Merge branch 'master' into central-server

Author: gbaz

.envrc

@@ -0,0 +1 @@
+use flake

.github/workflows/cabal.yml

@@ -0,0 +1,59 @@
+on:
+  push:
+    branches:
+      - master
+      - ci*
+  pull_request:
+    branches:
+      - master
+      - ci*
+name: Cabal
+jobs:
+  build:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        ghc: ['9.4.4', '9.2.7', '9.0.2']
+        cabal: ['3.8.1.0']
+        os: [ubuntu-latest]
+    name: Cabal with GHC ${{ matrix.ghc }}
+    steps:
+      - uses: actions/checkout@v3
+      - name: Setup Haskell
+        uses: haskell/actions/setup@v2
+        with:
+          ghc-version: ${{ matrix.ghc }}
+          cabal-version: ${{ matrix.cabal }}
+      - name: Install dependencies
+        run: sudo apt install -y libbrotli-dev libgd-dev
+      - name: Build
+        run: cabal build all --enable-tests
+      - name: Test
+        run: cabal test all --enable-tests
+      - name: Haddock
+        run: cabal haddock all
+  build_with_mtl_2_3:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        ghc: ['9.4.4']
+        cabal: ['3.8.1.0']
+        os: [ubuntu-latest]
+    name: Cabal with GHC ${{ matrix.ghc }} and mtl >= 2.3.1
+    steps:
+      - uses: actions/checkout@v3
+      - name: Setup Haskell
+        uses: haskell/actions/setup@v2
+        with:
+          ghc-version: ${{ matrix.ghc }}
+          cabal-version: ${{ matrix.cabal }}
+      - name: Install dependencies
+        run: sudo apt install -y libbrotli-dev libgd-dev
+      - name: Build dependencies with mtl >= 2.3.1
+        # 2022-12-30: 'transformers >= 0.6' is needed because of happstack-server
+        run: cabal build all --disable-tests --dependencies-only -O0 --constraint 'mtl >= 2.3.1' --constraint 'transformers >= 0.6' --allow-newer='Cabal:mtl' --allow-newer='Cabal:transformers'
+      - name: Build with mtl >= 2.3.1
+        # 2022-12-30: 'transformers >= 0.6' is needed because of happstack-server
+        run: cabal build all --disable-tests -O0 --constraint 'mtl >= 2.3.1' --constraint 'transformers >= 0.6' --allow-newer='Cabal:mtl' --allow-newer='Cabal:transformers'

.github/workflows/haskell-ci.yml

@@ -8,9 +8,9 @@
 #
 # For more information, see https://github.com/haskell-CI/haskell-ci
 #
-# version: 0.15.20221225
+# version: 0.15.20230321
 #
-# REGENDATA ("0.15.20221225",["github","hackage-server.cabal"])
+# REGENDATA ("0.15.20230321",["github","hackage-server.cabal"])
 #
 name: Haskell-CI
 on:
@@ -34,14 +34,19 @@ jobs:
     strategy:
       matrix:
         include:
+          - compiler: ghc-9.6.1
+            compilerKind: ghc
+            compilerVersion: 9.6.1
+            setup-method: ghcup
+            allow-failure: false
           - compiler: ghc-9.4.4
             compilerKind: ghc
             compilerVersion: 9.4.4
             setup-method: ghcup
             allow-failure: false
-          - compiler: ghc-9.2.5
+          - compiler: ghc-9.2.7
             compilerKind: ghc
-            compilerVersion: 9.2.5
+            compilerVersion: 9.2.7
             setup-method: ghcup
             allow-failure: false
           - compiler: ghc-9.0.2
@@ -66,12 +71,12 @@ jobs:
           apt-get update
           apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
           mkdir -p "$HOME/.ghcup/bin"
-          curl -sL https://downloads.haskell.org/ghcup/0.1.18.0/x86_64-linux-ghcup-0.1.18.0 > "$HOME/.ghcup/bin/ghcup"
+          curl -sL https://downloads.haskell.org/ghcup/0.1.19.2/x86_64-linux-ghcup-0.1.19.2 > "$HOME/.ghcup/bin/ghcup"
           chmod a+x "$HOME/.ghcup/bin/ghcup"
           "$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
-          "$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
+          "$HOME/.ghcup/bin/ghcup" install cabal 3.10.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
           apt-get update
-          apt-get install -y libbrotli-dev libgd-dev libpng-dev libjpeg-dev libfontconfig-dev libfreetype-dev libexpat1-dev
+          apt-get install -y libbrotli-dev libgd-dev
         env:
           HCKIND: ${{ matrix.compilerKind }}
           HCNAME: ${{ matrix.compiler }}
@@ -87,7 +92,7 @@ jobs:
           echo "HC=$HC" >> "$GITHUB_ENV"
           echo "HCPKG=$HOME/.ghcup/bin/$HCKIND-pkg-$HCVER" >> "$GITHUB_ENV"
           echo "HADDOCK=$HOME/.ghcup/bin/haddock-$HCVER" >> "$GITHUB_ENV"
-          echo "CABAL=$HOME/.ghcup/bin/cabal-3.6.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
+          echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
           HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
           echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
           if [ $((HCNUMVER >= 90400)) -ne 0 ] ; then echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV" ; else echo "ARG_TESTS=--disable-tests" >> "$GITHUB_ENV" ; fi
@@ -172,15 +177,15 @@ jobs:
           echo "    ghc-options: -Werror=missing-methods" >> cabal.project
           cat >> cabal.project <<EOF
           EOF
-          $HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(Cabal|hackage-server|parsec|process|text)$/; }' >> cabal.project.local
+          $HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(Cabal|Cabal-syntax|hackage-server|parsec|process|text)$/; }' >> cabal.project.local
           cat cabal.project
           cat cabal.project.local
       - name: dump install plan
         run: |
           $CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH --dry-run all
           cabal-plan
-      - name: cache
-        uses: actions/cache@v3
+      - name: restore cache
+        uses: actions/cache/restore@v3
         with:
           key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
           path: ~/.cabal/store
@@ -204,8 +209,14 @@ jobs:
           ${CABAL} -vnormal check
       - name: haddock
         run: |
-          $CABAL v2-haddock --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
+          $CABAL v2-haddock --disable-documentation --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
       - name: unconstrained build
         run: |
           rm -f cabal.project.local
           $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks all
+      - name: save cache
+        uses: actions/cache/save@v3
+        if: always()
+        with:
+          key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
+          path: ~/.cabal/store

.github/workflows/nix-shell.yml renamed to .github/workflows/nix-flake.yml

@@ -1,21 +1,25 @@
-name: "Test nix-shell"
+name: "Test Nix Flake"
 on:
   push:
     branches:
       - master
-      - ci*
   pull_request:
     branches:
       - master
-      - ci*
 jobs:
-  nix-shell:
-    runs-on: ubuntu-latest
+  nix:
+    strategy:
+      fail-fast: true
+      matrix:
+        os:
+        - ubuntu-latest
+        # - macos-latest
+    name: Nix on ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/[email protected]
-    - uses: cachix/install-nix-action@v18
+    - uses: cachix/install-nix-action@v20
       with:
-        nix_path: nixpkgs=channel:nixos-21.11
         extra_nix_config: |
           trusted-public-keys = hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ= cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= hackage-server.cachix.org-1:iw0iRh6+gsFIrxROFaAt5gKNgIHejKjIfyRdbpPYevY=
           substituters = https://hydra.iohk.io https://cache.nixos.org/ https://hackage-server.cachix.org/
@@ -24,4 +28,5 @@ jobs:
         # https://nix.dev/tutorials/continuous-integration-github-actions#setting-up-github-actions
         name: hackage-server
         authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
-    - run: nix-shell --pure --run ./.github/workflows/test-nix-shell.sh
+    - run: nix build
+    # - run: nix flake check

.gitignore

@@ -15,3 +15,6 @@ tags
 *.swp
 TAGS
 *~
+.direnv
+
+result*

cabal.haskell-ci

@@ -1,10 +1,6 @@
 branches: master ci*
 
-installed: +all -Cabal -text -parsec -process
-  -- Cabal-3.8.1.0 wants process-1.6.14 or newer
-
--- Did not help to salvage ghc-9.2 and below:
--- installed: -all +ghc
+installed: +all -Cabal -Cabal-syntax -text -parsec -process
 
 -- Does not work with GHA:
 -- -- allow failures with ghc-7.6 and ghc-7.8
@@ -13,14 +9,15 @@ installed: +all -Cabal -text -parsec -process
 -- Use Ubuntu 22.04
 distribution: jammy
 
-apt: libbrotli-dev
+apt: libbrotli-dev libgd-dev
+  -- libgd-dev is for gd via hs-captcha
 
 -- Make sure the haddock step is included,
 -- even though we don't define any library.
 haddock-components: all
   -- since haskell-ci 0.15.20220822
 
-tests: >= 9.4
-  -- parallel-doctest uses the ghc package
-  -- and thus does not build with Cabal-3.8.1.0 below GHC 9.4
-  -- See: https://github.com/haskell/cabal/issues/8554
+-- tests: >= 9.4
+--   -- parallel-doctest uses the ghc package
+--   -- and thus does not build with Cabal-3.8.1.0 below GHC 9.4
+--   -- See: https://github.com/haskell/cabal/issues/8554

cabal.project

@@ -8,7 +8,6 @@
 
 packages: .
 
-
 allow-newer: rss:time, rss:base
 
 -- Andreas, 2022-10-28:  `Cabal-3.8.1.0` wants `process >= 1.6.14`

datafiles/static/hackage.css

@@ -4,18 +4,23 @@
 
 /* Is this portable? */
 html {
-  background-color: white;
   width: 100%;
   height: 100%;
 }
 
 @media (prefers-color-scheme: dark) {
+  html {
+    background-color: #333;
+  }
   body {
     background: #333;
     color: #fefefe;
   }
 }
 @media (prefers-color-scheme: light) {
+  html {
+    background-color: #fefefe;
+  }
   body {
     background: #fefefe;
     color: #333;
@@ -140,22 +145,38 @@ pre, code, kbd, samp, .src {
   font-size: 85%; /* 11pt */
 }
 
-.candidate-warn {
-    background-color: #ffdddd;
+@media (prefers-color-scheme: dark) {
+  .candidate-warn {
     border-left: 6px solid #f44336;
     padding: 0.01em 16px;
     margin-bottom: 8px !important;
     margin-top: 8px !important;
+  }
+
+  .candidate-info {
+    border-left: 6px solid #2196F3;
+    padding: 0.01em 16px;
+    margin-bottom: 8px;
+  }
 }
 
-.candidate-info {
+@media (prefers-color-scheme: light) {
+  .candidate-warn {
+    background-color: #ffdddd;
+    border-left: 6px solid #f44336;
+    padding: 0.01em 16px;
+    margin-bottom: 8px !important;
+    margin-top: 8px !important;
+  }
+
+  .candidate-info {
     background-color: #e7f3fe;
     border-left: 6px solid #2196F3;
     padding: 0.01em 16px;
     margin-bottom: 8px;
+  }
 }
 
-
 /* @end */
 
 /* @group Common */
@@ -529,7 +550,6 @@ table.properties td, table.properties th {
   padding-bottom: 3em;
 }
 
-
 #page-header {
   background: #5E5184;
   border-bottom: 5px solid rgba(69, 59, 97, 0.5);
@@ -1014,12 +1034,21 @@ p.tip {
 
 /* Misc admin forms */
 
-.box {
-  background: #faf9dc;
-  border: 1px solid #d8d7ad;
-  padding: 0.5em 1em;
-  max-width: 35em;
-  margin: 0.5em 0 1em 1em;
+@media (prefers-color-scheme: dark) {
+    .box {
+        padding: 0.5em 1em;
+        max-width: 35em;
+        margin: 0.5em 0 1em 1em;
+    }
+}
+@media (prefers-color-scheme: light) {
+    .box {
+        background: #faf9dc;
+        border: 1px solid #d8d7ad;
+        padding: 0.5em 1em;
+        max-width: 35em;
+        margin: 0.5em 0 1em 1em;
+    }
 }
 
 table.simpletable th, table.simpletable td {
@@ -1216,3 +1245,20 @@ p.registration-email {
     border: 1px solid rgb(196,69,29);
     padding: 0 1em;
 }
+
+@media (prefers-color-scheme: dark) {
+  div#modal #content {
+    background: #222;
+  }
+}
+@media (prefers-color-scheme: light) {
+  div#modal #content {
+    background: #fff;
+  }
+}
+
+@media (prefers-color-scheme: dark) {
+  #search-results {
+    background: #222;
+  }
+}

datafiles/templates/Html/package-page.html.st

@@ -36,7 +36,7 @@
 
     $if(isDeprecated)$
     <div id="deprecated">
-      <span style="color:#D00B3C">Deprecated.</span>
+      <span style="color:#D00B3C">Deprecated</span>
       $deprecatedMsg$
     </div>
     $else$