From 366afe9fe93ac520e463129aba1d8e1fe9101317 Mon Sep 17 00:00:00 2001 From: Marc Scholten Date: Wed, 26 Jun 2024 15:26:05 -0700 Subject: [PATCH] Added impure workaround from devenv --- flake-module.nix | 8 + flake.lock | 742 ++++++++++++++++++++++++++++++++++++++++++----- flake.nix | 7 + 3 files changed, 689 insertions(+), 68 deletions(-) diff --git a/flake-module.nix b/flake-module.nix index e11b36e9d..0fd8235a2 100644 --- a/flake-module.nix +++ b/flake-module.nix @@ -197,6 +197,14 @@ ihpFlake: ++ [pkgs.mktemp] # Without this 'make build/bin/RunUnoptimizedProdServer' fails on macOS ; + # Hack to avoid --impure + # See https://github.com/cachix/devenv/commit/cc0944a60978ad7cf74d429d18c2a8065f018545 + devenv.root = + let + devenvRootFileContent = builtins.readFile ihpFlake.inputs.devenv-root.outPath; + in + pkgs.lib.mkIf (devenvRootFileContent != "") devenvRootFileContent; + /* we currently don't use devenv containers, and they break nix flake show without the proper inputs set diff --git a/flake.lock b/flake.lock index 6c93863b9..f88e94ef8 100644 --- a/flake.lock +++ b/flake.lock @@ -30,6 +30,42 @@ "type": "github" } }, + "cachix_2": { + "inputs": { + "devenv": "devenv_4", + "flake-compat": [ + "ihp-boilerplate", + "ihp", + "devenv", + "flake-compat" + ], + "nixpkgs": [ + "ihp-boilerplate", + "ihp", + "devenv", + "nixpkgs" + ], + "pre-commit-hooks": [ + "ihp-boilerplate", + "ihp", + "devenv", + "pre-commit-hooks" + ] + }, + "locked": { + "lastModified": 1712055811, + "narHash": "sha256-7FcfMm5A/f02yyzuavJe06zLa9hcMHsagE28ADcmQvk=", + "owner": "cachix", + "repo": "cachix", + "rev": "02e38da89851ec7fec3356a5c04bc8349cae0e30", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "cachix", + "type": "github" + } + }, "devenv": { "inputs": { "cachix": "cachix", @@ -41,20 +77,32 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1714390914, - "narHash": "sha256-W5DFIifCjGYJXJzLU3RpqBeqes4zrf0Sr/6rwzTygPU=", + "lastModified": 1718265154, + "narHash": "sha256-eTbBvYwGlKExMSTyHQya6+6kdx1rtva/aVfyAZu2NUU=", "owner": "cachix", "repo": "devenv", - "rev": "34e6461fd76b5f51ad5f8214f5cf22c4cd7a196e", + "rev": "1983f635c29dc68bb0d29b3a7e227579a1d98788", "type": "github" }, "original": { "owner": "cachix", - "ref": "refs/tags/v1.0.5", + "ref": "v1.0.7", "repo": "devenv", "type": "github" } }, + "devenv-root": { + "flake": false, + "locked": { + "narHash": "sha256-d6xi4mKdjkX2JFicDIv5niSzpyI0m/Hnm8GGAIU04kY=", + "type": "file", + "url": "file:///dev/null" + }, + "original": { + "type": "file", + "url": "file:///dev/null" + } + }, "devenv_2": { "inputs": { "flake-compat": [ @@ -88,8 +136,9 @@ }, "devenv_3": { "inputs": { - "flake-compat": "flake-compat_3", - "nix": "nix_3", + "cachix": "cachix_2", + "flake-compat": "flake-compat_4", + "nix": "nix_4", "nixpkgs": [ "ihp-boilerplate", "ihp", @@ -97,6 +146,69 @@ ], "pre-commit-hooks": "pre-commit-hooks_2" }, + "locked": { + "lastModified": 1714390914, + "narHash": "sha256-W5DFIifCjGYJXJzLU3RpqBeqes4zrf0Sr/6rwzTygPU=", + "owner": "cachix", + "repo": "devenv", + "rev": "34e6461fd76b5f51ad5f8214f5cf22c4cd7a196e", + "type": "github" + }, + "original": { + "owner": "cachix", + "ref": "refs/tags/v1.0.5", + "repo": "devenv", + "type": "github" + } + }, + "devenv_4": { + "inputs": { + "flake-compat": [ + "ihp-boilerplate", + "ihp", + "devenv", + "cachix", + "flake-compat" + ], + "nix": "nix_3", + "nixpkgs": "nixpkgs_2", + "poetry2nix": "poetry2nix_2", + "pre-commit-hooks": [ + "ihp-boilerplate", + "ihp", + "devenv", + "cachix", + "pre-commit-hooks" + ] + }, + "locked": { + "lastModified": 1708704632, + "narHash": "sha256-w+dOIW60FKMaHI1q5714CSibk99JfYxm0CzTinYWr+Q=", + "owner": "cachix", + "repo": "devenv", + "rev": "2ee4450b0f4b95a1b90f2eb5ffea98b90e48c196", + "type": "github" + }, + "original": { + "owner": "cachix", + "ref": "python-rewrite", + "repo": "devenv", + "type": "github" + } + }, + "devenv_5": { + "inputs": { + "flake-compat": "flake-compat_5", + "nix": "nix_5", + "nixpkgs": [ + "ihp-boilerplate", + "ihp", + "ihp-boilerplate", + "ihp", + "nixpkgs" + ], + "pre-commit-hooks": "pre-commit-hooks_3" + }, "locked": { "lastModified": 1694422554, "narHash": "sha256-s5NTPzT66yIMmau+ZGP7q9z4NjgceDETL4xZ6HJ/TBg=", @@ -111,18 +223,20 @@ "type": "github" } }, - "devenv_4": { + "devenv_6": { "inputs": { - "flake-compat": "flake-compat_4", - "nix": "nix_4", + "flake-compat": "flake-compat_6", + "nix": "nix_6", "nixpkgs": [ "ihp-boilerplate", "ihp", "ihp-boilerplate", "ihp", + "ihp-boilerplate", + "ihp", "nixpkgs" ], - "pre-commit-hooks": "pre-commit-hooks_3" + "pre-commit-hooks": "pre-commit-hooks_4" }, "locked": { "lastModified": 1686054274, @@ -187,6 +301,38 @@ } }, "flake-compat_4": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_5": { + "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-compat_6": { "flake": false, "locked": { "lastModified": 1673956053, @@ -208,6 +354,28 @@ "nixpkgs" ] }, + "locked": { + "lastModified": 1717285511, + "narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_2": { + "inputs": { + "nixpkgs-lib": [ + "ihp-boilerplate", + "ihp", + "nixpkgs" + ] + }, "locked": { "lastModified": 1714641030, "narHash": "sha256-yzcRNDoyVP7+SCNX0wmuDju1NUCt8Dz9+lyUXEI0dbI=", @@ -222,7 +390,7 @@ "type": "github" } }, - "flake-parts_2": { + "flake-parts_3": { "inputs": { "nixpkgs-lib": "nixpkgs-lib" }, @@ -240,7 +408,7 @@ "type": "github" } }, - "flake-parts_3": { + "flake-parts_4": { "inputs": { "nixpkgs-lib": "nixpkgs-lib_2" }, @@ -298,6 +466,42 @@ "inputs": { "systems": "systems_3" }, + "locked": { + "lastModified": 1689068808, + "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_4": { + "inputs": { + "systems": "systems_4" + }, + "locked": { + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_5": { + "inputs": { + "systems": "systems_5" + }, "locked": { "lastModified": 1685518550, "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", @@ -312,7 +516,7 @@ "type": "github" } }, - "flake-utils_4": { + "flake-utils_6": { "locked": { "lastModified": 1667395993, "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", @@ -359,6 +563,32 @@ "nixpkgs" ] }, + "locked": { + "lastModified": 1709087332, + "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "gitignore.nix", + "type": "github" + } + }, + "gitignore_3": { + "inputs": { + "nixpkgs": [ + "ihp-boilerplate", + "ihp", + "ihp-boilerplate", + "ihp", + "devenv", + "pre-commit-hooks", + "nixpkgs" + ] + }, "locked": { "lastModified": 1660459072, "narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=", @@ -373,13 +603,15 @@ "type": "github" } }, - "gitignore_3": { + "gitignore_4": { "inputs": { "nixpkgs": [ "ihp-boilerplate", "ihp", "ihp-boilerplate", "ihp", + "ihp-boilerplate", + "ihp", "devenv", "pre-commit-hooks", "nixpkgs" @@ -404,21 +636,21 @@ "devenv": "devenv_3", "flake-parts": "flake-parts_2", "ihp-boilerplate": "ihp-boilerplate_2", - "nix-filter": "nix-filter", - "nixpkgs": "nixpkgs_3", - "systems": "systems_5" + "nix-filter": "nix-filter_2", + "nixpkgs": "nixpkgs_5", + "systems": "systems_8" }, "locked": { - "lastModified": 1700013490, - "narHash": "sha256-oQz7ZBrHe6WwYMwnxxUgnYM55CuH5Oxjz6mrLnYbB7U=", + "lastModified": 1714870134, + "narHash": "sha256-DmaIr9kF+TG24wVNPVufxC74TYMCLziLYS9hCZHBDTc=", "owner": "digitallyinduced", "repo": "ihp", - "rev": "d59a65d71943cb506eee3ad6255f017963237359", + "rev": "29436fd63f11ccad9b10168bba7d14df737ee287", "type": "github" }, "original": { "owner": "digitallyinduced", - "ref": "v1.2", + "ref": "v1.3", "repo": "ihp", "type": "github" } @@ -447,6 +679,52 @@ "systems" ] }, + "locked": { + "lastModified": 1714870368, + "narHash": "sha256-40eI5uHSTrKgHX6qJz4muP3MVjg2Zhxt3fIktqsx7GU=", + "owner": "digitallyinduced", + "repo": "ihp-boilerplate", + "rev": "68eb3debd8e353653391214a658deafa6f72d91c", + "type": "github" + }, + "original": { + "owner": "digitallyinduced", + "repo": "ihp-boilerplate", + "type": "github" + } + }, + "ihp-boilerplate_2": { + "inputs": { + "devenv": [ + "ihp-boilerplate", + "ihp", + "ihp-boilerplate", + "ihp", + "devenv" + ], + "flake-parts": [ + "ihp-boilerplate", + "ihp", + "ihp-boilerplate", + "ihp", + "flake-parts" + ], + "ihp": "ihp_2", + "nixpkgs": [ + "ihp-boilerplate", + "ihp", + "ihp-boilerplate", + "ihp", + "nixpkgs" + ], + "systems": [ + "ihp-boilerplate", + "ihp", + "ihp-boilerplate", + "ihp", + "systems" + ] + }, "locked": { "lastModified": 1710175252, "narHash": "sha256-QIFqo64U69uUGJ7pgBr37T3yAKK0n1ueqagKmnm+XWw=", @@ -461,13 +739,15 @@ "type": "github" } }, - "ihp-boilerplate_2": { + "ihp-boilerplate_3": { "inputs": { "devenv": [ "ihp-boilerplate", "ihp", "ihp-boilerplate", "ihp", + "ihp-boilerplate", + "ihp", "devenv" ], "flake-parts": [ @@ -475,14 +755,18 @@ "ihp", "ihp-boilerplate", "ihp", + "ihp-boilerplate", + "ihp", "flake-parts" ], - "ihp": "ihp_2", + "ihp": "ihp_3", "nixpkgs": [ "ihp-boilerplate", "ihp", "ihp-boilerplate", "ihp", + "ihp-boilerplate", + "ihp", "nixpkgs" ], "systems": [ @@ -490,6 +774,8 @@ "ihp", "ihp-boilerplate", "ihp", + "ihp-boilerplate", + "ihp", "systems" ] }, @@ -507,7 +793,7 @@ "type": "github" } }, - "ihp-boilerplate_3": { + "ihp-boilerplate_4": { "flake": false, "locked": { "lastModified": 1686165507, @@ -526,11 +812,35 @@ }, "ihp_2": { "inputs": { - "devenv": "devenv_4", + "devenv": "devenv_5", "flake-parts": "flake-parts_3", "ihp-boilerplate": "ihp-boilerplate_3", - "nixpkgs": "nixpkgs_2", - "systems": "systems_4" + "nix-filter": "nix-filter", + "nixpkgs": "nixpkgs_4", + "systems": "systems_7" + }, + "locked": { + "lastModified": 1700013490, + "narHash": "sha256-oQz7ZBrHe6WwYMwnxxUgnYM55CuH5Oxjz6mrLnYbB7U=", + "owner": "digitallyinduced", + "repo": "ihp", + "rev": "d59a65d71943cb506eee3ad6255f017963237359", + "type": "github" + }, + "original": { + "owner": "digitallyinduced", + "ref": "v1.2", + "repo": "ihp", + "type": "github" + } + }, + "ihp_3": { + "inputs": { + "devenv": "devenv_6", + "flake-parts": "flake-parts_4", + "ihp-boilerplate": "ihp-boilerplate_4", + "nixpkgs": "nixpkgs_3", + "systems": "systems_6" }, "locked": { "lastModified": 1689949405, @@ -614,62 +924,162 @@ "rev": "d6381c442f79f2f1fdfde00521c3d15d6c21218e", "type": "github" }, - "original": { - "owner": "numtide", - "repo": "nix-filter", - "type": "github" - } - }, - "nix-filter_2": { + "original": { + "owner": "numtide", + "repo": "nix-filter", + "type": "github" + } + }, + "nix-filter_2": { + "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-filter_3": { + "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-github-actions": { + "inputs": { + "nixpkgs": [ + "devenv", + "cachix", + "devenv", + "poetry2nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1688870561, + "narHash": "sha256-4UYkifnPEw1nAzqqPOTL2MvWtm3sNGw1UTYTalkTcGY=", + "owner": "nix-community", + "repo": "nix-github-actions", + "rev": "165b1650b753316aa7f1787f3005a8d2da0f5301", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nix-github-actions", + "type": "github" + } + }, + "nix-github-actions_2": { + "inputs": { + "nixpkgs": [ + "ihp-boilerplate", + "ihp", + "devenv", + "cachix", + "devenv", + "poetry2nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1688870561, + "narHash": "sha256-4UYkifnPEw1nAzqqPOTL2MvWtm3sNGw1UTYTalkTcGY=", + "owner": "nix-community", + "repo": "nix-github-actions", + "rev": "165b1650b753316aa7f1787f3005a8d2da0f5301", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nix-github-actions", + "type": "github" + } + }, + "nix_2": { + "inputs": { + "flake-compat": [ + "devenv", + "flake-compat" + ], + "nixpkgs": [ + "devenv", + "nixpkgs" + ], + "nixpkgs-regression": "nixpkgs-regression_2" + }, "locked": { - "lastModified": 1710156097, - "narHash": "sha256-1Wvk8UP7PXdf8bCCaEoMnOT1qe5/Duqgj+rL8sRQsSM=", - "owner": "numtide", - "repo": "nix-filter", - "rev": "3342559a24e85fc164b295c3444e8a139924675b", + "lastModified": 1712911606, + "narHash": "sha256-BGvBhepCufsjcUkXnEEXhEVjwdJAwPglCC2+bInc794=", + "owner": "domenkozar", + "repo": "nix", + "rev": "b24a9318ea3f3600c1e24b4a00691ee912d4de12", "type": "github" }, "original": { - "owner": "numtide", - "repo": "nix-filter", + "owner": "domenkozar", + "ref": "devenv-2.21", + "repo": "nix", "type": "github" } }, - "nix-github-actions": { + "nix_3": { "inputs": { + "flake-compat": "flake-compat_3", "nixpkgs": [ + "ihp-boilerplate", + "ihp", "devenv", "cachix", "devenv", - "poetry2nix", "nixpkgs" - ] + ], + "nixpkgs-regression": "nixpkgs-regression_3" }, "locked": { - "lastModified": 1688870561, - "narHash": "sha256-4UYkifnPEw1nAzqqPOTL2MvWtm3sNGw1UTYTalkTcGY=", - "owner": "nix-community", - "repo": "nix-github-actions", - "rev": "165b1650b753316aa7f1787f3005a8d2da0f5301", + "lastModified": 1712911606, + "narHash": "sha256-BGvBhepCufsjcUkXnEEXhEVjwdJAwPglCC2+bInc794=", + "owner": "domenkozar", + "repo": "nix", + "rev": "b24a9318ea3f3600c1e24b4a00691ee912d4de12", "type": "github" }, "original": { - "owner": "nix-community", - "repo": "nix-github-actions", + "owner": "domenkozar", + "ref": "devenv-2.21", + "repo": "nix", "type": "github" } }, - "nix_2": { + "nix_4": { "inputs": { "flake-compat": [ + "ihp-boilerplate", + "ihp", "devenv", "flake-compat" ], "nixpkgs": [ + "ihp-boilerplate", + "ihp", "devenv", "nixpkgs" ], - "nixpkgs-regression": "nixpkgs-regression_2" + "nixpkgs-regression": "nixpkgs-regression_4" }, "locked": { "lastModified": 1712911606, @@ -686,16 +1096,18 @@ "type": "github" } }, - "nix_3": { + "nix_5": { "inputs": { "lowdown-src": "lowdown-src", "nixpkgs": [ + "ihp-boilerplate", + "ihp", "ihp-boilerplate", "ihp", "devenv", "nixpkgs" ], - "nixpkgs-regression": "nixpkgs-regression_3" + "nixpkgs-regression": "nixpkgs-regression_5" }, "locked": { "lastModified": 1676545802, @@ -712,7 +1124,7 @@ "type": "github" } }, - "nix_4": { + "nix_6": { "inputs": { "lowdown-src": "lowdown-src_2", "nixpkgs": [ @@ -720,10 +1132,12 @@ "ihp", "ihp-boilerplate", "ihp", + "ihp-boilerplate", + "ihp", "devenv", "nixpkgs" ], - "nixpkgs-regression": "nixpkgs-regression_4" + "nixpkgs-regression": "nixpkgs-regression_6" }, "locked": { "lastModified": 1676545802, @@ -856,6 +1270,38 @@ "type": "github" } }, + "nixpkgs-regression_5": { + "locked": { + "lastModified": 1643052045, + "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "github" + } + }, + "nixpkgs-regression_6": { + "locked": { + "lastModified": 1643052045, + "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "github" + } + }, "nixpkgs-stable": { "locked": { "lastModified": 1710695816, @@ -873,6 +1319,22 @@ } }, "nixpkgs-stable_2": { + "locked": { + "lastModified": 1710695816, + "narHash": "sha256-3Eh7fhEID17pv9ZxrPwCLfqXnYP006RKzSs0JptsN84=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "614b4613980a522ba49f0d194531beddbb7220d3", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-23.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-stable_3": { "locked": { "lastModified": 1685801374, "narHash": "sha256-otaSUoFEMM+LjBI1XL/xGB5ao6IwnZOXc47qhIgJe8U=", @@ -888,7 +1350,7 @@ "type": "github" } }, - "nixpkgs-stable_3": { + "nixpkgs-stable_4": { "locked": { "lastModified": 1678872516, "narHash": "sha256-/E1YwtMtFAu2KUQKV/1+KFuReYPANM2Rzehk84VxVoc=", @@ -905,6 +1367,22 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1692808169, + "narHash": "sha256-x9Opq06rIiwdwGeK2Ykj69dNc2IvUH1fY55Wm7atwrE=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "9201b5ff357e781bf014d0330d18555695df7ba8", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1681488673, "narHash": "sha256-PmojOyePBNvbY3snYE7NAQHTLB53t7Ro+pgiJ4wPCuk=", @@ -920,7 +1398,7 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { "lastModified": 1696291921, "narHash": "sha256-isKgVAoUxuxYEuO3Q4xhbfKcZrF/+UkJtOTv0eb/W5E=", @@ -936,7 +1414,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_5": { "locked": { "lastModified": 1714864423, "narHash": "sha256-Wx3Y6arRJD1pd3c8SnD7dfW7KWuCr/r248P/5XLaMdM=", @@ -951,6 +1429,21 @@ "type": "github" } }, + "nixpkgs_6": { + "locked": { + "lastModified": 1719438821, + "narHash": "sha256-/+3QdkW4N+d4o9qrGwu98xXvBGd13LdAeSOi1b2Nhnw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "3892cc3abd4041bc2cdecef65486dc7b8c95dfba", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "type": "github" + } + }, "poetry2nix": { "inputs": { "flake-utils": "flake-utils", @@ -976,6 +1469,33 @@ "type": "github" } }, + "poetry2nix_2": { + "inputs": { + "flake-utils": "flake-utils_3", + "nix-github-actions": "nix-github-actions_2", + "nixpkgs": [ + "ihp-boilerplate", + "ihp", + "devenv", + "cachix", + "devenv", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1692876271, + "narHash": "sha256-IXfZEkI0Mal5y1jr6IRWMqK8GW2/f28xJenZIPQqkY0=", + "owner": "nix-community", + "repo": "poetry2nix", + "rev": "d5006be9c2c2417dafb2e2e5034d83fabd207ee3", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "poetry2nix", + "type": "github" + } + }, "pre-commit-hooks": { "inputs": { "flake-compat": [ @@ -1012,7 +1532,7 @@ "devenv", "flake-compat" ], - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_4", "gitignore": "gitignore_2", "nixpkgs": [ "ihp-boilerplate", @@ -1023,11 +1543,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1688056373, - "narHash": "sha256-2+SDlNRTKsgo3LBRiMUcoEUb6sDViRNQhzJquZ4koOI=", + "lastModified": 1713775815, + "narHash": "sha256-Wu9cdYTnGQQwtT20QQMg7jzkANKQjwBD9iccfGKkfls=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "5843cf069272d92b60c3ed9e55b7a8989c01d4c7", + "rev": "2ac4dcbf55ed43f3be0bae15e181f08a57af24a4", "type": "github" }, "original": { @@ -1046,7 +1566,7 @@ "devenv", "flake-compat" ], - "flake-utils": "flake-utils_4", + "flake-utils": "flake-utils_5", "gitignore": "gitignore_3", "nixpkgs": [ "ihp-boilerplate", @@ -1058,6 +1578,46 @@ ], "nixpkgs-stable": "nixpkgs-stable_3" }, + "locked": { + "lastModified": 1688056373, + "narHash": "sha256-2+SDlNRTKsgo3LBRiMUcoEUb6sDViRNQhzJquZ4koOI=", + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "rev": "5843cf069272d92b60c3ed9e55b7a8989c01d4c7", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "type": "github" + } + }, + "pre-commit-hooks_4": { + "inputs": { + "flake-compat": [ + "ihp-boilerplate", + "ihp", + "ihp-boilerplate", + "ihp", + "ihp-boilerplate", + "ihp", + "devenv", + "flake-compat" + ], + "flake-utils": "flake-utils_6", + "gitignore": "gitignore_4", + "nixpkgs": [ + "ihp-boilerplate", + "ihp", + "ihp-boilerplate", + "ihp", + "ihp-boilerplate", + "ihp", + "devenv", + "nixpkgs" + ], + "nixpkgs-stable": "nixpkgs-stable_4" + }, "locked": { "lastModified": 1682596858, "narHash": "sha256-Hf9XVpqaGqe/4oDGr30W8HlsWvJXtMsEPHDqHZA6dDg=", @@ -1075,11 +1635,12 @@ "root": { "inputs": { "devenv": "devenv", + "devenv-root": "devenv-root", "flake-parts": "flake-parts", "ihp-boilerplate": "ihp-boilerplate", - "nix-filter": "nix-filter_2", - "nixpkgs": "nixpkgs_4", - "systems": "systems_6" + "nix-filter": "nix-filter_3", + "nixpkgs": "nixpkgs_6", + "systems": "systems_9" } }, "systems": { @@ -1171,6 +1732,51 @@ "repo": "default", "type": "github" } + }, + "systems_7": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_8": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_9": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 7b5e9ef19..a46151977 100644 --- a/flake.nix +++ b/flake.nix @@ -20,6 +20,13 @@ ihp-boilerplate.url = "github:digitallyinduced/ihp-boilerplate"; nix-filter.url = "github:numtide/nix-filter"; + + # Hack to avoid --impure flag + # See https://github.com/cachix/devenv/commit/cc0944a60978ad7cf74d429d18c2a8065f018545 + devenv-root = { + url = "file+file:///dev/null"; + flake = false; + }; }; outputs = inputs: inputs.flake-parts.lib.mkFlake { inherit inputs; } (