summary refs log tree commit diff
path: root/pkgs/build-support
diff options
context:
space:
mode:
authorvolth <volth@volth.com>2019-08-13 21:52:01 +0000
committervolth <volth@volth.com>2019-08-26 21:40:19 +0000
commit35d68ef143412f579544eaac7aaa87e29f84b15e (patch)
tree7e4cc2079e73fde7e1cacdbeb17a4ea290f0a02e /pkgs/build-support
parentfe9c9f719d143632d31ac2b01f5f7cfbad161ce1 (diff)
downloadnixpkgs-35d68ef143412f579544eaac7aaa87e29f84b15e.tar
nixpkgs-35d68ef143412f579544eaac7aaa87e29f84b15e.tar.gz
nixpkgs-35d68ef143412f579544eaac7aaa87e29f84b15e.tar.bz2
nixpkgs-35d68ef143412f579544eaac7aaa87e29f84b15e.tar.lz
nixpkgs-35d68ef143412f579544eaac7aaa87e29f84b15e.tar.xz
nixpkgs-35d68ef143412f579544eaac7aaa87e29f84b15e.tar.zst
nixpkgs-35d68ef143412f579544eaac7aaa87e29f84b15e.zip
treewide: remove redundant quotes
Diffstat (limited to 'pkgs/build-support')
-rw-r--r--pkgs/build-support/bintools-wrapper/default.nix8
-rw-r--r--pkgs/build-support/fetchdocker/default.nix4
-rw-r--r--pkgs/build-support/rust/build-rust-crate/test/brotli-crates.nix32
-rw-r--r--pkgs/build-support/rust/default.nix4
4 files changed, 24 insertions, 24 deletions
diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix
index e1ec09bc95a..e02e77de45e 100644
--- a/pkgs/build-support/bintools-wrapper/default.nix
+++ b/pkgs/build-support/bintools-wrapper/default.nix
@@ -180,10 +180,10 @@ stdenv.mkDerivation {
       else if targetPlatform.isx86_64  then "x86-64"
       else if targetPlatform.isx86_32  then "i386"
       else if targetPlatform.isMips    then {
-          "mips"     = "btsmipn32"; # n32 variant
-          "mipsel"   = "ltsmipn32"; # n32 variant
-          "mips64"   = "btsmip";
-          "mips64el" = "ltsmip";
+          mips     = "btsmipn32"; # n32 variant
+          mipsel   = "ltsmipn32"; # n32 variant
+          mips64   = "btsmip";
+          mips64el = "ltsmip";
         }.${targetPlatform.parsed.cpu.name}
       else if targetPlatform.isPower then if targetPlatform.isBigEndian then "ppc" else "lppc"
       else if targetPlatform.isSparc then "sparc"
diff --git a/pkgs/build-support/fetchdocker/default.nix b/pkgs/build-support/fetchdocker/default.nix
index bbd2bae46df..57d2e4ad82d 100644
--- a/pkgs/build-support/fetchdocker/default.nix
+++ b/pkgs/build-support/fetchdocker/default.nix
@@ -37,8 +37,8 @@ let
 
   repositories =
     writeText "repositories" (builtins.toJSON {
-      "${repoTag1}" = {
-        "${tag}" = lib.last layers;
+      ${repoTag1} = {
+        ${tag} = lib.last layers;
       };
     });
 
diff --git a/pkgs/build-support/rust/build-rust-crate/test/brotli-crates.nix b/pkgs/build-support/rust/build-rust-crate/test/brotli-crates.nix
index 068cc5a9884..abf5fedbf79 100644
--- a/pkgs/build-support/rust/build-rust-crate/test/brotli-crates.nix
+++ b/pkgs/build-support/rust/build-rust-crate/test/brotli-crates.nix
@@ -52,20 +52,20 @@ rec {
     features = mkFeatures (features.brotli_2_5_0 or {});
   };
   brotli_2_5_0_features = f: updateFeatures f (rec {
-    alloc_no_stdlib_1_3_0."no-stdlib" =
-      (f.alloc_no_stdlib_1_3_0."no-stdlib" or false) ||
-      (brotli_2_5_0."no-stdlib" or false) ||
-      (f.brotli_2_5_0."no-stdlib" or false);
+    alloc_no_stdlib_1_3_0.no-stdlib =
+      (f.alloc_no_stdlib_1_3_0.no-stdlib or false) ||
+      (brotli_2_5_0.no-stdlib or false) ||
+      (f.brotli_2_5_0.no-stdlib or false);
     alloc_no_stdlib_1_3_0.default = true;
     brotli_2_5_0.default = (f.brotli_2_5_0.default or true);
-    brotli_decompressor_1_3_1."disable-timer" =
-      (f.brotli_decompressor_1_3_1."disable-timer" or false) ||
-      (brotli_2_5_0."disable-timer" or false) ||
-      (f.brotli_2_5_0."disable-timer" or false);
-    brotli_decompressor_1_3_1."no-stdlib" =
-      (f.brotli_decompressor_1_3_1."no-stdlib" or false) ||
-      (brotli_2_5_0."no-stdlib" or false) ||
-      (f.brotli_2_5_0."no-stdlib" or false);
+    brotli_decompressor_1_3_1.disable-timer =
+      (f.brotli_decompressor_1_3_1.disable-timer or false) ||
+      (brotli_2_5_0.disable-timer or false) ||
+      (f.brotli_2_5_0.disable-timer or false);
+    brotli_decompressor_1_3_1.no-stdlib =
+      (f.brotli_decompressor_1_3_1.no-stdlib or false) ||
+      (brotli_2_5_0.no-stdlib or false) ||
+      (f.brotli_2_5_0.no-stdlib or false);
     brotli_decompressor_1_3_1.benchmark =
       (f.brotli_decompressor_1_3_1.benchmark or false) ||
       (brotli_2_5_0.benchmark or false) ||
@@ -81,10 +81,10 @@ rec {
     features = mkFeatures (features.brotli_decompressor_1_3_1 or {});
   };
   brotli_decompressor_1_3_1_features = f: updateFeatures f (rec {
-    alloc_no_stdlib_1_3_0."no-stdlib" =
-      (f.alloc_no_stdlib_1_3_0."no-stdlib" or false) ||
-      (brotli_decompressor_1_3_1."no-stdlib" or false) ||
-      (f.brotli_decompressor_1_3_1."no-stdlib" or false);
+    alloc_no_stdlib_1_3_0.no-stdlib =
+      (f.alloc_no_stdlib_1_3_0.no-stdlib or false) ||
+      (brotli_decompressor_1_3_1.no-stdlib or false) ||
+      (f.brotli_decompressor_1_3_1.no-stdlib or false);
     alloc_no_stdlib_1_3_0.default = true;
     alloc_no_stdlib_1_3_0.unsafe =
       (f.alloc_no_stdlib_1_3_0.unsafe or false) ||
diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix
index 09802d56d34..ce1bf800276 100644
--- a/pkgs/build-support/rust/default.nix
+++ b/pkgs/build-support/rust/default.nix
@@ -44,8 +44,8 @@ let
   hostConfig = stdenv.hostPlatform.config;
 
   rustHostConfig = {
-    "x86_64-pc-mingw32" = "x86_64-pc-windows-gnu";
-  }."${hostConfig}" or hostConfig;
+    x86_64-pc-mingw32 = "x86_64-pc-windows-gnu";
+  }.${hostConfig} or hostConfig;
 
   ccForBuild="${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}cc";
   cxxForBuild="${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}c++";