nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-28 00:24:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
121,254 Commits 186 Branches 125 Tags 9.4 GiB
d28c21bd6d
Commit Graph

960 Commits

Author SHA1 Message Date
Franz Pletz
1ae0f2a1d4
ipmitool: 1.8.17 -> 1.8.18 2017-06-20 03:56:38 +02:00
Franz Pletz
7f1fc9f838
collectd: 5.7.0 -> 5.7.2 2017-06-20 03:45:40 +02:00
Tuomas Tynkkynen
f19f6317ea fio: 2.20 -> 2.21 2017-06-19 17:46:52 +03:00
Jörg Thalheim
ce3273708b Merge pull request #26655 from gnidorah/master3 
pythonPackages.ps_mem: init at 3.9
 2017-06-18 16:37:14 +01:00
gnidorah
fd072b98d0 ps_mem: init at 3.9 2017-06-18 18:15:42 +03:00
Vladimír Čunát
d88c0cf867
Merge #26628: treewide: setuid/setgid fallout 2017-06-17 13:23:39 +02:00
Jörg Thalheim
ae147e329f
logcheck: add remark to patch 2017-06-17 10:40:01 +01:00
Jörg Thalheim
67655caf37 cron: document patch 2017-06-17 10:37:21 +01:00
Piotr Bogdan
0d4431cfe9
fakeroot: apply patch to ignore EINVAL errors as well 
Fixes #25901 the nixos.ova job.  See the referred links.
 2017-06-17 11:36:39 +02:00
Will Dietz
714cd37b21 logcheck: Don't set special permissions 2017-06-16 06:57:00 -05:00
Will Dietz
3d5409ac97 cron: don't set special permissions 2017-06-16 06:56:56 -05:00
Will Dietz
0d92084f75 at: Don't set fancy bits on install 2017-06-16 06:56:51 -05:00
Charles Strahan
3b1c4fce4f psensor: init at 1.2.0 
psensor is a graphical hardware monitoring application for Linux
 2017-06-13 18:51:36 -04:00
Vladimír Čunát
cb9f953c92
Merge branch 'master' into staging 
More larger rebuilds.
 2017-06-10 10:07:33 +02:00
Tuomas Tynkkynen
cd46df3a1e fio: 2.19 -> 2.20 2017-06-08 23:13:06 +03:00
Vladimír Čunát
8b49936ad4
vboot_reference: fix evaluation after 1aac1fe5dd 2017-06-08 20:53:20 +02:00
Marius Bergmann
766cbda1f3 journalbeat: 5.1.2 -> 5.4.1 2017-06-05 23:15:44 +02:00
Alexandre Peyroux
31d5363228
ctop: init at 2017-05-28 2017-05-30 13:10:45 +02:00
Joachim Fasting
d438cbb0b6
socklog: disable shsgr test 
Running the chkhsgr test on Hydra fails with
```
./chkshsgr || ( cat warn-shsgr; exit 1 )
Oops. Your getgroups() returned 0, and setgroups() failed; this means
that I can't reliably do my shsgr test. Please either ``make'' as root
or ``make'' while you're in one or more supplementary groups.
```

We just assume that our supported platforms have working
getgroups()/setgroups().
 2017-05-18 12:33:32 +02:00
Jörg Thalheim
e060a5ee15
cron: remove sbin from PATH 
follow up of https://github.com/NixOS/nixpkgs/pull/25550
 2017-05-09 08:50:58 +01:00
Joachim Fasting
22cffa0716
socklog: init at 2.1.0 2017-05-06 19:41:49 +02:00
Ioannis Koutras
cc4e2505e4 efivar: 31 -> 30 
According to the release page, version 31 of efivar is still considered
as a pre-release and the sha256sum has changed at least once. This commit
switches to the last, stable release.
 2017-05-02 20:56:36 +02:00
Michael Raskin
5ef193446e Merge pull request #24997 from romildo/upd.efibootmgr 
efibootmgr: 13 -> 15
 2017-05-01 13:22:28 +02:00
obadz
f5939cde52 Merge pull request #25341 from womfoo/bump/facter-3.6.4 
facter: 3.6.0 -> 3.6.4 and related deps
 2017-04-30 12:47:20 +01:00
Kranium Gikos Mendoza
673ac9506b facter: 3.6.0 -> 3.6.4 2017-04-30 21:13:26 +10:00
Armijn Hemel
b85893cb9c acct: 6.6.2 -> 6.6.3 2017-04-27 19:25:49 +02:00
Daiderd Jordan
80828429d7 Merge pull request #25066 from matthewbauer/less-darwin-eval-errors 
Add Darwin as platform to various "broken" packages that actually build
 2017-04-24 08:14:21 +02:00
Matthew Bauer
02285dcd10
cron: supports darwin 2017-04-23 18:08:42 -05:00
Joachim Fasting
5a04a30653
runit: replace hardcoded /sbin/runit with in-store runit binary 
runit-init calls the runit executable as /sbin/runit, which
obviously fails for us.

This should improve support for using runit as an init replacement.
 2017-04-23 11:00:55 +02:00
Joachim Fasting
160b9ab43f
runit: explain what static actually does 2017-04-23 11:00:53 +02:00
romildo
86b853e275 efibootmgr: 13 -> 15 
- Update to efibootmgr 15
- Add dependency on pkgconfig (listed as required in INSTALL)
- Remove dependency on perl, pciutils and zlib
- Set EFIDIR to 'nixos' (the same used in fwupdate)
- Update homepage
 2017-04-18 12:26:55 -03:00
Joachim Fasting
c2130eca44
logcheck: point homepage to alioth.debian.org 
The page at logcheck dot org contains questionable links and it is unclear
whether it is controlled by the logcheck project at all.  Fix by using the
homepage debian points to instead.

Fixes https://github.com/NixOS/nixpkgs/issues/24952
 2017-04-16 20:52:14 +02:00
Tuomas Tynkkynen
1b94c30beb fio: 2.17 -> 2.19 2017-04-09 22:34:19 +03:00
Peter Simons
4e307b644a Merge pull request #24760 from matthewbauer/linux-only-pkgs 
Mark linux-only pkgs
 2017-04-09 14:18:10 +02:00
Matthew Bauer
d8b98c4f77
safecopy: linux only 2017-04-09 01:29:52 -05:00
Matthew Bauer
c02ab895a1
hwinfo: make linux-only 2017-04-08 23:34:54 -05:00
Vladimír Čunát
0062dd2f14
pciutils: 3.5.2 -> 3.5.4 
The patch was integrated upstream.
 2017-04-01 13:27:20 +02:00
Vladimír Čunát
96d41e393d
treewide: purge maintainers.urkud 
It's sad, but he's been inactive for the last five years.
Keeping such people in meta.maintainers is counter-productive.
 2017-03-27 19:52:29 +02:00
Patrick Mahoney
09a5007797 skarnet.org packages: fix darwin build 
The configure scripts have been changed so that `--build` is now the
way to specify (non-cross compiling) build target, which is necessary
on darwin for binary compatibility across darwin versions.
 2017-03-26 17:30:41 -05:00
Patrick Mahoney
72a0d65d3d update skarnet.org packages 
execline:          2.1.4.5 -> 2.2.0.0
s6-dns:            2.0.0.7 -> 2.1.0.0
s6-linux-utils:    2.0.2.3 -> 2.2.0.0
s6-networking:     2.1.0.4 -> 2.2.1.0
s6-portable-utils: 2.1.0.0 -> 2.1.0.0 (no version change)
s6-rc:             0.0.2.1 -> 0.1.0.0
s6:                2.2.4.3 -> 2.4.0.0
skalibs:           2.3.9.0 -> 2.4.0.1

Also use new --enable-absolute-paths configure arg to correctly set
paths to runtime executables to point within the nix store rather than
relying on PATH resolution.
 2017-03-26 14:19:44 -05:00
ndowens
856a7e7646 augeas: 1.7.0 -> 1.8.0 2017-03-21 20:29:47 -05:00
Michael Raskin
4d44ed9d90 ipmiutil: 3.0.1 -> 3.0.2 2017-03-09 18:47:37 +01:00
Jörg Thalheim
82fda65c8a
fcron: add missing meta.platforms 2017-03-05 23:41:42 +01:00
Jörg Thalheim
947815f59f
fcron: 3.1.2 -> 3.2.1 
fixes #23320 #23413
 2017-03-05 22:41:11 +01:00
Joachim F
1539d94a73 Merge pull request #23317 from ndowens/logcheck 
logcheck: 1.3.17 -> 1.3.18
 2017-03-05 21:52:11 +01:00
ndowens
1dcb0bbc39 logcheck: 1.3.17 -> 1.3.18 
logcheck: Added hyphen
 2017-03-02 16:40:59 -06:00
Daiderd Jordan
cd929804a3 Merge pull request #23380 from veprbl/fakeroot_darwin 
fakeroot: add darwin support
 2017-03-02 20:19:55 +01:00
ndowens
441ad3a804 amtterm: 1.4 -> 1.6-1 2017-03-02 08:51:13 -06:00
Jörg Thalheim
15f1d84c88 Merge pull request #23343 from ndowens/augeas 
augeas: 1.5.0 -> 1.7.0
 2017-03-02 10:34:46 +01:00
ndowens
3806d47b49 uptimed: 0.3.18 -> 0.4.0 (#23316) 
* uptimed: 0.3.18 -> 0.4.0

* uptimed: autoreconfHook belongs to nativeBuildInputs
 2017-03-02 10:21:08 +01:00
Jörg Thalheim
b57861c30c Merge pull request #23315 from ndowens/xe 
xe: 0.5 -> 0.6.1
 2017-03-02 09:57:56 +01:00
Dmitry Kalinkin
82d3f926a9
fakeroot: add darwin support 
replace utillinux with getopt

Fixes #22773
 2017-03-01 22:33:33 -05:00
Tobias Geerinckx-Rice
20be30fdd2 Merge pull request #23341 from ndowens/di 
di: 4.42 -> 4.43
 2017-03-01 21:30:24 +00:00
ndowens
d9bc414521 augeas: 1.5.0 -> 1.7.0 2017-03-01 13:38:11 -06:00
ndowens
204850c975 di: 4.42 -> 4.43 2017-03-01 13:09:43 -06:00
ndowens
d12030d175 hwinfo: 21.23 -> 21.38 2017-03-01 17:50:50 +01:00
ndowens
f5c98a8a72 ioping: 0.9 -> 1.0 2017-02-28 20:18:28 -06:00
ndowens
0e3cf999ed xe: 0.5 -> 0.6.1 2017-02-28 19:30:26 -06:00
Peter Simons
7803a696cd smartmontools: update drivedb.h to latest SVN version 4391 2017-02-23 00:18:40 +01:00
romildo
ae8c267320 efivar: 27 -> 31 2017-02-21 05:42:01 +01:00
Joachim F
184f574283 Merge pull request #22915 from pradeepchhetri/envconsul 
envconsul: init at 0.6.2
 2017-02-19 10:23:58 +01:00
Pradeep Chhetri
1973a29536 envconsul: init at 0.6.2 2017-02-19 09:36:39 +05:30
Vladimír Čunát
432dba859e
Merge branch 'staging' 
A security update of libxml2 is within.
 2017-02-18 08:59:29 +01:00
Dan Peebles
7a113e9e83 fakechroot: 2.17.2 -> 2.19 (with modification) 
There's a PR I need merged so this is currently pointing at a fork
on my GitHub but I'll repoint it to mainline once that gets merged.
 2017-02-17 19:21:33 +00:00
Pradeep Chhetri
3e484e7880 consul-template: 0.18.0 -> 0.18.1 2017-02-17 02:20:23 +01:00
Robin Gloster
73ba9b0ef0
facter: 3.5.1 -> 3.6.0 2017-02-17 00:13:23 +01:00
Robin Gloster
46966ad4e5
ipmitool: 1.8.15 -> 1.8.17 2017-02-17 00:11:41 +01:00
Franz Pletz
eda8ee2830 Merge pull request #22752 from LumiGuide/syslog-ng-3.9.1 
syslog-ng: 3.6.2 -> 3.9.1
 2017-02-15 20:12:02 +01:00
Franz Pletz
ea309fcf48
syslogng_incubator: 141106 -> 0.5.0, mark as broken 
This is the current release but neither this nor the current master
is compatible with syslog-ng 3.8+. Committed work on update and
refactor of expression to make it easier in the future to bump.
 2017-02-15 01:58:54 +01:00
Franz Pletz
e38f7c625e
syslog-ng: refactor 2017-02-15 01:58:47 +01:00
Lancelot SIX
8d8bd31e5f
ddrescue: 1.21 -> 1.22 
See https://lists.gnu.org/archive/html/info-gnu/2017-02/msg00003.html
for release note.
 2017-02-14 19:40:39 +01:00
Bas van Dijk
020fb2cce1 syslog-ng: 3.6.2 -> 3.9.1 
This should fix: https://github.com/NixOS/nixpkgs/issues/20153
 2017-02-14 11:45:24 +01:00
Parnell Springmeyer
9e36a58649
Merging against upstream master 2017-02-13 17:16:28 -06:00
Tuomas Tynkkynen
6091bdfebe fio: 2.12 -> 2.17 2017-02-06 22:34:28 +02:00
Hannu Hartikainen
d91b39b3f9 illum: init at 0.4 2017-02-04 20:22:51 +02:00
Daiderd Jordan
10e3dd8a5f Merge pull request #22332 from pradeepchhetri/consul-template 
consul-template: 0.14.0 -> 0.18.0
 2017-02-02 19:13:55 +01:00
Robin Gloster
269b8a32ed
lr: 0.2 -> 0.3.2 2017-02-02 18:59:07 +01:00
Pradeep Chhetri
4d5c39611c consul-template: 0.14.0 -> 0.18.0 2017-02-02 15:47:59 +05:30
Bjørn Forsman
3e5022c787 hardinfo: init at 0.5.1 
Display information about your hardware and operating system.
 2017-02-01 21:12:59 +01:00
Franz Pletz
1128726064 Merge pull request #22305 from jbaum98/smartmontools 
smartmontools: 6.4 -> 6.5 and fix segfault on darwin
 2017-01-31 06:04:17 +01:00
Jake Waksbaum
a9afa48915
smartmontools: 6.4 -> 6.5 and fix segfault on darwin 2017-01-30 22:09:21 -05:00
Nikolay Amiantov
8371d736cf thermald: fix identation 2017-01-31 03:26:26 +03:00
Parnell Springmeyer
4aa0923009
Getting rid of the var indirection and using a bin path instead 2017-01-29 04:11:01 -06:00
Parnell Springmeyer
e92b8402b0
Addressing PR feedback 2017-01-28 20:48:03 -08:00
Parnell Springmeyer
a26a796d5c
Merging against master - updating smokingpig, rebase was going to be messy 2017-01-26 02:00:04 -08:00
Parnell Springmeyer
025555d7f1
More fixes and improvements 2017-01-26 00:05:40 -08:00
Parnell Springmeyer
bae00e8aa8
setcap-wrapper: Merging with upstream master and resolving conflicts 2017-01-25 11:08:05 -08:00
Michael Raskin
ae4f2fd145 Merge pull request #22066 from mbrgm/journalbeat 
journalbeat service: init at 5.1.2
 2017-01-24 17:56:48 +00:00
Casey Ransom
60e7f6d1b1 netdata: 1.4.0 -> 1.5.0 2017-01-23 16:49:24 -05:00
Marius Bergmann
00444cbf25 journalbeat service: init at 5.1.2 
Journalbeat is a log shipper from systemd/journald to
Logstash/Elasticsearch. I added a package as well as a NixOS service
module for it.
 2017-01-23 18:28:55 +01:00
Franz Pletz
281a56af4a
collectd: 5.6.0 -> 5.7.0 2017-01-22 13:00:58 +01:00
Michael Raskin
52103deef1 Merge pull request #22006 from womfoo/bump/facter-3.5.1 
facter: 3.4.1 -> 3.5.1 and related deps
 2017-01-21 18:14:08 +00:00
Kranium Gikos Mendoza
46cb55ced8 facter: 3.4.1 -> 3.5.1 2017-01-20 23:38:25 +08:00
Vladimír Čunát
6b6553c768
Merge branch 'staging' 
It contains security updates.  I somehow forgot to push this yesterday.
 2017-01-20 16:33:59 +01:00
Nikolay Amiantov
d75a3cfb29 Merge pull request #21995 from abbradar/opencl 
Fix OpenCL support
 2017-01-20 12:09:17 +03:00
Nikolay Amiantov
1db8ab66e3 opencl-info: init at 2014-02-21 2017-01-20 03:37:51 +03:00
Jörg Thalheim
068c9c6c53
r10k: use gemdir 2017-01-18 00:52:47 +01:00
Frederik Rietdijk
2445119d5a bootchart: use python2 2017-01-11 18:25:10 +01:00
Maurizio Di Pietro
ba9803079c chase: avoided using fq attribute names 2017-01-06 11:00:43 +01:00
Graham Christensen
6a68b95266
chase: correct download URL 
I broke the change after changing the name from chase_ to chase-. Sorry!
 2017-01-04 06:43:06 -05:00
Graham Christensen
fa89f84c54
maintainers: rename mdipietro to polyrod to match their github name 2017-01-03 20:39:20 -05:00
Maurizio Di Pietro
e0878ce316
chase: init at 0.5.2 2017-01-03 20:32:59 -05:00
Vladimír Čunát
1fe136ea8a
Make all meta.maintainers attributes lists 
(cherry picked from commit b714f55239)
The two new changes were really missing on master.
 2017-01-03 18:28:20 +01:00
Michael Raskin
5ce78bdd03 dd_rescue: 1.99 -> 1.99.5 2017-01-02 20:18:50 +01:00
Michael Raskin
8dc53b17ea ipmiutil: 3.0.0 -> 3.0.1 2017-01-02 20:18:48 +01:00
Bruno Bzeznik
8f3e3d2576 ior: init at 3.0.1 2016-12-16 23:12:42 +01:00
Michael Raskin
9ad8afbf66 freeipmi: 1.5.4 -> 1.5.5 2016-12-08 16:15:18 +01:00
Vladimír Čunát
1960fb5275
pciutils: 3.5.1 -> 3.5.2 2016-12-03 11:07:49 +01:00
Vladimír Čunát
925b335607
Merge branch 'master' into staging 2016-11-26 11:27:09 +01:00
Vladimír Čunát
ceda8cb203
pciutils: fixup finding modules to libkmod's way 
Fixes #20683.
 2016-11-24 16:50:56 +01:00
Vladimír Čunát
516f839c0d
Revert "pciutils: fixup finding modules to libkmod's way" 
This reverts commit 286c836b3f.
It's bigger rebuild than I expected, I'm sorry.  Moving to staging.
 2016-11-24 16:50:20 +01:00
Vladimír Čunát
286c836b3f
pciutils: fixup finding modules to libkmod's way 
Fixes #20683.
 2016-11-24 16:46:28 +01:00
Nikolay Amiantov
c240000451 thermald: 1.5.3 -> 1.5.4 2016-11-24 01:17:59 +03:00
Graham Christensen
1376aeba42
monit: 5.19.0 -> 5.20.0 for CVE-2016-7067 2016-11-17 08:45:56 -05:00
Tim Steinbach
29f679d32e Merge pull request #19861 from womfoo/fix/netdata 
netdata: allow execution without a config file
 2016-11-02 19:45:21 -04:00
Bjørn Forsman
03200ab74b sg3_utils: 1.31 -> 1.42 2016-11-01 22:34:41 +01:00
Kranium Gikos Mendoza
8ce23cfec2 netdata: allow execution without a config file 2016-10-25 23:09:18 +08:00
Kranium Gikos Mendoza
237c15d883 netdata: allow UI to load when running as non-root 2016-10-25 22:56:15 +08:00
zimbatm
cdbb020a1f fixes bundlerEnv calls 2016-10-14 16:56:42 +01:00
Tim Steinbach
2cfe0407b8 Merge pull request #19545 from derchrisuk/netdata 
netdata: 1.0.0 -> 1.4.0
 2016-10-14 09:27:13 -04:00
derchris
0acd3b3b42 netdata: 1.0.0 -> 1.4.0 2016-10-14 12:05:42 +02:00
zimbatm
1657d28895 hiera-eyaml: simplify 2016-10-08 22:38:56 +01:00
zimbatm
194ac466ee foreman: simplify 2016-10-08 22:38:56 +01:00
Nicolas Mattia
86c78073d8 r10k: remove unused docker dependency 2016-10-03 19:50:16 +02:00
Michael Raskin
5e882ea558 freeipmi: 1.5.3 -> 1.5.4 2016-10-03 17:35:18 +02:00
Nicolas Mattia
e3f4ea02c9 r10k: init at 2.4.3 2016-10-02 21:10:56 +02:00
Michael Raskin
a430a38f17 ipmiutil: 2.9.9 -> 3.0.0 2016-09-26 15:49:29 +02:00
Frederik Rietdijk
3ba16c8234 Do not use top-level buildPythonPackage or buildPythonApplication 
but instead use the one in pythonPackages.
 2016-09-26 11:10:51 +02:00
Corbin Simpson
edddd76165 collectd: patch deprecated usage of readdir_r() (#18956) 2016-09-25 19:52:55 +02:00
Arseniy Seroka
f528ff3751 Merge pull request #18916 from Mic92/monit 
monit: 5.10 -> 5.19.0
 2016-09-25 01:03:32 +04:00
Franz Pletz
63052c1126
collectd: 5.5.2 -> 5.6.0 2016-09-24 15:33:31 +02:00
Jörg Thalheim
6b34a62ef8
monit: 5.10 -> 5.19.0 
monit disables SSLv23 now by default, see

- https://mmonit.com/monit/changes/
- https://lwn.net/Vulnerabilities/691497/
 2016-09-24 09:46:25 +02:00
Robin Gloster
4ec5e729c4
systemd-journal2gelf: fix after godeps changes 2016-09-19 00:08:21 +02:00
Robin Gloster
5650c92b01
systemd-journal2gelf: init at 20160414 2016-09-19 00:08:19 +02:00
Daiderd Jordan
a167cd99f2 Merge pull request #18482 from aske/lshw 
lshw: 02.17b -> 02.18b
 2016-09-17 10:58:47 +02:00
Kamil Chmielewski
914e0e594c buildGoPackage: deps.json -> deps.nix in NIXON 
https://github.com/NixOS/nixpkgs/pull/17254#issuecomment-245295541

* update docs to describe `deps.nix`
* include goDeps in nix-shell GOPATH
* NixOS 16.09 rel notes about replacing goPackages
 2016-09-16 00:04:55 +01:00
aske
8233618691 lshw: 02.17b -> 02.18b 2016-09-14 02:26:31 +03:00
Kirill Boltaev
0f37287df5 treewide: explicitly specify gtk version 2016-09-13 21:09:24 +03:00
Kirill Boltaev
bccd75094f treewide: explicitly specify gtk and related package versions 2016-09-12 18:26:06 +03:00
Tuomas Tynkkynen
81eb0c20f8 honcho: Fix hash 2016-09-06 21:58:42 +03:00
Chris Martin
c7a5edcb7c honcho: md5->sha256 2016-09-05 20:08:10 -04:00
Ram Kromberg
c40578ccbb plan9port 2015-11-10 -> 2016-04-18 (#18228) 2016-09-04 14:52:34 +02:00
Susan Potter
a8129aeaf7 rsyslog: 8.17.0 -> 8.21.0 2016-09-03 16:03:28 -05:00
Kranium Gikos Mendoza
0bdec3194a vboot_reference: fix build (#18211) 2016-09-02 12:13:00 +02:00
Parnell Springmeyer
98c058a1ee Adapting everything for the merged permissions wrappers work. 2016-09-01 19:21:06 -05:00
Tuomas Tynkkynen
8c4aeb1780 Merge staging into master 
Brings in:
    - changed output order for multiple outputs:
      https://github.com/NixOS/nixpkgs/pull/14766
    - audit disabled by default
      https://github.com/NixOS/nixpkgs/pull/17916

 Conflicts:
	pkgs/development/libraries/openldap/default.nix
 2016-09-01 13:27:27 +03:00
Ram Kromberg
e852a8e8b6 plan9port: 2015-06-29 -> 2015-11-10 2016-08-31 08:58:45 +03:00
Tuomas Tynkkynen
d3dc3d4130 Merge remote-tracking branch 'dezgeg/shuffle-outputs' into staging 
https://github.com/NixOS/nixpkgs/pull/14766
 2016-08-30 12:43:37 +03:00
Tuomas Tynkkynen
a17216af4c treewide: Shuffle outputs 
Make either 'bin' or 'out' the first output.
 2016-08-29 14:49:51 +03:00
obadz
b74793bd1c Merge branch 'master' into staging 
Conflicts:
	pkgs/tools/system/facter/default.nix
 2016-08-29 12:44:17 +01:00