diff --git a/.github/workflows/setup.sh b/.github/workflows/setup.sh index 4018def5..a67201bb 100755 --- a/.github/workflows/setup.sh +++ b/.github/workflows/setup.sh @@ -3,7 +3,7 @@ sudo sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list' wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | sudo apt-key add - sudo apt -y update -sudo apt -y install postgresql-14 g++ mcpp libffi7 llvm +sudo apt -y install postgresql-14 g++ mcpp libffi7 llvm zlib1g-dev wget https://github.com/souffle-lang/souffle/releases/download/2.2/x86_64-ubuntu-2004-souffle-2.2-Linux.deb sudo dpkg -i ./x86_64-ubuntu-2004-souffle-2.2-Linux.deb diff --git a/CHANGELOG.md b/CHANGELOG.md index 3918fdb9..5d6f7d37 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,8 @@ * Add @horizon namespace ([#498](https://github.com/flora-pm/flora-server/issues/498)) * Signal deprecations and revision dates in version listing page ([#548](https://github.com/flora-pm/flora-server/pull/548)) * Introduce [changelog-d](https://codeberg.org/fgaz/changelog-d) in the release process. +* Remove the last @apply from tailwind ([#550](https://github.com/flora-pm/flora-server/pulls/550)) +* Use GHC 9.6.5 and Souffle Datalog 2.2 for development ([#552](https://github.com/flora-pm/flora-server/pull/552)) ## 1.0.17 -- 2024-03-26 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 93c4068c..2adf946d 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -75,6 +75,7 @@ Here is the procedure to follow when making a release: * Bump the version in the flora.cabal file * Generate the changelog with ./scripts/generate-changelog.sh * Write down the date in the CHANGELOG + * Remove the changelog.d entries 2. Once the PR is merged into `development`, merge `development` into `main` 3. Create a [new release](https://github.com/flora-pm/flora-server/releases/new). diff --git a/Dockerfile b/Dockerfile index 5f806d08..9191206a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,8 +5,8 @@ FROM ubuntu@sha256:67211c14fa74f070d27cc59d69a7fa9aeff8e28ea118ef3babc295a0428a6 ARG GID=1000 ARG UID=1000 -ARG ghc_version=9.6.4 -ARG cabal_version=3.10.2.0 +ARG ghc_version=9.6.5 +ARG cabal_version=3.10.3.0 # generate a working directory USER "root" @@ -49,8 +49,8 @@ ENV PATH="$PATH:/home/$USER/.ghcup/bin" # install soufflé USER "root" -RUN wget --content-disposition https://github.com/souffle-lang/souffle/releases/download/2.3/x86_64-ubuntu-2004-souffle-2.3-Linux.deb -RUN apt install -f -y ./x86_64-ubuntu-2004-souffle-2.3-Linux.deb +RUN wget --content-disposition https://github.com/souffle-lang/souffle/releases/download/2.2/x86_64-ubuntu-2004-souffle-2.2-Linux.deb +RUN apt install -f -y ./x86_64-ubuntu-2004-souffle-2.2-Linux.deb USER ${USER} RUN echo $PATH @@ -72,7 +72,7 @@ COPY --chown=${USER} scripts/shell-welcome.txt /etc/motd COPY --chown=${USER} scripts/.zshrc /home/$USER/.zshrc # build Haskell dependencies -COPY --chown=${USER} cabal.project flora.cabal ./ +COPY --chown=${USER} cabal.project flora.cabal cabal.project.freeze ./ RUN cabal build --only-dependencies -j # compile Souffle source files diff --git a/cabal.project b/cabal.project index 7039e324..735fa951 100644 --- a/cabal.project +++ b/cabal.project @@ -1,7 +1,7 @@ packages: ./ -with-compiler: ghc-9.6.4 +with-compiler: ghc-9.6.5 active-repositories: hackage.haskell.org @@ -26,6 +26,9 @@ package * package warp flags: -x509 +package zlib + flags: -pkg-config + source-repository-package type: git location: https://github.com/haskell-cryptography/libsodium-bindings diff --git a/cabal.project.freeze b/cabal.project.freeze index 35e288d0..9cdfe5b5 100644 --- a/cabal.project.freeze +++ b/cabal.project.freeze @@ -1,10 +1,10 @@ active-repositories: hackage.haskell.org:merge -constraints: any.Cabal ==3.10.1.0, - any.Cabal-syntax ==3.10.1.0, +constraints: any.Cabal ==3.10.3.0, + any.Cabal-syntax ==3.10.3.0, any.HUnit ==1.6.2.0, any.JuicyPixels ==3.3.8, JuicyPixels -mmap, - any.OneTuple ==0.4.1.1, + any.OneTuple ==0.4.2, any.Only ==0.1, any.PyF ==0.11.2.1, PyF -python_test, @@ -21,19 +21,19 @@ constraints: any.Cabal ==3.10.1.0, aeson +ordered-keymap, any.aeson-pretty ==0.8.10, aeson-pretty -lib-only, - any.ansi-terminal ==1.0.2, + any.ansi-terminal ==1.1.1, ansi-terminal -example, - any.ansi-terminal-types ==0.11.5, + any.ansi-terminal-types ==1.1, any.appar ==0.1.8, any.array ==0.5.6.0, any.asn1-encoding ==0.9.6, any.asn1-parse ==0.9.5, any.asn1-types ==0.3.4, - any.assoc ==1.1, - assoc +tagged, + any.assoc ==1.1.1, + assoc -tagged, any.async ==2.2.4, async -bench, - any.atomic-primops ==0.8.5, + any.atomic-primops ==0.8.7, atomic-primops -debug, any.attoparsec ==0.14.4, attoparsec -developer, @@ -41,23 +41,23 @@ constraints: any.Cabal ==3.10.1.0, any.authenticate-oauth ==1.7, any.auto-update ==0.1.6, any.barbies ==2.1.1.0, - any.base ==4.18.2.0, + any.base ==4.18.2.1, any.base-compat ==0.13.1, any.base-compat-batteries ==0.13.1, - any.base-orphans ==0.9.1, + any.base-orphans ==0.9.2, any.base16 ==1.0, any.base16-bytestring ==1.0.2.0, any.base32 ==0.4, any.base64 ==1.0, any.base64-bytestring ==1.2.1.0, any.basement ==0.0.16, - any.bifunctors ==5.6.1, + any.bifunctors ==5.6.2, bifunctors +tagged, any.binary ==0.8.9.1, any.bitvec ==1.1.5.0, bitvec +simd, any.blaze-builder ==0.4.2.3, - any.blaze-html ==0.9.1.2, + any.blaze-html ==0.9.2.0, any.blaze-markup ==0.8.3.0, any.boring ==0.2.1, boring +tagged, @@ -67,7 +67,7 @@ constraints: any.Cabal ==3.10.1.0, any.byteorder ==1.0.4, any.byteslice ==0.2.13.2, byteslice +avoid-rawmemchr, - any.bytesmith ==0.3.11.0, + any.bytesmith ==0.3.11.1, any.bytestring ==0.11.5.3, any.bytestring-builder ==0.10.8.2.0, bytestring-builder +bytestring_has_builder, @@ -87,14 +87,14 @@ constraints: any.Cabal ==3.10.1.0, cmdargs +quotation -testprog, any.colour ==2.3.6, any.colourista ==0.1.0.2, - any.commonmark ==0.2.5.1, - any.commonmark-extensions ==0.2.5.2, + any.commonmark ==0.2.6, + any.commonmark-extensions ==0.2.5.4, any.comonad ==5.0.8, comonad +containers +distributive +indexed-traversable, - any.concurrent-output ==1.10.20, + any.concurrent-output ==1.10.21, any.conduit ==1.3.5, any.conduit-extra ==1.3.6, - any.constraints ==0.14, + any.constraints ==0.14.2, any.containers ==0.6.7, any.contiguous ==0.6.4.2, any.contravariant ==1.5.5, @@ -107,7 +107,7 @@ constraints: any.Cabal ==3.10.1.0, any.cryptohash-sha1 ==0.11.101.0, any.cryptohash-sha256 ==0.11.102.1, cryptohash-sha256 -exe +use-cbits, - any.crypton ==0.34, + any.crypton ==1.0.0, crypton -check_alignment +integer-gmp -old_toolchain_inliner +support_aesni +support_deepseq +support_pclmuldq +support_rdrand -support_sse +use_target_attributes, any.crypton-connection ==0.3.2, any.crypton-x509 ==1.7.6, @@ -122,11 +122,11 @@ constraints: any.Cabal ==3.10.1.0, any.data-default-instances-containers ==0.0.1, any.data-default-instances-dlist ==0.0.1, any.data-default-instances-old-locale ==0.0.1, - any.data-fix ==0.3.2, + any.data-fix ==0.3.3, any.dec ==0.0.5, any.deepseq ==1.4.8.1, any.deriving-aeson ==0.2.9, - any.directory ==1.3.8.1, + any.directory ==1.3.8.4, any.distributive ==0.6.2.1, distributive +semigroups +tagged, any.dlist ==1.0, @@ -143,12 +143,12 @@ constraints: any.Cabal ==3.10.1.0, any.erf ==2.0.0.0, any.exceptions ==0.10.7, any.extensible-exceptions ==0.1.1.4, - any.extra ==1.7.14, + any.extra ==1.7.16, any.fast-logger ==3.2.2, any.file-embed ==0.0.16.0, - any.filepath ==1.4.200.1, + any.filepath ==1.4.300.1, flora -prod, - any.foreign-store ==0.2, + any.foreign-store ==0.2.1, any.free ==5.2, any.friendly-time ==0.4.1, any.fusion-plugin-types ==0.1.0, @@ -156,17 +156,17 @@ constraints: any.Cabal ==3.10.1.0, generic-deriving +base-4-9, any.generically ==0.1.1, any.generics-sop ==0.5.1.4, - any.ghc ==9.6.4, + any.ghc ==9.6.5, any.ghc-bignum ==1.3, - any.ghc-boot ==9.6.4, - any.ghc-boot-th ==9.6.4, - any.ghc-heap ==9.6.4, + any.ghc-boot ==9.6.5, + any.ghc-boot-th ==9.6.5, + any.ghc-heap ==9.6.5, any.ghc-prim ==0.10.0, - any.ghci ==9.6.4, + any.ghci ==9.6.5, any.haddock-library ==1.11.0, any.half ==0.3.1, any.happy ==1.20.1.1, - any.hashable ==1.4.3.0, + any.hashable ==1.4.4.0, hashable +integer-gmp -random-initial-seed, any.haskell-lexer ==1.1.1, any.haskell-src-exts ==1.23.1, @@ -179,15 +179,15 @@ constraints: any.Cabal ==3.10.1.0, any.hpc ==0.6.2.0, any.hsc2hs ==0.68.10, hsc2hs -in-ghc-tree, - any.hspec ==2.11.7, - any.hspec-core ==2.11.7, - any.hspec-discover ==2.11.7, + any.hspec ==2.11.8, + any.hspec-core ==2.11.8, + any.hspec-discover ==2.11.8, any.hspec-expectations ==0.8.4, any.hsyslog ==5.0.2, hsyslog -install-examples, any.http-api-data ==0.6, http-api-data -use-text-show, - any.http-client ==0.7.16, + any.http-client ==0.7.17, http-client +network-uri, any.http-client-tls ==0.3.6.3, any.http-conduit ==2.3.8.3, @@ -201,15 +201,15 @@ constraints: any.Cabal ==3.10.1.0, any.indexed-traversable ==0.1.3, any.indexed-traversable-instances ==0.1.1.2, any.insert-ordered-containers ==0.2.5.3, - any.integer-conversion ==0.1.0.1, + any.integer-conversion ==0.1.1, any.integer-gmp ==1.1, any.integer-logarithms ==1.0.3.1, integer-logarithms -check-bounds +integer-gmp, - any.invariant ==0.6.2, + any.invariant ==0.6.3, any.iproute ==1.7.12, any.iso8601-time ==0.1.5, iso8601-time +new-time, - any.kan-extensions ==5.2.5, + any.kan-extensions ==5.2.6, any.lens ==5.2.3, lens -benchmark-uniplate -dump-splices +inlining -j +test-hunit +test-properties +test-templates +trustworthy, any.libsodium-bindings ==0.0.1.1, @@ -238,7 +238,7 @@ constraints: any.Cabal ==3.10.1.0, monad-loops +base4, any.monad-time ==0.4.0.0, any.monad-time-effectful ==1.0.0.0, - any.mono-traversable ==1.0.15.3, + any.mono-traversable ==1.0.17.0, any.mtl ==2.3.1, any.mtl-compat ==0.2.2, mtl-compat -two-point-one -two-point-two, @@ -260,7 +260,7 @@ constraints: any.Cabal ==3.10.1.0, any.optics-th ==0.4.1, any.optparse-applicative ==0.18.1.0, optparse-applicative +process, - any.os-string ==2.0.2, + any.os-string ==2.0.2.2, any.parallel ==3.2.2.0, any.parsec ==3.1.16.1, any.parser-combinators ==1.3.0, @@ -274,7 +274,7 @@ constraints: any.Cabal ==3.10.1.0, any.poolboy ==0.2.2.0, any.postgresql-libpq ==0.9.5.0, postgresql-libpq -use-pkg-config, - any.postgresql-migration ==0.2.1.7, + any.postgresql-migration ==0.2.1.8, any.postgresql-simple ==0.6.5.1, any.pretty ==1.1.3.6, any.pretty-show ==1.10, @@ -282,10 +282,10 @@ constraints: any.Cabal ==3.10.1.0, prettyprinter -buildreadme +text, any.prettyprinter-ansi-terminal ==1.1.3, any.primitive ==0.9.0.0, - any.primitive-addr ==0.1.0.2, - any.primitive-offset ==0.2.0.0, + any.primitive-addr ==0.1.0.3, + any.primitive-offset ==0.2.0.1, any.primitive-unlifted ==2.1.0.0, - any.process ==1.6.17.0, + any.process ==1.6.19.0, any.profunctors ==5.6.2, any.psqueues ==0.2.8.0, any.qrcode-core ==0.9.9, @@ -295,7 +295,7 @@ constraints: any.Cabal ==3.10.1.0, any.raven-haskell ==0.1.4.1, raven-haskell -tests, any.recv ==0.1.0, - any.reflection ==2.1.7, + any.reflection ==2.1.8, reflection -slow +template-haskell, any.req ==3.13.2, req -dev, @@ -307,12 +307,12 @@ constraints: any.Cabal ==3.10.1.0, any.run-st ==0.1.3.3, any.safe ==0.3.21, any.safe-exceptions ==0.1.7.4, - any.scientific ==0.3.7.0, - scientific -bytestring-builder -integer-simple, + any.scientific ==0.3.8.0, + scientific -integer-simple, any.sel ==0.0.1.0, any.semialign ==1.3, semialign +semigroupoids, - any.semigroupoids ==6.0.0.1, + any.semigroupoids ==6.0.1, semigroupoids +comonad +containers +contravariant +distributive +tagged +unordered-containers, any.semigroups ==0.20, semigroups +binary +bytestring -bytestring-builder +containers +deepseq +hashable +tagged +template-haskell +text +transformers +unordered-containers, @@ -355,7 +355,7 @@ constraints: any.Cabal ==3.10.1.0, any.syb ==0.7.2.4, any.tagged ==0.8.8, tagged +deepseq +transformers, - any.tar ==0.6.1.0, + any.tar ==0.6.2.0, any.tasty ==1.5, tasty +unix, any.tasty-hunit ==0.10.1, @@ -364,26 +364,25 @@ constraints: any.Cabal ==3.10.1.0, any.terminal-size ==0.3.4, any.text ==2.0.2, any.text-conversions ==0.3.1.1, - any.text-display ==0.0.5.1, + any.text-display ==0.0.5.2, text-display -book, any.text-iso8601 ==0.1, any.text-manipulate ==0.3.1.0, - any.text-short ==0.1.5, + any.text-short ==0.1.6, text-short -asserts, any.tf-random ==0.5, any.th-abstraction ==0.6.0.0, - any.th-compat ==0.1.4, + any.th-compat ==0.1.5, any.th-expand-syns ==0.4.11.0, any.th-lift ==0.8.4, any.th-orphans ==0.13.14, any.th-reify-many ==0.1.10, any.these ==1.2, any.time ==1.12.2, - any.time-compat ==1.9.6.1, - time-compat -old-locale, + any.time-compat ==1.9.7, any.time-manager ==0.0.1, any.timing-convenience ==0.1, - any.tls ==2.0.1, + any.tls ==2.0.5, tls -devel, any.torsor ==0.1.0.1, any.transformers ==0.6.1.0, @@ -392,8 +391,8 @@ constraints: any.Cabal ==3.10.1.0, any.transformers-compat ==0.7.2, transformers-compat -five +five-three -four +generic-deriving +mtl -three -two, any.tuples ==0.1.0.0, - any.type-equality ==1, any.typed-process ==0.2.11.1, + any.typed-process-effectful ==1.0.0.1, any.unicode-data ==0.4.0.1, unicode-data -ucd2haskell, any.unicode-transforms ==0.4.0.1, @@ -420,7 +419,7 @@ constraints: any.Cabal ==3.10.1.0, any.void ==0.7.3, void -safe, any.wai ==3.2.4, - any.wai-app-static ==3.1.8, + any.wai-app-static ==3.1.9, wai-app-static +crypton -print, any.wai-extra ==3.1.14, wai-extra -build-example, @@ -437,6 +436,6 @@ constraints: any.Cabal ==3.10.1.0, any.xml-conduit-writer ==0.1.1.5, any.xml-types ==0.3.8, any.zigzag ==0.1.0.0, - any.zlib ==0.6.3.0, - zlib -bundled-c-zlib -non-blocking-ffi -pkg-config -index-state: hackage.haskell.org 2024-02-21T10:56:14Z + any.zlib ==0.7.1.0, + zlib -bundled-c-zlib +non-blocking-ffi -pkg-config +index-state: hackage.haskell.org 2024-05-14T16:55:19Z diff --git a/changelog.d/550 b/changelog.d/550 deleted file mode 100644 index 57553416..00000000 --- a/changelog.d/550 +++ /dev/null @@ -1,3 +0,0 @@ -synopsis: Remove the last @apply from tailwind -prs: #550 -issues: #0 diff --git a/changelog.d/config b/changelog.d/config index 093dac71..986678ac 100644 --- a/changelog.d/config +++ b/changelog.d/config @@ -2,4 +2,4 @@ organization: flora-pm repository: flora-server issue-url-template: https://github.com/{organization}/{repository}/issues/{index} pr-url-template: https://github.com/{organization}/{repository}/pulls/{index} -required-fields: synopsis prs issues +required-fields: synopsis prs diff --git a/flora.cabal b/flora.cabal index 6170725c..262bd1f5 100644 --- a/flora.cabal +++ b/flora.cabal @@ -1,18 +1,18 @@ cabal-version: 3.0 name: flora -version: 1.0.17 +version: 1.0.18 homepage: https://github.com/flora-pm/flora-server/#readme bug-reports: https://github.com/flora-pm/flora-server/issues author: Théophile Choutri maintainer: Théophile Choutri license: BSD-3-Clause build-type: Simple -extra-source-files: +extra-source-files: LICENSE +extra-doc-files: CHANGELOG.md - LICENSE README.md -tested-with: GHC ==9.6.4 +tested-with: GHC ==9.6.5 source-repository head type: git