From 10d1a04b02b3b40bc02888ba3d1c75093d4478b6 Mon Sep 17 00:00:00 2001 From: Uri Baghin Date: Mon, 23 Sep 2019 22:20:59 +1000 Subject: bazel-deps: remove --- pkgs/build-support/build-bazel-package/default.nix | 5 ++- .../build-managers/bazel/bazel-deps/default.nix | 40 ---------------------- pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 4 insertions(+), 43 deletions(-) delete mode 100644 pkgs/development/tools/build-managers/bazel/bazel-deps/default.nix diff --git a/pkgs/build-support/build-bazel-package/default.nix b/pkgs/build-support/build-bazel-package/default.nix index 694d0e47225f..a17712472b19 100644 --- a/pkgs/build-support/build-bazel-package/default.nix +++ b/pkgs/build-support/build-bazel-package/default.nix @@ -23,6 +23,8 @@ args@{ # # [1]: https://github.com/bazelbuild/rules_cc , removeRulesCC ? true +, removeLocalConfigCc ? true +, removeLocal ? true , ... }: @@ -86,7 +88,8 @@ in stdenv.mkDerivation (fBuildAttrs // { rm -rf $bazelOut/external/{bazel_tools,\@bazel_tools.marker} ${if removeRulesCC then "rm -rf $bazelOut/external/{rules_cc,\\@rules_cc.marker}" else ""} rm -rf $bazelOut/external/{embedded_jdk,\@embedded_jdk.marker} - rm -rf $bazelOut/external/{local_*,\@local_*.marker} + ${if removeLocalConfigCc then "rm -rf $bazelOut/external/{local_config_cc,\@local_config_cc.marker}" else ""} + ${if removeLocal then "rm -rf $bazelOut/external/{local_*,\@local_*.marker}" else ""} # Clear markers find $bazelOut/external -name '@*\.marker' -exec sh -c 'echo > {}' \; diff --git a/pkgs/development/tools/build-managers/bazel/bazel-deps/default.nix b/pkgs/development/tools/build-managers/bazel/bazel-deps/default.nix deleted file mode 100644 index 62a1329eca6a..000000000000 --- a/pkgs/development/tools/build-managers/bazel/bazel-deps/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ stdenv, buildBazelPackage, lib, fetchFromGitHub, git, jre, makeWrapper }: - -buildBazelPackage rec { - name = "bazel-deps-${version}"; - version = "2019-07-11"; - - meta = with stdenv.lib; { - homepage = "https://github.com/johnynek/bazel-deps"; - description = "Generate bazel dependencies for maven artifacts"; - license = licenses.mit; - maintainers = [ maintainers.uri-canva ]; - platforms = platforms.all; - broken = true; # global variable '_common_attrs_for_plugin_bootstrapping' is referenced before assignment. - }; - - src = fetchFromGitHub { - owner = "johnynek"; - repo = "bazel-deps"; - rev = "48fdf7f8bcf3aadfa07f9f7e6f0c9f4247cb0f58"; - sha256 = "0wpn5anfgq5wfljfhpn8gbgdmgcp0claffjgqcnv5dh70ch7i0gi"; - }; - - bazelTarget = "//src/scala/com/github/johnynek/bazel_deps:parseproject_deploy.jar"; - - buildInputs = [ git makeWrapper ]; - - fetchAttrs = { - sha256 = "1r5qxsbw2cgww7vcg5psh7404l3jcxpvc0ndgl3k8vj1x8y93nkf"; - }; - - buildAttrs = { - installPhase = '' - mkdir -p $out/bin/bazel-bin/src/scala/com/github/johnynek/bazel_deps - - cp gen_maven_deps.sh $out/bin - wrapProgram "$out/bin/gen_maven_deps.sh" --set JAVA_HOME "${jre}" --prefix PATH : ${lib.makeBinPath [ jre ]} - cp bazel-bin/src/scala/com/github/johnynek/bazel_deps/parseproject_deploy.jar $out/bin/bazel-bin/src/scala/com/github/johnynek/bazel_deps - ''; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a8bf22e01c74..916b27840cd5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9719,8 +9719,6 @@ in buildozer = bazel-buildtools; unused_deps = bazel-buildtools; - bazel-deps = callPackage ../development/tools/build-managers/bazel/bazel-deps { }; - bazel-remote = callPackage ../development/tools/build-managers/bazel/bazel-remote { }; bazel-watcher = callPackage ../development/tools/bazel-watcher { -- cgit 1.4.1