diff options
| author | volth <volth@volth.com> | 2019-08-13 21:52:01 +0000 |
|---|---|---|
| committer | volth <volth@volth.com> | 2019-08-26 21:40:19 +0000 |
| commit | 35d68ef143412f579544eaac7aaa87e29f84b15e (patch) | |
| tree | 7e4cc2079e73fde7e1cacdbeb17a4ea290f0a02e /pkgs/stdenv | |
| parent | fe9c9f719d143632d31ac2b01f5f7cfbad161ce1 (diff) | |
| download | nixpkgs-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/stdenv')
| -rw-r--r-- | pkgs/stdenv/default.nix | 42 | ||||
| -rw-r--r-- | pkgs/stdenv/generic/check-meta.nix | 2 | ||||
| -rw-r--r-- | pkgs/stdenv/linux/default.nix | 28 | ||||
| -rw-r--r-- | pkgs/stdenv/native/default.nix | 4 |
4 files changed, 38 insertions, 38 deletions
diff --git a/pkgs/stdenv/default.nix b/pkgs/stdenv/default.nix index 1f752f02152..b0db1be5f44 100644 --- a/pkgs/stdenv/default.nix +++ b/pkgs/stdenv/default.nix @@ -39,25 +39,25 @@ in if crossSystem != localSystem || crossOverlays != [] then stagesCross else if config ? replaceStdenv then stagesCustom else { # switch - "i686-linux" = stagesLinux; - "x86_64-linux" = stagesLinux; - "armv5tel-linux" = stagesLinux; - "armv6l-linux" = stagesLinux; - "armv6m-linux" = stagesLinux; - "armv7a-linux" = stagesLinux; - "armv7l-linux" = stagesLinux; - "armv7r-linux" = stagesLinux; - "armv7m-linux" = stagesLinux; - "armv8a-linux" = stagesLinux; - "armv8r-linux" = stagesLinux; - "armv8m-linux" = stagesLinux; - "aarch64-linux" = stagesLinux; - "mipsel-linux" = stagesLinux; - "powerpc-linux" = /* stagesLinux */ stagesNative; - "powerpc64le-linux" = stagesLinux; - "x86_64-darwin" = stagesDarwin; - "x86_64-solaris" = stagesNix; - "i686-cygwin" = stagesNative; - "x86_64-cygwin" = stagesNative; - "x86_64-freebsd" = stagesFreeBSD; + i686-linux = stagesLinux; + x86_64-linux = stagesLinux; + armv5tel-linux = stagesLinux; + armv6l-linux = stagesLinux; + armv6m-linux = stagesLinux; + armv7a-linux = stagesLinux; + armv7l-linux = stagesLinux; + armv7r-linux = stagesLinux; + armv7m-linux = stagesLinux; + armv8a-linux = stagesLinux; + armv8r-linux = stagesLinux; + armv8m-linux = stagesLinux; + aarch64-linux = stagesLinux; + mipsel-linux = stagesLinux; + powerpc-linux = /* stagesLinux */ stagesNative; + powerpc64le-linux = stagesLinux; + x86_64-darwin = stagesDarwin; + x86_64-solaris = stagesNix; + i686-cygwin = stagesNative; + x86_64-cygwin = stagesNative; + x86_64-freebsd = stagesFreeBSD; }.${localSystem.system} or stagesNative diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix index 89e2a7a8031..5277190d169 100644 --- a/pkgs/stdenv/generic/check-meta.nix +++ b/pkgs/stdenv/generic/check-meta.nix @@ -152,7 +152,7 @@ let '' + (builtins.getAttr reason remediation) attrs; - handler = if config ? "handleEvalIssue" + handler = if config ? handleEvalIssue then config.handleEvalIssue reason else throw; in handler msg; diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index 390c7f1123e..8344c9dfb2b 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -8,21 +8,21 @@ , bootstrapFiles ? let table = { - "glibc" = { - "i686-linux" = import ./bootstrap-files/i686.nix; - "x86_64-linux" = import ./bootstrap-files/x86_64.nix; - "armv5tel-linux" = import ./bootstrap-files/armv5tel.nix; - "armv6l-linux" = import ./bootstrap-files/armv6l.nix; - "armv7l-linux" = import ./bootstrap-files/armv7l.nix; - "aarch64-linux" = import ./bootstrap-files/aarch64.nix; - "mipsel-linux" = import ./bootstrap-files/loongson2f.nix; - "powerpc64le-linux" = import ./bootstrap-files/ppc64le.nix; + glibc = { + i686-linux = import ./bootstrap-files/i686.nix; + x86_64-linux = import ./bootstrap-files/x86_64.nix; + armv5tel-linux = import ./bootstrap-files/armv5tel.nix; + armv6l-linux = import ./bootstrap-files/armv6l.nix; + armv7l-linux = import ./bootstrap-files/armv7l.nix; + aarch64-linux = import ./bootstrap-files/aarch64.nix; + mipsel-linux = import ./bootstrap-files/loongson2f.nix; + powerpc64le-linux = import ./bootstrap-files/ppc64le.nix; }; - "musl" = { - "aarch64-linux" = import ./bootstrap-files/aarch64-musl.nix; - "armv6l-linux" = import ./bootstrap-files/armv6l-musl.nix; - "x86_64-linux" = import ./bootstrap-files/x86_64-musl.nix; - "powerpc64le-linux" = import ./bootstrap-files/ppc64le-musl.nix; + musl = { + aarch64-linux = import ./bootstrap-files/aarch64-musl.nix; + armv6l-linux = import ./bootstrap-files/armv6l-musl.nix; + x86_64-linux = import ./bootstrap-files/x86_64-musl.nix; + powerpc64le-linux = import ./bootstrap-files/ppc64le-musl.nix; }; }; diff --git a/pkgs/stdenv/native/default.nix b/pkgs/stdenv/native/default.nix index ba53a6f1d14..f6e0df161ad 100644 --- a/pkgs/stdenv/native/default.nix +++ b/pkgs/stdenv/native/default.nix @@ -121,8 +121,8 @@ in cc = let nativePrefix = { # switch - "i686-solaris" = "/usr/gnu"; - "x86_64-solaris" = "/opt/local/gcc47"; + i686-solaris = "/usr/gnu"; + x86_64-solaris = "/opt/local/gcc47"; }.${system} or "/usr"; in import ../../build-support/cc-wrapper { |