Remove weirdnesses caused by 'letrec*' behavior of record field initializers.
* gnu/packages/bootstrap.scm (package-from-tarball): Remove '*' from parameter names. Adjust accordingly. * gnu/packages/linux-initrd.scm (expression->initrd): Use 'name' directly, removing the 'name*' alias. * gnu/packages/linux.scm (linux-libre-headers, linux-libre): Rename 'version*' to 'version'.
This commit is contained in:
Ludovic Courtès
parent
59fbeb8cae
commit
dfb52abbd6
|
|
@ -70,14 +70,13 @@
|
|||
(boot url-fetch))
|
||||
(else orig-method))))))
|
||||
|
||||
(define (package-from-tarball name* source* program-to-test description*)
|
||||
"Return a package that correspond to the extraction of SOURCE*.
|
||||
PROGRAM-TO-TEST is a program to run after extraction of SOURCE*, to
|
||||
(define (package-from-tarball name source program-to-test description)
|
||||
"Return a package that correspond to the extraction of SOURCE.
|
||||
PROGRAM-TO-TEST is a program to run after extraction of SOURCE, to
|
||||
check whether everything is alright."
|
||||
(package
|
||||
(name name*)
|
||||
(name name)
|
||||
(version "0")
|
||||
(source #f)
|
||||
(build-system trivial-build-system)
|
||||
(arguments
|
||||
`(#:guile ,%bootstrap-guile
|
||||
|
|
@ -101,8 +100,9 @@ check whether everything is alright."
|
|||
(inputs
|
||||
`(("tar" ,(search-bootstrap-binary "tar" (%current-system)))
|
||||
("xz" ,(search-bootstrap-binary "xz" (%current-system)))
|
||||
("tarball" ,(bootstrap-origin (source* (%current-system))))))
|
||||
(synopsis description*)
|
||||
("tarball" ,(bootstrap-origin (source (%current-system))))))
|
||||
(source #f)
|
||||
(synopsis description)
|
||||
(description #f)
|
||||
(home-page #f)
|
||||
(license #f)))
|
||||
|
|
|
|||
|
|
@ -212,28 +212,27 @@ list of Guile module names to be embedded in the initrd."
|
|||
(and (zero? (system* gzip "--best" "initrd"))
|
||||
(rename-file "initrd.gz" "initrd")))))))))
|
||||
|
||||
(let ((name* name))
|
||||
(package
|
||||
(name name*)
|
||||
(version "0")
|
||||
(source #f)
|
||||
(build-system trivial-build-system)
|
||||
(arguments `(#:modules ((guix build utils))
|
||||
#:builder ,builder))
|
||||
(inputs `(("guile" ,guile)
|
||||
("cpio" ,cpio)
|
||||
("gzip" ,gzip)
|
||||
("modules" ,(module-package modules))
|
||||
("modules/compiled" ,(compiled-module-package modules))
|
||||
,@(if linux
|
||||
`(("linux" ,linux))
|
||||
'())))
|
||||
(synopsis "An initial RAM disk (initrd) for the Linux kernel")
|
||||
(description
|
||||
"An initial RAM disk (initrd), really a gzipped cpio archive, for use by
|
||||
(package
|
||||
(name name)
|
||||
(version "0")
|
||||
(source #f)
|
||||
(build-system trivial-build-system)
|
||||
(arguments `(#:modules ((guix build utils))
|
||||
#:builder ,builder))
|
||||
(inputs `(("guile" ,guile)
|
||||
("cpio" ,cpio)
|
||||
("gzip" ,gzip)
|
||||
("modules" ,(module-package modules))
|
||||
("modules/compiled" ,(compiled-module-package modules))
|
||||
,@(if linux
|
||||
`(("linux" ,linux))
|
||||
'())))
|
||||
(synopsis "An initial RAM disk (initrd) for the Linux kernel")
|
||||
(description
|
||||
"An initial RAM disk (initrd), really a gzipped cpio archive, for use by
|
||||
the Linux kernel.")
|
||||
(license gpl3+)
|
||||
(home-page "http://www.gnu.org/software/guix/"))))
|
||||
(license gpl3+)
|
||||
(home-page "http://www.gnu.org/software/guix/")))
|
||||
|
||||
(define-public qemu-initrd
|
||||
(expression->initrd
|
||||
|
|
|
|||
|
|
@ -65,7 +65,7 @@
|
|||
version "-gnu.tar.xz")))
|
||||
|
||||
(define-public linux-libre-headers
|
||||
(let* ((version* "3.3.8")
|
||||
(let* ((version "3.3.8")
|
||||
(build-phase
|
||||
(lambda (arch)
|
||||
`(lambda _
|
||||
|
|
@ -85,10 +85,10 @@
|
|||
(string-append out
|
||||
"/include/config/kernel.release")
|
||||
(lambda (p)
|
||||
(format p "~a-default~%" ,version*))))))))
|
||||
(format p "~a-default~%" ,version))))))))
|
||||
(package
|
||||
(name "linux-libre-headers")
|
||||
(version version*)
|
||||
(version version)
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (linux-libre-urls version))
|
||||
|
|
@ -145,7 +145,7 @@
|
|||
(license gpl2+)))
|
||||
|
||||
(define-public linux-libre
|
||||
(let* ((version* "3.11")
|
||||
(let* ((version "3.11")
|
||||
(build-phase
|
||||
'(lambda* (#:key system #:allow-other-keys #:rest args)
|
||||
(let ((arch (car (string-split system #\-))))
|
||||
|
|
@ -185,7 +185,7 @@
|
|||
"modules_install"))))))
|
||||
(package
|
||||
(name "linux-libre")
|
||||
(version version*)
|
||||
(version version)
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (linux-libre-urls version))
|
||||
|
|
|
|||
|
|
@ -451,15 +451,15 @@ for `sh' in $PATH, and without nscd, and with static NSS modules."
|
|||
;; A statically-linked Guile that is relocatable--i.e., it can search
|
||||
;; .scm and .go files relative to its installation directory, rather
|
||||
;; than in hard-coded configure-time paths.
|
||||
(let* ((patches* (cons* (search-patch "guile-relocatable.patch")
|
||||
(search-patch "guile-default-utf8.patch")
|
||||
(search-patch "guile-linux-syscalls.patch")
|
||||
(origin-patches (package-source guile-2.0))))
|
||||
(source* (origin (inherit (package-source guile-2.0))
|
||||
(patches patches*)))
|
||||
(let* ((patches (cons* (search-patch "guile-relocatable.patch")
|
||||
(search-patch "guile-default-utf8.patch")
|
||||
(search-patch "guile-linux-syscalls.patch")
|
||||
(origin-patches (package-source guile-2.0))))
|
||||
(source (origin (inherit (package-source guile-2.0))
|
||||
(patches patches)))
|
||||
(guile (package (inherit guile-2.0)
|
||||
(name (string-append (package-name guile-2.0) "-static"))
|
||||
(source source*)
|
||||
(source source)
|
||||
(synopsis "Statically-linked and relocatable Guile")
|
||||
(propagated-inputs
|
||||
`(("bdw-gc" ,libgc)
|
||||
|
|
|
|||
Loading…
Reference in New Issue