GLiCID/guix-glicid
7
0
Fork 0
mirror of https://gitlab.univ-nantes.fr/glicid-public/guix-glicid.git synced 2025-04-30 06:08:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'devel' into 'main'

Browse source 
revert changes for yade

See merge request glicid-public/guix-glicid!365
This commit is contained in:
Yann Dupont 2024-01-11 16:10:35 +00:00
commit c57e4dd3ac
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.guix-channel
View file

@ -1,9 +1,9 @@
(channel (channel
(version 0) (version 0)
(dependencies (dependencies
(channel ; (channel
(name guix-past) ; (name guix-past)
(url "https://gitlab.inria.fr/guix-hpc/guix-past")) ; (url "https://gitlab.inria.fr/guix-hpc/guix-past"))
(channel (channel
(name guix-science) (name guix-science)
(url "https://github.com/guix-science/guix-science.git")))) (url "https://github.com/guix-science/guix-science.git"))))

4
glicid/packages/science.scm
View file

@ -19,7 +19,7 @@
#:use-module (gnu packages maths) #:use-module (gnu packages maths)
#:use-module (gnu packages mpi) #:use-module (gnu packages mpi)
#:use-module (gnu packages python) #:use-module (gnu packages python)
#:use-module (past packages python) ; #:use-module (past packages python)
#:use-module (gnu packages python-xyz) #:use-module (gnu packages python-xyz)
#:use-module (gnu packages sphinx) #:use-module (gnu packages sphinx)
#:use-module (gnu packages commencement) #:use-module (gnu packages commencement)
@ -91,7 +91,7 @@
(propagated-inputs `(("gdb" ,gdb) (propagated-inputs `(("gdb" ,gdb)
("sqlite" ,sqlite) ("sqlite" ,sqlite)
("openmpi" ,openmpi) ("openmpi" ,openmpi)
("python" ,python-3.8) ("python" ,python) ;; beware python 3.10 is *NOT* supported
("python-numpy" ,python-numpy) ("python-numpy" ,python-numpy)
("python-matplotlib" ,python-matplotlib) ("python-matplotlib" ,python-matplotlib)
("python-sphinx" ,python-sphinx) ("python-sphinx" ,python-sphinx)