diff options
author | Vladimír Čunát <v@cunat.cz> | 2020-03-10 17:18:44 +0100 |
---|---|---|
committer | Vladimír Čunát <v@cunat.cz> | 2020-03-10 17:18:44 +0100 |
commit | f8d4120c521a09885a948950558d43dabddb4ea5 (patch) | |
tree | 9fe66b9f32e4772fca1639ecf8a6932cde3f9174 /pkgs/development/tools | |
parent | 1e579d1fe46c3c8dc737da99d46d6615fe67d52c (diff) | |
parent | 320334aee7f64b85c7ef4a6c508f51dd182151fa (diff) | |
download | nixlib-f8d4120c521a09885a948950558d43dabddb4ea5.tar nixlib-f8d4120c521a09885a948950558d43dabddb4ea5.tar.gz nixlib-f8d4120c521a09885a948950558d43dabddb4ea5.tar.bz2 nixlib-f8d4120c521a09885a948950558d43dabddb4ea5.tar.lz nixlib-f8d4120c521a09885a948950558d43dabddb4ea5.tar.xz nixlib-f8d4120c521a09885a948950558d43dabddb4ea5.tar.zst nixlib-f8d4120c521a09885a948950558d43dabddb4ea5.zip |
Merge branch 'master' into staging-next
Hydra nixpkgs: ?compare=1574844
Diffstat (limited to 'pkgs/development/tools')
20 files changed, 59 insertions, 88 deletions
diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index 67ded5bbb4a9..c977a9d20820 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "flow"; - version = "0.119.1"; + version = "0.120.1"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "refs/tags/v${version}"; - sha256 = "1p3kjdm4lsbc2lzab3kj1fjvccv8p47bj4s3jnfp2n7qppy7sbbf"; + sha256 = "0cqwwrml7yaqyd52rqcz64gbm1pc0yj5yhqqqj9vqyil8wif30v3"; }; installPhase = '' diff --git a/pkgs/development/tools/analysis/hopper/default.nix b/pkgs/development/tools/analysis/hopper/default.nix index f6c5dcaf1adb..14b61eac374c 100644 --- a/pkgs/development/tools/analysis/hopper/default.nix +++ b/pkgs/development/tools/analysis/hopper/default.nix @@ -12,12 +12,12 @@ }: stdenv.mkDerivation rec { pname = "hopper"; - version = "4.5.19"; + version = "4.5.21"; rev = "v${lib.versions.major version}"; src = fetchurl { url = "https://d2ap6ypl1xbe4k.cloudfront.net/Hopper-${rev}-${version}-Linux.pkg.tar.xz"; - sha256 = "1c9wbjwz5xn0skz2a1wpxyx78hhrm8vcbpzagsg4wwnyblap59db"; + sha256 = "0s733n3hmzpsnrvfryq7kzsvwshd1y9fzm16a64gnii8cmfalrqc"; }; sourceRoot = "."; diff --git a/pkgs/development/tools/analysis/jdepend/default.nix b/pkgs/development/tools/analysis/jdepend/default.nix index 455ff7722fa9..c903833a731a 100644 --- a/pkgs/development/tools/analysis/jdepend/default.nix +++ b/pkgs/development/tools/analysis/jdepend/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "jdepend"; - version = "2.9.1"; + version = "2.10"; src = fetchFromGitHub { owner = "clarkware"; repo = "jdepend"; rev = version; - sha256 = "1sxkgj4k4dhg8vb772pvisyzb8x0gwvlfqqir30ma4zvz3rfz60p"; + sha256 = "1lxf3j9vflky7a2py3i59q7cwd1zvjv2b88l3za39vc90s04dz6k"; }; nativeBuildInputs = [ ant jdk ]; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Traverses Java class file directories and generates design quality metrics for each Java package"; - homepage = http://www.clarkware.com/software/JDepend.html; + homepage = "http://www.clarkware.com/software/JDepend.html"; license = licenses.bsd3; platforms = platforms.linux; maintainers = with maintainers; [ pSub ]; diff --git a/pkgs/development/tools/cloudflare-wrangler/default.nix b/pkgs/development/tools/cloudflare-wrangler/default.nix index d2d4669ad646..a13433e784b1 100644 --- a/pkgs/development/tools/cloudflare-wrangler/default.nix +++ b/pkgs/development/tools/cloudflare-wrangler/default.nix @@ -1,5 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl, curl, darwin -}: +{ stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl, curl, darwin }: rustPlatform.buildRustPackage rec { pname = "cloudflare-wrangler"; @@ -8,13 +7,11 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "cloudflare"; repo = "wrangler"; - rev = "v" + version; + rev = "v${version}"; sha256 = "0lh06cnjddmy5h5xvbkg8f97vw2v0wr5fi7vrs3nnidiz7x4rsja"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - cargoSha256 = "0s07143vsrb2vwj4rarx5w3wcz1zh0gi8al6cdrfqyl7nhm1mshm"; + cargoSha256 = "1q7vilh0bynhdz5bbpig5ibaqvk2153n07gmc715qb80w92sjw7w"; nativeBuildInputs = [ pkg-config ]; @@ -29,7 +26,7 @@ rustPlatform.buildRustPackage rec { doCheck = false; meta = with stdenv.lib; { - description = "A CLI tool designed for folks who are interested in using Cloudflare Workers."; + 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 ]; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/tools/diesel-cli/default.nix b/pkgs/development/tools/diesel-cli/default.nix index d2888dc616a6..5c59703af3e7 100644 --- a/pkgs/development/tools/diesel-cli/default.nix +++ b/pkgs/development/tools/diesel-cli/default.nix @@ -37,10 +37,7 @@ rustPlatform.buildRustPackage rec { cargoBuildFlags = [ "--no-default-features --features \"${features}\"" ]; cargoPatches = [ ./cargo-lock.patch ]; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "0xlcskddhy7xsiwj54gmn1xlgkfxb4dwrys7rbamfz1h8aa6ixjx"; + cargoSha256 = "1vbb7r0dpmq8363i040bkhf279pz51c59kcq9v5qr34hs49ish8g"; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ openssl ] diff --git a/pkgs/development/tools/git-series/default.nix b/pkgs/development/tools/git-series/default.nix index e94f1f1e14ac..4a09e2225bea 100644 --- a/pkgs/development/tools/git-series/default.nix +++ b/pkgs/development/tools/git-series/default.nix @@ -15,10 +15,7 @@ buildRustPackage rec { sha256 = "07mgq5h6r1gf3jflbv2khcz32bdazw7z1s8xcsafdarnm13ps014"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "16qjbvppc01yxk8x9jk7gs8jaag5nkfl30j3lyv3dc27vv9mckjv"; + cargoSha256 = "0ijgx8fksg2najb336dhddxlqfzc338f9ylydkpw6b39k72mm00d"; cargoPatches = [ (fetchpatch { diff --git a/pkgs/development/tools/java/cfr/default.nix b/pkgs/development/tools/java/cfr/default.nix index 1d928292cd52..09684ea9986e 100644 --- a/pkgs/development/tools/java/cfr/default.nix +++ b/pkgs/development/tools/java/cfr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "cfr"; - version = "0.148"; + version = "0.149"; src = fetchurl { url = "http://www.benf.org/other/cfr/cfr_${version}.jar"; - sha256 = "04nhbzcb0n5xckkbl1rz4xa2bz53hrlm938wrh0gfkzrwwgzj1ql"; + sha256 = "1jksjr1345wj42nfad7k6skvpg5qsm4xgjdwzb90zhn27ddkns6v"; }; nativeBuildInputs = [ makeWrapper ]; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { Java beta 103 changes), Java 7 String switches etc, but is written entirely in Java 6. ''; - homepage = http://www.benf.org/other/cfr/; + homepage = "http://www.benf.org/other/cfr/"; license = licenses.mit; platforms = platforms.all; }; diff --git a/pkgs/development/tools/misc/teensy-loader-cli/default.nix b/pkgs/development/tools/misc/teensy-loader-cli/default.nix index 2975d64113e8..e03320f84295 100644 --- a/pkgs/development/tools/misc/teensy-loader-cli/default.nix +++ b/pkgs/development/tools/misc/teensy-loader-cli/default.nix @@ -1,26 +1,31 @@ -{ stdenv, libusb, fetchgit }: -let - version = "2.1"; -in -stdenv.mkDerivation { +{ stdenv, fetchFromGitHub, go-md2man, installShellFiles, libusb }: + +stdenv.mkDerivation rec { pname = "teensy-loader-cli"; - inherit version; - src = fetchgit { - url = "git://github.com/PaulStoffregen/teensy_loader_cli.git"; - rev = "f5b6d7aafda9a8b014b4bb08660833ca45c136d2"; - sha256 = "1a663bv3lvm7bsf2wcaj2c0vpmniak7w5hwix5qgz608bvm2v781"; + version = "2.1.20191110"; + + src = fetchFromGitHub { + owner = "PaulStoffregen"; + repo = "teensy_loader_cli"; + rev = "e98b5065cdb9f04aa4dde3f2e6e6e6f12dd97592"; + sha256 = "1yx8vsh6b29pqr4zb6sx47429i9x51hj9psn8zksfz75j5ivfd5i"; }; buildInputs = [ libusb ]; + nativeBuildInputs = [ go-md2man installShellFiles ]; + installPhase = '' - install -Dm755 teensy_loader_cli $out/bin/teensy-loader-cli + install -Dm555 teensy_loader_cli $out/bin/teensy-loader-cli + install -Dm444 -t $out/share/doc/${pname} *.md *.txt + go-md2man -in README.md -out ${pname}.1 + installManPage *.1 ''; meta = with stdenv.lib; { - license = licenses.gpl3; description = "Firmware uploader for the Teensy microcontroller boards"; - homepage = https://www.pjrc.com/teensy/; + homepage = "https://www.pjrc.com/teensy/"; + license = licenses.gpl3; maintainers = with maintainers; [ the-kenny ]; platforms = platforms.unix; }; diff --git a/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix b/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix index 09ab9587ddba..5144af97f759 100644 --- a/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix +++ b/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix @@ -1,12 +1,11 @@ -{ stdenv, fetchurl, ocamlPackages }: +{ stdenv, fetchzip, ocamlPackages }: stdenv.mkDerivation rec { pname = "ocsigen-i18n"; - version = "3.4.0"; - - buildInputs = with ocamlPackages; [ ocaml findlib ]; + version = "3.5.0"; + buildInputs = with ocamlPackages; [ ocaml findlib ppx_tools ]; dontStrip = true; @@ -15,9 +14,9 @@ stdenv.mkDerivation rec make bindir=$out/bin install ''; - src = fetchurl { + src = fetchzip { url = "https://github.com/besport/${pname}/archive/${version}.tar.gz"; - sha256 = "0i7cck6zlgwjpksb4s1jpy193h85jixf4d0nmqj09y3zcpn2i8gb"; + sha256 = "1qsgwfl64b53w235wm7nnchqinzgsvd2gb52xm0kra2wlwp69rfq"; }; meta = { diff --git a/pkgs/development/tools/pax-rs/default.nix b/pkgs/development/tools/pax-rs/default.nix index f2fff99d1532..aa83a1b8e1b6 100644 --- a/pkgs/development/tools/pax-rs/default.nix +++ b/pkgs/development/tools/pax-rs/default.nix @@ -36,8 +36,5 @@ buildRustPackage rec { cp ${cargo-lock} $out/Cargo.lock ''; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "132a9vnlyp78zxiw5xrazadvx0scs7h2vbm5wz612dmh436mwnxg"; + cargoSha256 = "0wx5x7ll21bb6v34csk63kkvxdk3as720hdkaj0izdkpy0xf1knr"; } diff --git a/pkgs/development/tools/rust/cargo-geiger/default.nix b/pkgs/development/tools/rust/cargo-geiger/default.nix index b6f3bb7af000..7678db0a3866 100644 --- a/pkgs/development/tools/rust/cargo-geiger/default.nix +++ b/pkgs/development/tools/rust/cargo-geiger/default.nix @@ -15,10 +15,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0kvmjahyx5dcjhry2hkvcshi0lbgipfj0as74a3h3bllfvdfkkg0"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "0aykhhxk416p237safmqh5dhwjgrhvgc6zikkmxi9rq567ypp914"; + cargoSha256 = "0v50fkyf0a77l7whxalwnfqfi8lxy82z2gpd0fa0ib80qjla2n5z"; cargoPatches = [ ./cargo-lock.patch ]; # Multiple tests require internet connectivity, so they are disabled here. diff --git a/pkgs/development/tools/rust/cargo-make/default.nix b/pkgs/development/tools/rust/cargo-make/default.nix index 35dba1149820..53849e4176fa 100644 --- a/pkgs/development/tools/rust/cargo-make/default.nix +++ b/pkgs/development/tools/rust/cargo-make/default.nix @@ -24,8 +24,6 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ Security ]; - legacyCargoFetcher = false; - cargoSha256 = "1x0lb68d47nhggnj7jf90adz7shb0cg305mavgqvxizd2s9789dx"; # Some tests fail because they need network access. diff --git a/pkgs/development/tools/rust/cargo-raze/default.nix b/pkgs/development/tools/rust/cargo-raze/default.nix index 48579e431064..f892263dd690 100644 --- a/pkgs/development/tools/rust/cargo-raze/default.nix +++ b/pkgs/development/tools/rust/cargo-raze/default.nix @@ -13,10 +13,7 @@ rustPlatform.buildRustPackage rec { }; sourceRoot = "source/impl"; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "06rl7v0f1lgj9ii07fcnaxmhn28ckr03cpf5b93q8ripm5qh7my9"; + cargoSha256 = "1z20xc508a3slc1ii3hy09swvlyib14zwf9akxc0h24d5m48as1c"; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ curl libgit2 openssl ] diff --git a/pkgs/development/tools/rust/maturin/default.nix b/pkgs/development/tools/rust/maturin/default.nix index 8edd69c28be9..70c424ee0084 100644 --- a/pkgs/development/tools/rust/maturin/default.nix +++ b/pkgs/development/tools/rust/maturin/default.nix @@ -5,16 +5,16 @@ let inherit (darwin.apple_sdk.frameworks) Security; in rustPlatform.buildRustPackage rec { name = "maturin-${version}"; - version = "0.7.6"; + version = "0.7.9"; src = fetchFromGitHub { owner = "PyO3"; repo = "maturin"; rev = "v${version}"; - sha256 = "1siqd8k6grlbj9n1a75jq8px1pzvzpr2ph689g53rjngf1k44zqk"; + sha256 = "1l8i1mz97zsc8kayvryv6xznwpby9k9jxy7lsx45acs5yksqchrv"; }; - cargoSha256 = "10x8kr4qxvvmzpr1n41ybsb6rnii2qz5bdhnk0zpfnr2n9215p8s"; + cargoSha256 = "0ly0f64acn1hxnj7vg1m860xpl06rklwqh545c386nnxaj839b0r"; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/tools/rust/racer/default.nix b/pkgs/development/tools/rust/racer/default.nix index 8839464e9f66..82b415bc8a3f 100644 --- a/pkgs/development/tools/rust/racer/default.nix +++ b/pkgs/development/tools/rust/racer/default.nix @@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0svvdkfqpk2rw0wxyrhkxy553k55lg7jxc0ly4w1195iwv14ad3y"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "1qxg9r6wpv811fh2l889jm0ya96gsra00kqpyxh41fb7myvl2a4i"; + cargoSha256 = "0zaqa89z3nf23s2q1jpmfz4lygh4zq9ymql71d748fgjy9psr449"; buildInputs = [ makeWrapper ] ++ stdenv.lib.optional stdenv.isDarwin Security; diff --git a/pkgs/development/tools/rust/racerd/default.nix b/pkgs/development/tools/rust/racerd/default.nix index c9b89abb0b07..c49ea2aaf128 100644 --- a/pkgs/development/tools/rust/racerd/default.nix +++ b/pkgs/development/tools/rust/racerd/default.nix @@ -1,10 +1,9 @@ { stdenv, fetchFromGitHub, rustPlatform, makeWrapper , Security }: -with rustPlatform; - -buildRustPackage rec { +rustPlatform.buildRustPackage rec { pname = "racerd"; version = "unstable-2019-09-02"; + src = fetchFromGitHub { owner = "jwilm"; repo = "racerd"; @@ -12,16 +11,13 @@ buildRustPackage rec { sha256 = "13jqdvjk4savcl03mrn2vzgdsd7vxv2racqbyavrxp2cm9h6cjln"; }; + cargoSha256 = "1nwjr7v8hkhsql93wbwk5gqqiq725gj5iwwsbd250my9g5kkfdbw"; + # a nightly compiler is required unless we use this cheat code. RUSTC_BOOTSTRAP=1; doCheck = false; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "07130587drrdkrk7aqb8pl8i3p485qr6xh1m86630ydlnb9z6s6i"; - nativeBuildInputs = [ makeWrapper ]; buildInputs = stdenv.lib.optional stdenv.isDarwin Security; @@ -35,7 +31,7 @@ buildRustPackage rec { meta = with stdenv.lib; { description = "JSON/HTTP Server based on racer for adding Rust support to editors and IDEs"; - homepage = https://github.com/jwilm/racerd; + homepage = "https://github.com/jwilm/racerd"; license = licenses.asl20; platforms = platforms.all; }; diff --git a/pkgs/development/tools/rust/svd2rust/default.nix b/pkgs/development/tools/rust/svd2rust/default.nix index fa457477b581..ecc7537267a9 100644 --- a/pkgs/development/tools/rust/svd2rust/default.nix +++ b/pkgs/development/tools/rust/svd2rust/default.nix @@ -14,10 +14,7 @@ buildRustPackage rec { }; cargoPatches = [ ./cargo-lock.patch ]; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "03rfb8swxbcc9qm4mhxz5nm4b1gw7g7389wrdc91abxl4mw733ac"; + cargoSha256 = "0n0xc8b982ra007l6gygssf1n60gfc2rphwyi7n95dbys1chciyg"; # doc tests fail due to missing dependency doCheck = false; diff --git a/pkgs/development/tools/scaff/default.nix b/pkgs/development/tools/scaff/default.nix index f81ca70c6a9a..97f94e2d61b5 100644 --- a/pkgs/development/tools/scaff/default.nix +++ b/pkgs/development/tools/scaff/default.nix @@ -2,17 +2,17 @@ rustPlatform.buildRustPackage rec { pname = "scaff"; - version = "0.1.1"; + version = "0.1.2"; src = fetchFromGitLab { owner = "jD91mZM2"; repo = pname; rev = version; - sha256 = "1s5v50205l2h33pccyafrjv3a6lpb62inhm8z81hkvx53bqifvd7"; + sha256 = "01yf2clf156qv2a6w866a2p8rc2dl8innxnsqrj244x54s1pk27r"; }; - cargoSha256 = "0k6msvly3yhzl1hhs4zv31qzbllwmw16i55dbznlgp1c8icy2pwr"; + cargoSha256 = "1v6580mj70d7cqbjw32slz65lg6c8ficq5mdkfbivs63hqkv4hgx"; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ openssl ]; diff --git a/pkgs/development/tools/wasm-bindgen-cli/default.nix b/pkgs/development/tools/wasm-bindgen-cli/default.nix index a073d0ae9324..e5afcb30a817 100644 --- a/pkgs/development/tools/wasm-bindgen-cli/default.nix +++ b/pkgs/development/tools/wasm-bindgen-cli/default.nix @@ -14,10 +14,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security curl ]; nativeBuildInputs = [ pkgconfig ]; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "1cp8ns0cywzqchdw5hkg4fhxhqb6apxwjjasf1ksf3dgjwynlhzm"; + cargoSha256 = "1ylk9vrpajslx1zy4vqmlyqa5ygcmvir1gcn8hsr6liigf5kcz7p"; cargoPatches = [ ./0001-Add-cargo.lock.patch ]; cargoBuildFlags = [ "-p" pname ]; diff --git a/pkgs/development/tools/yarn/default.nix b/pkgs/development/tools/yarn/default.nix index daf46ec48967..9db4472f6720 100644 --- a/pkgs/development/tools/yarn/default.nix +++ b/pkgs/development/tools/yarn/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "yarn"; - version = "1.22.0"; + version = "1.22.2"; src = fetchzip { url = "https://github.com/yarnpkg/yarn/releases/download/v${version}/yarn-v${version}.tar.gz"; - sha256 = "0hbsdbrqx5xhr171ik862v51xwjzbfncic92pgbnhnlmxy2y974x"; + sha256 = "1av52k5hl7xylxz5c0h64akz6ccd1vm64v0pzmny1661pbihiwp5"; }; buildInputs = [ nodejs ]; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://yarnpkg.com/; + homepage = "https://yarnpkg.com/"; description = "Fast, reliable, and secure dependency management for javascript"; license = licenses.bsd2; maintainers = with maintainers; [ offline screendriver ]; |