summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSophie Forrest <git@sophieforrest.com>2024-09-11 18:13:29 +1200
committerSophie Forrest <git@sophieforrest.com>2024-09-11 18:13:29 +1200
commit8b67cb373e91dc47feeea7ef41b526b75a4dbf93 (patch)
treefe0ec8fa0398d4d2d4d01743e1028469a3f9a85b
parent50e5cd743022ae5d28b477899c22b415afba12e1 (diff)
chore: fix flake checks
devenv has some hitches with flake.parts, this addresses some of them.
-rw-r--r--flake.lock71
-rw-r--r--flake.nix4
2 files changed, 75 insertions, 0 deletions
diff --git a/flake.lock b/flake.lock
index 5c7701d..ebd3e0a 100644
--- a/flake.lock
+++ b/flake.lock
@@ -169,6 +169,24 @@
"type": "github"
}
},
+ "flake-utils_3": {
+ "inputs": {
+ "systems": "systems_3"
+ },
+ "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"
+ }
+ },
"gitignore": {
"inputs": {
"nixpkgs": [
@@ -191,6 +209,21 @@
"type": "github"
}
},
+ "mk-shell-bin": {
+ "locked": {
+ "lastModified": 1677004959,
+ "narHash": "sha256-/uEkr1UkJrh11vD02aqufCxtbF5YnhRTIKlx5kyvf+I=",
+ "owner": "rrbutani",
+ "repo": "nix-mk-shell-bin",
+ "rev": "ff5d8bd4d68a347be5042e2f16caee391cd75887",
+ "type": "github"
+ },
+ "original": {
+ "owner": "rrbutani",
+ "repo": "nix-mk-shell-bin",
+ "type": "github"
+ }
+ },
"nix": {
"inputs": {
"flake-compat": "flake-compat",
@@ -241,6 +274,27 @@
"type": "github"
}
},
+ "nix2container": {
+ "inputs": {
+ "flake-utils": "flake-utils_3",
+ "nixpkgs": [
+ "nixpkgs"
+ ]
+ },
+ "locked": {
+ "lastModified": 1724996935,
+ "narHash": "sha256-njRK9vvZ1JJsP8oV2OgkBrpJhgQezI03S7gzskCcHos=",
+ "owner": "nlewo",
+ "repo": "nix2container",
+ "rev": "fa6bb0a1159f55d071ba99331355955ae30b3401",
+ "type": "github"
+ },
+ "original": {
+ "owner": "nlewo",
+ "repo": "nix2container",
+ "type": "github"
+ }
+ },
"nix_2": {
"inputs": {
"flake-compat": [
@@ -433,6 +487,8 @@
"inputs": {
"devenv": "devenv",
"flake-parts": "flake-parts",
+ "mk-shell-bin": "mk-shell-bin",
+ "nix2container": "nix2container",
"nixpkgs": "nixpkgs_3"
}
},
@@ -465,6 +521,21 @@
"repo": "default",
"type": "github"
}
+ },
+ "systems_3": {
+ "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 433b20a..e732d5b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -5,6 +5,10 @@
flake-parts.url = "github:hercules-ci/flake-parts";
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+ nix2container.url = "github:nlewo/nix2container";
+ nix2container.inputs.nixpkgs.follows = "nixpkgs";
+ mk-shell-bin.url = "github:rrbutani/nix-mk-shell-bin";
+
devenv.url = "github:cachix/devenv";
};