diff --git a/agora.cabal b/agora.cabal index 7f2420f..0c8baa6 100644 --- a/agora.cabal +++ b/agora.cabal @@ -19,7 +19,6 @@ common lang -fprint-explicit-foralls -fprint-explicit-kinds -Wunused-do-bind default-extensions: - NoFieldSelectors NoStarIsType BangPatterns BinaryLiterals @@ -59,7 +58,6 @@ common lang NamedWildCards NumericUnderscores OverloadedLabels - OverloadedRecordDot OverloadedStrings PackageImports PartialTypeSignatures @@ -79,6 +77,8 @@ common lang TypeSynonymInstances UndecidableInstances ViewPatterns + NoFieldSelectors + OverloadedRecordDot default-language: Haskell2010 diff --git a/agora/Agora/AuthorityToken.hs b/agora/Agora/AuthorityToken.hs index b1bffc0..cae2c12 100644 --- a/agora/Agora/AuthorityToken.hs +++ b/agora/Agora/AuthorityToken.hs @@ -31,18 +31,18 @@ import Plutarch.Api.V2 ( ) import Plutarch.Extra.AssetClass (PAssetClassData) import Plutarch.Extra.Bool (passert) -import "liqwid-plutarch-extra" Plutarch.Extra.List (plookupAssoc) import Plutarch.Extra.Maybe (passertPJust, pfromJust) import Plutarch.Extra.Sum (PSum (PSum)) import Plutarch.Extra.Tagged (PTagged) +import Plutarch.Extra.Traversable (pfoldMap) +import Plutarch.Extra.Value (psymbolValueOf') +import "liqwid-plutarch-extra" Plutarch.Extra.List (plookupAssoc) import "liqwid-plutarch-extra" Plutarch.Extra.TermCont ( pguardC, pletC, pletFieldsC, pmatchC, ) -import Plutarch.Extra.Traversable (pfoldMap) -import Plutarch.Extra.Value (psymbolValueOf') -------------------------------------------------------------------------------- diff --git a/agora/Agora/Effect/GovernorMutation.hs b/agora/Agora/Effect/GovernorMutation.hs index 5d0b560..82e7e2d 100644 --- a/agora/Agora/Effect/GovernorMutation.hs +++ b/agora/Agora/Effect/GovernorMutation.hs @@ -39,7 +39,6 @@ import Plutarch.DataRepr ( PDataFields, ) import Plutarch.Extra.Field (pletAll, pletAllC) -import "liqwid-plutarch-extra" Plutarch.Extra.List (ptryFromSingleton) import Plutarch.Extra.Maybe (passertPJust, pfromJust) import Plutarch.Extra.Record (mkRecordConstr, (.=)) import Plutarch.Extra.ScriptContext ( @@ -49,10 +48,11 @@ import Plutarch.Extra.ScriptContext ( ptryFromRedeemer, ) import Plutarch.Extra.Tagged (PTagged) -import "liqwid-plutarch-extra" Plutarch.Extra.TermCont (pguardC, pletC, pletFieldsC) import Plutarch.Lift (PConstantDecl, PLifted, PUnsafeLiftDecl) import PlutusLedgerApi.V1 (TxOutRef) import PlutusTx qualified +import "liqwid-plutarch-extra" Plutarch.Extra.List (ptryFromSingleton) +import "liqwid-plutarch-extra" Plutarch.Extra.TermCont (pguardC, pletC, pletFieldsC) -------------------------------------------------------------------------------- diff --git a/agora/Agora/Effect/TreasuryWithdrawal.hs b/agora/Agora/Effect/TreasuryWithdrawal.hs index 4f3c1fd..de0a6a5 100644 --- a/agora/Agora/Effect/TreasuryWithdrawal.hs +++ b/agora/Agora/Effect/TreasuryWithdrawal.hs @@ -34,14 +34,14 @@ import Plutarch.DataRepr ( PDataFields, ) import Plutarch.Extra.Field (pletAllC) -import "liqwid-plutarch-extra" Plutarch.Extra.List (pdeleteFirst) import Plutarch.Extra.ScriptContext (pisPubKey) import Plutarch.Extra.Tagged (PTagged) -import "liqwid-plutarch-extra" Plutarch.Extra.TermCont (pguardC, pletC, pletFieldsC) import Plutarch.Lift (PConstantDecl, PUnsafeLiftDecl (PLifted)) import PlutusLedgerApi.V1.Credential (Credential) import PlutusLedgerApi.V1.Value (Value) import PlutusTx qualified +import "liqwid-plutarch-extra" Plutarch.Extra.List (pdeleteFirst) +import "liqwid-plutarch-extra" Plutarch.Extra.TermCont (pguardC, pletC, pletFieldsC) {- | Datum that encodes behavior of Treasury Withdrawal effect. diff --git a/agora/Agora/Governor.hs b/agora/Agora/Governor.hs index e7cb192..6c372f2 100644 --- a/agora/Agora/Governor.hs +++ b/agora/Agora/Governor.hs @@ -60,16 +60,16 @@ import Plutarch.Extra.IsData ( EnumIsData (EnumIsData), PlutusTypeEnumData, ) -import "liqwid-plutarch-extra" Plutarch.Extra.List (pfindJust) import Plutarch.Extra.Maybe (pjust, pnothing) import Plutarch.Extra.Record (mkRecordConstr, (.=)) import Plutarch.Extra.ScriptContext (ptryFromRedeemer) import Plutarch.Extra.Tagged (PTagged) -import "liqwid-plutarch-extra" Plutarch.Extra.TermCont (pletFieldsC) import Plutarch.Extra.Value (passetClassValueOfT) import Plutarch.Lift (PConstantDecl, PUnsafeLiftDecl (PLifted)) import PlutusLedgerApi.V1 (TxOutRef) import PlutusTx qualified +import "liqwid-plutarch-extra" Plutarch.Extra.List (pfindJust) +import "liqwid-plutarch-extra" Plutarch.Extra.TermCont (pletFieldsC) -------------------------------------------------------------------------------- diff --git a/agora/Agora/Governor/Scripts.hs b/agora/Agora/Governor/Scripts.hs index 928993c..15a76eb 100644 --- a/agora/Agora/Governor/Scripts.hs +++ b/agora/Agora/Governor/Scripts.hs @@ -56,8 +56,6 @@ import Plutarch.Api.V2 ( ) import Plutarch.Extra.AssetClass (PAssetClassData, passetClass) import Plutarch.Extra.Field (pletAll, pletAllC) -import "liqwid-plutarch-extra" Plutarch.Extra.List (pfindJust, plistEqualsBy, pmapMaybe) -import "liqwid-plutarch-extra" Plutarch.Extra.Map (pkeys, ptryLookup) import Plutarch.Extra.Maybe (passertPJust, pfromJust, pjust, pmaybeData, pnothing) import Plutarch.Extra.Ord (POrdering (..), pcompareBy, pfromOrd, psort) import Plutarch.Extra.Record (mkRecordConstr, (.&), (.=)) @@ -71,6 +69,9 @@ import Plutarch.Extra.ScriptContext ( pvalueSpent, ) import Plutarch.Extra.Tagged (PTagged) +import Plutarch.Extra.Value (passetClassValueOf, psymbolValueOf) +import "liqwid-plutarch-extra" Plutarch.Extra.List (pfindJust, plistEqualsBy, pmapMaybe) +import "liqwid-plutarch-extra" Plutarch.Extra.Map (pkeys, ptryLookup) import "liqwid-plutarch-extra" Plutarch.Extra.TermCont ( pguardC, pletC, @@ -78,7 +79,6 @@ import "liqwid-plutarch-extra" Plutarch.Extra.TermCont ( pmatchC, ptryFromC, ) -import Plutarch.Extra.Value (passetClassValueOf, psymbolValueOf) -------------------------------------------------------------------------------- diff --git a/agora/Agora/Proposal.hs b/agora/Agora/Proposal.hs index 71ee430..c090a80 100644 --- a/agora/Agora/Proposal.hs +++ b/agora/Agora/Proposal.hs @@ -77,11 +77,8 @@ import Plutarch.Extra.IsData ( PlutusTypeEnumData, ProductIsData (ProductIsData), ) -import "liqwid-plutarch-extra" Plutarch.Extra.List (pfindJust) -import "liqwid-plutarch-extra" Plutarch.Extra.Map qualified as PM import Plutarch.Extra.Maybe (pfromJust) import Plutarch.Extra.Tagged (PTagged) -import "liqwid-plutarch-extra" Plutarch.Extra.TermCont (pguardC, pletC) import Plutarch.Lift ( DerivePConstantViaNewtype (DerivePConstantViaNewtype), PConstantDecl, @@ -90,6 +87,9 @@ import Plutarch.Lift ( import Plutarch.Orphans () import PlutusLedgerApi.V2 (Credential, DatumHash, ScriptHash) import PlutusTx qualified +import "liqwid-plutarch-extra" Plutarch.Extra.List (pfindJust) +import "liqwid-plutarch-extra" Plutarch.Extra.Map qualified as PM +import "liqwid-plutarch-extra" Plutarch.Extra.TermCont (pguardC, pletC) -------------------------------------------------------------------------------- -- Haskell-land diff --git a/agora/Agora/Proposal/Scripts.hs b/agora/Agora/Proposal/Scripts.hs index f92b550..ec8d73f 100644 --- a/agora/Agora/Proposal/Scripts.hs +++ b/agora/Agora/Proposal/Scripts.hs @@ -52,13 +52,6 @@ import Plutarch.Extra.AssetClass ( ) import Plutarch.Extra.Category (PCategory (pidentity)) import Plutarch.Extra.Field (pletAll, pletAllC) -import "liqwid-plutarch-extra" Plutarch.Extra.List ( - pfindJust, - plistEqualsBy, - pmapMaybe, - ptryFromSingleton, - ) -import "plutarch-extra" Plutarch.Extra.Map (pupdate) import Plutarch.Extra.Maybe ( passertPJust, pfromJust, @@ -76,6 +69,16 @@ import Plutarch.Extra.ScriptContext ( ) import Plutarch.Extra.Sum (PSum (PSum)) import Plutarch.Extra.Tagged (PTagged) +import Plutarch.Extra.Time (PFullyBoundedTimeRange) +import Plutarch.Extra.Traversable (pfoldMap) +import Plutarch.Extra.Value (psymbolValueOf') +import Plutarch.Unsafe (punsafeCoerce) +import "liqwid-plutarch-extra" Plutarch.Extra.List ( + pfindJust, + plistEqualsBy, + pmapMaybe, + ptryFromSingleton, + ) import "liqwid-plutarch-extra" Plutarch.Extra.TermCont ( pguardC, pletC, @@ -83,10 +86,7 @@ import "liqwid-plutarch-extra" Plutarch.Extra.TermCont ( pmatchC, ptryFromC, ) -import Plutarch.Extra.Time (PFullyBoundedTimeRange) -import Plutarch.Extra.Traversable (pfoldMap) -import Plutarch.Extra.Value (psymbolValueOf') -import Plutarch.Unsafe (punsafeCoerce) +import "plutarch-extra" Plutarch.Extra.Map (pupdate) {- | Policy for Proposals. diff --git a/agora/Agora/Proposal/Time.hs b/agora/Agora/Proposal/Time.hs index df0415f..edf8a71 100644 --- a/agora/Agora/Proposal/Time.hs +++ b/agora/Agora/Proposal/Time.hs @@ -49,7 +49,6 @@ import Plutarch.Extra.Bool (passert) import Plutarch.Extra.Field (pletAll, pletAllC) import Plutarch.Extra.IsData (PlutusTypeEnumData) import Plutarch.Extra.Maybe (pjust, pmaybe, pnothing) -import "liqwid-plutarch-extra" Plutarch.Extra.TermCont (pletC, pmatchC) import Plutarch.Extra.Time ( PFullyBoundedTimeRange (PFullyBoundedTimeRange), pisWithinTimeRange, @@ -63,6 +62,7 @@ import Plutarch.Lift ( import Plutarch.Num (PNum) import PlutusLedgerApi.V1 (POSIXTime) import PlutusTx qualified +import "liqwid-plutarch-extra" Plutarch.Extra.TermCont (pletC, pmatchC) -------------------------------------------------------------------------------- diff --git a/agora/Agora/Stake.hs b/agora/Agora/Stake.hs index df2e3f7..b42e667 100644 --- a/agora/Agora/Stake.hs +++ b/agora/Agora/Stake.hs @@ -75,7 +75,6 @@ import Plutarch.Extra.IsData ( DerivePConstantViaDataList (DerivePConstantViaDataList), ProductIsData (ProductIsData), ) -import "liqwid-plutarch-extra" Plutarch.Extra.List (pfindJust, pmapMaybe) import Plutarch.Extra.Maybe (passertPJust, pjust, pnothing) import Plutarch.Extra.ScriptContext (ptryFromOutputDatum) import Plutarch.Extra.Sum (PSum (PSum)) @@ -85,6 +84,7 @@ import Plutarch.Extra.Value (passetClassValueOfT) import Plutarch.Lift (PConstantDecl, PUnsafeLiftDecl (PLifted)) import PlutusLedgerApi.V2 (Credential, POSIXTime) import PlutusTx qualified +import "liqwid-plutarch-extra" Plutarch.Extra.List (pfindJust, pmapMaybe) -------------------------------------------------------------------------------- diff --git a/agora/Agora/Stake/Redeemers.hs b/agora/Agora/Stake/Redeemers.hs index 63eba7d..2ed44e0 100644 --- a/agora/Agora/Stake/Redeemers.hs +++ b/agora/Agora/Stake/Redeemers.hs @@ -54,15 +54,15 @@ import Plutarch.Api.V1.Address (PCredential) import Plutarch.Api.V2 (PMaybeData, PPOSIXTime) import Plutarch.Extra.Bool (passert) import Plutarch.Extra.Field (pletAll, pletAllC) +import Plutarch.Extra.Maybe (pdjust, pdnothing, pmaybeData) +import Plutarch.Extra.Record (mkRecordConstr, (.&), (.=)) +import Plutarch.Extra.Time (PFullyBoundedTimeRange (PFullyBoundedTimeRange)) import "liqwid-plutarch-extra" Plutarch.Extra.List ( pisSingleton, ptryDeleteFirstBy, ptryFromSingleton, ) -import Plutarch.Extra.Maybe (pdjust, pdnothing, pmaybeData) -import Plutarch.Extra.Record (mkRecordConstr, (.&), (.=)) import "liqwid-plutarch-extra" Plutarch.Extra.TermCont (pguardC, pletC, pletFieldsC, pmatchC) -import Plutarch.Extra.Time (PFullyBoundedTimeRange (PFullyBoundedTimeRange)) -- | A wrapper which ensures that no proposal is presented in the transaction. pwithoutProposal :: diff --git a/agora/Agora/Stake/Scripts.hs b/agora/Agora/Stake/Scripts.hs index d546a5d..c652e05 100644 --- a/agora/Agora/Stake/Scripts.hs +++ b/agora/Agora/Stake/Scripts.hs @@ -77,7 +77,6 @@ import Plutarch.Extra.AssetClass ( import Plutarch.Extra.Bool (passert) import Plutarch.Extra.Field (pletAll, pletAllC) import Plutarch.Extra.Functor (PFunctor (pfmap)) -import "liqwid-plutarch-extra" Plutarch.Extra.List (pfindJust, pmapMaybe) import Plutarch.Extra.Maybe ( passertPJust, pdjust, @@ -96,13 +95,6 @@ import Plutarch.Extra.ScriptContext ( pvalueSpent, ) import Plutarch.Extra.Tagged (PTagged) -import "liqwid-plutarch-extra" Plutarch.Extra.TermCont ( - pguardC, - pletC, - pletFieldsC, - pmatchC, - ptryFromC, - ) import Plutarch.Extra.Value ( passetClassValueOf, passetClassValueOfT, @@ -111,6 +103,14 @@ import Plutarch.Extra.Value ( ) import Plutarch.Num (PNum (pnegate)) import Plutarch.Unsafe (punsafeCoerce) +import "liqwid-plutarch-extra" Plutarch.Extra.List (pfindJust, pmapMaybe) +import "liqwid-plutarch-extra" Plutarch.Extra.TermCont ( + pguardC, + pletC, + pletFieldsC, + pmatchC, + ptryFromC, + ) import Prelude hiding (Num ((+))) {- | Policy for Stake state threads. diff --git a/flake.lock b/flake.lock index b20b987..dd97fe0 100644 --- a/flake.lock +++ b/flake.lock @@ -4238,11 +4238,11 @@ "nixpkgs-lib": "nixpkgs-lib_9" }, "locked": { - "lastModified": 1671575600, - "narHash": "sha256-Wmbb7vEOHMFvGjqn/Jgck+fTwZ/N3k80bMG2yT+RZeg=", + "lastModified": 1672616755, + "narHash": "sha256-dvwU2ORLpiP6ZMXL3CJ/qrqmtLBLF6VAc+Fois7Qfew=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "0f13f0455740c3dabee986eb86a976073e31f4de", + "rev": "87673d7c13a799d95ce25ff5dc7b9e15f01af2ea", "type": "github" }, "original": { @@ -8478,16 +8478,16 @@ "plutarch": "plutarch" }, "locked": { - "lastModified": 1672673536, - "narHash": "sha256-ORm28dhrlJhXB44v4vGehRNcSmPzxojHxvHqVWWU/XU=", + "lastModified": 1672762905, + "narHash": "sha256-RmGJPiCTZVGB/7W+9wk2wHdsRY9HCihgFCXBVURlnD0=", "owner": "Liqwid-Labs", "repo": "liqwid-nix", - "rev": "dabb2319b609774360c124e02c354387ec9e2592", + "rev": "737112114094a2326c82531a784157c0cebbbd5a", "type": "github" }, "original": { "owner": "Liqwid-Labs", - "ref": "v2.1.1", + "ref": "v2.2.0", "repo": "liqwid-nix", "type": "github" } @@ -8511,16 +8511,16 @@ "plutarch": "plutarch_2" }, "locked": { - "lastModified": 1672673536, - "narHash": "sha256-ORm28dhrlJhXB44v4vGehRNcSmPzxojHxvHqVWWU/XU=", + "lastModified": 1672762905, + "narHash": "sha256-RmGJPiCTZVGB/7W+9wk2wHdsRY9HCihgFCXBVURlnD0=", "owner": "Liqwid-Labs", "repo": "liqwid-nix", - "rev": "dabb2319b609774360c124e02c354387ec9e2592", + "rev": "737112114094a2326c82531a784157c0cebbbd5a", "type": "github" }, "original": { "owner": "Liqwid-Labs", - "ref": "v2.1.1", + "ref": "v2.2.0", "repo": "liqwid-nix", "type": "github" } @@ -8546,16 +8546,16 @@ "plutarch": "plutarch_3" }, "locked": { - "lastModified": 1672673536, - "narHash": "sha256-ORm28dhrlJhXB44v4vGehRNcSmPzxojHxvHqVWWU/XU=", + "lastModified": 1672762905, + "narHash": "sha256-RmGJPiCTZVGB/7W+9wk2wHdsRY9HCihgFCXBVURlnD0=", "owner": "Liqwid-Labs", "repo": "liqwid-nix", - "rev": "dabb2319b609774360c124e02c354387ec9e2592", + "rev": "737112114094a2326c82531a784157c0cebbbd5a", "type": "github" }, "original": { "owner": "Liqwid-Labs", - "ref": "v2.1.1", + "ref": "v2.2.0", "repo": "liqwid-nix", "type": "github" } @@ -8583,16 +8583,16 @@ "plutarch": "plutarch_4" }, "locked": { - "lastModified": 1672673536, - "narHash": "sha256-ORm28dhrlJhXB44v4vGehRNcSmPzxojHxvHqVWWU/XU=", + "lastModified": 1672762905, + "narHash": "sha256-RmGJPiCTZVGB/7W+9wk2wHdsRY9HCihgFCXBVURlnD0=", "owner": "Liqwid-Labs", "repo": "liqwid-nix", - "rev": "dabb2319b609774360c124e02c354387ec9e2592", + "rev": "737112114094a2326c82531a784157c0cebbbd5a", "type": "github" }, "original": { "owner": "Liqwid-Labs", - "ref": "v2.1.1", + "ref": "v2.2.0", "repo": "liqwid-nix", "type": "github" } @@ -8620,16 +8620,16 @@ "plutarch": "plutarch_5" }, "locked": { - "lastModified": 1672673536, - "narHash": "sha256-ORm28dhrlJhXB44v4vGehRNcSmPzxojHxvHqVWWU/XU=", + "lastModified": 1672762905, + "narHash": "sha256-RmGJPiCTZVGB/7W+9wk2wHdsRY9HCihgFCXBVURlnD0=", "owner": "Liqwid-Labs", "repo": "liqwid-nix", - "rev": "dabb2319b609774360c124e02c354387ec9e2592", + "rev": "737112114094a2326c82531a784157c0cebbbd5a", "type": "github" }, "original": { "owner": "Liqwid-Labs", - "ref": "v2.1.1", + "ref": "v2.2.0", "repo": "liqwid-nix", "type": "github" } @@ -8650,11 +8650,11 @@ "ply": "ply" }, "locked": { - "lastModified": 1672688999, - "narHash": "sha256-ZvSKP5p6/DLtc42Z+4ID3JNMMGE74SKCw5q902+FQns=", + "lastModified": 1673019188, + "narHash": "sha256-ITiwDhOYEeYf77slqm244xuPbJMcGdYRokHi3SE19AI=", "owner": "Liqwid-Labs", "repo": "liqwid-plutarch-extra", - "rev": "14f96159eee184f52d40140cd11d9146ec6bd92f", + "rev": "49d24f86353e78de8cb5146ac3bcdacd553327f2", "type": "github" }, "original": { @@ -8676,11 +8676,11 @@ "nixpkgs-latest": "nixpkgs-latest_4" }, "locked": { - "lastModified": 1672691102, - "narHash": "sha256-pudDEK7NyGw5AeSdbTL76o08wKIaOZaF6CtxUguPG/8=", + "lastModified": 1673021192, + "narHash": "sha256-Yje+QLIQjgqInxVQgd1g5jtymDdsLsA7YopYLvErWZ8=", "owner": "Liqwid-Labs", "repo": "liqwid-script-export", - "rev": "97b6e5c0635e032f5ec48bf819e6a4eabc6fcbd4", + "rev": "0264d22da5356ae53a1fc183c6b76f82ef87a759", "type": "github" }, "original": { @@ -12479,11 +12479,11 @@ }, "nixpkgs-latest": { "locked": { - "lastModified": 1669639772, - "narHash": "sha256-eiy6Zr0omoRZCxn7WOffTeLSZzQGiGrKcN4ErmTqzow=", + "lastModified": 1673017763, + "narHash": "sha256-mARXXCo2UTjvWDVNyTxALMImzqgU6yWkXxnbvFNsHFg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a2494bf2042d605ca1c4a679401bdc4971da54fb", + "rev": "0cf9da53302db7be3a9527e97c42c4b2fb7448b2", "type": "github" }, "original": { @@ -12494,11 +12494,11 @@ }, "nixpkgs-latest_2": { "locked": { - "lastModified": 1669827296, - "narHash": "sha256-1xOaIa4XeRyVkPqlXHfvOVnV4UtxIFRlVSPvj6z0iEs=", + "lastModified": 1673014281, + "narHash": "sha256-WDvalX0fihNS6Wow+yL/k3OXC1FoXY1W/0pYQxFECNA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e4902f2eb0c2e03a02bc2eb4df7f5585d5c54b95", + "rev": "eec992ad7f245ed9991405f78eaa7379ad559884", "type": "github" }, "original": { @@ -12509,11 +12509,11 @@ }, "nixpkgs-latest_3": { "locked": { - "lastModified": 1669639772, - "narHash": "sha256-eiy6Zr0omoRZCxn7WOffTeLSZzQGiGrKcN4ErmTqzow=", + "lastModified": 1672761287, + "narHash": "sha256-Wb9B9yqU7nYaQ65UpkP3ofL35xa4zSizvvqT86SYDEM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a2494bf2042d605ca1c4a679401bdc4971da54fb", + "rev": "2bd27f69f7bedb05a8089d1d8c33bb0b43f39975", "type": "github" }, "original": { @@ -12524,11 +12524,11 @@ }, "nixpkgs-latest_4": { "locked": { - "lastModified": 1669639772, - "narHash": "sha256-eiy6Zr0omoRZCxn7WOffTeLSZzQGiGrKcN4ErmTqzow=", + "lastModified": 1673018635, + "narHash": "sha256-ZeTHprunWNkYzrfK2WqPIq+yiSwa9+9hruy6qZGUcP0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a2494bf2042d605ca1c4a679401bdc4971da54fb", + "rev": "5a4794823275eaa012dd06d812ec94dfd726485c", "type": "github" }, "original": { @@ -12539,11 +12539,11 @@ }, "nixpkgs-latest_5": { "locked": { - "lastModified": 1669639772, - "narHash": "sha256-eiy6Zr0omoRZCxn7WOffTeLSZzQGiGrKcN4ErmTqzow=", + "lastModified": 1673021095, + "narHash": "sha256-dNu+pgM1thYL1ME2zSW4PwEHDb37Kgv3S/HoBwErIAQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a2494bf2042d605ca1c4a679401bdc4971da54fb", + "rev": "0cac47c9cc840f2a68cf49a6da3ff2a657ad2e64", "type": "github" }, "original": { @@ -12717,11 +12717,11 @@ "nixpkgs-lib_9": { "locked": { "dir": "lib", - "lastModified": 1665349835, - "narHash": "sha256-UK4urM3iN80UXQ7EaOappDzcisYIuEURFRoGQ/yPkug=", + "lastModified": 1672350804, + "narHash": "sha256-jo6zkiCabUBn3ObuKXHGqqORUMH27gYDIFFfLq5P4wg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "34c5293a71ffdb2fe054eb5288adc1882c1eb0b1", + "rev": "677ed08a50931e38382dbef01cba08a8f7eac8f6", "type": "github" }, "original": { @@ -14524,11 +14524,11 @@ "nixpkgs-latest": "nixpkgs-latest_2" }, "locked": { - "lastModified": 1672686336, - "narHash": "sha256-SR6J0DnZUWyu/pdHyWYMolvAwxb4FyIWVvsQR3LCPAQ=", + "lastModified": 1673017645, + "narHash": "sha256-q9+hmwAvEaoaX1e48xS5bx5GvYFRUdWbHe+PjIBUSg8=", "owner": "Liqwid-Labs", "repo": "plutarch-context-builder", - "rev": "a292baab568f85129fe3aa86195d096227e34ae4", + "rev": "1243d95a73d9f4bfbc291b7daaa17b0fde28388a", "type": "github" }, "original": { @@ -14551,11 +14551,11 @@ "nixpkgs-latest": "nixpkgs-latest_3" }, "locked": { - "lastModified": 1672687285, - "narHash": "sha256-is8WSzjqyzBFYXQXtMthW86ZxuglI7FjRA5wNLvfuo0=", + "lastModified": 1673014165, + "narHash": "sha256-3qQ1SdjwBMr7R5D9J5D1b0fRpZBjs30P8YeMi1y9JNk=", "owner": "Liqwid-Labs", "repo": "plutarch-quickcheck", - "rev": "0f6529b556025c6cafe933594bfd7cb07f6602fc", + "rev": "70c13239adfd67d80464e9230f14d487855a428b", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index bbdc157..a58f263 100644 --- a/flake.nix +++ b/flake.nix @@ -15,7 +15,7 @@ nixpkgs-latest.url = "github:NixOS/nixpkgs"; liqwid-nix = { - url = "github:Liqwid-Labs/liqwid-nix/v2.1.1"; + url = "github:Liqwid-Labs/liqwid-nix/v2.2.0"; inputs.nixpkgs-latest.follows = "nixpkgs-latest"; }; @@ -29,10 +29,18 @@ ]; systems = [ "x86_64-linux" "aarch64-darwin" "x86_64-darwin" "aarch64-linux" ]; perSystem = { config, self', inputs', pkgs, system, ... }: + let + pkgs = import inputs.nixpkgs-latest { inherit system; }; + in { onchain.default = { src = ./.; ghc.version = "ghc925"; + fourmolu.package = pkgs.haskell.packages.ghc943.fourmolu_0_10_1_0; + hlint = { }; + cabalFmt = { }; + hasktags = { }; + applyRefact = { }; shell = { }; enableBuildChecks = true; extraHackageDeps = [