Refactor flake.nix and update cuddle dependency (#297)

* Refactor flake.nix to independtly handle hackage updates

* Bump cuddle to 1.5.0.0

Author: joaosreis

flake.lock

@@ -1,5 +1,12 @@
 {
-  inputs.haskellNix.url = "github:input-output-hk/haskell.nix";
+  inputs.hackage = {
+    url = "github:input-output-hk/hackage.nix";
+    flake = false;
+  };
+  inputs.haskellNix = {
+    url = "github:input-output-hk/haskell.nix";
+    inputs.hackage.follows = "hackage";
+  };
   inputs.nixpkgs.follows = "haskellNix/nixpkgs-unstable";
   inputs.flake-utils.url = "github:numtide/flake-utils";
   inputs.git-hooks = {
@@ -14,8 +21,8 @@
     url = "github:tweag/CIPs?rev=5a4f49835b01695583830e01e2dfd11e9e582efc";
     flake = false;
   };
-  outputs =
-    { self, nixpkgs, flake-utils, haskellNix, git-hooks, treefmt-nix, cips }:
+  outputs = { self, nixpkgs, flake-utils, haskellNix, git-hooks, treefmt-nix
+    , cips, ... }:
     let
       supportedSystems =
         [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ];

flake.nix

@@ -43,7 +43,7 @@ library
   build-depends:
     base >=4.18 && <5,
     containers,
-    cuddle >=1.2,
+    cuddle >=1.5,
     heredoc >=0.2,
     scls-core,
     text,
@@ -63,7 +63,7 @@ library validate
     base >=4.18 && <5,
     bytestring,
     containers,
-    cuddle >=1.2,
+    cuddle >=1.5,
     scls-cardano,
     scls-core,
     text,
@@ -85,7 +85,7 @@ library testlib
     base16-bytestring,
     bytestring,
     cborg,
-    cuddle >=1.2,
+    cuddle >=1.5,
     hspec,
     hspec-expectations,
     scls-cardano:{validate},
@@ -103,7 +103,7 @@ executable gen-cddl
   main-is: Main.hs
   build-depends:
     base >=4.18 && <5,
-    cuddle >=1.2,
+    cuddle >=1.5,
     directory >=1,
     filepath >=1.4,
     prettyprinter,
@@ -129,7 +129,7 @@ test-suite scls-cardano-test
     bytestring,
     cborg,
     containers,
-    cuddle >=1.2,
+    cuddle >=1.5,
     directory,
     filepath,
     hspec,

scls-cardano/scls-cardano.cabal

@@ -14,6 +14,7 @@ import Codec.CBOR.Cuddle.CBOR.Gen (generateFromName)
 import Codec.CBOR.Cuddle.CBOR.Validator (validateCBOR)
 import Codec.CBOR.Cuddle.CBOR.Validator.Trace (Evidenced (..), SValidity (..), showValidationTrace)
 import Codec.CBOR.Cuddle.CDDL (Name (..))
+import Codec.CBOR.Cuddle.CDDL.CBORGenerator (GenEnv (..), runCBORGen)
 import Codec.CBOR.Cuddle.CDDL.CTree (CTreeRoot)
 import Codec.CBOR.Cuddle.CDDL.Resolve (MonoReferenced)
 import Codec.CBOR.Cuddle.IndexMappable (mapIndex)
@@ -48,7 +49,7 @@ generateCBORFromCDDL ::
   CTreeRoot MonoReferenced ->
   IO BS.ByteString
 generateCBORFromCDDL spec = do
-  term <- generate . runAntiGen $ generateFromName (mapIndex spec) (Name (T.pack "record_entry"))
+  term <- generate . runAntiGen $ runCBORGen (GenEnv{geTwiddle = False, geRoot = mapIndex spec}) . generateFromName $ (Name (T.pack "record_entry"))
   pure $ toStrictByteString $ encodeTerm term
 
 -- | Test if a reference CDDL accepts CBOR generated from another spec

scls-cardano/test/Conformance.hs

@@ -43,5 +43,5 @@ library
     base >=4.18 && <5,
     bytestring,
     cborg,
-    cuddle >=1.2,
+    cuddle >=1.5,
     mempack-scls,

scls-core/scls-core.cabal

@@ -117,7 +117,7 @@ test-suite scls-format-test
     cborg >=0.2,
     containers,
     crypton,
-    cuddle >=1.2,
+    cuddle >=1.5,
     filepath,
     hspec,
     hspec-expectations,

scls-format/scls-format.cabal

@@ -26,6 +26,7 @@ import Cardano.Types.Namespace qualified as Namespace
 import Cardano.Types.SlotNo (SlotNo (..))
 import Codec.CBOR.Cuddle.CBOR.Gen (generateFromName)
 import Codec.CBOR.Cuddle.CDDL (Name (..))
+import Codec.CBOR.Cuddle.CDDL.CBORGenerator (GenEnv (..), runCBORGen)
 import Codec.CBOR.Cuddle.CDDL.Resolve (
   asMap,
   buildMonoCTree,
@@ -114,7 +115,7 @@ mkRoundtripTestsFor groupName serialize =
         entries <-
           fmap nubByKey $ replicateM 1024 $ do
             key <- uniformByteStringM kSize globalStdGen
-            term <- generate . runAntiGen $ generateFromName (mapIndex mt) (Name (T.pack "record_entry"))
+            term <- generate . runAntiGen $ runCBORGen (GenEnv{geTwiddle = False, geRoot = mapIndex mt}) . generateFromName $ (Name (T.pack "record_entry"))
             Right canonicalTerm <- pure $ canonicalizeTerm p term
             pure $! SomeCBOREntry (GenericCBOREntry $ ChunkEntry (ByteStringSized @(NamespaceKeySize ns) key) (mkCBORTerm canonicalTerm))
         mEntries <-

scls-format/test/Roundtrip.hs

@@ -44,7 +44,7 @@ library
     cborg,
     containers,
     crypton,
-    cuddle >=1.2,
+    cuddle >=1.5,
     directory,
     filepath,
     mempack-scls,

scls-util/scls-util.cabal

@@ -49,6 +49,7 @@ import Cardano.SCLS.Util.Result
 import Cardano.Types.Namespace (Namespace)
 import Codec.CBOR.Cuddle.CBOR.Gen (generateFromName)
 import Codec.CBOR.Cuddle.CDDL (Name (..))
+import Codec.CBOR.Cuddle.CDDL.CBORGenerator (GenEnv (..), runCBORGen)
 import Control.Monad.Trans.Resource (runResourceT)
 
 -- | Generate a scls file with random data for debugging purposes.
@@ -99,7 +100,7 @@ generateNamespaceEntries (p :: proxy ns) count useRandomKeys spec =
   keyStream
     & S.take count
     & S.mapM \keyIn -> do
-      term <- liftIO . generate . runAntiGen $ generateFromName (mapIndex spec) (Name (T.pack "record_entry"))
+      term <- liftIO . generate . runAntiGen $ runCBORGen (GenEnv{geTwiddle = False, geRoot = mapIndex spec}) . generateFromName $ (Name (T.pack "record_entry"))
       Right canonicalTerm <- pure $ canonicalizeTerm p term
       pure $ GenericCBOREntry $ ChunkEntry (ByteStringSized @(NamespaceKeySize ns) keyIn) (mkCBORTerm canonicalTerm)
  where