BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
112530 commits 1 branch 0 tags 3.8 GiB
Commit graph

902 commits

Author SHA1 Message Date
Kamil Chmielewski
bbc37e0eb7 Moving from fetchgit generated by go2nix to fetchFromGitHub where rev is 
a tag
 2016-06-09 13:08:10 +02:00
Kamil Chmielewski
7eb671ebcd no more goPackages 2016-06-09 13:08:00 +02:00
Kamil Chmielewski
9e273d5b29 consul--template: extracted from goPackages 2016-06-09 11:22:02 +02:00
Kamil Chmielewski
abcec97b1e confd: extracted from goPackages 2016-06-09 11:22:02 +02:00
Tuomas Tynkkynen
bac26e08db Fix lots of fetchgit hashes (fallout from #15469) 2016-06-03 17:17:08 +03:00
michael bishop
85b87796ae
runit: fix closure size 2016-06-03 06:46:54 -03:00
Robin Gloster
2d382f3d98 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-05-30 19:39:34 +00:00
Frederik Rietdijk
373455e237 Merge pull request #15613 from womfoo/facter 
facter: 3.1.5 -> 3.1.6 (add ruby support) and dependency leatherman: 0.4.2 -> 0.7.0
 2016-05-28 15:29:31 +02:00
Vladimír Čunát
81039713fa Merge branch 'master' into staging 
... to get the systemd update (rebuilding ~7k jobs).
 2016-05-26 16:50:22 +02:00
Michael Raskin
cfdf0d5a79 freeipmi: 1.5.1 -> 1.5.2 2016-05-25 16:00:57 +02:00
Vladimír Čunát
0b192a0976 Merge branch 'master' into staging 
That's to get mesa rebuild from master, as it's nontrivial.
 2016-05-23 09:02:10 +02:00
Eelco Dolstra
64f22ddd64 pciutils: 3.4.1 -> 3.5.1 2016-05-22 23:05:25 +02:00
Kranium Gikos Mendoza
ccb3ade7c2 facter: ruby support 2016-05-22 18:44:54 +08:00
Kranium Gikos Mendoza
7c4438dcf9 facter: 3.1.5 -> 3.1.6 2016-05-22 18:44:54 +08:00
Vladimír Čunát
c4661e9643 Merge: make dev output references explicit 
This is a rebase of most commits from #14766,
resolving conflicts and a few other evaluation problems.
 2016-05-22 12:09:23 +02:00
Tuomas Tynkkynen
2a73de6e6c treewide: Make explicit that 'dev' output of openssl is used 2016-05-19 10:02:23 +02:00
Franz Pletz
f8d481754c
Merge remote-tracking branch 'origin/master' into hardened-stdenv 2016-05-18 17:10:02 +02:00
Domen Kožar
b49bf121b8 rename iElectric to domenkozar to match GitHub 2016-05-17 13:00:47 +01:00
Franz Pletz
e98a0bc9e0 Merge pull request #15476 from matthiasbeyer/update-unmaintained 
Update unmaintained packages
 2016-05-16 23:45:11 +02:00
Peter Simons
8e462995ba Bring my stdenv.lib.maintainers user name in line with my github nick. 2016-05-16 22:49:55 +02:00
Matthias Beyer
5f76761dc2 daemonize: 1.7.6 -> 1.7.7 2016-05-16 16:12:18 +02:00
Vladimír Čunát
e5d40c6fa3 Merge branch 'staging' 
Hydra is only half-finished, but we'd better get secure glibc fast.
 2016-05-16 10:15:28 +02:00
Joachim Fasting
ca730d4452
fio: 2.2.11 -> 2.9 
This fixes the build against linux 4.4 headers; see
https://hydra.nixos.org/build/35697941/log/raw

Also set `platforms.unix` per what upstream claims.
 2016-05-16 01:06:00 +02:00
Michael Raskin
916c6cf1ad ipmiutil: 2.9.8 -> 2.9.9 2016-05-15 23:49:44 +02:00
Joachim Fasting
a11b0bc515
efivar: fix build against linux 4.4 headers 2016-05-15 19:39:18 +02:00
Joachim Fasting
0a8d1627ec
Revert "efivar: fix build after #15449" 
This reverts commit 21d09bcb71.
 2016-05-15 19:30:39 +02:00
Vladimír Čunát
21d09bcb71 efivar: fix build after #15449 
I don't know why it matters here; the error was:
linux.c:25:24: fatal error: linux/nvme.h: No such file or directory
 2016-05-15 18:21:06 +02:00
Tobias Geerinckx-Rice
45f70fcb06
stress-ng: 0.06.00 -> 0.06.01 2016-05-08 19:42:49 +02:00
Tobias Geerinckx-Rice
519d99f975
thinkfan: 0.9.2 -> 0.9.3; add myself as a maintainer 
CC maintainer @iElectric.
 2016-05-08 00:44:49 +02:00
Tobias Geerinckx-Rice
39421df56a
stress-ng: 0.05.25 -> 0.06.00 
Changes: https://launchpad.net/ubuntu/+source/stress-ng/0.06.00-1.
 2016-05-06 19:17:07 +02:00
Tobias Geerinckx-Rice
d6e4c1b750
thinkfan: install manual, README and examples 
READMEs usually just waste those precious kilobytes, but both the
manual page and --help output refer to this one quite a bit.
 2016-05-04 00:39:51 +02:00
Franz Pletz
4825d4033e ddrescue: 1.20 -> 1.21 2016-05-03 16:15:20 +02:00
Franz Pletz
b5fdb8585b di: 4.36 -> 4.37 2016-05-03 16:15:20 +02:00
Franz Pletz
47a7b42d51 collectd: 5.5.0 -> 5.5.1 2016-05-03 16:15:20 +02:00
Tobias Geerinckx-Rice
95aab50e81
efivar: 0.21 -> 0.23 2016-05-03 03:50:13 +02:00
Robin Gloster
c92bca56f8 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-05-02 22:58:02 +00:00
Nikolay Amiantov
7a37ac15b3 runit: fix build 2016-04-30 05:32:28 +03:00
Nikolay Amiantov
bf0a3b4ba8 thermald: 1.4.3 -> 1.5.3 2016-04-30 03:12:34 +03:00
Nikolay Amiantov
938d64f1f3 quote URLs in my packages to ease opening them from urxvt 2016-04-30 03:12:32 +03:00
Tobias Geerinckx-Rice
d51a55366e
stress-ng: 0.05.00 -> 0.05.25 2016-04-29 21:42:35 +02:00
Vladimír Čunát
3748cdc791 awstats: fix build after closure-size merge 2016-04-26 11:15:28 +02:00
Robin Gloster
0fdde5efd0 rowhammer-test.isi686-linux: no Werror for format 2016-04-19 12:33:01 +00:00
Robin Gloster
d020caa5b2 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-04-18 13:49:22 +00:00
Kranium Gikos Mendoza
ca7f93a668 facter: 3.1.3 -> 3.1.5 2016-04-18 01:31:41 +08:00
Luca Bruno
627b7185b9 netdata: fix patch 2016-04-17 11:36:33 +02:00
Luca Bruno
07221cf39f netdata: patch nonsense when serving static files 2016-04-17 11:16:33 +02:00
Luca Bruno
0876c2f4ac netdata: init at 1.0.0 2016-04-14 23:43:01 +02:00
Vladimír Čunát
30f14243c3 Merge branch 'master' into closure-size 
Comparison to master evaluations on Hydra:
  - 1255515 for nixos
  - 1255502 for nixpkgs
 2016-04-10 11:17:52 +02:00
Robin Gloster
3e68106afd Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-04-07 21:52:26 +00:00
Vladimír Čunát
d1df28f8e5 Merge 'staging' into closure-size 
This is mainly to get the update of bootstrap tools.
Otherwise there were mysterious segfaults:
https://github.com/NixOS/nixpkgs/pull/7701#issuecomment-203389817
 2016-04-07 14:40:51 +02:00
Tim Steinbach
158558e091 rsyslog: 8.14.0 -> 8.17.0 2016-04-04 14:31:01 -04:00
Robin Gloster
696d85a62d Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-04-03 11:01:57 +00:00
Peter Simons
90d0b08237 Merge pull request #14371 from pmahoney/skarnet 
Update skarnet.org packages
 2016-04-01 17:59:14 +02:00
Patrick Mahoney
fc1f5d2cf1 set target for darwin binary compat in skarnet.org packages 
skalibs:
execline:
s6-dns:
s6-networking:
s6-portable-utils:
s6-rc:
s6:

The above software uses the target triplet from `cc -dumpmachine` as a
binary compatibility check. However, on darwin, the output includes the
darwin version number, which leads to build failures against a binary
skalibs package built a different version of darwin than the current
system.

Explicitly setting target ensures code can be compiled against a skalibs
binary built on a different version of darwin.

See http://www.skarnet.org/cgi-bin/archive.cgi?1:mss:623:heiodchokfjdkonfhdph
 2016-04-01 10:39:37 -05:00
Patrick Mahoney
e0c225857f update skarnet.org packages 
skalibs:           2.4.7.0 -> 2.3.9.0
execline:          2.1.4.0 -> 2.1.4.5
s6:                2.2.1.0 -> 2.2.4.3
s6-rc:             0.0.1.0 -> 0.0.2.1
s6-portable-utils: 2.0.5.2 -> 2.0.5.3
s6-linux-utils:    2.0.2.0 -> 2.0.2.3
s6-dns:            2.0.0.4 -> 2.0.0.7
s6-networking:     2.1.0.1 -> 2.1.0.4
 2016-04-01 10:38:58 -05:00
Vladimír Čunát
ab15a62c68 Merge branch 'master' into closure-size 
Beware that stdenv doesn't build. It seems something more will be needed
than just resolution of merge conflicts.
 2016-04-01 10:06:01 +02:00
Franz Pletz
2e08d8234e Merge remote-tracking branch 'origin/master' 2016-03-31 10:06:30 +02:00
Bob van der Linden
0e882ccf74 hwinfo: 21.12 -> 21.23 2016-03-30 20:06:58 +02:00
Robin Gloster
f60c9df0ba Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-03-28 15:16:29 +00:00
zimbatm
61c3ad7d2b Merge pull request #14067 from zimbatm/foreman-0.78.0 
foreman: init at 0.78.0
 2016-03-22 23:26:44 +00:00
Mitch Tishmack
db6dff75bd htop: fix build on darwin 2016-03-21 14:05:01 -05:00
Aneesh Agrawal
16ed322928 htop: fix platforms attribute 
See comments at
57dd725e85.

These values are already lists and need to be concatenated together
instead of placed in another list.
 2016-03-20 17:27:34 -04:00
zimbatm
57dd725e85 htop: fix supported platforms list 2016-03-20 19:35:59 +00:00
zimbatm
a6c1481c66 foreman: init at 0.78.0 2016-03-19 22:47:52 +00:00
zimbatm
d9e60e4d43 htop: merge both implementations 
htop 2.0+ is now cross-platform
 2016-03-19 22:20:20 +00:00
Lluís Batlle i Rossell
41c05b47a0 Updating ts to 0.7.6. 2016-03-19 12:23:54 +01:00
Sheena Artrip
0bffa2f1a9 libcollectdclient: make client derive from collectd package 
collectd: split version and name

libcollectdclient: make client derive from collectd package
 2016-03-17 23:26:09 -04:00
Robin Gloster
3f45f0948d Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-03-15 01:44:24 +00:00
Lluís Batlle i Rossell
e026b5c243 Adding rowhammer test. 2016-03-11 14:29:56 +01:00
Luca Bruno
370c318eb0 Merge pull request #13812 from obadz/go-upower-notify 
add go-upower-notify
 2016-03-11 12:34:11 +01:00
obadz
71ac0cd55e yeshup: init at 5461a8f 2016-03-11 11:24:41 +00:00
Vladimír Čunát
6f9fe31b42 awstats: init at 7.4, including a simple service 2016-03-11 10:37:06 +01:00
Thomas Tuegel
3ef7671cea ncurses: combine $lib and $out outputs 
The $lib output refers to the terminfo database in $out, which is about
10x larger than the ncurses shared library. Splitting these outputs
saves a small amount of space for any derivations that use the terminfo
database but not the ncurses library, but we do not have evidence that
any such exist.
 2016-03-08 11:35:24 -06:00
Vladimír Čunát
09af15654f Merge master into closure-size 
The kde-5 stuff still didn't merge well.
I hand-fixed what I saw, but there may be more problems.
 2016-03-08 09:58:19 +01:00
Franz Pletz
cb3d27df93 Merge remote-tracking branch 'origin/master' into hardened-stdenv 2016-03-05 18:55:30 +01:00
Franz Pletz
aff1f4ab94 Use general hardening flag toggle lists 
The following parameters are now available:

  * hardeningDisable
    To disable specific hardening flags
  * hardeningEnable
    To enable specific hardening flags

Only the cc-wrapper supports this right now, but these may be reused by
other wrappers, builders or setup hooks.

cc-wrapper supports the following flags:

  * fortify
  * stackprotector
  * pie (disabled by default)
  * pic
  * strictoverflow
  * format
  * relro
  * bindnow
 2016-03-05 18:55:26 +01:00
Emery
d07d94b97c amtterm: initial package at 1.4 
https://www.kraxel.org/cgit/amtterm/
 2016-03-04 14:47:47 +01:00
Robin Gloster
3b4765c9e5 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-02-28 16:32:57 +00:00
zimbatm
6a518e51dd Merge pull request #13475 from rimmington/collectd-no-mysql 
collectd: allow mysql to be null
 2016-02-27 22:24:57 +00:00
Rhys
ac94a5d86c collectd: allow mysql to be null 2016-02-27 12:02:44 +11:00
Robin Gloster
3477e662e6 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-02-27 00:08:08 +00:00
Robin Gloster
87e64f153b cron: enable pie hardening 2016-02-26 17:27:28 +00:00
Tobias Geerinckx-Rice
d9f5e94bae proot: 4.0.3 -> 5.1.0 
New features
------------
* Processes under PRoot now appear with their real names, that is,
  they are not renamed ld-linux.so or prooted-... anymore.
* Own ELF loader.

Fixes
-----
* Most bugs related to shebang support -- ie. #! at the beginning of
  a program -- were fixed.
* It is now possible to use GDB against multi-threaded programs under
  PRoot x86_64 and x86.
* It is possible to execute x86_64 programs from x86 programs again.
* It is possible to use x86 ptrace-based programs (strace, gdb, ...)
  under PRoot x86_64 again.
* The loader is now built with the build-id linker option explicitly
  disabled.  This special section might interfere with loaded
  programs.
* The loader can now load relocatable objects that have a predefined
  base address.
 2016-02-25 16:21:47 +01:00
Tobias Geerinckx-Rice
ebc9ba92d2 proot: generate and install manual page 2016-02-25 16:21:46 +01:00
Robin Gloster
402d57ee8e bootstrap env: disable stackprotector hardening until gcc >=4.9 2016-02-22 18:32:53 +00:00
Robin Gloster
289599367d stress-ng: 0.05.00 -> 0.05.18 
fixes build after broken hash
 2016-02-21 10:23:57 +00:00
Robin Gloster
3fead71a0e facter: remove obsolete PIC handling (default now) 2016-02-21 10:01:22 +00:00
Robin Gloster
cdb220fd6f rsyslog: turn off format hardening 2016-02-19 21:15:59 +00:00
Frederik Rietdijk
4d06bf70f4 buildPythonApplication: use new function for Python applications 2016-02-19 13:16:41 +01:00
Vladimír Čunát
d039c87984 Merge branch 'master' into closure-size 2016-02-14 08:33:51 +01:00
Robin Gloster
b4e77c34e7 foremost: turn off format hardening 2016-02-10 23:37:25 +00:00
Robin Gloster
5969a59052 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-02-09 16:28:44 +00:00
Charles Strahan
4faeca0cbd nq: init at 0.1 
Unix command line queue utility.
 2016-02-08 17:28:24 -05:00
Charles Strahan
5691a2a498 xe: init at 0.5 
Simple xargs and apply replacement.
 2016-02-08 17:27:44 -05:00
Robin Gloster
371b57a716 lr: init at 0.2 2016-02-08 16:30:29 +00:00
Robin Gloster
49d77a685f gdmap: turn off format hardening 2016-02-07 20:43:42 +00:00
Vladimír Čunát
ae74c356d9 Merge recent 'staging' into closure-size 
Let's get rid of those merge conflicts.
 2016-02-03 16:57:19 +01:00
Vladimír Čunát
2cc537bd06 Merge #11597: various multiple-output fixes 2016-01-28 13:05:30 +01:00
Alexander V. Nikolaev
61020943d1 syslog-ng: add explicit pcre build dependency 2016-01-27 15:37:19 +02:00
Tobias Geerinckx-Rice
ac33b4724a More version attribute tidying where maintainers |= nckx 2016-01-25 20:08:34 +01:00
Tobias Geerinckx-Rice
9fb8020e4e Add version attribute where maintainers |= nckx 
This will probably be mandatory soon, and is a step in the right
direction. Removes the deprecated meta.version, and move some meta
sections to the end of the file where I should have put them in
the first place.
 2016-01-25 17:35:21 +01:00
Tuomas Tynkkynen
d91c7347d1 treewide: Mass replace 'openssl}/lib' to refer the 'out' output 2016-01-24 10:03:38 +02:00
Tuomas Tynkkynen
8eb5d7d037 treewide: Mass replace 'ncurses}/lib' to refer the 'lib' output 2016-01-24 10:03:38 +02:00
Vladimír Čunát
716aac2519 Merge branch 'staging' into closure-size 2016-01-19 09:55:31 +01:00
Vladimír Čunát
36e7b376eb pciutils: minor update 3.4.0 -> 3.4.1 2016-01-07 00:17:59 +01:00
Arseniy Seroka
16223a4c65 Merge pull request #12057 from womfoo/facter 
facter: 3.0.2 -> 3.1.3
 2016-01-01 20:54:38 +03:00
Michael Raskin
247c419427 ipmiutil: 2.9.6 -> 2.9.8 2016-01-01 12:30:17 +03:00
Kranium Gikos Mendoza
6c34b9c2ad facter: 3.0.2 -> 3.1.3 2016-01-01 15:47:44 +08:00
Domen Kožar
2be814f21e Merge pull request #11985 from mayflower/update-thinkfan 
thinkfan: 0.8.1 -> 0.9.2
 2015-12-31 13:41:30 +01:00
Vladimír Čunát
f9f6f41bff Merge branch 'master' into closure-size 
TODO: there was more significant refactoring of qtbase and plasma 5.5
on master, and I'm deferring pointing to correct outputs to later.
 2015-12-31 09:53:02 +01:00
Robert Helgesson
73ede34fe5 vbetool: use stdenv 
This replaces use of `builderDefsPackage`.
 2015-12-30 21:15:15 +01:00
Robin Gloster
7de67f48a5 thinkfan: 0.8.1 -> 0.9.2 2015-12-27 20:27:56 +00:00
Lancelot SIX
f27dee4eb2 pkgs.freeipmi: 1.4.9 -> 1.5.1 
See https://lists.gnu.org/archive/html/info-gnu/2015-12/msg00000.html
 2015-12-12 15:04:59 +01:00
Luca Bruno
5b0352a6a4 Merge branch 'master' into closure-size 2015-12-11 18:31:00 +01:00
Frederik Rietdijk
f2ac29648a python ansible2: move to python-packages.nix 2015-12-11 11:28:33 +01:00
Frederik Rietdijk
14167636fc python ansible: move to python-packages.nix 2015-12-11 11:28:33 +01:00
Dan Peebles
12de4d5cb3 ansible2: init 2015-12-03 21:54:45 -05:00
Arseniy Seroka
6f50bbb60e Merge pull request #11323 from gebner/sleuthkit-4.2.0 
sleuthkit: 4.1.3 -> 4.2.0
 2015-12-01 22:59:10 +03:00
Luca Bruno
920b1d3591 Merge branch 'master' into closure-size 2015-11-29 16:50:26 +01:00
Fabian Schmitthenner
a936b602b5 smartmontools: 6.3 -> 6.4, update driverdb to r4179 2015-11-29 00:31:13 +01:00
Gabriel Ebner
3e7d4ce95a sleuthkit: 4.1.3 -> 4.2.0 2015-11-28 13:32:18 +01:00
Tobias Geerinckx-Rice
2798b02ad0 Convert some *Flags from strings to lists 2015-11-26 23:45:31 +01:00
Luca Bruno
a412927924 Merge remote-tracking branch 'origin/master' into closure-size 2015-11-25 21:37:30 +01:00
Joachim Fasting
2a752ac760 setserial: reimplement using mkDerivation 2015-11-24 14:45:15 +01:00
Domen Kožar
47cb9d76d6 Merge pull request #10501 from adnelson/fix_ansible 
ansible: fix constants.py patching, do not propagate pythonpaths
 2015-11-22 10:13:00 +01:00
Vladimír Čunát
333d69a5f0 Merge staging into closure-size 
The most complex problems were from dealing with switches reverted in
the meantime (gcc5, gmp6, ncurses6).
It's likely that darwin is (still) broken nontrivially.
 2015-11-20 14:32:58 +01:00
Tobias Geerinckx-Rice
0efb1f7963 stress-ng 0.04.21 -> 0.05.00 2015-11-19 23:25:28 +01:00
Jaka Hudoklin
b572ab99f7 Merge pull request #11131 from svend/ipmitool-darwin 
ipmitool: Fix build on darwin
 2015-11-18 22:56:44 +01:00
Svend Sorensen
95282e3cfc ipmitool: Fix build on darwin 
s6_addr16 is not available on Mac OS X.
 2015-11-18 10:35:07 -08:00
Pascal Wittmann
7fd2796e99 Replace 'with plaforms; platform' with 'platforms.platform' 2015-11-17 21:30:43 +01:00
Eelco Dolstra
f3bd5e1bd5 fio: 2.2.10 -> 2.2.11 2015-11-11 20:06:32 +01:00
Kosyrev Serge
c51e330824 bootchart: 0.9 -> 0.14.7; make pybootchartgui available 
Close #10497.
 2015-11-11 14:52:42 +01:00
Vladimír Čunát
ef2a9c8919 iops: don't build on Darwin (fix #10942) 2015-11-11 08:30:00 +01:00
William A. Kennington III
eca34a1341 rsyslog: 8.12.0 -> 8.14.0 2015-11-08 20:42:12 -08:00
Domen Kožar
0a05adc711 Merge pull request #10056 from pmahoney/s6-rc 
s6-rc: new derivation
 2015-11-06 11:11:56 +01:00
Domen Kožar
b654d87df0 Merge pull request #10709 from robbinch/pkg-collectd-smart 
collectd: Enable SMART plugin
 2015-11-06 10:59:50 +01:00
vbgl
81e78face8 Merge pull request #10776 from manveru/di 
di: 4.35 -> 4.36
 2015-11-05 10:33:08 +01:00
Tobias Geerinckx-Rice
6d7273571c stress-ng 0.04.20 -> 0.04.21 2015-11-04 22:02:18 +01:00
Michael Fellinger
ccd16c338d di: 4.35 -> 4.36 2015-11-01 12:55:09 +01:00
Stéphane Jourdois
a8c0eab3d0 gptfdisk: darwin fixes 2015-10-31 21:26:52 +01:00
Robbin C
1a8d4c4ac6 collectd: Enable SMART plugin 2015-10-30 15:26:35 +08:00
Aaron Bull Schaefer
0bd0f21215 ansible: 1.9.3 -> 1.9.4 2015-10-28 17:12:08 +00:00
Rickard Nilsson
d4bebcbd12 collectd: 5.4.2 -> 5.5.0 2015-10-22 13:07:56 +02:00
Nikolay Amiantov
5cbc177dfb fakeroot: 1.18.4 -> 1.20.2 2015-10-21 13:29:54 +03:00
Tobias Geerinckx-Rice
df22cfdb41 gptfdisk 1.0.0 -> 1.0.1 
Changes: http://www.rodsbooks.com/gdisk/revisions.html
 2015-10-21 01:46:39 +02:00
Allen Nelson
8b93c4103d fix ansible constants.py patching, do not propagate pythonpaths 2015-10-20 13:20:37 -05:00
Vladimír Čunát
90d5e87862 sqlite: split dev and bin outputs 2015-10-14 14:27:07 +02:00
Vladimír Čunát
783c40eb68 dbus: split into multiple outputs and fix referrers 2015-10-13 20:19:01 +02:00
Michael Raskin
8147a3d9d8 dd_rescue: 1.98 -> 1.99 2015-10-13 19:30:51 +03:00
Vladimír Čunát
f8c211fd2b fontconfig: split into multiple outputs 
Fixed all 'fontconfig}' references as well, hopefully, ugh!
 2015-10-05 12:23:56 +02:00
Vladimír Čunát
32b31398eb xorg.libXt: re-split into multiple outputs 
Fixed all 'libXt}' references, too.
 2015-10-05 11:23:34 +02:00
Tuomas Tynkkynen
2549373cb9 fio: Minor refactor 
- Use postPatch for patching, so don't need to manually override
  configurePhase and installPhase.
- Add python to buildInputs, so fio2gnuplot gets patchShebangs'd.
- Add platforms, so it gets built by Hydra.
 2015-09-25 22:16:43 +03:00
Patrick Mahoney
d4e0b35f18 s6: move to tools/system 
Matches runit, a similar process supervisor.
 2015-09-24 20:18:03 -05:00
Patrick Mahoney
c6ba04ee4f s6-rc: new derivation 2015-09-24 20:15:36 -05:00
Tobias Geerinckx-Rice
0e1a15f2da stress-ng: 0.04.19 -> 0.04.20 2015-09-21 02:51:54 +02:00
David Kleuker
775d1dc4b1 iops: init at 0.1 2015-09-20 23:24:43 +02:00
Vladimír Čunát
80a9e5a183 pciutils: feature+bugfix update 3.3.1 -> 3.4.0 2015-09-20 08:26:29 +02:00
William A. Kennington III
b17dfc68d4 rsyslog: 8.10.0 -> 8.12.0 2015-09-18 14:52:51 -07:00
Tobias Geerinckx-Rice
33d2f27d95 stress-ng: 0.04.18 -> 0.04.19 2015-09-16 13:08:17 +02:00
Mathnerd314
eb7404d97a all-packages: Use callPackage where possible 2015-09-14 22:27:19 -06:00
Lancelot SIX
01b1cea1a1 ddrescue: 1.19 -> 1.20 2015-09-14 15:17:54 +00:00
Tobias Geerinckx-Rice
cad2ac106a fio: 2.2.7 -> 2.2.10 2015-09-14 00:52:27 +02:00
Tobias Geerinckx-Rice
2ea03ece86 stress-ng: 0.04.17 -> 0.04.18 2015-09-13 22:36:47 +02:00
Pascal Wittmann
9576187050 daemonize: 1.7.5 -> 1.7.6 2015-09-13 21:32:02 +02:00
Lancelot SIX
0224234a25 ansible: 1.9.1 -> 1.9.3 2015-09-11 18:01:01 +00:00
Tobias Geerinckx-Rice
69e828b5a1 stress-ng: 0.04.16 -> 0.04.17 2015-09-10 23:01:59 +02:00
Kovacsics Robert (NixOS-SSD2)
d6e1ee5651 plan9port: fix interpreter paths, add perl 
Fixing interpreter paths was done by exporting PLAN9_TARGET, which
INSTALL looks at. Giving $PLAN9 to INSTALL does not achieve this, as
INSTALL only looks at its first argument so I removed the other
arguments to avoid confusion.

Perl is an optional dependency for a script that adds URLs to man pages,
I have added it to get fewer errors during install.
 2015-09-10 13:50:51 +01:00
Tobias Geerinckx-Rice
9aa595ef50 stress-ng: 0.04.15 -> 0.04.16 2015-09-08 02:21:19 +02:00
Eelco Dolstra
0f78de00b8 vboot_reference: Fix Git URL 2015-09-01 12:00:04 +02:00
Arseniy Seroka
0851e6aa7d Merge pull request #9410 from KoviRobi/plan9port-update 
plan9port: 20140306 -> git-2015-06-29
 2015-08-25 20:37:57 +03:00
Kovacsics Robert (NixOS-SSD2)
195671aa70 plan9port: 20140306 -> 2015-06-29 
We were already using snapshots, but development moved to github.
Also add "9" to $out/bin as it is the recommended practice, see
install.txt
 2015-08-24 21:55:48 +01:00
Kosyrev Serge
1770fe4443 wsmancli init at 2.6.0 2015-08-24 22:34:16 +03:00
Tobias Geerinckx-Rice
fb6502892a stress-ng: update 0.04.14 -> 0.04.15 2015-08-20 04:52:16 +02:00
Tobias Geerinckx-Rice
a9a0fedb94 stress-ng: 0.04.13 -> 0.04.14 2015-08-03 01:41:56 +02:00
Tobias Geerinckx-Rice
cf1edbb662 stress-ng: 0.04.12 -> 0.04.13 
Changes: https://launchpad.net/ubuntu/+source/stress-ng/0.04.13-1
 2015-07-31 02:02:09 +02:00
Kranium Gikos Mendoza
78309d9825 facter: init at 3.0.2 2015-07-28 19:53:32 +08:00
Nikolay Amiantov
9d815b266d thermald: update package 2015-07-28 12:33:30 +03:00
Tobias Geerinckx-Rice
df6381afec stress-ng: 0.04.11 -> 0.04.12 
Fixes/features:
  * Fix segfault in metrics because MMAPFORK macro not defined correctly
  * Add --cpu-load-slice option for CPU stressor time slice tweaks
 2015-07-24 22:03:32 +02:00
Tobias Geerinckx-Rice
c805663bf4 stress-ng: 0.04.10 -> 0.04.11 
Changes: https://launchpad.net/ubuntu/+source/stress-ng/+changelog
 2015-07-23 03:12:21 +02:00
Tuomas Tynkkynen
8de63957a5 memtester: init at 4.3.0 2015-07-21 19:59:41 +03:00
William A. Kennington III
967abfc786 efivar: 0.20 -> 0.21 2015-07-16 20:07:17 -07:00
Tobias Geerinckx-Rice
1869f171fd stress-ng: 0.04.07 -> 0.04.10 2015-07-03 04:08:49 +02:00
Shea Levy
145768bf9b Unmaintain a bunch of packages 2015-07-01 08:11:05 -04:00
William A. Kennington III
fa1bdb8cbd Migrate all krb5 -> libkrb5 2015-06-26 17:21:49 -07:00
Jascha Geerds
3f66bb7ff2 Add myself as maintainer 2015-06-22 08:26:09 +02:00
Tobias Geerinckx-Rice
066d4d92f5 stress-ng -> 0.04.07 
* Make semaphore stressors linux only because of timeout
* Make stress-sem conditional on STRESS_SEMAPHORE_POSIX
* stress-sem{,-sysv}: Add timeout to semaphore wait
* stress-sem{,-sysv}: ensure parent is waiting and not thrashing
* stress-sem: remove verbose timeout info, it can spam the output
 2015-06-21 22:37:17 +02:00
William A. Kennington III
be9a0a8943 logrotate: 3.8.9 -> 3.9.1 2015-06-18 23:52:33 -07:00
William A. Kennington III
8b7d3127b5 efibootmgr: 0.11.0 -> 0.12 2015-06-18 22:34:43 -07:00
William A. Kennington III
5668e3911c efivar: Fix linking against libdl 2015-06-18 22:34:29 -07:00
William A. Kennington III
0b9419f4a9 efivar: 0.15 -> 0.20 2015-06-18 22:03:00 -07:00
William A. Kennington III
8a13108d42 Merge pull request #8376 from eduarrrd/rsyslog 
rsyslog: 8.9.0 -> 8.10.0
 2015-06-17 20:34:27 -07:00
Eduard Bachmakov
e6f81661aa rsyslog: 8.9.0 -> 8.10.0 2015-06-17 21:59:54 -04:00
Dario Bertini
1c87fd82d4
Fix python-packages.nix conflict 
Merge remote-tracking branch 'origin/master' into ansible-win
 2015-06-15 19:41:30 +01:00
Dario Bertini
99912bbf0e
Add (optional, but opted in by default) support for Windows in ansible 2015-06-15 19:24:02 +01:00
Michael Raskin
2b35cccc5b Update dd_rescue and switch to bzip2 releases 2015-06-14 11:23:18 +03:00
Michael Raskin
000162daed Update FreeIPMI 2015-06-14 11:22:56 +03:00
Tobias Geerinckx-Rice
c8c15ba95d stress-ng -> 0.04.06 
- stess-sysfs: Do not read sysfs files when running as root
 2015-06-13 16:38:04 +02:00
Nikolay Amiantov
bb6e504d6b thermald: update and adopt 2015-06-12 03:42:29 +03:00
Joachim Schiele
a398088ec6 Merge pull request #8265 from k0ral/dfc 
dfc: 3.0.4 -> 3.0.5
 2015-06-10 20:46:05 +02:00
koral
e3b3dff1d5 dfc: 3.0.4 -> 3.0.5 2015-06-10 11:18:55 +00:00
Eelco Dolstra
5d8fe045b6 Revert "Refactor mkFlag out of old packages" 
This reverts commit 3117e0c897.

Conflicts:
	pkgs/development/libraries/wayland/default.nix
	pkgs/servers/samba/4.x.nix
 2015-06-04 14:54:50 +02:00
Eelco Dolstra
1e6e52c2ac Revert "krb5: 1.13.1 -> 1.13.2" 
This reverts commit 85932bc5a9.
 2015-06-04 14:54:48 +02:00
Tobias Geerinckx-Rice
3467aa462a stress-ng 0.04.04 -> 0.04.05 
Changes:
- Ensure maximum sizes don't exceed 4GB-1 for 32 bit systems
- stress-crypt: only use re-entrant crypt_r on Linux for now
- Add perf reference in manual, update date
- stress-vm-rw: zero msg_wr just to be totally safe
- stress-crypt: use reentrant crypt_r to avoid any memory leaks
- stress-zombie: free items on list head on exit
- stress-lockf: free items on list head on exit
- stress-wcstr: fix incorrect wide string size
- Add int8, int16, int32 and int64 versions of mwc*()
- Increase various stressors upper memory limits
- Make --aggressive force more CPU migrations and context switches
- Fix comment for stress_get_ticks_per_second
- perf: enable inherit flag to trace children
- Add the new --getrandom stressor
- Fix sigq options, missing because not using STRESS_SIGQUEUE
- Fix help -h option, was --h, should be -h
- avoid builtins when libs shall be tested
- add stressor for wide character sting operations
- fix string names
- avoid compiler error in stress-vector
- fix EPOLL build
 2015-06-03 12:44:07 +02:00
lethalman
80dd602c48 Merge pull request #7479 from bobvanderlinden/hwinfo 
added hwinfo
 2015-06-01 17:09:00 +02:00
Tobias Geerinckx-Rice
fbf7ff8b7f stress-ng 0.04.03 -> 0.04.03 2015-06-01 04:04:33 +02:00
Tobias Geerinckx-Rice
158e1cfdd0 Don't use "with licenses;" for single licences 
And don't use square brackets on such lines.
 2015-05-28 19:20:29 +02:00
William A. Kennington III
85932bc5a9 krb5: 1.13.1 -> 1.13.2 2015-05-28 02:20:08 -07:00
Tobias Geerinckx-Rice
b2d7f4b1ba Use common licence attributes from lib/licenses.nix 
Many (less easily automatically converted) old-style strings
remain.

Where there was any possible ambiguity about the exact version or
variant intended, nothing was changed. IANAL, nor a search robot.

Use `with stdenv.lib` wherever it makes sense.
 2015-05-27 22:00:06 +02:00
Bart Brouns
c3b7a8b053 add das_watchdog: a realtime watchdog 2015-05-26 15:13:59 +02:00
Bob van der Linden
2f4dc083d5 added hwinfo 2015-05-25 14:17:46 +02:00
William A. Kennington III
3117e0c897 Refactor mkFlag out of old packages 2015-05-22 13:54:52 -07:00
Tobias Geerinckx-Rice
87b27c9da5 stress-ng 0.04.02 -> 0.04.03 2015-05-22 10:39:28 +02:00
Daniel Pfile
7c9d5eeee5 Upgrade Ansible to 1.9.1 2015-05-19 16:27:25 -05:00
Henry Till
8b580fb9d1 smartmontools: clean up meta, add darwin to meta.platforms 2015-05-15 12:41:33 -04:00
Tobias Geerinckx-Rice
5144f01d4f stress-ng 0.04.00 -> 0.04.02 2015-05-12 08:45:47 +02:00
Wout Mertens
c7893e960d efibootmgr/var: upgrade 2015-05-11 14:25:17 +00:00
Michael Raskin
87eb733e5b Update IPMIutil 2015-05-10 13:46:31 +02:00
William A. Kennington III
074c4a7f78 Merge remote-tracking branch 'upstream/master' into staging 2015-05-07 01:44:49 -07:00
Peter Simons
324719a5a6 Drop obsolete pre-NG Haskell builds. 2015-05-05 21:44:47 +02:00
Tobias Geerinckx-Rice
7a94848638 stress-ng 0.04.00 -> 0.04.01 2015-05-05 19:44:46 +02:00
William A. Kennington III
00d108e4f5 pciutils: 3.3.0 -> 3.3.1 2015-05-04 23:27:52 -07:00
Paulus Esterhazy
4d8d25e4b3 Merge branch 'master' into fix/ansible-ec2 2015-05-04 08:57:57 +02:00
Paulus Esterhazy
cecae8262a Add "six" as dependency 
Ansible's official dynamic inventory script for AWS, ec2.py, requires
python library `six` to work properly. This commit adds the library as
a dependency.
 2015-05-04 08:55:12 +02:00
Thomas Tuegel
1fe28a1132 Merge remote-tracking branch 'upstream/master' into staging 2015-04-29 11:33:28 -05:00
Pascal Wittmann
f99d5cf2fc Fixed some descriptions 2015-04-28 10:55:20 +02:00
Tobias Geerinckx-Rice
7e3b44b205 stress-ng 0.03.22 -> 0.04.00 2015-04-27 23:02:02 +02:00
lethalman
9807dbc142 Merge pull request #7486 from oxij/actkbd-and-media-keys 
add actkbd; nixos: add support for volume control with media keys
 2015-04-27 12:31:15 +02:00
Vladimír Čunát
30f31c9afc Merge 'master' into staging 
(relatively simple conflicts)
 2015-04-26 22:52:08 +02:00
Joachim Fasting
290c217577 ioping: reimplement using mkDerivation 
Also
- set platform unix (upstream claims to support bsd and sun as well)
- fetch source from GitHub
 2015-04-24 11:54:38 +02:00
Eelco Dolstra
6bfc1f7380 fio: Update to 2.2.7 2015-04-23 15:45:45 +02:00
Tobias Geerinckx-Rice
b7135f496e suid-chroot 1.0.1 -> 1.0.2 (and refactor) 
More of a conversion excercise than anything, but here you go.
 2015-04-23 01:52:18 +02:00
William A. Kennington III
781d77d507 rsyslog: Use libmysql instead of mysql 2015-04-22 16:08:53 -07:00
Tobias Geerinckx-Rice
5e359ffbd0 foremost: add missing makefile.patch 2015-04-21 01:30:02 +02:00
Tobias Geerinckx-Rice
29e07d0e6e Add foremost 1.5.7: recover some files based on contents 2015-04-21 00:53:21 +02:00
Jan Malakhovski
bba9d17e94 actkbd: add version 0.2.8 2015-04-20 16:04:51 +00:00
Eelco Dolstra
61cca2cadf meta.homePage -> homepage 2015-04-20 14:20:03 +02:00
Tobias Geerinckx-Rice
7c75c7f7c8 stress-ng 0.03.21 -> 0.03.22 2015-04-18 20:46:48 +02:00
Vladimír Čunát
9de9669496 pciutils: maintenance + PCI IDs update 2015-04-18 07:24:18 +02:00
Luca Bruno
19a1b86a15 collectd: update and reintroduce rabbitmq-c 0.4 to fix build for ZHF 2015-04-17 15:07:46 +02:00
Tobias Geerinckx-Rice
54d262f4ab stress-ng: 0.03.20 -> 0.03.21 2015-04-16 05:44:23 +02:00
William A. Kennington III
c9cb532c8f rsyslog: 8.8.0 -> 8.9.0 2015-04-12 20:39:07 -07:00
Eric Seidel
6ec373d776 Merge branch master into staging 2015-04-06 18:58:08 -07:00
William A. Kennington III
6c07ca09e9 rsyslog: Make linux only 2015-04-04 20:03:37 -07:00
Michael Raskin
ba82a5d609 Merge pull request #5142 from bosu/static-proot 
proot: allow static compilation
 2015-04-04 13:26:21 +03:00
Tobias Geerinckx-Rice
b3453bf03d uptimed: 0.3.16 -> 0.3.18 2015-04-04 02:28:20 +02:00
Domen Kožar
7cc31b6b49 fix eval 2015-04-02 22:30:28 +02:00
William A. Kennington III
a604b42480 mysql: Use libs in place of the binary mysql 2015-04-01 16:46:53 -07:00
William A. Kennington III
fa2e5b25ba Merge branch 'master' into staging 2015-03-29 14:25:48 -07:00
Arseniy Seroka
52359e7a74 Merge pull request #7020 from risicle/daemonize 
add package for daemonize tool
 2015-03-28 19:41:28 +03:00
Robert Scott
72d0d04d0a add package for daemonize tool 2015-03-28 15:10:55 +00:00
William A. Kennington III
7ccccc15ba Merge branch 'master' into staging 2015-03-27 16:03:03 -07:00
William A. Kennington III
e8a8f78471 gptfdisk: 0.8.8 -> 1.0.0 2015-03-26 15:00:33 -07:00
William A. Kennington III
2e3a229915 which: 2.20 -> 2.21 2015-03-25 22:42:36 -07:00
Domen Kožar
5491cb0903 Merge pull request #6889 from benley/honcho 
New package: Honcho (Python clone of Foreman)
 2015-03-21 19:21:56 +01:00
Eelco Dolstra
2ed5c2bd6b Set some meta.platforms 
Also fix meta.platform -> meta.platforms in a few places.
 2015-03-20 20:04:42 +01:00
Benjamin Staffin
5972edc148 New package: Honcho (Python clone of Foreman) 2015-03-18 23:17:14 -07:00
lethalman
341332a814 Merge pull request #6845 from k0ral/logrotate 
logrotate: 3.8.7 -> 3.8.9
 2015-03-17 12:46:57 +01:00
Eelco Dolstra
c1e1092b8b rsyslog: Move systemd check 2015-03-17 10:13:06 +01:00
koral
25b6058628 logrotate: 3.8.7 -> 3.8.9 2015-03-17 00:24:37 +00:00
William A. Kennington III
ce0a5ab6c2 rsyslog: 7.6.3 -> 8.8.0 2015-03-11 18:50:04 -07:00
Rickard Nilsson
2d00826ac9 syslog-ng: Update from 3.6.1 to 3.6.2 2015-03-11 02:07:43 +01:00
William A. Kennington III
adbba6eded Merge pull request #6528 from codyopel/stdenv-fixes 
remove stdenv.isBSD
 2015-03-02 20:10:07 -08:00
Tobias Geerinckx-Rice
154d3597a9 stress-ng 0.03.19 -> 0.03.20 2015-03-01 03:30:34 +01:00
Mateusz Kowalczyk
301d73c4cd ansible: update from 1.7.2 to 1.8.4 2015-02-26 10:51:52 +00:00
Tobias Geerinckx-Rice
04b8bd0d50 stress-ng 0.03.18 -> 0.03.19 2015-02-25 16:27:02 +01:00
codyopel
e29b0da9c7 remove stdenv.isBSD 2015-02-24 22:15:51 -05:00
Tobias Geerinckx-Rice
9775f462b7 stress-ng 0.03.16 -> 0.03.18 2015-02-19 14:47:52 +01:00
Tobias Geerinckx-Rice
4b87505e32 stress-ng 0.03.15 -> 0.03.16 2015-02-15 22:38:32 +01:00
Tobias Geerinckx-Rice
5e608de1ac stress-ng: update 0.03.14 -> 0.03.15 2015-02-10 19:24:52 +01:00
Tobias Geerinckx-Rice
0711bd03e6 Update stress-ng 0.03.13 -> 0.03.14 2015-02-06 02:00:34 +01:00
Tobias Geerinckx-Rice
b7a4231be7 Update stress-ng 0.03.11 -> 0.03.13 2015-02-02 00:15:46 +01:00
Peter Simons
7185c6150c ipmitool: update from 1.8.14 to 1.8.15 2015-01-27 14:04:54 +01:00
Tobias Geerinckx-Rice
f59ba9a4a6 Update stress-ng 0.03.10 -> 0.03.11 2015-01-25 23:40:34 +01:00
Tobias Geerinckx-Rice
16597fed98 stress-ng 0.03.09 -> 0.03.10 2015-01-25 09:00:09 +01:00
Emery Hemingway
3e5a0dcf55 plan9port: fix acme font loading 2015-01-14 11:59:34 -05:00
Tobias Geerinckx-Rice
d885a5003a Add stress-ng 0.03.09: stress test a computer system 2015-01-14 10:02:05 +01:00
Vladimír Čunát
7637e71cee merge #5521: give fetchgit outputs nicer names 2015-01-13 17:46:44 +01:00
Michael Raskin
54cebfc27e FreeIPMI: 1.4.7 -> 1.4.8 2015-01-11 16:43:29 +03:00
Domen Kožar
fb508b6a58 add stress: configurable amount of CPU, memory, I/O, and disk stress on the system 2015-01-06 11:15:48 +01:00
Shea Levy
664d0fbbba proot: Don't hard-code git-export 2015-01-01 10:04:13 -05:00
tv
7015c61686 journal-mailer: add version 0.1.1.0 2014-12-26 16:41:18 +01:00
koral
9eee22aaca safe-rm: 0.11 -> 0.12 2014-12-23 22:32:49 +01:00
Michael Raskin
32160007ff FreeIPMI: 1.4.6 → 1.4.7 2014-12-21 11:14:25 +03:00
Pascal Wittmann
f94580da69 Fix license attribute of many bsd-like licensed packages 2014-12-21 00:00:35 +01:00
Bjørn Forsman
4b65f53652 gdmap: set meta attributes (license, platforms, maintainers) 2014-12-19 08:01:08 +01:00
Siarhei Zirukin
2c8ff5fdb7 plan9port: fix destination path in sources; add myself as a maintainer 2014-12-17 23:37:18 +01:00
Domen Kožar
4aa3eec330 Merge branch 'master' into staging 
Conflicts:
	pkgs/development/libraries/fontconfig/default.nix
 2014-12-07 14:02:48 +01:00
Siarhei Zirukin
60f2081019 plan9port: make it actually work 
* Add "which" dependency, otherwise it builds with lots of
  "command not found" errors.

* -lgcc_s, otherwise many commands basically fail without pthread_cancel.

* Fix X11 dependencies, otherwise it would be plan9port with none of UI
  programs working.
 2014-12-06 16:18:30 +01:00
Peter Simons
79486d44c0 tree: don't rely on $CC being set in the stdenv build environment 
Fixes https://github.com/NixOS/nixpkgs/issues/5214.
 2014-12-03 16:00:41 +01:00
Vladimír Čunát
06c6d4696d *: fix builds by disregarding warning from new glibc 
Also, in case of collectd, the -lgcc_s shouldn't be needed anymore,
as the library is in ${glibc}/lib/ now, which is practically always on RPATH.

In case of seyren it was some stdenv change uncovering the mistake of
putting src into buildInputs.
 2014-11-28 18:42:03 +01:00
Boris Sukholitko
9bc82e0952 proot: allow static build 2014-11-26 20:42:33 +02:00
Vladimír Čunát
b4af993c3f Merge branch 'master' into staging 
Conflicts (simple):
	pkgs/development/lisp-modules/clwrapper/setup-hook.sh
 2014-11-14 14:28:23 +01:00
Pascal Wittmann
18ffe551e8 acct: update from 6.6.1 to 6.6.2 and adopt it 2014-11-14 12:15:26 +01:00
Eelco Dolstra
f33fa1b66b Merge remote-tracking branch 'origin/master' into staging 
Conflicts:
	pkgs/development/libraries/boost/generic.nix
 2014-11-11 23:48:08 +01:00
Pascal Wittmann
8df0e0b151 Fixed many descriptions 2014-11-11 14:36:34 +01:00
Vladimír Čunát
28abe40149 pciutils: update, extend meta, maintain 2014-11-10 20:17:35 +01:00
Luca Bruno
6af0d6974f Merge branch 'master' into staging 2014-11-10 10:03:52 +01:00
Jaka Hudoklin
cc3ba83055 Add augeas, configuration editing tool 2014-11-09 14:32:08 +01:00
Luca Bruno
83221f3886 Merge branch 'master' into staging 
Makes the build more useful:
- Disabled hybrid iso, makes installer tests pass again
- Imagemagick fixes to the "Illegal instruction" thing
 2014-11-08 15:56:40 +01:00
Mateusz Kowalczyk
6c7793713d lshw: fix location of the binary 
The binary was going into sbin so even with package in profile we still
couldn't use it.

cc @phreedom
 2014-11-08 03:10:26 +00:00