diff --git a/flake.lock b/flake.lock index cfcc700..735088a 100644 --- a/flake.lock +++ b/flake.lock @@ -8,6 +8,53 @@ ], "rust-analyzer-src": "rust-analyzer-src" }, + "locked": { + "lastModified": 1733380458, + "narHash": "sha256-H+IQB6cJ7ji/YD537pcSUWlwGGJ49RoYylBonyNW9hk=", + "owner": "nix-community", + "repo": "fenix", + "rev": "08c9e4e29865b60cb81189f8e4de0dccaf297865", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "fenix", + "type": "github" + } + }, + "fenix_2": { + "inputs": { + "nixpkgs": [ + "mk", + "mk", + "nixpkgs" + ], + "rust-analyzer-src": "rust-analyzer-src_2" + }, + "locked": { + "lastModified": 1732689334, + "narHash": "sha256-yKI1KiZ0+bvDvfPTQ1ZT3oP/nIu3jPYm4dnbRd6hYg4=", + "owner": "nix-community", + "repo": "fenix", + "rev": "a8a983027ca02b363dfc82fbe3f7d9548a8d3dce", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "fenix", + "type": "github" + } + }, + "fenix_3": { + "inputs": { + "nixpkgs": [ + "mk", + "mk", + "mk", + "nixpkgs" + ], + "rust-analyzer-src": "rust-analyzer-src_3" + }, "locked": { "lastModified": 1728628307, "narHash": "sha256-GRMRHZyU+R0RqKPFFgi7BBMDIRFPnHaAhOIxlqyvbZQ=", @@ -22,14 +69,16 @@ "type": "github" } }, - "fenix_2": { + "fenix_4": { "inputs": { "nixpkgs": [ + "mk", + "mk", "mk", "mk", "nixpkgs" ], - "rust-analyzer-src": "rust-analyzer-src_2" + "rust-analyzer-src": "rust-analyzer-src_4" }, "locked": { "lastModified": 1723185066, @@ -49,6 +98,42 @@ "inputs": { "systems": "systems" }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_2": { + "inputs": { + "systems": "systems_2" + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_3": { + "inputs": { + "systems": "systems_3" + }, "locked": { "lastModified": 1726560853, "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", @@ -63,9 +148,9 @@ "type": "github" } }, - "flake-utils_2": { + "flake-utils_4": { "inputs": { - "systems": "systems_2" + "systems": "systems_4" }, "locked": { "lastModified": 1710146030, @@ -86,6 +171,48 @@ "fenix": "fenix", "flake-utils": "flake-utils", "mk": "mk_2", + "nixpkgs": "nixpkgs_4" + }, + "locked": { + "lastModified": 1733400671, + "narHash": "sha256-Vy35YmCsLJEXSdNPrKC0N5Pdx9oiaC+D4flh65mZA9g=", + "owner": "x0k", + "repo": "mk", + "rev": "8bed4198f91f4cf14da2a43456f41c01119efb61", + "type": "github" + }, + "original": { + "owner": "x0k", + "repo": "mk", + "type": "github" + } + }, + "mk_2": { + "inputs": { + "fenix": "fenix_2", + "flake-utils": "flake-utils_2", + "mk": "mk_3", + "nixpkgs": "nixpkgs_3" + }, + "locked": { + "lastModified": 1733398898, + "narHash": "sha256-uY51C0ZLmNZ3lVZYytMSAPzWY4tgZLhdTthMXuO4ppQ=", + "owner": "x0k", + "repo": "mk", + "rev": "251418dc63d97eb4e66d06b451f8812bfa37bed2", + "type": "github" + }, + "original": { + "owner": "x0k", + "repo": "mk", + "type": "github" + } + }, + "mk_3": { + "inputs": { + "fenix": "fenix_3", + "flake-utils": "flake-utils_3", + "mk": "mk_4", "nixpkgs": "nixpkgs_2" }, "locked": { @@ -102,10 +229,10 @@ "type": "github" } }, - "mk_2": { + "mk_4": { "inputs": { - "fenix": "fenix_2", - "flake-utils": "flake-utils_2", + "fenix": "fenix_4", + "flake-utils": "flake-utils_4", "nixpkgs": "nixpkgs" }, "locked": { @@ -156,11 +283,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1729413321, - "narHash": "sha256-I4tuhRpZFa6Fu6dcH9Dlo5LlH17peT79vx1y1SpeKt0=", + "lastModified": 1733212471, + "narHash": "sha256-M1+uCoV5igihRfcUKrr1riygbe73/dzNnzPsmaLCmpo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1997e4aa514312c1af7e2bda7fad1644e778ff26", + "rev": "55d15ad12a74eb7d4646254e13638ad0c4128776", "type": "github" }, "original": { @@ -170,13 +297,79 @@ "type": "github" } }, + "nixpkgs_4": { + "locked": { + "lastModified": 1733261153, + "narHash": "sha256-eq51hyiaIwtWo19fPEeE0Zr2s83DYMKJoukNLgGGpek=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "b681065d0919f7eb5309a93cea2cfa84dec9aa88", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-24.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_5": { + "locked": { + "lastModified": 1733261153, + "narHash": "sha256-eq51hyiaIwtWo19fPEeE0Zr2s83DYMKJoukNLgGGpek=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "b681065d0919f7eb5309a93cea2cfa84dec9aa88", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-24.11", + "repo": "nixpkgs", + "type": "github" + } + }, "root": { "inputs": { "mk": "mk", - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_5" } }, "rust-analyzer-src": { + "flake": false, + "locked": { + "lastModified": 1733330394, + "narHash": "sha256-1jwtAQYtErSsfkEQFvZJ9wJBrLGltzlvZKZzPXhpfpE=", + "owner": "rust-lang", + "repo": "rust-analyzer", + "rev": "f499faf72bcd2abbfbf3d7171e5191100547a3df", + "type": "github" + }, + "original": { + "owner": "rust-lang", + "ref": "nightly", + "repo": "rust-analyzer", + "type": "github" + } + }, + "rust-analyzer-src_2": { + "flake": false, + "locked": { + "lastModified": 1732633904, + "narHash": "sha256-7VKcoLug9nbAN2txqVksWHHJplqK9Ou8dXjIZAIYSGc=", + "owner": "rust-lang", + "repo": "rust-analyzer", + "rev": "8d5e91c94f80c257ce6dbdfba7bd63a5e8a03fa6", + "type": "github" + }, + "original": { + "owner": "rust-lang", + "ref": "nightly", + "repo": "rust-analyzer", + "type": "github" + } + }, + "rust-analyzer-src_3": { "flake": false, "locked": { "lastModified": 1728505432, @@ -193,7 +386,7 @@ "type": "github" } }, - "rust-analyzer-src_2": { + "rust-analyzer-src_4": { "flake": false, "locked": { "lastModified": 1723124382, @@ -239,6 +432,36 @@ "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" + } + }, + "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" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index f0299db..e7c7dff 100644 --- a/flake.nix +++ b/flake.nix @@ -1,6 +1,6 @@ { inputs = { - nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable"; + nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-24.11"; mk.url = "github:x0k/mk"; }; outputs = diff --git a/mkfilex b/mkfilex index 0ebba3f..5789a4a 100644 --- a/mkfilex +++ b/mkfilex @@ -55,3 +55,6 @@ x/: t: pnpm run test popd + +h: + mk -P targets "*"