dev-env: Add xargs. (digital-asset#7769)

We use `xargs` a lot but rely on the version on the user's system. This adds it to dev-env so it's consistent everywhere. If nothing else, this means we can safely use the `--no-run-if-empty` flag, which is not available on BSD (and therefore macOS) `xargs`. CHANGELOG_BEGIN CHANGELOG_END
kgeonw · Oct 21, 2020 · 1ab14c2 · 1ab14c2
1 parent 903f7b9
commit 1ab14c2
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 12 deletions.
diff --git a/dev-env/bin/find b/dev-env/bin/find
diff --git a/dev-env/bin/find b/dev-env/bin/find
@@ -0,0 +1 @@
+../lib/dade-exec-nix-tool
diff --git a/dev-env/bin/xargs b/dev-env/bin/xargs
@@ -0,0 +1 @@
+../lib/dade-exec-nix-tool
diff --git a/nix/default.nix b/nix/default.nix
@@ -187,21 +187,22 @@ in rec {
     # System tools
     shellcheck = pkgs.shellcheck;
     curl = bazel_dependencies.curl;
-    findutils = pkgs.findutils;
 
     patch = pkgs.patch;
     wget = pkgs.wget;
     grpcurl = pkgs.grpcurl;
 
     # String mangling tooling.
-    jq   = bazel_dependencies.jq;
+    base64 = pkgs.coreutils;
+    bc = pkgs.bc;
+    find = pkgs.findutils;
     gawk = bazel_dependencies.gawk;
+    grep = pkgs.gnugrep;
+    jq = bazel_dependencies.jq;
     sed = pkgs.gnused;
-    base64 = pkgs.coreutils;
     sha1sum = pkgs.coreutils;
+    xargs = pkgs.findutils;
     xmlstarlet = pkgs.xmlstarlet;
-    grep = pkgs.gnugrep;
-    bc = pkgs.bc;
 
     # Cryptography tooling
     gnupg = pkgs.gnupg;