Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/ofborg
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 8772eba53e8e
Choose a base ref
...
head repository: NixOS/ofborg
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 5e2747cc1360
Choose a head ref
  • 1 commit
  • 4 files changed
  • 1 contributor

Commits on Aug 8, 2018

  1. builtins.storePath the configured nix shell

    @grahamc
    grahamc committed Aug 8, 2018
    Copy the full SHA
    5e2747c View commit details
Showing with 9 additions and 9 deletions.
  1. +2 −2 ofborg/test-srcs/build-pr/default.nix
  2. +2 −2 ofborg/test-srcs/build/default.nix
  3. +3 −3 ofborg/test-srcs/eval-mixed-failure/default.nix
  4. +2 −2 ofborg/test-srcs/eval/default.nix
4 changes: 2 additions & 2 deletions ofborg/test-srcs/build-pr/default.nix
View file
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@ in {
success = derivation {
name = "success";
system = builtins.currentSystem;
builder = nix.shell;
builder = builtins.storePath nix.shell;
args = [
"-c"
"echo hi; printf '1\n2\n3\n4\n'; echo ${toString builtins.currentTime} > $out" ];
@@ -13,7 +13,7 @@ in {
failed = derivation {
name = "failed";
system = builtins.currentSystem;
builder = nix.shell;
builder = builtins.storePath nix.shell;
args = [
"-c"
"echo hi; echo ${toString builtins.currentTime}" ];
4 changes: 2 additions & 2 deletions ofborg/test-srcs/build/default.nix
View file
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@ in {
success = derivation {
name = "success";
system = builtins.currentSystem;
builder = nix.shell;
builder = builtins.storePath nix.shell;
args = [
"-c"
"echo hi; echo ${toString builtins.currentTime} > $out" ];
@@ -13,7 +13,7 @@ in {
failed = derivation {
name = "failed";
system = builtins.currentSystem;
builder = nix.shell;
builder = builtins.storePath nix.shell;
args = [
"-c"
"echo hi; echo ${toString builtins.currentTime}" ];
6 changes: 3 additions & 3 deletions ofborg/test-srcs/eval-mixed-failure/default.nix
View file
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@ in rec {
success = derivation {
name = "success";
system = builtins.currentSystem;
builder = nix.shell;
builder = builtins.storePath nix.shell;
args = [
"-c"
"echo hi; echo ${toString builtins.currentTime} > $out" ];
@@ -13,7 +13,7 @@ in rec {
failed = derivation {
name = "failed";
system = builtins.currentSystem;
builder = nix.shell;
builder = builtins.storePath nix.shell;
args = [
"-c"
"echo hi; echo ${toString builtins.currentTime}; echo ${success}" ];
@@ -22,7 +22,7 @@ in rec {
passes-instantiation = derivation {
name = "passes-instantiation";
system = builtins.currentSystem;
builder = nix.shell;
builder = builtins.storePath nix.shell;
args = [
"-c"
"echo this ones cool" ];
4 changes: 2 additions & 2 deletions ofborg/test-srcs/eval/default.nix
View file
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@ in rec {
success = derivation {
name = "success";
system = builtins.currentSystem;
builder = nix.shell;
builder = builtins.storePath nix.shell;
args = [
"-c"
"echo hi; echo ${toString builtins.currentTime} > $out" ];
@@ -13,7 +13,7 @@ in rec {
failed = derivation {
name = "failed";
system = builtins.currentSystem;
builder = nix.shell;
builder = builtins.storePath nix.shell;
args = [
"-c"
"echo hi; echo ${toString builtins.currentTime}; echo ${success}" ];