aboutsummaryrefslogtreecommitdiff
path: root/gnu/services/virtualization.scm
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2024-06-03 22:01:22 +0200
committerMaxim Cournoyer <maxim.cournoyer@gmail.com>2024-06-24 08:51:41 -0400
commite6facbe069ba536a6bb9dffc582a78f982596be6 (patch)
treefe50d17f9fd9ec810202f00bf443d8c5896f6d38 /gnu/services/virtualization.scm
parentd37614bed19891d322a305d02be61da8aacc0492 (diff)
downloadguix-e6facbe069ba536a6bb9dffc582a78f982596be6.tar.gz
guix-e6facbe069ba536a6bb9dffc582a78f982596be6.zip
gnu: grub: Update to 2.12.
* gnu/packages/bootloaders.scm (grub): Update to 2.12. [source](patches): Remove ‘grub-ignore-metadata-csum-seed.patch’. (snippet): Create ‘grub-core/extra_deps.lst’. Replace “exit 99” by “exit 77”. (grub-coreboot): Update value of ‘XFAIL_TESTS’. * doc/guix.texi (Keyboard Layout and Networking and Partitioning): Update accordingly (it should now be fine to use LUKS2). * gnu/packages/patches/grub-ignore-metadata-csum-seed.patch: Remove. * gnu/local.mk (dist_patch_DATA): Remove it. Change-Id: Ia31b3b7e0a2e7de42d30229733e9c196fcd12fd9 Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com> Modified-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Diffstat (limited to 'gnu/services/virtualization.scm')
0 files changed, 0 insertions, 0 deletions
-depends: foo, bar library build-depends: bar, baz ") (test-begin "hackage") (define-syntax-rule (define-package-matcher name pattern) (define* (name obj) (match obj (pattern #t) (x (pk 'fail x #f))))) (define-package-matcher match-ghc-foo ('package ('name "ghc-foo") ('version "1.0.0") ('source ('origin ('method 'url-fetch) ('uri ('hackage-uri "foo" 'version)) ('sha256 ('base32 (? string? hash))))) ('build-system 'haskell-build-system) ('properties '(quote ((upstream-name . "foo")))) ('inputs ('list 'ghc-http)) ('home-page "http://test.org") ('synopsis (? string?)) ('description (? string?)) ('license 'license:bsd-3))) (define* (eval-test-with-cabal test-cabal matcher #:key (cabal-environment '())) (define port (open-input-string test-cabal)) (matcher (hackage->guix-package "foo" #:port port #:cabal-environment cabal-environment))) (test-assert "hackage->guix-package test 1" (eval-test-with-cabal test-cabal-1 match-ghc-foo)) (test-assert "hackage->guix-package test 2" (eval-test-with-cabal test-cabal-2 match-ghc-foo)) (test-assert "hackage->guix-package test 3" (eval-test-with-cabal test-cabal-3 match-ghc-foo #:cabal-environment '(("impl" . "ghc-7.8")))) (test-assert "hackage->guix-package test 4" (eval-test-with-cabal test-cabal-4 match-ghc-foo #:cabal-environment '(("impl" . "ghc-7.8")))) (test-assert "hackage->guix-package test 5" (eval-test-with-cabal test-cabal-5 match-ghc-foo #:cabal-environment '(("impl" . "ghc-7.8")))) (define-package-matcher match-ghc-foo-6 ('package ('name "ghc-foo") ('version "1.0.0") ('source ('origin ('method 'url-fetch) ('uri ('hackage-uri "foo" 'version)) ('sha256 ('base32 (? string? hash))))) ('build-system 'haskell-build-system) ('properties '(quote ((upstream-name . "foo")))) ('inputs ('list 'ghc-b 'ghc-http)) ('native-inputs ('list 'ghc-haskell-gi)) ('home-page "http://test.org") ('synopsis (? string?)) ('description (? string?)) ('license 'license:bsd-3))) (test-assert "hackage->guix-package test 6" (eval-test-with-cabal test-cabal-6 match-ghc-foo-6)) ;; Check multi-line layouted description. (define test-cabal-multiline-layout "name: foo version: 1.0.0 homepage: http://test.org synopsis: synopsis description: first line second line license: BSD3 executable cabal build-depends: HTTP >= 4000.2.5 && < 4000.3, mtl >= 2.0 && < 3 ") (test-assert "hackage->guix-package test multiline desc (layout)" (eval-test-with-cabal test-cabal-multiline-layout match-ghc-foo)) ;; Check multi-line braced description. (define test-cabal-multiline-braced "name: foo version: 1.0.0 homepage: http://test.org synopsis: synopsis description: { first line second line } license: BSD3 executable cabal build-depends: HTTP >= 4000.2.5 && < 4000.3, mtl >= 2.0 && < 3 ") (test-assert "hackage->guix-package test multiline desc (braced)" (eval-test-with-cabal test-cabal-multiline-braced match-ghc-foo)) ;; Check mixed layout. Compare e.g. warp. (define test-cabal-mixed-layout "name: foo version: 1.0.0 homepage: http://test.org synopsis: synopsis description: description license: BSD3 executable cabal build-depends: HTTP >= 4000.2.5 && < 4000.3, mtl >= 2.0 && < 3 ghc-options: -Wall ") (test-assert "hackage->guix-package test mixed layout" (eval-test-with-cabal test-cabal-mixed-layout match-ghc-foo)) ;; Check flag executable. Compare e.g. darcs. (define test-cabal-flag-executable "name: foo version: 1.0.0 homepage: http://test.org synopsis: synopsis description: description license: BSD3 flag executable description: Build executable default: True executable cabal if !flag(executable) buildable: False else buildable: True build-depends: HTTP >= 4000.2.5 && < 4000.3, mtl >= 2.0 && < 3 ") (test-assert "hackage->guix-package test flag executable" (eval-test-with-cabal test-cabal-flag-executable match-ghc-foo)) ;; There is no mandatory space between property name and value. (define test-cabal-property-no-space "name:foo version:1.0.0 homepage:http://test.org synopsis:synopsis description:description license:BSD3 common bench-defaults ghc-options:-Wall executable cabal build-depends: HTTP >= 4000.2.5 && < 4000.3, mtl >= 2.0 && < 3 ") (test-assert "hackage->guix-package test properties without space" (eval-test-with-cabal test-cabal-property-no-space match-ghc-foo)) ;; There may be no final newline terminating a property. (define test-cabal-no-final-newline "name: foo version: 1.0.0 homepage: http://test.org synopsis: synopsis description: description license: BSD3 executable cabal build-depends: HTTP >= 4000.2.5 && < 4000.3, mtl >= 2.0 && < 3") (test-expect-fail 1) (test-assert "hackage->guix-package test without final newline" (eval-test-with-cabal test-cabal-no-final-newline match-ghc-foo)) ;; Make sure internal libraries will not be part of the dependencies, ;; ignore case. (define test-cabal-internal-library-ignored "name: foo version: 1.0.0 homepage: http://test.org synopsis: synopsis description: description license: BSD3 executable cabal build-depends: HTTP >= 4000.2.5 && < 4000.3, internAl library internaL build-depends: mtl >= 2.0 && < 3 ") (test-assert "hackage->guix-package test internal libraries are ignored" (eval-test-with-cabal test-cabal-internal-library-ignored match-ghc-foo)) ;; Check if-elif-else statements (define test-cabal-if "name: foo version: 1.0.0 homepage: http://test.org synopsis: synopsis description: description license: BSD3 library if os(first) Build-depends: ghc-c ") (define test-cabal-else "name: foo version: 1.0.0 homepage: http://test.org synopsis: synopsis description: description license: BSD3 library if os(first) Build-depends: ghc-a else Build-depends: ghc-c ") (define test-cabal-elif "name: foo version: 1.0.0 homepage: http://test.org synopsis: synopsis description: description license: BSD3 library if os(first) Build-depends: ghc-a elif os(second) Build-depends: ghc-b elif os(guix) Build-depends: ghc-c elif os(third) Build-depends: ghc-d else Build-depends: ghc-e ") ;; Try the same with different bracket styles (define test-cabal-elif-brackets "name: foo version: 1.0.0 homepage: http://test.org synopsis: synopsis description: description license: BSD3 library if os(first) { Build-depends: ghc-a } elif os(second) Build-depends: ghc-b elif os(guix) { Build-depends: ghc-c } elif os(third) { Build-depends: ghc-d } elif os(fourth) { Build-depends: ghc-d } else Build-depends: ghc-e ") (define-package-matcher match-ghc-elif ('package ('name "ghc-foo") ('version "1.0.0") ('source ('origin ('method 'url-fetch) ('uri ('hackage-uri "foo" 'version)) ('sha256 ('base32 (? string? hash))))) ('build-system 'haskell-build-system) ('properties '(quote ((upstream-name . "foo")))) ('inputs ('list 'ghc-c)) ('home-page "http://test.org") ('synopsis (? string?)) ('description (? string?)) ('license 'license:bsd-3))) (test-assert "hackage->guix-package test lonely if statement" (eval-test-with-cabal test-cabal-else match-ghc-elif #:cabal-environment '(("os" . "guix")))) (test-assert "hackage->guix-package test else statement" (eval-test-with-cabal test-cabal-else match-ghc-elif #:cabal-environment '(("os" . "guix")))) (test-assert "hackage->guix-package test elif statement" (eval-test-with-cabal test-cabal-elif match-ghc-elif #:cabal-environment '(("os" . "guix")))) (test-assert "hackage->guix-package test elif statement with brackets" (eval-test-with-cabal test-cabal-elif-brackets match-ghc-elif #:cabal-environment '(("os" . "guix")))) ;; Check Hackage Cabal revisions. (define test-cabal-revision "name: foo version: 1.0.0 x-revision: 2 homepage: http://test.org synopsis: synopsis description: description license: BSD3 executable cabal build-depends: HTTP >= 4000.2.5 && < 4000.3, mtl >= 2.0 && < 3 ") (define-package-matcher match-ghc-foo-revision ('package ('name "ghc-foo") ('version "1.0.0") ('source ('origin ('method 'url-fetch) ('uri ('hackage-uri "foo" 'version)) ('sha256 ('base32 (? string? hash))))) ('build-system 'haskell-build-system) ('properties '(quote ((upstream-name . "foo")))) ('inputs ('list 'ghc-http)) ('arguments ('quasiquote ('#:cabal-revision ("2" "0xxd88fb659f0krljidbvvmkh9ppjnx83j0nqzx8whcg4n5qbyng")))) ('home-page "http://test.org") ('synopsis (? string?)) ('description (? string?)) ('license 'license:bsd-3))) (test-assert "hackage->guix-package test cabal revision" (eval-test-with-cabal test-cabal-revision match-ghc-foo-revision)) (test-assert "read-cabal test 1" (match (call-with-input-string test-read-cabal-1 read-cabal) ((("name" ("test-me")) ('section 'library #f (('if ('flag "base4point8") (("build-depends" ("base >= 4.8 && < 5"))) (('if ('flag "base4") (("build-depends" ("base >= 4 && < 4.8"))) (('if ('flag "base3") (("build-depends" ("base >= 3 && < 4"))) (("build-depends" ("base < 3")))))))) ('if ('or ('flag "base4point8") ('and ('flag "base4") ('flag "base3"))) (("build-depends" ("random"))) ()) ("build-depends" ("containers")) ("exposed-modules" ("Test.QuickCheck.Exception"))))) #t) (x (pk 'fail x #f)))) (test-assert "read-cabal test: if brackets on the same line" (match (call-with-input-string test-read-cabal-2 read-cabal) ((("name" ("test-me")) ('section 'common "defaults" (('if ('os "foobar") (("cc-options" ("-DBARBAZ "))) ())))) #t) (x (pk 'fail x #f)))) (test-expect-fail 1) (test-assert "read-cabal test: property brackets on new line" (match (call-with-input-string test-read-cabal-brackets-newline read-cabal) ((("name" ("test-me")) ('section 'common "defaults" (("build-depends" ("foobar , barbaz"))))) #t) (x (pk 'fail x #f)))) (test-assert "read-cabal test: library name" (match (call-with-input-string test-read-cabal-library-name read-cabal) ((("name" ("test-me")) ('section 'library "foobar" (("build-depends" ("foo, bar")))) ('section 'library #f (("build-depends" ("bar, baz"))))) #t) (x (pk 'fail x #f)))) (define test-cabal-import "name: foo version: 1.0.0 homepage: http://test.org synopsis: synopsis description: description license: BSD3 common commons build-depends: HTTP >= 4000.2.5 && < 4000.3, mtl >= 2.0 && < 3 executable cabal import: commons ") (define-package-matcher match-ghc-foo-import ('package ('name "ghc-foo") ('version "1.0.0") ('source ('origin ('method 'url-fetch) ('uri ('hackage-uri "foo" 'version)) ('sha256 ('base32 (? string? hash))))) ('build-system 'haskell-build-system) ('properties '(quote ((upstream-name . "foo")))) ('inputs ('list 'ghc-http)) ('home-page "http://test.org") ('synopsis (? string?)) ('description (? string?)) ('license 'license:bsd-3))) (test-assert "hackage->guix-package test cabal import" (eval-test-with-cabal test-cabal-import match-ghc-foo-import)) (define test-cabal-multiple-imports "name: foo version: 1.0.0 homepage: http://test.org synopsis: synopsis description: description license: BSD3 common commons build-depends: HTTP >= 4000.2.5 && < 4000.3, mtl >= 2.0 && < 3 common others build-depends: base == 4.16.*, stm-chans == 3.0.* executable cabal import: commons , others ") (define-package-matcher match-ghc-foo-multiple-imports ('package ('name "ghc-foo") ('version "1.0.0") ('source ('origin ('method 'url-fetch) ('uri ('hackage-uri "foo" 'version)) ('sha256 ('base32 (? string? hash))))) ('build-system 'haskell-build-system) ('properties '(quote ((upstream-name . "foo")))) ('inputs ('list 'ghc-http 'ghc-stm-chans)) ('home-page "http://test.org") ('synopsis (? string?)) ('description (? string?)) ('license 'license:bsd-3))) (test-assert "hackage->guix-package test cabal multiple imports" (eval-test-with-cabal test-cabal-multiple-imports match-ghc-foo-multiple-imports)) (test-end "hackage")