Skip to content

Commit 24911f3

Browse files
committedJul 31, 2017
Merge remote-tracking branch 'origin/master' into openssl-1.1
2 parents 3e967b9 + 57b1542 commit 24911f3

File tree

279 files changed

+5198
-3525
lines changed

Some content is hidden

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

279 files changed

+5198
-3525
lines changed
 

‎.github/CODEOWNERS

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
# CODEOWNERS file
2+
#
3+
# This file is used to describe who owns what in this repository. This file does not
4+
# replace `meta.maintainers` but is instead used for other things than derivations
5+
# and modules, like documentation, package sets, and other assets.
6+
#
7+
# For documentation on this file, see https://help.github.com/articles/about-codeowners/
8+
# Mentioned users will get code review requests.
9+
10+
# Python-related code and docs
11+
pkgs/top-level/python-packages.nix @FRidh
12+
pkgs/development/interpreters/python/* @FRidh
13+
pkgs/development/python-modules/* @FRidh
14+
doc/languages-frameworks/python.md @FRidh
15+
16+
# Darwin-related
17+
pkgs/stdenv/darwin/* @copumpkin @LnL7
18+
pkgs/os-specific/darwin/* @LnL7
19+
pkgs/os-specific/darwin/apple-source-releases/* @copumpkin
20+

‎.github/PULL_REQUEST_TEMPLATE.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
###### Things done
55

6-
Please check what applies. Note that these are not hard requirements but mereley serve as information for reviewers.
6+
Please check what applies. Note that these are not hard requirements but merely serve as information for reviewers.
77

88
- [ ] Tested using sandboxing
99
([nix.useSandbox](http://nixos.org/nixos/manual/options.html#opt-nix.useSandbox) on NixOS,

0 commit comments

Comments
 (0)