[Git][haskell-team/DHG_packages][master] Agda: Refresh patches
Ilias Tsitsimpis (@iliastsi)
gitlab at salsa.debian.org
Fri Oct 13 16:29:42 BST 2023
Ilias Tsitsimpis pushed to branch master at Debian Haskell Group / DHG_packages
Commits:
feacede9 by Ilias Tsitsimpis at 2023-10-13T18:23:04+03:00
Agda: Refresh patches
- - - - -
5 changed files:
- p/agda/debian/control
- p/agda/debian/patches/agda-mode-deps
- + p/agda/debian/patches/newer-deps
- p/agda/debian/patches/series
- p/agda/debian/patches/var-lib-agda
Changes:
=====================================
p/agda/debian/control
=====================================
@@ -17,7 +17,7 @@ Build-Depends:
libghc-stmonadtrans-dev (<< 0.5),
libghc-stmonadtrans-prof,
libghc-aeson-dev (>= 1.1.2.0),
- libghc-aeson-dev (<< 2.2),
+ libghc-aeson-dev (<< 2.3),
libghc-aeson-prof,
libghc-async-dev (>= 2.2),
libghc-async-dev (<< 2.3),
@@ -62,10 +62,10 @@ Build-Depends:
libghc-regex-tdfa-dev (<< 1.4),
libghc-regex-tdfa-prof,
libghc-split-dev (>= 0.2.0.0),
- libghc-split-dev (<< 0.2.4),
+ libghc-split-dev (<< 0.3),
libghc-split-prof,
libghc-strict-dev (>= 0.4.0.1),
- libghc-strict-dev (<< 0.5),
+ libghc-strict-dev (<< 0.6),
libghc-strict-prof,
libghc-time-compat-dev (>= 1.9.2),
libghc-time-compat-dev (<< 1.10),
=====================================
p/agda/debian/patches/agda-mode-deps
=====================================
@@ -7,10 +7,12 @@ Author: Marcel Fourné <debian at marcelfourne.de>
Bug-Debian: https://bugs.debian.org/1017415
Last-Update: 2022-12-06
---- agda-2.6.2.2.orig/src/data/emacs-mode/agda2-mode-pkg.el
-+++ agda-2.6.2.2/src/data/emacs-mode/agda2-mode-pkg.el
+Index: b/src/data/emacs-mode/agda2-mode-pkg.el
+===================================================================
+--- a/src/data/emacs-mode/agda2-mode-pkg.el
++++ b/src/data/emacs-mode/agda2-mode-pkg.el
@@ -1,3 +1,3 @@
- (define-package "agda2-mode" "2.6.2.2"
+ (define-package "agda2-mode" "2.6.3"
"interactive development for Agda, a dependently typed functional programming language"
- '((emacs "24.3") (annotation "1.0") (eri "1.0")))
+ '((emacs "24.3")))
=====================================
p/agda/debian/patches/newer-deps
=====================================
@@ -0,0 +1,108 @@
+Index: b/Agda.cabal
+===================================================================
+--- a/Agda.cabal
++++ b/Agda.cabal
+@@ -1,5 +1,6 @@
+ name: Agda
+ version: 2.6.3
++x-revision: 5
+ cabal-version: 1.24
+ build-type: Custom
+ license: OtherLicense
+@@ -34,15 +35,18 @@ description:
+ policy, because it is not intended to be used by third-party
+ packages.
+
+-tested-with: GHC == 8.0.2
+- GHC == 8.2.2
+- GHC == 8.4.4
+- GHC == 8.6.5
+- GHC == 8.8.4
+- GHC == 8.10.7
+- GHC == 9.0.2
+- GHC == 9.2.5
+- GHC == 9.4.4
++tested-with:
++ GHC == 9.8.1
++ GHC == 9.6.3
++ GHC == 9.4.7
++ GHC == 9.2.8
++ GHC == 9.0.2
++ GHC == 8.10.7
++ GHC == 8.8.4
++ GHC == 8.6.5
++ GHC == 8.4.4
++ GHC == 8.2.2
++ GHC == 8.0.2
+
+ extra-source-files: CHANGELOG.md
+ README.md
+@@ -171,8 +175,8 @@ flag optimise-heavily
+ Enable some expensive optimisations when compiling Agda.
+
+ custom-setup
+- setup-depends: base >= 4.9.0.0 && < 4.18
+- , Cabal >= 1.24.0.0 && < 3.9
++ setup-depends: base >= 4.9.0.0 && < 4.20
++ , Cabal >= 1.24.0.0 && < 3.12
+ , directory >= 1.2.6.2 && < 1.4
+ , filepath >= 1.4.1.0 && < 1.5
+ , process >= 1.4.2.0 && < 1.7
+@@ -195,7 +199,7 @@ library
+ build-depends: text-icu >= 0.7.1.0
+
+ if os(windows)
+- build-depends: Win32 >= 2.3.1.1 && < 2.13
++ build-depends: Win32 >= 2.3.1.1 && < 2.14
+
+ -- Agda cannot be built with GHC 8.6.1 due to a compiler bug, see
+ -- Agda Issue #3344.
+@@ -207,19 +211,19 @@ library
+ if os(windows) && impl(ghc == 8.6.3)
+ buildable: False
+
+- build-depends: aeson >= 1.1.2.0 && < 2.2
++ build-depends: aeson >= 1.1.2.0 && < 2.3
+ , array >= 0.5.1.1 && < 0.6
+ , async >= 2.2 && < 2.3
+- , base >= 4.9.0.0 && < 4.18
++ , base >= 4.9.0.0 && < 4.20
+ , binary >= 0.8.3.0 && < 0.9
+ , blaze-html >= 0.8 && < 0.10
+ , boxes >= 0.1.3 && < 0.2
+- , bytestring >= 0.10.8.1 && < 0.12
++ , bytestring >= 0.10.8.1 && < 0.13
+ , case-insensitive >= 1.2.0.4 && < 1.3
+ -- containers-0.5.11.0 is the first to contain IntSet.intersection
+- , containers >= 0.5.11.0 && < 0.7
++ , containers >= 0.5.11.0 && < 0.8
+ , data-hash >= 0.2.0.0 && < 0.3
+- , deepseq >= 1.4.2.0 && < 1.5
++ , deepseq >= 1.4.2.0 && < 1.6
+ , directory >= 1.2.6.2 && < 1.4
+ , dlist >= 0.8 && < 1.1
+ , edit-distance >= 0.2.1.2 && < 0.3
+@@ -243,11 +247,11 @@ library
+ , pretty >= 1.1.3.3 && < 1.2
+ , process >= 1.4.2.0 && < 1.7
+ , regex-tdfa >= 1.3.1.0 && < 1.4
+- , split >= 0.2.0.0 && < 0.2.4
++ , split >= 0.2.0.0 && < 0.3
+ , stm >= 2.4.4 && < 2.6
+ , STMonadTrans >= 0.4.3 && < 0.5
+- , strict >= 0.4.0.1 && < 0.5
+- , text >= 1.2.3.0 && < 2.1
++ , strict >= 0.4.0.1 && < 0.6
++ , text >= 1.2.3.0 && < 2.2
+ , time >= 1.6.0.1 && < 1.13
+ , time-compat >= 1.9.2 && < 1.10
+ -- time-compat adds needed functionality missing in time < 1.9
+@@ -830,7 +834,7 @@ executable agda-mode
+ hs-source-dirs: src/agda-mode
+ main-is: Main.hs
+ other-modules: Paths_Agda
+- build-depends: base >= 4.9.0.0 && < 4.18
++ build-depends: base >= 4.9.0.0 && < 4.20
+ , directory >= 1.2.6.2 && < 1.4
+ , filepath >= 1.4.1.0 && < 1.5
+ , process >= 1.4.2.0 && < 1.7
=====================================
p/agda/debian/patches/series
=====================================
@@ -1,2 +1,3 @@
var-lib-agda
agda-mode-deps
+newer-deps
=====================================
p/agda/debian/patches/var-lib-agda
=====================================
@@ -4,15 +4,16 @@ Index: b/src/full/Agda/Interaction/Library.hs
===================================================================
--- a/src/full/Agda/Interaction/Library.hs
+++ b/src/full/Agda/Interaction/Library.hs
-@@ -300,16 +300,22 @@ getInstalledLibraries
+@@ -308,7 +308,7 @@ getInstalledLibraries
-> LibM [AgdaLibFile] -- ^ Content of library files. (Might have empty @LibName at s.)
getInstalledLibraries overrideLibFile = mkLibM [] $ do
filem <- liftIO $ runExceptT $ getLibrariesFile overrideLibFile
- case filem of
+ userlibs <- case filem of
- Left err -> raiseErrors' [OtherError err] >> return []
- Right file -> do
- if not (lfExists file) then return [] else do
+ Left theOverrideLibFile -> do
+ raiseErrors' [ LibrariesFileNotFound theOverrideLibFile ]
+ return []
+@@ -317,9 +317,15 @@ getInstalledLibraries overrideLibFile =
ls <- liftIO $ stripCommentLines <$> UTF8.readFile (lfPath file)
files <- liftIO $ sequence [ (i, ) <$> expandEnvironmentVariables s | (i, s) <- ls ]
parseLibFiles (Just file) $ nubOn snd files
@@ -21,7 +22,7 @@ Index: b/src/full/Agda/Interaction/Library.hs
+ parseLibFiles Nothing $ zip [1..] $ map (systemLibDir </>) files
+ return $ userlibs ++ systemlibs
`catchIO` \ e -> do
- raiseErrors' [ OtherError $ unlines ["Failed to read installed libraries.", show e] ]
+ raiseErrors' [ ReadError e "Failed to read installed libraries." ]
return []
+ where systemLibDir = "/var/lib/agda"
+ isLibFile fn = takeExtension fn == ".agda-lib" && not ("." `List.isPrefixOf` fn)
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/commit/feacede9600792b6259218b339c221eaa4d15035
--
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/commit/feacede9600792b6259218b339c221eaa4d15035
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-haskell-commits/attachments/20231013/2f4f50b4/attachment-0001.htm>
More information about the Pkg-haskell-commits
mailing list