[arch-commits] Commit in agda-stdlib/trunk (3 files)

[Felix Yan]

    Date: Friday, July 31, 2020 @ 07:18:19
  Author: felixonmars
Revision: 666062

upgpkg: agda-stdlib 1.3-2: try to fix usage issues like FS#64685 FS#64686 FS#61904 FS#67354

Added:
  agda-stdlib/trunk/standard-library.agda-lib.in
    (from rev 666061, agda-stdlib/trunk/standard-library.agda-lib)
Modified:
  agda-stdlib/trunk/PKGBUILD
Deleted:
  agda-stdlib/trunk/standard-library.agda-lib

------------------------------+
 PKGBUILD                     |   23 +++++++++++++++++------
 standard-library.agda-lib    |    2 --
 standard-library.agda-lib.in |    2 ++
 3 files changed, 19 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-07-31 07:13:01 UTC (rev 666061)
+++ PKGBUILD	2020-07-31 07:18:19 UTC (rev 666062)
@@ -3,19 +3,26 @@
 
 pkgname=agda-stdlib
 pkgver=1.3
-pkgrel=1
+_agdaver=2.6.1
+pkgrel=2
 pkgdesc="Agda standard libraries"
 url="https://github.com/agda/agda-stdlib"
 license=("MIT")
 arch=('x86_64')
-depends=('agda')
+depends=("agda=$_agdaver")
 makedepends=('ghc' 'haskell-filemanip')
 options=('staticlibs')
 source=("$pkgname-$pkgver.tar.gz::https://github.com/agda/agda-stdlib/archive/v$pkgver.tar.gz"
-        standard-library.agda-lib)
+        standard-library.agda-lib.in)
 sha512sums=('a1b78bd0e4bbca4cfa8c565cf14f05177cacbb28b63fae98bbdce482bca385a169c7aae0ac14973faf186e812abf7d8af47bfeb80110d9b0f671e1a475dbf109'
             '92fad2f9b941af4506bb0d5d9d533d09823df89f7530ee5d787b741816ba07e68f25b96d6653ae6ed949ec23484c1fba47a63cc6401311462a55b5e06cfc032c')
 
+prepare() {
+    cd $pkgname-$pkgver
+    rm standard-library.agda-lib
+    sed -i 's/< *4.14/<5/' lib.cabal
+}
+
 build() {
     cd $pkgname-$pkgver
 
@@ -25,14 +32,18 @@
     dist/build/GenerateEverything/GenerateEverything
 
     agda -i. -isrc Everything.agda
-    agda --html -i. -isrc README.agda
 }
 
 package() {
-    install -D -m644 standard-library.agda-lib "$pkgdir"/usr/share/agda/lib/standard-library.agda-lib
+    install -Dm644 standard-library.agda-lib.in "$pkgdir"/usr/share/agda/lib/standard-library.agda-lib
 
     cd $pkgname-$pkgver
     install -dm755 "$pkgdir"/usr/share/agda/lib/stdlib
-    cp -pr Everything.agda* src/* "$pkgdir"/usr/share/agda/lib/stdlib
+    cp -pr src/* "$pkgdir"/usr/share/agda/lib/stdlib/
+
+    # Symlink to avoid writing to this place when agda-lib is present
+    install -dm755 "$pkgdir"/usr/share/agda/lib/_build/$_agdaver/agda
+    ln -s ../../../stdlib "$pkgdir"/usr/share/agda/lib/_build/$_agdaver/agda/
+
     install -D -m644 LICENCE "$pkgdir"/usr/share/licenses/$pkgname/LICENCE
 }

Deleted: standard-library.agda-lib
===================================================================
--- standard-library.agda-lib	2020-07-31 07:13:01 UTC (rev 666061)
+++ standard-library.agda-lib	2020-07-31 07:18:19 UTC (rev 666062)
@@ -1,2 +0,0 @@
-name: standard-library
-include: stdlib

Copied: agda-stdlib/trunk/standard-library.agda-lib.in (from rev 666061, agda-stdlib/trunk/standard-library.agda-lib)
===================================================================
--- standard-library.agda-lib.in	                        (rev 0)
+++ standard-library.agda-lib.in	2020-07-31 07:18:19 UTC (rev 666062)
@@ -0,0 +1,2 @@
+name: standard-library
+include: stdlib