public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

replace "Mac OS X" and "OS X" with "macOS"

Browse Source 
as it is the official name since 2016

https://en.wikipedia.org/wiki/Macintosh_operating_systems#Desktop

exception are parts refering to older versions of macOS like

"GUI support for Mac OS X 10.6 - 10.12. Note that Emacs 23 and later [...]"
This commit is contained in:
davidak
2017-08-07 00:05:18 +02:00
parent ff9479cd54
commit 3270aa896b
62 changed files with 82 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/compilers/chicken/default.nix
View File

@@ -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.
'';
};

2
pkgs/development/compilers/llvm/3.8/llvm.nix
View File

@@ -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 ''

2
pkgs/development/compilers/ocaml/configure-3.08.0
View File

@@ -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

4
pkgs/development/haskell-modules/generic-builder.nix
View File

@@ -231,10 +231,10 @@ stdenv.mkDerivation ({
fi
done
'' + (optionalString stdenv.isDarwin ''
# Work around a limit in the Mac OS X Sierra linker on the number of paths
# Work around a limit in the macOS Sierra linker on the number of paths
# referenced by any one dynamic library:
#
# Create a local directory with symlinks of the *.dylib (Mac OS X shared
# Create a local directory with symlinks of the *.dylib (macOS shared
# libraries) from all the dependencies.
local dynamicLinksDir="$out/lib/links"
mkdir -p $dynamicLinksDir

20
pkgs/development/haskell-modules/hackage-packages.nix
View File

@@ -83327,7 +83327,7 @@ self: {
libraryHaskellDepends = [ array base containers glib gtk mtl ];
libraryPkgconfigDepends = [ gtk-mac-integration-gtk2 ];
homepage = "http://www.haskell.org/gtk2hs/";
description = "Bindings for the Gtk/OS X integration library";
description = "Bindings for the Gtk/macOS integration library";
license = stdenv.lib.licenses.lgpl21;
hydraPlatforms = stdenv.lib.platforms.none;
}) {gtk-mac-integration-gtk2 = null;};
@@ -83591,7 +83591,7 @@ self: {
libraryHaskellDepends = [ array base containers glib gtk3 mtl ];
libraryPkgconfigDepends = [ gtk-mac-integration-gtk3 ];
homepage = "http://www.haskell.org/gtk2hs/";
description = "Bindings for the Gtk/OS X integration library";
description = "Bindings for the Gtk/macOS integration library";
license = stdenv.lib.licenses.lgpl21;
hydraPlatforms = stdenv.lib.platforms.none;
}) {gtk-mac-integration-gtk3 = null;};
@@ -95058,7 +95058,7 @@ self: {
librarySystemDepends = [ Cocoa ];
libraryToolDepends = [ CoreServices ];
homepage = "http://github.com/luite/hfsevents";
description = "File/folder watching for OS X";
description = "File/folder watching for macOS";
license = stdenv.lib.licenses.bsd3;
platforms = [ "x86_64-darwin" ];
hydraPlatforms = stdenv.lib.platforms.none;
@@ -108820,7 +108820,7 @@ self: {
libraryPkgconfigDepends = [ ige-mac-integration ];
libraryToolDepends = [ gtk2hs-buildtools ];
homepage = "http://www.haskell.org/gtk2hs/";
description = "Bindings for the Gtk/OS X integration library";
description = "Bindings for the Gtk/macOS integration library";
license = stdenv.lib.licenses.lgpl21;
hydraPlatforms = stdenv.lib.platforms.none;
}) {ige-mac-integration = null;};
@@ -130347,7 +130347,7 @@ self: {
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [ base GLUT haskell98 unix ];
description = "Shows how to run grabber on Mac OS X";
description = "Shows how to run grabber on macOS";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
@@ -130745,7 +130745,7 @@ self: {
isExecutable = true;
enableSeparateDataOutput = true;
executableHaskellDepends = [ base directory filepath haskell98 ];
description = "Makes an OS X .app bundle from a binary.";
description = "Makes an macOS .app bundle from a binary.";
license = "GPL";
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
@@ -142686,7 +142686,7 @@ self: {
sha256 = "1d2lna7gvygiq062p2y1zy182wv3vkr0lda49y502ad6jf483xdn";
enableSeparateDataOutput = true;
libraryHaskellDepends = [ base binary bytestring containers ];
description = "Parser for OS X static archive format";
description = "Parser for macOS static archive format";
license = stdenv.lib.licenses.bsd3;
}) {};
@@ -149409,7 +149409,7 @@ self: {
sha256 = "0xsx1pvlnqyidpvswisir9p9054r7fczi81nccflazijn3pr9rgb";
enableSeparateDataOutput = true;
libraryHaskellDepends = [ base base64-bytestring bytestring hxt ];
description = "Generate and parse Mac OS X property list format";
description = "Generate and parse macOS property list format";
license = stdenv.lib.licenses.bsd3;
}) {};
@@ -178266,7 +178266,7 @@ self: {
test-framework-hunit test-framework-quickcheck2 time unix
];
homepage = "https://bitbucket.org/ssaasen/spy";
description = "A compact file system watcher for Mac OS X, Linux and Windows";
description = "A compact file system watcher for macOS, Linux and Windows";
license = stdenv.lib.licenses.bsd3;
}) {};
@@ -197119,7 +197119,7 @@ self: {
sha256 = "1gnrq6s7pipjqfyispkxib3xfzii1ss6a9iwv07mvb5a93hc45cw";
enableSeparateDataOutput = true;
libraryHaskellDepends = [ base binary bytestring ];
description = "Parser for OS X Universal Binary format";
description = "Parser for macOS Universal Binary format";
license = stdenv.lib.licenses.bsd3;
}) {};

2
pkgs/development/haskell-modules/with-packages-wrapper.nix
View File

@@ -97,7 +97,7 @@ symlinkJoin {
fi
done
'' + (lib.optionalString stdenv.isDarwin ''
# Work around a linker limit in Mac OS X Sierra (see generic-builder.nix):
# Work around a linker limit in macOS Sierra (see generic-builder.nix):
local packageConfDir="$out/lib/${ghc.name}/package.conf.d";
local dynamicLinksDir="$out/lib/links"
mkdir -p $dynamicLinksDir

2
pkgs/development/libraries/freenect/default.nix
View File

@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake pkgconfig ];
meta = {
description = "Drivers and libraries for the Xbox Kinect device on Windows, Linux, and OS X";
description = "Drivers and libraries for the Xbox Kinect device on Windows, Linux, and macOS";
inherit version;
homepage = http://openkinect.org;
license = with stdenv.lib.licenses; [ gpl2 asl20 ];

4
pkgs/development/libraries/hunspell/default.nix
View File

@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
longDescription = ''
Hunspell is the spell checker of LibreOffice, OpenOffice.org, Mozilla
Firefox 3 & Thunderbird, Google Chrome, and it is also used by
proprietary software packages, like Mac OS X, InDesign, memoQ, Opera and
proprietary software packages, like macOS, InDesign, memoQ, Opera and
SDL Trados.
Main features:
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
* C++ library under GPL/LGPL/MPL tri-license.
* Interfaces and ports:
* Enchant (Generic spelling library from the Abiword project),
* XSpell (Mac OS X port, but Hunspell is part of the OS X from version 10.6 (Snow Leopard), and
* XSpell (macOS port, but Hunspell is part of the macOS from version 10.6 (Snow Leopard), and
now it is enough to place Hunspell dictionary files into
~/Library/Spelling or /Library/Spelling for spell checking),
* Delphi, Java (JNA, JNI), Perl, .NET, Python, Ruby ([1], [2]), UNO.

2
pkgs/development/libraries/libmemcached/default.nix
View File

@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
# Fix linking against libpthread (patch from Fedora)
# https://bugzilla.redhat.com/show_bug.cgi?id=1037707
# https://bugs.launchpad.net/libmemcached/+bug/1281907
# Fix building on OS X (patch from Homebrew)
# Fix building on macOS (patch from Homebrew)
# https://bugs.launchpad.net/libmemcached/+bug/1245562
patches = stdenv.lib.optional stdenv.isLinux ./libmemcached-fix-linking-with-libpthread.patch
++ stdenv.lib.optional stdenv.isDarwin (fetchpatch {

2
pkgs/development/libraries/libserialport/default.nix
View File

@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
description = "Cross-platform shared library for serial port access";
homepage = http://sigrok.org/;
license = licenses.gpl3Plus;
# Mac OS X, Windows and Android is also supported (according to upstream).
# macOS, Windows and Android is also supported (according to upstream).
platforms = platforms.linux;
maintainers = [ maintainers.bjornfor ];
};

2
pkgs/development/libraries/libsndfile/default.nix
View File

@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
code format under the GNU Lesser General Public License.
The library was written to compile and run on a Linux system but
should compile and run on just about any Unix (including MacOS X).
should compile and run on just about any Unix (including macOS).
There are also pre-compiled binaries available for 32 and 64 bit
windows.

4
pkgs/development/libraries/opencv/3.x.nix
View File

@@ -37,7 +37,7 @@ let
sha256 = "1lynpbxz1jay3ya5y45zac5v8c6ifgk4ssn8d1chfdk3spi691jj";
};
# This fixes the build on OS X.
# This fixes the build on macOS.
# See: https://github.com/opencv/opencv_contrib/pull/926
contribOSXFix = fetchpatch {
url = "https://github.com/opencv/opencv_contrib/commit/abf44fcccfe2f281b7442dac243e37b7f436d961.patch";
@@ -69,7 +69,7 @@ stdenv.mkDerivation rec {
(lib.optionalString enableContrib ''
cp --no-preserve=mode -r "${contribSrc}/modules" "$NIX_BUILD_TOP/opencv_contrib"
# This fixes the build on OS X.
# This fixes the build on macOS.
patch -d "$NIX_BUILD_TOP/opencv_contrib" -p2 < "${contribOSXFix}"
for name in vgg_generated_48.i \

2
pkgs/development/libraries/wxwidgets/2.8/default.nix
View File

@@ -68,7 +68,7 @@ stdenv.mkDerivation rec {
platforms = platforms.linux;
license = licenses.wxWindows;
homepage = https://www.wxwidgets.org/;
description = "a C++ library that lets developers create applications for Windows, Mac OS X, Linux and other platforms with a single code base";
description = "a C++ library that lets developers create applications for Windows, macOS, Linux and other platforms with a single code base";
longDescription = "wxWidgets gives you a single, easy-to-use API for writing GUI applications on multiple platforms that still utilize the native platform's controls and utilities. Link with the appropriate library for your platform and compiler, and your application will adopt the look and feel appropriate to that platform. On top of great GUI functionality, wxWidgets gives you: online help, network programming, streams, clipboard and drag and drop, multithreading, image loading and saving in a variety of popular formats, database support, HTML viewing and printing, and much more.";
};
}

2
pkgs/development/libraries/wxwidgets/2.9/default.nix
View File

@@ -70,7 +70,7 @@ stdenv.mkDerivation {
platforms = with platforms; darwin ++ linux;
license = licenses.wxWindows;
homepage = https://www.wxwidgets.org/;
description = "a C++ library that lets developers create applications for Windows, Mac OS X, Linux and other platforms with a single code base";
description = "a C++ library that lets developers create applications for Windows, macOS, Linux and other platforms with a single code base";
longDescription = "wxWidgets gives you a single, easy-to-use API for writing GUI applications on multiple platforms that still utilize the native platform's controls and utilities. Link with the appropriate library for your platform and compiler, and your application will adopt the look and feel appropriate to that platform. On top of great GUI functionality, wxWidgets gives you: online help, network programming, streams, clipboard and drag and drop, multithreading, image loading and saving in a variety of popular formats, database support, HTML viewing and printing, and much more.";
};
}

2
pkgs/development/libraries/wxwidgets/3.0/default.nix
View File

@@ -86,7 +86,7 @@ stdenv.mkDerivation {
platforms = with platforms; darwin ++ linux;
license = licenses.wxWindows;
homepage = https://www.wxwidgets.org/;
description = "a C++ library that lets developers create applications for Windows, Mac OS X, Linux and other platforms with a single code base";
description = "a C++ library that lets developers create applications for Windows, macOS, Linux and other platforms with a single code base";
longDescription = "wxWidgets gives you a single, easy-to-use API for writing GUI applications on multiple platforms that still utilize the native platform's controls and utilities. Link with the appropriate library for your platform and compiler, and your application will adopt the look and feel appropriate to that platform. On top of great GUI functionality, wxWidgets gives you: online help, network programming, streams, clipboard and drag and drop, multithreading, image loading and saving in a variety of popular formats, database support, HTML viewing and printing, and much more.";
};
}

2
pkgs/development/libraries/wxwidgets/3.0/mac.nix
View File

@@ -103,7 +103,7 @@ stdenv.mkDerivation rec {
license = licenses.wxWindows;
maintainers = [ maintainers.lnl7 ];
homepage = https://www.wxwidgets.org/;
description = "a C++ library that lets developers create applications for Windows, Mac OS X, Linux and other platforms with a single code base";
description = "a C++ library that lets developers create applications for Windows, macOS, Linux and other platforms with a single code base";
longDescription = "wxWidgets gives you a single, easy-to-use API for writing GUI applications on multiple platforms that still utilize the native platform's controls and utilities. Link with the appropriate library for your platform and compiler, and your application will adopt the look and feel appropriate to that platform. On top of great GUI functionality, wxWidgets gives you: online help, network programming, streams, clipboard and drag and drop, multithreading, image loading and saving in a variety of popular formats, database support, HTML viewing and printing, and much more.";
};
}

4
pkgs/development/mobile/titaniumenv/build-app.nix
View File

@@ -21,7 +21,7 @@ let
security delete-keychain $keychainName
'';
# On Mac OS X, the java executable shows an -unoffical postfix in the version
# On macOS, the java executable shows an -unoffical postfix in the version
# number. This confuses the build script's version detector.
# We fix this by creating a wrapper that strips it out of the output.
@@ -72,7 +72,7 @@ stdenv.mkDerivation {
${if target == "android" then
''
${stdenv.lib.optionalString (stdenv.system == "x86_64-darwin") ''
# Hack to make version detection work with OpenJDK on Mac OS X
# Hack to make version detection work with OpenJDK on macOS
export PATH=${javaVersionFixWrapper}/bin:$PATH
export JAVA_HOME=${javaVersionFixWrapper}
javac -version

2
pkgs/development/ocaml-modules/ocamlnat/default.nix
View File

@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
but up to 100 times faster. It is based on the optimizing native code
compiler, the native runtime and an earlier prototype by Alain
Frisch. It is build upon Just-In-Time techniques and currently
supports Unix-like systems (i.e. Linux, BSD or Mac OS X) running on
supports Unix-like systems (i.e. Linux, BSD or macOS) running on
x86 or x86-64 processors. Support for additional architectures and
operating systems is planned, but not yet available.
'';

2
pkgs/development/pharo/vm/build-vm.nix
View File

@@ -90,7 +90,7 @@ stdenv.mkDerivation rec {
homepage = http://pharo.org;
license = stdenv.lib.licenses.mit;
maintainers = [ ];
# Pharo VM sources are packaged separately for darwin (OS X)
# Pharo VM sources are packaged separately for darwin (macOS)
platforms = with stdenv.lib;
intersectLists
platforms.mesaPlatforms

2
pkgs/development/python-modules/pyqt/4.x.nix
View File

@@ -19,7 +19,7 @@ in buildPythonPackage {
export PYTHONPATH=$PYTHONPATH:$out/lib/${python.libPrefix}/site-packages
${stdenv.lib.optionalString stdenv.isDarwin ''
export QMAKESPEC="unsupported/macx-clang-libc++" # OS X target after bootstrapping phase \
export QMAKESPEC="unsupported/macx-clang-libc++" # macOS target after bootstrapping phase \
''}
substituteInPlace configure.py \

2
pkgs/development/tools/gtk-mac-bundler/default.nix
View File

@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
'';
meta = with lib; {
description = "a helper script that creates application bundles form GTK+ executables for Mac OS X";
description = "a helper script that creates application bundles form GTK+ executables for macOS";
maintainers = [ maintainers.matthewbauer ];
platforms = platforms.darwin;
homepage = https://wiki.gnome.org/Projects/GTK+/OSX/Bundling;