diff --git a/flake.lock b/flake.lock index 79d346ae..c3715ff6 100644 --- a/flake.lock +++ b/flake.lock @@ -18,19 +18,16 @@ }, "crane": { "inputs": { - "flake-compat": "flake-compat", - "flake-utils": "flake-utils", "nixpkgs": [ "nixpkgs" - ], - "rust-overlay": "rust-overlay" + ] }, "locked": { - "lastModified": 1695511445, - "narHash": "sha256-mnE14re43v3/Jc50Jv0BKPMtEk7FEtDSligP6B5HwlI=", + "lastModified": 1699548976, + "narHash": "sha256-xnpxms0koM8mQpxIup9JnT0F7GrKdvv0QvtxvRuOYR4=", "owner": "ipetkov", "repo": "crane", - "rev": "3de322e06fc88ada5e3589dc8a375b73e749f512", + "rev": "6849911446e18e520970cc6b7a691e64ee90d649", "type": "github" }, "original": { @@ -41,13 +38,13 @@ }, "crane_2": { "inputs": { - "flake-compat": "flake-compat_4", - "flake-utils": "flake-utils_3", + "flake-compat": "flake-compat_3", + "flake-utils": "flake-utils_2", "nixpkgs": [ "topiary", "nixpkgs" ], - "rust-overlay": "rust-overlay_3" + "rust-overlay": "rust-overlay_2" }, "locked": { "lastModified": 1688772518, @@ -111,22 +108,6 @@ "type": "github" } }, - "flake-compat_4": { - "flake": false, - "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "flake-utils": { "inputs": { "systems": "systems" @@ -150,11 +131,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1694529238, - "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", + "lastModified": 1687709756, + "narHash": "sha256-Y5wKlQSkgEK2weWdOu4J3riRd+kV/VCgHsqLNTTWQ/0=", "owner": "numtide", "repo": "flake-utils", - "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", + "rev": "dbabf0ca0c0c4bce6ea5eaf65af5cb694d2082c7", "type": "github" }, "original": { @@ -185,24 +166,6 @@ "inputs": { "systems": "systems_4" }, - "locked": { - "lastModified": 1687709756, - "narHash": "sha256-Y5wKlQSkgEK2weWdOu4J3riRd+kV/VCgHsqLNTTWQ/0=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "dbabf0ca0c0c4bce6ea5eaf65af5cb694d2082c7", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_5": { - "inputs": { - "systems": "systems_5" - }, "locked": { "lastModified": 1681202837, "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", @@ -271,17 +234,17 @@ }, "nix-input": { "inputs": { - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat", "lowdown-src": "lowdown-src", "nixpkgs": "nixpkgs", "nixpkgs-regression": "nixpkgs-regression" }, "locked": { - "lastModified": 1694598107, - "narHash": "sha256-JEJSU2O+getWkc+Ql6Dsp72ZGihyZ2Ba7fMdv+ma4TQ=", + "lastModified": 1700244578, + "narHash": "sha256-nbL7sS4XYoALFmsWn2ua5QCB4vypmxLLhARzLvL/ssI=", "owner": "nixos", "repo": "nix", - "rev": "b99fdcf8dbb38ec0be0e82f65d1d138ec9e89dda", + "rev": "1d86bb4f70ee5c2d06810f21bf7cd057ed46712c", "type": "github" }, "original": { @@ -292,16 +255,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1695830400, - "narHash": "sha256-gToZXQVr0G/1WriO83olnqrLSHF2Jb8BPcmCt497ro0=", + "lastModified": 1698876495, + "narHash": "sha256-nsQo2/mkDUFeAjuu92p0dEqhRvHHiENhkKVIV1y0/Oo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8a86b98f0ba1c405358f1b71ff8b5e1d317f5db2", + "rev": "9eb24edd6a0027fed010ccfe300a9734d029983c", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-22.11-small", + "ref": "release-23.05", "repo": "nixpkgs", "type": "github" } @@ -340,11 +303,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1693565476, - "narHash": "sha256-ya00zHt7YbPo3ve/wNZ/6nts61xt7wK/APa6aZAfey0=", + "lastModified": 1699963925, + "narHash": "sha256-LE7OV/SwkIBsCpAlIPiFhch/J+jBDGEZjNfdnzCnCrY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "aa8aa7e2ea35ce655297e8322dc82bf77a31d04b", + "rev": "bf744fe90419885eefced41b3e5ae442d732712d", "type": "github" }, "original": { @@ -371,7 +334,7 @@ }, "pre-commit-hooks": { "inputs": { - "flake-compat": "flake-compat_3", + "flake-compat": "flake-compat_2", "flake-utils": [ "flake-utils" ], @@ -382,11 +345,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1695576016, - "narHash": "sha256-71KxwRhTfVuh7kNrg3/edNjYVg9DCyKZl2QIKbhRggg=", + "lastModified": 1700064067, + "narHash": "sha256-1ZWNDzhu8UlVCK7+DUN9dVQfiHX1bv6OQP9VxstY/gs=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "cb770e93516a1609652fa8e945a0f310e98f10c0", + "rev": "e558068cba67b23b4fbc5537173dbb43748a17e8", "type": "github" }, "original": { @@ -398,31 +361,29 @@ "root": { "inputs": { "crane": "crane", - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils", "nix-input": "nix-input", "nixpkgs": "nixpkgs_2", "pre-commit-hooks": "pre-commit-hooks", - "rust-overlay": "rust-overlay_2", + "rust-overlay": "rust-overlay", "topiary": "topiary" } }, "rust-overlay": { "inputs": { "flake-utils": [ - "crane", "flake-utils" ], "nixpkgs": [ - "crane", "nixpkgs" ] }, "locked": { - "lastModified": 1695003086, - "narHash": "sha256-d1/ZKuBRpxifmUf7FaedCqhy0lyVbqj44Oc2s+P5bdA=", + "lastModified": 1700187354, + "narHash": "sha256-RRIVKv+tiI1yn1PqZiVGQ9YlQGZ+/9iEkA4rst1QiNk=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "b87a14abea512d956f0b89d0d8a1e9b41f3e20ff", + "rev": "e3ebc177291f5de627d6dfbac817b4a661b15d1c", "type": "github" }, "original": { @@ -432,29 +393,6 @@ } }, "rust-overlay_2": { - "inputs": { - "flake-utils": [ - "flake-utils" - ], - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1696039808, - "narHash": "sha256-7TbAr9LskWG6ISPhUdyp6zHboT7FsFrME5QsWKybPTA=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "a4c3c904ab29e04a20d3a6da6626d66030385773", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, - "rust-overlay_3": { "inputs": { "flake-utils": [ "topiary", @@ -481,9 +419,9 @@ "type": "github" } }, - "rust-overlay_4": { + "rust-overlay_3": { "inputs": { - "flake-utils": "flake-utils_5", + "flake-utils": "flake-utils_4", "nixpkgs": "nixpkgs_3" }, "locked": { @@ -560,38 +498,23 @@ "type": "github" } }, - "systems_5": { - "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", "crane": "crane_2", - "flake-utils": "flake-utils_4", + "flake-utils": "flake-utils_3", "nix-filter": "nix-filter", "nixpkgs": [ "nixpkgs" ], - "rust-overlay": "rust-overlay_4" + "rust-overlay": "rust-overlay_3" }, "locked": { - "lastModified": 1695289853, - "narHash": "sha256-EgDFjJeGJb36je/be7DXvzvpBYDUaupOiQxtL7bN/+Q=", + "lastModified": 1698060390, + "narHash": "sha256-GEM01jYAGOv6Jb51bs4wsZFeg12ZPyw5E7601pY7vJI=", "owner": "tweag", "repo": "topiary", - "rev": "8299a04bf83c4a2774cbbff7a036c022efa939b3", + "rev": "79b93527d9bd59533f9a79fe490567963193fafd", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 79a0140a..769306f7 100644 --- a/flake.nix +++ b/flake.nix @@ -78,6 +78,7 @@ }); }) ]; + config.allowUnfreePredicate = pkg: builtins.elem (pkg.pname or "") [ "terraform" ]; }; wasm-bindgen-cli = diff --git a/lsp/nls/tests/main.rs b/lsp/nls/tests/main.rs index 9b14520e..c2b6424a 100644 --- a/lsp/nls/tests/main.rs +++ b/lsp/nls/tests/main.rs @@ -9,7 +9,7 @@ fn check_snapshots(path: &str) { let full_path = project_root().join(path); - let contents = std::fs::read_to_string(&full_path).unwrap(); + let contents = std::fs::read_to_string(full_path).unwrap(); let fixture = TestFixture::parse(&contents).unwrap(); let mut harness = TestHarness::new();