Commit 486e1c3c authored by Domen Kožar's avatar Domen Kožar Committed by GitHub
Browse files

Merge pull request #27998 from davidak/macOS 

replace "Mac OS X" and "OS X" with "macOS"
parents 3be89a67 3270aa89

doc/languages-frameworks/haskell.md

+1 −1
Original line number Diff line number Diff line
@@ -827,7 +827,7 @@ the work to be licensed" under the terms of the LGPL (including for free). 


The LGPL licensing for GMP is a problem for the overall licensing of binary

programs compiled with GHC because most distributions (and builds) of GHC use

static libraries. (Dynamic libraries are currently distributed only for OS X.)

static libraries. (Dynamic libraries are currently distributed only for macOS.)

The LGPL licensing situation may be worse: even though

[The Glasgow Haskell Compiler License](https://www.haskell.org/ghc/license)

is essentially a "free software" license (BSD3), according to

nixos/doc/manual/installation/installing-usb.xml

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ a USB stick. You can use the <command>dd</command> utility to write the image: 
<command>dd if=<replaceable>path-to-image</replaceable>

of=<replaceable>/dev/sdb</replaceable></command>. Be careful about specifying the

correct drive; you can use the <command>lsblk</command> command to get a list of

block devices. If you're on OS X you can run <command>diskutil list</command>

block devices. If you're on macOS you can run <command>diskutil list</command>

to see the list of devices; the device you'll use for the USB must be ejected

before writing the image.</para>

nixos/modules/services/editors/emacs.xml

+2 −2
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
  <para>

    Emacs runs within a graphical desktop environment using the X

    Window System, but works equally well on a text terminal. Under

    <productname>OS X</productname>, a "Mac port" edition is

    <productname>macOS</productname>, a "Mac port" edition is

    available, which uses Apple's native GUI frameworks.

  </para>
@@ -84,7 +84,7 @@ 
            <listitem>

              <para>

                Emacs 25 with the "Mac port" patches, providing a more

                native look and feel under OS X.

                native look and feel under macOS.

              </para>

            </listitem>

          </varlistentry>

pkgs/applications/audio/freewheeling/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec { 
        improv. We leave mice and menus, and dive into our own process

        of making sound.



        Freewheeling runs under Mac OS X and Linux, and is open source

        Freewheeling runs under macOS and Linux, and is open source

        software, released under the GNU GPL license.

    '' ;

pkgs/applications/editors/jetbrains/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ let 
        inherit description license;

        longDescription = ''

          Enhancing productivity for every C and C++

          developer on Linux, OS X and Windows.

          developer on Linux, macOS and Windows.

        '';

        maintainers = with maintainers; [ edwtjo mic92 ];

        platforms = platforms.linux;