From 11f9306b9a90e11b549fb6fa331742e4f729da7e Mon Sep 17 00:00:00 2001 From: sterni Date: Thu, 31 Mar 2022 18:40:08 +0200 Subject: chore(3p/sources): Bump channels & overlays Use nixos-unstable-small which fixes CVE-2018-25032 (out of bounds write while compressing). * //users/grfn/xanthous: - Supporting random-fu 0.3 requires considerable changes and patching random-extras (https://github.com/aristidb/random-extras/pull/5). For now we downgrade random-fu and its dependency rvar to 0.2.*, forcing us to build xanthous with GHC 8.10.7, due to random-fu 0.2.* not supporting that version. Nix expressions for the downgraded packages are checked in to avoid the potential need to compile Haskell at pipeline eval time. - generic-arbitrary exposes a GenericArbitrary newtype now. This means we no longer have to implement it in xanthous downstream and patch generic-arbitrary to expose the GArbitrary type class. - Minor adjustments for lens 5.0: Xanthous.Game.Memo: clear needs to use ASetter' instead of Lens' Xanthous.Data.EntityMap: TraversableWithIndex no longer has an itraversed function. - Xanthous.Orphans: adjust for aeson's KeyMap, use KM.size explicitly instead of relying on MonoTraversable's length * //nix/buildLisp: the CCL issue has resurfaced, disabling the implementation once again. * //3p/arion: remove, as depot uses the nixpkgs package of it anyways. * //users/wpcarro: accomodate GHC 9.0.1's stricter parsing of operators. * //users/tazjin: disable rustfmt as it stopped respecting settings * //3p/overlays: upgrade home-manager until fix for serivce generation has landed upstream * //users/grfn/system: remove rr override, as the pinned commit is part of the 5.5.0 release shipped by nixpkgs. Change-Id: If229e7317ba48498f85170b57ee9053f6997ff8a Reviewed-on: https://cl.tvl.fyi/c/depot/+/5428 Tested-by: BuildkiteCI Autosubmit: sterni Reviewed-by: grfn Reviewed-by: tazjin Reviewed-by: wpcarro --- users/grfn/system/home/modules/development.nix | 11 +---------- users/grfn/xanthous/default.nix | 2 +- users/grfn/xanthous/shell.nix | 2 +- users/grfn/xanthous/src/Xanthous/Data.hs | 1 - users/grfn/xanthous/src/Xanthous/Data/EntityMap.hs | 1 - users/grfn/xanthous/src/Xanthous/Entities/Character.hs | 1 - .../xanthous/src/Xanthous/Entities/Creature/Hippocampus.hs | 1 - users/grfn/xanthous/src/Xanthous/Game/Memo.hs | 2 +- users/grfn/xanthous/src/Xanthous/Game/State.hs | 1 - users/grfn/xanthous/src/Xanthous/Orphans.hs | 5 +++-- users/grfn/xanthous/src/Xanthous/Util/QuickCheck.hs | 10 ---------- 11 files changed, 7 insertions(+), 30 deletions(-) (limited to 'users/grfn') diff --git a/users/grfn/system/home/modules/development.nix b/users/grfn/system/home/modules/development.nix index 5e677a8555..18a851d149 100644 --- a/users/grfn/system/home/modules/development.nix +++ b/users/grfn/system/home/modules/development.nix @@ -59,16 +59,7 @@ with lib; lldb hyperfine clang-tools_11 - (rr.overrideAttrs (_: rec { - version = "f25671d094edac8059cec56b98d7f10f2c740697"; - src = pkgs.fetchFromGitHub { - owner = "rr-debugger"; - repo = "rr"; - rev = version; - sha256 = "149s4mw8vl8d3nx15sfp62z0izp2dibz99k720j75rjnkwk2bq2z"; - fetchSubmodules = true; - }; - })) + rr clj2nix clojure diff --git a/users/grfn/xanthous/default.nix b/users/grfn/xanthous/default.nix index e8a1eb14eb..049c92fb4c 100644 --- a/users/grfn/xanthous/default.nix +++ b/users/grfn/xanthous/default.nix @@ -15,7 +15,7 @@ let || builtins.baseNameOf path == "package.yaml"); }; # generated by cabal2nix - basePkg = pkgs.haskellPackages.callPackage ./pkg.nix { }; + basePkg = pkgs.haskell.packages.ghc8107.callPackage ./pkg.nix { }; in pkgs.haskell.lib.overrideCabal basePkg (default: { diff --git a/users/grfn/xanthous/shell.nix b/users/grfn/xanthous/shell.nix index 53fbd7a7c1..b114671716 100644 --- a/users/grfn/xanthous/shell.nix +++ b/users/grfn/xanthous/shell.nix @@ -4,7 +4,7 @@ let pkgs = third_party.nixpkgs; in -(pkgs.haskellPackages.extend (pkgs.haskell.lib.packageSourceOverrides { +(pkgs.haskell.packages.ghc8107.extend (pkgs.haskell.lib.packageSourceOverrides { xanthous = third_party.gitignoreSource ./.; })).shellFor { packages = p: [ p.xanthous ]; diff --git a/users/grfn/xanthous/src/Xanthous/Data.hs b/users/grfn/xanthous/src/Xanthous/Data.hs index 1b67e0f160..c11ceb55aa 100644 --- a/users/grfn/xanthous/src/Xanthous/Data.hs +++ b/users/grfn/xanthous/src/Xanthous/Data.hs @@ -131,7 +131,6 @@ import Data.Coerce import Data.Proxy (Proxy(Proxy)) -------------------------------------------------------------------------------- import Xanthous.Util (EqEqProp(..), EqProp, between) -import Xanthous.Util.QuickCheck (GenericArbitrary(..)) import Xanthous.Orphans () import Xanthous.Util.Graphics import qualified Linear.Metric as Metric diff --git a/users/grfn/xanthous/src/Xanthous/Data/EntityMap.hs b/users/grfn/xanthous/src/Xanthous/Data/EntityMap.hs index 1d9c4d46cd..33a98f1ae5 100644 --- a/users/grfn/xanthous/src/Xanthous/Data/EntityMap.hs +++ b/users/grfn/xanthous/src/Xanthous/Data/EntityMap.hs @@ -133,7 +133,6 @@ instance FunctorWithIndex EntityID EntityMap instance FoldableWithIndex EntityID EntityMap instance TraversableWithIndex EntityID EntityMap where - itraversed = byID . itraversed . rmap sequenceA . distrib itraverse = itraverseOf itraversed type instance Element (EntityMap a) = a diff --git a/users/grfn/xanthous/src/Xanthous/Entities/Character.hs b/users/grfn/xanthous/src/Xanthous/Entities/Character.hs index d405cb40d3..0a993a2f47 100644 --- a/users/grfn/xanthous/src/Xanthous/Entities/Character.hs +++ b/users/grfn/xanthous/src/Xanthous/Entities/Character.hs @@ -45,7 +45,6 @@ import Test.QuickCheck.Checkers (EqProp) import Control.Monad.State.Lazy (execState) import Control.Monad.Trans.State.Lazy (execStateT) -------------------------------------------------------------------------------- -import Xanthous.Util.QuickCheck import Xanthous.Game.State import Xanthous.Entities.Item import Xanthous.Entities.Common diff --git a/users/grfn/xanthous/src/Xanthous/Entities/Creature/Hippocampus.hs b/users/grfn/xanthous/src/Xanthous/Entities/Creature/Hippocampus.hs index 9d5cc13451..d13ea8055c 100644 --- a/users/grfn/xanthous/src/Xanthous/Entities/Creature/Hippocampus.hs +++ b/users/grfn/xanthous/src/Xanthous/Entities/Creature/Hippocampus.hs @@ -25,7 +25,6 @@ import Test.QuickCheck import Test.QuickCheck.Arbitrary.Generic -------------------------------------------------------------------------------- import Xanthous.Data -import Xanthous.Util.QuickCheck -------------------------------------------------------------------------------- diff --git a/users/grfn/xanthous/src/Xanthous/Game/Memo.hs b/users/grfn/xanthous/src/Xanthous/Game/Memo.hs index 9e483a8d4a..154063b5dd 100644 --- a/users/grfn/xanthous/src/Xanthous/Game/Memo.hs +++ b/users/grfn/xanthous/src/Xanthous/Game/Memo.hs @@ -45,7 +45,7 @@ emptyMemoState :: MemoState emptyMemoState = MemoState { _characterVisiblePositions = UnMemoized } {-# INLINE emptyMemoState #-} -clear :: Lens' MemoState (Memoized k v) -> MemoState -> MemoState +clear :: ASetter' MemoState (Memoized key val) -> MemoState -> MemoState clear = flip set UnMemoized {-# INLINE clear #-} diff --git a/users/grfn/xanthous/src/Xanthous/Game/State.hs b/users/grfn/xanthous/src/Xanthous/Game/State.hs index 3025eb15be..13b1ba1588 100644 --- a/users/grfn/xanthous/src/Xanthous/Game/State.hs +++ b/users/grfn/xanthous/src/Xanthous/Game/State.hs @@ -100,7 +100,6 @@ import qualified Graphics.Vty.Attributes as Vty import qualified Graphics.Vty.Image as Vty -------------------------------------------------------------------------------- import Xanthous.Util (KnownBool(..)) -import Xanthous.Util.QuickCheck (GenericArbitrary(..)) import Xanthous.Data import Xanthous.Data.App import Xanthous.Data.Levels diff --git a/users/grfn/xanthous/src/Xanthous/Orphans.hs b/users/grfn/xanthous/src/Xanthous/Orphans.hs index e9cfddc0e6..a8274bf0aa 100644 --- a/users/grfn/xanthous/src/Xanthous/Orphans.hs +++ b/users/grfn/xanthous/src/Xanthous/Orphans.hs @@ -11,7 +11,8 @@ module Xanthous.Orphans -------------------------------------------------------------------------------- import Xanthous.Prelude hiding (elements, (.=)) -------------------------------------------------------------------------------- -import Data.Aeson +import Data.Aeson hiding (Key) +import qualified Data.Aeson.KeyMap as KM import Data.Aeson.Types (typeMismatch) import Data.List.NonEmpty (NonEmpty(..)) import Graphics.Vty.Attributes @@ -461,7 +462,7 @@ instance forall a. (FromJSON a, Ord a) => FromJSON (Interval a) where upper <- parseBound $ arr ^?! ix 1 pure $ interval lower upper parseBound = withObject "Bound" $ \obj -> do - when (length obj /= 1) $ fail "Expected an object with a single key" + when (KM.size obj /= 1) $ fail "Expected an object with a single key" let [(k, v)] = obj ^@.. ifolded boundary <- case k of "Excluded" -> pure Open diff --git a/users/grfn/xanthous/src/Xanthous/Util/QuickCheck.hs b/users/grfn/xanthous/src/Xanthous/Util/QuickCheck.hs index be12bc2945..aa881b3227 100644 --- a/users/grfn/xanthous/src/Xanthous/Util/QuickCheck.hs +++ b/users/grfn/xanthous/src/Xanthous/Util/QuickCheck.hs @@ -14,7 +14,6 @@ import Test.QuickCheck.Function import Test.QuickCheck.Instances.ByteString () import Test.QuickCheck.Arbitrary.Generic import Data.Aeson -import GHC.Generics (Rep) -------------------------------------------------------------------------------- newtype FunctionShow a = FunctionShow a @@ -31,12 +30,3 @@ newtype FunctionJSON a = FunctionJSON a instance (ToJSON a, FromJSON a) => Function (FunctionJSON a) where function = functionJSON - --------------------------------------------------------------------------------- - -newtype GenericArbitrary a = GenericArbitrary a - deriving newtype Generic - -instance (Generic a, GArbitrary rep, Rep a ~ rep) - => Arbitrary (GenericArbitrary a) where - arbitrary = genericArbitrary -- cgit 1.4.1