1
0
Fork 0

Move python and pandoc

This commit is contained in:
Malte Brandy 2020-03-29 15:23:28 +02:00
parent 10ca8f75c0
commit 144f3f2966
No known key found for this signature in database
GPG key ID: 226A2D41EF5378C9
2 changed files with 5 additions and 4 deletions

View file

@ -39,6 +39,7 @@ rec {
p.hledger-lib p.hledger-lib
p.releaser p.releaser
p.megaparsec p.megaparsec
p.pandoc
]); ]);
haskellList = list: ''["${builtins.concatStringsSep ''", "'' list}"]''; haskellList = list: ''["${builtins.concatStringsSep ''", "'' list}"]'';
writeHaskellScript = writeHaskellScript =

View file

@ -62,8 +62,8 @@ in rec {
core-system-pkgs = { core-system-pkgs = {
inherit neovim; inherit neovim;
inherit (pkgs) inherit (pkgs)
gitFull gnumake python3 mkpasswd file wget curl wireguard gnupg mutt bind gitFull gnumake mkpasswd file wget curl wireguard gnupg mutt bind liboping
liboping psmisc unzip rename whois lsof parted; psmisc unzip rename whois lsof parted python3;
}; };
extra-system-pkgs = { extra-system-pkgs = {
@ -166,8 +166,8 @@ in rec {
meld icedtea8_web octave filezilla meld icedtea8_web octave filezilla
# tools & office # tools & office
feh gimp imagemagick libreoffice-fresh pandoc xournal musescore handbrake feh gimp imagemagick libreoffice-fresh xournal musescore handbrake evince
evince abcde beets abcde beets
# teamviewer # teamviewer