[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
06/13: import: hackage: Add upstream-name property.
From: |
guix-commits |
Subject: |
06/13: import: hackage: Add upstream-name property. |
Date: |
Sat, 21 Jan 2023 06:55:19 -0500 (EST) |
lbraun pushed a commit to branch wip-haskell
in repository guix.
commit 6f0543da1afe9722acb92a49a5bfc15a55b6f9d0
Author: Lars-Dominik Braun <lars@6xq.net>
AuthorDate: Wed Jan 4 09:37:25 2023 +0100
import: hackage: Add upstream-name property.
* guix/import/hackage.scm (hackage-module->sexp): Add property
upstream-name to imported package.
* tests/hackage.scm (match-ghc-foo): Add upstream-name property.
(match-ghc-foo-6): Ditto.
(match-ghc-elif): Ditto.
(match-ghc-foo-revision): Ditto.
(match-ghc-foo-import): Ditto.
---
guix/import/hackage.scm | 1 +
tests/hackage.scm | 5 +++++
2 files changed, 6 insertions(+)
diff --git a/guix/import/hackage.scm b/guix/import/hackage.scm
index e915aac58d..9e305cf080 100644
--- a/guix/import/hackage.scm
+++ b/guix/import/hackage.scm
@@ -314,6 +314,7 @@ the hash of the Cabal file."
(bytevector->nix-base32-string (file-sha256 tarball))
"failed to download tar archive")))))
(build-system haskell-build-system)
+ (properties '((upstream-name . ,name)))
,@(maybe-inputs 'inputs dependencies)
,@(maybe-inputs 'native-inputs native-dependencies)
,@(maybe-arguments)
diff --git a/tests/hackage.scm b/tests/hackage.scm
index ad2ee4b7f9..8eea818ebd 100644
--- a/tests/hackage.scm
+++ b/tests/hackage.scm
@@ -201,6 +201,7 @@ library
('base32
(? string? hash)))))
('build-system 'haskell-build-system)
+ ('properties '(quote ((upstream-name . "foo"))))
('inputs ('list 'ghc-http))
('home-page "http://test.org")
('synopsis (? string?))
@@ -241,6 +242,7 @@ library
('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")
@@ -471,6 +473,7 @@ library
('base32
(? string? hash)))))
('build-system 'haskell-build-system)
+ ('properties '(quote ((upstream-name . "foo"))))
('inputs ('list 'ghc-c))
('home-page "http://test.org")
('synopsis (? string?))
@@ -520,6 +523,7 @@ executable cabal
('base32
(? string? hash)))))
('build-system 'haskell-build-system)
+ ('properties '(quote ((upstream-name . "foo"))))
('inputs ('list 'ghc-http))
('arguments
('quasiquote
@@ -610,6 +614,7 @@ executable cabal
('base32
(? string? hash)))))
('build-system 'haskell-build-system)
+ ('properties '(quote ((upstream-name . "foo"))))
('inputs ('list 'ghc-http))
('home-page "http://test.org")
('synopsis (? string?))
- branch wip-haskell created (now 6eb6c08706), guix-commits, 2023/01/21
- 03/13: build: haskell-build-system: Support multiple libraries., guix-commits, 2023/01/21
- 04/13: gnu: Switch default to GHC 9.2., guix-commits, 2023/01/21
- 06/13: import: hackage: Add upstream-name property.,
guix-commits <=
- 08/13: import: hackage: Use upstream-name property., guix-commits, 2023/01/21
- 10/13: import: haskell: Add new internal library for GHC 9.2., guix-commits, 2023/01/21
- 01/13: import: hackage: Allow version at the beginning of cabal file., guix-commits, 2023/01/21
- 12/13: build: haskell-build-system: Remove unused linker flags., guix-commits, 2023/01/21
- 02/13: build: haskell-build-system: Remove trailing #t., guix-commits, 2023/01/21
- 05/13: import: stackage: Update to release 20.5., guix-commits, 2023/01/21
- 07/13: gnu: Add upstream-name property to Haskell packages., guix-commits, 2023/01/21
- 09/13: gnu: Use HACKAGE-URI for packages from Hackage., guix-commits, 2023/01/21
- 13/13: Upgrade Haskell packages., guix-commits, 2023/01/21
- 11/13: build: haskell-build-system: Process all transitive dependencies., guix-commits, 2023/01/21