From 2c7dd14b5422ad4d7db6f3868db630d5482b2a75 Mon Sep 17 00:00:00 2001 From: Yann Hamdaoui Date: Sat, 18 May 2024 09:13:26 +0100 Subject: [PATCH] flake.lock: Update (#1733) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * flake.lock: Update Flake lock file updates: • Updated input 'crane': 'github:ipetkov/crane/6849911446e18e520970cc6b7a691e64ee90d649' (2023-11-09) → 'github:ipetkov/crane/27025ab71bdca30e7ed0a16c88fd74c5970fc7f5' (2024-05-09) • Updated input 'flake-utils': 'github:numtide/flake-utils/ff7b65b44d01cf9ba6a71320833626af21126384' (2023-09-12) → 'github:numtide/flake-utils/b1d9ab70662946ef0850d488da1c9019f3a9752a' (2024-03-11) • Updated input 'nix-input': 'github:nixos/nix/1d86bb4f70ee5c2d06810f21bf7cd057ed46712c' (2023-11-17) → 'github:nixos/nix/87ab3c0ea4e6f85e7b902050365bb75cf2836fbb' (2024-05-10) • Added input 'nix-input/flake-parts': 'github:hercules-ci/flake-parts/9126214d0a59633752a136528f5f3b9aa8565b7d' (2024-04-01) • Added input 'nix-input/flake-parts/nixpkgs-lib': follows 'nix-input/nixpkgs' • Added input 'nix-input/libgit2': 'github:libgit2/libgit2/45fd9ed7ae1a9b74b957ef4f337bc3c8b3df01b5' (2023-10-18) • Removed input 'nix-input/lowdown-src' • Updated input 'nix-input/nixpkgs': 'github:NixOS/nixpkgs/9eb24edd6a0027fed010ccfe300a9734d029983c' (2023-11-01) → 'github:NixOS/nixpkgs/b550fe4b4776908ac2a861124307045f8e717c8e' (2024-02-28) • Added input 'nix-input/pre-commit-hooks': 'github:cachix/pre-commit-hooks.nix/40e6053ecb65fcbf12863338a6dcefb3f55f1bf8' (2024-04-12) • Added input 'nix-input/pre-commit-hooks/flake-compat': follows 'nix-input' • Added input 'nix-input/pre-commit-hooks/flake-utils': 'github:numtide/flake-utils/5aed5285a952e0b949eb3ba02c12fa4fcfef535f' (2022-11-02) • Added input 'nix-input/pre-commit-hooks/gitignore': follows 'nix-input' • Added input 'nix-input/pre-commit-hooks/nixpkgs': follows 'nix-input/nixpkgs' • Added input 'nix-input/pre-commit-hooks/nixpkgs-stable': follows 'nix-input/nixpkgs' • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/bf744fe90419885eefced41b3e5ae442d732712d' (2023-11-14) → 'github:NixOS/nixpkgs/f1010e0469db743d14519a1efd37e23f8513d714' (2024-05-09) • Updated input 'pre-commit-hooks': 'github:cachix/pre-commit-hooks.nix/e558068cba67b23b4fbc5537173dbb43748a17e8' (2023-11-15) → 'github:cachix/pre-commit-hooks.nix/2849da033884f54822af194400f8dff435ada242' (2024-04-30) • Updated input 'pre-commit-hooks/flake-compat': 'github:edolstra/flake-compat/35bb57c0c8d8b62bbfd284272c928ceb64ddbde9' (2023-01-17) → 'github:edolstra/flake-compat/0f9255e01c2351cc7d116c072cb317785dd33b33' (2023-10-04) • Updated input 'pre-commit-hooks/gitignore': 'github:hercules-ci/gitignore.nix/a20de23b925fd8264fd7fad6454652e142fd7f73' (2022-08-14) → 'github:hercules-ci/gitignore.nix/637db329424fd7e46cf4185293b9cc8c88c95394' (2024-02-28) • Updated input 'pre-commit-hooks/nixpkgs-stable': 'github:NixOS/nixpkgs/c37ca420157f4abc31e26f436c1145f8951ff373' (2023-06-03) → 'github:NixOS/nixpkgs/614b4613980a522ba49f0d194531beddbb7220d3' (2024-03-17) • Updated input 'rust-overlay': 'github:oxalica/rust-overlay/e3ebc177291f5de627d6dfbac817b4a661b15d1c' (2023-11-17) → 'github:oxalica/rust-overlay/8eb8671512cb0c72c748058506e50c54fb5d8e2b' (2024-05-11) • Updated input 'topiary': 'github:tweag/topiary/79b93527d9bd59533f9a79fe490567963193fafd' (2023-10-23) → 'github:tweag/topiary/82a94a9f57104b89d4316afaeeab271cc51f7698' (2024-04-09) • Updated input 'topiary/advisory-db': 'github:rustsec/advisory-db/5ceeefcbbabf4b510ef8ede121d6dc57d1a1f7f8' (2023-07-08) → 'github:rustsec/advisory-db/0bc9a77248be5cb5f2b51fe6aba8ba451d74c6bb' (2024-04-03) • Updated input 'topiary/crane': 'github:ipetkov/crane/8b08e96c9af8c6e3a2b69af5a7fa168750fcf88e' (2023-07-07) → 'github:ipetkov/crane/06a9ff255c1681299a87191c2725d9d579f28b82' (2024-04-03) • Removed input 'topiary/crane/flake-compat' • Removed input 'topiary/crane/flake-utils' • Removed input 'topiary/crane/flake-utils/systems' • Removed input 'topiary/crane/rust-overlay' • Removed input 'topiary/crane/rust-overlay/flake-utils' • Removed input 'topiary/crane/rust-overlay/nixpkgs' • Updated input 'topiary/flake-utils': 'github:numtide/flake-utils/dbabf0ca0c0c4bce6ea5eaf65af5cb694d2082c7' (2023-06-25) → 'github:numtide/flake-utils/b1d9ab70662946ef0850d488da1c9019f3a9752a' (2024-03-11) • Updated input 'topiary/nix-filter': 'github:numtide/nix-filter/d90c75e8319d0dd9be67d933d8eb9d0894ec9174' (2023-06-19) → 'github:numtide/nix-filter/3342559a24e85fc164b295c3444e8a139924675b' (2024-03-11) • Updated input 'topiary/rust-overlay': 'github:oxalica/rust-overlay/d7181bb2237035df17cab9295c95f987f5c527e6' (2023-07-11) → 'github:oxalica/rust-overlay/20e7895d1873cc64c14a9f024a8e04f5824bed28' (2024-04-04) • Updated input 'topiary/rust-overlay/flake-utils': 'github:numtide/flake-utils/cfacdce06f30d2b68473a46042957675eebb3401' (2023-04-11) → 'github:numtide/flake-utils/1ef2e671c3b0c19053962c07dbda38332dcebf26' (2024-01-15) • Updated input 'topiary/rust-overlay/nixpkgs': 'github:NixOS/nixpkgs/96ba1c52e54e74c3197f4d43026b3f3d92e83ff9' (2023-04-13) → 'github:NixOS/nixpkgs/90f456026d284c22b3e3497be980b2e47d0b28ac' (2024-01-29) * Update flake lock + fix consequences After a flake lock update, some errors needed fixes: - Updated Topiary input and formatted Nickel files - Merging manual: remove line number-dependent part of the error - Upgrade markdownlint config file to schema change - Fix flake.nix * Update flake.nix --------- Co-authored-by: github-actions[bot] --- .markdownlint.json | 2 +- core/benches/arrays/fold.ncl | 3 +- core/benches/arrays/generate.ncl | 3 +- core/stdlib/std.ncl | 3 +- doc/manual/merging.md | 6 +- examples/arrays/arrays.ncl | 6 +- flake.lock | 256 +++++++++++++++---------------- flake.nix | 11 +- 8 files changed, 137 insertions(+), 153 deletions(-) diff --git a/.markdownlint.json b/.markdownlint.json index 840bd891..60879682 100644 --- a/.markdownlint.json +++ b/.markdownlint.json @@ -5,6 +5,6 @@ "tables": false }, "MD024": { - "allow_different_nesting": true + "siblings_only": true } } diff --git a/core/benches/arrays/fold.ncl b/core/benches/arrays/fold.ncl index d6300dd7..58ba6d9b 100644 --- a/core/benches/arrays/fold.ncl +++ b/core/benches/arrays/fold.ncl @@ -1,4 +1,5 @@ -let letter | Number -> std.string.Character = fun n => +let letter | Number -> std.string.Character + = fun n => let letters = std.string.characters "abcdefghijklmnopqrstuvwxyz" in std.array.at (n % 26) letters in diff --git a/core/benches/arrays/generate.ncl b/core/benches/arrays/generate.ncl index 9dd042b1..bc7323a9 100644 --- a/core/benches/arrays/generate.ncl +++ b/core/benches/arrays/generate.ncl @@ -10,7 +10,8 @@ let g = fun n => n * 2 + 5 in run = fun n => generate n g, }, checked = { - generate_with_contract | forall a. Number -> (Number -> a) -> Array a = fun n g => + generate_with_contract | forall a. Number -> (Number -> a) -> Array a + = fun n g => if n == 0 then [] else diff --git a/core/stdlib/std.ncl b/core/stdlib/std.ncl index 4d74bc2e..fe3b1695 100644 --- a/core/stdlib/std.ncl +++ b/core/stdlib/std.ncl @@ -919,8 +919,7 @@ |> blame, # Outside of lazy data structures, we just use (==) - _ => - fun ctr_label value => + _ => fun ctr_label value => value |> check_typeof_eq ctr_label |> from_predicate ((==) constant) ctr_label, diff --git a/doc/manual/merging.md b/doc/manual/merging.md index 432f47a3..f880aa6d 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 @@ -624,10 +623,7 @@ error: missing definition for `required_field2` 8 │ & { foo.required_field1 = "here" } │ ------------------------ in this record │ - ┌─ :3255:18 - │ -3255 │ = fun x y => %deep_seq% x y, - │ ------------ accessed here +[...] ``` #### Example diff --git a/examples/arrays/arrays.ncl b/examples/arrays/arrays.ncl index 66978ba6..f026c396 100644 --- a/examples/arrays/arrays.ncl +++ b/examples/arrays/arrays.ncl @@ -3,7 +3,8 @@ # Example array functions. This code is illustrative: prefer using the array # stdlib functions `std.array.map` and `std.array.fold_right` instead. let my_array_lib = { - map : forall a b. (a -> b) -> Array a -> Array b = fun f arr => + map : forall a b. (a -> b) -> Array a -> Array b + = fun f arr => if arr == [] then [] else @@ -11,7 +12,8 @@ let my_array_lib = { let tail = std.array.drop_first arr in [f head] @ map f tail, - fold : forall a b. (a -> b -> b) -> b -> Array a -> b = fun f first arr => + fold : forall a b. (a -> b -> b) -> b -> Array a -> b + = fun f first arr => if arr == [] then first else diff --git a/flake.lock b/flake.lock index c3715ff6..50d0fb8f 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "advisory-db": { "flake": false, "locked": { - "lastModified": 1688825073, - "narHash": "sha256-fK2huTDGHJc/oZjZWhMZMAt1nQSuuY6p41Y2pudtJdM=", + "lastModified": 1712168594, + "narHash": "sha256-1Yh+vafNq19JDfmpknkWq11AkcQLPmFZ8X6YJZT5r7o=", "owner": "rustsec", "repo": "advisory-db", - "rev": "5ceeefcbbabf4b510ef8ede121d6dc57d1a1f7f8", + "rev": "0bc9a77248be5cb5f2b51fe6aba8ba451d74c6bb", "type": "github" }, "original": { @@ -23,11 +23,11 @@ ] }, "locked": { - "lastModified": 1699548976, - "narHash": "sha256-xnpxms0koM8mQpxIup9JnT0F7GrKdvv0QvtxvRuOYR4=", + "lastModified": 1715274763, + "narHash": "sha256-3Iv1PGHJn9sV3HO4FlOVaaztOxa9uGLfOmUWrH7v7+A=", "owner": "ipetkov", "repo": "crane", - "rev": "6849911446e18e520970cc6b7a691e64ee90d649", + "rev": "27025ab71bdca30e7ed0a16c88fd74c5970fc7f5", "type": "github" }, "original": { @@ -38,20 +38,17 @@ }, "crane_2": { "inputs": { - "flake-compat": "flake-compat_3", - "flake-utils": "flake-utils_2", "nixpkgs": [ "topiary", "nixpkgs" - ], - "rust-overlay": "rust-overlay_2" + ] }, "locked": { - "lastModified": 1688772518, - "narHash": "sha256-ol7gZxwvgLnxNSZwFTDJJ49xVY5teaSvF7lzlo3YQfM=", + "lastModified": 1712180168, + "narHash": "sha256-sYe00cK+kKnQlVo1wUIZ5rZl9x8/r3djShUqNgfjnM4=", "owner": "ipetkov", "repo": "crane", - "rev": "8b08e96c9af8c6e3a2b69af5a7fa168750fcf88e", + "rev": "06a9ff255c1681299a87191c2725d9d579f28b82", "type": "github" }, "original": { @@ -79,11 +76,11 @@ "flake-compat_2": { "flake": false, "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", "owner": "edolstra", "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", "type": "github" }, "original": { @@ -92,19 +89,24 @@ "type": "github" } }, - "flake-compat_3": { - "flake": false, + "flake-parts": { + "inputs": { + "nixpkgs-lib": [ + "nix-input", + "nixpkgs" + ] + }, "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "lastModified": 1712014858, + "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", "type": "github" }, "original": { - "owner": "edolstra", - "repo": "flake-compat", + "owner": "hercules-ci", + "repo": "flake-parts", "type": "github" } }, @@ -113,11 +115,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1694529238, - "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { @@ -127,15 +129,12 @@ } }, "flake-utils_2": { - "inputs": { - "systems": "systems_2" - }, "locked": { - "lastModified": 1687709756, - "narHash": "sha256-Y5wKlQSkgEK2weWdOu4J3riRd+kV/VCgHsqLNTTWQ/0=", + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", "owner": "numtide", "repo": "flake-utils", - "rev": "dbabf0ca0c0c4bce6ea5eaf65af5cb694d2082c7", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", "type": "github" }, "original": { @@ -146,14 +145,14 @@ }, "flake-utils_3": { "inputs": { - "systems": "systems_3" + "systems": "systems_2" }, "locked": { - "lastModified": 1687709756, - "narHash": "sha256-Y5wKlQSkgEK2weWdOu4J3riRd+kV/VCgHsqLNTTWQ/0=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "dbabf0ca0c0c4bce6ea5eaf65af5cb694d2082c7", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { @@ -164,14 +163,14 @@ }, "flake-utils_4": { "inputs": { - "systems": "systems_4" + "systems": "systems_3" }, "locked": { - "lastModified": 1681202837, - "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", + "lastModified": 1705309234, + "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", "owner": "numtide", "repo": "flake-utils", - "rev": "cfacdce06f30d2b68473a46042957675eebb3401", + "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", "type": "github" }, "original": { @@ -188,11 +187,11 @@ ] }, "locked": { - "lastModified": 1660459072, - "narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=", + "lastModified": 1709087332, + "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", "owner": "hercules-ci", "repo": "gitignore.nix", - "rev": "a20de23b925fd8264fd7fad6454652e142fd7f73", + "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", "type": "github" }, "original": { @@ -201,29 +200,29 @@ "type": "github" } }, - "lowdown-src": { + "libgit2": { "flake": false, "locked": { - "lastModified": 1633514407, - "narHash": "sha256-Dw32tiMjdK9t3ETl5fzGrutQTzh2rufgZV4A/BbxuD4=", - "owner": "kristapsdz", - "repo": "lowdown", - "rev": "d2c2b44ff6c27b936ec27358a2653caaef8f73b8", + "lastModified": 1697646580, + "narHash": "sha256-oX4Z3S9WtJlwvj0uH9HlYcWv+x1hqp8mhXl7HsLu2f0=", + "owner": "libgit2", + "repo": "libgit2", + "rev": "45fd9ed7ae1a9b74b957ef4f337bc3c8b3df01b5", "type": "github" }, "original": { - "owner": "kristapsdz", - "repo": "lowdown", + "owner": "libgit2", + "repo": "libgit2", "type": "github" } }, "nix-filter": { "locked": { - "lastModified": 1687178632, - "narHash": "sha256-HS7YR5erss0JCaUijPeyg2XrisEb959FIct3n2TMGbE=", + "lastModified": 1710156097, + "narHash": "sha256-1Wvk8UP7PXdf8bCCaEoMnOT1qe5/Duqgj+rL8sRQsSM=", "owner": "numtide", "repo": "nix-filter", - "rev": "d90c75e8319d0dd9be67d933d8eb9d0894ec9174", + "rev": "3342559a24e85fc164b295c3444e8a139924675b", "type": "github" }, "original": { @@ -235,16 +234,18 @@ "nix-input": { "inputs": { "flake-compat": "flake-compat", - "lowdown-src": "lowdown-src", + "flake-parts": "flake-parts", + "libgit2": "libgit2", "nixpkgs": "nixpkgs", - "nixpkgs-regression": "nixpkgs-regression" + "nixpkgs-regression": "nixpkgs-regression", + "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1700244578, - "narHash": "sha256-nbL7sS4XYoALFmsWn2ua5QCB4vypmxLLhARzLvL/ssI=", + "lastModified": 1715361977, + "narHash": "sha256-j/PLYYGs+Gjge4JGYxMjOhWQEp+GB4Fdicetbpmp6n0=", "owner": "nixos", "repo": "nix", - "rev": "1d86bb4f70ee5c2d06810f21bf7cd057ed46712c", + "rev": "87ab3c0ea4e6f85e7b902050365bb75cf2836fbb", "type": "github" }, "original": { @@ -255,16 +256,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1698876495, - "narHash": "sha256-nsQo2/mkDUFeAjuu92p0dEqhRvHHiENhkKVIV1y0/Oo=", + "lastModified": 1709083642, + "narHash": "sha256-7kkJQd4rZ+vFrzWu8sTRtta5D1kBG0LSRYAfhtmMlSo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9eb24edd6a0027fed010ccfe300a9734d029983c", + "rev": "b550fe4b4776908ac2a861124307045f8e717c8e", "type": "github" }, "original": { "owner": "NixOS", - "ref": "release-23.05", + "ref": "release-23.11", "repo": "nixpkgs", "type": "github" } @@ -287,27 +288,27 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1685801374, - "narHash": "sha256-otaSUoFEMM+LjBI1XL/xGB5ao6IwnZOXc47qhIgJe8U=", + "lastModified": 1710695816, + "narHash": "sha256-3Eh7fhEID17pv9ZxrPwCLfqXnYP006RKzSs0JptsN84=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c37ca420157f4abc31e26f436c1145f8951ff373", + "rev": "614b4613980a522ba49f0d194531beddbb7220d3", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-23.05", + "ref": "nixos-23.11", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_2": { "locked": { - "lastModified": 1699963925, - "narHash": "sha256-LE7OV/SwkIBsCpAlIPiFhch/J+jBDGEZjNfdnzCnCrY=", + "lastModified": 1715787315, + "narHash": "sha256-cYApT0NXJfqBkKcci7D9Kr4CBYZKOQKDYA23q8XNuWg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bf744fe90419885eefced41b3e5ae442d732712d", + "rev": "33d1e753c82ffc557b4a585c77de43d4c922ebb5", "type": "github" }, "original": { @@ -318,11 +319,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1681358109, - "narHash": "sha256-eKyxW4OohHQx9Urxi7TQlFBTDWII+F+x2hklDOQPB50=", + "lastModified": 1706487304, + "narHash": "sha256-LE8lVX28MV2jWJsidW13D2qrHU/RUUONendL2Q/WlJg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "96ba1c52e54e74c3197f4d43026b3f3d92e83ff9", + "rev": "90f456026d284c22b3e3497be980b2e47d0b28ac", "type": "github" }, "original": { @@ -334,10 +335,39 @@ }, "pre-commit-hooks": { "inputs": { - "flake-compat": "flake-compat_2", - "flake-utils": [ - "flake-utils" + "flake-compat": [ + "nix-input" ], + "flake-utils": "flake-utils_2", + "gitignore": [ + "nix-input" + ], + "nixpkgs": [ + "nix-input", + "nixpkgs" + ], + "nixpkgs-stable": [ + "nix-input", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1712897695, + "narHash": "sha256-nMirxrGteNAl9sWiOhoN5tIHyjBbVi5e2tgZUgZlK3Y=", + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "rev": "40e6053ecb65fcbf12863338a6dcefb3f55f1bf8", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "type": "github" + } + }, + "pre-commit-hooks_2": { + "inputs": { + "flake-compat": "flake-compat_2", "gitignore": "gitignore", "nixpkgs": [ "nixpkgs" @@ -345,11 +375,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1700064067, - "narHash": "sha256-1ZWNDzhu8UlVCK7+DUN9dVQfiHX1bv6OQP9VxstY/gs=", + "lastModified": 1715870890, + "narHash": "sha256-nacSOeXtUEM77Gn0G4bTdEOeFIrkCBXiyyFZtdGwuH0=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "e558068cba67b23b4fbc5537173dbb43748a17e8", + "rev": "fa606cccd7b0ccebe2880051208e4a0f61bfc8c1", "type": "github" }, "original": { @@ -364,7 +394,7 @@ "flake-utils": "flake-utils", "nix-input": "nix-input", "nixpkgs": "nixpkgs_2", - "pre-commit-hooks": "pre-commit-hooks", + "pre-commit-hooks": "pre-commit-hooks_2", "rust-overlay": "rust-overlay", "topiary": "topiary" } @@ -379,11 +409,11 @@ ] }, "locked": { - "lastModified": 1700187354, - "narHash": "sha256-RRIVKv+tiI1yn1PqZiVGQ9YlQGZ+/9iEkA4rst1QiNk=", + "lastModified": 1715393623, + "narHash": "sha256-nSUFcUqyTQQ/aYFIB05mpCzytcKvfKMy3ZQAe0fP26A=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "e3ebc177291f5de627d6dfbac817b4a661b15d1c", + "rev": "8eb8671512cb0c72c748058506e50c54fb5d8e2b", "type": "github" }, "original": { @@ -393,43 +423,16 @@ } }, "rust-overlay_2": { - "inputs": { - "flake-utils": [ - "topiary", - "crane", - "flake-utils" - ], - "nixpkgs": [ - "topiary", - "crane", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1688351637, - "narHash": "sha256-CLTufJ29VxNOIZ8UTg0lepsn3X03AmopmaLTTeHDCL4=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "f9b92316727af9e6c7fee4a761242f7f46880329", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, - "rust-overlay_3": { "inputs": { "flake-utils": "flake-utils_4", "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1689042658, - "narHash": "sha256-p7cQAFNt5kX19sZvK74CmY0nTrtujpZg6sZUiV1ntAk=", + "lastModified": 1712196778, + "narHash": "sha256-SOiwCr2HtmYpw8OvQQVRPtiCBWwndbIoPqtsamZK3J8=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "d7181bb2237035df17cab9295c95f987f5c527e6", + "rev": "20e7895d1873cc64c14a9f024a8e04f5824bed28", "type": "github" }, "original": { @@ -483,21 +486,6 @@ "type": "github" } }, - "systems_4": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "topiary": { "inputs": { "advisory-db": "advisory-db", @@ -507,14 +495,14 @@ "nixpkgs": [ "nixpkgs" ], - "rust-overlay": "rust-overlay_3" + "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1698060390, - "narHash": "sha256-GEM01jYAGOv6Jb51bs4wsZFeg12ZPyw5E7601pY7vJI=", + "lastModified": 1712658781, + "narHash": "sha256-KWfgbVFV2zbCuNNFp9yeSgAa0Cc7cT090KK2J1ynfKg=", "owner": "tweag", "repo": "topiary", - "rev": "79b93527d9bd59533f9a79fe490567963193fafd", + "rev": "82a94a9f57104b89d4316afaeeab271cc51f7698", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index c95c942f..cb079593 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"; @@ -394,13 +393,11 @@ inherit env; CARGO_BUILD_TARGET = pkgs.rust.toRustTarget pkgs.pkgsMusl.stdenv.hostPlatform; # For some reason, the rust build doesn't pick up the paths - # to `libcxx` and `libcxxabi` from the stdenv. So we specify - # them explicitly. Also, `libcxx` expects to be linked with - # `libcxxabi` at the end, and we need to make the rust linker - # aware of that. + # to `libcxx`. So we specify them explicitly. # - # We also explicitly add `libc` because of https://github.com/rust-lang/rust/issues/89626. - RUSTFLAGS = "-L${pkgs.pkgsMusl.llvmPackages.libcxx}/lib -L${pkgs.pkgsMusl.llvmPackages.libcxxabi}/lib -lstatic=c++abi -C link-arg=-lc"; + # We also explicitly add `libc` because of + # https://github.com/rust-lang/rust/issues/89626. + RUSTFLAGS = "-L${pkgs.pkgsMusl.llvmPackages.libcxx}/lib -lstatic=c++abi -C link-arg=-lc"; # Explain to `cc-rs` that it should use the `libcxx` C++ # standard library, and a static version of it, when building # C++ libraries. The `cc-rs` crate is typically used in