diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2017-08-13 18:34:59 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2017-08-13 18:34:59 +0200 |
| commit | 7ebcd39a0f147ffa544818c9fd5954bc9dcae2d8 (patch) | |
| tree | e2ad4a017b7946b4bf72a3ae863960a4b5ffa55c /pkgs/development/compilers | |
| parent | 206faacbcb8c9a4655c6c8cf2cf5eec688d59719 (diff) | |
| parent | 4c4920567605bd24226522fbd4c2a24d8cef86b6 (diff) | |
| download | nixpkgs-7ebcd39a0f147ffa544818c9fd5954bc9dcae2d8.tar nixpkgs-7ebcd39a0f147ffa544818c9fd5954bc9dcae2d8.tar.gz nixpkgs-7ebcd39a0f147ffa544818c9fd5954bc9dcae2d8.tar.bz2 nixpkgs-7ebcd39a0f147ffa544818c9fd5954bc9dcae2d8.tar.lz nixpkgs-7ebcd39a0f147ffa544818c9fd5954bc9dcae2d8.tar.xz nixpkgs-7ebcd39a0f147ffa544818c9fd5954bc9dcae2d8.tar.zst nixpkgs-7ebcd39a0f147ffa544818c9fd5954bc9dcae2d8.zip | |
Merge commit '4c49205' into HEAD
Diffstat (limited to 'pkgs/development/compilers')
| -rw-r--r-- | pkgs/development/compilers/chicken/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/compilers/llvm/3.8/llvm.nix | 2 | ||||
| -rwxr-xr-x | pkgs/development/compilers/ocaml/configure-3.08.0 | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/compilers/chicken/default.nix b/pkgs/development/compilers/chicken/default.nix index 24d583ed886..792ecc739a5 100644 --- a/pkgs/development/compilers/chicken/default.nix +++ b/pkgs/development/compilers/chicken/default.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation { CHICKEN is a compiler for the Scheme programming language. CHICKEN produces portable and efficient C, supports almost all of the R5RS Scheme language standard, and includes many - enhancements and extensions. CHICKEN runs on Linux, MacOS X, + enhancements and extensions. CHICKEN runs on Linux, macOS, Windows, and many Unix flavours. ''; }; diff --git a/pkgs/development/compilers/llvm/3.8/llvm.nix b/pkgs/development/compilers/llvm/3.8/llvm.nix index ee0a50c9397..a3f652d783b 100644 --- a/pkgs/development/compilers/llvm/3.8/llvm.nix +++ b/pkgs/development/compilers/llvm/3.8/llvm.nix @@ -40,7 +40,7 @@ in stdenv.mkDerivation rec { patches = [ ./D17533-1.patch ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [./fix-llvm-config.patch]; - # hacky fix: New LLVM releases require a newer OS X SDK than + # hacky fix: New LLVM releases require a newer macOS SDK than # 10.9. This is a temporary measure until nixpkgs darwin support is # updated. postPatch = stdenv.lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/development/compilers/ocaml/configure-3.08.0 b/pkgs/development/compilers/ocaml/configure-3.08.0 index c62da78ab9f..9c870585512 100755 --- a/pkgs/development/compilers/ocaml/configure-3.08.0 +++ b/pkgs/development/compilers/ocaml/configure-3.08.0 @@ -45,7 +45,7 @@ gcc_warnings="-Wall" unset LANG unset LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES LC_MONETARY LC_NUMERIC LC_TIME -# Turn off some MacOS X debugging stuff, same reason +# Turn off some macOS debugging stuff, same reason unset RC_TRACE_ARCHIVES RC_TRACE_DYLIBS RC_TRACE_PREBINDING_DISABLED # Parse command-line arguments |