diff options
Diffstat (limited to 'nixpkgs/pkgs/development/tools')
773 files changed, 3453 insertions, 2558 deletions
diff --git a/nixpkgs/pkgs/development/tools/alloy/default.nix b/nixpkgs/pkgs/development/tools/alloy/default.nix index 44a6d7329baa..1dade32ac64d 100644 --- a/nixpkgs/pkgs/development/tools/alloy/default.nix +++ b/nixpkgs/pkgs/development/tools/alloy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, jre, makeWrapper, makeDesktopItem }: +{ lib, stdenv, fetchurl, jre, makeWrapper, makeDesktopItem }: let generic = { major, version, src }: @@ -30,7 +30,7 @@ let generic = { major, version, src }: cp -r ${desktopItem}/share/applications $out/share ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Language & tool for relational models"; longDescription = '' Alloy is a language for describing structures and a tool for exploring diff --git a/nixpkgs/pkgs/development/tools/ameba/default.nix b/nixpkgs/pkgs/development/tools/ameba/default.nix index b46f6efd634c..f8cb74411161 100644 --- a/nixpkgs/pkgs/development/tools/ameba/default.nix +++ b/nixpkgs/pkgs/development/tools/ameba/default.nix @@ -11,7 +11,7 @@ crystal.buildCrystalPackage rec { sha256 = "0yhb8vfrfzsm3a45h2jmcrn1n7jy3zn2hwims3dikgq8kaggws9y"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A static code analysis tool for Crystal"; homepage = "https://crystal-ameba.github.io"; license = licenses.mit; diff --git a/nixpkgs/pkgs/development/tools/ammonite/default.nix b/nixpkgs/pkgs/development/tools/ammonite/default.nix index 20b26437e75f..eb827882b752 100644 --- a/nixpkgs/pkgs/development/tools/ammonite/default.nix +++ b/nixpkgs/pkgs/development/tools/ammonite/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, jre, nixosTests, writeScript, common-updater-scripts, git +{ lib, stdenv, fetchurl, jre, nixosTests, writeScript, common-updater-scripts, git , nixfmt, nix, coreutils, gnused, disableRemoteLogging ? true }: -with stdenv.lib; +with lib; let repo = "git@github.com:lihaoyi/Ammonite.git"; @@ -34,7 +34,7 @@ let #!${stdenv.shell} set -o errexit PATH=${ - stdenv.lib.makeBinPath [ + lib.makeBinPath [ common-updater-scripts coreutils git diff --git a/nixpkgs/pkgs/development/tools/analysis/autoflake/default.nix b/nixpkgs/pkgs/development/tools/analysis/autoflake/default.nix index 396a5817c672..884b511b8af1 100644 --- a/nixpkgs/pkgs/development/tools/analysis/autoflake/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/autoflake/default.nix @@ -1,4 +1,4 @@ -{ stdenv, python3Packages }: +{ lib, stdenv, python3Packages }: with python3Packages; buildPythonApplication rec { @@ -14,7 +14,7 @@ buildPythonApplication rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/myint/autoflake"; description = "A simple program which removes unused imports and unused variables as reported by pyflakes"; license = licenses.mit; diff --git a/nixpkgs/pkgs/development/tools/analysis/bingrep/default.nix b/nixpkgs/pkgs/development/tools/analysis/bingrep/default.nix index 236669dc54f7..ae54723dda3b 100644 --- a/nixpkgs/pkgs/development/tools/analysis/bingrep/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/bingrep/default.nix @@ -1,19 +1,19 @@ -{ stdenv, rustPlatform, fetchFromGitHub }: +{ lib, stdenv, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "bingrep"; - version = "0.8.2"; + version = "0.8.5"; src = fetchFromGitHub { owner = "m4b"; repo = pname; rev = "v${version}"; - sha256 = "1qv41g7mblnq07145m03s2fhbrjfsc0924zb9z4cp159ygkggxcy"; + sha256 = "sha256-ayA3aEidZPa5GJgbbm5K3X2Xgd5Eb6TgUU80Gw/p07w="; }; - cargoSha256 = "1z53408mcmy698xb2sxj1s1p9xc9srlkj0v8wswhdp7nq27vwkdj"; + cargoSha256 = "sha256-3eGYU5O7HSpawIL/8OVmROCzXfdnoMAnIujjrIp00xg="; - meta = with stdenv.lib; { + meta = with lib; { description = "Greps through binaries from various OSs and architectures, and colors them"; homepage = "https://github.com/m4b/bingrep"; license = licenses.mit; diff --git a/nixpkgs/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix b/nixpkgs/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix index b4cfa356b277..a0f251bfe910 100644 --- a/nixpkgs/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix @@ -1,4 +1,4 @@ -{ lib, pkgconfig, rustPlatform, fetchFromGitHub, openssl }: +{ lib, pkg-config, rustPlatform, fetchFromGitHub, openssl }: rustPlatform.buildRustPackage rec { pname = "cargo-tarpaulin"; @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config ]; buildInputs = [ openssl ]; diff --git a/nixpkgs/pkgs/development/tools/analysis/cccc/default.nix b/nixpkgs/pkgs/development/tools/analysis/cccc/default.nix index 374331f3ac87..bcbda8ad7e60 100644 --- a/nixpkgs/pkgs/development/tools/analysis/cccc/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/cccc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: let name = "cccc"; @@ -30,8 +30,8 @@ stdenv.mkDerivation { complexity and metrics proposed by Chidamber&Kemerer and Henry&Kafura. ''; homepage = "http://cccc.sourceforge.net/"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.linquize ]; + license = lib.licenses.gpl2; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.linquize ]; }; } diff --git a/nixpkgs/pkgs/development/tools/analysis/checkov/default.nix b/nixpkgs/pkgs/development/tools/analysis/checkov/default.nix new file mode 100644 index 000000000000..6277b1d4239e --- /dev/null +++ b/nixpkgs/pkgs/development/tools/analysis/checkov/default.nix @@ -0,0 +1,77 @@ +{ stdenv, pkgs, lib, python3, fetchFromGitHub }: + +let + pname = "checkov"; + version = "1.0.674"; + src = fetchFromGitHub { + owner = "bridgecrewio"; + repo = pname; + rev = version; + sha256 = "/S8ic5ZVxA2vd/rjRPX5gslbmnULL7BSx34vgWIsheQ="; + }; + + disabled = pkgs.python3Packages.pythonOlder "3.7"; + + # CheckOV only work with `dpath 1.5.0` + dpath = pkgs.python3Packages.buildPythonPackage rec { + pname = "dpath"; + version = "1.5.0"; + + src = pkgs.python3Packages.fetchPypi { + inherit pname version; + sha256 = "SWYVtOqEI20Y4NKGEi3nSGmmDg+H4sfsZ4f/KGxINhs="; + }; + + doCheck = false; + }; +in +python3.pkgs.buildPythonPackage rec { + inherit pname version disabled src; + + nativeBuildInputs = with python3.pkgs; [ setuptools_scm ]; + + propagatedBuildInputs = with python3.pkgs; [ + pytest + coverage + bandit + bc-python-hcl2 + deep_merge + tabulate + colorama + termcolor + junit-xml + dpath + pyyaml + boto3 + GitPython + six + jmespath + tqdm + update_checker + semantic-version + packaging + ]; + + # Both of these tests are pulling from external srouces (https://github.com/bridgecrewio/checkov/blob/f03a4204d291cf47e3753a02a9b8c8d805bbd1be/.github/workflows/build.yml) + preCheck = '' + rm -rf integration_tests/* + rm -rf tests/terraform/* + ''; + + # Wrap the executable so that the python packages are available + # it's just a shebang script which calls `python -m checkov "$@"` + postFixup = '' + wrapProgram $out/bin/checkov \ + --set PYTHONPATH $PYTHONPATH + ''; + + meta = with lib; { + homepage = "https://github.com/bridgecrewio/checkov"; + description = "Static code analysis tool for infrastructure-as-code"; + longDescription = '' + Prevent cloud misconfigurations during build-time for Terraform, Cloudformation, Kubernetes, Serverless framework and other infrastructure-as-code-languages with Checkov by Bridgecrew. + ''; + license = licenses.asl20; + maintainers = with maintainers; [ anhdle14 ]; + }; +} diff --git a/nixpkgs/pkgs/development/tools/analysis/checkstyle/default.nix b/nixpkgs/pkgs/development/tools/analysis/checkstyle/default.nix index 786ed360ef33..e5325f7da8c7 100644 --- a/nixpkgs/pkgs/development/tools/analysis/checkstyle/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/checkstyle/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl, makeWrapper, jre }: +{ lib, stdenv, fetchurl, makeWrapper, jre }: stdenv.mkDerivation rec { - version = "8.38"; + version = "8.39"; pname = "checkstyle"; src = fetchurl { url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar"; - sha256 = "1j4k75iv32fsp40ajdfm99zady5c0h0f39xvmv70frp8p58kq3rl"; + sha256 = "sha256-CPPSJVKf01TA89Qk/uyvIU+ejo5JyT4Mc35KKJPv4IE="; }; nativeBuildInputs = [ makeWrapper ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Checks Java source against a coding standard"; longDescription = '' checkstyle is a development tool to help programmers write Java code that diff --git a/nixpkgs/pkgs/development/tools/analysis/clang-analyzer/default.nix b/nixpkgs/pkgs/development/tools/analysis/clang-analyzer/default.nix index 43b32052bf3c..4752b31649d3 100644 --- a/nixpkgs/pkgs/development/tools/analysis/clang-analyzer/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/clang-analyzer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, clang, llvmPackages, perl, makeWrapper, python3 }: +{ lib, stdenv, fetchurl, clang, llvmPackages, perl, makeWrapper, python3 }: stdenv.mkDerivation rec { pname = "clang-analyzer"; @@ -27,8 +27,8 @@ stdenv.mkDerivation rec { meta = { description = "Clang Static Analyzer"; homepage = "http://clang-analyzer.llvm.org"; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + license = lib.licenses.bsd3; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.thoughtpolice ]; }; } diff --git a/nixpkgs/pkgs/development/tools/analysis/coan/default.nix b/nixpkgs/pkgs/development/tools/analysis/coan/default.nix index 4c6e9f1a078c..1e0b79e0daa5 100644 --- a/nixpkgs/pkgs/development/tools/analysis/coan/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/coan/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl }: +{ lib, stdenv, fetchurl, perl }: stdenv.mkDerivation rec { version = "6.0.1"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { mv -v $out/share/man/man1/coan.1.{1,gz} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "The C preprocessor chainsaw"; longDescription = '' A software engineering tool for analysing preprocessor-based diff --git a/nixpkgs/pkgs/development/tools/analysis/codeql/default.nix b/nixpkgs/pkgs/development/tools/analysis/codeql/default.nix index fc37324bc925..f3ad1d81e57d 100644 --- a/nixpkgs/pkgs/development/tools/analysis/codeql/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/codeql/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchzip , zlib , xorg @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { pname = "codeql"; - version = "2.4.0"; + version = "2.4.1"; dontConfigure = true; dontBuild = true; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { src = fetchzip { url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip"; - sha256 = "1mplya2dyqqmm6gj4if2k4h2fra15rxf2yfnhphqhz40kz75sxk8"; + sha256 = "sha256-UHH+nV62jHvEY6T5UKz5cm9zse9pWHPAjjsGHfpPoPY="; }; nativeBuildInputs = [ @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { ln -s $out/codeql/codeql $out/bin/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Semantic code analysis engine"; homepage = "https://semmle.com/codeql"; maintainers = [ maintainers.dump_stack ]; diff --git a/nixpkgs/pkgs/development/tools/analysis/cov-build/default.nix b/nixpkgs/pkgs/development/tools/analysis/cov-build/default.nix index bd8c5c37c864..93a4ffab388d 100644 --- a/nixpkgs/pkgs/development/tools/analysis/cov-build/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/cov-build/default.nix @@ -1,4 +1,4 @@ -{ stdenv, requireFile }: +{ lib, stdenv, requireFile }: let message = '' @@ -41,8 +41,8 @@ stdenv.mkDerivation rec { meta = { description = "Coverity Scan build tools"; homepage = "https://scan.coverity.com"; - license = stdenv.lib.licenses.unfreeRedistributable; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + license = lib.licenses.unfreeRedistributable; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.thoughtpolice ]; }; } diff --git a/nixpkgs/pkgs/development/tools/analysis/coz/default.nix b/nixpkgs/pkgs/development/tools/analysis/coz/default.nix index 42b47a9a8fd8..17968a466bf4 100644 --- a/nixpkgs/pkgs/development/tools/analysis/coz/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/coz/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , libelfin , ncurses @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/plasma-umass/coz"; description = "Profiler based on casual profiling"; - license = stdenv.lib.licenses.bsd2; - maintainers = with stdenv.lib.maintainers; [ zimbatm ]; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ zimbatm ]; }; } diff --git a/nixpkgs/pkgs/development/tools/analysis/cppcheck/default.nix b/nixpkgs/pkgs/development/tools/analysis/cppcheck/default.nix index 91bcecbb43d1..30c0614446e6 100644 --- a/nixpkgs/pkgs/development/tools/analysis/cppcheck/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/cppcheck/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libxslt, docbook_xsl, docbook_xml_dtd_45, pcre, withZ3 ? true, z3 }: +{ lib, stdenv, fetchurl, libxslt, docbook_xsl, docbook_xml_dtd_45, pcre, withZ3 ? true, z3 }: stdenv.mkDerivation rec { pname = "cppcheck"; @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { sha256 = "0mlw0z20qf0g9qrmdmbykzf87wlcgmah8bacmp4mk6dwfzr9g9n3"; }; - buildInputs = [ pcre ] ++ stdenv.lib.optionals withZ3 [ z3 ]; + buildInputs = [ pcre ] ++ lib.optionals withZ3 [ z3 ]; nativeBuildInputs = [ libxslt docbook_xsl docbook_xml_dtd_45 ]; makeFlags = [ "PREFIX=$(out)" "FILESDIR=$(out)/cfg" "HAVE_RULES=yes" ] - ++ stdenv.lib.optionals withZ3 [ "USE_Z3=yes" "CPPFLAGS=-DNEW_Z3=1" ]; + ++ lib.optionals withZ3 [ "USE_Z3=yes" "CPPFLAGS=-DNEW_Z3=1" ]; outputs = [ "out" "man" ]; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { cp cppcheck.1 $man/share/man/man1/cppcheck.1 ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A static analysis tool for C/C++ code"; longDescription = '' Check C/C++ code for memory leaks, mismatching allocation-deallocation, diff --git a/nixpkgs/pkgs/development/tools/analysis/egypt/default.nix b/nixpkgs/pkgs/development/tools/analysis/egypt/default.nix index 080b19bf163b..cfb974c86ddd 100644 --- a/nixpkgs/pkgs/development/tools/analysis/egypt/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/egypt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perlPackages }: +{ lib, stdenv, fetchurl, perlPackages }: perlPackages.buildPerlPackage rec { pname = "egypt"; @@ -15,7 +15,7 @@ perlPackages.buildPerlPackage rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Tool for making call graphs of C programmes"; longDescription = '' Egypt is a simple tool for creating call graphs of C programs. It neither diff --git a/nixpkgs/pkgs/development/tools/analysis/emma/default.nix b/nixpkgs/pkgs/development/tools/analysis/emma/default.nix index 3cc16c07ec59..97f93722a182 100644 --- a/nixpkgs/pkgs/development/tools/analysis/emma/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/emma/default.nix @@ -1,8 +1,8 @@ -{stdenv, fetchurl, unzip}: +{lib, stdenv, fetchurl, unzip}: stdenv.mkDerivation { name = "emma-2.0.5312"; - + src = fetchurl { url = "mirror://sourceforge/emma/emma-2.0.5312.zip"; sha256 = "0xxy39s2lvgs56vicjzpcz936l1vjaplliwa0dm7v3iyvw6jn7vj"; @@ -18,7 +18,7 @@ stdenv.mkDerivation { meta = { homepage = "http://emma.sourceforge.net/"; description = "A code coverage tool for Java"; - platforms = stdenv.lib.platforms.unix; - license = stdenv.lib.licenses.cpl10; + platforms = lib.platforms.unix; + license = lib.licenses.cpl10; }; } diff --git a/nixpkgs/pkgs/development/tools/analysis/evmdis/default.nix b/nixpkgs/pkgs/development/tools/analysis/evmdis/default.nix index 64a1c3173930..b8f3aa0ac1fb 100644 --- a/nixpkgs/pkgs/development/tools/analysis/evmdis/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/evmdis/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage { pname = "evmdis-unstable"; @@ -12,7 +12,7 @@ buildGoPackage { sha256 = "09y4j7ipgv8yd99g3xk3f079w8fqfj7kl1y7ry81ainysn0qlqrg"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/Arachnid/evmdis"; description = "Ethereum EVM disassembler"; license = [ licenses.asl20 ]; diff --git a/nixpkgs/pkgs/development/tools/analysis/findbugs/default.nix b/nixpkgs/pkgs/development/tools/analysis/findbugs/default.nix index d522b2b94227..265f62904530 100644 --- a/nixpkgs/pkgs/development/tools/analysis/findbugs/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/findbugs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { name = "findbugs-3.0.1"; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { EOF ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A static analysis tool to find bugs in Java programs automatically"; homepage = "http://findbugs.sourceforge.net/"; maintainers = with maintainers; [ pSub ]; diff --git a/nixpkgs/pkgs/development/tools/analysis/flow/default.nix b/nixpkgs/pkgs/development/tools/analysis/flow/default.nix index 80731a2106e4..fc39e86007d4 100644 --- a/nixpkgs/pkgs/development/tools/analysis/flow/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/flow/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchFromGitHub, ocamlPackages, CoreServices }: +{ lib, stdenv, fetchFromGitHub, ocamlPackages, CoreServices }: stdenv.mkDerivation rec { pname = "flow"; - version = "0.141.0"; + version = "0.143.0"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "refs/tags/v${version}"; - sha256 = "1hbq55gi834zapmly0gmg3kpqa1zwxcw4gll4g6vgzr0pfa0bwb2"; + sha256 = "sha256-j4vsuPs/xr/oy4ZWGBBCy+2mPMQtxE01gqpjsYITCa0="; }; installPhase = '' @@ -17,9 +17,9 @@ stdenv.mkDerivation rec { ''; buildInputs = (with ocamlPackages; [ ocaml findlib ocamlbuild dtoa core_kernel sedlex_2 ocaml_lwt lwt_log lwt_ppx ppx_deriving ppx_gen_rec ppx_tools_versioned visitors wtf8 ocaml-migrate-parsetree ]) - ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices ]; + ++ lib.optionals stdenv.isDarwin [ CoreServices ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A static type checker for JavaScript"; homepage = "https://flow.org/"; changelog = "https://github.com/facebook/flow/releases/tag/v${version}"; diff --git a/nixpkgs/pkgs/development/tools/analysis/frama-c/default.nix b/nixpkgs/pkgs/development/tools/analysis/frama-c/default.nix index 94012ce7ff68..394bd6558fbf 100644 --- a/nixpkgs/pkgs/development/tools/analysis/frama-c/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/frama-c/default.nix @@ -73,8 +73,8 @@ stdenv.mkDerivation rec { meta = { description = "An extensible and collaborative platform dedicated to source-code analysis of C software"; homepage = "http://frama-c.com/"; - license = stdenv.lib.licenses.lgpl21; - maintainers = with stdenv.lib.maintainers; [ thoughtpolice amiddelk ]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.lgpl21; + maintainers = with lib.maintainers; [ thoughtpolice amiddelk ]; + platforms = lib.platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/tools/analysis/garcosim/tracefilegen/default.nix b/nixpkgs/pkgs/development/tools/analysis/garcosim/tracefilegen/default.nix index d0221e80b9bc..8984a395818b 100644 --- a/nixpkgs/pkgs/development/tools/analysis/garcosim/tracefilegen/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/garcosim/tracefilegen/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { cp -ar $src/Documentation/html $out/share/doc/${name}/. ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Automatically generate all types of basic memory management operations and write into trace files"; homepage = "https://github.com/GarCoSim"; maintainers = [ maintainers.cmcdragonkai ]; diff --git a/nixpkgs/pkgs/development/tools/analysis/garcosim/tracefilesim/default.nix b/nixpkgs/pkgs/development/tools/analysis/garcosim/tracefilesim/default.nix index 10f0d74c0dc7..3f97485cbfa4 100644 --- a/nixpkgs/pkgs/development/tools/analysis/garcosim/tracefilesim/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/garcosim/tracefilesim/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit }: +{ lib, stdenv, fetchgit }: stdenv.mkDerivation { @@ -17,7 +17,7 @@ stdenv.mkDerivation { cp ./traceFileSim "$out/bin" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Ease the analysis of existing memory management techniques, as well as the prototyping of new memory management techniques"; homepage = "https://github.com/GarCoSim"; maintainers = [ maintainers.cmcdragonkai ]; diff --git a/nixpkgs/pkgs/development/tools/analysis/hopper/default.nix b/nixpkgs/pkgs/development/tools/analysis/hopper/default.nix index 68f12dac70f5..b169877f5c1f 100644 --- a/nixpkgs/pkgs/development/tools/analysis/hopper/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/hopper/default.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { --replace "Exec=/opt/hopper-${rev}/bin/Hopper" "Exec=$out/bin/hopper" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.hopperapp.com/index.html"; description = "A macOS and Linux Disassembler"; license = licenses.unfree; diff --git a/nixpkgs/pkgs/development/tools/analysis/hotspot/default.nix b/nixpkgs/pkgs/development/tools/analysis/hotspot/default.nix index f04d060290f1..6ea079e3ec15 100644 --- a/nixpkgs/pkgs/development/tools/analysis/hotspot/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/hotspot/default.nix @@ -1,4 +1,4 @@ -{ stdenv, +{ lib, stdenv, mkDerivation, cmake, elfutils, @@ -27,8 +27,8 @@ mkDerivation rec { fetchSubmodules = true; }; + nativeBuildInputs = [ cmake ]; buildInputs = [ - cmake elfutils extra-cmake-modules kconfigwidgets @@ -50,8 +50,6 @@ mkDerivation rec { mkdir -p 3rdparty/perfparser/.git ''; - enableParallelBuilding = true; - meta = { description = "A GUI for Linux perf"; longDescription = '' @@ -60,8 +58,8 @@ mkDerivation rec { then displays the result in a graphical way. ''; homepage = "https://github.com/KDAB/hotspot"; - license = with stdenv.lib.licenses; [ gpl2 gpl3 ]; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ nh2 ]; + license = with lib.licenses; [ gpl2 gpl3 ]; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ nh2 ]; }; } diff --git a/nixpkgs/pkgs/development/tools/analysis/ikos/default.nix b/nixpkgs/pkgs/development/tools/analysis/ikos/default.nix index 7108e9311b82..26c7b6dd0b70 100644 --- a/nixpkgs/pkgs/development/tools/analysis/ikos/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/ikos/default.nix @@ -20,7 +20,8 @@ stdenv.mkDerivation rec { sha256 = "0k3kp1af0qx3l1x6a4sl4fm8qlwchjvwkvs2ck0fhfnc62q2im5f"; }; - buildInputs = [ cmake boost tbb gmp clang llvm sqlite python + nativeBuildInputs = [ cmake ]; + buildInputs = [ boost tbb gmp clang llvm sqlite python ocamlPackages.apron mpfr ppl doxygen graphviz ]; cmakeFlags = [ "-DAPRON_ROOT=${ocamlPackages.apron}" ]; diff --git a/nixpkgs/pkgs/development/tools/analysis/include-what-you-use/default.nix b/nixpkgs/pkgs/development/tools/analysis/include-what-you-use/default.nix index 8bda0ac2223f..db1cf9c6ead5 100644 --- a/nixpkgs/pkgs/development/tools/analysis/include-what-you-use/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/include-what-you-use/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, llvmPackages, python2 }: +{ lib, stdenv, fetchurl, cmake, llvmPackages, python2 }: stdenv.mkDerivation rec { pname = "include-what-you-use"; @@ -15,14 +15,12 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DIWYU_LLVM_ROOT_PATH=${llvmPackages.clang-unwrapped}" ]; - enableParallelBuilding = true; - postInstall = '' substituteInPlace $out/bin/iwyu_tool.py \ --replace "'include-what-you-use'" "'$out/bin/include-what-you-use'" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Analyze #includes in C/C++ source files with clang"; longDescription = '' For every symbol (type, function variable, or macro) that you use in diff --git a/nixpkgs/pkgs/development/tools/analysis/jdepend/default.nix b/nixpkgs/pkgs/development/tools/analysis/jdepend/default.nix index c903833a731a..faa68dadc3b4 100644 --- a/nixpkgs/pkgs/development/tools/analysis/jdepend/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/jdepend/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ant, jdk, runtimeShell }: +{ lib, stdenv, fetchFromGitHub, ant, jdk, runtimeShell }: stdenv.mkDerivation rec { pname = "jdepend"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { chmod a+x $out/bin/jdepend ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Traverses Java class file directories and generates design quality metrics for each Java package"; homepage = "http://www.clarkware.com/software/JDepend.html"; license = licenses.bsd3; diff --git a/nixpkgs/pkgs/development/tools/analysis/kcov/default.nix b/nixpkgs/pkgs/development/tools/analysis/kcov/default.nix index bbea8a1dd65d..15891e74044a 100644 --- a/nixpkgs/pkgs/development/tools/analysis/kcov/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/kcov/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, cmake, pkgconfig, zlib, curl, elfutils, python, libiberty, libopcodes}: +{lib, stdenv, fetchFromGitHub, cmake, pkg-config, zlib, curl, elfutils, python, libiberty, libopcodes}: stdenv.mkDerivation rec { pname = "kcov"; @@ -12,13 +12,11 @@ stdenv.mkDerivation rec { }; preConfigure = "patchShebangs src/bin-to-c-source.py"; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ zlib curl elfutils python libiberty libopcodes ]; - enableParallelBuilding = true; - - meta = with stdenv.lib; { + meta = with lib; { description = "Code coverage tester for compiled programs, Python scripts and shell scripts"; longDescription = '' diff --git a/nixpkgs/pkgs/development/tools/analysis/lcov/default.nix b/nixpkgs/pkgs/development/tools/analysis/lcov/default.nix index c6faeaa72f23..35c75d67da50 100644 --- a/nixpkgs/pkgs/development/tools/analysis/lcov/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/lcov/default.nix @@ -1,4 +1,4 @@ - {stdenv, fetchFromGitHub, perl, perlPackages, makeWrapper }: + {lib, stdenv, fetchFromGitHub, perl, perlPackages, makeWrapper }: stdenv.mkDerivation rec { pname = "lcov"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/genpng --set PERL5LIB ${perlPackages.makeFullPerlPath [ perlPackages.GD ]} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Code coverage tool that enhances GNU gcov"; longDescription = @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { ''; homepage = "http://ltp.sourceforge.net/coverage/lcov.php"; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; maintainers = with maintainers; [ dezgeg ]; platforms = platforms.all; diff --git a/nixpkgs/pkgs/development/tools/analysis/makefile2graph/default.nix b/nixpkgs/pkgs/development/tools/analysis/makefile2graph/default.nix index 20fe74ecb74d..66f767f47028 100644 --- a/nixpkgs/pkgs/development/tools/analysis/makefile2graph/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/makefile2graph/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, makeWrapper, bash, gnumake }: +{ lib, stdenv, fetchFromGitHub, makeWrapper, bash, gnumake }: stdenv.mkDerivation { name = "makefile2graph-2018-01-03"; @@ -19,10 +19,10 @@ stdenv.mkDerivation { --replace '/bin/sh' ${bash}/bin/bash \ --replace 'make2graph' "$out/bin/make2graph" wrapProgram $out/bin/makefile2graph \ - --set PATH ${stdenv.lib.makeBinPath [ gnumake ]} + --set PATH ${lib.makeBinPath [ gnumake ]} ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/lindenb/makefile2graph"; description = "Creates a graph of dependencies from GNU-Make; Output is a graphiz-dot file or a Gexf-XML file"; maintainers = with maintainers; [ cmcdragonkai ]; diff --git a/nixpkgs/pkgs/development/tools/analysis/oclgrind/default.nix b/nixpkgs/pkgs/development/tools/analysis/oclgrind/default.nix index 8cc0477ca592..72154e909b65 100644 --- a/nixpkgs/pkgs/development/tools/analysis/oclgrind/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/oclgrind/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, llvmPackages, readline, python }: +{ lib, stdenv, fetchFromGitHub, cmake, llvmPackages, readline, python }: stdenv.mkDerivation rec { pname = "oclgrind"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { "-DCLANG_ROOT=${llvmPackages.clang-unwrapped}" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "An OpenCL device simulator and debugger"; homepage = "https://github.com/jrprice/oclgrind"; license = licenses.bsd3; diff --git a/nixpkgs/pkgs/development/tools/analysis/panopticon/default.nix b/nixpkgs/pkgs/development/tools/analysis/panopticon/default.nix index cbc736e1a26c..ff5014bd46a9 100644 --- a/nixpkgs/pkgs/development/tools/analysis/panopticon/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/panopticon/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchFromGitHub, rustPlatform, qt5, git, cmake -, pkgconfig, makeWrapper }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, qt5, git, cmake +, pkg-config, makeWrapper }: rustPlatform.buildRustPackage rec { pname = "panopticon"; @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1zv87nqhrzsxx0m891df4vagzssj3kblfv9yp7j96dw0vn9950qa"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ makeWrapper ]; propagatedBuildInputs = with qt5; [ qt5.qtbase @@ -34,7 +34,7 @@ rustPlatform.buildRustPackage rec { makeWrapper $out/share/${pname}/${pname} $out/bin/${pname} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A libre cross-platform disassembler"; longDescription = '' Panopticon is a cross platform disassembler for reverse diff --git a/nixpkgs/pkgs/development/tools/analysis/pev/default.nix b/nixpkgs/pkgs/development/tools/analysis/pev/default.nix index 42e382c8bcad..a46bc067f11b 100644 --- a/nixpkgs/pkgs/development/tools/analysis/pev/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/pev/default.nix @@ -1,4 +1,4 @@ -{ stdenv, openssl, fetchFromGitHub }: +{ lib, stdenv, openssl, fetchFromGitHub }: stdenv.mkDerivation { pname = "pev"; @@ -20,7 +20,7 @@ stdenv.mkDerivation { installFlags = [ "prefix=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A full-featured, open source, multiplatform command line toolkit to work with PE (Portable Executables) binaries"; homepage = "https://pev.sourceforge.net/"; license = licenses.gpl2; diff --git a/nixpkgs/pkgs/development/tools/analysis/pmd/default.nix b/nixpkgs/pkgs/development/tools/analysis/pmd/default.nix index 497a244f68b4..a75445c363b0 100644 --- a/nixpkgs/pkgs/development/tools/analysis/pmd/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/pmd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, makeWrapper, openjdk }: +{ lib, stdenv, fetchurl, unzip, makeWrapper, openjdk }: stdenv.mkDerivation rec { pname = "pmd"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "An extensible cross-language static code analyzer"; homepage = "https://pmd.github.io/"; changelog = "https://pmd.github.io/pmd-${version}/pmd_release_notes.html"; diff --git a/nixpkgs/pkgs/development/tools/analysis/qcachegrind/default.nix b/nixpkgs/pkgs/development/tools/analysis/qcachegrind/default.nix index d9f39667ceff..0145e51ee262 100644 --- a/nixpkgs/pkgs/development/tools/analysis/qcachegrind/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/qcachegrind/default.nix @@ -1,7 +1,7 @@ -{ stdenv, qmake, qtbase, perl, python, php, kcachegrind }: +{ lib, stdenv, qmake, qtbase, perl, python, php, kcachegrind }: let - name = stdenv.lib.replaceStrings ["kcachegrind"] ["qcachegrind"] kcachegrind.name; + name = lib.replaceStrings ["kcachegrind"] ["qcachegrind"] kcachegrind.name; in stdenv.mkDerivation { inherit name; @@ -31,7 +31,7 @@ in stdenv.mkDerivation { install -Dm644 kcachegrind/48-apps-kcachegrind.png "$out/share/icons/hicolor/48x48/apps/kcachegrind.png" ''); - meta = with stdenv.lib; { + meta = with lib; { description = "A Qt GUI to visualize profiling data"; license = licenses.gpl2; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/development/tools/analysis/radare2/cutter.nix b/nixpkgs/pkgs/development/tools/analysis/radare2/cutter.nix index d4a102ac097b..6d9543e3836f 100644 --- a/nixpkgs/pkgs/development/tools/analysis/radare2/cutter.nix +++ b/nixpkgs/pkgs/development/tools/analysis/radare2/cutter.nix @@ -1,6 +1,6 @@ { fetchFromGitHub, lib, mkDerivation # nativeBuildInputs -, qmake, pkgconfig +, qmake, pkg-config # Qt , qtbase, qtsvg, qtwebengine # buildInputs @@ -30,12 +30,12 @@ mkDerivation rec { --replace "include(lib_radare2.pri)" "" ''; - nativeBuildInputs = [ qmake pkgconfig python3 wrapQtAppsHook ]; + nativeBuildInputs = [ qmake pkg-config python3 wrapQtAppsHook ]; propagatedBuildInputs = [ python3.pkgs.pyside2 ]; buildInputs = [ qtbase qtsvg qtwebengine r2-for-cutter python3 ]; qmakeFlags = with python3.pkgs; [ - "CONFIG+=link_pkgconfig" + "CONFIG+=link_pkg-config" "PKGCONFIG+=r_core" # Leaving this enabled doesn't break build but generates errors # at runtime (to console) about being unable to load needed bits. diff --git a/nixpkgs/pkgs/development/tools/analysis/radare2/default.nix b/nixpkgs/pkgs/development/tools/analysis/radare2/default.nix index e86ef2532498..3623893ea63e 100644 --- a/nixpkgs/pkgs/development/tools/analysis/radare2/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/radare2/default.nix @@ -1,6 +1,6 @@ -{stdenv, fetchFromGitHub +{lib, stdenv, fetchFromGitHub , buildPackages -, pkgconfig +, pkg-config , libusb-compat-0_1, readline, libewf, perl, zlib, openssl , libuv, file, libzip, xxHash , gtk2 ? null, vte ? null, gtkdialog ? null @@ -19,7 +19,7 @@ assert pythonBindings -> python3 != null; let - inherit (stdenv.lib) optional; + inherit (lib) optional; generic = { version_commit, # unused @@ -56,11 +56,6 @@ let # radare 3.3 compat for radare2-cutter (cd shlr && ln -s ../capstone-${cs_ver} capstone) tar -czvf shlr/capstone-${cs_ver}.tar.gz capstone-${cs_ver} - # necessary because they broke the offline-build: - # https://github.com/radare/radare2/commit/6290e4ff4cc167e1f2c28ab924e9b99783fb1b38#diff-a44d840c10f1f1feaf401917ae4ccd54R258 - # https://github.com/radare/radare2/issues/13087#issuecomment-465159716 - curl() { true; } - export -f curl ''; postInstall = '' @@ -83,7 +78,7 @@ let enableParallelBuilding = true; depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ file readline libusb-compat-0_1 libewf perl zlib openssl libuv ] ++ optional useX11 [ gtkdialog vte gtk2 ] ++ optional rubyBindings [ ruby ] @@ -100,9 +95,9 @@ let meta = { description = "unix-like reverse engineering framework and commandline tools"; homepage = "http://radare.org/"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [ raskin makefu mic92 ]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ raskin makefu mic92 ]; + platforms = with lib.platforms; linux; inherit version; }; }; @@ -110,12 +105,12 @@ in { #<generated> # DO NOT EDIT! Automatically generated by ./update.py radare2 = generic { - version_commit = "24959"; - gittap = "4.5.1"; - gittip = "293cf5ae65ba4e28828095dcae212955593ba255"; - rev = "4.5.1"; - version = "4.5.1"; - sha256 = "0qigy1px0jy74c5ig73dc2fqjcy6vcy76i25dx9r3as6zfpkkaxj"; + version_commit = "25480"; + gittap = "5.0.0"; + gittip = "a476454c00f64acbb7425c178c98714ef76e26d7"; + rev = "5.0.0"; + version = "5.0.0"; + sha256 = "0aa7c27kd0l55fy5qfvxqmakp4pz6240v3hn84095qmqkzcbs420"; cs_ver = "4.0.2"; cs_sha256 = "0y5g74yjyliciawpn16zhdwya7bd3d7b1cccpcccc2wg8vni1k2w"; }; diff --git a/nixpkgs/pkgs/development/tools/analysis/randoop/default.nix b/nixpkgs/pkgs/development/tools/analysis/randoop/default.nix index b51b26eab172..0d10d6d6b277 100644 --- a/nixpkgs/pkgs/development/tools/analysis/randoop/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/randoop/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip }: +{ lib, stdenv, fetchurl, unzip }: stdenv.mkDerivation rec { version = "4.2.5"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { cp README.txt $out/doc ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Automatic test generation for Java"; homepage = "https://randoop.github.io/randoop/"; license = licenses.mit; diff --git a/nixpkgs/pkgs/development/tools/analysis/retdec/default.nix b/nixpkgs/pkgs/development/tools/analysis/retdec/default.nix index b0e5319df2d6..1701abeb25fd 100644 --- a/nixpkgs/pkgs/development/tools/analysis/retdec/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/retdec/default.nix @@ -9,7 +9,7 @@ , autoconf , automake , libtool -, pkgconfig +, pkg-config , bison , flex , groff @@ -145,7 +145,7 @@ in stdenv.mkDerivation rec { autoconf automake libtool - pkgconfig + pkg-config bison flex groff @@ -216,8 +216,6 @@ in stdenv.mkDerivation rec { substituteInPlace scripts/retdec-unpacker.py --replace "'upx'" "'${upx}/bin/upx'" ''; - enableParallelBuilding = true; - doInstallCheck = true; installCheckPhase = '' ${python3.interpreter} "$out/bin/retdec-tests-runner.py" diff --git a/nixpkgs/pkgs/development/tools/analysis/rr/default.nix b/nixpkgs/pkgs/development/tools/analysis/rr/default.nix index 5e80d5b096db..b63713f00073 100644 --- a/nixpkgs/pkgs/development/tools/analysis/rr/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/rr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, libpfm, zlib, pkgconfig, python3Packages, which, procps, gdb, capnproto }: +{ lib, stdenv, fetchFromGitHub, cmake, libpfm, zlib, pkg-config, python3Packages, which, procps, gdb, capnproto }: stdenv.mkDerivation rec { version = "5.4.0"; @@ -21,9 +21,9 @@ stdenv.mkDerivation rec { # see https://github.com/mozilla/rr/issues/2269 preConfigure = ''substituteInPlace CMakeLists.txt --replace "std=c++11" "std=c++14"''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config which ]; buildInputs = [ - cmake libpfm zlib python3Packages.python python3Packages.pexpect which procps gdb capnproto + libpfm zlib python3Packages.python python3Packages.pexpect procps gdb capnproto ]; propagatedBuildInputs = [ gdb ]; # needs GDB to replay programs at runtime cmakeFlags = [ @@ -37,8 +37,6 @@ stdenv.mkDerivation rec { hardeningDisable = [ "fortify" ]; - enableParallelBuilding = true; - # FIXME #doCheck = true; @@ -54,8 +52,8 @@ stdenv.mkDerivation rec { time the same execution is replayed. ''; - license = with stdenv.lib.licenses; [ mit bsd2 ]; - maintainers = with stdenv.lib.maintainers; [ pierron thoughtpolice ]; - platforms = stdenv.lib.platforms.x86; + license = with lib.licenses; [ mit bsd2 ]; + maintainers = with lib.maintainers; [ pierron thoughtpolice ]; + platforms = lib.platforms.x86; }; } diff --git a/nixpkgs/pkgs/development/tools/analysis/smatch/default.nix b/nixpkgs/pkgs/development/tools/analysis/smatch/default.nix index 1443c31192df..4330ec3d7426 100644 --- a/nixpkgs/pkgs/development/tools/analysis/smatch/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/smatch/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, sqlite, pkgconfig, perl +{ lib, stdenv, fetchgit, sqlite, pkg-config, perl , buildllvmsparse ? true , buildc2xml ? true , llvm ? null, libxml2 ? null @@ -16,10 +16,10 @@ stdenv.mkDerivation { sha256 = "0r43qi6vryqg450fj73yjwbb7gzcgx64rhrhb3r1m6a252srijiy"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [sqlite perl] - ++ stdenv.lib.optional buildllvmsparse llvm - ++ stdenv.lib.optional buildc2xml libxml2; + ++ lib.optional buildllvmsparse llvm + ++ lib.optional buildc2xml libxml2; preBuild = '' sed -i Makefile \ @@ -29,7 +29,7 @@ stdenv.mkDerivation { meta = { description = "A semantic analysis tool for C"; homepage = "http://smatch.sourceforge.net/"; - license = stdenv.lib.licenses.free; /* OSL, see http://www.opensource.org */ - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.free; /* OSL, see http://www.opensource.org */ + platforms = lib.platforms.linux; }; } diff --git a/nixpkgs/pkgs/development/tools/analysis/snowman/default.nix b/nixpkgs/pkgs/development/tools/analysis/snowman/default.nix index 2f7ff219081f..261645c062d3 100644 --- a/nixpkgs/pkgs/development/tools/analysis/snowman/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/snowman/default.nix @@ -1,4 +1,4 @@ -{ stdenv, mkDerivation, fetchFromGitHub, cmake, boost, qtbase }: +{ lib, stdenv, mkDerivation, fetchFromGitHub, cmake, boost, qtbase }: mkDerivation rec { pname = "snowman"; @@ -19,9 +19,7 @@ mkDerivation rec { export sourceRoot=$sourceRoot/src ''; - enableParallelBuilding = true; - - meta = with stdenv.lib; { + meta = with lib; { description = "Native code to C/C++ decompiler"; homepage = "http://derevenets.com/"; diff --git a/nixpkgs/pkgs/development/tools/analysis/sparse/default.nix b/nixpkgs/pkgs/development/tools/analysis/sparse/default.nix index 945f6c80af52..e0d9840472b4 100644 --- a/nixpkgs/pkgs/development/tools/analysis/sparse/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/sparse/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkgconfig, libxml2, llvm }: +{ fetchurl, lib, stdenv, pkg-config, libxml2, llvm }: stdenv.mkDerivation rec { name = "sparse-0.5.0"; @@ -12,15 +12,15 @@ stdenv.mkDerivation rec { sed -i Makefile -e "s|^PREFIX=.*$|PREFIX=$out|g" ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libxml2 llvm ]; doCheck = true; meta = { description = "Semantic parser for C"; homepage = "https://git.kernel.org/cgit/devel/sparse/sparse.git/"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + license = lib.licenses.mit; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.thoughtpolice ]; }; } diff --git a/nixpkgs/pkgs/development/tools/analysis/spin/default.nix b/nixpkgs/pkgs/development/tools/analysis/spin/default.nix index 73e88f9811c3..49e31f53a846 100644 --- a/nixpkgs/pkgs/development/tools/analysis/spin/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/spin/default.nix @@ -2,13 +2,13 @@ , withISpin ? true, tk, swarm, graphviz }: let - binPath = stdenv.lib.makeBinPath [ gcc ]; - ibinPath = stdenv.lib.makeBinPath [ gcc tk swarm graphviz tk ]; + binPath = lib.makeBinPath [ gcc ]; + ibinPath = lib.makeBinPath [ gcc tk swarm graphviz tk ]; in stdenv.mkDerivation rec { pname = "spin"; version = "6.4.9"; - url-version = stdenv.lib.replaceChars ["."] [""] version; + url-version = lib.replaceChars ["."] [""] version; src = fetchurl { # The homepage is behind CloudFlare anti-DDoS protection, which blocks cURL. @@ -36,7 +36,7 @@ in stdenv.mkDerivation rec { --prefix PATH ':' "$out/bin:${ibinPath}" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Formal verification tool for distributed software systems"; homepage = "http://spinroot.com/"; license = licenses.free; diff --git a/nixpkgs/pkgs/development/tools/analysis/splint/default.nix b/nixpkgs/pkgs/development/tools/analysis/splint/default.nix index 4dc93897e869..581ff56bb614 100644 --- a/nixpkgs/pkgs/development/tools/analysis/splint/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/splint/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, flex }: +{ fetchurl, lib, stdenv, flex }: stdenv.mkDerivation rec { name = "splint-3.1.2"; @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { sha256 = "02pv8kscsrkrzip9r08pfs9xs98q74c52mlxzbii6cv6vx1vd3f7"; }; - patches = [ ./tmpdir.patch ] ++ stdenv.lib.optional stdenv.isDarwin ./darwin.patch; + patches = [ ./tmpdir.patch ] ++ lib.optional stdenv.isDarwin ./darwin.patch; buildInputs = [ flex ]; doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.splint.org/"; description = "Annotation-assisted lightweight static analyzer for C"; diff --git a/nixpkgs/pkgs/development/tools/analysis/swarm/default.nix b/nixpkgs/pkgs/development/tools/analysis/swarm/default.nix index 03f218546ebf..894d9a2357ea 100644 --- a/nixpkgs/pkgs/development/tools/analysis/swarm/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/swarm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation { name = "swarm-2019-03-11"; @@ -15,7 +15,7 @@ stdenv.mkDerivation { install -Dm644 Doc/swarm.1 $out/share/man/man1/swarm.1 ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Verification script generator for Spin"; homepage = "http://spinroot.com/"; license = licenses.free; diff --git a/nixpkgs/pkgs/development/tools/analysis/tflint/default.nix b/nixpkgs/pkgs/development/tools/analysis/tflint/default.nix index 1011bcb5cc0c..617d255d7e51 100644 --- a/nixpkgs/pkgs/development/tools/analysis/tflint/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/tflint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tflint"; - version = "0.22.0"; + version = "0.23.1"; src = fetchFromGitHub { owner = "terraform-linters"; repo = pname; rev = "v${version}"; - sha256 = "0wbxlh2lwgdhhw902lqy6p2vh8adfq4yaa507js8an3byy26ls3d"; + sha256 = "19vgan743xsnglwva93fs4sqcbpqbyrxbgn5qff809ns8hj8ir94"; }; - vendorSha256 = "0yk9xsb0s4kymfb3p14irks6b30b53r0mz7irgcmx9jxz8vyffqg"; + vendorSha256 = "1y6ra9bkp6wl0pikvyqywhg5w18v3glnyvwqrddkkkabspl05nqx"; doCheck = false; diff --git a/nixpkgs/pkgs/development/tools/analysis/uefi-firmware-parser/default.nix b/nixpkgs/pkgs/development/tools/analysis/uefi-firmware-parser/default.nix index 0ad042d74def..17f390714620 100644 --- a/nixpkgs/pkgs/development/tools/analysis/uefi-firmware-parser/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/uefi-firmware-parser/default.nix @@ -1,4 +1,4 @@ -{ stdenv, python3, fetchFromGitHub }: +{ lib, stdenv, python3, fetchFromGitHub }: with python3.pkgs; @@ -14,7 +14,7 @@ buildPythonApplication rec { sha256 = "1yn9vi91j1yxkn0icdnjhgl0qrqqkzyhccj39af4f19q1gdw995l"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/theopolis/uefi-firmware-parser/"; description = "Parse BIOS/Intel ME/UEFI firmware related structures: Volumes, FileSystems, Files, etc"; # MIT + license headers in some files diff --git a/nixpkgs/pkgs/development/tools/analysis/valgrind/default.nix b/nixpkgs/pkgs/development/tools/analysis/valgrind/default.nix index 60d3a7c5ebc9..d99bbe1cae4b 100644 --- a/nixpkgs/pkgs/development/tools/analysis/valgrind/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/valgrind/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, gdb, cctools, xnu, bootstrap_cmds }: +{ lib, stdenv, fetchurl, perl, gdb, cctools, xnu, bootstrap_cmds }: stdenv.mkDerivation rec { name = "valgrind-3.16.1"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { # GDB is needed to provide a sane default for `--db-command'. # Perl is needed for `callgrind_{annotate,control}'. - buildInputs = [ gdb perl ] ++ stdenv.lib.optionals (stdenv.isDarwin) [ bootstrap_cmds xnu ]; + buildInputs = [ gdb perl ] ++ lib.optionals (stdenv.isDarwin) [ bootstrap_cmds xnu ]; # Perl is also a native build input. nativeBuildInputs = [ perl ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; separateDebugInfo = stdenv.isLinux; - preConfigure = stdenv.lib.optionalString stdenv.isDarwin ( + preConfigure = lib.optionalString stdenv.isDarwin ( let OSRELEASE = '' $(awk -F '"' '/#define OSRELEASE/{ print $2 }' \ <${xnu}/Library/Frameworks/Kernel.framework/Headers/libkern/version.h)''; @@ -50,8 +50,8 @@ stdenv.mkDerivation rec { postPatch = ""; configureFlags = - stdenv.lib.optional (stdenv.hostPlatform.system == "x86_64-linux" || stdenv.hostPlatform.system == "x86_64-darwin") "--enable-only64bit" - ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin "--with-xcodedir=${xnu}/include"; + lib.optional (stdenv.hostPlatform.system == "x86_64-linux" || stdenv.hostPlatform.system == "x86_64-darwin") "--enable-only64bit" + ++ lib.optional stdenv.hostPlatform.isDarwin "--with-xcodedir=${xnu}/include"; doCheck = false; # fails @@ -76,10 +76,10 @@ stdenv.mkDerivation rec { Valgrind to build new tools. ''; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; - maintainers = [ stdenv.lib.maintainers.eelco ]; - platforms = stdenv.lib.platforms.unix; + maintainers = [ lib.maintainers.eelco ]; + platforms = lib.platforms.unix; badPlatforms = [ "armv5tel-linux" "armv6l-linux" "armv6m-linux" "sparc-linux" "sparc64-linux" diff --git a/nixpkgs/pkgs/development/tools/analysis/valkyrie/default.nix b/nixpkgs/pkgs/development/tools/analysis/valkyrie/default.nix index 1c571fe6be0f..10b9f7291a22 100644 --- a/nixpkgs/pkgs/development/tools/analysis/valkyrie/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/valkyrie/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, qt4, qmake4Hook }: +{ lib, stdenv, fetchurl, qt4, qmake4Hook }: stdenv.mkDerivation rec { name = "valkyrie-2.0.0"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ qmake4Hook ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.valgrind.org/"; description = "Qt4-based GUI for the Valgrind 3.6.x series"; license = licenses.gpl2; diff --git a/nixpkgs/pkgs/development/tools/apktool/default.nix b/nixpkgs/pkgs/development/tools/apktool/default.nix index 2ff9c58fb339..33721e60b0ed 100644 --- a/nixpkgs/pkgs/development/tools/apktool/default.nix +++ b/nixpkgs/pkgs/development/tools/apktool/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, jre, build-tools }: +{ lib, stdenv, fetchurl, makeWrapper, jre, build-tools }: stdenv.mkDerivation rec { pname = "apktool"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { --prefix PATH : "${builtins.head build-tools}/libexec/android-sdk/build-tools/28.0.3" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A tool for reverse engineering Android apk files"; homepage = "https://ibotpeaches.github.io/Apktool/"; license = licenses.asl20; diff --git a/nixpkgs/pkgs/development/tools/asn2quickder/default.nix b/nixpkgs/pkgs/development/tools/asn2quickder/default.nix index 68a0c0f6073e..b2432f7fefc6 100644 --- a/nixpkgs/pkgs/development/tools/asn2quickder/default.nix +++ b/nixpkgs/pkgs/development/tools/asn2quickder/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonApplication, fetchFromGitHub, makeWrapper, cmake +{ lib, stdenv, buildPythonApplication, fetchFromGitHub, makeWrapper, cmake , pytestrunner, pytest, six, pyparsing, asn1ate }: buildPythonApplication rec { @@ -23,7 +23,7 @@ buildPythonApplication rec { propagatedBuildInputs = [ pyparsing asn1ate six ]; - meta = with stdenv.lib; { + meta = with lib; { description = "An ASN.1 compiler with a backend for Quick DER"; homepage = "https://github.com/vanrein/asn2quickder"; license = licenses.bsd3; diff --git a/nixpkgs/pkgs/development/tools/async/default.nix b/nixpkgs/pkgs/development/tools/async/default.nix index e63f9a18a63a..54e16cb6faaf 100644 --- a/nixpkgs/pkgs/development/tools/async/default.nix +++ b/nixpkgs/pkgs/development/tools/async/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform }: +{ lib, stdenv, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { pname = "async"; @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1zgds5rjjikvaj0rxc7slyvkjn067s0v8vdnxn3vsv819q5yd707"; - meta = with stdenv.lib; { + meta = with lib; { description = "A tool to parallelize shell commands"; longDescription = '' `async` is a tool to run shell commands in parallel and is designed to be diff --git a/nixpkgs/pkgs/development/tools/avro-tools/default.nix b/nixpkgs/pkgs/development/tools/avro-tools/default.nix index 5327ab354e91..5dd058614c10 100644 --- a/nixpkgs/pkgs/development/tools/avro-tools/default.nix +++ b/nixpkgs/pkgs/development/tools/avro-tools/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { --add-flags "-jar $out/libexec/avro-tools/${pname}.jar" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://avro.apache.org/"; description = "Avro command-line tools and utilities"; license = lib.licenses.asl20; diff --git a/nixpkgs/pkgs/development/tools/aws-sam-cli/default.nix b/nixpkgs/pkgs/development/tools/aws-sam-cli/default.nix index 52b1a26d8143..8a48b43312eb 100644 --- a/nixpkgs/pkgs/development/tools/aws-sam-cli/default.nix +++ b/nixpkgs/pkgs/development/tools/aws-sam-cli/default.nix @@ -15,6 +15,22 @@ let }; }); + aws-sam-translator = super.aws-sam-translator.overridePythonAttrs (oldAttrs: rec { + version = "1.27.0"; + src = oldAttrs.src.override { + inherit version; + sha256 = "sha256-MlgSL0zWcbo9wUE4LdBBLBI9ufExe+2LJucin2NjRFQ="; + }; + }); + + dateparser = super.dateparser.overridePythonAttrs (oldAttrs: rec { + version = "0.7.0"; + src = oldAttrs.src.override { + inherit version; + sha256 = "sha256-lAgoGDyTe87FMHUyEbcPZzwKmquDHkMnNImzEFON/4Y="; + }; + }); + cookiecutter = super.cookiecutter.overridePythonAttrs (oldAttrs: rec { version = "1.6.0"; src = oldAttrs.src.override { @@ -68,7 +84,7 @@ buildPythonApplication rec { postPatch = '' substituteInPlace requirements/base.txt \ --replace "boto3~=1.14.0, >=1.14.23" "boto3~=1.14" \ - --replace "docker~=4.2.0" "docker~=4.3.1" \ + --replace "docker~=4.2.0" "docker~=4.3" \ --replace "jmespath~=0.9.5" "jmespath~=0.10.0" \ --replace "python-dateutil~=2.6, <2.8.1" "python-dateutil~=2.6" \ --replace "requests==2.23.0" "requests~=2.24" \ diff --git a/nixpkgs/pkgs/development/tools/azcopy/default.nix b/nixpkgs/pkgs/development/tools/azcopy/default.nix index 1c5bb899b69b..822480b1d3f3 100644 --- a/nixpkgs/pkgs/development/tools/azcopy/default.nix +++ b/nixpkgs/pkgs/development/tools/azcopy/default.nix @@ -1,19 +1,19 @@ -{ stdenv, fetchFromGitHub, buildGoModule }: +{ lib, stdenv, fetchFromGitHub, buildGoModule }: buildGoModule rec { pname = "azure-storage-azcopy"; - version = "10.7.0"; + version = "10.8.0"; src = fetchFromGitHub { owner = "Azure"; repo = "azure-storage-azcopy"; rev = "v${version}"; - sha256 = "0l2109r9a8fhd66zgsi56zdmy390fpnvy08rbxf6rfc0a55n96ka"; + sha256 = "sha256-zA0/5lpVefZD0m7g7SfqSRAFkQm2b+g/F3doCl9oAn8="; }; subPackages = [ "." ]; - vendorSha256 = "032yzl8mmgmmxbpsymndp4ddgi572jh5drwql0bjjabp3yqwj1g1"; + vendorSha256 = "sha256-t7PluxN6naDB35eC59Xus1hgZflgViWF2yFog9mkaOA="; doCheck = false; @@ -21,7 +21,7 @@ buildGoModule rec { ln -rs "$out/bin/azure-storage-azcopy" "$out/bin/azcopy" ''; - meta = with stdenv.lib; { + meta = with lib; { maintainers = with maintainers; [ colemickens ]; license = licenses.mit; description = "The new Azure Storage data transfer utility - AzCopy v10"; diff --git a/nixpkgs/pkgs/development/tools/bazel-kazel/default.nix b/nixpkgs/pkgs/development/tools/bazel-kazel/default.nix index c8127256a612..ba9412c286c4 100644 --- a/nixpkgs/pkgs/development/tools/bazel-kazel/default.nix +++ b/nixpkgs/pkgs/development/tools/bazel-kazel/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "bazel-kazel"; - version = "0.1.3"; + version = "0.2.0"; src = fetchFromGitHub { owner = "kubernetes"; repo = "repo-infra"; rev = "v${version}"; - sha256 = "1mmla4j30ka368gsf4v8h23f32rsc4fpyrqswafw98x07xngmmqr"; + sha256 = "sha256-YWTWw5vDkDvIHOTqZM2xH8VPaVRuB2oyynvwWNmvPXs="; }; - vendorSha256 = "1pzkjh4n9ai8yqi98bkdhicjdr2l8j3fckl5n90c2gdcwqyxvgkf"; + vendorSha256 = "sha256-1+7Mx1Zh1WolqTpWNe560PRzRYaWVUVLvNvUOysaW5I="; doCheck = false; diff --git a/nixpkgs/pkgs/development/tools/bazel-watcher/default.nix b/nixpkgs/pkgs/development/tools/bazel-watcher/default.nix index e0a7febb875f..94efcc9be063 100644 --- a/nixpkgs/pkgs/development/tools/bazel-watcher/default.nix +++ b/nixpkgs/pkgs/development/tools/bazel-watcher/default.nix @@ -3,7 +3,7 @@ , git , go , python -, stdenv +, lib, stdenv }: let @@ -73,7 +73,7 @@ buildBazelPackage rec { ''; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/bazelbuild/bazel-watcher"; description = "Tools for building Bazel targets when source files change"; license = licenses.asl20; diff --git a/nixpkgs/pkgs/development/tools/bazelisk/default.nix b/nixpkgs/pkgs/development/tools/bazelisk/default.nix index 2a20888426d0..e4a6b3c2869e 100644 --- a/nixpkgs/pkgs/development/tools/bazelisk/default.nix +++ b/nixpkgs/pkgs/development/tools/bazelisk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ lib, stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "bazelisk"; @@ -17,7 +17,7 @@ buildGoModule rec { buildFlagsArray = [ "-ldflags=-s -w -X main.BazeliskVersion=${version}" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A user-friendly launcher for Bazel"; longDescription = '' BEWARE: This package does not work on NixOS. diff --git a/nixpkgs/pkgs/development/tools/bloaty/default.nix b/nixpkgs/pkgs/development/tools/bloaty/default.nix index 28df0aaa6963..ff24e7b7c1cd 100644 --- a/nixpkgs/pkgs/development/tools/bloaty/default.nix +++ b/nixpkgs/pkgs/development/tools/bloaty/default.nix @@ -1,4 +1,4 @@ -{ stdenv, cmake, zlib, fetchFromGitHub }: +{ lib, stdenv, cmake, zlib, fetchFromGitHub }: stdenv.mkDerivation rec { version = "1.1"; @@ -16,15 +16,13 @@ stdenv.mkDerivation rec { buildInputs = [ zlib ]; - enableParallelBuilding = true; - doCheck = true; installPhase = '' install -Dm755 {.,$out/bin}/bloaty ''; - meta = with stdenv.lib; { + meta = with lib; { description = "a size profiler for binaries"; homepage = "https://github.com/google/bloaty"; license = licenses.asl20; diff --git a/nixpkgs/pkgs/development/tools/boomerang/default.nix b/nixpkgs/pkgs/development/tools/boomerang/default.nix index bec5357691f2..4ac9159520fb 100644 --- a/nixpkgs/pkgs/development/tools/boomerang/default.nix +++ b/nixpkgs/pkgs/development/tools/boomerang/default.nix @@ -14,8 +14,6 @@ mkDerivation rec { nativeBuildInputs = [ cmake bison flex ]; buildInputs = [ qtbase capstone ]; - enableParallelBuilding = true; - meta = with lib; { homepage = "https://github.com/BoomerangDecompiler/boomerang"; license = licenses.bsd3; diff --git a/nixpkgs/pkgs/development/tools/boost-build/default.nix b/nixpkgs/pkgs/development/tools/boost-build/default.nix index 8ce475c893d5..8566edd2315f 100644 --- a/nixpkgs/pkgs/development/tools/boost-build/default.nix +++ b/nixpkgs/pkgs/development/tools/boost-build/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "boost-build"; @@ -27,9 +27,9 @@ stdenv.mkDerivation rec { ./b2 install --prefix=$out ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.boost.org/boost-build2/"; - license = stdenv.lib.licenses.boost; + license = lib.licenses.boost; platforms = platforms.unix; maintainers = with maintainers; [ ivan-tkatchev ]; }; diff --git a/nixpkgs/pkgs/development/tools/build-managers/apache-ant/1.9.nix b/nixpkgs/pkgs/development/tools/build-managers/apache-ant/1.9.nix index 49f8435b3773..182b8633aa01 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/apache-ant/1.9.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/apache-ant/1.9.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, coreutils, makeWrapper }: +{ fetchurl, lib, stdenv, coreutils, makeWrapper }: let version = "1.9.15"; in @@ -105,8 +105,8 @@ stdenv.mkDerivation { by an object that implements a particular Task interface. ''; - license = stdenv.lib.licenses.asl20; - maintainers = [ stdenv.lib.maintainers.eelco ]; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.eelco ]; + platforms = lib.platforms.all; }; } diff --git a/nixpkgs/pkgs/development/tools/build-managers/apache-ant/default.nix b/nixpkgs/pkgs/development/tools/build-managers/apache-ant/default.nix index caa9bc3b9eb7..d88068c1c3ee 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/apache-ant/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/apache-ant/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, coreutils, makeWrapper }: +{ fetchurl, lib, stdenv, coreutils, makeWrapper }: let version = "1.10.9"; in @@ -105,8 +105,8 @@ stdenv.mkDerivation { by an object that implements a particular Task interface. ''; - license = stdenv.lib.licenses.asl20; - maintainers = [ stdenv.lib.maintainers.eelco ]; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.eelco ]; + platforms = lib.platforms.all; }; } diff --git a/nixpkgs/pkgs/development/tools/build-managers/apache-maven/default.nix b/nixpkgs/pkgs/development/tools/build-managers/apache-maven/default.nix index 83260cbc1860..4658703f8b10 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/apache-maven/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/apache-maven/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, jdk, makeWrapper }: +{ lib, stdenv, fetchurl, jdk, makeWrapper }: assert jdk != null; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { inherit jdk; - meta = with stdenv.lib; { + meta = with lib; { description = "Build automation tool (used primarily for Java projects)"; homepage = "http://maven.apache.org/"; license = licenses.asl20; diff --git a/nixpkgs/pkgs/development/tools/build-managers/arpa2cm/default.nix b/nixpkgs/pkgs/development/tools/build-managers/arpa2cm/default.nix index ef3062c6ca50..0af9e77acf57 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/arpa2cm/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/arpa2cm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "arpa2cm"; @@ -11,9 +11,9 @@ stdenv.mkDerivation rec { owner = "arpa2"; }; - buildInputs = [ cmake ]; + nativeBuildInputs = [ cmake ]; - meta = with stdenv.lib; { + meta = with lib; { description = "CMake Module library for the ARPA2 project"; license = licenses.bsd2; maintainers = with maintainers; [ leenaars ]; diff --git a/nixpkgs/pkgs/development/tools/build-managers/bam/default.nix b/nixpkgs/pkgs/development/tools/build-managers/bam/default.nix index 969cd9879746..a828c57b8c00 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/bam/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/bam/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, lua5_3, python }: +{ lib, stdenv, fetchFromGitHub, lua5_3, python }: stdenv.mkDerivation rec { pname = "bam"; @@ -13,9 +13,9 @@ stdenv.mkDerivation rec { buildInputs = [ lua5_3 python ]; - buildPhase = ''${stdenv.shell} make_unix.sh''; + buildPhase = "${stdenv.shell} make_unix.sh"; - checkPhase = ''${python.interpreter} scripts/test.py''; + checkPhase = "${python.interpreter} scripts/test.py"; installPhase = '' mkdir -p "$out/share/bam" @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { cp bam "$out/bin" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Yet another build manager"; maintainers = with maintainers; [ diff --git a/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix b/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix index 0c9f4d7c50a0..ac03288f1485 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , git , go -, stdenv +, lib, stdenv }: buildBazelPackage rec { @@ -80,7 +80,7 @@ buildBazelPackage rec { ''; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/buchgr/bazel-remote"; description = "A remote HTTP/1.1 cache for Bazel"; license = licenses.asl20; diff --git a/nixpkgs/pkgs/development/tools/build-managers/bazel/buildtools/default.nix b/nixpkgs/pkgs/development/tools/build-managers/bazel/buildtools/default.nix index 66560e768d23..436b681e0054 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/bazel/buildtools/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/bazel/buildtools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "bazel-buildtools"; @@ -19,7 +19,7 @@ buildGoPackage rec { buildFlagsArray = [ "-ldflags=-s -w -X main.buildVersion=${version} -X main.buildScmRevision=${src.rev}" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Tools for working with Google's bazel buildtool. Includes buildifier, buildozer, and unused_deps"; homepage = "https://github.com/bazelbuild/buildtools"; license = licenses.asl20; diff --git a/nixpkgs/pkgs/development/tools/build-managers/bear/default.nix b/nixpkgs/pkgs/development/tools/build-managers/bear/default.nix index 756e68b56781..74b1f7040205 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/bear/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/bear/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , cmake , pkg-config @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { ./no-double-relative.patch ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Tool that generates a compilation database for clang tooling"; longDescription = '' Note: the bear command is very useful to generate compilation commands diff --git a/nixpkgs/pkgs/development/tools/build-managers/bloop/default.nix b/nixpkgs/pkgs/development/tools/build-managers/bloop/default.nix index c1b3a7aa1560..12fd01e5e4ed 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/bloop/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/bloop/default.nix @@ -82,7 +82,7 @@ stdenv.mkDerivation rec { installShellCompletion --name bloop.fish --fish ${bloop-fish} ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://scalacenter.github.io/bloop/"; license = licenses.asl20; description = "A Scala build server and command-line tool to make the compile and test developer workflows fast and productive in a build-tool-agnostic way"; diff --git a/nixpkgs/pkgs/development/tools/build-managers/bmake/default.nix b/nixpkgs/pkgs/development/tools/build-managers/bmake/default.nix index 9bda4cde0449..e1e9b348503c 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/bmake/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/bmake/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , getopt }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ./fix-unexport-env-test.patch ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Portable version of NetBSD 'make'"; homepage = "http://www.crufty.net/help/sjg/bmake.html"; license = licenses.bsd3; diff --git a/nixpkgs/pkgs/development/tools/build-managers/boot/default.nix b/nixpkgs/pkgs/development/tools/build-managers/boot/default.nix index 09c1eada54b5..68a4d5f44eaa 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/boot/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/boot/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, jdk }: +{ lib, stdenv, fetchurl, jdk }: stdenv.mkDerivation rec { version = "2.7.2"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ jdk ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Build tooling for Clojure"; homepage = "https://boot-clj.com/"; license = licenses.epl10; diff --git a/nixpkgs/pkgs/development/tools/build-managers/buck/default.nix b/nixpkgs/pkgs/development/tools/build-managers/buck/default.nix index 41fc0940b9d0..0fbcb95704b0 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/buck/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/buck/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, jdk, ant, python2, python2Packages, watchman, bash, makeWrapper }: +{ lib, stdenv, fetchFromGitHub, jdk, ant, python2, python2Packages, watchman, bash, makeWrapper }: stdenv.mkDerivation rec { pname = "buck"; @@ -30,10 +30,10 @@ stdenv.mkDerivation rec { install -D -m755 buck-out/gen/programs/buck.pex $out/bin/buck wrapProgram $out/bin/buck \ --prefix PYTHONPATH : $PYTHONPATH \ - --prefix PATH : "${stdenv.lib.makeBinPath [jdk watchman]}" + --prefix PATH : "${lib.makeBinPath [jdk watchman]}" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://buck.build/"; description = "A high-performance build tool"; maintainers = [ maintainers.jgertm maintainers.marsam ]; diff --git a/nixpkgs/pkgs/development/tools/build-managers/cmake/2.8.nix b/nixpkgs/pkgs/development/tools/build-managers/cmake/2.8.nix index 804bdd76f673..9dabd7b35560 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/cmake/2.8.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/cmake/2.8.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchurl, fetchpatch, curl, expat, zlib, bzip2 +{ lib, stdenv, fetchurl, fetchpatch, curl, expat, zlib, bzip2 , useNcurses ? false, ncurses, useQt4 ? false, qt4, ps }: -with stdenv.lib; +with lib; assert stdenv ? cc; assert stdenv.cc ? libc; let - os = stdenv.lib.optionalString; + os = lib.optionalString; majorVersion = "2.8"; minorVersion = "12.2"; version = "${majorVersion}.${minorVersion}"; @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { "--mandir=/share/man" "--system-libs" "--no-system-libarchive" - ] ++ stdenv.lib.optional useQt4 "--qt-gui"; + ] ++ lib.optional useQt4 "--qt-gui"; setupHook = ./setup-hook.sh; @@ -80,8 +80,8 @@ stdenv.mkDerivation rec { meta = { homepage = "https://cmake.org"; description = "Cross-Platform Makefile Generator"; - platforms = if useQt4 then qt4.meta.platforms else stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ xfix ]; - license = stdenv.lib.licenses.bsd3; + platforms = if useQt4 then qt4.meta.platforms else lib.platforms.unix; + maintainers = with lib.maintainers; [ xfix ]; + license = lib.licenses.bsd3; }; } diff --git a/nixpkgs/pkgs/development/tools/build-managers/cmake/default.nix b/nixpkgs/pkgs/development/tools/build-managers/cmake/default.nix index d38f42e4b338..67adc2438c7f 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/cmake/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/cmake/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, pkgconfig +{ stdenv, lib, fetchurl, pkg-config , bzip2, curl, expat, libarchive, xz, zlib, libuv, rhash , buildPackages # darwin attributes @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = [ setupHook pkgconfig ]; + nativeBuildInputs = [ setupHook pkg-config ]; buildInputs = [] ++ lib.optionals useSharedLibraries [ bzip2 curl expat libarchive xz zlib libuv rhash ] diff --git a/nixpkgs/pkgs/development/tools/build-managers/colormake/default.nix b/nixpkgs/pkgs/development/tools/build-managers/colormake/default.nix index 7eed88069557..251268a449d4 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/colormake/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/colormake/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, perl }: +{ lib, stdenv, fetchFromGitHub, perl }: stdenv.mkDerivation { pname = "colormake"; @@ -18,7 +18,7 @@ stdenv.mkDerivation { cp -fa colormake.pl colormake colormake-short clmake clmake-short $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Simple wrapper around make to colorize the output"; homepage = "https://bre.klaki.net/programs/colormake/"; license = licenses.gpl2; diff --git a/nixpkgs/pkgs/development/tools/build-managers/conan/default.nix b/nixpkgs/pkgs/development/tools/build-managers/conan/default.nix index e09277e498d2..c73b7149a361 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/conan/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/conan/default.nix @@ -1,4 +1,4 @@ -{ lib, python3, fetchFromGitHub, git, pkgconfig }: +{ lib, python3, fetchFromGitHub, git, pkg-config }: # Note: # Conan has specific dependency demands; check @@ -72,7 +72,7 @@ in newPython.pkgs.buildPythonApplication rec { ]; checkInputs = [ - pkgconfig + pkg-config git ] ++ (with newPython.pkgs; [ codecov diff --git a/nixpkgs/pkgs/development/tools/build-managers/doit/default.nix b/nixpkgs/pkgs/development/tools/build-managers/doit/default.nix deleted file mode 100644 index b906d64f0af9..000000000000 --- a/nixpkgs/pkgs/development/tools/build-managers/doit/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ stdenv, fetchurl, python3Packages }: - -let - - name = "doit"; - version = "0.32.0"; - -in python3Packages.buildPythonApplication { - name = "${name}-${version}"; - - src = fetchurl { - url = "mirror://pypi/d/${name}/${name}-${version}.tar.gz"; - sha256 = "033m6y9763l81kgqd07rm62bngv3dsm3k9p28nwsn2qawl8h8g9j"; - }; - - buildInputs = with python3Packages; [ mock pytest ]; - - propagatedBuildInputs = with python3Packages; [ cloudpickle ] - ++ stdenv.lib.optional stdenv.isLinux pyinotify - ++ stdenv.lib.optional stdenv.isDarwin macfsevents; - - # Tests fail due to mysterious gdbm.open() resource temporarily - # unavailable errors. - doCheck = false; - checkPhase = "py.test"; - - meta = with stdenv.lib; { - homepage = "https://pydoit.org/"; - description = "A task management & automation tool"; - license = licenses.mit; - longDescription = '' - doit is a modern open-source build-tool written in python - designed to be simple to use and flexible to deal with complex - work-flows. It is specially suitable for building and managing - custom work-flows where there is no out-of-the-box solution - available. - ''; - maintainers = with maintainers; [ pSub ]; - platforms = platforms.all; - }; -} diff --git a/nixpkgs/pkgs/development/tools/build-managers/drake/gemset.nix b/nixpkgs/pkgs/development/tools/build-managers/drake/gemset.nix index 061ed5d973ab..09b3bc7ec061 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/drake/gemset.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/drake/gemset.nix @@ -20,4 +20,4 @@ }; version = "0.9.2.0.3.1"; }; -} \ No newline at end of file +} diff --git a/nixpkgs/pkgs/development/tools/build-managers/dub/default.nix b/nixpkgs/pkgs/development/tools/build-managers/dub/default.nix index 2668eca45691..2df829a02295 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/dub/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/dub/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, curl, dmd, libevent, rsync }: +{ lib, stdenv, fetchFromGitHub, curl, dmd, libevent, rsync }: stdenv.mkDerivation rec { pname = "dub"; @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { cp bin/dub $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Package and build manager for D applications and libraries"; homepage = "https://code.dlang.org/"; license = licenses.mit; diff --git a/nixpkgs/pkgs/development/tools/build-managers/fac/default.nix b/nixpkgs/pkgs/development/tools/build-managers/fac/default.nix index 8c41eb3ac51a..25450ceb6d9b 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/fac/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/fac/default.nix @@ -1,4 +1,4 @@ -{ stdenv, git, fetchFromGitHub, rustPlatform }: +{ lib, stdenv, git, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { pname = "fac-build"; @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { 'std::process::Command::new("${git}/bin/git")' ''; - meta = with stdenv.lib; { + meta = with lib; { description = '' A build system that uses ptrace to handle dependencies automatically ''; diff --git a/nixpkgs/pkgs/development/tools/build-managers/gnumake/4.2/default.nix b/nixpkgs/pkgs/development/tools/build-managers/gnumake/4.2/default.nix index a83281c4e961..387650e85ab7 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/gnumake/4.2/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/gnumake/4.2/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, guileSupport ? false, pkgconfig ? null , guile ? null }: +{ lib, stdenv, fetchurl, guileSupport ? false, pkg-config ? null , guile ? null }: -assert guileSupport -> ( pkgconfig != null && guile != null ); +assert guileSupport -> ( pkg-config != null && guile != null ); let version = "4.2.1"; @@ -25,10 +25,10 @@ stdenv.mkDerivation { ./glibc-2.27-glob.patch ]; - nativeBuildInputs = stdenv.lib.optionals guileSupport [ pkgconfig ]; - buildInputs = stdenv.lib.optionals guileSupport [ guile ]; + nativeBuildInputs = lib.optionals guileSupport [ pkg-config ]; + buildInputs = lib.optionals guileSupport [ guile ]; - configureFlags = stdenv.lib.optional guileSupport "--with-guile" + configureFlags = lib.optional guileSupport "--with-guile" # Make uses this test to decide whether it should keep track of # subseconds. Apple made this possible with APFS and macOS 10.13. @@ -37,11 +37,11 @@ stdenv.mkDerivation { # a second. So, tell Make to ignore nanoseconds in mtime here by # overriding the autoconf test for the struct. # See https://github.com/NixOS/nixpkgs/issues/51221 for discussion. - ++ stdenv.lib.optional stdenv.isDarwin "ac_cv_struct_st_mtim_nsec=no"; + ++ lib.optional stdenv.isDarwin "ac_cv_struct_st_mtim_nsec=no"; outputs = [ "out" "man" "info" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.gnu.org/software/make/"; description = "A tool to control the generation of non-source files from sources"; license = licenses.gpl3Plus; diff --git a/nixpkgs/pkgs/development/tools/build-managers/gnumake/default.nix b/nixpkgs/pkgs/development/tools/build-managers/gnumake/default.nix index f01f38ecd233..fb9dab54049a 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/gnumake/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/gnumake/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, guileSupport ? false, pkgconfig ? null , guile ? null }: +{ lib, stdenv, fetchurl, guileSupport ? false, pkg-config ? null , guile ? null }: -assert guileSupport -> ( pkgconfig != null && guile != null ); +assert guileSupport -> ( pkg-config != null && guile != null ); let version = "4.3"; @@ -21,10 +21,10 @@ stdenv.mkDerivation { ./impure-dirs.patch ]; - nativeBuildInputs = stdenv.lib.optionals guileSupport [ pkgconfig ]; - buildInputs = stdenv.lib.optionals guileSupport [ guile ]; + nativeBuildInputs = lib.optionals guileSupport [ pkg-config ]; + buildInputs = lib.optionals guileSupport [ guile ]; - configureFlags = stdenv.lib.optional guileSupport "--with-guile" + configureFlags = lib.optional guileSupport "--with-guile" # Make uses this test to decide whether it should keep track of # subseconds. Apple made this possible with APFS and macOS 10.13. @@ -33,11 +33,11 @@ stdenv.mkDerivation { # a second. So, tell Make to ignore nanoseconds in mtime here by # overriding the autoconf test for the struct. # See https://github.com/NixOS/nixpkgs/issues/51221 for discussion. - ++ stdenv.lib.optional stdenv.isDarwin "ac_cv_struct_st_mtim_nsec=no"; + ++ lib.optional stdenv.isDarwin "ac_cv_struct_st_mtim_nsec=no"; outputs = [ "out" "man" "info" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.gnu.org/software/make/"; description = "A tool to control the generation of non-source files from sources"; license = licenses.gpl3Plus; diff --git a/nixpkgs/pkgs/development/tools/build-managers/gradle/default.nix b/nixpkgs/pkgs/development/tools/build-managers/gradle/default.nix index d06282739afe..638be6b02d83 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/gradle/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/gradle/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, jdk, java ? jdk, makeWrapper }: +{ lib, stdenv, fetchurl, unzip, jdk, java ? jdk, makeWrapper }: rec { gradleGen = {name, src, nativeVersion} : stdenv.mkDerivation { @@ -46,8 +46,8 @@ rec { build-by-convention behavior. ''; homepage = "http://www.gradle.org/"; - license = stdenv.lib.licenses.asl20; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.asl20; + platforms = lib.platforms.unix; }; }; diff --git a/nixpkgs/pkgs/development/tools/build-managers/gup/default.nix b/nixpkgs/pkgs/development/tools/build-managers/gup/default.nix index 30c4d4ec4de0..dcc0c3aef90c 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/gup/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/gup/default.nix @@ -33,8 +33,8 @@ stdenv.mkDerivation rec { meta = { inherit (src.meta) homepage; description = "A better make, inspired by djb's redo"; - license = stdenv.lib.licenses.lgpl2Plus; - maintainers = [ stdenv.lib.maintainers.timbertson ]; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.lgpl2Plus; + maintainers = [ lib.maintainers.timbertson ]; + platforms = lib.platforms.all; }; } diff --git a/nixpkgs/pkgs/development/tools/build-managers/icmake/default.nix b/nixpkgs/pkgs/development/tools/build-managers/icmake/default.nix index 89e2b8d0cc6e..6320646974ad 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/icmake/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/icmake/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, makeWrapper, gcc, ncurses }: +{ lib, stdenv, fetchFromGitLab, makeWrapper, gcc, ncurses }: stdenv.mkDerivation rec { pname = "icmake"; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { --prefix PATH : ${ncurses}/bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A program maintenance (make) utility using a C-like grammar"; homepage = "https://fbb-git.gitlab.io/icmake/"; license = licenses.gpl3; diff --git a/nixpkgs/pkgs/development/tools/build-managers/jam/default.nix b/nixpkgs/pkgs/development/tools/build-managers/jam/default.nix index 7d7502fad4b7..6f5ecde8f88c 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/jam/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/jam/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, yacc }: +{ lib, stdenv, fetchurl, yacc }: stdenv.mkDerivation rec { name = "jam-2.6.1"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.perforce.com/resources/documentation/jam"; license = licenses.free; description = "Just Another Make"; diff --git a/nixpkgs/pkgs/development/tools/build-managers/kati/default.nix b/nixpkgs/pkgs/development/tools/build-managers/kati/default.nix index a7fced4482be..ed5923e74d0a 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/kati/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/kati/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation { pname = "kati-unstable"; @@ -17,7 +17,7 @@ stdenv.mkDerivation { install -D ckati $out/bin/ckati ''; - meta = with stdenv.lib; { + meta = with lib; { description = "An experimental GNU make clone"; homepage = "https://github.com/google/kati"; platforms = platforms.all; diff --git a/nixpkgs/pkgs/development/tools/build-managers/leiningen/default.nix b/nixpkgs/pkgs/development/tools/build-managers/leiningen/default.nix index f1445970f6a7..488697033d91 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/leiningen/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/leiningen/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper +{ lib, stdenv, fetchurl, makeWrapper , coreutils, jdk, rlwrap, gnupg }: stdenv.mkDerivation rec { @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { substituteInPlace $out/bin/lein \ --replace 'LEIN_JAR=/usr/share/java/leiningen-$LEIN_VERSION-standalone.jar' "LEIN_JAR=$out/share/$JARNAME" wrapProgram $out/bin/lein \ - --prefix PATH ":" "${stdenv.lib.makeBinPath [ rlwrap coreutils ]}" \ + --prefix PATH ":" "${lib.makeBinPath [ rlwrap coreutils ]}" \ --set LEIN_GPG ${gnupg}/bin/gpg \ --set JAVA_CMD ${jdk}/bin/java ''; @@ -46,8 +46,8 @@ stdenv.mkDerivation rec { meta = { homepage = "https://leiningen.org/"; description = "Project automation for Clojure"; - license = stdenv.lib.licenses.epl10; - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; - maintainers = with stdenv.lib.maintainers; [ thiagokokada ]; + license = lib.licenses.epl10; + platforms = lib.platforms.linux ++ lib.platforms.darwin; + maintainers = with lib.maintainers; [ thiagokokada ]; }; } diff --git a/nixpkgs/pkgs/development/tools/build-managers/mage/default.nix b/nixpkgs/pkgs/development/tools/build-managers/mage/default.nix index 6c9d8bfc8385..d8ccd3ad2fe0 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/mage/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/mage/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "mage"; - version = "1.10.0"; + version = "1.11.0"; src = fetchFromGitHub { owner = "magefile"; repo = pname; rev = "v${version}"; - sha256 = "0c77xgz2bz4j9sh9v7f49iqyamc4lvvldcmn6v50hk98s9193gbf"; + sha256 = "sha256-ghOk44VcQUAAYm9NCLsgYdky1KEpwOeChBNrgUKjnC8="; }; - vendorSha256 = "0sjjj9z1dhilhpc8pq4154czrb79z9cm044jvn75kxcjv6v5l2m5"; + vendorSha256 = null; doCheck = false; diff --git a/nixpkgs/pkgs/development/tools/build-managers/meson/default.nix b/nixpkgs/pkgs/development/tools/build-managers/meson/default.nix index 890c457da059..74d96d4af002 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/meson/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/meson/default.nix @@ -63,7 +63,7 @@ python3.pkgs.buildPythonApplication rec { # 0.45 update enabled tests but they are failing doCheck = false; - # checkInputs = [ ninja pkgconfig ]; + # checkInputs = [ ninja pkg-config ]; # checkPhase = "python ./run_project_tests.py"; postFixup = '' diff --git a/nixpkgs/pkgs/development/tools/build-managers/mill/default.nix b/nixpkgs/pkgs/development/tools/build-managers/mill/default.nix index a3865e2c52c9..5942e20ec920 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/mill/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/mill/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, jre, makeWrapper }: +{ lib, stdenv, fetchurl, jre, makeWrapper }: stdenv.mkDerivation rec { pname = "mill"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.lihaoyi.com/mill"; license = licenses.mit; description = "A build tool for Scala, Java and more"; @@ -37,6 +37,6 @@ stdenv.mkDerivation rec { modules (written in Java or Scala) or through an external subprocesses. ''; maintainers = with maintainers; [ scalavision ]; - platforms = stdenv.lib.platforms.all; + platforms = lib.platforms.all; }; } diff --git a/nixpkgs/pkgs/development/tools/build-managers/mk/default.nix b/nixpkgs/pkgs/development/tools/build-managers/mk/default.nix index 09028789daa6..1eaa51a5de0b 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/mk/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/mk/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation { name = "mk-2006-01-31"; @@ -9,6 +9,6 @@ stdenv.mkDerivation { builder = ./builder.sh; meta = { - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/tools/build-managers/msbuild/default.nix b/nixpkgs/pkgs/development/tools/build-managers/msbuild/default.nix index 1b805df95a08..ce08986b3e17 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/msbuild/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/msbuild/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, glibcLocales, mono, dotnetPackages, unzip, dotnet-sdk }: +{ lib, stdenv, fetchurl, makeWrapper, glibcLocales, mono, dotnetPackages, unzip, dotnet-sdk }: let @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { # https://github.com/NixOS/nixpkgs/issues/38991 # bash: warning: setlocale: LC_ALL: cannot change locale (en_US.UTF-8) - LOCALE_ARCHIVE = stdenv.lib.optionalString stdenv.isLinux + LOCALE_ARCHIVE = lib.optionalString stdenv.isLinux "${glibcLocales}/lib/locale/locale-archive"; buildPhase = '' @@ -122,7 +122,7 @@ EOF ${mono}/bin/mono Helloworld.exe | grep "Hello, world!" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Mono version of Microsoft Build Engine, the build platform for .NET, and Visual Studio"; homepage = "https://github.com/mono/msbuild"; license = licenses.mit; diff --git a/nixpkgs/pkgs/development/tools/build-managers/ninja/default.nix b/nixpkgs/pkgs/development/tools/build-managers/ninja/default.nix index 8fc81a1a979d..ddc61ca86d9c 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/ninja/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/ninja/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, fetchpatch, python3, buildDocs ? true, asciidoc, docbook_xml_dtd_45, docbook_xsl, libxslt, re2c }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, python3, buildDocs ? true, asciidoc, docbook_xml_dtd_45, docbook_xsl, libxslt, re2c }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "ninja"; diff --git a/nixpkgs/pkgs/development/tools/build-managers/pants/default.nix b/nixpkgs/pkgs/development/tools/build-managers/pants/default.nix index 9757d8cda8d1..03eac2db5e38 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/pants/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/pants/default.nix @@ -1,6 +1,6 @@ -{ stdenv, pythonPackages }: +{ lib, stdenv, pythonPackages }: -with stdenv.lib; +with lib; with pythonPackages; buildPythonApplication rec { diff --git a/nixpkgs/pkgs/development/tools/build-managers/qbs/default.nix b/nixpkgs/pkgs/development/tools/build-managers/qbs/default.nix index 359c942d189a..3bf7623ed04c 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/qbs/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/qbs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, qmake, qtbase, qtscript }: +{ lib, stdenv, fetchFromGitHub, qmake, qtbase, qtscript }: stdenv.mkDerivation rec { pname = "qbs"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "A tool that helps simplify the build process for developing projects across multiple platforms"; homepage = "https://wiki.qt.io/Qbs"; license = licenses.lgpl3; diff --git a/nixpkgs/pkgs/development/tools/build-managers/rake/gemset.nix b/nixpkgs/pkgs/development/tools/build-managers/rake/gemset.nix index 05a59cff850f..534c5efcfb13 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/rake/gemset.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/rake/gemset.nix @@ -9,4 +9,4 @@ }; version = "12.3.2"; }; -} \ No newline at end of file +} diff --git a/nixpkgs/pkgs/development/tools/build-managers/rebar/default.nix b/nixpkgs/pkgs/development/tools/build-managers/rebar/default.nix index 1c5996c6b1cf..d3926beb3216 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/rebar/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/rebar/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, erlang }: +{ lib, stdenv, fetchurl, erlang }: let @@ -35,7 +35,7 @@ stdenv.mkDerivation { variety of locations (git, hg, etc). ''; - platforms = stdenv.lib.platforms.unix; - license = stdenv.lib.licenses.asl20; + platforms = lib.platforms.unix; + license = lib.licenses.asl20; }; } diff --git a/nixpkgs/pkgs/development/tools/build-managers/rebar3/default.nix b/nixpkgs/pkgs/development/tools/build-managers/rebar3/default.nix index bf28868d0e70..aa3af12c934b 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/rebar3/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/rebar3/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, +{ lib, stdenv, fetchFromGitHub, fetchHex, erlang, tree }: @@ -135,8 +135,8 @@ stdenv.mkDerivation rec { variety of locations (hex.pm, git, hg, and so on). ''; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ gleber tazjin ]; - license = stdenv.lib.licenses.asl20; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ gleber tazjin ]; + license = lib.licenses.asl20; }; } diff --git a/nixpkgs/pkgs/development/tools/build-managers/redo-apenwarr/default.nix b/nixpkgs/pkgs/development/tools/build-managers/redo-apenwarr/default.nix index c62fb0f2515d..638f10f01873 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/redo-apenwarr/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/redo-apenwarr/default.nix @@ -30,7 +30,7 @@ --replace "/bin/ls" "ls" substituteInPlace t/110-compile/hello.o.do \ - --replace "/usr/include" "${stdenv.lib.getDev stdenv.cc.libc}/include" + --replace "/usr/include" "${lib.getDev stdenv.cc.libc}/include" substituteInPlace t/200-shell/nonshelltest.do \ --replace "/usr/bin/env perl" "${perl}/bin/perl" diff --git a/nixpkgs/pkgs/development/tools/build-managers/redo-c/default.nix b/nixpkgs/pkgs/development/tools/build-managers/redo-c/default.nix index 1480f32a50f3..40708b7877a9 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/redo-c/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/redo-c/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "redo-c"; version = "0.2"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { cp '${./Makefile}' Makefile ''; - meta = with stdenv.lib; { + meta = with lib; { description = "An implementation of the redo build system in portable C with zero dependencies"; homepage = "https://github.com/leahneukirchen/redo-c"; license = licenses.cc0; diff --git a/nixpkgs/pkgs/development/tools/build-managers/redo-sh/default.nix b/nixpkgs/pkgs/development/tools/build-managers/redo-sh/default.nix index 315b74b820e5..d22f4bc487f8 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/redo-sh/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/redo-sh/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl, makeWrapper, coreutils }: +{ lib, stdenv, fetchurl, makeWrapper, coreutils }: stdenv.mkDerivation { - version = "4.0.3"; + version = "4.0.4"; pname = "redo-sh"; src = fetchurl { url = "http://news.dieweltistgarnichtso.net/bin/archives/redo-sh.tar.gz"; - sha256 = "1n84ld4fihqa7a6kn3f177dknz89qcvissfwz1m21bwdq950avia"; + sha256 = "0d3hz3vy5qmjr9r4f8a5cx9hikpzs8h8f0fsl3dpbialf4wck24g"; }; buildInputs = [ makeWrapper ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Redo implementation in Bourne Shell"; homepage = "http://news.dieweltistgarnichtso.net/bin/redo-sh.html"; license = licenses.agpl3; diff --git a/nixpkgs/pkgs/development/tools/build-managers/redo/default.nix b/nixpkgs/pkgs/development/tools/build-managers/redo/default.nix index a735a05dc5b8..48fbffc39406 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/redo/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/redo/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, perl }: +{lib, stdenv, fetchurl, perl }: stdenv.mkDerivation rec { name = "redo-1.4"; @@ -21,8 +21,8 @@ stdenv.mkDerivation rec { meta = { homepage = "https://jdebp.eu./Softwares/redo/"; description = "A system for building target files from source files"; - license = stdenv.lib.licenses.bsd2; - maintainers = [ stdenv.lib.maintainers.vrthra ]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.bsd2; + maintainers = [ lib.maintainers.vrthra ]; + platforms = lib.platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/tools/build-managers/remake/default.nix b/nixpkgs/pkgs/development/tools/build-managers/remake/default.nix index 7d44bc74df8a..f61a7e774583 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/remake/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/remake/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, readline }: +{ lib, stdenv, fetchurl, readline }: stdenv.mkDerivation rec { pname = "remake"; @@ -19,9 +19,9 @@ stdenv.mkDerivation rec { meta = { homepage = "http://bashdb.sourceforge.net/remake/"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; description = "GNU Make with comprehensible tracing and a debugger"; - platforms = with stdenv.lib.platforms; linux ++ darwin; - maintainers = with stdenv.lib.maintainers; [ bjornfor ]; + platforms = with lib.platforms; linux ++ darwin; + maintainers = with lib.maintainers; [ bjornfor ]; }; } diff --git a/nixpkgs/pkgs/development/tools/build-managers/rocm-cmake/default.nix b/nixpkgs/pkgs/development/tools/build-managers/rocm-cmake/default.nix index 1dd931981dad..5b9a456ce75f 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/rocm-cmake/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/rocm-cmake/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "rocm-cmake"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - meta = with stdenv.lib; { + meta = with lib; { description = "CMake modules for common build tasks for the ROCm stack"; homepage = "https://github.com/RadeonOpenCompute/rocm-cmake"; license = licenses.mit; diff --git a/nixpkgs/pkgs/development/tools/build-managers/samurai/default.nix b/nixpkgs/pkgs/development/tools/build-managers/samurai/default.nix index f8b649e04093..4360a3f3a308 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/samurai/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/samurai/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "samurai"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { makeFlags = [ "DESTDIR=" "PREFIX=${placeholder "out"}" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "ninja-compatible build tool written in C"; homepage = "https://github.com/michaelforney/samurai"; license = with licenses; [ mit asl20 ]; # see LICENSE diff --git a/nixpkgs/pkgs/development/tools/build-managers/sbt-extras/default.nix b/nixpkgs/pkgs/development/tools/build-managers/sbt-extras/default.nix index 24c2bdd2af31..f80d278c86df 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/sbt-extras/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/sbt-extras/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, which, curl, makeWrapper, jdk, writeScript +{ lib, stdenv, fetchFromGitHub, which, curl, makeWrapper, jdk, writeScript , common-updater-scripts, cacert, git, nixfmt, nix, jq, coreutils, gnused , nixosTests }: @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { install bin/sbt $out/bin wrapProgram $out/bin/sbt --prefix PATH : ${ - stdenv.lib.makeBinPath [ which curl ] + lib.makeBinPath [ which curl ] } ''; @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { #!${stdenv.shell} set -xo errexit PATH=${ - stdenv.lib.makeBinPath [ + lib.makeBinPath [ common-updater-scripts curl cacert @@ -70,8 +70,8 @@ stdenv.mkDerivation rec { description = "A more featureful runner for sbt, the simple/scala/standard build tool"; homepage = "https://github.com/paulp/sbt-extras"; - license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ nequissimus puffnfresh ]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ nequissimus puffnfresh ]; + platforms = lib.platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/tools/build-managers/sbt/default.nix b/nixpkgs/pkgs/development/tools/build-managers/sbt/default.nix index a9314cef0cc3..6bd0b83cec1d 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/sbt/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/sbt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, jre, autoPatchelfHook, zlib, writeScript +{ lib, stdenv, fetchurl, jre, autoPatchelfHook, zlib, writeScript , common-updater-scripts, git, nixfmt, nix, coreutils, gnused, nixosTests }: stdenv.mkDerivation rec { @@ -15,9 +15,9 @@ stdenv.mkDerivation rec { echo -java-home ${jre.home} >>conf/sbtopts ''; - nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ autoPatchelfHook ]; + nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook ]; - buildInputs = stdenv.lib.optionals stdenv.isLinux [ zlib ]; + buildInputs = lib.optionals stdenv.isLinux [ zlib ]; installPhase = '' mkdir -p $out/share/sbt $out/bin @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { } $out/bin/sbtn ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.scala-sbt.org/"; license = licenses.bsd3; description = "A build tool for Scala, Java and more"; @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { #!${stdenv.shell} set -o errexit PATH=${ - stdenv.lib.makeBinPath [ + lib.makeBinPath [ common-updater-scripts git nixfmt diff --git a/nixpkgs/pkgs/development/tools/build-managers/scons/common.nix b/nixpkgs/pkgs/development/tools/build-managers/scons/common.nix index 7a15c193423c..1de2ecbbc8b8 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/scons/common.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/scons/common.nix @@ -21,7 +21,7 @@ python3Packages.buildPythonApplication rec { # The release tarballs don't contain any tests (runtest.py and test/*): doCheck = lib.versionOlder version "4.0.0"; - meta = with stdenv.lib; { + meta = with lib; { description = "An improved, cross-platform substitute for Make"; longDescription = '' SCons is an Open Source software construction tool. Think of diff --git a/nixpkgs/pkgs/development/tools/build-managers/shards/default.nix b/nixpkgs/pkgs/development/tools/build-managers/shards/default.nix index cf422fc2e075..868ea265f6f4 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/shards/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/shards/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , crystal_0_34 , crystal_0_35 @@ -26,7 +26,7 @@ let # tries to execute git which fails spectacularly doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Dependency manager for the Crystal language"; license = licenses.asl20; maintainers = with maintainers; [ peterhoeg ]; diff --git a/nixpkgs/pkgs/development/tools/build-managers/tup/default.nix b/nixpkgs/pkgs/development/tools/build-managers/tup/default.nix index 628e0c4797b3..f0e6efdca3e9 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/tup/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/tup/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fuse3, pkgconfig, pcre }: +{ lib, stdenv, fetchFromGitHub, fuse3, pkg-config, pcre }: stdenv.mkDerivation rec { pname = "tup"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1qd07h4wi0743l7z2vybfvhwp61g2p2pc5qhl40672ryl24nvd1d"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ fuse3 pcre ]; configurePhase = '' @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { setupHook = ./setup-hook.sh; - meta = with stdenv.lib; { + meta = with lib; { description = "A fast, file-based build system"; longDescription = '' Tup is a file-based build system for Linux, OSX, and Windows. It inputs a list diff --git a/nixpkgs/pkgs/development/tools/build-managers/waf/default.nix b/nixpkgs/pkgs/development/tools/build-managers/waf/default.nix index 49aae7c30140..ae62ce539bab 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/waf/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/waf/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchFromGitLab, python, ensureNewerSourcesForZipFilesHook +{ lib, stdenv, fetchFromGitLab, python, ensureNewerSourcesForZipFilesHook # optional list of extra waf tools, e.g. `[ "doxygen" "pytest" ]` , withTools ? null }: let - wafToolsArg = with stdenv.lib.strings; + wafToolsArg = with lib.strings; optionalString (!isNull withTools) " --tools=\"${concatStringsSep "," withTools}\""; in stdenv.mkDerivation rec { @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { install -D waf $out/bin/waf ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Meta build system"; homepage = "https://waf.io"; license = licenses.bsd3; diff --git a/nixpkgs/pkgs/development/tools/buildah/default.nix b/nixpkgs/pkgs/development/tools/buildah/default.nix index e69e35442b3f..5c80cbe096e4 100644 --- a/nixpkgs/pkgs/development/tools/buildah/default.nix +++ b/nixpkgs/pkgs/development/tools/buildah/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib , buildGoModule , fetchFromGitHub , go-md2man @@ -14,13 +14,13 @@ buildGoModule rec { pname = "buildah"; - version = "1.18.0"; + version = "1.19.2"; src = fetchFromGitHub { owner = "containers"; repo = "buildah"; rev = "v${version}"; - sha256 = "0kn31y5g7269mjaw5ddfsiaan93s62i8zzxg4xl01dg3dkkadwc4"; + sha256 = "1gak5m4n4bfji1hcv8y5lj1m8a39rars8igqxdr89d2i45dkpbx0"; }; outputs = [ "out" "man" ]; @@ -52,7 +52,7 @@ buildGoModule rec { make -C docs install PREFIX="$man" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A tool which facilitates building OCI images"; homepage = "https://buildah.io/"; changelog = "https://github.com/containers/buildah/releases/tag/v${version}"; diff --git a/nixpkgs/pkgs/development/tools/buildkit/default.nix b/nixpkgs/pkgs/development/tools/buildkit/default.nix index 00a285c67d02..558940587949 100644 --- a/nixpkgs/pkgs/development/tools/buildkit/default.nix +++ b/nixpkgs/pkgs/development/tools/buildkit/default.nix @@ -1,22 +1,22 @@ -{ stdenv, fetchFromGitHub, buildGoPackage }: +{ lib, stdenv, fetchFromGitHub, buildGoPackage }: buildGoPackage rec { pname = "buildkit"; - version = "0.8.0"; + version = "0.8.1"; goPackagePath = "github.com/moby/buildkit"; - subPackages = [ "cmd/buildctl" ] ++ stdenv.lib.optionals stdenv.isLinux [ "cmd/buildkitd" ]; + subPackages = [ "cmd/buildctl" ] ++ lib.optionals stdenv.isLinux [ "cmd/buildkitd" ]; src = fetchFromGitHub { owner = "moby"; repo = "buildkit"; rev = "v${version}"; - sha256 = "0qcgq93wj77i912xqhwrzkzaqz608ilczfn5kcsrf9jk2m1gnx7m"; + sha256 = "0lqfz097nyb6q6bn5mmfg6vl1nmgb6k4lmwxc8anza6zp8qh7wif"; }; buildFlagsArray = [ "-ldflags=-s -w -X ${goPackagePath}/version.Version=${version} -X ${goPackagePath}/version.Revision=${src.rev}" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Concurrent, cache-efficient, and Dockerfile-agnostic builder toolkit"; homepage = "https://github.com/moby/buildkit"; license = licenses.asl20; diff --git a/nixpkgs/pkgs/development/tools/buildpack/default.nix b/nixpkgs/pkgs/development/tools/buildpack/default.nix index dbb45df40c25..68d0a53387a6 100644 --- a/nixpkgs/pkgs/development/tools/buildpack/default.nix +++ b/nixpkgs/pkgs/development/tools/buildpack/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "pack"; - version = "0.15.1"; + version = "0.16.0"; src = fetchFromGitHub { owner = "buildpacks"; repo = pname; rev = "v${version}"; - sha256 = "026qy81hfblx98z9hip7gpqcfqgzfhm5bimg6p9gi5fd5wsbfs4c"; + sha256 = "sha256-fNPgdMwqQq2Gh/rkf6KHEd34rnQqhw7Jf1L34oVorqM="; }; - vendorSha256 = "0i6nplh1papcmdzas9f8pkccsx5csbxxkvy5a6130jjbwdm14jw7"; + vendorSha256 = "sha256-U38j5fxECKjYr5pqaNk0+Z0opQNqiYV2+6dIEaHUVF8="; nativeBuildInputs = [ installShellFiles ]; diff --git a/nixpkgs/pkgs/development/tools/cadre/gemset.nix b/nixpkgs/pkgs/development/tools/cadre/gemset.nix index 33fd428debf2..e98f5c5f3e69 100644 --- a/nixpkgs/pkgs/development/tools/cadre/gemset.nix +++ b/nixpkgs/pkgs/development/tools/cadre/gemset.nix @@ -32,4 +32,4 @@ }; version = "1.2.1"; }; -} \ No newline at end of file +} diff --git a/nixpkgs/pkgs/development/tools/cargo-web/default.nix b/nixpkgs/pkgs/development/tools/cargo-web/default.nix index 3008c15d848a..c85ef52564a4 100644 --- a/nixpkgs/pkgs/development/tools/cargo-web/default.nix +++ b/nixpkgs/pkgs/development/tools/cargo-web/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, openssl, perl, pkgconfig, rustPlatform +{ lib, stdenv, fetchFromGitHub, openssl, perl, pkg-config, rustPlatform , CoreServices, Security }: @@ -15,10 +15,10 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "0i9xp7vd1rp6xgkbbrspm3qq4hxwfwa00di3k73z1x64d3d8r5fm"; - nativeBuildInputs = [ openssl perl pkgconfig ]; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices Security ]; + nativeBuildInputs = [ openssl perl pkg-config ]; + buildInputs = lib.optionals stdenv.isDarwin [ CoreServices Security ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A Cargo subcommand for the client-side Web"; homepage = "https://github.com/koute/cargo-web"; license = with licenses; [ asl20 /* or */ mit ]; diff --git a/nixpkgs/pkgs/development/tools/cask/default.nix b/nixpkgs/pkgs/development/tools/cask/default.nix index 925d10b23b44..886d435b8114 100644 --- a/nixpkgs/pkgs/development/tools/cask/default.nix +++ b/nixpkgs/pkgs/development/tools/cask/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchurl, python, emacsPackages }: +{ lib, stdenv, fetchurl, python, emacs }: stdenv.mkDerivation rec { pname = "cask"; - inherit (emacsPackages.melpaStablePackages.cask) src version; + inherit (emacs.pkgs.melpaStablePackages.cask) src version; doCheck = true; - nativeBuildInputs = [ emacsPackages.emacs ]; - buildInputs = with emacsPackages; [ + nativeBuildInputs = [ emacs ]; + buildInputs = with emacs.pkgs; [ s f dash ansi ecukes servant ert-runner el-mock noflet ert-async shell-split-string git package-build ] ++ [ @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ln -s $out/share/emacs/site-lisp/cask/bin/cask $out/bin/cask ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Project management for Emacs"; longDescription = '' Cask is a project management tool for Emacs that helps automate the diff --git a/nixpkgs/pkgs/development/tools/castxml/default.nix b/nixpkgs/pkgs/development/tools/castxml/default.nix index 90be513bd50f..ff47bd0e9f36 100644 --- a/nixpkgs/pkgs/development/tools/castxml/default.nix +++ b/nixpkgs/pkgs/development/tools/castxml/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { sha256 = "0ypj67xrgj228myp7l1gsjw1ja97q68nmj98dsd33srmiayqraj4"; }; - nativeBuildInputs = [ cmake ] ++ stdenv.lib.optionals withMan [ python3Packages.sphinx ]; + nativeBuildInputs = [ cmake ] ++ lib.optionals withMan [ python3Packages.sphinx ]; clangVersion = lib.getVersion llvmPackages.clang; @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { ctest -E 'cmd.cc-(gnu|msvc)-((c-src-c)|(src-cxx))-cmd' ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/CastXML/CastXML"; license = licenses.asl20; description = "Abstract syntax tree XML output tool"; diff --git a/nixpkgs/pkgs/development/tools/cbor-diag/gemset.nix b/nixpkgs/pkgs/development/tools/cbor-diag/gemset.nix index 49de5b06f543..c3fa8f420693 100644 --- a/nixpkgs/pkgs/development/tools/cbor-diag/gemset.nix +++ b/nixpkgs/pkgs/development/tools/cbor-diag/gemset.nix @@ -51,4 +51,4 @@ }; version = "1.6.10"; }; -} \ No newline at end of file +} diff --git a/nixpkgs/pkgs/development/tools/cddl/gemset.nix b/nixpkgs/pkgs/development/tools/cddl/gemset.nix index a66833e27d9f..c1f1c64495e3 100644 --- a/nixpkgs/pkgs/development/tools/cddl/gemset.nix +++ b/nixpkgs/pkgs/development/tools/cddl/gemset.nix @@ -92,4 +92,4 @@ }; version = "1.6.10"; }; -} \ No newline at end of file +} diff --git a/nixpkgs/pkgs/development/tools/cdecl/default.nix b/nixpkgs/pkgs/development/tools/cdecl/default.nix index 7981681a6414..7e0a07ad834d 100644 --- a/nixpkgs/pkgs/development/tools/cdecl/default.nix +++ b/nixpkgs/pkgs/development/tools/cdecl/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, yacc, flex, readline, ncurses, gnused}: +{lib, stdenv, fetchurl, yacc, flex, readline, ncurses, gnused}: stdenv.mkDerivation { name = "cdecl-2.5"; @@ -18,8 +18,8 @@ stdenv.mkDerivation { meta = { description = "Translator English -- C/C++ declarations"; - license = stdenv.lib.licenses.publicDomain; - maintainers = with stdenv.lib.maintainers; [joelteon]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.publicDomain; + maintainers = with lib.maintainers; [joelteon]; + platforms = lib.platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/tools/chefdk/gemset.nix b/nixpkgs/pkgs/development/tools/chefdk/gemset.nix index 326dfae79311..1f9522ba4c57 100644 --- a/nixpkgs/pkgs/development/tools/chefdk/gemset.nix +++ b/nixpkgs/pkgs/development/tools/chefdk/gemset.nix @@ -2453,4 +2453,4 @@ }; version = "1.0.5"; }; -} \ No newline at end of file +} diff --git a/nixpkgs/pkgs/development/tools/chit/default.nix b/nixpkgs/pkgs/development/tools/chit/default.nix index 564c5dcbcb53..ac8f15a41588 100644 --- a/nixpkgs/pkgs/development/tools/chit/default.nix +++ b/nixpkgs/pkgs/development/tools/chit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform, pkgconfig, openssl +{ lib, stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl , darwin }: @@ -17,13 +17,13 @@ buildRustPackage rec { cargoSha256 = "1w25k3bqmmcrhpkw510vbwph0rfmrzi2wby0z2rz1q4k1f9k486m"; - nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ pkgconfig ]; + nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ]; buildInputs = [] - ++ stdenv.lib.optionals stdenv.isLinux [ openssl ] - ++ stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ CoreFoundation CoreServices Security ]) + ++ lib.optionals stdenv.isLinux [ openssl ] + ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ CoreFoundation CoreServices Security ]) ; - meta = with stdenv.lib; { + meta = with lib; { description = "Crate help in terminal: A tool for looking up details about rust crates without going to crates.io"; longDescription = '' Chit helps answer these questions: diff --git a/nixpkgs/pkgs/development/tools/clang-tools/default.nix b/nixpkgs/pkgs/development/tools/clang-tools/default.nix index 2e8f48901aba..498310d4324f 100644 --- a/nixpkgs/pkgs/development/tools/clang-tools/default.nix +++ b/nixpkgs/pkgs/development/tools/clang-tools/default.nix @@ -1,11 +1,11 @@ -{ stdenv, llvmPackages }: +{ lib, stdenv, llvmPackages }: let clang = llvmPackages.clang-unwrapped; in stdenv.mkDerivation { pname = "clang-tools"; - version = stdenv.lib.getVersion clang; + version = lib.getVersion clang; dontUnpack = true; @@ -13,7 +13,7 @@ in stdenv.mkDerivation { runHook preInstall mkdir -p $out/bin - export libc_includes="${stdenv.lib.getDev stdenv.cc.libc}/include" + export libc_includes="${lib.getDev stdenv.cc.libc}/include" export libcpp_includes="${llvmPackages.libcxx}/include/c++/v1" export clang=${clang} @@ -34,6 +34,6 @@ in stdenv.mkDerivation { meta = clang.meta // { description = "Standalone command line tools for C++ development"; - maintainers = with stdenv.lib.maintainers; [ aherrmann ]; + maintainers = with lib.maintainers; [ aherrmann ]; }; } diff --git a/nixpkgs/pkgs/development/tools/clog-cli/default.nix b/nixpkgs/pkgs/development/tools/clog-cli/default.nix index 6d843ead24e0..182a7f98c4c2 100644 --- a/nixpkgs/pkgs/development/tools/clog-cli/default.nix +++ b/nixpkgs/pkgs/development/tools/clog-cli/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, rustPlatform, stdenv }: +{ fetchFromGitHub, rustPlatform, lib, stdenv }: with rustPlatform; @@ -18,8 +18,8 @@ buildRustPackage rec { meta = { description = "Generate changelogs from local git metadata"; homepage = "https://github.com/clog-tool/clog-cli"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.unix; - maintainers = [stdenv.lib.maintainers.nthorne]; + license = lib.licenses.mit; + platforms = lib.platforms.unix; + maintainers = [lib.maintainers.nthorne]; }; } diff --git a/nixpkgs/pkgs/development/tools/cloudfoundry-cli/default.nix b/nixpkgs/pkgs/development/tools/cloudfoundry-cli/default.nix index 642c42108aa5..4d7e226463fd 100644 --- a/nixpkgs/pkgs/development/tools/cloudfoundry-cli/default.nix +++ b/nixpkgs/pkgs/development/tools/cloudfoundry-cli/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, fetchurl, installShellFiles }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub, fetchurl, installShellFiles }: buildGoPackage rec { pname = "cloudfoundry-cli"; @@ -45,7 +45,7 @@ buildGoPackage rec { installShellCompletion --bash $bashCompletionScript ''; - meta = with stdenv.lib; { + meta = with lib; { description = "The official command line client for Cloud Foundry"; homepage = "https://github.com/cloudfoundry/cli"; maintainers = with maintainers; [ ris ]; diff --git a/nixpkgs/pkgs/development/tools/clpm/default.nix b/nixpkgs/pkgs/development/tools/clpm/default.nix new file mode 100644 index 000000000000..03174d6c4fcb --- /dev/null +++ b/nixpkgs/pkgs/development/tools/clpm/default.nix @@ -0,0 +1,44 @@ +{ lib, stdenv +, fetchgit +, wrapLisp +, sbcl +, openssl +}: + +stdenv.mkDerivation rec { + pname = "clpm"; + version = "0.3.5"; + + src = fetchgit { + url = "https://gitlab.common-lisp.net/clpm/clpm"; + rev = "v${version}"; + fetchSubmodules = true; + sha256 = "0jivnnp3z148yf4c2nzzr5whz76w5kjhsb97z2vs5maiwf79y2if"; + }; + + buildInputs = [ + (wrapLisp sbcl) + openssl + ]; + + buildPhase = '' + ln -s ${openssl.out}/lib/libcrypto.so.* . + ln -s ${openssl.out}/lib/libssl.so.* . + common-lisp.sh --script scripts/build.lisp + ''; + + installPhase = '' + INSTALL_ROOT=$out sh install.sh + ''; + + # fixupPhase results in fatal error in SBCL, `Can't find sbcl.core` + dontFixup = true; + + meta = with lib; { + description = "Common Lisp Package Manager"; + homepage = "https://www.clpm.dev/"; + license = licenses.bsd2; + maintainers = [ maintainers.petterstorvik ]; + platforms = platforms.all; + }; +} diff --git a/nixpkgs/pkgs/development/tools/cmake-language-server/default.nix b/nixpkgs/pkgs/development/tools/cmake-language-server/default.nix index 628bb31fbe93..2c85890e70bf 100644 --- a/nixpkgs/pkgs/development/tools/cmake-language-server/default.nix +++ b/nixpkgs/pkgs/development/tools/cmake-language-server/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonApplication, fetchFromGitHub +{ lib, stdenv, buildPythonApplication, fetchFromGitHub , poetry, pygls, pyparsing , cmake, pytest, pytest-datadir , fetchpatch @@ -17,7 +17,7 @@ buildPythonApplication rec { }; # can be removed after v0.1.2 - patches = stdenv.lib.optional stdenv.isDarwin (fetchpatch { + patches = lib.optional stdenv.isDarwin (fetchpatch { url = "https://github.com/regen100/cmake-language-server/commit/0ec120f39127f25898ab110b43819e3e9becb8a3.patch"; sha256 = "1xbmarvsvzd61fnlap4qscnijli2rw2iqr7cyyvar2jd87z6sfp0"; }); @@ -34,7 +34,7 @@ buildPythonApplication rec { dontUseCmakeConfigure = true; checkPhase = "pytest"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/regen100/cmake-language-server"; description = "CMake LSP Implementation"; license = licenses.mit; diff --git a/nixpkgs/pkgs/development/tools/compass/gemset.nix b/nixpkgs/pkgs/development/tools/compass/gemset.nix index 1beb3d3fec00..3e93f6e417ab 100644 --- a/nixpkgs/pkgs/development/tools/compass/gemset.nix +++ b/nixpkgs/pkgs/development/tools/compass/gemset.nix @@ -93,4 +93,4 @@ }; version = "3.4.25"; }; -} \ No newline at end of file +} diff --git a/nixpkgs/pkgs/development/tools/compile-daemon/default.nix b/nixpkgs/pkgs/development/tools/compile-daemon/default.nix index 24aca0dada7b..ef08b2d58134 100644 --- a/nixpkgs/pkgs/development/tools/compile-daemon/default.nix +++ b/nixpkgs/pkgs/development/tools/compile-daemon/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "compile-daemon-unstable"; @@ -16,7 +16,7 @@ buildGoPackage rec { goDeps = ./deps.nix; - meta = with stdenv.lib; { + meta = with lib; { description = "Very simple compile daemon for Go"; license = licenses.bsd2; maintainers = with maintainers; [ ]; diff --git a/nixpkgs/pkgs/development/tools/conftest/default.nix b/nixpkgs/pkgs/development/tools/conftest/default.nix index 1f12afe3f748..7f2e65fd9918 100644 --- a/nixpkgs/pkgs/development/tools/conftest/default.nix +++ b/nixpkgs/pkgs/development/tools/conftest/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "conftest"; - version = "0.22.0"; + version = "0.23.0"; src = fetchFromGitHub { owner = "open-policy-agent"; repo = "conftest"; rev = "v${version}"; - sha256 = "1mjfb39h6z8dbrqxlvrvnzid7la6wj709kx7dva4126i84cmpyf1"; + sha256 = "sha256-mSiZjpsFZfkM522f1WcJgBexiBS0o3uf1g94pjhgGVU="; }; - vendorSha256 = "08c4brwvjp9f7cpzywxns6dkhl3jzq9ckyvphm2jnm2kxmkawbbn"; + vendorSha256 = "sha256-iCIuEvwkbfBZ858yZZyVf5om6YLsGKRvzFmYzJBrRf4="; doCheck = false; diff --git a/nixpkgs/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix b/nixpkgs/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix index 82ac15565742..bd8608a91197 100644 --- a/nixpkgs/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix +++ b/nixpkgs/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, stdenv, buildGoModule, +{ fetchFromGitHub, lib, stdenv, buildGoModule, makeWrapper, coreutils, git, openssh, bash, gnused, gnugrep }: buildGoModule rec { name = "buildkite-agent-${version}"; @@ -27,10 +27,10 @@ buildGoModule rec { # These are runtime dependencies wrapProgram $out/bin/buildkite-agent \ - --prefix PATH : '${stdenv.lib.makeBinPath [ openssh git coreutils gnused gnugrep ]}' + --prefix PATH : '${lib.makeBinPath [ openssh git coreutils gnused gnugrep ]}' ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Build runner for buildkite.com"; longDescription = '' The buildkite-agent is a small, reliable, and cross-platform build runner diff --git a/nixpkgs/pkgs/development/tools/continuous-integration/buildkite-agent/generic.nix b/nixpkgs/pkgs/development/tools/continuous-integration/buildkite-agent/generic.nix index 391782014561..232efe32a1a8 100644 --- a/nixpkgs/pkgs/development/tools/continuous-integration/buildkite-agent/generic.nix +++ b/nixpkgs/pkgs/development/tools/continuous-integration/buildkite-agent/generic.nix @@ -13,7 +13,7 @@ buildGoPackage { nativeBuildInputs = [ makeWrapper ]; postInstall = '' - ${stdenv.lib.optionalString hasBootstrapScript '' + ${lib.optionalString hasBootstrapScript '' # Install bootstrap.sh mkdir -p $out/libexec/buildkite-agent cp $NIX_BUILD_TOP/go/src/${goPackagePath}/templates/bootstrap.sh $out/libexec/buildkite-agent @@ -25,11 +25,11 @@ buildGoPackage { # These are runtime dependencies wrapProgram $out/bin/buildkite-agent \ - ${stdenv.lib.optionalString hasBootstrapScript "--set BUILDKITE_BOOTSTRAP_SCRIPT_PATH $out/libexec/buildkite-agent/bootstrap.sh"} \ - --prefix PATH : '${stdenv.lib.makeBinPath [ openssh git coreutils gnused gnugrep ]}' + ${lib.optionalString hasBootstrapScript "--set BUILDKITE_BOOTSTRAP_SCRIPT_PATH $out/libexec/buildkite-agent/bootstrap.sh"} \ + --prefix PATH : '${lib.makeBinPath [ openssh git coreutils gnused gnugrep ]}' ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Build runner for buildkite.com"; longDescription = '' The buildkite-agent is a small, reliable, and cross-platform build runner diff --git a/nixpkgs/pkgs/development/tools/continuous-integration/drone-cli/default.nix b/nixpkgs/pkgs/development/tools/continuous-integration/drone-cli/default.nix index 2a8e10008c2b..b1ee5349a5c1 100644 --- a/nixpkgs/pkgs/development/tools/continuous-integration/drone-cli/default.nix +++ b/nixpkgs/pkgs/development/tools/continuous-integration/drone-cli/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildGoModule }: +{ lib, stdenv, fetchFromGitHub, buildGoModule }: let version = "1.2.4"; in buildGoModule rec { @@ -21,7 +21,7 @@ in buildGoModule rec { sha256 = "14sm5k2ifvr4g9369zqgb92vrr4rc0bxf5m52l3g8bd2s8fq8nx8"; }; - meta = with stdenv.lib; { + meta = with lib; { maintainers = with maintainers; [ bricewge ]; license = licenses.asl20; description = "Command line client for the Drone continuous integration server"; diff --git a/nixpkgs/pkgs/development/tools/continuous-integration/drone/default.nix b/nixpkgs/pkgs/development/tools/continuous-integration/drone/default.nix index 7a7f0d023d80..ffdf588895aa 100644 --- a/nixpkgs/pkgs/development/tools/continuous-integration/drone/default.nix +++ b/nixpkgs/pkgs/development/tools/continuous-integration/drone/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildGoModule }: +{ lib, stdenv, fetchFromGitHub, buildGoModule }: buildGoModule rec { name = "drone.io-${version}"; @@ -15,7 +15,7 @@ buildGoModule rec { sha256 = "sha256-12Jac+mXWdUX8gWvmpdO9ROv7Bi0YzvyqnNDVNJOr34="; }; - meta = with stdenv.lib; { + meta = with lib; { maintainers = with maintainers; [ elohmeier vdemeester ]; license = licenses.asl20; description = "Continuous Integration platform built on container technology"; diff --git a/nixpkgs/pkgs/development/tools/continuous-integration/fly/default.nix b/nixpkgs/pkgs/development/tools/continuous-integration/fly/default.nix index f993faf544d7..855fd879a8e2 100644 --- a/nixpkgs/pkgs/development/tools/continuous-integration/fly/default.nix +++ b/nixpkgs/pkgs/development/tools/continuous-integration/fly/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "fly"; - version = "6.7.2"; + version = "6.7.3"; src = fetchFromGitHub { owner = "concourse"; repo = "concourse"; rev = "v${version}"; - sha256 = "0c5alf2a0088i25mglla9dl4m3wr5y8pnl5cczgn06sz8qp9a0s0"; + sha256 = "sha256-XaoM/1YuHBl8ndPz3EByW1X0CzTuvJ5ju11mStbJnEU="; }; - vendorSha256 = "1fxbxkg7disndlmb065abnfn7sn79qclkcbizmrq49f064w1ijr4"; + vendorSha256 = "sha256-xeptlcJLj+R1BdC8Rdi3hsJVxdrmvfeTMsrhMNGrXi8="; doCheck = false; diff --git a/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index 3d127591bd0f..20cb953edea0 100644 --- a/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -1,16 +1,16 @@ { lib, buildGoPackage, fetchFromGitLab, fetchurl }: let - version = "13.7.0"; + version = "13.8.0"; # Gitlab runner embeds some docker images these are prebuilt for arm and x86_64 docker_x86_64 = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-x86_64.tar.xz"; - sha256 = "0hbzvw6bdy31yqnri7379gpm8n5nv6ayr1idg02c9zqgcsgm34jf"; + sha256 = "15pf6mxma8gkzyxkzm1rjwa514p7gzabn3c474lcvsjpmp76wv68"; }; docker_arm = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-arm.tar.xz"; - sha256 = "036drxlkmm35mdl0f5k79hnmwvf8gadgsxx71jprn1fjjzk3cxmz"; + sha256 = "1c4lpy7nc62rqk8bfwiy5pcgvcwx70qkz3lv9w512fr3n5hjd4c0"; }; in buildGoPackage rec { @@ -30,7 +30,7 @@ buildGoPackage rec { owner = "gitlab-org"; repo = "gitlab-runner"; rev = "v${version}"; - sha256 = "0v2wcalvs7gsbi33jm35k01cqv2iqz3k3yfjjw08dssg358d0vfp"; + sha256 = "0v0iqpllzaabkahlc5pidzzw0bjlli984pdna3f3bbg67lm5a421"; }; patches = [ ./fix-shell-path.patch ]; diff --git a/nixpkgs/pkgs/development/tools/continuous-integration/gocd-agent/default.nix b/nixpkgs/pkgs/development/tools/continuous-integration/gocd-agent/default.nix index 7cefd896f481..6e58b74654da 100644 --- a/nixpkgs/pkgs/development/tools/continuous-integration/gocd-agent/default.nix +++ b/nixpkgs/pkgs/development/tools/continuous-integration/gocd-agent/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip }: +{ lib, stdenv, fetchurl, unzip }: stdenv.mkDerivation rec { name = "gocd-agent-${version}-${rev}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { url = "https://download.go.cd/binaries/${version}-${rev}/generic/go-agent-${version}-${rev}.zip"; sha256 = "1nirdv82i8x4s1dyb0rmxldh8avappd4g3mbbl6xp7r7s0drcprp"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A continuous delivery server specializing in advanced workflow modeling and visualization"; homepage = "http://www.go.cd"; license = licenses.asl20; diff --git a/nixpkgs/pkgs/development/tools/continuous-integration/gocd-server/default.nix b/nixpkgs/pkgs/development/tools/continuous-integration/gocd-server/default.nix index d23bc9d8d8e9..90eb61dbff8d 100644 --- a/nixpkgs/pkgs/development/tools/continuous-integration/gocd-server/default.nix +++ b/nixpkgs/pkgs/development/tools/continuous-integration/gocd-server/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip }: +{ lib, stdenv, fetchurl, unzip }: stdenv.mkDerivation rec { name = "gocd-server-${version}-${rev}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0c30qzd6awlw0zx91rk6na0mmgykqkgrw9ychx18ivjwma0hr0sc"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A continuous delivery server specializing in advanced workflow modeling and visualization"; homepage = "http://www.go.cd"; license = licenses.asl20; diff --git a/nixpkgs/pkgs/development/tools/continuous-integration/jenkins/default.nix b/nixpkgs/pkgs/development/tools/continuous-integration/jenkins/default.nix index 13a6d596599a..adfc6a2580a3 100644 --- a/nixpkgs/pkgs/development/tools/continuous-integration/jenkins/default.nix +++ b/nixpkgs/pkgs/development/tools/continuous-integration/jenkins/default.nix @@ -1,13 +1,13 @@ -{ stdenv, fetchurl, common-updater-scripts, coreutils, git, gnused, nix, nixfmt +{ lib, stdenv, fetchurl, common-updater-scripts, coreutils, git, gnused, nix, nixfmt , writeScript, nixosTests, jq, cacert, curl }: stdenv.mkDerivation rec { pname = "jenkins"; - version = "2.263.1"; + version = "2.263.2"; src = fetchurl { url = "http://mirrors.jenkins.io/war-stable/${version}/jenkins.war"; - sha256 = "1wfn5r356fqy8ypqnw44ir0cy8qr5ck6xckxnnn2c9x324mypv8f"; + sha256 = "13l7y1307iv54z2zsjy0slzv2hpqv9i35qb15xa8s6sl7lcm9l49"; }; buildCommand = '' @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { #!${stdenv.shell} set -o errexit PATH=${ - stdenv.lib.makeBinPath [ + lib.makeBinPath [ cacert common-updater-scripts coreutils @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { ''; }; - meta = with stdenv.lib; { + meta = with lib; { description = "An extendable open source continuous integration server"; homepage = "https://jenkins-ci.org"; license = licenses.mit; diff --git a/nixpkgs/pkgs/development/tools/continuous-integration/laminar/default.nix b/nixpkgs/pkgs/development/tools/continuous-integration/laminar/default.nix index 5a326e94a544..f64cbd5e85fd 100644 --- a/nixpkgs/pkgs/development/tools/continuous-integration/laminar/default.nix +++ b/nixpkgs/pkgs/development/tools/continuous-integration/laminar/default.nix @@ -70,7 +70,7 @@ in stdenv.mkDerivation rec { rm -r $out/lib # it contains only systemd unit file ''); - meta = with stdenv.lib; { + meta = with lib; { description = "Lightweight and modular continuous integration service"; homepage = "https://laminar.ohwg.net"; license = licenses.gpl3; diff --git a/nixpkgs/pkgs/development/tools/convco/default.nix b/nixpkgs/pkgs/development/tools/convco/default.nix new file mode 100644 index 000000000000..d6be170bb8f6 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/convco/default.nix @@ -0,0 +1,26 @@ +{ lib, rustPlatform, fetchFromGitHub, stdenv, openssl, perl, pkg-config, libiconv, Security }: + +rustPlatform.buildRustPackage rec { + pname = "convco"; + version = "0.3.2"; + + src = fetchFromGitHub { + owner = "convco"; + repo = pname; + rev = "v${version}"; + sha256 = "0fqq6irbq1aikhhw08gc9kp0vbk2aminfbvwdlm58cvywyq91bn4"; + }; + + cargoSha256 = "073sfv42fbl8rjm3dih1ghs9vq75mjshp66zdzdan2dmmrnw5m9z"; + + nativeBuildInputs = [ openssl perl pkg-config ]; + + buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; + + meta = with lib; { + description = "A Conventional commit cli"; + homepage = "https://github.com/convco/convco"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ hoverbear ]; + }; +} diff --git a/nixpkgs/pkgs/development/tools/corgi/default.nix b/nixpkgs/pkgs/development/tools/corgi/default.nix index a1549de18436..a7698ef4fb8e 100644 --- a/nixpkgs/pkgs/development/tools/corgi/default.nix +++ b/nixpkgs/pkgs/development/tools/corgi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "corgi-${rev}"; @@ -16,7 +16,7 @@ buildGoPackage rec { goDeps = ./deps.nix; - meta = with stdenv.lib; { + meta = with lib; { description = "CLI workflow manager"; longDescription = '' Corgi is a command-line tool that helps with your repetitive command usages by organizing them into reusable snippet. diff --git a/nixpkgs/pkgs/development/tools/corundum/gemset.nix b/nixpkgs/pkgs/development/tools/corundum/gemset.nix index e395e098e6d1..a6ec2f2b9b91 100644 --- a/nixpkgs/pkgs/development/tools/corundum/gemset.nix +++ b/nixpkgs/pkgs/development/tools/corundum/gemset.nix @@ -151,4 +151,4 @@ }; version = "1.2.1"; }; -} \ No newline at end of file +} diff --git a/nixpkgs/pkgs/development/tools/coursier/default.nix b/nixpkgs/pkgs/development/tools/coursier/default.nix index a0f69033923c..e016f0ef7c92 100644 --- a/nixpkgs/pkgs/development/tools/coursier/default.nix +++ b/nixpkgs/pkgs/development/tools/coursier/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl, makeWrapper, jre, writeScript, common-updater-scripts +{ lib, stdenv, fetchurl, makeWrapper, jre, writeScript, common-updater-scripts , coreutils, git, gnused, nix, nixfmt }: let - version = "2.0.8"; + version = "2.0.9"; zshCompletion = fetchurl { url = @@ -19,7 +19,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/coursier/coursier/releases/download/v${version}/coursier"; - sha256 = "sha256-7dNJUMZu6YY3076cnjWHRisJZVn1NPRH1VC+cJjfI/8="; + sha256 = "sha256-jqSv9VBLotl6YVWgWNznvTThRIiMUStQ0WbN6u01b1c="; }; nativeBuildInputs = [ makeWrapper ]; @@ -37,7 +37,7 @@ in stdenv.mkDerivation rec { #!${stdenv.shell} set -o errexit PATH=${ - stdenv.lib.makeBinPath [ + lib.makeBinPath [ common-updater-scripts coreutils git @@ -62,7 +62,7 @@ in stdenv.mkDerivation rec { fi ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://get-coursier.io/"; description = "A Scala library to fetch dependencies from Maven / Ivy repositories"; diff --git a/nixpkgs/pkgs/development/tools/cppclean/default.nix b/nixpkgs/pkgs/development/tools/cppclean/default.nix index 283d9845dfaa..4e00eb903ebe 100644 --- a/nixpkgs/pkgs/development/tools/cppclean/default.nix +++ b/nixpkgs/pkgs/development/tools/cppclean/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python3Packages }: +{ lib, stdenv, fetchFromGitHub, python3Packages }: with python3Packages; @@ -21,7 +21,7 @@ buildPythonApplication rec { ./test.bash ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Finds problems in C++ source that slow development of large code bases"; homepage = "https://github.com/myint/cppclean"; license = licenses.asl20; diff --git a/nixpkgs/pkgs/development/tools/cucumber/gemset.nix b/nixpkgs/pkgs/development/tools/cucumber/gemset.nix index 99d519a83b68..d96d90718063 100644 --- a/nixpkgs/pkgs/development/tools/cucumber/gemset.nix +++ b/nixpkgs/pkgs/development/tools/cucumber/gemset.nix @@ -111,4 +111,4 @@ }; version = "0.1.2"; }; -} \ No newline at end of file +} diff --git a/nixpkgs/pkgs/development/tools/cue/default.nix b/nixpkgs/pkgs/development/tools/cue/default.nix index cdd0f2ae1053..243be958b07d 100644 --- a/nixpkgs/pkgs/development/tools/cue/default.nix +++ b/nixpkgs/pkgs/development/tools/cue/default.nix @@ -1,4 +1,4 @@ -{ buildGoModule, fetchgit, stdenv }: +{ buildGoModule, fetchgit, lib, stdenv }: buildGoModule rec { pname = "cue"; @@ -23,7 +23,7 @@ buildGoModule rec { meta = { description = "A data constraint language which aims to simplify tasks involving defining and using data"; homepage = "https://cuelang.org/"; - maintainers = with stdenv.lib.maintainers; [ solson ]; - license = stdenv.lib.licenses.asl20; + maintainers = with lib.maintainers; [ solson ]; + license = lib.licenses.asl20; }; } diff --git a/nixpkgs/pkgs/development/tools/dapper/default.nix b/nixpkgs/pkgs/development/tools/dapper/default.nix index 664dd61246d6..c49870346cbf 100644 --- a/nixpkgs/pkgs/development/tools/dapper/default.nix +++ b/nixpkgs/pkgs/development/tools/dapper/default.nix @@ -5,7 +5,7 @@ buildGoPackage rec { pname = "dapper"; - version = "0.5.3"; + version = "0.5.4"; goPackagePath = "github.com/rancher/dapper"; @@ -13,7 +13,7 @@ buildGoPackage rec { owner = "rancher"; repo = "dapper"; rev = "v${version}"; - sha256 = "1h62jahrxpmqx6r3mlakzap8gisrymgkp5syyarpab05qm1inngd"; + sha256 = "sha256-2KyDFiCxqoQt/m12vyHH8/L88+dOQGGsnI3l1G82NxQ="; }; patchPhase = '' substituteInPlace main.go --replace 0.0.0 ${version} diff --git a/nixpkgs/pkgs/development/tools/dapr/cli/default.nix b/nixpkgs/pkgs/development/tools/dapr/cli/default.nix index ef61edcbb8dd..7a8243ece25d 100644 --- a/nixpkgs/pkgs/development/tools/dapr/cli/default.nix +++ b/nixpkgs/pkgs/development/tools/dapr/cli/default.nix @@ -1,4 +1,4 @@ -{ buildGoModule, fetchFromGitHub, stdenv }: +{ buildGoModule, fetchFromGitHub, lib, stdenv }: let pname = "dapr"; @@ -22,7 +22,7 @@ in buildGoModule { mv $out/bin/cli $out/bin/dapr ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://dapr.io"; description = "A CLI for managing Dapr, the distributed application runtime"; license = licenses.mit; diff --git a/nixpkgs/pkgs/development/tools/database/dbmate/default.nix b/nixpkgs/pkgs/development/tools/database/dbmate/default.nix index fe7721f5ed4c..9c01c1e9d2d1 100644 --- a/nixpkgs/pkgs/development/tools/database/dbmate/default.nix +++ b/nixpkgs/pkgs/development/tools/database/dbmate/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ lib, stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "dbmate"; @@ -15,7 +15,7 @@ buildGoModule rec { doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Database migration tool"; homepage = "https://github.com/amacneil/dbmate"; license = licenses.mit; diff --git a/nixpkgs/pkgs/development/tools/database/dbmate/deps.nix b/nixpkgs/pkgs/development/tools/database/dbmate/deps.nix deleted file mode 100644 index 97bfc10b20af..000000000000 --- a/nixpkgs/pkgs/development/tools/database/dbmate/deps.nix +++ /dev/null @@ -1,84 +0,0 @@ -# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) -[ - { - goPackagePath = "github.com/davecgh/go-spew"; - fetch = { - type = "git"; - url = "https://github.com/davecgh/go-spew"; - rev = "346938d642f2ec3594ed81d874461961cd0faa76"; - sha256 = "0d4jfmak5p6lb7n2r6yvf5p1zcw0l8j74kn55ghvr7zr7b7axm6c"; - }; - } - { - goPackagePath = "github.com/go-sql-driver/mysql"; - fetch = { - type = "git"; - url = "https://github.com/go-sql-driver/mysql"; - rev = "2cc627ac8defc45d65066ae98f898166f580f9a4"; - sha256 = "0n589y9ak2m6glaqmqlggrfv2hghy5i2906r123svf92ci4r9sww"; - }; - } - { - goPackagePath = "github.com/joho/godotenv"; - fetch = { - type = "git"; - url = "https://github.com/joho/godotenv"; - rev = "a79fa1e548e2c689c241d10173efd51e5d689d5b"; - sha256 = "09610yqswxa02905mp9cqgsm50r76saagzddc55sqav4ad04j6qm"; - }; - } - { - goPackagePath = "github.com/lib/pq"; - fetch = { - type = "git"; - url = "https://github.com/lib/pq"; - rev = "19c8e9ad00952ce0c64489b60e8df88bb16dd514"; - sha256 = "0lm79ja5id7phf1jwf1vs987azaxis0q7qr69px0r6gqiva0q0vz"; - }; - } - { - goPackagePath = "github.com/mattn/go-sqlite3"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-sqlite3"; - rev = "6c771bb9887719704b210e87e934f08be014bdb1"; - sha256 = "0x6s7hy3ab3qw6dfl81y7ighjva5j4rrzvqhppf1qwz5alpfmpdm"; - }; - } - { - goPackagePath = "github.com/pmezard/go-difflib"; - fetch = { - type = "git"; - url = "https://github.com/pmezard/go-difflib"; - rev = "792786c7400a136282c1664665ae0a8db921c6c2"; - sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; - }; - } - { - goPackagePath = "github.com/stretchr/testify"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/testify"; - rev = "b91bfb9ebec76498946beb6af7c0230c7cc7ba6c"; - sha256 = "178xyfgsbs40jq406aqj0r67ik1b81gdc28z45nbcw6hfhz82rvl"; - }; - } - { - goPackagePath = "github.com/urfave/cli"; - fetch = { - type = "git"; - url = "https://github.com/urfave/cli"; - rev = "cfb38830724cc34fedffe9a2a29fb54fa9169cd1"; - sha256 = "0y6f4sbzkiiwrxbl15biivj8c7qwxnvm3zl2dd3mw4wzg4x10ygj"; - }; - } - { - goPackagePath = "google.golang.org/appengine"; - fetch = { - type = "git"; - url = "https://github.com/golang/appengine"; - rev = "150dc57a1b433e64154302bdc40b6bb8aefa313a"; - sha256 = "0w3knznv39k8bm85ri62f83czcrxknql7dv6p9hk1a5jx3xljgxq"; - }; - } -] diff --git a/nixpkgs/pkgs/development/tools/database/ephemeralpg/default.nix b/nixpkgs/pkgs/development/tools/database/ephemeralpg/default.nix index b2599cce4307..ae10c402945f 100644 --- a/nixpkgs/pkgs/development/tools/database/ephemeralpg/default.nix +++ b/nixpkgs/pkgs/development/tools/database/ephemeralpg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, postgresql, getopt, makeWrapper }: +{ lib, stdenv, fetchurl, postgresql, getopt, makeWrapper }: stdenv.mkDerivation rec { pname = "ephemeralpg"; version = "3.1"; @@ -10,9 +10,9 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out PREFIX=$out make install - wrapProgram $out/bin/pg_tmp --prefix PATH : ${stdenv.lib.makeBinPath [ postgresql getopt ]} + wrapProgram $out/bin/pg_tmp --prefix PATH : ${lib.makeBinPath [ postgresql getopt ]} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Run tests on an isolated, temporary PostgreSQL database"; license = licenses.isc; homepage = "http://ephemeralpg.org/"; diff --git a/nixpkgs/pkgs/development/tools/database/liquibase/default.nix b/nixpkgs/pkgs/development/tools/database/liquibase/default.nix index 6eb24a812aaa..16e5fce1ebc0 100644 --- a/nixpkgs/pkgs/development/tools/database/liquibase/default.nix +++ b/nixpkgs/pkgs/development/tools/database/liquibase/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, jre, makeWrapper -, mysqlSupport ? true, mysql_jdbc ? null }: +{ lib, stdenv, fetchurl, jre, makeWrapper +, mysqlSupport ? true, mysql_jdbc +, postgresqlSupport ? true, postgresql_jdbc }: -assert mysqlSupport -> mysql_jdbc != null; - -with stdenv.lib; let - extraJars = optional mysqlSupport mysql_jdbc; + extraJars = + lib.optional mysqlSupport mysql_jdbc + ++ lib.optional postgresqlSupport postgresql_jdbc; in stdenv.mkDerivation rec { @@ -47,15 +47,15 @@ stdenv.mkDerivation rec { # taken from the executable script in the source CP="$out/liquibase.jar" ${addJars "$out/lib"} - ${concatStringsSep "\n" (map (p: addJars "${p}/share/java") extraJars)} + ${lib.concatStringsSep "\n" (map (p: addJars "${p}/share/java") extraJars)} - ${getBin jre}/bin/java -cp "\$CP" \$JAVA_OPTS \ + ${lib.getBin jre}/bin/java -cp "\$CP" \$JAVA_OPTS \ liquibase.integration.commandline.Main \''${1+"\$@"} EOF chmod +x $out/bin/liquibase ''; - meta = { + meta = with lib; { description = "Version Control for your database"; homepage = "https://www.liquibase.org/"; changelog = "https://raw.githubusercontent.com/liquibase/liquibase/v${version}/changelog.txt"; diff --git a/nixpkgs/pkgs/development/tools/database/pg_checksums/default.nix b/nixpkgs/pkgs/development/tools/database/pg_checksums/default.nix index f440e550a897..65e7c06b1402 100644 --- a/nixpkgs/pkgs/development/tools/database/pg_checksums/default.nix +++ b/nixpkgs/pkgs/development/tools/database/pg_checksums/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libxslt, docbook_xsl, postgresql }: +{ lib, stdenv, fetchFromGitHub, libxslt, docbook_xsl, postgresql }: stdenv.mkDerivation rec { pname = "pg_checksums"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { install -Dm644 -t $out/share/man/man1 doc/man1/pg_checksums.1 ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Activate/deactivate/verify checksums in offline PostgreSQL clusters"; homepage = "https://github.com/credativ/pg_checksums"; maintainers = [ maintainers.marsam ]; diff --git a/nixpkgs/pkgs/development/tools/database/pgcli/default.nix b/nixpkgs/pkgs/development/tools/database/pgcli/default.nix index b4c26d6fb5c2..cc7524e3a437 100644 --- a/nixpkgs/pkgs/development/tools/database/pgcli/default.nix +++ b/nixpkgs/pkgs/development/tools/database/pgcli/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonApplication , fetchPypi , isPy3k @@ -46,9 +46,9 @@ buildPythonApplication rec { checkInputs = [ pytestCheckHook mock ]; - disabledTests = stdenv.lib.optionals stdenv.isDarwin [ "test_application_name_db_uri" ]; + disabledTests = lib.optionals stdenv.isDarwin [ "test_application_name_db_uri" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Command-line interface for PostgreSQL"; longDescription = '' Rich command-line interface for PostgreSQL with auto-completion and diff --git a/nixpkgs/pkgs/development/tools/database/pyrseas/default.nix b/nixpkgs/pkgs/development/tools/database/pyrseas/default.nix index c86a0f6df8bd..119aa2eb8f81 100644 --- a/nixpkgs/pkgs/development/tools/database/pyrseas/default.nix +++ b/nixpkgs/pkgs/development/tools/database/pyrseas/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pythonPackages, fetchFromGitHub }: +{ lib, stdenv, pythonPackages, fetchFromGitHub }: let pgdbconn = pythonPackages.buildPythonPackage { @@ -39,7 +39,7 @@ pythonPackages.buildPythonApplication { meta = { description = "A declarative language to describe PostgreSQL databases"; homepage = "https://perseas.github.io/"; - license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ pmeunier ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ pmeunier ]; }; } diff --git a/nixpkgs/pkgs/development/tools/database/shmig/default.nix b/nixpkgs/pkgs/development/tools/database/shmig/default.nix index ca07a0569407..447dbc23fdf1 100644 --- a/nixpkgs/pkgs/development/tools/database/shmig/default.nix +++ b/nixpkgs/pkgs/development/tools/database/shmig/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { mkdir -p $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Minimalistic database migration tool with MySQL, PostgreSQL and SQLite support"; homepage = "https://github.com/mbucc/shmig"; license = licenses.bsd3; diff --git a/nixpkgs/pkgs/development/tools/database/sqlcheck/default.nix b/nixpkgs/pkgs/development/tools/database/sqlcheck/default.nix index 33b2abce277b..2afd004f4d73 100644 --- a/nixpkgs/pkgs/development/tools/database/sqlcheck/default.nix +++ b/nixpkgs/pkgs/development/tools/database/sqlcheck/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "sqlcheck"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { inherit (src.meta) homepage; description = "Automatically identify anti-patterns in SQL queries"; license = licenses.asl20; diff --git a/nixpkgs/pkgs/development/tools/database/sqldeveloper/default.nix b/nixpkgs/pkgs/development/tools/database/sqldeveloper/default.nix index 49cc7b42b3da..6017d704fc17 100644 --- a/nixpkgs/pkgs/development/tools/database/sqldeveloper/default.nix +++ b/nixpkgs/pkgs/development/tools/database/sqldeveloper/default.nix @@ -1,4 +1,4 @@ -{ stdenv, makeDesktopItem, makeWrapper, requireFile, unzip, jdk }: +{ lib, stdenv, makeDesktopItem, makeWrapper, requireFile, unzip, jdk }: let version = "20.2.0.175.1842"; @@ -65,7 +65,7 @@ in --run "cd $out/libexec/sqldeveloper/bin" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Oracle's Oracle DB GUI client"; longDescription = '' Oracle SQL Developer is a free integrated development environment that diff --git a/nixpkgs/pkgs/development/tools/database/squirrel-sql/default.nix b/nixpkgs/pkgs/development/tools/database/squirrel-sql/default.nix index 924a82bfd85e..5aca6d55bc81 100644 --- a/nixpkgs/pkgs/development/tools/database/squirrel-sql/default.nix +++ b/nixpkgs/pkgs/development/tools/database/squirrel-sql/default.nix @@ -1,6 +1,6 @@ # To enable specific database drivers, override this derivation and pass the # driver packages in the drivers argument (e.g. mysql_jdbc, postgresql_jdbc). -{ stdenv, fetchurl, makeDesktopItem, makeWrapper, unzip +{ lib, stdenv, fetchurl, makeDesktopItem, makeWrapper, unzip , jre , drivers ? [] }: @@ -33,7 +33,7 @@ in stdenv.mkDerivation rec { installPhase = '' runHook preInstall - + mkdir -p $out/share/squirrel-sql cp -r . $out/share/squirrel-sql @@ -55,7 +55,7 @@ in stdenv.mkDerivation rec { ln -s $out/share/squirrel-sql/icons/acorn.png \ $out/share/icons/hicolor/32x32/apps/squirrel-sql.png ln -s ${desktopItem}/share/applications $out/share - + runHook postInstall ''; @@ -69,7 +69,7 @@ in stdenv.mkDerivation rec { icon = "squirrel-sql"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Universal SQL Client"; homepage = "http://squirrel-sql.sourceforge.net/"; license = licenses.lgpl21; diff --git a/nixpkgs/pkgs/development/tools/database/timescaledb-parallel-copy/default.nix b/nixpkgs/pkgs/development/tools/database/timescaledb-parallel-copy/default.nix index a0e05bf4ae57..2b8a6f7cca02 100644 --- a/nixpkgs/pkgs/development/tools/database/timescaledb-parallel-copy/default.nix +++ b/nixpkgs/pkgs/development/tools/database/timescaledb-parallel-copy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ lib, stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "timescaledb-parallel-copy"; @@ -13,7 +13,7 @@ buildGoModule rec { vendorSha256 = "03siay3hv1sgmmp7w4f9b0xb8c6bnbx0v4wy5grjl5k04zhnj76b"; - meta = with stdenv.lib; { + meta = with lib; { description = "Bulk, parallel insert of CSV records into PostgreSQL"; homepage = "https://github.com/timescale/timescaledb-parallel-copy"; license = licenses.asl20; diff --git a/nixpkgs/pkgs/development/tools/database/timescaledb-tune/default.nix b/nixpkgs/pkgs/development/tools/database/timescaledb-tune/default.nix index 2079925049dd..cec374ccb3a9 100644 --- a/nixpkgs/pkgs/development/tools/database/timescaledb-tune/default.nix +++ b/nixpkgs/pkgs/development/tools/database/timescaledb-tune/default.nix @@ -1,19 +1,19 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ lib, stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "timescaledb-tune"; - version = "0.9.0"; + version = "0.10.0"; src = fetchFromGitHub { owner = "timescale"; repo = pname; rev = "v${version}"; - sha256 = "0vncwwvw7y6g3crd4n5vvd6jwdsa8vsvsmfwy5mad4j6lix09ajx"; + sha256 = "0vrbbswmg6z3n012mqd1jasqk01navypzv5m00r6c9bxj72hgcxl"; }; vendorSha256 = "0hbpprbxs19fcar7xcy42kn9yfzhal2zsv5pml9ghiv2s61yns4z"; - meta = with stdenv.lib; { + meta = with lib; { description = "A tool for tuning your TimescaleDB for better performance"; homepage = "https://github.com/timescale/timescaledb-tune"; license = licenses.asl20; diff --git a/nixpkgs/pkgs/development/tools/database/webdis/default.nix b/nixpkgs/pkgs/development/tools/database/webdis/default.nix index ec22252cbe02..5de8296299fb 100644 --- a/nixpkgs/pkgs/development/tools/database/webdis/default.nix +++ b/nixpkgs/pkgs/development/tools/database/webdis/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, hiredis, http-parser, jansson, libevent, fetchpatch }: +{ lib, stdenv, fetchFromGitHub, hiredis, http-parser, jansson, libevent, fetchpatch }: stdenv.mkDerivation rec { pname = "webdis"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { "CONFDIR=${placeholder "out"}/share/webdis" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A Redis HTTP interface with JSON output"; homepage = "https://webd.is/"; license = licenses.bsd2; diff --git a/nixpkgs/pkgs/development/tools/dcadec/default.nix b/nixpkgs/pkgs/development/tools/dcadec/default.nix index 55f888056cf7..9f5f4f0a3b52 100644 --- a/nixpkgs/pkgs/development/tools/dcadec/default.nix +++ b/nixpkgs/pkgs/development/tools/dcadec/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "dcadec"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { doCheck = false; # fails with "ERROR: Run 'git submodule update --init test/samples' first." - meta = with stdenv.lib; { + meta = with lib; { description = "DTS Coherent Acoustics decoder with support for HD extensions"; maintainers = with maintainers; [ edwtjo ]; homepage = "https://github.com/foo86/dcadec"; diff --git a/nixpkgs/pkgs/development/tools/deis/default.nix b/nixpkgs/pkgs/development/tools/deis/default.nix index 4a07a05a6368..c8e20d42063f 100644 --- a/nixpkgs/pkgs/development/tools/deis/default.nix +++ b/nixpkgs/pkgs/development/tools/deis/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "deis"; @@ -25,7 +25,7 @@ buildGoPackage rec { export GOPATH=$GOPATH:$NIX_BUILD_TOP/go/src/${goPackagePath}/Godeps/_workspace ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://deis.io"; description = "A command line utility used to interact with the Deis open source PaaS"; license = licenses.asl20; diff --git a/nixpkgs/pkgs/development/tools/deisctl/default.nix b/nixpkgs/pkgs/development/tools/deisctl/default.nix index a245a06afe16..0f5df40d92c7 100644 --- a/nixpkgs/pkgs/development/tools/deisctl/default.nix +++ b/nixpkgs/pkgs/development/tools/deisctl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "deis"; @@ -19,7 +19,7 @@ buildGoPackage rec { export GOPATH=$GOPATH:$NIX_BUILD_TOP/go/src/${goPackagePath}/Godeps/_workspace ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://deis.io"; description = "A command-line utility used to provision and operate a Deis cluster"; license = licenses.asl20; diff --git a/nixpkgs/pkgs/development/tools/delve/default.nix b/nixpkgs/pkgs/development/tools/delve/default.nix index e81a1273af87..62fb32c85163 100644 --- a/nixpkgs/pkgs/development/tools/delve/default.nix +++ b/nixpkgs/pkgs/development/tools/delve/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "delve"; @@ -14,7 +14,7 @@ buildGoPackage rec { sha256 = "10zvla2jqxqibxdk3zbnsxg63i0zcwcn9npvw3bbicwd2z4vvskk"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "debugger for the Go programming language"; homepage = "https://github.com/derekparker/delve"; maintainers = with maintainers; [ vdemeester ]; diff --git a/nixpkgs/pkgs/development/tools/dep/default.nix b/nixpkgs/pkgs/development/tools/dep/default.nix index 8b7c54832e28..ff7f370b0d44 100644 --- a/nixpkgs/pkgs/development/tools/dep/default.nix +++ b/nixpkgs/pkgs/development/tools/dep/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "dep"; @@ -17,7 +17,7 @@ buildGoPackage rec { buildFlagsArray = ("-ldflags=-s -w -X main.commitHash=${rev} -X main.version=${version}"); - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/golang/dep"; description = "Go dependency management tool"; license = licenses.bsd3; diff --git a/nixpkgs/pkgs/development/tools/dep2nix/default.nix b/nixpkgs/pkgs/development/tools/dep2nix/default.nix index 9d14f7c1c1e3..daa68b1b9311 100644 --- a/nixpkgs/pkgs/development/tools/dep2nix/default.nix +++ b/nixpkgs/pkgs/development/tools/dep2nix/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildGoPackage +{ lib, stdenv, fetchFromGitHub, buildGoPackage , makeWrapper, nix-prefetch-scripts }: buildGoPackage rec { @@ -25,7 +25,7 @@ buildGoPackage rec { goDeps = ./deps.nix; - meta = with stdenv.lib; { + meta = with lib; { description = "Convert `Gopkg.lock` files from golang dep into `deps.nix`"; license = licenses.bsd3; homepage = "https://github.com/nixcloud/dep2nix"; diff --git a/nixpkgs/pkgs/development/tools/detect-secrets/default.nix b/nixpkgs/pkgs/development/tools/detect-secrets/default.nix index 1e42a32f7caa..f0dddf66ff40 100644 --- a/nixpkgs/pkgs/development/tools/detect-secrets/default.nix +++ b/nixpkgs/pkgs/development/tools/detect-secrets/default.nix @@ -1,29 +1,53 @@ -{ lib, buildPythonApplication, fetchFromGitHub, isPy27, pyyaml, unidiff, configparser, enum34, future, functools32, mock, pytest }: +{ lib +, buildPythonApplication +, configparser +, enum34 +, fetchFromGitHub +, functools32 +, future +, isPy27 +, mock +, pyahocorasick +, pytestCheckHook +, pyyaml +, requests +, responses +, unidiff +}: buildPythonApplication rec { pname = "detect-secrets"; - version = "0.12.4"; + version = "0.14.3"; + disabled = isPy27; # PyPI tarball doesn't ship tests src = fetchFromGitHub { owner = "Yelp"; - repo = "detect-secrets"; + repo = pname; rev = "v${version}"; - sha256 = "01y5xd0irxxib4wnf5834gwa7ibb81h5y4dl8b26gyzgvm5zfpk1"; + sha256 = "0c4hxih9ljmv0d3izq5idyspk5zci26gdb6lv9klwcshwrfkvxj0"; }; - propagatedBuildInputs = [ pyyaml ] - ++ lib.optionals isPy27 [ configparser enum34 future functools32 ]; + propagatedBuildInputs = [ + pyyaml + requests + ]; - checkInputs = [ mock pytest unidiff ]; + checkInputs = [ + mock + pyahocorasick + pytestCheckHook + responses + unidiff + ]; - # deselect tests which require git setup - checkPhase = '' - PYTHONPATH=$PWD:$PYTHONPATH pytest \ - --deselect tests/main_test.py::TestMain \ - --deselect tests/pre_commit_hook_test.py::TestPreCommitHook \ - --deselect tests/core/baseline_test.py::TestInitializeBaseline - ''; + disabledTests = [ + "TestMain" + "TestPreCommitHook" + "TestInitializeBaseline" + ]; + + pythonImportsCheck = [ "detect_secrets" ]; meta = with lib; { description = "An enterprise friendly way of detecting and preventing secrets in code"; diff --git a/nixpkgs/pkgs/development/tools/devd/default.nix b/nixpkgs/pkgs/development/tools/devd/default.nix index 2d5a38458d3a..32f29f7e128c 100644 --- a/nixpkgs/pkgs/development/tools/devd/default.nix +++ b/nixpkgs/pkgs/development/tools/devd/default.nix @@ -1,4 +1,4 @@ -{ buildGoPackage, fetchFromGitHub, stdenv }: +{ buildGoPackage, fetchFromGitHub, lib, stdenv }: buildGoPackage rec { pname = "devd"; @@ -11,7 +11,7 @@ buildGoPackage rec { }; goPackagePath = "github.com/cortesi/devd"; subPackages = [ "cmd/devd" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A local webserver for developers"; homepage = "https://github.com/cortesi/devd"; license = licenses.mit; diff --git a/nixpkgs/pkgs/development/tools/devpi-client/default.nix b/nixpkgs/pkgs/development/tools/devpi-client/default.nix index 1a0fdf403082..766f3f2b7292 100644 --- a/nixpkgs/pkgs/development/tools/devpi-client/default.nix +++ b/nixpkgs/pkgs/development/tools/devpi-client/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonApplication , fetchPypi # buildInputs @@ -25,11 +25,11 @@ buildPythonApplication rec { pname = "devpi-client"; - version = "5.2.0"; + version = "5.2.1"; src = fetchPypi { inherit pname version; - sha256 = "1y8r1pjav0gyrbnyqjnc202sa962n1gasi8233xj7jc39lv3iq40"; + sha256 = "74ff365efeaa7b78c9eb7f6d7bd349ccd6252a6cdf879bcb4137ee5ff0fb127a"; }; buildInputs = [ glibcLocales pkginfo check-manifest ]; @@ -49,7 +49,7 @@ buildPythonApplication rec { LC_ALL = "en_US.UTF-8"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://doc.devpi.net"; description = "Client for devpi, a pypi index server and packaging meta tool"; license = licenses.mit; diff --git a/nixpkgs/pkgs/development/tools/devpi-server/default.nix b/nixpkgs/pkgs/development/tools/devpi-server/default.nix index 7ddff92402cb..3d8cb16bb478 100644 --- a/nixpkgs/pkgs/development/tools/devpi-server/default.nix +++ b/nixpkgs/pkgs/development/tools/devpi-server/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python3Packages, nginx }: +{ lib, stdenv, fetchFromGitHub, python3Packages, nginx }: python3Packages.buildPythonApplication rec { pname = "devpi-server"; @@ -33,7 +33,7 @@ python3Packages.buildPythonApplication rec { pytestCheckHook pytest-flake8 webtest - ] ++ stdenv.lib.optionals isPy27 [ mock ]; + ] ++ lib.optionals isPy27 [ mock ]; # root_passwd_hash tries to write to store # TestMirrorIndexThings tries to write to /var through ngnix @@ -55,7 +55,7 @@ python3Packages.buildPythonApplication rec { "TestMirrorIndexThings" ]; - meta = with stdenv.lib;{ + meta = with lib;{ homepage = "http://doc.devpi.net"; description = "Github-style pypi index server and packaging meta tool"; license = licenses.mit; diff --git a/nixpkgs/pkgs/development/tools/devtodo/default.nix b/nixpkgs/pkgs/development/tools/devtodo/default.nix index f4a974da3476..34fdd2c794e5 100644 --- a/nixpkgs/pkgs/development/tools/devtodo/default.nix +++ b/nixpkgs/pkgs/development/tools/devtodo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, readline, ncurses }: +{ lib, stdenv, fetchurl, readline, ncurses }: stdenv.mkDerivation rec { pname = "devtodo"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://swapoff.org/devtodo1.html"; description = "A hierarchical command-line task manager"; license = licenses.gpl2; diff --git a/nixpkgs/pkgs/development/tools/diesel-cli/default.nix b/nixpkgs/pkgs/development/tools/diesel-cli/default.nix index 6a447dd57c92..bd8e71090c53 100644 --- a/nixpkgs/pkgs/development/tools/diesel-cli/default.nix +++ b/nixpkgs/pkgs/development/tools/diesel-cli/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, rustPlatform, fetchFromGitHub, openssl, pkgconfig, Security +{ stdenv, lib, rustPlatform, fetchFromGitHub, openssl, pkg-config, Security , sqliteSupport ? true, sqlite , postgresqlSupport ? true, postgresql , mysqlSupport ? true, mysql, zlib, libiconv @@ -8,7 +8,7 @@ assert lib.assertMsg (sqliteSupport == true || postgresqlSupport == true || mysq "support for at least one database must be enabled"; let - inherit (stdenv.lib) optional optionals optionalString; + inherit (lib) optional optionals optionalString; features = '' ${optionalString sqliteSupport "sqlite"} \ ${optionalString postgresqlSupport "postgres"} \ @@ -39,7 +39,7 @@ rustPlatform.buildRustPackage rec { cargoPatches = [ ./cargo-lock.patch ]; cargoSha256 = "1vbb7r0dpmq8363i040bkhf279pz51c59kcq9v5qr34hs49ish8g"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ optional stdenv.isDarwin Security ++ optional (stdenv.isDarwin && mysqlSupport) libiconv diff --git a/nixpkgs/pkgs/development/tools/dive/default.nix b/nixpkgs/pkgs/development/tools/dive/default.nix index 3cb050df0363..07ca12cc9cc9 100644 --- a/nixpkgs/pkgs/development/tools/dive/default.nix +++ b/nixpkgs/pkgs/development/tools/dive/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, pkg-config, btrfs-progs, gpgme, lvm2 }: +{ lib, stdenv, buildGoModule, fetchFromGitHub, pkg-config, btrfs-progs, gpgme, lvm2 }: buildGoModule rec { pname = "dive"; @@ -17,11 +17,11 @@ buildGoModule rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = stdenv.lib.optionals stdenv.isLinux [ btrfs-progs gpgme lvm2 ]; + buildInputs = lib.optionals stdenv.isLinux [ btrfs-progs gpgme lvm2 ]; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A tool for exploring each layer in a docker image"; homepage = "https://github.com/wagoodman/dive"; license = licenses.mit; diff --git a/nixpkgs/pkgs/development/tools/doctl/default.nix b/nixpkgs/pkgs/development/tools/doctl/default.nix index 2b4bf66a0158..4d05bd3ed114 100644 --- a/nixpkgs/pkgs/development/tools/doctl/default.nix +++ b/nixpkgs/pkgs/development/tools/doctl/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "doctl"; - version = "1.54.0"; + version = "1.55.0"; vendorSha256 = null; @@ -32,7 +32,7 @@ buildGoModule rec { owner = "digitalocean"; repo = "doctl"; rev = "v${version}"; - sha256 = "163n3d07vv9d4356ql6hbw2vg6n5c834axz7y4gk8gm9badbna82"; + sha256 = "sha256-vhg5X8H4VegSDORtj1rgNKlWQo1H1e/vvO01LJkVK+A="; }; meta = with lib; { diff --git a/nixpkgs/pkgs/development/tools/documentation/antora/default.nix b/nixpkgs/pkgs/development/tools/documentation/antora/default.nix index 781fee2bb266..d553df59446a 100644 --- a/nixpkgs/pkgs/development/tools/documentation/antora/default.nix +++ b/nixpkgs/pkgs/development/tools/documentation/antora/default.nix @@ -1,15 +1,15 @@ -{ stdenv, nodePackages }: +{ lib, stdenv, nodePackages }: let linkNodeDeps = ({ pkg, deps, name ? "" }: let - targetModule = if name != "" then name else stdenv.lib.getName pkg; + targetModule = if name != "" then name else lib.getName pkg; in nodePackages.${pkg}.override (oldAttrs: { postInstall = '' mkdir -p $out/lib/node_modules/${targetModule}/node_modules - ${stdenv.lib.concatStringsSep "\n" (map (dep: '' - ln -s ${nodePackages.${dep}}/lib/node_modules/${stdenv.lib.getName dep} \ - $out/lib/node_modules/${targetModule}/node_modules/${stdenv.lib.getName dep} + ${lib.concatStringsSep "\n" (map (dep: '' + ln -s ${nodePackages.${dep}}/lib/node_modules/${lib.getName dep} \ + $out/lib/node_modules/${targetModule}/node_modules/${lib.getName dep} '') deps )} ''; diff --git a/nixpkgs/pkgs/development/tools/documentation/doxygen/default.nix b/nixpkgs/pkgs/development/tools/documentation/doxygen/default.nix index 613dec86d7cd..a4a70dabd69d 100644 --- a/nixpkgs/pkgs/development/tools/documentation/doxygen/default.nix +++ b/nixpkgs/pkgs/development/tools/documentation/doxygen/default.nix @@ -1,4 +1,4 @@ -{ stdenv, cmake, fetchFromGitHub, python3, flex, bison, qt5, CoreServices, libiconv }: +{ lib, stdenv, cmake, fetchFromGitHub, python3, flex, bison, qt5, CoreServices, libiconv }: stdenv.mkDerivation rec { pname = "doxygen"; @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "doxygen"; repo = "doxygen"; - rev = "Release_${stdenv.lib.replaceStrings [ "." ] [ "_" ] version}"; + rev = "Release_${lib.replaceStrings [ "." ] [ "_" ] version}"; sha256 = "17chvi3i80rj4750smpizf562xjzd2xcv5rfyh997pyvc1zbq5rh"; }; @@ -19,21 +19,21 @@ stdenv.mkDerivation rec { ]; buildInputs = - stdenv.lib.optionals (qt5 != null) (with qt5; [ qtbase wrapQtAppsHook ]) - ++ stdenv.lib.optional stdenv.isSunOS libiconv - ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices libiconv ]; + lib.optionals (qt5 != null) (with qt5; [ qtbase wrapQtAppsHook ]) + ++ lib.optional stdenv.isSunOS libiconv + ++ lib.optionals stdenv.isDarwin [ CoreServices libiconv ]; cmakeFlags = [ "-DICONV_INCLUDE_DIR=${libiconv}/include" ] ++ - stdenv.lib.optional (qt5 != null) "-Dbuild_wizard=YES"; + lib.optional (qt5 != null) "-Dbuild_wizard=YES"; NIX_CFLAGS_COMPILE = - stdenv.lib.optionalString stdenv.isDarwin "-mmacosx-version-min=10.9"; + lib.optionalString stdenv.isDarwin "-mmacosx-version-min=10.9"; enableParallelBuilding = false; meta = { - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; homepage = "http://doxygen.nl/"; description = "Source code documentation generator tool"; @@ -45,6 +45,6 @@ stdenv.mkDerivation rec { manual (in LaTeX) from a set of documented source files. ''; - platforms = if qt5 != null then stdenv.lib.platforms.linux else stdenv.lib.platforms.unix; + platforms = if qt5 != null then lib.platforms.linux else lib.platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/tools/documentation/gnome-doc-utils/default.nix b/nixpkgs/pkgs/development/tools/documentation/gnome-doc-utils/default.nix index 54c37fa61837..2e04d3dd365e 100644 --- a/nixpkgs/pkgs/development/tools/documentation/gnome-doc-utils/default.nix +++ b/nixpkgs/pkgs/development/tools/documentation/gnome-doc-utils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libxml2Python, libxslt, intltool, gnome3 +{ lib, stdenv, fetchurl, pkg-config, libxml2Python, libxslt, intltool, gnome3 , python2Packages }: python2Packages.buildPythonApplication rec { @@ -8,11 +8,11 @@ python2Packages.buildPythonApplication rec { format = "other"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "19n4x25ndzngaciiyd8dd6s2mf9gv6nv3wv27ggns2smm7zkj1nb"; }; - nativeBuildInputs = [ intltool pkgconfig libxslt.dev ]; + nativeBuildInputs = [ intltool pkg-config libxslt.dev ]; buildInputs = [ libxslt ]; configureFlags = [ "--disable-scrollkeeper" ]; @@ -34,7 +34,7 @@ python2Packages.buildPythonApplication rec { rm $out/nix-support/propagated-build-inputs ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Collection of documentation utilities for the GNOME project"; homepage = "https://gitlab.gnome.org/GNOME/gnome-doc-utils"; license = with licenses; [ gpl2Plus lgpl2Plus ]; diff --git a/nixpkgs/pkgs/development/tools/documentation/gtk-doc/default.nix b/nixpkgs/pkgs/development/tools/documentation/gtk-doc/default.nix index 10b48d511918..b1ea6a0634b5 100644 --- a/nixpkgs/pkgs/development/tools/documentation/gtk-doc/default.nix +++ b/nixpkgs/pkgs/development/tools/documentation/gtk-doc/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitLab , meson , ninja @@ -44,7 +44,7 @@ python3.pkgs.buildPythonApplication rec { docbook_xml_dtd_43 docbook_xsl libxslt - ] ++ stdenv.lib.optionals withDblatex [ + ] ++ lib.optionals withDblatex [ dblatex ]; @@ -77,7 +77,7 @@ python3.pkgs.buildPythonApplication rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Tools to extract documentation embedded in GTK and GNOME source code"; homepage = "https://www.gtk.org/gtk-doc"; license = licenses.gpl2; diff --git a/nixpkgs/pkgs/development/tools/documentation/mdsh/default.nix b/nixpkgs/pkgs/development/tools/documentation/mdsh/default.nix index 5ab74a4b95ff..d2e555a4550d 100644 --- a/nixpkgs/pkgs/development/tools/documentation/mdsh/default.nix +++ b/nixpkgs/pkgs/development/tools/documentation/mdsh/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform }: +{ lib, stdenv, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { pname = "mdsh"; @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "118ykkqlf0x6gcgywx4pg3qawfhfr5q5f51gvrw9s302c1lmgk3g"; - meta = with stdenv.lib; { + meta = with lib; { description = "Markdown shell pre-processor"; homepage = "https://github.com/zimbatm/mdsh"; license = with licenses; [ mit ]; diff --git a/nixpkgs/pkgs/development/tools/documentation/mkdocs/default.nix b/nixpkgs/pkgs/development/tools/documentation/mkdocs/default.nix index 8d4480945bda..bee22856eb10 100644 --- a/nixpkgs/pkgs/development/tools/documentation/mkdocs/default.nix +++ b/nixpkgs/pkgs/development/tools/documentation/mkdocs/default.nix @@ -35,13 +35,13 @@ buildPythonApplication rec { backports_tempfile ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Project documentation with Markdown / static website generator"; longDescription = '' MkDocs is a fast, simple and downright gorgeous static site generator that's geared towards building project documentation. Documentation source files are written in Markdown, and configured with a single YAML configuration file. - + MkDocs can also be used to generate general-purpose Websites. ''; homepage = "http://mkdocs.org/"; diff --git a/nixpkgs/pkgs/development/tools/dot-http/default.nix b/nixpkgs/pkgs/development/tools/dot-http/default.nix index 1c81a4145d29..b156847870d8 100644 --- a/nixpkgs/pkgs/development/tools/dot-http/default.nix +++ b/nixpkgs/pkgs/development/tools/dot-http/default.nix @@ -1,4 +1,4 @@ -{ stdenv, rustPlatform, fetchFromGitHub, pkg-config, openssl, libiconv, Security }: +{ lib, stdenv, rustPlatform, fetchFromGitHub, pkg-config, openssl, libiconv, Security }: rustPlatform.buildRustPackage rec { pname = "dot-http"; @@ -15,11 +15,11 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ + buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ libiconv Security ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Text-based scriptable HTTP client"; homepage = "https://github.com/bayne/dot-http"; license = licenses.asl20; diff --git a/nixpkgs/pkgs/development/tools/drip/default.nix b/nixpkgs/pkgs/development/tools/drip/default.nix index b4edf8ec081b..2724e41e8e61 100644 --- a/nixpkgs/pkgs/development/tools/drip/default.nix +++ b/nixpkgs/pkgs/development/tools/drip/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, jdk8, which, makeWrapper }: +{ lib, stdenv, fetchFromGitHub, jdk8, which, makeWrapper }: stdenv.mkDerivation rec { pname = "drip"; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A launcher for the Java Virtual Machine intended to be a drop-in replacement for the java command, only faster"; license = licenses.epl10; homepage = "https://github.com/ninjudd/drip"; diff --git a/nixpkgs/pkgs/development/tools/drm_info/default.nix b/nixpkgs/pkgs/development/tools/drm_info/default.nix index c052db92e0c7..86d55ab07804 100644 --- a/nixpkgs/pkgs/development/tools/drm_info/default.nix +++ b/nixpkgs/pkgs/development/tools/drm_info/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , libdrm, json_c, pciutils -, meson, ninja, pkgconfig +, meson, ninja, pkg-config }: stdenv.mkDerivation rec { @@ -14,10 +14,10 @@ stdenv.mkDerivation rec { sha256 = "0s4zp8xz21zcpinbcwdvg48rf0xr7rs0dqri28q093vfmllsk36f"; }; - nativeBuildInputs = [ meson ninja pkgconfig ]; + nativeBuildInputs = [ meson ninja pkg-config ]; buildInputs = [ libdrm json_c pciutils ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Small utility to dump info about DRM devices"; homepage = "https://github.com/ascent12/drm_info"; license = licenses.mit; diff --git a/nixpkgs/pkgs/development/tools/dtools/default.nix b/nixpkgs/pkgs/development/tools/dtools/default.nix index 5efa579ec5a1..1c1604db654a 100644 --- a/nixpkgs/pkgs/development/tools/dtools/default.nix +++ b/nixpkgs/pkgs/development/tools/dtools/default.nix @@ -49,13 +49,13 @@ stdenv.mkDerivation rec { installPhase = '' $makeCmd INSTALL_DIR=$out install - ''; + ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Ancillary tools for the D programming language compiler"; homepage = "https://github.com/dlang/tools"; license = lib.licenses.boost; maintainers = with maintainers; [ ThomasMader ]; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/tools/easyjson/default.nix b/nixpkgs/pkgs/development/tools/easyjson/default.nix index ef99bbd01c31..a458f0dbfceb 100644 --- a/nixpkgs/pkgs/development/tools/easyjson/default.nix +++ b/nixpkgs/pkgs/development/tools/easyjson/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage { pname = "easyjson"; @@ -12,7 +12,7 @@ buildGoPackage { sha256 = "0q85h383mhbkcjm2vqm72bi8n2252fv3c56q3lclzb8n2crnjcdk"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/mailru/easyjson"; description = "Fast JSON serializer for golang"; license = licenses.mit; diff --git a/nixpkgs/pkgs/development/tools/eclipse-mat/default.nix b/nixpkgs/pkgs/development/tools/eclipse-mat/default.nix index 600b2b0e56ce..633e13d25f77 100644 --- a/nixpkgs/pkgs/development/tools/eclipse-mat/default.nix +++ b/nixpkgs/pkgs/development/tools/eclipse-mat/default.nix @@ -21,7 +21,7 @@ with lib; let - pVersion = "1.10.0.20200225"; + pVersion = "1.11.0.20201202"; pVersionTriple = splitVersion pVersion; majorVersion = elemAt pVersionTriple 0; minorVersion = elemAt pVersionTriple 1; @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://ftp.halifax.rwth-aachen.de/eclipse//mat/${baseVersion}/rcp/MemoryAnalyzer-${version}-linux.gtk.x86_64.zip"; - sha256 = "11cg01gjjvlm6lr6z6rwqs1r31xx5pxddnz55ca0s33lrnywf9fx"; + sha256 = "sha256-HtIKcGfdjb2wovGGSxv16ud7y1cPQFBn77pkhiekAkI="; }; desktopItem = makeDesktopItem { @@ -62,13 +62,13 @@ stdenv.mkDerivation rec { libCairo=$out/eclipse/libcairo-swt.so patchelf --set-interpreter $interpreter $out/mat/MemoryAnalyzer [ -f $libCairo ] && patchelf --set-rpath ${ - stdenv.lib.makeLibraryPath [ freetype fontconfig libX11 libXrender zlib ] + lib.makeLibraryPath [ freetype fontconfig libX11 libXrender zlib ] } $libCairo # Create wrapper script. Pass -configuration to store settings in ~/.eclipse-mat/<version> makeWrapper $out/mat/MemoryAnalyzer $out/bin/eclipse-mat \ --prefix PATH : ${jdk}/bin \ - --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath ([ glib gtk3 libXtst webkitgtk ])} \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath ([ glib gtk3 libXtst webkitgtk ])} \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \ --add-flags "-configuration \$HOME/.eclipse-mat/''${version}/configuration" @@ -100,7 +100,7 @@ stdenv.mkDerivation rec { dontBuild = true; dontConfigure = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Fast and feature-rich Java heap analyzer"; longDescription = '' The Eclipse Memory Analyzer is a tool that helps you find memory diff --git a/nixpkgs/pkgs/development/tools/ejson/gemset.nix b/nixpkgs/pkgs/development/tools/ejson/gemset.nix index 70c61be984c6..93fa1131f2a7 100644 --- a/nixpkgs/pkgs/development/tools/ejson/gemset.nix +++ b/nixpkgs/pkgs/development/tools/ejson/gemset.nix @@ -185,4 +185,4 @@ }; version = "0.0.23"; }; -} \ No newline at end of file +} diff --git a/nixpkgs/pkgs/development/tools/electron/default.nix b/nixpkgs/pkgs/development/tools/electron/default.nix index 29d00a159ab1..2e60885111d9 100644 --- a/nixpkgs/pkgs/development/tools/electron/default.nix +++ b/nixpkgs/pkgs/development/tools/electron/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , libXScrnSaver , makeWrapper , fetchurl @@ -76,30 +76,30 @@ rec { headers = "18frb1z5qkyff5z1w44mf4iz9aw9j4lq0h9yxgfnp33zf7sl9qb5"; }; - electron_9 = mkElectron "9.4.0" { - x86_64-linux = "2a81ef31fc4b1e1ea450f2c145179ad7c4b6fc752a7b9f3e27abd2461e908ea6"; - x86_64-darwin = "38fa3d93b74c425008d17712daa7676a0f4eb1a70b92da6d7a5c66bb078546cd"; - i686-linux = "629caa459e2fdf31e82501dfd194358d14112152c9d719be579850605ddd929a"; - armv7l-linux = "f46ae7a45d89007cec1c3f45e8e059f2d0e0b73dcadc009b96589ce8bb5e0e21"; - aarch64-linux = "7ebb9cebfa32add20f56b9b414a473f1cb55c90d55735b133f353a23ad76becd"; - headers = "17729m93a387v1sc0ayzfjpvbl1wr9vhlf8y11wyr4704iyimr72"; + electron_9 = mkElectron "9.4.1" { + x86_64-linux = "36c6c33e2702f591c34a7e6ebd7d0828d554a4ce2eafb319a0cd16ffd4cc4b28"; + x86_64-darwin = "3e2f87d899be684eab226c572c566e89c05114059c9add1a33d2be63100b18fd"; + i686-linux = "be5f8d18f11ad7c0655faec4040a8af6239f29f1155210024a01826a30b0dbbe"; + armv7l-linux = "b710a0e3b80ef265760d49c9210f78a6410007521b0ed73c8b868b05d22a0a60"; + aarch64-linux = "e2fc73309780fc0e9b5abebcb8256b2bc389672f0bcc261269da5891a3df66dc"; + headers = "0sabqcjd6gcc6khyhiz3rk30p1y4bxsajy4rs9866bqyafq86j6q"; }; - electron_10 = mkElectron "10.2.0" { - x86_64-linux = "71e6f27433c7a098d0d0d4f2b624bc05cc81614d4e8cd0df71a78a6f9f4e4d5a"; - x86_64-darwin = "c6c32fa6b59d33f79e2f5cc317d7c61f0e1b8d7ab22c46a7a4e3fc3233785d7c"; - i686-linux = "d18208292cc5b64fed42b7ed21740b20f31c92b7612eb54ea1b71f8058a7439d"; - armv7l-linux = "b588b1d14b6f13b1e705180c52fae85113033efa630417a97555a085d7442ec4"; - aarch64-linux = "6cd8172939005cd12705d3c30be57e02e8b5271362ad60fb7378cc99a21db1e0"; - headers = "116h3b02da18w5mqgw6adgbzc9l02vl3c62syw4wsy6xww6i0mgr"; + electron_10 = mkElectron "10.3.0" { + x86_64-linux = "1a4afb659400c7acca0734df1b981b867e5dfdd15d4d3b73fd276d87b682f089"; + x86_64-darwin = "9c5cca484b28dc5cca89a7f1c77e65b3a04251f4eee740265c358efae351cb94"; + i686-linux = "fcb298bca0ab229e92b92c418d3e352885ff4291f735a35c7822b3ca17ae8a86"; + armv7l-linux = "48accf0fbef1f2d1a81e12c2e66b9280f871029b16947d0bebe036cf1fb71b1c"; + aarch64-linux = "2c99b4ec87ba657c33efb3a7e907e3f3e315e87347954231cb8bae393c1c96fd"; + headers = "1k97pfzxqrgw4y76js2chq13avgp9czin9q9mlh1zdf13bih96hj"; }; - electron_11 = mkElectron "11.1.0" { - x86_64-linux = "64f9c0864a12a9e0a435b967ed63209a9bb447456aafe8660edaaa2f6517c538"; - x86_64-darwin = "827b0b3e562535de25d3e4d2c4d7529338efae9197e8cf6702dda786b5870bd0"; - i686-linux = "aa424de2c480d0deb26aa53dc45622857521cb9876cf29a52d32a4da66cae3c6"; - armv7l-linux = "375bbea1ecf521ab95760052df5e0ad167e41f61cc79c7c441553ecc2f64d1dd"; - aarch64-linux = "caaf1f9a2e62c9dbbcb777e5c64640d8a1f60a0f5791a2c8f62ab44067c88777"; - headers = "1kafrz2rxryv7psgfn20qrkpcn83hi9fz7df2ra1nzkngfj7xdjr"; + electron_11 = mkElectron "11.2.1" { + x86_64-linux = "607d9d58c9a3b5c36461acc6bbe473bc604eee42a55c2c617ac46d095cf98abb"; + x86_64-darwin = "39d95668a3ea04bdc652ff9e2889c7a88f638534420e8e256679cbf4b7658a65"; + i686-linux = "59f226133d01fb6acf86fe98907964f79dcf2902054e5c4c9c4ff84a3ea88f4a"; + armv7l-linux = "85051d8eacf04aeec3dd74e46e7888d01bd4e6caf7ec2001122a1f3e11db44ee"; + aarch64-linux = "8aa9be5d6c139386390bad64f78b95756206a40fe4982fc9f199b67a7d06bec5"; + headers = "12sy8zzb0z654b85c5l1j8762nhwmkim1pbz1y3qzgbzvpbd5arq"; }; } diff --git a/nixpkgs/pkgs/development/tools/electron/generic.nix b/nixpkgs/pkgs/development/tools/electron/generic.nix index 6d0dbc8cace2..e29064e673ad 100644 --- a/nixpkgs/pkgs/development/tools/electron/generic.nix +++ b/nixpkgs/pkgs/development/tools/electron/generic.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , libXScrnSaver , makeWrapper , fetchurl @@ -20,7 +20,7 @@ version: hashes: let name = "electron-${version}"; - meta = with stdenv.lib; { + meta = with lib; { description = "Cross platform desktop application shell"; homepage = "https://github.com/electron/electron"; license = licenses.mit; @@ -56,7 +56,7 @@ let passthru.headers = headersFetcher version hashes.headers; }; - electronLibPath = with stdenv.lib; makeLibraryPath ( + electronLibPath = with lib; makeLibraryPath ( [ libuuid at-spi2-atk at-spi2-core libappindicator-gtk3 ] ++ optionals (! versionOlder version "9.0.0") [ libdrm mesa ] ++ optionals (! versionOlder version "11.0.0") [ libxkbcommon ] @@ -89,7 +89,7 @@ let $out/lib/electron/electron wrapProgram $out/lib/electron/electron \ - --prefix LD_PRELOAD : ${stdenv.lib.makeLibraryPath [ libXScrnSaver ]}/libXss.so.1 \ + --prefix LD_PRELOAD : ${lib.makeLibraryPath [ libXScrnSaver ]}/libXss.so.1 \ "''${gappsWrapperArgs[@]}" ''; }; diff --git a/nixpkgs/pkgs/development/tools/eliot-tree/default.nix b/nixpkgs/pkgs/development/tools/eliot-tree/default.nix index 95108c21bb9c..e60642c5fe60 100644 --- a/nixpkgs/pkgs/development/tools/eliot-tree/default.nix +++ b/nixpkgs/pkgs/development/tools/eliot-tree/default.nix @@ -1,4 +1,4 @@ -{ stdenv, python3Packages }: +{ lib, stdenv, python3Packages }: python3Packages.buildPythonApplication rec { pname = "eliot-tree"; @@ -29,7 +29,7 @@ python3Packages.buildPythonApplication rec { pytest ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/jonathanj/eliottree"; description = "Render Eliot logs as an ASCII tree"; license = licenses.mit; diff --git a/nixpkgs/pkgs/development/tools/erlang/cuter/default.nix b/nixpkgs/pkgs/development/tools/erlang/cuter/default.nix index f9d63cc86d8d..44ed61ac1d5f 100644 --- a/nixpkgs/pkgs/development/tools/erlang/cuter/default.nix +++ b/nixpkgs/pkgs/development/tools/erlang/cuter/default.nix @@ -1,4 +1,4 @@ -{ stdenv, autoreconfHook, which, writeText, makeWrapper, fetchFromGitHub, erlang +{ lib, stdenv, autoreconfHook, which, writeText, makeWrapper, fetchFromGitHub, erlang , z3, python }: stdenv.mkDerivation rec { @@ -38,9 +38,9 @@ stdenv.mkDerivation rec { meta = { description = "A concolic testing tool for the Erlang functional programming language"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; homepage = "https://github.com/aggelgian/cuter"; - maintainers = with stdenv.lib.maintainers; [ ericbmerritt ]; - platforms = with stdenv.lib.platforms; unix; + maintainers = with lib.maintainers; [ ericbmerritt ]; + platforms = with lib.platforms; unix; }; } diff --git a/nixpkgs/pkgs/development/tools/errcheck/default.nix b/nixpkgs/pkgs/development/tools/errcheck/default.nix index 3c42c1437a47..eb9589f723da 100644 --- a/nixpkgs/pkgs/development/tools/errcheck/default.nix +++ b/nixpkgs/pkgs/development/tools/errcheck/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "errcheck"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "kisielk"; repo = "errcheck"; rev = "v${version}"; - sha256 = "00skyvy31yliw0f395j5h3gichi5n2q1m24izjidxvyc2av7pjn6"; + sha256 = "sha256-ZmocFXtg+Thdup+RqDYC/Td3+m1nS0FydZecfsWXIzI="; }; - vendorSha256 = "0mx506qb5sy6p4zqjs1n0w7dg8pz2wf982qi9v7nrhxysl2rlnxf"; + vendorSha256 = "sha256-rluaBdW+w2zPThELlBwX/6LXDgc2aIk/ucbrsrABpVc="; meta = with lib; { description = "Program for checking for unchecked errors in go programs"; diff --git a/nixpkgs/pkgs/development/tools/fac/default.nix b/nixpkgs/pkgs/development/tools/fac/default.nix index 6a23f84f2366..ef3298c54780 100644 --- a/nixpkgs/pkgs/development/tools/fac/default.nix +++ b/nixpkgs/pkgs/development/tools/fac/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, makeWrapper, git }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub, makeWrapper, git }: buildGoPackage rec { pname = "fac"; @@ -25,7 +25,7 @@ buildGoPackage rec { install -D go/src/${goPackagePath}/assets/doc/fac.1 $out/share/man/man1/fac.1 ''; - meta = with stdenv.lib; { + meta = with lib; { description = "CUI for fixing git conflicts"; inherit (src.meta) homepage; license = licenses.mit; diff --git a/nixpkgs/pkgs/development/tools/fac/deps.nix b/nixpkgs/pkgs/development/tools/fac/deps.nix index 65335497e5ff..8545bae7e22d 100644 --- a/nixpkgs/pkgs/development/tools/fac/deps.nix +++ b/nixpkgs/pkgs/development/tools/fac/deps.nix @@ -63,4 +63,4 @@ sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1"; }; } -] \ No newline at end of file +] diff --git a/nixpkgs/pkgs/development/tools/fedora-coreos-config-transpiler/default.nix b/nixpkgs/pkgs/development/tools/fedora-coreos-config-transpiler/default.nix index b53b03d26e36..d50491692ef3 100644 --- a/nixpkgs/pkgs/development/tools/fedora-coreos-config-transpiler/default.nix +++ b/nixpkgs/pkgs/development/tools/fedora-coreos-config-transpiler/default.nix @@ -4,13 +4,13 @@ with lib; buildGoModule rec { pname = "fcct"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "coreos"; repo = "fcct"; rev = "v${version}"; - sha256 = "0w3vhfjpmpahb08fp6czixhlqhk6izglmwdpj2l19ksz8fc8aq54"; + sha256 = "0kdsnsp9nzkkfwakcx64md66yz2k7cpw8bkhdv798yirbrqprgp6"; }; vendorSha256 = null; diff --git a/nixpkgs/pkgs/development/tools/fedpkg/default.nix b/nixpkgs/pkgs/development/tools/fedpkg/default.nix index 4fbecc2d58d0..285e71707fd5 100644 --- a/nixpkgs/pkgs/development/tools/fedpkg/default.nix +++ b/nixpkgs/pkgs/development/tools/fedpkg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonApplication, buildPythonPackage, isPy3k, fetchurl, rpkg, offtrac, urlgrabber, pyopenssl, python_fedora }: +{ lib, stdenv, buildPythonApplication, buildPythonPackage, isPy3k, fetchurl, rpkg, offtrac, urlgrabber, pyopenssl, python_fedora }: let fedora_cert = buildPythonPackage rec { @@ -26,7 +26,7 @@ in buildPythonApplication rec { patches = [ ./fix-paths.patch ]; propagatedBuildInputs = [ rpkg offtrac urlgrabber fedora_cert ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Subclass of the rpkg project for dealing with rpm packaging"; homepage = "https://pagure.io/fedpkg"; license = licenses.gpl2; diff --git a/nixpkgs/pkgs/development/tools/flamegraph/default.nix b/nixpkgs/pkgs/development/tools/flamegraph/default.nix index 23ada99eac0f..3a64d741de5c 100644 --- a/nixpkgs/pkgs/development/tools/flamegraph/default.nix +++ b/nixpkgs/pkgs/development/tools/flamegraph/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, perl }: +{ lib, stdenv, fetchFromGitHub, perl }: stdenv.mkDerivation rec { pname = "FlameGraph"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { license = with licenses; [ asl20 cddl gpl2Plus ]; homepage = "http://www.brendangregg.com/flamegraphs.html"; description = "Visualization for profiled code"; diff --git a/nixpkgs/pkgs/development/tools/flatpak-builder/default.nix b/nixpkgs/pkgs/development/tools/flatpak-builder/default.nix index 79c8236a065d..dd9282c68961 100644 --- a/nixpkgs/pkgs/development/tools/flatpak-builder/default.nix +++ b/nixpkgs/pkgs/development/tools/flatpak-builder/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , substituteAll , nixosTests @@ -11,7 +11,7 @@ , gettext , libxml2 , libxslt -, pkgconfig +, pkg-config , xmlto , acl @@ -64,7 +64,7 @@ in stdenv.mkDerivation rec { gettext libxml2 libxslt - pkgconfig + pkg-config xmlto ]; @@ -145,7 +145,7 @@ in stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Tool to build flatpaks from source"; homepage = "https://github.com/flatpak/flatpak-builder"; license = licenses.lgpl21Plus; diff --git a/nixpkgs/pkgs/development/tools/flootty/default.nix b/nixpkgs/pkgs/development/tools/flootty/default.nix index 1baddb52259c..4867b9c2cb99 100644 --- a/nixpkgs/pkgs/development/tools/flootty/default.nix +++ b/nixpkgs/pkgs/development/tools/flootty/default.nix @@ -1,4 +1,4 @@ -{ stdenv, python3Packages }: +{ lib, stdenv, python3Packages }: python3Packages.buildPythonApplication rec { pname = "Flootty"; @@ -9,10 +9,10 @@ python3Packages.buildPythonApplication rec { sha256 = "0gfl143ly81pmmrcml91yr0ypvwrs5q4s1sfdc0l2qkqpy233ih7"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A collaborative terminal. In practice, it's similar to a shared screen or tmux session"; homepage = "https://floobits.com/help/flootty"; license = licenses.asl20; - maintainers = with maintainers; [ sellout enzime ]; + maintainers = with maintainers; [ sellout ]; }; } diff --git a/nixpkgs/pkgs/development/tools/flyway/default.nix b/nixpkgs/pkgs/development/tools/flyway/default.nix index af58da175100..bcad4ffb4e94 100644 --- a/nixpkgs/pkgs/development/tools/flyway/default.nix +++ b/nixpkgs/pkgs/development/tools/flyway/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, jre_headless, makeWrapper }: +{ lib, stdenv, fetchurl, jre_headless, makeWrapper }: let version = "7.3.1"; in @@ -22,7 +22,7 @@ --add-flags "org.flywaydb.commandline.Main" \ --add-flags "-jarDirs='$out/share/flyway/jars'" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Evolve your Database Schema easily and reliably across all your instances"; longDescription = '' The Flyway command-line tool is a standalone Flyway distribution. diff --git a/nixpkgs/pkgs/development/tools/fmbt/default.nix b/nixpkgs/pkgs/development/tools/fmbt/default.nix index 71365c01bfdd..e6bb20327415 100644 --- a/nixpkgs/pkgs/development/tools/fmbt/default.nix +++ b/nixpkgs/pkgs/development/tools/fmbt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python, autoreconfHook, pkgconfig, makeWrapper +{ lib, stdenv, fetchFromGitHub, python, autoreconfHook, pkg-config, makeWrapper , flex , gettext, libedit, glib, imagemagick, libxml2, boost, gnuplot, graphviz , tesseract, gts, libXtst @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { sha256 = "1jb9nb2mipc5cg99a80dny4m06vz2zral0q30fv75rz2cb6ja4zp"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig flex makeWrapper + nativeBuildInputs = [ autoreconfHook pkg-config flex makeWrapper python.pkgs.wrapPython ]; buildInputs = [ python gettext libedit glib imagemagick libxml2 boost - gnuplot graphviz tesseract gts + gnuplot graphviz tesseract gts ]; propagatedBuildInputs = with python.pkgs; [ @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { preBuild = '' export PYTHONPATH="$PYTHONPATH:$out/lib/python${python.pythonVersion}/site-packages" export PATH="$PATH:$out/bin" - export LD_LIBRARY_PATH="${stdenv.lib.makeLibraryPath [libXtst]}" + export LD_LIBRARY_PATH="${lib.makeLibraryPath [libXtst]}" ''; postInstall = '' @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Free Model-Based Testing tool"; homepage = "https://github.com/intel/fMBT"; license = licenses.lgpl21; diff --git a/nixpkgs/pkgs/development/tools/fusee-launcher/default.nix b/nixpkgs/pkgs/development/tools/fusee-launcher/default.nix index 077dc8b87f99..08cf6caae3ef 100644 --- a/nixpkgs/pkgs/development/tools/fusee-launcher/default.nix +++ b/nixpkgs/pkgs/development/tools/fusee-launcher/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , python3Packages , python3 , fetchFromGitHub @@ -32,7 +32,7 @@ stdenv.mkDerivation { buildInputs = [ python3 python3Packages.pyusb ]; pythonPath = with python3Packages; [ pyusb ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/Cease-and-DeSwitch/fusee-launcher"; description = "Work-in-progress launcher for one of the Tegra X1 bootROM exploits"; license = licenses.gpl2; diff --git a/nixpkgs/pkgs/development/tools/galen/default.nix b/nixpkgs/pkgs/development/tools/galen/default.nix index 89d6b700018d..00831c05691a 100644 --- a/nixpkgs/pkgs/development/tools/galen/default.nix +++ b/nixpkgs/pkgs/development/tools/galen/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, jre8, unzip }: +{ lib, stdenv, fetchurl, jre8, unzip }: stdenv.mkDerivation rec { pname = "galen"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { cp galen.jar $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://galenframework.com"; description = "Automated layout testing for websites"; license = licenses.asl20; diff --git a/nixpkgs/pkgs/development/tools/gamecube-tools/default.nix b/nixpkgs/pkgs/development/tools/gamecube-tools/default.nix index 7c31f691b4e8..2f7c088cd486 100644 --- a/nixpkgs/pkgs/development/tools/gamecube-tools/default.nix +++ b/nixpkgs/pkgs/development/tools/gamecube-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook +{ lib, stdenv, fetchFromGitHub, autoreconfHook , freeimage, libGL }: stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sha256 = "0zvpkzqvl8iv4ndzhkjkmrzpampyzgb91spv0h2x2arl8zy4z7ca"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Tools for gamecube/wii projects"; homepage = "https://github.com/devkitPro/gamecube-tools/"; license = licenses.gpl2; diff --git a/nixpkgs/pkgs/development/tools/gauge/default.nix b/nixpkgs/pkgs/development/tools/gauge/default.nix index dd48998c7410..a0eb7370bee0 100644 --- a/nixpkgs/pkgs/development/tools/gauge/default.nix +++ b/nixpkgs/pkgs/development/tools/gauge/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "gauge"; @@ -14,7 +14,7 @@ buildGoPackage rec { sha256 = "02yrk4d5mm4j2grlhqkf4grxawx91kd2vhdn7k5wd2dl6wsnlgcl"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Light weight cross-platform test automation"; homepage = "https://gauge.org"; license = licenses.gpl3; diff --git a/nixpkgs/pkgs/development/tools/gdm/default.nix b/nixpkgs/pkgs/development/tools/gdm/default.nix index 2f26a1c35f85..7c7f73af1e0f 100644 --- a/nixpkgs/pkgs/development/tools/gdm/default.nix +++ b/nixpkgs/pkgs/development/tools/gdm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "gdm"; @@ -15,7 +15,7 @@ buildGoPackage rec { goDeps = ./deps.nix; - meta = with stdenv.lib; { + meta = with lib; { description = "Minimalist dependency manager for Go written in Go"; homepage = "https://github.com/sparrc/gdm"; license = licenses.unlicense; diff --git a/nixpkgs/pkgs/development/tools/ginkgo/default.nix b/nixpkgs/pkgs/development/tools/ginkgo/default.nix index 4670c13a63ab..b65e7c6a5eef 100644 --- a/nixpkgs/pkgs/development/tools/ginkgo/default.nix +++ b/nixpkgs/pkgs/development/tools/ginkgo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ lib, stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "ginkgo"; @@ -13,7 +13,7 @@ buildGoModule rec { vendorSha256 = "072amyw1ir18v9vk268j2y7dhw3lfwvxzvzsdqhnp50rxsa911bx"; doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "BDD Testing Framework for Go"; homepage = "https://github.com/onsi/ginkgo"; license = licenses.mit; diff --git a/nixpkgs/pkgs/development/tools/gir/default.nix b/nixpkgs/pkgs/development/tools/gir/default.nix index 02a3c13afb3d..8f38b41f7ae2 100644 --- a/nixpkgs/pkgs/development/tools/gir/default.nix +++ b/nixpkgs/pkgs/development/tools/gir/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform }: +{ lib, stdenv, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { pname = "gir"; @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "048qhlc4f5khxi7dnakgqkhgww44r6h3mlx2fm7y2wqivr3rj8p1"; - meta = with stdenv.lib; { + meta = with lib; { description = "Tool to generate rust bindings and user API for glib-based libraries"; homepage = "https://github.com/gtk-rs/gir/"; license = with licenses; [ mit ]; diff --git a/nixpkgs/pkgs/development/tools/git-ftp/default.nix b/nixpkgs/pkgs/development/tools/git-ftp/default.nix index 0c107ecc5031..25295ad0062d 100644 --- a/nixpkgs/pkgs/development/tools/git-ftp/default.nix +++ b/nixpkgs/pkgs/development/tools/git-ftp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pandoc, man }: +{ lib, stdenv, fetchFromGitHub, pandoc, man }: stdenv.mkDerivation rec { pname = "git-ftp"; version = "1.6.0"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [pandoc man]; - meta = with stdenv.lib; { + meta = with lib; { description = "Git powered FTP client written as shell script"; homepage = "https://git-ftp.github.io/"; license = licenses.gpl3; diff --git a/nixpkgs/pkgs/development/tools/git-quick-stats/default.nix b/nixpkgs/pkgs/development/tools/git-quick-stats/default.nix index 500c9a55c1d8..ed9205ee2516 100644 --- a/nixpkgs/pkgs/development/tools/git-quick-stats/default.nix +++ b/nixpkgs/pkgs/development/tools/git-quick-stats/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , makeWrapper , coreutils @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "git-quick-stats"; - version = "2.1.4"; + version = "2.1.5"; src = fetchFromGitHub { repo = "git-quick-stats"; owner = "arzzen"; rev = version; - sha256 = "0fg0fijghcz7hvbc9y8dfksz0qmsz700kc2mfb03y90kja99v68y"; + sha256 = "sha256-d5B+SSUXtOD4x+dChQsUCkiHuHcW3lOrL4QhQekY7cA="; }; nativeBuildInputs = [ makeWrapper ]; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { postInstall = let - path = stdenv.lib.makeBinPath [ + path = lib.makeBinPath [ coreutils gawk git @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/git-quick-stats --suffix PATH : ${path} ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/arzzen/git-quick-stats"; description = "A simple and efficient way to access various statistics in git repository"; platforms = platforms.all; diff --git a/nixpkgs/pkgs/development/tools/git-series/default.nix b/nixpkgs/pkgs/development/tools/git-series/default.nix index 3507131082e8..4f13c3de40bb 100644 --- a/nixpkgs/pkgs/development/tools/git-series/default.nix +++ b/nixpkgs/pkgs/development/tools/git-series/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchFromGitHub, fetchpatch, rustPlatform -, openssl, cmake, perl, pkgconfig, zlib, curl, libgit2, libssh2 +{ lib, stdenv, fetchFromGitHub, fetchpatch, rustPlatform +, openssl, cmake, perl, pkg-config, zlib, curl, libgit2, libssh2 }: with rustPlatform; @@ -36,14 +36,14 @@ buildRustPackage rec { LIBGIT2_SYS_USE_PKG_CONFIG = true; LIBSSH2_SYS_USE_PKG_CONFIG = true; - nativeBuildInputs = [ cmake pkgconfig perl ]; + nativeBuildInputs = [ cmake pkg-config perl ]; buildInputs = [ openssl zlib curl libgit2 libssh2 ]; postBuild = '' install -D "$src/git-series.1" "$out/man/man1/git-series.1" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A tool to help with formatting git patches for review on mailing lists"; longDescription = '' git series tracks changes to a patch series over time. git diff --git a/nixpkgs/pkgs/development/tools/github-changelog-generator/gemset.nix b/nixpkgs/pkgs/development/tools/github-changelog-generator/gemset.nix index 3382557aaa57..173ee55b6e7c 100644 --- a/nixpkgs/pkgs/development/tools/github-changelog-generator/gemset.nix +++ b/nixpkgs/pkgs/development/tools/github-changelog-generator/gemset.nix @@ -152,4 +152,4 @@ }; version = "1.2.5"; }; -} \ No newline at end of file +} diff --git a/nixpkgs/pkgs/development/tools/github/cligh/default.nix b/nixpkgs/pkgs/development/tools/github/cligh/default.nix index 5eb65dc4fbdf..dfe66c789ca4 100644 --- a/nixpkgs/pkgs/development/tools/github/cligh/default.nix +++ b/nixpkgs/pkgs/development/tools/github/cligh/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildPythonApplication, pyxdg, PyGithub }: +{ lib, stdenv, fetchFromGitHub, buildPythonApplication, pyxdg, PyGithub }: buildPythonApplication rec { pname = "cligh"; @@ -15,7 +15,7 @@ buildPythonApplication rec { propagatedBuildInputs = [ pyxdg PyGithub ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://the-brannons.com/software/cligh.html"; description = "A simple command-line interface to the facilities of Github"; longDescription = '' diff --git a/nixpkgs/pkgs/development/tools/github/github-release/default.nix b/nixpkgs/pkgs/development/tools/github/github-release/default.nix index 8b68426d4b5e..81b125ac0585 100644 --- a/nixpkgs/pkgs/development/tools/github/github-release/default.nix +++ b/nixpkgs/pkgs/development/tools/github/github-release/default.nix @@ -1,4 +1,4 @@ -{ stdenv, system, fetchurl }: +{ lib, stdenv, system, fetchurl }: let linuxPredicate = system == "x86_64-linux"; @@ -36,7 +36,7 @@ in stdenv.mkDerivation rec { cp "${metadata.archiveBinaryPath}/github-release" "$out/bin/" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Commandline app to create and edit releases on Github (and upload artifacts)"; longDescription = '' A small commandline app written in Go that allows you to easily create and diff --git a/nixpkgs/pkgs/development/tools/glade/default.nix b/nixpkgs/pkgs/development/tools/glade/default.nix index 363e429b6baa..d77772c32db6 100644 --- a/nixpkgs/pkgs/development/tools/glade/default.nix +++ b/nixpkgs/pkgs/development/tools/glade/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , gettext , fetchurl , python3 @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { version = "3.38.2"; src = fetchurl { - url = "mirror://gnome/sources/glade/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/glade/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1dxsiz9ahqkxg2a1dw9sbd8jg59y5pdz4c1gvnbmql48gmj8gz4q"; }; @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://wiki.gnome.org/Apps/Glade"; description = "User interface designer for GTK applications"; maintainers = teams.gnome.members; diff --git a/nixpkgs/pkgs/development/tools/glide/default.nix b/nixpkgs/pkgs/development/tools/glide/default.nix index 4f511813ad0b..f8abde7e00a7 100644 --- a/nixpkgs/pkgs/development/tools/glide/default.nix +++ b/nixpkgs/pkgs/development/tools/glide/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "glide"; @@ -18,7 +18,7 @@ buildGoPackage rec { sha256 = "1wskg1cxqy9sp0738qiiagdw09dbs3swxsk4z6w5hsfiq2h44a54"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://glide.sh"; description = "Package management for Go"; license = licenses.mit; diff --git a/nixpkgs/pkgs/development/tools/gllvm/default.nix b/nixpkgs/pkgs/development/tools/gllvm/default.nix index efa7ae21c3a5..f2c552252fb2 100644 --- a/nixpkgs/pkgs/development/tools/gllvm/default.nix +++ b/nixpkgs/pkgs/development/tools/gllvm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "gllvm"; @@ -13,7 +13,7 @@ buildGoPackage rec { sha256 = "15cgngvd9mg057iz32fk5kcprcvvavahbvfvl5ds8x7shbm60g7s"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/SRI-CSL/gllvm"; description = "Whole Program LLVM: wllvm ported to go"; license = licenses.bsd3; diff --git a/nixpkgs/pkgs/development/tools/global-platform-pro/default.nix b/nixpkgs/pkgs/development/tools/global-platform-pro/default.nix index 2f125d3ea8a3..4d80010f71ea 100644 --- a/nixpkgs/pkgs/development/tools/global-platform-pro/default.nix +++ b/nixpkgs/pkgs/development/tools/global-platform-pro/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, jdk8, maven, makeWrapper, jre8_headless, pcsclite }: +{ lib, stdenv, fetchFromGitHub, jdk8, maven, makeWrapper, jre8_headless, pcsclite }: let jdk = jdk8; jre_headless = jre8_headless; in # TODO: This is quite a bit of duplicated logic with gephi. Factor it out? @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { --prefix LD_LIBRARY_PATH : "${pcsclite.out}/lib" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Command-line utility for managing applets and keys on Java Cards"; longDescription = '' This command-line utility can be used to manage applets and keys diff --git a/nixpkgs/pkgs/development/tools/glock/default.nix b/nixpkgs/pkgs/development/tools/glock/default.nix index 0ffa521f38ff..c00478c9fb6a 100644 --- a/nixpkgs/pkgs/development/tools/glock/default.nix +++ b/nixpkgs/pkgs/development/tools/glock/default.nix @@ -1,8 +1,8 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "glock"; - version = "20160816-${stdenv.lib.strings.substring 0 7 rev}"; + version = "20160816-${lib.strings.substring 0 7 rev}"; rev = "b8c84ff5ade15a6238ca61c20d3afc70d2e41276"; goPackagePath = "github.com/robfig/glock"; @@ -16,7 +16,7 @@ buildGoPackage rec { goDeps = ./deps.nix; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/robfig/glock"; description = "A command-line tool to lock Go dependencies to specific revisions"; license = licenses.mit; diff --git a/nixpkgs/pkgs/development/tools/glpaper/default.nix b/nixpkgs/pkgs/development/tools/glpaper/default.nix index 94d140552a10..9ad85e840bad 100644 --- a/nixpkgs/pkgs/development/tools/glpaper/default.nix +++ b/nixpkgs/pkgs/development/tools/glpaper/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchhg, meson, ninja, pkg-config, wlroots, wayland, wayland-protocols +{ lib, stdenv, fetchhg, meson, ninja, pkg-config, wlroots, wayland, wayland-protocols , libX11, libGL }: stdenv.mkDerivation { @@ -18,7 +18,7 @@ stdenv.mkDerivation { libGL ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Wallpaper program for wlroots based Wayland compositors such as sway that allows you to render glsl shaders as your wallpaper"; homepage = "https://hg.sr.ht/~scoopta/glpaper"; diff --git a/nixpkgs/pkgs/development/tools/glslviewer/default.nix b/nixpkgs/pkgs/development/tools/glslviewer/default.nix index 84b3d2a6b1ee..3f83e1fcb02f 100644 --- a/nixpkgs/pkgs/development/tools/glslviewer/default.nix +++ b/nixpkgs/pkgs/development/tools/glslviewer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, glfw, pkgconfig, libXrandr, libXdamage +{ lib, stdenv, fetchFromGitHub, glfw, pkg-config, libXrandr, libXdamage , libXext, libXrender, libXinerama, libXcursor, libXxf86vm, libXi , libX11, libGLU, python3Packages, ensureNewerSourcesForZipFilesHook , Cocoa @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { sha256 = "0v7x93b61ama0gmzlx1zc56jgi7bvzsfvbkfl82xzwf2h5g1zni7"; }; - nativeBuildInputs = [ pkgconfig ensureNewerSourcesForZipFilesHook python3Packages.six ]; + nativeBuildInputs = [ pkg-config ensureNewerSourcesForZipFilesHook python3Packages.six ]; buildInputs = [ glfw libGLU glfw libXrandr libXdamage libXext libXrender libXinerama libXcursor libXxf86vm libXi libX11 ] ++ (with python3Packages; [ python setuptools wrapPython ]) - ++ stdenv.lib.optional stdenv.isDarwin Cocoa; + ++ lib.optional stdenv.isDarwin Cocoa; pythonPath = with python3Packages; [ pyyaml requests ]; # Makefile has /usr/local/bin hard-coded for 'make install' @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { wrapPythonPrograms ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Live GLSL coding renderer"; homepage = "http://patriciogonzalezvivo.com/2015/glslViewer/"; license = licenses.bsd3; diff --git a/nixpkgs/pkgs/development/tools/gnome-desktop-testing/default.nix b/nixpkgs/pkgs/development/tools/gnome-desktop-testing/default.nix index e0dc9ecda80a..5f01881958fe 100644 --- a/nixpkgs/pkgs/development/tools/gnome-desktop-testing/default.nix +++ b/nixpkgs/pkgs/development/tools/gnome-desktop-testing/default.nix @@ -1,7 +1,7 @@ -{ stdenv +{ lib, stdenv , glib , autoreconfHook -, pkgconfig +, pkg-config , systemd , fetchFromGitLab }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook - pkgconfig + pkg-config ]; buildInputs = [ @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "GNOME test runner for installed tests"; homepage = "https://wiki.gnome.org/Initiatives/GnomeGoals/InstalledTests"; license = licenses.lgpl2Plus; diff --git a/nixpkgs/pkgs/development/tools/gnulib/default.nix b/nixpkgs/pkgs/development/tools/gnulib/default.nix index 81e4d8793752..2a2ce1b190ff 100644 --- a/nixpkgs/pkgs/development/tools/gnulib/default.nix +++ b/nixpkgs/pkgs/development/tools/gnulib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit }: +{ lib, stdenv, fetchgit }: stdenv.mkDerivation { pname = "gnulib"; @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = { homepage = "https://www.gnu.org/software/gnulib/"; description = "Central location for code to be shared among GNU packages"; - license = stdenv.lib.licenses.gpl3Plus; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/tools/go-bindata-assetfs/default.nix b/nixpkgs/pkgs/development/tools/go-bindata-assetfs/default.nix index 30344a52e065..57d0e93a9b0c 100644 --- a/nixpkgs/pkgs/development/tools/go-bindata-assetfs/default.nix +++ b/nixpkgs/pkgs/development/tools/go-bindata-assetfs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "go-bindata-assetfs"; @@ -13,7 +13,7 @@ buildGoPackage rec { sha256 = "0b6q8h9fwpgpkvml1j87wq9174g7px1dmskhm884drpvswda2djk"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Serve embedded files from jteeuwen/go-bindata"; license = licenses.bsd2; maintainers = with maintainers; [ avnik ]; diff --git a/nixpkgs/pkgs/development/tools/go-bindata/default.nix b/nixpkgs/pkgs/development/tools/go-bindata/default.nix index 9256fab43bf8..5d257bbf9982 100644 --- a/nixpkgs/pkgs/development/tools/go-bindata/default.nix +++ b/nixpkgs/pkgs/development/tools/go-bindata/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage { pname = "go-bindata"; @@ -15,7 +15,7 @@ buildGoPackage { excludedPackages = "testdata"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/jteeuwen/go-bindata"; description = "A small utility which generates Go code from any file, useful for embedding binary data in a Go program"; maintainers = with maintainers; [ cstrahan ]; diff --git a/nixpkgs/pkgs/development/tools/go-junit-report/default.nix b/nixpkgs/pkgs/development/tools/go-junit-report/default.nix index 96ebce0eaca6..f1e822e3633f 100644 --- a/nixpkgs/pkgs/development/tools/go-junit-report/default.nix +++ b/nixpkgs/pkgs/development/tools/go-junit-report/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "go-junit-report-unstable"; @@ -14,7 +14,7 @@ buildGoPackage rec { sha256 = "109zs8wpdmc2ijc2khyqija8imay88ka6v50xvrpnnwnd3ywckxi"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Converts go test output to an xml report, suitable for applications that expect junit xml reports (e.g. Jenkins)"; homepage = "https://${goPackagePath}"; maintainers = with maintainers; [ cryptix ]; diff --git a/nixpkgs/pkgs/development/tools/go-langserver/default.nix b/nixpkgs/pkgs/development/tools/go-langserver/default.nix index c6a0dcc0d9da..fdefd6b0178b 100644 --- a/nixpkgs/pkgs/development/tools/go-langserver/default.nix +++ b/nixpkgs/pkgs/development/tools/go-langserver/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "go-langserver"; @@ -14,7 +14,7 @@ buildGoPackage rec { sha256 = "1wv7xf81s3qi8xydxjkkp8vacdzrq8sbj04346fz73nsn85z0sgp"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A Go language server protocol server"; homepage = "https://github.com/sourcegraph/go-langserver"; license = licenses.mit; diff --git a/nixpkgs/pkgs/development/tools/go-migrate/default.nix b/nixpkgs/pkgs/development/tools/go-migrate/default.nix index 3a424014ec33..1786bfe5f0f9 100644 --- a/nixpkgs/pkgs/development/tools/go-migrate/default.nix +++ b/nixpkgs/pkgs/development/tools/go-migrate/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ lib, stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "go-migrate"; @@ -15,7 +15,7 @@ buildGoModule rec { subPackages = [ "cmd/migrate" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/golang-migrate/migrate"; description = "Database migrations. CLI and Golang library"; maintainers = with maintainers; [ offline ]; diff --git a/nixpkgs/pkgs/development/tools/go-minimock/default.nix b/nixpkgs/pkgs/development/tools/go-minimock/default.nix index ed4374e77640..3131fc59b414 100644 --- a/nixpkgs/pkgs/development/tools/go-minimock/default.nix +++ b/nixpkgs/pkgs/development/tools/go-minimock/default.nix @@ -11,6 +11,10 @@ buildGoModule rec { sha256 = "0r0krbwvx5w1z0yv2qqi92irbsfhkvwvaigy350cvcz9gmcppj4h"; }; + buildFlagsArray = [ + "-ldflags=-s -w -X main.version=${version}" + ]; + vendorSha256 = "1macwm6hybjinwnx62v146yxydcn5k5r587nxwkf4ffy76s2m3jc"; doCheck = true; diff --git a/nixpkgs/pkgs/development/tools/go-motion/default.nix b/nixpkgs/pkgs/development/tools/go-motion/default.nix index 824668055b1d..9ece650f0cb2 100644 --- a/nixpkgs/pkgs/development/tools/go-motion/default.nix +++ b/nixpkgs/pkgs/development/tools/go-motion/default.nix @@ -9,7 +9,7 @@ buildGoPackage rec { rev = "218875ebe23806e7af82f3b5b14bb3355534f679"; goPackagePath = "github.com/fatih/motion"; - excludedPackages = ''testdata''; + excludedPackages = "testdata"; src = fetchFromGitHub { inherit rev; diff --git a/nixpkgs/pkgs/development/tools/go-outline/default.nix b/nixpkgs/pkgs/development/tools/go-outline/default.nix index f10ee426c080..d30d5c30f3a1 100644 --- a/nixpkgs/pkgs/development/tools/go-outline/default.nix +++ b/nixpkgs/pkgs/development/tools/go-outline/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "go-outline"; @@ -18,7 +18,7 @@ buildGoPackage rec { meta = { description = "Utility to extract JSON representation of declarations from a Go source file"; homepage = "https://github.com/ramya-rao-a/go-outline"; - maintainers = with stdenv.lib.maintainers; [ vdemeester ]; - license = stdenv.lib.licenses.mit; + maintainers = with lib.maintainers; [ vdemeester ]; + license = lib.licenses.mit; }; } diff --git a/nixpkgs/pkgs/development/tools/go-protobuf/default.nix b/nixpkgs/pkgs/development/tools/go-protobuf/default.nix index c5e9af3e7bbf..0187552d8445 100644 --- a/nixpkgs/pkgs/development/tools/go-protobuf/default.nix +++ b/nixpkgs/pkgs/development/tools/go-protobuf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ lib, stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "go-protobuf"; @@ -15,7 +15,7 @@ buildGoModule rec { doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/golang/protobuf"; description = " Go bindings for protocol buffer"; maintainers = with maintainers; [ lewo ]; diff --git a/nixpkgs/pkgs/development/tools/go-repo-root/default.nix b/nixpkgs/pkgs/development/tools/go-repo-root/default.nix index 3392a19b6360..25fc87f8985d 100644 --- a/nixpkgs/pkgs/development/tools/go-repo-root/default.nix +++ b/nixpkgs/pkgs/development/tools/go-repo-root/default.nix @@ -1,8 +1,8 @@ -{ stdenv, buildGoPackage, fetchgit }: +{ lib, stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { pname = "go-repo-root"; - version = "20140911-${stdenv.lib.strings.substring 0 7 rev}"; + version = "20140911-${lib.strings.substring 0 7 rev}"; rev = "90041e5c7dc634651549f96814a452f4e0e680f9"; goPackagePath = "github.com/cstrahan/go-repo-root"; diff --git a/nixpkgs/pkgs/development/tools/go-swagger/default.nix b/nixpkgs/pkgs/development/tools/go-swagger/default.nix index 7f0a1a50b6d5..1515dae3391d 100644 --- a/nixpkgs/pkgs/development/tools/go-swagger/default.nix +++ b/nixpkgs/pkgs/development/tools/go-swagger/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "go-swagger"; - version = "0.25.0"; + version = "0.26.0"; src = fetchFromGitHub { owner = "go-swagger"; repo = pname; rev = "v${version}"; - sha256 = "05zyja58ff0k4fsfmb1j8q5p7lysi78m7jklrzz2xv8ianifkfbg"; + sha256 = "sha256-mBBjZRjaD1m6sIKR1/MRAKW25bGVNihxBwQMbw/lby4="; }; - vendorSha256 = "0vvr167spwk7whqzdp5vd8sm0qwc5g3namm4iqw3vff2pifjgs40"; + vendorSha256 = "sha256-Am0ypcViUcAcf96qv5qE7K3FvQuQs1XlpIqZf2upWyc="; doCheck = false; diff --git a/nixpkgs/pkgs/development/tools/go-symbols/default.nix b/nixpkgs/pkgs/development/tools/go-symbols/default.nix index 1e2b63ba154f..3f41007716e7 100644 --- a/nixpkgs/pkgs/development/tools/go-symbols/default.nix +++ b/nixpkgs/pkgs/development/tools/go-symbols/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "go-symbols"; @@ -17,7 +17,7 @@ buildGoPackage rec { meta = { description = "A utility for extracting a JSON representation of the package symbols from a go source tree"; homepage = "https://github.com/acroca/go-symbols"; - maintainers = with stdenv.lib.maintainers; [ vdemeester ]; - license = stdenv.lib.licenses.mit; + maintainers = with lib.maintainers; [ vdemeester ]; + license = lib.licenses.mit; }; } diff --git a/nixpkgs/pkgs/development/tools/go-tools/default.nix b/nixpkgs/pkgs/development/tools/go-tools/default.nix index 3d3c9db9a1eb..57e836d8f4ed 100644 --- a/nixpkgs/pkgs/development/tools/go-tools/default.nix +++ b/nixpkgs/pkgs/development/tools/go-tools/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "go-tools"; - version = "2020.2"; + version = "2020.2.1"; src = fetchFromGitHub { owner = "dominikh"; repo = "go-tools"; rev = version; - sha256 = "1qqpr481rx6n75xp1racsjjyn2fa8f28pcb0r9kd56qq890h3qgj"; + sha256 = "0a1a4dhz33grwg892436bjhgp8sygrg8yhdhy8dh6i3l6n9dalfh"; }; - vendorSha256 = "1axci0l7pymy66j6lilm49ksrwp7dvnj5krai2kvy96n3arcnsvq"; + vendorSha256 = "081p008sb3lkc8j6sa6n42qi04za4a631kihrd4ca6aigwkgl3ak"; doCheck = false; diff --git a/nixpkgs/pkgs/development/tools/go2nix/default.nix b/nixpkgs/pkgs/development/tools/go2nix/default.nix index 300f82ee5486..bcd1f56f5256 100644 --- a/nixpkgs/pkgs/development/tools/go2nix/default.nix +++ b/nixpkgs/pkgs/development/tools/go2nix/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, go-bindata, gotools, nix-prefetch-git, git, makeWrapper, +{ lib, stdenv, buildGoPackage, go-bindata, gotools, nix-prefetch-git, git, makeWrapper, fetchFromGitHub }: buildGoPackage rec { @@ -21,7 +21,7 @@ buildGoPackage rec { nativeBuildInputs = [ go-bindata gotools makeWrapper ]; - preBuild = ''go generate ./...''; + preBuild = "go generate ./..."; postInstall = '' wrapProgram $out/bin/go2nix \ @@ -36,7 +36,7 @@ buildGoPackage rec { doCheck = false; # tries to access the net - meta = with stdenv.lib; { + meta = with lib; { description = "Go apps packaging for Nix"; homepage = "https://github.com/kamilchm/go2nix"; license = licenses.mit; diff --git a/nixpkgs/pkgs/development/tools/goa/default.nix b/nixpkgs/pkgs/development/tools/goa/default.nix index 6a373099a01b..63322b6d3639 100644 --- a/nixpkgs/pkgs/development/tools/goa/default.nix +++ b/nixpkgs/pkgs/development/tools/goa/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "goa"; @@ -16,7 +16,7 @@ buildGoPackage rec { goDeps = ./deps.nix; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://goa.design"; description = "A framework for building microservices in Go using a unique design-first approach"; license = licenses.mit; diff --git a/nixpkgs/pkgs/development/tools/gocode-gomod/default.nix b/nixpkgs/pkgs/development/tools/gocode-gomod/default.nix index 01ee2931c998..995bd3102cc0 100644 --- a/nixpkgs/pkgs/development/tools/gocode-gomod/default.nix +++ b/nixpkgs/pkgs/development/tools/gocode-gomod/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ lib, stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "gocode-gomod"; @@ -9,7 +9,7 @@ buildGoModule rec { # standard packages. allowGoReference = true; - excludedPackages = ''internal/suggest/testdata''; + excludedPackages = "internal/suggest/testdata"; src = fetchFromGitHub { owner = "stamblerre"; @@ -24,7 +24,7 @@ buildGoModule rec { mv $out/bin/gocode $out/bin/gocode-gomod ''; - meta = with stdenv.lib; { + meta = with lib; { description = "An autocompletion daemon for the Go programming language"; longDescription = '' Gocode is a helper tool which is intended to be integrated with your diff --git a/nixpkgs/pkgs/development/tools/gocode/default.nix b/nixpkgs/pkgs/development/tools/gocode/default.nix index f38d06b34c61..9bed4073b2b3 100644 --- a/nixpkgs/pkgs/development/tools/gocode/default.nix +++ b/nixpkgs/pkgs/development/tools/gocode/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "gocode-unstable"; @@ -6,7 +6,7 @@ buildGoPackage rec { rev = "4acdcbdea79de6b3dee1c637eca5cbea0fdbe37c"; goPackagePath = "github.com/mdempsky/gocode"; - excludedPackages = ''internal/suggest/testdata''; + excludedPackages = "internal/suggest/testdata"; # we must allow references to the original `go` package, # because `gocode` needs to dig into $GOROOT to provide completions for the @@ -23,7 +23,7 @@ buildGoPackage rec { goDeps = ./deps.nix; - meta = with stdenv.lib; { + meta = with lib; { description = "An autocompletion daemon for the Go programming language"; longDescription = '' Gocode is a helper tool which is intended to be integrated with your diff --git a/nixpkgs/pkgs/development/tools/goconvey/default.nix b/nixpkgs/pkgs/development/tools/goconvey/default.nix index 173da3ff29dc..dcec045e5ebc 100644 --- a/nixpkgs/pkgs/development/tools/goconvey/default.nix +++ b/nixpkgs/pkgs/development/tools/goconvey/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "goconvey"; @@ -19,7 +19,7 @@ buildGoPackage rec { meta = { description = "Go testing in the browser. Integrates with `go test`. Write behavioral tests in Go"; homepage = "https://github.com/smartystreets/goconvey"; - maintainers = with stdenv.lib.maintainers; [ vdemeester ]; - license = stdenv.lib.licenses.mit; + maintainers = with lib.maintainers; [ vdemeester ]; + license = lib.licenses.mit; }; } diff --git a/nixpkgs/pkgs/development/tools/godef/default.nix b/nixpkgs/pkgs/development/tools/godef/default.nix index c8149ecc82dd..6d4f40ba6bca 100644 --- a/nixpkgs/pkgs/development/tools/godef/default.nix +++ b/nixpkgs/pkgs/development/tools/godef/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ lib, stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "godef"; @@ -21,7 +21,7 @@ buildGoModule rec { meta = { description = "Print where symbols are defined in Go source code"; homepage = "https://github.com/rogpeppe/godef/"; - maintainers = with stdenv.lib.maintainers; [ vdemeester rvolosatovs ]; - license = stdenv.lib.licenses.bsd3; + maintainers = with lib.maintainers; [ vdemeester rvolosatovs ]; + license = lib.licenses.bsd3; }; } diff --git a/nixpkgs/pkgs/development/tools/godot/default.nix b/nixpkgs/pkgs/development/tools/godot/default.nix index 492430cc7c70..217717d3e7d7 100644 --- a/nixpkgs/pkgs/development/tools/godot/default.nix +++ b/nixpkgs/pkgs/development/tools/godot/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, scons, pkgconfig, libX11, libXcursor +{ stdenv, lib, fetchFromGitHub, scons, pkg-config, libX11, libXcursor , libXinerama, libXrandr, libXrender, libpulseaudio ? null , libXi ? null, libXext, libXfixes, freetype, openssl , alsaLib, libGLU, zlib, yasm ? null }: @@ -19,7 +19,7 @@ in stdenv.mkDerivation rec { sha256 = "19vrp5lhyvxbm6wjxzn28sn3i0s8j08ca7nani8l1nrhvlc8wi0v"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ scons libX11 libXcursor libXinerama libXrandr libXrender libXi libXext libXfixes freetype openssl alsaLib libpulseaudio @@ -61,8 +61,8 @@ in stdenv.mkDerivation rec { meta = { homepage = "https://godotengine.org"; description = "Free and Open Source 2D and 3D game engine"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; platforms = [ "i686-linux" "x86_64-linux" ]; - maintainers = [ stdenv.lib.maintainers.twey ]; + maintainers = [ lib.maintainers.twey ]; }; } diff --git a/nixpkgs/pkgs/development/tools/godot/headless.nix b/nixpkgs/pkgs/development/tools/godot/headless.nix index 0ae28b774fbc..20d3b48f2fd5 100644 --- a/nixpkgs/pkgs/development/tools/godot/headless.nix +++ b/nixpkgs/pkgs/development/tools/godot/headless.nix @@ -1,4 +1,4 @@ -{ godot, stdenv }: +{ godot, lib, stdenv }: godot.overrideAttrs (oldAttrs: rec { pname = "godot-headless"; sconsFlags = "target=release_debug platform=server tools=yes"; @@ -14,5 +14,5 @@ godot.overrideAttrs (oldAttrs: rec { ''; meta.description = "Free and Open Source 2D and 3D game engine (headless build)"; - meta.maintainers = with stdenv.lib.maintainers; [ twey yusdacra ]; + meta.maintainers = with lib.maintainers; [ twey yusdacra ]; }) diff --git a/nixpkgs/pkgs/development/tools/godot/server.nix b/nixpkgs/pkgs/development/tools/godot/server.nix index 48f21b796c36..6ce347355e3b 100644 --- a/nixpkgs/pkgs/development/tools/godot/server.nix +++ b/nixpkgs/pkgs/development/tools/godot/server.nix @@ -1,4 +1,4 @@ -{ godot, stdenv }: +{ godot, lib, stdenv }: godot.overrideAttrs (oldAttrs: rec { pname = "godot-server"; sconsFlags = "target=release platform=server tools=no"; @@ -14,5 +14,5 @@ godot.overrideAttrs (oldAttrs: rec { ''; meta.description = "Free and Open Source 2D and 3D game engine (server build)"; - meta.maintainers = with stdenv.lib.maintainers; [ twey yusdacra ]; + meta.maintainers = with lib.maintainers; [ twey yusdacra ]; }) diff --git a/nixpkgs/pkgs/development/tools/gofumpt/default.nix b/nixpkgs/pkgs/development/tools/gofumpt/default.nix index 82ae3d4bb7b8..e55cea0895be 100644 --- a/nixpkgs/pkgs/development/tools/gofumpt/default.nix +++ b/nixpkgs/pkgs/development/tools/gofumpt/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gofumpt"; - version = "2020-10-27"; + version = "0.1.0"; src = fetchFromGitHub { owner = "mvdan"; repo = pname; - rev = "85d5401eb0f699d87b0d6c949dd4c0d5fb23f2e0"; - sha256 = "0n72d7p4y89kfilcdx3qb63qy6xm8dyp6q8s8954wrkm2wlhkwiy"; + rev = "v${version}"; + sha256 = "0xln0a5n8na3p6b7l8im3bh4ys5rr3k413ibzk8mnp471f5h1558"; }; - vendorSha256 = "1s546hp4ngzqvfx7dbd43k7b94z0mvndgdkndh4ypkkl3rpd9kkz"; + vendorSha256 = "05qdwz1icl8in0j94gx9pgplidm2v29hsn4kgg5gw35bsbn1c7id"; doCheck = false; diff --git a/nixpkgs/pkgs/development/tools/gojsontoyaml/default.nix b/nixpkgs/pkgs/development/tools/gojsontoyaml/default.nix index ed8cc3587c17..0f772134a0e2 100644 --- a/nixpkgs/pkgs/development/tools/gojsontoyaml/default.nix +++ b/nixpkgs/pkgs/development/tools/gojsontoyaml/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ lib, stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "gojsontoyaml"; @@ -13,7 +13,7 @@ buildGoModule rec { vendorSha256 = null; - meta = with stdenv.lib; { + meta = with lib; { description = "Simply tool to convert json to yaml written in Go"; homepage = "https://github.com/brancz/gojsontoyaml"; license = licenses.mit; diff --git a/nixpkgs/pkgs/development/tools/golangci-lint/default.nix b/nixpkgs/pkgs/development/tools/golangci-lint/default.nix index ddcbbb127585..2679d56ec64d 100644 --- a/nixpkgs/pkgs/development/tools/golangci-lint/default.nix +++ b/nixpkgs/pkgs/development/tools/golangci-lint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "golangci-lint"; - version = "1.33.0"; + version = "1.35.2"; src = fetchFromGitHub { owner = "golangci"; repo = "golangci-lint"; rev = "v${version}"; - sha256 = "1yqq5jai0npkjzfk2h121nv3pgqfqi5c3vs22wyv6qwnlia97yin"; + sha256 = "sha256-UntDMiznrHZsaBFTcnNhnh59j+yY1zdpWrFNlalxTDA="; }; - vendorSha256 = "1kmsfsa5z41mjxi15a4zra1qhskm5pjcfbk09c99xbv27pin5yrj"; + vendorSha256 = "sha256-6YacyQqTq9WQk8PgvoIxflh6HRmv5xgxtWq6HrprJis="; doCheck = false; diff --git a/nixpkgs/pkgs/development/tools/golint/default.nix b/nixpkgs/pkgs/development/tools/golint/default.nix index 284bb32f89e8..1f75384f3387 100644 --- a/nixpkgs/pkgs/development/tools/golint/default.nix +++ b/nixpkgs/pkgs/development/tools/golint/default.nix @@ -1,8 +1,8 @@ -{ stdenv, buildGoPackage, fetchgit }: +{ lib, stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { pname = "lint"; - version = "20181026-${stdenv.lib.strings.substring 0 7 rev}"; + version = "20181026-${lib.strings.substring 0 7 rev}"; rev = "c67002cb31c3a748b7688c27f20d8358b4193582"; goPackagePath = "golang.org/x/lint"; @@ -20,7 +20,7 @@ buildGoPackage rec { goDeps = ./deps.nix; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://golang.org"; description = "Linter for Go source code"; license = licenses.bsd3; diff --git a/nixpkgs/pkgs/development/tools/gomodifytags/default.nix b/nixpkgs/pkgs/development/tools/gomodifytags/default.nix index 70bbc635cc1a..650f1b89f30e 100644 --- a/nixpkgs/pkgs/development/tools/gomodifytags/default.nix +++ b/nixpkgs/pkgs/development/tools/gomodifytags/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ lib, stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "gomodifytags"; @@ -18,7 +18,7 @@ buildGoModule rec { meta = { description = "Go tool to modify struct field tags"; homepage = "https://github.com/fatih/gomodifytags"; - maintainers = with stdenv.lib.maintainers; [ vdemeester ]; - license = stdenv.lib.licenses.bsd3; + maintainers = with lib.maintainers; [ vdemeester ]; + license = lib.licenses.bsd3; }; } diff --git a/nixpkgs/pkgs/development/tools/gomplate/default.nix b/nixpkgs/pkgs/development/tools/gomplate/default.nix index 2bef9d53ff9e..f8d6553f74d8 100644 --- a/nixpkgs/pkgs/development/tools/gomplate/default.nix +++ b/nixpkgs/pkgs/development/tools/gomplate/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ lib, stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "gomplate"; @@ -26,7 +26,7 @@ buildGoModule rec { "-X github.com/${owner}/${pname}/v3/version.Version=${rev}" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A flexible commandline tool for template rendering"; homepage = "https://gomplate.ca/"; maintainers = with maintainers; [ ris jlesquembre ]; diff --git a/nixpkgs/pkgs/development/tools/google-app-engine-go-sdk/default.nix b/nixpkgs/pkgs/development/tools/google-app-engine-go-sdk/default.nix index 485b2c3625fb..4d572e070e76 100644 --- a/nixpkgs/pkgs/development/tools/google-app-engine-go-sdk/default.nix +++ b/nixpkgs/pkgs/development/tools/google-app-engine-go-sdk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, python3Packages, makeWrapper }: +{ lib, stdenv, fetchzip, python3Packages, makeWrapper }: with python3Packages; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Google App Engine SDK for Go"; version = version; homepage = "https://cloud.google.com/appengine/docs/go/"; diff --git a/nixpkgs/pkgs/development/tools/gopkgs/default.nix b/nixpkgs/pkgs/development/tools/gopkgs/default.nix index 8d26ca7eb448..e4a72cb27a17 100644 --- a/nixpkgs/pkgs/development/tools/gopkgs/default.nix +++ b/nixpkgs/pkgs/development/tools/gopkgs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ lib, stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "gopkgs"; @@ -20,7 +20,7 @@ buildGoModule rec { meta = { description = "Tool to get list available Go packages"; homepage = "https://github.com/uudashr/gopkgs"; - maintainers = with stdenv.lib.maintainers; [ vdemeester ]; - license = stdenv.lib.licenses.mit; + maintainers = with lib.maintainers; [ vdemeester ]; + license = lib.licenses.mit; }; } diff --git a/nixpkgs/pkgs/development/tools/gopkgs/deps.nix b/nixpkgs/pkgs/development/tools/gopkgs/deps.nix index 715c7bbbc824..e813a5b22564 100644 --- a/nixpkgs/pkgs/development/tools/gopkgs/deps.nix +++ b/nixpkgs/pkgs/development/tools/gopkgs/deps.nix @@ -18,4 +18,4 @@ sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5"; }; } -] \ No newline at end of file +] diff --git a/nixpkgs/pkgs/development/tools/gopls/default.nix b/nixpkgs/pkgs/development/tools/gopls/default.nix index 49b8c8a3306f..7a7c98e28940 100644 --- a/nixpkgs/pkgs/development/tools/gopls/default.nix +++ b/nixpkgs/pkgs/development/tools/gopls/default.nix @@ -1,24 +1,24 @@ -{ stdenv, buildGoModule, fetchgit }: +{ lib, stdenv, buildGoModule, fetchgit }: buildGoModule rec { pname = "gopls"; - version = "0.5.3"; + version = "0.6.2"; src = fetchgit { rev = "gopls/v${version}"; url = "https://go.googlesource.com/tools"; - sha256 = "04dkrvk5190kyfa9swxpl0m3xq9g90qp8j7yxhi87wyb8giqbll2"; + sha256 = "0hbfxdsbfz044vw8zp223ni6m7gcwqpff4xpjiqmihhgga5849lf"; }; modRoot = "gopls"; - vendorSha256 = "0ml8n6qnq9nprn7kv138qy0i2q8qawzd0lhh3v2qw39j0aj5fb7z"; + vendorSha256 = "0r9bffgi9ainqrl4kraqy71rgwdfcbqmv3srs12h3xvj0w5ya5rz"; doCheck = false; # Only build gopls, and not the integration tests or documentation generator. subPackages = [ "." ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Official language server for the Go language"; homepage = "https://github.com/golang/tools/tree/master/gopls"; license = licenses.bsd3; diff --git a/nixpkgs/pkgs/development/tools/gore/default.nix b/nixpkgs/pkgs/development/tools/gore/default.nix index ca9c8d9eec0f..30d7cd1ef336 100644 --- a/nixpkgs/pkgs/development/tools/gore/default.nix +++ b/nixpkgs/pkgs/development/tools/gore/default.nix @@ -1,21 +1,21 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ lib, stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "gore"; - version = "0.5.0"; + version = "0.5.2"; src = fetchFromGitHub { owner = "motemen"; repo = pname; rev = "v${version}"; - sha256 = "61Hn3Vs4BZtAX8WNJlUeodvEWvwLo+lXKsc8JxRwOE4="; + sha256 = "sha256-oiaZvoCxA69slNb3LArLJfaqzfQ1YImxLuQHzW5tibo="; }; - vendorSha256 = "3bq6sRKS5dq7WCPpKGm2q5gFajthR3zhrTFGve9zXhY="; + vendorSha256 = "sha256-vJG7sc+ngagtrYvTwO3OrCSFUgAA7zhaXHkU97nIhcY="; doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Yet another Go REPL that works nicely"; homepage = "https://github.com/motemen/gore"; license = licenses.mit; diff --git a/nixpkgs/pkgs/development/tools/gosec/default.nix b/nixpkgs/pkgs/development/tools/gosec/default.nix index 44862bb3311d..69d74496e615 100644 --- a/nixpkgs/pkgs/development/tools/gosec/default.nix +++ b/nixpkgs/pkgs/development/tools/gosec/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ lib, stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "gosec"; @@ -19,7 +19,7 @@ buildGoModule rec { buildFlagsArray = [ "-ldflags=-s -w -X main.Version=${version} -X main.GitTag=${src.rev} -X main.BuildDate=unknown" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/securego/gosec"; description = "Golang security checker"; license = licenses.asl20; diff --git a/nixpkgs/pkgs/development/tools/gotags/default.nix b/nixpkgs/pkgs/development/tools/gotags/default.nix index 5499a22ec01b..ea40bd0e6fe1 100644 --- a/nixpkgs/pkgs/development/tools/gotags/default.nix +++ b/nixpkgs/pkgs/development/tools/gotags/default.nix @@ -1,8 +1,8 @@ -{ stdenv, buildGoPackage, fetchgit }: +{ lib, stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { pname = "gotags"; - version = "20150803-${stdenv.lib.strings.substring 0 7 rev}"; + version = "20150803-${lib.strings.substring 0 7 rev}"; rev = "be986a34e20634775ac73e11a5b55916085c48e7"; goPackagePath = "github.com/jstemmer/gotags"; diff --git a/nixpkgs/pkgs/development/tools/gotests/default.nix b/nixpkgs/pkgs/development/tools/gotests/default.nix index 43f221bd3241..87a93abee8ef 100644 --- a/nixpkgs/pkgs/development/tools/gotests/default.nix +++ b/nixpkgs/pkgs/development/tools/gotests/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "gotests"; @@ -19,7 +19,7 @@ buildGoPackage rec { meta = { description = "Generate Go tests from your source code"; homepage = "https://github.com/cweill/gotests"; - maintainers = with stdenv.lib.maintainers; [ vdemeester ]; - license = stdenv.lib.licenses.asl20; + maintainers = with lib.maintainers; [ vdemeester ]; + license = lib.licenses.asl20; }; } diff --git a/nixpkgs/pkgs/development/tools/gotestsum/default.nix b/nixpkgs/pkgs/development/tools/gotestsum/default.nix index 8ccc1b593fd7..ece194f00030 100644 --- a/nixpkgs/pkgs/development/tools/gotestsum/default.nix +++ b/nixpkgs/pkgs/development/tools/gotestsum/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchFromGitHub, buildGoModule }: +{ lib, stdenv, fetchFromGitHub, buildGoModule }: buildGoModule rec { pname = "gotestsum"; - version = "0.6.0"; + version = "1.6.1"; src = fetchFromGitHub { owner = "gotestyourself"; repo = "gotestsum"; rev = "v${version}"; - sha256 = "0w0s2qvwnb69s18gvkkbwsx9zh7yi8ksnnrfpl8az8sybk6m1iaz"; + sha256 = "sha256-eJxrdR3JYqF+GexcwnyHV4xO75stEDNFzxDtky7PVc8="; }; - vendorSha256 = "09cifc69z1ashjw1mqgbi0gh90h2sypqyl0jswxxcqk89ibgy3am"; + vendorSha256 = "sha256-VQ3/VkxoYtY71xJQj6/XAoIEH4jr4Rq4hFqFnwxzkSU="; doCheck = false; @@ -19,7 +19,7 @@ buildGoModule rec { subPackages = [ "." ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/gotestyourself/gotestsum"; description = "A human friendly `go test` runner"; platforms = platforms.linux ++ platforms.darwin; diff --git a/nixpkgs/pkgs/development/tools/gotools/default.nix b/nixpkgs/pkgs/development/tools/gotools/default.nix index 606092e8cdcb..7ca3486a503a 100644 --- a/nixpkgs/pkgs/development/tools/gotools/default.nix +++ b/nixpkgs/pkgs/development/tools/gotools/default.nix @@ -1,14 +1,14 @@ -{ stdenv, go, buildGoModule, fetchgit }: +{ lib, stdenv, buildGoModule, fetchgit }: buildGoModule rec { pname = "gotools-unstable"; - version = "2020-10-27"; - rev = "eafbe7b904eb2418efc832e36ac634dc09084f10"; + version = "2021-01-13"; + rev = "8b4aab62c064010e8e875d2e5a8e63a96fefc87d"; src = fetchgit { inherit rev; url = "https://go.googlesource.com/tools"; - sha256 = "0884znfbm44f4ddjkm0g7qg2a257kwzv1ismd2m225f3c69n3mdg"; + sha256 = "1cmnm9fl2a6hiplj8s6x0l3czcw4xh3j3lvzbgccnp1l8kz8q2vm"; }; # The gopls folder contains a Go submodule which causes a build failure. @@ -40,7 +40,7 @@ buildGoModule rec { ''; excludedPackages = "\\(" - + stdenv.lib.concatStringsSep "\\|" ([ "testdata" ] ++ stdenv.lib.optionals (stdenv.lib.versionAtLeast go.meta.branch "1.5") [ "vet" "cover" ]) + + lib.concatStringsSep "\\|" ([ "testdata" "vet" "cover" ]) + "\\)"; # Set GOTOOLDIR for derivations adding this to buildInputs diff --git a/nixpkgs/pkgs/development/tools/govendor/default.nix b/nixpkgs/pkgs/development/tools/govendor/default.nix index 804a9bf043ed..edd9b577be4c 100644 --- a/nixpkgs/pkgs/development/tools/govendor/default.nix +++ b/nixpkgs/pkgs/development/tools/govendor/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "govendor"; @@ -13,7 +13,7 @@ buildGoPackage rec { sha256 = "0g02cd25chyijg0rzab4xr627pkvk5k33mscd6r0gf1v5xvadcfq"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/kardianos/govendor"; description = "Go vendor tool that works with the standard vendor file"; license = licenses.bsd3; diff --git a/nixpkgs/pkgs/development/tools/govers/default.nix b/nixpkgs/pkgs/development/tools/govers/default.nix index ebce368ea9f8..cac76daa6fc3 100644 --- a/nixpkgs/pkgs/development/tools/govers/default.nix +++ b/nixpkgs/pkgs/development/tools/govers/default.nix @@ -1,8 +1,8 @@ -{ stdenv, buildGoPackage, fetchgit }: +{ lib, stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { pname = "govers"; - version = "20160623-${stdenv.lib.strings.substring 0 7 rev}"; + version = "20160623-${lib.strings.substring 0 7 rev}"; rev = "77fd787551fc5e7ae30696e009e334d52d2d3a43"; goPackagePath = "github.com/rogpeppe/govers"; diff --git a/nixpkgs/pkgs/development/tools/gox/default.nix b/nixpkgs/pkgs/development/tools/gox/default.nix index 34e7d338318c..3deb73acb441 100644 --- a/nixpkgs/pkgs/development/tools/gox/default.nix +++ b/nixpkgs/pkgs/development/tools/gox/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "gox"; @@ -13,7 +13,7 @@ buildGoPackage rec { sha256 = "0mkh81hd7kn45dz7b6yhzqsg2mvg1g6pwx89jjigxrnqhyg9vrl7"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/mitchellh/gox"; description = "A dead simple, no frills Go cross compile tool"; license = licenses.mpl20; diff --git a/nixpkgs/pkgs/development/tools/gpp/default.nix b/nixpkgs/pkgs/development/tools/gpp/default.nix index ee15df1a9f6f..9e49b0c0284f 100644 --- a/nixpkgs/pkgs/development/tools/gpp/default.nix +++ b/nixpkgs/pkgs/development/tools/gpp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation { pname = "gpp"; @@ -16,7 +16,7 @@ stdenv.mkDerivation { installCheckPhase = "$out/bin/gpp --help"; doInstallCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "General-purpose preprocessor with customizable syntax"; homepage = "https://logological.org/gpp"; license = licenses.lgpl3; diff --git a/nixpkgs/pkgs/development/tools/gron/default.nix b/nixpkgs/pkgs/development/tools/gron/default.nix index e0d2d3d1498f..6d182b0b5f50 100644 --- a/nixpkgs/pkgs/development/tools/gron/default.nix +++ b/nixpkgs/pkgs/development/tools/gron/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "gron"; @@ -16,7 +16,7 @@ buildGoPackage rec { goDeps = ./deps.nix; - meta = with stdenv.lib; { + meta = with lib; { description = "Make JSON greppable!"; longDescription = '' gron transforms JSON into discrete assignments to make it easier to grep diff --git a/nixpkgs/pkgs/development/tools/gtk-mac-bundler/default.nix b/nixpkgs/pkgs/development/tools/gtk-mac-bundler/default.nix index df21f414ecb8..c4ac76f46123 100644 --- a/nixpkgs/pkgs/development/tools/gtk-mac-bundler/default.nix +++ b/nixpkgs/pkgs/development/tools/gtk-mac-bundler/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; installPhase = '' - mkdir -p $out/bin + mkdir -p $out/bin substitute gtk-mac-bundler.in $out/bin/gtk-mac-bundler \ --subst-var-by PATH $out/share chmod a+x $out/bin/gtk-mac-bundler diff --git a/nixpkgs/pkgs/development/tools/guile/g-wrap/default.nix b/nixpkgs/pkgs/development/tools/guile/g-wrap/default.nix index 15233979e158..6bb80306e68e 100644 --- a/nixpkgs/pkgs/development/tools/guile/g-wrap/default.nix +++ b/nixpkgs/pkgs/development/tools/guile/g-wrap/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, guile, guile-lib, libffi, pkgconfig, glib }: +{ fetchurl, lib, stdenv, guile, guile-lib, libffi, pkg-config, glib }: stdenv.mkDerivation rec { pname = "g-wrap"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0ak0bha37dfpj9kmyw1r8fj8nva639aw5xr66wr5gd3l1rqf5xhg"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; # Note: Glib support is optional, but it's quite useful (e.g., it's used by # Guile-GNOME). @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "A wrapper generator for Guile"; longDescription = '' G-Wrap is a tool (and Guile library) for generating function wrappers for diff --git a/nixpkgs/pkgs/development/tools/guile/guile-lint/default.nix b/nixpkgs/pkgs/development/tools/guile/guile-lint/default.nix index b8efb30f5f17..6de9e48ae667 100644 --- a/nixpkgs/pkgs/development/tools/guile/guile-lint/default.nix +++ b/nixpkgs/pkgs/development/tools/guile/guile-lint/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, guile }: +{ lib, stdenv, fetchurl, guile }: stdenv.mkDerivation rec { pname = "guile-lint"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { doCheck = !stdenv.isDarwin; - meta = with stdenv.lib; { + meta = with lib; { description = "Checks syntax and semantics in a Guile program or module"; homepage = "https://user42.tuxfamily.org/guile-lint/index.html"; license = licenses.gpl3Plus; diff --git a/nixpkgs/pkgs/development/tools/halfempty/default.nix b/nixpkgs/pkgs/development/tools/halfempty/default.nix index c8c267f91872..5b96d338f52f 100644 --- a/nixpkgs/pkgs/development/tools/halfempty/default.nix +++ b/nixpkgs/pkgs/development/tools/halfempty/default.nix @@ -1,17 +1,17 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, glib, util-linux, scowl }: +{ lib, stdenv, fetchFromGitHub, pkg-config, glib, util-linux, scowl }: stdenv.mkDerivation rec { pname = "halfempty"; - version = "0.30"; + version = "0.40"; src = fetchFromGitHub { owner = "googleprojectzero"; repo = pname; rev = "v${version}"; - sha256 = "0838pw0ccjvlxmjygzrnppz1fx1a10vjzdgjbxgb4wgpqjr8v6vc"; + sha256 = "sha256-YGq6fneAMo2jCpLPrjzRJ0eeOsStKaK5L+lwQfqcfpY="; }; - nativeBuildInputs = [ pkgconfig util-linux ]; + nativeBuildInputs = [ pkg-config util-linux ]; buildInputs = [ glib ]; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/development/tools/haskell/dconf2nix/dconf2nix.nix b/nixpkgs/pkgs/development/tools/haskell/dconf2nix/dconf2nix.nix index 4d7dca12f8fc..02c4c96bd8e7 100644 --- a/nixpkgs/pkgs/development/tools/haskell/dconf2nix/dconf2nix.nix +++ b/nixpkgs/pkgs/development/tools/haskell/dconf2nix/dconf2nix.nix @@ -1,5 +1,5 @@ { mkDerivation, base, containers, fetchgit, hedgehog -, optparse-applicative, parsec, stdenv, template-haskell, text +, optparse-applicative, parsec, lib, stdenv, template-haskell, text }: mkDerivation { pname = "dconf2nix"; @@ -20,5 +20,5 @@ mkDerivation { base containers hedgehog parsec template-haskell text ]; description = "Convert dconf files to Nix, as expected by Home Manager"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; } diff --git a/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/default.nix b/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/default.nix index e33d731dae43..512aec84eead 100644 --- a/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/default.nix +++ b/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/default.nix @@ -2,21 +2,23 @@ , bytestring, containers, data-default, deepseq, directory, extra , fetchgit, filepath, floskell, fourmolu, ghc, ghc-boot-th , ghc-paths, ghcide, gitrev, hashable, haskell-lsp, hie-bios -, hls-explicit-imports-plugin, hls-hlint-plugin, hls-plugin-api -, hls-retrie-plugin, hls-tactics-plugin, hslogger, hspec -, hspec-core, lens, lsp-test, mtl, optparse-applicative +, hls-class-plugin, hls-eval-plugin, hls-explicit-imports-plugin +, hls-hlint-plugin, hls-plugin-api, hls-retrie-plugin +, hls-tactics-plugin, hslogger, hspec, hspec-core +, hspec-expectations, lens, lsp-test, mtl, optparse-applicative , optparse-simple, ormolu, process, regex-tdfa, safe-exceptions -, shake, stdenv, stm, stylish-haskell, tasty, tasty-ant-xml +, shake, lib, stdenv, stm, stylish-haskell, tasty, tasty-ant-xml , tasty-expected-failure, tasty-golden, tasty-hunit, tasty-rerun -, temporary, text, time, transformers, unordered-containers, yaml +, temporary, text, transformers, unordered-containers, with-utf8 +, yaml }: mkDerivation { pname = "haskell-language-server"; - version = "0.7.1.0"; + version = "0.8.0.0"; src = fetchgit { url = "https://github.com/haskell/haskell-language-server.git"; - sha256 = "0gkzvjx4dgf53yicinqjshlj80gznx5khb62i7g3kqjr85iy0raa"; - rev = "e4f677e1780fe85a02b99a09404a0a3c3ab5ce7c"; + sha256 = "0p6fqs07lajbi2g1wf4w3j5lvwknnk58n12vlg48cs4iz25gp588"; + rev = "eb58f13f7b8e4f9bc771af30ff9fd82dc4309ff5"; fetchSubmodules = true; }; isLibrary = true; @@ -29,22 +31,23 @@ mkDerivation { executableHaskellDepends = [ aeson base binary brittany bytestring containers deepseq directory extra filepath floskell fourmolu ghc ghc-boot-th ghc-paths ghcide - gitrev hashable haskell-lsp hie-bios hls-explicit-imports-plugin - hls-hlint-plugin hls-plugin-api hls-retrie-plugin - hls-tactics-plugin hslogger lens mtl optparse-applicative - optparse-simple ormolu process regex-tdfa safe-exceptions shake - stylish-haskell temporary text time transformers - unordered-containers + gitrev hashable haskell-lsp hie-bios hls-class-plugin + hls-eval-plugin hls-explicit-imports-plugin hls-hlint-plugin + hls-plugin-api hls-retrie-plugin hls-tactics-plugin hslogger lens + mtl optparse-applicative optparse-simple ormolu process regex-tdfa + safe-exceptions shake stylish-haskell temporary text transformers + unordered-containers with-utf8 ]; testHaskellDepends = [ aeson base blaze-markup bytestring containers data-default directory extra filepath haskell-lsp hie-bios hls-plugin-api - hslogger hspec hspec-core lens lsp-test process stm tasty - tasty-ant-xml tasty-expected-failure tasty-golden tasty-hunit - tasty-rerun temporary text transformers unordered-containers yaml + hslogger hspec hspec-core hspec-expectations lens lsp-test process + stm tasty tasty-ant-xml tasty-expected-failure tasty-golden + tasty-hunit tasty-rerun temporary text transformers + unordered-containers yaml ]; testToolDepends = [ ghcide ]; homepage = "https://github.com/haskell/haskell-language-server#readme"; description = "LSP server for GHC"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; } diff --git a/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-class-plugin.nix b/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-class-plugin.nix new file mode 100644 index 000000000000..c51689343903 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-class-plugin.nix @@ -0,0 +1,21 @@ +{ mkDerivation, aeson, base, containers, fetchgit, ghc +, ghc-exactprint, ghcide, haskell-lsp, hls-plugin-api, lens, shake +, lib, stdenv, text, transformers, unordered-containers +}: +mkDerivation { + pname = "hls-class-plugin"; + version = "0.1.0.0"; + src = fetchgit { + url = "https://github.com/haskell/haskell-language-server.git"; + sha256 = "0p6fqs07lajbi2g1wf4w3j5lvwknnk58n12vlg48cs4iz25gp588"; + rev = "eb58f13f7b8e4f9bc771af30ff9fd82dc4309ff5"; + fetchSubmodules = true; + }; + postUnpack = "sourceRoot+=/plugins/hls-class-plugin; echo source root reset to $sourceRoot"; + libraryHaskellDepends = [ + aeson base containers ghc ghc-exactprint ghcide haskell-lsp + hls-plugin-api lens shake text transformers unordered-containers + ]; + description = "Explicit imports plugin for Haskell Language Server"; + license = lib.licenses.asl20; +} diff --git a/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-eval-plugin.nix b/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-eval-plugin.nix new file mode 100644 index 000000000000..b5774ddcbfd3 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-eval-plugin.nix @@ -0,0 +1,27 @@ +{ mkDerivation, aeson, base, containers, deepseq, Diff, directory +, extra, fetchgit, filepath, ghc, ghc-boot-th, ghc-paths, ghcide +, hashable, haskell-lsp, haskell-lsp-types, hls-plugin-api +, parser-combinators, pretty-simple, QuickCheck, safe-exceptions +, shake, lib, stdenv, temporary, text, time, transformers +, unordered-containers +}: +mkDerivation { + pname = "hls-eval-plugin"; + version = "0.1.0.0"; + src = fetchgit { + url = "https://github.com/haskell/haskell-language-server.git"; + sha256 = "0p6fqs07lajbi2g1wf4w3j5lvwknnk58n12vlg48cs4iz25gp588"; + rev = "eb58f13f7b8e4f9bc771af30ff9fd82dc4309ff5"; + fetchSubmodules = true; + }; + postUnpack = "sourceRoot+=/plugins/hls-eval-plugin; echo source root reset to $sourceRoot"; + libraryHaskellDepends = [ + aeson base containers deepseq Diff directory extra filepath ghc + ghc-boot-th ghc-paths ghcide hashable haskell-lsp haskell-lsp-types + hls-plugin-api parser-combinators pretty-simple QuickCheck + safe-exceptions shake temporary text time transformers + unordered-containers + ]; + description = "Eval plugin for Haskell Language Server"; + license = lib.licenses.asl20; +} diff --git a/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-explicit-imports-plugin.nix b/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-explicit-imports-plugin.nix index 7c3b22cf1d0a..1c7d31004b6a 100644 --- a/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-explicit-imports-plugin.nix +++ b/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-explicit-imports-plugin.nix @@ -1,5 +1,5 @@ { mkDerivation, aeson, base, containers, deepseq, fetchgit, ghc -, ghcide, haskell-lsp-types, hls-plugin-api, shake, stdenv, text +, ghcide, haskell-lsp-types, hls-plugin-api, shake, lib, stdenv, text , unordered-containers }: mkDerivation { @@ -7,8 +7,8 @@ mkDerivation { version = "0.1.0.0"; src = fetchgit { url = "https://github.com/haskell/haskell-language-server.git"; - sha256 = "0gkzvjx4dgf53yicinqjshlj80gznx5khb62i7g3kqjr85iy0raa"; - rev = "e4f677e1780fe85a02b99a09404a0a3c3ab5ce7c"; + sha256 = "0p6fqs07lajbi2g1wf4w3j5lvwknnk58n12vlg48cs4iz25gp588"; + rev = "eb58f13f7b8e4f9bc771af30ff9fd82dc4309ff5"; fetchSubmodules = true; }; postUnpack = "sourceRoot+=/plugins/hls-explicit-imports-plugin; echo source root reset to $sourceRoot"; @@ -17,5 +17,5 @@ mkDerivation { hls-plugin-api shake text unordered-containers ]; description = "Explicit imports plugin for Haskell Language Server"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; } diff --git a/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-hlint-plugin.nix b/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-hlint-plugin.nix index 8bfcf034bd2b..4a90933d1e7f 100644 --- a/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-hlint-plugin.nix +++ b/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-hlint-plugin.nix @@ -2,7 +2,7 @@ , containers, data-default, deepseq, Diff, directory, extra , fetchgit, filepath, ghc, ghc-lib, ghc-lib-parser-ex, ghcide , hashable, haskell-lsp, hlint, hls-plugin-api, hslogger, lens -, regex-tdfa, shake, stdenv, temporary, text, transformers +, regex-tdfa, shake, lib, stdenv, temporary, text, transformers , unordered-containers }: mkDerivation { @@ -10,8 +10,8 @@ mkDerivation { version = "0.1.0.0"; src = fetchgit { url = "https://github.com/haskell/haskell-language-server.git"; - sha256 = "0gkzvjx4dgf53yicinqjshlj80gznx5khb62i7g3kqjr85iy0raa"; - rev = "e4f677e1780fe85a02b99a09404a0a3c3ab5ce7c"; + sha256 = "0p6fqs07lajbi2g1wf4w3j5lvwknnk58n12vlg48cs4iz25gp588"; + rev = "eb58f13f7b8e4f9bc771af30ff9fd82dc4309ff5"; fetchSubmodules = true; }; postUnpack = "sourceRoot+=/plugins/hls-hlint-plugin; echo source root reset to $sourceRoot"; @@ -22,5 +22,5 @@ mkDerivation { regex-tdfa shake temporary text transformers unordered-containers ]; description = "Hlint integration plugin with Haskell Language Server"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; } diff --git a/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-retrie-plugin.nix b/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-retrie-plugin.nix index 7a44903f9870..311a26633a5c 100644 --- a/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-retrie-plugin.nix +++ b/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-retrie-plugin.nix @@ -1,6 +1,6 @@ { mkDerivation, aeson, base, containers, deepseq, directory, extra , fetchgit, ghc, ghcide, hashable, haskell-lsp, haskell-lsp-types -, hls-plugin-api, retrie, safe-exceptions, shake, stdenv, text +, hls-plugin-api, retrie, safe-exceptions, shake, lib, stdenv, text , transformers, unordered-containers }: mkDerivation { @@ -8,8 +8,8 @@ mkDerivation { version = "0.1.0.0"; src = fetchgit { url = "https://github.com/haskell/haskell-language-server.git"; - sha256 = "0gkzvjx4dgf53yicinqjshlj80gznx5khb62i7g3kqjr85iy0raa"; - rev = "e4f677e1780fe85a02b99a09404a0a3c3ab5ce7c"; + sha256 = "0p6fqs07lajbi2g1wf4w3j5lvwknnk58n12vlg48cs4iz25gp588"; + rev = "eb58f13f7b8e4f9bc771af30ff9fd82dc4309ff5"; fetchSubmodules = true; }; postUnpack = "sourceRoot+=/plugins/hls-retrie-plugin; echo source root reset to $sourceRoot"; @@ -19,5 +19,5 @@ mkDerivation { shake text transformers unordered-containers ]; description = "Retrie integration plugin for Haskell Language Server"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; } diff --git a/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-tactics-plugin.nix b/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-tactics-plugin.nix index 326e8ce0cdf9..4f476431d9b7 100644 --- a/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-tactics-plugin.nix +++ b/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-tactics-plugin.nix @@ -2,7 +2,7 @@ , directory, extra, fetchgit, filepath, fingertree, generic-lens , ghc, ghc-boot-th, ghc-exactprint, ghc-source-gen, ghcide , haskell-lsp, hie-bios, hls-plugin-api, hspec, hspec-discover -, lens, mtl, QuickCheck, refinery, retrie, shake, stdenv, syb, text +, lens, mtl, QuickCheck, refinery, retrie, shake, lib, stdenv, syb, text , transformers }: mkDerivation { @@ -10,8 +10,8 @@ mkDerivation { version = "0.5.1.0"; src = fetchgit { url = "https://github.com/haskell/haskell-language-server.git"; - sha256 = "0gkzvjx4dgf53yicinqjshlj80gznx5khb62i7g3kqjr85iy0raa"; - rev = "e4f677e1780fe85a02b99a09404a0a3c3ab5ce7c"; + sha256 = "0p6fqs07lajbi2g1wf4w3j5lvwknnk58n12vlg48cs4iz25gp588"; + rev = "eb58f13f7b8e4f9bc771af30ff9fd82dc4309ff5"; fetchSubmodules = true; }; postUnpack = "sourceRoot+=/plugins/tactics; echo source root reset to $sourceRoot"; @@ -28,5 +28,5 @@ mkDerivation { testToolDepends = [ hspec-discover ]; description = "Tactics plugin for Haskell Language Server"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; } diff --git a/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/update.sh b/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/update.sh index f14a97221ff8..aaccf8b9b9fe 100755 --- a/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/update.sh +++ b/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/update.sh @@ -41,11 +41,10 @@ hls_new_version=$hls_latest_release echo "Updating haskell-language-server from old version $hls_old_version to new version $hls_new_version." echo "Running cabal2nix and outputting to ${hls_derivation_file}..." - cabal2nix --revision "$hls_new_version" "https://github.com/haskell/haskell-language-server.git" > "$hls_derivation_file" cabal2nix --revision "$hls_new_version" --subpath plugins/tactics "https://github.com/haskell/haskell-language-server.git" > "${script_dir}/hls-tactics-plugin.nix" -cabal2nix --revision "$hls_new_version" --subpath plugins/hls-hlint-plugin "https://github.com/haskell/haskell-language-server.git" > "${script_dir}/hls-hlint-plugin.nix" -cabal2nix --revision "$hls_new_version" --subpath plugins/hls-explicit-imports-plugin "https://github.com/haskell/haskell-language-server.git" > "${script_dir}/hls-explicit-imports-plugin.nix" -cabal2nix --revision "$hls_new_version" --subpath plugins/hls-retrie-plugin "https://github.com/haskell/haskell-language-server.git" > "${script_dir}/hls-retrie-plugin.nix" +for plugin in "hls-hlint-plugin" "hls-explicit-imports-plugin" "hls-retrie-plugin" "hls-class-plugin" "hls-eval-plugin"; do + cabal2nix --revision "$hls_new_version" --subpath plugins/$plugin "https://github.com/haskell/haskell-language-server.git" > "${script_dir}/$plugin.nix" +done echo "Finished." diff --git a/nixpkgs/pkgs/development/tools/haskell/hyper-haskell/default.nix b/nixpkgs/pkgs/development/tools/haskell/hyper-haskell/default.nix index df889d43d463..6b1399046166 100644 --- a/nixpkgs/pkgs/development/tools/haskell/hyper-haskell/default.nix +++ b/nixpkgs/pkgs/development/tools/haskell/hyper-haskell/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchFromGitHub, jshon, electron_3 +{ lib, stdenv, fetchFromGitHub, jshon, electron_3 , runtimeShell, hyper-haskell-server, extra-packages ? [] }: let - binPath = stdenv.lib.makeBinPath ([ hyper-haskell-server ] ++ extra-packages); + binPath = lib.makeBinPath ([ hyper-haskell-server ] ++ extra-packages); electron = electron_3; in stdenv.mkDerivation rec { pname = "hyper-haskell"; @@ -42,7 +42,7 @@ in stdenv.mkDerivation rec { chmod 755 $out/bin/hyper-haskell ''; - meta = with stdenv.lib; { + meta = with lib; { description = "The strongly hyped graphical interpreter for the Haskell programming language"; homepage = "https://github.com/HeinrichApfelmus/hyper-haskell"; license = licenses.bsd3; diff --git a/nixpkgs/pkgs/development/tools/haskell/ihaskell/wrapper.nix b/nixpkgs/pkgs/development/tools/haskell/ihaskell/wrapper.nix index 60f8c2ecb252..875d5a8a4a8d 100644 --- a/nixpkgs/pkgs/development/tools/haskell/ihaskell/wrapper.nix +++ b/nixpkgs/pkgs/development/tools/haskell/ihaskell/wrapper.nix @@ -1,4 +1,4 @@ -{ stdenv, writeScriptBin, makeWrapper, buildEnv, haskell, ghcWithPackages, jupyter, packages }: +{ lib, stdenv, writeScriptBin, makeWrapper, buildEnv, haskell, ghcWithPackages, jupyter, packages }: let ihaskellEnv = ghcWithPackages (self: [ self.ihaskell @@ -9,7 +9,7 @@ let ihaskellSh = writeScriptBin "ihaskell-notebook" '' #! ${stdenv.shell} export GHC_PACKAGE_PATH="$(echo ${ihaskellEnv}/lib/*/package.conf.d| tr ' ' ':'):$GHC_PACKAGE_PATH" - export PATH="${stdenv.lib.makeBinPath ([ ihaskellEnv jupyter ])}''${PATH:+:}$PATH" + export PATH="${lib.makeBinPath ([ ihaskellEnv jupyter ])}''${PATH:+:}$PATH" ${ihaskellEnv}/bin/ihaskell install -l $(${ihaskellEnv}/bin/ghc --print-libdir) && ${jupyter}/bin/jupyter notebook ''; in diff --git a/nixpkgs/pkgs/development/tools/haskell/vaultenv/default.nix b/nixpkgs/pkgs/development/tools/haskell/vaultenv/default.nix index 1d901cb723cf..42cf33224201 100644 --- a/nixpkgs/pkgs/development/tools/haskell/vaultenv/default.nix +++ b/nixpkgs/pkgs/development/tools/haskell/vaultenv/default.nix @@ -1,7 +1,7 @@ { mkDerivation, async, base, bytestring, connection, containers , directory, hpack, hspec, hspec-discover, hspec-expectations , http-client, http-conduit, lens, lens-aeson, megaparsec, mtl -, optparse-applicative, parser-combinators, retry, stdenv, text +, optparse-applicative, parser-combinators, retry, lib, stdenv, text , unix, unordered-containers, utf8-string, fetchzip, dotenv }: mkDerivation rec { @@ -37,6 +37,6 @@ mkDerivation rec { preConfigure = "hpack"; homepage = "https://github.com/channable/vaultenv#readme"; description = "Runs processes with secrets from HashiCorp Vault"; - license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ lnl7 manveru ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ lnl7 manveru ]; } diff --git a/nixpkgs/pkgs/development/tools/hcloud/default.nix b/nixpkgs/pkgs/development/tools/hcloud/default.nix index edaaa9c3a68e..5c4fe48f60fb 100644 --- a/nixpkgs/pkgs/development/tools/hcloud/default.nix +++ b/nixpkgs/pkgs/development/tools/hcloud/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, installShellFiles }: +{ lib, stdenv, buildGoModule, fetchFromGitHub, installShellFiles }: buildGoModule rec { pname = "hcloud"; @@ -29,7 +29,7 @@ buildGoModule rec { meta = { description = "A command-line interface for Hetzner Cloud, a provider for cloud virtual private servers"; homepage = "https://github.com/hetznercloud/cli"; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.zauberpony ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.zauberpony ]; }; } diff --git a/nixpkgs/pkgs/development/tools/hexio/default.nix b/nixpkgs/pkgs/development/tools/hexio/default.nix index 116e7c3a5ced..5b3fca815e6a 100644 --- a/nixpkgs/pkgs/development/tools/hexio/default.nix +++ b/nixpkgs/pkgs/development/tools/hexio/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python, pcsclite, pth }: +{ lib, stdenv, fetchFromGitHub, python, pcsclite, pth }: stdenv.mkDerivation rec { pname = "hexio"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { patchPhase = '' substituteInPlace Makefile \ - --replace '-I/usr/local/include/PCSC/' '-I${stdenv.lib.getDev pcsclite}/include/PCSC/' \ + --replace '-I/usr/local/include/PCSC/' '-I${lib.getDev pcsclite}/include/PCSC/' \ --replace '-L/usr/local/lib/pth' '-I${pth}/lib/' ''; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { make DESTDIR=$out PREFIX=/ install ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Low-level I/O helpers for hexadecimal, tty/serial devices and so on"; homepage = "https://github.com/vanrein/hexio"; license = licenses.bsd2; diff --git a/nixpkgs/pkgs/development/tools/hobbes/default.nix b/nixpkgs/pkgs/development/tools/hobbes/default.nix index 5fd9d314c5e0..667997ddff4d 100644 --- a/nixpkgs/pkgs/development/tools/hobbes/default.nix +++ b/nixpkgs/pkgs/development/tools/hobbes/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, llvm_6, ncurses, readline, zlib }: +{ lib, stdenv, fetchFromGitHub, cmake, llvm_6, ncurses, readline, zlib }: stdenv.mkDerivation { name = "hobbes"; @@ -25,7 +25,7 @@ stdenv.mkDerivation { doCheck = false; # Running tests in NixOS hangs. See https://git.io/JvK7R. checkTarget = "test"; - meta = with stdenv.lib; { + meta = with lib; { description = "A language and an embedded JIT compiler"; longDescription = '' Hobbes is a a language, embedded compiler, and runtime for efficient diff --git a/nixpkgs/pkgs/development/tools/iaca/2.1.nix b/nixpkgs/pkgs/development/tools/iaca/2.1.nix index f36e2e48fdfb..6170cbb4318b 100644 --- a/nixpkgs/pkgs/development/tools/iaca/2.1.nix +++ b/nixpkgs/pkgs/development/tools/iaca/2.1.nix @@ -1,5 +1,5 @@ -{ stdenv, makeWrapper, requireFile, gcc, unzip }: -with stdenv.lib; +{ lib, stdenv, makeWrapper, requireFile, gcc, unzip }: +with lib; # v2.1: last version with NHM/WSM arch support stdenv.mkDerivation { @@ -22,7 +22,7 @@ stdenv.mkDerivation { --set-rpath $out/lib:"${libPath}" \ $out/bin/iaca ''; - postFixup = ''wrapProgram $out/bin/iaca --set LD_LIBRARY_PATH $out/lib''; + postFixup = "wrapProgram $out/bin/iaca --set LD_LIBRARY_PATH $out/lib"; meta = { description = "Intel Architecture Code Analyzer"; homepage = "https://software.intel.com/en-us/articles/intel-architecture-code-analyzer/"; diff --git a/nixpkgs/pkgs/development/tools/iaca/3.0.nix b/nixpkgs/pkgs/development/tools/iaca/3.0.nix index f03f53544223..731b64317172 100644 --- a/nixpkgs/pkgs/development/tools/iaca/3.0.nix +++ b/nixpkgs/pkgs/development/tools/iaca/3.0.nix @@ -1,5 +1,5 @@ -{ stdenv, requireFile, unzip }: -with stdenv.lib; +{ lib, stdenv, requireFile, unzip }: +with lib; stdenv.mkDerivation { name = "iaca-3.0"; diff --git a/nixpkgs/pkgs/development/tools/icestorm/default.nix b/nixpkgs/pkgs/development/tools/icestorm/default.nix index feaea18be18b..2644821529b7 100644 --- a/nixpkgs/pkgs/development/tools/icestorm/default.nix +++ b/nixpkgs/pkgs/development/tools/icestorm/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchFromGitHub -, pkgconfig, libftdi1 +{ lib, stdenv, fetchFromGitHub +, pkg-config, libftdi1 , python3, pypy3 # PyPy yields large improvements in build time and runtime performance, and @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { sha256 = "0vxhqs2fampglg3xlfwb35229iv96kvlwp1gyxrdrmlpznhkqdrk"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ passthru.pythonPkg libftdi1 ]; makeFlags = [ "PREFIX=$(out)" ]; @@ -63,8 +63,8 @@ stdenv.mkDerivation rec { creating bitstream files. ''; homepage = "http://www.clifford.at/icestorm/"; - license = stdenv.lib.licenses.isc; - maintainers = with stdenv.lib.maintainers; [ shell thoughtpolice emily ]; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.isc; + maintainers = with lib.maintainers; [ shell thoughtpolice emily ]; + platforms = lib.platforms.all; }; } diff --git a/nixpkgs/pkgs/development/tools/icr/default.nix b/nixpkgs/pkgs/development/tools/icr/default.nix index 50a349d8ff71..13c4cbe37db8 100644 --- a/nixpkgs/pkgs/development/tools/icr/default.nix +++ b/nixpkgs/pkgs/development/tools/icr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, crystal, shards, makeWrapper, pkgconfig, which +{ stdenv, lib, fetchFromGitHub, crystal, shards, makeWrapper, pkg-config, which , openssl, readline, libyaml, zlib }: crystal.buildCrystalPackage rec { @@ -16,7 +16,7 @@ crystal.buildCrystalPackage rec { buildInputs = [ libyaml openssl readline zlib ]; - nativeBuildInputs = [ makeWrapper pkgconfig which ]; + nativeBuildInputs = [ makeWrapper pkg-config which ]; # tests are failing due to our sandbox doCheck = false; @@ -26,7 +26,7 @@ crystal.buildCrystalPackage rec { --prefix PATH : ${lib.makeBinPath [ crystal shards makeWrapper which ]} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Interactive console for the Crystal programming language"; homepage = "https://github.com/crystal-community/icr"; license = licenses.mit; diff --git a/nixpkgs/pkgs/development/tools/imatix_gsl/default.nix b/nixpkgs/pkgs/development/tools/imatix_gsl/default.nix index edba0d686dbb..ad729923d67a 100644 --- a/nixpkgs/pkgs/development/tools/imatix_gsl/default.nix +++ b/nixpkgs/pkgs/development/tools/imatix_gsl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pcre } : +{ lib, stdenv, fetchFromGitHub, pcre } : stdenv.mkDerivation { pname = "imatix_gsl"; @@ -19,7 +19,7 @@ stdenv.mkDerivation { preBuild = "cd src"; installFlags = [ "DESTDIR=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { license = licenses.gpl3Plus; homepage = "https://github.com/imatix/gsl/"; description = "A universal code generator"; diff --git a/nixpkgs/pkgs/development/tools/ineffassign/default.nix b/nixpkgs/pkgs/development/tools/ineffassign/default.nix index 85c643537af8..215809577523 100644 --- a/nixpkgs/pkgs/development/tools/ineffassign/default.nix +++ b/nixpkgs/pkgs/development/tools/ineffassign/default.nix @@ -6,10 +6,10 @@ buildGoPackage rec { pname = "ineffassign-unstable"; version = "2018-09-09"; - rev = "1003c8bd00dc2869cb5ca5282e6ce33834fed514"; + rev = "1003c8bd00dc2869cb5ca5282e6ce33834fed514"; goPackagePath = "github.com/gordonklaus/ineffassign"; - excludedPackages = ''testdata''; + excludedPackages = "testdata"; src = fetchFromGitHub { inherit rev; diff --git a/nixpkgs/pkgs/development/tools/interfacer/default.nix b/nixpkgs/pkgs/development/tools/interfacer/default.nix index b7f568f4d2b8..4358ee244896 100644 --- a/nixpkgs/pkgs/development/tools/interfacer/default.nix +++ b/nixpkgs/pkgs/development/tools/interfacer/default.nix @@ -9,7 +9,7 @@ buildGoPackage rec { rev = "c20040233aedb03da82d460eca6130fcd91c629a"; goPackagePath = "mvdan.cc/interfacer"; - excludedPackages = ''check/testdata''; + excludedPackages = "check/testdata"; src = fetchFromGitHub { inherit rev; diff --git a/nixpkgs/pkgs/development/tools/irony-server/default.nix b/nixpkgs/pkgs/development/tools/irony-server/default.nix index cc56b27ca2df..2f8afb176e6e 100644 --- a/nixpkgs/pkgs/development/tools/irony-server/default.nix +++ b/nixpkgs/pkgs/development/tools/irony-server/default.nix @@ -1,4 +1,4 @@ -{ stdenv, cmake, llvmPackages, irony }: +{ lib, stdenv, cmake, llvmPackages, irony }: stdenv.mkDerivation { pname = "irony-server"; @@ -15,7 +15,7 @@ stdenv.mkDerivation { "-DCMAKE_PREFIX_PATH=${llvmPackages.clang-unwrapped}" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "The server part of irony"; homepage = "https://melpa.org/#/irony"; maintainers = [ maintainers.deepfire ]; diff --git a/nixpkgs/pkgs/development/tools/java/cfr/default.nix b/nixpkgs/pkgs/development/tools/java/cfr/default.nix index ce1501fa4dd5..35ac0dbc6a51 100644 --- a/nixpkgs/pkgs/development/tools/java/cfr/default.nix +++ b/nixpkgs/pkgs/development/tools/java/cfr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, makeWrapper, fetchurl, jre }: +{ lib, stdenv, makeWrapper, fetchurl, jre }: stdenv.mkDerivation rec { pname = "cfr"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { makeWrapper ${jre}/bin/java $out/bin/cfr --add-flags "-jar $jar" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Another java decompiler"; longDescription = '' CFR will decompile modern Java features - Java 8 lambdas (pre and post diff --git a/nixpkgs/pkgs/development/tools/java/dex2jar/default.nix b/nixpkgs/pkgs/development/tools/java/dex2jar/default.nix index c1f7f1329854..b20a80355a02 100644 --- a/nixpkgs/pkgs/development/tools/java/dex2jar/default.nix +++ b/nixpkgs/pkgs/development/tools/java/dex2jar/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = https://sourceforge.net/projects/dex2jar/; description = "Tools to work with android .dex and java .class files"; maintainers = with maintainers; [ makefu ]; diff --git a/nixpkgs/pkgs/development/tools/java/fastjar/default.nix b/nixpkgs/pkgs/development/tools/java/fastjar/default.nix index 04fe7c2f46df..52211e302dd9 100644 --- a/nixpkgs/pkgs/development/tools/java/fastjar/default.nix +++ b/nixpkgs/pkgs/development/tools/java/fastjar/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, zlib }: +{ fetchurl, lib, stdenv, zlib }: let version = "0.98"; in stdenv.mkDerivation { @@ -25,8 +25,8 @@ let version = "0.98"; in homepage = "https://savannah.nongnu.org/projects/fastjar/"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; maintainers = [ ]; }; } diff --git a/nixpkgs/pkgs/development/tools/java/jhiccup/default.nix b/nixpkgs/pkgs/development/tools/java/jhiccup/default.nix index 1b235e354855..c2d1a33a49d9 100644 --- a/nixpkgs/pkgs/development/tools/java/jhiccup/default.nix +++ b/nixpkgs/pkgs/development/tools/java/jhiccup/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip }: +{ lib, stdenv, fetchzip }: stdenv.mkDerivation rec { pname = "jhiccup"; @@ -29,8 +29,8 @@ stdenv.mkDerivation rec { meta = { description = "Measure JVM application stalls and GC pauses"; homepage = "https://www.azul.com/jhiccup/"; - license = stdenv.lib.licenses.cc0; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ thoughtpolice ]; + license = lib.licenses.cc0; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ thoughtpolice ]; }; } diff --git a/nixpkgs/pkgs/development/tools/java/visualvm/default.nix b/nixpkgs/pkgs/development/tools/java/visualvm/default.nix index 4c0ec3bc29d2..52ccc3d91509 100644 --- a/nixpkgs/pkgs/development/tools/java/visualvm/default.nix +++ b/nixpkgs/pkgs/development/tools/java/visualvm/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { cp -r . $out ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A visual interface for viewing information about Java applications"; longDescription = '' VisualVM is a visual tool integrating several commandline JDK diff --git a/nixpkgs/pkgs/development/tools/jazzy/gemset.nix b/nixpkgs/pkgs/development/tools/jazzy/gemset.nix index aa4492560b81..6e2b873d4fd3 100644 --- a/nixpkgs/pkgs/development/tools/jazzy/gemset.nix +++ b/nixpkgs/pkgs/development/tools/jazzy/gemset.nix @@ -431,4 +431,4 @@ }; version = "1.17.1"; }; -} \ No newline at end of file +} diff --git a/nixpkgs/pkgs/development/tools/jbake/default.nix b/nixpkgs/pkgs/development/tools/jbake/default.nix index 44d537f97626..97d1c7536821 100644 --- a/nixpkgs/pkgs/development/tools/jbake/default.nix +++ b/nixpkgs/pkgs/development/tools/jbake/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, makeWrapper, jre }: +{ lib, stdenv, fetchzip, makeWrapper, jre }: stdenv.mkDerivation rec { version = "2.6.5"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ''; doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Java based, open source, static site/blog generator for developers & designers"; homepage = "https://jbake.org/"; license = licenses.mit; diff --git a/nixpkgs/pkgs/development/tools/jbang/default.nix b/nixpkgs/pkgs/development/tools/jbang/default.nix new file mode 100644 index 000000000000..b161b1d137c3 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/jbang/default.nix @@ -0,0 +1,40 @@ +{ stdenv, lib, fetchzip, jdk, makeWrapper, coreutils, curl }: + +stdenv.mkDerivation rec { + version = "0.62.0"; + pname = "jbang"; + + src = fetchzip { + url = "https://github.com/jbangdev/jbang/releases/download/v${version}/${pname}-${version}.tar"; + sha256 = "sha256-Ffh08477Wc4yEUo2YBM2yxC288Kq05ZkKXf/XSW2iXc="; + }; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + runHook preInstall + rm bin/jbang.{cmd,ps1} + rmdir tmp + cp -r . $out + wrapProgram $out/bin/jbang \ + --set JAVA_HOME ${jdk} \ + --set PATH ${lib.makeBinPath [ coreutils jdk curl ]} + runHook postInstall + ''; + + installCheckPhase = '' + $out/bin/jbang --version 2>&1 | grep -q "${version}" + ''; + + meta = with lib; { + description = "Run java as scripts anywhere"; + longDescription = '' + jbang uses the java language to build scripts similar to groovy scripts. Dependencies are automatically + downloaded and the java code runs. + ''; + homepage = "https://https://www.jbang.dev/"; + license = licenses.mit; + platforms = platforms.all; + maintainers = with maintainers; [ moaxcp ]; + }; +} diff --git a/nixpkgs/pkgs/development/tools/jd/default.nix b/nixpkgs/pkgs/development/tools/jd/default.nix index b03fd7a0028a..772e2802ff57 100644 --- a/nixpkgs/pkgs/development/tools/jd/default.nix +++ b/nixpkgs/pkgs/development/tools/jd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchgit }: +{ lib, stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { pname = "jd"; @@ -13,7 +13,7 @@ buildGoPackage rec { sha256 = "0dj4k38pf80dl77jns29vx2dj265s4ksg2q2s9n240b7b8z8mn5h"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Interactive JSON Editor"; license = licenses.mit; maintainers = [ maintainers.np ]; diff --git a/nixpkgs/pkgs/development/tools/jid/default.nix b/nixpkgs/pkgs/development/tools/jid/default.nix index e6eef68ec6cf..5e4e3df69427 100644 --- a/nixpkgs/pkgs/development/tools/jid/default.nix +++ b/nixpkgs/pkgs/development/tools/jid/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "jid"; @@ -18,7 +18,7 @@ buildGoPackage rec { meta = { description = "A command-line tool to incrementally drill down JSON"; homepage = "https://github.com/simeji/jid"; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ stesie ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ stesie ]; }; } diff --git a/nixpkgs/pkgs/development/tools/jira_cli/default.nix b/nixpkgs/pkgs/development/tools/jira_cli/default.nix index 4040debf15ea..7b7647da033e 100644 --- a/nixpkgs/pkgs/development/tools/jira_cli/default.nix +++ b/nixpkgs/pkgs/development/tools/jira_cli/default.nix @@ -1,4 +1,4 @@ -{ stdenv, libffi, openssl, python3Packages }: +{ lib, stdenv, libffi, openssl, python3Packages }: let inherit (python3Packages) fetchPypi buildPythonApplication vcrpy mock hiro; in @@ -23,7 +23,7 @@ in jira keyrings-alt ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A command line interface to Jira"; homepage = "https://github.com/alisaifee/jira-cli"; maintainers = with maintainers; [ nyarly ]; diff --git a/nixpkgs/pkgs/development/tools/jl/default.nix b/nixpkgs/pkgs/development/tools/jl/default.nix index 9a1314a60835..e0bf896c149f 100644 --- a/nixpkgs/pkgs/development/tools/jl/default.nix +++ b/nixpkgs/pkgs/development/tools/jl/default.nix @@ -1,6 +1,6 @@ { mkDerivation, fetchFromGitHub, fetchpatch , aeson, aeson-pretty, attoparsec, base, bytestring, conduit, conduit-extra -, containers, exceptions, mtl, optparse-simple, parsec, scientific, stdenv +, containers, exceptions, mtl, optparse-simple, parsec, scientific, lib, stdenv , text, unordered-containers, vector }: mkDerivation rec { @@ -30,8 +30,8 @@ mkDerivation rec { aeson aeson-pretty base bytestring conduit conduit-extra containers mtl optparse-simple text vector ]; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; description = "Functional sed for JSON"; - maintainers = with stdenv.lib.maintainers; [ fgaz ]; + maintainers = with lib.maintainers; [ fgaz ]; homepage = "https://github.com/chrisdone/jl"; } diff --git a/nixpkgs/pkgs/development/tools/jmespath/default.nix b/nixpkgs/pkgs/development/tools/jmespath/default.nix index 5414c51a00c7..f5a7092e60f9 100644 --- a/nixpkgs/pkgs/development/tools/jmespath/default.nix +++ b/nixpkgs/pkgs/development/tools/jmespath/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "jmespath"; @@ -13,7 +13,7 @@ buildGoPackage rec { repo = "go-jmespath"; sha256 = "0f4j0m44limnjd6q5fk152g6jq2a5cshcdms4p3a1br8pl9wp5fb"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A JMESPath implementation in Go"; homepage = "https://github.com/jmespath/go-jmespath"; maintainers = with maintainers; [ cransom ]; diff --git a/nixpkgs/pkgs/development/tools/jo/default.nix b/nixpkgs/pkgs/development/tools/jo/default.nix index 8592e38de7f7..653867956ff1 100644 --- a/nixpkgs/pkgs/development/tools/jo/default.nix +++ b/nixpkgs/pkgs/development/tools/jo/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, autoreconfHook, pandoc, pkgconfig}: +{lib, stdenv, fetchFromGitHub, autoreconfHook, pandoc, pkg-config}: stdenv.mkDerivation rec { pname = "jo"; @@ -13,9 +13,9 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - nativeBuildInputs = [ autoreconfHook pandoc pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pandoc pkg-config ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A small utility to create JSON objects"; homepage = "https://github.com/jpmens/jo"; license = licenses.gpl2Plus; diff --git a/nixpkgs/pkgs/development/tools/jp/default.nix b/nixpkgs/pkgs/development/tools/jp/default.nix index f05c788dabe1..d8d703feed30 100644 --- a/nixpkgs/pkgs/development/tools/jp/default.nix +++ b/nixpkgs/pkgs/development/tools/jp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "jp"; @@ -13,7 +13,7 @@ buildGoPackage rec { repo = "jp"; sha256 = "0fdbnihbd0kq56am3bmh2zrfk4fqjslcbm48malbgmpqw3a5nvpi"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A command line interface to the JMESPath expression language for JSON"; homepage = "https://github.com/jmespath/jp"; maintainers = with maintainers; [ cransom ]; diff --git a/nixpkgs/pkgs/development/tools/jpexs/default.nix b/nixpkgs/pkgs/development/tools/jpexs/default.nix index 87bba3847b55..24aa43cdeba3 100644 --- a/nixpkgs/pkgs/development/tools/jpexs/default.nix +++ b/nixpkgs/pkgs/development/tools/jpexs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, makeWrapper, makeDesktopItem, jdk8 }: +{ lib, stdenv, fetchzip, makeWrapper, makeDesktopItem, jdk8 }: stdenv.mkDerivation rec { pname = "jpexs"; @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { ''; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Flash SWF decompiler and editor"; longDescription = '' Open-source Flash SWF decompiler and editor. Extract resources, diff --git a/nixpkgs/pkgs/development/tools/jq/default.nix b/nixpkgs/pkgs/development/tools/jq/default.nix index 63c7e01a4b8d..e8fe27aae099 100644 --- a/nixpkgs/pkgs/development/tools/jq/default.nix +++ b/nixpkgs/pkgs/development/tools/jq/default.nix @@ -1,4 +1,4 @@ -{ stdenv, nixosTests, fetchurl, oniguruma }: +{ lib, stdenv, nixosTests, fetchurl, oniguruma }: stdenv.mkDerivation rec { pname = "jq"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { "--mandir=\${man}/share/man" ] # jq is linked to libjq: - ++ stdenv.lib.optional (!stdenv.isDarwin) "LDFLAGS=-Wl,-rpath,\\\${libdir}"; + ++ lib.optional (!stdenv.isDarwin) "LDFLAGS=-Wl,-rpath,\\\${libdir}"; doInstallCheck = true; installCheckTarget = "check"; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { passthru.tests = { inherit (nixosTests) jq; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A lightweight and flexible command-line JSON processor"; license = licenses.mit; maintainers = with maintainers; [ raskin globin ]; diff --git a/nixpkgs/pkgs/development/tools/jtc/default.nix b/nixpkgs/pkgs/development/tools/jtc/default.nix index f0e708d58aa5..947dee9ee3c0 100644 --- a/nixpkgs/pkgs/development/tools/jtc/default.nix +++ b/nixpkgs/pkgs/development/tools/jtc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "jtc"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "JSON manipulation and transformation tool"; homepage = "https://github.com/ldn-softdev/jtc"; license = licenses.mit; diff --git a/nixpkgs/pkgs/development/tools/just/default.nix b/nixpkgs/pkgs/development/tools/just/default.nix index 05b2b50f26f6..bbdd1bd016d5 100644 --- a/nixpkgs/pkgs/development/tools/just/default.nix +++ b/nixpkgs/pkgs/development/tools/just/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform, coreutils, bash, installShellFiles }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, coreutils, bash, installShellFiles }: rustPlatform.buildRustPackage rec { pname = "just"; @@ -42,7 +42,7 @@ rustPlatform.buildRustPackage rec { # Skip "choose" when running "cargo test", since this test case needs "fzf". checkFlags = [ "--skip=choose" "--skip=edit" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A handy way to save and run project-specific commands"; homepage = "https://github.com/casey/just"; license = licenses.cc0; diff --git a/nixpkgs/pkgs/development/tools/k6/default.nix b/nixpkgs/pkgs/development/tools/k6/default.nix index 35972f9cce53..6a8fe4caf01b 100644 --- a/nixpkgs/pkgs/development/tools/k6/default.nix +++ b/nixpkgs/pkgs/development/tools/k6/default.nix @@ -1,8 +1,8 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "k6"; - version = "0.29.0"; + version = "0.30.0"; goPackagePath = "github.com/loadimpact/k6"; @@ -10,12 +10,12 @@ buildGoPackage rec { owner = "loadimpact"; repo = pname; rev = "v${version}"; - sha256 = "1zkw7jga8nsqycvrwnqxifbb5la2z4bmxg3l5638i4xlpn58g711"; + sha256 = "sha256-eUvkW6IBmUp4/zYNlQKrNrxMszdzU8v6tCc2o4DN1As="; }; subPackages = [ "./" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A modern load testing tool, using Go and JavaScript"; homepage = "https://k6.io/"; changelog = "https://github.com/loadimpact/k6/releases/tag/v${version}"; diff --git a/nixpkgs/pkgs/development/tools/kafkacat/default.nix b/nixpkgs/pkgs/development/tools/kafkacat/default.nix index 6e7db6b35c6b..e297de7a0db0 100644 --- a/nixpkgs/pkgs/development/tools/kafkacat/default.nix +++ b/nixpkgs/pkgs/development/tools/kafkacat/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, zlib, rdkafka, yajl }: +{ lib, stdenv, fetchFromGitHub, pkg-config, zlib, rdkafka, yajl }: stdenv.mkDerivation rec { pname = "kafkacat"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0z3bw00s269myfd1xqksjyznmgp74xfs09xqlq347adsgby3cmfs"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ zlib rdkafka yajl ]; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { patchShebangs ./configure ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A generic non-JVM producer and consumer for Apache Kafka"; homepage = "https://github.com/edenhill/kafkacat"; license = licenses.bsd2; diff --git a/nixpkgs/pkgs/development/tools/kcli/default.nix b/nixpkgs/pkgs/development/tools/kcli/default.nix index 3a0fff71dc79..6c9f62c6f72d 100644 --- a/nixpkgs/pkgs/development/tools/kcli/default.nix +++ b/nixpkgs/pkgs/development/tools/kcli/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ lib, stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "kcli"; @@ -17,7 +17,7 @@ buildGoModule rec { subPackages = [ "." ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A kafka command line browser"; homepage = "https://github.com/cswank/kcli"; license = licenses.mit; diff --git a/nixpkgs/pkgs/development/tools/kind/default.nix b/nixpkgs/pkgs/development/tools/kind/default.nix index 55f0a0e9f305..3fff2aae1f4d 100644 --- a/nixpkgs/pkgs/development/tools/kind/default.nix +++ b/nixpkgs/pkgs/development/tools/kind/default.nix @@ -1,19 +1,19 @@ -{ stdenv, buildGoModule, fetchFromGitHub, installShellFiles }: +{ lib, stdenv, buildGoModule, fetchFromGitHub, installShellFiles }: -with stdenv.lib; +with lib; buildGoModule rec { pname = "kind"; - version = "0.9.0"; + version = "0.10.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "kubernetes-sigs"; repo = "kind"; - sha256 = "1kyjmlp1kmr3lwylnya6w392j1qpqgbvcacwpnz3ifyh3pbv32qr"; + sha256 = "1pp2x4bfqsd15siahyv9xkdyswsipmp9n86iwavrd0xhliqxlsa7"; }; - vendorSha256 = "04fmqh6lhvvzpvf1l2xk1r8687k5jx2lb5199rgmjbfnjgsa0q2d"; + vendorSha256 = "0c0j4s8kfzk2b3hy0d2g5bp1zr60l6vnwnpynsg6ksv8spwnpl5m"; doCheck = false; @@ -31,7 +31,7 @@ buildGoModule rec { description = "Kubernetes IN Docker - local clusters for testing Kubernetes"; homepage = "https://github.com/kubernetes-sigs/kind"; maintainers = with maintainers; [ offline rawkode ]; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/tools/knightos/genkfs/default.nix b/nixpkgs/pkgs/development/tools/knightos/genkfs/default.nix index b826c1a58b99..9f553aa6bae3 100644 --- a/nixpkgs/pkgs/development/tools/knightos/genkfs/default.nix +++ b/nixpkgs/pkgs/development/tools/knightos/genkfs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, asciidoc }: +{ lib, stdenv, fetchFromGitHub, cmake, asciidoc }: stdenv.mkDerivation rec { pname = "genkfs"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://knightos.org/"; description = "Utility to write a KFS filesystem into a ROM file"; license = licenses.mit; diff --git a/nixpkgs/pkgs/development/tools/knightos/kcc/default.nix b/nixpkgs/pkgs/development/tools/knightos/kcc/default.nix index 364d46de56d9..5f047d79a138 100644 --- a/nixpkgs/pkgs/development/tools/knightos/kcc/default.nix +++ b/nixpkgs/pkgs/development/tools/knightos/kcc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, bison, flex, boost }: +{ lib, stdenv, fetchFromGitHub, cmake, bison, flex, boost }: stdenv.mkDerivation rec { pname = "kcc"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ boost ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://knightos.org/"; description = "KnightOS C compiler"; license = licenses.gpl2Plus; diff --git a/nixpkgs/pkgs/development/tools/knightos/kimg/default.nix b/nixpkgs/pkgs/development/tools/knightos/kimg/default.nix index 3f3f698693df..33ec5b8bbb2a 100644 --- a/nixpkgs/pkgs/development/tools/knightos/kimg/default.nix +++ b/nixpkgs/pkgs/development/tools/knightos/kimg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, asciidoc }: +{ lib, stdenv, fetchFromGitHub, cmake, asciidoc }: stdenv.mkDerivation rec { pname = "kimg"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://knightos.org/"; description = "Converts image formats supported by stb_image to the KnightOS image format"; license = licenses.mit; diff --git a/nixpkgs/pkgs/development/tools/knightos/kpack/default.nix b/nixpkgs/pkgs/development/tools/knightos/kpack/default.nix index 657a1712ed24..43a8e4eddfa8 100644 --- a/nixpkgs/pkgs/development/tools/knightos/kpack/default.nix +++ b/nixpkgs/pkgs/development/tools/knightos/kpack/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, asciidoc, libxslt, docbook_xsl }: +{ lib, stdenv, fetchFromGitHub, cmake, asciidoc, libxslt, docbook_xsl }: stdenv.mkDerivation rec { pname = "kpack"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "fortify" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://knightos.org/"; description = "A tool to create or extract KnightOS packages"; license = licenses.lgpl2Only; diff --git a/nixpkgs/pkgs/development/tools/knightos/mkrom/default.nix b/nixpkgs/pkgs/development/tools/knightos/mkrom/default.nix index 46482a849134..b1ee36ac2dab 100644 --- a/nixpkgs/pkgs/development/tools/knightos/mkrom/default.nix +++ b/nixpkgs/pkgs/development/tools/knightos/mkrom/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, asciidoc }: +{ lib, stdenv, fetchFromGitHub, cmake, asciidoc }: stdenv.mkDerivation rec { pname = "mkrom"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://knightos.org/"; description = "Packages KnightOS distribution files into a ROM"; license = licenses.mit; diff --git a/nixpkgs/pkgs/development/tools/knightos/mktiupgrade/default.nix b/nixpkgs/pkgs/development/tools/knightos/mktiupgrade/default.nix index 171c1671b332..a91d1e5beda8 100644 --- a/nixpkgs/pkgs/development/tools/knightos/mktiupgrade/default.nix +++ b/nixpkgs/pkgs/development/tools/knightos/mktiupgrade/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, asciidoc }: +{ lib, stdenv, fetchFromGitHub, cmake, asciidoc }: stdenv.mkDerivation rec { pname = "mktiupgrade"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://knightos.org/"; description = "Makes TI calculator upgrade files from ROM dumps"; license = licenses.mit; diff --git a/nixpkgs/pkgs/development/tools/knightos/patchrom/default.nix b/nixpkgs/pkgs/development/tools/knightos/patchrom/default.nix index 9feab36ec822..33ed8d38c63d 100644 --- a/nixpkgs/pkgs/development/tools/knightos/patchrom/default.nix +++ b/nixpkgs/pkgs/development/tools/knightos/patchrom/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, asciidoc, libxslt, docbook_xsl }: +{ lib, stdenv, fetchFromGitHub, cmake, asciidoc, libxslt, docbook_xsl }: stdenv.mkDerivation rec { @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://knightos.org/"; description = "Patches jumptables into TI calculator ROM files and generates an include file"; license = licenses.mit; diff --git a/nixpkgs/pkgs/development/tools/knightos/scas/default.nix b/nixpkgs/pkgs/development/tools/knightos/scas/default.nix index b87650d5bf95..573d261306a6 100644 --- a/nixpkgs/pkgs/development/tools/knightos/scas/default.nix +++ b/nixpkgs/pkgs/development/tools/knightos/scas/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, stdenv, cmake }: +{ fetchFromGitHub, lib, stdenv, cmake }: stdenv.mkDerivation rec { pname = "scas"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://knightos.org/"; description = "Assembler and linker for the Z80"; license = licenses.mit; diff --git a/nixpkgs/pkgs/development/tools/knightos/z80e/default.nix b/nixpkgs/pkgs/development/tools/knightos/z80e/default.nix index d8f6a1274032..a089511fb684 100644 --- a/nixpkgs/pkgs/development/tools/knightos/z80e/default.nix +++ b/nixpkgs/pkgs/development/tools/knightos/z80e/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, knightos-scas, readline, SDL2 }: +{ lib, stdenv, fetchFromGitHub, cmake, knightos-scas, readline, SDL2 }: stdenv.mkDerivation rec { pname = "z80e"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-Denable-sdl=YES" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://knightos.org/"; description = "A Z80 calculator emulator and debugger"; license = licenses.mit; diff --git a/nixpkgs/pkgs/development/tools/krew/default.nix b/nixpkgs/pkgs/development/tools/krew/default.nix index b5fc91b62dda..7449d6df38eb 100644 --- a/nixpkgs/pkgs/development/tools/krew/default.nix +++ b/nixpkgs/pkgs/development/tools/krew/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ lib, stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "krew"; @@ -15,11 +15,11 @@ buildGoModule rec { subPackages = [ "cmd/krew" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Package manager for kubectl plugins"; homepage = "https://github.com/kubernetes-sigs/krew"; maintainers = with maintainers; [ vdemeester ]; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/tools/ktlint/default.nix b/nixpkgs/pkgs/development/tools/ktlint/default.nix index 7e71c08ec4b1..4abe6b6d17fa 100644 --- a/nixpkgs/pkgs/development/tools/ktlint/default.nix +++ b/nixpkgs/pkgs/development/tools/ktlint/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, jre_headless }: +{ lib, stdenv, fetchurl, makeWrapper, jre_headless }: stdenv.mkDerivation rec { pname = "ktlint"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/ktlint --prefix PATH : "${jre_headless}/bin" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "An anti-bikeshedding Kotlin linter with built-in formatter"; homepage = "https://ktlint.github.io/"; license = licenses.mit; diff --git a/nixpkgs/pkgs/development/tools/kube-prompt/deps.nix b/nixpkgs/pkgs/development/tools/kube-prompt/deps.nix index e2391789a41c..b8d9e200a8ca 100644 --- a/nixpkgs/pkgs/development/tools/kube-prompt/deps.nix +++ b/nixpkgs/pkgs/development/tools/kube-prompt/deps.nix @@ -306,4 +306,4 @@ sha256 = "06rszpgckx9gmqz9gbq8wnl39d1dnl28wdgrygj2fhz5prhj0x4s"; }; } -] \ No newline at end of file +] diff --git a/nixpkgs/pkgs/development/tools/kubectx/default.nix b/nixpkgs/pkgs/development/tools/kubectx/default.nix index 59a7c8300e2e..f2186709e835 100644 --- a/nixpkgs/pkgs/development/tools/kubectx/default.nix +++ b/nixpkgs/pkgs/development/tools/kubectx/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, installShellFiles }: +{ lib, stdenv, buildGoModule, fetchFromGitHub, installShellFiles }: buildGoModule rec { pname = "kubectx"; @@ -21,7 +21,7 @@ buildGoModule rec { installShellCompletion completion/* ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Fast way to switch between clusters and namespaces in kubectl!"; license = licenses.asl20; homepage = "https://github.com/ahmetb/kubectx"; diff --git a/nixpkgs/pkgs/development/tools/kubeprompt/default.nix b/nixpkgs/pkgs/development/tools/kubeprompt/default.nix index 51369bc1f91e..4fc8f3253429 100644 --- a/nixpkgs/pkgs/development/tools/kubeprompt/default.nix +++ b/nixpkgs/pkgs/development/tools/kubeprompt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ lib, stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "kubeprompt"; @@ -22,7 +22,7 @@ buildGoModule rec { doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Kubernetes prompt"; homepage = "https://github.com/jlesquembre/kubeprompt"; license = licenses.epl20; diff --git a/nixpkgs/pkgs/development/tools/kubicorn/default.nix b/nixpkgs/pkgs/development/tools/kubicorn/default.nix index 67e170f6e25c..f0985277a25e 100644 --- a/nixpkgs/pkgs/development/tools/kubicorn/default.nix +++ b/nixpkgs/pkgs/development/tools/kubicorn/default.nix @@ -1,10 +1,10 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub }: -with stdenv.lib; +with lib; buildGoPackage rec { pname = "kubicorn"; - version = "2018-10-13-${stdenv.lib.strings.substring 0 7 rev}"; + version = "2018-10-13-${lib.strings.substring 0 7 rev}"; rev = "4c7f3623e9188fba43778271afe161a4facfb657"; src = fetchFromGitHub { @@ -20,7 +20,7 @@ buildGoPackage rec { meta = { description = "Simple, cloud native infrastructure for Kubernetes"; homepage = "http://kubicorn.io/"; - maintainers = with stdenv.lib.maintainers; [ offline ]; - license = stdenv.lib.licenses.asl20; + maintainers = with lib.maintainers; [ offline ]; + license = lib.licenses.asl20; }; } diff --git a/nixpkgs/pkgs/development/tools/kubie/default.nix b/nixpkgs/pkgs/development/tools/kubie/default.nix index cae76669ab42..8a199f9191c0 100644 --- a/nixpkgs/pkgs/development/tools/kubie/default.nix +++ b/nixpkgs/pkgs/development/tools/kubie/default.nix @@ -1,4 +1,4 @@ -{ stdenv, rustPlatform, fetchFromGitHub, installShellFiles, Security }: +{ lib, stdenv, rustPlatform, fetchFromGitHub, installShellFiles, Security }: rustPlatform.buildRustPackage rec { pname = "kubie"; @@ -15,13 +15,13 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ]; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = lib.optionals stdenv.isDarwin [ Security ]; postInstall = '' installShellCompletion completion/kubie.bash ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Shell independent context and namespace switcher for kubectl"; homepage = "https://github.com/sbstp/kubie"; license = with licenses; [ zlib ]; diff --git a/nixpkgs/pkgs/development/tools/kustomize/default.nix b/nixpkgs/pkgs/development/tools/kustomize/default.nix index 79c484586111..6ff123bb2be3 100644 --- a/nixpkgs/pkgs/development/tools/kustomize/default.nix +++ b/nixpkgs/pkgs/development/tools/kustomize/default.nix @@ -2,9 +2,9 @@ buildGoModule rec { pname = "kustomize"; - version = "3.8.7"; - # rev is the 3.8.7 commit, mainly for kustomize version command output - rev = "ad092cc7a91c07fdf63a2e4b7f13fa588a39af4f"; + version = "3.9.2"; + # rev is the 3.9.2 commit, mainly for kustomize version command output + rev = "e98eada7365fc564c9aba392e954f306a9cbf1dd"; buildFlagsArray = let t = "sigs.k8s.io/kustomize/api/provenance"; in '' @@ -17,13 +17,13 @@ buildGoModule rec { owner = "kubernetes-sigs"; repo = pname; rev = "kustomize/v${version}"; - sha256 = "1942cyaj6knf8mc3q2vcz6rqqc6lxdd6nikry9m0idk5l1b09x1m"; + sha256 = "0p1rxswfaj0g3y8nfw70qmxrlyv1pnzkapy1mxpzzyf04mmhg7wn"; }; # avoid finding test and development commands sourceRoot = "source/kustomize"; - vendorSha256 = "0y77ykfcbn4l0x85c3hb1lgjpy64kimx3s1qkn38gpmi4lphvkkl"; + vendorSha256 = "1pv8g0nnrpzbvd6dqgnrw2i27xkilbrr9npdz6pxr7mmbcg3w3w9"; meta = with lib; { description = "Customization of kubernetes YAML configurations"; @@ -34,6 +34,6 @@ buildGoModule rec { ''; homepage = "https://github.com/kubernetes-sigs/kustomize"; license = licenses.asl20; - maintainers = with maintainers; [ carlosdagos vdemeester periklis zaninime ]; + maintainers = with maintainers; [ carlosdagos vdemeester periklis zaninime Chili-Man]; }; } diff --git a/nixpkgs/pkgs/development/tools/kythe/default.nix b/nixpkgs/pkgs/development/tools/kythe/default.nix index 601634b31842..f6a4c2e6c1e6 100644 --- a/nixpkgs/pkgs/development/tools/kythe/default.nix +++ b/nixpkgs/pkgs/development/tools/kythe/default.nix @@ -1,4 +1,4 @@ -{ stdenv, binutils , fetchurl, ncurses5 }: +{ lib, stdenv, binutils , fetchurl, ncurses5 }: stdenv.mkDerivation rec { version = "0.0.30"; @@ -23,14 +23,14 @@ stdenv.mkDerivation rec { write_entries write_tables entrystream; do echo "Patching:" $exe patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $exe - patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc ncurses5 ]}" $exe + patchelf --set-rpath "${lib.makeLibraryPath [ stdenv.cc.cc ncurses5 ]}" $exe done cd ../ cp -R ./ $out ln -s $out/tools $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A pluggable, (mostly) language-agnostic ecosystem for building tools that work with code"; longDescription = '' The Kythe project was founded to provide and support tools and standards diff --git a/nixpkgs/pkgs/development/tools/lattice-diamond/default.nix b/nixpkgs/pkgs/development/tools/lattice-diamond/default.nix index 6720603b2e5f..4c94ff1e6e27 100644 --- a/nixpkgs/pkgs/development/tools/lattice-diamond/default.nix +++ b/nixpkgs/pkgs/development/tools/lattice-diamond/default.nix @@ -1,4 +1,4 @@ -{ stdenv, rpmextract, patchelf, makeWrapper, file, requireFile, glib, zlib, +{ lib, stdenv, rpmextract, patchelf, makeWrapper, file, requireFile, glib, zlib, freetype, fontconfig, xorg, libusb-compat-0_1 }: stdenv.mkDerivation { @@ -95,7 +95,7 @@ stdenv.mkDerivation { done ''; - libPath = stdenv.lib.makeLibraryPath [ + libPath = lib.makeLibraryPath [ glib zlib freetype fontconfig xorg.libSM xorg.libICE xorg.libXrender xorg.libXext xorg.libX11 xorg.libXt libusb-compat-0_1 @@ -109,8 +109,8 @@ stdenv.mkDerivation { next-generation replacement for ispLEVER. ''; homepage = "http://www.latticesemi.com/latticediamond"; - license = stdenv.lib.licenses.unfree; - maintainers = with stdenv.lib.maintainers; [ q3k ]; + license = lib.licenses.unfree; + maintainers = with lib.maintainers; [ q3k ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/nixpkgs/pkgs/development/tools/lazygit/default.nix b/nixpkgs/pkgs/development/tools/lazygit/default.nix index 1ede21609b44..1e8ebb0d0879 100644 --- a/nixpkgs/pkgs/development/tools/lazygit/default.nix +++ b/nixpkgs/pkgs/development/tools/lazygit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ lib, stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "lazygit"; @@ -16,7 +16,7 @@ buildGoModule rec { buildFlagsArray = [ "-ldflags=-X main.version=${version} -X main.buildSource=nix" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Simple terminal UI for git commands"; homepage = "https://github.com/jesseduffield/lazygit"; changelog = "https://github.com/jesseduffield/lazygit/releases/tag/v${version}"; diff --git a/nixpkgs/pkgs/development/tools/lc3tools/default.nix b/nixpkgs/pkgs/development/tools/lc3tools/default.nix index 122271c34a4d..3e7f81bb4e7b 100644 --- a/nixpkgs/pkgs/development/tools/lc3tools/default.nix +++ b/nixpkgs/pkgs/development/tools/lc3tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, flex, tk, ncurses, readline }: +{ lib, stdenv, fetchurl, unzip, flex, tk, ncurses, readline }: stdenv.mkDerivation { pname = "lc3tools"; @@ -39,7 +39,7 @@ stdenv.mkDerivation { mv -t $out/bin $out/lc3* ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Toolchain and emulator for the LC-3 architecture"; license = licenses.gpl2; maintainers = with maintainers; [ anna328p ]; diff --git a/nixpkgs/pkgs/development/tools/leaps/default.nix b/nixpkgs/pkgs/development/tools/leaps/default.nix index bb8673d4d56b..e68542e584f2 100644 --- a/nixpkgs/pkgs/development/tools/leaps/default.nix +++ b/nixpkgs/pkgs/development/tools/leaps/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "leaps"; @@ -19,7 +19,7 @@ buildGoPackage rec { description = "A pair programming tool and library written in Golang"; homepage = "https://github.com/jeffail/leaps/"; license = "MIT"; - maintainers = with stdenv.lib.maintainers; [ qknight ]; - platforms = stdenv.lib.platforms.unix; + maintainers = with lib.maintainers; [ qknight ]; + platforms = lib.platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/tools/libsigrok/default.nix b/nixpkgs/pkgs/development/tools/libsigrok/default.nix index 4e104a79d5d2..7f32b0bd7162 100644 --- a/nixpkgs/pkgs/development/tools/libsigrok/default.nix +++ b/nixpkgs/pkgs/development/tools/libsigrok/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libzip, glib, libusb1, libftdi1, check +{ lib, stdenv, fetchurl, pkg-config, libzip, glib, libusb1, libftdi1, check , libserialport, librevisa, doxygen, glibmm, python , version ? "0.5.1", sha256 ? "171b553dir5gn6w4f7n37waqk62nq2kf1jykx4ifjacdz5xdw3z4" }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { sha256 = "14sd8xqph4kb109g073daiavpadb20fcz7ch1ipn0waz7nlly4sw"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libzip glib libusb1 libftdi1 check libserialport librevisa doxygen glibmm python ]; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { tar --strip-components=1 -xvf "${firmware}" -C "$out/share/sigrok-firmware/" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Core library of the sigrok signal analysis software suite"; homepage = "https://sigrok.org/"; license = licenses.gpl3Plus; diff --git a/nixpkgs/pkgs/development/tools/libsigrokdecode/default.nix b/nixpkgs/pkgs/development/tools/libsigrokdecode/default.nix index e78afc1a8614..cb3b30405962 100644 --- a/nixpkgs/pkgs/development/tools/libsigrokdecode/default.nix +++ b/nixpkgs/pkgs/development/tools/libsigrokdecode/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, python3, libsigrok, check }: +{ lib, stdenv, fetchurl, pkg-config, glib, python3, libsigrok, check }: stdenv.mkDerivation rec { name = "libsigrokdecode-0.5.3"; @@ -8,10 +8,10 @@ stdenv.mkDerivation rec { sha256 = "1h1zi1kpsgf6j2z8j8hjpv1q7n49i3fhqjn8i178rka3cym18265"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib python3 libsigrok check ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Protocol decoding library for the sigrok signal analysis software suite"; homepage = "https://sigrok.org/"; license = licenses.gpl3Plus; diff --git a/nixpkgs/pkgs/development/tools/literate-programming/Literate/default.nix b/nixpkgs/pkgs/development/tools/literate-programming/Literate/default.nix index 428e6e444a21..87213b911a96 100644 --- a/nixpkgs/pkgs/development/tools/literate-programming/Literate/default.nix +++ b/nixpkgs/pkgs/development/tools/literate-programming/Literate/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, dmd, dub }: +{ lib, stdenv, fetchgit, dmd, dub }: stdenv.mkDerivation { pname = "Literate"; @@ -14,7 +14,7 @@ stdenv.mkDerivation { installPhase = "install -D bin/lit $out/bin/lit"; - meta = with stdenv.lib; { + meta = with lib; { description = "A literate programming tool for any language"; homepage = "http://literate.zbyedidia.webfactional.com/"; license = licenses.mit; diff --git a/nixpkgs/pkgs/development/tools/literate-programming/eweb/default.nix b/nixpkgs/pkgs/development/tools/literate-programming/eweb/default.nix index 82805af5804f..caacc04903e6 100644 --- a/nixpkgs/pkgs/development/tools/literate-programming/eweb/default.nix +++ b/nixpkgs/pkgs/development/tools/literate-programming/eweb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python3, asciidoc }: +{ lib, stdenv, fetchurl, python3, asciidoc }: stdenv.mkDerivation rec { pname = "eweb"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { cp etangle.w etangle.html $out/share/doc/${pname}-${version} ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://eweb.sourceforge.net/"; description = "An Asciidoc-based literate programming tool, written in Python"; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/development/tools/literate-programming/funnelweb/default.nix b/nixpkgs/pkgs/development/tools/literate-programming/funnelweb/default.nix index 9d27351f15d4..53b7f208e812 100644 --- a/nixpkgs/pkgs/development/tools/literate-programming/funnelweb/default.nix +++ b/nixpkgs/pkgs/development/tools/literate-programming/funnelweb/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation rec { @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { install fw $out/bin/fw ''; - meta = with stdenv.lib; { + meta = with lib; { version = "3.20"; description = "A simple, reliable literate-programming macro preprocessor"; homepage = "http://www.ross.net/funnelweb/"; diff --git a/nixpkgs/pkgs/development/tools/literate-programming/noweb/default.nix b/nixpkgs/pkgs/development/tools/literate-programming/noweb/default.nix index 52586939c1df..5d4441ecfbb6 100644 --- a/nixpkgs/pkgs/development/tools/literate-programming/noweb/default.nix +++ b/nixpkgs/pkgs/development/tools/literate-programming/noweb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, gawk, groff, icon-lang ? null }: +{ lib, stdenv, fetchFromGitHub, gawk, groff, icon-lang ? null }: let noweb = stdenv.mkDerivation rec { pname = "noweb"; @@ -13,17 +13,17 @@ let noweb = stdenv.mkDerivation rec { patches = [ ./no-FAQ.patch ]; - nativeBuildInputs = [ groff ] ++ stdenv.lib.optionals (!isNull icon-lang) [ icon-lang ]; + nativeBuildInputs = [ groff ] ++ lib.optionals (!isNull icon-lang) [ icon-lang ]; preBuild = '' mkdir -p "$out/lib/noweb" cd src ''; - makeFlags = stdenv.lib.optionals (!isNull icon-lang) [ + makeFlags = lib.optionals (!isNull icon-lang) [ "LIBSRC=icon" "ICONC=icont" - ] ++ stdenv.lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.isDarwin [ "CC=clang" ]; @@ -70,7 +70,7 @@ let noweb = stdenv.mkDerivation rec { tlType = "run"; passthru.pkgs = [ noweb.tex ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A simple, extensible literate-programming tool"; homepage = "https://www.cs.tufts.edu/~nr/noweb"; license = licenses.bsd2; diff --git a/nixpkgs/pkgs/development/tools/literate-programming/nuweb/default.nix b/nixpkgs/pkgs/development/tools/literate-programming/nuweb/default.nix index 1f4fba681c35..37deaacb216c 100644 --- a/nixpkgs/pkgs/development/tools/literate-programming/nuweb/default.nix +++ b/nixpkgs/pkgs/development/tools/literate-programming/nuweb/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, tex}: +{lib, stdenv, fetchurl, tex}: stdenv.mkDerivation rec { @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { cp htdocs/index.html nuweb.w nuweb.pdf nuwebdoc.pdf README $out/share/doc/${pname}-${version} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A simple literate programming tool"; homepage = "http://nuweb.sourceforge.net"; license = licenses.free; diff --git a/nixpkgs/pkgs/development/tools/makerpm/default.nix b/nixpkgs/pkgs/development/tools/makerpm/default.nix index a05615a22d9e..5b7fc83df407 100644 --- a/nixpkgs/pkgs/development/tools/makerpm/default.nix +++ b/nixpkgs/pkgs/development/tools/makerpm/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, zlib, libarchive, openssl }: +{ lib, stdenv, fetchFromGitHub, zlib, libarchive, openssl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation rec { version = "1.0"; pname = "makerpm"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { sha256 = "089dkbh5705ppyi920rd0ksjc0143xmvnhm8qrx93rsgwc1ggi1y"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/ivan-tkatchev/makerpm/"; description = "A clean, simple RPM packager reimplemented completely from scratch"; license = licenses.free; diff --git a/nixpkgs/pkgs/development/tools/manul/default.nix b/nixpkgs/pkgs/development/tools/manul/default.nix index 71010149a921..4265c2a74501 100644 --- a/nixpkgs/pkgs/development/tools/manul/default.nix +++ b/nixpkgs/pkgs/development/tools/manul/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage { name = "manul-unstable-2016-09-30"; @@ -16,7 +16,7 @@ buildGoPackage { deleteVendor = true; goDeps = ./deps.nix; - meta = with stdenv.lib; { + meta = with lib; { description = "The madness vendoring utility for Golang programs"; homepage = "https://github.com/kovetskiy/manul"; license = licenses.mit; diff --git a/nixpkgs/pkgs/development/tools/mdk/default.nix b/nixpkgs/pkgs/development/tools/mdk/default.nix index 5c8924ee21be..6db4395a14f5 100644 --- a/nixpkgs/pkgs/development/tools/mdk/default.nix +++ b/nixpkgs/pkgs/development/tools/mdk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, intltool, pkgconfig, glib }: +{ lib, stdenv, fetchurl, intltool, pkg-config, glib }: stdenv.mkDerivation { name = "gnu-mdk-1.3.0"; @@ -6,7 +6,7 @@ stdenv.mkDerivation { url = "https://ftp.gnu.org/gnu/mdk/v1.3.0/mdk-1.3.0.tar.gz"; sha256 = "0bhk3c82kyp8167h71vdpbcr852h5blpnwggcswqqwvvykbms7lb"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ intltool glib ]; postInstall = '' mkdir -p $out/share/emacs/site-lisp/ @@ -16,7 +16,7 @@ stdenv.mkDerivation { meta = { description = "GNU MIX Development Kit (MDK)"; homepage = "https://www.gnu.org/software/mdk/"; - license = stdenv.lib.licenses.gpl3; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.gpl3; + platforms = lib.platforms.all; }; } diff --git a/nixpkgs/pkgs/development/tools/metals/default.nix b/nixpkgs/pkgs/development/tools/metals/default.nix index 951e9a0ac2e8..729ab88c680b 100644 --- a/nixpkgs/pkgs/development/tools/metals/default.nix +++ b/nixpkgs/pkgs/development/tools/metals/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "metals"; - version = "0.9.8"; + version = "0.9.10"; deps = stdenv.mkDerivation { name = "${pname}-deps-${version}"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ''; outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "1gn7v1478sqhz4hv53pgvaw2nqziyiavvhn5q152lkzyvghq08wk"; + outputHash = "1i91jq1p27kkzxk57mm438sablnrx8j5pfyl0yg64wzrashba1xa"; }; nativeBuildInputs = [ makeWrapper ]; @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { --add-flags "${extraJavaOpts} -Dmetals.client=sublime -cp $CLASSPATH scala.meta.metals.Main" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://scalameta.org/metals/"; license = licenses.asl20; description = "Work-in-progress language server for Scala"; diff --git a/nixpkgs/pkgs/development/tools/micronaut/default.nix b/nixpkgs/pkgs/development/tools/micronaut/default.nix index 5d032d42108f..1139215fbf85 100644 --- a/nixpkgs/pkgs/development/tools/micronaut/default.nix +++ b/nixpkgs/pkgs/development/tools/micronaut/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, jdk, makeWrapper, installShellFiles }: +{ lib, stdenv, fetchzip, jdk, makeWrapper, installShellFiles }: stdenv.mkDerivation rec { pname = "micronaut"; @@ -16,19 +16,19 @@ stdenv.mkDerivation rec { rm bin/mn.bat cp -r . $out wrapProgram $out/bin/mn \ - --prefix JAVA_HOME : ${jdk} + --prefix JAVA_HOME : ${jdk} installShellCompletion --bash --name mn.bash bin/mn_completion runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Modern, JVM-based, full-stack framework for building microservice applications"; longDescription = '' Micronaut is a modern, JVM-based, full stack microservices framework designed for building modular, easily testable microservice applications. - Reflection-based IoC frameworks load and cache reflection data for - every single field, method, and constructor in your code, whereas with - Micronaut, your application startup time and memory consumption are + Reflection-based IoC frameworks load and cache reflection data for + every single field, method, and constructor in your code, whereas with + Micronaut, your application startup time and memory consumption are not bound to the size of your codebase. ''; homepage = "https://micronaut.io/"; diff --git a/nixpkgs/pkgs/development/tools/minizinc/default.nix b/nixpkgs/pkgs/development/tools/minizinc/default.nix index 1d01ef97f401..4e5f39472626 100644 --- a/nixpkgs/pkgs/development/tools/minizinc/default.nix +++ b/nixpkgs/pkgs/development/tools/minizinc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, cmake, flex, bison }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, flex, bison }: let version = "2.4.3"; in @@ -6,7 +6,7 @@ stdenv.mkDerivation { pname = "minizinc"; inherit version; - buildInputs = [ cmake flex bison ]; + nativeBuildInputs = [ cmake flex bison ]; src = fetchFromGitHub { owner = "MiniZinc"; @@ -34,7 +34,7 @@ stdenv.mkDerivation { }) ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.minizinc.org/"; description = "A medium-level constraint modelling language"; diff --git a/nixpkgs/pkgs/development/tools/minizinc/ide.nix b/nixpkgs/pkgs/development/tools/minizinc/ide.nix index aedf2ab881dc..7709423e676f 100644 --- a/nixpkgs/pkgs/development/tools/minizinc/ide.nix +++ b/nixpkgs/pkgs/development/tools/minizinc/ide.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, qtbase, qtwebengine, qtwebkit, qmake, makeWrapper, minizinc }: +{ lib, stdenv, fetchFromGitHub, qtbase, qtwebengine, qtwebkit, qmake, makeWrapper, minizinc }: let version = "2.4.3"; in @@ -21,10 +21,10 @@ stdenv.mkDerivation { enableParallelBuilding = true; postInstall = '' - wrapProgram $out/bin/MiniZincIDE --prefix PATH ":" ${stdenv.lib.makeBinPath [ minizinc ]} + wrapProgram $out/bin/MiniZincIDE --prefix PATH ":" ${lib.makeBinPath [ minizinc ]} ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.minizinc.org/"; description = "IDE for MiniZinc, a medium-level constraint modelling language"; diff --git a/nixpkgs/pkgs/development/tools/misc/abi-compliance-checker/default.nix b/nixpkgs/pkgs/development/tools/misc/abi-compliance-checker/default.nix index c95a340181c0..c4dda95a7f25 100644 --- a/nixpkgs/pkgs/development/tools/misc/abi-compliance-checker/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/abi-compliance-checker/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ctags, perl, binutils, abi-dumper }: +{ lib, stdenv, fetchFromGitHub, ctags, perl, binutils, abi-dumper }: stdenv.mkDerivation rec { pname = "abi-compliance-checker"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { makeFlags = [ "prefix=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://lvc.github.io/abi-compliance-checker"; description = "A tool for checking backward API/ABI compatibility of a C/C++ library"; license = licenses.lgpl21; diff --git a/nixpkgs/pkgs/development/tools/misc/abi-dumper/default.nix b/nixpkgs/pkgs/development/tools/misc/abi-dumper/default.nix index dc2a6d00b5f0..6dd2bf41ba6f 100644 --- a/nixpkgs/pkgs/development/tools/misc/abi-dumper/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/abi-dumper/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ctags, perl, elfutils, vtable-dumper }: +{ lib, stdenv, fetchFromGitHub, ctags, perl, elfutils, vtable-dumper }: stdenv.mkDerivation rec { pname = "abi-dumper"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { preBuild = "mkdir -p $out"; makeFlags = [ "prefix=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/lvc/abi-dumper"; description = "Dump ABI of an ELF object containing DWARF debug info"; license = licenses.lgpl21; diff --git a/nixpkgs/pkgs/development/tools/misc/act/default.nix b/nixpkgs/pkgs/development/tools/misc/act/default.nix index 4bb2d3d62456..6bf13ce7ec65 100644 --- a/nixpkgs/pkgs/development/tools/misc/act/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/act/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "act"; - version = "0.2.17"; + version = "0.2.18"; src = fetchFromGitHub { owner = "nektos"; repo = pname; rev = "v${version}"; - sha256 = "0s7bgm2q7z9xpaj6kfvg63v12k35ckaxwmh6bbjh15xibaw58183"; + sha256 = "16c5qxxi37pdcqrf8aliad6lkqx9jk57yc2q6gpw9ffar49km4qi"; }; - vendorSha256 = "0bcrw3hf92m7n58lrlm0vj1wiwwy82q2rl1a725q3d6xwvi5kh9h"; + vendorSha256 = "1xw80vb49bd0n620yaxwcvyf9glkscc42i847blan4hw6k957hii"; doCheck = false; diff --git a/nixpkgs/pkgs/development/tools/misc/arcanist/default.nix b/nixpkgs/pkgs/development/tools/misc/arcanist/default.nix index 14ef09ee7ed0..a5a9d724a79e 100644 --- a/nixpkgs/pkgs/development/tools/misc/arcanist/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/arcanist/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , flex , php -, stdenv +, lib, stdenv }: # Make a custom wrapper. If `wrapProgram` is used, arcanist thinks .arc-wrapped is being @@ -31,7 +31,7 @@ stdenv.mkDerivation { }; buildInputs = [ bison flex php ]; - postPatch = stdenv.lib.optionalString stdenv.isAarch64 '' + postPatch = lib.optionalString stdenv.isAarch64 '' substituteInPlace support/xhpast/Makefile \ --replace "-minline-all-stringops" "" ''; @@ -60,8 +60,8 @@ stdenv.mkDerivation { meta = { description = "Command line interface to Phabricator"; homepage = "http://phabricator.org"; - license = stdenv.lib.licenses.asl20; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + license = lib.licenses.asl20; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.thoughtpolice ]; }; } diff --git a/nixpkgs/pkgs/development/tools/misc/argbash/default.nix b/nixpkgs/pkgs/development/tools/misc/argbash/default.nix index 3efff5009439..571050508146 100644 --- a/nixpkgs/pkgs/development/tools/misc/argbash/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/argbash/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoconf, runtimeShell, python3Packages, makeWrapper }: +{ lib, stdenv, fetchFromGitHub, autoconf, runtimeShell, python3Packages, makeWrapper }: stdenv.mkDerivation rec { pname = "argbash"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { --prefix PATH : '${autoconf}/bin' ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Bash argument parsing code generator"; homepage = "https://argbash.io/"; license = licenses.free; # custom license. See LICENSE in source repo. diff --git a/nixpkgs/pkgs/development/tools/misc/asls/default.nix b/nixpkgs/pkgs/development/tools/misc/asls/default.nix index 0e08acdeb450..bccda0185036 100644 --- a/nixpkgs/pkgs/development/tools/misc/asls/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/asls/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , erlangR22 }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ erlangR22 ]; installPhase = "install -Dm755 -t $out/bin asls"; - meta = with stdenv.lib; { + meta = with lib; { description = "AssemblyScript Language Server"; homepage = "https://github.com/saulecabrera/asls"; license = licenses.mit; diff --git a/nixpkgs/pkgs/development/tools/misc/autobuild/default.nix b/nixpkgs/pkgs/development/tools/misc/autobuild/default.nix index 05afa379f99a..da387105cef5 100644 --- a/nixpkgs/pkgs/development/tools/misc/autobuild/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/autobuild/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, makeWrapper, perl, openssh, rsync }: +{ fetchurl, lib, stdenv, makeWrapper, perl, openssh, rsync }: stdenv.mkDerivation rec { name = "autobuild-5.3"; @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { ''; homepage = "https://josefsson.org/autobuild/"; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; }; } diff --git a/nixpkgs/pkgs/development/tools/misc/autoconf-archive/default.nix b/nixpkgs/pkgs/development/tools/misc/autoconf-archive/default.nix index f002346c9949..e0d558b18800 100644 --- a/nixpkgs/pkgs/development/tools/misc/autoconf-archive/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/autoconf-archive/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, xz }: +{ lib, stdenv, fetchurl, xz }: stdenv.mkDerivation rec { pname = "autoconf-archive"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ xz ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Archive of autoconf m4 macros"; homepage = "https://www.gnu.org/software/autoconf-archive/"; license = licenses.gpl3; diff --git a/nixpkgs/pkgs/development/tools/misc/autoconf/2.13.nix b/nixpkgs/pkgs/development/tools/misc/autoconf/2.13.nix index 424dff8541bc..e5280d46b598 100644 --- a/nixpkgs/pkgs/development/tools/misc/autoconf/2.13.nix +++ b/nixpkgs/pkgs/development/tools/misc/autoconf/2.13.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, m4, perl, lzma}: +{lib, stdenv, fetchurl, m4, perl, lzma}: stdenv.mkDerivation rec { name = "autoconf-2.13"; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { can use, in the form of M4 macro calls. ''; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/tools/misc/autoconf/2.64.nix b/nixpkgs/pkgs/development/tools/misc/autoconf/2.64.nix index 1fd18bcb12af..6976a291ae72 100644 --- a/nixpkgs/pkgs/development/tools/misc/autoconf/2.64.nix +++ b/nixpkgs/pkgs/development/tools/misc/autoconf/2.64.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, m4, perl }: +{ lib, stdenv, fetchurl, m4, perl }: stdenv.mkDerivation rec { name = "autoconf-2.64"; @@ -44,8 +44,8 @@ stdenv.mkDerivation rec { can use, in the form of M4 macro calls. ''; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.all; + platforms = lib.platforms.all; }; } diff --git a/nixpkgs/pkgs/development/tools/misc/autoconf/2.69.nix b/nixpkgs/pkgs/development/tools/misc/autoconf/2.69.nix index 500d80d4bb8f..f2f8ca0a858c 100644 --- a/nixpkgs/pkgs/development/tools/misc/autoconf/2.69.nix +++ b/nixpkgs/pkgs/development/tools/misc/autoconf/2.69.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, m4, perl }: +{ lib, stdenv, fetchurl, m4, perl }: stdenv.mkDerivation rec { name = "autoconf-2.69"; @@ -45,8 +45,8 @@ stdenv.mkDerivation rec { can use, in the form of M4 macro calls. ''; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.all; + platforms = lib.platforms.all; }; } diff --git a/nixpkgs/pkgs/development/tools/misc/autoconf/default.nix b/nixpkgs/pkgs/development/tools/misc/autoconf/default.nix index 57a92cee737b..ae8fc2d90619 100644 --- a/nixpkgs/pkgs/development/tools/misc/autoconf/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/autoconf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, m4, perl }: +{ lib, stdenv, fetchurl, m4, perl }: # Note: this package is used for bootstrapping fetchurl, and thus # cannot use fetchpatch! All mutable patches (generated by GitHub or @@ -47,8 +47,8 @@ stdenv.mkDerivation rec { can use, in the form of M4 macro calls. ''; - license = stdenv.lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; - platforms = stdenv.lib.platforms.all; + platforms = lib.platforms.all; }; } diff --git a/nixpkgs/pkgs/development/tools/misc/autogen/default.nix b/nixpkgs/pkgs/development/tools/misc/autogen/default.nix index 23235499cfbd..c6eb6916d1ec 100644 --- a/nixpkgs/pkgs/development/tools/misc/autogen/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/autogen/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPackages, fetchurl, autoreconfHook, which, pkgconfig, perl, guile, libxml2 }: +{ lib, stdenv, buildPackages, fetchurl, autoreconfHook, which, pkg-config, perl, guile, libxml2 }: stdenv.mkDerivation rec { pname = "autogen"; @@ -33,8 +33,8 @@ stdenv.mkDerivation rec { outputs = [ "bin" "dev" "lib" "out" "man" "info" ]; nativeBuildInputs = [ - which pkgconfig perl autoreconfHook/*patches applied*/ - ] ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + which pkg-config perl autoreconfHook/*patches applied*/ + ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ # autogen needs a build autogen when cross-compiling buildPackages.buildPackages.autogen buildPackages.texinfo ]; @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { # Debian: https://salsa.debian.org/debian/autogen/-/blob/master/debian/rules#L21 "--enable-timeout=78" ] - ++ (stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + ++ (lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "--with-libxml2=${libxml2.dev}" "--with-libxml2-cflags=-I${libxml2.dev}/include/libxml2" # the configure check for regcomp wants to run a host program @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { sed -e "s|$lib/lib|/no-such-autogen-lib-path|" -i $f done - '' + stdenv.lib.optionalString (!stdenv.hostPlatform.isDarwin) '' + '' + lib.optionalString (!stdenv.hostPlatform.isDarwin) '' # remove /build/** from RPATHs for f in "$bin"/bin/*; do local nrp="$(patchelf --print-rpath "$f" | sed -E 's@(:|^)/build/[^:]*:@\1@g')" @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Automated text and program generation tool"; license = with licenses; [ gpl3Plus lgpl3Plus ]; homepage = "https://www.gnu.org/software/autogen/"; diff --git a/nixpkgs/pkgs/development/tools/misc/automake/automake-1.11.x.nix b/nixpkgs/pkgs/development/tools/misc/automake/automake-1.11.x.nix index b79f30478890..5e3167d182dc 100644 --- a/nixpkgs/pkgs/development/tools/misc/automake/automake-1.11.x.nix +++ b/nixpkgs/pkgs/development/tools/misc/automake/automake-1.11.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, autoconf }: +{ lib, stdenv, fetchurl, perl, autoconf }: stdenv.mkDerivation rec { name = "automake-1.11.6"; @@ -42,8 +42,8 @@ stdenv.mkDerivation rec { Standards. Automake requires the use of Autoconf. ''; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.all; + platforms = lib.platforms.all; }; } diff --git a/nixpkgs/pkgs/development/tools/misc/automake/automake-1.15.x.nix b/nixpkgs/pkgs/development/tools/misc/automake/automake-1.15.x.nix index bf0967e9ddb4..0088eb74cc48 100644 --- a/nixpkgs/pkgs/development/tools/misc/automake/automake-1.15.x.nix +++ b/nixpkgs/pkgs/development/tools/misc/automake/automake-1.15.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, autoconf }: +{ lib, stdenv, fetchurl, perl, autoconf }: stdenv.mkDerivation rec { name = "automake-1.15.1"; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { branch = "1.15"; homepage = "https://www.gnu.org/software/automake/"; description = "GNU standard-compliant makefile generator"; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; longDescription = '' GNU Automake is a tool for automatically generating @@ -40,6 +40,6 @@ stdenv.mkDerivation rec { Standards. Automake requires the use of Autoconf. ''; - platforms = stdenv.lib.platforms.all; + platforms = lib.platforms.all; }; } diff --git a/nixpkgs/pkgs/development/tools/misc/automake/automake-1.16.x.nix b/nixpkgs/pkgs/development/tools/misc/automake/automake-1.16.x.nix index 58c559fcc566..48f01f8d0f67 100644 --- a/nixpkgs/pkgs/development/tools/misc/automake/automake-1.16.x.nix +++ b/nixpkgs/pkgs/development/tools/misc/automake/automake-1.16.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, autoconf }: +{ lib, stdenv, fetchurl, perl, autoconf }: stdenv.mkDerivation rec { name = "automake-1.16.3"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { branch = "1.16"; homepage = "https://www.gnu.org/software/automake/"; description = "GNU standard-compliant makefile generator"; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; longDescription = '' GNU Automake is a tool for automatically generating @@ -38,6 +38,6 @@ stdenv.mkDerivation rec { Standards. Automake requires the use of Autoconf. ''; - platforms = stdenv.lib.platforms.all; + platforms = lib.platforms.all; }; } diff --git a/nixpkgs/pkgs/development/tools/misc/automoc4/default.nix b/nixpkgs/pkgs/development/tools/misc/automoc4/default.nix index 1cabb1f0223e..ac027ec45301 100644 --- a/nixpkgs/pkgs/development/tools/misc/automoc4/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/automoc4/default.nix @@ -1,16 +1,18 @@ -{ stdenv, fetchurl, cmake, qt4 }: +{ lib, stdenv, fetchurl, cmake, qt4 }: stdenv.mkDerivation rec { - name = "automoc4-0.9.88"; - + pname = "automoc4"; + version = "0.9.88"; + src = fetchurl { - url = "mirror://kde/stable/automoc4/0.9.88/${name}.tar.bz2"; + url = "mirror://kde/stable/automoc4/0.9.88/${pname}.tar.bz2"; sha256 = "0jackvg0bdjg797qlbbyf9syylm0qjs55mllhn11vqjsq3s1ch93"; }; - - buildInputs = [ cmake qt4 ]; - - meta = with stdenv.lib; { + + nativeBuildInputs = [ cmake ]; + buildInputs = [ qt4 ]; + + meta = with lib; { homepage = "https://techbase.kde.org/Development/Tools/Automoc4"; description = "KDE Meta Object Compiler"; license = licenses.bsd2; diff --git a/nixpkgs/pkgs/development/tools/misc/avrdude/default.nix b/nixpkgs/pkgs/development/tools/misc/avrdude/default.nix index bb0520cf28ef..4d95310c342f 100644 --- a/nixpkgs/pkgs/development/tools/misc/avrdude/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/avrdude/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, yacc, flex, libusb-compat-0_1, libelf, libftdi1, readline +{ lib, stdenv, fetchurl, yacc, flex, libusb-compat-0_1, libelf, libftdi1, readline # docSupport is a big dependency, disabled by default , docSupport ? false, texLive ? null, texinfo ? null, texi2html ? null }: @@ -13,12 +13,12 @@ stdenv.mkDerivation rec { sha256 = "15m1w1qad3dj7r8n5ng1qqcaiyx1gyd6hnc3p2apgjllccdp77qg"; }; - configureFlags = stdenv.lib.optionals docSupport "--enable-doc"; + configureFlags = lib.optionals docSupport "--enable-doc"; buildInputs = [ yacc flex libusb-compat-0_1 libelf libftdi1 readline ] - ++ stdenv.lib.optionals docSupport [ texLive texinfo texi2html ]; + ++ lib.optionals docSupport [ texLive texinfo texi2html ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Command-line tool for programming Atmel AVR microcontrollers"; longDescription = '' AVRDUDE (AVR Downloader/UploaDEr) is an utility to diff --git a/nixpkgs/pkgs/development/tools/misc/awf/default.nix b/nixpkgs/pkgs/development/tools/misc/awf/default.nix index b1e627e7aa8c..b73f1dc04502 100644 --- a/nixpkgs/pkgs/development/tools/misc/awf/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/awf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, gtk2, gtk3, pkgconfig +{ lib, stdenv, fetchFromGitHub, autoreconfHook, gtk2, gtk3, pkg-config , wrapGAppsHook }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0jl2kxwpvf2n8974zzyp69mqhsbjnjcqm39y0jvijvjb1iy8iman"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig wrapGAppsHook ]; + nativeBuildInputs = [ autoreconfHook pkg-config wrapGAppsHook ]; buildInputs = [ gtk2 gtk3 ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ./autogen.sh ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A Widget Factory"; longDescription = '' A widget factory is a theme preview application for gtk2 and diff --git a/nixpkgs/pkgs/development/tools/misc/babeltrace/default.nix b/nixpkgs/pkgs/development/tools/misc/babeltrace/default.nix index 03539eb2cc84..26c484017d2b 100644 --- a/nixpkgs/pkgs/development/tools/misc/babeltrace/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/babeltrace/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, libuuid, popt, elfutils }: +{ lib, stdenv, fetchurl, pkg-config, glib, libuuid, popt, elfutils }: stdenv.mkDerivation rec { name = "babeltrace-1.5.8"; @@ -8,10 +8,10 @@ stdenv.mkDerivation rec { sha256 = "1hkg3phnamxfrhwzmiiirbhdgckzfkqwhajl0lmr1wfps7j47wcz"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib libuuid popt elfutils ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Command-line tool and library to read and convert LTTng tracefiles"; homepage = "https://www.efficios.com/babeltrace"; license = licenses.mit; diff --git a/nixpkgs/pkgs/development/tools/misc/bashdb/default.nix b/nixpkgs/pkgs/development/tools/misc/bashdb/default.nix index 0897960f6aa9..72ec8c96be34 100644 --- a/nixpkgs/pkgs/development/tools/misc/bashdb/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/bashdb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, python3Packages }: +{ lib, stdenv, fetchurl, makeWrapper, python3Packages }: stdenv.mkDerivation rec { pname = "bashdb"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { description = "Bash script debugger"; homepage = "http://bashdb.sourceforge.net/"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; }; } diff --git a/nixpkgs/pkgs/development/tools/misc/bin_replace_string/default.nix b/nixpkgs/pkgs/development/tools/misc/bin_replace_string/default.nix index 8fc809f0f0cf..a732d6e732c5 100644 --- a/nixpkgs/pkgs/development/tools/misc/bin_replace_string/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/bin_replace_string/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libelf, txt2man }: +{ lib, stdenv, fetchurl, libelf, txt2man }: stdenv.mkDerivation { pname = "bin_replace_string"; @@ -14,7 +14,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Edit precompiled binaries"; longDescription = '' bin_replace_string edits C-style strings in precompiled binaries. This is diff --git a/nixpkgs/pkgs/development/tools/misc/binutils/default.nix b/nixpkgs/pkgs/development/tools/misc/binutils/default.nix index 559268521460..5022f8a7f8cc 100644 --- a/nixpkgs/pkgs/development/tools/misc/binutils/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/binutils/default.nix @@ -4,7 +4,7 @@ , withAllTargets ? false, libbfd, libopcodes , enableShared ? !stdenv.hostPlatform.isStatic , noSysDirs -, gold ? !stdenv.buildPlatform.isDarwin || stdenv.hostPlatform == stdenv.targetPlatform +, gold ? true , bison ? null , flex , texinfo @@ -19,7 +19,7 @@ let reuseLibs = enableShared && withAllTargets; - version = "2.34"; + version = "2.35.1"; basename = "binutils"; # The targetPrefix prepended to binary names to allow multiple binuntils on the # PATH to both be usable. @@ -34,7 +34,7 @@ let # HACK to ensure that we preserve source from bootstrap binutils to not rebuild LLVM normal-src = stdenv.__bootPackages.binutils-unwrapped.src or (fetchurl { url = "mirror://gnu/binutils/${basename}-${version}.tar.bz2"; - sha256 = "1rin1f5c7wm4n3piky6xilcrpf2s0n3dd5vqq8irrxkcic3i1w49"; + sha256 = "sha256-Mg56HQ9G/Nn0E/EEbiFsviO7K85t62xqYzBEJeSLGUI="; }); in @@ -48,12 +48,6 @@ stdenv.mkDerivation { # Make binutils output deterministic by default. ./deterministic.patch - # Bfd looks in BINDIR/../lib for some plugins that don't - # exist. This is pointless (since users can't install plugins - # there) and causes a cycle between the lib and bin outputs, so - # get rid of it. - ./no-plugins.patch - # Help bfd choose between elf32-littlearm, elf32-littlearm-symbian, and # elf32-littlearm-vxworks in favor of the first. # https://github.com/NixOS/nixpkgs/pull/30484#issuecomment-345472766 diff --git a/nixpkgs/pkgs/development/tools/misc/binutils/no-plugins.patch b/nixpkgs/pkgs/development/tools/misc/binutils/no-plugins.patch deleted file mode 100644 index 68cf51b7dd3c..000000000000 --- a/nixpkgs/pkgs/development/tools/misc/binutils/no-plugins.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/bfd/plugin.c b/bfd/plugin.c -index 537ab60311..bfe7957f96 100644 ---- a/bfd/plugin.c -+++ b/bfd/plugin.c -@@ -386,6 +386,7 @@ load_plugin (bfd *abfd) - if (plugin_program_name == NULL) - return found; - -+#if 0 - /* Try not to search the same dir twice, by looking at st_dev and - st_ino for the dir. If we are on a file system that always sets - st_ino to zero or the actual st_ino is zero we might waste some -@@ -437,7 +438,7 @@ load_plugin (bfd *abfd) - if (found) - break; - } -- -+#endif - return found; - } - diff --git a/nixpkgs/pkgs/development/tools/misc/blackmagic/default.nix b/nixpkgs/pkgs/development/tools/misc/blackmagic/default.nix index 48ae364a26eb..c49187273c46 100644 --- a/nixpkgs/pkgs/development/tools/misc/blackmagic/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/blackmagic/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub -, gcc-arm-embedded, libftdi1, libusb-compat-0_1, pkgconfig +, gcc-arm-embedded, libftdi1, libusb-compat-0_1, pkg-config , python, pythonPackages }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - gcc-arm-embedded pkgconfig + gcc-arm-embedded pkg-config ]; buildInputs = [ diff --git a/nixpkgs/pkgs/development/tools/misc/bossa/default.nix b/nixpkgs/pkgs/development/tools/misc/bossa/default.nix index 38cc2867650c..74073722857f 100644 --- a/nixpkgs/pkgs/development/tools/misc/bossa/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/bossa/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, wxGTK, libX11, readline }: +{ lib, stdenv, fetchgit, wxGTK, libX11, readline }: let # BOSSA needs a "bin2c" program to embed images. @@ -8,8 +8,8 @@ let name = "bossa-bin2c"; src = ./bin2c.c; dontUnpack = true; - buildPhase = ''cc $src -o bin2c''; - installPhase = ''mkdir -p $out/bin; cp bin2c $out/bin/''; + buildPhase = "cc $src -o bin2c"; + installPhase = "mkdir -p $out/bin; cp bin2c $out/bin/"; }; in @@ -36,7 +36,7 @@ stdenv.mkDerivation { cp bin/bossa{c,sh,} $out/bin/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A flash programming utility for Atmel's SAM family of flash-based ARM microcontrollers"; longDescription = '' BOSSA is a flash programming utility for Atmel's SAM family of diff --git a/nixpkgs/pkgs/development/tools/misc/bsdbuild/default.nix b/nixpkgs/pkgs/development/tools/misc/bsdbuild/default.nix index 6ba8064c094d..e3bfc958437a 100644 --- a/nixpkgs/pkgs/development/tools/misc/bsdbuild/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/bsdbuild/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, libtool, pkgconfig, gettext, mandoc, ed }: +{ lib, stdenv, fetchurl, perl, libtool, pkg-config, gettext, mandoc, ed }: stdenv.mkDerivation rec { pname = "bsdbuild"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ perl mandoc ed ]; - nativeBuildInputs = [ pkgconfig libtool gettext ]; + nativeBuildInputs = [ pkg-config libtool gettext ]; prePatch = '' #ignore unfamiliar flags @@ -62,7 +62,7 @@ EOF directory, BSDBuild will produce the required Makefiles in place). ''; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.bsd3; + platforms = lib.platforms.linux; }; } diff --git a/nixpkgs/pkgs/development/tools/misc/cbrowser/default.nix b/nixpkgs/pkgs/development/tools/misc/cbrowser/default.nix index f3ba4b3a70d7..0f7edeea812f 100644 --- a/nixpkgs/pkgs/development/tools/misc/cbrowser/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/cbrowser/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, tk, makeWrapper }: +{ fetchurl, lib, stdenv, tk, makeWrapper }: stdenv.mkDerivation rec { name = "cbrowser-0.8"; @@ -23,12 +23,12 @@ stdenv.mkDerivation rec { meta = { description = "Tcl/Tk GUI front-end to cscope"; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; homepage = "https://sourceforge.net/projects/cbrowser/"; - maintainers = with stdenv.lib.maintainers; [viric]; + maintainers = with lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + platforms = with lib.platforms; linux; }; } diff --git a/nixpkgs/pkgs/development/tools/misc/cc-tool/default.nix b/nixpkgs/pkgs/development/tools/misc/cc-tool/default.nix index 6be0ab2acb50..e2a511a0e328 100644 --- a/nixpkgs/pkgs/development/tools/misc/cc-tool/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/cc-tool/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , autoreconfHook , boost @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { install -D udev/90-cc-debugger.rules $out/lib/udev/rules.d/90-cc-debugger.rules ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Command line tool for the Texas Instruments CC Debugger"; longDescription = '' cc-tool provides support for Texas Instruments CC Debugger diff --git a/nixpkgs/pkgs/development/tools/misc/ccache/default.nix b/nixpkgs/pkgs/development/tools/misc/ccache/default.nix index f9254b2cf15e..655807d95069 100644 --- a/nixpkgs/pkgs/development/tools/misc/ccache/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/ccache/default.nix @@ -60,7 +60,7 @@ let ccache = stdenv.mkDerivation rec { local cname="$1" if [ -x "${unwrappedCC}/bin/$cname" ]; then makeWrapper ${ccache}/bin/ccache $out/bin/$cname \ - --run ${stdenv.lib.escapeShellArg extraConfig} \ + --run ${lib.escapeShellArg extraConfig} \ --add-flags ${unwrappedCC}/bin/$cname fi } @@ -84,7 +84,7 @@ let ccache = stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Compiler cache for fast recompilation of C/C++ code"; homepage = "https://ccache.dev"; downloadPage = "https://ccache.dev/download.html"; diff --git a/nixpkgs/pkgs/development/tools/misc/ccls/default.nix b/nixpkgs/pkgs/development/tools/misc/ccls/default.nix index 16365a462a94..40b53ca6934a 100644 --- a/nixpkgs/pkgs/development/tools/misc/ccls/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/ccls/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , cmake, llvmPackages, rapidjson, runtimeShell }: stdenv.mkDerivation rec { @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { postFixup = '' # We need to tell ccls where to find the standard library headers. - standard_library_includes="\\\"-isystem\\\", \\\"${stdenv.lib.getDev stdenv.cc.libc}/include\\\"" + standard_library_includes="\\\"-isystem\\\", \\\"${lib.getDev stdenv.cc.libc}/include\\\"" standard_library_includes+=", \\\"-isystem\\\", \\\"${llvmPackages.libcxx}/include/c++/v1\\\"" export standard_library_includes @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { chmod --reference=$out/bin/$wrapped $out/bin/ccls ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A c/c++ language server powered by clang"; homepage = "https://github.com/MaskRay/ccls"; license = licenses.asl20; diff --git a/nixpkgs/pkgs/development/tools/misc/cflow/default.nix b/nixpkgs/pkgs/development/tools/misc/cflow/default.nix index 1215c29c4776..b9e75d7cb2a3 100644 --- a/nixpkgs/pkgs/development/tools/misc/cflow/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/cflow/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gettext, emacs }: +{ lib, stdenv, fetchurl, gettext, emacs }: stdenv.mkDerivation rec { name = "cflow-1.6"; @@ -16,14 +16,14 @@ stdenv.mkDerivation rec { buildInputs = [ gettext ] ++ # We don't have Emacs/GTK/etc. on {Dar,Cyg}win. - stdenv.lib.optional - (! (stdenv.lib.lists.any (x: stdenv.hostPlatform.system == x) + lib.optional + (! (lib.lists.any (x: stdenv.hostPlatform.system == x) [ "i686-cygwin" ])) emacs; doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Tool to analyze the control flow of C programs"; longDescription = '' @@ -45,13 +45,6 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.vrthra ]; - /* On Darwin, build fails with: - - Undefined symbols: - "_argp_program_version", referenced from: - _argp_program_version$non_lazy_ptr in libcflow.a(argp-parse.o) - ld: symbol(s) not found - */ - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/nixpkgs/pkgs/development/tools/misc/cgdb/default.nix b/nixpkgs/pkgs/development/tools/misc/cgdb/default.nix index a863cec1d4c5..0e92d373c0b3 100644 --- a/nixpkgs/pkgs/development/tools/misc/cgdb/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/cgdb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses, readline, flex, texinfo }: +{ lib, stdenv, fetchurl, ncurses, readline, flex, texinfo }: stdenv.mkDerivation rec { pname = "cgdb"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses readline flex texinfo ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A curses interface to gdb"; homepage = "https://cgdb.github.io/"; diff --git a/nixpkgs/pkgs/development/tools/misc/checkbashisms/default.nix b/nixpkgs/pkgs/development/tools/misc/checkbashisms/default.nix index 86ac37ee4913..524abbfdc909 100644 --- a/nixpkgs/pkgs/development/tools/misc/checkbashisms/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/checkbashisms/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl }: +{ lib, stdenv, fetchurl, perl }: stdenv.mkDerivation rec { version = "2.0.0.2"; pname = "checkbashisms"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://sourceforge.net/projects/checkbaskisms/"; description = "Check shell scripts for non-portable syntax"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl2; + platforms = lib.platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/tools/misc/chrpath/default.nix b/nixpkgs/pkgs/development/tools/misc/chrpath/default.nix index 7e08157d7bd4..ff804f897d1e 100644 --- a/nixpkgs/pkgs/development/tools/misc/chrpath/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/chrpath/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation { name = "chrpath-0.16"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "0yvfq891mcdkf8g18gjjkn2m5rvs8z4z4cl1vwdhx6f2p9a4q3dv"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Command line tool to adjust the RPATH or RUNPATH of ELF binaries"; longDescription = '' chrpath changes, lists or removes the rpath or runpath setting in a diff --git a/nixpkgs/pkgs/development/tools/misc/circleci-cli/default.nix b/nixpkgs/pkgs/development/tools/misc/circleci-cli/default.nix index ef04e78da609..73ea64f1d62c 100644 --- a/nixpkgs/pkgs/development/tools/misc/circleci-cli/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/circleci-cli/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchFromGitHub, buildGoModule }: +{ lib, stdenv, fetchFromGitHub, buildGoModule }: buildGoModule rec { pname = "circleci-cli"; - version = "0.1.11540"; + version = "0.1.11924"; src = fetchFromGitHub { owner = "CircleCI-Public"; repo = pname; rev = "v${version}"; - sha256 = "QtD+H59AlXp+3mXtUA44Dl+3xEvWdO8FybuBnL9sjBA="; + sha256 = "sha256-KY1kqqRRpwNt0ovllfFcWSsJAH2J1NrlQAueqQrw354="; }; - vendorSha256 = "fIk443TD4W0hhNuvFSZiV+fdxjelNsxh1+3qtw9yiZY="; + vendorSha256 = "sha256-6FBMLwoLM2BtnMHQfpY7f7NiQt5evsL4CfYTZvr3gAs="; doCheck = false; @@ -26,7 +26,7 @@ buildGoModule rec { install -Dm644 -t $out/share/circleci-cli _data/data.yml ''; - meta = with stdenv.lib; { + meta = with lib; { # Box blurb edited from the AUR package circleci-cli description = '' Command to enable you to reproduce the CircleCI environment locally and diff --git a/nixpkgs/pkgs/development/tools/misc/cl-launch/default.nix b/nixpkgs/pkgs/development/tools/misc/cl-launch/default.nix index c245a32a06d9..4fe93694ab77 100644 --- a/nixpkgs/pkgs/development/tools/misc/cl-launch/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/cl-launch/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: let s = # Generated upstream information rec { @@ -30,9 +30,9 @@ stdenv.mkDerivation { meta = { inherit (s) version; - description = ''Common Lisp launcher script''; - license = stdenv.lib.licenses.llgpl21 ; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.unix; + description = "Common Lisp launcher script"; + license = lib.licenses.llgpl21 ; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/tools/misc/cli11/default.nix b/nixpkgs/pkgs/development/tools/misc/cli11/default.nix index 5694693615dd..03c3e51cb89b 100644 --- a/nixpkgs/pkgs/development/tools/misc/cli11/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/cli11/default.nix @@ -1,5 +1,5 @@ { - stdenv, + lib, stdenv, fetchFromGitHub, cmake, gtest, @@ -30,9 +30,7 @@ stdenv.mkDerivation rec { sed -i '/TrueFalseTest/d' tests/CMakeLists.txt ''; - enableParallelBuilding = true; - - meta = with stdenv.lib; { + meta = with lib; { description = "Command line parser for C++11"; homepage = "https://github.com/CLIUtils/CLI11"; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/development/tools/misc/clojure-lsp/default.nix b/nixpkgs/pkgs/development/tools/misc/clojure-lsp/default.nix index 7f6a4eddcab0..af435d417cef 100644 --- a/nixpkgs/pkgs/development/tools/misc/clojure-lsp/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/clojure-lsp/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl, jre, makeWrapper }: +{ lib, stdenv, fetchurl, jre, makeWrapper }: stdenv.mkDerivation rec { pname = "clojure-lsp"; - version = "20201228T020543"; + version = "2021.01.20-01.39.32"; src = fetchurl { - url = "https://github.com/clojure-lsp/clojure-lsp/releases/download/release-${version}/${pname}.jar"; - sha256 = "0jkpw7dx7976p63c08bp43fiwk6f2h2nxj9vv1zr103hgywpplri"; + url = "https://github.com/clojure-lsp/clojure-lsp/releases/download/${version}/${pname}.jar"; + sha256 = "sha256-DqvAIM5YHtcUNZHoH+fcZym6EaPX5a/vgphTFfTO6bU="; }; dontUnpack = true; @@ -16,12 +16,12 @@ stdenv.mkDerivation rec { installPhase = '' install -Dm644 $src $out/share/java/${pname}.jar makeWrapper ${jre}/bin/java $out/bin/${pname} \ - --add-flags "-jar $out/share/java/${pname}.jar" \ --add-flags "-Xmx2g" \ - --add-flags "-server" + --add-flags "-server" \ + --add-flags "-jar $out/share/java/${pname}.jar" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Language Server Protocol (LSP) for Clojure"; homepage = "https://github.com/snoe/clojure-lsp"; license = licenses.mit; diff --git a/nixpkgs/pkgs/development/tools/misc/coccinelle/default.nix b/nixpkgs/pkgs/development/tools/misc/coccinelle/default.nix index f8cad56f0995..40a22f18203b 100644 --- a/nixpkgs/pkgs/development/tools/misc/coccinelle/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/coccinelle/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, python, ncurses, ocamlPackages, pkgconfig }: +{ fetchurl, lib, stdenv, python, ncurses, ocamlPackages, pkg-config }: stdenv.mkDerivation rec { pname = "coccinelle"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = with ocamlPackages; [ ocaml findlib menhir ocaml_pcre pycaml - python ncurses pkgconfig + python ncurses pkg-config ]; doCheck = !stdenv.isDarwin; @@ -50,8 +50,8 @@ stdenv.mkDerivation rec { ''; homepage = "http://coccinelle.lip6.fr/"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + license = lib.licenses.gpl2; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.thoughtpolice ]; }; } diff --git a/nixpkgs/pkgs/development/tools/misc/complexity/default.nix b/nixpkgs/pkgs/development/tools/misc/complexity/default.nix index 71ed762df040..6e70fbcfcde5 100644 --- a/nixpkgs/pkgs/development/tools/misc/complexity/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/complexity/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, autogen }: +{ fetchurl, lib, stdenv, autogen }: stdenv.mkDerivation rec { pname = "complexity"; @@ -22,11 +22,11 @@ stdenv.mkDerivation rec { addresses several issues not considered in that scoring scheme. ''; - license = stdenv.lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; homepage = "https://www.gnu.org/software/complexity/"; - platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; + platforms = lib.platforms.gnu ++ lib.platforms.linux; maintainers = [ ]; }; } diff --git a/nixpkgs/pkgs/development/tools/misc/cppi/default.nix b/nixpkgs/pkgs/development/tools/misc/cppi/default.nix index 8de7391b9ec6..9fe5ed966724 100644 --- a/nixpkgs/pkgs/development/tools/misc/cppi/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/cppi/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv }: +{ fetchurl, lib, stdenv }: stdenv.mkDerivation rec { name = "cppi-1.18"; @@ -23,9 +23,9 @@ stdenv.mkDerivation rec { to the level of nesting of that directive. ''; - license = stdenv.lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; maintainers = [ ]; - platforms = stdenv.lib.platforms.all; + platforms = lib.platforms.all; }; } diff --git a/nixpkgs/pkgs/development/tools/misc/cproto/default.nix b/nixpkgs/pkgs/development/tools/misc/cproto/default.nix index e18196fe595f..5ee1a64f2c23 100644 --- a/nixpkgs/pkgs/development/tools/misc/cproto/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/cproto/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, flex, bison }: +{ lib, stdenv, fetchurl, flex, bison }: stdenv.mkDerivation rec { pname = "cproto"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { [ "$("$out/bin/cproto" -V 2>&1)" = '${version}' ] ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Tool to generate C function prototypes from C source code"; homepage = "https://invisible-island.net/cproto/"; license = licenses.publicDomain; diff --git a/nixpkgs/pkgs/development/tools/misc/creduce/default.nix b/nixpkgs/pkgs/development/tools/misc/creduce/default.nix index fc6f7156a81b..75234fde6ca5 100644 --- a/nixpkgs/pkgs/development/tools/misc/creduce/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/creduce/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, makeWrapper +{ lib, stdenv, fetchurl, cmake, makeWrapper , llvm, clang-unwrapped , flex , zlib @@ -27,19 +27,16 @@ stdenv.mkDerivation rec { # On Linux, c-reduce's preferred way to reason about # the cpu architecture/topology is to use 'lscpu', # so let's make sure it knows where to find it: - postPatch = stdenv.lib.optionalString stdenv.isLinux '' + postPatch = lib.optionalString stdenv.isLinux '' substituteInPlace creduce/creduce_utils.pm --replace \ lscpu ${util-linux}/bin/lscpu ''; - - enableParallelBuilding = true; - postInstall = '' wrapProgram $out/bin/creduce --prefix PERL5LIB : "$PERL5LIB" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A C program reducer"; homepage = "https://embed.cs.utah.edu/creduce"; # Officially, the license is: https://github.com/csmith-project/creduce/blob/master/COPYING diff --git a/nixpkgs/pkgs/development/tools/misc/cscope/default.nix b/nixpkgs/pkgs/development/tools/misc/cscope/default.nix index 31d4e83663be..7eb38e385e8f 100644 --- a/nixpkgs/pkgs/development/tools/misc/cscope/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/cscope/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, ncurses +{ fetchurl, lib, stdenv, ncurses , emacsSupport ? true, emacs }: @@ -13,9 +13,9 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-ncurses=${ncurses.dev}" ]; buildInputs = [ ncurses ]; - nativeBuildInputs = stdenv.lib.optional emacsSupport emacs; + nativeBuildInputs = lib.optional emacsSupport emacs; - postInstall = stdenv.lib.optionalString emacsSupport '' + postInstall = lib.optionalString emacsSupport '' cd "contrib/xcscope" sed -i "cscope-indexer" \ @@ -46,8 +46,8 @@ stdenv.mkDerivation rec { homepage = "http://cscope.sourceforge.net/"; - maintainers = with stdenv.lib.maintainers; [viric]; + maintainers = with lib.maintainers; [viric]; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/tools/misc/csmith/default.nix b/nixpkgs/pkgs/development/tools/misc/csmith/default.nix index 253dd4065e40..0643e81edf99 100644 --- a/nixpkgs/pkgs/development/tools/misc/csmith/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/csmith/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, m4, makeWrapper, libbsd, perlPackages }: +{ lib, stdenv, fetchurl, m4, makeWrapper, libbsd, perlPackages }: stdenv.mkDerivation rec { pname = "csmith"; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "A random generator of C programs"; homepage = "https://embed.cs.utah.edu/csmith"; # Officially, the license is this: https://github.com/csmith-project/csmith/blob/master/COPYING diff --git a/nixpkgs/pkgs/development/tools/misc/ctags/default.nix b/nixpkgs/pkgs/development/tools/misc/ctags/default.nix index 3adca34a5bbc..90825db2a549 100644 --- a/nixpkgs/pkgs/development/tools/misc/ctags/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/ctags/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchsvn, autoreconfHook }: +{ lib, stdenv, fetchsvn, autoreconfHook }: stdenv.mkDerivation rec { name = "ctags-${revision}"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { # don't use $T(E)MP which is set to the build directory configureFlags= [ "--enable-tmpdir=/tmp" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A tool for fast source code browsing (exuberant ctags)"; longDescription = '' Ctags generates an index (or tag) file of language objects found diff --git a/nixpkgs/pkgs/development/tools/misc/ctags/wrapped.nix b/nixpkgs/pkgs/development/tools/misc/ctags/wrapped.nix index 08f8049aa8a1..f658e78d5db0 100644 --- a/nixpkgs/pkgs/development/tools/misc/ctags/wrapped.nix +++ b/nixpkgs/pkgs/development/tools/misc/ctags/wrapped.nix @@ -1,6 +1,6 @@ { pkgs, ctags }: -with pkgs.stdenv.lib; +with pkgs.lib; # define some ctags wrappers adding support for some not that common languages # customization: diff --git a/nixpkgs/pkgs/development/tools/misc/cwebbin/default.nix b/nixpkgs/pkgs/development/tools/misc/cwebbin/default.nix index 0b89156d71aa..3ab8800f3c4e 100644 --- a/nixpkgs/pkgs/development/tools/misc/cwebbin/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/cwebbin/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchurl, tie }: +{ lib, stdenv, fetchFromGitHub, fetchurl, tie }: stdenv.mkDerivation rec { pname = "cwebbin"; @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { make -f Makefile.unix install $makeFlags ''; - meta = with stdenv.lib; { + meta = with lib; { inherit (src.meta) homepage; description = "Literate Programming in C/C++"; platforms = with platforms; unix; diff --git a/nixpkgs/pkgs/development/tools/misc/d-feet/default.nix b/nixpkgs/pkgs/development/tools/misc/d-feet/default.nix index 53ba94c7e81e..60d3c5c45394 100644 --- a/nixpkgs/pkgs/development/tools/misc/d-feet/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/d-feet/default.nix @@ -1,5 +1,5 @@ -{ stdenv -, pkgconfig +{ lib, stdenv +, pkg-config , fetchurl , meson , ninja @@ -21,7 +21,7 @@ python3.pkgs.buildPythonApplication rec { format = "other"; src = fetchurl { - url = "mirror://gnome/sources/d-feet/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/d-feet/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1cgxgpj546jgpyns6z9nkm5k48lid8s36mvzj8ydkjqws2d19zqz"; }; @@ -31,7 +31,7 @@ python3.pkgs.buildPythonApplication rec { itstool meson ninja - pkgconfig + pkg-config python3 wrapGAppsHook ]; @@ -68,7 +68,7 @@ python3.pkgs.buildPythonApplication rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "D-Feet is an easy to use D-Bus debugger"; longDescription = '' D-Feet can be used to inspect D-Bus interfaces of running programs diff --git a/nixpkgs/pkgs/development/tools/misc/dbench/default.nix b/nixpkgs/pkgs/development/tools/misc/dbench/default.nix index 49fb1efbd4a9..9565eaa36262 100644 --- a/nixpkgs/pkgs/development/tools/misc/dbench/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/dbench/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, autoconf, popt, zlib, rpcsvc-proto, libtirpc }: +{ lib, stdenv, fetchgit, autoconf, popt, zlib, rpcsvc-proto, libtirpc }: stdenv.mkDerivation { name = "dbench-2013-01-01"; @@ -35,7 +35,7 @@ stdenv.mkDerivation { ln -s dbench/doc/dbench/loadfiles $out/share/loadfiles ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Filesystem benchmark tool based on load patterns"; homepage = "https://dbench.samba.org/"; license = licenses.gpl3; diff --git a/nixpkgs/pkgs/development/tools/misc/ddd/default.nix b/nixpkgs/pkgs/development/tools/misc/ddd/default.nix index 174168b7db7d..74eb9fcb2936 100644 --- a/nixpkgs/pkgs/development/tools/misc/ddd/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/ddd/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, motif, ncurses, libX11, libXt}: +{lib, stdenv, fetchurl, motif, ncurses, libX11, libXt}: stdenv.mkDerivation rec { name = "ddd-3.3.12"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://www.gnu.org/software/ddd"; description = "Graphical front-end for command-line debuggers"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; }; } diff --git a/nixpkgs/pkgs/development/tools/misc/dejagnu/default.nix b/nixpkgs/pkgs/development/tools/misc/dejagnu/default.nix index 73e2ab8ef92d..285805ccb02c 100644 --- a/nixpkgs/pkgs/development/tools/misc/dejagnu/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/dejagnu/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, expect, makeWrapper }: +{ fetchurl, lib, stdenv, expect, makeWrapper }: stdenv.mkDerivation rec { name = "dejagnu-1.6.2"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { --prefix PATH ":" "${expect}/bin" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Framework for testing other programs"; longDescription = '' diff --git a/nixpkgs/pkgs/development/tools/misc/dfu-programmer/default.nix b/nixpkgs/pkgs/development/tools/misc/dfu-programmer/default.nix index 1aaf113d0b95..f0a3a9b76006 100644 --- a/nixpkgs/pkgs/development/tools/misc/dfu-programmer/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/dfu-programmer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libusb-compat-0_1 }: +{ lib, stdenv, fetchurl, libusb-compat-0_1 }: let version = "0.7.2"; in @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-libusb_1_0" ]; - meta = with stdenv.lib; { + meta = with lib; { license = licenses.gpl2; description = "A Device Firmware Update based USB programmer for Atmel chips with a USB bootloader"; homepage = "http://dfu-programmer.sourceforge.net/"; diff --git a/nixpkgs/pkgs/development/tools/misc/dfu-util/default.nix b/nixpkgs/pkgs/development/tools/misc/dfu-util/default.nix index 9af9ddc0df7c..85917a114c0f 100644 --- a/nixpkgs/pkgs/development/tools/misc/dfu-util/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/dfu-util/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchurl, pkgconfig, libusb1 }: +{ lib, stdenv, fetchurl, pkg-config, libusb1 }: stdenv.mkDerivation rec { pname = "dfu-util"; version = "0.10"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libusb1 ]; src = fetchurl { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0hlvc47ccf5hry13saqhc1j5cdq5jyjv4i05kj0mdh3rzj6wagd0"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Device firmware update (DFU) USB programmer"; longDescription = '' dfu-util is a program that implements the host (PC) side of the USB diff --git a/nixpkgs/pkgs/development/tools/misc/dialog/default.nix b/nixpkgs/pkgs/development/tools/misc/dialog/default.nix index ead105779788..97db1b5b7e81 100644 --- a/nixpkgs/pkgs/development/tools/misc/dialog/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/dialog/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, ncurses +{ lib, stdenv, fetchurl +, ncurses , withLibrary ? false, libtool , unicodeSupport ? true , enableShared ? !stdenv.isDarwin @@ -9,32 +10,32 @@ assert unicodeSupport -> ncurses.unicode && ncurses != null; stdenv.mkDerivation rec { pname = "dialog"; - version = "1.3-20190211"; + version = "1.3-20201126"; src = fetchurl { urls = [ "ftp://ftp.invisible-island.net/dialog/${pname}-${version}.tgz" "https://invisible-mirror.net/archives/dialog/${pname}-${version}.tgz" ]; - sha256 = "1lx0bvradzx1zl7znlrsnyljcs596r7wamkhyq37ikbxsy4y5h29"; + sha256 = "sha256-ySM6bI6jOlniN45RRq4r0TtRl0TP22R690IK2sWtOGY="; }; buildInputs = [ ncurses ]; configureFlags = [ "--disable-rpath-hacks" - (stdenv.lib.withFeature withLibrary "libtool") - "--with-ncurses${stdenv.lib.optionalString unicodeSupport "w"}" - "--with-libtool-opts=${stdenv.lib.optionalString enableShared "-shared"}" + (lib.withFeature withLibrary "libtool") + "--with-ncurses${lib.optionalString unicodeSupport "w"}" + "--with-libtool-opts=${lib.optionalString enableShared "-shared"}" ]; - installTargets = [ "install${stdenv.lib.optionalString withLibrary "-full"}" ]; + installTargets = [ "install${lib.optionalString withLibrary "-full"}" ]; - meta = { + meta = with lib; { homepage = "https://invisible-island.net/dialog/dialog.html"; description = "Display dialog boxes from shell"; - license = stdenv.lib.licenses.lgpl21Plus; - maintainers = [ stdenv.lib.maintainers.spacefrogg ]; - platforms = stdenv.lib.platforms.all; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ AndersonTorres spacefrogg ]; + platforms = ncurses.meta.platforms; }; } diff --git a/nixpkgs/pkgs/development/tools/misc/direvent/default.nix b/nixpkgs/pkgs/development/tools/misc/direvent/default.nix index 0ae1884646d9..3477d60b7849 100644 --- a/nixpkgs/pkgs/development/tools/misc/direvent/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/direvent/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl }: @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0m9vi01b1km0cpknflyzsjnknbava0s1n6393b2bpjwyvb6j5613"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Directory event monitoring daemon"; homepage = "https://www.gnu.org.ua/software/direvent/"; license = licenses.gpl3Plus; diff --git a/nixpkgs/pkgs/development/tools/misc/distcc/default.nix b/nixpkgs/pkgs/development/tools/misc/distcc/default.nix index 3894ed58728d..cad9fe0960b5 100644 --- a/nixpkgs/pkgs/development/tools/misc/distcc/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/distcc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, popt, avahi, pkgconfig, python, gtk2, runCommand +{ lib, stdenv, fetchFromGitHub, popt, avahi, pkg-config, python, gtk2, runCommand , gcc, autoconf, automake, which, procps, libiberty_static , runtimeShell , sysconfDir ? "" # set this parameter to override the default value $out/etc @@ -17,8 +17,8 @@ let sha256 = "1vj31wcdas8wy52hy6749mlrca9v6ynycdiigx5ay8pnya9z73c6"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [popt avahi pkgconfig python gtk2 autoconf automake which procps libiberty_static]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [popt avahi pkg-config python gtk2 autoconf automake which procps libiberty_static]; preConfigure = '' export CPATH=$(ls -d ${gcc.cc}/lib/gcc/*/${gcc.cc.version}/plugin/include) @@ -76,8 +76,8 @@ let homepage = "http://distcc.org"; license = "GPL"; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ anderspapitto ]; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ anderspapitto ]; }; }; in diff --git a/nixpkgs/pkgs/development/tools/misc/distcc/masq.nix b/nixpkgs/pkgs/development/tools/misc/distcc/masq.nix index f3bccde81606..2387ab1bd418 100644 --- a/nixpkgs/pkgs/development/tools/misc/distcc/masq.nix +++ b/nixpkgs/pkgs/development/tools/misc/distcc/masq.nix @@ -1,4 +1,4 @@ -{ stdenv, gccRaw, binutils }: +{ lib, stdenv, gccRaw, binutils }: stdenv.mkDerivation { name = "distcc-masq-${gccRaw.name}"; @@ -39,6 +39,6 @@ stdenv.mkDerivation { ''; meta = { - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/nixpkgs/pkgs/development/tools/misc/doclifter/default.nix b/nixpkgs/pkgs/development/tools/misc/doclifter/default.nix index 3c6fa76616fc..8b7717881119 100644 --- a/nixpkgs/pkgs/development/tools/misc/doclifter/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/doclifter/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, python}: +{lib, stdenv, fetchurl, python}: stdenv.mkDerivation { name = "doclifter-2.19"; @@ -7,20 +7,20 @@ stdenv.mkDerivation { sha256 = "1as6z7mdjrrkw2kism41q5ybvyzvwcmj9qzla2fz98v9f4jbj2s2"; }; buildInputs = [ python ]; - + makeFlags = [ "PREFIX=$(out)" ]; - + preInstall = '' mkdir -p $out/bin mkdir -p $out/share/man/man1 cp manlifter $out/bin cp manlifter.1 $out/share/man/man1 ''; - + meta = { description = "Lift documents in nroff markups to XML-DocBook"; homepage = "http://www.catb.org/esr/doclifter"; license = "BSD"; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/tools/misc/docopts/default.nix b/nixpkgs/pkgs/development/tools/misc/docopts/default.nix index 98a24ca5ebe4..3614270574e4 100644 --- a/nixpkgs/pkgs/development/tools/misc/docopts/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/docopts/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "docopts"; @@ -21,7 +21,7 @@ buildGoPackage rec { install -D -m 755 ./go/src/$goPackagePath/docopts.sh $out/bin/docopts.sh ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/docopt/${pname}"; description = "docopt CLI tool for shell scripting"; license = licenses.mit; diff --git a/nixpkgs/pkgs/development/tools/misc/drush/default.nix b/nixpkgs/pkgs/development/tools/misc/drush/default.nix index d5c345d9d22b..32d9975e332b 100644 --- a/nixpkgs/pkgs/development/tools/misc/drush/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/drush/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchurl, php73, which, makeWrapper, bash, coreutils, ncurses }: +{ lib, stdenv, fetchurl, php73, which, makeWrapper, bash, coreutils, ncurses }: stdenv.mkDerivation rec { name = "drush-6.1.0"; - meta = with stdenv.lib; { + meta = with lib; { description = "Command-line shell and Unix scripting interface for Drupal"; homepage = "https://github.com/drush-ops/drush"; license = licenses.gpl2; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { mkdir -p "$out" cp -r . "$out/src" mkdir "$out/bin" - wrapProgram "$out/src/drush" --prefix PATH : "${stdenv.lib.makeBinPath [ which php73 bash coreutils ncurses ]}" + wrapProgram "$out/src/drush" --prefix PATH : "${lib.makeBinPath [ which php73 bash coreutils ncurses ]}" ln -s "$out/src/drush" "$out/bin/drush" ''; } diff --git a/nixpkgs/pkgs/development/tools/misc/editorconfig-checker/default.nix b/nixpkgs/pkgs/development/tools/misc/editorconfig-checker/default.nix index 401bbdbee6ef..5edbdba4141e 100644 --- a/nixpkgs/pkgs/development/tools/misc/editorconfig-checker/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/editorconfig-checker/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "editorconfig-checker"; - version = "2.2.0"; + version = "2.3.1"; src = fetchFromGitHub { owner = "editorconfig-checker"; repo = "editorconfig-checker"; rev = version; - sha256 = "18gz94h2x1z6g6r7v9cdixkbcaigd7cl08af6smlkaa89j0aki32"; + sha256 = "0c7mainlwn3pd9q6i1f82m5znv8m6fs15zq7nrbm04fy554h0pzz"; }; vendorSha256 = "1z4j8vm9mnhjhhmhlj0ycs8b1wpm7lhsfqjnk7w8gfapvj3yfk6h"; diff --git a/nixpkgs/pkgs/development/tools/misc/editorconfig-core-c/default.nix b/nixpkgs/pkgs/development/tools/misc/editorconfig-core-c/default.nix index e563ff203a23..de5c1e070fdb 100644 --- a/nixpkgs/pkgs/development/tools/misc/editorconfig-core-c/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/editorconfig-core-c/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, cmake, pcre, doxygen }: +{ lib, stdenv, fetchgit, cmake, pcre, doxygen }: stdenv.mkDerivation rec { name = "editorconfig-core-c-${meta.version}"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { # parallel: https://bugzilla.gnome.org/show_bug.cgi?id=791153 enableParallelBuilding = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://editorconfig.org/"; description = "EditorConfig core library written in C"; longDescription = '' diff --git a/nixpkgs/pkgs/development/tools/misc/eggdbus/default.nix b/nixpkgs/pkgs/development/tools/misc/eggdbus/default.nix index d1211c9fcecd..5a5267510d7d 100644 --- a/nixpkgs/pkgs/development/tools/misc/eggdbus/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/eggdbus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, dbus, dbus-glib }: +{ lib, stdenv, fetchurl, pkg-config, glib, dbus, dbus-glib }: stdenv.mkDerivation rec { name = "eggdbus-0.6"; @@ -8,10 +8,10 @@ stdenv.mkDerivation rec { sha256 = "118hj63ac65zlg71kydv4607qcg1qpdlql4kvhnwnnhar421jnq4"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib dbus dbus-glib ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://hal.freedesktop.org/releases/"; description = "D-Bus bindings for GObject"; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/development/tools/misc/elfinfo/default.nix b/nixpkgs/pkgs/development/tools/misc/elfinfo/default.nix index 3778793b71cd..cd19e263f0a5 100644 --- a/nixpkgs/pkgs/development/tools/misc/elfinfo/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/elfinfo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "elfinfo"; @@ -12,7 +12,7 @@ buildGoPackage rec { sha256 = "1n8bg0rcq9fqa6rdnk6x9ngvm59hcayblkpjv9j5myn2vmm6fv8m"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Small utility for showing information about ELF files"; homepage = "https://elfinfo.roboticoverlords.org/"; license = licenses.mit; diff --git a/nixpkgs/pkgs/development/tools/misc/elfkickers/default.nix b/nixpkgs/pkgs/development/tools/misc/elfkickers/default.nix index e8992b62665f..e60b40c7fd4c 100644 --- a/nixpkgs/pkgs/development/tools/misc/elfkickers/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/elfkickers/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "elfkickers"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.muppetlabs.com/~breadbox/software/elfkickers.html"; description = "A collection of programs that access and manipulate ELF files"; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/development/tools/misc/epm/default.nix b/nixpkgs/pkgs/development/tools/misc/epm/default.nix index 8caa33c20d1b..8f5921783e24 100644 --- a/nixpkgs/pkgs/development/tools/misc/epm/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/epm/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, rpm}: +{lib, stdenv, fetchFromGitHub, rpm}: stdenv.mkDerivation rec { pname = "epm"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { sed -i 's/README/README.md/' Makefile ''; - meta = with stdenv.lib; { + meta = with lib; { description = "The ESP Package Manager generates distribution archives for a variety of platforms"; homepage = "https://www.msweet.org/projects.php?Z2"; license = licenses.gpl2; diff --git a/nixpkgs/pkgs/development/tools/misc/findnewest/default.nix b/nixpkgs/pkgs/development/tools/misc/findnewest/default.nix index b289c16b7a6e..6773e9bc0bd4 100644 --- a/nixpkgs/pkgs/development/tools/misc/findnewest/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/findnewest/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { pname = "findnewest"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/0-wiz-0/findnewest"; description = "Recursively find newest file in a hierarchy and print its timestamp"; license = licenses.bsd2; diff --git a/nixpkgs/pkgs/development/tools/misc/fsatrace/default.nix b/nixpkgs/pkgs/development/tools/misc/fsatrace/default.nix index 69d7c6b3919f..132ddf2eacfd 100644 --- a/nixpkgs/pkgs/development/tools/misc/fsatrace/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/fsatrace/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "fsatrace"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ln -s $out/$installDir/fsatrace $out/bin/fsatrace ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/jacereda/fsatrace"; description = "filesystem access tracer"; license = licenses.isc; diff --git a/nixpkgs/pkgs/development/tools/misc/fswatch/default.nix b/nixpkgs/pkgs/development/tools/misc/fswatch/default.nix index e32da3e67b71..6f9f5e113c06 100644 --- a/nixpkgs/pkgs/development/tools/misc/fswatch/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/fswatch/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , autoreconfHook # for xargs @@ -20,12 +20,12 @@ stdenv.mkDerivation rec { sha256 = "11479ac436g8bwk0lfnmdms0cirv9k11pdvfrrg9jwkki1j1abkk"; }; - nativeBuildInputs = [ autoreconfHook ] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices ]; + nativeBuildInputs = [ autoreconfHook ] ++ lib.optionals stdenv.isDarwin [ CoreServices ]; buildInputs = [ gettext libtool makeWrapper texinfo ]; enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "A cross-platform file change monitor with multiple backends"; homepage = "https://github.com/emcrisostomo/fswatch"; license = licenses.gpl3Plus; diff --git a/nixpkgs/pkgs/development/tools/misc/fujprog/default.nix b/nixpkgs/pkgs/development/tools/misc/fujprog/default.nix index e5cd2e0e2ddf..db1f42e3a266 100644 --- a/nixpkgs/pkgs/development/tools/misc/fujprog/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/fujprog/default.nix @@ -1,7 +1,7 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , cmake -, pkgconfig +, pkg-config , IOKit , libftdi1 , libusb-compat-0_1 @@ -20,15 +20,15 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake - pkgconfig + pkg-config ]; buildInputs = [ libftdi1 libusb-compat-0_1 - ] ++ stdenv.lib.optionals stdenv.isDarwin [ IOKit ]; + ] ++ lib.optionals stdenv.isDarwin [ IOKit ]; - meta = with stdenv.lib; { + meta = with lib; { description = "JTAG programmer for the ULX3S and ULX2S open hardware FPGA development boards"; homepage = "https://github.com/kost/fujprog"; license = licenses.bsd2; diff --git a/nixpkgs/pkgs/development/tools/misc/gdb/default.nix b/nixpkgs/pkgs/development/tools/misc/gdb/default.nix index d9bac6e3c83c..2ce779be5680 100644 --- a/nixpkgs/pkgs/development/tools/misc/gdb/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/gdb/default.nix @@ -1,7 +1,7 @@ -{ stdenv, targetPackages +{ lib, stdenv, targetPackages # Build time -, fetchurl, pkgconfig, perl, texinfo, setupDebugInfoDirs, buildPackages +, fetchurl, pkg-config, perl, texinfo, setupDebugInfoDirs, buildPackages # Run time , ncurses, readline, gmp, mpfr, expat, libipt, zlib, dejagnu @@ -18,7 +18,7 @@ let basename = "gdb"; - targetPrefix = stdenv.lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) + targetPrefix = lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) "${stdenv.targetPlatform.config}-"; in @@ -40,15 +40,15 @@ stdenv.mkDerivation rec { patches = [ ./debug-info-from-env.patch - ] ++ stdenv.lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.isDarwin [ ./darwin-target-match.patch ]; - nativeBuildInputs = [ pkgconfig texinfo perl setupDebugInfoDirs ]; + nativeBuildInputs = [ pkg-config texinfo perl setupDebugInfoDirs ]; buildInputs = [ ncurses readline gmp mpfr expat libipt zlib guile ] - ++ stdenv.lib.optional pythonSupport python3 - ++ stdenv.lib.optional doCheck dejagnu; + ++ lib.optional pythonSupport python3 + ++ lib.optional doCheck dejagnu; propagatedNativeBuildInputs = [ setupDebugInfoDirs ]; @@ -57,12 +57,12 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; # darwin build fails with format hardening since v7.12 - hardeningDisable = stdenv.lib.optionals stdenv.isDarwin [ "format" ]; + hardeningDisable = lib.optionals stdenv.isDarwin [ "format" ]; NIX_CFLAGS_COMPILE = "-Wno-format-nonliteral"; # TODO(@Ericson2314): Always pass "--target" and always prefix. - configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (stdenv.targetPlatform != stdenv.hostPlatform) "target"; + configurePlatforms = [ "build" "host" ] ++ lib.optional (stdenv.targetPlatform != stdenv.hostPlatform) "target"; # GDB have to be built out of tree. preConfigure = '' @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { ''; configureScript = "../configure"; - configureFlags = with stdenv.lib; [ + configureFlags = with lib; [ "--enable-targets=all" "--enable-64-bit-bfd" "--disable-install-libbfd" "--disable-shared" "--enable-static" @@ -82,7 +82,7 @@ stdenv.mkDerivation rec { "--with-mpfr=${mpfr.dev}" "--with-expat" "--with-libexpat-prefix=${expat.dev}" "--with-auto-load-safe-path=${builtins.concatStringsSep ":" safePaths}" - ] ++ stdenv.lib.optional (!pythonSupport) "--without-python"; + ] ++ lib.optional (!pythonSupport) "--without-python"; postInstall = '' # Remove Info files already provided by Binutils and other packages. @@ -92,7 +92,7 @@ stdenv.mkDerivation rec { # TODO: Investigate & fix the test failures. doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "The GNU Project debugger"; longDescription = '' @@ -103,7 +103,7 @@ stdenv.mkDerivation rec { homepage = "https://www.gnu.org/software/gdb/"; - license = stdenv.lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; platforms = with platforms; linux ++ cygwin ++ darwin; maintainers = with maintainers; [ pierron globin lsix ]; diff --git a/nixpkgs/pkgs/development/tools/misc/gdbgui/default.nix b/nixpkgs/pkgs/development/tools/misc/gdbgui/default.nix index ecbfc2ae7569..c01bb61f4f69 100644 --- a/nixpkgs/pkgs/development/tools/misc/gdbgui/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/gdbgui/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonApplication , fetchPypi , gdb @@ -41,13 +41,13 @@ buildPythonApplication rec { postInstall = '' wrapProgram $out/bin/gdbgui \ - --prefix PATH : ${stdenv.lib.makeBinPath [ gdb ]} + --prefix PATH : ${lib.makeBinPath [ gdb ]} ''; # tests do not work without stdout/stdin doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "A browser-based frontend for GDB"; homepage = "https://www.gdbgui.com/"; license = licenses.gpl3; diff --git a/nixpkgs/pkgs/development/tools/misc/gede/default.nix b/nixpkgs/pkgs/development/tools/misc/gede/default.nix index b27c3a515bbe..39954b458b4d 100644 --- a/nixpkgs/pkgs/development/tools/misc/gede/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/gede/default.nix @@ -20,7 +20,7 @@ mkDerivation rec { installPhase = '' python build.py install --verbose --prefix="$out" wrapProgram $out/bin/gede \ - --prefix PATH : ${lib.makeBinPath [ ctags gdb ]} + --prefix PATH : ${lib.makeBinPath [ ctags gdb ]} ''; meta = with lib; { diff --git a/nixpkgs/pkgs/development/tools/misc/gengetopt/default.nix b/nixpkgs/pkgs/development/tools/misc/gengetopt/default.nix index 0a3b0b1c7508..2c09f925d3d8 100644 --- a/nixpkgs/pkgs/development/tools/misc/gengetopt/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/gengetopt/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, texinfo, help2man }: +{ fetchurl, lib, stdenv, texinfo, help2man }: stdenv.mkDerivation rec { pname = "gengetopt"; @@ -37,9 +37,9 @@ stdenv.mkDerivation rec { homepage = "https://www.gnu.org/software/gengetopt/"; - license = stdenv.lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; maintainers = [ ]; - platforms = stdenv.lib.platforms.all; + platforms = lib.platforms.all; }; } diff --git a/nixpkgs/pkgs/development/tools/misc/global/default.nix b/nixpkgs/pkgs/development/tools/misc/global/default.nix index 36798fe4fc1a..fb3ddfcb29b3 100644 --- a/nixpkgs/pkgs/development/tools/misc/global/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/global/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, libtool, makeWrapper +{ fetchurl, lib, stdenv, libtool, makeWrapper , coreutils, ctags, ncurses, pythonPackages, sqlite, universal-ctags }: @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { --prefix PYTHONPATH : "$(toPythonPath ${pythonPackages.pygments})" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Source code tag system"; longDescription = '' GNU GLOBAL is a source code tagging system that works the same way diff --git a/nixpkgs/pkgs/development/tools/misc/gnum4/default.nix b/nixpkgs/pkgs/development/tools/misc/gnum4/default.nix index 2e3e4acfdc1b..512989a14462 100644 --- a/nixpkgs/pkgs/development/tools/misc/gnum4/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/gnum4/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: # Note: this package is used for bootstrapping fetchurl, and thus # cannot use fetchpatch! All mutable patches (generated by GitHub or @@ -26,7 +26,7 @@ stdenv.mkDerivation { sha256 = "12lmdnbml9lfvy0khpjc42riicddaz7li8wmbnsam7zsw6al11qk"; }) ] - ++ stdenv.lib.optional stdenv.isDarwin ./darwin-secure-format.patch; + ++ lib.optional stdenv.isDarwin ./darwin-secure-format.patch; meta = { homepage = "https://www.gnu.org/software/m4/"; @@ -49,8 +49,8 @@ stdenv.mkDerivation { compiler or as a macro processor in its own right. ''; - license = stdenv.lib.licenses.gpl3Plus; - platforms = stdenv.lib.platforms.unix ++ stdenv.lib.platforms.windows; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.unix ++ lib.platforms.windows; }; } diff --git a/nixpkgs/pkgs/development/tools/misc/gob2/default.nix b/nixpkgs/pkgs/development/tools/misc/gob2/default.nix index b1e107368ba7..b78c111ccbf8 100644 --- a/nixpkgs/pkgs/development/tools/misc/gob2/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/gob2/default.nix @@ -1,16 +1,16 @@ -{ stdenv, fetchurl, pkgconfig, glib, bison, flex, gnome3 }: +{ lib, stdenv, fetchurl, pkg-config, glib, bison, flex, gnome3 }: stdenv.mkDerivation rec { pname = "gob2"; version = "2.0.20"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "5fe5d7990fd65b0d4b617ba894408ebaa6df453f2781c15a1cfdf2956c0c5428"; }; # configure script looks for d-bus but it is only needed for tests - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib bison flex ]; passthru = { @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "Preprocessor for making GObjects with inline C code"; homepage = "https://www.jirka.org/gob.html"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/tools/misc/gperf/3.0.x.nix b/nixpkgs/pkgs/development/tools/misc/gperf/3.0.x.nix index e013428a6f7f..339511f2cc02 100644 --- a/nixpkgs/pkgs/development/tools/misc/gperf/3.0.x.nix +++ b/nixpkgs/pkgs/development/tools/misc/gperf/3.0.x.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, autoreconfHook }: +{lib, stdenv, fetchurl, autoreconfHook }: stdenv.mkDerivation rec { name = "gperf-3.0.4"; @@ -27,9 +27,9 @@ stdenv.mkDerivation rec { employed by gperf. ''; - license = stdenv.lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; homepage = "https://www.gnu.org/software/gperf/"; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/tools/misc/gperf/default.nix b/nixpkgs/pkgs/development/tools/misc/gperf/default.nix index bf85cd91380e..e998f09683ae 100644 --- a/nixpkgs/pkgs/development/tools/misc/gperf/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/gperf/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation rec { name = "gperf-3.1"; @@ -25,9 +25,9 @@ stdenv.mkDerivation rec { employed by gperf. ''; - license = stdenv.lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; homepage = "https://www.gnu.org/software/gperf/"; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/tools/misc/gpshell/default.nix b/nixpkgs/pkgs/development/tools/misc/gpshell/default.nix index 182d28375b61..13437b719536 100644 --- a/nixpkgs/pkgs/development/tools/misc/gpshell/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/gpshell/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, globalplatform, pcsclite, gppcscconnectionplugin +{ lib, stdenv, fetchurl, pkg-config, globalplatform, pcsclite, gppcscconnectionplugin , makeWrapper }: @@ -11,14 +11,14 @@ stdenv.mkDerivation rec { sha256 = "19a77zvyf2vazbv17185s4pynhylk2ky8vhl4i8pg9zww29sicqi"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ globalplatform pcsclite makeWrapper ]; postFixup = '' wrapProgram "$out/bin/gpshell" --prefix LD_LIBRARY_PATH : "${gppcscconnectionplugin}/lib" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://sourceforge.net/p/globalplatform/wiki/Home/"; description = "Smartcard management application"; license = licenses.gpl3; diff --git a/nixpkgs/pkgs/development/tools/misc/gputils/default.nix b/nixpkgs/pkgs/development/tools/misc/gputils/default.nix index 2ad496bfb887..c07949e80968 100644 --- a/nixpkgs/pkgs/development/tools/misc/gputils/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/gputils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "gputils"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "055v83fdgqljprapf7rmh8x66mr13fj0qypj49xba5spx0ca123g"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://gputils.sourceforge.io"; description = "A collection of tools for the Microchip (TM) PIC microcontrollers. It includes gpasm, gplink, and gplib"; license = licenses.gpl2; diff --git a/nixpkgs/pkgs/development/tools/misc/grpc-tools/default.nix b/nixpkgs/pkgs/development/tools/misc/grpc-tools/default.nix new file mode 100644 index 000000000000..3e06f10cbf1e --- /dev/null +++ b/nixpkgs/pkgs/development/tools/misc/grpc-tools/default.nix @@ -0,0 +1,40 @@ +{ lib +, stdenv +, cmake +, fetchFromGitHub +}: + +stdenv.mkDerivation rec { + pname = "grpc-tools"; + version = "1.10.0"; + + src = fetchFromGitHub { + owner = "grpc"; + repo = "grpc-node"; + rev = "3a094f01711942f79abd8a536c45a91b574d626f"; # version 1.10.0 was not tagged + sha256 = "1a7l91kxc3g7mqfqvhc3nb7zy0n21ifs5ck0qqg09qh3f44q04xm"; + fetchSubmodules = true; + }; + + sourceRoot = "source/packages/grpc-tools"; + + nativeBuildInputs = [ cmake ]; + + installPhase = '' + install -Dm755 -t $out/bin grpc_node_plugin + install -Dm755 -t $out/bin deps/protobuf/protoc + ''; + + meta = with lib; { + description = "Distribution of protoc and the gRPC Node protoc plugin for ease of installation with npm"; + longDescription = '' + This package distributes the Protocol Buffers compiler protoc along with + the plugin for generating client and service objects for use with the Node + gRPC libraries. + ''; + homepage = "https://github.com/grpc/grpc-node/tree/master/packages/grpc-tools"; + license = licenses.asl20; + platforms = platforms.all; + maintainers = [ maintainers.nzhang-zh ]; + }; +} diff --git a/nixpkgs/pkgs/development/tools/misc/gtkdialog/default.nix b/nixpkgs/pkgs/development/tools/misc/gtkdialog/default.nix index 6cdcce77ffdc..6651bbb03845 100644 --- a/nixpkgs/pkgs/development/tools/misc/gtkdialog/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/gtkdialog/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, gtk2, pkgconfig }: +{lib, stdenv, fetchurl, gtk2, pkg-config }: stdenv.mkDerivation { name = "gtkdialog-0.8.3"; @@ -8,14 +8,14 @@ stdenv.mkDerivation { sha256 = "ff89d2d7f1e6488e5df5f895716ac1d4198c2467a2a5dc1f51ab408a2faec38e"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk2 ]; meta = { homepage = "https://code.google.com/archive/p/gtkdialog/"; # community links: http://murga-linux.com/puppy/viewtopic.php?t=111923 -> https://github.com/01micko/gtkdialog description = "Small utility for fast and easy GUI building from many scripted and compiled languages"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; }; } diff --git a/nixpkgs/pkgs/development/tools/misc/gtkperf/default.nix b/nixpkgs/pkgs/development/tools/misc/gtkperf/default.nix index 82ee29172778..4b7f7985a673 100644 --- a/nixpkgs/pkgs/development/tools/misc/gtkperf/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/gtkperf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gtk2, pkgconfig, libintl }: +{ lib, stdenv, fetchurl, gtk2, pkg-config, libintl }: stdenv.mkDerivation { name = "gtkperf-0.40.0"; @@ -9,13 +9,13 @@ stdenv.mkDerivation { hardeningDisable = [ "format" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk2 libintl ]; # https://openbenchmarking.org/innhold/7e9780c11550d09aa67bdba71248facbe2d781db patches = [ ./bench.patch ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Application designed to test GTK performance"; homepage = "http://gtkperf.sourceforge.net/"; license = with licenses; [ gpl2 ]; diff --git a/nixpkgs/pkgs/development/tools/misc/help2man/default.nix b/nixpkgs/pkgs/development/tools/misc/help2man/default.nix index f23b5a9c8fdd..6afc4415e113 100644 --- a/nixpkgs/pkgs/development/tools/misc/help2man/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/help2man/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perlPackages, gettext }: +{ lib, stdenv, fetchurl, perlPackages, gettext }: # Note: this package is used for bootstrapping fetchurl, and thus # cannot use fetchpatch! All mutable patches (generated by GitHub or @@ -27,14 +27,14 @@ stdenv.mkDerivation rec { cat > $out/bin/help2man <<EOF #! $SHELL -e export PERL5LIB=\''${PERL5LIB:+:}${perlPackages.LocaleGettext}/${perlPackages.perl.libPrefix} - ${stdenv.lib.optionalString stdenv.hostPlatform.isCygwin + ${lib.optionalString stdenv.hostPlatform.isCygwin ''export PATH=\''${PATH:+:}${gettext}/bin''} exec -a \$0 $out/bin/.help2man-wrapped "\$@" EOF chmod +x $out/bin/help2man ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Generate man pages from `--help' output"; longDescription = diff --git a/nixpkgs/pkgs/development/tools/misc/hound/default.nix b/nixpkgs/pkgs/development/tools/misc/hound/default.nix index 4e817251bffe..476179ac8e7a 100644 --- a/nixpkgs/pkgs/development/tools/misc/hound/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/hound/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildGoPackage , fetchFromGitHub , makeWrapper @@ -32,8 +32,8 @@ buildGoPackage rec { inherit (src.meta) homepage; description = "Lightning fast code searching made easy"; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ grahamc ]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ grahamc ]; + platforms = lib.platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/tools/misc/hydra-cli/default.nix b/nixpkgs/pkgs/development/tools/misc/hydra-cli/default.nix index 10ecd8174af4..9160a3366811 100644 --- a/nixpkgs/pkgs/development/tools/misc/hydra-cli/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/hydra-cli/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, pkgconfig, openssl, fetchFromGitHub, rustPlatform, darwin }: +{ stdenv, lib, pkg-config, openssl, fetchFromGitHub, rustPlatform, darwin }: rustPlatform.buildRustPackage rec { pname = "hydra-cli"; @@ -16,10 +16,10 @@ rustPlatform.buildRustPackage rec { ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; nativeBuildInputs = [ - pkgconfig + pkg-config ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A client for the Hydra CI"; homepage = "https://github.com/nlewo/hydra-cli"; license = with licenses; [ mit ]; diff --git a/nixpkgs/pkgs/development/tools/misc/hydra/common.nix b/nixpkgs/pkgs/development/tools/misc/hydra/common.nix index 4af9fe045874..cf56e6c1a9c9 100644 --- a/nixpkgs/pkgs/development/tools/misc/hydra/common.nix +++ b/nixpkgs/pkgs/development/tools/misc/hydra/common.nix @@ -1,6 +1,6 @@ { stdenv, nix, perlPackages, buildEnv, fetchFromGitHub -, makeWrapper, autoconf, automake, libtool, unzip, pkgconfig, sqlite, libpqxx -, gitAndTools, mercurial, darcs, subversion, breezy, openssl, bzip2, libxslt +, makeWrapper, autoconf, automake, libtool, unzip, pkg-config, sqlite, libpqxx +, top-git, mercurial, darcs, subversion, breezy, openssl, bzip2, libxslt , guile, perl, postgresql, nukeReferences, git, boehmgc, nlohmann_json , docbook_xsl, openssh, gnused, coreutils, findutils, gzip, lzma, gnutar , rpm, dpkg, cdrkit, pixz, lib, boost, autoreconfHook, src ? null, version ? null @@ -80,7 +80,7 @@ in stdenv.mkDerivation rec { buildInputs = [ makeWrapper autoconf automake libtool unzip nukeReferences sqlite libpqxx - gitAndTools.top-git mercurial /*darcs*/ subversion breezy openssl bzip2 libxslt + top-git mercurial /*darcs*/ subversion breezy openssl bzip2 libxslt perlDeps perl nix postgresql # for running the tests nlohmann_json @@ -89,10 +89,10 @@ in stdenv.mkDerivation rec { hydraPath = lib.makeBinPath ( [ sqlite subversion openssh nix coreutils findutils pixz - gzip bzip2 lzma gnutar unzip git gitAndTools.top-git mercurial /*darcs*/ gnused breezy + gzip bzip2 lzma gnutar unzip git top-git mercurial /*darcs*/ gnused breezy ] ++ lib.optionals stdenv.isLinux [ rpm dpkg cdrkit ] ); - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; configureFlags = [ "--with-docbook-xsl=${docbook_xsl}/xml/xsl/docbook" ]; @@ -128,7 +128,7 @@ in stdenv.mkDerivation rec { passthru = { inherit perlDeps migration tests; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Nix-based continuous build system"; license = licenses.gpl3; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/development/tools/misc/hydra/default.nix b/nixpkgs/pkgs/development/tools/misc/hydra/default.nix index 7aa1e05a88e4..1636ad6dd71f 100644 --- a/nixpkgs/pkgs/development/tools/misc/hydra/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/hydra/default.nix @@ -9,6 +9,9 @@ rev = "79d34ed7c93af2daf32cf44ee0e3e0768f13f97c"; sha256 = "1lql899430137l6ghnhyz0ivkayy83fdr087ck2wq3gf1jv8pccj"; }; + patches = [ + ./hydra-nix-receiveContents.patch + ]; nix = nixFlakes; tests = { diff --git a/nixpkgs/pkgs/development/tools/misc/hydra/hydra-nix-receiveContents.patch b/nixpkgs/pkgs/development/tools/misc/hydra/hydra-nix-receiveContents.patch new file mode 100644 index 000000000000..61957e2190cd --- /dev/null +++ b/nixpkgs/pkgs/development/tools/misc/hydra/hydra-nix-receiveContents.patch @@ -0,0 +1,18 @@ +Update for https://github.com/NixOS/nix/commit/faa31f40 + +--- a/src/hydra-queue-runner/nar-extractor.cc ++++ b/src/hydra-queue-runner/nar-extractor.cc +@@ -48,9 +48,9 @@ +- void receiveContents(unsigned char * data, size_t len) override ++ void receiveContents(std::string_view data) override + { + assert(expectedSize); + assert(curMember); + assert(hashSink); +- *curMember->fileSize += len; +- (*hashSink)(data, len); ++ *curMember->fileSize += data.size(); ++ (*hashSink)(data); + if (curMember->contents) { +- curMember->contents->append((char *) data, len); ++ curMember->contents->append(data); diff --git a/nixpkgs/pkgs/development/tools/misc/icon-naming-utils/default.nix b/nixpkgs/pkgs/development/tools/misc/icon-naming-utils/default.nix index 0905ce484634..8fdc448ee91e 100644 --- a/nixpkgs/pkgs/development/tools/misc/icon-naming-utils/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/icon-naming-utils/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, perlPackages, librsvg}: +{lib, stdenv, fetchurl, perlPackages, librsvg}: stdenv.mkDerivation rec { name = "icon-naming-utils-0.8.90"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { --replace '/bin/perl' '/bin/perl -I${perlPackages.XMLSimple}/${perlPackages.perl.libPrefix}' ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://tango.freedesktop.org/Standard_Icon_Naming_Specification"; platforms = with platforms; linux ++ darwin; license = licenses.gpl2; diff --git a/nixpkgs/pkgs/development/tools/misc/igprof/default.nix b/nixpkgs/pkgs/development/tools/misc/igprof/default.nix index 0780672cc020..47f41f130bef 100644 --- a/nixpkgs/pkgs/development/tools/misc/igprof/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/igprof/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, libunwind, cmake, pcre, gdb}: +{lib, stdenv, fetchFromGitHub, libunwind, cmake, pcre, gdb}: stdenv.mkDerivation rec { version = "5.9.16"; @@ -34,10 +34,10 @@ stdenv.mkDerivation rec { details and see the big picture from combined workloads. ''; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; homepage = "https://igprof.org/"; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ ktf ]; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ ktf ]; }; } diff --git a/nixpkgs/pkgs/development/tools/misc/indent/default.nix b/nixpkgs/pkgs/development/tools/misc/indent/default.nix index c4b5fecca741..8c5ec6af1c7f 100644 --- a/nixpkgs/pkgs/development/tools/misc/indent/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/indent/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, texinfo }: +{ lib, stdenv, fetchurl, texinfo }: stdenv.mkDerivation rec { name = "indent-2.2.12"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ texinfo ]; - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-implicit-function-declaration"; hardeningDisable = [ "format" ]; @@ -20,8 +20,8 @@ stdenv.mkDerivation rec { meta = { homepage = "https://www.gnu.org/software/indent/"; description = "A source code reformatter"; - license = stdenv.lib.licenses.gpl3Plus; - maintainers = [ stdenv.lib.maintainers.mmahut ]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl3Plus; + maintainers = [ lib.maintainers.mmahut ]; + platforms = lib.platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/tools/misc/inotify-tools/default.nix b/nixpkgs/pkgs/development/tools/misc/inotify-tools/default.nix index a9d642f48f0f..e085d3dd259e 100644 --- a/nixpkgs/pkgs/development/tools/misc/inotify-tools/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/inotify-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, autoreconfHook, fetchFromGitHub, fetchpatch }: +{ lib, stdenv, autoreconfHook, fetchFromGitHub, fetchpatch }: stdenv.mkDerivation rec { pname = "inotify-tools"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/rvoicilas/inotify-tools/wiki"; license = licenses.gpl2; maintainers = with maintainers; [ marcweber pSub ]; diff --git a/nixpkgs/pkgs/development/tools/misc/intel-gpu-tools/default.nix b/nixpkgs/pkgs/development/tools/misc/intel-gpu-tools/default.nix index 19556aeafc01..62d350593b16 100644 --- a/nixpkgs/pkgs/development/tools/misc/intel-gpu-tools/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/intel-gpu-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libdrm, libpciaccess, cairo, xorgproto, udev +{ lib, stdenv, fetchurl, pkg-config, libdrm, libpciaccess, cairo, xorgproto, udev , libX11, libXext, libXv, libXrandr, glib, bison, libunwind, python3, kmod , procps, utilmacros, gtk-doc, openssl, peg, elfutils }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "04fx7xclhick3k7fyk9c4mn8mxzf1253j1r0hrvj9sl40j7lsia0"; }; - nativeBuildInputs = [ pkgconfig utilmacros ]; + nativeBuildInputs = [ pkg-config utilmacros ]; buildInputs = [ libdrm libpciaccess cairo xorgproto udev libX11 kmod libXext libXv libXrandr glib bison libunwind python3 procps gtk-doc openssl peg elfutils ]; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://01.org/linuxgraphics/"; description = "Tools for development and testing of the Intel DRM driver"; license = licenses.mit; diff --git a/nixpkgs/pkgs/development/tools/misc/intltool/default.nix b/nixpkgs/pkgs/development/tools/misc/intltool/default.nix index 20f880938c66..7a3379d59217 100644 --- a/nixpkgs/pkgs/development/tools/misc/intltool/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/intltool/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, gettext, perlPackages, buildPackages }: +{ lib, stdenv, fetchurl, fetchpatch, gettext, perlPackages, buildPackages }: stdenv.mkDerivation rec { pname = "intltool"; @@ -22,12 +22,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = with perlPackages; [ perl XMLParser ]; propagatedBuildInputs = [ gettext ] ++ (with perlPackages; [ perl XMLParser ]); - postInstall = stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' + postInstall = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' for f in $out/bin/*; do substituteInPlace $f --replace "${buildPackages.perl}" "${perlPackages.perl}" done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Translation helper tool"; homepage = "https://launchpad.net/intltool/"; license = licenses.gpl2Plus; diff --git a/nixpkgs/pkgs/development/tools/misc/iozone/default.nix b/nixpkgs/pkgs/development/tools/misc/iozone/default.nix index 93e2673be63a..ad62d1048732 100644 --- a/nixpkgs/pkgs/development/tools/misc/iozone/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/iozone/default.nix @@ -55,8 +55,8 @@ stdenv.mkDerivation rec { meta = { description = "IOzone Filesystem Benchmark"; homepage = "http://www.iozone.org/"; - license = stdenv.lib.licenses.unfreeRedistributable; + license = lib.licenses.unfreeRedistributable; platforms = ["i686-linux" "x86_64-linux" "x86_64-darwin" "aarch64-linux" ]; - maintainers = with stdenv.lib.maintainers; [ Baughn makefu ]; + maintainers = with lib.maintainers; [ Baughn makefu ]; }; } diff --git a/nixpkgs/pkgs/development/tools/misc/itm-tools/default.nix b/nixpkgs/pkgs/development/tools/misc/itm-tools/default.nix index a121cc670993..992b76bd62da 100644 --- a/nixpkgs/pkgs/development/tools/misc/itm-tools/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/itm-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform, pkg-config }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, pkg-config }: rustPlatform.buildRustPackage rec { pname = "itm-tools"; @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Tools for analyzing ITM traces"; homepage = "https://github.com/japaric/itm-tools"; license = with licenses; [ asl20 mit ]; diff --git a/nixpkgs/pkgs/development/tools/misc/itstool/default.nix b/nixpkgs/pkgs/development/tools/misc/itstool/default.nix index d46256f039aa..55e62a2dcaee 100644 --- a/nixpkgs/pkgs/development/tools/misc/itstool/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/itstool/default.nix @@ -19,8 +19,8 @@ stdenv.mkDerivation rec { meta = { homepage = "http://itstool.org/"; description = "XML to PO and back again"; - license = stdenv.lib.licenses.gpl3Plus; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.all; maintainers = [ ]; }; } diff --git a/nixpkgs/pkgs/development/tools/misc/jscoverage/default.nix b/nixpkgs/pkgs/development/tools/misc/jscoverage/default.nix index 6ed66c8d3cc0..a978c31c34d1 100644 --- a/nixpkgs/pkgs/development/tools/misc/jscoverage/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/jscoverage/default.nix @@ -1,4 +1,4 @@ -{ autoconf, fetchurl, makedepend, perl, python, stdenv, unzip, zip }: +{ autoconf, fetchurl, makedepend, perl, python, lib, stdenv, unzip, zip }: stdenv.mkDerivation rec { name = "jscoverage-0.5.1"; @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { ''; homepage = "http://siliconforks.com/jscoverage/"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; }; } diff --git a/nixpkgs/pkgs/development/tools/misc/kconfig-frontends/default.nix b/nixpkgs/pkgs/development/tools/misc/kconfig-frontends/default.nix index fa413511dc01..3b355b6218a5 100644 --- a/nixpkgs/pkgs/development/tools/misc/kconfig-frontends/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/kconfig-frontends/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, bison, flex, gperf, ncurses, pythonPackages }: +{ lib, stdenv, fetchurl, pkg-config, bison, flex, gperf, ncurses, pythonPackages }: stdenv.mkDerivation rec { basename = "kconfig-frontends"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { url = "http://ymorin.is-a-geek.org/download/${basename}/${name}.tar.xz"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ bison flex gperf ncurses pythonPackages.python pythonPackages.wrapPython ]; configureFlags = [ @@ -21,9 +21,9 @@ stdenv.mkDerivation rec { wrapPythonPrograms ''; - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-error=format-security"; + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=format-security"; - meta = with stdenv.lib; { + meta = with lib; { description = "Out of Linux tree packaging of the kconfig infrastructure"; longDescription = '' Configuration language and system for the Linux kernel and other diff --git a/nixpkgs/pkgs/development/tools/misc/kdbg/default.nix b/nixpkgs/pkgs/development/tools/misc/kdbg/default.nix index 6b7369a0558f..dad7d41c1f68 100644 --- a/nixpkgs/pkgs/development/tools/misc/kdbg/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/kdbg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, extra-cmake-modules, qt5, +{ lib, stdenv, fetchurl, cmake, extra-cmake-modules, qt5, ki18n, kconfig, kiconthemes, kxmlgui, kwindowsystem, qtbase, makeWrapper, }: @@ -14,14 +14,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake extra-cmake-modules makeWrapper ]; buildInputs = [ qt5.qtbase ki18n kconfig kiconthemes kxmlgui kwindowsystem ]; - enableParallelBuilding = true; - - postInstall = '' wrapProgram $out/bin/kdbg --prefix QT_PLUGIN_PATH : ${qtbase}/${qtbase.qtPluginPrefix} ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.kdbg.org/"; description = '' A graphical user interface to gdb, the GNU debugger. It provides an diff --git a/nixpkgs/pkgs/development/tools/misc/kibana/6.x.nix b/nixpkgs/pkgs/development/tools/misc/kibana/6.x.nix index 354f77d0fb97..3fa2d219fe3a 100644 --- a/nixpkgs/pkgs/development/tools/misc/kibana/6.x.nix +++ b/nixpkgs/pkgs/development/tools/misc/kibana/6.x.nix @@ -1,6 +1,6 @@ { elk6Version , enableUnfree ? true -, stdenv +, lib, stdenv , makeWrapper , fetchurl , nodejs-10_x @@ -8,7 +8,7 @@ , which }: -with stdenv.lib; +with lib; let nodejs = nodejs-10_x; inherit (builtins) elemAt; @@ -49,7 +49,7 @@ in stdenv.mkDerivation rec { mv * $out/libexec/kibana/ rm -r $out/libexec/kibana/node makeWrapper $out/libexec/kibana/bin/kibana $out/bin/kibana \ - --prefix PATH : "${stdenv.lib.makeBinPath [ nodejs coreutils which ]}" + --prefix PATH : "${lib.makeBinPath [ nodejs coreutils which ]}" sed -i 's@NODE=.*@NODE=${nodejs}/bin/node@' $out/libexec/kibana/bin/kibana ''; diff --git a/nixpkgs/pkgs/development/tools/misc/kibana/7.x.nix b/nixpkgs/pkgs/development/tools/misc/kibana/7.x.nix index dc3beb9866c0..7f46d6f65120 100644 --- a/nixpkgs/pkgs/development/tools/misc/kibana/7.x.nix +++ b/nixpkgs/pkgs/development/tools/misc/kibana/7.x.nix @@ -1,6 +1,6 @@ { elk7Version , enableUnfree ? true -, stdenv +, lib, stdenv , makeWrapper , fetchurl , nodejs-10_x @@ -8,7 +8,7 @@ , which }: -with stdenv.lib; +with lib; let nodejs = nodejs-10_x; inherit (builtins) elemAt; @@ -49,7 +49,7 @@ in stdenv.mkDerivation rec { mv * $out/libexec/kibana/ rm -r $out/libexec/kibana/node makeWrapper $out/libexec/kibana/bin/kibana $out/bin/kibana \ - --prefix PATH : "${stdenv.lib.makeBinPath [ nodejs coreutils which ]}" + --prefix PATH : "${lib.makeBinPath [ nodejs coreutils which ]}" sed -i 's@NODE=.*@NODE=${nodejs}/bin/node@' $out/libexec/kibana/bin/kibana ''; diff --git a/nixpkgs/pkgs/development/tools/misc/libtool/default.nix b/nixpkgs/pkgs/development/tools/misc/libtool/default.nix index 199c6504f392..2b0089e89f64 100644 --- a/nixpkgs/pkgs/development/tools/misc/libtool/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/libtool/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, m4, perl}: +{lib, stdenv, fetchurl, m4, perl}: # Note: this package is used for bootstrapping fetchurl, and thus # cannot use fetchpatch! All mutable patches (generated by GitHub or @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { homepage = "https://www.gnu.org/software/libtool/"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/tools/misc/libtool/libtool2.nix b/nixpkgs/pkgs/development/tools/misc/libtool/libtool2.nix index fbe49dc68b2a..6d7c4a9087f4 100644 --- a/nixpkgs/pkgs/development/tools/misc/libtool/libtool2.nix +++ b/nixpkgs/pkgs/development/tools/misc/libtool/libtool2.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, m4, perl, help2man +{ lib, stdenv, fetchurl, m4, perl, help2man }: stdenv.mkDerivation rec { @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "GNU Libtool, a generic library support script"; longDescription = '' GNU libtool is a generic library support script. Libtool hides diff --git a/nixpkgs/pkgs/development/tools/misc/libwhich/default.nix b/nixpkgs/pkgs/development/tools/misc/libwhich/default.nix index 59bbb99bd46e..aeda5271142a 100644 --- a/nixpkgs/pkgs/development/tools/misc/libwhich/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/libwhich/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "libwhich"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { install -Dm755 -t $out/bin libwhich ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Like `which`, for dynamic libraries"; homepage = "https://github.com/vtjnash/libwhich"; license = licenses.mit; diff --git a/nixpkgs/pkgs/development/tools/misc/loccount/default.nix b/nixpkgs/pkgs/development/tools/misc/loccount/default.nix index ace34f350599..59bab3742a26 100644 --- a/nixpkgs/pkgs/development/tools/misc/loccount/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/loccount/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitLab }: +{ lib, stdenv, buildGoPackage, fetchFromGitLab }: buildGoPackage rec { pname = "loccount"; version = "1.2"; @@ -13,7 +13,7 @@ buildGoPackage rec { sha256 = "18z7ai7wy2k9yd3w65d37apfqs3h9bc2c15y7v1bydppi44zfsdk"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Re-implementation of sloccount in Go"; longDescription = '' loccount is a re-implementation of David A. Wheeler's sloccount tool diff --git a/nixpkgs/pkgs/development/tools/misc/lsof/default.nix b/nixpkgs/pkgs/development/tools/misc/lsof/default.nix index e5988b1d5a9a..94e3722598b0 100644 --- a/nixpkgs/pkgs/development/tools/misc/lsof/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/lsof/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, buildPackages, ncurses }: +{ lib, stdenv, fetchFromGitHub, buildPackages, ncurses }: -let dialect = with stdenv.lib; last (splitString "-" stdenv.hostPlatform.system); in +let dialect = with lib; last (splitString "-" stdenv.hostPlatform.system); in stdenv.mkDerivation rec { pname = "lsof"; @@ -18,14 +18,14 @@ stdenv.mkDerivation rec { patches = [ ./no-build-info.patch ]; - postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' + postPatch = lib.optionalString stdenv.hostPlatform.isMusl '' substituteInPlace dialects/linux/dlsof.h --replace "defined(__UCLIBC__)" 1 - '' + stdenv.lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' sed -i 's|lcurses|lncurses|g' Configure ''; # Stop build scripts from searching global include paths - LSOF_INCLUDE = "${stdenv.lib.getDev stdenv.cc.libc}/include"; + LSOF_INCLUDE = "${lib.getDev stdenv.cc.libc}/include"; configurePhase = "LINUX_CONF_CC=$CC_FOR_BUILD LSOF_CC=$CC LSOF_AR=\"$AR cr\" LSOF_RANLIB=$RANLIB ./Configure -n ${dialect}"; preBuild = '' for filepath in $(find dialects/${dialect} -type f); do @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { cp lsof $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/lsof-org/lsof"; description = "A tool to list open files"; longDescription = '' diff --git a/nixpkgs/pkgs/development/tools/misc/ltrace/default.nix b/nixpkgs/pkgs/development/tools/misc/ltrace/default.nix index d88d9d7a7be5..e1d9ae6b5513 100644 --- a/nixpkgs/pkgs/development/tools/misc/ltrace/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/ltrace/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, elfutils, libunwind }: +{ lib, stdenv, fetchurl, elfutils, libunwind }: stdenv.mkDerivation { name = "ltrace-0.7.3"; @@ -20,7 +20,7 @@ stdenv.mkDerivation { patches="$patches $(cat debian/patches/series | sed 's|^|debian/patches/|')" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Library call tracer"; homepage = "https://www.ltrace.org/"; platforms = [ "i686-linux" "x86_64-linux" ]; diff --git a/nixpkgs/pkgs/development/tools/misc/lttng-tools/default.nix b/nixpkgs/pkgs/development/tools/misc/lttng-tools/default.nix index 03e370aeeb4b..223e10d04ab5 100644 --- a/nixpkgs/pkgs/development/tools/misc/lttng-tools/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/lttng-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, popt, libuuid, liburcu, lttng-ust, kmod, libxml2 }: +{ lib, stdenv, fetchurl, pkg-config, popt, libuuid, liburcu, lttng-ust, kmod, libxml2 }: stdenv.mkDerivation rec { pname = "lttng-tools"; @@ -9,10 +9,10 @@ stdenv.mkDerivation rec { sha256 = "1g0g7ypxvc7wd5x4d4ixmfgl9yk0lxax3ymm95hcjwxn5p497r6w"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ popt libuuid liburcu lttng-ust libxml2 kmod ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Tracing tools (kernel + user space) for Linux"; homepage = "https://lttng.org/"; license = licenses.lgpl21; diff --git a/nixpkgs/pkgs/development/tools/misc/lttng-ust/default.nix b/nixpkgs/pkgs/development/tools/misc/lttng-ust/default.nix index 1b59045c6fd2..94d2e4a33f29 100644 --- a/nixpkgs/pkgs/development/tools/misc/lttng-ust/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/lttng-ust/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, liburcu, python }: +{ lib, stdenv, fetchurl, liburcu, python3 }: # NOTE: # ./configure ... @@ -20,15 +20,15 @@ stdenv.mkDerivation rec { sha256 = "0ddwk0nl28bkv2xb78gz16a2bvlpfbjmzwfbgwf5p1cq46dyvy86"; }; - buildInputs = [ python ]; + buildInputs = [ python3 ]; preConfigure = '' patchShebangs . ''; - + propagatedBuildInputs = [ liburcu ]; - meta = with stdenv.lib; { + meta = with lib; { description = "LTTng Userspace Tracer libraries"; homepage = "https://lttng.org/"; license = licenses.lgpl21Plus; diff --git a/nixpkgs/pkgs/development/tools/misc/lttv/default.nix b/nixpkgs/pkgs/development/tools/misc/lttv/default.nix index abcc476d5947..a196c5f45288 100644 --- a/nixpkgs/pkgs/development/tools/misc/lttv/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/lttv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, gtk2, popt, babeltrace }: +{ lib, stdenv, fetchurl, pkg-config, glib, gtk2, popt, babeltrace }: stdenv.mkDerivation rec { name = "lttv-1.5"; @@ -8,10 +8,10 @@ stdenv.mkDerivation rec { sha256 = "1faldxnh9dld5k0vxckwpqw241ya1r2zv286l6rpgqr500zqw7r1"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib gtk2 popt babeltrace ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Graphical trace viewer for LTTng trace files"; homepage = "https://lttng.org/"; # liblttvtraceread (ltt/ directory) is distributed under the GNU LGPL v2.1. diff --git a/nixpkgs/pkgs/development/tools/misc/luarocks/default.nix b/nixpkgs/pkgs/development/tools/misc/luarocks/default.nix index fa19b2494076..77f34cca7dec 100644 --- a/nixpkgs/pkgs/development/tools/misc/luarocks/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/luarocks/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub +{lib, stdenv, fetchFromGitHub , curl, makeWrapper, which, unzip , lua # for 'luarocks pack' @@ -62,9 +62,9 @@ stdenv.mkDerivation rec { export LUA_PATH="src/?.lua;''${LUA_PATH:-}" ''; - meta = with stdenv.lib; { + meta = with lib; { inherit version; - description = ''A package manager for Lua''; + description = "A package manager for Lua"; license = licenses.mit ; maintainers = with maintainers; [raskin teto]; platforms = platforms.linux ++ platforms.darwin; diff --git a/nixpkgs/pkgs/development/tools/misc/luarocks/luarocks-nix.nix b/nixpkgs/pkgs/development/tools/misc/luarocks/luarocks-nix.nix index 57f200fd0fcb..30e02a3623fa 100644 --- a/nixpkgs/pkgs/development/tools/misc/luarocks/luarocks-nix.nix +++ b/nixpkgs/pkgs/development/tools/misc/luarocks/luarocks-nix.nix @@ -1,14 +1,11 @@ { luarocks, fetchFromGitHub }: luarocks.overrideAttrs(old: { pname = "luarocks-nix"; - version = "2019-09-07"; + version = "2021-01-22"; src = fetchFromGitHub { owner = "nix-community"; repo = "luarocks-nix"; - rev = "73b8772e56fd39dfffda9e3b13e9eb31e93d5cde"; - sha256 = "00jgshygw439pbaxg7yph3ijia6nid9r1br416wdbyl5wqhlhm1y"; + rev = "v3.5.0_nix"; + sha256 = "sha256-Ea3PVkCaUPO/mvVZtHtD1G9T/Yom28M9oN6duY4ovHk="; }; - patches = [ - ./darwin-3.1.3.patch - ]; }) diff --git a/nixpkgs/pkgs/development/tools/misc/macdylibbundler/default.nix b/nixpkgs/pkgs/development/tools/misc/macdylibbundler/default.nix index 5008175363cb..c92d7b077983 100644 --- a/nixpkgs/pkgs/development/tools/misc/macdylibbundler/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/macdylibbundler/default.nix @@ -1,4 +1,4 @@ -{ stdenv, makeWrapper, fetchFromGitHub, cctools }: +{ lib, stdenv, makeWrapper, fetchFromGitHub, cctools }: stdenv.mkDerivation { pname = "macdylibbundler"; @@ -20,7 +20,7 @@ stdenv.mkDerivation { --prefix PATH ":" "${cctools}/bin" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Utility to ease bundling libraries into executables for OSX"; longDescription = '' dylibbundler is a small command-line programs that aims to make bundling diff --git a/nixpkgs/pkgs/development/tools/misc/mdl/gemset.nix b/nixpkgs/pkgs/development/tools/misc/mdl/gemset.nix index f2d332a95bb8..eaaa7bed5a5e 100644 --- a/nixpkgs/pkgs/development/tools/misc/mdl/gemset.nix +++ b/nixpkgs/pkgs/development/tools/misc/mdl/gemset.nix @@ -94,4 +94,4 @@ }; version = "2.0.0"; }; -} \ No newline at end of file +} diff --git a/nixpkgs/pkgs/development/tools/misc/micronucleus/default.nix b/nixpkgs/pkgs/development/tools/misc/micronucleus/default.nix index 890439adc6e9..2999b741888a 100644 --- a/nixpkgs/pkgs/development/tools/misc/micronucleus/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/micronucleus/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ libusb-compat-0_1 ]; - makeFlags = stdenv.lib.optionals stdenv.isDarwin [ "CC=cc" ]; + makeFlags = lib.optionals stdenv.isDarwin [ "CC=cc" ]; installPhase = '' mkdir -p $out/bin diff --git a/nixpkgs/pkgs/development/tools/misc/msitools/default.nix b/nixpkgs/pkgs/development/tools/misc/msitools/default.nix index 0e28f729fe9d..f444f86dbfbe 100644 --- a/nixpkgs/pkgs/development/tools/misc/msitools/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/msitools/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchurl, intltool, glib, pkgconfig, libgsf, libuuid, gcab, bzip2, gnome3 }: +{ lib, stdenv, fetchurl, intltool, glib, pkg-config, libgsf, libuuid, gcab, bzip2, gnome3 }: stdenv.mkDerivation rec { pname = "msitools"; version = "0.98"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "19wb3n3nwkpc6bjr0q3f1znaxsfaqgjbdxxnbx8ic8bb5b49hwac"; }; - nativeBuildInputs = [ intltool pkgconfig ]; + nativeBuildInputs = [ intltool pkg-config ]; buildInputs = [ glib libgsf libuuid gcab bzip2 ]; passthru = { @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Set of programs to inspect and build Windows Installer (.MSI) files"; homepage = "https://wiki.gnome.org/msitools"; license = [ licenses.gpl2 licenses.lgpl21 ]; diff --git a/nixpkgs/pkgs/development/tools/misc/nimlsp/default.nix b/nixpkgs/pkgs/development/tools/misc/nimlsp/default.nix new file mode 100644 index 000000000000..1919e26ddec4 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/misc/nimlsp/default.nix @@ -0,0 +1,48 @@ +{ lib, stdenv, fetchFromGitHub, srcOnly, nim }: +let + astpatternmatching = fetchFromGitHub { + owner = "krux02"; + repo = "ast-pattern-matching"; + rev = "87f7d163421af5a4f5e5cb6da7b93278e6897e96"; + sha256 = "19mb5bb6riia8380p5dpc3q0vwgrj958dd6p7vw8vkvwiqrzg6zq"; + }; + + jsonschema = fetchFromGitHub { + owner = "PMunch"; + repo = "jsonschema"; + rev = "7b41c03e3e1a487d5a8f6b940ca8e764dc2cbabf"; + sha256 = "1js64jqd854yjladxvnylij4rsz7212k31ks541pqrdzm6hpblbz"; + }; +in +stdenv.mkDerivation rec { + pname = "nimlsp"; + version = "0.2.6"; + + src = fetchFromGitHub { + owner = "PMunch"; + repo = "nimlsp"; + rev = "v${version}"; + sha256 = "13kw3zjh0iqymwqxwhyj8jz6hgswwahf1rjd6iad7c6gcwrrg6yl"; + }; + + nativeBuildInputs = [ nim ]; + + buildPhase = '' + export HOME=$TMPDIR + nim -d:release -p:${astpatternmatching}/src -p:${jsonschema}/src \ + c --threads:on -d:nimcore -d:nimsuggest -d:debugCommunication \ + -d:debugLogging -d:explicitSourcePath=${srcOnly nim.unwrapped} -d:tempDir=/tmp src/nimlsp + ''; + + installPhase = '' + install -Dt $out/bin src/nimlsp + ''; + + meta = with lib; { + description = "Language Server Protocol implementation for Nim"; + homepage = "https://github.com/PMunch/nimlsp"; + license = licenses.mit; + platforms = nim.meta.platforms; + maintainers = [ maintainers.marsam ]; + }; +} diff --git a/nixpkgs/pkgs/development/tools/misc/ninka/default.nix b/nixpkgs/pkgs/development/tools/misc/ninka/default.nix index e683bef7b060..8e8fb6bb5972 100644 --- a/nixpkgs/pkgs/development/tools/misc/ninka/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/ninka/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, perl, perlPackages }: +{ lib, stdenv, fetchFromGitHub, perl, perlPackages }: assert stdenv ? glibc; @@ -26,7 +26,7 @@ perlPackages.buildPerlPackage { perl Makefile.PL ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A sentence based license detector"; homepage = "http://ninka.turingmachine.org/"; license = licenses.gpl2; diff --git a/nixpkgs/pkgs/development/tools/misc/nrfutil/default.nix b/nixpkgs/pkgs/development/tools/misc/nrfutil/default.nix index eeb9100a4c8f..a8a18b254b98 100644 --- a/nixpkgs/pkgs/development/tools/misc/nrfutil/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/nrfutil/default.nix @@ -1,4 +1,4 @@ -{ stdenv, python37Packages, fetchFromGitHub }: +{ lib, stdenv, python37Packages, fetchFromGitHub }: with python37Packages; buildPythonApplication rec { pname = "nrfutil"; @@ -20,7 +20,7 @@ with python37Packages; buildPythonApplication rec { mkdir test-reports ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Device Firmware Update tool for nRF chips"; homepage = "https://github.com/NordicSemiconductor/pc-nrfutil"; license = licenses.unfreeRedistributable; diff --git a/nixpkgs/pkgs/development/tools/misc/nxpmicro-mfgtools/default.nix b/nixpkgs/pkgs/development/tools/misc/nxpmicro-mfgtools/default.nix index e9259b7156b9..74309a33f22f 100644 --- a/nixpkgs/pkgs/development/tools/misc/nxpmicro-mfgtools/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/nxpmicro-mfgtools/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , cmake , pkg-config @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { preConfigure = "echo ${version} > .tarball-version"; - meta = with stdenv.lib; { + meta = with lib; { description = "Freescale/NXP I.MX chip image deploy tools"; longDescription = '' UUU (Universal Update Utility) is a command line tool, evolved out of diff --git a/nixpkgs/pkgs/development/tools/misc/objconv/default.nix b/nixpkgs/pkgs/development/tools/misc/objconv/default.nix index 52cc1b2d5c58..55147e9a16db 100644 --- a/nixpkgs/pkgs/development/tools/misc/objconv/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/objconv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip }: +{ lib, stdenv, fetchurl, unzip }: stdenv.mkDerivation rec { pname = "objconv"; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { mv objconv-instructions.pdf $out/doc/objconv ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Object and executable file converter, modifier and disassembler"; homepage = "https://www.agner.org/optimize/"; license = licenses.gpl2; diff --git a/nixpkgs/pkgs/development/tools/misc/one_gadget/gemset.nix b/nixpkgs/pkgs/development/tools/misc/one_gadget/gemset.nix index 26507a26e915..89425f805b43 100644 --- a/nixpkgs/pkgs/development/tools/misc/one_gadget/gemset.nix +++ b/nixpkgs/pkgs/development/tools/misc/one_gadget/gemset.nix @@ -31,4 +31,4 @@ }; version = "1.7.2"; }; -} \ No newline at end of file +} diff --git a/nixpkgs/pkgs/development/tools/misc/opengrok/default.nix b/nixpkgs/pkgs/development/tools/misc/opengrok/default.nix index 79fa383300e1..01f2ced1f4bb 100644 --- a/nixpkgs/pkgs/development/tools/misc/opengrok/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/opengrok/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, jre, ctags, makeWrapper, coreutils, git, runtimeShell }: +{ lib, stdenv, fetchurl, jre, ctags, makeWrapper, coreutils, git, runtimeShell }: stdenv.mkDerivation rec { pname = "opengrok"; @@ -18,12 +18,12 @@ stdenv.mkDerivation rec { substituteInPlace $out/bin/OpenGrok --replace "/bin/uname" "${coreutils}/bin/uname" substituteInPlace $out/bin/Messages --replace "#!/bin/ksh" "#!${runtimeShell}" wrapProgram $out/bin/OpenGrok \ - --prefix PATH : "${stdenv.lib.makeBinPath [ ctags git ]}" \ + --prefix PATH : "${lib.makeBinPath [ ctags git ]}" \ --set JAVA_HOME "${jre}" \ --set OPENGROK_TOMCAT_BASE "/var/tomcat" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Source code search and cross reference engine"; homepage = "https://opengrok.github.io/OpenGrok/"; license = licenses.cddl; diff --git a/nixpkgs/pkgs/development/tools/misc/pahole/default.nix b/nixpkgs/pkgs/development/tools/misc/pahole/default.nix index bb88862a8e8e..c39ef5e00516 100644 --- a/nixpkgs/pkgs/development/tools/misc/pahole/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/pahole/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, cmake, elfutils, zlib }: +{ lib, stdenv, fetchgit, cmake, elfutils, zlib }: stdenv.mkDerivation rec { pname = "pahole"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { # Put libraries in "lib" subdirectory, not top level of $out cmakeFlags = [ "-D__LIB=lib" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://git.kernel.org/cgit/devel/pahole/pahole.git/"; description = "Pahole and other DWARF utils"; license = licenses.gpl2; diff --git a/nixpkgs/pkgs/development/tools/misc/patchelf/default.nix b/nixpkgs/pkgs/development/tools/misc/patchelf/default.nix index 1d31709ccf0c..a0c002d8a8c5 100644 --- a/nixpkgs/pkgs/development/tools/misc/patchelf/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/patchelf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: # Note: this package is used for bootstrapping fetchurl, and thus # cannot use fetchpatch! All mutable patches (generated by GitHub or @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { # fails 8 out of 24 tests, problems when loading libc.so.6 doCheck = stdenv.name == "stdenv-linux"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/NixOS/patchelf/blob/master/README"; license = licenses.gpl3; description = "A small utility to modify the dynamic linker and RPATH of ELF executables"; diff --git a/nixpkgs/pkgs/development/tools/misc/patchelf/unstable.nix b/nixpkgs/pkgs/development/tools/misc/patchelf/unstable.nix index 0d9eeb84bfb4..1d790740e697 100644 --- a/nixpkgs/pkgs/development/tools/misc/patchelf/unstable.nix +++ b/nixpkgs/pkgs/development/tools/misc/patchelf/unstable.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook, fetchFromGitHub }: +{ lib, stdenv, fetchurl, autoreconfHook, fetchFromGitHub }: stdenv.mkDerivation rec { name = "patchelf-${version}"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; # Drop test that fails on musl (?) - postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' + postPatch = lib.optionalString stdenv.hostPlatform.isMusl '' substituteInPlace tests/Makefile.am \ --replace "set-rpath-library.sh" "" ''; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { doCheck = !stdenv.isDarwin; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/NixOS/patchelf/blob/master/README"; license = licenses.gpl3; description = "A small utility to modify the dynamic linker and RPATH of ELF executables"; diff --git a/nixpkgs/pkgs/development/tools/misc/perfect-hash/default.nix b/nixpkgs/pkgs/development/tools/misc/perfect-hash/default.nix index 4e405413e3ae..7447bf660226 100644 --- a/nixpkgs/pkgs/development/tools/misc/perfect-hash/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/perfect-hash/default.nix @@ -1,4 +1,4 @@ -{ stdenv, python3, fetchFromGitHub }: +{ lib, stdenv, python3, fetchFromGitHub }: python3.pkgs.buildPythonApplication rec { pname = "perfect-hash"; version = "0.4.1"; @@ -18,7 +18,7 @@ python3.pkgs.buildPythonApplication rec { cp -r examples $out/share/doc/perfect-hash ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Minimal perfect hash function generator"; longDescription = '' Generate a minimal perfect hash function for a given set of keys. diff --git a/nixpkgs/pkgs/development/tools/misc/pkg-config/default.nix b/nixpkgs/pkgs/development/tools/misc/pkg-config/default.nix index 84f6c330f8c5..b0b3115700fb 100644 --- a/nixpkgs/pkgs/development/tools/misc/pkg-config/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/pkg-config/default.nix @@ -1,13 +1,13 @@ -{ stdenv, fetchurl, libiconv, vanilla ? false }: +{ lib, stdenv, fetchurl, libiconv, vanilla ? false }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "pkg-config"; version = "0.29.2"; src = fetchurl { - url = "https://pkgconfig.freedesktop.org/releases/${pname}-${version}.tar.gz"; + url = "https://pkg-config.freedesktop.org/releases/${pname}-${version}.tar.gz"; sha256 = "14fmwzki1rlz8bs2p810lk6jqdxsk966d8drgsjmi54cd00rrikg"; }; diff --git a/nixpkgs/pkgs/development/tools/misc/pkgconf/default.nix b/nixpkgs/pkgs/development/tools/misc/pkgconf/default.nix index 6fca02ad788b..c6c984f9699f 100644 --- a/nixpkgs/pkgs/development/tools/misc/pkgconf/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/pkgconf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, removeReferencesTo }: +{ lib, stdenv, fetchurl, removeReferencesTo }: stdenv.mkDerivation rec { pname = "pkgconf"; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { mv ${placeholder "dev"}/share ${placeholder "out"} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Package compiler and linker metadata toolkit"; homepage = "https://git.dereferenced.org/pkgconf/pkgconf"; platforms = platforms.all; diff --git a/nixpkgs/pkgs/development/tools/misc/pmccabe/default.nix b/nixpkgs/pkgs/development/tools/misc/pmccabe/default.nix index 81a88f20ad20..1fd58fd14a2f 100644 --- a/nixpkgs/pkgs/development/tools/misc/pmccabe/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/pmccabe/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "pmccabe"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "McCabe-style function complexity and line counting for C and C++"; homepage = "https://people.debian.org/~bame/pmccabe/"; license = licenses.gpl2Plus; diff --git a/nixpkgs/pkgs/development/tools/misc/prelink/default.nix b/nixpkgs/pkgs/development/tools/misc/prelink/default.nix index 5d7ca75de322..63fc7c8e64a5 100644 --- a/nixpkgs/pkgs/development/tools/misc/prelink/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/prelink/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libelf }: +{ lib, stdenv, fetchurl, libelf }: let version = "20130503"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { inherit version; buildInputs = [ - libelf stdenv.cc.libc (stdenv.lib.getOutput "static" stdenv.cc.libc) + libelf stdenv.cc.libc (lib.getOutput "static" stdenv.cc.libc) ]; src = fetchurl { @@ -20,6 +20,6 @@ stdenv.mkDerivation { homepage = "https://people.redhat.com/jakub/prelink/"; license = "GPL"; description = "ELF prelinking utility to speed up dynamic linking"; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/nixpkgs/pkgs/development/tools/misc/premake/3.nix b/nixpkgs/pkgs/development/tools/misc/premake/3.nix index a630c0ced9e7..9176842d75d0 100644 --- a/nixpkgs/pkgs/development/tools/misc/premake/3.nix +++ b/nixpkgs/pkgs/development/tools/misc/premake/3.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, unzip}: +{lib, stdenv, fetchurl, unzip}: let baseName = "premake"; version = "3.7"; @@ -24,7 +24,7 @@ stdenv.mkDerivation { meta = { homepage = "http://industriousone.com/premake"; description = "A simple build configuration and project generation tool using lua"; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.bsd3; + platforms = lib.platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/tools/misc/premake/5.nix b/nixpkgs/pkgs/development/tools/misc/premake/5.nix index 5e8606833d31..bb0269d0cc3b 100644 --- a/nixpkgs/pkgs/development/tools/misc/premake/5.nix +++ b/nixpkgs/pkgs/development/tools/misc/premake/5.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, Foundation, readline }: +{ lib, stdenv, fetchFromGitHub, Foundation, readline }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "premake5"; @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://premake.github.io"; description = "A simple build configuration and project generation tool using lua"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; platforms = platforms.darwin ++ platforms.linux; }; } diff --git a/nixpkgs/pkgs/development/tools/misc/premake/default.nix b/nixpkgs/pkgs/development/tools/misc/premake/default.nix index 92445abbba9b..ccd8a4574a1f 100644 --- a/nixpkgs/pkgs/development/tools/misc/premake/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/premake/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip }: +{ lib, stdenv, fetchurl, unzip }: let baseName = "premake"; version = "4.3"; @@ -25,10 +25,10 @@ stdenv.mkDerivation { premake_cmd = "premake4"; setupHook = ./setup-hook.sh; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://industriousone.com/premake"; description = "A simple build configuration and project generation tool using lua"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; platforms = platforms.unix; maintainers = [ maintainers.bjornfor ]; }; diff --git a/nixpkgs/pkgs/development/tools/misc/ptags/default.nix b/nixpkgs/pkgs/development/tools/misc/ptags/default.nix index 93014af3f620..0ef7a2aa73a4 100644 --- a/nixpkgs/pkgs/development/tools/misc/ptags/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/ptags/default.nix @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec { $releaseDir/ptags --help > /dev/null ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A parallel universal-ctags wrapper for git repository"; homepage = "https://github.com/dalance/ptags"; maintainers = with maintainers; [ pamplemousse ]; diff --git a/nixpkgs/pkgs/development/tools/misc/pwndbg/default.nix b/nixpkgs/pkgs/development/tools/misc/pwndbg/default.nix index f9d792d185f8..69ed17ab4b9e 100644 --- a/nixpkgs/pkgs/development/tools/misc/pwndbg/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/pwndbg/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , python3 , fetchFromGitHub , makeWrapper @@ -42,7 +42,7 @@ in stdenv.mkDerivation rec { --set NIX_PYTHONPATH ${pythonPath} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Exploit Development and Reverse Engineering with GDB Made Easy"; homepage = "https://github.com/pwndbg/pwndbg"; license = licenses.mit; diff --git a/nixpkgs/pkgs/development/tools/misc/remarkable/remarkable-toolchain/default.nix b/nixpkgs/pkgs/development/tools/misc/remarkable/remarkable-toolchain/default.nix index d259721353b1..643e28e82b27 100644 --- a/nixpkgs/pkgs/development/tools/misc/remarkable/remarkable-toolchain/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/remarkable/remarkable-toolchain/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libarchive, python, file, which }: +{ lib, stdenv, fetchurl, libarchive, python, file, which }: stdenv.mkDerivation rec { pname = "remarkable-toolchain"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ENVCLEANED=1 $src -y -d $out ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A toolchain for cross-compiling to reMarkable tablets"; homepage = "https://remarkable.engineering/"; license = licenses.gpl2; diff --git a/nixpkgs/pkgs/development/tools/misc/remarkable/remarkable2-toolchain/default.nix b/nixpkgs/pkgs/development/tools/misc/remarkable/remarkable2-toolchain/default.nix new file mode 100644 index 000000000000..7b4df5df1647 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/misc/remarkable/remarkable2-toolchain/default.nix @@ -0,0 +1,39 @@ +{ lib, stdenv, fetchurl, libarchive, python3, file }: + +stdenv.mkDerivation rec { + pname = "remarkable2-toolchain"; + version = "2.5.2"; + + src = fetchurl { + url = "https://storage.googleapis.com/codex-public-bucket/codex-x86_64-cortexa7hf-neon-rm11x-toolchain-${version}.sh"; + sha256 = "1v410q1jn8flisdpkrymxd4pa1ylawd0rh3rljjpkqw1bp8a5vw1"; + }; + + nativeBuildInputs = [ + libarchive + python3 + file + ]; + + unpackCmd = '' + mkdir src + install $curSrc src/install-toolchain.sh + ''; + + dontBuild = true; + + installPhase = '' + patchShebangs install-toolchain.sh + sed -i -e '3,9d' install-toolchain.sh # breaks PATH + sed -i 's|PYTHON=.*$|PYTHON=${python3}/bin/python|' install-toolchain.sh + ./install-toolchain.sh -D -y -d $out + ''; + + meta = with lib; { + description = "A toolchain for cross-compiling to reMarkable 2 tablets"; + homepage = "https://remarkable.engineering/"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ tadfisher ]; + platforms = platforms.x86_64; + }; +} diff --git a/nixpkgs/pkgs/development/tools/misc/rman/default.nix b/nixpkgs/pkgs/development/tools/misc/rman/default.nix index 09769d5c5912..1f7de915c974 100644 --- a/nixpkgs/pkgs/development/tools/misc/rman/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/rman/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation { name = "rman-3.2"; @@ -27,6 +27,6 @@ stdenv.mkDerivation { meta = { description = "Parse formatted man pages and man page source from most flavors of UNIX and converts them to HTML, ASCII, TkMan, DocBook, and other formats"; license = "artistic"; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/nixpkgs/pkgs/development/tools/misc/rolespec/default.nix b/nixpkgs/pkgs/development/tools/misc/rolespec/default.nix index 6eb13bb242da..d86277993caa 100644 --- a/nixpkgs/pkgs/development/tools/misc/rolespec/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/rolespec/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, makeWrapper }: +{ lib, stdenv, fetchFromGitHub, makeWrapper }: stdenv.mkDerivation rec { @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { dontPatchELF = true; dontStrip = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/nickjj/rolespec"; description = "A test library for testing Ansible roles"; longDescription = '' diff --git a/nixpkgs/pkgs/development/tools/misc/saleae-logic/default.nix b/nixpkgs/pkgs/development/tools/misc/saleae-logic/default.nix index b9f84edc964a..c26e834ee0f7 100644 --- a/nixpkgs/pkgs/development/tools/misc/saleae-logic/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/saleae-logic/default.nix @@ -6,7 +6,7 @@ # # In NixOS, simply add this package to services.udev.packages. -{ stdenv, fetchurl, unzip, glib, libSM, libICE, gtk2, libXext, libXft +{ lib, stdenv, fetchurl, unzip, glib, libSM, libICE, gtk2, libXext, libXft , fontconfig, libXrender, libXfixes, libX11, libXi, libXrandr, libXcursor , freetype, libXinerama, libxcb, zlib, pciutils , makeDesktopItem, xkeyboardconfig, dbus, runtimeShell, libGL @@ -14,7 +14,7 @@ let - libPath = stdenv.lib.makeLibraryPath [ + libPath = lib.makeLibraryPath [ glib libSM libICE gtk2 libXext libXft fontconfig libXrender libXfixes libX11 libXi libXrandr libXcursor freetype libXinerama libxcb zlib stdenv.cc.cc.lib dbus libGL @@ -87,7 +87,7 @@ stdenv.mkDerivation rec { cp Drivers/99-SaleaeLogic.rules "$out/etc/udev/rules.d/" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Software for Saleae logic analyzers"; homepage = "https://www.saleae.com/"; license = licenses.unfree; diff --git a/nixpkgs/pkgs/development/tools/misc/scc/default.nix b/nixpkgs/pkgs/development/tools/misc/scc/default.nix index 5fc23547615a..49052c141a1a 100644 --- a/nixpkgs/pkgs/development/tools/misc/scc/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/scc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ lib, stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "scc"; @@ -16,7 +16,7 @@ buildGoModule rec { # scc has a scripts/ sub-package that's for testing. excludedPackages = [ "scripts" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/boyter/scc"; description = "A very fast accurate code counter with complexity calculations and COCOMO estimates written in pure Go"; maintainers = with maintainers; [ sigma Br1ght0ne ]; diff --git a/nixpkgs/pkgs/development/tools/misc/sccache/default.nix b/nixpkgs/pkgs/development/tools/misc/sccache/default.nix index 843059b33562..c68a1c1547cc 100644 --- a/nixpkgs/pkgs/development/tools/misc/sccache/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/sccache/default.nix @@ -1,4 +1,14 @@ -{ stdenv, fetchFromGitHub, cargo, rustc, rustPlatform, pkgconfig, glib, openssl, darwin }: +{ stdenv +, lib +, fetchFromGitHub +, cargo +, rustc +, rustPlatform +, pkg-config +, glib +, openssl +, darwin +}: rustPlatform.buildRustPackage rec { version = "0.2.14"; @@ -14,16 +24,16 @@ rustPlatform.buildRustPackage rec { cargoBuildFlags = [ "--features=all" ]; nativeBuildInputs = [ - pkgconfig cargo rustc + pkg-config cargo rustc ]; buildInputs = [ openssl - ] ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; + ] ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; # Tests fail because of client server setup which is not possible inside the pure environment, # see https://github.com/mozilla/sccache/issues/460 checkPhase = null; - meta = with stdenv.lib; { + meta = with lib; { description = "Ccache with Cloud Storage"; homepage = "https://github.com/mozilla/sccache"; maintainers = with maintainers; [ doronbehar ]; diff --git a/nixpkgs/pkgs/development/tools/misc/sipp/default.nix b/nixpkgs/pkgs/development/tools/misc/sipp/default.nix index 610e66a2b9cc..22bf244662b3 100644 --- a/nixpkgs/pkgs/development/tools/misc/sipp/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/sipp/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ncurses, libpcap }: +{lib, stdenv, fetchurl, ncurses, libpcap }: stdenv.mkDerivation rec { version = "3.6.0"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { buildInputs = [ncurses libpcap]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://sipp.sf.net"; description = "The SIPp testing tool"; license = licenses.gpl3; diff --git a/nixpkgs/pkgs/development/tools/misc/sloccount/default.nix b/nixpkgs/pkgs/development/tools/misc/sloccount/default.nix index b2b83aa79b16..fc041f2ee8d6 100644 --- a/nixpkgs/pkgs/development/tools/misc/sloccount/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/sloccount/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, perl, makeWrapper }: +{ fetchurl, lib, stdenv, perl, makeWrapper }: stdenv.mkDerivation rec { name = "sloccount-2.26"; @@ -62,11 +62,11 @@ stdenv.mkDerivation rec { the Perl CPAN library using this tool suite. ''; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; homepage = "https://www.dwheeler.com/sloccount/"; maintainers = [ ]; - platforms = stdenv.lib.platforms.all; + platforms = lib.platforms.all; }; } diff --git a/nixpkgs/pkgs/development/tools/misc/srecord/default.nix b/nixpkgs/pkgs/development/tools/misc/srecord/default.nix index f978d4d4e120..a18dcd85255a 100644 --- a/nixpkgs/pkgs/development/tools/misc/srecord/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/srecord/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, boost, libtool, groff, ghostscript, libgcrypt ? null }: +{ lib, stdenv, fetchurl, boost, libtool, groff, ghostscript, libgcrypt ? null }: stdenv.mkDerivation rec { name = "srecord-1.64"; @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { buildInputs = [ boost libtool groff ghostscript libgcrypt ]; - configureFlags = stdenv.lib.optional (libgcrypt == null) "--without-gcrypt"; + configureFlags = lib.optional (libgcrypt == null) "--without-gcrypt"; - meta = with stdenv.lib; { + meta = with lib; { description = "Collection of powerful tools for manipulating EPROM load files"; homepage = "http://srecord.sourceforge.net/"; license = licenses.gpl3Plus; maintainers = [ maintainers.bjornfor ]; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/tools/misc/stlink/default.nix b/nixpkgs/pkgs/development/tools/misc/stlink/default.nix index 7595b84721cf..e67fd9ca7a85 100644 --- a/nixpkgs/pkgs/development/tools/misc/stlink/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/stlink/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, libusb1 }: +{ lib, stdenv, fetchFromGitHub, cmake, libusb1 }: let # The Darwin build of stlink explicitly refers to static libusb. @@ -29,7 +29,7 @@ in stdenv.mkDerivation rec { mkdir -p $out/etc/modprobe.d ''; - meta = with stdenv.lib; { + meta = with lib; { description = "In-circuit debug and programming for ST-Link devices"; license = licenses.bsd3; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/development/tools/misc/stm32cubemx/default.nix b/nixpkgs/pkgs/development/tools/misc/stm32cubemx/default.nix index 9fe34aecade2..3b754e4c91bb 100644 --- a/nixpkgs/pkgs/development/tools/misc/stm32cubemx/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/stm32cubemx/default.nix @@ -1,4 +1,4 @@ -{ stdenv, requireFile, makeDesktopItem, libicns, imagemagick, jre, fetchzip }: +{ lib, stdenv, requireFile, makeDesktopItem, libicns, imagemagick, jre, fetchzip }: let version = "6.0.1"; @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { ln -s ${desktopItem}/share/applications/* $out/share/applications ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A graphical tool for configuring STM32 microcontrollers and microprocessors"; longDescription = '' A graphical tool that allows a very easy configuration of STM32 diff --git a/nixpkgs/pkgs/development/tools/misc/stm32flash/default.nix b/nixpkgs/pkgs/development/tools/misc/stm32flash/default.nix index 0c2cb96a9d6c..bc7d4b1b3dc8 100644 --- a/nixpkgs/pkgs/development/tools/misc/stm32flash/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/stm32flash/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { name = "stm32flash-0.5"; @@ -16,10 +16,10 @@ stdenv.mkDerivation rec { cp stm32flash $out/bin/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Open source flash program for the STM32 ARM processors using the ST bootloader"; homepage = "https://sourceforge.net/projects/stm32flash/"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; platforms = platforms.all; # Should work on all platforms maintainers = with maintainers; [ elitak ]; }; diff --git a/nixpkgs/pkgs/development/tools/misc/strace/default.nix b/nixpkgs/pkgs/development/tools/misc/strace/default.nix index 6b797481799e..004e1527d352 100644 --- a/nixpkgs/pkgs/development/tools/misc/strace/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/strace/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, libunwind, buildPackages }: +{ lib, stdenv, fetchurl, perl, libunwind, buildPackages }: stdenv.mkDerivation rec { pname = "strace"; @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ perl ]; - buildInputs = [ perl.out ] ++ stdenv.lib.optional libunwind.supportsHost libunwind; # support -k + buildInputs = [ perl.out ] ++ lib.optional libunwind.supportsHost libunwind; # support -k postPatch = "patchShebangs --host strace-graph"; - configureFlags = stdenv.lib.optional (!stdenv.hostPlatform.isx86) "--enable-mpers=check"; + configureFlags = [ "--enable-mpers=check" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://strace.io/"; description = "A system call tracer for Linux"; license = with licenses; [ lgpl21Plus gpl2Plus ]; # gpl2Plus is for the test suite diff --git a/nixpkgs/pkgs/development/tools/misc/swig/2.x.nix b/nixpkgs/pkgs/development/tools/misc/swig/2.x.nix index 745cc9a2e783..1068b3e2ad9d 100644 --- a/nixpkgs/pkgs/development/tools/misc/swig/2.x.nix +++ b/nixpkgs/pkgs/development/tools/misc/swig/2.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, libtool, bison, pcre }: +{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, bison, pcre }: stdenv.mkDerivation rec { pname = "swig"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ./autogen.sh ''; - meta = with stdenv.lib; { + meta = with lib; { description = "SWIG, an interface compiler that connects C/C++ code to higher-level languages"; homepage = "http://swig.org/"; # Different types of licenses available: http://www.swig.org/Release/LICENSE . diff --git a/nixpkgs/pkgs/development/tools/misc/swig/3.x.nix b/nixpkgs/pkgs/development/tools/misc/swig/3.x.nix index 853a240ffc35..109243b54ba1 100644 --- a/nixpkgs/pkgs/development/tools/misc/swig/3.x.nix +++ b/nixpkgs/pkgs/development/tools/misc/swig/3.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, libtool, bison, pcre }: +{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, bison, pcre }: stdenv.mkDerivation rec { pname = "swig"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ./autogen.sh ''; - meta = with stdenv.lib; { + meta = with lib; { description = "An interface compiler that connects C/C++ code to higher-level languages"; homepage = "http://swig.org/"; # Different types of licenses available: http://www.swig.org/Release/LICENSE . diff --git a/nixpkgs/pkgs/development/tools/misc/swig/4.nix b/nixpkgs/pkgs/development/tools/misc/swig/4.nix index 4096b7353fa4..56106143027f 100644 --- a/nixpkgs/pkgs/development/tools/misc/swig/4.nix +++ b/nixpkgs/pkgs/development/tools/misc/swig/4.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, libtool, bison, pcre }: +{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, bison, pcre }: stdenv.mkDerivation rec { pname = "swig"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ./autogen.sh ''; - meta = with stdenv.lib; { + meta = with lib; { description = "SWIG, an interface compiler that connects C/C++ code to higher-level languages"; homepage = "http://swig.org/"; # Different types of licenses available: http://www.swig.org/Release/LICENSE . diff --git a/nixpkgs/pkgs/development/tools/misc/swig/default.nix b/nixpkgs/pkgs/development/tools/misc/swig/default.nix index cf0880855db6..3c1a5b82dc2a 100644 --- a/nixpkgs/pkgs/development/tools/misc/swig/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/swig/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, boost, tcl }: +{ lib, stdenv, fetchurl, boost, tcl }: stdenv.mkDerivation rec { pname = "swig"; @@ -11,12 +11,12 @@ stdenv.mkDerivation rec { doCheck = !stdenv.isCygwin; # 'make check' uses boost and tcl - buildInputs = stdenv.lib.optionals doCheck [ boost tcl ]; + buildInputs = lib.optionals doCheck [ boost tcl ]; configureFlags = [ "--disable-ccache" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "SWIG, an interface compiler that connects C/C++ code to higher-level languages"; homepage = "http://swig.org/"; # Different types of licenses available: http://www.swig.org/Release/LICENSE . diff --git a/nixpkgs/pkgs/development/tools/misc/sysbench/default.nix b/nixpkgs/pkgs/development/tools/misc/sysbench/default.nix index 616a1cbc3fbd..2cf8c91d3bf9 100644 --- a/nixpkgs/pkgs/development/tools/misc/sysbench/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/sysbench/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config , libmysqlclient, libaio }: @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { pname = "sysbench"; version = "1.0.20"; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libmysqlclient libaio ]; src = fetchFromGitHub { @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { description = "Modular, cross-platform and multi-threaded benchmark tool"; homepage = "https://github.com/akopytov/sysbench"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; }; } diff --git a/nixpkgs/pkgs/development/tools/misc/tcptrack/default.nix b/nixpkgs/pkgs/development/tools/misc/tcptrack/default.nix index 9872c91ac4ba..5b1fd72a7f51 100644 --- a/nixpkgs/pkgs/development/tools/misc/tcptrack/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/tcptrack/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ncurses, libpcap }: +{ lib, stdenv, fetchFromGitHub, ncurses, libpcap }: stdenv.mkDerivation rec { pname = "tcptrack"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-Wno-error=cpp"; - meta = with stdenv.lib; { + meta = with lib; { inherit (src.meta) homepage; description = "libpcap based program for live TCP connection monitoring"; license = licenses.lgpl21; diff --git a/nixpkgs/pkgs/development/tools/misc/teensy-loader-cli/default.nix b/nixpkgs/pkgs/development/tools/misc/teensy-loader-cli/default.nix index 40f3921ec705..156e3f7f895d 100644 --- a/nixpkgs/pkgs/development/tools/misc/teensy-loader-cli/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/teensy-loader-cli/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, go-md2man, installShellFiles, libusb-compat-0_1 }: +{ lib, stdenv, fetchFromGitHub, go-md2man, installShellFiles, libusb-compat-0_1 }: stdenv.mkDerivation rec { pname = "teensy-loader-cli"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { installManPage *.1 ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Firmware uploader for the Teensy microcontroller boards"; homepage = "https://www.pjrc.com/teensy/"; license = licenses.gpl3; diff --git a/nixpkgs/pkgs/development/tools/misc/terraform-ls/default.nix b/nixpkgs/pkgs/development/tools/misc/terraform-ls/default.nix index 220042079fd4..498508d091fc 100644 --- a/nixpkgs/pkgs/development/tools/misc/terraform-ls/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/terraform-ls/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "terraform-ls"; - version = "0.11.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "hashicorp"; repo = pname; rev = "v${version}"; - sha256 = "XOKaNpYR31lKpA33+7WU2KYjgEx4g6gpp3IAjWtb3Zk="; + sha256 = "w9PLKLFjKehtub1LbVX9TbvKkj/S1t0MwZIZurF2x18="; }; - vendorSha256 = "8NdeCD558r0tV+ZR4MvLl5CzeNj8cUGtqwvJ2ZhS7mI="; + vendorSha256 = "J8ovcUeQsb58Bq/EM9mvYqtuDY1bXTEVCC9/AH+UttU="; # tests fail in sandbox mode because of trying to download stuff from releases.hashicorp.com doCheck = false; diff --git a/nixpkgs/pkgs/development/tools/misc/tet/default.nix b/nixpkgs/pkgs/development/tools/misc/tet/default.nix index acc42d61423b..6bfcb3129236 100644 --- a/nixpkgs/pkgs/development/tools/misc/tet/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/tet/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv }: +{ fetchurl, lib, stdenv }: stdenv.mkDerivation ({ version = "3.8"; @@ -11,19 +11,19 @@ stdenv.mkDerivation ({ buildInputs = [ ]; - patchPhase = ''chmod +x configure''; + patchPhase = "chmod +x configure"; - configurePhase = ''./configure -t lite''; + configurePhase = "./configure -t lite"; - buildPhase = ''cd src; make; cd -''; + buildPhase = "cd src; make; cd -"; - installPhase = ''cd src; make install; cd -; cp -vr $PWD $out''; + installPhase = "cd src; make install; cd -; cp -vr $PWD $out"; meta = { description = "The Test Environment Toolkit is used in test applications like The Open Group's UNIX Certification program and the Free Standards Group's LSB Certification program"; homepage = "http://tetworks.opengroup.org/Products/tet.htm"; - license = stdenv.lib.licenses.artistic1; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.artistic1; + platforms = lib.platforms.unix; maintainers = [ ]; }; }) diff --git a/nixpkgs/pkgs/development/tools/misc/texi2html/default.nix b/nixpkgs/pkgs/development/tools/misc/texi2html/default.nix index 755bfcd7274b..98f846b7c2f7 100644 --- a/nixpkgs/pkgs/development/tools/misc/texi2html/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/texi2html/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, gettext }: +{ lib, stdenv, fetchurl, perl, gettext, buildPackages }: stdenv.mkDerivation rec { pname = "texi2html"; @@ -9,15 +9,22 @@ stdenv.mkDerivation rec { sha256 = "1yprv64vrlcbksqv25asplnjg07mbq38lfclp1m5lj8cw878pag8"; }; - nativeBuildInputs = [ gettext ]; + strictDeps = true; + + nativeBuildInputs = [ gettext perl ]; buildInputs = [ perl ]; - preBuild = '' - substituteInPlace separated_to_hash.pl \ - --replace "/usr/bin/perl" "${perl}/bin/perl" + postPatch = '' + patchShebangs separated_to_hash.pl + ''; + + postInstall = lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' + for f in $out/bin/*; do + substituteInPlace $f --replace "${buildPackages.perl}" "${perl}" + done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Perl script which converts Texinfo source files to HTML output"; homepage = "https://www.nongnu.org/texi2html/"; license = licenses.gpl2; diff --git a/nixpkgs/pkgs/development/tools/misc/texinfo/common.nix b/nixpkgs/pkgs/development/tools/misc/texinfo/common.nix index 057e52615ac7..1c5de083bc0d 100644 --- a/nixpkgs/pkgs/development/tools/misc/texinfo/common.nix +++ b/nixpkgs/pkgs/development/tools/misc/texinfo/common.nix @@ -1,6 +1,6 @@ { version, sha256 }: -{ stdenv, buildPackages, fetchurl, perl, xz, gettext +{ lib, stdenv, buildPackages, fetchurl, perl, xz, gettext # we are a dependency of gcc, this simplifies bootstraping , interactive ? false, ncurses, procps @@ -15,7 +15,7 @@ let crossBuildTools = stdenv.hostPlatform != stdenv.buildPlatform; in -with stdenv.lib; +with lib; stdenv.mkDerivation { name = "texinfo-${optionalString interactive "interactive-"}${version}"; @@ -43,7 +43,7 @@ stdenv.mkDerivation { ++ optional interactive ncurses; configureFlags = [ "PERL=${buildPackages.perl}/bin/perl" ] - ++ stdenv.lib.optional stdenv.isSunOS "AWK=${gawk}/bin/awk"; + ++ lib.optional stdenv.isSunOS "AWK=${gawk}/bin/awk"; installFlags = [ "TEXMF=$(out)/texmf-dist" ]; installTargets = [ "install" "install-tex" ]; diff --git a/nixpkgs/pkgs/development/tools/misc/texlab/default.nix b/nixpkgs/pkgs/development/tools/misc/texlab/default.nix index 8b734bdd1c18..480c7cfd5561 100644 --- a/nixpkgs/pkgs/development/tools/misc/texlab/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/texlab/default.nix @@ -1,4 +1,5 @@ -{ stdenv +{ lib +, stdenv , rustPlatform , fetchFromGitHub , installShellFiles @@ -7,28 +8,28 @@ rustPlatform.buildRustPackage rec { pname = "texlab"; - version = "2.2.0"; + version = "2.2.2"; src = fetchFromGitHub { owner = "latex-lsp"; repo = pname; rev = "v${version}"; - sha256 = "0iydkbmx9z7xpwaif0han5jvy9xh1afmfyldl7fcyy4r906dsmhx"; + sha256 = "06x7j4ppgw24xbsnyj1icaksngqbvq6mk8wfcqikzmvmifjspx9m"; }; - cargoSha256 = "0iibjh2ll181j69vld1awvjgyv3xwmq0abh10651la4k4jpppx46"; + cargoSha256 = "0gzxylpn2hps0kxczd6wwcqhnvm6ir971bfvpgjr6rxi12hs47ky"; nativeBuildInputs = [ installShellFiles ]; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = lib.optionals stdenv.isDarwin [ Security ]; postInstall = '' installManPage texlab.1 ''; - meta = with stdenv.lib; { + meta = with lib; { description = "An implementation of the Language Server Protocol for LaTeX"; - homepage = "https://texlab.netlify.com/"; + homepage = "https://texlab.netlify.app"; license = licenses.mit; maintainers = with maintainers; [ doronbehar metadark ]; }; diff --git a/nixpkgs/pkgs/development/tools/misc/tie/default.nix b/nixpkgs/pkgs/development/tools/misc/tie/default.nix index 074523309b67..e75248aa8673 100644 --- a/nixpkgs/pkgs/development/tools/misc/tie/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/tie/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "tie"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { cp tie $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.ctan.org/tex-archive/web/tie"; description = "Allow multiple web change files"; platforms = with platforms; unix; diff --git a/nixpkgs/pkgs/development/tools/misc/tokei/default.nix b/nixpkgs/pkgs/development/tools/misc/tokei/default.nix index 0c366668c5c4..47966dcc1336 100644 --- a/nixpkgs/pkgs/development/tools/misc/tokei/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/tokei/default.nix @@ -1,26 +1,26 @@ -{ stdenv, fetchFromGitHub, rustPlatform, libiconv, darwin }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, libiconv, darwin }: rustPlatform.buildRustPackage rec { pname = "tokei"; - version = "12.1.1"; + version = "12.1.2"; src = fetchFromGitHub { owner = "XAMPPRocky"; repo = pname; rev = "v${version}"; - sha256 = "1n5n7lxlw6zhrdf4jbmqpyn9k02dpn4wqm93qgiin4i8j8bxwjw8"; + sha256 = "sha256-jqDsxUAMD/MCCI0hamkGuCYa8rEXNZIR8S+84S8FbgI="; }; - cargoSha256 = "0bph6n8i5dfy5ryr3nyd3pxyrl1032vvg63s4s44g01qjm9rfdvf"; + cargoSha256 = "sha256-iUDc54E8AiLMJw9h99kg/3VmaSi8GqfQyrPwa9nJ994="; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ]; # enable all output formats cargoBuildFlags = [ "--features" "all" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A program that allows you to count your code, quickly"; longDescription = '' Tokei is a program that displays statistics about your code. Tokei will show number of files, total lines within those files and code, comments, and blanks grouped by language. diff --git a/nixpkgs/pkgs/development/tools/misc/travis/gemset.nix b/nixpkgs/pkgs/development/tools/misc/travis/gemset.nix index e10475a916b1..02b39bfca947 100644 --- a/nixpkgs/pkgs/development/tools/misc/travis/gemset.nix +++ b/nixpkgs/pkgs/development/tools/misc/travis/gemset.nix @@ -266,4 +266,4 @@ }; version = "1.2.8"; }; -} \ No newline at end of file +} diff --git a/nixpkgs/pkgs/development/tools/misc/uisp/default.nix b/nixpkgs/pkgs/development/tools/misc/uisp/default.nix index ca51e0897337..1fb255073ed8 100644 --- a/nixpkgs/pkgs/development/tools/misc/uisp/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/uisp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation { name = "uisp-20050207"; @@ -12,8 +12,8 @@ stdenv.mkDerivation { meta = { description = "Tool for AVR microcontrollers which can interface to many hardware in-system programmers"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; homepage = "https://savannah.nongnu.org/projects/uisp"; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/nixpkgs/pkgs/development/tools/misc/uncrustify/default.nix b/nixpkgs/pkgs/development/tools/misc/uncrustify/default.nix index 587896fce680..f6b51a969b27 100644 --- a/nixpkgs/pkgs/development/tools/misc/uncrustify/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/uncrustify/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, python }: +{ lib, stdenv, fetchFromGitHub, cmake, python }: stdenv.mkDerivation rec { name = "${product}-${version}"; @@ -14,9 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake python ]; - enableParallelBuilding = true; - - meta = with stdenv.lib; { + meta = with lib; { description = "Source code beautifier for C, C++, C#, ObjectiveC, D, Java, Pawn and VALA"; homepage = "http://uncrustify.sourceforge.net/"; license = licenses.gpl2Plus; diff --git a/nixpkgs/pkgs/development/tools/misc/unifdef/default.nix b/nixpkgs/pkgs/development/tools/misc/unifdef/default.nix index 19dd907b73b9..53e2b2762d31 100644 --- a/nixpkgs/pkgs/development/tools/misc/unifdef/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/unifdef/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv }: +{ fetchurl, lib, stdenv }: stdenv.mkDerivation rec { name = "unifdef-2.6"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { export DESTDIR=$out ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://dotat.at/prog/unifdef/"; description = "Selectively remove C preprocessor conditionals"; license = licenses.bsd2; diff --git a/nixpkgs/pkgs/development/tools/misc/universal-ctags/default.nix b/nixpkgs/pkgs/development/tools/misc/universal-ctags/default.nix index 0bf902eccff8..bd362e8d1a45 100644 --- a/nixpkgs/pkgs/development/tools/misc/universal-ctags/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/universal-ctags/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, perl, pythonPackages, libiconv, jansson }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, perl, pythonPackages, libiconv, jansson }: stdenv.mkDerivation { pname = "universal-ctags"; @@ -11,8 +11,8 @@ stdenv.mkDerivation { sha256 = "14n3ix77rkhq6vq6kspmgjrmm0kg0f8cxikyqdq281sbnfq8bajn"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig pythonPackages.docutils ]; - buildInputs = [ jansson ] ++ stdenv.lib.optional stdenv.isDarwin libiconv; + nativeBuildInputs = [ autoreconfHook pkg-config pythonPackages.docutils ]; + buildInputs = [ jansson ] ++ lib.optional stdenv.isDarwin libiconv; # to generate makefile.in autoreconfPhase = '' @@ -35,7 +35,7 @@ stdenv.mkDerivation { checkFlags = [ "units" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A maintained ctags implementation"; homepage = "https://ctags.io/"; license = licenses.gpl2Plus; diff --git a/nixpkgs/pkgs/development/tools/misc/unused/default.nix b/nixpkgs/pkgs/development/tools/misc/unused/default.nix index 3e5f9c319ef8..6487c3fc2c0c 100644 --- a/nixpkgs/pkgs/development/tools/misc/unused/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/unused/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform, cmake }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, cmake }: rustPlatform.buildRustPackage rec { pname = "unused"; version = "0.2.1"; @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1c0gj2wp0nydv0binxj3ikm5sm6y5z3pklp5b06dgvq02licz57a"; - meta = with stdenv.lib; { + meta = with lib; { description = "A tool to identify potentially unused code"; homepage = "https://unused.codes"; license = licenses.mit; diff --git a/nixpkgs/pkgs/development/tools/misc/usb-modeswitch/data.nix b/nixpkgs/pkgs/development/tools/misc/usb-modeswitch/data.nix index 6280b103ab60..7bb9fc69c58a 100644 --- a/nixpkgs/pkgs/development/tools/misc/usb-modeswitch/data.nix +++ b/nixpkgs/pkgs/development/tools/misc/usb-modeswitch/data.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, tcl, usb-modeswitch }: +{ lib, stdenv, fetchurl, tcl, usb-modeswitch }: stdenv.mkDerivation rec { pname = "usb-modeswitch-data"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { # the usb_modeswitch.d directory nativeBuildInputs = [ tcl ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Device database and the rules file for 'multi-mode' USB devices"; inherit (usb-modeswitch.meta) license maintainers platforms; }; diff --git a/nixpkgs/pkgs/development/tools/misc/usb-modeswitch/default.nix b/nixpkgs/pkgs/development/tools/misc/usb-modeswitch/default.nix index 18926a85528c..4f9dbe92d2b7 100644 --- a/nixpkgs/pkgs/development/tools/misc/usb-modeswitch/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/usb-modeswitch/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, pkgconfig, makeWrapper +{ stdenv, lib, fetchurl, pkg-config, makeWrapper , libusb1, tcl, util-linux, coreutils, bash }: stdenv.mkDerivation rec { @@ -35,9 +35,9 @@ stdenv.mkDerivation rec { ''; buildInputs = [ libusb1 tcl ]; - nativeBuildInputs = [ pkgconfig makeWrapper ]; + nativeBuildInputs = [ pkg-config makeWrapper ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A mode switching tool for controlling 'multi-mode' USB devices"; license = licenses.gpl2; maintainers = with maintainers; [ marcweber peterhoeg ]; diff --git a/nixpkgs/pkgs/development/tools/misc/vtable-dumper/default.nix b/nixpkgs/pkgs/development/tools/misc/vtable-dumper/default.nix index a44140c1445f..1bd59aa9944a 100644 --- a/nixpkgs/pkgs/development/tools/misc/vtable-dumper/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/vtable-dumper/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libelf }: +{ lib, stdenv, fetchFromGitHub, libelf }: stdenv.mkDerivation rec { pname = "vtable-dumper"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ libelf ]; makeFlags = [ "prefix=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/lvc/vtable-dumper"; description = "A tool to list content of virtual tables in a C++ shared library"; license = licenses.lgpl21; diff --git a/nixpkgs/pkgs/development/tools/misc/watson-ruby/default.nix b/nixpkgs/pkgs/development/tools/misc/watson-ruby/default.nix index 81f5430371a0..23ec0643d77d 100644 --- a/nixpkgs/pkgs/development/tools/misc/watson-ruby/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/watson-ruby/default.nix @@ -1,4 +1,4 @@ -{ stdenv, bundlerEnv, ruby, bundlerUpdateScript }: +{ lib, stdenv, bundlerEnv, ruby, bundlerUpdateScript }: stdenv.mkDerivation rec { pname = "watson-ruby"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { passthru.updateScript = bundlerUpdateScript "watson-ruby"; - meta = with stdenv.lib; { + meta = with lib; { description = "An inline issue manager"; homepage = "https://goosecode.com/watson/"; license = with licenses; mit; diff --git a/nixpkgs/pkgs/development/tools/misc/watson-ruby/gemset.nix b/nixpkgs/pkgs/development/tools/misc/watson-ruby/gemset.nix index a3bb144899c7..2f865820f5aa 100644 --- a/nixpkgs/pkgs/development/tools/misc/watson-ruby/gemset.nix +++ b/nixpkgs/pkgs/development/tools/misc/watson-ruby/gemset.nix @@ -15,4 +15,4 @@ }; version = "1.6.3"; }; -} \ No newline at end of file +} diff --git a/nixpkgs/pkgs/development/tools/misc/whatstyle/default.nix b/nixpkgs/pkgs/development/tools/misc/whatstyle/default.nix index c882d6243fa0..6afcfe871a47 100644 --- a/nixpkgs/pkgs/development/tools/misc/whatstyle/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/whatstyle/default.nix @@ -1,4 +1,4 @@ -{ stdenv, python3, fetchFromGitHub, clang-unwrapped }: +{ lib, stdenv, python3, fetchFromGitHub, clang-unwrapped }: python3.pkgs.buildPythonApplication rec { pname = "whatstyle"; @@ -20,7 +20,7 @@ python3.pkgs.buildPythonApplication rec { doCheck = false; # 3 or 4 failures depending on version, haven't investigated. - meta = with stdenv.lib; { + meta = with lib; { description = "Find a code format style that fits given source files"; homepage = "https://github.com/mikr/whatstyle"; license = licenses.mit; diff --git a/nixpkgs/pkgs/development/tools/misc/xc3sprog/default.nix b/nixpkgs/pkgs/development/tools/misc/xc3sprog/default.nix index 1ccd6c2ec4f2..b9785bac7c5c 100644 --- a/nixpkgs/pkgs/development/tools/misc/xc3sprog/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/xc3sprog/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchsvn, cmake, libusb-compat-0_1, libftdi }: +{ lib, stdenv, fetchsvn, cmake, libusb-compat-0_1, libftdi }: # The xc3sprog project doesn't seem to make proper releases, they only put out # prebuilt binary subversion snapshots on sourceforge. @@ -13,9 +13,10 @@ stdenv.mkDerivation rec { rev = version; }; - buildInputs = [ cmake libusb-compat-0_1 libftdi ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ libusb-compat-0_1 libftdi ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Command-line tools for programming FPGAs, microcontrollers and PROMs via JTAG"; homepage = "http://xc3sprog.sourceforge.net/"; license = licenses.gpl2Plus; diff --git a/nixpkgs/pkgs/development/tools/misc/ycmd/default.nix b/nixpkgs/pkgs/development/tools/misc/ycmd/default.nix index 4bbff3ca33f8..cf4fe39754fc 100644 --- a/nixpkgs/pkgs/development/tools/misc/ycmd/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/ycmd/default.nix @@ -19,9 +19,9 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ cmake ] - ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; + ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; buildInputs = [ boost llvmPackages.libclang ] - ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin Cocoa; + ++ lib.optional stdenv.hostPlatform.isDarwin Cocoa; buildPhase = '' export EXTRA_CMAKE_ARGS=-DPATH_TO_LLVM_ROOT=${llvmPackages.clang-unwrapped} @@ -90,7 +90,7 @@ stdenv.mkDerivation { "'$out/lib/ycmd/ycmd/__main__.py'" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A code-completion and comprehension server"; homepage = "https://github.com/Valloric/ycmd"; license = licenses.gpl3; diff --git a/nixpkgs/pkgs/development/tools/misc/yodl/default.nix b/nixpkgs/pkgs/development/tools/misc/yodl/default.nix index 6bb7e1377af3..a8b48e9fa53f 100644 --- a/nixpkgs/pkgs/development/tools/misc/yodl/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/yodl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, perl, icmake, util-linux }: +{ lib, stdenv, fetchFromGitLab, perl, icmake, util-linux }: stdenv.mkDerivation rec { pname = "yodl"; @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { ./build install man ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A package that implements a pre-document language and tools to process it"; homepage = "https://fbb-git.gitlab.io/yodl/"; license = licenses.gpl3; diff --git a/nixpkgs/pkgs/development/tools/mmixware/default.nix b/nixpkgs/pkgs/development/tools/mmixware/default.nix index 0b0d394b4e1e..b6d03f456712 100644 --- a/nixpkgs/pkgs/development/tools/mmixware/default.nix +++ b/nixpkgs/pkgs/development/tools/mmixware/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, tetex }: +{ lib, stdenv, fetchFromGitLab, tetex }: stdenv.mkDerivation { pname = "mmixware"; @@ -34,7 +34,7 @@ stdenv.mkDerivation { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "MMIX simulator and assembler"; homepage = "https://www-cs-faculty.stanford.edu/~knuth/mmix-news.html"; maintainers = with maintainers; [ siraben ]; diff --git a/nixpkgs/pkgs/development/tools/mod/default.nix b/nixpkgs/pkgs/development/tools/mod/default.nix index 32fd2258daaf..c1d17bba57b9 100644 --- a/nixpkgs/pkgs/development/tools/mod/default.nix +++ b/nixpkgs/pkgs/development/tools/mod/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "mod"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "marwan-at-work"; repo = "mod"; rev = "v${version}"; - sha256 = "1n0pipbq4fjban8hsxhyl5w8xrl4ai1pvgd02i1j1awmm2l3ykzl"; + sha256 = "sha256-IPdZ2PSS4rYVoMxrunse8Z2NHXLjXAoBcDvB6D70ki0="; }; - vendorSha256 = "032s62rjjq7bqiz5fg17yfkq4j4dsbl6vhvs1wf2sg8jvbqmvdwn"; + vendorSha256 = "sha256-1+06/yXi07iWZhcCEGNnoL2DpeVRYMW/NdyEhZQePbk="; doCheck = false; diff --git a/nixpkgs/pkgs/development/tools/modd/default.nix b/nixpkgs/pkgs/development/tools/modd/default.nix index 5c63447fdc5f..efe4c9605668 100644 --- a/nixpkgs/pkgs/development/tools/modd/default.nix +++ b/nixpkgs/pkgs/development/tools/modd/default.nix @@ -1,4 +1,4 @@ -{ buildGoPackage, fetchFromGitHub, stdenv }: +{ buildGoPackage, fetchFromGitHub, lib, stdenv }: buildGoPackage rec { pname = "modd"; @@ -11,7 +11,7 @@ buildGoPackage rec { }; goPackagePath = "github.com/cortesi/modd"; subPackages = [ "cmd/modd" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A flexible developer tool that runs processes and responds to filesystem changes"; homepage = "https://github.com/cortesi/modd"; license = licenses.mit; diff --git a/nixpkgs/pkgs/development/tools/msgpack-tools/default.nix b/nixpkgs/pkgs/development/tools/msgpack-tools/default.nix index 65bc8feab6b4..a7b3c36d87b2 100644 --- a/nixpkgs/pkgs/development/tools/msgpack-tools/default.nix +++ b/nixpkgs/pkgs/development/tools/msgpack-tools/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, fetchFromGitHub, cmake, unzip }: +{ lib, stdenv, fetchurl, fetchFromGitHub, cmake }: + stdenv.mkDerivation rec { pname = "msgpack-tools"; version = "0.6"; @@ -32,10 +33,9 @@ stdenv.mkDerivation rec { cp ${mpack} $sourceRoot/contrib/mpack-df17e83f0fa8571b9cd0d8ccf38144fa90e244d1.tar.gz ''; + nativeBuildInputs = [ cmake ]; - buildInputs = [ cmake unzip ]; - - meta = with stdenv.lib; { + meta = with lib; { description = "Command-line tools for converting between MessagePack and JSON"; homepage = "https://github.com/ludocode/msgpack-tools"; license = licenses.mit; diff --git a/nixpkgs/pkgs/development/tools/mustache-go/default.nix b/nixpkgs/pkgs/development/tools/mustache-go/default.nix index 7bcf72df55ce..99e4eb621564 100644 --- a/nixpkgs/pkgs/development/tools/mustache-go/default.nix +++ b/nixpkgs/pkgs/development/tools/mustache-go/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "mustache-go"; @@ -13,7 +13,7 @@ buildGoPackage rec { sha256 = "0mnh5zbpfwymddm1dppg9i9d1r8jqyg03z2gl6c5a8fgbrnxpjvc"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/cbroglie/mustache"; description = "The mustache template language in Go"; license = [ licenses.mit ]; diff --git a/nixpkgs/pkgs/development/tools/nailgun/default.nix b/nixpkgs/pkgs/development/tools/nailgun/default.nix index 84e5a6b1d9fc..9832de15140a 100644 --- a/nixpkgs/pkgs/development/tools/nailgun/default.nix +++ b/nixpkgs/pkgs/development/tools/nailgun/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchMavenArtifact, fetchFromGitHub, jre, makeWrapper }: +{ lib, stdenv, fetchMavenArtifact, fetchFromGitHub, jre, makeWrapper }: let version = "1.0.0"; @@ -29,7 +29,7 @@ stdenv.mkDerivation { --add-flags '-classpath ${nailgun-server.jar}:$CLASSPATH com.facebook.nailgun.NGServer' ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Client, protocol, and server for running Java programs from the command line without incurring the JVM startup overhead"; homepage = "http://www.martiansoftware.com/nailgun/"; license = licenses.asl20; diff --git a/nixpkgs/pkgs/development/tools/nemiver/default.nix b/nixpkgs/pkgs/development/tools/nemiver/default.nix index 8890ceca9d39..58c0f2ed28b1 100644 --- a/nixpkgs/pkgs/development/tools/nemiver/default.nix +++ b/nixpkgs/pkgs/development/tools/nemiver/default.nix @@ -1,7 +1,7 @@ -{ stdenv +{ lib, stdenv , fetchurl , fetchpatch -, pkgconfig +, pkg-config , gnome3 , gtk3 , libxml2 @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { version = "0.9.6"; src = fetchurl { - url = "mirror://gnome/sources/nemiver/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/nemiver/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "85ab8cf6c4f83262f441cb0952a6147d075c3c53d0687389a3555e946b694ef2"; }; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { libxml2 intltool itstool - pkgconfig + pkg-config wrapGAppsHook ]; @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://wiki.gnome.org/Apps/Nemiver"; description = "Easy to use standalone C/C++ debugger"; license = licenses.gpl2; diff --git a/nixpkgs/pkgs/development/tools/neoload/default.nix b/nixpkgs/pkgs/development/tools/neoload/default.nix index be772f60492a..fb85aa80dc35 100644 --- a/nixpkgs/pkgs/development/tools/neoload/default.nix +++ b/nixpkgs/pkgs/development/tools/neoload/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, writeTextFile, jre, makeWrapper, fontsConf, licenseAccepted ? false }: +{ lib, stdenv, fetchurl, writeTextFile, jre, makeWrapper, fontsConf, licenseAccepted ? false }: # If you happen to use this software on the XMonad window manager, you will have issues with # grey windows, no resizing, menus not showing and other glitches. @@ -87,9 +87,9 @@ in stdenv.mkDerivation { homepage = "https://www.neotys.com/product/overview-neoload.html"; # https://www.neotys.com/documents/legal/eula/neoload/eula_en.html - license = stdenv.lib.licenses.unfree; + license = lib.licenses.unfree; - maintainers = [ stdenv.lib.maintainers.bluescreen303 ]; + maintainers = [ lib.maintainers.bluescreen303 ]; platforms = [ "i686-linux" "x86_64-linux" ]; }; } diff --git a/nixpkgs/pkgs/development/tools/node-webkit/nw12.nix b/nixpkgs/pkgs/development/tools/node-webkit/nw12.nix index ffd2a78f5094..31358129821e 100644 --- a/nixpkgs/pkgs/development/tools/node-webkit/nw12.nix +++ b/nixpkgs/pkgs/development/tools/node-webkit/nw12.nix @@ -41,7 +41,7 @@ in stdenv.mkDerivation rec { ln -s ${lib.getLib systemd}/lib/libudev.so $out/share/nwjs/libudev.so.0 - patchelf --set-rpath "${nwEnv}/lib:${nwEnv}/lib64:${stdenv.lib.makeLibraryPath [ stdenv.cc.cc ]}:$out/share/nwjs" $out/share/nwjs/nw + patchelf --set-rpath "${nwEnv}/lib:${nwEnv}/lib64:${lib.makeLibraryPath [ stdenv.cc.cc ]}:$out/share/nwjs" $out/share/nwjs/nw patchelf --set-rpath "${nwEnv}/lib:${nwEnv}/lib64:$out/share/nwjs" $out/share/nwjs/nwjc mkdir -p $out/bin @@ -51,7 +51,7 @@ in stdenv.mkDerivation rec { buildInputs = [ makeWrapper ]; - meta = with stdenv.lib; { + meta = with lib; { description = "An app runtime based on Chromium and node.js"; homepage = "https://nwjs.io/"; platforms = ["i686-linux" "x86_64-linux"]; diff --git a/nixpkgs/pkgs/development/tools/nrpl/default.nix b/nixpkgs/pkgs/development/tools/nrpl/default.nix index a1c9bfd53e33..72177582919a 100644 --- a/nixpkgs/pkgs/development/tools/nrpl/default.nix +++ b/nixpkgs/pkgs/development/tools/nrpl/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation { --prefix PATH : ${lib.makeBinPath [ nim tinycc ]} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "REPL for the Nim programming language"; homepage = "https://github.com/wheineman/nrpl"; license = licenses.mit; diff --git a/nixpkgs/pkgs/development/tools/nsis/default.nix b/nixpkgs/pkgs/development/tools/nsis/default.nix index 303ea6a00fe8..2d3f54bbf75b 100644 --- a/nixpkgs/pkgs/development/tools/nsis/default.nix +++ b/nixpkgs/pkgs/development/tools/nsis/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , fetchzip , sconsPackages @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { prefixKey = "PREFIX="; installTargets = [ "install-compiler" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A free scriptable win32 installer/uninstaller system that doesn't suck and isn't huge"; homepage = "https://nsis.sourceforge.io/"; license = licenses.zlib; diff --git a/nixpkgs/pkgs/development/tools/nwjs/default.nix b/nixpkgs/pkgs/development/tools/nwjs/default.nix index 4eedc003272c..d3490b2b9c99 100644 --- a/nixpkgs/pkgs/development/tools/nwjs/default.nix +++ b/nixpkgs/pkgs/development/tools/nwjs/default.nix @@ -53,7 +53,7 @@ in stdenv.mkDerivation rec { dontPatchELF = true; installPhase = - let ccPath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc ]; + let ccPath = lib.makeLibraryPath [ stdenv.cc.cc ]; in '' mkdir -p $out/share/nwjs cp -R * $out/share/nwjs @@ -85,7 +85,7 @@ in stdenv.mkDerivation rec { buildInputs = [ makeWrapper ]; - meta = with stdenv.lib; { + meta = with lib; { description = "An app runtime based on Chromium and node.js"; homepage = "https://nwjs.io/"; platforms = ["i686-linux" "x86_64-linux"]; diff --git a/nixpkgs/pkgs/development/tools/ocaml/camlidl/default.nix b/nixpkgs/pkgs/development/tools/ocaml/camlidl/default.nix index 309c44d6d463..a464996ff381 100644 --- a/nixpkgs/pkgs/development/tools/ocaml/camlidl/default.nix +++ b/nixpkgs/pkgs/development/tools/ocaml/camlidl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, writeText }: +{ lib, stdenv, fetchurl, ocaml, writeText }: let pname = "camlidl"; @@ -46,6 +46,6 @@ stdenv.mkDerivation rec { description = "A stub code generator and COM binding for Objective Caml"; homepage = webpage; license = "LGPL"; - maintainers = [ stdenv.lib.maintainers.roconnor ]; + maintainers = [ lib.maintainers.roconnor ]; }; } diff --git a/nixpkgs/pkgs/development/tools/ocaml/camlp4/default.nix b/nixpkgs/pkgs/development/tools/ocaml/camlp4/default.nix index 73228655cca0..fffa426ba4c9 100644 --- a/nixpkgs/pkgs/development/tools/ocaml/camlp4/default.nix +++ b/nixpkgs/pkgs/development/tools/ocaml/camlp4/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchzip, which, ocaml, ocamlbuild }: +{ lib, stdenv, fetchzip, which, ocaml, ocamlbuild }: -if stdenv.lib.versionAtLeast ocaml.version "4.09" +if lib.versionAtLeast ocaml.version "4.09" then throw "camlp4 is not available for OCaml ${ocaml.version}" else @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { dontStrip = true; - meta = with stdenv.lib; { + meta = with lib; { description = "A software system for writing extensible parsers for programming languages"; homepage = "https://github.com/ocaml/camlp4"; platforms = ocaml.meta.platforms or []; diff --git a/nixpkgs/pkgs/development/tools/ocaml/camlp5/default.nix b/nixpkgs/pkgs/development/tools/ocaml/camlp5/default.nix index 5fb76a526016..fc79cafdc42a 100644 --- a/nixpkgs/pkgs/development/tools/ocaml/camlp5/default.nix +++ b/nixpkgs/pkgs/development/tools/ocaml/camlp5/default.nix @@ -1,26 +1,32 @@ -{ stdenv, fetchzip, ocaml }: +{ lib, stdenv, fetchzip, ocaml, perl }: + +if lib.versionOlder ocaml.version "4.02" +then throw "camlp5 is not available for OCaml ${ocaml.version}" +else stdenv.mkDerivation { - name = "camlp5-7.13"; + name = "camlp5-7.14"; src = fetchzip { - url = "https://github.com/camlp5/camlp5/archive/rel713.tar.gz"; - sha256 = "1d9spy3f5ahixm8nxxk086kpslzva669a5scn49am0s7vx4i71kp"; + url = "https://github.com/camlp5/camlp5/archive/rel714.tar.gz"; + sha256 = "1dd68bisbpqn5lq2pslm582hxglcxnbkgfkwhdz67z4w9d5nvr7w"; }; - buildInputs = [ ocaml ]; + buildInputs = [ ocaml perl ]; prefixKey = "-prefix "; - preConfigure = "configureFlagsArray=(--strict" + - " --libdir $out/lib/ocaml/${ocaml.version}/site-lib)"; + preConfigure = '' + configureFlagsArray=(--strict --libdir $out/lib/ocaml/${ocaml.version}/site-lib) + patchShebangs ./config/find_stuffversion.pl + ''; buildFlags = [ "world.opt" ]; dontStrip = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Preprocessor-pretty-printer for OCaml"; longDescription = '' Camlp5 is a preprocessor and pretty-printer for OCaml programs. diff --git a/nixpkgs/pkgs/development/tools/ocaml/cppo/default.nix b/nixpkgs/pkgs/development/tools/ocaml/cppo/default.nix index a0215fa81471..032f346bf9c3 100644 --- a/nixpkgs/pkgs/development/tools/ocaml/cppo/default.nix +++ b/nixpkgs/pkgs/development/tools/ocaml/cppo/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, fetchFromGitHub, ocaml, findlib, ocamlbuild +{ lib, stdenv, fetchurl, fetchFromGitHub, ocaml, findlib, ocamlbuild , buildDunePackage }: let pname = "cppo"; - meta = with stdenv.lib; { + meta = with lib; { description = "The C preprocessor for OCaml"; longDescription = '' Cppo is an equivalent of the C preprocessor targeted at the OCaml language and its variants. @@ -17,7 +17,7 @@ let in -if stdenv.lib.versionAtLeast ocaml.version "4.02" then +if lib.versionAtLeast ocaml.version "4.02" then buildDunePackage rec { inherit pname; diff --git a/nixpkgs/pkgs/development/tools/ocaml/dune-release/default.nix b/nixpkgs/pkgs/development/tools/ocaml/dune-release/default.nix index c267b2757a43..60a9bfba58fe 100644 --- a/nixpkgs/pkgs/development/tools/ocaml/dune-release/default.nix +++ b/nixpkgs/pkgs/development/tools/ocaml/dune-release/default.nix @@ -32,9 +32,14 @@ in buildDunePackage rec { # to have a fixed path to the binary in nix store sed -i '/must_exist (Cmd\.v "curl"/d' lib/github.ml - # set bogus user info in git so git commit doesn't fail - sed -i '/git init/ a \ $ git config user.name test; git config user.email "pseudo@pseudo.invalid"' \ - tests/bin/{delegate_info,errors,tag,no_doc,x-commit-hash}/run.t + # fix problems with git invocations in tests + for f in tests/bin/{delegate_info,errors,tag,no_doc,x-commit-hash}/run.t; do + # set bogus user info in git so git commit doesn't fail + sed -i '/git init/ a \ $ git config user.name test; git config user.email "pseudo@pseudo.invalid"' "$f" + # surpress hint to set default branch name + substituteInPlace "$f" --replace "git init" "git init -b main" + done + # ignore weird yes error message sed -i 's/yes |/yes 2>\/dev\/null |/' tests/bin/no_doc/run.t ''; diff --git a/nixpkgs/pkgs/development/tools/ocaml/dune/2.nix b/nixpkgs/pkgs/development/tools/ocaml/dune/2.nix index 177fa96f5b96..f2fe3693ed7a 100644 --- a/nixpkgs/pkgs/development/tools/ocaml/dune/2.nix +++ b/nixpkgs/pkgs/development/tools/ocaml/dune/2.nix @@ -1,30 +1,22 @@ -{ stdenv, fetchurl, ocaml, findlib, fetchpatch }: +{ lib, stdenv, fetchurl, ocaml, findlib }: -if stdenv.lib.versionOlder ocaml.version "4.08" +if lib.versionOlder ocaml.version "4.08" then throw "dune is not available for OCaml ${ocaml.version}" else stdenv.mkDerivation rec { pname = "dune"; - version = "2.7.1"; + version = "2.8.2"; src = fetchurl { url = "https://github.com/ocaml/dune/releases/download/${version}/dune-${version}.tbz"; - sha256 = "0pcjf209gynjwipnpplaqyvyivnawqiwhvqnivhkybisicpqyln3"; + sha256 = "07mf6pnmv1a6wh4la45zf6cn6qy2vcmz4xgx0djj75kw1wiyii72"; }; buildInputs = [ ocaml findlib ]; buildFlags = "release"; - patches = [ - # Fix setup.ml configure path. Remove with the next release. - (fetchpatch { - url = "https://github.com/ocaml/dune/commit/8a3d7f2f2015b71384caa07226d1a89dba9d6c25.patch"; - sha256 = "0dw4q10030h9xcdlxw2vp7qm0hd2qpkb98rir5d55m9vn65w8j28"; - }) - ]; - dontAddPrefix = true; installFlags = [ "PREFIX=${placeholder "out"}" "LIBDIR=$(OCAMLFIND_DESTDIR)" ]; @@ -32,9 +24,9 @@ stdenv.mkDerivation rec { meta = { homepage = "https://dune.build/"; description = "A composable build system"; - changelog = "https://github.com/ocaml/dune/releases/tag/${version}"; - maintainers = [ stdenv.lib.maintainers.vbgl stdenv.lib.maintainers.marsam ]; - license = stdenv.lib.licenses.mit; + changelog = "https://github.com/ocaml/dune/blob/${version}/CHANGES.md"; + maintainers = [ lib.maintainers.vbgl lib.maintainers.marsam ]; + license = lib.licenses.mit; inherit (ocaml.meta) platforms; }; } diff --git a/nixpkgs/pkgs/development/tools/ocaml/dune/default.nix b/nixpkgs/pkgs/development/tools/ocaml/dune/default.nix index ef0f5c4fabd4..bbdbc45270d0 100644 --- a/nixpkgs/pkgs/development/tools/ocaml/dune/default.nix +++ b/nixpkgs/pkgs/development/tools/ocaml/dune/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, ocaml, findlib, opaline }: +{ stdenv, lib, fetchurl, ocaml, findlib }: -if !stdenv.lib.versionAtLeast ocaml.version "4.02" +if !lib.versionAtLeast ocaml.version "4.02" then throw "dune is not available for OCaml ${ocaml.version}" else @@ -15,20 +15,18 @@ stdenv.mkDerivation rec { buildInputs = [ ocaml findlib ]; buildFlags = [ "release" ]; + makeFlags = [ + "PREFIX=${placeholder "out"}" + "LIBDIR=$(OCAMLFIND_DESTDIR)" + ]; dontAddPrefix = true; - installPhase = '' - runHook preInstall - ${opaline}/bin/opaline -prefix $out -libdir $OCAMLFIND_DESTDIR - runHook postInstall - ''; - - meta = { + meta = with lib; { homepage = "https://dune.build/"; description = "A composable build system"; - maintainers = [ stdenv.lib.maintainers.vbgl stdenv.lib.maintainers.marsam ]; - license = stdenv.lib.licenses.mit; + maintainers = [ maintainers.vbgl maintainers.marsam ]; + license = licenses.mit; inherit (ocaml.meta) platforms; }; } diff --git a/nixpkgs/pkgs/development/tools/ocaml/findlib/default.nix b/nixpkgs/pkgs/development/tools/ocaml/findlib/default.nix index 1354e158a8e6..8752b2edb66e 100644 --- a/nixpkgs/pkgs/development/tools/ocaml/findlib/default.nix +++ b/nixpkgs/pkgs/development/tools/ocaml/findlib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, m4, ncurses, ocaml, writeText }: +{ lib, stdenv, fetchurl, fetchpatch, m4, ncurses, ocaml, writeText }: stdenv.mkDerivation rec { pname = "ocaml-findlib"; @@ -49,11 +49,11 @@ stdenv.mkDerivation rec { meta = { homepage = "http://projects.camlcity.org/projects/findlib.html"; description = "O'Caml library manager"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; platforms = ocaml.meta.platforms or []; maintainers = [ - stdenv.lib.maintainers.maggesi - stdenv.lib.maintainers.vbmithr + lib.maintainers.maggesi + lib.maintainers.vbmithr ]; }; } diff --git a/nixpkgs/pkgs/development/tools/ocaml/oasis/default.nix b/nixpkgs/pkgs/development/tools/ocaml/oasis/default.nix index a0932d919c08..6854c7c20ca3 100644 --- a/nixpkgs/pkgs/development/tools/ocaml/oasis/default.nix +++ b/nixpkgs/pkgs/development/tools/ocaml/oasis/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, ocamlmod, ocamlify }: +{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, ocamlmod, ocamlify }: stdenv.mkDerivation { version = "0.4.10"; @@ -22,7 +22,7 @@ stdenv.mkDerivation { buildPhase = "ocaml setup.ml -build"; installPhase = "ocaml setup.ml -install"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://oasis.forge.ocamlcore.org/"; description = "Configure, build and install system for OCaml projects"; license = licenses.lgpl21; diff --git a/nixpkgs/pkgs/development/tools/ocaml/obelisk/default.nix b/nixpkgs/pkgs/development/tools/ocaml/obelisk/default.nix index 483e9c45df01..d5e9d33d5db6 100644 --- a/nixpkgs/pkgs/development/tools/ocaml/obelisk/default.nix +++ b/nixpkgs/pkgs/development/tools/ocaml/obelisk/default.nix @@ -1,20 +1,20 @@ { lib, fetchurl, ocamlPackages }: ocamlPackages.buildDunePackage rec { - pname = "obelisk"; - version = "0.5.2"; - useDune2 = true; - src = fetchurl { - url = "https://github.com/Lelio-Brun/Obelisk/releases/download/v${version}/obelisk-v${version}.tbz"; - sha256 = "0s86gkypyrkrp83xnay258ijri3yjwj3marsjnjf8mz58z0zd9g6"; - }; + pname = "obelisk"; + version = "0.5.2"; + useDune2 = true; + src = fetchurl { + url = "https://github.com/Lelio-Brun/Obelisk/releases/download/v${version}/obelisk-v${version}.tbz"; + sha256 = "0s86gkypyrkrp83xnay258ijri3yjwj3marsjnjf8mz58z0zd9g6"; + }; - buildInputs = with ocamlPackages; [ menhir re ]; + buildInputs = with ocamlPackages; [ menhir re ]; - meta = { - description = "A simple tool which produces pretty-printed output from a Menhir parser file (.mly)"; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.vbgl ]; - homepage = "https://github.com/Lelio-Brun/Obelisk"; - }; + meta = { + description = "A simple tool which produces pretty-printed output from a Menhir parser file (.mly)"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.vbgl ]; + homepage = "https://github.com/Lelio-Brun/Obelisk"; + }; } diff --git a/nixpkgs/pkgs/development/tools/ocaml/obuild/default.nix b/nixpkgs/pkgs/development/tools/ocaml/obuild/default.nix index 5e851a93205b..e31334000da0 100644 --- a/nixpkgs/pkgs/development/tools/ocaml/obuild/default.nix +++ b/nixpkgs/pkgs/development/tools/ocaml/obuild/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, ocaml }: +{ lib, stdenv, fetchzip, ocaml }: let version = "0.1.10"; in @@ -27,7 +27,7 @@ stdenv.mkDerivation { homepage = "https://github.com/ocaml-obuild/obuild"; platforms = ocaml.meta.platforms or []; description = "Simple package build system for OCaml"; - license = stdenv.lib.licenses.lgpl21; - maintainers = with stdenv.lib.maintainers; [ volth ]; + license = lib.licenses.lgpl21; + maintainers = with lib.maintainers; [ volth ]; }; } diff --git a/nixpkgs/pkgs/development/tools/ocaml/ocamlbuild/default.nix b/nixpkgs/pkgs/development/tools/ocaml/ocamlbuild/default.nix index 7270386972de..c74794b35c95 100644 --- a/nixpkgs/pkgs/development/tools/ocaml/ocamlbuild/default.nix +++ b/nixpkgs/pkgs/development/tools/ocaml/ocamlbuild/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ocaml, findlib }: +{ lib, stdenv, fetchFromGitHub, ocaml, findlib }: let version = "0.14.0"; in @@ -25,7 +25,7 @@ stdenv.mkDerivation { "OCAMLBUILD_LIBDIR=$OCAMLFIND_DESTDIR" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/ocaml/ocamlbuild/"; description = "A build system with builtin rules to easily build most OCaml projects"; license = licenses.lgpl2; diff --git a/nixpkgs/pkgs/development/tools/ocaml/ocamlformat/default.nix b/nixpkgs/pkgs/development/tools/ocaml/ocamlformat/default.nix index 1de95187af2f..57061cfe126c 100644 --- a/nixpkgs/pkgs/development/tools/ocaml/ocamlformat/default.nix +++ b/nixpkgs/pkgs/development/tools/ocaml/ocamlformat/default.nix @@ -40,5 +40,13 @@ rec { version = "0.15.0"; }; - ocamlformat = ocamlformat_0_15_0; + ocamlformat_0_15_1 = mkOCamlformat { + version = "0.15.1"; + }; + + ocamlformat_0_16_0 = mkOCamlformat { + version = "0.16.0"; + }; + + ocamlformat = ocamlformat_0_16_0; } diff --git a/nixpkgs/pkgs/development/tools/ocaml/ocamlformat/generic.nix b/nixpkgs/pkgs/development/tools/ocaml/ocamlformat/generic.nix index 8fac26c2b3e8..24527fcf41af 100644 --- a/nixpkgs/pkgs/development/tools/ocaml/ocamlformat/generic.nix +++ b/nixpkgs/pkgs/development/tools/ocaml/ocamlformat/generic.nix @@ -18,6 +18,8 @@ let src = "0.14.2" = "16phz1sg9b070p6fm8d42j0piizg05vghdjmw8aj7xm82b1pm7sz"; "0.14.3" = "13pfakdncddm41cp61p0l98scawbvhx1q4zdsglv7ph87l7zwqfl"; "0.15.0" = "0190vz59n6ma9ca1m3syl3mc8i1smj1m3d8x1jp21f710y4llfr6"; + "0.15.1" = "1x6fha495sgk4z05g0p0q3zfqm5l6xzmf6vjm9g9g7c820ym2q9a"; + "0.16.0" = "1vwjvvwha0ljc014v8jp8snki5zsqxlwd7x0dl0rg2i9kcmwc4mr"; }."${version}"; } ; in @@ -39,7 +41,23 @@ buildDunePackage rec { useDune2 = true; buildInputs = - if lib.versionAtLeast version "0.14" + if lib.versionAtLeast version "0.15.1" + then [ + base + cmdliner + fpath + odoc + re + stdio + uuseg + uutf + fix + menhir + (ppxlib.override { version = "0.18.0"; }) + dune-build-info # lib.versionAtLeast version "0.16.0" + ocaml-version # lib.versionAtLeast version "0.16.0" + ] + else if lib.versionAtLeast version "0.14" then [ base cmdliner diff --git a/nixpkgs/pkgs/development/tools/ocaml/ocamlify/default.nix b/nixpkgs/pkgs/development/tools/ocaml/ocamlify/default.nix index 9b06a55f07d0..a43903c34d38 100644 --- a/nixpkgs/pkgs/development/tools/ocaml/ocamlify/default.nix +++ b/nixpkgs/pkgs/development/tools/ocaml/ocamlify/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild }: +{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild }: stdenv.mkDerivation { name = "ocamlify-0.0.2"; @@ -27,8 +27,8 @@ stdenv.mkDerivation { homepage = "https://forge.ocamlcore.org/projects/ocamlmod/ocamlmod"; description = "Generate OCaml modules from source files"; platforms = ocaml.meta.platforms or []; - license = stdenv.lib.licenses.lgpl21; - maintainers = with stdenv.lib.maintainers; [ + license = lib.licenses.lgpl21; + maintainers = with lib.maintainers; [ maggesi ]; }; diff --git a/nixpkgs/pkgs/development/tools/ocaml/ocamlmod/default.nix b/nixpkgs/pkgs/development/tools/ocaml/ocamlmod/default.nix index 49342d7b8485..77d390295512 100644 --- a/nixpkgs/pkgs/development/tools/ocaml/ocamlmod/default.nix +++ b/nixpkgs/pkgs/development/tools/ocaml/ocamlmod/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, ounit }: +{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, ounit }: stdenv.mkDerivation { pname = "ocamlmod"; @@ -25,7 +25,7 @@ stdenv.mkDerivation { homepage = "https://forge.ocamlcore.org/projects/ocamlmod/ocamlmod"; description = "Generate OCaml modules from source files"; platforms = ocaml.meta.platforms or []; - maintainers = with stdenv.lib.maintainers; [ + maintainers = with lib.maintainers; [ maggesi ]; }; diff --git a/nixpkgs/pkgs/development/tools/ocaml/ocamlscript/default.nix b/nixpkgs/pkgs/development/tools/ocaml/ocamlscript/default.nix index 2172c7f6161a..4518e7a22e41 100644 --- a/nixpkgs/pkgs/development/tools/ocaml/ocamlscript/default.nix +++ b/nixpkgs/pkgs/development/tools/ocaml/ocamlscript/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ocaml, findlib, camlp4}: +{lib, stdenv, fetchurl, ocaml, findlib, camlp4}: stdenv.mkDerivation { name = "ocamlscript-2.0.3"; src = fetchurl { @@ -16,7 +16,7 @@ stdenv.mkDerivation { preInstall = "mkdir $out/bin"; createFindlibDestdir = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://martin.jambon.free.fr/ocamlscript.html"; license = licenses.boost; platforms = ocaml.meta.platforms or []; diff --git a/nixpkgs/pkgs/development/tools/ocaml/ocp-build/default.nix b/nixpkgs/pkgs/development/tools/ocaml/ocp-build/default.nix index 57db51612245..655f7b4d4c2f 100644 --- a/nixpkgs/pkgs/development/tools/ocaml/ocp-build/default.nix +++ b/nixpkgs/pkgs/development/tools/ocaml/ocp-build/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ocaml, findlib, ncurses, cmdliner, re }: +{ lib, stdenv, fetchFromGitHub, ocaml, findlib, ncurses, cmdliner, re }: let version = "1.99.21"; in @@ -20,7 +20,7 @@ stdenv.mkDerivation { export configureFlags="$configureFlags --with-metadir=$OCAMLFIND_DESTDIR" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.typerex.org/ocp-build.html"; description = "A build tool for OCaml"; longDescription = '' diff --git a/nixpkgs/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix b/nixpkgs/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix index 476c98ce5bc6..b12aa2e6d6de 100644 --- a/nixpkgs/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix +++ b/nixpkgs/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, ocamlPackages }: +{ lib, stdenv, fetchzip, ocamlPackages }: stdenv.mkDerivation rec { @@ -22,8 +22,8 @@ stdenv.mkDerivation rec meta = { homepage = "https://github.com/besport/ocsigen-i18n"; description = "I18n made easy for web sites written with eliom"; - license = stdenv.lib.licenses.lgpl21; - maintainers = [ stdenv.lib.maintainers.gal_bolle ]; + license = lib.licenses.lgpl21; + maintainers = [ lib.maintainers.gal_bolle ]; }; } diff --git a/nixpkgs/pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix b/nixpkgs/pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix index 6a3c0c20d85f..047246cd0a0d 100644 --- a/nixpkgs/pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix +++ b/nixpkgs/pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix @@ -1,11 +1,11 @@ -{stdenv, fetchurl, makeWrapper, ocaml, ncurses}: +{lib, stdenv, fetchurl, makeWrapper, ocaml, ncurses}: let pname = "omake"; version = "0.9.8.6-0.rc1"; webpage = "http://omake.metaprl.org"; in -if stdenv.lib.versionAtLeast ocaml.version "4.06" +if lib.versionAtLeast ocaml.version "4.06" then throw "${pname}-${version} is not available for OCaml ${ocaml.version}" else @@ -32,7 +32,7 @@ stdenv.mkDerivation { # # configureFlags = if transitional then "--transitional" else "--strict"; # -# buildFlags = [ "world.opt" ]; +# buildFlags = [ "world.opt" ]; meta = { description = "Omake build system"; diff --git a/nixpkgs/pkgs/development/tools/ocaml/omake/default.nix b/nixpkgs/pkgs/development/tools/ocaml/omake/default.nix index 2afe0d1e9f52..bcfd86a2d4de 100644 --- a/nixpkgs/pkgs/development/tools/ocaml/omake/default.nix +++ b/nixpkgs/pkgs/development/tools/ocaml/omake/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, ncurses }: +{ lib, stdenv, fetchurl, ocaml, ncurses }: stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { description = "A build system designed for scalability and portability"; homepage = "http://projects.camlcity.org/projects/omake.html"; - license = with stdenv.lib.licenses; [ + license = with lib.licenses; [ mit /* scripts */ gpl2 /* program */ ]; diff --git a/nixpkgs/pkgs/development/tools/ocaml/opaline/default.nix b/nixpkgs/pkgs/development/tools/ocaml/opaline/default.nix index a49749ad716f..9cdacd289d49 100644 --- a/nixpkgs/pkgs/development/tools/ocaml/opaline/default.nix +++ b/nixpkgs/pkgs/development/tools/ocaml/opaline/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ocamlPackages }: +{ lib, stdenv, fetchFromGitHub, ocamlPackages }: stdenv.mkDerivation rec { version = "0.3.2"; @@ -19,8 +19,8 @@ stdenv.mkDerivation rec { meta = { description = "OPAm Light INstaller Engine"; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.vbgl ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.vbgl ]; inherit (src.meta) homepage; inherit (ocamlPackages.ocaml.meta) platforms; }; diff --git a/nixpkgs/pkgs/development/tools/ocaml/opam/1.2.2.nix b/nixpkgs/pkgs/development/tools/ocaml/opam/1.2.2.nix index e6c08b97aca4..a128f2144e9f 100644 --- a/nixpkgs/pkgs/development/tools/ocaml/opam/1.2.2.nix +++ b/nixpkgs/pkgs/development/tools/ocaml/opam/1.2.2.nix @@ -82,7 +82,7 @@ in stdenv.mkDerivation { doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "A package manager for OCaml"; homepage = "http://opam.ocamlpro.com/"; maintainers = [ maintainers.henrytill ]; diff --git a/nixpkgs/pkgs/development/tools/ocaml/opam/default.nix b/nixpkgs/pkgs/development/tools/ocaml/opam/default.nix index 9e95db79dd0b..4fe408fb77f0 100644 --- a/nixpkgs/pkgs/development/tools/ocaml/opam/default.nix +++ b/nixpkgs/pkgs/development/tools/ocaml/opam/default.nix @@ -110,7 +110,7 @@ in stdenv.mkDerivation { doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "A package manager for OCaml"; homepage = "https://opam.ocaml.org/"; maintainers = [ maintainers.henrytill maintainers.marsam ]; diff --git a/nixpkgs/pkgs/development/tools/ocaml/opam/opam.nix.pl b/nixpkgs/pkgs/development/tools/ocaml/opam/opam.nix.pl index 828e209fac61..1cbad6f5f44e 100755 --- a/nixpkgs/pkgs/development/tools/ocaml/opam/opam.nix.pl +++ b/nixpkgs/pkgs/development/tools/ocaml/opam/opam.nix.pl @@ -120,7 +120,7 @@ print <<'EOF'; doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "A package manager for OCaml"; homepage = "https://opam.ocaml.org/"; maintainers = [ maintainers.henrytill maintainers.marsam ]; diff --git a/nixpkgs/pkgs/development/tools/ocaml/utop/default.nix b/nixpkgs/pkgs/development/tools/ocaml/utop/default.nix index ac7cd4f4dbbc..622ac80306f7 100644 --- a/nixpkgs/pkgs/development/tools/ocaml/utop/default.nix +++ b/nixpkgs/pkgs/development/tools/ocaml/utop/default.nix @@ -1,18 +1,20 @@ -{ stdenv, fetchurl, ocaml, findlib, dune +{ lib, stdenv, fetchurl, ocaml, findlib , lambdaTerm, cppo, makeWrapper, buildDunePackage }: -if !stdenv.lib.versionAtLeast ocaml.version "4.03" +if !lib.versionAtLeast ocaml.version "4.03" then throw "utop is not available for OCaml ${ocaml.version}" else buildDunePackage rec { pname = "utop"; - version = "2.4.3"; + version = "2.6.0"; + + useDune2 = true; src = fetchurl { url = "https://github.com/ocaml-community/utop/releases/download/${version}/utop-${version}.tbz"; - sha256 = "107al0l3x4a5kkjka7glmhsqlm7pwzzc6shspiv5gsjb49pblc2f"; + sha256 = "17n9igl74xcvj0mzdh2ybda29f2m48a5lj4yf8lrdqr7vg0982jd"; }; nativeBuildInputs = [ makeWrapper ]; @@ -56,7 +58,7 @@ buildDunePackage rec { --prefix CAML_LD_LIBRARY_PATH ":" "${get "CAML_LD_LIBRARY_PATH"}" \ --prefix OCAMLPATH ":" "${get "OCAMLPATH"}" \ --prefix OCAMLPATH ":" $(unset OCAMLPATH; addOCamlPath "$out"; printf %s "$OCAMLPATH") \ - --add-flags "-I ${findlib}/lib/ocaml/${stdenv.lib.getVersion ocaml}/site-lib" + --add-flags "-I ${findlib}/lib/ocaml/${lib.getVersion ocaml}/site-lib" done ''; @@ -68,10 +70,10 @@ buildDunePackage rec { It integrates with the tuareg mode in Emacs. ''; homepage = "https://github.com/diml/utop"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; platforms = ocaml.meta.platforms or []; maintainers = [ - stdenv.lib.maintainers.gal_bolle + lib.maintainers.gal_bolle ]; }; } diff --git a/nixpkgs/pkgs/development/tools/ofono-phonesim/default.nix b/nixpkgs/pkgs/development/tools/ofono-phonesim/default.nix index e651c7cfab50..82ed82a67bdc 100644 --- a/nixpkgs/pkgs/development/tools/ofono-phonesim/default.nix +++ b/nixpkgs/pkgs/development/tools/ofono-phonesim/default.nix @@ -1,8 +1,8 @@ -{ stdenv +{ lib, stdenv , mkDerivation , fetchgit , autoreconfHook -, pkgconfig +, pkg-config , qtbase }: @@ -18,7 +18,7 @@ mkDerivation { nativeBuildInputs = [ autoreconfHook - pkgconfig + pkg-config ]; buildInputs = [ @@ -30,7 +30,7 @@ mkDerivation { "UIC=${qtbase.dev}/bin/uic" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Phone Simulator for modem testing"; homepage = "https://01.org/ofono"; license = licenses.gpl2; diff --git a/nixpkgs/pkgs/development/tools/omniorb/default.nix b/nixpkgs/pkgs/development/tools/omniorb/default.nix index 2ab8fa23dde0..74341c0a7b49 100644 --- a/nixpkgs/pkgs/development/tools/omniorb/default.nix +++ b/nixpkgs/pkgs/development/tools/omniorb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python2 }: +{ lib, stdenv, fetchurl, python2 }: stdenv.mkDerivation rec { pname = "omniorb"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A robust high performance CORBA ORB for C++ and Python. It is freely available under the terms of the GNU Lesser General Public License (for the libraries), and GNU General Public License (for the tools). omniORB is largely CORBA 2.6 compliant"; homepage = "http://omniorb.sourceforge.net/"; license = licenses.gpl2Plus; diff --git a/nixpkgs/pkgs/development/tools/omnisharp-roslyn/default.nix b/nixpkgs/pkgs/development/tools/omnisharp-roslyn/default.nix index 9dd085b421fe..ac5ab022ef12 100644 --- a/nixpkgs/pkgs/development/tools/omnisharp-roslyn/default.nix +++ b/nixpkgs/pkgs/development/tools/omnisharp-roslyn/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , mono5 , makeWrapper @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { --add-flags "$out/src/OmniSharp.exe" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "OmniSharp based on roslyn workspaces"; homepage = "https://github.com/OmniSharp/omnisharp-roslyn"; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/development/tools/open-policy-agent/default.nix b/nixpkgs/pkgs/development/tools/open-policy-agent/default.nix index 98e966cbf537..96cae21a5b73 100644 --- a/nixpkgs/pkgs/development/tools/open-policy-agent/default.nix +++ b/nixpkgs/pkgs/development/tools/open-policy-agent/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "open-policy-agent"; - version = "0.25.2"; + version = "0.26.0"; src = fetchFromGitHub { owner = "open-policy-agent"; repo = "opa"; rev = "v${version}"; - sha256 = "0y4jd1dpq7cy9nfacpf5jbh705gmky44j78q32kq5v566lzrsvvp"; + sha256 = "sha256-bkWfRmcUPNYeUucrbh9xAqmLg7RxEEQGa2DQdN2S6Po="; }; vendorSha256 = null; diff --git a/nixpkgs/pkgs/development/tools/operator-sdk/default.nix b/nixpkgs/pkgs/development/tools/operator-sdk/default.nix index f97611c77853..c09331de5980 100644 --- a/nixpkgs/pkgs/development/tools/operator-sdk/default.nix +++ b/nixpkgs/pkgs/development/tools/operator-sdk/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "operator-sdk"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "operator-framework"; repo = pname; rev = "v${version}"; - sha256 = "03iy4a5jlsmmzn8cpyp35sc2kgz6shg18ah0qdzkadqqalqlldy8"; + sha256 = "sha256-xYG605Z8WGFH5byJA+sHPBjBmWi8b+TTtWRnQnmYN/4="; }; - vendorSha256 = "0dls086lw3sbal4rf0l3xb0sp6g393n9ylkpzppp75myj7v900vv"; + vendorSha256 = "sha256-0ZowddIiVHVg1OKhaCFo+vQKcUe6wZ6L0J8RdMvZyGk="; doCheck = false; diff --git a/nixpkgs/pkgs/development/tools/osslsigncode/default.nix b/nixpkgs/pkgs/development/tools/osslsigncode/default.nix index ef673ed018f2..e9dd2f08d3ae 100644 --- a/nixpkgs/pkgs/development/tools/osslsigncode/default.nix +++ b/nixpkgs/pkgs/development/tools/osslsigncode/default.nix @@ -1,8 +1,8 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , autoreconfHook , libgsf -, pkgconfig +, pkg-config , openssl , curl }: @@ -18,9 +18,9 @@ stdenv.mkDerivation rec { sha256 = "0iwxdzqan2bswz62pmwjcyh01vs6ifpdcannw3s192gqzac1lgg3"; }; - nativeBuildInputs = [ autoreconfHook libgsf pkgconfig openssl curl ]; + nativeBuildInputs = [ autoreconfHook libgsf pkg-config openssl curl ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/mtrojnar/osslsigncode"; description = "OpenSSL based Authenticode signing for PE/MSI/Java CAB files"; license = licenses.gpl3Plus; diff --git a/nixpkgs/pkgs/development/tools/out-of-tree/default.nix b/nixpkgs/pkgs/development/tools/out-of-tree/default.nix index b902dd2cc406..9ab69d1d5d85 100644 --- a/nixpkgs/pkgs/development/tools/out-of-tree/default.nix +++ b/nixpkgs/pkgs/development/tools/out-of-tree/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchgit, qemu, docker, which, makeWrapper }: +{ lib, stdenv, buildGoModule, fetchgit, qemu, docker, which, makeWrapper }: buildGoModule rec { pname = "out-of-tree"; @@ -18,10 +18,10 @@ buildGoModule rec { postFixup = '' wrapProgram $out/bin/out-of-tree \ - --prefix PATH : "${stdenv.lib.makeBinPath [ qemu docker which ]}" + --prefix PATH : "${lib.makeBinPath [ qemu docker which ]}" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "kernel {module, exploit} development tool"; homepage = "https://out-of-tree.io"; maintainers = [ maintainers.dump_stack ]; diff --git a/nixpkgs/pkgs/development/tools/overcommit/gemset.nix b/nixpkgs/pkgs/development/tools/overcommit/gemset.nix index b7d58c0ea708..95244c1afe6d 100644 --- a/nixpkgs/pkgs/development/tools/overcommit/gemset.nix +++ b/nixpkgs/pkgs/development/tools/overcommit/gemset.nix @@ -30,4 +30,4 @@ }; version = "0.51.0"; }; -} \ No newline at end of file +} diff --git a/nixpkgs/pkgs/development/tools/packer/default.nix b/nixpkgs/pkgs/development/tools/packer/default.nix index 8570e10a07c3..d4dd46cdcb5c 100644 --- a/nixpkgs/pkgs/development/tools/packer/default.nix +++ b/nixpkgs/pkgs/development/tools/packer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "packer"; version = "1.6.6"; @@ -14,7 +14,7 @@ buildGoPackage rec { sha256 = "sha256-kFDy8Zlx+D5JDyNlAmB/ICTe4K9s6KDbALP5pom5OQg="; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A tool for creating identical machine images for multiple platforms from a single source configuration"; homepage = "https://www.packer.io"; license = licenses.mpl20; diff --git a/nixpkgs/pkgs/development/tools/packet-cli/default.nix b/nixpkgs/pkgs/development/tools/packet-cli/default.nix index 4c4cb6a28d42..ec07e4b058ee 100644 --- a/nixpkgs/pkgs/development/tools/packet-cli/default.nix +++ b/nixpkgs/pkgs/development/tools/packet-cli/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ lib, stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "packet-cli"; @@ -19,7 +19,7 @@ buildGoModule rec { doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Official Packet CLI"; homepage = "https://github.com/packethost/packet-cli"; license = licenses.mit; diff --git a/nixpkgs/pkgs/development/tools/packet/default.nix b/nixpkgs/pkgs/development/tools/packet/default.nix index 9bca1ec75b67..31ccf19bb05f 100644 --- a/nixpkgs/pkgs/development/tools/packet/default.nix +++ b/nixpkgs/pkgs/development/tools/packet/default.nix @@ -1,5 +1,5 @@ # This file was generated by https://github.com/kamilchm/go2nix v1.2.1 -{ stdenv, buildGoPackage, fetchgit }: +{ lib, stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { pname = "packet"; @@ -18,8 +18,8 @@ buildGoPackage rec { meta = { description = "a CLI tool to manage packet.net services"; homepage = "https://github.com/ebsarr/packet"; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.grahamc ]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.grahamc ]; + platforms = lib.platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/tools/parinfer-rust/default.nix b/nixpkgs/pkgs/development/tools/parinfer-rust/default.nix index f697e00b56a4..79c8f3791880 100644 --- a/nixpkgs/pkgs/development/tools/parinfer-rust/default.nix +++ b/nixpkgs/pkgs/development/tools/parinfer-rust/default.nix @@ -1,4 +1,4 @@ -{ stdenv, rustPlatform, fetchFromGitHub, llvmPackages }: +{ lib, stdenv, rustPlatform, fetchFromGitHub, llvmPackages }: rustPlatform.buildRustPackage rec { pname = "parinfer-rust"; @@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec { plugin/parinfer.vim >$rtpPath/plugin/parinfer.vim ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Infer parentheses for Clojure, Lisp, and Scheme"; homepage = "https://github.com/eraserhd/parinfer-rust"; license = licenses.isc; diff --git a/nixpkgs/pkgs/development/tools/parse-cli-bin/default.nix b/nixpkgs/pkgs/development/tools/parse-cli-bin/default.nix index 0f8ead579d0a..7cda74db5ef6 100644 --- a/nixpkgs/pkgs/development/tools/parse-cli-bin/default.nix +++ b/nixpkgs/pkgs/development/tools/parse-cli-bin/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "parse-cli-bin"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1iyfizbbxmr87wjgqiwqds51irgw6l3vm9wn89pc3zpj2zkyvf5h"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Parse Command Line Interface"; homepage = "https://parse.com"; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/development/tools/parsing/antlr/2.7.7.nix b/nixpkgs/pkgs/development/tools/parsing/antlr/2.7.7.nix index 55800a800984..fed96e954751 100644 --- a/nixpkgs/pkgs/development/tools/parsing/antlr/2.7.7.nix +++ b/nixpkgs/pkgs/development/tools/parsing/antlr/2.7.7.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, jdk, python2 }: +{ lib, stdenv, fetchurl, jdk, python2 }: stdenv.mkDerivation { name = "antlr-2.7.7"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { buildInputs = [ jdk ]; nativeBuildInputs = [ python2 ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Powerful parser generator"; longDescription = '' ANTLR (ANother Tool for Language Recognition) is a powerful parser diff --git a/nixpkgs/pkgs/development/tools/parsing/antlr/3.4.nix b/nixpkgs/pkgs/development/tools/parsing/antlr/3.4.nix index 1263e7934be7..962cd079a8e9 100644 --- a/nixpkgs/pkgs/development/tools/parsing/antlr/3.4.nix +++ b/nixpkgs/pkgs/development/tools/parsing/antlr/3.4.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, jre}: +{lib, stdenv, fetchurl, jre}: stdenv.mkDerivation rec { pname = "antlr"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { inherit jre; - meta = with stdenv.lib; { + meta = with lib; { description = "Powerful parser generator"; longDescription = '' ANTLR (ANother Tool for Language Recognition) is a powerful parser diff --git a/nixpkgs/pkgs/development/tools/parsing/antlr/3.5.nix b/nixpkgs/pkgs/development/tools/parsing/antlr/3.5.nix index 6fa6323d3e87..2efe752c3635 100644 --- a/nixpkgs/pkgs/development/tools/parsing/antlr/3.5.nix +++ b/nixpkgs/pkgs/development/tools/parsing/antlr/3.5.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, fetchFromGitHub, jre}: +{lib, stdenv, fetchurl, fetchFromGitHub, jre}: stdenv.mkDerivation rec { pname = "antlr"; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { inherit jre; - meta = with stdenv.lib; { + meta = with lib; { description = "Powerful parser generator"; longDescription = '' ANTLR (ANother Tool for Language Recognition) is a powerful parser @@ -40,6 +40,6 @@ stdenv.mkDerivation rec { homepage = "https://www.antlr.org/"; license = licenses.bsd3; platforms = platforms.linux; - maintainers = [ stdenv.lib.maintainers.farlion ]; + maintainers = [ lib.maintainers.farlion ]; }; } diff --git a/nixpkgs/pkgs/development/tools/parsing/antlr/4.8.nix b/nixpkgs/pkgs/development/tools/parsing/antlr/4.8.nix index 1c88c82e16ae..0708ba754b2a 100644 --- a/nixpkgs/pkgs/development/tools/parsing/antlr/4.8.nix +++ b/nixpkgs/pkgs/development/tools/parsing/antlr/4.8.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, jre -, fetchFromGitHub, cmake, ninja, pkgconfig, libuuid, darwin }: +{ lib, stdenv, fetchurl, jre +, fetchFromGitHub, cmake, ninja, pkg-config, libuuid, darwin }: let version = "4.8"; @@ -18,15 +18,15 @@ let outputs = [ "out" "dev" "doc" ]; - nativeBuildInputs = [ cmake ninja pkgconfig ]; - buildInputs = stdenv.lib.optional stdenv.isLinux libuuid - ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.CoreFoundation; + nativeBuildInputs = [ cmake ninja pkg-config ]; + buildInputs = lib.optional stdenv.isLinux libuuid + ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.CoreFoundation; postUnpack = '' export sourceRoot=$sourceRoot/runtime/Cpp ''; - meta = with stdenv.lib; { + meta = with lib; { description = "C++ target for ANTLR 4"; homepage = "https://www.antlr.org/"; license = licenses.bsd3; @@ -67,7 +67,7 @@ let jarLocation = "${antlr}/share/java/antlr-${version}-complete.jar"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Powerful parser generator"; longDescription = '' ANTLR (ANother Tool for Language Recognition) is a powerful parser diff --git a/nixpkgs/pkgs/development/tools/parsing/bison/default.nix b/nixpkgs/pkgs/development/tools/parsing/bison/default.nix index aa8d8df2c1d1..662961ae46aa 100644 --- a/nixpkgs/pkgs/development/tools/parsing/bison/default.nix +++ b/nixpkgs/pkgs/development/tools/parsing/bison/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, m4, perl, help2man }: +{ lib, stdenv, fetchurl, m4, perl, help2man }: # Note: this package is used for bootstrapping fetchurl, and thus # cannot use fetchpatch! All mutable patches (generated by GitHub or @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "1qkp2rfi5njyp5c5avajab00aj74pkmkgzkvshv4p2ydkhswgazv"; }; - nativeBuildInputs = [ m4 perl ] ++ stdenv.lib.optional stdenv.isSunOS help2man; + nativeBuildInputs = [ m4 perl ] ++ lib.optional stdenv.isSunOS help2man; propagatedBuildInputs = [ m4 ]; doCheck = false; # fails @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://www.gnu.org/software/bison/"; description = "Yacc-compatible parser generator"; - license = stdenv.lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; longDescription = '' Bison is a general-purpose parser generator that converts an @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { to use Bison. ''; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; passthru = { glrSupport = true; }; diff --git a/nixpkgs/pkgs/development/tools/parsing/bisonc++/default.nix b/nixpkgs/pkgs/development/tools/parsing/bisonc++/default.nix index c6a4fc1a068d..5710500a18f7 100644 --- a/nixpkgs/pkgs/development/tools/parsing/bisonc++/default.nix +++ b/nixpkgs/pkgs/development/tools/parsing/bisonc++/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, fetchFromGitLab +{lib, stdenv, fetchurl, fetchFromGitLab , yodl, icmake, flexcpp, bobcat }: stdenv.mkDerivation rec { @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { ./build install x ''; - meta = with stdenv.lib; { + meta = with lib; { inherit version; description = "A parser generator like bison, but it generates C++ code"; license = licenses.gpl2Plus; diff --git a/nixpkgs/pkgs/development/tools/parsing/byacc/default.nix b/nixpkgs/pkgs/development/tools/parsing/byacc/default.nix index 60e6796850c2..4f6f00e968ef 100644 --- a/nixpkgs/pkgs/development/tools/parsing/byacc/default.nix +++ b/nixpkgs/pkgs/development/tools/parsing/byacc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "byacc"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ln -s $out/bin/byacc $out/bin/yacc ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Berkeley YACC"; homepage = "https://invisible-island.net/byacc/byacc.html"; license = licenses.publicDomain; diff --git a/nixpkgs/pkgs/development/tools/parsing/flex/2.5.35.nix b/nixpkgs/pkgs/development/tools/parsing/flex/2.5.35.nix index 504e5b090497..b2245ff9c9b9 100644 --- a/nixpkgs/pkgs/development/tools/parsing/flex/2.5.35.nix +++ b/nixpkgs/pkgs/development/tools/parsing/flex/2.5.35.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook, flex, bison, texinfo, help2man, m4 }: +{ lib, stdenv, fetchurl, autoreconfHook, flex, bison, texinfo, help2man, m4 }: stdenv.mkDerivation { name = "flex-2.5.35"; @@ -16,14 +16,14 @@ stdenv.mkDerivation { propagatedBuildInputs = [ m4 ]; - preConfigure = stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + preConfigure = lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "ac_cv_func_malloc_0_nonnull=yes" "ac_cv_func_realloc_0_nonnull=yes" ]; doCheck = false; # fails 2 out of 46 tests - meta = with stdenv.lib; { + meta = with lib; { branch = "2.5.35"; homepage = "http://flex.sourceforge.net/"; description = "A fast lexical analyser generator"; diff --git a/nixpkgs/pkgs/development/tools/parsing/flex/2.6.1.nix b/nixpkgs/pkgs/development/tools/parsing/flex/2.6.1.nix index 2562b3c26134..cc0ecb148c44 100644 --- a/nixpkgs/pkgs/development/tools/parsing/flex/2.6.1.nix +++ b/nixpkgs/pkgs/development/tools/parsing/flex/2.6.1.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, bison, m4 }: +{ lib, stdenv, fetchurl, bison, m4 }: stdenv.mkDerivation { name = "flex-2.6.1"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { postPatch = '' patchShebangs tests - '' + stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' + '' + lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' substituteInPlace Makefile.in --replace "tests" " "; ''; @@ -18,16 +18,16 @@ stdenv.mkDerivation { propagatedBuildInputs = [ m4 ]; - preConfigure = stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + preConfigure = lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "ac_cv_func_malloc_0_nonnull=yes" "ac_cv_func_realloc_0_nonnull=yes" ]; - postConfigure = stdenv.lib.optionalString (stdenv.isDarwin || stdenv.isCygwin) '' + postConfigure = lib.optionalString (stdenv.isDarwin || stdenv.isCygwin) '' sed -i Makefile -e 's/-no-undefined//;' ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/westes/flex"; description = "A fast lexical analyser generator"; license = licenses.bsd2; diff --git a/nixpkgs/pkgs/development/tools/parsing/flex/default.nix b/nixpkgs/pkgs/development/tools/parsing/flex/default.nix index 51373f4a4fd7..42b007300a95 100644 --- a/nixpkgs/pkgs/development/tools/parsing/flex/default.nix +++ b/nixpkgs/pkgs/development/tools/parsing/flex/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPackages, fetchurl, bison, m4 +{ lib, stdenv, buildPackages, fetchurl, bison, m4 , fetchpatch, autoreconfHook, help2man }: @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { postPatch = '' patchShebangs tests - '' + stdenv.lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' + '' + lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' substituteInPlace Makefile.in --replace "tests" " " substituteInPlace doc/Makefile.am --replace 'flex.1: $(top_srcdir)/configure.ac' 'flex.1: ' @@ -33,18 +33,18 @@ stdenv.mkDerivation rec { buildInputs = [ bison ]; propagatedBuildInputs = [ m4 ]; - preConfigure = stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + preConfigure = lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "ac_cv_func_malloc_0_nonnull=yes" "ac_cv_func_realloc_0_nonnull=yes" ]; - postConfigure = stdenv.lib.optionalString (stdenv.isDarwin || stdenv.isCygwin) '' + postConfigure = lib.optionalString (stdenv.isDarwin || stdenv.isCygwin) '' sed -i Makefile -e 's/-no-undefined//;' ''; dontDisableStatic = stdenv.buildPlatform != stdenv.hostPlatform; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/westes/flex"; description = "A fast lexical analyser generator"; license = licenses.bsd2; diff --git a/nixpkgs/pkgs/development/tools/parsing/flexc++/default.nix b/nixpkgs/pkgs/development/tools/parsing/flexc++/default.nix index a9482f9fd493..e4db5631e7fe 100644 --- a/nixpkgs/pkgs/development/tools/parsing/flexc++/default.nix +++ b/nixpkgs/pkgs/development/tools/parsing/flexc++/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, bobcat, icmake, yodl }: +{ lib, stdenv, fetchFromGitHub, bobcat, icmake, yodl }: stdenv.mkDerivation rec { pname = "flexc++"; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ./build install x ''; - meta = with stdenv.lib; { + meta = with lib; { description = "C++ tool for generating lexical scanners"; longDescription = '' Flexc++ was designed after `flex'. Flexc++ offers a cleaner class design diff --git a/nixpkgs/pkgs/development/tools/parsing/hammer/default.nix b/nixpkgs/pkgs/development/tools/parsing/hammer/default.nix index d36dfa9219d4..0a9dfdec0163 100644 --- a/nixpkgs/pkgs/development/tools/parsing/hammer/default.nix +++ b/nixpkgs/pkgs/development/tools/parsing/hammer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, glib, pkgconfig, python, scons }: +{ lib, stdenv, fetchgit, glib, pkg-config, python, scons }: stdenv.mkDerivation { pname = "hammer"; @@ -10,10 +10,10 @@ stdenv.mkDerivation { rev = "47f34b81e4de834fd3537dd71928c4f3cdb7f533"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib python scons ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A bit-oriented parser combinator library"; longDescription = '' Hammer is a parsing library. Like many modern parsing libraries, diff --git a/nixpkgs/pkgs/development/tools/parsing/jikespg/default.nix b/nixpkgs/pkgs/development/tools/parsing/jikespg/default.nix index 18dd531e4b14..34e628866838 100644 --- a/nixpkgs/pkgs/development/tools/parsing/jikespg/default.nix +++ b/nixpkgs/pkgs/development/tools/parsing/jikespg/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation rec { name = "jikespg-1.3"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { cp jikespg $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://jikes.sourceforge.net/"; description = "The Jikes Parser Generator"; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/development/tools/parsing/lemon/default.nix b/nixpkgs/pkgs/development/tools/parsing/lemon/default.nix index b10e98909517..3db9e0f6d9ed 100644 --- a/nixpkgs/pkgs/development/tools/parsing/lemon/default.nix +++ b/nixpkgs/pkgs/development/tools/parsing/lemon/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: let @@ -30,7 +30,7 @@ in stdenv.mkDerivation { install -Dvm644 ${srcs.lempar} $out/bin/lempar.c ''; - meta = with stdenv.lib; { + meta = with lib; { description = "An LALR(1) parser generator"; longDescription = '' The Lemon program is an LALR(1) parser generator that takes a diff --git a/nixpkgs/pkgs/development/tools/parsing/peg/default.nix b/nixpkgs/pkgs/development/tools/parsing/peg/default.nix index 458ddc007f5e..a7ffeb697459 100644 --- a/nixpkgs/pkgs/development/tools/parsing/peg/default.nix +++ b/nixpkgs/pkgs/development/tools/parsing/peg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { name = "peg-0.1.18"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { preBuild="makeFlagsArray+=( PREFIX=$out )"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://piumarta.com/software/peg/"; description = "Tools for generating recursive-descent parsers: programs that perform pattern matching on text"; platforms = platforms.all; diff --git a/nixpkgs/pkgs/development/tools/parsing/ragel/default.nix b/nixpkgs/pkgs/development/tools/parsing/ragel/default.nix index dddddba129c9..6bbcf36cd2c2 100644 --- a/nixpkgs/pkgs/development/tools/parsing/ragel/default.nix +++ b/nixpkgs/pkgs/development/tools/parsing/ragel/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, transfig, tex, ghostscript, colm +{ lib, stdenv, fetchurl, transfig, tex, ghostscript, colm , build-manual ? false }: @@ -13,19 +13,19 @@ let inherit sha256; }; - buildInputs = stdenv.lib.optional build-manual [ transfig ghostscript tex ]; + buildInputs = lib.optional build-manual [ transfig ghostscript tex ]; - preConfigure = stdenv.lib.optional build-manual '' + preConfigure = lib.optional build-manual '' sed -i "s/build_manual=no/build_manual=yes/g" DIST ''; configureFlags = [ "--with-colm=${colm}" ]; - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isGNU "-std=gnu++98"; + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isGNU "-std=gnu++98"; doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.colm.net/open-source/ragel/"; description = "State machine compiler"; inherit license; @@ -40,12 +40,12 @@ in ragelStable = generic { version = "6.10"; sha256 = "0gvcsl62gh6sg73nwaxav4a5ja23zcnyxncdcdnqa2yjcpdnw5az"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; }; ragelDev = generic { version = "7.0.0.12"; sha256 = "0x3si355lv6q051lgpg8bpclpiq5brpri5lv3p8kk2qhzfbyz69r"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }; } diff --git a/nixpkgs/pkgs/development/tools/parsing/re2c/default.nix b/nixpkgs/pkgs/development/tools/parsing/re2c/default.nix index 482beeff1221..665609fe90af 100644 --- a/nixpkgs/pkgs/development/tools/parsing/re2c/default.nix +++ b/nixpkgs/pkgs/development/tools/parsing/re2c/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook }: stdenv.mkDerivation rec { pname = "re2c"; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { patchShebangs run_tests.sh ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Tool for writing very fast and very flexible scanners"; homepage = "http://re2c.org"; license = licenses.publicDomain; diff --git a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix index e1648b84be5e..6d8c9237bd0f 100644 --- a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix +++ b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix @@ -16,6 +16,7 @@ tree-sitter-json = (builtins.fromJSON (builtins.readFile ./tree-sitter-json.json)); tree-sitter-julia = (builtins.fromJSON (builtins.readFile ./tree-sitter-julia.json)); tree-sitter-lua = (builtins.fromJSON (builtins.readFile ./tree-sitter-lua.json)); + tree-sitter-nix = (builtins.fromJSON (builtins.readFile ./tree-sitter-nix.json)); tree-sitter-ocaml = (builtins.fromJSON (builtins.readFile ./tree-sitter-ocaml.json)); tree-sitter-php = (builtins.fromJSON (builtins.readFile ./tree-sitter-php.json)); tree-sitter-python = (builtins.fromJSON (builtins.readFile ./tree-sitter-python.json)); diff --git a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c-sharp.json b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c-sharp.json index 6498e40497eb..81ccf5a84726 100644 --- a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c-sharp.json +++ b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c-sharp.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-c-sharp", - "rev": "b8bff2a389ecc098dbb7e8abee492816a5eb42db", - "date": "2020-11-15T07:54:17+00:00", - "path": "/nix/store/h5p71g661hbyzcdcj6xff8y5pcsivpa4-tree-sitter-c-sharp", - "sha256": "0x78s2wgd8b6pwjzbmc9fgp0ivdmxv39wikig1m55slai6yq51wh", + "rev": "aae8ab2b681082ce7a35d8d5fdf75ffcf7f994e5", + "date": "2021-01-08T13:18:05+00:00", + "path": "/nix/store/fpx44l1j2dz3drnvfb7746d8zxn37gwi-tree-sitter-c-sharp", + "sha256": "107bxz9bhyixdla3xli06ism8rnkha7pa79hi7lyx00sfnjmgcc8", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nix.json b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nix.json new file mode 100644 index 000000000000..6d055ca0ae93 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nix.json @@ -0,0 +1,10 @@ +{ + "url": "https://github.com/cstrahan/tree-sitter-nix", + "rev": "791b5ff0e4f0da358cbb941788b78d436a2ca621", + "date": "2019-05-10T15:57:43-05:00", + "path": "/nix/store/5gcddcxf6jfr4f0p203jnbjc0zxk207d-tree-sitter-nix", + "sha256": "1y5b3wh3fcmbgq8r2i97likzfp1zp02m58zacw5a1cjqs5raqz66", + "fetchSubmodules": false, + "deepClone": false, + "leaveDotGit": false +} diff --git a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json index 86551acbee09..ff60ff80101e 100644 --- a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json +++ b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-python", - "rev": "65b486b42fe0188e4be344092151042bf1bc6d9a", - "date": "2020-12-15T09:33:20-08:00", - "path": "/nix/store/k9jziqzyxq2bv55pwl03jcmmca83fjyp-tree-sitter-python", - "sha256": "1yxqdlmp0jybm7vvza1ni5a320vrviqkd14pnpcrg9ilzq23mlsh", + "rev": "f568dfabf7c4611077467a9cd13297fa0658abb6", + "date": "2021-01-06T13:32:39-08:00", + "path": "/nix/store/5g256n8ym3ll2kp9jlmnkaxpnyf6rpk3-tree-sitter-python", + "sha256": "1lxmzrkw4k9pba4xywnbd1pk2x5s99qa4skgqvgy3imgbhy7ilkh", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ruby.json b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ruby.json index 027478e99f88..d5a1767a23ce 100644 --- a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ruby.json +++ b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ruby.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-ruby", - "rev": "bb572f60e9538bd11fbde95a54f97522073f1e06", - "date": "2020-12-20T12:25:50-08:00", - "path": "/nix/store/hkjgvxh8l4drk1z4zkhmd0wcj876x5y1-tree-sitter-ruby", - "sha256": "198sfmrb3mxvpfmlwmwfmb3qs075ih0bjmr0ffrdy4nqm4a00cb8", + "rev": "f86d90cce578e28c824afdcdbdca7d031b88c0b0", + "date": "2020-11-02T20:49:49-08:00", + "path": "/nix/store/gs0hhb1dlgmv0y60zyyz7ki30yvpddfx-tree-sitter-ruby", + "sha256": "1n1irdjfmv27p5ia2vqzv8zfsq19pxi0as0wrkb7z7s1lqr1gwrb", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json index 38c9e44f2f6a..c02d03d11d94 100644 --- a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json +++ b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-rust", - "rev": "8746bd4b584b8063ee8e445bf31015e887417d33", - "date": "2020-11-23T17:16:42-08:00", - "path": "/nix/store/1zzxvza23wsdyazw47lhjvrs0za6wjpn-tree-sitter-rust", - "sha256": "0bhxfyq8ycnp90pqvr6cf3gpq1vax8a34kaq85dmbrc6ar8a7ap6", + "rev": "2beedf23bedbd7b02b416518693e8eed3944d4a0", + "date": "2021-01-05T10:00:48-08:00", + "path": "/nix/store/2igv1zlnl535b86zj8s9s3ir4q85933x-tree-sitter-rust", + "sha256": "0iicwhxf1f56zqpsagbm8nr30fpssi970mi9i47az206dbs506ly", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json index a875232eab6d..fda72fc99c6e 100644 --- a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json +++ b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-typescript", - "rev": "a3a4becef889692724bb1c2191f8fc4bce6573f9", - "date": "2020-12-15T13:34:55-08:00", - "path": "/nix/store/dra5wbhgxkkhphm1mhgv87hsfw0g18nw-tree-sitter-typescript", - "sha256": "0ir7lmzwnbf1zwbl4bfsib1jilg8pvfc1nabaq2n2rixvghlvf3d", + "rev": "2d1c7d5c10c33cb444d1781fa76f2936810afec4", + "date": "2021-01-07T09:49:56-08:00", + "path": "/nix/store/s65bv25523lwa9yrqbj9hsh0k4ig6pbx-tree-sitter-typescript", + "sha256": "09bv44n181az5rqjd43wngj9bghwy0237gpvs6xkjf9j19kvy0yi", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/update.nix b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/update.nix index 7b0b16b403f4..631944cb67a0 100644 --- a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/update.nix +++ b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/update.nix @@ -63,6 +63,10 @@ let # If you need a grammar that already exists in the official orga, # make sure to give it a different name. otherGrammars = { + "tree-sitter-nix" = { + orga = "cstrahan"; + repo = "tree-sitter-nix"; + }; "tree-sitter-lua" = { orga = "nvim-treesitter"; repo = "tree-sitter-lua"; diff --git a/nixpkgs/pkgs/development/tools/pax-rs/default.nix b/nixpkgs/pkgs/development/tools/pax-rs/default.nix index 6aa38104bcac..cda3ba5e8a8b 100644 --- a/nixpkgs/pkgs/development/tools/pax-rs/default.nix +++ b/nixpkgs/pkgs/development/tools/pax-rs/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchFromGitHub, fetchurl, rustPlatform, runCommand } : +{ lib, stdenv, fetchFromGitHub, fetchurl, rustPlatform, runCommand } : with rustPlatform; buildRustPackage rec { pname = "pax-rs"; version = "0.4.0"; - meta = with stdenv.lib; { + meta = with lib; { description = "The fastest JavaScript bundler in the galaxy"; longDescription = '' The fastest JavaScript bundler in the galaxy. Fully supports ECMAScript module syntax (import/export) in addition to CommonJS require(<string>). diff --git a/nixpkgs/pkgs/development/tools/pew/default.nix b/nixpkgs/pkgs/development/tools/pew/default.nix index a7fabb783951..6ca94041bb50 100644 --- a/nixpkgs/pkgs/development/tools/pew/default.nix +++ b/nixpkgs/pkgs/development/tools/pew/default.nix @@ -1,4 +1,4 @@ -{ stdenv, python3 }: +{ lib, stdenv, python3 }: with python3.pkgs; @@ -20,7 +20,7 @@ buildPythonApplication rec { pythonImportsCheck = [ "pew" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/berdario/pew"; description = "Tools to manage multiple virtualenvs written in pure python"; license = licenses.mit; diff --git a/nixpkgs/pkgs/development/tools/pgformatter/default.nix b/nixpkgs/pkgs/development/tools/pgformatter/default.nix index 1cd9f9ea17ba..d5c6872cd7dc 100644 --- a/nixpkgs/pkgs/development/tools/pgformatter/default.nix +++ b/nixpkgs/pkgs/development/tools/pgformatter/default.nix @@ -1,4 +1,4 @@ -{ stdenv, perlPackages, fetchFromGitHub, shortenPerlShebang }: +{ lib, stdenv, perlPackages, fetchFromGitHub, shortenPerlShebang }: perlPackages.buildPerlPackage rec { pname = "pgformatter"; @@ -24,14 +24,14 @@ perlPackages.buildPerlPackage rec { --replace "'INSTALLDIRS' => \$INSTALLDIRS," "'INSTALLDIRS' => \$INSTALLDIRS, 'INSTALLVENDORLIB' => 'bin/lib', 'INSTALLVENDORBIN' => 'bin', 'INSTALLVENDORSCRIPT' => 'bin', 'INSTALLVENDORMAN1DIR' => 'share/man/man1', 'INSTALLVENDORMAN3DIR' => 'share/man/man3'," ''; - nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin shortenPerlShebang; - postInstall = stdenv.lib.optionalString stdenv.isDarwin '' + nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; + postInstall = lib.optionalString stdenv.isDarwin '' shortenPerlShebang $out/bin/pg_format ''; doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "A PostgreSQL SQL syntax beautifier that can work as a console program or as a CGI"; homepage = "https://github.com/darold/pgFormatter"; changelog = "https://github.com/darold/pgFormatter/releases/tag/v${version}"; diff --git a/nixpkgs/pkgs/development/tools/pgloader/default.nix b/nixpkgs/pkgs/development/tools/pgloader/default.nix index 6d4bcaadd118..94217a765e28 100644 --- a/nixpkgs/pkgs/development/tools/pgloader/default.nix +++ b/nixpkgs/pkgs/development/tools/pgloader/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, sbcl, sqlite, freetds, libzip, curl, git, cacert, openssl }: +{ lib, stdenv, fetchurl, makeWrapper, sbcl, sqlite, freetds, libzip, curl, git, cacert, openssl }: stdenv.mkDerivation rec { pname = "pgloader"; version = "3.6.2"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ git makeWrapper ]; buildInputs = [ sbcl cacert sqlite freetds libzip curl openssl ]; - LD_LIBRARY_PATH = stdenv.lib.makeLibraryPath [ sqlite libzip curl git openssl freetds ]; + LD_LIBRARY_PATH = lib.makeLibraryPath [ sqlite libzip curl git openssl freetds ]; buildPhase = '' export PATH=$PATH:$out/bin @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/pgloader --prefix LD_LIBRARY_PATH : "${LD_LIBRARY_PATH}" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://pgloader.io/"; description = "Loads data into PostgreSQL and allows you to implement Continuous Migration from your current database to PostgreSQL"; maintainers = with maintainers; [ mguentner ]; diff --git a/nixpkgs/pkgs/development/tools/phantomjs/default.nix b/nixpkgs/pkgs/development/tools/phantomjs/default.nix index f042aa35b6f6..66cdb09cf15a 100644 --- a/nixpkgs/pkgs/development/tools/phantomjs/default.nix +++ b/nixpkgs/pkgs/development/tools/phantomjs/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { buildPhase = lib.optionalString (!stdenv.isDarwin) '' patchelf \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${stdenv.lib.makeLibraryPath [ freetype fontconfig stdenv.cc.cc stdenv.cc.cc openssl ]}" \ + --set-rpath "${lib.makeLibraryPath [ freetype fontconfig stdenv.cc.cc stdenv.cc.cc openssl ]}" \ bin/phantomjs ''; diff --git a/nixpkgs/pkgs/development/tools/phantomjs2/default.nix b/nixpkgs/pkgs/development/tools/phantomjs2/default.nix index d565a70798ae..594deeb1c730 100644 --- a/nixpkgs/pkgs/development/tools/phantomjs2/default.nix +++ b/nixpkgs/pkgs/development/tools/phantomjs2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch +{ lib, stdenv, fetchFromGitHub, fetchpatch , bison, flex, fontconfig, freetype, gperf, icu, openssl, libjpeg , libpng, perl, python, ruby, sqlite, qtwebkit, qmake, qtbase , darwin, writeScriptBin, cups, makeWrapper @@ -30,7 +30,7 @@ in stdenv.mkDerivation rec { bison flex fontconfig freetype gperf icu openssl libjpeg libpng perl python ruby sqlite qtwebkit qtbase makeWrapper - ] ++ stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ AGL ApplicationServices AppKit Cocoa OpenGL darwin.libobjc fakeClang cups ]); @@ -73,7 +73,7 @@ in stdenv.mkDerivation rec { # invalid suffix on literal; C++11 requires a space between litend identifier NIX_CFLAGS_COMPILE = "-Wno-reserved-user-defined-literal"; - __impureHostDeps = stdenv.lib.optional stdenv.isDarwin "/usr/lib/libicucore.dylib"; + __impureHostDeps = lib.optional stdenv.isDarwin "/usr/lib/libicucore.dylib"; enableParallelBuilding = true; @@ -81,7 +81,7 @@ in stdenv.mkDerivation rec { mkdir -p $out/share/doc/phantomjs cp -a bin $out cp -a ChangeLog examples LICENSE.BSD README.md third-party.txt $out/share/doc/phantomjs - '' + stdenv.lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' install_name_tool -change \ ${darwin.CF}/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation \ /System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation \ @@ -92,10 +92,10 @@ in stdenv.mkDerivation rec { '' + '' wrapProgram $out/bin/phantomjs \ --set QT_QPA_PLATFORM offscreen \ - --prefix PATH : ${stdenv.lib.makeBinPath [ qtbase ]} + --prefix PATH : ${lib.makeBinPath [ qtbase ]} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Headless WebKit with JavaScript API"; longDescription = '' PhantomJS2 is a headless WebKit with JavaScript API. diff --git a/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix b/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix index 16d66c48af8b..5810d6d2a749 100644 --- a/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix +++ b/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix @@ -56,7 +56,7 @@ self: super: av = super.av.overridePythonAttrs ( old: { nativeBuildInputs = old.nativeBuildInputs ++ [ - pkgs.pkgconfig + pkgs.pkg-config ]; buildInputs = old.buildInputs ++ [ pkgs.ffmpeg_4 ]; } @@ -127,7 +127,7 @@ self: super: cryptography = super.cryptography.overridePythonAttrs ( old: { nativeBuildInputs = old.nativeBuildInputs or [ ] - ++ stdenv.lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) self.python.pythonForBuild.pkgs.cffi; + ++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) self.python.pythonForBuild.pkgs.cffi; buildInputs = old.buildInputs ++ [ pkgs.openssl ]; } ); @@ -234,8 +234,8 @@ self: super: h5py = super.h5py.overridePythonAttrs ( old: if old.format != "wheel" then rec { - nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkgconfig ]; - buildInputs = old.buildInputs ++ [ pkgs.hdf5 self.pkgconfig self.cython ]; + nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkg-config ]; + buildInputs = old.buildInputs ++ [ pkgs.hdf5 self.pkg-config self.cython ]; configure_flags = "--hdf5=${pkgs.hdf5}"; postConfigure = '' ${self.python.executable} setup.py configure ${configure_flags} @@ -245,7 +245,7 @@ self: super: horovod = super.horovod.overridePythonAttrs ( old: { - propagatedBuildInputs = old.propagatedBuildInputs ++ [ pkgs.openmpi ]; + propagatedBuildInputs = old.propagatedBuildInputs ++ [ pkgs.mpi ]; } ); @@ -386,7 +386,7 @@ self: super: ); libvirt-python = super.libvirt-python.overridePythonAttrs ({ nativeBuildInputs ? [ ], ... }: { - nativeBuildInputs = nativeBuildInputs ++ [ pkgs.pkgconfig ]; + nativeBuildInputs = nativeBuildInputs ++ [ pkgs.pkg-config ]; propagatedBuildInputs = [ pkgs.libvirt ]; }); @@ -407,7 +407,7 @@ self: super: export LLVM_CONFIG=${pkgs.llvm}/bin/llvm-config ''; - __impureHostDeps = pkgs.stdenv.lib.optionals pkgs.stdenv.isDarwin [ "/usr/lib/libm.dylib" ]; + __impureHostDeps = pkgs.lib.optionals pkgs.stdenv.isDarwin [ "/usr/lib/libm.dylib" ]; passthru = old.passthru // { llvm = pkgs.llvm; }; } @@ -421,7 +421,7 @@ self: super: lxml = super.lxml.overridePythonAttrs ( old: { - nativeBuildInputs = with pkgs; old.nativeBuildInputs ++ [ pkgconfig libxml2.dev libxslt.dev ]; + nativeBuildInputs = with pkgs; old.nativeBuildInputs ++ [ pkg-config libxml2.dev libxslt.dev ]; buildInputs = with pkgs; old.buildInputs ++ [ libxml2 libxslt ]; } ); @@ -443,7 +443,7 @@ self: super: inherit (pkgs.darwin.apple_sdk.frameworks) Cocoa; in { - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${pkgs.libcxx}/include/c++/v1"; + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${pkgs.libcxx}/include/c++/v1"; XDG_RUNTIME_DIR = "/tmp"; @@ -452,7 +452,7 @@ self: super: ++ lib.optional stdenv.isDarwin [ Cocoa ]; nativeBuildInputs = old.nativeBuildInputs ++ [ - pkgs.pkgconfig + pkgs.pkg-config ]; postPatch = '' @@ -466,9 +466,9 @@ self: super: pkgs.libpng pkgs.freetype ] - ++ stdenv.lib.optionals enableGtk3 [ pkgs.cairo self.pycairo pkgs.gtk3 pkgs.gobject-introspection self.pygobject3 ] - ++ stdenv.lib.optionals enableTk [ pkgs.tcl pkgs.tk self.tkinter pkgs.libX11 ] - ++ stdenv.lib.optionals enableQt [ self.pyqt5 ] + ++ lib.optionals enableGtk3 [ pkgs.cairo self.pycairo pkgs.gtk3 pkgs.gobject-introspection self.pygobject3 ] + ++ lib.optionals enableTk [ pkgs.tcl pkgs.tk self.tkinter pkgs.libX11 ] + ++ lib.optionals enableQt [ self.pyqt5 ] ; inherit (super.matplotlib) patches; @@ -528,14 +528,14 @@ self: super: { } { mpi = { - mpicc = "${pkgs.openmpi.outPath}/bin/mpicc"; + mpicc = "${pkgs.mpi.outPath}/bin/mpicc"; }; } ); }; in { - propagatedBuildInputs = old.propagatedBuildInputs ++ [ pkgs.openmpi ]; + propagatedBuildInputs = old.propagatedBuildInputs ++ [ pkgs.mpi ]; enableParallelBuilding = true; preBuild = '' ln -sf ${cfg} mpi.cfg @@ -637,7 +637,7 @@ self: super: pillow = super.pillow.overridePythonAttrs ( old: { - nativeBuildInputs = [ pkgs.pkgconfig ] ++ old.nativeBuildInputs; + nativeBuildInputs = [ pkgs.pkg-config ] ++ old.nativeBuildInputs; buildInputs = with pkgs; [ freetype libjpeg zlib libtiff libwebp tcl lcms2 ] ++ old.buildInputs; } ); @@ -706,7 +706,7 @@ self: super: nativeBuildInputs = old.nativeBuildInputs ++ [ self.cython - pkgs.pkgconfig + pkgs.pkg-config pkgs.cmake ]; @@ -755,7 +755,7 @@ self: super: nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.meson pkgs.ninja - pkgs.pkgconfig + pkgs.pkg-config ]; propagatedBuildInputs = old.propagatedBuildInputs ++ [ @@ -822,7 +822,7 @@ self: super: pygobject = super.pygobject.overridePythonAttrs ( old: { - nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkgconfig ]; + nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkg-config ]; buildInputs = old.buildInputs ++ [ pkgs.glib pkgs.gobject-introspection ]; } ); @@ -873,7 +873,7 @@ self: super: format = "other"; nativeBuildInputs = old.nativeBuildInputs ++ [ - pkgs.pkgconfig + pkgs.pkg-config pkgs.qt5.qmake pkgs.xorg.lndir pkgs.qt5.qtbase @@ -1012,7 +1012,7 @@ self: super: pyzmq = super.pyzmq.overridePythonAttrs ( old: { - nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkgconfig ]; + nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkg-config ]; propagatedBuildInputs = old.propagatedBuildInputs ++ [ pkgs.zeromq ]; } ); @@ -1117,7 +1117,7 @@ self: super: tables = super.tables.overridePythonAttrs ( old: { HDF5_DIR = "${pkgs.hdf5}"; - nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkgconfig ]; + nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkg-config ]; propagatedBuildInputs = old.nativeBuildInputs ++ [ pkgs.hdf5 self.numpy self.numexpr ]; } ); diff --git a/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pep425.nix b/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pep425.nix index e333bd497184..edf556377b33 100644 --- a/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pep425.nix +++ b/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pep425.nix @@ -73,9 +73,9 @@ let if isLinux then ( - x: x.platform == "manylinux1_${stdenv.platform.kernelArch}" - || x.platform == "manylinux2010_${stdenv.platform.kernelArch}" - || x.platform == "manylinux2014_${stdenv.platform.kernelArch}" + x: x.platform == "manylinux1_${stdenv.hostPlatform.linuxArch}" + || x.platform == "manylinux2010_${stdenv.hostPlatform.linuxArch}" + || x.platform == "manylinux2014_${stdenv.hostPlatform.linuxArch}" || x.platform == "any" ) else (x: hasInfix "macosx" x.platform || x.platform == "any"); diff --git a/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pep508.nix b/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pep508.nix index ba8145398f5d..e8d4159deeee 100644 --- a/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pep508.nix +++ b/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pep508.nix @@ -95,7 +95,7 @@ let else if stdenv.isDarwin then "darwin" else throw "Unsupported platform" ); - platform_machine = stdenv.platform.kernelArch; + platform_machine = stdenv.hostPlatform.linuxArch; platform_python_implementation = let impl = python.passthru.implementation; @@ -132,7 +132,7 @@ let mVal = ''[a-zA-Z0-9\'"_\. ]+''; mOp = "in|[!=<>]+"; e = stripStr exprs.value; - m = builtins.map stripStr (builtins.match ''^(${mVal}) *(${mOp}) *(${mVal})$'' e); + m = builtins.map stripStr (builtins.match "^(${mVal}) *(${mOp}) *(${mVal})$" e); m0 = processVar (builtins.elemAt m 0); m2 = processVar (builtins.elemAt m 2); in diff --git a/nixpkgs/pkgs/development/tools/postiats-utilities/default.nix b/nixpkgs/pkgs/development/tools/postiats-utilities/default.nix index 4b6d230becd6..b9ca9ae57814 100644 --- a/nixpkgs/pkgs/development/tools/postiats-utilities/default.nix +++ b/nixpkgs/pkgs/development/tools/postiats-utilities/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python3, python3Packages }: +{ lib, stdenv, fetchurl, python3, python3Packages }: stdenv.mkDerivation { name = "postiats-utilities-2.0.1"; @@ -7,7 +7,7 @@ stdenv.mkDerivation { sha256 = "12jlzqigmaa9m37x0nq5v3gq8v61m73i5kzdnsm06chf0przpaix"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/Hibou57/PostiATS-Utilities"; license = licenses.bsd2; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/development/tools/profiling/EZTrace/default.nix b/nixpkgs/pkgs/development/tools/profiling/EZTrace/default.nix index e856c1f718a4..e057fc8ebe18 100644 --- a/nixpkgs/pkgs/development/tools/profiling/EZTrace/default.nix +++ b/nixpkgs/pkgs/development/tools/profiling/EZTrace/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl, autoconf, gfortran , libelf, libiberty, zlib, libbfd, libopcodes , buildPackages @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = { description = "Tool that aims at generating automatically execution trace from HPC programs"; - license = stdenv.lib.licenses.cecill-b; - maintainers = with stdenv.lib.maintainers; [ ]; + license = lib.licenses.cecill-b; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/tools/profiling/oprofile/default.nix b/nixpkgs/pkgs/development/tools/profiling/oprofile/default.nix index ca346cd1f149..6cd3ea800278 100644 --- a/nixpkgs/pkgs/development/tools/profiling/oprofile/default.nix +++ b/nixpkgs/pkgs/development/tools/profiling/oprofile/default.nix @@ -1,5 +1,5 @@ -{ stdenv, buildPackages -, fetchurl, pkgconfig +{ lib, stdenv, buildPackages +, fetchurl, pkg-config , libbfd, popt, zlib, linuxHeaders, libiberty_static , withGUI ? false, qt4 ? null }: @@ -21,15 +21,15 @@ stdenv.mkDerivation rec { --replace "/bin/cp" "${buildPackages.coreutils}/bin/cp" ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libbfd zlib popt linuxHeaders libiberty_static ] - ++ stdenv.lib.optionals withGUI [ qt4 ]; + ++ lib.optionals withGUI [ qt4 ]; configureFlags = [ "--with-kernel=${linuxHeaders}" "--disable-shared" # needed because only the static libbfd is available ] - ++ stdenv.lib.optional withGUI "--with-qt-dir=${qt4} --enable-gui=qt4"; + ++ lib.optional withGUI "--with-qt-dir=${qt4} --enable-gui=qt4"; meta = { description = "System-wide profiler for Linux"; @@ -45,10 +45,10 @@ stdenv.mkDerivation rec { is profiled: hardware and software interrupt handlers, kernel modules, the kernel, shared libraries, and applications. ''; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; homepage = "http://oprofile.sourceforge.net/"; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; maintainers = [ ]; }; } diff --git a/nixpkgs/pkgs/development/tools/profiling/pprof/default.nix b/nixpkgs/pkgs/development/tools/profiling/pprof/default.nix index 2618dd3ef1ec..dd2345378d43 100644 --- a/nixpkgs/pkgs/development/tools/profiling/pprof/default.nix +++ b/nixpkgs/pkgs/development/tools/profiling/pprof/default.nix @@ -1,5 +1,5 @@ # This file was originally generated by https://github.com/kamilchm/go2nix v1.2.1 -{ stdenv, buildGoPackage, fetchgit }: +{ lib, stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { pname = "pprof-unstable"; @@ -16,7 +16,7 @@ buildGoPackage rec { goDeps = ./deps.nix; - meta = with stdenv.lib; { + meta = with lib; { description = "A tool for visualization and analysis of profiling data"; homepage = "https://github.com/google/pprof"; license = licenses.asl20; diff --git a/nixpkgs/pkgs/development/tools/profiling/sysprof/capture.nix b/nixpkgs/pkgs/development/tools/profiling/sysprof/capture.nix index a1f5d00332c4..a9443eeadf6e 100644 --- a/nixpkgs/pkgs/development/tools/profiling/sysprof/capture.nix +++ b/nixpkgs/pkgs/development/tools/profiling/sysprof/capture.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , meson , ninja , sysprof @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { meta = sysprof.meta // { description = "Static library for Sysprof capture data generation"; - platforms = stdenv.lib.platforms.all; + platforms = lib.platforms.all; }; } diff --git a/nixpkgs/pkgs/development/tools/profiling/sysprof/default.nix b/nixpkgs/pkgs/development/tools/profiling/sysprof/default.nix index 49b8e88486ca..9e749adea209 100644 --- a/nixpkgs/pkgs/development/tools/profiling/sysprof/default.nix +++ b/nixpkgs/pkgs/development/tools/profiling/sysprof/default.nix @@ -10,7 +10,7 @@ , libxml2 , meson, ninja , pango -, pkgconfig +, pkg-config , polkit , shared-mime-info , systemd @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "lib" "dev" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1z2i9187f2jx456l7h07wy8m9a0p7pj3xiv1aji3snq7rjb1lkj0"; }; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { libxml2 meson ninja - pkgconfig + pkg-config shared-mime-info wrapGAppsHook gnome3.adwaita-icon-theme @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "System-wide profiler for Linux"; homepage = "https://wiki.gnome.org/Apps/Sysprof"; longDescription = '' diff --git a/nixpkgs/pkgs/development/tools/profiling/systemtap/default.nix b/nixpkgs/pkgs/development/tools/profiling/systemtap/default.nix index c1f38a624184..c978d8bd96a7 100644 --- a/nixpkgs/pkgs/development/tools/profiling/systemtap/default.nix +++ b/nixpkgs/pkgs/development/tools/profiling/systemtap/default.nix @@ -1,4 +1,4 @@ -{ fetchgit, pkgconfig, gettext, runCommand, makeWrapper +{ fetchgit, pkg-config, gettext, runCommand, makeWrapper , elfutils, kernel, gnumake, python2, python2Packages }: @@ -17,7 +17,7 @@ let pname = "systemtap"; inherit version; src = fetchgit { inherit url rev sha256; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ elfutils gettext python2 python2Packages.setuptools ]; enableParallelBuilding = true; }; diff --git a/nixpkgs/pkgs/development/tools/pry/Gemfile.lock b/nixpkgs/pkgs/development/tools/pry/Gemfile.lock index d76845bc05a7..87f7e81fbe3a 100644 --- a/nixpkgs/pkgs/development/tools/pry/Gemfile.lock +++ b/nixpkgs/pkgs/development/tools/pry/Gemfile.lock @@ -1,11 +1,11 @@ GEM remote: https://rubygems.org/ specs: - coderay (1.1.2) - method_source (0.9.2) - pry (0.12.2) - coderay (~> 1.1.0) - method_source (~> 0.9.0) + coderay (1.1.3) + method_source (1.0.0) + pry (0.13.1) + coderay (~> 1.1) + method_source (~> 1.0) PLATFORMS ruby diff --git a/nixpkgs/pkgs/development/tools/pry/gemset.nix b/nixpkgs/pkgs/development/tools/pry/gemset.nix index e779c48aebfc..c3f42889e1ff 100644 --- a/nixpkgs/pkgs/development/tools/pry/gemset.nix +++ b/nixpkgs/pkgs/development/tools/pry/gemset.nix @@ -4,20 +4,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15vav4bhcc2x3jmi3izb11l4d9f3xv8hp2fszb7iqmpsccv1pz4y"; + sha256 = "0jvxqxzply1lwp7ysn94zjhh57vc14mcshw1ygw14ib8lhc00lyw"; type = "gem"; }; - version = "1.1.2"; + version = "1.1.3"; }; method_source = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pviwzvdqd90gn6y7illcdd9adapw8fczml933p5vl739dkvl3lq"; + sha256 = "1pnyh44qycnf9mzi1j6fywd5fkskv3x7nmsqrrws0rjn5dd4ayfp"; type = "gem"; }; - version = "0.9.2"; + version = "1.0.0"; }; pry = { dependencies = ["coderay" "method_source"]; @@ -25,9 +25,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00rm71x0r1jdycwbs83lf9l6p494m99asakbvqxh8rz7zwnlzg69"; + sha256 = "0iyw4q4an2wmk8v5rn2ghfy2jaz9vmw2nk8415nnpx2s866934qk"; type = "gem"; }; - version = "0.12.2"; + version = "0.13.1"; }; -} \ No newline at end of file +} diff --git a/nixpkgs/pkgs/development/tools/puppet/puppet-lint/gemset.nix b/nixpkgs/pkgs/development/tools/puppet/puppet-lint/gemset.nix index 86d18b0c554c..d42626f1cd59 100644 --- a/nixpkgs/pkgs/development/tools/puppet/puppet-lint/gemset.nix +++ b/nixpkgs/pkgs/development/tools/puppet/puppet-lint/gemset.nix @@ -7,4 +7,4 @@ }; version = "2.3.6"; }; -} \ No newline at end of file +} diff --git a/nixpkgs/pkgs/development/tools/purescript/spago/spago.nix b/nixpkgs/pkgs/development/tools/purescript/spago/spago.nix index 43f8e66d8704..3f54a4f9c0ee 100644 --- a/nixpkgs/pkgs/development/tools/purescript/spago/spago.nix +++ b/nixpkgs/pkgs/development/tools/purescript/spago/spago.nix @@ -1,35 +1,36 @@ { mkDerivation, aeson, aeson-pretty, ansi-terminal, async-pool -, base, bower-json, bytestring, Cabal, containers, dhall, directory -, either, exceptions, extra, fetchgit, file-embed, filepath, foldl -, fsnotify, generic-lens, github, Glob, hpack, hspec -, hspec-discover, hspec-megaparsec, http-client, http-conduit -, http-types, lens-family-core, megaparsec, mtl, network-uri -, open-browser, optparse-applicative, prettyprinter, process -, QuickCheck, retry, rio, rio-orphans, safe, semver-range, stdenv -, stm, stringsearch, tar, template-haskell, temporary, text, time -, transformers, turtle, unliftio, unordered-containers, utf8-string -, vector, versions, with-utf8, zlib +, base, bower-json, bytestring, Cabal, containers, cryptonite +, dhall, directory, either, exceptions, extra, fetchgit, file-embed +, filepath, foldl, fsnotify, generic-lens, github, Glob, hpack +, hspec, hspec-discover, hspec-megaparsec, http-client +, http-conduit, http-types, lens-family-core, megaparsec, mtl +, network-uri, open-browser, optparse-applicative, prettyprinter +, process, QuickCheck, retry, rio, rio-orphans, safe, semver-range +, lib, stdenv, stm, stringsearch, tar, template-haskell, temporary, text +, time, transformers, turtle, unliftio, unordered-containers +, utf8-string, vector, versions, with-utf8, zlib }: mkDerivation { pname = "spago"; - version = "0.18.0"; + version = "0.19.0"; src = fetchgit { url = "https://github.com/purescript/spago.git"; - sha256 = "03ww7qhrggwsbm0kcnvcr3ifb8rm860ajimzr81isiw46ykwrl38"; - rev = "a4d39c21cae2f2c6d43fa204853c8e17c72904d2"; + sha256 = "182a9pkv64rbyqrig470cmql4ingf5vpxh11xkxqq2baxym3vwip"; + rev = "960a310d6efca3bb40009eb06d88382e4670ccef"; fetchSubmodules = true; }; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson aeson-pretty ansi-terminal async-pool base bower-json - bytestring Cabal containers dhall directory either exceptions - file-embed filepath foldl fsnotify generic-lens github Glob - http-client http-conduit http-types lens-family-core megaparsec mtl - network-uri open-browser optparse-applicative prettyprinter process - retry rio rio-orphans safe semver-range stm stringsearch tar - template-haskell temporary text time transformers turtle unliftio - unordered-containers utf8-string vector versions with-utf8 zlib + bytestring Cabal containers cryptonite dhall directory either + exceptions file-embed filepath foldl fsnotify generic-lens github + Glob http-client http-conduit http-types lens-family-core + megaparsec mtl network-uri open-browser optparse-applicative + prettyprinter process retry rio rio-orphans safe semver-range stm + stringsearch tar template-haskell temporary text time transformers + turtle unliftio unordered-containers utf8-string vector versions + with-utf8 zlib ]; libraryToolDepends = [ hpack ]; executableHaskellDepends = [ base text turtle with-utf8 ]; @@ -40,5 +41,5 @@ mkDerivation { testToolDepends = [ hspec-discover ]; prePatch = "hpack"; homepage = "https://github.com/purescript/spago#readme"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; } diff --git a/nixpkgs/pkgs/development/tools/pxview/default.nix b/nixpkgs/pkgs/development/tools/pxview/default.nix index 6b11071b6fa3..20049215a70d 100644 --- a/nixpkgs/pkgs/development/tools/pxview/default.nix +++ b/nixpkgs/pkgs/development/tools/pxview/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, perl, perlPackages, pxlib }: +{ lib, stdenv, fetchurl, pkg-config, perl, perlPackages, pxlib }: stdenv.mkDerivation rec { pname = "pxview"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ pxlib perl ] ++ (with perlPackages; [ libxml_perl ]); - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; configureFlags = [ "--with-pxlib=${pxlib.out}" ]; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { LDFLAGS = "-lm"; hardeningDisable = [ "format" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Program to convert Paradox databases"; homepage = "http://pxlib.sourceforge.net/pxview/"; license = licenses.gpl2; diff --git a/nixpkgs/pkgs/development/tools/py-spy/default.nix b/nixpkgs/pkgs/development/tools/py-spy/default.nix index 5e1dcbfa6fce..a9634ec53c72 100644 --- a/nixpkgs/pkgs/development/tools/py-spy/default.nix +++ b/nixpkgs/pkgs/development/tools/py-spy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgsBuildBuild, rustPlatform, fetchFromGitHub, pkgconfig, libunwind, python3 }: +{ lib, stdenv, pkgsBuildBuild, rustPlatform, fetchFromGitHub, pkg-config, libunwind, python3 }: rustPlatform.buildRustPackage rec { pname = "py-spy"; @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { NIX_CFLAGS_COMPILE = "-L${libunwind}/lib"; # error: linker `arm-linux-gnueabihf-gcc` not found - preConfigure = stdenv.lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' + preConfigure = lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' export RUSTFLAGS="-Clinker=$CC" ''; @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "0hrzmpwd2k4l8gjbry8ddrkv9q9qh8ag096md4q0fyn5bgnxhkah"; - meta = with stdenv.lib; { + meta = with lib; { description = "Sampling profiler for Python programs"; license = licenses.mit; maintainers = [ maintainers.lnl7 ]; diff --git a/nixpkgs/pkgs/development/tools/pydb/default.nix b/nixpkgs/pkgs/development/tools/pydb/default.nix index 67e7a879d883..eaaa057dc0a2 100644 --- a/nixpkgs/pkgs/development/tools/pydb/default.nix +++ b/nixpkgs/pkgs/development/tools/pydb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python2, emacs }: +{ lib, stdenv, fetchurl, python2, emacs }: stdenv.mkDerivation { name = "pydb-1.26"; @@ -18,7 +18,7 @@ stdenv.mkDerivation { meta = { description = "Python debugger with GDB-like commands and Emacs bindings"; homepage = "http://bashdb.sourceforge.net/pydb/"; - license = stdenv.lib.licenses.gpl3; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.gpl3; + platforms = lib.platforms.all; }; } diff --git a/nixpkgs/pkgs/development/tools/qtcreator/default.nix b/nixpkgs/pkgs/development/tools/qtcreator/default.nix index a750a21c1b4c..40e3e42d84cc 100644 --- a/nixpkgs/pkgs/development/tools/qtcreator/default.nix +++ b/nixpkgs/pkgs/development/tools/qtcreator/default.nix @@ -1,6 +1,6 @@ { mkDerivation, lib, fetchurl, fetchgit, fetchpatch , qtbase, qtquickcontrols, qtscript, qtdeclarative, qmake, llvmPackages_8 -, withDocumentation ? false, withClangPlugins ? true +, withDocumentation ? false, withClangPlugins ? true }: with lib; @@ -28,9 +28,9 @@ mkDerivation rec { sha256 = "0ibn7bapw7m26nmxl26dns1hnpawfdqk1i1mgg0gjssja8famszg"; }; - buildInputs = [ qtbase qtscript qtquickcontrols qtdeclarative ] ++ - optionals withClangPlugins [ llvmPackages_8.libclang - clang_qt_vendor + buildInputs = [ qtbase qtscript qtquickcontrols qtdeclarative ] ++ + optionals withClangPlugins [ llvmPackages_8.libclang + clang_qt_vendor llvmPackages_8.llvm ]; nativeBuildInputs = [ qmake ]; @@ -38,7 +38,7 @@ mkDerivation rec { # 0001-Fix-clang-libcpp-regexp.patch is for fixing regexp that is used to # find clang libc++ library include paths. By default it's not covering paths # like libc++-version, which is default name for libc++ folder in nixos. - # ./0002-Dont-remove-clang-header-paths.patch is for forcing qtcreator to not + # ./0002-Dont-remove-clang-header-paths.patch is for forcing qtcreator to not # remove system clang include paths. patches = [ ./0001-Fix-clang-libcpp-regexp.patch ./0002-Dont-remove-clang-header-paths.patch ]; @@ -53,7 +53,7 @@ mkDerivation rec { preConfigure = '' substituteInPlace src/plugins/plugins.pro \ - --replace '$$[QT_INSTALL_QML]/QtQuick/Controls' '${qtquickcontrols}/${qtbase.qtQmlPrefix}/QtQuick/Controls' + --replace '$$[QT_INSTALL_QML]/QtQuick/Controls' '${qtquickcontrols}/${qtbase.qtQmlPrefix}/QtQuick/Controls' '' + optionalString withClangPlugins '' # Fix paths for llvm/clang includes directories. substituteInPlace src/shared/clang/clang_defines.pri \ diff --git a/nixpkgs/pkgs/development/tools/quicktemplate/default.nix b/nixpkgs/pkgs/development/tools/quicktemplate/default.nix index cb9b4f950c92..4edb60d11a15 100644 --- a/nixpkgs/pkgs/development/tools/quicktemplate/default.nix +++ b/nixpkgs/pkgs/development/tools/quicktemplate/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ lib, stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "quicktemplate"; @@ -13,7 +13,7 @@ buildGoModule rec { vendorSha256 = null; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/valyala/quicktemplate"; description = "Fast, powerful, yet easy to use template engine for Go"; license = licenses.mit; diff --git a/nixpkgs/pkgs/development/tools/quilt/default.nix b/nixpkgs/pkgs/development/tools/quilt/default.nix index dece0a7b44ba..71cf10e63b91 100644 --- a/nixpkgs/pkgs/development/tools/quilt/default.nix +++ b/nixpkgs/pkgs/development/tools/quilt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, bash, perl, diffstat, diffutils, patch, findutils }: +{ lib, stdenv, fetchurl, makeWrapper, bash, perl, diffstat, diffutils, patch, findutils }: stdenv.mkDerivation rec { @@ -27,8 +27,8 @@ stdenv.mkDerivation rec { and more. ''; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.all; }; } diff --git a/nixpkgs/pkgs/development/tools/rdbtools/default.nix b/nixpkgs/pkgs/development/tools/rdbtools/default.nix index 624434101d99..5674876daba6 100644 --- a/nixpkgs/pkgs/development/tools/rdbtools/default.nix +++ b/nixpkgs/pkgs/development/tools/rdbtools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, python }: +{ lib, stdenv, python }: with python.pkgs; @@ -16,7 +16,7 @@ buildPythonApplication rec { # No tests in published package doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Parse Redis dump.rdb files, Analyze Memory, and Export Data to JSON"; homepage = "https://github.com/sripathikrishnan/redis-rdb-tools"; license = licenses.mit; diff --git a/nixpkgs/pkgs/development/tools/rdocker/default.nix b/nixpkgs/pkgs/development/tools/rdocker/default.nix index 60df0df10031..098d7a593148 100644 --- a/nixpkgs/pkgs/development/tools/rdocker/default.nix +++ b/nixpkgs/pkgs/development/tools/rdocker/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, makeWrapper, openssh }: +{ lib, stdenv, fetchFromGitHub, makeWrapper, openssh }: stdenv.mkDerivation { pname = "rdocker"; @@ -19,13 +19,13 @@ stdenv.mkDerivation { postInstall = '' wrapProgram $out/bin/rdocker \ - --prefix PATH : ${stdenv.lib.makeBinPath [ openssh ]} + --prefix PATH : ${lib.makeBinPath [ openssh ]} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Securely control a remote docker daemon CLI using ssh forwarding, no SSL setup needed"; homepage = "https://github.com/dvddarias/rdocker"; - maintainers = [ stdenv.lib.maintainers.pneumaticat ]; + maintainers = [ lib.maintainers.pneumaticat ]; license = licenses.mit; platforms = platforms.unix; }; diff --git a/nixpkgs/pkgs/development/tools/react-native-debugger/default.nix b/nixpkgs/pkgs/development/tools/react-native-debugger/default.nix index 6ee5e884ea2d..06b5dd794015 100644 --- a/nixpkgs/pkgs/development/tools/react-native-debugger/default.nix +++ b/nixpkgs/pkgs/development/tools/react-native-debugger/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchurl, unzip, cairo, xorg, gdk-pixbuf, fontconfig, pango, gnome3, atk, at-spi2-atk, at-spi2-core +{ lib, stdenv, fetchurl, unzip, cairo, xorg, gdk-pixbuf, fontconfig, pango, gnome3, atk, at-spi2-atk, at-spi2-core , gtk3, glib, freetype, dbus, nss, nspr, alsaLib, cups, expat, udev, makeDesktopItem }: let - rpath = stdenv.lib.makeLibraryPath [ + rpath = lib.makeLibraryPath [ cairo stdenv.cc.cc gdk-pixbuf @@ -73,7 +73,7 @@ in stdenv.mkDerivation rec { categories = "Development;Debugger;"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/jhen0409/react-native-debugger"; license = licenses.mit; description = "The standalone app based on official debugger of React Native, and includes React Inspector / Redux DevTools"; diff --git a/nixpkgs/pkgs/development/tools/redis-dump/gemset.nix b/nixpkgs/pkgs/development/tools/redis-dump/gemset.nix index 2bfaa1fb9529..74e6d4e1b324 100644 --- a/nixpkgs/pkgs/development/tools/redis-dump/gemset.nix +++ b/nixpkgs/pkgs/development/tools/redis-dump/gemset.nix @@ -50,4 +50,4 @@ }; version = "1.4.1"; }; -} \ No newline at end of file +} diff --git a/nixpkgs/pkgs/development/tools/remarshal/default.nix b/nixpkgs/pkgs/development/tools/remarshal/default.nix index d28ca286f086..c37779a5293b 100644 --- a/nixpkgs/pkgs/development/tools/remarshal/default.nix +++ b/nixpkgs/pkgs/development/tools/remarshal/default.nix @@ -1,4 +1,4 @@ -{ stdenv, python3Packages }: +{ lib, stdenv, python3Packages }: python3Packages.buildPythonApplication rec { pname = "remarshal"; @@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec { pyyaml cbor2 dateutil tomlkit u-msgpack-python ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Convert between TOML, YAML and JSON"; license = licenses.mit; homepage = "https://github.com/dbohdan/remarshal"; diff --git a/nixpkgs/pkgs/development/tools/renderizer/default.nix b/nixpkgs/pkgs/development/tools/renderizer/default.nix index 2b2c57135cb0..747e80adf4f2 100644 --- a/nixpkgs/pkgs/development/tools/renderizer/default.nix +++ b/nixpkgs/pkgs/development/tools/renderizer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ lib, stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "renderizer"; @@ -15,7 +15,7 @@ buildGoModule rec { doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "CLI to render Go template text files"; inherit (src.meta) homepage; license = licenses.gpl3; diff --git a/nixpkgs/pkgs/development/tools/reno/default.nix b/nixpkgs/pkgs/development/tools/reno/default.nix index b05bb2cd26a3..17a334aba205 100644 --- a/nixpkgs/pkgs/development/tools/reno/default.nix +++ b/nixpkgs/pkgs/development/tools/reno/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , git , gnupg1 , python3Packages @@ -49,7 +49,7 @@ with python3Packages; buildPythonApplication rec { $out/bin/reno -h ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Release Notes Manager"; homepage = "https://docs.openstack.org/reno/latest"; license = licenses.asl20; diff --git a/nixpkgs/pkgs/development/tools/rep/default.nix b/nixpkgs/pkgs/development/tools/rep/default.nix index d24056f1d02b..bc73c3927771 100644 --- a/nixpkgs/pkgs/development/tools/rep/default.nix +++ b/nixpkgs/pkgs/development/tools/rep/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, asciidoc-full }: +{ lib, stdenv, fetchFromGitHub, asciidoc-full }: stdenv.mkDerivation rec { pname = "rep"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ''; makeFlags = [ "prefix=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Single-shot nREPL client"; homepage = "https://github.com/eraserhd/rep"; license = licenses.epl10; diff --git a/nixpkgs/pkgs/development/tools/repository-managers/nexus/default.nix b/nixpkgs/pkgs/development/tools/repository-managers/nexus/default.nix index 1b4509a4057b..828b8e5b1cd6 100644 --- a/nixpkgs/pkgs/development/tools/repository-managers/nexus/default.nix +++ b/nixpkgs/pkgs/development/tools/repository-managers/nexus/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl, makeWrapper, jre_headless, gawk }: +{ lib, stdenv, fetchurl, makeWrapper, jre_headless, gawk }: stdenv.mkDerivation rec { pname = "nexus"; - version = "3.29.0-02"; + version = "3.29.2-02"; src = fetchurl { url = "https://sonatype-download.global.ssl.fastly.net/nexus/3/nexus-${version}-unix.tar.gz"; - sha256 = "0yxk3yy9vllxc9v4dn3fs8hh389lrw2g8gg24rx1w8bg05rrrr8z"; + sha256 = "sha256-vHy7V32xlYaPJdc8oi3j98weOdc4R5S64Dwo9YI8o6c="; }; preferLocalBuild = true; @@ -33,12 +33,12 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/nexus \ --set JAVA_HOME ${jre_headless} \ --set ALTERNATIVE_NAME "nexus" \ - --prefix PATH "${stdenv.lib.makeBinPath [ gawk ]}" + --prefix PATH "${lib.makeBinPath [ gawk ]}" runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Repository manager for binary software components"; homepage = "http://www.sonatype.org/nexus"; license = licenses.epl10; diff --git a/nixpkgs/pkgs/development/tools/richgo/default.nix b/nixpkgs/pkgs/development/tools/richgo/default.nix index 441c0d8bdf1d..1013c4aa8b43 100644 --- a/nixpkgs/pkgs/development/tools/richgo/default.nix +++ b/nixpkgs/pkgs/development/tools/richgo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ lib, stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "richgo"; @@ -17,7 +17,7 @@ buildGoModule rec { subPackages = [ "." ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Enrich `go test` outputs with text decorations"; homepage = "https://github.com/kyoh86/richgo"; license = licenses.mit; diff --git a/nixpkgs/pkgs/development/tools/ronn/gemset.nix b/nixpkgs/pkgs/development/tools/ronn/gemset.nix index ce804e1f9f5b..534741a69938 100644 --- a/nixpkgs/pkgs/development/tools/ronn/gemset.nix +++ b/nixpkgs/pkgs/development/tools/ronn/gemset.nix @@ -31,4 +31,4 @@ }; version = "0.7.3"; }; -} \ No newline at end of file +} diff --git a/nixpkgs/pkgs/development/tools/rtags/default.nix b/nixpkgs/pkgs/development/tools/rtags/default.nix index 0ebeab72df3f..e5da0ddf59ac 100644 --- a/nixpkgs/pkgs/development/tools/rtags/default.nix +++ b/nixpkgs/pkgs/development/tools/rtags/default.nix @@ -1,9 +1,9 @@ -{ stdenv, lib, fetchgit, cmake, llvmPackages, openssl, apple_sdk, emacs, pkgconfig }: +{ stdenv, lib, fetchgit, cmake, llvmPackages, openssl, apple_sdk, emacs, pkg-config }: stdenv.mkDerivation rec { pname = "rtags"; version = "2.38"; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ llvmPackages.llvm openssl emacs ] ++ lib.optionals stdenv.cc.isGNU [ llvmPackages.clang-unwrapped ] ++ lib.optionals stdenv.isDarwin [ apple_sdk.libs.xpc apple_sdk.frameworks.CoreServices ]; @@ -25,12 +25,10 @@ stdenv.mkDerivation rec { LIBCLANG_LIBDIR="${llvmPackages.clang.cc}/lib" ''; - enableParallelBuilding = true; - meta = { description = "C/C++ client-server indexer based on clang"; homepage = "https://github.com/andersbakken/rtags"; - license = stdenv.lib.licenses.gpl3; - platforms = with stdenv.lib.platforms; x86_64 ++ aarch64; + license = lib.licenses.gpl3; + platforms = with lib.platforms; x86_64 ++ aarch64; }; } diff --git a/nixpkgs/pkgs/development/tools/rubocop/Gemfile.lock b/nixpkgs/pkgs/development/tools/rubocop/Gemfile.lock index 6b6a3a995918..74ae51427a95 100644 --- a/nixpkgs/pkgs/development/tools/rubocop/Gemfile.lock +++ b/nixpkgs/pkgs/development/tools/rubocop/Gemfile.lock @@ -2,25 +2,25 @@ GEM remote: https://rubygems.org/ specs: ast (2.4.1) - parallel (1.19.2) - parser (2.7.2.0) + parallel (1.20.1) + parser (3.0.0.0) ast (~> 2.4.1) rainbow (3.0.0) - regexp_parser (1.8.2) + regexp_parser (2.0.3) rexml (3.2.4) - rubocop (1.1.0) + rubocop (1.8.0) parallel (~> 1.10) - parser (>= 2.7.1.5) + parser (>= 3.0.0.0) rainbow (>= 2.2.2, < 4.0) - regexp_parser (>= 1.8) + regexp_parser (>= 1.8, < 3.0) rexml - rubocop-ast (>= 1.0.1) + rubocop-ast (>= 1.2.0, < 2.0) ruby-progressbar (~> 1.7) - unicode-display_width (>= 1.4.0, < 2.0) - rubocop-ast (1.1.0) + unicode-display_width (>= 1.4.0, < 3.0) + rubocop-ast (1.4.0) parser (>= 2.7.1.5) - ruby-progressbar (1.10.1) - unicode-display_width (1.7.0) + ruby-progressbar (1.11.0) + unicode-display_width (2.0.0) PLATFORMS ruby diff --git a/nixpkgs/pkgs/development/tools/rubocop/gemset.nix b/nixpkgs/pkgs/development/tools/rubocop/gemset.nix index c1f55f7aca27..4fc468a177d1 100644 --- a/nixpkgs/pkgs/development/tools/rubocop/gemset.nix +++ b/nixpkgs/pkgs/development/tools/rubocop/gemset.nix @@ -14,10 +14,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "17b127xxmm2yqdz146qwbs57046kn0js1h8synv01dwqz2z1kp2l"; + sha256 = "0055br0mibnqz0j8wvy20zry548dhkakws681bhj3ycb972awkzd"; type = "gem"; }; - version = "1.19.2"; + version = "1.20.1"; }; parser = { dependencies = ["ast"]; @@ -25,10 +25,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1f7gmm60yla325wlnd3qkxs59qm2y0aan8ljpg6k18rwzrrfil6z"; + sha256 = "1jixakyzmy0j5c1rb0fjrrdhgnyryvrr6vgcybs14jfw09akv5ml"; type = "gem"; }; - version = "2.7.2.0"; + version = "3.0.0.0"; }; rainbow = { groups = ["default"]; @@ -45,10 +45,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0x4s82lgf0l71y3xc9gp4qxkrgx1kv8f6avdqd68l46ijbyvicdm"; + sha256 = "0zm86k9q8m5jkcnpb1f93wsvc57saldfj8czxkx1aw031i95inip"; type = "gem"; }; - version = "1.8.2"; + version = "2.0.3"; }; rexml = { groups = ["default"]; @@ -66,10 +66,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1nw87ngw4a9r3dpgykb872zcm640m7k0nk17qv537fmss2hl8shl"; + sha256 = "12arfnsj32126ps6mxbn7dwrw43cy70sq45rm0ib7qfrmhp5qyid"; type = "gem"; }; - version = "1.1.0"; + version = "1.8.0"; }; rubocop-ast = { dependencies = ["parser"]; @@ -77,29 +77,29 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ami6n3vnpm9y5z6wd4c6y2infijajizjjwv8fq0wrcjvr3zivzz"; + sha256 = "1qvfp567aprjgcwj757p55ynj0dx2b3c3hd76za9z3c43sphprcj"; type = "gem"; }; - version = "1.1.0"; + version = "1.4.0"; }; ruby-progressbar = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1k77i0d4wsn23ggdd2msrcwfy0i376cglfqypkk2q77r2l3408zf"; + sha256 = "02nmaw7yx9kl7rbaan5pl8x5nn0y4j5954mzrkzi9i3dhsrps4nc"; type = "gem"; }; - version = "1.10.1"; + version = "1.11.0"; }; unicode-display_width = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06i3id27s60141x6fdnjn5rar1cywdwy64ilc59cz937303q3mna"; + sha256 = "1bilbnc8j6jkb59lrf177i3p1pdyxll0n8400hzqr35vl3r3kv2m"; type = "gem"; }; - version = "1.7.0"; + version = "2.0.0"; }; -} \ No newline at end of file +} diff --git a/nixpkgs/pkgs/development/tools/rucksack/default.nix b/nixpkgs/pkgs/development/tools/rucksack/default.nix index 2734cdd3596e..1aad7a5c8da1 100644 --- a/nixpkgs/pkgs/development/tools/rucksack/default.nix +++ b/nixpkgs/pkgs/development/tools/rucksack/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, liblaxjson, cmake, freeimage }: +{ lib, stdenv, fetchFromGitHub, liblaxjson, cmake, freeimage }: stdenv.mkDerivation rec { version = "3.1.0"; @@ -11,9 +11,10 @@ stdenv.mkDerivation rec { sha256 = "0bcm20hqxqnq1j0zghb9i7z9frri6bbf7rmrv5g8dd626sq07vyv"; }; - buildInputs = [ cmake liblaxjson freeimage ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ liblaxjson freeimage ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Texture packer and resource bundler"; platforms = [ "i686-linux" "x86_64-linux" ]; # fails on Darwin and AArch64 homepage = "https://github.com/andrewrk/rucksack"; diff --git a/nixpkgs/pkgs/development/tools/rufo/gemset.nix b/nixpkgs/pkgs/development/tools/rufo/gemset.nix index cd5c2c462a98..1c63c3f3b796 100644 --- a/nixpkgs/pkgs/development/tools/rufo/gemset.nix +++ b/nixpkgs/pkgs/development/tools/rufo/gemset.nix @@ -9,4 +9,4 @@ }; version = "0.12.0"; }; -} \ No newline at end of file +} diff --git a/nixpkgs/pkgs/development/tools/run/default.nix b/nixpkgs/pkgs/development/tools/run/default.nix index 7ec08d02020a..a0c169d84661 100644 --- a/nixpkgs/pkgs/development/tools/run/default.nix +++ b/nixpkgs/pkgs/development/tools/run/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ lib, stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "run"; version = "0.7.2"; @@ -14,7 +14,7 @@ buildGoModule rec { doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Easily manage and invoke small scripts and wrappers"; homepage = "https://github.com/TekWizely/run"; license = licenses.mit; diff --git a/nixpkgs/pkgs/development/tools/rund/default.nix b/nixpkgs/pkgs/development/tools/rund/default.nix index 9a7ac0b63244..186e044318e0 100644 --- a/nixpkgs/pkgs/development/tools/rund/default.nix +++ b/nixpkgs/pkgs/development/tools/rund/default.nix @@ -39,11 +39,11 @@ stdenv.mkDerivation rec { mv $NIX_BUILD_TOP/rund $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A compiler-wrapper that runs and caches D programs"; homepage = "https://github.com/dragon-lang/rund"; license = lib.licenses.boost; maintainers = with maintainers; [ jonathanmarler ]; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/tools/rust/bindgen/default.nix b/nixpkgs/pkgs/development/tools/rust/bindgen/default.nix index 01e29036dbc7..eef8a5e41fd2 100644 --- a/nixpkgs/pkgs/development/tools/rust/bindgen/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/bindgen/default.nix @@ -1,5 +1,7 @@ -{ stdenv, fetchFromGitHub, rustPlatform, clang, llvmPackages, rustfmt, writeScriptBin, - runtimeShell }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, clang, llvmPackages, rustfmt, writeScriptBin +, runtimeShell +, bash +}: rustPlatform.buildRustPackage rec { pname = "rust-bindgen"; @@ -16,7 +18,9 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1dv1ywdy701bnc2jv5jq0hnpal1snlizaj9w6k1wxyrp9szjd48w"; - libclang = llvmPackages.libclang.lib; #for substituteAll + #for substituteAll + libclang = llvmPackages.libclang.lib; + inherit bash; buildInputs = [ libclang ]; @@ -50,7 +54,7 @@ rustPlatform.buildRustPackage rec { patchShebangs . ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Automatically generates Rust FFI bindings to C (and some C++) libraries"; longDescription = '' Bindgen takes a c or c++ header file and turns them into diff --git a/nixpkgs/pkgs/development/tools/rust/bindgen/wrapper.sh b/nixpkgs/pkgs/development/tools/rust/bindgen/wrapper.sh index 95cd0901cec8..0b3e3cd4c1e0 100755 --- a/nixpkgs/pkgs/development/tools/rust/bindgen/wrapper.sh +++ b/nixpkgs/pkgs/development/tools/rust/bindgen/wrapper.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!@bash@/bin/bash sep='--' # whether to add -- before new options cxx=0 # whether cxx was explicitly requested lastWasx=0 # whether the last argument passed was -x diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-asm/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-asm/default.nix index 76b49056a3f2..f453955a5c71 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-asm/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cargo-asm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform, Security }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, Security }: rustPlatform.buildRustPackage rec { pname = "cargo-asm"; @@ -13,13 +13,13 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "0d797cisiydblh64vqpfdjf37wmxrvs77phdrqh582lbrvnfhx2j"; - buildInputs = stdenv.lib.optional stdenv.isDarwin Security; + buildInputs = lib.optional stdenv.isDarwin Security; # Test checks against machine code output, which fails with some # LLVM/compiler versions. doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Display the assembly or LLVM-IR generated for Rust source code"; homepage = "https://github.com/gnzlbg/cargo-asm"; license = licenses.mit; diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-binutils/Cargo.lock b/nixpkgs/pkgs/development/tools/rust/cargo-binutils/Cargo.lock new file mode 100644 index 000000000000..a1e4cdde3b87 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/rust/cargo-binutils/Cargo.lock @@ -0,0 +1,419 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +[[package]] +name = "addr2line" +version = "0.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a55f82cfe485775d02112886f4169bde0c5894d75e79ead7eafe7e40a25e45f7" +dependencies = [ + "gimli", +] + +[[package]] +name = "adler" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee2a4ec343196209d6594e19543ae87a39f96d5534d7174822a3ad825dd6ed7e" + +[[package]] +name = "aho-corasick" +version = "0.7.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7404febffaa47dac81aa44dba71523c9d069b1bdc50a77db41195149e17f68e5" +dependencies = [ + "memchr", +] + +[[package]] +name = "ansi_term" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" +dependencies = [ + "winapi", +] + +[[package]] +name = "anyhow" +version = "1.0.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee67c11feeac938fae061b232e38e0b6d94f97a9df10e6271319325ac4c56a86" + +[[package]] +name = "atty" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" +dependencies = [ + "hermit-abi", + "libc", + "winapi", +] + +[[package]] +name = "autocfg" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" + +[[package]] +name = "backtrace" +version = "0.3.55" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef5140344c85b01f9bbb4d4b7288a8aa4b3287ccef913a14bcc78a1063623598" +dependencies = [ + "addr2line", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", +] + +[[package]] +name = "bitflags" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" + +[[package]] +name = "cargo-binutils" +version = "0.3.3" +dependencies = [ + "anyhow", + "cargo_metadata", + "clap", + "regex", + "rustc-cfg", + "rustc-demangle", + "rustc_version", + "serde", + "toml", +] + +[[package]] +name = "cargo_metadata" +version = "0.11.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3a567c24b86754d629addc2db89e340ac9398d07b5875efcff837e3878e17ec" +dependencies = [ + "semver 0.10.0", + "serde", + "serde_json", +] + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "clap" +version = "2.33.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002" +dependencies = [ + "ansi_term", + "atty", + "bitflags", + "strsim", + "textwrap", + "unicode-width", + "vec_map", +] + +[[package]] +name = "failure" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d32e9bd16cc02eae7db7ef620b392808b89f6a5e16bb3497d159c6b92a0f4f86" +dependencies = [ + "backtrace", + "failure_derive", +] + +[[package]] +name = "failure_derive" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "synstructure", +] + +[[package]] +name = "gimli" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6503fe142514ca4799d4c26297c4248239fe8838d827db6bd6065c6ed29a6ce" + +[[package]] +name = "hermit-abi" +version = "0.1.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5aca5565f760fb5b220e499d72710ed156fdb74e631659e99377d9ebfbd13ae8" +dependencies = [ + "libc", +] + +[[package]] +name = "itoa" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736" + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "libc" +version = "0.2.81" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1482821306169ec4d07f6aca392a4681f66c75c9918aa49641a2595db64053cb" + +[[package]] +name = "memchr" +version = "2.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525" + +[[package]] +name = "miniz_oxide" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f2d26ec3309788e423cfbf68ad1800f061638098d76a83681af979dc4eda19d" +dependencies = [ + "adler", + "autocfg", +] + +[[package]] +name = "object" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d3b63360ec3cb337817c2dbd47ab4a0f170d285d8e5a2064600f3def1402397" + +[[package]] +name = "proc-macro2" +version = "1.0.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71" +dependencies = [ + "unicode-xid", +] + +[[package]] +name = "quote" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "991431c3519a3f36861882da93630ce66b52918dcf1b8e2fd66b397fc96f28df" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "regex" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38cf2c13ed4745de91a5eb834e11c00bcc3709e773173b2ce4c56c9fbde04b9c" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", + "thread_local", +] + +[[package]] +name = "regex-syntax" +version = "0.6.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b181ba2dcf07aaccad5448e8ead58db5b742cf85dfe035e2227f137a539a189" + +[[package]] +name = "rustc-cfg" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ad221fe7cd09334f8735dcc157b1178e343f43dfaefcd1b09d7fd4fc0921b6f" +dependencies = [ + "failure", +] + +[[package]] +name = "rustc-demangle" +version = "0.1.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e3bad0ee36814ca07d7968269dd4b7ec89ec2da10c4bb613928d3077083c232" + +[[package]] +name = "rustc_version" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" +dependencies = [ + "semver 0.9.0", +] + +[[package]] +name = "ryu" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e" + +[[package]] +name = "semver" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" +dependencies = [ + "semver-parser", +] + +[[package]] +name = "semver" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "394cec28fa623e00903caf7ba4fa6fb9a0e260280bb8cdbbba029611108a0190" +dependencies = [ + "semver-parser", + "serde", +] + +[[package]] +name = "semver-parser" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" + +[[package]] +name = "serde" +version = "1.0.118" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06c64263859d87aa2eb554587e2d23183398d617427327cf2b3d0ed8c69e4800" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.118" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c84d3526699cd55261af4b941e4e725444df67aa4f9e6a3564f18030d12672df" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "serde_json" +version = "1.0.61" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fceb2595057b6891a4ee808f70054bd2d12f0e97f1cbb78689b59f676df325a" +dependencies = [ + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "strsim" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" + +[[package]] +name = "syn" +version = "1.0.57" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4211ce9909eb971f111059df92c45640aad50a619cf55cd76476be803c4c68e6" +dependencies = [ + "proc-macro2", + "quote", + "unicode-xid", +] + +[[package]] +name = "synstructure" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b834f2d66f734cb897113e34aaff2f1ab4719ca946f9a7358dba8f8064148701" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "unicode-xid", +] + +[[package]] +name = "textwrap" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" +dependencies = [ + "unicode-width", +] + +[[package]] +name = "thread_local" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14" +dependencies = [ + "lazy_static", +] + +[[package]] +name = "toml" +version = "0.5.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa" +dependencies = [ + "serde", +] + +[[package]] +name = "unicode-width" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3" + +[[package]] +name = "unicode-xid" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564" + +[[package]] +name = "vec_map" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-binutils/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-binutils/default.nix new file mode 100644 index 000000000000..b79611ff5ecb --- /dev/null +++ b/nixpkgs/pkgs/development/tools/rust/cargo-binutils/default.nix @@ -0,0 +1,29 @@ +{ stdenv, lib, fetchFromGitHub, rustPlatform, runCommand }: + +rustPlatform.buildRustPackage rec { + pname = "cargo-binutils"; + version = "0.3.3"; + + # Upstream doesn't commit `Cargo.lock`, see https://github.com/rust-embedded/cargo-binutils/pull/99 + src = let + repo = fetchFromGitHub { + owner = "rust-embedded"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-Dgn+f4aSsDSh+RC8yvt3ydkdtwib5jEVsnZkod5c7Vo="; + }; + in runCommand "source" { } '' + cp -R ${repo} $out + chmod -R +w $out + cp ${./Cargo.lock} $out/Cargo.lock + ''; + + cargoSha256 = "sha256-Zrl269PacPi81TrGTIDzmVndgGY5i5lYyspiOj43rpw="; + + meta = with lib; { + description = "Cargo subcommands to invoke the LLVM tools shipped with the Rust toolchain"; + homepage = "https://github.com/rust-embedded/cargo-binutils"; + license = with licenses; [ asl20 mit ]; + maintainers = with maintainers; [ stupremee ]; + }; +} diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-c/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-c/default.nix index ce57194bc49b..7b9aa5cf6101 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-c/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cargo-c/default.nix @@ -5,7 +5,7 @@ rustPlatform.buildRustPackage rec { pname = "cargo-c"; - version = "0.7.0"; + version = "0.7.1"; src = stdenv.mkDerivation rec { name = "${pname}-source-${version}"; @@ -14,11 +14,11 @@ rustPlatform.buildRustPackage rec { owner = "lu-zero"; repo = pname; rev = "v${version}"; - sha256 = "0pd1vnpy29fxmf47pvkyxd6bydar8cykfjx0f1bbw3gfk7vychbj"; + sha256 = "1a348ys4lbgsr23px81kw985i5bp8z75wgzl9l2jv9sdzirpb8k4"; }; cargoLock = fetchurl { url = "https://github.com/lu-zero/${pname}/releases/download/v${version}/Cargo.lock"; - sha256 = "10xhd5m63r928gfvr4djmis30mra8wdsx55kgin9kiig2kylx69h"; + sha256 = "1f78wlid8jx26pqybmafzcl1656nnp87hdiib0v1p5k73mk4ymvy"; }; installPhase = '' @@ -28,11 +28,11 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoSha256 = "1axg0kr8xsb5fm3r8qgc7s3g70pa8g9vc68d6icm7ms77phczx4r"; + cargoSha256 = "1nj54igm57h9d8hhqdgkay2nnblcdxhpnha68jqvjazd8a0bq3la"; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] - ++ stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation libiconv Security ]; + ++ lib.optionals stdenv.isDarwin [ CoreFoundation libiconv Security ]; meta = with lib; { description = "A cargo subcommand to build and install C-ABI compatibile dynamic and static libraries"; diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-cache/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-cache/default.nix index 3271e7951fac..021e19b9cd97 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-cache/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cargo-cache/default.nix @@ -1,23 +1,23 @@ -{ stdenv, fetchFromGitHub, rustPlatform, libiconv, Security }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, libiconv, Security }: rustPlatform.buildRustPackage rec { pname = "cargo-cache"; - version = "0.5.1"; + version = "0.6.0"; src = fetchFromGitHub { owner = "matthiaskrgr"; repo = pname; rev = version; - sha256 = "02d593w1x8160p4m3jwm1dyvv383cy7njijlcaw49jczxv5isqbi"; + sha256 = "sha256-SqhGwm2VZW6ZUYyxN940fi/YLJGAZikjJCIq0GbljtY="; }; - cargoSha256 = "150ifd7gq6csrasqw91z4nsaj6w7kf69j0w6wydr3z7bdahmlgqw"; + cargoSha256 = "sha256-sZxkEQBZ2PJXSvwcA+IL7uW/gcnzuzRcDklNW5vpzWg="; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ]; + buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; checkFlagsArray = [ "offline_tests" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Manage cargo cache (\${CARGO_HOME}, ~/.cargo/), print sizes of dirs and remove dirs selectively"; homepage = "https://github.com/matthiaskrgr/cargo-cache"; license = with licenses; [ asl20 /* or */ mit ]; diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-crev/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-crev/default.nix index 6c85a5238039..e3c16b09ef34 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-crev/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cargo-crev/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , rustPlatform , perl @@ -11,22 +11,22 @@ rustPlatform.buildRustPackage rec { pname = "cargo-crev"; - version = "0.18.0"; + version = "0.18.1"; src = fetchFromGitHub { owner = "crev-dev"; repo = "cargo-crev"; rev = "v${version}"; - sha256 = "1ccwa44hpmpd57ff6w02rvrs63wxwmgls2i1rn285rxypmbysrp0"; + sha256 = "sha256-qoN9pTpmXfwaJ37MqAggiPsH4cPr+nsT6NhAUOVclSw="; }; - cargoSha256 = "1sffivpgrn4my57pcrg46b2yg6fmhxj61d2sqvg60fjljrg595zn"; + cargoSha256 = "sha256-mmd9Ds37ST+OuCt506/YbdpOOJBp7WIVZBq+bQ2SR3U="; nativeBuildInputs = [ perl pkg-config ]; - buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ Security libiconv curl ]; + buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security libiconv curl ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A cryptographically verifiable code review system for the cargo (Rust) package manager"; homepage = "https://github.com/crev-dev/cargo-crev"; license = with licenses; [ asl20 mit mpl20 ]; diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-deny/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-deny/default.nix index 34126a7713ff..ba126e57a145 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-deny/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cargo-deny/default.nix @@ -2,26 +2,28 @@ , lib , rustPlatform , fetchFromGitHub -, perl, pkgconfig, openssl, Security, libiconv, curl +, perl, pkg-config, openssl, Security, libiconv, curl }: rustPlatform.buildRustPackage rec { pname = "cargo-deny"; - version = "0.7.0"; + version = "0.8.5"; src = fetchFromGitHub { owner = "EmbarkStudios"; repo = pname; rev = version; - sha256 = "0mfccjcll7dxrhdi2bhfbggmkqdp8cmq5vf8vbb05qzpvlswvkf7"; + sha256 = "01czsnhlvs78fpx1kpi75386657jmlrqpsj4474nxmgcs75igncx"; }; - cargoSha256 = "1gp5m432273mr0zwq1kdswdjgp0kajr0imymqyc4yj9i931by1xv"; + cargoSha256 = "1d5vh6cifkvqxmbgc2z9259q8879fjw016z959hfivv38rragqbr"; - nativeBuildInputs = [ perl pkgconfig ]; + doCheck = false; + + nativeBuildInputs = [ perl pkg-config ]; buildInputs = [ openssl ] - ++ stdenv.lib.optionals stdenv.isDarwin [ Security libiconv curl ]; + ++ lib.optionals stdenv.isDarwin [ Security libiconv curl ]; meta = with lib; { description = "Cargo plugin to generate list of all licenses for a crate"; diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-fund/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-fund/default.nix index 06f99268d0b7..70a2e6feca64 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-fund/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cargo-fund/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkg-config, rustPlatform, Security, curl, openssl, libiconv }: +{ lib, stdenv, fetchFromGitHub, pkg-config, rustPlatform, Security, curl, openssl, libiconv }: rustPlatform.buildRustPackage rec { pname = "cargo-fund"; @@ -18,9 +18,9 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ Security libiconv curl ]; + buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security libiconv curl ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Discover funding links for your project's dependencies"; homepage = "https://github.com/acfoltzer/cargo-fund"; license = with licenses; [ mit /* or */ asl20 ]; diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-fuzz/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-fuzz/default.nix index 14c849ac0afe..904ba6efb52b 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-fuzz/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cargo-fuzz/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform }: +{ lib, stdenv, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { pname = "cargo-fuzz"; @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Command line helpers for fuzzing"; homepage = "https://github.com/rust-fuzz/cargo-fuzz"; license = with licenses; [ mit asl20 ]; diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-geiger/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-geiger/default.nix index 1a5273feeca5..3b2702c66f64 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-geiger/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cargo-geiger/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub -, rustPlatform, pkgconfig, openssl +, rustPlatform, pkg-config, openssl # testing packages , cargo-insta # darwin dependencies @@ -24,12 +24,12 @@ rustPlatform.buildRustPackage rec { ''; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security libiconv ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; # FIXME: Use impure version of CoreFoundation because of missing symbols. # CFURLSetResourcePropertyForKey is defined in the headers but there's no # corresponding implementation in the sources from opensource.apple.com. - preConfigure = stdenv.lib.optionalString stdenv.isDarwin '' + preConfigure = lib.optionalString stdenv.isDarwin '' export NIX_CFLAGS_COMPILE="-F${CoreFoundation}/Library/Frameworks $NIX_CFLAGS_COMPILE" ''; diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-generate/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-generate/default.nix index 5f803635dd2e..635f36ee834c 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-generate/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cargo-generate/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform, Security, openssl, pkgconfig, libiconv, curl }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, Security, openssl, pkg-config, libiconv, curl }: rustPlatform.buildRustPackage rec { pname = "cargo-generate"; @@ -13,10 +13,10 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1vngn9gbiv59wrq230qk2mv00bsbdfk2mi1iqpr736c5wj1caqld"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] - ++ stdenv.lib.optionals stdenv.isDarwin [ Security libiconv curl ]; + ++ lib.optionals stdenv.isDarwin [ Security libiconv curl ]; preCheck = '' export HOME=$(mktemp -d) USER=nixbld @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { git config --global user.email nixbld@localhost.localnet ''; - meta = with stdenv.lib; { + meta = with lib; { description = "cargo, make me a project"; homepage = "https://github.com/ashleygwilliams/cargo-generate"; license = licenses.asl20; diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-inspect/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-inspect/default.nix index 5a8c9150279a..9339660388b5 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-inspect/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cargo-inspect/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "026vc8d0jkc1d7dlp3ldmwks7svpvqzl0k5niri8a12cl5w5b9hj"; }; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = lib.optionals stdenv.isDarwin [ Security ]; cargoSha256 = "1ryi5qi1zz2yljyj4rn84q9zkzafc9w4nw3zc01hlzpnb1sjw5sw"; diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-make/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-make/default.nix index 881a53872c96..e393184aebda 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-make/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cargo-make/default.nix @@ -1,22 +1,22 @@ -{ stdenv, fetchurl, runCommand, fetchCrate, rustPlatform, Security, openssl, pkg-config +{ lib, stdenv, fetchurl, runCommand, fetchCrate, rustPlatform, Security, openssl, pkg-config , SystemConfiguration }: rustPlatform.buildRustPackage rec { pname = "cargo-make"; - version = "0.32.9"; + version = "0.32.10"; src = fetchCrate { inherit pname version; - sha256 = "0f6avprq0d65v5fk3kn2kvw3w024f21yq6v8y7d9rbwqxxf87jlf"; + sha256 = "sha256-cDpEFw9uICB/4aZheTWwDqYGjLz+C6gLie/S3ehhifg="; }; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] - ++ stdenv.lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; + ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; - cargoSha256 = "0v0657hh8ivqaq4sn0saaiz06shxavhrh9mksjlzj7c2ym6cxkih"; + cargoSha256 = "sha256-Qh14lks72bsetwyv0ALF7nZo3m3FDEmVxzFkHJoEuzE="; # Some tests fail because they need network access. # However, Travis ensures a proper build. @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { # https://travis-ci.org/sagiegurari/cargo-make doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "A Rust task runner and build tool"; homepage = "https://github.com/sagiegurari/cargo-make"; license = licenses.asl20; diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-raze/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-raze/default.nix index 8df03a4bd15c..11a52e6ea08f 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-raze/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cargo-raze/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchFromGitHub, rustPlatform -, pkgconfig, curl, libgit2, openssl, Security }: +{ lib, stdenv, fetchFromGitHub, rustPlatform +, pkg-config, curl, libgit2, openssl, Security }: rustPlatform.buildRustPackage rec { pname = "cargo-raze"; @@ -15,13 +15,13 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1z20xc508a3slc1ii3hy09swvlyib14zwf9akxc0h24d5m48as1c"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ curl libgit2 openssl ] - ++ stdenv.lib.optional stdenv.isDarwin Security; + ++ lib.optional stdenv.isDarwin Security; doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Generate Bazel BUILD files from Cargo dependencies"; homepage = "https://github.com/google/cargo-raze"; license = licenses.asl20; diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-readme/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-readme/default.nix new file mode 100644 index 000000000000..ae638cac8a9a --- /dev/null +++ b/nixpkgs/pkgs/development/tools/rust/cargo-readme/default.nix @@ -0,0 +1,34 @@ +{ lib, stdenv, rustPlatform, fetchFromGitHub, fetchpatch }: + +rustPlatform.buildRustPackage rec { + pname = "cargo-readme"; + version = "3.2.0"; + + src = fetchFromGitHub { + owner = "livioribeiro"; + repo = pname; + # Git tag is missing, see upstream issue: + # https://github.com/livioribeiro/cargo-readme/issues/61 + rev = "cf66017c0120ae198210ebaf58a0be6a78372974"; + sha256 = "sha256-/ufHHM13L83M3UYi6mjdhIjgXx7bZgzvR/X02Zsx7Fw="; + }; + + cargoSha256 = "sha256-QVRl6xCvztWi5zAs3PXYR4saTqO5nTBPIjdlMiMXFTM="; + + patches = [ + (fetchpatch { + # Fixup warning thrown at build when running test-suite + # unused return, see upstream PR: + # https://github.com/livioribeiro/cargo-readme/pull/62 + url = "https://github.com/livioribeiro/cargo-readme/commit/060f2daaa2b2cf981bf490dc36bcc6527545ea03.patch"; + sha256 = "sha256-wlAIgTI9OqtA/Jnswoqp7iOj+1zjrUZA7JpHUiF/n+s="; + }) + ]; + + meta = with lib; { + description = "Generate README.md from docstrings"; + homepage = "https://github.com/livioribeiro/cargo-readme"; + license = with licenses; [ mit asl20 ]; + maintainers = with maintainers; [ baloo ]; + }; +} diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-sweep/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-sweep/default.nix index 72883ab4508e..210449a72300 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-sweep/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cargo-sweep/default.nix @@ -1,4 +1,4 @@ -{ stdenv, rustPlatform, fetchFromGitHub }: +{ lib, stdenv, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "cargo-sweep"; @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1sxjc64g8h77a3dvzb99f1f72zrak1nh4jgfjfkw4yc4dhkpyrmz"; - meta = with stdenv.lib; { + meta = with lib; { description = "A Cargo subcommand for cleaning up unused build files generated by Cargo"; homepage = "https://github.com/holmgr/cargo-sweep"; license = licenses.mit; diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-sync-readme/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-sync-readme/default.nix index f42868826d55..45ea6c430d15 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-sync-readme/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cargo-sync-readme/default.nix @@ -1,4 +1,4 @@ -{ stdenv, rustPlatform, fetchFromGitHub }: +{ lib, stdenv, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "cargo-sync-readme"; @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1x15q6wv5278hm3ns2wmw4i8602g35y1jyv1b8wa5i4dnh52dj83"; - meta = with stdenv.lib; { + meta = with lib; { description = "A cargo plugin that generates a Markdown section in your README based on your Rust documentation"; homepage = "https://github.com/phaazon/cargo-sync-readme"; license = licenses.bsd3; diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-udeps/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-udeps/default.nix index 840f2ae27c3c..dcbf539c1c14 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-udeps/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cargo-udeps/default.nix @@ -1,4 +1,4 @@ -{ stdenv, rustPlatform, fetchFromGitHub, pkgconfig, openssl, CoreServices, Security, libiconv }: +{ lib, stdenv, rustPlatform, fetchFromGitHub, pkg-config, openssl, CoreServices, Security, libiconv }: rustPlatform.buildRustPackage rec { pname = "cargo-udeps"; @@ -13,15 +13,15 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "17931z5nbigfzvvhr6k64s2j9p1sp9nvmy5fyf92j3ci02dplm5c"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] - ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices Security libiconv ]; + ++ lib.optionals stdenv.isDarwin [ CoreServices Security libiconv ]; # Requires network access doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Find unused dependencies in Cargo.toml"; homepage = "https://github.com/est31/cargo-udeps"; license = licenses.mit; diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-wipe/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-wipe/default.nix index 1ad0fbbb4b01..6c73b245e047 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-wipe/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cargo-wipe/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , rustPlatform , fetchFromGitHub , nix-update-script @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-wipe"; - version = "0.3.0"; + version = "0.3.1"; src = fetchFromGitHub { owner = "mihai-dinculescu"; repo = "cargo-wipe"; rev = "v${version}"; - sha256 = "1kwkifdp98zsinh7xcsz2va252wxbw73xlrv0r7h3m0bn51d52vw"; + sha256 = "sha256-sVekfGHg2wspP5/zJzXTXupspwJr4hQBucY5+8iUjUQ="; }; - cargoSha256 = "15snr1b1pybwcjzwddxybvry3jyllcmrp8dyfm9yiagks3wrcfb4"; + cargoSha256 = "sha256-IzEurJcPoM/JMQlSL7N84wzZddNpynrsjQEOUNms2YQ="; passthru = { updateScript = nix-update-script { @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = ''Cargo subcommand "wipe": recursively finds and optionally wipes all "target" or "node_modules" folders''; homepage = "https://github.com/mihai-dinculescu/cargo-wipe"; license = with licenses; [ mit ]; diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-xbuild/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-xbuild/default.nix index 477f26e8b819..2e800402c1dd 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-xbuild/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cargo-xbuild/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform }: +{ lib, stdenv, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { pname = "cargo-xbuild"; @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1gcixzxca1yi4rvy55s986my6j0vx7n6fm1g5r4v4w0zgzlz4d89"; - meta = with stdenv.lib; { + meta = with lib; { description = "Automatically cross-compiles the sysroot crates core, compiler_builtins, and alloc"; homepage = "https://github.com/rust-osdev/cargo-xbuild"; license = with licenses; [ mit asl20 ]; diff --git a/nixpkgs/pkgs/development/tools/rust/cbindgen/default.nix b/nixpkgs/pkgs/development/tools/rust/cbindgen/default.nix index 0b557af42585..508090553375 100644 --- a/nixpkgs/pkgs/development/tools/rust/cbindgen/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cbindgen/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform, Security }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, Security }: rustPlatform.buildRustPackage rec { pname = "rust-cbindgen"; @@ -13,14 +13,14 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1lzzckzcgj496chbfd6lhwxcangv0krx8m5k2jwffnb9mfgac7hx"; - buildInputs = stdenv.lib.optional stdenv.isDarwin Security; + buildInputs = lib.optional stdenv.isDarwin Security; checkFlags = [ # https://github.com/eqrion/cbindgen/issues/338 "--skip test_expand" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A project for generating C bindings from Rust code"; homepage = "https://github.com/eqrion/cbindgen"; license = licenses.mpl20; diff --git a/nixpkgs/pkgs/development/tools/rust/maturin/default.nix b/nixpkgs/pkgs/development/tools/rust/maturin/default.nix index 723ea94152ca..d40145f163b2 100644 --- a/nixpkgs/pkgs/development/tools/rust/maturin/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/maturin/default.nix @@ -1,31 +1,31 @@ -{ stdenv, fetchFromGitHub, rustPlatform, dbus, gmp, openssl, pkgconfig +{ lib, stdenv, fetchFromGitHub, rustPlatform, dbus, gmp, openssl, pkg-config , darwin }: let inherit (darwin.apple_sdk.frameworks) Security; in rustPlatform.buildRustPackage rec { name = "maturin-${version}"; - version = "0.8.3"; + version = "0.9.0"; src = fetchFromGitHub { owner = "PyO3"; repo = "maturin"; rev = "v${version}"; - sha256 = "08l5r7d75id6qzf8xhkjv4hkdr64cq4dbcmdjywmvf9szjbnr65z"; + sha256 = "sha256-X5/1zEVhhdTuyXcUwC3jVv9Gblmv8LT+ftsVo8BnnZs="; }; - cargoSha256 = "1n0sxkhcdg2rbzqd7826pa7sxlnn0c2sc8l6lc98xw21vvqisc8n"; + cargoSha256 = "sha256-PBmuPIpCwC7fr/MKFaeSd/0avoEATlxoeMHisjouAeI="; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gmp openssl ] - ++ stdenv.lib.optional stdenv.isDarwin Security - ++ stdenv.lib.optional stdenv.isLinux dbus; + ++ lib.optional stdenv.isDarwin Security + ++ lib.optional stdenv.isLinux dbus; # Requires network access, fails in sandbox. doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Build and publish crates with pyo3 bindings as python packages"; homepage = "https://github.com/PyO3/maturin"; license = licenses.mit; diff --git a/nixpkgs/pkgs/development/tools/rust/racer/default.nix b/nixpkgs/pkgs/development/tools/rust/racer/default.nix index 86f1989729eb..3ad4b54b47a0 100644 --- a/nixpkgs/pkgs/development/tools/rust/racer/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/racer/default.nix @@ -1,46 +1,45 @@ -{ stdenv, fetchFromGitHub, rustPlatform, makeWrapper, substituteAll, Security }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, makeWrapper, substituteAll, Security }: rustPlatform.buildRustPackage rec { pname = "racer"; - version = "2.1.35"; + version = "2.1.40"; src = fetchFromGitHub { owner = "racer-rust"; repo = "racer"; rev = "v${version}"; - sha256 = "0c00b81s7abnadjbf4i39lhdkipx7z44sr8p78jd1fl61yyrspli"; + sha256 = "sha256-8Is+RBfcXKbGSFzYoolLHs30rxlNI//xVGEOhxP2TV8="; }; - cargoSha256 = "1nbp2jp65fqwsq9i04iyi4pbszs035w6id50p5ypw234cqxznikm"; + cargoSha256 = "sha256-iUomr9viCdZk4nV75/OP8vHtJpMbmy+pq1IbaA2lLmE="; nativeBuildInputs = [ makeWrapper ]; - buildInputs = stdenv.lib.optional stdenv.isDarwin Security; + buildInputs = lib.optional stdenv.isDarwin Security; # a nightly compiler is required unless we use this cheat code. RUSTC_BOOTSTRAP = 1; - RUST_SRC_PATH = rustPlatform.rustcSrc; + RUST_SRC_PATH = rustPlatform.rustLibSrc; postInstall = '' - wrapProgram $out/bin/racer --set-default RUST_SRC_PATH ${rustPlatform.rustcSrc} + wrapProgram $out/bin/racer --set-default RUST_SRC_PATH ${rustPlatform.rustLibSrc} ''; - checkPhase = '' - cargo test -- \ - --skip nameres::test_do_file_search_std \ - --skip util::test_get_rust_src_path_rustup_ok \ - --skip util::test_get_rust_src_path_not_rust_source_tree \ - --skip extern --skip completes_pub_fn --skip find_crate_doc \ - --skip follows_use_local_package --skip follows_use_for_reexport \ - --skip follows_rand_crate --skip get_completion_in_example_dir \ - --skip test_resolve_global_path_in_modules - ''; + checkFlags = [ + "--skip nameres::test_do_file_search_std" + "--skip util::test_get_rust_src_path_rustup_ok" + "--skip util::test_get_rust_src_path_not_rust_source_tree" + "--skip extern --skip completes_pub_fn --skip find_crate_doc" + "--skip follows_use_local_package --skip follows_use_for_reexport" + "--skip follows_rand_crate --skip get_completion_in_example_dir" + "--skip test_resolve_global_path_in_modules" + ]; doInstallCheck = true; installCheckPhase = '' $out/bin/racer --version ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A utility intended to provide Rust code completion for editors and IDEs"; homepage = "https://github.com/racer-rust/racer"; license = licenses.mit; diff --git a/nixpkgs/pkgs/development/tools/rust/racerd/default.nix b/nixpkgs/pkgs/development/tools/rust/racerd/default.nix index 26e2a5ba50e3..33d6721610e9 100644 --- a/nixpkgs/pkgs/development/tools/rust/racerd/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/racerd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, rustPlatform, makeWrapper, Security }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, rustPlatform, makeWrapper, Security }: rustPlatform.buildRustPackage rec { pname = "racerd"; @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { doCheck = false; nativeBuildInputs = [ makeWrapper ]; - buildInputs = stdenv.lib.optional stdenv.isDarwin Security; + buildInputs = lib.optional stdenv.isDarwin Security; RUST_SRC_PATH = rustPlatform.rustcSrc; @@ -36,7 +36,7 @@ rustPlatform.buildRustPackage rec { wrapProgram $out/bin/racerd --set-default RUST_SRC_PATH "$RUST_SRC_PATH" ''; - meta = with stdenv.lib; { + meta = with lib; { broken = true; description = "JSON/HTTP Server based on racer for adding Rust support to editors and IDEs"; homepage = "https://github.com/jwilm/racerd"; diff --git a/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix b/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix index a398b7e504df..8ff596d475c8 100644 --- a/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix @@ -2,10 +2,10 @@ { rust-analyzer-unwrapped = callPackage ./generic.nix rec { - rev = "2020-11-09"; + rev = "2021-01-18"; version = "unstable-${rev}"; - sha256 = "sha256-SX9dvx2JtYZBxA3+dHQKX/jrjbAMy37/SAybDjlYcSs="; - cargoSha256 = "sha256-+td+wMmI+MyGz9oPC+SPO2TmAV0+3lOORNY7xf6s3vI="; + sha256 = "sha256-eFiZdFBJZuBfwH8tqZTayNaWiq8fWUzlzBRRvdPbmW8="; + cargoSha256 = "sha256-rRoo0TrXa03okJ8wktzVSAn8tRO1d9kcDprotZ1hZ6w="; }; rust-analyzer = callPackage ./wrapper.nix {} { diff --git a/nixpkgs/pkgs/development/tools/rust/rust-analyzer/generic.nix b/nixpkgs/pkgs/development/tools/rust/rust-analyzer/generic.nix index 1bab5b951837..10f0c6b26ad7 100644 --- a/nixpkgs/pkgs/development/tools/rust/rust-analyzer/generic.nix +++ b/nixpkgs/pkgs/development/tools/rust/rust-analyzer/generic.nix @@ -41,7 +41,7 @@ rustPlatform.buildRustPackage { runHook postInstallCheck ''; - meta = with stdenv.lib; { + meta = with lib; { description = "An experimental modular compiler frontend for the Rust language"; homepage = "https://github.com/rust-analyzer/rust-analyzer"; license = with licenses; [ mit asl20 ]; diff --git a/nixpkgs/pkgs/development/tools/rust/rust-analyzer/update.sh b/nixpkgs/pkgs/development/tools/rust/rust-analyzer/update.sh index f08ea67cf22d..1bd46862692f 100755 --- a/nixpkgs/pkgs/development/tools/rust/rust-analyzer/update.sh +++ b/nixpkgs/pkgs/development/tools/rust/rust-analyzer/update.sh @@ -26,7 +26,7 @@ sha256=$(nix-prefetch -f "$nixpkgs" rust-analyzer-unwrapped.src --rev "$rev") # Clear cargoSha256 to avoid inconsistency. sed -e "s#rev = \".*\"#rev = \"$rev\"#" \ -e "s#sha256 = \".*\"#sha256 = \"$sha256\"#" \ - -e "s#cargoSha256 = \".*\"#cargoSha256 = \"\"#" \ + -e "s#cargoSha256 = \".*\"#cargoSha256 = \"sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\"#" \ --in-place ./default.nix node_src="$(nix-build "$nixpkgs" -A rust-analyzer.src --no-out-link)/editors/code" diff --git a/nixpkgs/pkgs/development/tools/rust/rustup/default.nix b/nixpkgs/pkgs/development/tools/rust/rustup/default.nix index f846ed5f02e1..56097f9b98c3 100644 --- a/nixpkgs/pkgs/development/tools/rust/rustup/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/rustup/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, runCommand, patchelf , fetchFromGitHub, rustPlatform, makeWrapper -, pkgconfig, curl, zlib, Security, CoreServices }: +, pkg-config, curl, zlib, Security, CoreServices }: let libPath = lib.makeLibraryPath [ @@ -21,11 +21,11 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1zkrrg5m0j9rk65g51v2zh404529p9z84qqb7bfyjmgiqlnh48ig"; - nativeBuildInputs = [ makeWrapper pkgconfig ]; + nativeBuildInputs = [ makeWrapper pkg-config ]; buildInputs = [ curl zlib - ] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices Security ]; + ] ++ lib.optionals stdenv.isDarwin [ CoreServices Security ]; cargoBuildFlags = [ "--features no-self-update" ]; @@ -70,7 +70,7 @@ rustPlatform.buildRustPackage rec { $out/bin/rustup completions zsh cargo > "$out/share/zsh/site-functions/_cargo" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "The Rust toolchain installer"; homepage = "https://www.rustup.rs/"; license = with licenses; [ asl20 /* or */ mit ]; diff --git a/nixpkgs/pkgs/development/tools/rust/svd2rust/default.nix b/nixpkgs/pkgs/development/tools/rust/svd2rust/default.nix index 348fe6d9c71f..97da80562905 100644 --- a/nixpkgs/pkgs/development/tools/rust/svd2rust/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/svd2rust/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform }: +{ lib, stdenv, fetchFromGitHub, rustPlatform }: with rustPlatform; @@ -19,7 +19,7 @@ buildRustPackage rec { # doc tests fail due to missing dependency doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Generate Rust register maps (`struct`s) from SVD files"; homepage = "https://github.com/rust-embedded/svd2rust"; license = with licenses; [ mit asl20 ]; diff --git a/nixpkgs/pkgs/development/tools/sass/gemset.nix b/nixpkgs/pkgs/development/tools/sass/gemset.nix index f4fdc899abf8..c0c5937b15a4 100644 --- a/nixpkgs/pkgs/development/tools/sass/gemset.nix +++ b/nixpkgs/pkgs/development/tools/sass/gemset.nix @@ -52,4 +52,4 @@ }; version = "4.0.0"; }; -} \ No newline at end of file +} diff --git a/nixpkgs/pkgs/development/tools/sassc/default.nix b/nixpkgs/pkgs/development/tools/sassc/default.nix index 373a7ea66658..d9662cd7ddb9 100644 --- a/nixpkgs/pkgs/development/tools/sassc/default.nix +++ b/nixpkgs/pkgs/development/tools/sassc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, libsass }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, libsass }: stdenv.mkDerivation rec { pname = "sassc"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { buildInputs = [ libsass ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A front-end for libsass"; homepage = "https://github.com/sass/sassc/"; license = licenses.mit; diff --git a/nixpkgs/pkgs/development/tools/sauce-connect/default.nix b/nixpkgs/pkgs/development/tools/sauce-connect/default.nix index 9560d45d6815..12082de98422 100644 --- a/nixpkgs/pkgs/development/tools/sauce-connect/default.nix +++ b/nixpkgs/pkgs/development/tools/sauce-connect/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { buildInputs = [ unzip ]; - patchPhase = stdenv.lib.optionalString stdenv.isLinux '' + patchPhase = lib.optionalString stdenv.isLinux '' patchelf \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath "$out/lib:${makeLibraryPath [zlib]}" \ diff --git a/nixpkgs/pkgs/development/tools/scaff/default.nix b/nixpkgs/pkgs/development/tools/scaff/default.nix index 97f94e2d61b5..2449769e07f3 100644 --- a/nixpkgs/pkgs/development/tools/scaff/default.nix +++ b/nixpkgs/pkgs/development/tools/scaff/default.nix @@ -1,4 +1,4 @@ -{ lib, rustPlatform, fetchFromGitLab, pkgconfig, openssl }: +{ lib, rustPlatform, fetchFromGitLab, pkg-config, openssl }: rustPlatform.buildRustPackage rec { pname = "scaff"; @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1v6580mj70d7cqbjw32slz65lg6c8ficq5mdkfbivs63hqkv4hgx"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ]; meta = with lib; { diff --git a/nixpkgs/pkgs/development/tools/scalafix/default.nix b/nixpkgs/pkgs/development/tools/scalafix/default.nix index aa3a6cfb0dcf..00fda8bfc368 100644 --- a/nixpkgs/pkgs/development/tools/scalafix/default.nix +++ b/nixpkgs/pkgs/development/tools/scalafix/default.nix @@ -1,4 +1,4 @@ -{ stdenv, jdk, jre, coursier, makeWrapper }: +{ lib, stdenv, jdk, jre, coursier, makeWrapper }: let baseName = "scalafix"; @@ -34,7 +34,7 @@ stdenv.mkDerivation { $out/bin/${baseName} --version | grep -q "${version}" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Refactoring and linting tool for Scala"; homepage = "https://scalacenter.github.io/scalafix/"; license = licenses.bsd3; diff --git a/nixpkgs/pkgs/development/tools/scalafmt/default.nix b/nixpkgs/pkgs/development/tools/scalafmt/default.nix index 0f14f52295e8..45efd813a38b 100644 --- a/nixpkgs/pkgs/development/tools/scalafmt/default.nix +++ b/nixpkgs/pkgs/development/tools/scalafmt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, jdk, jre, coursier, makeWrapper }: +{ lib, stdenv, jdk, jre, coursier, makeWrapper }: let baseName = "scalafmt"; @@ -35,7 +35,7 @@ stdenv.mkDerivation { $out/bin/${baseName} --version | grep -q "${version}" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Opinionated code formatter for Scala"; homepage = "http://scalameta.org/scalafmt"; license = licenses.asl20; diff --git a/nixpkgs/pkgs/development/tools/scss-lint/gemset.nix b/nixpkgs/pkgs/development/tools/scss-lint/gemset.nix index 46747f049396..027522e58f8b 100644 --- a/nixpkgs/pkgs/development/tools/scss-lint/gemset.nix +++ b/nixpkgs/pkgs/development/tools/scss-lint/gemset.nix @@ -59,4 +59,4 @@ }; version = "0.57.1"; }; -} \ No newline at end of file +} diff --git a/nixpkgs/pkgs/development/tools/selenium/chromedriver/default.nix b/nixpkgs/pkgs/development/tools/selenium/chromedriver/default.nix index de1c9c9c11aa..d777d788aec6 100644 --- a/nixpkgs/pkgs/development/tools/selenium/chromedriver/default.nix +++ b/nixpkgs/pkgs/development/tools/selenium/chromedriver/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, unzip, makeWrapper +{ lib, stdenv, fetchurl, unzip, makeWrapper , cairo, fontconfig, freetype, gdk-pixbuf, glib , glibc, gtk2, libX11, nspr, nss, pango, gconf , libxcb, libXi, libXrender, libXext }: let - upstream-info = (stdenv.lib.importJSON ../../../../applications/networking/browsers/chromium/upstream-info.json).stable.chromedriver; + upstream-info = (lib.importJSON ../../../../applications/networking/browsers/chromium/upstream-info.json).stable.chromedriver; allSpecs = { x86_64-linux = { system = "linux64"; @@ -21,7 +21,7 @@ let spec = allSpecs.${stdenv.hostPlatform.system} or (throw "missing chromedriver binary for ${stdenv.hostPlatform.system}"); - libs = stdenv.lib.makeLibraryPath [ + libs = lib.makeLibraryPath [ stdenv.cc.cc.lib cairo fontconfig freetype gdk-pixbuf glib gtk2 gconf @@ -44,12 +44,12 @@ in stdenv.mkDerivation rec { installPhase = '' install -m755 -D chromedriver $out/bin/chromedriver - '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' + '' + lib.optionalString (!stdenv.isDarwin) '' patchelf --set-interpreter ${glibc.out}/lib/ld-linux-x86-64.so.2 $out/bin/chromedriver wrapProgram "$out/bin/chromedriver" --prefix LD_LIBRARY_PATH : "${libs}:\$LD_LIBRARY_PATH" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://chromedriver.chromium.org/"; description = "A WebDriver server for running Selenium tests on Chrome"; longDescription = '' diff --git a/nixpkgs/pkgs/development/tools/selenium/htmlunit-driver/default.nix b/nixpkgs/pkgs/development/tools/selenium/htmlunit-driver/default.nix index 400cf24012a9..be3048cca25b 100644 --- a/nixpkgs/pkgs/development/tools/selenium/htmlunit-driver/default.nix +++ b/nixpkgs/pkgs/development/tools/selenium/htmlunit-driver/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "htmlunit-driver-standalone"; diff --git a/nixpkgs/pkgs/development/tools/selenium/selendroid/default.nix b/nixpkgs/pkgs/development/tools/selenium/selendroid/default.nix index bf9eabec53c0..c25190cab74e 100644 --- a/nixpkgs/pkgs/development/tools/selenium/selendroid/default.nix +++ b/nixpkgs/pkgs/development/tools/selenium/selendroid/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, makeWrapper, jdk, selenium-server-standalone }: +{ lib, stdenv, fetchurl, makeWrapper, jdk, selenium-server-standalone }: -with stdenv.lib; +with lib; let name = "selendroid-standalone-${version}"; pluginName = "selendroid-grid-plugin-${version}"; diff --git a/nixpkgs/pkgs/development/tools/selenium/server/default.nix b/nixpkgs/pkgs/development/tools/selenium/server/default.nix index a6d60e33ee36..10893a9d1700 100644 --- a/nixpkgs/pkgs/development/tools/selenium/server/default.nix +++ b/nixpkgs/pkgs/development/tools/selenium/server/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, makeWrapper, jre +{ lib, stdenv, fetchurl, makeWrapper, jre , htmlunit-driver, chromedriver, chromeSupport ? true }: -with stdenv.lib; +with lib; let minorVersion = "3.141"; diff --git a/nixpkgs/pkgs/development/tools/setupcfg2nix/info.nix b/nixpkgs/pkgs/development/tools/setupcfg2nix/info.nix index 6b65632bf7d1..17e888fee416 100644 --- a/nixpkgs/pkgs/development/tools/setupcfg2nix/info.nix +++ b/nixpkgs/pkgs/development/tools/setupcfg2nix/info.nix @@ -1,7 +1,7 @@ { - pname = ''setupcfg2nix''; - version = ''2.0.1''; + pname = "setupcfg2nix"; + version = "2.0.1"; install_requires = [ - ''setuptools'' + "setuptools" ]; } diff --git a/nixpkgs/pkgs/development/tools/shadered/default.nix b/nixpkgs/pkgs/development/tools/shadered/default.nix new file mode 100644 index 000000000000..01c16b139468 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/shadered/default.nix @@ -0,0 +1,45 @@ +{ stdenv +, lib +, fetchFromGitHub +, cmake +, sfml +, glm +, python3 +, glew +, pkg-config +, SDL2 }: + +stdenv.mkDerivation rec { + pname = "SHADERed"; + version = "1.4.1"; + + src = fetchFromGitHub { + owner = "dfranx"; + repo = pname; + rev = "v${version}"; + fetchSubmodules = true; + sha256 = "ivOd4NJgx5KWSDnXSBQLMrdvBuOm8NRzcb2S4lvOrms="; + }; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ + SDL2 + glew + glm + python3 + sfml + ]; + + NIX_CFLAGS_COMPILE = "-Wno-error=format-security"; + + meta = with lib; { + description = "Lightweight, cross-platform & full-featured shader IDE"; + homepage = "https://github.com/dfranx/SHADERed"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ Scriptkiddi ]; + }; +} diff --git a/nixpkgs/pkgs/development/tools/sigrok-cli/default.nix b/nixpkgs/pkgs/development/tools/sigrok-cli/default.nix index b71e9fb3a99c..b4173c7aebb0 100644 --- a/nixpkgs/pkgs/development/tools/sigrok-cli/default.nix +++ b/nixpkgs/pkgs/development/tools/sigrok-cli/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, libsigrok, libsigrokdecode }: +{ lib, stdenv, fetchurl, pkg-config, glib, libsigrok, libsigrokdecode }: stdenv.mkDerivation rec { name = "sigrok-cli-0.7.1"; @@ -8,10 +8,10 @@ stdenv.mkDerivation rec { sha256 = "15vpn1psriadcbl6v9swwgws7dva85ld03yv6g1mgm27kx11697m"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib libsigrok libsigrokdecode ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Command-line frontend for the sigrok signal analysis software suite"; homepage = "https://sigrok.org/"; license = licenses.gpl3Plus; diff --git a/nixpkgs/pkgs/development/tools/simavr/default.nix b/nixpkgs/pkgs/development/tools/simavr/default.nix index 83ae00ce7b66..1d47b3251010 100644 --- a/nixpkgs/pkgs/development/tools/simavr/default.nix +++ b/nixpkgs/pkgs/development/tools/simavr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libelf, which, pkgconfig, freeglut +{ lib, stdenv, fetchFromGitHub, libelf, which, pkg-config, freeglut , avrgcc, avrlibc , libGLU, libGL , GLUT }: @@ -24,9 +24,9 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = [ "-Wno-error=stringop-truncation" ]; - nativeBuildInputs = [ which pkgconfig avrgcc ]; + nativeBuildInputs = [ which pkg-config avrgcc ]; buildInputs = [ libelf freeglut libGLU libGL ] - ++ stdenv.lib.optional stdenv.isDarwin GLUT; + ++ lib.optional stdenv.isDarwin GLUT; # Hack to avoid TMPDIR in RPATHs. preFixup = ''rm -rf "$(pwd)" && mkdir "$(pwd)" ''; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { doCheck = true; checkTarget = "-C tests run_tests"; - meta = with stdenv.lib; { + meta = with lib; { description = "A lean and mean Atmel AVR simulator"; homepage = "https://github.com/buserror/simavr"; license = licenses.gpl3; diff --git a/nixpkgs/pkgs/development/tools/skopeo/default.nix b/nixpkgs/pkgs/development/tools/skopeo/default.nix index db5f392b2ce6..5b1d8b0794d8 100644 --- a/nixpkgs/pkgs/development/tools/skopeo/default.nix +++ b/nixpkgs/pkgs/development/tools/skopeo/default.nix @@ -1,4 +1,5 @@ -{ stdenv +{ lib +, stdenv , buildGoModule , fetchFromGitHub , gpgme @@ -13,13 +14,13 @@ buildGoModule rec { pname = "skopeo"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { rev = "v${version}"; owner = "containers"; repo = "skopeo"; - sha256 = "1v7k3ki10i6082r7zswblyirx6zck674y6bw3plssw4p1l2611rd"; + sha256 = "1y9pmijazbgxzriymrm7zrifmkd1x1wad9b3zjcj7zwr6c999dhg"; }; outputs = [ "out" "man" ]; @@ -31,7 +32,7 @@ buildGoModule rec { nativeBuildInputs = [ pkg-config go-md2man installShellFiles makeWrapper ]; buildInputs = [ gpgme ] - ++ stdenv.lib.optionals stdenv.isLinux [ lvm2 btrfs-progs ]; + ++ lib.optionals stdenv.isLinux [ lvm2 btrfs-progs ]; buildPhase = '' patchShebangs . @@ -42,12 +43,12 @@ buildGoModule rec { install -Dm755 bin/skopeo -t $out/bin installManPage docs/*.[1-9] installShellCompletion --bash completions/bash/skopeo - '' + stdenv.lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.isLinux '' wrapProgram $out/bin/skopeo \ - --prefix PATH : ${stdenv.lib.makeBinPath [ fuse-overlayfs ]} + --prefix PATH : ${lib.makeBinPath [ fuse-overlayfs ]} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A command line utility for various operations on container images and image repositories"; homepage = "https://github.com/containers/skopeo"; maintainers = with maintainers; [ lewo ] ++ teams.podman.members; diff --git a/nixpkgs/pkgs/development/tools/slimerjs/default.nix b/nixpkgs/pkgs/development/tools/slimerjs/default.nix index 49eea7213bd8..76728c5f2d80 100644 --- a/nixpkgs/pkgs/development/tools/slimerjs/default.nix +++ b/nixpkgs/pkgs/development/tools/slimerjs/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, zip, unzip, firefox, bash}: +{lib, stdenv, fetchFromGitHub, zip, unzip, firefox, bash}: let s = # Generated upstream information rec { @@ -42,9 +42,9 @@ stdenv.mkDerivation { ''; meta = { inherit (s) version; - description = ''Gecko-based programmatically-driven browser''; - license = stdenv.lib.licenses.mpl20 ; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + description = "Gecko-based programmatically-driven browser"; + license = lib.licenses.mpl20 ; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.linux; }; } diff --git a/nixpkgs/pkgs/development/tools/so/default.nix b/nixpkgs/pkgs/development/tools/so/default.nix index 0ee2359c8413..99f9cdcd936f 100644 --- a/nixpkgs/pkgs/development/tools/so/default.nix +++ b/nixpkgs/pkgs/development/tools/so/default.nix @@ -1,4 +1,4 @@ -{ stdenv, rustPlatform, fetchFromGitHub, openssl, pkg-config, libiconv, Security }: +{ lib, stdenv, rustPlatform, fetchFromGitHub, openssl, pkg-config, libiconv, Security }: rustPlatform.buildRustPackage rec { pname = "so"; @@ -14,11 +14,11 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1ddbhy1plag4ckbmlyj47wnky7vgmfa68msl3hl25h1lwmzaf1aq"; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ + buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ libiconv Security ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A TUI interface to the StackExchange network"; homepage = "https://github.com/samtay/so"; license = licenses.mit; diff --git a/nixpkgs/pkgs/development/tools/solarus-quest-editor/default.nix b/nixpkgs/pkgs/development/tools/solarus-quest-editor/default.nix index d44622e7e595..159fe3d99eb7 100644 --- a/nixpkgs/pkgs/development/tools/solarus-quest-editor/default.nix +++ b/nixpkgs/pkgs/development/tools/solarus-quest-editor/default.nix @@ -1,7 +1,7 @@ -{ lib, mkDerivation, fetchFromGitLab, cmake, luajit, - SDL2, SDL2_image, SDL2_ttf, physfs, - openal, libmodplug, libvorbis, solarus, - qtbase, qttools, glm }: +{ lib, mkDerivation, fetchFromGitLab, cmake, luajit +, SDL2, SDL2_image, SDL2_ttf, physfs, fetchpatch +, openal, libmodplug, libvorbis, solarus +, qtbase, qttools, glm }: mkDerivation rec { pname = "solarus-quest-editor"; @@ -13,11 +13,18 @@ mkDerivation rec { rev = "v${version}"; sha256 = "1qbc2j9kalk7xqk9j27s7wnm5zawiyjs47xqkqphw683idmzmjzn"; }; - - buildInputs = [ cmake luajit SDL2 - SDL2_image SDL2_ttf physfs - openal libmodplug libvorbis - solarus qtbase qttools glm ]; + + patches = [ + (fetchpatch { + url = "https://gitlab.com/solarus-games/solarus-quest-editor/-/commit/81d5c7f1602cf355684d70a5e3449fefccfc44b8.patch"; + sha256 = "tVUxkkDp2PcOHGy4dGvUcYj9gF7k4LN21VuxohCw9NE="; + }) + ]; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ luajit SDL2 SDL2_image SDL2_ttf physfs openal + libmodplug libvorbis solarus qtbase qttools glm ]; meta = with lib; { description = "The editor for the Zelda-like ARPG game engine, Solarus"; @@ -31,5 +38,5 @@ mkDerivation rec { maintainers = [ maintainers.Nate-Devv ]; platforms = platforms.linux; }; - + } diff --git a/nixpkgs/pkgs/development/tools/sourcetrail/default.nix b/nixpkgs/pkgs/development/tools/sourcetrail/default.nix index 91653d3773e1..46f097e5b60a 100644 --- a/nixpkgs/pkgs/development/tools/sourcetrail/default.nix +++ b/nixpkgs/pkgs/development/tools/sourcetrail/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, callPackage, writeScript, cmake, wrapQtAppsHook +{ lib, stdenv, fetchFromGitHub, callPackage, writeScript, cmake, wrapQtAppsHook , boost, qt5, llvmPackages, gcc, jdk, pythonPackages, desktop-file-utils , shared-mime-info, imagemagick, which, coreutils, maven, fetchpatch }: @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { desktop-file-utils imagemagick javaIndexer # the resulting jar file is copied by our install script - ] ++ stdenv.lib.optionals doCheck testBinPath; + ] ++ lib.optionals doCheck testBinPath; buildInputs = [ boost pythonIndexer shared-mime-info ] ++ (with qt5; [ qtbase qtsvg ]) @@ -86,9 +86,9 @@ stdenv.mkDerivation rec { ]; postPatch = let - major = stdenv.lib.versions.major version; - minor = stdenv.lib.versions.minor version; - patch = stdenv.lib.versions.patch version; + major = lib.versions.major version; + minor = lib.versions.minor version; + patch = lib.versions.patch version; in '' # Upstream script obtains it's version from git: # https://github.com/CoatiSoftware/Sourcetrail/blob/master/cmake/version.cmake @@ -176,7 +176,7 @@ stdenv.mkDerivation rec { mkdir -p $out/bin makeQtWrapper $out/opt/sourcetrail/bin/sourcetrail $out/bin/sourcetrail \ - --prefix PATH : ${stdenv.lib.makeBinPath binPath} + --prefix PATH : ${lib.makeBinPath binPath} ''; checkPhase = '' @@ -188,7 +188,7 @@ stdenv.mkDerivation rec { # shorten PATH to prevent build failures wrapQtApp ./Sourcetrail_test \ --set PATH "" \ - --prefix PATH : ${stdenv.lib.makeBinPath testBinPath} \ + --prefix PATH : ${lib.makeBinPath testBinPath} \ --set MAVEN_OPTS "-Dmaven.repo.local=$TMPDIR/m2repo" ./Sourcetrail_test popd @@ -203,7 +203,7 @@ stdenv.mkDerivation rec { # FIXME: some test cases are disabled in the patch phase doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.sourcetrail.com"; description = "A cross-platform source explorer for C/C++ and Java"; platforms = platforms.all; diff --git a/nixpkgs/pkgs/development/tools/sourcetrail/jedi.nix b/nixpkgs/pkgs/development/tools/sourcetrail/jedi.nix index 14a40a6e6db4..fa25604f9fc5 100644 --- a/nixpkgs/pkgs/development/tools/sourcetrail/jedi.nix +++ b/nixpkgs/pkgs/development/tools/sourcetrail/jedi.nix @@ -1,6 +1,6 @@ # Taken from a past commit of nixpkgs -{ stdenv, buildPythonPackage, fetchPypi, pytest, glibcLocales, tox, pytestcov, parso }: +{ lib, stdenv, buildPythonPackage, fetchPypi, pytest, glibcLocales, tox, pytestcov, parso }: buildPythonPackage rec { pname = "jedi"; @@ -28,7 +28,7 @@ buildPythonPackage rec { # tox required for tests: https://github.com/davidhalter/jedi/issues/808 doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/davidhalter/jedi"; description = "An autocompletion tool for Python that can be used for text editors"; license = licenses.lgpl3Plus; diff --git a/nixpkgs/pkgs/development/tools/spirv-tools/default.nix b/nixpkgs/pkgs/development/tools/spirv-tools/default.nix index bac10d244422..57f04b00c0d2 100644 --- a/nixpkgs/pkgs/development/tools/spirv-tools/default.nix +++ b/nixpkgs/pkgs/development/tools/spirv-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, python3, spirv-headers }: +{ lib, stdenv, fetchFromGitHub, cmake, python3, spirv-headers }: let # Update spirv-headers rev in lockstep according to DEPs file version = "2020.2"; @@ -14,13 +14,12 @@ stdenv.mkDerivation rec { rev = "v${version}"; sha256 = "00b7xgyrcb2qq63pp3cnw5q1xqx2d9rfn65lai6n6r89s1vh3vg6"; }; - enableParallelBuilding = true; nativeBuildInputs = [ cmake python3 ]; cmakeFlags = [ "-DSPIRV-Headers_SOURCE_DIR=${spirv-headers.src}" ]; - meta = with stdenv.lib; { + meta = with lib; { inherit (src.meta) homepage; description = "The SPIR-V Tools project provides an API and commands for processing SPIR-V modules"; license = licenses.asl20; diff --git a/nixpkgs/pkgs/development/tools/spring-boot-cli/default.nix b/nixpkgs/pkgs/development/tools/spring-boot-cli/default.nix index 38573e075146..5bc89e839e92 100644 --- a/nixpkgs/pkgs/development/tools/spring-boot-cli/default.nix +++ b/nixpkgs/pkgs/development/tools/spring-boot-cli/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, jdk, makeWrapper, installShellFiles, coreutils }: +{ lib, stdenv, fetchzip, jdk, makeWrapper, installShellFiles, coreutils }: stdenv.mkDerivation rec { pname = "spring-boot-cli"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = '' CLI which makes it easy to create spring-based applications ''; diff --git a/nixpkgs/pkgs/development/tools/sqlint/gemset.nix b/nixpkgs/pkgs/development/tools/sqlint/gemset.nix index a86277363fbc..aeffdccffa13 100644 --- a/nixpkgs/pkgs/development/tools/sqlint/gemset.nix +++ b/nixpkgs/pkgs/development/tools/sqlint/gemset.nix @@ -20,4 +20,4 @@ }; version = "0.1.10"; }; -} \ No newline at end of file +} diff --git a/nixpkgs/pkgs/development/tools/sqsh/default.nix b/nixpkgs/pkgs/development/tools/sqsh/default.nix index d6087cd02244..9c56efcb59fb 100644 --- a/nixpkgs/pkgs/development/tools/sqsh/default.nix +++ b/nixpkgs/pkgs/development/tools/sqsh/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook, freetds, readline, libiconv }: +{ lib, stdenv, fetchurl, autoreconfHook, freetds, readline, libiconv }: let mainVersion = "2.5"; @@ -17,7 +17,7 @@ in stdenv.mkDerivation rec { substituteInPlace src/cmd_connect.c \ --replace CS_TDS_80 CS_TDS_73 - '' + stdenv.lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' substituteInPlace configure --replace "libct.so" "libct.dylib" ''; @@ -27,7 +27,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Command line tool for querying Sybase/MSSQL databases"; longDescription = '' Sqsh (pronounced skwish) is short for SQshelL (pronounced s-q-shell), diff --git a/nixpkgs/pkgs/development/tools/sslmate/default.nix b/nixpkgs/pkgs/development/tools/sslmate/default.nix index a6d1ce55fdb7..cdf2242bdbaa 100644 --- a/nixpkgs/pkgs/development/tools/sslmate/default.nix +++ b/nixpkgs/pkgs/development/tools/sslmate/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perlPackages, makeWrapper, openssl }: +{ lib, stdenv, fetchurl, perlPackages, makeWrapper, openssl }: stdenv.mkDerivation rec { name = "sslmate-1.7.1"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { --prefix PATH : "${openssl.bin}/bin" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://sslmate.com"; maintainers = [ maintainers.domenkozar ]; description = "Easy to buy, deploy, and manage your SSL certs"; diff --git a/nixpkgs/pkgs/development/tools/stagit/default.nix b/nixpkgs/pkgs/development/tools/stagit/default.nix index dacee9aa78e1..1cabcfe044f3 100644 --- a/nixpkgs/pkgs/development/tools/stagit/default.nix +++ b/nixpkgs/pkgs/development/tools/stagit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, libgit2, fetchgit }: +{ lib, stdenv, libgit2, fetchgit }: stdenv.mkDerivation rec { pname = "stagit"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ libgit2 ]; - meta = with stdenv.lib; { + meta = with lib; { description = "git static site generator"; homepage = "https://git.codemadness.org/stagit/"; license = licenses.mit; diff --git a/nixpkgs/pkgs/development/tools/summon/default.nix b/nixpkgs/pkgs/development/tools/summon/default.nix index e01c60e3a89c..5d851adc5abc 100644 --- a/nixpkgs/pkgs/development/tools/summon/default.nix +++ b/nixpkgs/pkgs/development/tools/summon/default.nix @@ -1,6 +1,6 @@ { stdenv, buildGoModule, fetchFromGitHub, lib, patchResolver ? true }: -with stdenv.lib; +with lib; buildGoModule rec { pname = "summon"; diff --git a/nixpkgs/pkgs/development/tools/sumneko-lua-language-server/default.nix b/nixpkgs/pkgs/development/tools/sumneko-lua-language-server/default.nix new file mode 100644 index 000000000000..d63493ba7a1e --- /dev/null +++ b/nixpkgs/pkgs/development/tools/sumneko-lua-language-server/default.nix @@ -0,0 +1,52 @@ +{ lib, stdenv, fetchFromGitHub, ninja, makeWrapper }: + +stdenv.mkDerivation rec { + pname = "sumneko-lua-language-server"; + version = "1.11.2"; + + src = fetchFromGitHub { + owner = "sumneko"; + repo = "lua-language-server"; + rev = version; + sha256 = "1cnzwfqmzlzi6797l37arhhx2l6wsvs3jjgxdxwdbgq3rfz1ncr8"; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ + ninja + makeWrapper + ]; + + preBuild = '' + cd 3rd/luamake + ''; + + ninjaFlags = [ + "-f ninja/linux.ninja" + ]; + + postBuild = '' + cd ../.. + ./3rd/luamake/luamake rebuild + ''; + + installPhase = '' + mkdir -p $out/bin $out/extras + cp -r ./{locale,meta,script,*.lua} $out/extras/ + cp ./bin/Linux/{bee.so,lpeglabel.so} $out/extras + cp ./bin/Linux/lua-language-server $out/extras/.lua-language-server-unwrapped + makeWrapper $out/extras/.lua-language-server-unwrapped \ + $out/bin/lua-language-server \ + --add-flags "-E $out/extras/main.lua \ + --logpath='~/.cache/sumneko_lua/log' \ + --metapath='~/.cache/sumneko_lua/meta'" + ''; + + meta = with lib; { + description = "Lua Language Server coded by Lua "; + homepage = "https://github.com/sumneko/lua-language-server"; + license = licenses.mit; + maintainers = with maintainers; [ mjlbach ]; + platforms = platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/development/tools/sunxi-tools/default.nix b/nixpkgs/pkgs/development/tools/sunxi-tools/default.nix index 5a530c6e9f18..ae9c7c833928 100644 --- a/nixpkgs/pkgs/development/tools/sunxi-tools/default.nix +++ b/nixpkgs/pkgs/development/tools/sunxi-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, libusb1, zlib }: +{ lib, stdenv, fetchFromGitHub, pkg-config, libusb1, zlib }: stdenv.mkDerivation { name = "sunxi-tools-20181113"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256 = "1yhl6jfl2cws596ymkyhm8h9qkcvp67v8hlh081lsaqv1i8j9yig"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libusb1 zlib ]; makeFlags = [ "PREFIX=$(out)" ]; @@ -19,7 +19,7 @@ stdenv.mkDerivation { installTargets = [ "install-tools" "install-misc" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Tools for Allwinner SoC devices"; homepage = "http://linux-sunxi.org/"; license = licenses.gpl2Plus; diff --git a/nixpkgs/pkgs/development/tools/swiftformat/default.nix b/nixpkgs/pkgs/development/tools/swiftformat/default.nix index cb3ed5217f08..823496693f25 100644 --- a/nixpkgs/pkgs/development/tools/swiftformat/default.nix +++ b/nixpkgs/pkgs/development/tools/swiftformat/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "swiftformat"; - version = "0.44.9"; + version = "0.47.10"; src = fetchFromGitHub { owner = "nicklockwood"; repo = "SwiftFormat"; rev = version; - sha256 = "0zajvbaf3r02k53lv5zdxf13apc6chnjmj69zkyac48lpnpbcxq6"; + sha256 = "1gqxpymbhpmap0i2blg9akarlql4mkzv45l4i212gsxcs991b939"; }; preConfigure = "LD=$CC"; diff --git a/nixpkgs/pkgs/development/tools/tabnine/default.nix b/nixpkgs/pkgs/development/tools/tabnine/default.nix index 6c54e8f3c405..f18be619f267 100644 --- a/nixpkgs/pkgs/development/tools/tabnine/default.nix +++ b/nixpkgs/pkgs/development/tools/tabnine/default.nix @@ -1,17 +1,17 @@ -{ stdenv, lib, fetchurl }: +{ stdenv, lib, fetchurl, unzip }: let - version = "3.1.1"; + version = "3.2.63"; src = if stdenv.hostPlatform.system == "x86_64-darwin" then fetchurl { - url = "https://update.tabnine.com/${version}/x86_64-apple-darwin/TabNine"; - sha256 = "w+Ufy4pICfQmseKCeohEQIP0VD6YrkYTEn41HX40Zlw="; + url = "https://update.tabnine.com/bundles/${version}/x86_64-apple-darwin/TabNine.zip"; + sha256 = "0y0wb3jdr2qk4k21c11w8c9a5fl0h2rm1wm7m8hqdywy4lz9ppgy"; } else if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { - url = "https://update.tabnine.com/${version}/x86_64-unknown-linux-musl/TabNine"; - sha256 = "hSltZWQz2BRFut0NDI4fS/N8XxFJaYGHRtV3llBVOY4="; + url = "https://update.tabnine.com/bundles/${version}/x86_64-unknown-linux-musl/TabNine.zip"; + sha256 = "0zzk2w5azk5f0svjxlj2774x01xdflb767xxvbglj4223dgyx2x5"; } else throw "Not supported on ${stdenv.hostPlatform.system}"; in stdenv.mkDerivation rec { @@ -20,10 +20,15 @@ in stdenv.mkDerivation rec { inherit version src; dontBuild = true; - dontUnpack = true; + + # Work around the "unpacker appears to have produced no directories" + # case that happens when the archive doesn't have a subdirectory. + setSourceRoot = "sourceRoot=`pwd`"; + + nativeBuildInputs = [ unzip ]; installPhase = '' - install -Dm755 $src $out/bin/TabNine + install -Dm755 TabNine $out/bin/TabNine ''; meta = with lib; { diff --git a/nixpkgs/pkgs/development/tools/textql/default.nix b/nixpkgs/pkgs/development/tools/textql/default.nix index 4cdb5b8dd163..7dc899c4fc46 100644 --- a/nixpkgs/pkgs/development/tools/textql/default.nix +++ b/nixpkgs/pkgs/development/tools/textql/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, sqlite }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub, sqlite }: buildGoPackage rec { pname = "textql"; @@ -24,7 +24,7 @@ buildGoPackage rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Execute SQL against structured text like CSV or TSV"; homepage = "https://github.com/dinedal/textql"; license = licenses.mit; diff --git a/nixpkgs/pkgs/development/tools/the-way/default.nix b/nixpkgs/pkgs/development/tools/the-way/default.nix index 5506201b7427..1e88cfcdcc11 100644 --- a/nixpkgs/pkgs/development/tools/the-way/default.nix +++ b/nixpkgs/pkgs/development/tools/the-way/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform, installShellFiles, AppKit, Security }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, installShellFiles, AppKit, Security }: rustPlatform.buildRustPackage rec { pname = "the-way"; @@ -13,10 +13,10 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ]; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ AppKit Security ]; + buildInputs = lib.optionals stdenv.isDarwin [ AppKit Security ]; cargoSha256 = "1aiyfsvmrqcmlw0z1944i9s5g3yxc39na5mf16pb9a4bhw8zcwjr"; - checkFlagsArray = stdenv.lib.optionals stdenv.isDarwin [ "--skip=copy" ]; + checkFlagsArray = lib.optionals stdenv.isDarwin [ "--skip=copy" ]; cargoParallelTestThreads = false; postInstall = '' @@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Terminal code snippets manager"; homepage = "https://github.com/out-of-cheese-error/the-way"; license = with licenses; [ mit ]; diff --git a/nixpkgs/pkgs/development/tools/thrust/default.nix b/nixpkgs/pkgs/development/tools/thrust/default.nix index a0bc39f2816d..44dfa1a4ba11 100644 --- a/nixpkgs/pkgs/development/tools/thrust/default.nix +++ b/nixpkgs/pkgs/development/tools/thrust/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, buildEnv, makeWrapper, glib, alsaLib , dbus, gtk2, atk +{ lib, stdenv, fetchurl, buildEnv, makeWrapper, glib, alsaLib , dbus, gtk2, atk , pango, freetype, fontconfig, gdk-pixbuf , cairo, cups, expat, nspr, gconf, nss , xorg, libcap, unzip }: @@ -37,7 +37,7 @@ in stdenv.mkDerivation rec { ln -s $out/libexec/thrust/thrust_shell $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Chromium-based cross-platform / cross-language application framework"; homepage = "https://github.com/breach/thrust"; license = licenses.mit; diff --git a/nixpkgs/pkgs/development/tools/toluapp/default.nix b/nixpkgs/pkgs/development/tools/toluapp/default.nix index 8f4e66703478..5f938547cdd8 100644 --- a/nixpkgs/pkgs/development/tools/toluapp/default.nix +++ b/nixpkgs/pkgs/development/tools/toluapp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, sconsPackages, lua }: +{ lib, stdenv, fetchFromGitHub, sconsPackages, lua }: stdenv.mkDerivation rec { version = "1.0.93"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { --replace /usr/local $out ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A tool to integrate C/Cpp code with Lua"; homepage = "http://www.codenix.com/~tolua/"; license = licenses.mit; diff --git a/nixpkgs/pkgs/development/tools/tracy/default.nix b/nixpkgs/pkgs/development/tools/tracy/default.nix index 4efef71f6ad0..2dcc32e7389d 100644 --- a/nixpkgs/pkgs/development/tools/tracy/default.nix +++ b/nixpkgs/pkgs/development/tools/tracy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, darwin, fetchFromGitHub, tbb, gtk3, glfw, pkgconfig, freetype, Carbon, AppKit, capstone }: +{ stdenv, lib, darwin, fetchFromGitHub, tbb, gtk3, glfw, pkg-config, freetype, Carbon, AppKit, capstone }: stdenv.mkDerivation rec { pname = "tracy"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0s39kimpc03x48kh7lyhblfs8y4mdzcz3g7f806h90x7zndsmfxj"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glfw capstone ] ++ lib.optionals stdenv.isDarwin [ Carbon AppKit freetype ] @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { install_name_tool -change libcapstone.4.dylib ${capstone}/lib/libcapstone.4.dylib $out/bin/Tracy ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A real time, nanosecond resolution, remote telemetry frame profiler for games and other applications"; homepage = "https://github.com/wolfpld/tracy"; platforms = platforms.linux ++ platforms.darwin; diff --git a/nixpkgs/pkgs/development/tools/tradcpp/default.nix b/nixpkgs/pkgs/development/tools/tradcpp/default.nix index ddcdc38a4fb9..dc7156febe98 100644 --- a/nixpkgs/pkgs/development/tools/tradcpp/default.nix +++ b/nixpkgs/pkgs/development/tools/tradcpp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoconf }: +{ lib, stdenv, fetchurl, autoconf }: stdenv.mkDerivation { name = "tradcpp-0.5.2"; @@ -16,7 +16,7 @@ stdenv.mkDerivation { ./aarch64.patch ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A traditional (K&R-style) C macro preprocessor"; platforms = platforms.all; license = licenses.bsd2; diff --git a/nixpkgs/pkgs/development/tools/trellis/default.nix b/nixpkgs/pkgs/development/tools/trellis/default.nix index dead1dac2a51..6ce1ad9a38aa 100644 --- a/nixpkgs/pkgs/development/tools/trellis/default.nix +++ b/nixpkgs/pkgs/development/tools/trellis/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , python3, boost , cmake }: @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { version = "2021.01.02"; # git describe --tags - realVersion = with stdenv.lib; with builtins; + realVersion = with lib; with builtins; "1.0-482-g${substring 0 7 (elemAt srcs 0).rev}"; srcs = [ @@ -37,7 +37,6 @@ stdenv.mkDerivation rec { # TODO: should this be in stdenv instead? "-DCMAKE_INSTALL_DATADIR=${placeholder "out"}/share" ]; - enableParallelBuilding = true; preConfigure = with builtins; '' rmdir database && ln -sfv ${elemAt srcs 1} ./database @@ -46,7 +45,7 @@ stdenv.mkDerivation rec { cd libtrellis ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Documentation and bitstream tools for Lattice ECP5 FPGAs"; longDescription = '' Project Trellis documents the Lattice ECP5 architecture @@ -55,8 +54,8 @@ stdenv.mkDerivation rec { open Verilog to bitstream toolchain for these devices. ''; homepage = "https://github.com/SymbiFlow/prjtrellis"; - license = stdenv.lib.licenses.isc; + license = lib.licenses.isc; maintainers = with maintainers; [ q3k thoughtpolice emily ]; - platforms = stdenv.lib.platforms.all; + platforms = lib.platforms.all; }; } diff --git a/nixpkgs/pkgs/development/tools/turbogit/default.nix b/nixpkgs/pkgs/development/tools/turbogit/default.nix new file mode 100644 index 000000000000..68bd10683547 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/turbogit/default.nix @@ -0,0 +1,42 @@ +{ fetchFromGitHub, buildGoModule, lib, installShellFiles }: +buildGoModule rec { + pname = "turbogit"; + version = "1.2.0"; + + src = fetchFromGitHub { + owner = "b4nst"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-alVgXnsoC2nmUe6i/l0ttUjoXpKLHr0n/7p6WbIIGBU="; + }; + + vendorSha256 = "sha256-6fxbxpROYiNw5SYdQAIdy5NfqzOcFfAlJ+vTQyFtink="; + + subPackages = [ "." ]; + + nativeBuildInputs = [ installShellFiles ]; + postInstall = '' + # Move turbogit binary to tug + ln -s $out/bin/turbogit $out/bin/tug + + # Generate completion files + mkdir -p share/completions + $out/bin/tug completion bash > share/completions/tug.bash + $out/bin/tug completion fish > share/completions/tug.fish + $out/bin/tug completion zsh > share/completions/tug.zsh + + installShellCompletion share/completions/tug.{bash,fish,zsh} + ''; + + meta = with lib; { + description = "Keep your git workflow clean without headache."; + longDescription = '' + turbogit (tug) is a cli tool built to help you deal with your day-to-day git work. + turbogit enforces convention (e.g. The Conventional Commits) but tries to keep things simple and invisible for you. + turbogit is your friend. + ''; + homepage = "https://b4nst.github.io/turbogit"; + license = licenses.mit; + maintainers = [ maintainers.yusdacra ]; + }; +} diff --git a/nixpkgs/pkgs/development/tools/tychus/default.nix b/nixpkgs/pkgs/development/tools/tychus/default.nix index edd428480a00..8b330b36ea99 100644 --- a/nixpkgs/pkgs/development/tools/tychus/default.nix +++ b/nixpkgs/pkgs/development/tools/tychus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildGoPackage, CoreFoundation }: +{ lib, stdenv, fetchFromGitHub, buildGoPackage, CoreFoundation }: buildGoPackage rec { pname = "tychus"; @@ -15,13 +15,13 @@ buildGoPackage rec { sha256 = "02ybxjsfga89gpg0k21zmykhhnpx1vy3ny8fcwj0qsg73i11alvw"; }; - buildInputs = stdenv.lib.optionals stdenv.hostPlatform.isDarwin [ CoreFoundation ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreFoundation ]; buildFlags = [ "--tags" "release" ]; meta = { description = "Command line utility to live-reload your application"; homepage = "https://github.com/devlocker/tychus"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }; } diff --git a/nixpkgs/pkgs/development/tools/tychus/deps.nix b/nixpkgs/pkgs/development/tools/tychus/deps.nix index 194aa96ae3ce..e8897efffc95 100644 --- a/nixpkgs/pkgs/development/tools/tychus/deps.nix +++ b/nixpkgs/pkgs/development/tools/tychus/deps.nix @@ -27,4 +27,4 @@ sha256 = "13mhx4i913jil32j295m3a36jzvq1y64xig0naadiz7q9ja011r2"; }; } -] \ No newline at end of file +] diff --git a/nixpkgs/pkgs/development/tools/udis86/default.nix b/nixpkgs/pkgs/development/tools/udis86/default.nix index 6996d5bf13fa..22977d6ea954 100644 --- a/nixpkgs/pkgs/development/tools/udis86/default.nix +++ b/nixpkgs/pkgs/development/tools/udis86/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, python }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, python }: stdenv.mkDerivation rec { pname = "udis86"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { outputs = [ "bin" "out" "dev" "lib" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://udis86.sourceforge.net"; license = licenses.bsd2; maintainers = with maintainers; [ timor ]; diff --git a/nixpkgs/pkgs/development/tools/uftrace/default.nix b/nixpkgs/pkgs/development/tools/uftrace/default.nix index 2fbf73665382..03ee72289014 100644 --- a/nixpkgs/pkgs/development/tools/uftrace/default.nix +++ b/nixpkgs/pkgs/development/tools/uftrace/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub}: +{lib, stdenv, fetchFromGitHub}: stdenv.mkDerivation rec { pname = "uftrace"; @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { meta = { description = "Function (graph) tracer for user-space"; homepage = "https://github.com/namhyung/uftrace"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; - maintainers = [stdenv.lib.maintainers.nthorne]; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; + maintainers = [lib.maintainers.nthorne]; }; } diff --git a/nixpkgs/pkgs/development/tools/unity3d/default.nix b/nixpkgs/pkgs/development/tools/unity3d/default.nix index dfb5f6abf481..5c41a1dac931 100644 --- a/nixpkgs/pkgs/development/tools/unity3d/default.nix +++ b/nixpkgs/pkgs/development/tools/unity3d/default.nix @@ -29,7 +29,7 @@ in stdenv.mkDerivation { version = "${ver}x${build}"; src = fetchurl { - url = "https://beta.unity3d.com/download/6e9a27477296/LinuxEditorInstaller/Unity.tar.xz"; + url = "https://beta.unity3d.com/download/6e9a27477296/LinuxEditorInstaller/Unity.tar.xz"; sha1 = "083imikkrgha5w9sihjvv1m74naxm5yv"; }; @@ -129,7 +129,7 @@ in stdenv.mkDerivation { dontStrip = true; dontPatchELF = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://unity3d.com/"; description = "Game development tool"; longDescription = '' diff --git a/nixpkgs/pkgs/development/tools/unityhub/default.nix b/nixpkgs/pkgs/development/tools/unityhub/default.nix index 85b7a704b9cc..9a2c1d72caa3 100644 --- a/nixpkgs/pkgs/development/tools/unityhub/default.nix +++ b/nixpkgs/pkgs/development/tools/unityhub/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, appimageTools, gsettings-desktop-schemas, gtk3 }: +{ lib, stdenv, fetchurl, appimageTools, gsettings-desktop-schemas, gtk3 }: let version = "2.3.2"; @@ -13,7 +13,7 @@ in appimageTools.wrapType2 rec { libX11 libXcursor libXdamage libXfixes libXrender libXi libXcomposite libXext libXrandr libXtst libSM libICE libxcb - libselinux pciutils libpulseaudio libxml2 + libselinux pciutils libpulseaudio libxml2 icu clang ]); profile = '' @@ -26,7 +26,7 @@ in appimageTools.wrapType2 rec { sha256 = "07nfyfp9apshqarc6pgshsczila6x4943hiyyizc55kp85aw0imn"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://unity3d.com/"; description = "Game development tool"; longDescription = '' diff --git a/nixpkgs/pkgs/development/tools/vagrant/default.nix b/nixpkgs/pkgs/development/tools/vagrant/default.nix index b3f1bf1a5b8f..701b973ad4f7 100644 --- a/nixpkgs/pkgs/development/tools/vagrant/default.nix +++ b/nixpkgs/pkgs/development/tools/vagrant/default.nix @@ -34,7 +34,7 @@ let for gem in "$out"/lib/ruby/gems/*/gems/*; do cp -a "$gem/" "$gem.new" rm "$gem" - # needed on macOS, otherwise the mv yields permission denied + # needed on macOS, otherwise the mv yields permission denied chmod +w "$gem.new" mv "$gem.new" "$gem" done diff --git a/nixpkgs/pkgs/development/tools/vagrant/gemset.nix b/nixpkgs/pkgs/development/tools/vagrant/gemset.nix index 169c3533efcb..e617e1a58729 100644 --- a/nixpkgs/pkgs/development/tools/vagrant/gemset.nix +++ b/nixpkgs/pkgs/development/tools/vagrant/gemset.nix @@ -363,4 +363,4 @@ }; version = "1.3.5"; }; -} \ No newline at end of file +} diff --git a/nixpkgs/pkgs/development/tools/vagrant/gemset_libvirt.nix b/nixpkgs/pkgs/development/tools/vagrant/gemset_libvirt.nix index df6b6c40496b..f50f4438f50d 100644 --- a/nixpkgs/pkgs/development/tools/vagrant/gemset_libvirt.nix +++ b/nixpkgs/pkgs/development/tools/vagrant/gemset_libvirt.nix @@ -156,4 +156,4 @@ }; version = "0.2.1"; }; -} \ No newline at end of file +} diff --git a/nixpkgs/pkgs/development/tools/vala-language-server/default.nix b/nixpkgs/pkgs/development/tools/vala-language-server/default.nix index f26615e26b7a..696776a69720 100644 --- a/nixpkgs/pkgs/development/tools/vala-language-server/default.nix +++ b/nixpkgs/pkgs/development/tools/vala-language-server/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , nix-update-script , meson @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { vala ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Code Intelligence for Vala & Genie"; homepage = "https://github.com/benwaffle/vala-language-server"; license = licenses.lgpl21Plus; diff --git a/nixpkgs/pkgs/development/tools/vala-lint/default.nix b/nixpkgs/pkgs/development/tools/vala-lint/default.nix index 378bc935e22a..a45ced8a4922 100644 --- a/nixpkgs/pkgs/development/tools/vala-lint/default.nix +++ b/nixpkgs/pkgs/development/tools/vala-lint/default.nix @@ -1,10 +1,10 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , glib , meson , ninja , pantheon -, pkgconfig +, pkg-config , vala , gettext , wrapGAppsHook @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { gettext meson ninja - pkgconfig + pkg-config vala wrapGAppsHook ]; @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { # See https://github.com/vala-lang/vala-lint/issues/133 doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/vala-lang/vala-lint"; description = "Check Vala code files for code-style errors"; longDescription = '' diff --git a/nixpkgs/pkgs/development/tools/vcstool/default.nix b/nixpkgs/pkgs/development/tools/vcstool/default.nix index e99f7dca9bf5..65f91b3324f5 100644 --- a/nixpkgs/pkgs/development/tools/vcstool/default.nix +++ b/nixpkgs/pkgs/development/tools/vcstool/default.nix @@ -1,4 +1,4 @@ -{ stdenv, python3Packages +{ lib, stdenv, python3Packages , git, breezy, subversion }: with python3Packages; @@ -14,11 +14,11 @@ buildPythonApplication rec { propagatedBuildInputs = [ pyyaml setuptools ]; - makeWrapperArgs = ["--prefix" "PATH" ":" (stdenv.lib.makeBinPath [ git breezy subversion ])]; + makeWrapperArgs = ["--prefix" "PATH" ":" (lib.makeBinPath [ git breezy subversion ])]; doCheck = false; # requires network - meta = with stdenv.lib; { + meta = with lib; { description = "Provides a command line tool to invoke vcs commands on multiple repositories"; homepage = "https://github.com/dirk-thomas/vcstool"; license = licenses.asl20; diff --git a/nixpkgs/pkgs/development/tools/vend/default.nix b/nixpkgs/pkgs/development/tools/vend/default.nix index ef59ea8dd65c..cfadf694320e 100644 --- a/nixpkgs/pkgs/development/tools/vend/default.nix +++ b/nixpkgs/pkgs/development/tools/vend/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ lib, stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "vend"; @@ -28,7 +28,7 @@ buildGoModule rec { vendorSha256 = null; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/nomad-software/vend"; description = "A utility which vendors go code including c dependencies"; maintainers = with maintainers; [ c00w mic92 zowoq ]; diff --git a/nixpkgs/pkgs/development/tools/vogl/default.nix b/nixpkgs/pkgs/development/tools/vogl/default.nix index 5c3b2abe4a47..315a896929dc 100644 --- a/nixpkgs/pkgs/development/tools/vogl/default.nix +++ b/nixpkgs/pkgs/development/tools/vogl/default.nix @@ -1,5 +1,5 @@ { mkDerivation, lib, fetchFromGitHub -, cmake, git, pkgconfig, wget, zip +, cmake, git, pkg-config, wget, zip , qtbase, qtx11extras , libdwarf, libjpeg_turbo, libunwind, lzma, tinyxml, libX11 , SDL2, SDL2_gfx, SDL2_image, SDL2_ttf @@ -26,7 +26,7 @@ mkDerivation { }) ]; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ git wget zip diff --git a/nixpkgs/pkgs/development/tools/vulkan-validation-layers/default.nix b/nixpkgs/pkgs/development/tools/vulkan-validation-layers/default.nix index 25fb4077abc4..fdf66004deb3 100644 --- a/nixpkgs/pkgs/development/tools/vulkan-validation-layers/default.nix +++ b/nixpkgs/pkgs/development/tools/vulkan-validation-layers/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , cmake , writeText @@ -8,7 +8,7 @@ , vulkan-headers , vulkan-loader , glslang -, pkgconfig +, pkg-config , xlibsWrapper , libxcb , libXrandr @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config cmake python3 ]; @@ -80,8 +80,6 @@ stdenv.mkDerivation rec { wayland ]; - enableParallelBuilding = true; - cmakeFlags = [ "-DGLSLANG_INSTALL_DIR=${localGlslang}" "-DSPIRV_HEADERS_INSTALL_DIR=${localSpirvHeaders}" @@ -99,7 +97,7 @@ stdenv.mkDerivation rec { sed "s|\([[:space:]]*set(INSTALL_DEFINES \''${INSTALL_DEFINES} -DRELATIVE_LAYER_BINARY=\"\)\(\$<TARGET_FILE_NAME:\''${TARGET_NAME}>\")\)|\1$out/lib/\2|" -i layers/CMakeLists.txt ''; - meta = with stdenv.lib; { + meta = with lib; { description = "The official Khronos Vulkan validation layers"; homepage = "https://github.com/KhronosGroup/Vulkan-ValidationLayers"; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/development/tools/vultr-cli/default.nix b/nixpkgs/pkgs/development/tools/vultr-cli/default.nix index 58ee064ad552..23dda32b7232 100644 --- a/nixpkgs/pkgs/development/tools/vultr-cli/default.nix +++ b/nixpkgs/pkgs/development/tools/vultr-cli/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ lib, stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "vultr-cli"; @@ -15,7 +15,7 @@ buildGoModule rec { doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Official command line tool for Vultr services"; homepage = "https://github.com/vultr/vultr-cli"; license = licenses.asl20; diff --git a/nixpkgs/pkgs/development/tools/vultr/default.nix b/nixpkgs/pkgs/development/tools/vultr/default.nix index 7c396f69f259..b9ca0febf971 100644 --- a/nixpkgs/pkgs/development/tools/vultr/default.nix +++ b/nixpkgs/pkgs/development/tools/vultr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "vultr"; @@ -15,7 +15,7 @@ buildGoPackage rec { meta = { description = "A command line tool for Vultr services, a provider for cloud virtual private servers"; homepage = "https://github.com/JamesClonk/vultr"; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.zauberpony ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.zauberpony ]; }; } diff --git a/nixpkgs/pkgs/development/tools/wabt/default.nix b/nixpkgs/pkgs/development/tools/wabt/default.nix index b910a31e1552..27b11870a899 100644 --- a/nixpkgs/pkgs/development/tools/wabt/default.nix +++ b/nixpkgs/pkgs/development/tools/wabt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchpatch, fetchFromGitHub, cmake, python3, substituteAll }: +{ lib, stdenv, fetchpatch, fetchFromGitHub, cmake, python3, substituteAll }: stdenv.mkDerivation rec { pname = "wabt"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_TESTS=OFF" "-DCMAKE_PROJECT_VERSION=${version}" ]; buildInputs = [ python3 ]; - meta = with stdenv.lib; { + meta = with lib; { description = "The WebAssembly Binary Toolkit"; longDescription = '' WABT (pronounced "wabbit") is a suite of tools for WebAssembly, including: diff --git a/nixpkgs/pkgs/development/tools/wasm-bindgen-cli/default.nix b/nixpkgs/pkgs/development/tools/wasm-bindgen-cli/default.nix index 5794f5cc335e..0024c43e05df 100644 --- a/nixpkgs/pkgs/development/tools/wasm-bindgen-cli/default.nix +++ b/nixpkgs/pkgs/development/tools/wasm-bindgen-cli/default.nix @@ -1,4 +1,4 @@ -{ rustPlatform, fetchFromGitHub, lib, openssl, pkgconfig, stdenv, curl, Security +{ rustPlatform, fetchFromGitHub, lib, openssl, pkg-config, stdenv, curl, Security , runCommand }: @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { ''; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security curl ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; cargoSha256 = "1wrfly7c3an1mjqm7v13mlvx57hwlcxfjijkimicck04q6qdhbp6"; cargoBuildFlags = [ "-p" pname ]; diff --git a/nixpkgs/pkgs/development/tools/wasm-pack/default.nix b/nixpkgs/pkgs/development/tools/wasm-pack/default.nix index 93bda0b81807..94ee6d3a1bac 100644 --- a/nixpkgs/pkgs/development/tools/wasm-pack/default.nix +++ b/nixpkgs/pkgs/development/tools/wasm-pack/default.nix @@ -1,7 +1,7 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , rustPlatform -, pkgconfig +, pkg-config , libressl , curl , Security @@ -20,20 +20,20 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "0fw04hgxxqsbp1pylp32yd087r9bb8bpa05v90qdshkgp6znfl9s"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ # LibreSSL works around segfault issues caused by OpenSSL being unable to # gracefully exit while doing work. # See: https://github.com/rustwasm/wasm-pack/issues/650 libressl - ] ++ stdenv.lib.optionals stdenv.isDarwin [ curl Security ]; + ] ++ lib.optionals stdenv.isDarwin [ curl Security ]; # Most tests rely on external resources and build artifacts. # Disabling check here to work with build sandboxing. doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "A utility that builds rust-generated WebAssembly package"; homepage = "https://github.com/rustwasm/wasm-pack"; license = with licenses; [ asl20 /* or */ mit ]; diff --git a/nixpkgs/pkgs/development/tools/watchman/default.nix b/nixpkgs/pkgs/development/tools/watchman/default.nix index 63f2b0e4933d..2acbf13e2789 100644 --- a/nixpkgs/pkgs/development/tools/watchman/default.nix +++ b/nixpkgs/pkgs/development/tools/watchman/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, config, fetchFromGitHub, autoconf, automake, pcre -, libtool, pkgconfig, openssl +, libtool, pkg-config, openssl , confFile ? config.watchman.confFile or null , withApple ? stdenv.isDarwin, CoreServices }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sha256 = "0fdaj5pmicm6j17d5q7px800m5rmam1a400x3hv1iiifnmhgnkal"; }; - nativeBuildInputs = [ autoconf automake pkgconfig libtool ]; + nativeBuildInputs = [ autoconf automake pkg-config libtool ]; buildInputs = [ pcre openssl ] ++ lib.optionals withApple [ CoreServices ]; diff --git a/nixpkgs/pkgs/development/tools/wiggle/default.nix b/nixpkgs/pkgs/development/tools/wiggle/default.nix index b89d36273f86..e861f20a9194 100644 --- a/nixpkgs/pkgs/development/tools/wiggle/default.nix +++ b/nixpkgs/pkgs/development/tools/wiggle/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses, groff }: +{ lib, stdenv, fetchurl, ncurses, groff }: stdenv.mkDerivation { @@ -37,8 +37,8 @@ stdenv.mkDerivation { already been applied, and will ignore them. ''; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.all; }; } diff --git a/nixpkgs/pkgs/development/tools/wiiload/default.nix b/nixpkgs/pkgs/development/tools/wiiload/default.nix index 37d909461d07..2f2fe174d14e 100644 --- a/nixpkgs/pkgs/development/tools/wiiload/default.nix +++ b/nixpkgs/pkgs/development/tools/wiiload/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, zlib }: +{ lib, stdenv, fetchFromGitHub, autoconf, automake, zlib }: stdenv.mkDerivation rec { version = "0.5.1"; pname = "wiiload"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { preConfigure = "./autogen.sh"; - meta = with stdenv.lib; { + meta = with lib; { description = "Load homebrew apps over network/usbgecko to your Wii"; homepage = "https://wiibrew.org/wiki/Wiiload"; license = licenses.gpl2; diff --git a/nixpkgs/pkgs/development/tools/winpdb/default.nix b/nixpkgs/pkgs/development/tools/winpdb/default.nix index 8db0b719c67b..b7eaabe8693f 100644 --- a/nixpkgs/pkgs/development/tools/winpdb/default.nix +++ b/nixpkgs/pkgs/development/tools/winpdb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pythonPackages, makeDesktopItem }: +{ lib, stdenv, fetchurl, pythonPackages, makeDesktopItem }: pythonPackages.buildPythonApplication rec { name = "winpdb-1.4.8"; @@ -36,7 +36,10 @@ pythonPackages.buildPythonApplication rec { cp artwork/winpdb-icon.svg "$out"/share/icons/winpdb.svg ''; - meta = with stdenv.lib; { + # no tests + doCheck = false; + + meta = with lib; { description = "Platform independent Python debugger"; longDescription = '' Winpdb is a platform independent GPL Python debugger with support for diff --git a/nixpkgs/pkgs/development/tools/wllvm/default.nix b/nixpkgs/pkgs/development/tools/wllvm/default.nix index cd002bd2ef61..a3702f2e3e65 100644 --- a/nixpkgs/pkgs/development/tools/wllvm/default.nix +++ b/nixpkgs/pkgs/development/tools/wllvm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, python3Packages }: +{ lib, stdenv, python3Packages }: python3Packages.buildPythonApplication rec { version = "1.2.8"; @@ -10,7 +10,7 @@ python3Packages.buildPythonApplication rec { sha256 = "1d88fzg4ba4r3hwrinnv6agiyj3xxdy4yryb8wz2ml51nc6bi591"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/travitch/whole-program-llvm"; description = "A wrapper script to build whole-program LLVM bitcode files"; license = licenses.mit; diff --git a/nixpkgs/pkgs/development/tools/wrangler/default.nix b/nixpkgs/pkgs/development/tools/wrangler/default.nix index 6b85e20612bf..c7b1c0329f3a 100644 --- a/nixpkgs/pkgs/development/tools/wrangler/default.nix +++ b/nixpkgs/pkgs/development/tools/wrangler/default.nix @@ -1,22 +1,22 @@ -{ stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl, curl, darwin, perl }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl, curl, darwin, perl }: rustPlatform.buildRustPackage rec { pname = "wrangler"; - version = "1.12.3"; + version = "1.13.0"; src = fetchFromGitHub { owner = "cloudflare"; repo = pname; rev = "v${version}"; - sha256 = "1h9020yf5jsbilzn94h7qyxw9qnz3vw43g8a2415wvjqq6ihzfvm"; + sha256 = "0xhldarzb71x4k7ydk4yd6g0qv6y2l0mn2lc43hvl9jm29pnz95q"; }; - cargoSha256 = "12azc41y2yx936ax9b1yylc0gy91k0m7ih6p0bkw7m928f762hpx"; + cargoSha256 = "0w845virvw7mvibc76ar2hbffhfzj2v8v1xkrsssrgzyaryb48jk"; - nativeBuildInputs = [ perl ] ++ stdenv.lib.optionals stdenv.isLinux [ pkg-config ]; + nativeBuildInputs = [ perl ] ++ lib.optionals stdenv.isLinux [ pkg-config ]; - buildInputs = stdenv.lib.optionals stdenv.isLinux [ openssl ] - ++ stdenv.lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.isLinux [ openssl ] + ++ lib.optionals stdenv.isDarwin [ curl darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.CoreServices @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { # tries to use "/homeless-shelter" and fails doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "A CLI tool designed for folks who are interested in using Cloudflare Workers"; homepage = "https://github.com/cloudflare/wrangler"; license = with licenses; [ asl20 /* or */ mit ]; diff --git a/nixpkgs/pkgs/development/tools/ws/default.nix b/nixpkgs/pkgs/development/tools/ws/default.nix index 4a6d8892208d..3026289fec1e 100644 --- a/nixpkgs/pkgs/development/tools/ws/default.nix +++ b/nixpkgs/pkgs/development/tools/ws/default.nix @@ -1,5 +1,5 @@ # This file was generated by https://github.com/kamilchm/go2nix v1.2.1 -{ stdenv, buildGoPackage, fetchgit }: +{ lib, stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { pname = "ws"; @@ -14,7 +14,7 @@ buildGoPackage rec { sha256 = "192slrz1cj1chzmfrl0d9ai8bq6s4w0iwpvxkhxb9krga7mkp9xb"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "websocket command line tool"; homepage = "https://github.com/hashrocket/ws"; license = licenses.mit; diff --git a/nixpkgs/pkgs/development/tools/wxformbuilder/default.nix b/nixpkgs/pkgs/development/tools/wxformbuilder/default.nix index a3f8196b124b..5c78d730d203 100644 --- a/nixpkgs/pkgs/development/tools/wxformbuilder/default.nix +++ b/nixpkgs/pkgs/development/tools/wxformbuilder/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , wxGTK31 , meson @@ -26,7 +26,7 @@ stdenv.mkDerivation { wxGTK31 ]; - meta = with stdenv.lib; { + meta = with lib; { description = "RAD tool for wxWidgets GUI design"; homepage = "https://github.com/wxFormBuilder/wxFormBuilder"; license = licenses.gpl2; diff --git a/nixpkgs/pkgs/development/tools/xcbuild/default.nix b/nixpkgs/pkgs/development/tools/xcbuild/default.nix index cb2e6edd0e10..1f38e49daee5 100644 --- a/nixpkgs/pkgs/development/tools/xcbuild/default.nix +++ b/nixpkgs/pkgs/development/tools/xcbuild/default.nix @@ -1,4 +1,4 @@ -{ stdenv, cmake, fetchFromGitHub, zlib, libxml2, libpng +{ lib, stdenv, cmake, fetchFromGitHub, zlib, libxml2, libpng , CoreServices, CoreGraphics, ImageIO, ninja }: let @@ -36,19 +36,17 @@ in stdenv.mkDerivation { cp -r --no-preserve=all ${linenoise} ThirdParty/linenoise ''; - postPatch = stdenv.lib.optionalString (!stdenv.isDarwin) '' + postPatch = lib.optionalString (!stdenv.isDarwin) '' # Avoid a glibc >= 2.25 deprecation warning that gets fatal via -Werror. sed 1i'#include <sys/sysmacros.h>' \ -i Libraries/xcassets/Headers/xcassets/Slot/SystemVersion.h - '' + stdenv.lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' # Apple Open Sourced LZFSE, but not libcompression, and it isn't # part of an impure framework we can add substituteInPlace Libraries/libcar/Sources/Rendition.cpp \ --replace "#if HAVE_LIBCOMPRESSION" "#if 0" ''; - enableParallelBuilding = true; - # TODO: instruct cmake not to put it in /usr, rather than cleaning up postInstall = '' mv $out/usr/* $out @@ -59,10 +57,11 @@ in stdenv.mkDerivation { cmakeFlags = [ "-GNinja" ]; - buildInputs = [ cmake zlib libxml2 libpng ninja ] - ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices CoreGraphics ImageIO ]; + nativeBuildInputs = [ cmake ninja ]; + buildInputs = [ zlib libxml2 libpng ] + ++ lib.optionals stdenv.isDarwin [ CoreServices CoreGraphics ImageIO ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Xcode-compatible build tool"; homepage = "https://github.com/facebook/xcbuild"; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/development/tools/xcpretty/gemset.nix b/nixpkgs/pkgs/development/tools/xcpretty/gemset.nix index 30c68a93c13f..ef5591c30cf3 100644 --- a/nixpkgs/pkgs/development/tools/xcpretty/gemset.nix +++ b/nixpkgs/pkgs/development/tools/xcpretty/gemset.nix @@ -16,4 +16,4 @@ }; version = "0.3.0"; }; -} \ No newline at end of file +} diff --git a/nixpkgs/pkgs/development/tools/xib2nib/default.nix b/nixpkgs/pkgs/development/tools/xib2nib/default.nix index 4d62f5b85714..67900dda1406 100644 --- a/nixpkgs/pkgs/development/tools/xib2nib/default.nix +++ b/nixpkgs/pkgs/development/tools/xib2nib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pugixml, boost, PlistCpp }: +{ lib, stdenv, fetchFromGitHub, pugixml, boost, PlistCpp }: stdenv.mkDerivation { name = "xib2nib-730e177"; @@ -13,7 +13,7 @@ stdenv.mkDerivation { buildInputs = [ PlistCpp pugixml boost ]; makeFlags = [ "PREFIX=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { maintainers = with maintainers; [ matthewbauer ]; description = "Compiles CocoaTouch .xib files into .nib"; license = licenses.mit; diff --git a/nixpkgs/pkgs/development/tools/xqilla/default.nix b/nixpkgs/pkgs/development/tools/xqilla/default.nix index e97a6f1cdb78..033d18608ac8 100644 --- a/nixpkgs/pkgs/development/tools/xqilla/default.nix +++ b/nixpkgs/pkgs/development/tools/xqilla/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, xercesc }: +{ lib, stdenv, fetchurl, xercesc }: stdenv.mkDerivation rec { pname = "xqilla"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-xerces=${xercesc}" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "An XQuery and XPath 2 library and command line utility written in C++, implemented on top of the Xerces-C library"; license = licenses.asl20 ; maintainers = with maintainers; [ obadz ]; diff --git a/nixpkgs/pkgs/development/tools/yaml2json/default.nix b/nixpkgs/pkgs/development/tools/yaml2json/default.nix index e1427476dd8c..d707caaec5a7 100644 --- a/nixpkgs/pkgs/development/tools/yaml2json/default.nix +++ b/nixpkgs/pkgs/development/tools/yaml2json/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage { @@ -15,7 +15,7 @@ buildGoPackage { sha256 = "16a2sqzbam5adbhfvilnpdabzwncs7kgpr0cn4gp09h2imzsprzw"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/bronze1man/yaml2json"; description = "Convert yaml to json"; license = with licenses; [ mit ]; diff --git a/nixpkgs/pkgs/development/tools/yarn/default.nix b/nixpkgs/pkgs/development/tools/yarn/default.nix index 7151c872e4d0..1868bdaf2c32 100644 --- a/nixpkgs/pkgs/development/tools/yarn/default.nix +++ b/nixpkgs/pkgs/development/tools/yarn/default.nix @@ -1,4 +1,4 @@ -{ stdenv, nodejs, fetchzip }: +{ lib, stdenv, nodejs, fetchzip }: stdenv.mkDerivation rec { pname = "yarn"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ln -s $out/libexec/yarn/bin/yarn.js $out/bin/yarnpkg ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://yarnpkg.com/"; description = "Fast, reliable, and secure dependency management for javascript"; license = licenses.bsd2; diff --git a/nixpkgs/pkgs/development/tools/ydiff/default.nix b/nixpkgs/pkgs/development/tools/ydiff/default.nix deleted file mode 100644 index 510808fc4127..000000000000 --- a/nixpkgs/pkgs/development/tools/ydiff/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ stdenv, lib, pythonPackages, python3Packages, less, patchutils, git -, subversion, coreutils, which }: - -with pythonPackages; - -buildPythonApplication rec { - pname = "ydiff"; - version = "1.2"; - - src = fetchPypi { - inherit pname version; - sha256 = "f5430577ecd30974d766ee9b8333e06dc76a947b4aae36d39612a0787865a121"; - }; - - patchPhase = '' - substituteInPlace tests/test_ydiff.py \ - --replace /bin/rm ${coreutils}/bin/rm \ - --replace /bin/sh ${stdenv.shell} - substituteInPlace Makefile \ - --replace "pep8 --ignore" "# pep8 --ignore" \ - --replace "python3 \`which coverage\`" "${python3Packages.coverage}/bin/coverage3" \ - --replace /bin/sh ${stdenv.shell} \ - --replace tests/regression.sh "${stdenv.shell} tests/regression.sh" - patchShebangs tests/*.sh - ''; - - buildInputs = [ docutils pygments ]; - propagatedBuildInputs = [ less patchutils ]; - checkInputs = [ coverage coreutils git subversion which ]; - - checkTarget = if isPy3k then "test3" else "test"; - - meta = { - homepage = "https://github.com/ymattw/ydiff"; - description = "View colored, incremental diff in workspace or from stdin"; - longDescription = '' - Term based tool to view colored, incremental diff in a version - controlled workspace (supports Git, Mercurial, Perforce and Svn - so far) or from stdin, with side by side (similar to diff -y) - and auto pager support. - ''; - license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ leenaars ]; - }; -} diff --git a/nixpkgs/pkgs/development/tools/yj/default.nix b/nixpkgs/pkgs/development/tools/yj/default.nix index 43771e4b6798..68ecaf6479eb 100644 --- a/nixpkgs/pkgs/development/tools/yj/default.nix +++ b/nixpkgs/pkgs/development/tools/yj/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ lib, stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "yj"; @@ -15,8 +15,8 @@ buildGoModule rec { buildFlagsArray = [ "-ldflags=-s -w -X main.Version=${version}" ]; - meta = with stdenv.lib; { - description = ''Convert YAML <=> TOML <=> JSON <=> HCL''; + meta = with lib; { + description = "Convert YAML <=> TOML <=> JSON <=> HCL"; license = licenses.asl20; maintainers = with maintainers; [ Profpatsch ]; homepage = "https://github.com/sclevine/yj"; diff --git a/nixpkgs/pkgs/development/tools/yq-go/default.nix b/nixpkgs/pkgs/development/tools/yq-go/default.nix index 479494e515d7..878661e74ce0 100644 --- a/nixpkgs/pkgs/development/tools/yq-go/default.nix +++ b/nixpkgs/pkgs/development/tools/yq-go/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "yq-go"; - version = "3.4.1"; + version = "4.4.1"; src = fetchFromGitHub { owner = "mikefarah"; - rev = version; + rev = "v${version}"; repo = "yq"; - sha256 = "09kcqa15assjhp3kdffa3yhc2vykinzgscjzg996qa85kjircy9b"; + sha256 = "sha256-U1nMSwWKzPvyvxUx8J50AMB251ET4s9xcSrjGGjkYus="; }; - vendorSha256 = "0l5bhbp8dfq04hb4xcpx96ksfwx4xvk0pj5ma00rk3z913ikygcd"; + vendorSha256 = "sha256-CUELy6ajaoVzomY5lMen24DFJke3IyFzqWYyF7sws5g="; doCheck = false; @@ -19,7 +19,7 @@ buildGoModule rec { postInstall = '' for shell in bash fish zsh; do - $out/bin/yq shell-completion --variation $shell > yq.$shell + $out/bin/yq shell-completion $shell > yq.$shell installShellCompletion yq.$shell done ''; diff --git a/nixpkgs/pkgs/development/tools/yuicompressor/default.nix b/nixpkgs/pkgs/development/tools/yuicompressor/default.nix index 70160c1ce664..05c1b62477b0 100644 --- a/nixpkgs/pkgs/development/tools/yuicompressor/default.nix +++ b/nixpkgs/pkgs/development/tools/yuicompressor/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchurl, makeWrapper, jre }: +{ lib, stdenv, fetchurl, makeWrapper, jre }: stdenv.mkDerivation rec { pname = "yuicompressor"; version = "2.4.8"; - + src = fetchurl { url = "https://github.com/yui/yuicompressor/releases/download/v${version}/${pname}-${version}.jar"; sha256 = "1qjxlak9hbl9zd3dl5ks0w4zx5z64wjsbk7ic73r1r45fasisdrh"; @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { makeWrapper ${jre}/bin/java $out/bin/yuicompressor --add-flags \ "-cp $out/lib/yuicompressor.jar com.yahoo.platform.yui.compressor.YUICompressor" ''; - - meta = with stdenv.lib; { + + meta = with lib; { description = "A JavaScript and CSS minifier"; homepage = "http://yui.github.io/yuicompressor/"; license = licenses.bsd3; |