Skip to content

Commit 8b01ec9

Browse files
vcunatvcunat
committedMay 9, 2017
Merge branch 'master' into staging
·
branch-off-24.1117.09-beta
2 parents 7a61788 + 9c90ff7 commit 8b01ec9

File tree

86 files changed

+1227
-966
lines changed

Some content is hidden

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

86 files changed

+1227
-966
lines changed
 

‎lib/maintainers.nix

+1-1
Original file line numberDiff line numberDiff line change
@@ -446,6 +446,7 @@
446446
relrod = "Ricky Elrod <ricky@elrod.me>";
447447
renzo = "Renzo Carbonara <renzocarbonara@gmail.com>";
448448
retrry = "Tadas Barzdžius <retrry@gmail.com>";
449+
rht = "rht <rhtbot@protonmail.com>";
449450
rick68 = "Wei-Ming Yang <rick68@gmail.com>";
450451
rickynils = "Rickard Nilsson <rickynils@gmail.com>";
451452
rlupton20 = "Richard Lupton <richard.lupton@gmail.com>";
@@ -458,7 +459,6 @@
458459
roconnor = "Russell O'Connor <roconnor@theorem.ca>";
459460
romildo = "José Romildo Malaquias <malaquias@gmail.com>";
460461
rongcuid = "Rongcui Dong <rongcuid@outlook.com>";
461-
ronny = "Ronny Pfannschmidt <nixos@ronnypfannschmidt.de>";
462462
rszibele = "Richard Szibele <richard@szibele.com>";
463463
rtreffer = "Rene Treffer <treffer+nixos@measite.de>";
464464
rushmorem = "Rushmore Mushambi <rushmore@webenchanter.com>";

‎nixos/modules/config/shells-environment.nix

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ in
5555

5656
environment.profileRelativeEnvVars = mkOption {
5757
type = types.attrsOf (types.listOf types.str);
58-
example = { PATH = [ "/bin" "/sbin" ]; MANPATH = [ "/man" "/share/man" ]; };
58+
example = { PATH = [ "/bin" ]; MANPATH = [ "/man" "/share/man" ]; };
5959
description = ''
6060
Attribute set of environment variable. Each attribute maps to a list
6161
of relative paths. Each relative path is appended to the each profile

0 commit comments

Comments
 (0)
Please sign in to comment.