Merge branch 'development'

.github/workflows/backend.yml

@@ -78,22 +78,20 @@ jobs:
         echo "${FLORA_DB_HOST}:${FLORA_DB_PORT}:${FLORA_DB_DATABASE}:${FLORA_DB_USER}:${FLORA_DB_PASSWORD}" > .pgpass
         cat ~/.pgpass
         cabal update
-        cabal freeze
-
     - name: Cache
       uses: actions/cache@v4.0.0
       with:
         path: ${{ steps.setup-haskell.outputs.cabal-store }}
-        key: ${{ runner.os }}-ghc-${{ matrix.ghc }}-cabal-${{ hashFiles('**/plan.json') }}
+        key: ${{ runner.os }}-ghc-${{ matrix.ghc }}-cabal-${{ hashFiles('./.plan.json') }}
         restore-keys: ${{ runner.os }}-ghc-${{ matrix.ghc }}-
 
     - name: Build
       run: |
+        cabal install postgresql-migration
         make soufflé
         make assets-deps
         make build-assets
         make build
-        cabal install postgresql-migration
     - name: Test
       run: |
         set -x

.github/workflows/linting.yml

@@ -25,12 +25,12 @@ jobs:
     - uses: actions/checkout@v4
 
     - name: 'Set up HLint'
-      uses: rwe/actions-hlint-setup@v1
+      uses: haskell-actions/hlint-setup@v2
       with:
         version: '3.8'
 
     - name: 'Run HLint'
-      uses: rwe/actions-hlint-run@v2
+      uses: haskell-actions/hlint-run@v2
       with:
-        path: '["src/", "app/", "test/"]'
+        path: '["src/", "test/", "app/"]'
         fail-on: warning

.github/workflows/nix-check.yml

@@ -1,8 +1,4 @@
 name: "Flora nix check"
-on:
-  pull_request:
-  push:
-    branches: ["main", "development"]
 jobs:
   tests:
     runs-on: ubuntu-latest

.gitignore

@@ -36,3 +36,4 @@ design/node_modules
 
 *.dump-timings
 _build/cabal-store
+storage/

CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 1.0.16 -- 2024-02-26
+
+* Add badge component for custom build type ([#517](https://github.com/flora-pm/flora-server/pull/517))
+
 ## 1.0.15 -- 2024-02-16
 * Show 3 digits in version if using 0x scheme. ([#490](https://github.com/flora-pm/flora-server/pull/490))
 * Deduplicate dependencies listed in package overview ([#492](https://github.com/flora-pm/flora-server/pull/492))

assets/css/3-screens/1-package/1-package.css

@@ -1,5 +1,23 @@
 /* stylelint-disable selector-class-pattern */
 /* stylelint-disable declaration-block-no-redundant-longhand-properties */
+
+#package-install-section {
+  p {
+    display: inline-block;
+  }
+
+  .package-build-type-custom {
+    background-color: #ffc107;
+    border-radius: 0.25rem;
+    color: white;
+    font-size: 50%;
+    font-weight: 700;
+    padding-left: 0.5rem;
+    padding-right: 0.5rem;
+    margin-left: 0.5rem;
+  }
+}
+
 .package-install-string {
   background-color: transparent;
   border-color: var(--install-string-border);
@@ -46,7 +64,7 @@
   .package-body-section {
     font-size: 1.5rem;
     line-height: 2rem;
-    margin-bottom: 0.75rem;
+    margin-bottom: 0.5rem;
   }
 
   .package-right-column {

assets/css/3-screens/5-package-version.css → assets/css/3-screens/5-settings/1-dashboard.css

@@ -1,2 +1,6 @@
 /* stylelint-disable selector-class-pattern */
 /* stylelint-disable declaration-block-no-redundant-longhand-properties */
+
+#subheader {
+  text-align: right;
+}

assets/css/styles.css

@@ -20,6 +20,7 @@
 @import "3-screens/2-categories.css";
 @import "3-screens/3-about.css";
 @import "3-screens/4-front-page.css";
+@import "3-screens/5-settings/1-dashboard.css";
 
 @import "4-helpers.css";
 

cabal.project

@@ -1,27 +1,20 @@
 packages:
     ./
 
--- profiling: True
-executable-dynamic: True
-
-with-compiler: ghc-9.4.7
+with-compiler: ghc-9.6.4
 
 active-repositories: hackage.haskell.org
 
-store-dir: _build/cabal-store
-
 tests: True
 
-documentation: True
-
 allow-newer: type-errors-pretty:base
-           , prometheus-proc:base
-           , prometheus-proc:text
            , souffle-haskell:text
            , servant-lucid:text
            , lucid-svg:text
+           , lucid-svg:transformers
            , lucid-aria:text
            , lucid-alpine:text
+           , hashable:filepath
 
 allow-older: pg-entity:time
 
@@ -50,18 +43,10 @@ source-repository-package
     location: https://github.com/supki/envparse
     tag: 503a699
 
-source-repository-package
-    type: git
-    location: https://github.com/fimad/prometheus-haskell
-    tag: 43f19da
-    subdir: ./prometheus-metrics-ghc
-            ./prometheus-client 
-            ./wai-middleware-prometheus
-
 source-repository-package
     type: git
     location: https://github.com/flora-pm/wai-middleware-heartbeat
-    tag: 336523a
+    tag: 5b56e1d
 
 source-repository-package
     type: git
@@ -82,3 +67,8 @@ source-repository-package
     type: git
     location: https://github.com/haskell-cryptography/one-time-password
     tag: 2ca2313
+
+source-repository-package
+    type: git
+    location: https://github.com/tchoutri/souffle-haskell
+    tag: 3afe53f