Skip to content

Commit eed6e0a

Browse files
vcunatvcunat
committedNov 4, 2017
Merge branch 'master' into staging
Lots of rebuilds from master; at least some of them due to security.
2 parents 2c822b1 + bb87d2c commit eed6e0a

File tree

323 files changed

+10626
-22815
lines changed

Some content is hidden

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

323 files changed

+10626
-22815
lines changed
 

‎.github/CODEOWNERS

+52-28
Original file line numberDiff line numberDiff line change
@@ -8,51 +8,75 @@
88
# Mentioned users will get code review requests.
99

1010
# This file
11-
.github/CODEOWNERS @edolstra
11+
/.github/CODEOWNERS @edolstra
1212

1313
# Boostraping and core infra
14-
pkgs/stdenv/ @edolstra
15-
pkgs/build-support/cc-wrapper/ @edolstra
14+
/pkgs/stdenv @edolstra
15+
/pkgs/build-support/cc-wrapper @edolstra
1616

1717
# Libraries
18-
lib/ @edolstra
18+
/lib @edolstra @nbp
19+
20+
# Nixpkgs Internals
21+
/default.nix @nbp
22+
/pkgs/top-level/default.nix @nbp
23+
/pkgs/top-level/impure.nix @nbp
24+
/pkgs/top-level/stage.nix @nbp
25+
26+
# NixOS Internals
27+
/nixos/default.nix @nbp
28+
/nixos/lib/from-env.nix @nbp
29+
/nixos/lib/eval-config.nix @nbp
30+
/nixos/doc/manual/configuration/abstractions.xml @nbp
31+
/nixos/doc/manual/configuration/config-file.xml @nbp
32+
/nixos/doc/manual/configuration/config-syntax.xml @nbp
33+
/nixos/doc/manual/configuration/modularity.xml @nbp
34+
/nixos/doc/manual/development/assertions.xml @nbp
35+
/nixos/doc/manual/development/meta-attributes.xml @nbp
36+
/nixos/doc/manual/development/option-declarations.xml @nbp
37+
/nixos/doc/manual/development/option-def.xml @nbp
38+
/nixos/doc/manual/development/option-types.xml @nbp
39+
/nixos/doc/manual/development/replace-modules.xml @nbp
40+
/nixos/doc/manual/development/writing-modules.xml @nbp
41+
/nixos/doc/manual/man-nixos-option.xml @nbp
42+
/nixos/modules/installer/tools/nixos-option.sh @nbp
1943

2044
# 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
45+
/pkgs/top-level/python-packages.nix @FRidh
46+
/pkgs/development/interpreters/python @FRidh
47+
/pkgs/development/python-modules @FRidh
48+
/doc/languages-frameworks/python.md @FRidh
2549

2650
# 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
51+
/pkgs/development/compilers/ghc @peti
52+
/pkgs/development/haskell-modules @peti
53+
/pkgs/development/haskell-modules/default.nix @peti
54+
/pkgs/development/haskell-modules/generic-builder.nix @peti
55+
/pkgs/development/haskell-modules/hoogle.nix @peti
3256

3357
# R
34-
pkgs/applications/science/math/R @peti
35-
pkgs/development/r-modules @peti
58+
/pkgs/applications/science/math/R @peti
59+
/pkgs/development/r-modules @peti
3660

3761
# Ruby
38-
pkgs/development/interpreters/ruby/* @zimbatm
39-
pkgs/development/ruby-modules/* @zimbatm
62+
/pkgs/development/interpreters/ruby @zimbatm
63+
/pkgs/development/ruby-modules @zimbatm
4064

4165
# Darwin-related
42-
/pkgs/stdenv/darwin/ @org/darwin-maintainers
43-
/pkgs/os-specific/darwin/ @org/darwin-maintainers
66+
/pkgs/stdenv/darwin @NixOS/darwin-maintainers
67+
/pkgs/os-specific/darwin @NixOS/darwin-maintainers
4468

4569
# Beam-related (Erlang, Elixir, LFE, etc)
46-
pkgs/development/beam-modules/* @gleber
47-
pkgs/development/interpreters/erlang/* @gleber
48-
pkgs/development/interpreters/lfe/* @gleber
49-
pkgs/development/interpreters/elixir/* @gleber
50-
pkgs/development/tools/build-managers/rebar/* @gleber
51-
pkgs/development/tools/build-managers/rebar3/* @gleber
52-
pkgs/development/tools/erlang/* @gleber
70+
/pkgs/development/beam-modules @gleber
71+
/pkgs/development/interpreters/erlang @gleber
72+
/pkgs/development/interpreters/lfe @gleber
73+
/pkgs/development/interpreters/elixir @gleber
74+
/pkgs/development/tools/build-managers/rebar @gleber
75+
/pkgs/development/tools/build-managers/rebar3 @gleber
76+
/pkgs/development/tools/erlang @gleber
5377

5478
# Jetbrains
55-
pkgs/applications/editors/jetbrains @edwtjo
79+
/pkgs/applications/editors/jetbrains @edwtjo
5680

5781
# Eclipse
58-
pkgs/applications/editors/eclipse @rycee
82+
/pkgs/applications/editors/eclipse @rycee

‎doc/configuration.xml

+4
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,10 @@ configuration file located at
5555
</programlisting>
5656
</para>
5757

58+
<para>Note that we are not able to test or build unfree software on Hydra
59+
due to policy. Most unfree licenses prohibit us from either executing or
60+
distributing the software.</para>
61+
5862
<section xml:id="sec-allow-broken">
5963
<title>Installing broken packages</title>
6064

0 commit comments

Comments
 (0)
Please sign in to comment.