chore(3p/sources): bump channels & overlays – xz edition

Update all 3p/sources as we do normally except

- agenix which is still pinned to 0.15.0

- nixpkgs (unstable) which we bump to the HEAD of the staging-next
  branch. This branch includes the downgrade of xz from 5.6.1 to
  5.4.6 (d6dc19adbd). It
  also includes the second haskell-updates rotation with GHC 9.6.4
  which contains a few build fixes that seem to be required to get
  our Haskell targets to work.

Note that this only reverts xz to a version that doesn't contain the now
known backdoor (CVE-2024-3094) which may or may not actually affect
NixOS. Additionally reverting to a version before the malicious
contributor's involvement may be difficult, but prudent:
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1068024

Changes required by the updates:

- //3p/overlays/haskell:

  - Update ihp-hsx to latest master to fix build with Stackage LTS 22.
  - Update tmp-postgres to latest master to work around failure with
    ansi-wl-pprint >= 1.
  - Patch punycode for mtl >= 2.3.

- //users/Profpatsch:

  - Clean up some warnings, mostly about unused dependencies
  - my-prelude: Fix build with ghc-boot-9.6.4
  - cas-serve: Use crypton over unmaintained cryptonite
  - ical-smolify: skip in ci, iCalendar would require heavy patching to
    work with Stackage LTS 22.

- //users/{wpcarro,aspen,flokli}:

  Disable home-manager / nixos configuration builds that seem to have
  transient failures that should disappear as we move away from
  staging-next and closer to an actual channel release.

Change-Id: I5cca48e101041c3aedc1d9932dbca2cac885fcc1
Reviewed-on: https://cl.tvl.fyi/c/depot/+/11289
Tested-by: BuildkiteCI
Autosubmit: sterni <sternenseemann@systemli.org>
Reviewed-by: sterni <sternenseemann@systemli.org>
Reviewed-by: tazjin <tazjin@tvl.su>
This commit is contained in:
sterni 2024-03-31 11:56:52 +02:00 committed by clbot
parent b67b0a6d72
commit 73b1f0407b
10 changed files with 68 additions and 32 deletions

View file

@ -65,10 +65,9 @@ executable cas-serve
text,
sqlite-simple,
http-types,
ihp-hsx,
wai,
warp,
mtl,
bytestring,
memory,
cryptonite,
crypton,

View file

@ -15,7 +15,7 @@ let
libraryHaskellDepends = [
pkgs.haskellPackages.pa-prelude
pkgs.haskellPackages.pa-label
pkgs.haskellPackages.ihp-hsx
pkgs.haskellPackages.crypton
pkgs.haskellPackages.wai
pkgs.haskellPackages.warp
pkgs.haskellPackages.sqlite-simple

View file

@ -1,7 +1,7 @@
{ depot, pkgs, lib, ... }:
let
cas-serve = pkgs.writers.writeHaskell "ical-smolify"
ical-smolify = pkgs.writers.writeHaskell "ical-smolify"
{
libraries = [
pkgs.haskellPackages.iCalendar
@ -13,4 +13,11 @@ let
} ./IcalSmolify.hs;
in
cas-serve
ical-smolify.overrideAttrs (old: {
meta = lib.recursiveUpdate old.meta or { } {
# Dependency iCalendar no longer builds in nixpkgs due to a lack of maintenance upstream
# https://github.com/nixos/nixpkgs/commit/13d10cc6e302e7d5800c6a08c1728b14c3801e26
ci.skip = true;
};
})

View file

@ -345,7 +345,8 @@ stringToText = Data.Text.pack
--
-- ATTN: Dont use `String` in code if you can avoid it, prefer `Text` instead.
stringToBytesUtf8 :: String -> ByteString
stringToBytesUtf8 = GHC.utf8EncodeString
-- TODO(Profpatsch): use a stable interface
stringToBytesUtf8 = GHC.utf8EncodeByteString
-- | Like `show`, but generate a 'Text'
--

View file

@ -8,7 +8,6 @@ module Postgres.MonadPostgres where
import AtLeast (AtLeast)
import Control.Exception
import Control.Foldl qualified as Fold
import Control.Monad.Except
import Control.Monad.Logger.CallStack (MonadLogger, logDebug, logWarn)
import Control.Monad.Reader (MonadReader (ask), ReaderT (..))
import Control.Monad.Trans.Resource

View file

@ -31,7 +31,6 @@ let
pkgs.haskellPackages.pa-run-command
pkgs.haskellPackages.aeson-better-errors
pkgs.haskellPackages.blaze-html
pkgs.haskellPackages.dlist
pkgs.haskellPackages.hs-opentelemetry-sdk
pkgs.haskellPackages.http-conduit
pkgs.haskellPackages.http-types
@ -39,7 +38,6 @@ let
pkgs.haskellPackages.monad-logger
pkgs.haskellPackages.resource-pool
pkgs.haskellPackages.postgresql-simple
pkgs.haskellPackages.selective
pkgs.haskellPackages.tmp-postgres
pkgs.haskellPackages.unliftio
pkgs.haskellPackages.wai-extra

View file

@ -86,13 +86,11 @@ library
aeson-better-errors,
aeson,
blaze-html,
blaze-markup,
bytestring,
case-insensitive,
containers,
unordered-containers,
directory,
dlist,
exceptions,
filepath,
hs-opentelemetry-sdk,
@ -107,8 +105,6 @@ library
resource-pool,
postgresql-simple,
punycode,
scientific,
selective,
tmp-postgres,
unliftio,
wai-extra,