Merge branch 'tarball-subdir' into 'master'

Tarball subdir

See merge request !2

ChangeLog.md

 # Changelog for horizon-spec
 
+## v0.10.0
+
+* Add `subdir` field to `FromTarball`.
+* Add `callHorizonGitlab`.
+
 ## v0.9.0
 
 * Add `example.dhall`.

horizon-spec/example.dhall

 let H =
       ./package.dhall
-        sha256:f52fc6fc1f8569c1afbc6be778f751242592127164666ffe2e8a9cbe7f2059a8
+        sha256:80c3701d26567157d8b2c398af1cbdebfb6f6a7ff7e6dcc768c0385cd3162ae4
 
 let packages =
       { Cabal = H.callHackage "Cabal" "3.8.1.0"

horizon-spec/package.dhall

@@ -20,7 +20,7 @@ let Url = Text
 let HaskellSource =
       < FromHackage : { name : Name, version : Version }
       | FromGit : { url : Url, revision : Revision, subdir : Optional Subdir }
-      | FromTarball : Url
+      | FromTarball : { url : Url, subdir : Optional Subdir }
       >
 
 let Modifiers =
@@ -108,8 +108,30 @@ let callGit
         }
 
 let callTarball
-    : Url → HaskellPackage.Type
-    = λ(url : Url) → HaskellPackage::{ source = HaskellSource.FromTarball url }
+    : Url → Optional Subdir → HaskellPackage.Type
+    = λ(url : Url) →
+      λ(subdir : Optional Subdir) →
+        HaskellPackage::{ source = HaskellSource.FromTarball { url, subdir } }
+
+let callHorizonGitlab
+    : Name → Version → Optional Subdir → HaskellPackage.Type
+    = λ(name : Name) →
+      λ(version : Version) →
+      λ(subdir : Optional Subdir) →
+        callTarball
+          ( Prelude.Text.concat
+              [ "https://gitlab.horizon-haskell.net/haskell/"
+              , name
+              , "/-/archive/"
+              , version
+              , "/"
+              , name
+              , "-"
+              , version
+              , ".tar.gz"
+              ]
+          )
+          subdir
 
 let modPackageList
     : Modifiers.Type → PackageList → PackageList
@@ -153,6 +175,7 @@ in  { Attr
     , callGit
     , callHackage
     , callTarball
+    , callHorizonGitlab
     , modPackageList
     , modPackageSet
     }

version

-0.9.0
+0.10.0