[Git][haskell-team/DHG_packages][master] agda: Refresh patches

[Ilias Tsitsimpis]

Ilias Tsitsimpis pushed to branch master at Debian Haskell Group / DHG_packages


Commits:
6b15fe68 by Ilias Tsitsimpis at 2020-07-29T17:48:11+03:00
agda: Refresh patches

- - - - -


3 changed files:

- p/agda/debian/changelog
- p/agda/debian/control
- p/agda/debian/patches/var-lib-agda


Changes:

=====================================
p/agda/debian/changelog
=====================================
@@ -1,8 +1,12 @@
 agda (2.6.1-1) unstable; urgency=medium
 
+  [ Sean Whitton ]
   * New upstream release
 
- -- Sean Whitton <spwhitton at spwhitton.name>  Tue, 26 May 2020 09:19:56 -0700
+  [ Ilias Tsitsimpis ]
+  * Refresh patches
+
+ -- Ilias Tsitsimpis <iliastsi at debian.org>  Wed, 29 Jul 2020 17:42:01 +0300
 
 agda (2.6.0.1-1) unstable; urgency=medium
 


=====================================
p/agda/debian/control
=====================================
@@ -85,8 +85,8 @@ Build-Depends-Indep: ghc-doc,
  libghc-unordered-containers-doc,
  libghc-uri-encode-doc,
  libghc-zlib-doc,
-Standards-Version: 4.4.0
-Homepage: http://wiki.portal.chalmers.se/agda/
+Standards-Version: 4.5.0
+Homepage: https://wiki.portal.chalmers.se/agda/
 Vcs-Browser: https://salsa.debian.org/haskell-team/DHG_packages/tree/master/p/agda
 Vcs-Git: https://salsa.debian.org/haskell-team/DHG_packages.git [p/agda]
 


=====================================
p/agda/debian/patches/var-lib-agda
=====================================
@@ -1,8 +1,10 @@
 See https://github.com/agda/agda/issues/2804
 
+Index: b/src/full/Agda/Interaction/Library.hs
+===================================================================
 --- a/src/full/Agda/Interaction/Library.hs
 +++ b/src/full/Agda/Interaction/Library.hs
-@@ -267,13 +267,19 @@
+@@ -280,13 +280,19 @@ getInstalledLibraries
    -> LibM [AgdaLibFile] -- ^ Content of library files.  (Might have empty @LibName at s.)
  getInstalledLibraries overrideLibFile = mkLibM [] $ do
      file <- lift $ getLibrariesFile overrideLibFile
@@ -10,7 +12,7 @@ See https://github.com/agda/agda/issues/2804
 +    userlibs <- if not (lfExists file) then return [] else do
        ls    <- lift $ stripCommentLines <$> readFile (lfPath file)
        files <- lift $ sequence [ (i, ) <$> expandEnvironmentVariables s | (i, s) <- ls ]
-       parseLibFiles (Just file) $ List.nubBy ((==) `on` snd) files
+       parseLibFiles (Just file) $ nubOn snd files
 +    systemlibs <- ifNotM (lift $ doesDirectoryExist systemLibDir) (return []) $ do
 +      files <- lift $ filter isLibFile <$> listDirectory systemLibDir
 +      parseLibFiles Nothing $ zip [1..] $ map (systemLibDir </>) files



View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/commit/6b15fe689bb5f603ae7d54c144514b6512491c12

-- 
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/commit/6b15fe689bb5f603ae7d54c144514b6512491c12
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/20200729/17910b98/attachment-0001.html>