1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-23 06:01:15 +00:00
Commit graph

1591 commits

Author SHA1 Message Date
Roman Volosatovs 4ef3de8645
ctop: ensure go 1.13 compatibility 2019-10-11 10:09:06 +02:00
David Guibert 18b5ca29f5 inxi: enable json output
Before this patch:
$ inxi --output json --output-file output.json $additional_args
Error 80: The required json Perl module is not installed:
Cpanel::JSON::XS OR JSON::XS
See --recommends for more information.

With this patch, it works as expected:
$ inxi --output json --output-file output.json $additional_args
Writing JSON data to: output.json
Data written successfully.
2019-10-09 08:30:56 -07:00
Christine Koppelt ee06d27cf2 treewide: add some missing meta: descriptions and homepages (#70497) 2019-10-06 00:59:26 -04:00
Michael Fellinger 1a27482a6c di: fix homepage 2019-10-05 22:59:23 +09:00
Peter Hoeg aab7e12a87
Merge pull request #69375 from cko/thinkfan-1.0.2
thinkfan: 0.9.3 -> 1.0.2 (replaces #55895)
2019-09-30 19:53:26 +08:00
Christine Koppelt e00ce8c983 addressing remarks from @peterhoeg ( thinkfan: 0.9.3 -> 1.0.2) 2019-09-29 23:59:13 +02:00
markuskowa b09be3c20e
Merge pull request #69983 from r-ryantm/auto-update/uptimed
uptimed: 0.4.1 -> 0.4.2
2019-09-29 22:47:44 +02:00
R. RyanTM ca4c504191 uptimed: 0.4.1 -> 0.4.2
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/uptimed/versions
2019-09-29 00:12:18 -07:00
Vladimír Čunát fda4a08d4a
Merge branch 'staging-next'
There are several security fixes - again, as it consists mainly of the
previously reverted staging-next merge.
2019-09-28 07:43:04 +02:00
Mario Rodas 13107bfaee
Merge pull request #69627 from r-ryantm/auto-update/logrotate
logrotate: 3.15.0 -> 3.15.1
2019-09-27 22:14:13 -05:00
Vladimír Čunát 217cf982c7
Merge branch 'master' into staging-next 2019-09-27 22:13:02 +02:00
Marek Mahut b8a16d2c7b
Merge pull request #69538 from r-ryantm/auto-update/fio
fio: 3.15 -> 3.16
2019-09-27 22:08:24 +02:00
Renaud 76519374dc
Merge pull request #68918 from dtzWill/update/stress-ng-0.10.05-musl
stress-ng: 0.10.02 -> 0.10.05, fix w/musl
2019-09-27 15:46:40 +02:00
R. RyanTM 17ad60e68f logrotate: 3.15.0 -> 3.15.1
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/logrotate/versions
2019-09-26 19:15:47 -07:00
R. RyanTM 9d6f4a662d fio: 3.15 -> 3.16
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/fio/versions
2019-09-26 07:45:52 -07:00
Christine Koppelt 3966d0d300 addressing remarks from @peterhoeg ( thinkfan: 0.9.3 -> 1.0.2) 2019-09-25 08:57:10 +02:00
Christine Koppelt c3a562f3e2 addressing remarks from @peterhoeg ( thinkfan: 0.9.3 -> 1.0.2) 2019-09-25 00:33:22 +02:00
Christine Koppelt 482a9537b2 thinkfan: 1.0.1 -> 1.0.2 2019-09-24 21:22:55 +02:00
Christine Koppelt 15f4112f53 fixing remarks from #55895 (thinkfan: 0.9.3 -> 1.0.1) 2019-09-24 21:00:03 +02:00
Andrey Ovcharov 859b3b7f90 thinkfan: 0.9.3 -> 1.0.1 2019-09-24 20:53:59 +02:00
Vladimír Čunát eab41878ac
Merge branch 'master' into staging-next 2019-09-24 08:14:34 +02:00
Sander van der Burg 96ffba10f5 daemon: init at 0.6.4 2019-09-22 21:18:54 +02:00
Vladimír Čunát 22a216849b
Re-Revert "Merge branch 'staging-next'"
This reverts commit f8a8fc6c7c.
2019-09-22 09:38:09 +02:00
Vladimír Čunát f8a8fc6c7c
Revert "Merge branch 'staging-next'"
This reverts commit 41af38f372, reversing
changes made to f0fec244ca.

Let's delay this.  We have some serious regressions.
2019-09-21 20:05:09 +02:00
Vladimír Čunát 41af38f372
Merge branch 'staging-next' 2019-09-21 13:14:09 +02:00
Mario Rodas 4a414f378b systemd-journal2gelf: use buildGoPackage 2019-09-21 04:29:00 -05:00
Anderson Torres 92324d92a6
Merge pull request #68961 from eraserhd/pr/master/plan9port-missing-which
plan9port: use command instead of which in builder.sh
2019-09-20 07:34:08 -03:00
Frederik Rietdijk 0b12d44c06 Merge master into staging-next 2019-09-19 16:59:42 +02:00
Matthew Bauer ca99e4562a
Merge pull request #69039 from samueldr/cross/vboot_reference
vboot_reference: use the right ar when cross-compiling
2019-09-18 20:43:03 -04:00
Samuel Dionne-Riel 48859723ac vboot_reference: use the right ar when cross-compiling 2019-09-18 15:11:21 -04:00
Jason Felice 1a5c68c7fe plan9port: do not use which in builder.sh
Removing the build time dependency on which broke builder.sh
2019-09-16 22:15:59 -04:00
Will Dietz 31be449657
stress-ng: workaround kernel header SNAFU re:sysinfo, fix w/musl 2019-09-16 12:37:43 -05:00
Vladimír Čunát fa4a3af5a7
Merge branch 'master' into staging-next 2019-09-16 19:24:52 +02:00
Will Dietz 3eb894e55b
stress-ng: 0.10.02 -> 0.10.05 2019-09-16 10:10:03 -05:00
Mario Rodas 41894f17e0
Merge pull request #68644 from marsam/update-netdata
netdata: 1.17.0 -> 1.17.1
2019-09-15 17:49:34 -05:00
Aaron Andersen a6edca1aca
Merge pull request #68406 from leenaars/datefudged
datefudge: 1.22 -> 1.23
2019-09-15 10:17:51 -04:00
Nick Spinale f4951397ba lshw: fix cross-compilation 2019-09-15 15:36:31 +02:00
Mario Rodas 67425aa31e
netdata: 1.17.0 -> 1.17.1
Changelog: https://github.com/netdata/netdata/releases/tag/v1.17.1
2019-09-13 04:20:00 -05:00
Jan Tojnar a441eaa7b1
Merge branch 'staging-next' into staging 2019-09-12 22:49:43 +02:00
Anderson Torres 868bf106f1
Merge pull request #66404 from eraserhd/pr/master/plan9port-mac-compiler-fixes
plan9port: use C compiler from Nix
2019-09-10 07:45:51 -03:00
Michiel Leenaars 14bb6f07df datefudge: 1.22 -> 1.23 2019-09-10 10:00:11 +02:00
Jason Felice 51faa42af6 plan9port: avoid needing to propagate "which" 2019-09-09 12:31:09 -04:00
Izorkin 329a88efa7 treewide: replace mysql.connector-c to libmysqlclient 2019-09-09 15:55:34 +03:00
volth 7b8fb5c06c treewide: remove redundant quotes 2019-09-08 23:38:31 +00:00
Frederik Rietdijk 5f4734b1dd Merge remote-tracking branch 'upstream/gcc-8' into staging-next
Earlier the gcc8 branch was merged instead of the gcc-8 branch (note the dash)...
2019-09-08 20:44:26 +02:00
Jan Tojnar f9237f3152
Merge branch 'master' into staging-next 2019-09-06 16:55:11 +02:00
adisbladis 1b64fd7f53
journalbeat5: Remove EOL package 2019-09-06 14:22:15 +01:00
Jan Tojnar cdf426488b
Merge branch 'master' into staging-next
Fixed trivial conflicts caused by removing rec.
2019-09-06 03:20:09 +02:00
Mario Rodas 044cc701c2
Merge pull request #68048 from marsam/update-netdata
netdata: 1.16.0 -> 1.17.0
2019-09-04 18:37:21 -05:00
Will Dietz 1d3e71bf9b
stress-ng: 0.10.01 -> 0.10.02 2019-09-03 20:22:33 -05:00