ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-11 21:59:08 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove weirdnesses caused by 'letrec*' behavior of record field initializers.

Browse source 
* 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 2013-10-15 23:42:58 +02:00
parent 59fbeb8cae
commit dfb52abbd6
4 changed files with 39 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
gnu/packages/bootstrap.scm
View file

@ -70,14 +70,13 @@ (define (boot fetch)
(boot url-fetch)) (boot url-fetch))
(else orig-method)))))) (else orig-method))))))
(define (package-from-tarball name* source* program-to-test description*) (define (package-from-tarball name source program-to-test description)
"Return a package that correspond to the extraction of SOURCE*. "Return a package that correspond to the extraction of SOURCE.
PROGRAM-TO-TEST is a program to run after extraction of SOURCE*, to PROGRAM-TO-TEST is a program to run after extraction of SOURCE, to
check whether everything is alright." check whether everything is alright."
(package (package
(name name*) (name name)
(version "0") (version "0")
(source #f)
(build-system trivial-build-system) (build-system trivial-build-system)
(arguments (arguments
`(#:guile ,%bootstrap-guile `(#:guile ,%bootstrap-guile
@ -101,8 +100,9 @@ (define (package-from-tarball name* source* program-to-test description*)
(inputs (inputs
`(("tar" ,(search-bootstrap-binary "tar" (%current-system))) `(("tar" ,(search-bootstrap-binary "tar" (%current-system)))
("xz" ,(search-bootstrap-binary "xz" (%current-system))) ("xz" ,(search-bootstrap-binary "xz" (%current-system)))
("tarball" ,(bootstrap-origin (source* (%current-system)))))) ("tarball" ,(bootstrap-origin (source (%current-system))))))
(synopsis description*) (source #f)
(synopsis description)
(description #f) (description #f)
(home-page #f) (home-page #f)
(license #f))) (license #f)))

41
gnu/packages/linux-initrd.scm
View file

@ -212,28 +212,27 @@ (define print0
(and (zero? (system* gzip "--best" "initrd")) (and (zero? (system* gzip "--best" "initrd"))
(rename-file "initrd.gz" "initrd"))))))))) (rename-file "initrd.gz" "initrd")))))))))
(let ((name* name)) (package
(package (name name)
(name name*) (version "0")
(version "0") (source #f)
(source #f) (build-system trivial-build-system)
(build-system trivial-build-system) (arguments `(#:modules ((guix build utils))
(arguments `(#:modules ((guix build utils)) #:builder ,builder))
#:builder ,builder)) (inputs `(("guile" ,guile)
(inputs `(("guile" ,guile) ("cpio" ,cpio)
("cpio" ,cpio) ("gzip" ,gzip)
("gzip" ,gzip) ("modules" ,(module-package modules))
("modules" ,(module-package modules)) ("modules/compiled" ,(compiled-module-package modules))
("modules/compiled" ,(compiled-module-package modules)) ,@(if linux
,@(if linux `(("linux" ,linux))
`(("linux" ,linux)) '())))
'()))) (synopsis "An initial RAM disk (initrd) for the Linux kernel")
(synopsis "An initial RAM disk (initrd) for the Linux kernel") (description
(description "An initial RAM disk (initrd), really a gzipped cpio archive, for use by
"An initial RAM disk (initrd), really a gzipped cpio archive, for use by
the Linux kernel.") the Linux kernel.")
(license gpl3+) (license gpl3+)
(home-page "http://www.gnu.org/software/guix/")))) (home-page "http://www.gnu.org/software/guix/")))
(define-public qemu-initrd (define-public qemu-initrd
(expression->initrd (expression->initrd

10
gnu/packages/linux.scm
View file

@ -65,7 +65,7 @@ (define (linux-libre-urls version)
version "-gnu.tar.xz"))) version "-gnu.tar.xz")))
(define-public linux-libre-headers (define-public linux-libre-headers
(let* ((version* "3.3.8") (let* ((version "3.3.8")
(build-phase (build-phase
(lambda (arch) (lambda (arch)
`(lambda _ `(lambda _
@ -85,10 +85,10 @@ (define-public linux-libre-headers
(string-append out (string-append out
"/include/config/kernel.release") "/include/config/kernel.release")
(lambda (p) (lambda (p)
(format p "~a-default~%" ,version*)))))))) (format p "~a-default~%" ,version))))))))
(package (package
(name "linux-libre-headers") (name "linux-libre-headers")
(version version*) (version version)
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (linux-libre-urls version)) (uri (linux-libre-urls version))
@ -145,7 +145,7 @@ (define-public module-init-tools
(license gpl2+))) (license gpl2+)))
(define-public linux-libre (define-public linux-libre
(let* ((version* "3.11") (let* ((version "3.11")
(build-phase (build-phase
'(lambda* (#:key system #:allow-other-keys #:rest args) '(lambda* (#:key system #:allow-other-keys #:rest args)
(let ((arch (car (string-split system #\-)))) (let ((arch (car (string-split system #\-))))
@ -185,7 +185,7 @@ (define-public linux-libre
"modules_install")))))) "modules_install"))))))
(package (package
(name "linux-libre") (name "linux-libre")
(version version*) (version version)
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (linux-libre-urls version)) (uri (linux-libre-urls version))

14
gnu/packages/make-bootstrap.scm
View file

@ -451,15 +451,15 @@ (define %guile-static
;; A statically-linked Guile that is relocatable--i.e., it can search ;; A statically-linked Guile that is relocatable--i.e., it can search
;; .scm and .go files relative to its installation directory, rather ;; .scm and .go files relative to its installation directory, rather
;; than in hard-coded configure-time paths. ;; than in hard-coded configure-time paths.
(let* ((patches* (cons* (search-patch "guile-relocatable.patch") (let* ((patches (cons* (search-patch "guile-relocatable.patch")
(search-patch "guile-default-utf8.patch") (search-patch "guile-default-utf8.patch")
(search-patch "guile-linux-syscalls.patch") (search-patch "guile-linux-syscalls.patch")
(origin-patches (package-source guile-2.0)))) (origin-patches (package-source guile-2.0))))
(source* (origin (inherit (package-source guile-2.0)) (source (origin (inherit (package-source guile-2.0))
(patches patches*))) (patches patches)))
(guile (package (inherit guile-2.0) (guile (package (inherit guile-2.0)
(name (string-append (package-name guile-2.0) "-static")) (name (string-append (package-name guile-2.0) "-static"))
(source source*) (source source)
(synopsis "Statically-linked and relocatable Guile") (synopsis "Statically-linked and relocatable Guile")
(propagated-inputs (propagated-inputs
`(("bdw-gc" ,libgc) `(("bdw-gc" ,libgc)