Unify all packages into one

.github/workflows/checks.yml

@@ -58,24 +58,6 @@ jobs:
     - name: Cabal check
       run: ./scripts/ci/check-cabal-files.sh
 
-  check-release-badges:
-
-    name: Release badges are updated
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v6
-
-    - name: Check README badges
-      run: |
-        for f in $(find ouroboros-consensus* *sop* -type f -name "*.cabal"); do
-          pkg=$(grep "^name: " $f | rev | cut -d' ' -f1 | rev)
-          ver=$(grep "^version: " $f | rev | cut -d' ' -f1 | rev)
-          echo "Checking badge for $pkg-$ver"
-          grep "$(echo $pkg | sed 's/-/--/g')-$ver" README.md
-        done
-
   check-build-plans:
 
     name: Check build plans (dev vs release)
@@ -107,4 +89,4 @@ jobs:
     - uses: actions/checkout@v6
 
     - name: Diff plans
-      run: GH=1 ./scripts/release/cabal-plan-diff.sh
+      run: GH=1 ./scripts/release/cabal-plan-diff.sh

.github/workflows/ci.yml

@@ -160,7 +160,7 @@ jobs:
 
     - name: Test (NoThunks-safe tests only)
       if: matrix.test-set == 'no-thunks-safe'
-      run: cabal test ouroboros-consensus:consensus-test ouroboros-consensus:doctest ouroboros-consensus:infra-test ouroboros-consensus:storage-test ouroboros-consensus-cardano:byron-test ouroboros-consensus-cardano:shelley-test ouroboros-consensus-diffusion:infra-test ouroboros-consensus-protocol:protocol-test -j --test-show-details=streaming
+      run: cabal test ouroboros-consensus:consensus-test ouroboros-consensus:doctest ouroboros-consensus:consensus-infra-test ouroboros-consensus:storage-test ouroboros-consensus:byron-test ouroboros-consensus:shelley-test ouroboros-consensus:diffusion-infra-test ouroboros-consensus:protocol-test -j --test-show-details=streaming
 
     - name: Identify benchmark executables
       run: |

CHANGELOG.md

@@ -1,8 +1,17 @@
-This project contains multiple packages. Their changelogs are listed and linked below:
+# Ouroboros-consensus Changelog
+
+The changelog is organized by the main four libraries: Core, Protocol, Diffusion
+and Cardano. Each library has their own Patch, Non-Breaking and Breaking
+sections.
+
+# Changelog entries
+
+
+# Archeological note
+
+Before joining all packages into one, the changelogs were kept in separate files for each package:
 
 - [ouroboros-consensus/CHANGELOG.md](./ouroboros-consensus/CHANGELOG.md)
 - [ouroboros-consensus-diffusion/CHANGELOG.md](./ouroboros-consensus-diffusion/CHANGELOG.md)
 - [ouroboros-consensus-cardano/CHANGELOG.md](./ouroboros-consensus-cardano/CHANGELOG.md)
-- [sop-extras/CHANGELOG.md](./sop-extras/CHANGELOG.md)
-- [strict-sop-core/CHANGELOG.md](./strict-sop-core/CHANGELOG.md)
 - [ouroboros-consensus-protocol/CHANGELOG.md](./ouroboros-consensus-protocol/CHANGELOG.md)

LICENSE

@@ -1,3 +1,4 @@
+
                                  Apache License
                            Version 2.0, January 2004
                         http://www.apache.org/licenses/
@@ -174,28 +175,3 @@
       of your accepting any such warranty or additional liability.
 
    END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.

cabal.project

@@ -20,10 +20,7 @@ index-state:
 
 
 packages:
-  ouroboros-consensus
-  ouroboros-consensus-cardano
-  ouroboros-consensus-protocol
-  ouroboros-consensus-diffusion
+  .
   sop-extras
   strict-sop-core
 
@@ -33,7 +30,7 @@ benchmarks: true
 
 multi-repl: True
 
-import: ./asserts.cabal
+import: scripts/asserts.cabal
 
 package ouroboros-network
   -- Certain ThreadNet tests rely on transactions to be submitted promptly after

changelog.d/20260225_145303_javier.sagredo_unify_packages.md

@@ -0,0 +1,18 @@
+<!--
+A new scriv changelog fragment.
+
+Uncomment the section that is right (remove the HTML comment wrapper).
+For top level release notes, leave all the headers commented out.
+-->
+
+### Breaking
+
+- Absorbed `ouroboros-consensus-lsm` into `ouroboros-consensus:lsm`.
+
+- Absorbed `ouroboros-consensus-lmdb` into `ouroboros-consensus:lmdb`.
+
+- Absorbed `ouroboros-consensus-protocol` into `ouroboros-consensus:protocol`.
+
+- Absorbed `ouroboros-consensus-diffusion` into `ouroboros-consensus:diffusion`.
+
+- Absorbed `ouroboros-consensus-cardano` into `ouroboros-consensus:cardano`.

ouroboros-consensus/changelog.d/scriv.ini → changelog.d/scriv.ini

@@ -1,14 +1,15 @@
 [scriv]
 format = md
-insert_marker = Changelog entries
+start_marker = Changelog entries
 md_header_level = 2
 version = literal: ouroboros-consensus.cabal: version
-categories = Patch, Non-Breaking, Breaking
-end_marker = scriv-end-here
+categories = Breaking, Non-Breaking, Patch
+end_marker = # Archeological note
 fragment_directory = changelog.d
 ghrel_template = {{body}}
 main_branches = master, main, develop
 new_fragment_template = file: new_fragment.${config:format}.j2
 output_file = CHANGELOG.${config:format}
 skip_fragments = README.*
-entry_title_template = {%% if version %%}{{ version }} -- {%% endif %%}{{ date.strftime('%%Y-%%m-%%d') }}
+entry_title_template = {%% if version %%}{{ version }} -- {%% endif %%}{{ date.strftime('%%Y-%%m-%%d') }}
+compact_fragments = True

nix/ci.nix

@@ -15,7 +15,7 @@ let
 
       isCardanoExe = p:
         let i = p.identifier;
-        in i.name == "ouroboros-consensus-cardano" && i.component-type == "exe";
+        in i.name == "ouroboros-consensus" && i.component-type == "exe";
       setGitRevs =
         lib.mapAttrsRecursiveCond (as: !lib.isDerivation as)
           (_: p: if isCardanoExe p then pkgs.set-git-rev p else p);

nix/haskell.nix

@@ -29,28 +29,28 @@ let
       }))
       {
         # Options related to tasty and tasty-golden:
-        packages.ouroboros-consensus-cardano.components.tests =
-          lib.listToAttrs (builtins.map
+        packages.ouroboros-consensus.components.tests =
+          lib.listToAttrs (map
             (n: lib.nameValuePair "${n}-test" {
               testFlags = lib.mkForce [ "--no-create --hide-successes" ];
-              extraSrcFiles = [ "golden/${n}/**/*" ];
+              extraSrcFiles = [ "ouroboros-consensus-cardano/golden/${n}/**/*" ];
             }) [ "byron" "shelley" "cardano" ]);
       }
       ({ pkgs, lib, ... }: lib.mkIf pkgs.stdenv.hostPlatform.isWindows {
         # https://github.com/input-output-hk/haskell.nix/issues/2332
         packages.basement.configureFlags = [ "--hsc2hs-option=--cflag=-Wno-int-conversion" ];
         # We can't cross-compile the ruby gem `cddlc` so we decided to skip this
         # test on Windows in Hydra.
-        packages.ouroboros-consensus-cardano.components.tests.cardano-test.preCheck = ''
+        packages.ouroboros-consensus.components.tests.cardano-test.preCheck = ''
           export DISABLE_CDDLC=1
         '';
       })
       ({ pkgs, ... }: lib.mkIf (!pkgs.stdenv.hostPlatform.isWindows) {
         # Tools for CBOR/CDDL tests:
-        packages.ouroboros-consensus-cardano.components.tests.cardano-test = {
+        packages.ouroboros-consensus.components.tests.cardano-test = {
           build-tools =
             [ pkgs.cddlc pkgs.cuddle ];
-          extraSrcFiles = [ "cddl/**/*" ];
+          extraSrcFiles = [ "ouroboros-consensus-cardano/cddl/**/*" ];
         };
       })
     ];
@@ -59,7 +59,7 @@ let
         src = lib.mkForce (final.applyPatches {
           name = "consensus-src-no-asserts";
           src = ./..;
-          postPatch = ''echo > asserts.cabal'';
+          postPatch = ''echo > scripts/asserts.cabal'';
         });
       };
       profiled = {
@@ -102,7 +102,7 @@ in
     buildPhase = ''
       export CABAL_DIR=$(mktemp -d)
       touch $CABAL_DIR/config $out
-      cabal-docspec --no-cabal-plan $(fd -e cabal --exact-depth 2)
+      cabal-docspec --no-cabal-plan ouroboros-consensus.cabal sop-extras/sop-extras.cabal strict-sop-core/strict-sop-core.cabal
     '';
   };
 }