chore(3p/sources): Bump channels & overlays r/3942

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 <sternenseemann@systemli.org>
Reviewed-by: grfn <grfn@gws.fyi>
Reviewed-by: tazjin <tazjin@tvl.su>
Reviewed-by: wpcarro <wpcarro@gmail.com>

14 files changed, 12 insertions, 32 deletions

diff --git a/users/grfn/system/home/modules/development.nix b/users/grfn/system/home/modules/development.nix
index 5e677a855585..18a851d1493b 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 e8a1eb14eb1a..049c92fb4c9c 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 53fbd7a7c14a..b11467171615 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 1b67e0f160db..c11ceb55aa26 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 1d9c4d46cdc9..33a98f1ae5a9 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 d405cb40d3eb..0a993a2f479c 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 9d5cc134517f..d13ea8055c2b 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 9e483a8d4af7..154063b5dde2 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 3025eb15be5a..13b1ba158818 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 e9cfddc0e69c..a8274bf0aa44 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 be12bc294513..aa881b322779 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
diff --git a/users/tazjin/default.nix b/users/tazjin/default.nix
index 0c1baf14c8df..8359b2de3275 100644
--- a/users/tazjin/default.nix
+++ b/users/tazjin/default.nix
@@ -10,6 +10,9 @@ let
 
 in
 rustfmt.overrideAttrs (_: {
+  # rustfmt not respecting config atm, disable
+  meta.ci.skip = true;
+
   meta.ci.extraSteps.rustfmt = {
     command = rustfmt;
   };
diff --git a/users/wpcarro/website/sandbox/learnpianochords/src/server/App.hs b/users/wpcarro/website/sandbox/learnpianochords/src/server/App.hs
index e23757b01544..b7a31457b79e 100644
--- a/users/wpcarro/website/sandbox/learnpianochords/src/server/App.hs
+++ b/users/wpcarro/website/sandbox/learnpianochords/src/server/App.hs
@@ -43,7 +43,7 @@ run = do
   ctx@T.Context{..} <- ask
   ctx
     |> server
-    |> serve (Proxy @ API)
+    |> serve (Proxy @API)
     |> cors (const $ Just corsPolicy)
     |> Warp.run contextServerPort
     |> liftIO
diff --git a/users/wpcarro/zoo/Main.hs b/users/wpcarro/zoo/Main.hs
index 407d29e61e3a..c18edbed9666 100644
--- a/users/wpcarro/zoo/Main.hs
+++ b/users/wpcarro/zoo/Main.hs
@@ -157,4 +157,4 @@ parseInput x =
     _ -> Nothing
 
 main :: IO ()
-main = Warp.run 8000 $ serve (Proxy @ Api) server
+main = Warp.run 8000 $ serve (Proxy @Api) server