From 73b1f0407bb224f82cca6ce1854a6080a6afecca Mon Sep 17 00:00:00 2001 From: sterni Date: Sun, 31 Mar 2024 11:56:52 +0200 Subject: chore(3p/sources): bump channels & overlays – xz edition MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 (https://github.com/nixos/nixpkgs/commit/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 Reviewed-by: sterni Reviewed-by: tazjin --- users/Profpatsch/cas-serve/cas-serve.cabal | 3 +-- users/Profpatsch/cas-serve/default.nix | 2 +- users/Profpatsch/ical-smolify/default.nix | 11 +++++++++-- users/Profpatsch/my-prelude/src/MyPrelude.hs | 3 ++- users/Profpatsch/my-prelude/src/Postgres/MonadPostgres.hs | 1 - users/Profpatsch/whatcd-resolver/default.nix | 2 -- users/Profpatsch/whatcd-resolver/whatcd-resolver.cabal | 4 ---- 7 files changed, 13 insertions(+), 13 deletions(-) (limited to 'users') diff --git a/users/Profpatsch/cas-serve/cas-serve.cabal b/users/Profpatsch/cas-serve/cas-serve.cabal index 82db1f5fd8..d14776700a 100644 --- a/users/Profpatsch/cas-serve/cas-serve.cabal +++ b/users/Profpatsch/cas-serve/cas-serve.cabal @@ -65,10 +65,9 @@ executable cas-serve text, sqlite-simple, http-types, - ihp-hsx, wai, warp, mtl, bytestring, memory, - cryptonite, + crypton, diff --git a/users/Profpatsch/cas-serve/default.nix b/users/Profpatsch/cas-serve/default.nix index 1b4fbe03e7..14c3e4aa13 100644 --- a/users/Profpatsch/cas-serve/default.nix +++ b/users/Profpatsch/cas-serve/default.nix @@ -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 diff --git a/users/Profpatsch/ical-smolify/default.nix b/users/Profpatsch/ical-smolify/default.nix index f67d175ce3..bf766db0e9 100644 --- a/users/Profpatsch/ical-smolify/default.nix +++ b/users/Profpatsch/ical-smolify/default.nix @@ -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; + }; +}) diff --git a/users/Profpatsch/my-prelude/src/MyPrelude.hs b/users/Profpatsch/my-prelude/src/MyPrelude.hs index ffc03c5ecd..880983c47e 100644 --- a/users/Profpatsch/my-prelude/src/MyPrelude.hs +++ b/users/Profpatsch/my-prelude/src/MyPrelude.hs @@ -345,7 +345,8 @@ stringToText = Data.Text.pack -- -- ATTN: Don’t 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' -- diff --git a/users/Profpatsch/my-prelude/src/Postgres/MonadPostgres.hs b/users/Profpatsch/my-prelude/src/Postgres/MonadPostgres.hs index 2585f6637c..f83a6d7fcf 100644 --- a/users/Profpatsch/my-prelude/src/Postgres/MonadPostgres.hs +++ b/users/Profpatsch/my-prelude/src/Postgres/MonadPostgres.hs @@ -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 diff --git a/users/Profpatsch/whatcd-resolver/default.nix b/users/Profpatsch/whatcd-resolver/default.nix index 6d5d0834b1..27468507ac 100644 --- a/users/Profpatsch/whatcd-resolver/default.nix +++ b/users/Profpatsch/whatcd-resolver/default.nix @@ -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 diff --git a/users/Profpatsch/whatcd-resolver/whatcd-resolver.cabal b/users/Profpatsch/whatcd-resolver/whatcd-resolver.cabal index cad1fabe99..a9bd04827b 100644 --- a/users/Profpatsch/whatcd-resolver/whatcd-resolver.cabal +++ b/users/Profpatsch/whatcd-resolver/whatcd-resolver.cabal @@ -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, -- cgit 1.4.1