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 
modified:   glicid/packages/nginx.scm

See merge request glicid-public/guix-glicid!155
This commit is contained in:
Jean-François GUILLAUME 2022-11-30 15:51:13 +00:00
commit 64f7f64d51
3 changed files with 314 additions and 388 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

654
glicid/packages/nginx.scm
View file

@ -1,376 +1,306 @@
(define-module (glicid packages nginx) (define-module (glicid packages nginx)
#:use-module (ice-9 match) #:use-module (ice-9 match)
#:use-module (guix) #:use-module (guix)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix git-download) #:use-module (guix git-download)
#:use-module ((guix licenses) #:prefix license:) #:use-module ((guix licenses) #:prefix license:)
#:use-module (guix utils) #:use-module (guix utils)
#:use-module (gnu packages compression) #:use-module (gnu packages compression)
#:use-module (gnu packages curl) #:use-module (gnu packages curl)
#:use-module (gnu packages geo) #:use-module (gnu packages geo)
#:use-module (gnu packages pcre) #:use-module (gnu packages pcre)
#:use-module (gnu packages perl) #:use-module (gnu packages perl)
#:use-module (gnu packages pkg-config) #:use-module (gnu packages pkg-config)
#:use-module (gnu packages web) #:use-module (gnu packages web)
#:use-module (gnu packages xml) #:use-module (gnu packages xml)
#:use-module (gnu packages tls) #:use-module (gnu packages tls)
#:use-module (glicid packages openldap) #:use-module (glicid packages openldap))
)
(define-public nginx (define-public nginx
(package (package
(name "nginx") (name "nginx")
(version "1.23.2") (version "1.23.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://nginx.org/download/nginx-" version ".tar.gz")) (uri (string-append "https://nginx.org/download/nginx-" version ".tar.gz"))
(sha256 (base32 "0ihbkfcqlqadzkdk813raq15qqrahss1gdd81bkswanpsdrc4358")))) (sha256 (base32 "0ihbkfcqlqadzkdk813raq15qqrahss1gdd81bkswanpsdrc4358"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (list libxml2 libxslt openssl pcre zlib)) (inputs (list libxml2 libxslt openssl pcre zlib))
(arguments (arguments
`(#:tests? #f `(#:tests? #f
#:phases #:phases
(modify-phases %standard-phases (modify-phases
(add-before 'configure 'patch-/bin/sh %standard-phases
(lambda _ (add-before 'configure 'patch-/bin/sh
(substitute* "auto/feature" (lambda _
(("/bin/sh") (which "sh"))) (substitute* "auto/feature"
#t)) (("/bin/sh") (which "sh")))
(replace 'configure #t))
;; The configure script is hand-written, not from GNU autotools. (replace 'configure
(lambda* (#:key configure-flags inputs outputs #:allow-other-keys) ;; The configure script is hand-written, not from GNU autotools.
(let ((flags (lambda* (#:key configure-flags inputs outputs #:allow-other-keys)
(append (list (string-append "--prefix=" (assoc-ref outputs "out")) (let ((flags
"--with-http_ssl_module" (append (list (string-append "--prefix=" (assoc-ref outputs "out"))
"--with-http_v2_module" "--with-http_ssl_module"
"--with-http_xslt_module" "--with-http_v2_module"
"--with-http_gzip_static_module" "--with-http_xslt_module"
"--with-http_gunzip_module" "--with-http_gzip_static_module"
"--with-http_addition_module" "--with-http_gunzip_module"
"--with-http_sub_module" "--with-http_addition_module"
"--with-pcre-jit" "--with-http_sub_module"
"--with-debug" "--with-pcre-jit"
"--with-stream" "--with-debug"
;; Even when not cross-building, we pass the "--with-stream"
;; --crossbuild option to avoid customizing for the ;; Even when not cross-building, we pass the
;; kernel version on the build machine. ;; --crossbuild option to avoid customizing for the
,(let ((system "Linux") ; uname -s ;; kernel version on the build machine.
(release "3.2.0") ; uname -r ,(let ((system "Linux") ; uname -s
;; uname -m (release "3.2.0") ; uname -r
(machine (match (or (%current-target-system) ;; uname -m
(%current-system)) (machine (match (or (%current-target-system)
("x86_64-linux" "x86_64") (%current-system))
("i686-linux" "i686") ("x86_64-linux" "x86_64")
("mips64el-linux" "mips64") ("i686-linux" "i686")
(_ "UNSUPPORTED")))) ("mips64el-linux" "mips64")
(string-append "--crossbuild=" system ":" release ":" machine) (_ "UNSUPPORTED"))))
)) (string-append "--crossbuild=" system ":" release ":" machine)
configure-flags))) ))
(setenv "CC" ,(cc-for-target)) configure-flags)))
(setenv "CFLAGS" ; CPPFLAGS is not respected (setenv "CC" ,(cc-for-target))
(string-append "-I" (assoc-ref inputs "libxml2") (setenv "CFLAGS" ; CPPFLAGS is not respected
"/include/libxml2")) (string-append "-I" (assoc-ref inputs "libxml2")
(format #t "configure flags: ~s~%" flags) "/include/libxml2"))
(apply invoke "./configure" flags) (format #t "configure flags: ~s~%" flags)
#t))) (apply invoke "./configure" flags)
(add-after 'install 'install-man-page #t)))
(lambda* (#:key outputs #:allow-other-keys) (add-after 'install 'install-man-page
(let* ((out (assoc-ref outputs "out")) (lambda* (#:key outputs #:allow-other-keys)
(man (string-append out "/share/man"))) (let* ((out (assoc-ref outputs "out"))
(install-file "objs/nginx.8" (string-append man "/man8")) (man (string-append out "/share/man")))
#t))) (install-file "objs/nginx.8" (string-append man "/man8"))
(add-after 'install 'fix-root-dirs #t)))
(lambda* (#:key outputs #:allow-other-keys) (add-after 'install 'fix-root-dirs
(let* ((out (assoc-ref outputs "out")) (lambda* (#:key outputs #:allow-other-keys)
(share (string-append out "/share/nginx"))) (let* ((out (assoc-ref outputs "out"))
(rmdir (string-append out "/logs")) (share (string-append out "/share/nginx")))
(mkdir-p share) (rmdir (string-append out "/logs"))
(rename-file (string-append out "/conf") (mkdir-p share)
(string-append share "/conf")) (rename-file (string-append out "/conf")
(rename-file (string-append out "/html") (string-append share "/conf"))
(string-append share "/html")) (rename-file (string-append out "/html")
#t)))))) (string-append share "/html"))
(home-page "https://nginx.org") #t))))))
(synopsis "HTTP and reverse proxy server") (home-page "https://nginx.org")
(description (synopsis "HTTP and reverse proxy server")
"Nginx (\"engine X\") is a high-performance web and reverse proxy server (description
created by Igor Sysoev. It can be used both as a stand-alone web server "Nginx (\"engine X\") is a high-performance web and reverse proxy server
and as a proxy to reduce the load on back-end HTTP or mail servers.") created by Igor Sysoev. It can be used both as a stand-alone web server
(license (list license:bsd-2 license:expat license:bsd-3 license:bsd-4)))) and as a proxy to reduce the load on back-end HTTP or mail servers.")
(license (list license:bsd-2 license:expat license:bsd-3 license:bsd-4))))
(define-public nginx-ldap-auth-module (define-public nginx-ldap-auth-module
(package (package
(inherit nginx) (inherit nginx)
(name "nginx-ldap-auth-module") (name "nginx-ldap-auth-module")
(version "83c059b73566c2ee9cbda920d91b66657cf120b7") (version "83c059b73566c2ee9cbda920d91b66657cf120b7")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/kvspb/nginx-auth-ldap") (url "https://github.com/kvspb/nginx-auth-ldap")
(commit version) (commit version)))
) (file-name (git-file-name "nginx-ldap-auth-module" version))
) (sha256 (base32 "023zmdir7w92dnb508ggskkc7kmd7k71hc597sb7i4xfgpwxzq1s"))))
(file-name (git-file-name "nginx-ldap-auth-module" version)) (synopsis "LDAP Authentication module for nginx")
(sha256 (base32 "023zmdir7w92dnb508ggskkc7kmd7k71hc597sb7i4xfgpwxzq1s")) (description "LDAP module for nginx which supports authentication against multiple LDAP servers.")
) (build-system gnu-build-system)
) (inputs
(synopsis "LDAP Authentication module for nginx") `(("nginx-sources" ,(package-source nginx))
(description "LDAP module for nginx which supports authentication against multiple LDAP servers.") ("openldap", openldap)
(build-system gnu-build-system) ,@(package-inputs nginx)))
(inputs (arguments
`(("nginx-sources" ,(package-source nginx)) (substitute-keyword-arguments
("openldap", openldap) `(#:configure-flags '("--add-dynamic-module=.")
,@(package-inputs nginx))) #:make-flags '("modules") ,@(package-arguments nginx))
(arguments ((#:phases phases)
(substitute-keyword-arguments `(modify-phases ,phases
`(#:configure-flags '("--add-dynamic-module=.") (add-after 'unpack 'unpack-nginx-sources
#:make-flags '("modules") (lambda* (#:key inputs native-inputs #:allow-other-keys)
,@(package-arguments nginx) (begin
) (format #t "decompressing nginx source code~%")
((#:phases phases) (let ((tar (assoc-ref inputs "tar")) (nginx-srcs (assoc-ref inputs "nginx-sources")))
`(modify-phases ,phases (invoke (string-append tar "/bin/tar") "xvf" nginx-srcs "--strip-components=1"))
(add-after 'unpack 'unpack-nginx-sources #t )))
(lambda* (#:key inputs native-inputs #:allow-other-keys) (replace 'install
(begin (lambda* (#:key outputs #:allow-other-keys)
;; The nginx source code is part of the module’s source. (let ((modules-dir (string-append (assoc-ref outputs "out") "/etc/nginx/modules")))
(format #t "decompressing nginx source code~%") (install-file "objs/ngx_http_auth_ldap_module.so" modules-dir)
(let ((tar (assoc-ref inputs "tar")) (nginx-srcs (assoc-ref inputs "nginx-sources"))) #t )))
(invoke (string-append tar "/bin/tar") "xvf" nginx-srcs "--strip-components=1") (delete 'fix-root-dirs)
) (delete 'install-man-page)))))))
#t
)
)
)
(replace 'install
(lambda* (#:key outputs #:allow-other-keys)
(let ((modules-dir (string-append (assoc-ref outputs "out") "/etc/nginx/modules")))
(install-file "objs/ngx_http_auth_ldap_module.so" modules-dir)
#t
)
)
)
(delete 'fix-root-dirs)
(delete 'install-man-page)
)
)
)
)
)
)
(define-public modsecurity (define-public modsecurity
(package (package
(name "modsecurity") (name "modsecurity")
(version "3.0.8") (version "3.0.8")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (list (uri (list
(string-append "https://github.com/SpiderLabs/ModSecurity/releases/download/v" version "/modsecurity-v" version ".tar.gz") (string-append "https://github.com/SpiderLabs/ModSecurity/releases/download/v" version "/modsecurity-v" version ".tar.gz")
)) ))
(sha256 (base32 "1isng4z2xijqq92105si1zxkzlx4ifdnn38d7n38mrfp7jdwhhg2")) (sha256 (base32 "1isng4z2xijqq92105si1zxkzlx4ifdnn38d7n38mrfp7jdwhhg2"))))
) (synopsis "modsecurity module for nginx")
) (description "modsecurity module for nginx.")
(synopsis "modsecurity module for nginx") (license license:asl2.0)
(description "modsecurity module for nginx.") (home-page "https://github.com/SpiderLabs/ModSecurity")
(license license:asl2.0) (build-system gnu-build-system)
(home-page "https://github.com/SpiderLabs/ModSecurity") (inputs `(
(build-system gnu-build-system) ("curl", curl)
(inputs `( ("libxml2", libxml2)
("curl", curl) ("libxslt", libxslt)
("libxml2", libxml2) ("openssl", openssl)
("libxslt", libxslt) ("pcre", pcre)
("openssl", openssl) ("pcre:bin", pcre "bin")
("pcre", pcre) ("zlib", zlib)
("pcre:bin", pcre "bin") ("pkg-config", pkg-config)
("zlib", zlib) ("nginx-sources", (package-source nginx))
("pkg-config", pkg-config) ))
("nginx-sources", (package-source nginx)) (arguments
)) `( #:configure-flags (list
(arguments `( (string-append "--with-curl=" (assoc-ref %build-inputs "curl"))
#:configure-flags (list (string-append "--with-pcre=" (assoc-ref %build-inputs "pcre:bin") "/bin/pcre-config")
(string-append "--with-curl=" (assoc-ref %build-inputs "curl")) (string-append "--with-libxml=" (assoc-ref %build-inputs "libxml2"))
(string-append "--with-pcre=" (assoc-ref %build-inputs "pcre:bin") "/bin/pcre-config") "--enable-standalone-module" )))))
(string-append "--with-libxml=" (assoc-ref %build-inputs "libxml2"))
"--enable-standalone-module"
)
))
)
)
(define-public nginx-modsecurity-module (define-public nginx-modsecurity-module
(package (package
(inherit nginx) (inherit nginx)
(name "nginx-modsecurity-module") (name "nginx-modsecurity-module")
(version "1.0.3") (version "1.0.3")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (list (uri (list
(string-append "https://github.com/SpiderLabs/ModSecurity-nginx/releases/download/v" version "/modsecurity-nginx-v" version ".tar.gz") (string-append "https://github.com/SpiderLabs/ModSecurity-nginx/releases/download/v" version "/modsecurity-nginx-v" version ".tar.gz")
)) ))
(sha256 (base32 "1pcayz0kkpr0fvs8fwai0xv7jw9r7ph66vwxm6vrq0mc11r1r0df")) (sha256 (base32 "1pcayz0kkpr0fvs8fwai0xv7jw9r7ph66vwxm6vrq0mc11r1r0df"))
) )
) )
(synopsis "ModSecurity module for nginx") (synopsis "ModSecurity module for nginx")
(description "ModSecurity module for nginx.") (description "ModSecurity module for nginx.")
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
`(("nginx-sources" ,(package-source nginx)) `(("nginx-sources" ,(package-source nginx))
("modsecurity", modsecurity) ("modsecurity", modsecurity)
,@(package-inputs nginx))) ,@(package-inputs nginx)))
(arguments (arguments
(substitute-keyword-arguments (substitute-keyword-arguments
`(#:configure-flags '("--add-dynamic-module=.") `(#:configure-flags '("--add-dynamic-module=.")
#:make-flags '("modules") #:make-flags '("modules")
,@(package-arguments nginx) ,@(package-arguments nginx)
) )
((#:phases phases) ((#:phases phases)
`(modify-phases ,phases `(modify-phases ,phases
(add-after 'unpack 'unpack-nginx-sources (add-after 'unpack 'unpack-nginx-sources
(lambda* (#:key inputs native-inputs #:allow-other-keys) (lambda* (#:key inputs native-inputs #:allow-other-keys)
(begin (begin
;; The nginx source code is part of the module’s source. ;; The nginx source code is part of the module’s source.
(format #t "decompressing nginx source code~%") (format #t "decompressing nginx source code~%")
(let ((tar (assoc-ref inputs "tar")) (nginx-srcs (assoc-ref inputs "nginx-sources"))) (let ((tar (assoc-ref inputs "tar")) (nginx-srcs (assoc-ref inputs "nginx-sources")))
(invoke (string-append tar "/bin/tar") "xvf" nginx-srcs "--strip-components=1") (invoke (string-append tar "/bin/tar") "xvf" nginx-srcs "--strip-components=1")
) )
#t #t )))
) (replace 'install
) (lambda* (#:key outputs #:allow-other-keys)
) (let ((modules-dir (string-append (assoc-ref outputs "out") "/etc/nginx/modules")))
(replace 'install (install-file "objs/ngx_http_modsecurity_module.so" modules-dir)
(lambda* (#:key outputs #:allow-other-keys) #t )))
(let ((modules-dir (string-append (assoc-ref outputs "out") "/etc/nginx/modules"))) (delete 'fix-root-dirs)
(install-file "objs/ngx_http_modsecurity_module.so" modules-dir) (delete 'install-man-page)))))))
#t
)
)
)
(delete 'fix-root-dirs)
(delete 'install-man-page)
)
)
)
)
)
)
(define-public nginx-geoip2-module (define-public nginx-geoip2-module
(package (package
(inherit nginx) (inherit nginx)
(name "nginx-geoip2-module") (name "nginx-geoip2-module")
(version "3.4") (version "3.4")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (list (uri (list
(string-append "https://github.com/leev/ngx_http_geoip2_module/archive/refs/tags/" version ".tar.gz") (string-append "https://github.com/leev/ngx_http_geoip2_module/archive/refs/tags/" version ".tar.gz")
)) ))
(sha256 (base32 "0lllgnasd97r6xkj70q42rp61cxrz8qlb64l14rmlwcd6hizqwmd")) (sha256 (base32 "0lllgnasd97r6xkj70q42rp61cxrz8qlb64l14rmlwcd6hizqwmd"))))
) (synopsis "GeoIP2 module for nginx")
) (description "GeoIP2 module for nginx.")
(synopsis "GeoIP2 module for nginx") (build-system gnu-build-system)
(description "GeoIP2 module for nginx.") (inputs
(build-system gnu-build-system) `(("nginx-sources" ,(package-source nginx))
(inputs ("libmaxminddb", libmaxminddb)
`(("nginx-sources" ,(package-source nginx)) ,@(package-inputs nginx)))
("libmaxminddb", libmaxminddb) (arguments
,@(package-inputs nginx))) (substitute-keyword-arguments
(arguments `(#:configure-flags '("--add-dynamic-module=.")
(substitute-keyword-arguments #:make-flags '("modules") ,@(package-arguments nginx))
`(#:configure-flags '("--add-dynamic-module=.") ((#:phases phases)
#:make-flags '("modules") `(modify-phases ,phases
,@(package-arguments nginx) (add-after 'unpack 'unpack-nginx-sources
) (lambda* (#:key inputs native-inputs #:allow-other-keys)
((#:phases phases) (begin
`(modify-phases ,phases ;; The nginx source code is part of the module’s source.
(add-after 'unpack 'unpack-nginx-sources (format #t "decompressing nginx source code~%")
(lambda* (#:key inputs native-inputs #:allow-other-keys) (let ((tar (assoc-ref inputs "tar")) (nginx-srcs (assoc-ref inputs "nginx-sources")))
(begin (invoke (string-append tar "/bin/tar") "xvf" nginx-srcs "--strip-components=1")
;; The nginx source code is part of the module’s source. )
(format #t "decompressing nginx source code~%") #t )))
(let ((tar (assoc-ref inputs "tar")) (nginx-srcs (assoc-ref inputs "nginx-sources"))) (replace 'install
(invoke (string-append tar "/bin/tar") "xvf" nginx-srcs "--strip-components=1") (lambda* (#:key outputs #:allow-other-keys)
) (let ((modules-dir (string-append (assoc-ref outputs "out") "/etc/nginx/modules")))
#t (install-file "objs/ngx_http_geoip2_module.so" modules-dir)
) (install-file "objs/ngx_stream_geoip2_module.so" modules-dir)
) #t )))
) (delete 'fix-root-dirs)
(replace 'install (delete 'install-man-page)))))))
(lambda* (#:key outputs #:allow-other-keys)
(let ((modules-dir (string-append (assoc-ref outputs "out") "/etc/nginx/modules")))
(install-file "objs/ngx_http_geoip2_module.so" modules-dir)
(install-file "objs/ngx_stream_geoip2_module.so" modules-dir)
#t
)
)
)
(delete 'fix-root-dirs)
(delete 'install-man-page)
)
)
)
)
)
)
(define-public nginx-http_subs_filter-module (define-public nginx-http_subs_filter-module
(package (package
(inherit nginx) (inherit nginx)
(name "nginx-http_subs_filter-module") (name "nginx-http_subs_filter-module")
(version "e12e965") (version "e12e965")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (list (uri (list
(string-append "https://github.com/yaoweibin/ngx_http_substitutions_filter_module/archive/" version ".tar.gz") (string-append "https://github.com/yaoweibin/ngx_http_substitutions_filter_module/archive/" version ".tar.gz")
)) ))
(sha256 (base32 "1cxb3yv6085rj50s001p2vblvz5px2v92whwjhb14kl8fnm2cans")) (sha256 (base32 "1cxb3yv6085rj50s001p2vblvz5px2v92whwjhb14kl8fnm2cans"))))
) (synopsis "substitutions_filter module for nginx")
) (description "substitutions_filter module for nginx.")
(synopsis "substitutions_filter module for nginx") (build-system gnu-build-system)
(description "substitutions_filter module for nginx.") (inputs
(build-system gnu-build-system) `(("nginx-sources" ,(package-source nginx))
(inputs ,@(package-inputs nginx)))
`(("nginx-sources" ,(package-source nginx)) (arguments
,@(package-inputs nginx))) (substitute-keyword-arguments
(arguments `(#:configure-flags '("--add-dynamic-module=.")
(substitute-keyword-arguments #:make-flags '("modules") ,@(package-arguments nginx))
`(#:configure-flags '("--add-dynamic-module=.") ((#:phases phases)
#:make-flags '("modules") `(modify-phases ,phases
,@(package-arguments nginx) (add-after 'unpack 'unpack-nginx-sources
) (lambda* (#:key inputs native-inputs #:allow-other-keys)
((#:phases phases) (begin
`(modify-phases ,phases ;; The nginx source code is part of the module’s source.
(add-after 'unpack 'unpack-nginx-sources (format #t "decompressing nginx source code~%")
(lambda* (#:key inputs native-inputs #:allow-other-keys) (let ((tar (assoc-ref inputs "tar")) (nginx-srcs (assoc-ref inputs "nginx-sources")))
(begin (invoke (string-append tar "/bin/tar") "xvf" nginx-srcs "--strip-components=1")
;; The nginx source code is part of the module’s source. )
(format #t "decompressing nginx source code~%") #t )))
(let ((tar (assoc-ref inputs "tar")) (nginx-srcs (assoc-ref inputs "nginx-sources"))) (replace 'install
(invoke (string-append tar "/bin/tar") "xvf" nginx-srcs "--strip-components=1") (lambda* (#:key outputs #:allow-other-keys)
) (let ((modules-dir (string-append (assoc-ref outputs "out") "/etc/nginx/modules")))
#t (install-file "objs/ngx_http_subs_filter_module.so" modules-dir)
) #t )))
) (delete 'fix-root-dirs)
) (delete 'install-man-page)))))))
(replace 'install
(lambda* (#:key outputs #:allow-other-keys)
(let ((modules-dir (string-append (assoc-ref outputs "out") "/etc/nginx/modules")))
(install-file "objs/ngx_http_subs_filter_module.so" modules-dir)
#t
)
)
)
(delete 'fix-root-dirs)
(delete 'install-man-page)
)
)
)
)
)
)

45
glicid/packages/sssd.scm
View file

@ -1,26 +1,23 @@
(define-module (glicid packages sssd) (define-module (glicid packages sssd)
#: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 ((gnu packages sssd) #:prefix gnu:) #:use-module (gnu packages dns)
) #:use-module ((gnu packages sssd) #:prefix gnu:)
)
(define-public sssd-upstream-orig (define-public sssd
(package (package
(inherit gnu:sssd) (inherit gnu:sssd)
(name "sssd-upstream") (name "sssd")
(version "1_16_5") (version "2.8.1")
(source (source
(origin (origin
(inherit (package-source gnu:sssd)) (method url-fetch)
(method git-fetch) (uri (string-append "https://github.com/SSSD/sssd/releases/download/2.8.1/sssd-" version ".tar.gz"))
(uri (git-reference (sha256 (base32 "121i1xh89r3bv59rndnrdlra3fvzam88g15gq0acpj1n6ib3ay0s"))))
(url "https://github.com/SSSD/sssd") (inputs `( bind
(commit (string-append "sssd-" version)) ,@(package-inputs gnu:sssd)
)) ))))
(file-name (git-file-name name version))
(sha256 (base32 "0zbs04lkjbp7y92anmafl7gzamcnq1f147p13hc4byyvjk9rg6f7")) sssd
)
)
)
)

3
glicid/services/networking.scm
View file

@ -23,8 +23,7 @@
(squid-loglevel squid-loglevel (default 1)) (squid-loglevel squid-loglevel (default 1))
(squid-config-file squid-config-file (default (file-append squid "/etc/squid.conf"))) (squid-config-file squid-config-file (default (file-append squid "/etc/squid.conf")))
(pid-file squid-pid-file (default "/var/run/squid/squid.pid")) (pid-file squid-pid-file (default "/var/run/squid/squid.pid"))
(log-file squid-log-file (default "/var/log/squid/squid.log")) (log-file squid-log-file (default "/var/log/squid/squid.log")))
)
(define squid-shepherd-service (define squid-shepherd-service
(match-lambda (match-lambda