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