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/applications/editors | |
parent | 206faacbcb8c9a4655c6c8cf2cf5eec688d59719 (diff) | |
parent | 4c4920567605bd24226522fbd4c2a24d8cef86b6 (diff) | |
download | nixlib-7ebcd39a0f147ffa544818c9fd5954bc9dcae2d8.tar nixlib-7ebcd39a0f147ffa544818c9fd5954bc9dcae2d8.tar.gz nixlib-7ebcd39a0f147ffa544818c9fd5954bc9dcae2d8.tar.bz2 nixlib-7ebcd39a0f147ffa544818c9fd5954bc9dcae2d8.tar.lz nixlib-7ebcd39a0f147ffa544818c9fd5954bc9dcae2d8.tar.xz nixlib-7ebcd39a0f147ffa544818c9fd5954bc9dcae2d8.tar.zst nixlib-7ebcd39a0f147ffa544818c9fd5954bc9dcae2d8.zip |
Merge commit '4c49205' into HEAD
Diffstat (limited to 'pkgs/applications/editors')
-rw-r--r-- | pkgs/applications/editors/jetbrains/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/editors/vim/configurable.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/editors/vim/macvim.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/editors/vim/qvim.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/editors/vscode/default.nix | 4 |
5 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 6970c771aa52..08fc25fe9c14 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -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; diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix index 97e430fded63..0f81b0bdd640 100644 --- a/pkgs/applications/editors/vim/configurable.nix +++ b/pkgs/applications/editors/vim/configurable.nix @@ -89,7 +89,7 @@ composableDerivation { NIX_LDFLAGS = stdenv.lib.optional stdenv.isDarwin "/System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation"; }; - } #Disable Darwin (Mac OS X) support. + } #Disable Darwin (macOS) support. // edf { name = "xsmp"; } #Disable XSMP session management // edf { name = "xsmp_interact"; } #Disable XSMP interaction // edf { name = "mzscheme"; feat = "mzschemeinterp";} #Include MzScheme interpreter. diff --git a/pkgs/applications/editors/vim/macvim.nix b/pkgs/applications/editors/vim/macvim.nix index a688170b8ad4..bb265e90b770 100644 --- a/pkgs/applications/editors/vim/macvim.nix +++ b/pkgs/applications/editors/vim/macvim.nix @@ -102,7 +102,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "Vim - the text editor - for Mac OS X"; + description = "Vim - the text editor - for macOS"; homepage = https://github.com/b4winckler/macvim; license = licenses.vim; maintainers = with maintainers; [ cstrahan ]; diff --git a/pkgs/applications/editors/vim/qvim.nix b/pkgs/applications/editors/vim/qvim.nix index 5e98b3c9a785..c23bf360daf3 100644 --- a/pkgs/applications/editors/vim/qvim.nix +++ b/pkgs/applications/editors/vim/qvim.nix @@ -43,7 +43,7 @@ composableDerivation { ''; }; } - // edf { name = "darwin"; } #Disable Darwin (Mac OS X) support. + // edf { name = "darwin"; } #Disable Darwin (macOS) support. // edf { name = "xsmp"; } #Disable XSMP session management // edf { name = "xsmp_interact"; } #Disable XSMP interaction // edf { name = "mzscheme"; } #Include MzScheme interpreter. diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/default.nix index 18eb1803fd62..45a734216cf3 100644 --- a/pkgs/applications/editors/vscode/default.nix +++ b/pkgs/applications/editors/vscode/default.nix @@ -77,11 +77,11 @@ in meta = with stdenv.lib; { description = '' Open source source code editor developed by Microsoft for Windows, - Linux and OS X + Linux and macOS ''; longDescription = '' Open source source code editor developed by Microsoft for Windows, - Linux and OS X. It includes support for debugging, embedded Git + Linux and macOS. It includes support for debugging, embedded Git control, syntax highlighting, intelligent code completion, snippets, and code refactoring. It is also customizable, so users can change the editor's theme, keyboard shortcuts, and preferences |