Skip to content

Commit 29f91c1

Browse files
FRidhFRidh
committedJul 23, 2017
Merge remote-tracking branch 'upstream/master' into HEAD
·
branch-off-24.1117.09-beta
2 parents 9af7782 + 239b694 commit 29f91c1

File tree

168 files changed

+2722
-1237
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

168 files changed

+2722
-1237
lines changed
 

‎.github/CONTRIBUTING.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ under the terms of [COPYING](../COPYING), which is an MIT-like license.
1515
* Format the commits in the following way:
1616

1717
```
18-
(pkg-name | service-name): (from -> to | init at version | refactor | etc)
18+
(pkg-name | nixos/<module>): (from -> to | init at version | refactor | etc)
1919
2020
(Motivation for change. Additional information.)
2121
```
@@ -24,10 +24,10 @@ under the terms of [COPYING](../COPYING), which is an MIT-like license.
2424

2525
* nginx: init at 2.0.1
2626
* firefox: 3.0 -> 3.1.1
27-
* hydra service: add bazBaz option
27+
* nixos/hydra: add bazBaz option
2828

2929
Dual baz behavior is needed to do foo.
30-
* nginx service: refactor config generation
30+
* nixos/nginx: refactor config generation
3131

3232
The old config generation system used impure shell scripts and could break in specific circumstances (see #1234).
3333

‎.github/PULL_REQUEST_TEMPLATE.md

+2
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33

44
###### Things done
55

6+
Please check what applies. Note that these are not hard requirements but mereley serve as information for reviewers.
7+
68
- [ ] Tested using sandboxing
79
([nix.useSandbox](http://nixos.org/nixos/manual/options.html#opt-nix.useSandbox) on NixOS,
810
or option `build-use-sandbox` in [`nix.conf`](http://nixos.org/nix/manual/#sec-conf-file)

0 commit comments

Comments
 (0)
Please sign in to comment.