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/whatcd-resolver/default.nix | 2 -- users/Profpatsch/whatcd-resolver/whatcd-resolver.cabal | 4 ---- 2 files changed, 6 deletions(-) (limited to 'users/Profpatsch/whatcd-resolver') diff --git a/users/Profpatsch/whatcd-resolver/default.nix b/users/Profpatsch/whatcd-resolver/default.nix index 6d5d0834b1a7..27468507ac5a 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 cad1fabe9905..a9bd04827b83 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