Commit Graph

2483 Commits

Author SHA1 Message Date
Maximilian Bosch
6c64610487
Merge pull request #134171 from Kranzes/auto-update/thermald
thermald: 2.4.3 -> 2.4.6
2021-08-19 09:45:47 +02:00
davidak
19c3ab9856
Merge pull request #134583 from lovesegfault/htop-features
htop: optionally enable sensors and systemd support on Linux
2021-08-19 01:30:13 +02:00
Vladimír Čunát
7c38b03f74
Merge #131928: branch 'staging-next' 2021-08-18 22:23:15 +02:00
Alyssa Ross
6e6c8b7338 s6-rc: fix cross builds that run s6-rc-compile
The reason for this change is explained in the long comment I added.

Here's a simple example of the problem:

	let
	  pkgs = import <nixpkgs> { crossSystem.system = "aarch64-linux"; };
	in

	pkgs.callPackage ({ stdenv, s6-rc }: stdenv.mkDerivation {
	  name = "s6-rc-compiled";

	  nativeBuildInputs = [ s6-rc ];

	  buildCommand = ''
	    mkdir in
	    s6-rc-compile $out in
	  '';
	}) {}

We're cross compiling for aarch64 here, so we'd expect the scripts
generated by this derivation to be things we could run on aarch64.
But when I build this on my x86_64 machine, without this change
applied, $out/servicedirs/s6rc-oneshot-runner/run gets generated full
of references to x86_64 non-cross store paths for execline, s6, and
s6-rc.

With this change applied, the scripts generated by the above
expression now refer to the cross-compiled aarch64 store paths for
execline, s6, and s6-rc.
2021-08-18 20:09:19 +00:00
Alyssa Ross
1f099b87f9
s6-rc: broaden platforms 2021-08-18 17:33:31 +00:00
github-actions[bot]
90d220f41f
Merge master into staging-next 2021-08-18 12:01:14 +00:00
Michael Raskin
ea7d44eb7f
Merge pull request #134579 from r-ryantm/auto-update/sleuthkit
sleuthkit: 4.10.2 -> 4.11.0
2021-08-18 07:01:34 +00:00
Bernardo Meurer
23c81659b5
htop: optionally enable sensors and systemd support on Linux 2021-08-17 18:05:46 -07:00
R. RyanTM
8674bcebc4 sleuthkit: 4.10.2 -> 4.11.0 2021-08-18 00:37:04 +00:00
github-actions[bot]
893d6605ee
Merge master into staging-next 2021-08-18 00:01:24 +00:00
Ben Siraphob
e3e9668c5e
Merge pull request #134515 from r-ryantm/auto-update/uptimed
uptimed: 0.4.3 -> 0.4.4
2021-08-17 17:46:57 -05:00
Sandro
925953db85
Merge pull request #134498 from alyssais/minijail
minijail: 16 -> 17
2021-08-17 23:56:05 +02:00
Artturi
fc61baca05
Merge pull request #133983 from r-ryantm/auto-update/kmon
kmon: 1.5.4 -> 1.5.5
2021-08-17 22:52:17 +03:00
R. RyanTM
e886ecd416 uptimed: 0.4.3 -> 0.4.4 2021-08-17 18:49:02 +00:00
github-actions[bot]
ad00d57d02
Merge master into staging-next 2021-08-17 18:01:12 +00:00
Alyssa Ross
d327f21b1e
minijail: enableParallelBuilding
Works for me at -j48.
2021-08-17 17:42:41 +00:00
Alyssa Ross
4cc8b0c6f6
minijail: 16 -> 17 2021-08-17 17:39:06 +00:00
R. RyanTM
ee19862567 nvtop: 1.1.0 -> 1.2.2 2021-08-17 10:38:02 -07:00
Ilan Joselevich
953c19369b thermald: 2.4.3 -> 2.4.6 2021-08-15 14:32:18 +03:00
R. RyanTM
29e132b22a kmon: 1.5.4 -> 1.5.5 2021-08-14 10:59:41 +00:00
Jan Tojnar
0aa35561e7 Merge branch 'master' into staging-next 2021-08-14 12:53:07 +02:00
Timothy DeHerrera
4138cbd913
Merge pull request #133535 from ylh/patch-1
plan9port: unmark as broken on darwin
2021-08-12 08:41:47 -06:00
Sandro Jäckel
db805c9d36 smartmontools: format, cleanup 2021-08-12 12:00:10 +09:00
Sandro Jäckel
4b1bccf57a sg3_utils: convert to pname + version 2021-08-12 12:00:10 +09:00
Yestin L. Harrison
07deb55d5d
plan9port: unmark as broken on darwin
Builds and runs just fine with an overlay filtering out the broken attr
2021-08-11 12:55:08 -06:00
Jan Tojnar
4e7e464ae8 Merge branch 'master' into staging-next
; Conflicts:
;	pkgs/tools/system/sg3_utils/default.nix
2021-08-11 16:22:42 +02:00
Kid
b43389f49d iasl: drop pacakge 2021-08-10 03:46:01 +00:00
Bernardo Meurer
e62d2b750c
Merge pull request #113303 from midchildan/fix/smartmontools
smartmontools: drop mailutils dependency by default
2021-08-09 21:15:55 +00:00
Artturi
4de5b947f3
Merge pull request #115545 from r-ryantm/auto-update/sg3_utils
sg3_utils: 1.45 -> 1.46r862
2021-08-09 01:46:31 +03:00
Artturi
334bf400f8
Merge pull request #115553 from r-ryantm/auto-update/rsyslog
rsyslog: 8.2006.0 -> 8.2102.0
2021-08-09 01:37:22 +03:00
github-actions[bot]
cb64ec05dd
Merge master into staging-next 2021-08-05 18:03:00 +00:00
Sandro
67df78457a
Merge pull request #132515 from kidonng/acpica-tools
acpica-tools,iasl: 20200430 -> 20210730
2021-08-05 16:31:44 +02:00
github-actions[bot]
7fac04f59c
Merge master into staging-next 2021-08-05 00:01:21 +00:00
R. RyanTM
0948110e24 hostctl: 1.1.0 -> 1.1.1 2021-08-04 07:05:40 +00:00
Kid
171da17e83 acpica-tools,iasl: 20200430 -> 20210730 2021-08-03 14:24:14 +00:00
zowoq
7996eebcae Merge master into staging-next 2021-08-02 07:36:39 +10:00
Aaron Andersen
4fad3a2b69
Merge pull request #131020 from Artturin/uptimed-fix
uptimed nixos/uptimed: switch to /var/lib/ and fix perms
2021-08-01 15:58:36 -04:00
zowoq
1005c971f5 gdu: 5.3.0 -> 5.5.0
https://github.com/dundee/gdu/releases/tag/v5.4.0
https://github.com/dundee/gdu/releases/tag/v5.5.0
2021-08-01 21:34:35 +10:00
Artturin
bd8eeec9c0 {uptimed,nixos/uptimed}: switch to /var/lib/ and fix perms 2021-07-31 01:05:44 +03:00
github-actions[bot]
10f41ca1da
Merge staging-next into staging 2021-07-29 00:02:13 +00:00
Felix Buehler
e170c65244 tools/system: replace name with pname&version 2021-07-28 16:42:26 +02:00
Felix Buehler
051fcdbe8b tools/{security/system}: replace name with pname&version 2021-07-27 17:54:21 +02:00
R. RyanTM
ebc065c77b gdu: 5.3.0 -> 5.4.0 2021-07-24 18:23:58 +00:00
Fabian Affolter
8236d8c581 natscli: 0.0.24 -> 0.0.25 2021-07-23 13:17:21 +02:00
Sandro
3bcabe0c0b
Merge pull request #130713 from r-ryantm/auto-update/hostctl
hostctl: 1.0.14 -> 1.1.0
2021-07-22 03:18:36 +02:00
Fabian Affolter
abefacef62
Merge pull request #130931 from r-ryantm/auto-update/gdu
gdu: 5.2.0 -> 5.3.0
2021-07-21 22:38:27 +02:00
Sandro
f3024ac294
gotop: cleanup 2021-07-21 15:37:14 +02:00
R. RyanTM
dd81b4d235 gdu: 5.2.0 -> 5.3.0 2021-07-21 12:11:59 +00:00
Maximilian Bosch
de9a4fda81
Merge pull request #130894 from marsam/update-gotop
gotop: 4.1.1 -> 4.1.2
2021-07-21 13:38:50 +02:00
Ryan Mulligan
cba59ab376
Merge pull request #130716 from r-ryantm/auto-update/kmon
kmon: 1.5.3 -> 1.5.4
2021-07-20 18:58:40 -07:00