Merge #4475

4475: Use `fs-sim-0.1.0.0` and `fs-api-0.1.0.0`, update cabal `index-state`s r=dnadales a=jorisdral # Description With `fs-sim-0.1.0.0` and `fs-api-0.1.0.0` released to CHaP, we can remove an `s-r-p`. We update the `index-state`s for both Hackage and CHaP in the process. Co-authored-by: Joris Dral <joris@well-typed.com>
IntersectMBO · Mar 29, 2023 · a921380 · a921380
2 parents a0695a0 + a13795d
commit a921380
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 21 deletions.
diff --git a/cabal.project b/cabal.project
@@ -13,12 +13,12 @@ repository cardano-haskell-packages
 -- See CONTRIBUTING for some Nix commands you will need to run if you
 -- update either of these.
 -- repeat the index-state for hackage to work around haskell.nix parsing limitation
-index-state: 2023-02-22T00:00:00Z
+index-state: 2023-03-29T00:00:00Z
 index-state:
   -- Bump this if you need newer packages from Hackage
-  , hackage.haskell.org 2023-02-22T00:00:00Z
+  , hackage.haskell.org 2023-03-29T00:00:00Z
   -- Bump this if you need newer packages from CHaP
-  , cardano-haskell-packages 2023-03-22T15:33:46Z
+  , cardano-haskell-packages 2023-03-29T00:00:00Z
 
 packages: ./cardano-ping
           ./ouroboros-network-testing
@@ -80,13 +80,3 @@ package ouroboros-consensus-shelley
 
 package ouroboros-consensus-cardano
   flags: +asserts
-
--- TODO: remove this once fs-api and fs-sim are published to CHaP.
-source-repository-package
-  type: git
-  location: https://github.com/input-output-hk/fs-sim
-  tag: 13a1cfa5a82740c5723fb0a279b3f32f98c8b494
-  --sha256: 1q783gsb0hh4i0slvfwp5nppi8h425pkvj0kqr2lpl06y7y2gq41
-  subdir:
-    fs-api
-    fs-sim
diff --git a/nix/sources.json b/nix/sources.json
@@ -5,10 +5,10 @@
         "homepage": "https://input-output-hk.github.io/cardano-haskell-packages/",
         "owner": "input-output-hk",
         "repo": "cardano-haskell-packages",
-        "rev": "07bb6c7f3d5f6245fbc7b222ea082487736bdb67",
-        "sha256": "1mnms5r7bwjz2raw5v7mnl8svzl7jz6lqv64d1a9ccql3dhyp4wy",
+        "rev": "b115ff855d3812a6fb9a19bc3c1af20977bbe6b2",
+        "sha256": "1yfiswh61vwha61bwyy0zg7br1kf34lm6d26q0mdg0pzfg7ka33h",
         "type": "tarball",
-        "url": "https://github.com/input-output-hk/cardano-haskell-packages/archive/07bb6c7f3d5f6245fbc7b222ea082487736bdb67.tar.gz",
+        "url": "https://github.com/input-output-hk/cardano-haskell-packages/archive/b115ff855d3812a6fb9a19bc3c1af20977bbe6b2.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "hackage.nix": {
@@ -17,10 +17,10 @@
         "homepage": "",
         "owner": "input-output-hk",
         "repo": "hackage.nix",
-        "rev": "897c1249791993dec81a293f54c59fb2c9b68f17",
-        "sha256": "0sqbs30imjb3snr99nj4bqmqc1clakrhvjvsflg8b1i0aj7cwl36",
+        "rev": "83ed8375cd36e572d0c308fa592ea165e429870a",
+        "sha256": "12520j3985kcr89gs741970xv7k1pks3iad0d0znp4ga0k4k43am",
         "type": "tarball",
-        "url": "https://github.com/input-output-hk/hackage.nix/archive/897c1249791993dec81a293f54c59fb2c9b68f17.tar.gz",
+        "url": "https://github.com/input-output-hk/hackage.nix/archive/83ed8375cd36e572d0c308fa592ea165e429870a.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz",
         "version": "b3c99d7f13df89a9a918c835ecb7114098912962"
     },

diff --git a/ouroboros-consensus/src/Ouroboros/Consensus/Util/Orphans.hs b/ouroboros-consensus/src/Ouroboros/Consensus/Util/Orphans.hs
@@ -24,15 +24,19 @@ import qualified Data.Bimap as Bimap
 import           Data.IntPSQ (IntPSQ)
 import qualified Data.IntPSQ as PSQ
 import           Data.SOP.Strict
-import           NoThunks.Class (NoThunks (..), OnlyCheckWhnfNamed (..),
-                     allNoThunks, noThunksInKeysAndValues)
+import           NoThunks.Class (InspectHeap (..), InspectHeapNamed (..),
+                     NoThunks (..), OnlyCheckWhnfNamed (..), allNoThunks,
+                     noThunksInKeysAndValues)
 import           Ouroboros.Consensus.Block.Abstract
 import           Ouroboros.Consensus.Util.Condense
 import           Ouroboros.Consensus.Util.MonadSTM.NormalForm
 import           Ouroboros.Network.AnchoredFragment (AnchoredFragment)
 import qualified Ouroboros.Network.AnchoredFragment as AF
 import           Ouroboros.Network.Mock.Chain (Chain (..))
 import           Ouroboros.Network.Util.ShowProxy
+import           System.FS.API (SomeHasFS)
+import           System.FS.API.Types (FsPath, Handle)
+import           System.FS.CRC (CRC (CRC))
 
 {-------------------------------------------------------------------------------
   Condense
@@ -105,3 +109,14 @@ deriving newtype instance NoThunks Time
 instance NoThunks a => NoThunks (K a b) where
   showTypeOf _ = showTypeOf (Proxy @a)
   wNoThunks ctxt (K a) = wNoThunks ("K":ctxt) a
+
+{-------------------------------------------------------------------------------
+  fs-api
+-------------------------------------------------------------------------------}
+
+deriving via InspectHeapNamed "Handle" (Handle h)
+    instance NoThunks (Handle h)
+deriving via InspectHeap FsPath instance NoThunks FsPath
+deriving via OnlyCheckWhnfNamed "SomeHasFS" (SomeHasFS m)
+    instance NoThunks (SomeHasFS m)
+deriving newtype instance NoThunks CRC