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