Skip to content

Replace Haskell git submodules with source-repository-package stanzas #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Jimbo4350 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Replace Haskell git submodules with source-repository-package stanzas #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a1839db
replace haskell git submodules with source-repository-package stanzas.
Jimbo4350 May 27, 2026
2066c1e
fix casing of Script_Native_0.json golden filename in JsonSpec.
Jimbo4350 May 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,6 @@
[submodule "hugo-theme-learn"]
path = docs/themes/learn
url = https://github.com/matcornic/hugo-theme-learn.git
[submodule "modules/wai-routes"]
path = server/modules/wai-routes
url = https://github.com/CardanoSolutions/wai-routes.git
[submodule "modules/hjsonpointer"]
path = server/modules/hjsonpointer
url = https://github.com/CardanoSolutions/hjsonpointer.git
[submodule "modules/hjsonschema"]
path = server/modules/hjsonschema
url = https://github.com/CardanoSolutions/hjsonschema.git
[submodule "server/config"]
path = server/config
url = https://github.com/cardano-foundation/cardano-configurations.git
12 changes: 10 additions & 2 deletions server/cabal.project
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,6 @@ packages:
modules/contra-tracers
modules/fast-bech32
modules/git-th
modules/hjsonpointer
modules/hjsonschema
modules/hspec-json-schema
modules/json-rpc

Expand Down Expand Up @@ -87,6 +85,16 @@ package text
package formatting
flags: +no-double-conversion

source-repository-package
type: git
location: https://github.com/CardanoSolutions/hjsonpointer.git
tag: 879f0e74d55eef76ceaec8f60ed07657ab84bad7

source-repository-package
type: git
location: https://github.com/CardanoSolutions/hjsonschema.git
tag: fc9cfe92723e305e6289e7c1733f3420d64dd9d5

-- cardano-ledger with queryDRepDelegations backported on top of conway-1.19.0.0 (instead of 1.20.0.0).
source-repository-package
type: git
Expand Down
1 change: 0 additions & 1 deletion server/modules/hjsonpointer
Open in desktop
Submodule hjsonpointer deleted from 879f0e
1 change: 0 additions & 1 deletion server/modules/hjsonschema
Open in desktop
Submodule hjsonschema deleted from fc9cfe
1 change: 0 additions & 1 deletion server/modules/wai-routes
Open in desktop
Submodule wai-routes deleted from d74b39
3 changes: 0 additions & 3 deletions server/src/Ogmios/App/Server/Http.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@
{-# LANGUAGE DeriveGeneric #-}
{-# LANGUAGE TemplateHaskell #-}

-- NOTE: Needed because of auto-generated template-haskell code for wai-routes.
{-# OPTIONS_GHC -fno-warn-redundant-constraints #-}

module Ogmios.App.Server.Http
( mkHttpApp
, healthCheck
Expand Down
2 changes: 1 addition & 1 deletion server/test/unit/Ogmios/Data/JsonSpec.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -395,7 +395,7 @@ spec = do
fail "successfully decoded an invalid payload (as Conway Utxo)?"

specify "Golden: Script_Native_0.json" $ do
json <- decodeFileThrow "Script_native_0.json"
json <- decodeFileThrow "Script_Native_0.json"
case traverse @[] (Json.parse (decodeScript @BabbageEra)) json of
Json.Error e ->
fail (show e)
Expand Down
Loading