| Message ID | 0aa369b60b785e933cab9de136cf9745dc4ea50a.1632324617.git.public@yoctocell.xyz |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [bug#50618,v2] import: stackage: Don’t try to update packages not available on Stackage. | expand |
| Context | Check | Description |
|---|---|---|
| cbaines/applying patch | fail | View Laminar job |
| cbaines/issue | success | View issue |
| cbaines/applying patch | fail | View Laminar job |
| cbaines/issue | success | View issue |
Hi, for some reason I cannot get this patch to apply. `git am` fails and also `patch -Np1` spits out an error: patching file guix/import/stackage.scm patch: **** malformed patch at line 47: @@ -141,11 +145,23 @@ Can you push it somewhere? Thanks, Lars
diff --git a/guix/import/stackage.scm b/guix/import/stackage.scm index bbd903a2cd..9b757f1986 100644 --- a/guix/import/stackage.scm +++ b/guix/import/stackage.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2017 Federico Beffa <beffa@fbengineering.ch> ;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2020 Martin Becze <mjbecze@riseup.net> +;;; Copyright © 2021 Xinglu Chem <public@yoctocell.xyz> ;;; ;;; This file is part of GNU Guix. ;;; @@ -21,10 +22,13 @@ (define-module (guix import stackage) #:use-module (ice-9 match) #:use-module (ice-9 regex) #:use-module (srfi srfi-1) #:use-module (srfi srfi-26) #:use-module (srfi srfi-34) #:use-module (srfi srfi-35) + #:use-module (srfi srfi-43) #:use-module (guix import json) #:use-module (guix import hackage) #:use-module (guix import utils) @@ -141,11 +145,23 @@ (define latest-lts-release (version version)
Previously, the ‘hackage-package?’ predicate was used which meant that the updater would try to update non-Stackage packages, and lead to messages like these: $ guix refresh -t stackage warning: failed to parse https://hackage.haskell.org/package/hurl/hurl.cabal warning: failed to parse https://hackage.haskell.org/package/idris/idris.cabal Since ‘hurl’ and ‘idris’ aren’t available on the current Stackage LTS release, they should be filtered out before the Stackage updater even tries to update them. * stackage.scm (stackage-package?): New procedure. (%stackage-updater): Use it. --- Changes since v1: * Use ‘stackage-lts-info-fetch’ to improve performance. guix/import/stackage.scm | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) (urls (list url)))))))))) +(define (stackage-package? package) + "Whether PACKAGE is available on the default Stackage LTS release." + (and (hackage-package? package) + (let ((packages (lts-info-packages + (stackage-lts-info-fetch %default-lts-version))) + (hackage-name (guix-package->hackage-name package))) + (vector-any identity + (vector-map + (lambda (_ metadata) + (string=? (cdr (list-ref metadata 2)) hackage-name)) + packages))))) + (define %stackage-updater (upstream-updater (name 'stackage) (description "Updater for Stackage LTS packages") - (pred hackage-package?) + (pred stackage-package?) (latest latest-lts-release))) ;;; stackage.scm ends here base-commit: 33bc3fb2a5f30a6e21f1b8d6d43867d921bd951c