Merge pull request #2914 from github/adding-back-nix

Adding back nix grammar
This commit is contained in:
Arfon Smith
2016-03-27 20:35:30 -06:00
5 changed files with 20 additions and 1 deletions

3
.gitmodules vendored
View File

@@ -698,3 +698,6 @@
[submodule "vendor/grammars/grace"]
path = vendor/grammars/grace
url = https://github.com/zmthy/grace-tmbundle
[submodule "vendor/grammars/nix"]
path = vendor/grammars/nix
url = git@github.com:wmertens/sublime-nix.git

View File

@@ -414,6 +414,8 @@ vendor/grammars/nesC:
- source.nesc
vendor/grammars/ninja.tmbundle:
- source.ninja
vendor/grammars/nix:
- source.nix
vendor/grammars/objective-c.tmbundle:
- source.objc
- source.objc++

View File

@@ -2373,7 +2373,7 @@ Nix:
- .nix
aliases:
- nixos
tm_scope: none
tm_scope: source.nix
ace_mode: nix
Nu:

1
vendor/grammars/nix vendored Submodule

Submodule vendor/grammars/nix added at cf33194bcc

13
vendor/licenses/grammar/nix.txt vendored Normal file
View File

@@ -0,0 +1,13 @@
---
type: grammar
name: nix
license: mit
---
The MIT License (MIT)
Copyright (c) 2016 Wout Mertens
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.