diff --git a/.markdownlint.json b/.markdownlint.json index 840bd891b..608796821 100644 --- a/.markdownlint.json +++ b/.markdownlint.json @@ -5,6 +5,6 @@ "tables": false }, "MD024": { - "allow_different_nesting": true + "siblings_only": true } } diff --git a/doc/manual/merging.md b/doc/manual/merging.md index ec13356c5..f880aa6d9 100644 --- a/doc/manual/merging.md +++ b/doc/manual/merging.md @@ -611,7 +611,6 @@ argument), we do get a contract violation error: { foo | FooContract } & { foo.required_field1 = "here" } in - intermediate & { foo.required_field2 = "here" } |> std.deep_seq intermediate diff --git a/flake.lock b/flake.lock index 2312f53cf..50d0fb8f5 100644 --- a/flake.lock +++ b/flake.lock @@ -368,9 +368,6 @@ "pre-commit-hooks_2": { "inputs": { "flake-compat": "flake-compat_2", - "flake-utils": [ - "flake-utils" - ], "gitignore": "gitignore", "nixpkgs": [ "nixpkgs" @@ -378,11 +375,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1714478972, - "narHash": "sha256-q//cgb52vv81uOuwz1LaXElp3XAe1TqrABXODAEF6Sk=", + "lastModified": 1715870890, + "narHash": "sha256-nacSOeXtUEM77Gn0G4bTdEOeFIrkCBXiyyFZtdGwuH0=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "2849da033884f54822af194400f8dff435ada242", + "rev": "fa606cccd7b0ccebe2880051208e4a0f61bfc8c1", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index af9e37b8e..c67cd2a9e 100644 --- a/flake.nix +++ b/flake.nix @@ -5,7 +5,6 @@ pre-commit-hooks = { url = "github:cachix/pre-commit-hooks.nix"; inputs.nixpkgs.follows = "nixpkgs"; - inputs.flake-utils.follows = "flake-utils"; }; rust-overlay = { url = "github:oxalica/rust-overlay"; @@ -154,6 +153,7 @@ markdownlint = { enable = true; + # settings.configuration = builtins.fromJSON (builtins.readFile ./.markdownlint.json); excludes = [ "notes/(.+)\\.md$" "^RELEASES\\.md$"