From e7e70b7073ca774f2f0dfeace5511d29c75d3cec Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Sat, 22 Jun 2019 10:31:51 +0200 Subject: [PATCH] bazel: add fixed output test case Feels like a horrible hack, but it should make sure that downstream hashes are preserved between bazel versions. --- .../tools/build-managers/bazel/default.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix index 1a383b76d5d..a8c4ffcb85b 100644 --- a/pkgs/development/tools/build-managers/bazel/default.nix +++ b/pkgs/development/tools/build-managers/bazel/default.nix @@ -1,4 +1,5 @@ -{ stdenv, callPackage, lib, fetchurl, fetchFromGitHub, runCommand, runCommandCC, makeWrapper +{ stdenv, callPackage, lib, fetchurl, fetchFromGitHub +, runCommand, runCommandCC, makeWrapper, recurseIntoAttrs # this package (through the fixpoint glass) , bazel , lr, xe, zip, unzip, bash, writeCBin, coreutils @@ -11,6 +12,8 @@ , buildJdk, runJdk , buildJdkName , runtimeShell +# Downstream packages for tests +, bazel-watcher # Always assume all markers valid (don't redownload dependencies). # Also, don't clean up environment variables. , enableNixHacks ? false @@ -221,10 +224,18 @@ stdenv.mkDerivation rec { pythonBinPath = callPackage ./python-bin-path-test.nix { inherit runLocal bazelTest; }; bashToolsWithNixHacks = callPackage ./bash-tools-test.nix { inherit runLocal bazelTest; bazel = bazelWithNixHacks; }; + cppWithNixHacks = callPackage ./cpp-test.nix { inherit runLocal bazelTest bazel-examples; bazel = bazelWithNixHacks; }; javaWithNixHacks = callPackage ./java-test.nix { inherit runLocal bazelTest bazel-examples; bazel = bazelWithNixHacks; }; protobufWithNixHacks = callPackage ./protobuf-test.nix { inherit runLocal bazelTest; bazel = bazelWithNixHacks; }; pythonBinPathWithNixHacks = callPackage ./python-bin-path-test.nix { inherit runLocal bazelTest; bazel = bazelWithNixHacks; }; + + # downstream packages using buildBazelPackage + # fixed-output hashes of the fetch phase need to be spot-checked manually + downstream = recurseIntoAttrs { + inherit (python3.pkgs) dm-sonnet; + inherit bazel-watcher; + }; }; # update the list of workspace dependencies