diff options
author | Maxim Cournoyer <[email protected]> | 2022-01-25 22:07:13 -0500 |
---|---|---|
committer | Maxim Cournoyer <[email protected]> | 2022-01-25 22:07:13 -0500 |
commit | 1a5302435ff0d2822b823f5a6fe01faa7a85c629 (patch) | |
tree | ac7810c88b560532f22d2bab2e59609cd7305c21 /gnu/packages/piet.scm | |
parent | 3ff2ac4980dacf10087e4b42bd9fbc490591900c (diff) | |
parent | 070b8a893febd6e7d8b2b7c8c4dcebacf7845aa9 (diff) |
Merge branch 'master' into staging.
With "conflicts" solved (all in favor of master except git) in:
gnu/local.mk
gnu/packages/databases.scm
gnu/packages/glib.scm
gnu/packages/gnome.scm
gnu/packages/gnupg.scm
gnu/packages/gnuzilla.scm
gnu/packages/graphics.scm
gnu/packages/gstreamer.scm
gnu/packages/gtk.scm
gnu/packages/linux.scm
gnu/packages/machine-learning.scm
gnu/packages/networking.scm
gnu/packages/polkit.scm
gnu/packages/pulseaudio.scm
gnu/packages/rpc.scm
gnu/packages/rust.scm
gnu/packages/version-control.scm
gnu/packages/w3m.scm
Diffstat (limited to 'gnu/packages/piet.scm')
-rw-r--r-- | gnu/packages/piet.scm | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/gnu/packages/piet.scm b/gnu/packages/piet.scm index a09c05d990..824efe59de 100644 --- a/gnu/packages/piet.scm +++ b/gnu/packages/piet.scm @@ -52,11 +52,8 @@ `("PATH" ":" prefix (,(dirname (which "wish"))))) #t)))))) (inputs - `(("gd" ,gd) - ("giflib" ,giflib) - ("libpng" ,libpng) - ("tk" ,tk))) - (native-inputs `(("groff" ,groff))) + (list gd giflib libpng tk)) + (native-inputs (list groff)) (synopsis "Piet interpreter") (description "Npiet is an interpreter for the Piet programming language. Instead of @@ -151,11 +148,9 @@ an Algol-like language #t))))))) (native-inputs ;; For our tests. - `(("netpbm" ,netpbm) - ("npiet" ,npiet))) + (list netpbm npiet)) (inputs - `(("perl" ,perl) - ("perl-parse-recdescent" ,perl-parse-recdescent))) + (list perl perl-parse-recdescent)) (home-page "https://www.toothycat.net/wiki/wiki.pl?MoonShadow/Piet") (synopsis "Piet compiler and assembler") (description |