diff options
| author | Efraim Flashner <efraim@flashner.co.il> | 2021-03-24 15:28:33 +0200 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2021-03-24 20:50:44 +0200 |
| commit | 2aab587f842908a886e3bd08b028885dddd650e0 (patch) | |
| tree | 87c0723a9ae2c69ab6920d90b6e87ad8510492fe /gnu/packages/man.scm | |
| parent | 5664bcdcb0e4c10dfe48dd5e4730fc3c746a21e2 (diff) | |
| parent | 65c46e79e0495fe4d32f6f2725d7233fff10fd70 (diff) | |
| download | guix-2aab587f842908a886e3bd08b028885dddd650e0.tar.gz | |
Merge remote-tracking branch 'origin/master' into core-updates
Diffstat (limited to 'gnu/packages/man.scm')
| -rw-r--r-- | gnu/packages/man.scm | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/gnu/packages/man.scm b/gnu/packages/man.scm index 03905ba828..95382bf92d 100644 --- a/gnu/packages/man.scm +++ b/gnu/packages/man.scm @@ -31,6 +31,7 @@ #:use-module (guix packages) #:use-module (guix build-system gnu) #:use-module (guix build-system ruby) + #:use-module (guix utils) #:use-module (gnu packages dbm) #:use-module (gnu packages flex) #:use-module (gnu packages gawk) @@ -224,7 +225,7 @@ the traditional flat-text whatis databases.") (define-public man-pages (package (name "man-pages") - (version "5.10") + (version "5.11") (source (origin (method url-fetch) @@ -234,7 +235,7 @@ the traditional flat-text whatis databases.") (string-append "mirror://kernel.org/linux/docs/man-pages/Archive/" "man-pages-" version ".tar.xz"))) (sha256 - (base32 "0ql7fqs0w2nbwv1b6ffnzyjz1sysvkhq8kb77wi2z7qip8sja43m")))) + (base32 "1aiwn6yi19idg4jbf7x4x5i06macjv7r8d5fgp1rwnc4a775vniy")))) (build-system gnu-build-system) (arguments '(#:phases (modify-phases %standard-phases (delete 'configure)) @@ -304,17 +305,18 @@ automatically.") (version "1.10.1") (source (origin - (method url-fetch) - (uri (string-append "https://git.sr.ht/%7Esircmpwn/scdoc/archive/" version - ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://git.sr.ht/~sircmpwn/scdoc") + (commit version))) + (file-name (git-file-name name version)) (sha256 - (base32 - "13x7g1r56bshvfmlvapvz35ywnbgsh337kywb5kcv8nc6b3j3q40")))) + (base32 "1xmh6fnp378xmiycslg4migs1vx7yly4i1cf2vbbnwim9c9g0aw7")))) (build-system gnu-build-system) (arguments `(#:make-flags - (list "CC=gcc" (string-append "PREFIX=" (assoc-ref %outputs "out"))) + (list (string-append "CC=" ,(cc-for-target)) + (string-append "PREFIX=" (assoc-ref %outputs "out"))) #:phases (modify-phases %standard-phases (delete 'configure)))) |