Skip to content

Commit 9914de7

Browse files
globinglobin
committedSep 30, 2017
Merge remote-tracking branch 'upstream/master' into openssl-1.1
2 parents 1f53bd4 + 03eae7a commit 9914de7

File tree

2,617 files changed

+67231
-39695
lines changed

Some content is hidden

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

2,617 files changed

+67231
-39695
lines changed
 

Diff for: ‎.github/CODEOWNERS

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

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
10+
# This file
11+
.github/CODEOWNERS @edolstra
1512

1613
# Boostraping and core infra
17-
pkgs/stdenv/ @Ericson2314
18-
pkgs/build-support/cc-wrapper/ @Ericson2314
14+
pkgs/stdenv/ @edolstra
15+
pkgs/build-support/cc-wrapper/ @edolstra
16+
17+
# Libraries
18+
lib/ @edolstra
19+
20+
# Python-related code and docs
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
25+
26+
# Haskell
27+
pkgs/development/compilers/ghc @peti
28+
pkgs/development/haskell-modules @peti
29+
pkgs/development/haskell-modules/default.nix @peti
30+
pkgs/development/haskell-modules/generic-builder.nix @peti
31+
pkgs/development/haskell-modules/hoogle.nix @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
41+
42+
# Beam-related (Erlang, Elixir, LFE, etc)
43+
pkgs/development/beam-modules/* @gleber
44+
pkgs/development/interpreters/erlang/* @gleber
45+
pkgs/development/interpreters/lfe/* @gleber
46+
pkgs/development/interpreters/elixir/* @gleber
47+
pkgs/development/tools/build-managers/rebar/* @gleber
48+
pkgs/development/tools/build-managers/rebar3/* @gleber
49+
pkgs/development/tools/erlang/* @gleber
50+
51+
# Jetbrains
52+
pkgs/applications/editors/jetbrains @edwtjo

Diff for: ‎.github/CONTRIBUTING.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ under the terms of [COPYING](../COPYING), which is an MIT-like license.
2323
Examples:
2424

2525
* nginx: init at 2.0.1
26-
* firefox: 3.0 -> 3.1.1
26+
* firefox: 54.0.1 -> 55.0
2727
* nixos/hydra: add bazBaz option
2828

2929
Dual baz behavior is needed to do foo.

0 commit comments

Comments
 (0)