From c522fec2743ffb95f2bc296f249232d73ae57dd1 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Sat, 23 Jan 2021 19:26:19 +0700 Subject: pkgs/development/tools: stdenv.lib -> lib --- pkgs/development/tools/alloy/default.nix | 4 ++-- pkgs/development/tools/ammonite/default.nix | 6 +++--- .../tools/analysis/autoflake/default.nix | 4 ++-- .../development/tools/analysis/bingrep/default.nix | 4 ++-- pkgs/development/tools/analysis/cccc/default.nix | 8 ++++---- .../tools/analysis/checkstyle/default.nix | 4 ++-- .../tools/analysis/clang-analyzer/default.nix | 8 ++++---- pkgs/development/tools/analysis/coan/default.nix | 4 ++-- pkgs/development/tools/analysis/codeql/default.nix | 4 ++-- .../tools/analysis/cov-build/default.nix | 8 ++++---- pkgs/development/tools/analysis/coz/default.nix | 6 +++--- .../tools/analysis/cppcheck/default.nix | 8 ++++---- pkgs/development/tools/analysis/egypt/default.nix | 4 ++-- pkgs/development/tools/analysis/emma/default.nix | 6 +++--- pkgs/development/tools/analysis/evmdis/default.nix | 4 ++-- .../tools/analysis/findbugs/default.nix | 4 ++-- pkgs/development/tools/analysis/flow/default.nix | 6 +++--- .../development/tools/analysis/frama-c/default.nix | 6 +++--- .../analysis/garcosim/tracefilegen/default.nix | 4 ++-- .../analysis/garcosim/tracefilesim/default.nix | 4 ++-- pkgs/development/tools/analysis/hopper/default.nix | 2 +- .../development/tools/analysis/hotspot/default.nix | 8 ++++---- .../analysis/include-what-you-use/default.nix | 4 ++-- .../development/tools/analysis/jdepend/default.nix | 4 ++-- pkgs/development/tools/analysis/kcov/default.nix | 4 ++-- pkgs/development/tools/analysis/lcov/default.nix | 6 +++--- .../tools/analysis/makefile2graph/default.nix | 6 +++--- .../tools/analysis/oclgrind/default.nix | 4 ++-- .../tools/analysis/panopticon/default.nix | 4 ++-- pkgs/development/tools/analysis/pev/default.nix | 4 ++-- pkgs/development/tools/analysis/pmd/default.nix | 4 ++-- .../tools/analysis/qcachegrind/default.nix | 6 +++--- .../development/tools/analysis/radare2/default.nix | 10 +++++----- .../development/tools/analysis/randoop/default.nix | 4 ++-- pkgs/development/tools/analysis/rr/default.nix | 8 ++++---- pkgs/development/tools/analysis/smatch/default.nix | 10 +++++----- .../development/tools/analysis/snowman/default.nix | 4 ++-- pkgs/development/tools/analysis/sparse/default.nix | 8 ++++---- pkgs/development/tools/analysis/spin/default.nix | 8 ++++---- pkgs/development/tools/analysis/splint/default.nix | 6 +++--- pkgs/development/tools/analysis/swarm/default.nix | 4 ++-- .../analysis/uefi-firmware-parser/default.nix | 4 ++-- .../tools/analysis/valgrind/default.nix | 16 ++++++++-------- .../tools/analysis/valkyrie/default.nix | 4 ++-- pkgs/development/tools/apktool/default.nix | 4 ++-- pkgs/development/tools/asn2quickder/default.nix | 4 ++-- pkgs/development/tools/avro-tools/default.nix | 2 +- pkgs/development/tools/azcopy/default.nix | 4 ++-- pkgs/development/tools/bazel-watcher/default.nix | 4 ++-- pkgs/development/tools/bazelisk/default.nix | 4 ++-- pkgs/development/tools/bloaty/default.nix | 4 ++-- pkgs/development/tools/boost-build/default.nix | 6 +++--- .../tools/build-managers/apache-ant/1.9.nix | 8 ++++---- .../tools/build-managers/apache-ant/default.nix | 8 ++++---- .../tools/build-managers/apache-maven/default.nix | 4 ++-- .../tools/build-managers/arpa2cm/default.nix | 4 ++-- .../tools/build-managers/bam/default.nix | 4 ++-- .../build-managers/bazel/bazel-remote/default.nix | 4 ++-- .../build-managers/bazel/buildtools/default.nix | 4 ++-- .../tools/build-managers/bear/default.nix | 4 ++-- .../tools/build-managers/bloop/default.nix | 2 +- .../tools/build-managers/bmake/default.nix | 4 ++-- .../tools/build-managers/boot/default.nix | 4 ++-- .../tools/build-managers/buck/default.nix | 6 +++--- .../development/tools/build-managers/cmake/2.8.nix | 14 +++++++------- .../tools/build-managers/colormake/default.nix | 4 ++-- .../tools/build-managers/doit/default.nix | 8 ++++---- .../tools/build-managers/dub/default.nix | 4 ++-- .../tools/build-managers/fac/default.nix | 4 ++-- .../tools/build-managers/gnumake/4.2/default.nix | 12 ++++++------ .../tools/build-managers/gnumake/default.nix | 12 ++++++------ .../tools/build-managers/gradle/default.nix | 6 +++--- .../tools/build-managers/gup/default.nix | 6 +++--- .../tools/build-managers/icmake/default.nix | 4 ++-- .../tools/build-managers/jam/default.nix | 4 ++-- .../tools/build-managers/kati/default.nix | 4 ++-- .../tools/build-managers/leiningen/default.nix | 10 +++++----- .../tools/build-managers/mill/default.nix | 6 +++--- .../tools/build-managers/mk/default.nix | 4 ++-- .../tools/build-managers/msbuild/default.nix | 6 +++--- .../tools/build-managers/ninja/default.nix | 4 ++-- .../tools/build-managers/pants/default.nix | 4 ++-- .../tools/build-managers/qbs/default.nix | 4 ++-- .../tools/build-managers/rebar/default.nix | 6 +++--- .../tools/build-managers/rebar3/default.nix | 8 ++++---- .../tools/build-managers/redo-apenwarr/default.nix | 2 +- .../tools/build-managers/redo-c/default.nix | 4 ++-- .../tools/build-managers/redo-sh/default.nix | 4 ++-- .../tools/build-managers/redo/default.nix | 8 ++++---- .../tools/build-managers/remake/default.nix | 8 ++++---- .../tools/build-managers/rocm-cmake/default.nix | 4 ++-- .../tools/build-managers/samurai/default.nix | 4 ++-- .../tools/build-managers/sbt-extras/default.nix | 12 ++++++------ .../tools/build-managers/sbt/default.nix | 10 +++++----- .../tools/build-managers/scons/common.nix | 2 +- .../tools/build-managers/shards/default.nix | 4 ++-- .../tools/build-managers/tup/default.nix | 4 ++-- .../tools/build-managers/waf/default.nix | 6 +++--- pkgs/development/tools/buildkit/default.nix | 6 +++--- pkgs/development/tools/cargo-web/default.nix | 6 +++--- pkgs/development/tools/cask/default.nix | 4 ++-- pkgs/development/tools/castxml/default.nix | 4 ++-- pkgs/development/tools/cdecl/default.nix | 8 ++++---- pkgs/development/tools/chit/default.nix | 10 +++++----- pkgs/development/tools/clang-tools/default.nix | 8 ++++---- pkgs/development/tools/clog-cli/default.nix | 8 ++++---- .../development/tools/cloudfoundry-cli/default.nix | 4 ++-- pkgs/development/tools/clpm/default.nix | 4 ++-- .../tools/cmake-language-server/default.nix | 2 +- pkgs/development/tools/compile-daemon/default.nix | 4 ++-- .../buildkite-agent/default.nix | 6 +++--- .../buildkite-agent/generic.nix | 8 ++++---- .../continuous-integration/drone-cli/default.nix | 4 ++-- .../tools/continuous-integration/drone/default.nix | 4 ++-- .../continuous-integration/gocd-agent/default.nix | 4 ++-- .../continuous-integration/gocd-server/default.nix | 4 ++-- .../continuous-integration/jenkins/default.nix | 6 +++--- .../continuous-integration/laminar/default.nix | 2 +- pkgs/development/tools/corgi/default.nix | 4 ++-- pkgs/development/tools/coursier/default.nix | 6 +++--- pkgs/development/tools/cppclean/default.nix | 4 ++-- pkgs/development/tools/cue/default.nix | 6 +++--- pkgs/development/tools/database/dbmate/default.nix | 4 ++-- .../tools/database/ephemeralpg/default.nix | 6 +++--- .../tools/database/pg_checksums/default.nix | 4 ++-- pkgs/development/tools/database/pgcli/default.nix | 6 +++--- .../development/tools/database/pyrseas/default.nix | 6 +++--- pkgs/development/tools/database/shmig/default.nix | 2 +- .../tools/database/sqlcheck/default.nix | 4 ++-- .../tools/database/sqldeveloper/default.nix | 4 ++-- .../tools/database/squirrel-sql/default.nix | 4 ++-- .../database/timescaledb-parallel-copy/default.nix | 4 ++-- .../tools/database/timescaledb-tune/default.nix | 4 ++-- pkgs/development/tools/database/webdis/default.nix | 4 ++-- pkgs/development/tools/dcadec/default.nix | 4 ++-- pkgs/development/tools/deis/default.nix | 4 ++-- pkgs/development/tools/deisctl/default.nix | 4 ++-- pkgs/development/tools/delve/default.nix | 4 ++-- pkgs/development/tools/dep/default.nix | 4 ++-- pkgs/development/tools/devd/default.nix | 4 ++-- pkgs/development/tools/devpi-client/default.nix | 4 ++-- pkgs/development/tools/devpi-server/default.nix | 6 +++--- pkgs/development/tools/devtodo/default.nix | 4 ++-- pkgs/development/tools/diesel-cli/default.nix | 2 +- pkgs/development/tools/dive/default.nix | 6 +++--- .../tools/documentation/antora/default.nix | 10 +++++----- .../tools/documentation/doxygen/default.nix | 18 +++++++++--------- .../documentation/gnome-doc-utils/default.nix | 6 +++--- .../tools/documentation/gtk-doc/default.nix | 6 +++--- .../tools/documentation/mdsh/default.nix | 4 ++-- .../tools/documentation/mkdocs/default.nix | 2 +- pkgs/development/tools/dot-http/default.nix | 2 +- pkgs/development/tools/drip/default.nix | 4 ++-- pkgs/development/tools/drm_info/default.nix | 4 ++-- pkgs/development/tools/dtools/default.nix | 4 ++-- pkgs/development/tools/easyjson/default.nix | 4 ++-- pkgs/development/tools/eclipse-mat/default.nix | 4 ++-- pkgs/development/tools/electron/default.nix | 2 +- pkgs/development/tools/electron/generic.nix | 8 ++++---- pkgs/development/tools/erlang/cuter/default.nix | 8 ++++---- pkgs/development/tools/fac/default.nix | 4 ++-- pkgs/development/tools/fedpkg/default.nix | 4 ++-- pkgs/development/tools/flamegraph/default.nix | 4 ++-- pkgs/development/tools/flatpak-builder/default.nix | 4 ++-- pkgs/development/tools/flootty/default.nix | 4 ++-- pkgs/development/tools/flyway/default.nix | 4 ++-- pkgs/development/tools/fmbt/default.nix | 6 +++--- pkgs/development/tools/fusee-launcher/default.nix | 4 ++-- pkgs/development/tools/galen/default.nix | 4 ++-- pkgs/development/tools/gamecube-tools/default.nix | 4 ++-- pkgs/development/tools/gauge/default.nix | 4 ++-- pkgs/development/tools/gdm/default.nix | 4 ++-- pkgs/development/tools/git-ftp/default.nix | 4 ++-- pkgs/development/tools/git-quick-stats/default.nix | 6 +++--- pkgs/development/tools/git-series/default.nix | 4 ++-- pkgs/development/tools/github/cligh/default.nix | 4 ++-- .../tools/github/github-release/default.nix | 4 ++-- pkgs/development/tools/glade/default.nix | 2 +- pkgs/development/tools/glide/default.nix | 4 ++-- pkgs/development/tools/gllvm/default.nix | 4 ++-- pkgs/development/tools/glock/default.nix | 6 +++--- pkgs/development/tools/glslviewer/default.nix | 6 +++--- .../tools/gnome-desktop-testing/default.nix | 4 ++-- pkgs/development/tools/gnulib/default.nix | 6 +++--- .../tools/go-bindata-assetfs/default.nix | 4 ++-- pkgs/development/tools/go-bindata/default.nix | 4 ++-- pkgs/development/tools/go-langserver/default.nix | 4 ++-- pkgs/development/tools/go-outline/default.nix | 6 +++--- pkgs/development/tools/go-protobuf/default.nix | 4 ++-- pkgs/development/tools/go-repo-root/default.nix | 4 ++-- pkgs/development/tools/go-symbols/default.nix | 6 +++--- pkgs/development/tools/go2nix/default.nix | 4 ++-- pkgs/development/tools/goa/default.nix | 4 ++-- pkgs/development/tools/gocode-gomod/default.nix | 4 ++-- pkgs/development/tools/gocode/default.nix | 4 ++-- pkgs/development/tools/goconvey/default.nix | 6 +++--- pkgs/development/tools/godef/default.nix | 6 +++--- pkgs/development/tools/godot/default.nix | 4 ++-- pkgs/development/tools/godot/headless.nix | 4 ++-- pkgs/development/tools/godot/server.nix | 4 ++-- pkgs/development/tools/golint/default.nix | 6 +++--- pkgs/development/tools/gomodifytags/default.nix | 6 +++--- .../tools/google-app-engine-go-sdk/default.nix | 4 ++-- pkgs/development/tools/gopkgs/default.nix | 6 +++--- pkgs/development/tools/gosec/default.nix | 4 ++-- pkgs/development/tools/gotags/default.nix | 4 ++-- pkgs/development/tools/gotests/default.nix | 6 +++--- pkgs/development/tools/gotools/default.nix | 4 ++-- pkgs/development/tools/govendor/default.nix | 4 ++-- pkgs/development/tools/govers/default.nix | 4 ++-- pkgs/development/tools/gox/default.nix | 4 ++-- pkgs/development/tools/gpp/default.nix | 4 ++-- pkgs/development/tools/gron/default.nix | 4 ++-- pkgs/development/tools/guile/g-wrap/default.nix | 4 ++-- .../development/tools/guile/guile-lint/default.nix | 4 ++-- .../tools/haskell/dconf2nix/dconf2nix.nix | 4 ++-- .../haskell/haskell-language-server/default.nix | 4 ++-- .../haskell-language-server/hls-class-plugin.nix | 4 ++-- .../haskell-language-server/hls-eval-plugin.nix | 4 ++-- .../hls-explicit-imports-plugin.nix | 4 ++-- .../haskell-language-server/hls-hlint-plugin.nix | 4 ++-- .../haskell-language-server/hls-retrie-plugin.nix | 4 ++-- .../haskell-language-server/hls-tactics-plugin.nix | 4 ++-- .../tools/haskell/hyper-haskell/default.nix | 6 +++--- .../development/tools/haskell/ihaskell/wrapper.nix | 4 ++-- .../development/tools/haskell/vaultenv/default.nix | 6 +++--- pkgs/development/tools/hcloud/default.nix | 6 +++--- pkgs/development/tools/hexio/default.nix | 6 +++--- pkgs/development/tools/iaca/2.1.nix | 4 ++-- pkgs/development/tools/iaca/3.0.nix | 4 ++-- pkgs/development/tools/icestorm/default.nix | 8 ++++---- pkgs/development/tools/icr/default.nix | 2 +- pkgs/development/tools/imatix_gsl/default.nix | 4 ++-- pkgs/development/tools/irony-server/default.nix | 4 ++-- pkgs/development/tools/java/cfr/default.nix | 4 ++-- pkgs/development/tools/java/dex2jar/default.nix | 2 +- pkgs/development/tools/java/fastjar/default.nix | 6 +++--- pkgs/development/tools/java/jhiccup/default.nix | 8 ++++---- pkgs/development/tools/java/visualvm/default.nix | 2 +- pkgs/development/tools/jbake/default.nix | 4 ++-- pkgs/development/tools/jbang/default.nix | 2 +- pkgs/development/tools/jd/default.nix | 4 ++-- pkgs/development/tools/jid/default.nix | 6 +++--- pkgs/development/tools/jira_cli/default.nix | 4 ++-- pkgs/development/tools/jl/default.nix | 6 +++--- pkgs/development/tools/jmespath/default.nix | 4 ++-- pkgs/development/tools/jo/default.nix | 4 ++-- pkgs/development/tools/jp/default.nix | 4 ++-- pkgs/development/tools/jq/default.nix | 6 +++--- pkgs/development/tools/just/default.nix | 4 ++-- pkgs/development/tools/k6/default.nix | 4 ++-- pkgs/development/tools/kafkacat/default.nix | 4 ++-- pkgs/development/tools/kind/default.nix | 6 +++--- pkgs/development/tools/krew/default.nix | 2 +- pkgs/development/tools/ktlint/default.nix | 4 ++-- pkgs/development/tools/kubectx/default.nix | 4 ++-- pkgs/development/tools/kubicorn/default.nix | 10 +++++----- pkgs/development/tools/kubie/default.nix | 2 +- pkgs/development/tools/kythe/default.nix | 6 +++--- pkgs/development/tools/lattice-diamond/default.nix | 8 ++++---- pkgs/development/tools/lazygit/default.nix | 4 ++-- pkgs/development/tools/leaps/default.nix | 6 +++--- pkgs/development/tools/libsigrok/default.nix | 4 ++-- pkgs/development/tools/libsigrokdecode/default.nix | 4 ++-- .../literate-programming/Literate/default.nix | 4 ++-- .../tools/literate-programming/eweb/default.nix | 4 ++-- .../literate-programming/funnelweb/default.nix | 4 ++-- .../tools/literate-programming/noweb/default.nix | 10 +++++----- .../tools/literate-programming/nuweb/default.nix | 4 ++-- pkgs/development/tools/makerpm/default.nix | 4 ++-- pkgs/development/tools/manul/default.nix | 4 ++-- pkgs/development/tools/mdk/default.nix | 6 +++--- pkgs/development/tools/minizinc/default.nix | 4 ++-- pkgs/development/tools/minizinc/ide.nix | 6 +++--- .../tools/misc/abi-compliance-checker/default.nix | 4 ++-- pkgs/development/tools/misc/abi-dumper/default.nix | 4 ++-- pkgs/development/tools/misc/arcanist/default.nix | 10 +++++----- pkgs/development/tools/misc/argbash/default.nix | 4 ++-- pkgs/development/tools/misc/asls/default.nix | 4 ++-- pkgs/development/tools/misc/autobuild/default.nix | 4 ++-- .../tools/misc/autoconf-archive/default.nix | 4 ++-- pkgs/development/tools/misc/autoconf/2.13.nix | 6 +++--- pkgs/development/tools/misc/autoconf/2.64.nix | 6 +++--- pkgs/development/tools/misc/autoconf/2.69.nix | 6 +++--- pkgs/development/tools/misc/autoconf/default.nix | 6 +++--- pkgs/development/tools/misc/autogen/default.nix | 10 +++++----- .../tools/misc/automake/automake-1.11.x.nix | 6 +++--- .../tools/misc/automake/automake-1.15.x.nix | 6 +++--- .../tools/misc/automake/automake-1.16.x.nix | 6 +++--- pkgs/development/tools/misc/automoc4/default.nix | 4 ++-- pkgs/development/tools/misc/avrdude/default.nix | 8 ++++---- pkgs/development/tools/misc/awf/default.nix | 4 ++-- pkgs/development/tools/misc/babeltrace/default.nix | 4 ++-- pkgs/development/tools/misc/bashdb/default.nix | 6 +++--- .../tools/misc/bin_replace_string/default.nix | 4 ++-- pkgs/development/tools/misc/bossa/default.nix | 4 ++-- pkgs/development/tools/misc/bsdbuild/default.nix | 6 +++--- pkgs/development/tools/misc/cbrowser/default.nix | 8 ++++---- pkgs/development/tools/misc/cc-tool/default.nix | 4 ++-- pkgs/development/tools/misc/ccache/default.nix | 4 ++-- pkgs/development/tools/misc/ccls/default.nix | 6 +++--- pkgs/development/tools/misc/cflow/default.nix | 8 ++++---- pkgs/development/tools/misc/cgdb/default.nix | 4 ++-- .../tools/misc/checkbashisms/default.nix | 6 +++--- pkgs/development/tools/misc/chrpath/default.nix | 4 ++-- .../tools/misc/circleci-cli/default.nix | 4 ++-- pkgs/development/tools/misc/cl-launch/default.nix | 8 ++++---- pkgs/development/tools/misc/cli11/default.nix | 4 ++-- .../development/tools/misc/clojure-lsp/default.nix | 4 ++-- pkgs/development/tools/misc/coccinelle/default.nix | 8 ++++---- pkgs/development/tools/misc/complexity/default.nix | 6 +++--- pkgs/development/tools/misc/cppi/default.nix | 6 +++--- pkgs/development/tools/misc/cproto/default.nix | 4 ++-- pkgs/development/tools/misc/creduce/default.nix | 6 +++--- pkgs/development/tools/misc/cscope/default.nix | 10 +++++----- pkgs/development/tools/misc/csmith/default.nix | 4 ++-- pkgs/development/tools/misc/ctags/default.nix | 4 ++-- pkgs/development/tools/misc/cwebbin/default.nix | 4 ++-- pkgs/development/tools/misc/d-feet/default.nix | 6 +++--- pkgs/development/tools/misc/dbench/default.nix | 4 ++-- pkgs/development/tools/misc/ddd/default.nix | 6 +++--- pkgs/development/tools/misc/dejagnu/default.nix | 4 ++-- .../tools/misc/dfu-programmer/default.nix | 4 ++-- pkgs/development/tools/misc/dfu-util/default.nix | 4 ++-- pkgs/development/tools/misc/dialog/default.nix | 12 ++++++------ pkgs/development/tools/misc/direvent/default.nix | 4 ++-- pkgs/development/tools/misc/distcc/default.nix | 6 +++--- pkgs/development/tools/misc/distcc/masq.nix | 4 ++-- pkgs/development/tools/misc/doclifter/default.nix | 4 ++-- pkgs/development/tools/misc/docopts/default.nix | 4 ++-- pkgs/development/tools/misc/drush/default.nix | 6 +++--- .../tools/misc/editorconfig-core-c/default.nix | 4 ++-- pkgs/development/tools/misc/eggdbus/default.nix | 4 ++-- pkgs/development/tools/misc/elfinfo/default.nix | 4 ++-- pkgs/development/tools/misc/elfkickers/default.nix | 4 ++-- pkgs/development/tools/misc/epm/default.nix | 4 ++-- pkgs/development/tools/misc/findnewest/default.nix | 4 ++-- pkgs/development/tools/misc/fsatrace/default.nix | 4 ++-- pkgs/development/tools/misc/fswatch/default.nix | 6 +++--- pkgs/development/tools/misc/fujprog/default.nix | 6 +++--- pkgs/development/tools/misc/gdb/default.nix | 22 +++++++++++----------- pkgs/development/tools/misc/gdbgui/default.nix | 6 +++--- pkgs/development/tools/misc/gengetopt/default.nix | 6 +++--- pkgs/development/tools/misc/global/default.nix | 4 ++-- pkgs/development/tools/misc/gnum4/default.nix | 8 ++++---- pkgs/development/tools/misc/gob2/default.nix | 8 ++++---- pkgs/development/tools/misc/gperf/3.0.x.nix | 6 +++--- pkgs/development/tools/misc/gperf/default.nix | 6 +++--- pkgs/development/tools/misc/gpshell/default.nix | 4 ++-- pkgs/development/tools/misc/gputils/default.nix | 4 ++-- pkgs/development/tools/misc/gtkdialog/default.nix | 6 +++--- pkgs/development/tools/misc/gtkperf/default.nix | 4 ++-- pkgs/development/tools/misc/help2man/default.nix | 6 +++--- pkgs/development/tools/misc/hound/default.nix | 8 ++++---- pkgs/development/tools/misc/hydra-cli/default.nix | 2 +- pkgs/development/tools/misc/hydra/common.nix | 2 +- .../tools/misc/icon-naming-utils/default.nix | 4 ++-- pkgs/development/tools/misc/igprof/default.nix | 8 ++++---- pkgs/development/tools/misc/indent/default.nix | 10 +++++----- .../tools/misc/inotify-tools/default.nix | 4 ++-- .../tools/misc/intel-gpu-tools/default.nix | 4 ++-- pkgs/development/tools/misc/intltool/default.nix | 6 +++--- pkgs/development/tools/misc/iozone/default.nix | 4 ++-- pkgs/development/tools/misc/itm-tools/default.nix | 4 ++-- pkgs/development/tools/misc/itstool/default.nix | 4 ++-- pkgs/development/tools/misc/jscoverage/default.nix | 6 +++--- .../tools/misc/kconfig-frontends/default.nix | 6 +++--- pkgs/development/tools/misc/kdbg/default.nix | 4 ++-- pkgs/development/tools/misc/kibana/6.x.nix | 6 +++--- pkgs/development/tools/misc/kibana/7.x.nix | 6 +++--- pkgs/development/tools/misc/libtool/default.nix | 6 +++--- pkgs/development/tools/misc/libtool/libtool2.nix | 4 ++-- pkgs/development/tools/misc/libwhich/default.nix | 4 ++-- pkgs/development/tools/misc/loccount/default.nix | 4 ++-- pkgs/development/tools/misc/lsof/default.nix | 12 ++++++------ pkgs/development/tools/misc/ltrace/default.nix | 4 ++-- .../development/tools/misc/lttng-tools/default.nix | 4 ++-- pkgs/development/tools/misc/lttng-ust/default.nix | 4 ++-- pkgs/development/tools/misc/lttv/default.nix | 4 ++-- pkgs/development/tools/misc/luarocks/default.nix | 4 ++-- .../tools/misc/macdylibbundler/default.nix | 4 ++-- .../tools/misc/micronucleus/default.nix | 2 +- pkgs/development/tools/misc/msitools/default.nix | 6 +++--- pkgs/development/tools/misc/nimlsp/default.nix | 4 ++-- pkgs/development/tools/misc/ninka/default.nix | 4 ++-- pkgs/development/tools/misc/nrfutil/default.nix | 4 ++-- .../tools/misc/nxpmicro-mfgtools/default.nix | 4 ++-- pkgs/development/tools/misc/objconv/default.nix | 4 ++-- pkgs/development/tools/misc/opengrok/default.nix | 6 +++--- pkgs/development/tools/misc/pahole/default.nix | 4 ++-- pkgs/development/tools/misc/patchelf/default.nix | 4 ++-- pkgs/development/tools/misc/patchelf/unstable.nix | 6 +++--- .../tools/misc/perfect-hash/default.nix | 4 ++-- pkgs/development/tools/misc/pkg-config/default.nix | 4 ++-- pkgs/development/tools/misc/pkgconf/default.nix | 4 ++-- pkgs/development/tools/misc/pmccabe/default.nix | 4 ++-- pkgs/development/tools/misc/prelink/default.nix | 6 +++--- pkgs/development/tools/misc/premake/3.nix | 6 +++--- pkgs/development/tools/misc/premake/5.nix | 6 +++--- pkgs/development/tools/misc/premake/default.nix | 6 +++--- pkgs/development/tools/misc/ptags/default.nix | 2 +- pkgs/development/tools/misc/pwndbg/default.nix | 4 ++-- .../remarkable/remarkable-toolchain/default.nix | 4 ++-- .../remarkable/remarkable2-toolchain/default.nix | 4 ++-- pkgs/development/tools/misc/rman/default.nix | 4 ++-- pkgs/development/tools/misc/rolespec/default.nix | 4 ++-- .../tools/misc/saleae-logic/default.nix | 6 +++--- pkgs/development/tools/misc/scc/default.nix | 4 ++-- pkgs/development/tools/misc/sipp/default.nix | 4 ++-- pkgs/development/tools/misc/sloccount/default.nix | 6 +++--- pkgs/development/tools/misc/srecord/default.nix | 8 ++++---- pkgs/development/tools/misc/stlink/default.nix | 4 ++-- .../development/tools/misc/stm32cubemx/default.nix | 4 ++-- pkgs/development/tools/misc/stm32flash/default.nix | 6 +++--- pkgs/development/tools/misc/strace/default.nix | 6 +++--- pkgs/development/tools/misc/swig/2.x.nix | 4 ++-- pkgs/development/tools/misc/swig/3.x.nix | 4 ++-- pkgs/development/tools/misc/swig/4.nix | 4 ++-- pkgs/development/tools/misc/swig/default.nix | 6 +++--- pkgs/development/tools/misc/sysbench/default.nix | 6 +++--- pkgs/development/tools/misc/tcptrack/default.nix | 4 ++-- .../tools/misc/teensy-loader-cli/default.nix | 4 ++-- pkgs/development/tools/misc/tet/default.nix | 6 +++--- pkgs/development/tools/misc/texi2html/default.nix | 6 +++--- pkgs/development/tools/misc/texinfo/common.nix | 6 +++--- pkgs/development/tools/misc/tie/default.nix | 4 ++-- pkgs/development/tools/misc/tokei/default.nix | 6 +++--- pkgs/development/tools/misc/uisp/default.nix | 6 +++--- pkgs/development/tools/misc/uncrustify/default.nix | 4 ++-- pkgs/development/tools/misc/unifdef/default.nix | 4 ++-- .../tools/misc/universal-ctags/default.nix | 6 +++--- pkgs/development/tools/misc/unused/default.nix | 4 ++-- .../development/tools/misc/usb-modeswitch/data.nix | 4 ++-- .../tools/misc/usb-modeswitch/default.nix | 2 +- .../tools/misc/vtable-dumper/default.nix | 4 ++-- .../development/tools/misc/watson-ruby/default.nix | 4 ++-- pkgs/development/tools/misc/whatstyle/default.nix | 4 ++-- pkgs/development/tools/misc/xc3sprog/default.nix | 4 ++-- pkgs/development/tools/misc/ycmd/default.nix | 6 +++--- pkgs/development/tools/misc/yodl/default.nix | 4 ++-- pkgs/development/tools/modd/default.nix | 4 ++-- pkgs/development/tools/mustache-go/default.nix | 4 ++-- pkgs/development/tools/nemiver/default.nix | 2 +- pkgs/development/tools/neoload/default.nix | 6 +++--- pkgs/development/tools/node-webkit/nw12.nix | 4 ++-- pkgs/development/tools/nrpl/default.nix | 2 +- pkgs/development/tools/nwjs/default.nix | 4 ++-- pkgs/development/tools/ocaml/camlidl/default.nix | 4 ++-- pkgs/development/tools/ocaml/camlp4/default.nix | 6 +++--- pkgs/development/tools/ocaml/camlp5/default.nix | 6 +++--- pkgs/development/tools/ocaml/cppo/default.nix | 6 +++--- pkgs/development/tools/ocaml/dune/2.nix | 8 ++++---- pkgs/development/tools/ocaml/findlib/default.nix | 8 ++++---- pkgs/development/tools/ocaml/oasis/default.nix | 4 ++-- pkgs/development/tools/ocaml/obuild/default.nix | 6 +++--- .../development/tools/ocaml/ocamlbuild/default.nix | 4 ++-- pkgs/development/tools/ocaml/ocamlify/default.nix | 6 +++--- pkgs/development/tools/ocaml/ocamlmod/default.nix | 4 ++-- pkgs/development/tools/ocaml/ocp-build/default.nix | 4 ++-- .../tools/ocaml/ocsigen-i18n/default.nix | 6 +++--- pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix | 4 ++-- pkgs/development/tools/ocaml/omake/default.nix | 4 ++-- pkgs/development/tools/ocaml/opaline/default.nix | 6 +++--- pkgs/development/tools/ocaml/opam/1.2.2.nix | 2 +- pkgs/development/tools/ocaml/opam/default.nix | 2 +- pkgs/development/tools/ocaml/utop/default.nix | 10 +++++----- pkgs/development/tools/omniorb/default.nix | 4 ++-- .../development/tools/omnisharp-roslyn/default.nix | 4 ++-- pkgs/development/tools/out-of-tree/default.nix | 2 +- pkgs/development/tools/packet/default.nix | 8 ++++---- pkgs/development/tools/parsing/antlr/3.5.nix | 2 +- pkgs/development/tools/parsing/antlr/4.8.nix | 4 ++-- pkgs/development/tools/parsing/bison/default.nix | 8 ++++---- pkgs/development/tools/parsing/flex/2.5.35.nix | 2 +- pkgs/development/tools/parsing/flex/2.6.1.nix | 6 +++--- pkgs/development/tools/parsing/flex/default.nix | 6 +++--- pkgs/development/tools/parsing/ragel/default.nix | 10 +++++----- pkgs/development/tools/pgformatter/default.nix | 4 ++-- pkgs/development/tools/pgloader/default.nix | 2 +- pkgs/development/tools/phantomjs/default.nix | 2 +- pkgs/development/tools/phantomjs2/default.nix | 8 ++++---- .../tools/poetry2nix/poetry2nix/overrides.nix | 10 +++++----- .../tools/profiling/EZTrace/default.nix | 6 +++--- .../tools/profiling/oprofile/default.nix | 10 +++++----- .../tools/profiling/sysprof/capture.nix | 4 ++-- .../tools/profiling/sysprof/default.nix | 2 +- pkgs/development/tools/purescript/spago/spago.nix | 4 ++-- pkgs/development/tools/py-spy/default.nix | 2 +- pkgs/development/tools/pydb/default.nix | 6 +++--- pkgs/development/tools/quilt/default.nix | 6 +++--- pkgs/development/tools/rdocker/default.nix | 4 ++-- .../tools/react-native-debugger/default.nix | 2 +- .../tools/repository-managers/nexus/default.nix | 2 +- pkgs/development/tools/rtags/default.nix | 4 ++-- pkgs/development/tools/rund/default.nix | 2 +- pkgs/development/tools/rust/cargo-asm/default.nix | 2 +- pkgs/development/tools/rust/cargo-c/default.nix | 2 +- .../development/tools/rust/cargo-cache/default.nix | 2 +- pkgs/development/tools/rust/cargo-crev/default.nix | 2 +- pkgs/development/tools/rust/cargo-deny/default.nix | 2 +- pkgs/development/tools/rust/cargo-fund/default.nix | 2 +- .../tools/rust/cargo-geiger/default.nix | 2 +- .../tools/rust/cargo-generate/default.nix | 2 +- .../tools/rust/cargo-inspect/default.nix | 2 +- pkgs/development/tools/rust/cargo-make/default.nix | 2 +- pkgs/development/tools/rust/cargo-raze/default.nix | 2 +- .../development/tools/rust/cargo-udeps/default.nix | 2 +- pkgs/development/tools/rust/cbindgen/default.nix | 2 +- pkgs/development/tools/rust/maturin/default.nix | 4 ++-- pkgs/development/tools/rust/racer/default.nix | 2 +- pkgs/development/tools/rust/racerd/default.nix | 2 +- pkgs/development/tools/rust/rustup/default.nix | 2 +- pkgs/development/tools/sauce-connect/default.nix | 2 +- .../tools/selenium/chromedriver/default.nix | 6 +++--- .../tools/selenium/htmlunit-driver/default.nix | 4 ++-- .../tools/selenium/selendroid/default.nix | 4 ++-- pkgs/development/tools/selenium/server/default.nix | 4 ++-- pkgs/development/tools/simavr/default.nix | 2 +- pkgs/development/tools/slimerjs/default.nix | 8 ++++---- pkgs/development/tools/so/default.nix | 2 +- pkgs/development/tools/sourcetrail/default.nix | 12 ++++++------ pkgs/development/tools/sqsh/default.nix | 2 +- pkgs/development/tools/summon/default.nix | 2 +- .../tools/sumneko-lua-language-server/default.nix | 4 ++-- pkgs/development/tools/the-way/default.nix | 4 ++-- pkgs/development/tools/trellis/default.nix | 6 +++--- pkgs/development/tools/tychus/default.nix | 6 +++--- pkgs/development/tools/uftrace/default.nix | 8 ++++---- pkgs/development/tools/vcstool/default.nix | 2 +- pkgs/development/tools/vultr/default.nix | 6 +++--- pkgs/development/tools/wasm-pack/default.nix | 2 +- pkgs/development/tools/wiggle/default.nix | 6 +++--- pkgs/development/tools/wrangler/default.nix | 6 +++--- pkgs/development/tools/xcbuild/default.nix | 6 +++--- 534 files changed, 1314 insertions(+), 1314 deletions(-) diff --git a/pkgs/development/tools/alloy/default.nix b/pkgs/development/tools/alloy/default.nix index 44a6d7329baa9..1dade32ac64d4 100644 --- a/pkgs/development/tools/alloy/default.nix +++ b/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/pkgs/development/tools/ammonite/default.nix b/pkgs/development/tools/ammonite/default.nix index 20b26437e75fd..eb827882b7528 100644 --- a/pkgs/development/tools/ammonite/default.nix +++ b/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/pkgs/development/tools/analysis/autoflake/default.nix b/pkgs/development/tools/analysis/autoflake/default.nix index 396a5817c672c..884b511b8af1b 100644 --- a/pkgs/development/tools/analysis/autoflake/default.nix +++ b/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/pkgs/development/tools/analysis/bingrep/default.nix b/pkgs/development/tools/analysis/bingrep/default.nix index d1b0c3a665690..ae54723dda3b0 100644 --- a/pkgs/development/tools/analysis/bingrep/default.nix +++ b/pkgs/development/tools/analysis/bingrep/default.nix @@ -1,4 +1,4 @@ -{ stdenv, rustPlatform, fetchFromGitHub }: +{ lib, stdenv, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "bingrep"; @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { 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/pkgs/development/tools/analysis/cccc/default.nix b/pkgs/development/tools/analysis/cccc/default.nix index 374331f3ac87d..bcbda8ad7e605 100644 --- a/pkgs/development/tools/analysis/cccc/default.nix +++ b/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/pkgs/development/tools/analysis/checkstyle/default.nix b/pkgs/development/tools/analysis/checkstyle/default.nix index e38645e84c5c7..e5325f7da8c77 100644 --- a/pkgs/development/tools/analysis/checkstyle/default.nix +++ b/pkgs/development/tools/analysis/checkstyle/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, jre }: +{ lib, stdenv, fetchurl, makeWrapper, jre }: stdenv.mkDerivation rec { version = "8.39"; @@ -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/pkgs/development/tools/analysis/clang-analyzer/default.nix b/pkgs/development/tools/analysis/clang-analyzer/default.nix index 43b32052bf3cf..4752b31649d34 100644 --- a/pkgs/development/tools/analysis/clang-analyzer/default.nix +++ b/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/pkgs/development/tools/analysis/coan/default.nix b/pkgs/development/tools/analysis/coan/default.nix index 4c6e9f1a078ca..1e0b79e0daa5c 100644 --- a/pkgs/development/tools/analysis/coan/default.nix +++ b/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/pkgs/development/tools/analysis/codeql/default.nix b/pkgs/development/tools/analysis/codeql/default.nix index f9bd749f01476..f3ad1d81e57d7 100644 --- a/pkgs/development/tools/analysis/codeql/default.nix +++ b/pkgs/development/tools/analysis/codeql/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchzip , zlib , xorg @@ -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/pkgs/development/tools/analysis/cov-build/default.nix b/pkgs/development/tools/analysis/cov-build/default.nix index bd8c5c37c864a..93a4ffab388dd 100644 --- a/pkgs/development/tools/analysis/cov-build/default.nix +++ b/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/pkgs/development/tools/analysis/coz/default.nix b/pkgs/development/tools/analysis/coz/default.nix index 42b47a9a8fd85..17968a466bf4e 100644 --- a/pkgs/development/tools/analysis/coz/default.nix +++ b/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/pkgs/development/tools/analysis/cppcheck/default.nix b/pkgs/development/tools/analysis/cppcheck/default.nix index 91bcecbb43d1d..30c0614446e6b 100644 --- a/pkgs/development/tools/analysis/cppcheck/default.nix +++ b/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/pkgs/development/tools/analysis/egypt/default.nix b/pkgs/development/tools/analysis/egypt/default.nix index 080b19bf163b9..cfb974c86ddd8 100644 --- a/pkgs/development/tools/analysis/egypt/default.nix +++ b/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/pkgs/development/tools/analysis/emma/default.nix b/pkgs/development/tools/analysis/emma/default.nix index 56d3554bf7502..97f93722a182e 100644 --- a/pkgs/development/tools/analysis/emma/default.nix +++ b/pkgs/development/tools/analysis/emma/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, unzip}: +{lib, stdenv, fetchurl, unzip}: stdenv.mkDerivation { name = "emma-2.0.5312"; @@ -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/pkgs/development/tools/analysis/evmdis/default.nix b/pkgs/development/tools/analysis/evmdis/default.nix index 64a1c3173930b..b8f3aa0ac1fb4 100644 --- a/pkgs/development/tools/analysis/evmdis/default.nix +++ b/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/pkgs/development/tools/analysis/findbugs/default.nix b/pkgs/development/tools/analysis/findbugs/default.nix index d522b2b942272..265f629045302 100644 --- a/pkgs/development/tools/analysis/findbugs/default.nix +++ b/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/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index 948df14957a4f..fc39e86007d47 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ocamlPackages, CoreServices }: +{ lib, stdenv, fetchFromGitHub, ocamlPackages, CoreServices }: stdenv.mkDerivation rec { pname = "flow"; @@ -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/pkgs/development/tools/analysis/frama-c/default.nix b/pkgs/development/tools/analysis/frama-c/default.nix index 94012ce7ff680..394bd6558fbf0 100644 --- a/pkgs/development/tools/analysis/frama-c/default.nix +++ b/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/pkgs/development/tools/analysis/garcosim/tracefilegen/default.nix b/pkgs/development/tools/analysis/garcosim/tracefilegen/default.nix index d0221e80b9bc9..8984a395818b9 100644 --- a/pkgs/development/tools/analysis/garcosim/tracefilegen/default.nix +++ b/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/pkgs/development/tools/analysis/garcosim/tracefilesim/default.nix b/pkgs/development/tools/analysis/garcosim/tracefilesim/default.nix index 10f0d74c0dc71..3f97485cbfa4b 100644 --- a/pkgs/development/tools/analysis/garcosim/tracefilesim/default.nix +++ b/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/pkgs/development/tools/analysis/hopper/default.nix b/pkgs/development/tools/analysis/hopper/default.nix index 68f12dac70f5f..b169877f5c1f7 100644 --- a/pkgs/development/tools/analysis/hopper/default.nix +++ b/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/pkgs/development/tools/analysis/hotspot/default.nix b/pkgs/development/tools/analysis/hotspot/default.nix index de29b29df311e..6ea079e3ec15b 100644 --- a/pkgs/development/tools/analysis/hotspot/default.nix +++ b/pkgs/development/tools/analysis/hotspot/default.nix @@ -1,4 +1,4 @@ -{ stdenv, +{ lib, stdenv, mkDerivation, cmake, elfutils, @@ -58,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/pkgs/development/tools/analysis/include-what-you-use/default.nix b/pkgs/development/tools/analysis/include-what-you-use/default.nix index 6715721815444..db1cf9c6ead51 100644 --- a/pkgs/development/tools/analysis/include-what-you-use/default.nix +++ b/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"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { --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/pkgs/development/tools/analysis/jdepend/default.nix b/pkgs/development/tools/analysis/jdepend/default.nix index c903833a731a8..faa68dadc3b48 100644 --- a/pkgs/development/tools/analysis/jdepend/default.nix +++ b/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/pkgs/development/tools/analysis/kcov/default.nix b/pkgs/development/tools/analysis/kcov/default.nix index b8e456b1c1eae..15891e74044a4 100644 --- a/pkgs/development/tools/analysis/kcov/default.nix +++ b/pkgs/development/tools/analysis/kcov/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, cmake, pkg-config, zlib, curl, elfutils, python, libiberty, libopcodes}: +{lib, stdenv, fetchFromGitHub, cmake, pkg-config, zlib, curl, elfutils, python, libiberty, libopcodes}: stdenv.mkDerivation rec { pname = "kcov"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ zlib curl elfutils python libiberty libopcodes ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Code coverage tester for compiled programs, Python scripts and shell scripts"; longDescription = '' diff --git a/pkgs/development/tools/analysis/lcov/default.nix b/pkgs/development/tools/analysis/lcov/default.nix index c6faeaa72f238..35c75d67da507 100644 --- a/pkgs/development/tools/analysis/lcov/default.nix +++ b/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/pkgs/development/tools/analysis/makefile2graph/default.nix b/pkgs/development/tools/analysis/makefile2graph/default.nix index 20fe74ecb74db..66f767f470282 100644 --- a/pkgs/development/tools/analysis/makefile2graph/default.nix +++ b/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/pkgs/development/tools/analysis/oclgrind/default.nix b/pkgs/development/tools/analysis/oclgrind/default.nix index 8cc0477ca5928..72154e909b65d 100644 --- a/pkgs/development/tools/analysis/oclgrind/default.nix +++ b/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/pkgs/development/tools/analysis/panopticon/default.nix b/pkgs/development/tools/analysis/panopticon/default.nix index 4cd16a80a943b..ff5014bd46a9e 100644 --- a/pkgs/development/tools/analysis/panopticon/default.nix +++ b/pkgs/development/tools/analysis/panopticon/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform, qt5, git, cmake +{ lib, stdenv, fetchFromGitHub, rustPlatform, qt5, git, cmake , pkg-config, makeWrapper }: rustPlatform.buildRustPackage rec { @@ -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/pkgs/development/tools/analysis/pev/default.nix b/pkgs/development/tools/analysis/pev/default.nix index 42e382c8bcad2..a46bc067f11b6 100644 --- a/pkgs/development/tools/analysis/pev/default.nix +++ b/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/pkgs/development/tools/analysis/pmd/default.nix b/pkgs/development/tools/analysis/pmd/default.nix index 497a244f68b43..a75445c363b0a 100644 --- a/pkgs/development/tools/analysis/pmd/default.nix +++ b/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/pkgs/development/tools/analysis/qcachegrind/default.nix b/pkgs/development/tools/analysis/qcachegrind/default.nix index d9f39667ceff1..0145e51ee2628 100644 --- a/pkgs/development/tools/analysis/qcachegrind/default.nix +++ b/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/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix index c6cc555e05085..3623893ea63ee 100644 --- a/pkgs/development/tools/analysis/radare2/default.nix +++ b/pkgs/development/tools/analysis/radare2/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub +{lib, stdenv, fetchFromGitHub , buildPackages , pkg-config , libusb-compat-0_1, readline, libewf, perl, zlib, openssl @@ -19,7 +19,7 @@ assert pythonBindings -> python3 != null; let - inherit (stdenv.lib) optional; + inherit (lib) optional; generic = { version_commit, # unused @@ -95,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; }; }; diff --git a/pkgs/development/tools/analysis/randoop/default.nix b/pkgs/development/tools/analysis/randoop/default.nix index b51b26eab1728..0d10d6d6b2776 100644 --- a/pkgs/development/tools/analysis/randoop/default.nix +++ b/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/pkgs/development/tools/analysis/rr/default.nix b/pkgs/development/tools/analysis/rr/default.nix index 92f2494dbe287..b63713f000737 100644 --- a/pkgs/development/tools/analysis/rr/default.nix +++ b/pkgs/development/tools/analysis/rr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, libpfm, zlib, pkg-config, 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"; @@ -52,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/pkgs/development/tools/analysis/smatch/default.nix b/pkgs/development/tools/analysis/smatch/default.nix index e29f06fca8ef4..4330ec3d7426b 100644 --- a/pkgs/development/tools/analysis/smatch/default.nix +++ b/pkgs/development/tools/analysis/smatch/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, sqlite, pkg-config, perl +{ lib, stdenv, fetchgit, sqlite, pkg-config, perl , buildllvmsparse ? true , buildc2xml ? true , llvm ? null, libxml2 ? null @@ -18,8 +18,8 @@ stdenv.mkDerivation { 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/pkgs/development/tools/analysis/snowman/default.nix b/pkgs/development/tools/analysis/snowman/default.nix index 82eb58879f10e..261645c062d30 100644 --- a/pkgs/development/tools/analysis/snowman/default.nix +++ b/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,7 +19,7 @@ mkDerivation rec { export sourceRoot=$sourceRoot/src ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Native code to C/C++ decompiler"; homepage = "http://derevenets.com/"; diff --git a/pkgs/development/tools/analysis/sparse/default.nix b/pkgs/development/tools/analysis/sparse/default.nix index 29ee980b4874a..e0d9840472b44 100644 --- a/pkgs/development/tools/analysis/sparse/default.nix +++ b/pkgs/development/tools/analysis/sparse/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkg-config, libxml2, llvm }: +{ fetchurl, lib, stdenv, pkg-config, libxml2, llvm }: stdenv.mkDerivation rec { name = "sparse-0.5.0"; @@ -19,8 +19,8 @@ stdenv.mkDerivation rec { 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/pkgs/development/tools/analysis/spin/default.nix b/pkgs/development/tools/analysis/spin/default.nix index 73e88f9811c35..49e31f53a8465 100644 --- a/pkgs/development/tools/analysis/spin/default.nix +++ b/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/pkgs/development/tools/analysis/splint/default.nix b/pkgs/development/tools/analysis/splint/default.nix index 4dc93897e869a..581ff56bb614b 100644 --- a/pkgs/development/tools/analysis/splint/default.nix +++ b/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/pkgs/development/tools/analysis/swarm/default.nix b/pkgs/development/tools/analysis/swarm/default.nix index 03f218546ebf8..894d9a2357ea2 100644 --- a/pkgs/development/tools/analysis/swarm/default.nix +++ b/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/pkgs/development/tools/analysis/uefi-firmware-parser/default.nix b/pkgs/development/tools/analysis/uefi-firmware-parser/default.nix index 0ad042d74deff..17f3907146205 100644 --- a/pkgs/development/tools/analysis/uefi-firmware-parser/default.nix +++ b/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/pkgs/development/tools/analysis/valgrind/default.nix b/pkgs/development/tools/analysis/valgrind/default.nix index 60d3a7c5ebc90..d99bbe1cae4b4 100644 --- a/pkgs/development/tools/analysis/valgrind/default.nix +++ b/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/pkgs/development/tools/analysis/valkyrie/default.nix b/pkgs/development/tools/analysis/valkyrie/default.nix index 1c571fe6be0fc..10b9f7291a220 100644 --- a/pkgs/development/tools/analysis/valkyrie/default.nix +++ b/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/pkgs/development/tools/apktool/default.nix b/pkgs/development/tools/apktool/default.nix index 2ff9c58fb3398..33721e60b0ed6 100644 --- a/pkgs/development/tools/apktool/default.nix +++ b/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/pkgs/development/tools/asn2quickder/default.nix b/pkgs/development/tools/asn2quickder/default.nix index 68a0c0f6073e6..b2432f7fefc65 100644 --- a/pkgs/development/tools/asn2quickder/default.nix +++ b/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/pkgs/development/tools/avro-tools/default.nix b/pkgs/development/tools/avro-tools/default.nix index 5327ab354e917..5dd058614c10f 100644 --- a/pkgs/development/tools/avro-tools/default.nix +++ b/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/pkgs/development/tools/azcopy/default.nix b/pkgs/development/tools/azcopy/default.nix index bae6dd738290c..822480b1d3f3f 100644 --- a/pkgs/development/tools/azcopy/default.nix +++ b/pkgs/development/tools/azcopy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildGoModule }: +{ lib, stdenv, fetchFromGitHub, buildGoModule }: buildGoModule rec { pname = "azure-storage-azcopy"; @@ -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/pkgs/development/tools/bazel-watcher/default.nix b/pkgs/development/tools/bazel-watcher/default.nix index e0a7febb875f5..94efcc9be0630 100644 --- a/pkgs/development/tools/bazel-watcher/default.nix +++ b/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/pkgs/development/tools/bazelisk/default.nix b/pkgs/development/tools/bazelisk/default.nix index 2a20888426d07..e4a6b3c2869e4 100644 --- a/pkgs/development/tools/bazelisk/default.nix +++ b/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/pkgs/development/tools/bloaty/default.nix b/pkgs/development/tools/bloaty/default.nix index fcab0fb198e2f..ff24e7b7c1cdf 100644 --- a/pkgs/development/tools/bloaty/default.nix +++ b/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"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { 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/pkgs/development/tools/boost-build/default.nix b/pkgs/development/tools/boost-build/default.nix index 8ce475c893d5f..8566edd2315fc 100644 --- a/pkgs/development/tools/boost-build/default.nix +++ b/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/pkgs/development/tools/build-managers/apache-ant/1.9.nix b/pkgs/development/tools/build-managers/apache-ant/1.9.nix index 49f8435b3773b..182b8633aa015 100644 --- a/pkgs/development/tools/build-managers/apache-ant/1.9.nix +++ b/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/pkgs/development/tools/build-managers/apache-ant/default.nix b/pkgs/development/tools/build-managers/apache-ant/default.nix index caa9bc3b9eb74..d88068c1c3ee3 100644 --- a/pkgs/development/tools/build-managers/apache-ant/default.nix +++ b/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/pkgs/development/tools/build-managers/apache-maven/default.nix b/pkgs/development/tools/build-managers/apache-maven/default.nix index 83260cbc18607..4658703f8b103 100644 --- a/pkgs/development/tools/build-managers/apache-maven/default.nix +++ b/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/pkgs/development/tools/build-managers/arpa2cm/default.nix b/pkgs/development/tools/build-managers/arpa2cm/default.nix index 9ed9da0d268b8..0af9e77acf576 100644 --- a/pkgs/development/tools/build-managers/arpa2cm/default.nix +++ b/pkgs/development/tools/build-managers/arpa2cm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "arpa2cm"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - meta = with stdenv.lib; { + meta = with lib; { description = "CMake Module library for the ARPA2 project"; license = licenses.bsd2; maintainers = with maintainers; [ leenaars ]; diff --git a/pkgs/development/tools/build-managers/bam/default.nix b/pkgs/development/tools/build-managers/bam/default.nix index 969cd98797468..8eb197151a329 100644 --- a/pkgs/development/tools/build-managers/bam/default.nix +++ b/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"; @@ -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/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix b/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix index 0c9f4d7c50a0d..ac03288f14850 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix +++ b/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/pkgs/development/tools/build-managers/bazel/buildtools/default.nix b/pkgs/development/tools/build-managers/bazel/buildtools/default.nix index 66560e768d23a..436b681e00549 100644 --- a/pkgs/development/tools/build-managers/bazel/buildtools/default.nix +++ b/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/pkgs/development/tools/build-managers/bear/default.nix b/pkgs/development/tools/build-managers/bear/default.nix index 756e68b567814..74b1f7040205c 100644 --- a/pkgs/development/tools/build-managers/bear/default.nix +++ b/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/pkgs/development/tools/build-managers/bloop/default.nix b/pkgs/development/tools/build-managers/bloop/default.nix index c1b3a7aa15601..12fd01e5e4ed6 100644 --- a/pkgs/development/tools/build-managers/bloop/default.nix +++ b/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/pkgs/development/tools/build-managers/bmake/default.nix b/pkgs/development/tools/build-managers/bmake/default.nix index 9bda4cde0449e..e1e9b348503cd 100644 --- a/pkgs/development/tools/build-managers/bmake/default.nix +++ b/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/pkgs/development/tools/build-managers/boot/default.nix b/pkgs/development/tools/build-managers/boot/default.nix index 09c1eada54b5a..68a4d5f44eaa4 100644 --- a/pkgs/development/tools/build-managers/boot/default.nix +++ b/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/pkgs/development/tools/build-managers/buck/default.nix b/pkgs/development/tools/build-managers/buck/default.nix index 41fc0940b9d09..0fbcb95704b05 100644 --- a/pkgs/development/tools/build-managers/buck/default.nix +++ b/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/pkgs/development/tools/build-managers/cmake/2.8.nix b/pkgs/development/tools/build-managers/cmake/2.8.nix index 804bdd76f6730..9dabd7b35560d 100644 --- a/pkgs/development/tools/build-managers/cmake/2.8.nix +++ b/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/pkgs/development/tools/build-managers/colormake/default.nix b/pkgs/development/tools/build-managers/colormake/default.nix index 7eed88069557a..251268a449d41 100644 --- a/pkgs/development/tools/build-managers/colormake/default.nix +++ b/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/pkgs/development/tools/build-managers/doit/default.nix b/pkgs/development/tools/build-managers/doit/default.nix index b906d64f0af95..d48f0d4d56b6d 100644 --- a/pkgs/development/tools/build-managers/doit/default.nix +++ b/pkgs/development/tools/build-managers/doit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python3Packages }: +{ lib, stdenv, fetchurl, python3Packages }: let @@ -16,15 +16,15 @@ in python3Packages.buildPythonApplication { buildInputs = with python3Packages; [ mock pytest ]; propagatedBuildInputs = with python3Packages; [ cloudpickle ] - ++ stdenv.lib.optional stdenv.isLinux pyinotify - ++ stdenv.lib.optional stdenv.isDarwin macfsevents; + ++ lib.optional stdenv.isLinux pyinotify + ++ lib.optional stdenv.isDarwin macfsevents; # Tests fail due to mysterious gdbm.open() resource temporarily # unavailable errors. doCheck = false; checkPhase = "py.test"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://pydoit.org/"; description = "A task management & automation tool"; license = licenses.mit; diff --git a/pkgs/development/tools/build-managers/dub/default.nix b/pkgs/development/tools/build-managers/dub/default.nix index 2668eca45691f..2df829a02295a 100644 --- a/pkgs/development/tools/build-managers/dub/default.nix +++ b/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/pkgs/development/tools/build-managers/fac/default.nix b/pkgs/development/tools/build-managers/fac/default.nix index 8c41eb3ac51ac..25450ceb6d9b0 100644 --- a/pkgs/development/tools/build-managers/fac/default.nix +++ b/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/pkgs/development/tools/build-managers/gnumake/4.2/default.nix b/pkgs/development/tools/build-managers/gnumake/4.2/default.nix index c2ce00eee2177..387650e85ab7e 100644 --- a/pkgs/development/tools/build-managers/gnumake/4.2/default.nix +++ b/pkgs/development/tools/build-managers/gnumake/4.2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, guileSupport ? false, pkg-config ? null , guile ? null }: +{ lib, stdenv, fetchurl, guileSupport ? false, pkg-config ? null , guile ? null }: assert guileSupport -> ( pkg-config != null && guile != null ); @@ -25,10 +25,10 @@ stdenv.mkDerivation { ./glibc-2.27-glob.patch ]; - nativeBuildInputs = stdenv.lib.optionals guileSupport [ pkg-config ]; - buildInputs = stdenv.lib.optionals guileSupport [ guile ]; + nativeBuildInputs = lib.optionals guileSupport [ pkg-config ]; + buildInputs = lib.optionals guileSupport [ guile ]; - configureFlags = stdenv.lib.optional guileSupport "--with-guile" + configureFlags = lib.optional guileSupport "--with-guile" # Make uses this test to decide whether it should keep track of # subseconds. Apple made this possible with APFS and macOS 10.13. @@ -37,11 +37,11 @@ stdenv.mkDerivation { # a second. So, tell Make to ignore nanoseconds in mtime here by # overriding the autoconf test for the struct. # See https://github.com/NixOS/nixpkgs/issues/51221 for discussion. - ++ stdenv.lib.optional stdenv.isDarwin "ac_cv_struct_st_mtim_nsec=no"; + ++ lib.optional stdenv.isDarwin "ac_cv_struct_st_mtim_nsec=no"; outputs = [ "out" "man" "info" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.gnu.org/software/make/"; description = "A tool to control the generation of non-source files from sources"; license = licenses.gpl3Plus; diff --git a/pkgs/development/tools/build-managers/gnumake/default.nix b/pkgs/development/tools/build-managers/gnumake/default.nix index 213d43c735ca0..fb9dab54049a1 100644 --- a/pkgs/development/tools/build-managers/gnumake/default.nix +++ b/pkgs/development/tools/build-managers/gnumake/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, guileSupport ? false, pkg-config ? null , guile ? null }: +{ lib, stdenv, fetchurl, guileSupport ? false, pkg-config ? null , guile ? null }: assert guileSupport -> ( pkg-config != null && guile != null ); @@ -21,10 +21,10 @@ stdenv.mkDerivation { ./impure-dirs.patch ]; - nativeBuildInputs = stdenv.lib.optionals guileSupport [ pkg-config ]; - buildInputs = stdenv.lib.optionals guileSupport [ guile ]; + nativeBuildInputs = lib.optionals guileSupport [ pkg-config ]; + buildInputs = lib.optionals guileSupport [ guile ]; - configureFlags = stdenv.lib.optional guileSupport "--with-guile" + configureFlags = lib.optional guileSupport "--with-guile" # Make uses this test to decide whether it should keep track of # subseconds. Apple made this possible with APFS and macOS 10.13. @@ -33,11 +33,11 @@ stdenv.mkDerivation { # a second. So, tell Make to ignore nanoseconds in mtime here by # overriding the autoconf test for the struct. # See https://github.com/NixOS/nixpkgs/issues/51221 for discussion. - ++ stdenv.lib.optional stdenv.isDarwin "ac_cv_struct_st_mtim_nsec=no"; + ++ lib.optional stdenv.isDarwin "ac_cv_struct_st_mtim_nsec=no"; outputs = [ "out" "man" "info" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.gnu.org/software/make/"; description = "A tool to control the generation of non-source files from sources"; license = licenses.gpl3Plus; diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index d06282739afe6..638be6b02d834 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/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/pkgs/development/tools/build-managers/gup/default.nix b/pkgs/development/tools/build-managers/gup/default.nix index 30c4d4ec4de04..dcc0c3aef90c3 100644 --- a/pkgs/development/tools/build-managers/gup/default.nix +++ b/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/pkgs/development/tools/build-managers/icmake/default.nix b/pkgs/development/tools/build-managers/icmake/default.nix index 89e2b8d0cc6e6..6320646974ad0 100644 --- a/pkgs/development/tools/build-managers/icmake/default.nix +++ b/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/pkgs/development/tools/build-managers/jam/default.nix b/pkgs/development/tools/build-managers/jam/default.nix index 7d7502fad4b73..6f5ecde8f88c9 100644 --- a/pkgs/development/tools/build-managers/jam/default.nix +++ b/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/pkgs/development/tools/build-managers/kati/default.nix b/pkgs/development/tools/build-managers/kati/default.nix index a7fced4482bed..ed5923e74d0af 100644 --- a/pkgs/development/tools/build-managers/kati/default.nix +++ b/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/pkgs/development/tools/build-managers/leiningen/default.nix b/pkgs/development/tools/build-managers/leiningen/default.nix index f1445970f6a76..488697033d91b 100644 --- a/pkgs/development/tools/build-managers/leiningen/default.nix +++ b/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/pkgs/development/tools/build-managers/mill/default.nix b/pkgs/development/tools/build-managers/mill/default.nix index a3865e2c52c9d..5942e20ec920a 100644 --- a/pkgs/development/tools/build-managers/mill/default.nix +++ b/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/pkgs/development/tools/build-managers/mk/default.nix b/pkgs/development/tools/build-managers/mk/default.nix index 09028789daa6f..1eaa51a5de0b1 100644 --- a/pkgs/development/tools/build-managers/mk/default.nix +++ b/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/pkgs/development/tools/build-managers/msbuild/default.nix b/pkgs/development/tools/build-managers/msbuild/default.nix index 1b805df95a086..ce08986b3e172 100644 --- a/pkgs/development/tools/build-managers/msbuild/default.nix +++ b/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/pkgs/development/tools/build-managers/ninja/default.nix b/pkgs/development/tools/build-managers/ninja/default.nix index 8fc81a1a979d8..ddc61ca86d9c8 100644 --- a/pkgs/development/tools/build-managers/ninja/default.nix +++ b/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/pkgs/development/tools/build-managers/pants/default.nix b/pkgs/development/tools/build-managers/pants/default.nix index 9757d8cda8d13..03eac2db5e38e 100644 --- a/pkgs/development/tools/build-managers/pants/default.nix +++ b/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/pkgs/development/tools/build-managers/qbs/default.nix b/pkgs/development/tools/build-managers/qbs/default.nix index 359c942d189a5..3bf7623ed04c5 100644 --- a/pkgs/development/tools/build-managers/qbs/default.nix +++ b/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/pkgs/development/tools/build-managers/rebar/default.nix b/pkgs/development/tools/build-managers/rebar/default.nix index 1c5996c6b1cf2..d3926beb3216b 100644 --- a/pkgs/development/tools/build-managers/rebar/default.nix +++ b/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/pkgs/development/tools/build-managers/rebar3/default.nix b/pkgs/development/tools/build-managers/rebar3/default.nix index bf28868d0e704..aa3af12c934b4 100644 --- a/pkgs/development/tools/build-managers/rebar3/default.nix +++ b/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/pkgs/development/tools/build-managers/redo-apenwarr/default.nix b/pkgs/development/tools/build-managers/redo-apenwarr/default.nix index c62fb0f2515d1..638f10f018737 100644 --- a/pkgs/development/tools/build-managers/redo-apenwarr/default.nix +++ b/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/pkgs/development/tools/build-managers/redo-c/default.nix b/pkgs/development/tools/build-managers/redo-c/default.nix index 1480f32a50f3b..40708b7877a90 100644 --- a/pkgs/development/tools/build-managers/redo-c/default.nix +++ b/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/pkgs/development/tools/build-managers/redo-sh/default.nix b/pkgs/development/tools/build-managers/redo-sh/default.nix index 71e5a54320a7f..d22f4bc487f88 100644 --- a/pkgs/development/tools/build-managers/redo-sh/default.nix +++ b/pkgs/development/tools/build-managers/redo-sh/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, coreutils }: +{ lib, stdenv, fetchurl, makeWrapper, coreutils }: stdenv.mkDerivation { version = "4.0.4"; @@ -21,7 +21,7 @@ stdenv.mkDerivation { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Redo implementation in Bourne Shell"; homepage = "http://news.dieweltistgarnichtso.net/bin/redo-sh.html"; license = licenses.agpl3; diff --git a/pkgs/development/tools/build-managers/redo/default.nix b/pkgs/development/tools/build-managers/redo/default.nix index a735a05dc5b80..48fbffc394063 100644 --- a/pkgs/development/tools/build-managers/redo/default.nix +++ b/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/pkgs/development/tools/build-managers/remake/default.nix b/pkgs/development/tools/build-managers/remake/default.nix index 7d44bc74df8a7..f61a7e7745830 100644 --- a/pkgs/development/tools/build-managers/remake/default.nix +++ b/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/pkgs/development/tools/build-managers/rocm-cmake/default.nix b/pkgs/development/tools/build-managers/rocm-cmake/default.nix index 1dd931981dad4..5b9a456ce75fe 100644 --- a/pkgs/development/tools/build-managers/rocm-cmake/default.nix +++ b/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/pkgs/development/tools/build-managers/samurai/default.nix b/pkgs/development/tools/build-managers/samurai/default.nix index f8b649e040932..4360a3f3a3083 100644 --- a/pkgs/development/tools/build-managers/samurai/default.nix +++ b/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/pkgs/development/tools/build-managers/sbt-extras/default.nix b/pkgs/development/tools/build-managers/sbt-extras/default.nix index 24c2bdd2af319..f80d278c86dfc 100644 --- a/pkgs/development/tools/build-managers/sbt-extras/default.nix +++ b/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/pkgs/development/tools/build-managers/sbt/default.nix b/pkgs/development/tools/build-managers/sbt/default.nix index a9314cef0cc38..6bd0b83cec1d6 100644 --- a/pkgs/development/tools/build-managers/sbt/default.nix +++ b/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/pkgs/development/tools/build-managers/scons/common.nix b/pkgs/development/tools/build-managers/scons/common.nix index 7a15c193423c5..1de2ecbbc8b85 100644 --- a/pkgs/development/tools/build-managers/scons/common.nix +++ b/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/pkgs/development/tools/build-managers/shards/default.nix b/pkgs/development/tools/build-managers/shards/default.nix index cf422fc2e0755..868ea265f6f4a 100644 --- a/pkgs/development/tools/build-managers/shards/default.nix +++ b/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/pkgs/development/tools/build-managers/tup/default.nix b/pkgs/development/tools/build-managers/tup/default.nix index ebdad7be8fa53..f0e6efdca3e9c 100644 --- a/pkgs/development/tools/build-managers/tup/default.nix +++ b/pkgs/development/tools/build-managers/tup/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fuse3, pkg-config, pcre }: +{ lib, stdenv, fetchFromGitHub, fuse3, pkg-config, pcre }: stdenv.mkDerivation rec { pname = "tup"; @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { setupHook = ./setup-hook.sh; - meta = with stdenv.lib; { + meta = with lib; { description = "A fast, file-based build system"; longDescription = '' Tup is a file-based build system for Linux, OSX, and Windows. It inputs a list diff --git a/pkgs/development/tools/build-managers/waf/default.nix b/pkgs/development/tools/build-managers/waf/default.nix index 49aae7c30140f..ae62ce539bab7 100644 --- a/pkgs/development/tools/build-managers/waf/default.nix +++ b/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/pkgs/development/tools/buildkit/default.nix b/pkgs/development/tools/buildkit/default.nix index 30a013dac11c6..558940587949d 100644 --- a/pkgs/development/tools/buildkit/default.nix +++ b/pkgs/development/tools/buildkit/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchFromGitHub, buildGoPackage }: +{ lib, stdenv, fetchFromGitHub, buildGoPackage }: buildGoPackage rec { pname = "buildkit"; 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"; @@ -16,7 +16,7 @@ buildGoPackage rec { 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/pkgs/development/tools/cargo-web/default.nix b/pkgs/development/tools/cargo-web/default.nix index cf2e565fe4582..c85ef52564a4d 100644 --- a/pkgs/development/tools/cargo-web/default.nix +++ b/pkgs/development/tools/cargo-web/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, openssl, perl, pkg-config, rustPlatform +{ lib, stdenv, fetchFromGitHub, openssl, perl, pkg-config, rustPlatform , CoreServices, Security }: @@ -16,9 +16,9 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "0i9xp7vd1rp6xgkbbrspm3qq4hxwfwa00di3k73z1x64d3d8r5fm"; nativeBuildInputs = [ openssl perl pkg-config ]; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices Security ]; + 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/pkgs/development/tools/cask/default.nix b/pkgs/development/tools/cask/default.nix index ab7a7c0fdff8a..886d435b81147 100644 --- a/pkgs/development/tools/cask/default.nix +++ b/pkgs/development/tools/cask/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python, emacs }: +{ lib, stdenv, fetchurl, python, emacs }: stdenv.mkDerivation rec { pname = "cask"; @@ -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/pkgs/development/tools/castxml/default.nix b/pkgs/development/tools/castxml/default.nix index 90be513bd50fb..ff47bd0e9f36e 100644 --- a/pkgs/development/tools/castxml/default.nix +++ b/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/pkgs/development/tools/cdecl/default.nix b/pkgs/development/tools/cdecl/default.nix index 7981681a64143..7e0a07ad834db 100644 --- a/pkgs/development/tools/cdecl/default.nix +++ b/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/pkgs/development/tools/chit/default.nix b/pkgs/development/tools/chit/default.nix index f7c806c89a384..ac8f15a415888 100644 --- a/pkgs/development/tools/chit/default.nix +++ b/pkgs/development/tools/chit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl +{ lib, stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl , darwin }: @@ -17,13 +17,13 @@ buildRustPackage rec { cargoSha256 = "1w25k3bqmmcrhpkw510vbwph0rfmrzi2wby0z2rz1q4k1f9k486m"; - nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ pkg-config ]; + 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/pkgs/development/tools/clang-tools/default.nix b/pkgs/development/tools/clang-tools/default.nix index 2e8f48901aba9..498310d4324fd 100644 --- a/pkgs/development/tools/clang-tools/default.nix +++ b/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/pkgs/development/tools/clog-cli/default.nix b/pkgs/development/tools/clog-cli/default.nix index 6d843ead24e02..182a7f98c4c2b 100644 --- a/pkgs/development/tools/clog-cli/default.nix +++ b/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/pkgs/development/tools/cloudfoundry-cli/default.nix b/pkgs/development/tools/cloudfoundry-cli/default.nix index 642c42108aa56..4d7e226463fda 100644 --- a/pkgs/development/tools/cloudfoundry-cli/default.nix +++ b/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/pkgs/development/tools/clpm/default.nix b/pkgs/development/tools/clpm/default.nix index e051dfef19b3b..03174d6c4fcbb 100644 --- a/pkgs/development/tools/clpm/default.nix +++ b/pkgs/development/tools/clpm/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchgit , wrapLisp , sbcl @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { # fixupPhase results in fatal error in SBCL, `Can't find sbcl.core` dontFixup = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Common Lisp Package Manager"; homepage = "https://www.clpm.dev/"; license = licenses.bsd2; diff --git a/pkgs/development/tools/cmake-language-server/default.nix b/pkgs/development/tools/cmake-language-server/default.nix index c5398f695d225..2c85890e70bfc 100644 --- a/pkgs/development/tools/cmake-language-server/default.nix +++ b/pkgs/development/tools/cmake-language-server/default.nix @@ -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"; }); diff --git a/pkgs/development/tools/compile-daemon/default.nix b/pkgs/development/tools/compile-daemon/default.nix index 24aca0dada7bd..ef08b2d581343 100644 --- a/pkgs/development/tools/compile-daemon/default.nix +++ b/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/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix b/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix index 82ac155657428..bd8608a91197e 100644 --- a/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix +++ b/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/pkgs/development/tools/continuous-integration/buildkite-agent/generic.nix b/pkgs/development/tools/continuous-integration/buildkite-agent/generic.nix index 3917820145612..232efe32a1a8d 100644 --- a/pkgs/development/tools/continuous-integration/buildkite-agent/generic.nix +++ b/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/pkgs/development/tools/continuous-integration/drone-cli/default.nix b/pkgs/development/tools/continuous-integration/drone-cli/default.nix index 2a8e10008c2b7..b1ee5349a5c1e 100644 --- a/pkgs/development/tools/continuous-integration/drone-cli/default.nix +++ b/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/pkgs/development/tools/continuous-integration/drone/default.nix b/pkgs/development/tools/continuous-integration/drone/default.nix index 7a7f0d023d807..ffdf588895aa4 100644 --- a/pkgs/development/tools/continuous-integration/drone/default.nix +++ b/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/pkgs/development/tools/continuous-integration/gocd-agent/default.nix b/pkgs/development/tools/continuous-integration/gocd-agent/default.nix index 7cefd896f4816..6e58b74654da7 100644 --- a/pkgs/development/tools/continuous-integration/gocd-agent/default.nix +++ b/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/pkgs/development/tools/continuous-integration/gocd-server/default.nix b/pkgs/development/tools/continuous-integration/gocd-server/default.nix index d23bc9d8d8e9e..90eb61dbff8d7 100644 --- a/pkgs/development/tools/continuous-integration/gocd-server/default.nix +++ b/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/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix index f54ef1acbb025..adfc6a2580a3d 100644 --- a/pkgs/development/tools/continuous-integration/jenkins/default.nix +++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix @@ -1,4 +1,4 @@ -{ 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 { @@ -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/pkgs/development/tools/continuous-integration/laminar/default.nix b/pkgs/development/tools/continuous-integration/laminar/default.nix index 5a326e94a544a..f64cbd5e85fda 100644 --- a/pkgs/development/tools/continuous-integration/laminar/default.nix +++ b/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/pkgs/development/tools/corgi/default.nix b/pkgs/development/tools/corgi/default.nix index a1549de184363..a7698ef4fb8e5 100644 --- a/pkgs/development/tools/corgi/default.nix +++ b/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/pkgs/development/tools/coursier/default.nix b/pkgs/development/tools/coursier/default.nix index 54836216c54d4..e016f0ef7c923 100644 --- a/pkgs/development/tools/coursier/default.nix +++ b/pkgs/development/tools/coursier/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, jre, writeScript, common-updater-scripts +{ lib, stdenv, fetchurl, makeWrapper, jre, writeScript, common-updater-scripts , coreutils, git, gnused, nix, nixfmt }: let @@ -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/pkgs/development/tools/cppclean/default.nix b/pkgs/development/tools/cppclean/default.nix index 283d9845dfaaf..4e00eb903ebe7 100644 --- a/pkgs/development/tools/cppclean/default.nix +++ b/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/pkgs/development/tools/cue/default.nix b/pkgs/development/tools/cue/default.nix index cdd0f2ae10532..243be958b07d0 100644 --- a/pkgs/development/tools/cue/default.nix +++ b/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/pkgs/development/tools/database/dbmate/default.nix b/pkgs/development/tools/database/dbmate/default.nix index fe7721f5ed4c3..9c01c1e9d2d12 100644 --- a/pkgs/development/tools/database/dbmate/default.nix +++ b/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/pkgs/development/tools/database/ephemeralpg/default.nix b/pkgs/development/tools/database/ephemeralpg/default.nix index b2599cce43074..ae10c402945fe 100644 --- a/pkgs/development/tools/database/ephemeralpg/default.nix +++ b/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/pkgs/development/tools/database/pg_checksums/default.nix b/pkgs/development/tools/database/pg_checksums/default.nix index f440e550a897c..65e7c06b14029 100644 --- a/pkgs/development/tools/database/pg_checksums/default.nix +++ b/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/pkgs/development/tools/database/pgcli/default.nix b/pkgs/development/tools/database/pgcli/default.nix index b4c26d6fb5c25..cc7524e3a4372 100644 --- a/pkgs/development/tools/database/pgcli/default.nix +++ b/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/pkgs/development/tools/database/pyrseas/default.nix b/pkgs/development/tools/database/pyrseas/default.nix index c86a0f6df8bd1..119aa2eb8f81d 100644 --- a/pkgs/development/tools/database/pyrseas/default.nix +++ b/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/pkgs/development/tools/database/shmig/default.nix b/pkgs/development/tools/database/shmig/default.nix index ca07a05694075..447dbc23fdf11 100644 --- a/pkgs/development/tools/database/shmig/default.nix +++ b/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/pkgs/development/tools/database/sqlcheck/default.nix b/pkgs/development/tools/database/sqlcheck/default.nix index 33b2abce277b9..2afd004f4d733 100644 --- a/pkgs/development/tools/database/sqlcheck/default.nix +++ b/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/pkgs/development/tools/database/sqldeveloper/default.nix b/pkgs/development/tools/database/sqldeveloper/default.nix index 49cc7b42b3da6..6017d704fc17f 100644 --- a/pkgs/development/tools/database/sqldeveloper/default.nix +++ b/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/pkgs/development/tools/database/squirrel-sql/default.nix b/pkgs/development/tools/database/squirrel-sql/default.nix index c773db7509fa3..5aca6d55bc81b 100644 --- a/pkgs/development/tools/database/squirrel-sql/default.nix +++ b/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 ? [] }: @@ -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/pkgs/development/tools/database/timescaledb-parallel-copy/default.nix b/pkgs/development/tools/database/timescaledb-parallel-copy/default.nix index a0e05bf4ae574..2b8a6f7cca02c 100644 --- a/pkgs/development/tools/database/timescaledb-parallel-copy/default.nix +++ b/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/pkgs/development/tools/database/timescaledb-tune/default.nix b/pkgs/development/tools/database/timescaledb-tune/default.nix index 787c7c3131b2c..cec374ccb3a92 100644 --- a/pkgs/development/tools/database/timescaledb-tune/default.nix +++ b/pkgs/development/tools/database/timescaledb-tune/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ lib, stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "timescaledb-tune"; @@ -13,7 +13,7 @@ buildGoModule rec { 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/pkgs/development/tools/database/webdis/default.nix b/pkgs/development/tools/database/webdis/default.nix index ec22252cbe020..5de8296299fba 100644 --- a/pkgs/development/tools/database/webdis/default.nix +++ b/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/pkgs/development/tools/dcadec/default.nix b/pkgs/development/tools/dcadec/default.nix index 55f888056cf72..9f5f4f0a3b520 100644 --- a/pkgs/development/tools/dcadec/default.nix +++ b/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/pkgs/development/tools/deis/default.nix b/pkgs/development/tools/deis/default.nix index 4a07a05a6368b..c8e20d42063f8 100644 --- a/pkgs/development/tools/deis/default.nix +++ b/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/pkgs/development/tools/deisctl/default.nix b/pkgs/development/tools/deisctl/default.nix index a245a06afe161..0f5df40d92c70 100644 --- a/pkgs/development/tools/deisctl/default.nix +++ b/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/pkgs/development/tools/delve/default.nix b/pkgs/development/tools/delve/default.nix index e81a1273af87f..62fb32c851631 100644 --- a/pkgs/development/tools/delve/default.nix +++ b/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/pkgs/development/tools/dep/default.nix b/pkgs/development/tools/dep/default.nix index 8b7c54832e28f..ff7f370b0d44c 100644 --- a/pkgs/development/tools/dep/default.nix +++ b/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/pkgs/development/tools/devd/default.nix b/pkgs/development/tools/devd/default.nix index 2d5a38458d3a6..32f29f7e128cd 100644 --- a/pkgs/development/tools/devd/default.nix +++ b/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/pkgs/development/tools/devpi-client/default.nix b/pkgs/development/tools/devpi-client/default.nix index f881f5c610dbb..766f3f2b7292c 100644 --- a/pkgs/development/tools/devpi-client/default.nix +++ b/pkgs/development/tools/devpi-client/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonApplication , fetchPypi # buildInputs @@ -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/pkgs/development/tools/devpi-server/default.nix b/pkgs/development/tools/devpi-server/default.nix index 7ddff92402cbb..3d8cb16bb4785 100644 --- a/pkgs/development/tools/devpi-server/default.nix +++ b/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/pkgs/development/tools/devtodo/default.nix b/pkgs/development/tools/devtodo/default.nix index f4a974da34762..34fdd2c794e56 100644 --- a/pkgs/development/tools/devtodo/default.nix +++ b/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/pkgs/development/tools/diesel-cli/default.nix b/pkgs/development/tools/diesel-cli/default.nix index a1ae7cfc86ebe..bd8e71090c536 100644 --- a/pkgs/development/tools/diesel-cli/default.nix +++ b/pkgs/development/tools/diesel-cli/default.nix @@ -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"} \ diff --git a/pkgs/development/tools/dive/default.nix b/pkgs/development/tools/dive/default.nix index 3cb050df03636..07ca12cc9cc98 100644 --- a/pkgs/development/tools/dive/default.nix +++ b/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/pkgs/development/tools/documentation/antora/default.nix b/pkgs/development/tools/documentation/antora/default.nix index 781fee2bb266f..d553df59446a2 100644 --- a/pkgs/development/tools/documentation/antora/default.nix +++ b/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/pkgs/development/tools/documentation/doxygen/default.nix b/pkgs/development/tools/documentation/doxygen/default.nix index 613dec86d7cdf..a4a70dabd69dc 100644 --- a/pkgs/development/tools/documentation/doxygen/default.nix +++ b/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/pkgs/development/tools/documentation/gnome-doc-utils/default.nix b/pkgs/development/tools/documentation/gnome-doc-utils/default.nix index a5bbfbc908856..2e04d3dd365e9 100644 --- a/pkgs/development/tools/documentation/gnome-doc-utils/default.nix +++ b/pkgs/development/tools/documentation/gnome-doc-utils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkg-config, libxml2Python, libxslt, intltool, gnome3 +{ lib, stdenv, fetchurl, pkg-config, libxml2Python, libxslt, intltool, gnome3 , python2Packages }: python2Packages.buildPythonApplication rec { @@ -8,7 +8,7 @@ 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"; }; @@ -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/pkgs/development/tools/documentation/gtk-doc/default.nix b/pkgs/development/tools/documentation/gtk-doc/default.nix index 10b48d5119189..b1ea6a0634b5a 100644 --- a/pkgs/development/tools/documentation/gtk-doc/default.nix +++ b/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/pkgs/development/tools/documentation/mdsh/default.nix b/pkgs/development/tools/documentation/mdsh/default.nix index 5ab74a4b95ffe..d2e555a4550d0 100644 --- a/pkgs/development/tools/documentation/mdsh/default.nix +++ b/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/pkgs/development/tools/documentation/mkdocs/default.nix b/pkgs/development/tools/documentation/mkdocs/default.nix index f3b6639420710..bee22856eb10e 100644 --- a/pkgs/development/tools/documentation/mkdocs/default.nix +++ b/pkgs/development/tools/documentation/mkdocs/default.nix @@ -35,7 +35,7 @@ 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 diff --git a/pkgs/development/tools/dot-http/default.nix b/pkgs/development/tools/dot-http/default.nix index 9ff3001882cee..b156847870d89 100644 --- a/pkgs/development/tools/dot-http/default.nix +++ b/pkgs/development/tools/dot-http/default.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ + buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ libiconv Security ]; diff --git a/pkgs/development/tools/drip/default.nix b/pkgs/development/tools/drip/default.nix index b4edf8ec081b5..2724e41e8e616 100644 --- a/pkgs/development/tools/drip/default.nix +++ b/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/pkgs/development/tools/drm_info/default.nix b/pkgs/development/tools/drm_info/default.nix index c64ab8534daa7..86d55ab078040 100644 --- a/pkgs/development/tools/drm_info/default.nix +++ b/pkgs/development/tools/drm_info/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , libdrm, json_c, pciutils , meson, ninja, pkg-config }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { 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/pkgs/development/tools/dtools/default.nix b/pkgs/development/tools/dtools/default.nix index fabd2b2f77520..1c1604db654ab 100644 --- a/pkgs/development/tools/dtools/default.nix +++ b/pkgs/development/tools/dtools/default.nix @@ -51,11 +51,11 @@ stdenv.mkDerivation rec { $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/pkgs/development/tools/easyjson/default.nix b/pkgs/development/tools/easyjson/default.nix index ef99bbd01c31e..a458f0dbfcebb 100644 --- a/pkgs/development/tools/easyjson/default.nix +++ b/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/pkgs/development/tools/eclipse-mat/default.nix b/pkgs/development/tools/eclipse-mat/default.nix index 025b7413cebca..633e13d25f772 100644 --- a/pkgs/development/tools/eclipse-mat/default.nix +++ b/pkgs/development/tools/eclipse-mat/default.nix @@ -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/ 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" diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index 966f307e0dada..282705094f219 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , libXScrnSaver , makeWrapper , fetchurl diff --git a/pkgs/development/tools/electron/generic.nix b/pkgs/development/tools/electron/generic.nix index 6d0dbc8cace21..e29064e673ad7 100644 --- a/pkgs/development/tools/electron/generic.nix +++ b/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/pkgs/development/tools/erlang/cuter/default.nix b/pkgs/development/tools/erlang/cuter/default.nix index f9d63cc86d8de..44ed61ac1d5fe 100644 --- a/pkgs/development/tools/erlang/cuter/default.nix +++ b/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/pkgs/development/tools/fac/default.nix b/pkgs/development/tools/fac/default.nix index 6a23f84f2366c..ef3298c54780c 100644 --- a/pkgs/development/tools/fac/default.nix +++ b/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/pkgs/development/tools/fedpkg/default.nix b/pkgs/development/tools/fedpkg/default.nix index 4fbecc2d58d0e..285e71707fd51 100644 --- a/pkgs/development/tools/fedpkg/default.nix +++ b/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/pkgs/development/tools/flamegraph/default.nix b/pkgs/development/tools/flamegraph/default.nix index 23ada99eac0fa..3a64d741de5c4 100644 --- a/pkgs/development/tools/flamegraph/default.nix +++ b/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/pkgs/development/tools/flatpak-builder/default.nix b/pkgs/development/tools/flatpak-builder/default.nix index beafe0654db8f..dd9282c689612 100644 --- a/pkgs/development/tools/flatpak-builder/default.nix +++ b/pkgs/development/tools/flatpak-builder/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , substituteAll , nixosTests @@ -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/pkgs/development/tools/flootty/default.nix b/pkgs/development/tools/flootty/default.nix index 2b8f174f763a6..4867b9c2cb992 100644 --- a/pkgs/development/tools/flootty/default.nix +++ b/pkgs/development/tools/flootty/default.nix @@ -1,4 +1,4 @@ -{ stdenv, python3Packages }: +{ lib, stdenv, python3Packages }: python3Packages.buildPythonApplication rec { pname = "Flootty"; @@ -9,7 +9,7 @@ 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; diff --git a/pkgs/development/tools/flyway/default.nix b/pkgs/development/tools/flyway/default.nix index af58da1751009..bcad4ffb4e947 100644 --- a/pkgs/development/tools/flyway/default.nix +++ b/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/pkgs/development/tools/fmbt/default.nix b/pkgs/development/tools/fmbt/default.nix index 46a132389612a..e6bb20327415c 100644 --- a/pkgs/development/tools/fmbt/default.nix +++ b/pkgs/development/tools/fmbt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python, autoreconfHook, pkg-config, makeWrapper +{ lib, stdenv, fetchFromGitHub, python, autoreconfHook, pkg-config, makeWrapper , flex , gettext, libedit, glib, imagemagick, libxml2, boost, gnuplot, graphviz , tesseract, gts, libXtst @@ -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/pkgs/development/tools/fusee-launcher/default.nix b/pkgs/development/tools/fusee-launcher/default.nix index 077dc8b87f997..08cf6caae3ef8 100644 --- a/pkgs/development/tools/fusee-launcher/default.nix +++ b/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/pkgs/development/tools/galen/default.nix b/pkgs/development/tools/galen/default.nix index 89d6b700018db..00831c05691a6 100644 --- a/pkgs/development/tools/galen/default.nix +++ b/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/pkgs/development/tools/gamecube-tools/default.nix b/pkgs/development/tools/gamecube-tools/default.nix index 7c31f691b4e88..2f7c088cd486e 100644 --- a/pkgs/development/tools/gamecube-tools/default.nix +++ b/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/pkgs/development/tools/gauge/default.nix b/pkgs/development/tools/gauge/default.nix index dd48998c7410d..a0eb7370bee0f 100644 --- a/pkgs/development/tools/gauge/default.nix +++ b/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/pkgs/development/tools/gdm/default.nix b/pkgs/development/tools/gdm/default.nix index 2f26a1c35f85a..7c7f73af1e0fd 100644 --- a/pkgs/development/tools/gdm/default.nix +++ b/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/pkgs/development/tools/git-ftp/default.nix b/pkgs/development/tools/git-ftp/default.nix index 0c107ecc5031f..25295ad0062df 100644 --- a/pkgs/development/tools/git-ftp/default.nix +++ b/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/pkgs/development/tools/git-quick-stats/default.nix b/pkgs/development/tools/git-quick-stats/default.nix index 2b775de4e43d9..ed9205ee25167 100644 --- a/pkgs/development/tools/git-quick-stats/default.nix +++ b/pkgs/development/tools/git-quick-stats/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , makeWrapper , coreutils @@ -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/pkgs/development/tools/git-series/default.nix b/pkgs/development/tools/git-series/default.nix index 004125adead3a..4f13c3de40bb9 100644 --- a/pkgs/development/tools/git-series/default.nix +++ b/pkgs/development/tools/git-series/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, rustPlatform +{ lib, stdenv, fetchFromGitHub, fetchpatch, rustPlatform , openssl, cmake, perl, pkg-config, zlib, curl, libgit2, libssh2 }: @@ -43,7 +43,7 @@ buildRustPackage rec { 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/pkgs/development/tools/github/cligh/default.nix b/pkgs/development/tools/github/cligh/default.nix index 5eb65dc4fbdf1..dfe66c789ca48 100644 --- a/pkgs/development/tools/github/cligh/default.nix +++ b/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/pkgs/development/tools/github/github-release/default.nix b/pkgs/development/tools/github/github-release/default.nix index 8b68426d4b5e5..81b125ac05858 100644 --- a/pkgs/development/tools/github/github-release/default.nix +++ b/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/pkgs/development/tools/glade/default.nix b/pkgs/development/tools/glade/default.nix index 0e3cdf4bda1e4..d77772c32db6f 100644 --- a/pkgs/development/tools/glade/default.nix +++ b/pkgs/development/tools/glade/default.nix @@ -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"; }; diff --git a/pkgs/development/tools/glide/default.nix b/pkgs/development/tools/glide/default.nix index 4f511813ad0b4..f8abde7e00a7a 100644 --- a/pkgs/development/tools/glide/default.nix +++ b/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/pkgs/development/tools/gllvm/default.nix b/pkgs/development/tools/gllvm/default.nix index efa7ae21c3a5a..f2c552252fb2c 100644 --- a/pkgs/development/tools/gllvm/default.nix +++ b/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/pkgs/development/tools/glock/default.nix b/pkgs/development/tools/glock/default.nix index 0ffa521f38ffe..c00478c9fb6a4 100644 --- a/pkgs/development/tools/glock/default.nix +++ b/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/pkgs/development/tools/glslviewer/default.nix b/pkgs/development/tools/glslviewer/default.nix index 76c75af2d5f88..3f83e1fcb02fd 100644 --- a/pkgs/development/tools/glslviewer/default.nix +++ b/pkgs/development/tools/glslviewer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, glfw, pkg-config, libXrandr, libXdamage +{ lib, stdenv, fetchFromGitHub, glfw, pkg-config, libXrandr, libXdamage , libXext, libXrender, libXinerama, libXcursor, libXxf86vm, libXi , libX11, libGLU, python3Packages, ensureNewerSourcesForZipFilesHook , Cocoa @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { 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/pkgs/development/tools/gnome-desktop-testing/default.nix b/pkgs/development/tools/gnome-desktop-testing/default.nix index f63a46793a375..5f01881958fe9 100644 --- a/pkgs/development/tools/gnome-desktop-testing/default.nix +++ b/pkgs/development/tools/gnome-desktop-testing/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , glib , autoreconfHook , pkg-config @@ -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/pkgs/development/tools/gnulib/default.nix b/pkgs/development/tools/gnulib/default.nix index 81e4d87937523..2a2ce1b190ffd 100644 --- a/pkgs/development/tools/gnulib/default.nix +++ b/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/pkgs/development/tools/go-bindata-assetfs/default.nix b/pkgs/development/tools/go-bindata-assetfs/default.nix index 30344a52e0652..57d0e93a9b0c9 100644 --- a/pkgs/development/tools/go-bindata-assetfs/default.nix +++ b/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/pkgs/development/tools/go-bindata/default.nix b/pkgs/development/tools/go-bindata/default.nix index 9256fab43bf85..5d257bbf99827 100644 --- a/pkgs/development/tools/go-bindata/default.nix +++ b/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/pkgs/development/tools/go-langserver/default.nix b/pkgs/development/tools/go-langserver/default.nix index c6a0dcc0d9da5..fdefd6b0178bf 100644 --- a/pkgs/development/tools/go-langserver/default.nix +++ b/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/pkgs/development/tools/go-outline/default.nix b/pkgs/development/tools/go-outline/default.nix index f10ee426c0806..d30d5c30f3a1d 100644 --- a/pkgs/development/tools/go-outline/default.nix +++ b/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/pkgs/development/tools/go-protobuf/default.nix b/pkgs/development/tools/go-protobuf/default.nix index c5e9af3e7bbf6..0187552d84456 100644 --- a/pkgs/development/tools/go-protobuf/default.nix +++ b/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/pkgs/development/tools/go-repo-root/default.nix b/pkgs/development/tools/go-repo-root/default.nix index 3392a19b6360a..25fc87f8985dc 100644 --- a/pkgs/development/tools/go-repo-root/default.nix +++ b/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/pkgs/development/tools/go-symbols/default.nix b/pkgs/development/tools/go-symbols/default.nix index 1e2b63ba154f0..3f41007716e79 100644 --- a/pkgs/development/tools/go-symbols/default.nix +++ b/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/pkgs/development/tools/go2nix/default.nix b/pkgs/development/tools/go2nix/default.nix index 300f82ee5486d..618ddc7d45015 100644 --- a/pkgs/development/tools/go2nix/default.nix +++ b/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 { @@ -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/pkgs/development/tools/goa/default.nix b/pkgs/development/tools/goa/default.nix index 6a373099a01b0..63322b6d3639c 100644 --- a/pkgs/development/tools/goa/default.nix +++ b/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/pkgs/development/tools/gocode-gomod/default.nix b/pkgs/development/tools/gocode-gomod/default.nix index 01ee2931c998b..59f17e8acfd0d 100644 --- a/pkgs/development/tools/gocode-gomod/default.nix +++ b/pkgs/development/tools/gocode-gomod/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ lib, stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "gocode-gomod"; @@ -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/pkgs/development/tools/gocode/default.nix b/pkgs/development/tools/gocode/default.nix index f38d06b34c61b..a50c5969167a2 100644 --- a/pkgs/development/tools/gocode/default.nix +++ b/pkgs/development/tools/gocode/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "gocode-unstable"; @@ -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/pkgs/development/tools/goconvey/default.nix b/pkgs/development/tools/goconvey/default.nix index 173da3ff29dc3..dcec045e5ebc5 100644 --- a/pkgs/development/tools/goconvey/default.nix +++ b/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/pkgs/development/tools/godef/default.nix b/pkgs/development/tools/godef/default.nix index c8149ecc82dd5..6d4f40ba6bcab 100644 --- a/pkgs/development/tools/godef/default.nix +++ b/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/pkgs/development/tools/godot/default.nix b/pkgs/development/tools/godot/default.nix index 303040768c71d..217717d3e7d76 100644 --- a/pkgs/development/tools/godot/default.nix +++ b/pkgs/development/tools/godot/default.nix @@ -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/pkgs/development/tools/godot/headless.nix b/pkgs/development/tools/godot/headless.nix index 0ae28b774fbc2..20d3b48f2fd5f 100644 --- a/pkgs/development/tools/godot/headless.nix +++ b/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/pkgs/development/tools/godot/server.nix b/pkgs/development/tools/godot/server.nix index 48f21b796c36d..6ce347355e3be 100644 --- a/pkgs/development/tools/godot/server.nix +++ b/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/pkgs/development/tools/golint/default.nix b/pkgs/development/tools/golint/default.nix index 284bb32f89e81..1f75384f33873 100644 --- a/pkgs/development/tools/golint/default.nix +++ b/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/pkgs/development/tools/gomodifytags/default.nix b/pkgs/development/tools/gomodifytags/default.nix index 70bbc635cc1a8..650f1b89f30e2 100644 --- a/pkgs/development/tools/gomodifytags/default.nix +++ b/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/pkgs/development/tools/google-app-engine-go-sdk/default.nix b/pkgs/development/tools/google-app-engine-go-sdk/default.nix index 485b2c3625fbc..4d572e070e76d 100644 --- a/pkgs/development/tools/google-app-engine-go-sdk/default.nix +++ b/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/pkgs/development/tools/gopkgs/default.nix b/pkgs/development/tools/gopkgs/default.nix index 8d26ca7eb4487..e4a72cb27a173 100644 --- a/pkgs/development/tools/gopkgs/default.nix +++ b/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/pkgs/development/tools/gosec/default.nix b/pkgs/development/tools/gosec/default.nix index 44862bb3311dd..69d74496e6156 100644 --- a/pkgs/development/tools/gosec/default.nix +++ b/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/pkgs/development/tools/gotags/default.nix b/pkgs/development/tools/gotags/default.nix index 5499a22ec01b8..ea40bd0e6fe10 100644 --- a/pkgs/development/tools/gotags/default.nix +++ b/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/pkgs/development/tools/gotests/default.nix b/pkgs/development/tools/gotests/default.nix index 43f221bd32412..87a93abee8efb 100644 --- a/pkgs/development/tools/gotests/default.nix +++ b/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/pkgs/development/tools/gotools/default.nix b/pkgs/development/tools/gotools/default.nix index eabf41f866395..7ca3486a503a1 100644 --- a/pkgs/development/tools/gotools/default.nix +++ b/pkgs/development/tools/gotools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchgit }: +{ lib, stdenv, buildGoModule, fetchgit }: buildGoModule rec { pname = "gotools-unstable"; @@ -40,7 +40,7 @@ buildGoModule rec { ''; excludedPackages = "\\(" - + stdenv.lib.concatStringsSep "\\|" ([ "testdata" "vet" "cover" ]) + + lib.concatStringsSep "\\|" ([ "testdata" "vet" "cover" ]) + "\\)"; # Set GOTOOLDIR for derivations adding this to buildInputs diff --git a/pkgs/development/tools/govendor/default.nix b/pkgs/development/tools/govendor/default.nix index 804a9bf043ed0..edd9b577be4c1 100644 --- a/pkgs/development/tools/govendor/default.nix +++ b/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/pkgs/development/tools/govers/default.nix b/pkgs/development/tools/govers/default.nix index ebce368ea9f81..cac76daa6fc3e 100644 --- a/pkgs/development/tools/govers/default.nix +++ b/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/pkgs/development/tools/gox/default.nix b/pkgs/development/tools/gox/default.nix index 34e7d338318c7..3deb73acb4419 100644 --- a/pkgs/development/tools/gox/default.nix +++ b/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/pkgs/development/tools/gpp/default.nix b/pkgs/development/tools/gpp/default.nix index ee15df1a9f6f5..9e49b0c0284fd 100644 --- a/pkgs/development/tools/gpp/default.nix +++ b/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/pkgs/development/tools/gron/default.nix b/pkgs/development/tools/gron/default.nix index e0d2d3d1498ff..6d182b0b5f505 100644 --- a/pkgs/development/tools/gron/default.nix +++ b/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/pkgs/development/tools/guile/g-wrap/default.nix b/pkgs/development/tools/guile/g-wrap/default.nix index 33572c70b13ff..6bb80306e68ea 100644 --- a/pkgs/development/tools/guile/g-wrap/default.nix +++ b/pkgs/development/tools/guile/g-wrap/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, guile, guile-lib, libffi, pkg-config, glib }: +{ fetchurl, lib, stdenv, guile, guile-lib, libffi, pkg-config, glib }: stdenv.mkDerivation rec { pname = "g-wrap"; @@ -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/pkgs/development/tools/guile/guile-lint/default.nix b/pkgs/development/tools/guile/guile-lint/default.nix index b8efb30f5f17a..6de9e48ae6675 100644 --- a/pkgs/development/tools/guile/guile-lint/default.nix +++ b/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/pkgs/development/tools/haskell/dconf2nix/dconf2nix.nix b/pkgs/development/tools/haskell/dconf2nix/dconf2nix.nix index 4d7dca12f8fc4..02c4c96bd8e7f 100644 --- a/pkgs/development/tools/haskell/dconf2nix/dconf2nix.nix +++ b/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/pkgs/development/tools/haskell/haskell-language-server/default.nix b/pkgs/development/tools/haskell/haskell-language-server/default.nix index 44cd234da722d..512aec84eead2 100644 --- a/pkgs/development/tools/haskell/haskell-language-server/default.nix +++ b/pkgs/development/tools/haskell/haskell-language-server/default.nix @@ -7,7 +7,7 @@ , 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, transformers, unordered-containers, with-utf8 , yaml @@ -49,5 +49,5 @@ mkDerivation { 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/pkgs/development/tools/haskell/haskell-language-server/hls-class-plugin.nix b/pkgs/development/tools/haskell/haskell-language-server/hls-class-plugin.nix index 86c29c7be3901..c51689343903c 100644 --- a/pkgs/development/tools/haskell/haskell-language-server/hls-class-plugin.nix +++ b/pkgs/development/tools/haskell/haskell-language-server/hls-class-plugin.nix @@ -1,6 +1,6 @@ { mkDerivation, aeson, base, containers, fetchgit, ghc , ghc-exactprint, ghcide, haskell-lsp, hls-plugin-api, lens, shake -, stdenv, text, transformers, unordered-containers +, lib, stdenv, text, transformers, unordered-containers }: mkDerivation { pname = "hls-class-plugin"; @@ -17,5 +17,5 @@ mkDerivation { hls-plugin-api lens shake text transformers unordered-containers ]; description = "Explicit imports plugin for Haskell Language Server"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; } diff --git a/pkgs/development/tools/haskell/haskell-language-server/hls-eval-plugin.nix b/pkgs/development/tools/haskell/haskell-language-server/hls-eval-plugin.nix index 20ebc5f5e8989..b5774ddcbfd3d 100644 --- a/pkgs/development/tools/haskell/haskell-language-server/hls-eval-plugin.nix +++ b/pkgs/development/tools/haskell/haskell-language-server/hls-eval-plugin.nix @@ -2,7 +2,7 @@ , 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, stdenv, temporary, text, time, transformers +, shake, lib, stdenv, temporary, text, time, transformers , unordered-containers }: mkDerivation { @@ -23,5 +23,5 @@ mkDerivation { unordered-containers ]; description = "Eval plugin for Haskell Language Server"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; } diff --git a/pkgs/development/tools/haskell/haskell-language-server/hls-explicit-imports-plugin.nix b/pkgs/development/tools/haskell/haskell-language-server/hls-explicit-imports-plugin.nix index bad0e82194cdb..1c7d31004b6a6 100644 --- a/pkgs/development/tools/haskell/haskell-language-server/hls-explicit-imports-plugin.nix +++ b/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 { @@ -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/pkgs/development/tools/haskell/haskell-language-server/hls-hlint-plugin.nix b/pkgs/development/tools/haskell/haskell-language-server/hls-hlint-plugin.nix index ecbe141fd724a..4a90933d1e7f7 100644 --- a/pkgs/development/tools/haskell/haskell-language-server/hls-hlint-plugin.nix +++ b/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 { @@ -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/pkgs/development/tools/haskell/haskell-language-server/hls-retrie-plugin.nix b/pkgs/development/tools/haskell/haskell-language-server/hls-retrie-plugin.nix index 5a769e7a719bd..311a26633a5c0 100644 --- a/pkgs/development/tools/haskell/haskell-language-server/hls-retrie-plugin.nix +++ b/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 { @@ -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/pkgs/development/tools/haskell/haskell-language-server/hls-tactics-plugin.nix b/pkgs/development/tools/haskell/haskell-language-server/hls-tactics-plugin.nix index b5819b705b627..4f476431d9b79 100644 --- a/pkgs/development/tools/haskell/haskell-language-server/hls-tactics-plugin.nix +++ b/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 { @@ -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/pkgs/development/tools/haskell/hyper-haskell/default.nix b/pkgs/development/tools/haskell/hyper-haskell/default.nix index df889d43d4636..6b1399046166e 100644 --- a/pkgs/development/tools/haskell/hyper-haskell/default.nix +++ b/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/pkgs/development/tools/haskell/ihaskell/wrapper.nix b/pkgs/development/tools/haskell/ihaskell/wrapper.nix index 60f8c2ecb252c..875d5a8a4a8d5 100644 --- a/pkgs/development/tools/haskell/ihaskell/wrapper.nix +++ b/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/pkgs/development/tools/haskell/vaultenv/default.nix b/pkgs/development/tools/haskell/vaultenv/default.nix index 1d901cb723cf1..42cf33224201b 100644 --- a/pkgs/development/tools/haskell/vaultenv/default.nix +++ b/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/pkgs/development/tools/hcloud/default.nix b/pkgs/development/tools/hcloud/default.nix index edaaa9c3a68e2..5c4fe48f60fb4 100644 --- a/pkgs/development/tools/hcloud/default.nix +++ b/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/pkgs/development/tools/hexio/default.nix b/pkgs/development/tools/hexio/default.nix index 116e7c3a5ced0..5b3fca815e6a4 100644 --- a/pkgs/development/tools/hexio/default.nix +++ b/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/pkgs/development/tools/iaca/2.1.nix b/pkgs/development/tools/iaca/2.1.nix index f36e2e48fdfb8..0fc1dcfbae03d 100644 --- a/pkgs/development/tools/iaca/2.1.nix +++ b/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 { diff --git a/pkgs/development/tools/iaca/3.0.nix b/pkgs/development/tools/iaca/3.0.nix index f03f53544223c..731b643171724 100644 --- a/pkgs/development/tools/iaca/3.0.nix +++ b/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/pkgs/development/tools/icestorm/default.nix b/pkgs/development/tools/icestorm/default.nix index 5b07f982aacd5..2644821529b73 100644 --- a/pkgs/development/tools/icestorm/default.nix +++ b/pkgs/development/tools/icestorm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , pkg-config, libftdi1 , python3, pypy3 @@ -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/pkgs/development/tools/icr/default.nix b/pkgs/development/tools/icr/default.nix index 8e549b54f1ff6..13c4cbe37db8b 100644 --- a/pkgs/development/tools/icr/default.nix +++ b/pkgs/development/tools/icr/default.nix @@ -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/pkgs/development/tools/imatix_gsl/default.nix b/pkgs/development/tools/imatix_gsl/default.nix index edba0d686dbb2..ad729923d67a9 100644 --- a/pkgs/development/tools/imatix_gsl/default.nix +++ b/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/pkgs/development/tools/irony-server/default.nix b/pkgs/development/tools/irony-server/default.nix index cc56b27ca2df5..2f8afb176e6e8 100644 --- a/pkgs/development/tools/irony-server/default.nix +++ b/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/pkgs/development/tools/java/cfr/default.nix b/pkgs/development/tools/java/cfr/default.nix index ce1501fa4dd57..35ac0dbc6a513 100644 --- a/pkgs/development/tools/java/cfr/default.nix +++ b/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/pkgs/development/tools/java/dex2jar/default.nix b/pkgs/development/tools/java/dex2jar/default.nix index c1f7f13298543..b20a80355a02f 100644 --- a/pkgs/development/tools/java/dex2jar/default.nix +++ b/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/pkgs/development/tools/java/fastjar/default.nix b/pkgs/development/tools/java/fastjar/default.nix index 04fe7c2f46df5..52211e302dd94 100644 --- a/pkgs/development/tools/java/fastjar/default.nix +++ b/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/pkgs/development/tools/java/jhiccup/default.nix b/pkgs/development/tools/java/jhiccup/default.nix index 1b235e354855b..c2d1a33a49d9c 100644 --- a/pkgs/development/tools/java/jhiccup/default.nix +++ b/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/pkgs/development/tools/java/visualvm/default.nix b/pkgs/development/tools/java/visualvm/default.nix index 4c0ec3bc29d2d..52ccc3d915090 100644 --- a/pkgs/development/tools/java/visualvm/default.nix +++ b/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/pkgs/development/tools/jbake/default.nix b/pkgs/development/tools/jbake/default.nix index 44d537f976262..97d1c75368211 100644 --- a/pkgs/development/tools/jbake/default.nix +++ b/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/pkgs/development/tools/jbang/default.nix b/pkgs/development/tools/jbang/default.nix index 11f22fbef3fb8..b161b1d137c37 100644 --- a/pkgs/development/tools/jbang/default.nix +++ b/pkgs/development/tools/jbang/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { $out/bin/jbang --version 2>&1 | grep -q "${version}" ''; - meta = with stdenv.lib; { + 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 diff --git a/pkgs/development/tools/jd/default.nix b/pkgs/development/tools/jd/default.nix index b03fd7a0028a5..772e2802ff579 100644 --- a/pkgs/development/tools/jd/default.nix +++ b/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/pkgs/development/tools/jid/default.nix b/pkgs/development/tools/jid/default.nix index e6eef68ec6cfc..5e4e3df694274 100644 --- a/pkgs/development/tools/jid/default.nix +++ b/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/pkgs/development/tools/jira_cli/default.nix b/pkgs/development/tools/jira_cli/default.nix index 4040debf15ea3..7b7647da033ee 100644 --- a/pkgs/development/tools/jira_cli/default.nix +++ b/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/pkgs/development/tools/jl/default.nix b/pkgs/development/tools/jl/default.nix index 9a1314a608358..e0bf896c149ff 100644 --- a/pkgs/development/tools/jl/default.nix +++ b/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/pkgs/development/tools/jmespath/default.nix b/pkgs/development/tools/jmespath/default.nix index 5414c51a00c71..f5a7092e60f92 100644 --- a/pkgs/development/tools/jmespath/default.nix +++ b/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/pkgs/development/tools/jo/default.nix b/pkgs/development/tools/jo/default.nix index c3553a5b5010c..653867956ff1d 100644 --- a/pkgs/development/tools/jo/default.nix +++ b/pkgs/development/tools/jo/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, autoreconfHook, pandoc, pkg-config}: +{lib, stdenv, fetchFromGitHub, autoreconfHook, pandoc, pkg-config}: stdenv.mkDerivation rec { pname = "jo"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { 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/pkgs/development/tools/jp/default.nix b/pkgs/development/tools/jp/default.nix index f05c788dabe1c..d8d703feed30c 100644 --- a/pkgs/development/tools/jp/default.nix +++ b/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/pkgs/development/tools/jq/default.nix b/pkgs/development/tools/jq/default.nix index 63c7e01a4b8de..e8fe27aae099f 100644 --- a/pkgs/development/tools/jq/default.nix +++ b/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/pkgs/development/tools/just/default.nix b/pkgs/development/tools/just/default.nix index 05b2b50f26f66..bbdd1bd016d5b 100644 --- a/pkgs/development/tools/just/default.nix +++ b/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/pkgs/development/tools/k6/default.nix b/pkgs/development/tools/k6/default.nix index 35972f9cce531..6eb99291f8f2e 100644 --- a/pkgs/development/tools/k6/default.nix +++ b/pkgs/development/tools/k6/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "k6"; @@ -15,7 +15,7 @@ buildGoPackage rec { 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/pkgs/development/tools/kafkacat/default.nix b/pkgs/development/tools/kafkacat/default.nix index 01323281dfe53..e297de7a0db07 100644 --- a/pkgs/development/tools/kafkacat/default.nix +++ b/pkgs/development/tools/kafkacat/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkg-config, zlib, rdkafka, yajl }: +{ lib, stdenv, fetchFromGitHub, pkg-config, zlib, rdkafka, yajl }: stdenv.mkDerivation rec { pname = "kafkacat"; @@ -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/pkgs/development/tools/kind/default.nix b/pkgs/development/tools/kind/default.nix index 55f0a0e9f305b..edde4131a0d94 100644 --- a/pkgs/development/tools/kind/default.nix +++ b/pkgs/development/tools/kind/default.nix @@ -1,6 +1,6 @@ -{ stdenv, buildGoModule, fetchFromGitHub, installShellFiles }: +{ lib, stdenv, buildGoModule, fetchFromGitHub, installShellFiles }: -with stdenv.lib; +with lib; buildGoModule rec { pname = "kind"; @@ -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/pkgs/development/tools/krew/default.nix b/pkgs/development/tools/krew/default.nix index 8e5d9d76fc493..7449d6df38ebb 100644 --- a/pkgs/development/tools/krew/default.nix +++ b/pkgs/development/tools/krew/default.nix @@ -19,7 +19,7 @@ buildGoModule rec { 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/pkgs/development/tools/ktlint/default.nix b/pkgs/development/tools/ktlint/default.nix index 7e71c08ec4b1f..4abe6b6d17fad 100644 --- a/pkgs/development/tools/ktlint/default.nix +++ b/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/pkgs/development/tools/kubectx/default.nix b/pkgs/development/tools/kubectx/default.nix index 59a7c8300e2e9..f2186709e8352 100644 --- a/pkgs/development/tools/kubectx/default.nix +++ b/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/pkgs/development/tools/kubicorn/default.nix b/pkgs/development/tools/kubicorn/default.nix index 67e170f6e25c6..f0985277a25e8 100644 --- a/pkgs/development/tools/kubicorn/default.nix +++ b/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/pkgs/development/tools/kubie/default.nix b/pkgs/development/tools/kubie/default.nix index 33d4ea0df1d21..8a199f9191c00 100644 --- a/pkgs/development/tools/kubie/default.nix +++ b/pkgs/development/tools/kubie/default.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ]; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = lib.optionals stdenv.isDarwin [ Security ]; postInstall = '' installShellCompletion completion/kubie.bash diff --git a/pkgs/development/tools/kythe/default.nix b/pkgs/development/tools/kythe/default.nix index 601634b318421..f6a4c2e6c1e60 100644 --- a/pkgs/development/tools/kythe/default.nix +++ b/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/pkgs/development/tools/lattice-diamond/default.nix b/pkgs/development/tools/lattice-diamond/default.nix index 6720603b2e5ff..4c94ff1e6e27a 100644 --- a/pkgs/development/tools/lattice-diamond/default.nix +++ b/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/pkgs/development/tools/lazygit/default.nix b/pkgs/development/tools/lazygit/default.nix index 1ede21609b44c..1e8ebb0d08797 100644 --- a/pkgs/development/tools/lazygit/default.nix +++ b/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/pkgs/development/tools/leaps/default.nix b/pkgs/development/tools/leaps/default.nix index bb8673d4d56bd..e68542e584f28 100644 --- a/pkgs/development/tools/leaps/default.nix +++ b/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/pkgs/development/tools/libsigrok/default.nix b/pkgs/development/tools/libsigrok/default.nix index 0846cc9d87a6d..7f32b0bd71620 100644 --- a/pkgs/development/tools/libsigrok/default.nix +++ b/pkgs/development/tools/libsigrok/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkg-config, 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" }: @@ -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/pkgs/development/tools/libsigrokdecode/default.nix b/pkgs/development/tools/libsigrokdecode/default.nix index d97afa5604f34..cb3b304059627 100644 --- a/pkgs/development/tools/libsigrokdecode/default.nix +++ b/pkgs/development/tools/libsigrokdecode/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkg-config, glib, python3, libsigrok, check }: +{ lib, stdenv, fetchurl, pkg-config, glib, python3, libsigrok, check }: stdenv.mkDerivation rec { name = "libsigrokdecode-0.5.3"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { 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/pkgs/development/tools/literate-programming/Literate/default.nix b/pkgs/development/tools/literate-programming/Literate/default.nix index 428e6e444a215..87213b911a96a 100644 --- a/pkgs/development/tools/literate-programming/Literate/default.nix +++ b/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/pkgs/development/tools/literate-programming/eweb/default.nix b/pkgs/development/tools/literate-programming/eweb/default.nix index 82805af5804fa..caacc04903e6e 100644 --- a/pkgs/development/tools/literate-programming/eweb/default.nix +++ b/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/pkgs/development/tools/literate-programming/funnelweb/default.nix b/pkgs/development/tools/literate-programming/funnelweb/default.nix index 9d27351f15d48..53b7f208e8124 100644 --- a/pkgs/development/tools/literate-programming/funnelweb/default.nix +++ b/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/pkgs/development/tools/literate-programming/noweb/default.nix b/pkgs/development/tools/literate-programming/noweb/default.nix index 52586939c1dfe..5d4441ecfbb60 100644 --- a/pkgs/development/tools/literate-programming/noweb/default.nix +++ b/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/pkgs/development/tools/literate-programming/nuweb/default.nix b/pkgs/development/tools/literate-programming/nuweb/default.nix index 1f4fba681c358..37deaacb216cb 100644 --- a/pkgs/development/tools/literate-programming/nuweb/default.nix +++ b/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/pkgs/development/tools/makerpm/default.nix b/pkgs/development/tools/makerpm/default.nix index 1577392c8bca1..5b7fc83df4077 100644 --- a/pkgs/development/tools/makerpm/default.nix +++ b/pkgs/development/tools/makerpm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, zlib, libarchive, openssl }: +{ lib, stdenv, fetchFromGitHub, zlib, libarchive, openssl }: stdenv.mkDerivation rec { version = "1.0"; @@ -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/pkgs/development/tools/manul/default.nix b/pkgs/development/tools/manul/default.nix index 71010149a9210..4265c2a745014 100644 --- a/pkgs/development/tools/manul/default.nix +++ b/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/pkgs/development/tools/mdk/default.nix b/pkgs/development/tools/mdk/default.nix index d6f34a0a9d215..6db4395a14f5f 100644 --- a/pkgs/development/tools/mdk/default.nix +++ b/pkgs/development/tools/mdk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, intltool, pkg-config, glib }: +{ lib, stdenv, fetchurl, intltool, pkg-config, glib }: stdenv.mkDerivation { name = "gnu-mdk-1.3.0"; @@ -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/pkgs/development/tools/minizinc/default.nix b/pkgs/development/tools/minizinc/default.nix index bcaa3e565071f..4e5f39472626f 100644 --- a/pkgs/development/tools/minizinc/default.nix +++ b/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 @@ -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/pkgs/development/tools/minizinc/ide.nix b/pkgs/development/tools/minizinc/ide.nix index aedf2ab881dc2..7709423e676f7 100644 --- a/pkgs/development/tools/minizinc/ide.nix +++ b/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/pkgs/development/tools/misc/abi-compliance-checker/default.nix b/pkgs/development/tools/misc/abi-compliance-checker/default.nix index c95a340181c0e..c4dda95a7f25f 100644 --- a/pkgs/development/tools/misc/abi-compliance-checker/default.nix +++ b/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/pkgs/development/tools/misc/abi-dumper/default.nix b/pkgs/development/tools/misc/abi-dumper/default.nix index dc2a6d00b5f0d..6dd2bf41ba6f3 100644 --- a/pkgs/development/tools/misc/abi-dumper/default.nix +++ b/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/pkgs/development/tools/misc/arcanist/default.nix b/pkgs/development/tools/misc/arcanist/default.nix index 14ef09ee7ed0b..a5a9d724a79e9 100644 --- a/pkgs/development/tools/misc/arcanist/default.nix +++ b/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/pkgs/development/tools/misc/argbash/default.nix b/pkgs/development/tools/misc/argbash/default.nix index 3efff50094391..5710505081462 100644 --- a/pkgs/development/tools/misc/argbash/default.nix +++ b/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/pkgs/development/tools/misc/asls/default.nix b/pkgs/development/tools/misc/asls/default.nix index 0e08acdeb450f..bccda0185036e 100644 --- a/pkgs/development/tools/misc/asls/default.nix +++ b/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/pkgs/development/tools/misc/autobuild/default.nix b/pkgs/development/tools/misc/autobuild/default.nix index 05afa379f99a4..da387105cef50 100644 --- a/pkgs/development/tools/misc/autobuild/default.nix +++ b/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/pkgs/development/tools/misc/autoconf-archive/default.nix b/pkgs/development/tools/misc/autoconf-archive/default.nix index f002346c99496..e0d558b18800e 100644 --- a/pkgs/development/tools/misc/autoconf-archive/default.nix +++ b/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/pkgs/development/tools/misc/autoconf/2.13.nix b/pkgs/development/tools/misc/autoconf/2.13.nix index 424dff8541bc5..e5280d46b598b 100644 --- a/pkgs/development/tools/misc/autoconf/2.13.nix +++ b/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/pkgs/development/tools/misc/autoconf/2.64.nix b/pkgs/development/tools/misc/autoconf/2.64.nix index 1fd18bcb12afd..6976a291ae724 100644 --- a/pkgs/development/tools/misc/autoconf/2.64.nix +++ b/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/pkgs/development/tools/misc/autoconf/2.69.nix b/pkgs/development/tools/misc/autoconf/2.69.nix index 500d80d4bb8f4..f2f8ca0a858c9 100644 --- a/pkgs/development/tools/misc/autoconf/2.69.nix +++ b/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/pkgs/development/tools/misc/autoconf/default.nix b/pkgs/development/tools/misc/autoconf/default.nix index 57a92cee737b1..ae8fc2d90619b 100644 --- a/pkgs/development/tools/misc/autoconf/default.nix +++ b/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/pkgs/development/tools/misc/autogen/default.nix b/pkgs/development/tools/misc/autogen/default.nix index 1bf3a0c2832f9..c6eb6916d1ec8 100644 --- a/pkgs/development/tools/misc/autogen/default.nix +++ b/pkgs/development/tools/misc/autogen/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPackages, fetchurl, autoreconfHook, which, pkg-config, perl, guile, libxml2 }: +{ lib, stdenv, buildPackages, fetchurl, autoreconfHook, which, pkg-config, perl, guile, libxml2 }: stdenv.mkDerivation rec { pname = "autogen"; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ which pkg-config perl autoreconfHook/*patches applied*/ - ] ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + ] ++ 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/pkgs/development/tools/misc/automake/automake-1.11.x.nix b/pkgs/development/tools/misc/automake/automake-1.11.x.nix index b79f304788907..5e3167d182dcb 100644 --- a/pkgs/development/tools/misc/automake/automake-1.11.x.nix +++ b/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/pkgs/development/tools/misc/automake/automake-1.15.x.nix b/pkgs/development/tools/misc/automake/automake-1.15.x.nix index bf0967e9ddb4a..0088eb74cc487 100644 --- a/pkgs/development/tools/misc/automake/automake-1.15.x.nix +++ b/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/pkgs/development/tools/misc/automake/automake-1.16.x.nix b/pkgs/development/tools/misc/automake/automake-1.16.x.nix index 58c559fcc5666..48f01f8d0f678 100644 --- a/pkgs/development/tools/misc/automake/automake-1.16.x.nix +++ b/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/pkgs/development/tools/misc/automoc4/default.nix b/pkgs/development/tools/misc/automoc4/default.nix index 22942e2a658ef..ac027ec453013 100644 --- a/pkgs/development/tools/misc/automoc4/default.nix +++ b/pkgs/development/tools/misc/automoc4/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, qt4 }: +{ lib, stdenv, fetchurl, cmake, qt4 }: stdenv.mkDerivation rec { pname = "automoc4"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ qt4 ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://techbase.kde.org/Development/Tools/Automoc4"; description = "KDE Meta Object Compiler"; license = licenses.bsd2; diff --git a/pkgs/development/tools/misc/avrdude/default.nix b/pkgs/development/tools/misc/avrdude/default.nix index bb0520cf28efb..4d95310c342f8 100644 --- a/pkgs/development/tools/misc/avrdude/default.nix +++ b/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/pkgs/development/tools/misc/awf/default.nix b/pkgs/development/tools/misc/awf/default.nix index 24a0455042805..b73f1dc04502f 100644 --- a/pkgs/development/tools/misc/awf/default.nix +++ b/pkgs/development/tools/misc/awf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, gtk2, gtk3, pkg-config +{ lib, stdenv, fetchFromGitHub, autoreconfHook, gtk2, gtk3, pkg-config , wrapGAppsHook }: stdenv.mkDerivation rec { @@ -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/pkgs/development/tools/misc/babeltrace/default.nix b/pkgs/development/tools/misc/babeltrace/default.nix index e768bdde146b7..26c484017d2bd 100644 --- a/pkgs/development/tools/misc/babeltrace/default.nix +++ b/pkgs/development/tools/misc/babeltrace/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkg-config, glib, libuuid, popt, elfutils }: +{ lib, stdenv, fetchurl, pkg-config, glib, libuuid, popt, elfutils }: stdenv.mkDerivation rec { name = "babeltrace-1.5.8"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { 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/pkgs/development/tools/misc/bashdb/default.nix b/pkgs/development/tools/misc/bashdb/default.nix index 0897960f6aa9c..72ec8c96be34e 100644 --- a/pkgs/development/tools/misc/bashdb/default.nix +++ b/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/pkgs/development/tools/misc/bin_replace_string/default.nix b/pkgs/development/tools/misc/bin_replace_string/default.nix index 8fc809f0f0cfc..a732d6e732c5a 100644 --- a/pkgs/development/tools/misc/bin_replace_string/default.nix +++ b/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/pkgs/development/tools/misc/bossa/default.nix b/pkgs/development/tools/misc/bossa/default.nix index 38cc2867650c2..bb14e26bfd98b 100644 --- a/pkgs/development/tools/misc/bossa/default.nix +++ b/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. @@ -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/pkgs/development/tools/misc/bsdbuild/default.nix b/pkgs/development/tools/misc/bsdbuild/default.nix index 6491ff83ec786..e3bfc958437a3 100644 --- a/pkgs/development/tools/misc/bsdbuild/default.nix +++ b/pkgs/development/tools/misc/bsdbuild/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, libtool, pkg-config, gettext, mandoc, ed }: +{ lib, stdenv, fetchurl, perl, libtool, pkg-config, gettext, mandoc, ed }: stdenv.mkDerivation rec { pname = "bsdbuild"; @@ -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/pkgs/development/tools/misc/cbrowser/default.nix b/pkgs/development/tools/misc/cbrowser/default.nix index f3ba4b3a70d75..0f7edeea812f2 100644 --- a/pkgs/development/tools/misc/cbrowser/default.nix +++ b/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/pkgs/development/tools/misc/cc-tool/default.nix b/pkgs/development/tools/misc/cc-tool/default.nix index 6be0ab2acb50b..e2a511a0e3280 100644 --- a/pkgs/development/tools/misc/cc-tool/default.nix +++ b/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/pkgs/development/tools/misc/ccache/default.nix b/pkgs/development/tools/misc/ccache/default.nix index f9254b2cf15ed..655807d950691 100644 --- a/pkgs/development/tools/misc/ccache/default.nix +++ b/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/pkgs/development/tools/misc/ccls/default.nix b/pkgs/development/tools/misc/ccls/default.nix index 16365a462a942..40b53ca6934a5 100644 --- a/pkgs/development/tools/misc/ccls/default.nix +++ b/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/pkgs/development/tools/misc/cflow/default.nix b/pkgs/development/tools/misc/cflow/default.nix index 8c271bd767326..b9e75d7cb2a3b 100644 --- a/pkgs/development/tools/misc/cflow/default.nix +++ b/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 = '' diff --git a/pkgs/development/tools/misc/cgdb/default.nix b/pkgs/development/tools/misc/cgdb/default.nix index a863cec1d4c54..0e92d373c0b31 100644 --- a/pkgs/development/tools/misc/cgdb/default.nix +++ b/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/pkgs/development/tools/misc/checkbashisms/default.nix b/pkgs/development/tools/misc/checkbashisms/default.nix index 86ac37ee49139..524abbfdc9097 100644 --- a/pkgs/development/tools/misc/checkbashisms/default.nix +++ b/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/pkgs/development/tools/misc/chrpath/default.nix b/pkgs/development/tools/misc/chrpath/default.nix index 7e08157d7bd4b..ff804f897d1e7 100644 --- a/pkgs/development/tools/misc/chrpath/default.nix +++ b/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/pkgs/development/tools/misc/circleci-cli/default.nix b/pkgs/development/tools/misc/circleci-cli/default.nix index 441aae5826979..73ea64f1d62cb 100644 --- a/pkgs/development/tools/misc/circleci-cli/default.nix +++ b/pkgs/development/tools/misc/circleci-cli/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildGoModule }: +{ lib, stdenv, fetchFromGitHub, buildGoModule }: buildGoModule rec { pname = "circleci-cli"; @@ -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/pkgs/development/tools/misc/cl-launch/default.nix b/pkgs/development/tools/misc/cl-launch/default.nix index c245a32a06d9d..1d3a36c5773b5 100644 --- a/pkgs/development/tools/misc/cl-launch/default.nix +++ b/pkgs/development/tools/misc/cl-launch/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: let s = # Generated upstream information rec { @@ -31,8 +31,8 @@ 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; + license = lib.licenses.llgpl21 ; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/tools/misc/cli11/default.nix b/pkgs/development/tools/misc/cli11/default.nix index de01ab9309000..03c3e51cb89b8 100644 --- a/pkgs/development/tools/misc/cli11/default.nix +++ b/pkgs/development/tools/misc/cli11/default.nix @@ -1,5 +1,5 @@ { - stdenv, + lib, stdenv, fetchFromGitHub, cmake, gtest, @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { sed -i '/TrueFalseTest/d' tests/CMakeLists.txt ''; - 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/pkgs/development/tools/misc/clojure-lsp/default.nix b/pkgs/development/tools/misc/clojure-lsp/default.nix index 16f5c4063bed0..af435d417cef7 100644 --- a/pkgs/development/tools/misc/clojure-lsp/default.nix +++ b/pkgs/development/tools/misc/clojure-lsp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, jre, makeWrapper }: +{ lib, stdenv, fetchurl, jre, makeWrapper }: stdenv.mkDerivation rec { pname = "clojure-lsp"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { --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/pkgs/development/tools/misc/coccinelle/default.nix b/pkgs/development/tools/misc/coccinelle/default.nix index 43392b2a89cba..40a22f18203b2 100644 --- a/pkgs/development/tools/misc/coccinelle/default.nix +++ b/pkgs/development/tools/misc/coccinelle/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, python, ncurses, ocamlPackages, pkg-config }: +{ fetchurl, lib, stdenv, python, ncurses, ocamlPackages, pkg-config }: stdenv.mkDerivation rec { pname = "coccinelle"; @@ -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/pkgs/development/tools/misc/complexity/default.nix b/pkgs/development/tools/misc/complexity/default.nix index 71ed762df040a..6e70fbcfcde56 100644 --- a/pkgs/development/tools/misc/complexity/default.nix +++ b/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/pkgs/development/tools/misc/cppi/default.nix b/pkgs/development/tools/misc/cppi/default.nix index 8de7391b9ec66..9fe5ed9667245 100644 --- a/pkgs/development/tools/misc/cppi/default.nix +++ b/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/pkgs/development/tools/misc/cproto/default.nix b/pkgs/development/tools/misc/cproto/default.nix index e18196fe595f8..5ee1a64f2c236 100644 --- a/pkgs/development/tools/misc/cproto/default.nix +++ b/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/pkgs/development/tools/misc/creduce/default.nix b/pkgs/development/tools/misc/creduce/default.nix index 7bc4aca3d9d60..75234fde6ca50 100644 --- a/pkgs/development/tools/misc/creduce/default.nix +++ b/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,7 +27,7 @@ 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 ''; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { 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/pkgs/development/tools/misc/cscope/default.nix b/pkgs/development/tools/misc/cscope/default.nix index 31d4e83663be4..7eb38e385e8fc 100644 --- a/pkgs/development/tools/misc/cscope/default.nix +++ b/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/pkgs/development/tools/misc/csmith/default.nix b/pkgs/development/tools/misc/csmith/default.nix index 253dd4065e40c..0643e81edf999 100644 --- a/pkgs/development/tools/misc/csmith/default.nix +++ b/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/pkgs/development/tools/misc/ctags/default.nix b/pkgs/development/tools/misc/ctags/default.nix index 3adca34a5bbce..90825db2a549c 100644 --- a/pkgs/development/tools/misc/ctags/default.nix +++ b/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/pkgs/development/tools/misc/cwebbin/default.nix b/pkgs/development/tools/misc/cwebbin/default.nix index 0b89156d71aa5..3ab8800f3c4e2 100644 --- a/pkgs/development/tools/misc/cwebbin/default.nix +++ b/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/pkgs/development/tools/misc/d-feet/default.nix b/pkgs/development/tools/misc/d-feet/default.nix index 6ee366ae2c64d..60d3c5c453945 100644 --- a/pkgs/development/tools/misc/d-feet/default.nix +++ b/pkgs/development/tools/misc/d-feet/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , pkg-config , fetchurl , meson @@ -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"; }; @@ -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/pkgs/development/tools/misc/dbench/default.nix b/pkgs/development/tools/misc/dbench/default.nix index 49fb1efbd4a93..9565eaa362622 100644 --- a/pkgs/development/tools/misc/dbench/default.nix +++ b/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/pkgs/development/tools/misc/ddd/default.nix b/pkgs/development/tools/misc/ddd/default.nix index 174168b7db7d8..74eb9fcb29367 100644 --- a/pkgs/development/tools/misc/ddd/default.nix +++ b/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/pkgs/development/tools/misc/dejagnu/default.nix b/pkgs/development/tools/misc/dejagnu/default.nix index 73e2ab8ef92de..285805ccb02c6 100644 --- a/pkgs/development/tools/misc/dejagnu/default.nix +++ b/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/pkgs/development/tools/misc/dfu-programmer/default.nix b/pkgs/development/tools/misc/dfu-programmer/default.nix index 1aaf113d0b958..f0a3a9b760065 100644 --- a/pkgs/development/tools/misc/dfu-programmer/default.nix +++ b/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/pkgs/development/tools/misc/dfu-util/default.nix b/pkgs/development/tools/misc/dfu-util/default.nix index c570b1a7997ad..85917a114c0f6 100644 --- a/pkgs/development/tools/misc/dfu-util/default.nix +++ b/pkgs/development/tools/misc/dfu-util/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkg-config, libusb1 }: +{ lib, stdenv, fetchurl, pkg-config, libusb1 }: stdenv.mkDerivation rec { pname = "dfu-util"; @@ -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/pkgs/development/tools/misc/dialog/default.nix b/pkgs/development/tools/misc/dialog/default.nix index c56620e3105e7..97db1b5b7e81f 100644 --- a/pkgs/development/tools/misc/dialog/default.nix +++ b/pkgs/development/tools/misc/dialog/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , ncurses , withLibrary ? false, libtool , unicodeSupport ? true @@ -24,14 +24,14 @@ stdenv.mkDerivation rec { 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 = with stdenv.lib; { + meta = with lib; { homepage = "https://invisible-island.net/dialog/dialog.html"; description = "Display dialog boxes from shell"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/tools/misc/direvent/default.nix b/pkgs/development/tools/misc/direvent/default.nix index 0ae1884646d9e..3477d60b7849a 100644 --- a/pkgs/development/tools/misc/direvent/default.nix +++ b/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/pkgs/development/tools/misc/distcc/default.nix b/pkgs/development/tools/misc/distcc/default.nix index 8a315a61e98ee..cad9fe0960b5a 100644 --- a/pkgs/development/tools/misc/distcc/default.nix +++ b/pkgs/development/tools/misc/distcc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, popt, avahi, pkg-config, 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 @@ -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/pkgs/development/tools/misc/distcc/masq.nix b/pkgs/development/tools/misc/distcc/masq.nix index f3bccde81606c..2387ab1bd4186 100644 --- a/pkgs/development/tools/misc/distcc/masq.nix +++ b/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/pkgs/development/tools/misc/doclifter/default.nix b/pkgs/development/tools/misc/doclifter/default.nix index a1528cfca3e6c..8b7717881119b 100644 --- a/pkgs/development/tools/misc/doclifter/default.nix +++ b/pkgs/development/tools/misc/doclifter/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, python}: +{lib, stdenv, fetchurl, python}: stdenv.mkDerivation { name = "doclifter-2.19"; @@ -21,6 +21,6 @@ stdenv.mkDerivation { 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/pkgs/development/tools/misc/docopts/default.nix b/pkgs/development/tools/misc/docopts/default.nix index 98a24ca5ebe45..3614270574e4f 100644 --- a/pkgs/development/tools/misc/docopts/default.nix +++ b/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/pkgs/development/tools/misc/drush/default.nix b/pkgs/development/tools/misc/drush/default.nix index d5c345d9d22b3..32d9975e332bf 100644 --- a/pkgs/development/tools/misc/drush/default.nix +++ b/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/pkgs/development/tools/misc/editorconfig-core-c/default.nix b/pkgs/development/tools/misc/editorconfig-core-c/default.nix index e563ff203a23f..de5c1e070fdbb 100644 --- a/pkgs/development/tools/misc/editorconfig-core-c/default.nix +++ b/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/pkgs/development/tools/misc/eggdbus/default.nix b/pkgs/development/tools/misc/eggdbus/default.nix index 198bbabb19f27..5a5267510d7d4 100644 --- a/pkgs/development/tools/misc/eggdbus/default.nix +++ b/pkgs/development/tools/misc/eggdbus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkg-config, glib, dbus, dbus-glib }: +{ lib, stdenv, fetchurl, pkg-config, glib, dbus, dbus-glib }: stdenv.mkDerivation rec { name = "eggdbus-0.6"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { 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/pkgs/development/tools/misc/elfinfo/default.nix b/pkgs/development/tools/misc/elfinfo/default.nix index 3778793b71cd2..cd19e263f0a58 100644 --- a/pkgs/development/tools/misc/elfinfo/default.nix +++ b/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/pkgs/development/tools/misc/elfkickers/default.nix b/pkgs/development/tools/misc/elfkickers/default.nix index e8992b62665f3..e60b40c7fd4c1 100644 --- a/pkgs/development/tools/misc/elfkickers/default.nix +++ b/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/pkgs/development/tools/misc/epm/default.nix b/pkgs/development/tools/misc/epm/default.nix index 8caa33c20d1be..8f5921783e249 100644 --- a/pkgs/development/tools/misc/epm/default.nix +++ b/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/pkgs/development/tools/misc/findnewest/default.nix b/pkgs/development/tools/misc/findnewest/default.nix index b289c16b7a6e2..6773e9bc0bd47 100644 --- a/pkgs/development/tools/misc/findnewest/default.nix +++ b/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/pkgs/development/tools/misc/fsatrace/default.nix b/pkgs/development/tools/misc/fsatrace/default.nix index 69d7c6b3919f5..132ddf2eacfd6 100644 --- a/pkgs/development/tools/misc/fsatrace/default.nix +++ b/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/pkgs/development/tools/misc/fswatch/default.nix b/pkgs/development/tools/misc/fswatch/default.nix index e32da3e67b71c..6f9f5e113c06c 100644 --- a/pkgs/development/tools/misc/fswatch/default.nix +++ b/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/pkgs/development/tools/misc/fujprog/default.nix b/pkgs/development/tools/misc/fujprog/default.nix index 3ec4d0f8efb4c..db1f42e3a266c 100644 --- a/pkgs/development/tools/misc/fujprog/default.nix +++ b/pkgs/development/tools/misc/fujprog/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , cmake , pkg-config @@ -26,9 +26,9 @@ stdenv.mkDerivation rec { 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/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix index f77ab03b8107b..2ce779be5680d 100644 --- a/pkgs/development/tools/misc/gdb/default.nix +++ b/pkgs/development/tools/misc/gdb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, targetPackages +{ lib, stdenv, targetPackages # Build time , fetchurl, pkg-config, perl, texinfo, setupDebugInfoDirs, buildPackages @@ -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 = [ 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/pkgs/development/tools/misc/gdbgui/default.nix b/pkgs/development/tools/misc/gdbgui/default.nix index ecbfc2ae75698..c01bb61f4f696 100644 --- a/pkgs/development/tools/misc/gdbgui/default.nix +++ b/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/pkgs/development/tools/misc/gengetopt/default.nix b/pkgs/development/tools/misc/gengetopt/default.nix index 0a3b0b1c7508f..2c09f925d3d8b 100644 --- a/pkgs/development/tools/misc/gengetopt/default.nix +++ b/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/pkgs/development/tools/misc/global/default.nix b/pkgs/development/tools/misc/global/default.nix index 36798fe4fc1a7..fb3ddfcb29b37 100644 --- a/pkgs/development/tools/misc/global/default.nix +++ b/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/pkgs/development/tools/misc/gnum4/default.nix b/pkgs/development/tools/misc/gnum4/default.nix index 2e3e4acfdc1b9..512989a144623 100644 --- a/pkgs/development/tools/misc/gnum4/default.nix +++ b/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/pkgs/development/tools/misc/gob2/default.nix b/pkgs/development/tools/misc/gob2/default.nix index e34b5733b2234..b78c111ccbf8d 100644 --- a/pkgs/development/tools/misc/gob2/default.nix +++ b/pkgs/development/tools/misc/gob2/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, pkg-config, 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"; }; @@ -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/pkgs/development/tools/misc/gperf/3.0.x.nix b/pkgs/development/tools/misc/gperf/3.0.x.nix index e013428a6f7fe..339511f2cc022 100644 --- a/pkgs/development/tools/misc/gperf/3.0.x.nix +++ b/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/pkgs/development/tools/misc/gperf/default.nix b/pkgs/development/tools/misc/gperf/default.nix index bf85cd91380e5..e998f09683ae6 100644 --- a/pkgs/development/tools/misc/gperf/default.nix +++ b/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/pkgs/development/tools/misc/gpshell/default.nix b/pkgs/development/tools/misc/gpshell/default.nix index 5a3cdad80407e..13437b7195362 100644 --- a/pkgs/development/tools/misc/gpshell/default.nix +++ b/pkgs/development/tools/misc/gpshell/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkg-config, globalplatform, pcsclite, gppcscconnectionplugin +{ lib, stdenv, fetchurl, pkg-config, globalplatform, pcsclite, gppcscconnectionplugin , makeWrapper }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { 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/pkgs/development/tools/misc/gputils/default.nix b/pkgs/development/tools/misc/gputils/default.nix index 2ad496bfb8877..c07949e80968d 100644 --- a/pkgs/development/tools/misc/gputils/default.nix +++ b/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/pkgs/development/tools/misc/gtkdialog/default.nix b/pkgs/development/tools/misc/gtkdialog/default.nix index 2b2a831894722..6651bbb03845a 100644 --- a/pkgs/development/tools/misc/gtkdialog/default.nix +++ b/pkgs/development/tools/misc/gtkdialog/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, gtk2, pkg-config }: +{lib, stdenv, fetchurl, gtk2, pkg-config }: stdenv.mkDerivation { name = "gtkdialog-0.8.3"; @@ -15,7 +15,7 @@ stdenv.mkDerivation { 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/pkgs/development/tools/misc/gtkperf/default.nix b/pkgs/development/tools/misc/gtkperf/default.nix index feda9faf59aab..4b7f7985a673d 100644 --- a/pkgs/development/tools/misc/gtkperf/default.nix +++ b/pkgs/development/tools/misc/gtkperf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gtk2, pkg-config, libintl }: +{ lib, stdenv, fetchurl, gtk2, pkg-config, libintl }: stdenv.mkDerivation { name = "gtkperf-0.40.0"; @@ -15,7 +15,7 @@ stdenv.mkDerivation { # 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/pkgs/development/tools/misc/help2man/default.nix b/pkgs/development/tools/misc/help2man/default.nix index f23b5a9c8fdd8..6afc4415e1138 100644 --- a/pkgs/development/tools/misc/help2man/default.nix +++ b/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 < /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/pkgs/development/tools/misc/pwndbg/default.nix b/pkgs/development/tools/misc/pwndbg/default.nix index f9d792d185f82..69ed17ab4b9ee 100644 --- a/pkgs/development/tools/misc/pwndbg/default.nix +++ b/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/pkgs/development/tools/misc/remarkable/remarkable-toolchain/default.nix b/pkgs/development/tools/misc/remarkable/remarkable-toolchain/default.nix index d259721353b1c..643e28e82b275 100644 --- a/pkgs/development/tools/misc/remarkable/remarkable-toolchain/default.nix +++ b/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/pkgs/development/tools/misc/remarkable/remarkable2-toolchain/default.nix b/pkgs/development/tools/misc/remarkable/remarkable2-toolchain/default.nix index f4f83f21840bf..7b4df5df16477 100644 --- a/pkgs/development/tools/misc/remarkable/remarkable2-toolchain/default.nix +++ b/pkgs/development/tools/misc/remarkable/remarkable2-toolchain/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libarchive, python3, file }: +{ lib, stdenv, fetchurl, libarchive, python3, file }: stdenv.mkDerivation rec { pname = "remarkable2-toolchain"; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ./install-toolchain.sh -D -y -d $out ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A toolchain for cross-compiling to reMarkable 2 tablets"; homepage = "https://remarkable.engineering/"; license = licenses.gpl2Plus; diff --git a/pkgs/development/tools/misc/rman/default.nix b/pkgs/development/tools/misc/rman/default.nix index 09769d5c5912c..1f7de915c9743 100644 --- a/pkgs/development/tools/misc/rman/default.nix +++ b/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/pkgs/development/tools/misc/rolespec/default.nix b/pkgs/development/tools/misc/rolespec/default.nix index 6eb13bb242da3..d86277993caa9 100644 --- a/pkgs/development/tools/misc/rolespec/default.nix +++ b/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/pkgs/development/tools/misc/saleae-logic/default.nix b/pkgs/development/tools/misc/saleae-logic/default.nix index b9f84edc964a9..c26e834ee0f7e 100644 --- a/pkgs/development/tools/misc/saleae-logic/default.nix +++ b/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/pkgs/development/tools/misc/scc/default.nix b/pkgs/development/tools/misc/scc/default.nix index 5fc23547615ac..49052c141a1a7 100644 --- a/pkgs/development/tools/misc/scc/default.nix +++ b/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/pkgs/development/tools/misc/sipp/default.nix b/pkgs/development/tools/misc/sipp/default.nix index 610e66a2b9cc7..22bf244662b35 100644 --- a/pkgs/development/tools/misc/sipp/default.nix +++ b/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/pkgs/development/tools/misc/sloccount/default.nix b/pkgs/development/tools/misc/sloccount/default.nix index b2b83aa79b16e..fc041f2ee8d6a 100644 --- a/pkgs/development/tools/misc/sloccount/default.nix +++ b/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/pkgs/development/tools/misc/srecord/default.nix b/pkgs/development/tools/misc/srecord/default.nix index f978d4d4e120a..a18dcd85255a3 100644 --- a/pkgs/development/tools/misc/srecord/default.nix +++ b/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/pkgs/development/tools/misc/stlink/default.nix b/pkgs/development/tools/misc/stlink/default.nix index 7595b84721cf3..e67fd9ca7a85b 100644 --- a/pkgs/development/tools/misc/stlink/default.nix +++ b/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/pkgs/development/tools/misc/stm32cubemx/default.nix b/pkgs/development/tools/misc/stm32cubemx/default.nix index 9fe34aecade28..3b754e4c91bb1 100644 --- a/pkgs/development/tools/misc/stm32cubemx/default.nix +++ b/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/pkgs/development/tools/misc/stm32flash/default.nix b/pkgs/development/tools/misc/stm32flash/default.nix index 0c2cb96a9d6c8..bc7d4b1b3dc80 100644 --- a/pkgs/development/tools/misc/stm32flash/default.nix +++ b/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/pkgs/development/tools/misc/strace/default.nix b/pkgs/development/tools/misc/strace/default.nix index 877aedc4e4975..004e1527d352a 100644 --- a/pkgs/development/tools/misc/strace/default.nix +++ b/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 = [ "--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/pkgs/development/tools/misc/swig/2.x.nix b/pkgs/development/tools/misc/swig/2.x.nix index 745cc9a2e7836..1068b3e2ad9d6 100644 --- a/pkgs/development/tools/misc/swig/2.x.nix +++ b/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/pkgs/development/tools/misc/swig/3.x.nix b/pkgs/development/tools/misc/swig/3.x.nix index 853a240ffc35b..109243b54ba10 100644 --- a/pkgs/development/tools/misc/swig/3.x.nix +++ b/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/pkgs/development/tools/misc/swig/4.nix b/pkgs/development/tools/misc/swig/4.nix index 4096b7353fa48..56106143027f6 100644 --- a/pkgs/development/tools/misc/swig/4.nix +++ b/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/pkgs/development/tools/misc/swig/default.nix b/pkgs/development/tools/misc/swig/default.nix index cf0880855db61..3c1a5b82dc2a1 100644 --- a/pkgs/development/tools/misc/swig/default.nix +++ b/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/pkgs/development/tools/misc/sysbench/default.nix b/pkgs/development/tools/misc/sysbench/default.nix index fb9b19660158d..2cf8c91d3bf9d 100644 --- a/pkgs/development/tools/misc/sysbench/default.nix +++ b/pkgs/development/tools/misc/sysbench/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config , libmysqlclient, libaio }: @@ -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/pkgs/development/tools/misc/tcptrack/default.nix b/pkgs/development/tools/misc/tcptrack/default.nix index 9872c91ac4ba2..5b1fd72a7f517 100644 --- a/pkgs/development/tools/misc/tcptrack/default.nix +++ b/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/pkgs/development/tools/misc/teensy-loader-cli/default.nix b/pkgs/development/tools/misc/teensy-loader-cli/default.nix index 40f3921ec705d..156e3f7f895db 100644 --- a/pkgs/development/tools/misc/teensy-loader-cli/default.nix +++ b/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/pkgs/development/tools/misc/tet/default.nix b/pkgs/development/tools/misc/tet/default.nix index acc42d61423bf..5e66b974337fa 100644 --- a/pkgs/development/tools/misc/tet/default.nix +++ b/pkgs/development/tools/misc/tet/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv }: +{ fetchurl, lib, stdenv }: stdenv.mkDerivation ({ version = "3.8"; @@ -22,8 +22,8 @@ stdenv.mkDerivation ({ 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/pkgs/development/tools/misc/texi2html/default.nix b/pkgs/development/tools/misc/texi2html/default.nix index 0c3736ff2f3bb..98f846b7c2f7a 100644 --- a/pkgs/development/tools/misc/texi2html/default.nix +++ b/pkgs/development/tools/misc/texi2html/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, gettext, buildPackages }: +{ lib, stdenv, fetchurl, perl, gettext, buildPackages }: stdenv.mkDerivation rec { pname = "texi2html"; @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { patchShebangs separated_to_hash.pl ''; - postInstall = stdenv.lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' + 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/pkgs/development/tools/misc/texinfo/common.nix b/pkgs/development/tools/misc/texinfo/common.nix index 057e52615ac76..1c5de083bc0de 100644 --- a/pkgs/development/tools/misc/texinfo/common.nix +++ b/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/pkgs/development/tools/misc/tie/default.nix b/pkgs/development/tools/misc/tie/default.nix index 074523309b67f..e75248aa8673a 100644 --- a/pkgs/development/tools/misc/tie/default.nix +++ b/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/pkgs/development/tools/misc/tokei/default.nix b/pkgs/development/tools/misc/tokei/default.nix index 32094d9303b8c..47966dcc1336a 100644 --- a/pkgs/development/tools/misc/tokei/default.nix +++ b/pkgs/development/tools/misc/tokei/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform, libiconv, darwin }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, libiconv, darwin }: rustPlatform.buildRustPackage rec { pname = "tokei"; @@ -13,14 +13,14 @@ rustPlatform.buildRustPackage rec { 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/pkgs/development/tools/misc/uisp/default.nix b/pkgs/development/tools/misc/uisp/default.nix index ca51e08973377..1fb255073ed80 100644 --- a/pkgs/development/tools/misc/uisp/default.nix +++ b/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/pkgs/development/tools/misc/uncrustify/default.nix b/pkgs/development/tools/misc/uncrustify/default.nix index 526e71515aecd..f6b51a969b27c 100644 --- a/pkgs/development/tools/misc/uncrustify/default.nix +++ b/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,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake python ]; - 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/pkgs/development/tools/misc/unifdef/default.nix b/pkgs/development/tools/misc/unifdef/default.nix index 19dd907b73b98..53e2b2762d313 100644 --- a/pkgs/development/tools/misc/unifdef/default.nix +++ b/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/pkgs/development/tools/misc/universal-ctags/default.nix b/pkgs/development/tools/misc/universal-ctags/default.nix index b086b3cdc48f0..bd362e8d1a45a 100644 --- a/pkgs/development/tools/misc/universal-ctags/default.nix +++ b/pkgs/development/tools/misc/universal-ctags/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config, perl, pythonPackages, libiconv, jansson }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, perl, pythonPackages, libiconv, jansson }: stdenv.mkDerivation { pname = "universal-ctags"; @@ -12,7 +12,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ autoreconfHook pkg-config pythonPackages.docutils ]; - buildInputs = [ jansson ] ++ stdenv.lib.optional stdenv.isDarwin libiconv; + 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/pkgs/development/tools/misc/unused/default.nix b/pkgs/development/tools/misc/unused/default.nix index 3e5f9c319ef82..6487c3fc2c0cc 100644 --- a/pkgs/development/tools/misc/unused/default.nix +++ b/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/pkgs/development/tools/misc/usb-modeswitch/data.nix b/pkgs/development/tools/misc/usb-modeswitch/data.nix index 6280b103ab602..7bb9fc69c58a2 100644 --- a/pkgs/development/tools/misc/usb-modeswitch/data.nix +++ b/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/pkgs/development/tools/misc/usb-modeswitch/default.nix b/pkgs/development/tools/misc/usb-modeswitch/default.nix index 5cbe627b55375..4f9dbe92d2b70 100644 --- a/pkgs/development/tools/misc/usb-modeswitch/default.nix +++ b/pkgs/development/tools/misc/usb-modeswitch/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { buildInputs = [ libusb1 tcl ]; 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/pkgs/development/tools/misc/vtable-dumper/default.nix b/pkgs/development/tools/misc/vtable-dumper/default.nix index a44140c1445fb..1bd59aa9944af 100644 --- a/pkgs/development/tools/misc/vtable-dumper/default.nix +++ b/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/pkgs/development/tools/misc/watson-ruby/default.nix b/pkgs/development/tools/misc/watson-ruby/default.nix index 81f5430371a00..23ec0643d77d7 100644 --- a/pkgs/development/tools/misc/watson-ruby/default.nix +++ b/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/pkgs/development/tools/misc/whatstyle/default.nix b/pkgs/development/tools/misc/whatstyle/default.nix index c882d6243fa0c..6afcfe871a471 100644 --- a/pkgs/development/tools/misc/whatstyle/default.nix +++ b/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/pkgs/development/tools/misc/xc3sprog/default.nix b/pkgs/development/tools/misc/xc3sprog/default.nix index e54dc7844e794..b9785bac7c5c4 100644 --- a/pkgs/development/tools/misc/xc3sprog/default.nix +++ b/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. @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { 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/pkgs/development/tools/misc/ycmd/default.nix b/pkgs/development/tools/misc/ycmd/default.nix index 4bbff3ca33f88..cf4fe39754fc1 100644 --- a/pkgs/development/tools/misc/ycmd/default.nix +++ b/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/pkgs/development/tools/misc/yodl/default.nix b/pkgs/development/tools/misc/yodl/default.nix index 6bb7e1377af37..a8b48e9fa53fe 100644 --- a/pkgs/development/tools/misc/yodl/default.nix +++ b/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/pkgs/development/tools/modd/default.nix b/pkgs/development/tools/modd/default.nix index 5c63447fdc5fc..efe4c9605668a 100644 --- a/pkgs/development/tools/modd/default.nix +++ b/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/pkgs/development/tools/mustache-go/default.nix b/pkgs/development/tools/mustache-go/default.nix index 7bcf72df55ce1..99e4eb6215643 100644 --- a/pkgs/development/tools/mustache-go/default.nix +++ b/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/pkgs/development/tools/nemiver/default.nix b/pkgs/development/tools/nemiver/default.nix index 2f51f0d9338b3..58c0f2ed28b1d 100644 --- a/pkgs/development/tools/nemiver/default.nix +++ b/pkgs/development/tools/nemiver/default.nix @@ -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"; }; diff --git a/pkgs/development/tools/neoload/default.nix b/pkgs/development/tools/neoload/default.nix index be772f60492aa..fb85aa80dc355 100644 --- a/pkgs/development/tools/neoload/default.nix +++ b/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/pkgs/development/tools/node-webkit/nw12.nix b/pkgs/development/tools/node-webkit/nw12.nix index ffd2a78f5094a..31358129821eb 100644 --- a/pkgs/development/tools/node-webkit/nw12.nix +++ b/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/pkgs/development/tools/nrpl/default.nix b/pkgs/development/tools/nrpl/default.nix index a1c9bfd53e332..72177582919a1 100644 --- a/pkgs/development/tools/nrpl/default.nix +++ b/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/pkgs/development/tools/nwjs/default.nix b/pkgs/development/tools/nwjs/default.nix index 4eedc003272c0..d3490b2b9c999 100644 --- a/pkgs/development/tools/nwjs/default.nix +++ b/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/pkgs/development/tools/ocaml/camlidl/default.nix b/pkgs/development/tools/ocaml/camlidl/default.nix index 309c44d6d4630..a464996ff3814 100644 --- a/pkgs/development/tools/ocaml/camlidl/default.nix +++ b/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/pkgs/development/tools/ocaml/camlp4/default.nix b/pkgs/development/tools/ocaml/camlp4/default.nix index 73228655cca0e..fffa426ba4c9c 100644 --- a/pkgs/development/tools/ocaml/camlp4/default.nix +++ b/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/pkgs/development/tools/ocaml/camlp5/default.nix b/pkgs/development/tools/ocaml/camlp5/default.nix index 6d68a320a910b..fc79cafdc42a1 100644 --- a/pkgs/development/tools/ocaml/camlp5/default.nix +++ b/pkgs/development/tools/ocaml/camlp5/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchzip, ocaml, perl }: +{ lib, stdenv, fetchzip, ocaml, perl }: -if stdenv.lib.versionOlder ocaml.version "4.02" +if lib.versionOlder ocaml.version "4.02" then throw "camlp5 is not available for OCaml ${ocaml.version}" else @@ -26,7 +26,7 @@ stdenv.mkDerivation { 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/pkgs/development/tools/ocaml/cppo/default.nix b/pkgs/development/tools/ocaml/cppo/default.nix index a0215fa814714..032f346bf9c37 100644 --- a/pkgs/development/tools/ocaml/cppo/default.nix +++ b/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/pkgs/development/tools/ocaml/dune/2.nix b/pkgs/development/tools/ocaml/dune/2.nix index 8183e106aa7ba..00cf1da522adb 100644 --- a/pkgs/development/tools/ocaml/dune/2.nix +++ b/pkgs/development/tools/ocaml/dune/2.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, ocaml, findlib }: +{ 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 @@ -25,8 +25,8 @@ stdenv.mkDerivation rec { 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; + maintainers = [ lib.maintainers.vbgl lib.maintainers.marsam ]; + license = lib.licenses.mit; inherit (ocaml.meta) platforms; }; } diff --git a/pkgs/development/tools/ocaml/findlib/default.nix b/pkgs/development/tools/ocaml/findlib/default.nix index 1354e158a8e6b..8752b2edb66ed 100644 --- a/pkgs/development/tools/ocaml/findlib/default.nix +++ b/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/pkgs/development/tools/ocaml/oasis/default.nix b/pkgs/development/tools/ocaml/oasis/default.nix index a0932d919c08f..6854c7c20ca3f 100644 --- a/pkgs/development/tools/ocaml/oasis/default.nix +++ b/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/pkgs/development/tools/ocaml/obuild/default.nix b/pkgs/development/tools/ocaml/obuild/default.nix index 5e851a93205b8..e31334000da0d 100644 --- a/pkgs/development/tools/ocaml/obuild/default.nix +++ b/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/pkgs/development/tools/ocaml/ocamlbuild/default.nix b/pkgs/development/tools/ocaml/ocamlbuild/default.nix index 7270386972de0..c74794b35c957 100644 --- a/pkgs/development/tools/ocaml/ocamlbuild/default.nix +++ b/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/pkgs/development/tools/ocaml/ocamlify/default.nix b/pkgs/development/tools/ocaml/ocamlify/default.nix index 9b06a55f07d09..a43903c34d380 100644 --- a/pkgs/development/tools/ocaml/ocamlify/default.nix +++ b/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/pkgs/development/tools/ocaml/ocamlmod/default.nix b/pkgs/development/tools/ocaml/ocamlmod/default.nix index 49342d7b84859..77d3902955127 100644 --- a/pkgs/development/tools/ocaml/ocamlmod/default.nix +++ b/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/pkgs/development/tools/ocaml/ocp-build/default.nix b/pkgs/development/tools/ocaml/ocp-build/default.nix index 57db516122453..655f7b4d4c2f9 100644 --- a/pkgs/development/tools/ocaml/ocp-build/default.nix +++ b/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/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix b/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix index 476c98ce5bc64..b12aa2e6d6deb 100644 --- a/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix +++ b/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/pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix b/pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix index b840cb7736b7b..047246cd0a0da 100644 --- a/pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix +++ b/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 diff --git a/pkgs/development/tools/ocaml/omake/default.nix b/pkgs/development/tools/ocaml/omake/default.nix index 2afe0d1e9f52d..bcfd86a2d4dec 100644 --- a/pkgs/development/tools/ocaml/omake/default.nix +++ b/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/pkgs/development/tools/ocaml/opaline/default.nix b/pkgs/development/tools/ocaml/opaline/default.nix index a49749ad716f5..9cdacd289d493 100644 --- a/pkgs/development/tools/ocaml/opaline/default.nix +++ b/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/pkgs/development/tools/ocaml/opam/1.2.2.nix b/pkgs/development/tools/ocaml/opam/1.2.2.nix index e6c08b97aca4a..a128f2144e9f3 100644 --- a/pkgs/development/tools/ocaml/opam/1.2.2.nix +++ b/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/pkgs/development/tools/ocaml/opam/default.nix b/pkgs/development/tools/ocaml/opam/default.nix index 9e95db79dd0b7..4fe408fb77f06 100644 --- a/pkgs/development/tools/ocaml/opam/default.nix +++ b/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/pkgs/development/tools/ocaml/utop/default.nix b/pkgs/development/tools/ocaml/utop/default.nix index 2c4c330b286d2..622ac80306f73 100644 --- a/pkgs/development/tools/ocaml/utop/default.nix +++ b/pkgs/development/tools/ocaml/utop/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl, ocaml, findlib +{ 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 @@ -58,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 ''; @@ -70,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/pkgs/development/tools/omniorb/default.nix b/pkgs/development/tools/omniorb/default.nix index 2ab8fa23dde04..74341c0a7b492 100644 --- a/pkgs/development/tools/omniorb/default.nix +++ b/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/pkgs/development/tools/omnisharp-roslyn/default.nix b/pkgs/development/tools/omnisharp-roslyn/default.nix index 9dd085b421fe3..ac5ab022ef12a 100644 --- a/pkgs/development/tools/omnisharp-roslyn/default.nix +++ b/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/pkgs/development/tools/out-of-tree/default.nix b/pkgs/development/tools/out-of-tree/default.nix index 7573776421904..9ab69d1d5d85a 100644 --- a/pkgs/development/tools/out-of-tree/default.nix +++ b/pkgs/development/tools/out-of-tree/default.nix @@ -18,7 +18,7 @@ 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 lib; { diff --git a/pkgs/development/tools/packet/default.nix b/pkgs/development/tools/packet/default.nix index 9bca1ec75b67c..31ccf19bb05fa 100644 --- a/pkgs/development/tools/packet/default.nix +++ b/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/pkgs/development/tools/parsing/antlr/3.5.nix b/pkgs/development/tools/parsing/antlr/3.5.nix index 39c022604d8ff..2efe752c3635b 100644 --- a/pkgs/development/tools/parsing/antlr/3.5.nix +++ b/pkgs/development/tools/parsing/antlr/3.5.nix @@ -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/pkgs/development/tools/parsing/antlr/4.8.nix b/pkgs/development/tools/parsing/antlr/4.8.nix index acf46a4401f46..0708ba754b2a3 100644 --- a/pkgs/development/tools/parsing/antlr/4.8.nix +++ b/pkgs/development/tools/parsing/antlr/4.8.nix @@ -19,8 +19,8 @@ let outputs = [ "out" "dev" "doc" ]; nativeBuildInputs = [ cmake ninja pkg-config ]; - buildInputs = stdenv.lib.optional stdenv.isLinux libuuid - ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.CoreFoundation; + buildInputs = lib.optional stdenv.isLinux libuuid + ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.CoreFoundation; postUnpack = '' export sourceRoot=$sourceRoot/runtime/Cpp diff --git a/pkgs/development/tools/parsing/bison/default.nix b/pkgs/development/tools/parsing/bison/default.nix index aa8d8df2c1d18..662961ae46aaf 100644 --- a/pkgs/development/tools/parsing/bison/default.nix +++ b/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/pkgs/development/tools/parsing/flex/2.5.35.nix b/pkgs/development/tools/parsing/flex/2.5.35.nix index c352b5a38374a..b2245ff9c9b92 100644 --- a/pkgs/development/tools/parsing/flex/2.5.35.nix +++ b/pkgs/development/tools/parsing/flex/2.5.35.nix @@ -16,7 +16,7 @@ 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" ]; diff --git a/pkgs/development/tools/parsing/flex/2.6.1.nix b/pkgs/development/tools/parsing/flex/2.6.1.nix index 3a032e60c32f6..cc0ecb148c445 100644 --- a/pkgs/development/tools/parsing/flex/2.6.1.nix +++ b/pkgs/development/tools/parsing/flex/2.6.1.nix @@ -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,12 +18,12 @@ 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//;' ''; diff --git a/pkgs/development/tools/parsing/flex/default.nix b/pkgs/development/tools/parsing/flex/default.nix index c77c1f73c69e6..42b007300a951 100644 --- a/pkgs/development/tools/parsing/flex/default.nix +++ b/pkgs/development/tools/parsing/flex/default.nix @@ -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,12 +33,12 @@ 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//;' ''; diff --git a/pkgs/development/tools/parsing/ragel/default.nix b/pkgs/development/tools/parsing/ragel/default.nix index fd7308097110e..6bbcf36cd2c22 100644 --- a/pkgs/development/tools/parsing/ragel/default.nix +++ b/pkgs/development/tools/parsing/ragel/default.nix @@ -13,15 +13,15 @@ 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; @@ -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/pkgs/development/tools/pgformatter/default.nix b/pkgs/development/tools/pgformatter/default.nix index 0e3e1b7e9ca65..d5c6872cd7dc3 100644 --- a/pkgs/development/tools/pgformatter/default.nix +++ b/pkgs/development/tools/pgformatter/default.nix @@ -24,8 +24,8 @@ 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 ''; diff --git a/pkgs/development/tools/pgloader/default.nix b/pkgs/development/tools/pgloader/default.nix index 0e16726bb8078..94217a765e28d 100644 --- a/pkgs/development/tools/pgloader/default.nix +++ b/pkgs/development/tools/pgloader/default.nix @@ -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 diff --git a/pkgs/development/tools/phantomjs/default.nix b/pkgs/development/tools/phantomjs/default.nix index f042aa35b6f6b..66cdb09cf15a7 100644 --- a/pkgs/development/tools/phantomjs/default.nix +++ b/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/pkgs/development/tools/phantomjs2/default.nix b/pkgs/development/tools/phantomjs2/default.nix index 9fc2f416b7678..594deeb1c7305 100644 --- a/pkgs/development/tools/phantomjs2/default.nix +++ b/pkgs/development/tools/phantomjs2/default.nix @@ -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,7 +92,7 @@ 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 lib; { diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix b/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix index 3106575891410..21e43cdd8c970 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix @@ -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 ]; } ); @@ -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"; @@ -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; diff --git a/pkgs/development/tools/profiling/EZTrace/default.nix b/pkgs/development/tools/profiling/EZTrace/default.nix index e856c1f718a47..e057fc8ebe18c 100644 --- a/pkgs/development/tools/profiling/EZTrace/default.nix +++ b/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/pkgs/development/tools/profiling/oprofile/default.nix b/pkgs/development/tools/profiling/oprofile/default.nix index 335b9bef4cdd5..6cd3ea8002786 100644 --- a/pkgs/development/tools/profiling/oprofile/default.nix +++ b/pkgs/development/tools/profiling/oprofile/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPackages +{ lib, stdenv, buildPackages , fetchurl, pkg-config , libbfd, popt, zlib, linuxHeaders, libiberty_static , withGUI ? false, qt4 ? null @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { 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/pkgs/development/tools/profiling/sysprof/capture.nix b/pkgs/development/tools/profiling/sysprof/capture.nix index a1f5d00332c47..a9443eeadf6e2 100644 --- a/pkgs/development/tools/profiling/sysprof/capture.nix +++ b/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/pkgs/development/tools/profiling/sysprof/default.nix b/pkgs/development/tools/profiling/sysprof/default.nix index 8144bae48c86f..9e749adea2091 100644 --- a/pkgs/development/tools/profiling/sysprof/default.nix +++ b/pkgs/development/tools/profiling/sysprof/default.nix @@ -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"; }; diff --git a/pkgs/development/tools/purescript/spago/spago.nix b/pkgs/development/tools/purescript/spago/spago.nix index ed0ce05843bb1..3f54a4f9c0eea 100644 --- a/pkgs/development/tools/purescript/spago/spago.nix +++ b/pkgs/development/tools/purescript/spago/spago.nix @@ -6,7 +6,7 @@ , 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 +, lib, stdenv, stm, stringsearch, tar, template-haskell, temporary, text , time, transformers, turtle, unliftio, unordered-containers , utf8-string, vector, versions, with-utf8, zlib }: @@ -41,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/pkgs/development/tools/py-spy/default.nix b/pkgs/development/tools/py-spy/default.nix index a8973cd508430..a9634ec53c72b 100644 --- a/pkgs/development/tools/py-spy/default.nix +++ b/pkgs/development/tools/py-spy/default.nix @@ -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" ''; diff --git a/pkgs/development/tools/pydb/default.nix b/pkgs/development/tools/pydb/default.nix index 67e7a879d883f..eaaa057dc0a27 100644 --- a/pkgs/development/tools/pydb/default.nix +++ b/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/pkgs/development/tools/quilt/default.nix b/pkgs/development/tools/quilt/default.nix index dece0a7b44ba5..71cf10e63b91a 100644 --- a/pkgs/development/tools/quilt/default.nix +++ b/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/pkgs/development/tools/rdocker/default.nix b/pkgs/development/tools/rdocker/default.nix index 16e832a99b84d..098d7a5931487 100644 --- a/pkgs/development/tools/rdocker/default.nix +++ b/pkgs/development/tools/rdocker/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation { postInstall = '' wrapProgram $out/bin/rdocker \ - --prefix PATH : ${stdenv.lib.makeBinPath [ openssh ]} + --prefix PATH : ${lib.makeBinPath [ openssh ]} ''; 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/pkgs/development/tools/react-native-debugger/default.nix b/pkgs/development/tools/react-native-debugger/default.nix index f5174da13a1b3..06b5dd794015c 100644 --- a/pkgs/development/tools/react-native-debugger/default.nix +++ b/pkgs/development/tools/react-native-debugger/default.nix @@ -3,7 +3,7 @@ }: let - rpath = stdenv.lib.makeLibraryPath [ + rpath = lib.makeLibraryPath [ cairo stdenv.cc.cc gdk-pixbuf diff --git a/pkgs/development/tools/repository-managers/nexus/default.nix b/pkgs/development/tools/repository-managers/nexus/default.nix index 62b9df741270c..828b8e5b1cd60 100644 --- a/pkgs/development/tools/repository-managers/nexus/default.nix +++ b/pkgs/development/tools/repository-managers/nexus/default.nix @@ -33,7 +33,7 @@ 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 ''; diff --git a/pkgs/development/tools/rtags/default.nix b/pkgs/development/tools/rtags/default.nix index ec3fcf9cd3949..e5da0ddf59ac3 100644 --- a/pkgs/development/tools/rtags/default.nix +++ b/pkgs/development/tools/rtags/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { 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/pkgs/development/tools/rund/default.nix b/pkgs/development/tools/rund/default.nix index 0752f803c3c91..186e044318e09 100644 --- a/pkgs/development/tools/rund/default.nix +++ b/pkgs/development/tools/rund/default.nix @@ -44,6 +44,6 @@ stdenv.mkDerivation rec { 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/pkgs/development/tools/rust/cargo-asm/default.nix b/pkgs/development/tools/rust/cargo-asm/default.nix index 490fa9e09c37c..f453955a5c717 100644 --- a/pkgs/development/tools/rust/cargo-asm/default.nix +++ b/pkgs/development/tools/rust/cargo-asm/default.nix @@ -13,7 +13,7 @@ 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. diff --git a/pkgs/development/tools/rust/cargo-c/default.nix b/pkgs/development/tools/rust/cargo-c/default.nix index e28f9165ebbee..7b9aa5cf6101f 100644 --- a/pkgs/development/tools/rust/cargo-c/default.nix +++ b/pkgs/development/tools/rust/cargo-c/default.nix @@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec { 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/pkgs/development/tools/rust/cargo-cache/default.nix b/pkgs/development/tools/rust/cargo-cache/default.nix index 882f0408cec1c..021e19b9cd97e 100644 --- a/pkgs/development/tools/rust/cargo-cache/default.nix +++ b/pkgs/development/tools/rust/cargo-cache/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-sZxkEQBZ2PJXSvwcA+IL7uW/gcnzuzRcDklNW5vpzWg="; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ]; + buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; checkFlagsArray = [ "offline_tests" ]; diff --git a/pkgs/development/tools/rust/cargo-crev/default.nix b/pkgs/development/tools/rust/cargo-crev/default.nix index f2c8d72ec18c2..e3c16b09ef34d 100644 --- a/pkgs/development/tools/rust/cargo-crev/default.nix +++ b/pkgs/development/tools/rust/cargo-crev/default.nix @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { 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 lib; { description = "A cryptographically verifiable code review system for the cargo (Rust) package manager"; diff --git a/pkgs/development/tools/rust/cargo-deny/default.nix b/pkgs/development/tools/rust/cargo-deny/default.nix index 4c2ee35bdf726..ba126e57a1452 100644 --- a/pkgs/development/tools/rust/cargo-deny/default.nix +++ b/pkgs/development/tools/rust/cargo-deny/default.nix @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec { 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/pkgs/development/tools/rust/cargo-fund/default.nix b/pkgs/development/tools/rust/cargo-fund/default.nix index 4e30ea48272d1..70a2e6feca640 100644 --- a/pkgs/development/tools/rust/cargo-fund/default.nix +++ b/pkgs/development/tools/rust/cargo-fund/default.nix @@ -18,7 +18,7 @@ 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 lib; { description = "Discover funding links for your project's dependencies"; diff --git a/pkgs/development/tools/rust/cargo-geiger/default.nix b/pkgs/development/tools/rust/cargo-geiger/default.nix index 9daa3b251e8e3..3b2702c66f647 100644 --- a/pkgs/development/tools/rust/cargo-geiger/default.nix +++ b/pkgs/development/tools/rust/cargo-geiger/default.nix @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { # 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/pkgs/development/tools/rust/cargo-generate/default.nix b/pkgs/development/tools/rust/cargo-generate/default.nix index 3a4c4c44ae7d4..635f36ee834c9 100644 --- a/pkgs/development/tools/rust/cargo-generate/default.nix +++ b/pkgs/development/tools/rust/cargo-generate/default.nix @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { 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 diff --git a/pkgs/development/tools/rust/cargo-inspect/default.nix b/pkgs/development/tools/rust/cargo-inspect/default.nix index 5a8c9150279ab..9339660388b58 100644 --- a/pkgs/development/tools/rust/cargo-inspect/default.nix +++ b/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/pkgs/development/tools/rust/cargo-make/default.nix b/pkgs/development/tools/rust/cargo-make/default.nix index c90761309e677..e393184aebdaf 100644 --- a/pkgs/development/tools/rust/cargo-make/default.nix +++ b/pkgs/development/tools/rust/cargo-make/default.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] - ++ stdenv.lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; + ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; cargoSha256 = "sha256-Qh14lks72bsetwyv0ALF7nZo3m3FDEmVxzFkHJoEuzE="; diff --git a/pkgs/development/tools/rust/cargo-raze/default.nix b/pkgs/development/tools/rust/cargo-raze/default.nix index 56e38f78ca05a..11a52e6ea08fd 100644 --- a/pkgs/development/tools/rust/cargo-raze/default.nix +++ b/pkgs/development/tools/rust/cargo-raze/default.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ curl libgit2 openssl ] - ++ stdenv.lib.optional stdenv.isDarwin Security; + ++ lib.optional stdenv.isDarwin Security; doCheck = true; diff --git a/pkgs/development/tools/rust/cargo-udeps/default.nix b/pkgs/development/tools/rust/cargo-udeps/default.nix index 9da28921ea766..dcbf539c1c14d 100644 --- a/pkgs/development/tools/rust/cargo-udeps/default.nix +++ b/pkgs/development/tools/rust/cargo-udeps/default.nix @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { 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; diff --git a/pkgs/development/tools/rust/cbindgen/default.nix b/pkgs/development/tools/rust/cbindgen/default.nix index db2a1c4c6607b..5080905533757 100644 --- a/pkgs/development/tools/rust/cbindgen/default.nix +++ b/pkgs/development/tools/rust/cbindgen/default.nix @@ -13,7 +13,7 @@ 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 diff --git a/pkgs/development/tools/rust/maturin/default.nix b/pkgs/development/tools/rust/maturin/default.nix index b2340b21689c0..ff52824ef9a4b 100644 --- a/pkgs/development/tools/rust/maturin/default.nix +++ b/pkgs/development/tools/rust/maturin/default.nix @@ -19,8 +19,8 @@ in rustPlatform.buildRustPackage rec { 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; diff --git a/pkgs/development/tools/rust/racer/default.nix b/pkgs/development/tools/rust/racer/default.nix index d5482d58457c3..3ad4b54b47a06 100644 --- a/pkgs/development/tools/rust/racer/default.nix +++ b/pkgs/development/tools/rust/racer/default.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { 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; diff --git a/pkgs/development/tools/rust/racerd/default.nix b/pkgs/development/tools/rust/racerd/default.nix index 19cc3fdf58046..33d6721610e92 100644 --- a/pkgs/development/tools/rust/racerd/default.nix +++ b/pkgs/development/tools/rust/racerd/default.nix @@ -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; diff --git a/pkgs/development/tools/rust/rustup/default.nix b/pkgs/development/tools/rust/rustup/default.nix index fa9b39e84a787..56097f9b98c3a 100644 --- a/pkgs/development/tools/rust/rustup/default.nix +++ b/pkgs/development/tools/rust/rustup/default.nix @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ curl zlib - ] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices Security ]; + ] ++ lib.optionals stdenv.isDarwin [ CoreServices Security ]; cargoBuildFlags = [ "--features no-self-update" ]; diff --git a/pkgs/development/tools/sauce-connect/default.nix b/pkgs/development/tools/sauce-connect/default.nix index 9560d45d68153..12082de984225 100644 --- a/pkgs/development/tools/sauce-connect/default.nix +++ b/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/pkgs/development/tools/selenium/chromedriver/default.nix b/pkgs/development/tools/selenium/chromedriver/default.nix index 5f01b98e8d113..d777d788aec69 100644 --- a/pkgs/development/tools/selenium/chromedriver/default.nix +++ b/pkgs/development/tools/selenium/chromedriver/default.nix @@ -5,7 +5,7 @@ }: 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,7 +44,7 @@ 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" ''; diff --git a/pkgs/development/tools/selenium/htmlunit-driver/default.nix b/pkgs/development/tools/selenium/htmlunit-driver/default.nix index 400cf24012a98..be3048cca25bf 100644 --- a/pkgs/development/tools/selenium/htmlunit-driver/default.nix +++ b/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/pkgs/development/tools/selenium/selendroid/default.nix b/pkgs/development/tools/selenium/selendroid/default.nix index bf9eabec53c03..c25190cab74e9 100644 --- a/pkgs/development/tools/selenium/selendroid/default.nix +++ b/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/pkgs/development/tools/selenium/server/default.nix b/pkgs/development/tools/selenium/server/default.nix index a6d60e33ee36f..10893a9d17001 100644 --- a/pkgs/development/tools/selenium/server/default.nix +++ b/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/pkgs/development/tools/simavr/default.nix b/pkgs/development/tools/simavr/default.nix index 987765a321765..1d47b32510103 100644 --- a/pkgs/development/tools/simavr/default.nix +++ b/pkgs/development/tools/simavr/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { 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)" ''; diff --git a/pkgs/development/tools/slimerjs/default.nix b/pkgs/development/tools/slimerjs/default.nix index 49eea7213bd8d..b64776bac3c89 100644 --- a/pkgs/development/tools/slimerjs/default.nix +++ b/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 { @@ -43,8 +43,8 @@ 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; + license = lib.licenses.mpl20 ; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/tools/so/default.nix b/pkgs/development/tools/so/default.nix index 08481169dcdd0..99f9cdcd936ff 100644 --- a/pkgs/development/tools/so/default.nix +++ b/pkgs/development/tools/so/default.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1ddbhy1plag4ckbmlyj47wnky7vgmfa68msl3hl25h1lwmzaf1aq"; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ + buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ libiconv Security ]; diff --git a/pkgs/development/tools/sourcetrail/default.nix b/pkgs/development/tools/sourcetrail/default.nix index d1e26662f0c24..46f097e5b60a8 100644 --- a/pkgs/development/tools/sourcetrail/default.nix +++ b/pkgs/development/tools/sourcetrail/default.nix @@ -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 diff --git a/pkgs/development/tools/sqsh/default.nix b/pkgs/development/tools/sqsh/default.nix index 6b408592a0d03..9c56efcb59fba 100644 --- a/pkgs/development/tools/sqsh/default.nix +++ b/pkgs/development/tools/sqsh/default.nix @@ -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" ''; diff --git a/pkgs/development/tools/summon/default.nix b/pkgs/development/tools/summon/default.nix index e01c60e3a89cf..5d851adc5abcb 100644 --- a/pkgs/development/tools/summon/default.nix +++ b/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/pkgs/development/tools/sumneko-lua-language-server/default.nix b/pkgs/development/tools/sumneko-lua-language-server/default.nix index 05281f1bb83c2..d63493ba7a1e6 100644 --- a/pkgs/development/tools/sumneko-lua-language-server/default.nix +++ b/pkgs/development/tools/sumneko-lua-language-server/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ninja, makeWrapper }: +{ lib, stdenv, fetchFromGitHub, ninja, makeWrapper }: stdenv.mkDerivation rec { pname = "sumneko-lua-language-server"; @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { --metapath='~/.cache/sumneko_lua/meta'" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Lua Language Server coded by Lua "; homepage = "https://github.com/sumneko/lua-language-server"; license = licenses.mit; diff --git a/pkgs/development/tools/the-way/default.nix b/pkgs/development/tools/the-way/default.nix index 7eec364c47b12..1e88cfcdcc113 100644 --- a/pkgs/development/tools/the-way/default.nix +++ b/pkgs/development/tools/the-way/default.nix @@ -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 = '' diff --git a/pkgs/development/tools/trellis/default.nix b/pkgs/development/tools/trellis/default.nix index 003e3cec9cee3..6ce1ad9a38aa8 100644 --- a/pkgs/development/tools/trellis/default.nix +++ b/pkgs/development/tools/trellis/default.nix @@ -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 = [ @@ -54,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/pkgs/development/tools/tychus/default.nix b/pkgs/development/tools/tychus/default.nix index edd428480a008..8b330b36ea99c 100644 --- a/pkgs/development/tools/tychus/default.nix +++ b/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/pkgs/development/tools/uftrace/default.nix b/pkgs/development/tools/uftrace/default.nix index 2fbf736653826..03ee72289014a 100644 --- a/pkgs/development/tools/uftrace/default.nix +++ b/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/pkgs/development/tools/vcstool/default.nix b/pkgs/development/tools/vcstool/default.nix index 95ebfcf64b4c0..65f91b3324f54 100644 --- a/pkgs/development/tools/vcstool/default.nix +++ b/pkgs/development/tools/vcstool/default.nix @@ -14,7 +14,7 @@ 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 diff --git a/pkgs/development/tools/vultr/default.nix b/pkgs/development/tools/vultr/default.nix index 7c396f69f259f..b9ca0febf971a 100644 --- a/pkgs/development/tools/vultr/default.nix +++ b/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/pkgs/development/tools/wasm-pack/default.nix b/pkgs/development/tools/wasm-pack/default.nix index c2a70f2de29a6..94ee6d3a1bac6 100644 --- a/pkgs/development/tools/wasm-pack/default.nix +++ b/pkgs/development/tools/wasm-pack/default.nix @@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec { # 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. diff --git a/pkgs/development/tools/wiggle/default.nix b/pkgs/development/tools/wiggle/default.nix index b89d36273f86a..e861f20a9194d 100644 --- a/pkgs/development/tools/wiggle/default.nix +++ b/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/pkgs/development/tools/wrangler/default.nix b/pkgs/development/tools/wrangler/default.nix index b7a37f8b8d76d..c7b1c0329f3a7 100644 --- a/pkgs/development/tools/wrangler/default.nix +++ b/pkgs/development/tools/wrangler/default.nix @@ -13,10 +13,10 @@ rustPlatform.buildRustPackage rec { 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 diff --git a/pkgs/development/tools/xcbuild/default.nix b/pkgs/development/tools/xcbuild/default.nix index abc48b41446ea..1f38e49daee51 100644 --- a/pkgs/development/tools/xcbuild/default.nix +++ b/pkgs/development/tools/xcbuild/default.nix @@ -36,11 +36,11 @@ 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 ' \ -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 \ @@ -59,7 +59,7 @@ in stdenv.mkDerivation { nativeBuildInputs = [ cmake ninja ]; buildInputs = [ zlib libxml2 libpng ] - ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices CoreGraphics ImageIO ]; + ++ lib.optionals stdenv.isDarwin [ CoreServices CoreGraphics ImageIO ]; meta = with lib; { description = "Xcode-compatible build tool"; -- cgit 1.4.1