3
0
Fork 0
forked from mirrors/nixpkgs
nixpkgs/pkgs/tools/system
Vladimír Čunát 985d1ac425
Merge branch 'master' into staging-next
There were several more conflicts from name -> pname+version;
all auto-solved by kdiff3, hopefully OK.

Hydra nixpkgs: ?compare=1538611
2019-08-25 14:57:11 +02:00
..
acct
acpica-tools acpica-tools: 20190703 -> 20190816 2019-08-22 13:23:33 -07:00
actkbd
amtterm treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
at treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
augeas treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
awstats
bar
bfs treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
bootchart treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
chase treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
clinfo
collectd treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
colorls bundlerUpdateScript: init and use (#64822) 2019-07-22 12:02:47 +00:00
confd treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
consul-template treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
cron
ctop
daemonize treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
das_watchdog treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
datefudge treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
dcfldd
dd_rescue treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
ddrescue
ddrescueview gdk-pixbuf: rename from gdk_pixbuf 2019-07-22 18:50:57 -04:00
ddrutility treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
dfc treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
di treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
dog
efibootmgr treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
efivar treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
envconsul treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
evemu treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
facter treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
fakechroot
fakeroot treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
fcron treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
fdisk
fio treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
foreman
foremost treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
freeipmi Merge branch 'master' into staging-next 2019-08-24 08:55:37 +02:00
gdmap
gohai treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
goreman treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
gotop
gptfdisk treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
gt5
hardinfo treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
hardlink treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
hiera-eyaml hiera-eyaml: 2.1.0 -> 3.0.0 (#65692) 2019-08-01 14:16:24 -07:00
honcho
htop treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
hwinfo treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
idle3tools
illum treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
incron
inxi Merge staging-next into staging 2019-08-17 09:39:23 +02:00
ioping treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
iops treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
ior treewide: name -> pname 2019-08-17 10:54:38 +00:00
ipmitool
ipmiutil ipmiutil: 3.1.3 -> 3.1.4 2019-08-19 05:12:23 -07:00
journalbeat treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
journalwatch
jump
krakenx
ledmon
loadwatch
localtime
logcheck treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
logrotate treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
lr Merge branch 'master' into staging-next 2019-08-24 08:55:37 +02:00
lshw
mcron
memtester treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
minijail
monit monit: 5.25.3 -> 5.26.0 2019-07-15 14:58:38 -07:00
mq-cli
netdata treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
nq treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
nvtop treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
opencl-info
osquery google-gflags: move to aliases.nix 2019-07-25 09:18:32 +00:00
pciutils
pcstat treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
plan9port treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
procodile bundlerUpdateScript: init and use (#64822) 2019-07-22 12:02:47 +00:00
proot
ps_mem
psensor treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
psstop treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
r10k bundlerUpdateScript: init and use (#64822) 2019-07-22 12:02:47 +00:00
rofi-systemd treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
rowhammer-test
rsyslog rsyslog: 8.1905.0 -> 8.1907.0 2019-07-17 09:34:36 +02:00
runit Merge branch 'master' into staging-next 2019-08-24 08:55:37 +02:00
s-tui treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
s6
s6-rc
safe-rm treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
safecopy
setserial treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
sg3_utils
sleuthkit treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
smartmontools treewide: name -> pname 2019-08-17 10:54:38 +00:00
socklog treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
storebrowse
stress
stress-ng stress-ng: 0.10.00 -> 0.10.01 2019-08-20 19:10:08 -07:00
suid-chroot treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
supervise treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
symlinks treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
syslog-ng Remove myself as maintainer of some packages. 2019-08-20 15:24:01 +02:00
syslog-ng-incubator Merge branch 'master' into staging-next 2019-08-24 08:55:37 +02:00
systemd-journal2gelf treewide: update globin's maintained drvs 2019-08-20 19:36:05 +02:00
testdisk-photorec treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
thermald Merge branch 'master' into staging-next 2019-08-24 08:55:37 +02:00
thinkfan treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
throttled
tm
tree treewide: name -> pname 2019-08-17 10:54:38 +00:00
ts
undaemonize
uptimed treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
vbetool treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
vboot_reference treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
which
wsmancli treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
xe treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
yeshup