aboutsummaryrefslogtreecommitdiff
path: root/pkgs/build-support
diff options
context:
space:
mode:
authorvolth <volth@volth.com>2019-09-08 23:38:31 +0000
committervolth <volth@volth.com>2019-09-08 23:38:31 +0000
commit7b8fb5c06cc28a9ed2bbe605de44570ad6c8fecc (patch)
treeb533615a7e59e291dcff5793e00586dbf9d1417e /pkgs/build-support
parent4b929acf6739c1a60616f2a1edaf513b8e3dcc84 (diff)
treewide: remove redundant quotes
Diffstat (limited to 'pkgs/build-support')
-rw-r--r--pkgs/build-support/dhall-to-nix.nix2
-rw-r--r--pkgs/build-support/fetchgit/default.nix2
-rw-r--r--pkgs/build-support/fetchgit/private.nix4
-rw-r--r--pkgs/build-support/vm/windows/default.nix2
-rw-r--r--pkgs/build-support/writers/test.nix4
5 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/build-support/dhall-to-nix.nix b/pkgs/build-support/dhall-to-nix.nix
index c563b34ff3b..3805656dfa0 100644
--- a/pkgs/build-support/dhall-to-nix.nix
+++ b/pkgs/build-support/dhall-to-nix.nix
@@ -33,6 +33,6 @@ let
};
in
- import "${drv}";
+ import drv;
in
dhallToNix
diff --git a/pkgs/build-support/fetchgit/default.nix b/pkgs/build-support/fetchgit/default.nix
index 256c86748d2..0405951a9e4 100644
--- a/pkgs/build-support/fetchgit/default.nix
+++ b/pkgs/build-support/fetchgit/default.nix
@@ -52,7 +52,7 @@ else
stdenvNoCC.mkDerivation {
inherit name;
builder = ./builder.sh;
- fetcher = "${./nix-prefetch-git}"; # This must be a string to ensure it's called with bash.
+ fetcher = ./nix-prefetch-git; # This must be a string to ensure it's called with bash.
nativeBuildInputs = [git];
outputHashAlgo = "sha256";
diff --git a/pkgs/build-support/fetchgit/private.nix b/pkgs/build-support/fetchgit/private.nix
index 59376f3b042..6731cf87fbd 100644
--- a/pkgs/build-support/fetchgit/private.nix
+++ b/pkgs/build-support/fetchgit/private.nix
@@ -4,7 +4,7 @@
else null;
GIT_SSH = let
- config = ''${let
+ config = let
sshConfigFile = if (builtins.tryEval <ssh-config-file>).success
then <ssh-config-file>
else builtins.trace ''
@@ -14,7 +14,7 @@
You may need StrictHostKeyChecking=no in the config file. Since ssh will refuse to use a group-readable private key, if using build-users you will likely want to use something like IdentityFile /some/directory/%u/key and have a directory for each build user accessible to that user.
'' "/var/lib/empty/config";
- in builtins.toString sshConfigFile}'';
+ in builtins.toString sshConfigFile;
ssh-wrapped = runCommand "fetchgit-ssh" {
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/build-support/vm/windows/default.nix b/pkgs/build-support/vm/windows/default.nix
index e5ff13f0da9..48ee2713d1f 100644
--- a/pkgs/build-support/vm/windows/default.nix
+++ b/pkgs/build-support/vm/windows/default.nix
@@ -25,7 +25,7 @@ in {
bootstrap = bootstrapper attrs.windowsImage;
in {
requiredSystemFeatures = [ "kvm" ];
- builder = "${pkgs.stdenv.shell}";
+ builder = pkgs.stdenv.shell;
args = ["-e" (bootstrap.resumeAndRun builder)];
windowsImage = bootstrap.suspendedVM;
origArgs = attrs.args;
diff --git a/pkgs/build-support/writers/test.nix b/pkgs/build-support/writers/test.nix
index 80e9543f9c8..d7c347a559e 100644
--- a/pkgs/build-support/writers/test.nix
+++ b/pkgs/build-support/writers/test.nix
@@ -159,8 +159,8 @@ in runCommand "test-writers" {
meta.platforms = stdenv.lib.platforms.all;
} ''
${lib.concatMapStringsSep "\n" (test: writeTest "success" "${test}/bin/test_writers") (lib.attrValues bin)}
- ${lib.concatMapStringsSep "\n" (test: writeTest "success" "${test}") (lib.attrValues simple)}
- ${lib.concatMapStringsSep "\n" (test: writeTest "success" "${test}") (lib.attrValues path)}
+ ${lib.concatMapStringsSep "\n" (test: writeTest "success" test) (lib.attrValues simple)}
+ ${lib.concatMapStringsSep "\n" (test: writeTest "success" test) (lib.attrValues path)}
echo 'nix-writers successfully tested' >&2
touch $out