diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-06-05 19:40:53 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-06-05 19:40:53 +0200 |
| commit | 43f71029cc6b18c1b4db4d01b35dbb30425c2f4e (patch) | |
| tree | 190bf57c6dcd3e691e93efc0491f3387c26772f2 /pkgs/development/tools | |
| parent | f9af74e75a27fac3bb50a43fce0c72c9b6ac24ed (diff) | |
| parent | 5f0bd4d70f18b3499005eb61a34acb98c9b05756 (diff) | |
| download | nixlib-43f71029cc6b18c1b4db4d01b35dbb30425c2f4e.tar nixlib-43f71029cc6b18c1b4db4d01b35dbb30425c2f4e.tar.gz nixlib-43f71029cc6b18c1b4db4d01b35dbb30425c2f4e.tar.bz2 nixlib-43f71029cc6b18c1b4db4d01b35dbb30425c2f4e.tar.lz nixlib-43f71029cc6b18c1b4db4d01b35dbb30425c2f4e.tar.xz nixlib-43f71029cc6b18c1b4db4d01b35dbb30425c2f4e.tar.zst nixlib-43f71029cc6b18c1b4db4d01b35dbb30425c2f4e.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/tools')
| -rw-r--r-- | pkgs/development/tools/bazel-watcher/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/development/tools/rq/default.nix | 5 |
2 files changed, 6 insertions, 9 deletions
diff --git a/pkgs/development/tools/bazel-watcher/default.nix b/pkgs/development/tools/bazel-watcher/default.nix index 98675d98d576..f331272a5f31 100644 --- a/pkgs/development/tools/bazel-watcher/default.nix +++ b/pkgs/development/tools/bazel-watcher/default.nix @@ -1,13 +1,9 @@ { buildBazelPackage , fetchFromGitHub -, fetchpatch , git , go , python , stdenv -, iana-etc -, mailcap -, tzdata }: let @@ -17,13 +13,13 @@ let in buildBazelPackage rec { name = "bazel-watcher-${version}"; - version = "0.13.0"; + version = "0.13.1"; src = fetchFromGitHub { owner = "bazelbuild"; repo = "bazel-watcher"; rev = "v${version}"; - sha256 = "1fc3sp79znbbq1yjap56lham72n7cap8yfghpzrzmpl5brybjkvm"; + sha256 = "0n28q27510ymg5d455hrbk7z8wawszgjmqjjhb4zximqhvxks7kh"; }; nativeBuildInputs = [ go git python ]; @@ -60,7 +56,7 @@ buildBazelPackage rec { sed -e '/^FILE:@bazel_gazelle_go_repository_tools.*/d' -i $bazelOut/external/\@*.marker ''; - sha256 = "0i77nnbd1sd39qw4vm3n5mwkag3dskqjhzr7qs4w1arbiih45zd4"; + sha256 = "16zgjd6zww9skk34ggfx5l3kbsdyv98zxawrvmx1arv5gaj63pp9"; }; buildAttrs = { diff --git a/pkgs/development/tools/rq/default.nix b/pkgs/development/tools/rq/default.nix index 5fe73ed33f0a..89ba58ea5f53 100644 --- a/pkgs/development/tools/rq/default.nix +++ b/pkgs/development/tools/rq/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, rustPlatform, libiconv, llvmPackages, v8 }: +{ stdenv, lib, fetchFromGitHub, rustPlatform, libiconv, llvmPackages, v8 }: rustPlatform.buildRustPackage rec { pname = "rq"; @@ -13,7 +13,8 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "0c5vwy3c5ji602dj64z6jqvcpi2xff03zvjbnwihb3ydqwnb3v67"; - buildInputs = [ llvmPackages.clang-unwrapped v8 ]; + buildInputs = [ llvmPackages.clang-unwrapped v8 ] + ++ lib.optionals stdenv.isDarwin [ libiconv ]; configurePhase = '' export LIBCLANG_PATH="${llvmPackages.clang-unwrapped}/lib" |