diff options
Diffstat (limited to 'pkgs/development/tools')
5 files changed, 48 insertions, 12 deletions
diff --git a/pkgs/development/tools/build-managers/qbs/default.nix b/pkgs/development/tools/build-managers/qbs/default.nix index 3c5a485e36fc..196a5d2a7fc9 100644 --- a/pkgs/development/tools/build-managers/qbs/default.nix +++ b/pkgs/development/tools/build-managers/qbs/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "qbs-${version}"; - version = "1.12.2"; + version = "1.13.0"; src = fetchFromGitHub { owner = "qbs"; repo = "qbs"; rev = "v${version}"; - sha256 = "0spkkq7nmh27rbx61p23fzkxffx3qdhjqw95pqgsbc76xczd45sv"; + sha256 = "12zzbhddsgfxyzglknvim0bb7rrnifawnx18g35g1105ybfak607"; }; nativeBuildInputs = [ qmake ]; diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index c75baf454b34..a8f4336cf71e 100644 --- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -1,16 +1,16 @@ { lib, buildGoPackage, fetchFromGitLab, fetchurl }: let - version = "11.9.2"; + version = "11.10.1"; # 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 = "10zmaywq1vzch4a6zdvnm9kgil9ankc9napix9s9fw45wc0lw01p"; + sha256 = "120gpyim54mc8z84gzpbms5hkg2xg4sgzdvkrn1fis9myvd55bav"; }; docker_arm = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-arm.tar.xz"; - sha256 = "0845ylhb3i3jmi5q6aaix4hw9zdb83v5fhvif0xvvi2m7irg06lf"; + sha256 = "0qfqsi1fm94sxv7g975fw0av871f677rp48yv8q5669ipm16n9qk"; }; in buildGoPackage rec { @@ -29,7 +29,7 @@ buildGoPackage rec { owner = "gitlab-org"; repo = "gitlab-runner"; rev = "v${version}"; - sha256 = "00k4myca2djd6h3i83vjndahm5q1rnlkq0p69dhl5jbldwy614ph"; + sha256 = "1nxv783rdzdwm0qq3li893p7q3n8gg7abla2961f3n735gjlnibx"; }; patches = [ ./fix-shell-path.patch ]; diff --git a/pkgs/development/tools/pax-rs/default.nix b/pkgs/development/tools/pax-rs/default.nix index 3a4f35c0412b..7c52a13b7e72 100644 --- a/pkgs/development/tools/pax-rs/default.nix +++ b/pkgs/development/tools/pax-rs/default.nix @@ -26,7 +26,7 @@ buildRustPackage rec { }; cargo-lock = fetchurl { - url = "https://gist.github.com/8084/c7863424d7df0c379782015f6bb3b399/raw/1cf7481e33984fd1510dc77ed677606d08fa8eb6/Cargo.lock"; + url = "https://gist.github.com/klntsky/c7863424d7df0c379782015f6bb3b399/raw/1cf7481e33984fd1510dc77ed677606d08fa8eb6/Cargo.lock"; sha256 = "0ff1b64b99cbca1cc2ceabcd2e4f7bc3411e3a2a9fbb9db2204d9240fe38ddeb"; }; in diff --git a/pkgs/development/tools/rust/rustup/default.nix b/pkgs/development/tools/rust/rustup/default.nix index 3eb0760b2220..d6c5718d3ec6 100644 --- a/pkgs/development/tools/rust/rustup/default.nix +++ b/pkgs/development/tools/rust/rustup/default.nix @@ -1,25 +1,25 @@ { stdenv, lib, runCommand, patchelf , fetchFromGitHub, rustPlatform -, pkgconfig, curl, Security }: +, pkgconfig, curl, Security, CoreServices }: rustPlatform.buildRustPackage rec { pname = "rustup"; - version = "1.18.1"; + version = "1.18.2"; src = fetchFromGitHub { owner = "rust-lang"; repo = "rustup.rs"; rev = version; - sha256 = "0932n708ikxzjv7y78zcrnnnps3rgimsnpaximhm9vmjjnkdgm7x"; + sha256 = "0lyn06vzp5406sjng7msifigkal2lafppqjbdnigx8yvgxqgd06f"; }; - cargoSha256 = "0kw8a9prqjf939g0h8ryyhlm1n84fwdycvl0nkykkwlfqd6hh9hb"; + cargoSha256 = "0yxjy1kls80fcpwskklmihkqva16s6mawa8rdxc3zz8g588am03c"; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ curl - ] ++ stdenv.lib.optionals stdenv.isDarwin [ Security ]; + ] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices Security ]; cargoBuildFlags = [ "--features no-self-update" ]; diff --git a/pkgs/development/tools/wasm-pack/default.nix b/pkgs/development/tools/wasm-pack/default.nix new file mode 100644 index 000000000000..b2bee738344d --- /dev/null +++ b/pkgs/development/tools/wasm-pack/default.nix @@ -0,0 +1,36 @@ +{ stdenv +, fetchFromGitHub +, rustPlatform +, pkgconfig +, openssl +}: + +rustPlatform.buildRustPackage rec { + name = "wasm-pack-${version}"; + version = "0.8.1"; + + src = fetchFromGitHub { + owner = "rustwasm"; + repo = "wasm-pack"; + rev = "v${version}"; + sha256 = "1z66m16n4r16zqmnv84a5jndr5x6mdqdq4b1wq929sablwqd2rl4"; + }; + + cargoSha256 = "1xdx0gjqd4zyhnp72hz88rdmgry1m7rcw2j73lh67vp08z74y54y"; + + nativeBuildInputs = [ pkgconfig ]; + + buildInputs = [ openssl ]; + + # Tests fetch external resources and build artifacts. + # Disabled to work with sandboxing + doCheck = false; + + meta = with stdenv.lib; { + description = "A utility that builds rust-generated WebAssembly package"; + homepage = https://github.com/rustwasm/wasm-pack; + license = with licenses; [ asl20 /* or */ mit ]; + maintainers = [ maintainers.dhkl ]; + platforms = platforms.all; + }; +} |