diff options
Diffstat (limited to 'pkgs/development/tools')
-rw-r--r-- | pkgs/development/tools/analysis/codeql/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/tools/ats-acc/default.nix | 22 | ||||
-rw-r--r-- | pkgs/development/tools/delve/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/tools/esbuild/default.nix | 6 | ||||
-rw-r--r-- | pkgs/development/tools/nwjs/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/tools/rust/rustup/default.nix | 41 |
6 files changed, 58 insertions, 23 deletions
diff --git a/pkgs/development/tools/analysis/codeql/default.nix b/pkgs/development/tools/analysis/codeql/default.nix index 687d928fce3f9..d256b6e767a6b 100644 --- a/pkgs/development/tools/analysis/codeql/default.nix +++ b/pkgs/development/tools/analysis/codeql/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { pname = "codeql"; - version = "2.5.4"; + version = "2.5.5"; 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 = "sha256-UYiyF0Ij6zWjJUs7GZtUVTZbFQmN21/O/64X4JV5+O4="; + sha256 = "sha256-M5O2NEGIVPWYKl11yxMMVreEtDO1VqcMkiGGrjNmk3A="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/ats-acc/default.nix b/pkgs/development/tools/ats-acc/default.nix new file mode 100644 index 0000000000000..73e475da3942b --- /dev/null +++ b/pkgs/development/tools/ats-acc/default.nix @@ -0,0 +1,22 @@ +{ lib, stdenv, fetchFromGitHub, ats2 }: + +stdenv.mkDerivation rec { + pname = "ats-acc"; + version = "unstable-2018-10-21"; + + src = fetchFromGitHub { + owner = "sparverius"; + repo = pname; + rev = "2d49f4e76d0fe1f857ceb70deba4aed13c306dcb"; + sha256 = "sha256-Wp39488YNL40GKp4KaJwhi75PsYP+gMtrZqAvs4Q/sw="; + }; + + nativeBuildInputs = [ ats2 ]; + + meta = with lib; { + description = "Pretty-print error messages of the ATS Compiler"; + homepage = "https://github.com/sparverius/ats-acc"; + maintainers = with maintainers; [ fortuneteller2k ]; + license = licenses.unfree; # Upstream has no license + }; +} diff --git a/pkgs/development/tools/delve/default.nix b/pkgs/development/tools/delve/default.nix index f0926e23aa734..62e51597055c6 100644 --- a/pkgs/development/tools/delve/default.nix +++ b/pkgs/development/tools/delve/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "delve"; - version = "1.6.0"; + version = "1.6.1"; goPackagePath = "github.com/go-delve/delve"; excludedPackages = "\\(_fixtures\\|scripts\\|service/test\\)"; @@ -11,7 +11,7 @@ buildGoPackage rec { owner = "go-delve"; repo = "delve"; rev = "v${version}"; - sha256 = "sha256-krNCS5GaEMuwQ9XS8w0myL+xZX6goNNNBgUiRVoZPIU="; + sha256 = "sha256-bTVCasemE8Vyjcs8wZBiiXEsW3UBndjpPQ5bi+4vQkw="; }; meta = with lib; { diff --git a/pkgs/development/tools/esbuild/default.nix b/pkgs/development/tools/esbuild/default.nix index 6c4dcb0492d43..5c32caad5b567 100644 --- a/pkgs/development/tools/esbuild/default.nix +++ b/pkgs/development/tools/esbuild/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "esbuild"; - version = "0.11.23"; + version = "0.12.0"; src = fetchFromGitHub { owner = "evanw"; repo = "esbuild"; rev = "v${version}"; - sha256 = "0m9dhmvysdla9scam367hxjgbzgg8mbf9mn385qqvbmyx3svxakn"; + sha256 = "sha256-JRGRm6fiJ3VIzcwoQOvqiN15vhSYuxGdZrLAH8FiC7g="; }; - vendorSha256 = "1n5538yik72x94vzfq31qaqrkpxds5xys1wlibw2gn2am0z5c06q"; + vendorSha256 = "sha256-2ABWPqhK2Cf4ipQH7XvRrd+ZscJhYPc3SV2cGT0apdg="; meta = with lib; { description = "An extremely fast JavaScript bundler"; diff --git a/pkgs/development/tools/nwjs/default.nix b/pkgs/development/tools/nwjs/default.nix index 1356bc46ced80..9cfb3c448e84e 100644 --- a/pkgs/development/tools/nwjs/default.nix +++ b/pkgs/development/tools/nwjs/default.nix @@ -3,7 +3,7 @@ , xorg, alsaLib, dbus, glib, gtk3, atk, pango, freetype, fontconfig , gdk-pixbuf, cairo, nss, nspr, gconf, expat, systemd, libcap , libnotify -, ffmpeg_3, libxcb, cups +, ffmpeg, libxcb, cups , sqlite, udev , libuuid , sdk ? false @@ -22,7 +22,7 @@ let xorg.libXScrnSaver cups libcap libnotify # libnw-specific (not chromium dependencies) - ffmpeg_3 libxcb + ffmpeg libxcb # chromium runtime deps (dlopen’d) sqlite udev libuuid diff --git a/pkgs/development/tools/rust/rustup/default.nix b/pkgs/development/tools/rust/rustup/default.nix index edd4dd7afd59d..d18d1a0ec37b3 100644 --- a/pkgs/development/tools/rust/rustup/default.nix +++ b/pkgs/development/tools/rust/rustup/default.nix @@ -1,6 +1,18 @@ -{ stdenv, lib, runCommand, patchelf -, fetchFromGitHub, rustPlatform, makeWrapper -, pkg-config, curl, zlib, Security, CoreServices }: +{ stdenv +, lib +, runCommand +, patchelf +, fetchFromGitHub +, rustPlatform +, makeWrapper +, pkg-config +, curl +, zlib +, Security +, CoreServices +, libiconv +, xz +}: let libPath = lib.makeLibraryPath [ @@ -10,32 +22,33 @@ in rustPlatform.buildRustPackage rec { pname = "rustup"; - version = "1.24.1"; + version = "1.24.2"; src = fetchFromGitHub { owner = "rust-lang"; repo = "rustup"; rev = version; - sha256 = "sha256-GKvKawvfm/4eBU4mn/Q9fhu3Ml+j+BsxVNPvbvcnMLU="; + sha256 = "sha256-uRCzVeTr5rr0CvE/1Uz7RHcw4Kt/sOItwcbZJBjjNjg="; }; - cargoSha256 = "sha256-tWww+rR4DQgRacVeLqnOBcuXA7o/NYmJBcJgWX3aLRY="; + cargoSha256 = "sha256-+E6Wa4QrMG/Ow3KehsxIzLzubXJQxCWo/rowC4MPdgk="; nativeBuildInputs = [ makeWrapper pkg-config ]; buildInputs = [ - curl zlib - ] ++ lib.optionals stdenv.isDarwin [ CoreServices Security ]; + curl + zlib + ] ++ lib.optionals stdenv.isDarwin [ CoreServices Security libiconv xz ]; cargoBuildFlags = [ "--features no-self-update" ]; patches = lib.optionals stdenv.isLinux [ - (runCommand "0001-dynamically-patchelf-binaries.patch" { CC=stdenv.cc; patchelf = patchelf; libPath = "$ORIGIN/../lib:${libPath}"; } '' - export dynamicLinker=$(cat $CC/nix-support/dynamic-linker) - substitute ${./0001-dynamically-patchelf-binaries.patch} $out \ - --subst-var patchelf \ - --subst-var dynamicLinker \ - --subst-var libPath + (runCommand "0001-dynamically-patchelf-binaries.patch" { CC = stdenv.cc; patchelf = patchelf; libPath = "$ORIGIN/../lib:${libPath}"; } '' + export dynamicLinker=$(cat $CC/nix-support/dynamic-linker) + substitute ${./0001-dynamically-patchelf-binaries.patch} $out \ + --subst-var patchelf \ + --subst-var dynamicLinker \ + --subst-var libPath '') ]; |