tangled
alpha
login
or
join now
pyrox.dev
/
nixpkgs
lol
0
fork
atom
overview
issues
pulls
pipelines
bazel: Bump nix-hacks.patch for 0.9.
Shea Levy
8 years ago
f040f646
d4dbe03b
+62
-25
4 changed files
expand all
collapse all
unified
split
pkgs
development
tools
build-managers
bazel
0.4.nix
nix-hacks-0.4.patch
nix-hacks.patch
top-level
all-packages.nix
+1
-1
pkgs/development/tools/build-managers/bazel/0.4.nix
···
29
'';
30
sourceRoot = ".";
31
32
-
patches = lib.optional enableNixHacks ./nix-hacks.patch;
33
34
postPatch = ''
35
for f in $(grep -l -r '/bin/bash'); do
···
29
'';
30
sourceRoot = ".";
31
32
+
patches = lib.optional enableNixHacks ./nix-hacks-0.4.patch;
33
34
postPatch = ''
35
for f in $(grep -l -r '/bin/bash'); do
+51
pkgs/development/tools/build-managers/bazel/nix-hacks-0.4.patch
···
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
···
1
+
diff --git a/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorFunction.java b/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorFunction.java
2
+
index eafa09fb5..d2d5e40e8 100644
3
+
--- a/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorFunction.java
4
+
+++ b/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorFunction.java
5
+
@@ -287,21 +287,8 @@ public final class RepositoryDelegatorFunction implements SkyFunction {
6
+
markerData.put(key, value);
7
+
}
8
+
}
9
+
- boolean result = false;
10
+
- if (markerRuleKey.equals(ruleKey)) {
11
+
- result = handler.verifyMarkerData(rule, markerData, env);
12
+
- if (env.valuesMissing()) {
13
+
- return null;
14
+
- }
15
+
- }
16
+
17
+
- if (result) {
18
+
- return new Fingerprint().addString(content).digestAndReset();
19
+
- } else {
20
+
- // So that we are in a consistent state if something happens while fetching the repository
21
+
- markerPath.delete();
22
+
- return null;
23
+
- }
24
+
+ return new Fingerprint().addString(content).digestAndReset();
25
+
26
+
} catch (IOException e) {
27
+
throw new RepositoryFunctionException(e, Transience.TRANSIENT);
28
+
diff --git a/src/main/java/com/google/devtools/build/lib/shell/JavaSubprocessFactory.java b/src/main/java/com/google/devtools/build/lib/shell/JavaSubprocessFactory.java
29
+
index a7ebc8f7a..40f2049fa 100644
30
+
--- a/src/main/java/com/google/devtools/build/lib/shell/JavaSubprocessFactory.java
31
+
+++ b/src/main/java/com/google/devtools/build/lib/shell/JavaSubprocessFactory.java
32
+
@@ -129,7 +129,6 @@ public class JavaSubprocessFactory implements SubprocessFactory {
33
+
ProcessBuilder builder = new ProcessBuilder();
34
+
builder.command(params.getArgv());
35
+
if (params.getEnv() != null) {
36
+
- builder.environment().clear();
37
+
builder.environment().putAll(params.getEnv());
38
+
}
39
+
40
+
diff --git a/src/main/java/com/google/devtools/build/lib/worker/Worker.java b/src/main/java/com/google/devtools/build/lib/worker/Worker.java
41
+
index 0268d1b2b..637364657 100644
42
+
--- a/src/main/java/com/google/devtools/build/lib/worker/Worker.java
43
+
+++ b/src/main/java/com/google/devtools/build/lib/worker/Worker.java
44
+
@@ -77,7 +77,6 @@ class Worker {
45
+
new ProcessBuilder(command)
46
+
.directory(workDir.getPathFile())
47
+
.redirectError(Redirect.appendTo(logFile.getPathFile()));
48
+
- processBuilder.environment().clear();
49
+
processBuilder.environment().putAll(workerKey.getEnv());
50
+
51
+
this.process = processBuilder.start();
+8
-22
pkgs/development/tools/build-managers/bazel/nix-hacks.patch
···
1
-
diff --git a/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorFunction.java b/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorFunction.java
2
-
index eafa09fb5..d2d5e40e8 100644
3
-
--- a/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorFunction.java
4
-
+++ b/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorFunction.java
5
-
@@ -287,21 +287,8 @@ public final class RepositoryDelegatorFunction implements SkyFunction {
6
markerData.put(key, value);
7
}
8
}
···
25
26
} catch (IOException e) {
27
throw new RepositoryFunctionException(e, Transience.TRANSIENT);
28
-
diff --git a/src/main/java/com/google/devtools/build/lib/shell/JavaSubprocessFactory.java b/src/main/java/com/google/devtools/build/lib/shell/JavaSubprocessFactory.java
29
-
index a7ebc8f7a..40f2049fa 100644
30
-
--- a/src/main/java/com/google/devtools/build/lib/shell/JavaSubprocessFactory.java
31
-
+++ b/src/main/java/com/google/devtools/build/lib/shell/JavaSubprocessFactory.java
32
-
@@ -129,7 +129,6 @@ public class JavaSubprocessFactory implements SubprocessFactory {
33
ProcessBuilder builder = new ProcessBuilder();
34
builder.command(params.getArgv());
35
if (params.getEnv() != null) {
···
37
builder.environment().putAll(params.getEnv());
38
}
39
40
-
diff --git a/src/main/java/com/google/devtools/build/lib/worker/Worker.java b/src/main/java/com/google/devtools/build/lib/worker/Worker.java
41
-
index 0268d1b2b..637364657 100644
42
-
--- a/src/main/java/com/google/devtools/build/lib/worker/Worker.java
43
-
+++ b/src/main/java/com/google/devtools/build/lib/worker/Worker.java
44
-
@@ -77,7 +77,6 @@ class Worker {
45
-
new ProcessBuilder(command)
46
-
.directory(workDir.getPathFile())
47
-
.redirectError(Redirect.appendTo(logFile.getPathFile()));
48
-
- processBuilder.environment().clear();
49
-
processBuilder.environment().putAll(workerKey.getEnv());
50
-
51
-
this.process = processBuilder.start();
···
1
+
diff -Naur a/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorFunction.java b/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorFunction.java
2
+
--- a/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorFunction.java 1980-01-01 00:00:00.000000000 -0500
3
+
+++ b/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorFunction.java 2018-01-18 08:17:22.420459162 -0500
4
+
@@ -287,21 +287,8 @@
0
5
markerData.put(key, value);
6
}
7
}
···
24
25
} catch (IOException e) {
26
throw new RepositoryFunctionException(e, Transience.TRANSIENT);
27
+
diff -Naur a/src/main/java/com/google/devtools/build/lib/shell/JavaSubprocessFactory.java b/src/main/java/com/google/devtools/build/lib/shell/JavaSubprocessFactory.java
28
+
--- a/src/main/java/com/google/devtools/build/lib/shell/JavaSubprocessFactory.java 1980-01-01 00:00:00.000000000 -0500
29
+
+++ b/src/main/java/com/google/devtools/build/lib/shell/JavaSubprocessFactory.java 2018-01-18 08:17:53.274877980 -0500
30
+
@@ -129,7 +129,6 @@
0
31
ProcessBuilder builder = new ProcessBuilder();
32
builder.command(params.getArgv());
33
if (params.getEnv() != null) {
···
35
builder.environment().putAll(params.getEnv());
36
}
37
0
0
0
0
0
0
0
0
0
0
0
0
+2
-2
pkgs/top-level/all-packages.nix
···
7205
bam = callPackage ../development/tools/build-managers/bam {};
7206
7207
bazel_0_4 = callPackage ../development/tools/build-managers/bazel/0.4.nix { };
7208
-
bazel_0_5 = callPackage ../development/tools/build-managers/bazel { };
7209
-
bazel = bazel_0_5;
7210
7211
bear = callPackage ../development/tools/build-managers/bear { };
7212
···
7205
bam = callPackage ../development/tools/build-managers/bam {};
7206
7207
bazel_0_4 = callPackage ../development/tools/build-managers/bazel/0.4.nix { };
7208
+
bazel_0_9 = callPackage ../development/tools/build-managers/bazel { };
7209
+
bazel = bazel_0_9;
7210
7211
bear = callPackage ../development/tools/build-managers/bear { };
7212