-
-
Notifications
You must be signed in to change notification settings - Fork 12.7k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
replace "Mac OS X" and "OS X" with "macOS" #27998
Conversation
to satisfy the contribution guidelines i changed the first letter to uppercase. pkgs/os-specific/darwin/cctools/port.nix
should we keep the original brand name (macOS)? |
I'm running Update: nox crashes madjar/nox#73, Travis also I will pick some packages and test the build. |
@copumpkin any thoughts on that sdk.nix file? |
@@ -12,7 +12,7 @@ let | |||
}; | |||
|
|||
SystemVersion = { | |||
ProductName = "Mac OS X"; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hmmm, should you not either leave this alone, or replace it with "macOS"?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Version 10.10 is called "OS X", so i corrected it.
I don't know if we could update ProductVersion
to 10.13 (newest version) and use "macOS" here.
Thanks for the review!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
imac:~ davidak$ cat /System/Library/CoreServices/SystemVersion.plist
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>ProductBuildVersion</key>
<string>14F2109</string>
<key>ProductCopyright</key>
<string>1983-2016 Apple Inc.</string>
<key>ProductName</key>
<string>Mac OS X</string>
<key>ProductUserVisibleVersion</key>
<string>10.10.5</string>
<key>ProductVersion</key>
<string>10.10.5</string>
</dict>
</plist>
So @apple itself is inconsistent here and we can leave it as is.
LGTM |
@globin Is this really a mass rebuild? The output hashes should be the same... But I'm not sure what Nix includes to calculate the hashes. |
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 [...]"
Seems like it only rebuilds Haskell darwin packages, which is fine. |
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 [...]"
or patches.
Motivation for this change
make it a little more correct while not breaking anything.
i'm not sure if this changes trigger a mass rebuild since mostly descriptions or comments are changed.
please review carefully!
Things done
(nix.useSandbox on NixOS,
or option
build-use-sandbox
innix.conf
on non-NixOS)
nix-shell -p nox --run "nox-review wip"
./result/bin/
)