From 502f1dd6278372af7c23a16fb412573ca85e790e Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Sat, 7 Nov 2020 19:15:53 +0100 Subject: [PATCH] test-srcs: apply nixpkgs-fmt --- ofborg/test-srcs/build-pr/default.nix | 9 +++++---- ofborg/test-srcs/build/default.nix | 7 +++---- ofborg/test-srcs/eval-mixed-failure/default.nix | 15 ++++++++------- ofborg/test-srcs/eval/default.nix | 5 ++--- ofborg/test-srcs/maintainers/default.nix | 3 +-- 5 files changed, 19 insertions(+), 20 deletions(-) diff --git a/ofborg/test-srcs/build-pr/default.nix b/ofborg/test-srcs/build-pr/default.nix index 61e22b1..231e584 100644 --- a/ofborg/test-srcs/build-pr/default.nix +++ b/ofborg/test-srcs/build-pr/default.nix @@ -1,25 +1,26 @@ let builder = builtins.storePath ; -in { +in +{ success = derivation { name = "success"; system = builtins.currentSystem; inherit builder; - args = ["-c" "echo hi; printf '1\n2\n3\n4\n'; echo ${toString builtins.currentTime} > $out" ]; + args = [ "-c" "echo hi; printf '1\n2\n3\n4\n'; echo ${toString builtins.currentTime} > $out" ]; }; failed = derivation { name = "failed"; system = builtins.currentSystem; inherit builder; - args = ["-c" "echo hi; echo ${toString builtins.currentTime}" ]; + args = [ "-c" "echo hi; echo ${toString builtins.currentTime}" ]; }; sandbox-violation = derivation { name = "sandbox-violation"; system = builtins.currentSystem; inherit builder; - args = ["-c" "echo hi; echo ${toString builtins.currentTime} > $out" ]; + args = [ "-c" "echo hi; echo ${toString builtins.currentTime} > $out" ]; src = ./../../src; }; } diff --git a/ofborg/test-srcs/build/default.nix b/ofborg/test-srcs/build/default.nix index 3bceab1..6c57488 100644 --- a/ofborg/test-srcs/build/default.nix +++ b/ofborg/test-srcs/build/default.nix @@ -1,20 +1,19 @@ let builder = builtins.storePath ; in - { success = derivation { name = "success"; system = builtins.currentSystem; inherit builder; - args = ["-c" "echo hi; echo ${toString builtins.currentTime} > $out" ]; + args = [ "-c" "echo hi; echo ${toString builtins.currentTime} > $out" ]; }; failed = derivation { name = "failed"; system = builtins.currentSystem; inherit builder; - args = ["-c" "echo hi; echo ${toString builtins.currentTime}" ]; + args = [ "-c" "echo hi; echo ${toString builtins.currentTime}" ]; }; sandbox-violation = derivation { @@ -22,6 +21,6 @@ in system = builtins.currentSystem; src = ./../../src; inherit builder; - args = ["-c" "echo hi; echo ${toString builtins.currentTime} > $out" ]; + args = [ "-c" "echo hi; echo ${toString builtins.currentTime} > $out" ]; }; } diff --git a/ofborg/test-srcs/eval-mixed-failure/default.nix b/ofborg/test-srcs/eval-mixed-failure/default.nix index 4963362..067c72a 100644 --- a/ofborg/test-srcs/eval-mixed-failure/default.nix +++ b/ofborg/test-srcs/eval-mixed-failure/default.nix @@ -1,11 +1,11 @@ let fetchGit = builtins.fetchGit or (path: assert builtins.trace '' error: access to path '/fake' is forbidden in restricted mode - '' false; path); + '' + false; path); builder = builtins.storePath ; in - { nixpkgs ? fetchGit /fake }: rec { @@ -13,31 +13,32 @@ rec { name = "success"; system = builtins.currentSystem; inherit builder; - args = ["-c" "echo hi; echo ${toString builtins.currentTime} > $out" ]; + args = [ "-c" "echo hi; echo ${toString builtins.currentTime} > $out" ]; }; failed = derivation { name = "failed"; system = builtins.currentSystem; inherit builder; - args = ["-c" "echo hi; echo ${toString builtins.currentTime}; echo ${success}" ]; + args = [ "-c" "echo hi; echo ${toString builtins.currentTime}; echo ${success}" ]; }; passes-instantiation = derivation { name = "passes-instantiation"; system = builtins.currentSystem; inherit builder; - args = ["-c" "echo this ones cool" ]; + args = [ "-c" "echo this ones cool" ]; }; nixpkgs-restricted-mode = derivation { name = "nixpkgs-restricted-mode-fetchgit"; system = builtins.currentSystem; inherit builder; - args = ["-c" "echo hi; echo ${toString nixpkgs} > $out" ]; + args = [ "-c" "echo hi; echo ${toString nixpkgs} > $out" ]; }; fails-instantiation = assert builtins.trace '' You just can't frooble the frozz on this particular system. - '' false; {}; + '' + false; { }; } diff --git a/ofborg/test-srcs/eval/default.nix b/ofborg/test-srcs/eval/default.nix index 5ecbc69..e95f0dd 100644 --- a/ofborg/test-srcs/eval/default.nix +++ b/ofborg/test-srcs/eval/default.nix @@ -1,19 +1,18 @@ let builder = builtins.storePath ; in - rec { success = derivation { name = "success"; system = builtins.currentSystem; inherit builder; - args = ["-c" "echo hi; echo ${toString builtins.currentTime} > $out" ]; + args = [ "-c" "echo hi; echo ${toString builtins.currentTime} > $out" ]; }; failed = derivation { name = "failed"; system = builtins.currentSystem; inherit builder; - args = ["-c" "echo hi; echo ${toString builtins.currentTime}; echo ${success}" ]; + args = [ "-c" "echo hi; echo ${toString builtins.currentTime}; echo ${success}" ]; }; } diff --git a/ofborg/test-srcs/maintainers/default.nix b/ofborg/test-srcs/maintainers/default.nix index 712a555..961bb32 100644 --- a/ofborg/test-srcs/maintainers/default.nix +++ b/ofborg/test-srcs/maintainers/default.nix @@ -1,6 +1,5 @@ { ... }: { lib = import ./lib; - foo.bar.packageA = { - }; + foo.bar.packageA = { }; }