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/opencog.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/opencog.scm')
| -rw-r--r-- | gnu/packages/opencog.scm | 31 |
1 files changed, 10 insertions, 21 deletions
diff --git a/gnu/packages/opencog.scm b/gnu/packages/opencog.scm index cca0b37ead..998d9b47ae 100644 --- a/gnu/packages/opencog.scm +++ b/gnu/packages/opencog.scm @@ -54,7 +54,7 @@ (arguments `(#:test-target "tests")) (inputs - `(("boost" ,boost))) + (list boost)) (native-inputs `(("cxxtest" ,cxxtest) ("python" ,python-minimal) @@ -93,11 +93,7 @@ utilities use for typical programming tasks in multiple OpenCog projects.") (assoc-ref %outputs "out") "/share/guile/site/2.2/")))) (inputs - `(("boost" ,boost) - ("cogutil" ,cogutil) - ("gmp" ,gmp) - ("guile" ,guile-2.2) - ("postgresql" ,postgresql))) + (list boost cogutil gmp guile-2.2 postgresql)) (native-inputs `(("cxxtest" ,cxxtest) ("python" ,python-minimal) @@ -139,11 +135,7 @@ features not otherwise available.") (assoc-ref %outputs "out") "/share/guile/site/2.2/")))) (inputs - `(("atomspace" ,atomspace) - ("boost" ,boost) - ("cogutil" ,cogutil) - ("gmp" ,gmp) - ("guile" ,guile-2.2))) + (list atomspace boost cogutil gmp guile-2.2)) (native-inputs `(("cxxtest" ,cxxtest) ("python" ,python-minimal) @@ -182,12 +174,12 @@ OpenCog framework.") (assoc-ref %outputs "out") "/share/guile/site/2.2/")))) (inputs - `(("atomspace" ,atomspace) - ("boost" ,boost) - ("cogserver" ,cogserver) - ("cogutil" ,cogutil) - ("gmp" ,gmp) - ("guile" ,guile-2.2))) + (list atomspace + boost + cogserver + cogutil + gmp + guile-2.2)) (native-inputs `(("cxxtest" ,cxxtest) ("python" ,python-minimal) @@ -288,10 +280,7 @@ combination.") "/share/guile/site/2.2/opencog")))) #t))))) (inputs - `(("atomspace" ,atomspace) - ("cogutil" ,cogutil) - ("gmp" ,gmp) - ("guile" ,guile-2.2))) + (list atomspace cogutil gmp guile-2.2)) (native-inputs `(("cxxtest" ,cxxtest) ("python" ,python-minimal) |