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

rewrite of multiple .scm

Browse source
This commit is contained in:
Jean-François GUILLAUME 2022-12-13 14:38:19 +00:00
commit 230759ae42
4 changed files with 315 additions and 498 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

151
glicid/packages/admin.scm
View file

@ -1,92 +1,77 @@
(define-module (glicid packages admin) (define-module (glicid packages admin)
#:use-module ((gnu packages admin) #:prefix gnu:) #:use-module ((gnu packages admin) #:prefix gnu:)
#:use-module (gnu packages base) #:use-module (gnu packages base)
#:use-module (gnu packages compression) #:use-module (gnu packages compression)
#:use-module (gnu packages cyrus-sasl) #:use-module (gnu packages cyrus-sasl)
#:use-module (gnu packages groff) #:use-module (gnu packages groff)
#:use-module (gnu packages hurd) #:use-module (gnu packages hurd)
#:use-module (gnu packages linux) #:use-module (gnu packages linux)
#:use-module (gnu packages openldap) #:use-module (gnu packages openldap)
#:use-module (gnu packages pkg-config) #:use-module (gnu packages pkg-config)
#:use-module (gnu packages tls) #:use-module (gnu packages tls)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (guix build-system python) #:use-module (guix build-system python)
#:use-module (guix download) #:use-module (guix download)
#:use-module ((guix licenses) #:prefix license:) #:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix utils) #:use-module (guix utils)
#:use-module (glicid packages python) #:use-module (glicid packages python)
) )
(define-public shadow (define-public shadow
(package (package
(inherit gnu:shadow) (inherit gnu:shadow)
(name "shadow") (name "shadow")
(version "4.11.1") (version "4.13")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (list (uri (list (string-append "https://github.com/shadow-maint/shadow/releases/download/v" version "/shadow-" version ".tar.xz")))
(string-append "https://github.com/shadow-maint/shadow/releases/download/v" version "/shadow-" version ".tar.xz") (sha256 (base32 "0b6xz415b4y3y5nk3pw9xibv05kln4cjbmhybyncmrx2g5fj9zls"))))))
))
(sha256 (base32 "15bwf2krh4crj4w2frkzw9pkxiwbq7h56m8wk8w5zbmjb3797w21"))
))
)
)
(define-public sudo (define-public sudo
(let* ((sudo-minimal gnu:sudo)) (let* ((sudo-minimal gnu:sudo))
(package (package
(inherit sudo-minimal) (inherit sudo-minimal)
(name (string-append (package-name sudo-minimal) "-with-ldap")) (name (string-append (package-name sudo-minimal) "-with-ldap"))
(arguments (arguments
(substitute-keyword-arguments (package-arguments sudo-minimal) (substitute-keyword-arguments (package-arguments sudo-minimal)
((#:configure-flags flags) ((#:configure-flags flags)
`(append (list `(append (list
"--enable-sasl" "--enable-sasl"
"--with-ldap" "--with-ldap"
"--enable-openssl" "--enable-openssl"
"--with-nsswitch") "--with-nsswitch")
,flags)))) ,flags))))
(inputs (modify-inputs (package-inputs sudo-minimal) (inputs (modify-inputs (package-inputs sudo-minimal)
(append openldap (append openldap
openssl openssl
cyrus-sasl))) cyrus-sasl)))
(native-inputs (modify-inputs (package-native-inputs sudo-minimal) (native-inputs (modify-inputs (package-native-inputs sudo-minimal)
(append pkg-config)))))) (append pkg-config))))))
(define-public ansible (define-public ansible
(package (package
(inherit gnu:ansible) (inherit gnu:ansible)
(name "ansible") (name "ansible")
(version "6.3.0") (version "6.3.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri name version)) (uri (pypi-uri name version))
(sha256 (base32 "09im4w38bm36arjxmi0jbdrmv6cgnjq4b5ks4kawhicdbb0rzynm")) (sha256 (base32 "09im4w38bm36arjxmi0jbdrmv6cgnjq4b5ks4kawhicdbb0rzynm"))))
)) (propagated-inputs (list ansible-core))))
(propagated-inputs (list ansible-core))
)
)
(define-public ansible-core (define-public ansible-core
(package (package
(inherit gnu:ansible-core) (inherit gnu:ansible-core)
(name "ansible-core") (name "ansible-core")
(version "2.13.3") (version "2.13.3")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri name version)) (uri (pypi-uri name version))
(sha256 (base32 "120rrpj8pqscdf2llipxxvpmg4fxqr3s0vx32f6hq77z60jh9igf")) (sha256 (base32 "120rrpj8pqscdf2llipxxvpmg4fxqr3s0vx32f6hq77z60jh9igf"))))
)) (arguments
(arguments `(
`( #:tests? #f
#:tests? #f #:phases
#:phases (modify-phases %standard-phases
(modify-phases %standard-phases (delete 'sanity-check))))))
(delete 'sanity-check)
)
)
)
)
)

271
glicid/packages/openldap.scm
View file

@ -1,162 +1,127 @@
(define-module (glicid packages openldap) (define-module (glicid packages openldap)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (guix download) #:use-module (guix download)
#:use-module ((guix licenses) #:prefix license:) #:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix utils) #:use-module (guix utils)
#:use-module (gnu packages autotools) #:use-module (gnu packages autotools)
#:use-module (gnu packages compression) #:use-module (gnu packages compression)
#:use-module (gnu packages cyrus-sasl) #:use-module (gnu packages cyrus-sasl)
#:use-module (gnu packages databases) #:use-module (gnu packages databases)
#:use-module (gnu packages dbm) #:use-module (gnu packages dbm)
#:use-module (gnu packages gnupg) #:use-module (gnu packages gnupg)
#:use-module (gnu packages groff) #:use-module (gnu packages groff)
#:use-module (gnu packages kerberos) #:use-module (gnu packages kerberos)
#:use-module (gnu packages libevent) #:use-module (gnu packages libevent)
#:use-module (gnu packages linux) #:use-module (gnu packages linux)
#:use-module ((gnu packages openldap) #:prefix gnu:) #:use-module ((gnu packages openldap) #:prefix gnu:)
#:use-module (gnu packages password-utils) #:use-module (gnu packages password-utils)
#:use-module (gnu packages perl) #:use-module (gnu packages perl)
#:use-module (gnu packages python) #:use-module (gnu packages python)
#:use-module (gnu packages pkg-config) #:use-module (gnu packages pkg-config)
#:use-module (gnu packages tls) #:use-module (gnu packages tls))
)
(define-public openldap (define-public openldap
(package (package
(name "openldap") (name "openldap")
(version "2.6.3") (version "2.6.3")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (list (uri (list (string-append "https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-" version ".tgz")))
(string-append "https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-" version ".tgz") (sha256 (base32 "0ihddk8c6hg9lkjv0wk0w13g8kb75r8dfsn1n6b77mzk3pbs38nj"))))
)) (build-system gnu-build-system)
(sha256 (base32 "0ihddk8c6hg9lkjv0wk0w13g8kb75r8dfsn1n6b77mzk3pbs38nj")) (inputs (list argon2 cyrus-sasl libevent libgcrypt libltdl lz4 openssl perl snappy unixodbc wiredtiger zlib))
) (native-inputs (list bdb groff libtool pkg-config))
) (arguments '(
(build-system gnu-build-system) ; this is needed because the make check does not work inside guix
(inputs (list argon2 cyrus-sasl libevent libgcrypt libltdl lz4 openssl perl snappy unixodbc wiredtiger zlib)) #:tests? #f
(native-inputs (list bdb groff libtool pkg-config)) #:configure-flags '(
(arguments '( "--enable-debug"
; this is needed because the make check does not work inside guix "--enable-dynamic"
#:tests? #f "--enable-syslog"
#:configure-flags '( "--enable-ipv6"
"--enable-debug" "--enable-local"
"--enable-dynamic" "--enable-slapd"
"--enable-syslog" "--enable-dynacl"
"--enable-ipv6" "--enable-aci"
"--enable-local" "--enable-cleartext"
"--enable-slapd" "--enable-crypt"
"--enable-dynacl" "--enable-spasswd"
"--enable-aci" "--enable-modules"
"--enable-cleartext" "--enable-rlookups"
"--enable-crypt" "--enable-slapi"
"--enable-spasswd" "--enable-backends=mod"
"--enable-modules" "--enable-overlays=mod"
"--enable-rlookups" "--enable-argon2"
"--enable-slapi" "--enable-balancer"
"--enable-backends=mod" "--disable-static"
"--enable-overlays=mod" "--enable-shared"
"--enable-argon2" "--with-tls=openssl"
"--enable-balancer" )
"--disable-static" #:make-flags '("STRIP=")
"--enable-shared" #:phases (modify-phases %standard-phases
"--with-tls=openssl" (add-before 'build 'make-depend
) (lambda* (#:key input #:allow-other-keys)
#:make-flags '("STRIP=") (invoke "make" "depend"))))))
#:phases (modify-phases %standard-phases (synopsis "Implementation of the Lightweight Directory Access Protocol")
(add-before 'build 'make-depend (description "OpenLDAP is a free implementation of the Lightweight Directory Access Protocol.")
(lambda* (#:key input #:allow-other-keys) (license license:openldap2.8)
(invoke "make" "depend") (home-page "https://www.openldap.org/")))
)
)
)
))
(synopsis "Implementation of the Lightweight Directory Access Protocol")
(description "OpenLDAP is a free implementation of the Lightweight Directory Access Protocol.")
(license license:openldap2.8)
(home-page "https://www.openldap.org/")
)
)
(define-public openldap-2.4.59 (define-public openldap-2.4.59
(package (package
(inherit openldap) (inherit openldap)
(name "openldap") (name "openldap")
(version "2.4.59") (version "2.4.59")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (list (uri (list (string-append "https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-" version ".tgz")))
(string-append "https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-" version ".tgz") (sha256 (base32 "0d1gw898gbkv46mw0gll3q0w2j2y9midlzh6f320d0nq8xkpvwwr"))))))
))
(sha256 (base32 "0d1gw898gbkv46mw0gll3q0w2j2y9midlzh6f320d0nq8xkpvwwr"))
)
)
)
)
(define-public openldap-2.5.13 (define-public openldap-2.5.13
(package (package
(inherit openldap) (inherit openldap)
(name "openldap") (name "openldap")
(version "2.5.13") (version "2.5.13")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (list (uri (list (string-append "https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-" version ".tgz")))
(string-append "https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-" version ".tgz") (sha256 (base32 "13007pv1vpp31dvnf9xzzcknqv9p75rqq412nrbprf7p9q646g7f"))))))
))
(sha256 (base32 "13007pv1vpp31dvnf9xzzcknqv9p75rqq412nrbprf7p9q646g7f"))
)
)
)
)
(define-public nss-pam-ldapd (define-public nss-pam-ldapd
(package (package
(name "nss-pam-ldapd") (name "nss-pam-ldapd")
(version "0.9.12") (version "0.9.12")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://arthurdejong.org/nss-pam-ldapd/nss-pam-ldapd-" version ".tar.gz")) (uri (string-append "https://arthurdejong.org/nss-pam-ldapd/nss-pam-ldapd-" version ".tar.gz"))
(sha256 (base32 "050fzcmxmf6y15dlcffc4gxr3wkk7fliqqwhlwqzbjwk8vkn3mn6")) (sha256 (base32 "050fzcmxmf6y15dlcffc4gxr3wkk7fliqqwhlwqzbjwk8vkn3mn6"))))
)) (build-system gnu-build-system)
(build-system gnu-build-system) (arguments
(arguments `(
`( #:configure-flags
#:configure-flags (list (string-append
(list (string-append "--with-pam-seclib-dir=" (assoc-ref %outputs "out") "/lib/security/")
"--with-pam-seclib-dir=" (assoc-ref %outputs "out") "/lib/security/") "--with-ldap-conf-file=/etc/nslcd.conf" )
"--with-ldap-conf-file=/etc/nslcd.conf" #:phases
) (modify-phases %standard-phases
#:phases (add-after 'unpack 'override-nslcd.conf-install-path
(modify-phases %standard-phases (lambda* (#:key outputs #:allow-other-keys)
(add-after 'unpack 'override-nslcd.conf-install-path (substitute* "Makefile.in"
(lambda* (#:key outputs #:allow-other-keys) (
(substitute* "Makefile.in" ("\\$\\(DESTDIR\\)\\$\\(NSLCD_CONF_PATH\\)")
( (string-append (assoc-ref outputs "out") "/etc/nslcd.conf.example"))))))))
("\\$\\(DESTDIR\\)\\$\\(NSLCD_CONF_PATH\\)") (inputs `(
(string-append (assoc-ref outputs "out") "/etc/nslcd.conf.example") ("linux-pam", linux-pam)
) ("mit-krb5", mit-krb5)
) ("openldap", openldap)
) ("python", python)))
) (home-page "https://arthurdejong.org/nss-pam-ldapd")
) (synopsis "NSS and PAM modules for LDAP")
) (description "nss-pam-ldapd provides a @dfn{Name Service Switch} (NSS)
) module that allows your LDAP server to provide user account, group, host name,
(inputs `( alias, netgroup, and basically any other information that you would normally
("linux-pam", linux-pam) get from @file{/etc} flat files or NIS. It also provides a @dfn{Pluggable
("mit-krb5", mit-krb5) Authentication Module} (PAM) to do identity and authentication management with
("openldap", openldap) an LDAP server.")
("python", python) (license license:lgpl2.1+)))
))
(home-page "https://arthurdejong.org/nss-pam-ldapd")
(synopsis "NSS and PAM modules for LDAP")
(description "nss-pam-ldapd provides a @dfn{Name Service Switch} (NSS)
module that allows your LDAP server to provide user account, group, host name,
alias, netgroup, and basically any other information that you would normally
get from @file{/etc} flat files or NIS. It also provides a @dfn{Pluggable
Authentication Module} (PAM) to do identity and authentication management with
an LDAP server.")
(license license:lgpl2.1+)
)
)

262
glicid/packages/ssh.scm
View file

@ -1,181 +1,97 @@
(define-module (glicid packages ssh) (define-module (glicid packages ssh)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix git-download) #:use-module (guix git-download)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (guix build-system cmake) #:use-module (guix build-system cmake)
#:use-module ((guix licenses) #:prefix license:) #:use-module ((guix licenses) #:prefix license:)
#:use-module (gnu packages ssh) #:use-module (gnu packages ssh)
#:use-module (gnu packages hurd) #:use-module (gnu packages hurd)
#:use-module (gnu packages tls) #:use-module (gnu packages tls)
#:use-module (gnu packages compression) #:use-module (gnu packages compression)
#:use-module (gnu packages pkg-config) #:use-module (gnu packages pkg-config)
#:use-module (gnu packages linux) #:use-module (gnu packages linux)
#:use-module (gnu packages security-token) #:use-module (gnu packages security-token)
) )
(define-public libcbor-0.8.0 (define-public libcbor-0.8.0
(package (package
(name "libcbor") (name "libcbor")
(version "0.8.0") (version "0.8.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "http://github.com/PJK/libcbor/archive/refs/tags/v" version ".tar.gz")) (uri (string-append "http://github.com/PJK/libcbor/archive/refs/tags/v" version ".tar.gz"))
(sha256 (base32 "12vw46ahhsc3ydnivkv5lvk1cn4sjjmcr639cjcl99d4dqb9g031")) (sha256 (base32 "12vw46ahhsc3ydnivkv5lvk1cn4sjjmcr639cjcl99d4dqb9g031"))))
) (build-system cmake-build-system)
) (arguments
(build-system cmake-build-system) `(#:configure-flags (list
(arguments "-DCMAKE_CXX_FLAGS=-fPIE"
`(#:configure-flags (list "-DCMAKE_C_FLAGS=-fPIE" )))
"-DCMAKE_CXX_FLAGS=-fPIE" (synopsis "libfido2")
"-DCMAKE_C_FLAGS=-fPIE" (description "Todo")
)) (home-page "toto")
) (license license:gpl2+)))
(synopsis "libfido2")
(description "Todo")
(home-page "toto")
(license license:gpl2+)
)
)
(define-public libcbor-0.9.0 (define-public libcbor-0.9.0
(package (package
(inherit libcbor-0.8.0) (inherit libcbor-0.8.0)
(version "0.9.0") (version "0.9.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "http://github.com/PJK/libcbor/archive/refs/tags/v" version ".tar.gz")) (uri (string-append "http://github.com/PJK/libcbor/archive/refs/tags/v" version ".tar.gz"))
(sha256 (base32 "1l8m7h84zwlx088gkz6gvg2fq11g0p3q6lblwba8c01y6gwy90fs")) (sha256 (base32 "1l8m7h84zwlx088gkz6gvg2fq11g0p3q6lblwba8c01y6gwy90fs"))))))
)
)
)
)
(define-public libcbor-latest libcbor-0.9.0) (define-public libcbor-latest libcbor-0.9.0)
;(define-public libfido2-1.8.0
; (package
; (name "libfido2")
; (version "1.8.0")
; (source
; (origin
; (method url-fetch)
; (uri (string-append "https://developers.yubico.com/libfido2/Releases/libfido2-" version ".tar.gz"))
; (sha256 (base32 "07gxyy5yzgfh5hg7q9fr77z5mkj0xjvd5ya7p5f5kar4iwc92hjm"))
; )
; )
; (build-system cmake-build-system)
; (arguments '(
; #:tests? #f
; ))
; (inputs `(
; ("libcbor",libcbor-latest)
; ("openssl",openssl)
; ("zlib", zlib)
; ("pkg-config", pkg-config)
; ("eudev", eudev)
; ))
; (synopsis "libfido2")
; (description "Todo")
; (home-page "toto")
; (license license:gpl2+)
; )
;)
;(define-public libfido2-1.9.0
; (package
; (inherit libfido2-1.8.0)
; (version "1.9.0")
; (source
; (origin
; (method url-fetch)
; (uri (string-append "https://developers.yubico.com/libfido2/Releases/libfido2-" version ".tar.gz"))
; (sha256 (base32 "1ln2b0zfvl35r03kn2k1i2aw1k3ypvivc71xmp4dzlin6ypy6fds"))
; )
; )
; )
;)
;(define libfido2-latest libfido2-1.9.0)
(define-public openssh-with-fido2 ;; this is has to be worked again (define-public openssh-with-fido2 ;; this is has to be worked again
(package (package
(inherit openssh) (inherit openssh)
(name "openssh-with-fido2") (name "openssh-with-fido2")
(arguments `( (arguments `(
#:test-target "tests" #:test-target "tests"
;; Otherwise, the test scripts try to use a nonexistent directory and #:make-flags '("REGRESSTMP=\"$${BUILDDIR}/regress\"")
;; fail. #:configure-flags `(
#:make-flags '("REGRESSTMP=\"$${BUILDDIR}/regress\"") "--sysconfdir=/etc/ssh"
#:configure-flags `( "--with-default-path=/run/current-system/profile/bin"
"--sysconfdir=/etc/ssh" ,(string-append "--with-kerberos5=" (assoc-ref %build-inputs "mit-krb5") "/bin")
;; Default value of 'PATH' used by sshd. "--with-libedit"
"--with-default-path=/run/current-system/profile/bin" "--with-security-key-builtin"
;; configure needs to find krb5-config. ,,@(if (hurd-target?)
,(string-append "--with-kerberos5=" (assoc-ref %build-inputs "mit-krb5") "/bin") '()
;; libedit is needed for sftp completion. '("--with-pam"))
"--with-libedit" ,,@(if (%current-target-system)
;; for u2f '("--disable-strip")
"--with-security-key-builtin" '()))
;; Enable PAM support in sshd. #:phases
,,@(if (hurd-target?) (modify-phases %standard-phases
'() (add-after 'configure 'reset-/var/empty
'("--with-pam") (lambda* (#:key outputs #:allow-other-keys)
) (let ((out (assoc-ref outputs "out")))
;; "make install" runs "install -s" by default, (substitute*
;; which doesn't work for cross-compiled binaries "Makefile"
;; because it invokes 'strip' instead of (("PRIVSEP_PATH=/var/empty") (string-append "PRIVSEP_PATH=" out "/var/empty"))
;; 'TRIPLET-strip'.Work around this. )
,,@(if (%current-target-system) #t )))
'("--disable-strip") (add-before 'check 'patch-tests
'() (lambda _
) (substitute* "regress/test-exec.sh" (("/bin/sh") (which "sh")))
) (substitute*
#:phases (list "Makefile" "regress/Makefile")
(modify-phases %standard-phases (("^(tests:.*) t-exec(.*)" all pre post) (string-append pre post)))
(add-after 'configure 'reset-/var/empty #t ))
(lambda* (#:key outputs #:allow-other-keys) (replace 'install
(let ((out (assoc-ref outputs "out"))) (lambda*
(substitute* (
"Makefile" #:key outputs (make-flags '())
(("PRIVSEP_PATH=/var/empty") (string-append "PRIVSEP_PATH=" out "/var/empty")) #:allow-other-keys
) )
#t (apply invoke "make" "install-nosysconf" make-flags)
) (install-file "contrib/ssh-copy-id" (string-append (assoc-ref outputs "out") "/bin/"))
) (chmod (string-append (assoc-ref outputs "out") "/bin/ssh-copy-id") #o555)
) (install-file "contrib/ssh-copy-id.1" (string-append (assoc-ref outputs "out") "/share/man/man1/"))
(add-before 'check 'patch-tests #t )))))
(lambda _ (inputs `(
(substitute* "regress/test-exec.sh" (("/bin/sh") (which "sh"))) ("libfido2", libfido2)
;; Remove 't-exec' regress target which requires user 'sshd'. ("libcbor", libcbor)
(substitute* ,@(package-inputs openssh)))))
(list "Makefile" "regress/Makefile")
(("^(tests:.*) t-exec(.*)" all pre post) (string-append pre post))
)
#t
)
)
(replace 'install
(lambda*
(
#:key outputs (make-flags '())
#:allow-other-keys
)
;; Install without host keys and system configuration files.
(apply invoke "make" "install-nosysconf" make-flags)
(install-file "contrib/ssh-copy-id" (string-append (assoc-ref outputs "out") "/bin/"))
(chmod (string-append (assoc-ref outputs "out") "/bin/ssh-copy-id") #o555)
(install-file "contrib/ssh-copy-id.1" (string-append (assoc-ref outputs "out") "/share/man/man1/"))
#t
)
)
)
))
(inputs `(
("libfido2", libfido2)
("libcbor", libcbor)
,@(package-inputs openssh)
))
)
)

129
glicid/packages/virtualization.scm
View file

@ -1,99 +1,50 @@
(define-module (glicid packages virtualization) (define-module (glicid packages virtualization)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix gexp) #:use-module (guix gexp)
#:use-module (gnu packages) #:use-module (gnu packages)
#:use-module (guix utils) #:use-module (guix utils)
#:use-module (gnu packages virtualization) #:use-module (gnu packages virtualization)
#:use-module (gnu packages storage) #:use-module (gnu packages storage)
#:use-module (guix download) #:use-module (guix download)
#:use-module (glicid utils) #:use-module (glicid utils))
; #:use-module (glicid packages storage)
)
;(define local-qemu qemu-7.0-upstream)
;(define qemu-latest (latest-version local-qemu qemu))
;(define local-qemu-minimal qemu-minimal-7.0-upstream)
;(define qemu-minimal-latest (latest-version local-qemu-minimal qemu-minimal))
;; current guix version is latest.
(define-public qemu-latest qemu) (define-public qemu-latest qemu)
(define-public qemu-minimal-latest qemu-minimal) (define-public qemu-minimal-latest qemu-minimal)
(define-public qemu-with-rbd (define-public qemu-with-rbd
(package (package
(inherit qemu-latest) (inherit qemu-latest)
(name "qemu-with-rbd") (name "qemu-with-rbd")
(arguments
(arguments (substitute-keyword-arguments
(substitute-keyword-arguments (package-arguments qemu) (package-arguments qemu)
((#:tests? _ #f) ((#:tests? _ #f)
;; FIXME: To run the test suite, fix all the instances where scripts #f)))
;; generates "#! /bin/sh" shebangs. (inputs `(
#f) ("ceph:lib", ceph "lib")
) ,@(package-inputs qemu)))))
)
(inputs `(
("ceph:lib", ceph "lib")
,@(package-inputs qemu)
))
)
)
;(define-public qemu-with-rbd
; (package
; (inherit qemu-latest)
; (name "qemu-with-rbd")
; (arguments
; (substitute-keyword-arguments `(
; #:tests? #f
; ,@(package-arguments qemu)
; ))
; )
; (inputs `(
; ("ceph:lib", ceph "lib")
; ,@(package-inputs qemu)
; ))
; )
;)
(define-public qemu-minimal-with-rbd (define-public qemu-minimal-with-rbd
(package (package
(inherit qemu-minimal-latest) (inherit qemu-minimal-latest)
(name "qemu-minimal-with-rbd") (name "qemu-minimal-with-rbd")
(arguments (arguments
(substitute-keyword-arguments `( (substitute-keyword-arguments
#:tests? #f `(
,@(package-arguments qemu-minimal) #:tests? #f
)) ,@(package-arguments qemu-minimal))))
) (inputs `(
(inputs `( ("ceph:lib", ceph "lib" )
("ceph:lib", ceph "lib" ) ,@(package-inputs qemu-minimal)))))
,@(package-inputs qemu-minimal)
))
)
)
(define-public libvirt-8.5 (define-public libvirt-8.5
(package (package
(inherit libvirt) (inherit libvirt)
(name "libvirt") (name "libvirt")
(version "8.5.0") (version "8.5.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://libvirt.org/sources/libvirt-" version ".tar.xz")) (uri (string-append "https://libvirt.org/sources/libvirt-" version ".tar.xz"))
(sha256 (base32 "0qnvjy7k4l52bb5xylvhm21blkgbhld0jzilhsdf6gdqw6srj7j0")) (sha256 (base32 "0qnvjy7k4l52bb5xylvhm21blkgbhld0jzilhsdf6gdqw6srj7j0"))
(patches (search-patches "glicid/packages/patches/glicid-libvirt-add-install-prefix.patch")) (patches (search-patches "glicid/packages/patches/glicid-libvirt-add-install-prefix.patch"))))))
)
)
)
)