From 2eb5492bc4bc39c4cab16af3df51edcbfcb44610 Mon Sep 17 00:00:00 2001 From: Yann Hamdaoui Date: Wed, 13 Nov 2024 01:46:14 +0100 Subject: [PATCH] Update to Nickel v1.9.0 (#713) --- flake.lock | 180 +++++++++++++++++++++-------------------------------- 1 file changed, 70 insertions(+), 110 deletions(-) diff --git a/flake.lock b/flake.lock index 899e9df8..9b3a89b8 100644 --- a/flake.lock +++ b/flake.lock @@ -1,34 +1,12 @@ { "nodes": { - "advisory-db": { - "flake": false, - "locked": { - "lastModified": 1714183630, - "narHash": "sha256-1BVft7ggSN2XXFeXQjazU3jN9wVECd9qp2mZx/8GDMk=", - "owner": "rustsec", - "repo": "advisory-db", - "rev": "35e7459a331d3e0c585e56dabd03006b9b354088", - "type": "github" - }, - "original": { - "owner": "rustsec", - "repo": "advisory-db", - "type": "github" - } - }, "crane": { - "inputs": { - "nixpkgs": [ - "nickel", - "nixpkgs" - ] - }, "locked": { - "lastModified": 1717535930, - "narHash": "sha256-1hZ/txnbd/RmiBPNUs7i8UQw2N89uAK3UzrGAWdnFfU=", + "lastModified": 1727060013, + "narHash": "sha256-/fC5YlJy4IoAW9GhkJiwyzk0K/gQd9Qi4rRcoweyG9E=", "owner": "ipetkov", "repo": "crane", - "rev": "55e7754ec31dac78980c8be45f8a28e80e370946", + "rev": "6b40cc876c929bfe1e3a24bf538ce3b5622646ba", "type": "github" }, "original": { @@ -62,11 +40,11 @@ ] }, "locked": { - "lastModified": 1712014858, - "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", + "lastModified": 1719994518, + "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", + "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7", "type": "github" }, "original": { @@ -98,11 +76,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1726560853, + "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", "type": "github" }, "original": { @@ -111,6 +89,41 @@ "type": "github" } }, + "git-hooks-nix": { + "inputs": { + "flake-compat": [ + "nickel", + "nix-input" + ], + "gitignore": [ + "nickel", + "nix-input" + ], + "nixpkgs": [ + "nickel", + "nix-input", + "nixpkgs" + ], + "nixpkgs-stable": [ + "nickel", + "nix-input", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1721042469, + "narHash": "sha256-6FPUl7HVtvRHCCBQne7Ylp4p+dpP3P/OYuzjztZ4s70=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "f451c19376071a90d8c58ab1a953c6e9840527fd", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "git-hooks.nix", + "type": "github" + } + }, "gitignore": { "inputs": { "nixpkgs": [ @@ -136,15 +149,16 @@ "libgit2": { "flake": false, "locked": { - "lastModified": 1697646580, - "narHash": "sha256-oX4Z3S9WtJlwvj0uH9HlYcWv+x1hqp8mhXl7HsLu2f0=", + "lastModified": 1715853528, + "narHash": "sha256-J2rCxTecyLbbDdsyBWn9w7r3pbKRMkI9E7RvRgAqBdY=", "owner": "libgit2", "repo": "libgit2", - "rev": "45fd9ed7ae1a9b74b957ef4f337bc3c8b3df01b5", + "rev": "36f7e21ad757a3dacc58cf7944329da6bc1d6e96", "type": "github" }, "original": { "owner": "libgit2", + "ref": "v1.8.1", "repo": "libgit2", "type": "github" } @@ -156,15 +170,14 @@ "nix-input": "nix-input", "nixpkgs": "nixpkgs", "pre-commit-hooks": "pre-commit-hooks", - "rust-overlay": "rust-overlay", - "topiary": "topiary" + "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1725887128, - "narHash": "sha256-mjmT1ogvUJgy3Jb6m/npE+1if1Uy191wPU80nNlVwdM=", + "lastModified": 1731431209, + "narHash": "sha256-chIpZqs1tyXk4YQBlF4K/Ofrn1CrijbYant9+SSppGU=", "owner": "tweag", "repo": "nickel", - "rev": "c587e3505653a0150b00616f4ad515ba31530dff", + "rev": "7236f8e610c58072abb26a6e8d019983ae25035a", "type": "github" }, "original": { @@ -174,21 +187,6 @@ "type": "github" } }, - "nix-filter": { - "locked": { - "lastModified": 1710156097, - "narHash": "sha256-1Wvk8UP7PXdf8bCCaEoMnOT1qe5/Duqgj+rL8sRQsSM=", - "owner": "numtide", - "repo": "nix-filter", - "rev": "3342559a24e85fc164b295c3444e8a139924675b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "nix-filter", - "type": "github" - } - }, "nix-input": { "inputs": { "flake-compat": [ @@ -197,24 +195,21 @@ "flake-compat" ], "flake-parts": "flake-parts", + "git-hooks-nix": "git-hooks-nix", "libgit2": "libgit2", "nixpkgs": [ "nickel", "nixpkgs" ], "nixpkgs-23-11": "nixpkgs-23-11", - "nixpkgs-regression": "nixpkgs-regression", - "pre-commit-hooks": [ - "nickel", - "pre-commit-hooks" - ] + "nixpkgs-regression": "nixpkgs-regression" }, "locked": { - "lastModified": 1717862855, - "narHash": "sha256-DHM/6HZsuJO+k32vBfPzzhEwgMVpYdHiMD5r6qoCk9k=", + "lastModified": 1727696274, + "narHash": "sha256-H+EeGBRV87NRDXgOQP/aZfof9svbYCSQktpMiLBrqCQ=", "owner": "nixos", "repo": "nix", - "rev": "0ab9369572f64b1ab70a8db29f79ae730ff31ab6", + "rev": "c116030605bf7fecd232d0ff3b6fe066f23e4620", "type": "github" }, "original": { @@ -225,11 +220,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1717786204, - "narHash": "sha256-4q0s6m0GUcN7q+Y2DqD27iLvbcd1G50T2lv08kKxkSI=", + "lastModified": 1726937504, + "narHash": "sha256-bvGoiQBvponpZh8ClUcmJ6QnsNKw0EMrCQJARK3bI1c=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "051f920625ab5aabe37c920346e3e69d7d34400e", + "rev": "9357f4f23713673f310988025d9dc261c20e70c6", "type": "github" }, "original": { @@ -272,16 +267,16 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1710695816, - "narHash": "sha256-3Eh7fhEID17pv9ZxrPwCLfqXnYP006RKzSs0JptsN84=", + "lastModified": 1720386169, + "narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "614b4613980a522ba49f0d194531beddbb7220d3", + "rev": "194846768975b7ad2c4988bdb82572c00222c0d7", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-23.11", + "ref": "nixos-24.05", "repo": "nixpkgs", "type": "github" } @@ -312,11 +307,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1717664902, - "narHash": "sha256-7XfBuLULizXjXfBYy/VV+SpYMHreNRHk9nKMsm1bgb4=", + "lastModified": 1726745158, + "narHash": "sha256-D5AegvGoEjt4rkKedmxlSEmC+nNLMBPWFxvmYnVLhjk=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "cc4d466cb1254af050ff7bdf47f6d404a7c646d1", + "rev": "4e743a6920eab45e8ba0fbe49dc459f1423a4b74", "type": "github" }, "original": { @@ -340,11 +335,11 @@ ] }, "locked": { - "lastModified": 1719973106, - "narHash": "sha256-IGCdN/m7DfwUfxZjFnlTiTtpwSHCb01P/LWavAKD2jw=", + "lastModified": 1727144949, + "narHash": "sha256-uMZMjoCS2nf40TAE1686SJl3OXWfdfM+BDEfRdr+uLc=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "fb733500aead50880b9b301f34a0061bf997d6f2", + "rev": "2e19799819104b46019d339e78d21c14372d3666", "type": "github" }, "original": { @@ -382,41 +377,6 @@ "repo": "default", "type": "github" } - }, - "topiary": { - "inputs": { - "advisory-db": "advisory-db", - "crane": [ - "nickel", - "crane" - ], - "flake-utils": [ - "nickel", - "flake-utils" - ], - "nix-filter": "nix-filter", - "nixpkgs": [ - "nickel", - "nixpkgs" - ], - "rust-overlay": [ - "nickel", - "rust-overlay" - ] - }, - "locked": { - "lastModified": 1725634392, - "narHash": "sha256-xpxdzcIXR/ISpfE74tc+8N225RSPnZbFPEay78kcnC4=", - "owner": "tweag", - "repo": "topiary", - "rev": "cff73fc3d58490b260935a4d9968a180acf75b8b", - "type": "github" - }, - "original": { - "owner": "tweag", - "repo": "topiary", - "type": "github" - } } }, "root": "root",