diff options
Diffstat (limited to 'pkgs/development/tools')
13 files changed, 178 insertions, 55 deletions
diff --git a/pkgs/development/tools/analysis/autoflake/default.nix b/pkgs/development/tools/analysis/autoflake/default.nix index c30c3555100a..a8b8a965256f 100644 --- a/pkgs/development/tools/analysis/autoflake/default.nix +++ b/pkgs/development/tools/analysis/autoflake/default.nix @@ -3,12 +3,12 @@ with python3Packages; buildPythonApplication rec { pname = "autoflake"; - version = "1.2"; + version = "1.3"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "c103e63466f11db3617167a2c68ff6a0cda35b940222920631c6eeec6b67e807"; + sha256 = "0wzrvrn6279fijg8jkqbs6313f7b5ll5d22pk5s0fc1fp2wyanbb"; }; propagatedBuildInputs = [ pyflakes ]; diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index 5e3b001b6a08..8ab655bc4bd3 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.97.0"; + version = "0.98.0"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "refs/tags/v${version}"; - sha256 = "1y6mdm7ph9k3vv8n8hzxr3rqa6bfkh4yn9bcxb7qq67v08dlvx6r"; + sha256 = "13ry3bmgm3xy24kasx843dwd1nsv7nyd174696iaz2c64z46bbfm"; }; installPhase = '' diff --git a/pkgs/development/tools/bazelisk/default.nix b/pkgs/development/tools/bazelisk/default.nix index 86748b716e6e..3b4869636399 100644 --- a/pkgs/development/tools/bazelisk/default.nix +++ b/pkgs/development/tools/bazelisk/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "bazelisk"; - version = "0.0.3"; + version = "0.0.4"; src = fetchFromGitHub { owner = "philwo"; repo = pname; rev = "v${version}"; - sha256 = "1rkpw9izpav3ysb9fpbdf0m1wqrs3vl87s9zjjmfsjm5dfhxss72"; + sha256 = "1hi4jmkqy1fjn91q72qlfvm63plz5jqb4hw4c1qv9ddqjgwrmxr3"; }; modSha256 = "1f73j6ryidzi3kfy3rhsqx047vzwvzaqcsl7ykhg87rn2l2s7fdl"; diff --git a/pkgs/development/tools/coursier/default.nix b/pkgs/development/tools/coursier/default.nix index bd9dbbb71742..07763e3fa68c 100644 --- a/pkgs/development/tools/coursier/default.nix +++ b/pkgs/development/tools/coursier/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "coursier-${version}"; - version = "1.1.0-M10"; + version = "1.1.0-M14-1"; src = fetchurl { - url = "https://github.com/coursier/coursier/raw/v${version}/coursier"; - sha256 = "14iq0717vdm0mj0196idc724vmxp1y0f3gfn41sbqahfhvcx05y8"; + url = "https://github.com/coursier/coursier/releases/download/v${version}/coursier"; + sha256 = "0km9bxhch2bh7v6yi5jzyvq95fwdmccwqmbiznzhz4iqij8y066w"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/dep/default.nix b/pkgs/development/tools/dep/default.nix index 283193a485cd..a486d786c374 100644 --- a/pkgs/development/tools/dep/default.nix +++ b/pkgs/development/tools/dep/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "dep-${version}"; - version = "0.5.0"; + version = "0.5.1"; rev = "v${version}"; goPackagePath = "github.com/golang/dep"; @@ -12,7 +12,7 @@ buildGoPackage rec { inherit rev; owner = "golang"; repo = "dep"; - sha256 = "1p35995w2f8rp4cxhcwnhdv26ajx6gxx9pm2ijb5sjy2pwhw5c6j"; + sha256 = "1a5vq5v3ikg6iysbywxr5hcjnbv76nzhk50rd3iq3v2fnyq38dv2"; }; buildFlagsArray = ("-ldflags=-s -w -X main.commitHash=${rev} -X main.version=${version}"); diff --git a/pkgs/development/tools/electron/5.x.nix b/pkgs/development/tools/electron/5.x.nix new file mode 100644 index 000000000000..ba97587c5af7 --- /dev/null +++ b/pkgs/development/tools/electron/5.x.nix @@ -0,0 +1,77 @@ +{ stdenv, libXScrnSaver, makeWrapper, fetchurl, unzip, atomEnv, libuuid, at-spi2-atk, at-spi2-core }: + +let + version = "5.0.0"; + name = "electron-${version}"; + + throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}"; + + meta = with stdenv.lib; { + description = "Cross platform desktop application shell"; + homepage = https://github.com/electron/electron; + license = licenses.mit; + maintainers = with maintainers; [ travisbhartwell manveru ]; + platforms = [ "x86_64-darwin" "x86_64-linux" "i686-linux" "armv7l-linux" "aarch64-linux" ]; + }; + + linux = { + inherit name version meta; + src = { + i686-linux = fetchurl { + url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-ia32.zip"; + sha256 = "01320qv0x18rmjn6ibbs49pd04d58rz5dac509lxxay8nfb14gdp"; + }; + x86_64-linux = fetchurl { + url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-x64.zip"; + sha256 = "0mkc8r5xggkzdypyq4hxigmjl6d1jn0139l8nwj1vr224ggnskhn"; + }; + armv7l-linux = fetchurl { + url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-armv7l.zip"; + sha256 = "1w767yxm3b6sj52z0wnzr4vfn0m8n2jdjhj3ksmq6qrv401vvib3"; + }; + aarch64-linux = fetchurl { + url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-arm64.zip"; + sha256 = "1nvpfkrizkmr6xxb2ls19p9mhgpms65ws09bx3l8sqq6275916jk"; + }; + }.${stdenv.hostPlatform.system} or throwSystem; + + buildInputs = [ unzip makeWrapper ]; + + buildCommand = '' + mkdir -p $out/lib/electron $out/bin + unzip -d $out/lib/electron $src + ln -s $out/lib/electron/electron $out/bin + + fixupPhase + + patchelf \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "${atomEnv.libPath}:${stdenv.lib.makeLibraryPath [ libuuid at-spi2-atk at-spi2-core ]}:$out/lib/electron" \ + $out/lib/electron/electron + + wrapProgram $out/lib/electron/electron \ + --prefix LD_PRELOAD : ${stdenv.lib.makeLibraryPath [ libXScrnSaver ]}/libXss.so.1 + ''; + }; + + darwin = { + inherit name version meta; + + src = fetchurl { + url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-darwin-x64.zip"; + sha256 = "07s2cq4ffpx86pjxrh1hcvk3r85saxqi3kkbbfkg9r1bbq8zbapm"; + }; + + buildInputs = [ unzip ]; + + buildCommand = '' + mkdir -p $out/Applications + unzip $src + mv Electron.app $out/Applications + mkdir -p $out/bin + ln -s $out/Applications/Electron.app/Contents/MacOs/Electron $out/bin/electron + ''; + }; +in + + stdenv.mkDerivation (if stdenv.isDarwin then darwin else linux) diff --git a/pkgs/development/tools/flatpak-builder/default.nix b/pkgs/development/tools/flatpak-builder/default.nix index d4fa99c48258..5f8aaf07d730 100644 --- a/pkgs/development/tools/flatpak-builder/default.nix +++ b/pkgs/development/tools/flatpak-builder/default.nix @@ -37,7 +37,7 @@ }: let - version = "1.0.5"; + version = "1.0.6"; in stdenv.mkDerivation rec { name = "flatpak-builder-${version}"; @@ -45,7 +45,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/flatpak/flatpak-builder/releases/download/${version}/${name}.tar.xz"; - sha256 = "1l5hpxkc7f3mp9v8wyagpbc8vvfn0m0jq8rsk1h7vwyyjmijv6mb"; + sha256 = "1fw9lzf9cy3fnnvn9q3g0schxcj7kaj6kjijhrmcmsfcnzbjlmrv"; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/camlp4.nix b/pkgs/development/tools/ocaml/js_of_ocaml/camlp4.nix index 139ffef186b5..ff59fa7cf8a3 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/camlp4.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/camlp4.nix @@ -1,11 +1,19 @@ -{ stdenv, ocaml, findlib, dune, js_of_ocaml-compiler +{ stdenv, fetchFromGitHub, ocaml, findlib, dune, js_of_ocaml-compiler , camlp4, ocsigen_deriving }: stdenv.mkDerivation rec { + version = "3.2.1"; name = "js_of_ocaml-camlp4-${version}"; - inherit (js_of_ocaml-compiler) version src installPhase meta; + src = fetchFromGitHub { + owner = "ocsigen"; + repo = "js_of_ocaml"; + rev = version; + sha256 = "1v2hfq0ra9j07yz6pj6m03hrvgys4vmx0gclchv94yywpb2wc7ik"; + }; + + inherit (js_of_ocaml-compiler) installPhase meta; buildInputs = [ ocaml findlib dune camlp4 ocsigen_deriving ]; diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix b/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix index 94be7132b796..c5a345f505b7 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix @@ -8,13 +8,13 @@ else stdenv.mkDerivation rec { name = "js_of_ocaml-compiler-${version}"; - version = "3.2.1"; + version = "3.3.0"; src = fetchFromGitHub { owner = "ocsigen"; repo = "js_of_ocaml"; rev = version; - sha256 = "1v2hfq0ra9j07yz6pj6m03hrvgys4vmx0gclchv94yywpb2wc7ik"; + sha256 = "0bg8x2s3f24c8ia2g293ikd5yg0yjw3hkdgdql59c8k2amqin8f8"; }; buildInputs = [ ocaml findlib dune cmdliner cppo ]; diff --git a/pkgs/development/tools/omnisharp-roslyn/default.nix b/pkgs/development/tools/omnisharp-roslyn/default.nix new file mode 100644 index 000000000000..6f8b4f824b3f --- /dev/null +++ b/pkgs/development/tools/omnisharp-roslyn/default.nix @@ -0,0 +1,41 @@ +{ stdenv +, fetchurl +, mono5 +, makeWrapper +}: + +stdenv.mkDerivation rec { + + name = "omnisharp-roslyn-${version}"; + version = "1.32.8"; + + src = fetchurl { + url = "https://github.com/OmniSharp/omnisharp-roslyn/releases/download/v${version}/omnisharp-mono.tar.gz"; + sha256 = "0k2a4awmzb7ppll2skyzaa94n3hxqm35ffibl0sygldk3symzwgp"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + preUnpack = '' + mkdir src + cd src + sourceRoot=. + ''; + + installPhase = '' + mkdir -p $out/bin + cd .. + cp -r src $out/ + ls -al $out/src + makeWrapper ${mono5}/bin/mono $out/bin/omnisharp \ + --add-flags "$out/src/OmniSharp.exe" + ''; + + meta = with stdenv.lib; { + description = "OmniSharp based on roslyn workspaces"; + platforms = platforms.linux; + license = licenses.mit; + maintainers = with maintainers; [ tesq0 ]; + }; + +} diff --git a/pkgs/development/tools/rust/cargo-expand/default.nix b/pkgs/development/tools/rust/cargo-expand/default.nix index 88fd212dad2e..3e2128ff0850 100644 --- a/pkgs/development/tools/rust/cargo-expand/default.nix +++ b/pkgs/development/tools/rust/cargo-expand/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-expand"; - version = "0.4.11"; + version = "0.4.12"; src = fetchFromGitHub { owner = "dtolnay"; repo = pname; rev = version; - sha256 = "051hy2320mqdxvafhafwnk1n8q2sq2d7jyhx5bbxvqmjjm55lg8h"; + sha256 = "0m57v7mh7wdl0rdbad7vkvcgy93p9gcb971wap8i5nzjvzmp4wlb"; }; - cargoSha256 = "0d1j01nrq5j0yrgd85lnvg1mzalcd8xadkza3yvwnqzf554idrcy"; + cargoSha256 = "1wvqxj2w02d6zhyw3z5v0w4bfmbmldh63ygmvfxa3ngfb36gcacz"; meta = with stdenv.lib; { description = "A utility and Cargo subcommand designed to let people expand macros in their Rust source code"; diff --git a/pkgs/development/tools/rust/rustup/0001-dynamically-patchelf-binaries.patch b/pkgs/development/tools/rust/rustup/0001-dynamically-patchelf-binaries.patch index 60f29fccdc34..74da8d6102e7 100644 --- a/pkgs/development/tools/rust/rustup/0001-dynamically-patchelf-binaries.patch +++ b/pkgs/development/tools/rust/rustup/0001-dynamically-patchelf-binaries.patch @@ -1,32 +1,25 @@ -From c21cc756b69a5f33c8a7758b746a816f40f55932 Mon Sep 17 00:00:00 2001 -From: Leon Isenberg <ljli@users.noreply.github.com> -Date: Sat, 28 Oct 2017 17:58:17 +0200 -Subject: [PATCH] nix customization: patchelf installed binaries - ---- - src/rustup-dist/src/component/package.rs | 21 ++++++++++++++++++++- - 1 file changed, 20 insertions(+), 1 deletion(-) - -diff --git a/src/rustup-dist/src/component/package.rs b/src/rustup-dist/src/component/package.rs -index 70c54dcd..f0318986 100644 ---- a/src/rustup-dist/src/component/package.rs -+++ b/src/rustup-dist/src/component/package.rs -@@ -100,7 +100,10 @@ impl Package for DirectoryPackage { - let src_path = root.join(&path); - +diff --git a/src/dist/component/package.rs b/src/dist/component/package.rs +index e0fdea28..38d9d0e4 100644 +--- a/src/dist/component/package.rs ++++ b/src/dist/component/package.rs +@@ -104,10 +104,11 @@ impl Package for DirectoryPackage { match &*part.0 { -- "file" => builder.copy_file(path.clone(), &src_path)?, -+ "file" => { -+ builder.copy_file(path.clone(), &src_path)?; + "file" => { + if self.copy { +- builder.copy_file(path.clone(), &src_path)? ++ builder.copy_file(path.clone(), &src_path)?; + } else { +- builder.move_file(path.clone(), &src_path)? ++ builder.move_file(path.clone(), &src_path)?; + } + nix_patchelf_if_needed(&target.prefix().path().join(path.clone()), &src_path) -+ } - "dir" => builder.copy_dir(path.clone(), &src_path)?, - _ => return Err(ErrorKind::CorruptComponent(name.to_owned()).into()), - } -@@ -118,6 +121,22 @@ impl Package for DirectoryPackage { + } + "dir" => { + if self.copy { +@@ -132,6 +133,22 @@ impl Package for DirectoryPackage { } } - + +fn nix_patchelf_if_needed(dest_path: &Path, src_path: &Path) { + let is_bin = if let Some(p) = src_path.parent() { + p.ends_with("bin") @@ -46,6 +39,3 @@ index 70c54dcd..f0318986 100644 // On Unix we need to set up the file permissions correctly so // binaries are executable and directories readable. This shouldn't be // necessary: the source files *should* have the right permissions, --- -2.17.1 - diff --git a/pkgs/development/tools/rust/rustup/default.nix b/pkgs/development/tools/rust/rustup/default.nix index 1177423869c1..3eb0760b2220 100644 --- a/pkgs/development/tools/rust/rustup/default.nix +++ b/pkgs/development/tools/rust/rustup/default.nix @@ -3,17 +3,17 @@ , pkgconfig, curl, Security }: rustPlatform.buildRustPackage rec { - name = "rustup-${version}"; - version = "1.17.0"; + pname = "rustup"; + version = "1.18.1"; src = fetchFromGitHub { owner = "rust-lang"; repo = "rustup.rs"; rev = version; - sha256 = "1mf92z89wqqaj3cg2cqf6basvcz47krldmy8ianfkzp323fimqmn"; + sha256 = "0932n708ikxzjv7y78zcrnnnps3rgimsnpaximhm9vmjjnkdgm7x"; }; - cargoSha256 = "0y7kbihdrpd35dw24qqqzmccvjdy6arka10p5rnv38d420f1bpzd"; + cargoSha256 = "0kw8a9prqjf939g0h8ryyhlm1n84fwdycvl0nkykkwlfqd6hh9hb"; nativeBuildInputs = [ pkgconfig ]; @@ -49,9 +49,16 @@ rustPlatform.buildRustPackage rec { # tries to create .rustup export HOME=$(mktemp -d) mkdir -p "$out/share/"{bash-completion/completions,fish/vendor_completions.d,zsh/site-functions} - $out/bin/rustup completions bash > "$out/share/bash-completion/completions/rustup" - $out/bin/rustup completions fish > "$out/share/fish/vendor_completions.d/rustup.fish" - $out/bin/rustup completions zsh > "$out/share/zsh/site-functions/_rustup" + + # generate completion scripts for rustup + $out/bin/rustup completions bash rustup > "$out/share/bash-completion/completions/rustup" + $out/bin/rustup completions fish rustup > "$out/share/fish/vendor_completions.d/rustup.fish" + $out/bin/rustup completions zsh rustup > "$out/share/zsh/site-functions/_rustup" + + # generate completion scripts for cargo + # Note: fish completion script is not supported. + $out/bin/rustup completions bash cargo > "$out/share/bash-completion/completions/cargo" + $out/bin/rustup completions zsh cargo > "$out/share/zsh/site-functions/_cargo" ''; meta = with stdenv.lib; { |