diff options
| author | volth <volth@volth.com> | 2019-09-08 23:38:31 +0000 |
|---|---|---|
| committer | volth <volth@volth.com> | 2019-09-08 23:38:31 +0000 |
| commit | 7b8fb5c06cc28a9ed2bbe605de44570ad6c8fecc (patch) | |
| tree | b533615a7e59e291dcff5793e00586dbf9d1417e /pkgs/build-support/fetchgit | |
| parent | 4b929acf6739c1a60616f2a1edaf513b8e3dcc84 (diff) | |
| download | nixpkgs-7b8fb5c06cc28a9ed2bbe605de44570ad6c8fecc.tar nixpkgs-7b8fb5c06cc28a9ed2bbe605de44570ad6c8fecc.tar.gz nixpkgs-7b8fb5c06cc28a9ed2bbe605de44570ad6c8fecc.tar.bz2 nixpkgs-7b8fb5c06cc28a9ed2bbe605de44570ad6c8fecc.tar.lz nixpkgs-7b8fb5c06cc28a9ed2bbe605de44570ad6c8fecc.tar.xz nixpkgs-7b8fb5c06cc28a9ed2bbe605de44570ad6c8fecc.tar.zst nixpkgs-7b8fb5c06cc28a9ed2bbe605de44570ad6c8fecc.zip | |
treewide: remove redundant quotes
Diffstat (limited to 'pkgs/build-support/fetchgit')
| -rw-r--r-- | pkgs/build-support/fetchgit/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/build-support/fetchgit/private.nix | 4 |
2 files changed, 3 insertions, 3 deletions
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 ]; |