diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2021-01-24 20:41:42 +0100 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2021-01-24 20:41:42 +0100 |
commit | cc8fd11ffb7fe5cd7f1cfa75ea987429f1b2e77d (patch) | |
tree | e72cb717dfc1161f4a6a2218cc11dc6a07bdec05 /pkgs/development/tools | |
parent | 09e2990117c2eb0f9ab054ecf65cda7d55ca0dfc (diff) | |
parent | 27955d37e97b5a35c83222345f057b322334c7ac (diff) |
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/development/tools')
21 files changed, 70 insertions, 71 deletions
diff --git a/pkgs/development/tools/build-managers/bam/default.nix b/pkgs/development/tools/build-managers/bam/default.nix index 8eb197151a32..a828c57b8c00 100644 --- a/pkgs/development/tools/build-managers/bam/default.nix +++ b/pkgs/development/tools/build-managers/bam/default.nix @@ -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" diff --git a/pkgs/development/tools/build-managers/doit/default.nix b/pkgs/development/tools/build-managers/doit/default.nix deleted file mode 100644 index d48f0d4d56b6..000000000000 --- a/pkgs/development/tools/build-managers/doit/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ lib, 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 ] - ++ lib.optional stdenv.isLinux pyinotify - ++ lib.optional stdenv.isDarwin macfsevents; - - # Tests fail due to mysterious gdbm.open() resource temporarily - # unavailable errors. - doCheck = false; - checkPhase = "py.test"; - - meta = with 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/pkgs/development/tools/doctl/default.nix b/pkgs/development/tools/doctl/default.nix index 609df797b585..4d05bd3ed114 100644 --- a/pkgs/development/tools/doctl/default.nix +++ b/pkgs/development/tools/doctl/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "doctl"; - version = "1.54.1"; + version = "1.55.0"; vendorSha256 = null; @@ -32,7 +32,7 @@ buildGoModule rec { owner = "digitalocean"; repo = "doctl"; rev = "v${version}"; - sha256 = "sha256-f8jD+kFW4Y7Sfi1p4TOtW3Lwsf6cqCEDjj+XL4A3eh0="; + sha256 = "sha256-vhg5X8H4VegSDORtj1rgNKlWQo1H1e/vvO01LJkVK+A="; }; meta = with lib; { diff --git a/pkgs/development/tools/go-motion/default.nix b/pkgs/development/tools/go-motion/default.nix index 824668055b1d..9ece650f0cb2 100644 --- a/pkgs/development/tools/go-motion/default.nix +++ b/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/pkgs/development/tools/go2nix/default.nix b/pkgs/development/tools/go2nix/default.nix index 618ddc7d4501..bcd1f56f5256 100644 --- a/pkgs/development/tools/go2nix/default.nix +++ b/pkgs/development/tools/go2nix/default.nix @@ -21,7 +21,7 @@ buildGoPackage rec { nativeBuildInputs = [ go-bindata gotools makeWrapper ]; - preBuild = ''go generate ./...''; + preBuild = "go generate ./..."; postInstall = '' wrapProgram $out/bin/go2nix \ diff --git a/pkgs/development/tools/gocode-gomod/default.nix b/pkgs/development/tools/gocode-gomod/default.nix index 59f17e8acfd0..995bd3102cc0 100644 --- a/pkgs/development/tools/gocode-gomod/default.nix +++ b/pkgs/development/tools/gocode-gomod/default.nix @@ -9,7 +9,7 @@ buildGoModule rec { # standard packages. allowGoReference = true; - excludedPackages = ''internal/suggest/testdata''; + excludedPackages = "internal/suggest/testdata"; src = fetchFromGitHub { owner = "stamblerre"; diff --git a/pkgs/development/tools/gocode/default.nix b/pkgs/development/tools/gocode/default.nix index a50c5969167a..9bed4073b2b3 100644 --- a/pkgs/development/tools/gocode/default.nix +++ b/pkgs/development/tools/gocode/default.nix @@ -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 diff --git a/pkgs/development/tools/iaca/2.1.nix b/pkgs/development/tools/iaca/2.1.nix index 0fc1dcfbae03..6170cbb4318b 100644 --- a/pkgs/development/tools/iaca/2.1.nix +++ b/pkgs/development/tools/iaca/2.1.nix @@ -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/pkgs/development/tools/ineffassign/default.nix b/pkgs/development/tools/ineffassign/default.nix index 0d0f6824ce77..215809577523 100644 --- a/pkgs/development/tools/ineffassign/default.nix +++ b/pkgs/development/tools/ineffassign/default.nix @@ -9,7 +9,7 @@ buildGoPackage rec { rev = "1003c8bd00dc2869cb5ca5282e6ce33834fed514"; goPackagePath = "github.com/gordonklaus/ineffassign"; - excludedPackages = ''testdata''; + excludedPackages = "testdata"; src = fetchFromGitHub { inherit rev; diff --git a/pkgs/development/tools/interfacer/default.nix b/pkgs/development/tools/interfacer/default.nix index b7f568f4d2b8..4358ee244896 100644 --- a/pkgs/development/tools/interfacer/default.nix +++ b/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/pkgs/development/tools/k6/default.nix b/pkgs/development/tools/k6/default.nix index 6eb99291f8f2..6a8fe4caf01b 100644 --- a/pkgs/development/tools/k6/default.nix +++ b/pkgs/development/tools/k6/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "k6"; - version = "0.29.0"; + version = "0.30.0"; goPackagePath = "github.com/loadimpact/k6"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "loadimpact"; repo = pname; rev = "v${version}"; - sha256 = "1zkw7jga8nsqycvrwnqxifbb5la2z4bmxg3l5638i4xlpn58g711"; + sha256 = "sha256-eUvkW6IBmUp4/zYNlQKrNrxMszdzU8v6tCc2o4DN1As="; }; subPackages = [ "./" ]; diff --git a/pkgs/development/tools/misc/bossa/default.nix b/pkgs/development/tools/misc/bossa/default.nix index bb14e26bfd98..74073722857f 100644 --- a/pkgs/development/tools/misc/bossa/default.nix +++ b/pkgs/development/tools/misc/bossa/default.nix @@ -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 diff --git a/pkgs/development/tools/misc/cl-launch/default.nix b/pkgs/development/tools/misc/cl-launch/default.nix index 1d3a36c5773b..4fe93694ab77 100644 --- a/pkgs/development/tools/misc/cl-launch/default.nix +++ b/pkgs/development/tools/misc/cl-launch/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { meta = { inherit (s) version; - description = ''Common Lisp launcher script''; + description = "Common Lisp launcher script"; license = lib.licenses.llgpl21 ; maintainers = [lib.maintainers.raskin]; platforms = lib.platforms.unix; diff --git a/pkgs/development/tools/misc/grpc-tools/default.nix b/pkgs/development/tools/misc/grpc-tools/default.nix new file mode 100644 index 000000000000..3e06f10cbf1e --- /dev/null +++ b/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/pkgs/development/tools/misc/luarocks/default.nix b/pkgs/development/tools/misc/luarocks/default.nix index 9f83ca5565f7..77f34cca7dec 100644 --- a/pkgs/development/tools/misc/luarocks/default.nix +++ b/pkgs/development/tools/misc/luarocks/default.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { 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/pkgs/development/tools/misc/tet/default.nix b/pkgs/development/tools/misc/tet/default.nix index 5e66b974337f..6bfcb3129236 100644 --- a/pkgs/development/tools/misc/tet/default.nix +++ b/pkgs/development/tools/misc/tet/default.nix @@ -11,13 +11,13 @@ 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"; diff --git a/pkgs/development/tools/mod/default.nix b/pkgs/development/tools/mod/default.nix index 32fd2258daaf..c1d17bba57b9 100644 --- a/pkgs/development/tools/mod/default.nix +++ b/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/pkgs/development/tools/poetry2nix/poetry2nix/pep508.nix b/pkgs/development/tools/poetry2nix/poetry2nix/pep508.nix index ea2f27b0e227..e8d4159deeee 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/pep508.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/pep508.nix @@ -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/pkgs/development/tools/setupcfg2nix/info.nix b/pkgs/development/tools/setupcfg2nix/info.nix index 6b65632bf7d1..17e888fee416 100644 --- a/pkgs/development/tools/setupcfg2nix/info.nix +++ b/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/pkgs/development/tools/slimerjs/default.nix b/pkgs/development/tools/slimerjs/default.nix index b64776bac3c8..76728c5f2d80 100644 --- a/pkgs/development/tools/slimerjs/default.nix +++ b/pkgs/development/tools/slimerjs/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation { ''; meta = { inherit (s) version; - description = ''Gecko-based programmatically-driven browser''; + description = "Gecko-based programmatically-driven browser"; license = lib.licenses.mpl20 ; maintainers = [lib.maintainers.raskin]; platforms = lib.platforms.linux; diff --git a/pkgs/development/tools/yj/default.nix b/pkgs/development/tools/yj/default.nix index 3244d7a0c848..68ecaf6479eb 100644 --- a/pkgs/development/tools/yj/default.nix +++ b/pkgs/development/tools/yj/default.nix @@ -16,7 +16,7 @@ buildGoModule rec { buildFlagsArray = [ "-ldflags=-s -w -X main.Version=${version}" ]; meta = with lib; { - description = ''Convert YAML <=> TOML <=> JSON <=> HCL''; + description = "Convert YAML <=> TOML <=> JSON <=> HCL"; license = licenses.asl20; maintainers = with maintainers; [ Profpatsch ]; homepage = "https://github.com/sclevine/yj"; |