Skip to content

Commit 0a2176d

Browse files
committed
guix: Reindent existing manifest.scm
1 parent c090a3e commit 0a2176d

File tree

1 file changed

+42
-42
lines changed

1 file changed

+42
-42
lines changed

contrib/guix/manifest.scm

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -52,28 +52,28 @@ we link against libssp.so, and thus will ensure that this works properly.
5252
Taken from:
5353
http://www.linuxfromscratch.org/hlfs/view/development/chapter05/gcc-pass1.html"
5454
(package
55-
(inherit xgcc)
56-
(arguments
57-
(substitute-keyword-arguments (package-arguments xgcc)
58-
((#:make-flags flags)
59-
`(cons "gcc_cv_libc_provides_ssp=yes" ,flags))))))
55+
(inherit xgcc)
56+
(arguments
57+
(substitute-keyword-arguments (package-arguments xgcc)
58+
((#:make-flags flags)
59+
`(cons "gcc_cv_libc_provides_ssp=yes" ,flags))))))
6060

6161
(define (make-gcc-rpath-link xgcc)
6262
"Given a XGCC package, return a modified package that replace each instance of
6363
-rpath in the default system spec that's inserted by Guix with -rpath-link"
6464
(package
65-
(inherit xgcc)
66-
(arguments
67-
(substitute-keyword-arguments (package-arguments xgcc)
68-
((#:phases phases)
69-
`(modify-phases ,phases
70-
(add-after 'pre-configure 'replace-rpath-with-rpath-link
71-
(lambda _
72-
(substitute* (cons "gcc/config/rs6000/sysv4.h"
73-
(find-files "gcc/config"
74-
"^gnu-user.*\\.h$"))
75-
(("-rpath=") "-rpath-link="))
76-
#t))))))))
65+
(inherit xgcc)
66+
(arguments
67+
(substitute-keyword-arguments (package-arguments xgcc)
68+
((#:phases phases)
69+
`(modify-phases ,phases
70+
(add-after 'pre-configure 'replace-rpath-with-rpath-link
71+
(lambda _
72+
(substitute* (cons "gcc/config/rs6000/sysv4.h"
73+
(find-files "gcc/config"
74+
"^gnu-user.*\\.h$"))
75+
(("-rpath=") "-rpath-link="))
76+
#t))))))))
7777

7878
(define (make-cross-toolchain target
7979
base-gcc-for-libc
@@ -127,18 +127,18 @@ chain for " target " development."))
127127
(license (package-license xgcc)))))
128128

129129
(define* (make-bitcoin-cross-toolchain target
130-
#:key
131-
(base-gcc-for-libc gcc-7)
132-
(base-kernel-headers linux-libre-headers-5.4)
133-
(base-libc glibc) ; glibc 2.31
134-
(base-gcc (make-gcc-rpath-link gcc-8)))
130+
#:key
131+
(base-gcc-for-libc gcc-7)
132+
(base-kernel-headers linux-libre-headers-5.4)
133+
(base-libc glibc) ; glibc 2.31
134+
(base-gcc (make-gcc-rpath-link gcc-8)))
135135
"Convenience wrapper around MAKE-CROSS-TOOLCHAIN with default values
136136
desirable for building Bitcoin Core release binaries."
137137
(make-cross-toolchain target
138-
base-gcc-for-libc
139-
base-kernel-headers
140-
base-libc
141-
base-gcc))
138+
base-gcc-for-libc
139+
base-kernel-headers
140+
base-libc
141+
base-gcc))
142142

143143
(define (make-gcc-with-pthreads gcc)
144144
(package-with-extra-configure-variable gcc "--enable-threads" "posix"))
@@ -177,22 +177,22 @@ chain for " target " development."))
177177

178178
(define-public font-tuffy
179179
(package
180-
(name "font-tuffy")
181-
(version "20120614")
182-
(source
183-
(origin
184-
(method url-fetch)
185-
(uri (string-append "http://tulrich.com/fonts/tuffy-" version ".tar.gz"))
186-
(file-name (string-append name "-" version ".tar.gz"))
187-
(sha256
188-
(base32
189-
"02vf72bgrp30vrbfhxjw82s115z27dwfgnmmzfb0n9wfhxxfpyf6"))))
190-
(build-system font-build-system)
191-
(home-page "http://tulrich.com/fonts/")
192-
(synopsis "The Tuffy Truetype Font Family")
193-
(description
194-
"Thatcher Ulrich's first outline font design. He started with the goal of producing a neutral, readable sans-serif text font. There are lots of \"expressive\" fonts out there, but he wanted to start with something very plain and clean, something he might want to actually use. ")
195-
(license license:public-domain)))
180+
(name "font-tuffy")
181+
(version "20120614")
182+
(source
183+
(origin
184+
(method url-fetch)
185+
(uri (string-append "http://tulrich.com/fonts/tuffy-" version ".tar.gz"))
186+
(file-name (string-append name "-" version ".tar.gz"))
187+
(sha256
188+
(base32
189+
"02vf72bgrp30vrbfhxjw82s115z27dwfgnmmzfb0n9wfhxxfpyf6"))))
190+
(build-system font-build-system)
191+
(home-page "http://tulrich.com/fonts/")
192+
(synopsis "The Tuffy Truetype Font Family")
193+
(description
194+
"Thatcher Ulrich's first outline font design. He started with the goal of producing a neutral, readable sans-serif text font. There are lots of \"expressive\" fonts out there, but he wanted to start with something very plain and clean, something he might want to actually use. ")
195+
(license license:public-domain)))
196196

197197
(define-public lief
198198
(package

0 commit comments

Comments
 (0)