Skip to content

Commit c9171e5

Browse files
vcunatvcunat
committedJan 30, 2018
Merge branch 'master' into staging
Hydra: ?compare=1430035
2 parents e851d53 + 078fc69 commit c9171e5

File tree

196 files changed

+2733
-1587
lines changed

Some content is hidden

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

196 files changed

+2733
-1587
lines changed
 

‎lib/maintainers.nix

+5
Original file line numberDiff line numberDiff line change
@@ -328,6 +328,7 @@
328328
joelmo = "Joel Moberg <joel.moberg@gmail.com>";
329329
joelteon = "Joel Taylor <me@joelt.io>";
330330
johbo = "Johannes Bornhold <johannes@bornhold.name>";
331+
johnazoidberg = "Daniel Schäfer <git@danielschaefer.me>";
331332
johnmh = "John M. Harris, Jr. <johnmh@openblox.org>";
332333
johnramsden = "John Ramsden <johnramsden@riseup.net>";
333334
joko = "Ioannis Koutras <ioannis.koutras@gmail.com>";
@@ -610,12 +611,14 @@
610611
schmitthenner = "Fabian Schmitthenner <development@schmitthenner.eu>";
611612
schneefux = "schneefux <schneefux+nixos_pkg@schneefux.xyz>";
612613
schristo = "Scott Christopher <schristopher@konputa.com>";
614+
scode = "Peter Schuller <peter.schuller@infidyne.com>";
613615
scolobb = "Sergiu Ivanov <sivanov@colimite.fr>";
614616
sdll = "Sasha Illarionov <sasha.delly@gmail.com>";
615617
SeanZicari = "Sean Zicari <sean.zicari@gmail.com>";
616618
sellout = "Greg Pfeil <greg@technomadic.org>";
617619
sepi = "Raffael Mancini <raffael@mancini.lu>";
618620
seppeljordan = "Sebastian Jordan <sebastian.jordan.mail@googlemail.com>";
621+
sfrijters = "Stefan Frijters <sfrijters@gmail.com>";
619622
shanemikel = "Shane Pearlman <shanemikel1@gmail.com>";
620623
shawndellysse = "Shawn Dellysse <sdellysse@gmail.com>";
621624
sheenobu = "Sheena Artrip <sheena.artrip@gmail.com>";
@@ -679,6 +682,7 @@
679682
ThomasMader = "Thomas Mader <thomas.mader@gmail.com>";
680683
thoughtpolice = "Austin Seipp <aseipp@pobox.com>";
681684
thpham = "Thomas Pham <thomas.pham@ithings.ch>";
685+
tilpner = "Till Höppner <till@hoeppner.ws>";
682686
timbertson = "Tim Cuthbertson <tim@gfxmonk.net>";
683687
timokau = "Timo Kaufmann <timokau@zoho.com>";
684688
tiramiseb = "Sébastien Maccagnoni <sebastien@maccagnoni.eu>";
@@ -698,6 +702,7 @@
698702
tvorog = "Marsel Zaripov <marszaripov@gmail.com>";
699703
tweber = "Thorsten Weber <tw+nixpkgs@360vier.de>";
700704
twey = "James ‘Twey’ Kay <twey@twey.co.uk>";
705+
unode = "Renato Alves <alves.rjc@gmail.com>";
701706
uralbash = "Svintsov Dmitry <root@uralbash.ru>";
702707
utdemir = "Utku Demir <me@utdemir.com>";
703708
#urkud = "Yury G. Kudryashov <urkud+nix@ya.ru>"; inactive since 2012

‎nixos/modules/config/power-management.nix

-3
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,6 @@ in
6969

7070
config = mkIf cfg.enable {
7171

72-
# Leftover for old setups, should be set by nixos-generate-config now
73-
powerManagement.cpuFreqGovernor = mkDefault "ondemand";
74-
7572
systemd.targets.post-resume = {
7673
description = "Post-Resume Actions";
7774
requires = [ "post-resume.service" ];

0 commit comments

Comments
 (0)