Merge remote-tracking branch 'upstream/master'

This commit is contained in:
fhdk 2018-04-23 12:49:43 +02:00
commit d051e57d54
3 changed files with 5 additions and 7 deletions

View file

@ -23,11 +23,12 @@ konsole
>extra ark >extra ark
# optional dependencies of ark: # optional dependencies of ark:
>extra p7zip >extra p7zip
>extra unrar >extra unarchiver
## package manager ## package manager
>extra octopi >extra octopi
>extra octopi-notifier-frameworks >extra octopi-notifier-frameworks
# optional dependencies of octopi:
>extra octopi-cachecleaner >extra octopi-cachecleaner
>extra octopi-repoeditor >extra octopi-repoeditor
>extra pacmanlogviewer >extra pacmanlogviewer

View file

@ -5,6 +5,8 @@ manjaro-live-systemd
grub-theme-live-manjaro grub-theme-live-manjaro
nbd nbd
mkinitcpio-nfs-utils mkinitcpio-nfs-utils
systemd-sysvcompat
licenses
## GUI installer ## GUI installer
calamares calamares
@ -12,6 +14,7 @@ squashfs-tools
xdg-user-dirs xdg-user-dirs
## system repair tools for chroot, partitioning, internet research, iso writer, SMART tool, ... ## system repair tools for chroot, partitioning, internet research, iso writer, SMART tool, ...
memtest86+
manjaro-tools-base manjaro-tools-base
falkon falkon
imagewriter imagewriter

View file

@ -6,17 +6,11 @@ base
manjaro-system manjaro-system
mhwd mhwd
sudo sudo
## required packages
systemd-sysvcompat
licenses
KERNEL KERNEL
# KERNEL-r8168
## boot loader ## boot loader
grub grub
os-prober os-prober
memtest86+
efibootmgr efibootmgr
intel-ucode intel-ucode