Skip to content
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

Merged
merged 1 commit into from
Aug 11, 2017
Merged

Conversation

davidak
Copy link
Member

@davidak davidak commented Aug 7, 2017

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
  • Tested using sandboxing
    (nix.useSandbox on NixOS,
    or option build-use-sandbox in nix.conf
    on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • Linux
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@davidak davidak requested a review from FRidh as a code owner August 7, 2017 00:29
@mention-bot
Copy link

@davidak, thanks for your PR! By analyzing the history of the files in this pull request, we identified @peti, @rvl and @benley to be potential reviewers.

@davidak
Copy link
Member Author

davidak commented Aug 7, 2017

to satisfy the contribution guidelines i changed the first letter to uppercase.

pkgs/os-specific/darwin/cctools/port.nix

description = "MacOS Compiler Tools (cross-platform port)";

should we keep the original brand name (macOS)?

@davidak
Copy link
Member Author

davidak commented Aug 7, 2017

I'm running nix-shell -p nox --run "nox-review pr 27998" to see if any build fails.

Update: nox crashes madjar/nox#73, Travis also

I will pick some packages and test the build.

@FRidh FRidh added the 6.topic: darwin Running or building packages on Darwin label Aug 7, 2017
@wmertens
Copy link
Contributor

wmertens commented Aug 7, 2017

@copumpkin any thoughts on that sdk.nix file?

@@ -12,7 +12,7 @@ let
};

SystemVersion = {
ProductName = "Mac OS X";
Copy link
Contributor

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"?

Copy link
Member Author

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!

Copy link
Member Author

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.

@wmertens
Copy link
Contributor

wmertens commented Aug 7, 2017

LGTM

@globin globin changed the base branch from master to staging August 7, 2017 17:19
@matthewbauer
Copy link
Member

@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 [...]"
@domenkozar
Copy link
Member

Seems like it only rebuilds Haskell darwin packages, which is fine.

@domenkozar domenkozar merged commit 486e1c3 into NixOS:staging Aug 11, 2017
@davidak davidak deleted the macOS branch March 27, 2018 22:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
1.severity: mass-darwin-rebuild 6.topic: darwin Running or building packages on Darwin
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants