diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2019-11-15 20:11:35 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2019-11-15 20:11:35 +0100 |
| commit | f056553c6b8ffa36f4ce9fb1c3602a8f4b1de242 (patch) | |
| tree | 80c815216a3717cf00b615c9cb8840c113eaf79f /gnu/packages/samba.scm | |
| parent | 2c9d34166983565120f831284df57a07e2edd2f9 (diff) | |
| parent | 528b52390d216d8a8cd13dfcd1e6e40a6448e6c2 (diff) | |
| download | guix-f056553c6b8ffa36f4ce9fb1c3602a8f4b1de242.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/samba.scm')
| -rw-r--r-- | gnu/packages/samba.scm | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/gnu/packages/samba.scm b/gnu/packages/samba.scm index c69345910b..a60b735414 100644 --- a/gnu/packages/samba.scm +++ b/gnu/packages/samba.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013, 2015, 2017 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2015 Mark H Weaver <mhw@netris.org> -;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2016, 2017, 2019 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016 Adonay "adfeno" Felipe Nogueira <https://libreplanet.org/wiki/User:Adfeno> <adfeno@openmailbox.org> ;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be> ;;; Copyright © 2017, 2018 Marius Bakke <mbakke@fastmail.com> @@ -27,6 +27,7 @@ (define-module (gnu packages samba) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix git-download) #:use-module (guix build-system gnu) #:use-module (guix licenses) #:use-module (guix utils) @@ -99,13 +100,14 @@ the Linux kernel CIFS client.") (name "iniparser") (version "4.1") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/ndevilla/iniparser/archive/v" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/ndevilla/iniparser") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "1bpk8dj9d5cl64lg6jsk0qlzrpg848nymwxc3fx707fk1n0al3cn")))) + "0dhab6pad6wh816lr7r3jb6z273njlgw2vpw8kcfnmi7ijaqhnr5")))) (build-system gnu-build-system) (arguments `(#:make-flags @@ -154,14 +156,14 @@ anywhere.") (define-public samba (package (name "samba") - (version "4.11.0") + (version "4.11.2") (source (origin (method url-fetch) (uri (string-append "https://download.samba.org/pub/samba/stable/" "samba-" version ".tar.gz")) (sha256 (base32 - "174fwi8n191dnb8ix9afchfp59hic6iwa3062iz3y7zzmxs1rpva")))) + "07wzn0fq90mbrfsm5qvyrzvhb9s76yvwqvw9hxazn9azryvz2yyj")))) (build-system gnu-build-system) (arguments `(#:phases |