From 65a3f9e33c972fb9de19a86fe6cfe0d3775857f7 Mon Sep 17 00:00:00 2001 From: Samuel Leathers Date: Sat, 16 Dec 2023 09:59:26 -0500 Subject: [PATCH 1/6] chap: migrate to chap.intersectmbo.org --- RELEASING.md | 6 +++--- cabal.project | 2 +- flake.nix | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/RELEASING.md b/RELEASING.md index f62713aac4..56e0eb55ae 100644 --- a/RELEASING.md +++ b/RELEASING.md @@ -9,7 +9,7 @@ When making a new release, firstly you have to decide on a new version number fo In order to decide which version number needs to be bumped up, it is necessary to know what was the latest released version of a package. Three simple ways are: -* look at the latest version on [`cardano-haskell-packages` (aka **CHaP**)](https://input-output-hk.github.io/cardano-haskell-packages/index.html) - the most reliable way +* look at the latest version on [`cardano-haskell-packages` (aka **CHaP**)](https://chap.intersectmbo.org/index.html) - the most reliable way * current version in the changelog * look at the latest git tag for the version @@ -132,7 +132,7 @@ Briefly speaking, it requires executing of the following steps: 1. Merge the PR - you don't need additional approvals for that if you belong to the correct GitHub access group. -After package gets released, you can check the released version at: https://input-output-hk.github.io/cardano-haskell-packages/all-package-versions/ and update the version in the dependant packages, in their cabal files, for example: `cardano-api ^>= 8.3` +After package gets released, you can check the released version at: https://chap.intersectmbo.org/all-package-versions/ and update the version in the dependant packages, in their cabal files, for example: `cardano-api ^>= 8.3` ## Troubleshooting @@ -156,7 +156,7 @@ This issue happens due to frequent cache collisions in the [`cabal-cache`](https ## References 1. https://github.com/input-output-hk/cardano-updates/tree/main/scripts 1. https://github.com/input-output-hk/cardano-ledger/blob/master/RELEASING.md -1. https://input-output-hk.github.io/cardano-haskell-packages/index.html +1. https://chap.intersectmbo.org/index.html 1. https://input-output-hk.github.io/cardano-engineering-handbook/policy/haskell/packaging/versioning.html diff --git a/cabal.project b/cabal.project index a6be891d9d..01c6a86855 100644 --- a/cabal.project +++ b/cabal.project @@ -1,6 +1,6 @@ -- Custom repository for cardano haskell packages, see CONTRIBUTING for more repository cardano-haskell-packages - url: https://input-output-hk.github.io/cardano-haskell-packages + url: https://chap.intersectmbo.org secure: True root-keys: 3e0cce471cf09815f930210f7827266fd09045445d65923e6d0238a6cd15126f diff --git a/flake.nix b/flake.nix index 357cb58019..f5344360be 100644 --- a/flake.nix +++ b/flake.nix @@ -64,7 +64,7 @@ # nix flake lock --update-input CHaP # inputMap = { - "https://input-output-hk.github.io/cardano-haskell-packages" = inputs.CHaP; + "https://chap.intersectmbo.org" = inputs.CHaP; }; # Also currently needed to make `nix flake lock --update-input CHaP` work. cabalProjectLocal = '' From b7a423b8c194c0fb3026500e285f0c69a1206236 Mon Sep 17 00:00:00 2001 From: Jordan Millar Date: Sat, 16 Dec 2023 11:13:34 -0400 Subject: [PATCH 2/6] Add trailing slash --- cabal.project | 2 +- flake.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cabal.project b/cabal.project index 01c6a86855..2dacb16f36 100644 --- a/cabal.project +++ b/cabal.project @@ -1,6 +1,6 @@ -- Custom repository for cardano haskell packages, see CONTRIBUTING for more repository cardano-haskell-packages - url: https://chap.intersectmbo.org + url: https://chap.intersectmbo.org/ secure: True root-keys: 3e0cce471cf09815f930210f7827266fd09045445d65923e6d0238a6cd15126f diff --git a/flake.nix b/flake.nix index f5344360be..7967ce0376 100644 --- a/flake.nix +++ b/flake.nix @@ -64,7 +64,7 @@ # nix flake lock --update-input CHaP # inputMap = { - "https://chap.intersectmbo.org" = inputs.CHaP; + "https://chap.intersectmbo.org/" = inputs.CHaP; }; # Also currently needed to make `nix flake lock --update-input CHaP` work. cabalProjectLocal = '' From ab1ef20c8332bd285dca6a4dfa632ccde4e53a3e Mon Sep 17 00:00:00 2001 From: Samuel Leathers Date: Sat, 16 Dec 2023 10:37:45 -0500 Subject: [PATCH 3/6] update GH pages links in markdown --- README.md | 2 +- cardano-api/CHANGELOG.md | 2 +- cardano-api/internal/Cardano/Api/Query.hs | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 2e4aa3196c..2280b9dbc8 100644 --- a/README.md +++ b/README.md @@ -17,4 +17,4 @@ See the [Contributing guide](CONTRIBUTING.md) for how to contribute to this proj Development documentation can be found in [Cardano Node Wiki](https://github.com/input-output-hk/cardano-node-wiki/wiki). -Haddock documentation is available at: https://input-output-hk.github.io/cardano-api/ +Haddock documentation is available at: https://cardano-api.cardano.intersectmbo.org/ diff --git a/cardano-api/CHANGELOG.md b/cardano-api/CHANGELOG.md index d235adb8e8..430059350e 100644 --- a/cardano-api/CHANGELOG.md +++ b/cardano-api/CHANGELOG.md @@ -1732,7 +1732,7 @@ None - Improved tests for Byron era legacy key formats (#2259) - More precise error cases for tx outputs that are out of range (#2217) - Host up-to-date generated API documentation via github - https://input-output-hk.github.io/cardano-node/ (#2273, #2276, #2278) + https://cardano-node.cardano.intersectmbo.org/ (#2273, #2276, #2278) ## 1.24.2 -- December 2020 diff --git a/cardano-api/internal/Cardano/Api/Query.hs b/cardano-api/internal/Cardano/Api/Query.hs index eaf32492a7..3daba208ac 100644 --- a/cardano-api/internal/Cardano/Api/Query.hs +++ b/cardano-api/internal/Cardano/Api/Query.hs @@ -326,8 +326,8 @@ data QueryInShelleyBasedEra era result where -- | Mapping for queries in Shelley-based eras returning minimal node-to-client protocol versions. More -- information about queries versioning can be found: --- * https://input-output-hk.github.io/ouroboros-network/ouroboros-network/Ouroboros-Network-NodeToClient.html#t:NodeToClientVersion --- * https://input-output-hk.github.io/ouroboros-consensus/docs/for-developers/QueryVersioning/#implementation +-- * https://ouroboros-network.cardano.intersectmbo.org/ouroboros-network/Ouroboros-Network-NodeToClient.html#t:NodeToClientVersion +-- * https://ouroboros-consensus.cardano.intersectmbo.org/docs/for-developers/QueryVersioning/#implementation instance NodeToClientVersionOf (QueryInShelleyBasedEra era result) where nodeToClientVersionOf QueryEpoch = NodeToClientV_9 nodeToClientVersionOf QueryGenesisParameters = NodeToClientV_9 From be45aa624142d396fa76c2e74f15896af78aec64 Mon Sep 17 00:00:00 2001 From: Samuel Leathers Date: Sat, 16 Dec 2023 10:50:59 -0500 Subject: [PATCH 4/6] codeowners/flake fixes --- CODEOWNERS | 6 +++--- flake.nix | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CODEOWNERS b/CODEOWNERS index 18deb5d324..9671617a77 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -8,10 +8,10 @@ cabal.project @Jimbo4350 @newhog # Specific reviewers for code pieces # NB - The last matching pattern takes precedence -*.nix @input-output-hk/core-tech-release -flake.lock @input-output-hk/core-tech-release +*.nix @intersectmbo/core-tech-release +flake.lock @intersectmbo/core-tech-release # Technical writers README.* @Jimbo4350 @newhoggy @olgahryniuk @disassembler @CarlosLopezDeLara -.github @Jimbo4350 @newhoggy @carbolymer @input-output-hk/core-tech-release +.github @Jimbo4350 @newhoggy @carbolymer @intersectmbo/core-tech-release diff --git a/flake.nix b/flake.nix index 7967ce0376..930319d741 100644 --- a/flake.nix +++ b/flake.nix @@ -10,7 +10,7 @@ cardano-mainnet-mirror.url = "github:input-output-hk/cardano-mainnet-mirror"; cardano-mainnet-mirror.flake = false; - CHaP.url = "github:input-output-hk/cardano-haskell-packages?ref=repo"; + CHaP.url = "github:intersectmbo/cardano-haskell-packages?ref=repo"; CHaP.flake = false; # non-flake nix compatibility From 1fa75a1f6183a9736b4edab4f5bb2fa1412aa65a Mon Sep 17 00:00:00 2001 From: Samuel Leathers Date: Sat, 16 Dec 2023 11:16:38 -0500 Subject: [PATCH 5/6] flake: update urls --- flake.lock | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/flake.lock b/flake.lock index fbc98fba93..6dc13d9205 100644 --- a/flake.lock +++ b/flake.lock @@ -3,15 +3,15 @@ "CHaP": { "flake": false, "locked": { - "lastModified": 1701353939, - "narHash": "sha256-wsljJKhdO0EhfYlXDZ6ZMNnXgNC7C2Wh+TYqSNkwBRo=", - "owner": "input-output-hk", + "lastModified": 1702742788, + "narHash": "sha256-lSU0M27LC0d60cJ2C2Kdo6gBwTCCYRiALbD528CoTtc=", + "owner": "intersectmbo", "repo": "cardano-haskell-packages", - "rev": "c1a79fca672e85c9545694ff037594bafc869bcb", + "rev": "4a236a8ad9e3c6d20235de27eacbe3d4de72479c", "type": "github" }, "original": { - "owner": "input-output-hk", + "owner": "intersectmbo", "ref": "repo", "repo": "cardano-haskell-packages", "type": "github" From 22d451337c4c5629fa1eefeeb72cb5485ca8d6bc Mon Sep 17 00:00:00 2001 From: Jordan Millar Date: Sat, 16 Dec 2023 12:30:48 -0400 Subject: [PATCH 6/6] Fix RELEASING.md links --- RELEASING.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/RELEASING.md b/RELEASING.md index 56e0eb55ae..a6295aebef 100644 --- a/RELEASING.md +++ b/RELEASING.md @@ -111,7 +111,7 @@ Please note that the tagging process will fail if: ### Releasing to `cardano-haskell-packages` After the `cardano-api` version gets tagged, it needs to be pushed into `cardano-haskell-packages` (aka **CHaP**). -Detailed description of the release process is described in [CHaP repository README](https://github.com/input-output-hk/cardano-haskell-packages#how-to-add-a-new-package-version). +Detailed description of the release process is described in [CHaP repository README](https://github.com/intersectmbo/cardano-haskell-packages#how-to-add-a-new-package-version). Briefly speaking, it requires executing of the following steps: 1. :four_leaf_clover: Clone `cardano-haskell-packages`: @@ -128,7 +128,7 @@ Briefly speaking, it requires executing of the following steps: The script will create a separate commit for each package. 1. Push your `HEAD` to a new branch, and create a PR in CHaP. - An example release PR which you might want to use as a reference: https://github.com/input-output-hk/cardano-haskell-packages/pull/345 . + An example release PR which you might want to use as a reference: https://github.com/intersectmbo/cardano-haskell-packages/pull/345 . 1. Merge the PR - you don't need additional approvals for that if you belong to the correct GitHub access group.