Skip to content

Commit d38ee5b

Browse files
FRidhFRidh
committedSep 7, 2017
Merge remote-tracking branch 'upstream/master' into HEAD
2 parents 0c660ad + aabadda commit d38ee5b

File tree

70 files changed

+1478
-248
lines changed

Some content is hidden

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

70 files changed

+1478
-248
lines changed
 

‎.github/CODEOWNERS

+27-10
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,34 @@
77
# For documentation on this file, see https://help.github.com/articles/about-codeowners/
88
# Mentioned users will get code review requests.
99

10+
# Boostraping and core infra
11+
pkgs/stdenv/ @Ericson2314
12+
pkgs/build-support/cc-wrapper/ @Ericson2314
13+
14+
# Libraries
15+
lib/ @Profpatsch
16+
17+
# Build-Support
18+
pkgs/build-support @Profpatsch
19+
1020
# 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
21+
pkgs/top-level/python-packages.nix @FRidh
22+
pkgs/development/interpreters/python/* @FRidh
23+
pkgs/development/python-modules/* @FRidh
24+
doc/languages-frameworks/python.md @FRidh
1525

16-
# Boostraping and core infra
17-
pkgs/stdenv/ @Ericson2314
18-
pkgs/build-support/cc-wrapper/ @Ericson2314
26+
# Haskell
27+
pkgs/development/compilers/ghc @peti
28+
pkgs/development/haskell-modules @peti
29+
pkgs/development/haskell-modules/default.nix @Profpatsch @peti
30+
pkgs/development/haskell-modules/generic-builder.nix @Profpatsch @peti
31+
pkgs/development/haskell-modules/hoogle.nix @Profpatsch @peti
32+
33+
# R
34+
pkgs/applications/science/math/R @peti
35+
pkgs/development/r-modules @peti
1936

2037
# Darwin-related
21-
pkgs/stdenv/darwin/* @copumpkin @LnL7
22-
pkgs/os-specific/darwin/* @LnL7
23-
pkgs/os-specific/darwin/apple-source-releases/* @copumpkin
38+
pkgs/stdenv/darwin/* @copumpkin @LnL7
39+
pkgs/os-specific/darwin/* @LnL7
40+
pkgs/os-specific/darwin/apple-source-releases/* @copumpkin

‎lib/maintainers.nix

+1
Original file line numberDiff line numberDiff line change
@@ -577,6 +577,7 @@
577577
tavyc = "Octavian Cerna <octavian.cerna@gmail.com>";
578578
ltavard = "Laure Tavard <laure.tavard@univ-grenoble-alpes.fr>";
579579
teh = "Tom Hunger <tehunger@gmail.com>";
580+
teto = "Matthieu Coudron <mcoudron@hotmail.com>";
580581
telotortium = "Robert Irelan <rirelan@gmail.com>";
581582
thall = "Niclas Thall <niclas.thall@gmail.com>";
582583
thammers = "Tobias Hammerschmidt <jawr@gmx.de>";

0 commit comments

Comments
 (0)
Please sign in to comment.