Fix homepage on chrome/brave

Refreeze
Prepare for hackage release
2021-10-01 20:51:37 +02:00 · 2021-10-01 20:29:24 +02:00 · 2021-10-01 17:15:30 +02:00 · 2021-09-30 15:43:22 +02:00
10 changed files with 71 additions and 87 deletions
--- a/cabal.ghc8107.project
+++ b/cabal.ghc8107.project
@@ -8,16 +8,6 @@ package ghcup
    tests: True
    flags: +tui

-source-repository-package
-    type: git
-    location: https://github.com/bgamari/terminal-size
-    tag: 34ea816bd63f75f800eedac12c6908c6f3736036
-
-source-repository-package
-    type: git
-    location: https://github.com/hasufell/libarchive
-    tag: 8587aab78dd515928024ecd82c8f215e06db85cd
-
 constraints: http-io-streams -brotli

 package libarchive
--- a/cabal.ghc8107.project.freeze
+++ b/cabal.ghc8107.project.freeze
@@ -1,7 +1,8 @@
 active-repositories: hackage.haskell.org:merge
-constraints: any.Cabal ==3.2.1.0,
+constraints: any.Cabal ==3.2.1.0 || ==3.6.1.0,
+             Cabal -bundled-binary-generic,
             any.HUnit ==1.6.2.0,
-             any.HsOpenSSL ==0.11.7.1,
+             any.HsOpenSSL ==0.11.7.2,
             HsOpenSSL -fast-bignum -homebrew-openssl -macports-openssl -use-pkg-config,
             any.HsYAML ==0.2.1.0,
             HsYAML -exe,
@@ -26,16 +27,16 @@ constraints: any.Cabal ==3.2.1.0,
             any.attoparsec ==0.13.2.5,
             attoparsec -developer,
             any.base ==4.14.3.0,
-             any.base-compat ==0.11.2,
-             any.base-compat-batteries ==0.11.2,
-             any.base-orphans ==0.8.4,
+             any.base-compat ==0.12.0,
+             any.base-compat-batteries ==0.12.0,
+             any.base-orphans ==0.8.5,
             any.base16-bytestring ==1.0.1.0,
             any.base64-bytestring ==1.1.0.0,
             any.bifunctors ==5.5.11,
             bifunctors +semigroups +tagged,
             any.binary ==0.8.8.0,
             any.blaze-builder ==0.4.2.1,
-             any.brick ==0.64,
+             any.brick ==0.64.1,
             brick -demos,
             any.bytestring ==0.10.12.0,
             any.bz2 ==1.0.1.0,
@@ -47,7 +48,7 @@ constraints: any.Cabal ==3.2.1.0,
             any.call-stack ==0.4.0,
             any.case-insensitive ==1.2.1.0,
             any.casing ==0.1.4.1,
-             any.chs-cabal ==0.1.1.0,
+             any.chs-cabal ==0.1.1.1,
             any.chs-deps ==0.1.0.0,
             chs-deps -cross,
             any.clock ==0.8.2,
@@ -57,7 +58,6 @@ constraints: any.Cabal ==3.2.1.0,
             comonad +containers +distributive +indexed-traversable,
             any.composition-prelude ==3.0.0.2,
             composition-prelude -development,
-             any.concurrent-output ==1.10.12,
             any.config-ini ==0.2.4.0,
             config-ini -enable-doctests,
             any.containers ==0.6.5.1,
@@ -94,7 +94,7 @@ constraints: any.Cabal ==3.2.1.0,
             hsc2hs -in-ghc-tree,
             any.hspec ==2.7.10,
             any.hspec-core ==2.7.10,
-             any.hspec-discover ==2.7.10 || ==2.8.3,
+             any.hspec-discover ==2.7.10,
             any.hspec-expectations ==0.8.2,
             any.hspec-golden-aeson ==0.9.0.0,
             any.http-io-streams ==0.1.6.0,
@@ -109,7 +109,7 @@ constraints: any.Cabal ==3.2.1.0,
             io-streams +network -nointeractivetests +zlib,
             any.language-c ==0.9.0.1,
             language-c -allwarnings +iecfpextension +usebytestrings,
-             any.libarchive ==3.0.2.2,
+             any.libarchive ==3.0.3.0,
             libarchive -cross -low-memory -system-libarchive,
             any.lzma-static ==5.2.5.4,
             any.megaparsec ==9.0.1,
@@ -143,7 +143,7 @@ constraints: any.Cabal ==3.2.1.0,
             any.profunctors ==5.6.2,
             any.quickcheck-arbitrary-adt ==0.3.1.0,
             any.quickcheck-io ==0.2.0,
-             any.random ==1.2.0,
+             any.random ==1.2.1,
             any.recursion-schemes ==5.2.2.1,
             recursion-schemes +template-haskell,
             any.regex-base ==0.94.0.1,
@@ -175,14 +175,14 @@ constraints: any.Cabal ==3.2.1.0,
             any.text ==1.2.4.1,
             any.text-zipper ==0.11,
             any.tf-random ==0.5,
-             any.th-abstraction ==0.4.2.0,
-             any.th-compat ==0.1.2,
+             any.th-abstraction ==0.4.3.0,
+             any.th-compat ==0.1.3,
             any.th-lift ==0.8.2,
             any.th-lift-instances ==0.1.18,
             any.these ==1.1.1.1,
             these +assoc,
             any.time ==1.9.3,
-             any.time-compat ==1.9.6,
+             any.time-compat ==1.9.6.1,
             time-compat -old-locale,
             any.transformers ==0.5.6.2,
             any.transformers-base ==0.4.6,
@@ -200,14 +200,14 @@ constraints: any.Cabal ==3.2.1.0,
             uri-bytestring -lib-werror,
             any.utf8-string ==1.0.2,
             any.uuid-types ==1.0.5,
-             any.vector ==0.12.3.0,
+             any.vector ==0.12.3.1,
             vector +boundschecks -internalchecks -unsafechecks -wall,
             any.versions ==5.0.0,
             any.vty ==5.33,
-             any.word-wrap ==0.4.1,
+             any.word-wrap ==0.5,
             any.word8 ==0.1.3,
             any.xor ==0.0.1.0,
             any.zlib ==0.6.2.3,
             zlib -bundled-c-zlib -non-blocking-ffi -pkg-config,
             any.zlib-bindings ==0.1.1.5
-index-state: hackage.haskell.org 2021-08-29T16:24:29Z
+index-state: hackage.haskell.org 2021-10-01T15:16:26Z
--- a/cabal.ghc901.project
+++ b/cabal.ghc901.project
@@ -8,16 +8,6 @@ package ghcup
    tests: True
    flags: +tui

-source-repository-package
-    type: git
-    location: https://github.com/bgamari/terminal-size
-    tag: 34ea816bd63f75f800eedac12c6908c6f3736036
-
-source-repository-package
-    type: git
-    location: https://github.com/hasufell/libarchive
-    tag: 8587aab78dd515928024ecd82c8f215e06db85cd
-
 constraints: http-io-streams -brotli

 package libarchive
--- a/cabal.ghc901.project.freeze
+++ b/cabal.ghc901.project.freeze
@@ -1,7 +1,8 @@
 active-repositories: hackage.haskell.org:merge
-constraints: any.Cabal ==3.4.0.0,
+constraints: any.Cabal ==3.4.0.0 || ==3.6.1.0,
+             Cabal -bundled-binary-generic,
             any.HUnit ==1.6.2.0,
-             any.HsOpenSSL ==0.11.7.1,
+             any.HsOpenSSL ==0.11.7.2,
             HsOpenSSL -fast-bignum -homebrew-openssl -macports-openssl -use-pkg-config,
             any.HsYAML ==0.2.1.0,
             HsYAML -exe,
@@ -26,16 +27,16 @@ constraints: any.Cabal ==3.4.0.0,
             any.attoparsec ==0.13.2.5,
             attoparsec -developer,
             any.base ==4.15.0.0,
-             any.base-compat ==0.11.2,
-             any.base-compat-batteries ==0.11.2,
-             any.base-orphans ==0.8.4,
+             any.base-compat ==0.12.0,
+             any.base-compat-batteries ==0.12.0,
+             any.base-orphans ==0.8.5,
             any.base16-bytestring ==1.0.1.0,
             any.base64-bytestring ==1.1.0.0,
             any.bifunctors ==5.5.11,
             bifunctors +semigroups +tagged,
             any.binary ==0.8.8.0,
             any.blaze-builder ==0.4.2.1,
-             any.brick ==0.64,
+             any.brick ==0.64.1,
             brick -demos,
             any.bytestring ==0.10.12.1,
             any.bz2 ==1.0.1.0,
@@ -47,7 +48,7 @@ constraints: any.Cabal ==3.4.0.0,
             any.call-stack ==0.4.0,
             any.case-insensitive ==1.2.1.0,
             any.casing ==0.1.4.1,
-             any.chs-cabal ==0.1.1.0,
+             any.chs-cabal ==0.1.1.1,
             any.chs-deps ==0.1.0.0,
             chs-deps -cross,
             any.clock ==0.8.2,
@@ -57,7 +58,6 @@ constraints: any.Cabal ==3.4.0.0,
             comonad +containers +distributive +indexed-traversable,
             any.composition-prelude ==3.0.0.2,
             composition-prelude -development,
-             any.concurrent-output ==1.10.12,
             any.config-ini ==0.2.4.0,
             config-ini -enable-doctests,
             any.containers ==0.6.4.1,
@@ -95,7 +95,7 @@ constraints: any.Cabal ==3.4.0.0,
             hsc2hs -in-ghc-tree,
             any.hspec ==2.7.10,
             any.hspec-core ==2.7.10,
-             any.hspec-discover ==2.7.10 || ==2.8.3,
+             any.hspec-discover ==2.7.10,
             any.hspec-expectations ==0.8.2,
             any.hspec-golden-aeson ==0.9.0.0,
             any.http-io-streams ==0.1.6.0,
@@ -109,7 +109,7 @@ constraints: any.Cabal ==3.4.0.0,
             io-streams +network -nointeractivetests +zlib,
             any.language-c ==0.9.0.1,
             language-c -allwarnings +iecfpextension +usebytestrings,
-             any.libarchive ==3.0.2.2,
+             any.libarchive ==3.0.3.0,
             libarchive -cross -low-memory -system-libarchive,
             any.lzma-static ==5.2.5.4,
             any.megaparsec ==9.0.1,
@@ -143,7 +143,7 @@ constraints: any.Cabal ==3.4.0.0,
             any.profunctors ==5.6.2,
             any.quickcheck-arbitrary-adt ==0.3.1.0,
             any.quickcheck-io ==0.2.0,
-             any.random ==1.2.0,
+             any.random ==1.2.1,
             any.recursion-schemes ==5.2.2.1,
             recursion-schemes +template-haskell,
             any.regex-base ==0.94.0.1,
@@ -175,14 +175,14 @@ constraints: any.Cabal ==3.4.0.0,
             any.text ==1.2.4.1,
             any.text-zipper ==0.11,
             any.tf-random ==0.5,
-             any.th-abstraction ==0.4.2.0,
-             any.th-compat ==0.1.2,
+             any.th-abstraction ==0.4.3.0,
+             any.th-compat ==0.1.3,
             any.th-lift ==0.8.2,
             any.th-lift-instances ==0.1.18,
             any.these ==1.1.1.1,
             these +assoc,
             any.time ==1.9.3,
-             any.time-compat ==1.9.6,
+             any.time-compat ==1.9.6.1,
             time-compat -old-locale,
             any.transformers ==0.5.6.2,
             any.transformers-base ==0.4.6,
@@ -200,14 +200,14 @@ constraints: any.Cabal ==3.4.0.0,
             uri-bytestring -lib-werror,
             any.utf8-string ==1.0.2,
             any.uuid-types ==1.0.5,
-             any.vector ==0.12.3.0,
+             any.vector ==0.12.3.1,
             vector +boundschecks -internalchecks -unsafechecks -wall,
             any.versions ==5.0.0,
             any.vty ==5.33,
-             any.word-wrap ==0.4.1,
+             any.word-wrap ==0.5,
             any.word8 ==0.1.3,
             any.xor ==0.0.1.0,
             any.zlib ==0.6.2.3,
             zlib -bundled-c-zlib -non-blocking-ffi -pkg-config,
             any.zlib-bindings ==0.1.1.5
-index-state: hackage.haskell.org 2021-08-29T16:24:29Z
+index-state: hackage.haskell.org 2021-10-01T15:16:26Z
--- a/cabal.project
+++ b/cabal.project
@@ -8,11 +8,6 @@ package ghcup
    tests: True
    flags: +tui

-source-repository-package
-    type: git
-    location: https://github.com/hasufell/libarchive
-    tag: 8587aab78dd515928024ecd82c8f215e06db85cd
-
 constraints: http-io-streams -brotli

 package libarchive
--- a/data/metadata/ghcup-0.0.6.yaml
+++ b/data/metadata/ghcup-0.0.6.yaml
@@ -2277,7 +2277,7 @@ ghcupDownloads:
              dlUri: https://downloads.haskell.org/~ghcup/unofficial-bindists/cabal/3.6.0.0/cabal-install-3.6.0.0-armv7-linux.tar.xz
              dlHash: 11b5ca042a8bf45971224f2127a3e9d6b803f09210042ca80a254bea06f01a2e
  GHCup:
-    0.1.17.1:
+    0.1.17.2:
      viTags:
      - Recommended
      - Latest
@@ -2287,43 +2287,46 @@ ghcupDownloads:
        A_64:
          Linux_UnknownLinux:
            unknown_versioning: &ghcup-64
-              dlUri: https://downloads.haskell.org/~ghcup/0.1.17.1/x86_64-linux-ghcup-0.1.17.1
-              dlHash: 2824687fe3965374f463ae49f9d8abd9d3d556a0f63880bc78b5ee02098ba142
+              dlUri: https://downloads.haskell.org/~ghcup/0.1.17.2/x86_64-linux-ghcup-0.1.17.2
+              dlHash: e9adb022b9bcfe501caca39e76ae7241af0f30fbb466a2202837a7a578607daf
          Darwin:
            unknown_versioning:
-              dlUri: https://downloads.haskell.org/~ghcup/0.1.17.1/x86_64-apple-darwin-ghcup-0.1.17.1
-              dlHash: 0dd4e5afc7d93bdef20ba16085ae9f2aa5e4acd6b34e75a3b31b1fcc8ea451a9
+              dlUri: https://downloads.haskell.org/~ghcup/0.1.17.2/x86_64-apple-darwin-ghcup-0.1.17.2
+              dlHash: 9418dab0f603b25f925739d66ca2328e876ce5197c131d7e75060f8edf7c57c9
          FreeBSD:
-            unknown_versioning:
-              dlUri: https://downloads.haskell.org/~ghcup/0.1.17.1/x86_64-freebsd-ghcup-0.1.17.1
-              dlHash: a480ba827c07ed50d9ab724bd80198722a85b7bb683c5bcc1e8b1df2be7ad0e5
+            '( >= 12 && < 13 )':
+              dlUri: https://downloads.haskell.org/~ghcup/0.1.17.2/x86_64-portbld-freebsd12-ghcup-0.1.17.2
+              dlHash: b6f0558e66f95a0772a60902c2c96202d0271d8d963db436a1359f1c4e1d2947
+            '( >= 13 )':
+              dlUri: https://downloads.haskell.org/~ghcup/0.1.17.2/x86_64-portbld-freebsd13-ghcup-0.1.17.2
+              dlHash: 5bd5760dd29117ca2797a87b79f99b804743e7e64fcdcfe6ad6436314423ef84
          Windows:
            unknown_versioning:
-              dlUri: https://downloads.haskell.org/~ghcup/0.1.17.1/x86_64-mingw64-ghcup-0.1.17.1.exe
-              dlHash: dabd8c545401b038407a01168a9fda977f17cb326f43c6b3129e76bee3b113d6
+              dlUri: https://downloads.haskell.org/~ghcup/0.1.17.2/x86_64-mingw64-ghcup-0.1.17.2.exe
+              dlHash: 17ab704551c691067d590760c513891d0d0d375efb59dc3c99219fdf352fed71
          Linux_Alpine:
            unknown_versioning: *ghcup-64
        A_32:
          Linux_UnknownLinux:
            unknown_versioning: &ghcup-32
-              dlUri: https://downloads.haskell.org/~ghcup/0.1.17.1/i386-linux-ghcup-0.1.17.1
-              dlHash: 04ec4ffd8fab1931e53f70beb3497770b42f4d37d7469c1973a0eeeccd5e8989
+              dlUri: https://downloads.haskell.org/~ghcup/0.1.17.2/i386-linux-ghcup-0.1.17.2
+              dlHash: eb29a33ed9798c94ed05b10c66c2cd6690a4d5aa79ed7ce6a9b8564e0c095ff4
          Linux_Alpine:
            unknown_versioning: *ghcup-32
        A_ARM64:
          Linux_UnknownLinux:
            unknown_versioning:
-              dlUri: https://downloads.haskell.org/~ghcup/0.1.17.1/aarch64-linux-ghcup-0.1.17.1
-              dlHash: d14539dbbbb2269b6c3e105b83fa7dac744c1cfaf39f7eb2760293fec856e738
+              dlUri: https://downloads.haskell.org/~ghcup/0.1.17.2/aarch64-linux-ghcup-0.1.17.2
+              dlHash: ad72641877f91f1cc5142151dafad68566f439114f96a738837ed549430173a5
          Darwin:
            unknown_versioning:
-              dlUri: https://downloads.haskell.org/~ghcup/0.1.17.1/aarch64-apple-darwin-ghcup-0.1.17.1
-              dlHash: 80cb12af6eaeab2839e13f9cd428c0152fcb38fffc62954a3f5eccca7b06b6d9
+              dlUri: https://downloads.haskell.org/~ghcup/0.1.17.2/aarch64-apple-darwin-ghcup-0.1.17.2
+              dlHash: bf8691a88627b02253c2068537dc16e7eb1d3dbb22bcb1342cb7f0d00df08fd5
        A_ARM:
          Linux_UnknownLinux:
            unknown_versioning:
-              dlUri: https://downloads.haskell.org/~ghcup/0.1.17.1/armv7-linux-ghcup-0.1.17.1
-              dlHash: 2b1e63cbd62cce1a15c7cf0635f85b6bc7de880563cdf4b3a20422c9c30a616c
+              dlUri: https://downloads.haskell.org/~ghcup/0.1.17.2/armv7-linux-ghcup-0.1.17.2
+              dlHash: 03f2f8aaa8393372e9f7e16061703eda3f497b9604171825995389f3d5cc8f8f
  HLS:
    1.1.0:
      viTags:
--- a/ghcup.cabal
+++ b/ghcup.cabal
@@ -111,7 +111,7 @@ library
    , haskus-utils-types    ^>=1.5
    , haskus-utils-variant  >=3.0        && <3.2
    , HsYAML-aeson          ^>=0.2.0.0
-    , libarchive            ^>=3.0.0.0
+    , libarchive            ^>=3.0.3.0
    , lzma-static           ^>=5.2.5.3
    , megaparsec            >=8.0.0      && <9.1
    , mtl                   ^>=2.2
@@ -202,7 +202,7 @@ executable ghcup
    , ghcup
    , haskus-utils-variant  >=3.0      && <3.2
    , HsYAML-aeson          ^>=0.2.0.0
-    , libarchive            ^>=3.0.0.0
+    , libarchive            ^>=3.0.3.0
    , megaparsec            >=8.0.0    && <9.1
    , mtl                   ^>=2.2
    , optparse-applicative  >=0.15.1.0 && <0.17
@@ -264,7 +264,7 @@ executable ghcup-gen
    , ghcup
    , haskus-utils-variant  >=3.0      && <3.2
    , HsYAML-aeson          ^>=0.2.0.0
-    , libarchive            ^>=3.0.0.0
+    , libarchive            ^>=3.0.3.0
    , mtl                   ^>=2.2
    , optics                ^>=0.4
    , optparse-applicative  >=0.15.1.0 && <0.17
--- a/scripts/bootstrap/bootstrap-haskell
+++ b/scripts/bootstrap/bootstrap-haskell
@@ -25,7 +25,7 @@

 plat="$(uname -s)"
 arch=$(uname -m)
-ghver="0.1.17.1"
+ghver="0.1.17.2"
 base_url="https://downloads.haskell.org/~ghcup"

 export GHCUP_SKIP_UPDATE_CHECK=yes
@@ -211,6 +211,14 @@ download_ghcup() {
 			esac
 			;;
        "FreeBSD"|"freebsd")
+            if freebsd-version | grep -E '^12.*' ; then
+                freebsd_ver=12
+            elif freebsd-version | grep -E '^13.*' ; then
+                freebsd_ver=13
+            else
+                die "Unsupported FreeBSD version! Please report a bug at https://gitlab.haskell.org/haskell/ghcup-hs/-/issues"
+            fi
+
 			case "${arch}" in
 				x86_64|amd64)
 					;;
@@ -220,7 +228,7 @@ download_ghcup() {
 				*) die "Unknown architecture: ${arch}"
 					;;
 			esac
-			_url=${base_url}/${ghver}/x86_64-portbld-freebsd-ghcup-${ghver}
+			_url=${base_url}/${ghver}/x86_64-portbld-freebsd${freebsd_ver}-ghcup-${ghver}
            ;;
        "Darwin"|"darwin")
 			case "${arch}" in
--- a/stack.yaml
+++ b/stack.yaml
@@ -1,12 +1,9 @@
-resolver: lts-18.2
+resolver: lts-18.12

 packages:
  - .

 extra-deps:
-  - git: https://github.com/hasufell/libarchive
-    commit: 8587aab78dd515928024ecd82c8f215e06db85cd
-
  - IfElse-0.85@sha256:6939b94acc6a55f545f63a168a349dd2fbe4b9a7cca73bf60282db5cc6aa47d2,445
  - ascii-string-1.0.1.4@sha256:fa34f1d9ba57e8e89c0d4c9cef5e01ba32cb2d4373d13f92dcc0b531a6c6749b,2582
  - base16-bytestring-0.1.1.7@sha256:0021256a9628971c08da95cb8f4d0d72192f3bb8a7b30b55c080562d17c43dd3,2231
@@ -26,6 +23,7 @@ extra-deps:
  - hspec-discover-2.7.10@sha256:d08bf5dd785629f589571477d9beb7cd91529471bd89f39517c1cb4b9b38160f,2184
  - hspec-golden-aeson-0.9.0.0@sha256:aa17274114026661ba4dfc9c60c230673c8f408bd86482fd611d2d5cb6aff996,2179
  - http-io-streams-0.1.6.0@sha256:53f5bab177efb52cd65ec396fd04ed59b93e5f919fb3700cd7dacd6cfce6f06d,3582
+  - libarchive-3.0.3.0
  - lzma-static-5.2.5.3@sha256:2758ee58c35992fcf7db78e98684c357a16a82fa2a4e7c352a6c210c08c555d8,7308
  - optics-0.4@sha256:9fb69bf0195b8d8f1f8cd0098000946868b8a3c3ffb51e5b64f79fc600c3eb4c,6568
  - optics-core-0.4@sha256:59e04aebca536bd011ae50c781937f45af4c1456af1eb9fb578f9a69eee293cd,4995
--- a/www/ghcup.css
+++ b/www/ghcup.css
@@ -94,7 +94,7 @@ body#idx p.other-help {
 }

 .instructions > * {
-    width: 55rem;
+    width: 40rem;
    margin-left: auto;
    margin-right: auto;
 }
Author	SHA1	Message	Date
Julian Ospald	b3aeb3246f	Fix homepage on chrome/brave	2021-10-01 20:51:37 +02:00
Julian Ospald	1fc3e0ee5d	Refreeze	2021-10-01 20:29:24 +02:00
Julian Ospald	f2dcfbdc5f	Prepare for hackage release	2021-10-01 17:15:30 +02:00
Julian Ospald	23d77ce1b4	Update metadata	2021-09-30 15:43:22 +02:00