From 74cf9ecfa0a3a1b54697c430c391be169ef272d2 Mon Sep 17 00:00:00 2001 From: kurogeek Date: Wed, 8 Apr 2026 12:00:32 +0700 Subject: [PATCH] mob next [ci-skip] [ci skip] [skip ci] lastFile:overlays/default.nix --- flake.lock | 538 ++++++++++++++++++++++++++++++++++++++++++- flake.nix | 5 + overlays/default.nix | 7 +- 3 files changed, 548 insertions(+), 2 deletions(-) diff --git a/flake.lock b/flake.lock index edf3c0f..5480a30 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,58 @@ { "nodes": { + "arion": { + "inputs": { + "flake-parts": "flake-parts_2", + "haskell-flake": "haskell-flake", + "nixpkgs": [ + "frappix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1733918465, + "narHash": "sha256-hSuGa8Hh67EHr2x812Ay6WFyFT2BGKn+zk+FJWeKXPg=", + "owner": "hercules-ci", + "repo": "arion", + "rev": "f01c95c10f9d4f04bb08d97b3233b530b180f12e", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "arion", + "type": "github" + } + }, + "blank": { + "locked": { + "lastModified": 1625557891, + "narHash": "sha256-O8/MWsPBGhhyPoPLHZAuoZiiHo9q6FLlEeIDEXuj6T4=", + "owner": "divnix", + "repo": "blank", + "rev": "5a5d2684073d9f563072ed07c871d577a6c614a8", + "type": "github" + }, + "original": { + "owner": "divnix", + "repo": "blank", + "type": "github" + } + }, + "call-flake": { + "locked": { + "lastModified": 1687380775, + "narHash": "sha256-bmhE1TmrJG4ba93l9WQTLuYM53kwGQAjYHRvHOeuxWU=", + "owner": "divnix", + "repo": "call-flake", + "rev": "74061f6c241227cd05e79b702db9a300a2e4131a", + "type": "github" + }, + "original": { + "owner": "divnix", + "repo": "call-flake", + "type": "github" + } + }, "clan-core": { "inputs": { "data-mesher": "data-mesher", @@ -100,6 +153,39 @@ "type": "github" } }, + "dmerge": { + "inputs": { + "haumea": [ + "frappix", + "std", + "haumea" + ], + "nixlib": [ + "frappix", + "std", + "lib" + ], + "yants": [ + "frappix", + "std", + "yants" + ] + }, + "locked": { + "lastModified": 1686862774, + "narHash": "sha256-ojGtRQ9pIOUrxsQEuEPerUkqIJEuod9hIflfNkY+9CE=", + "owner": "divnix", + "repo": "dmerge", + "rev": "9f7f7a8349d33d7bd02e0f2b484b1f076e503a96", + "type": "github" + }, + "original": { + "owner": "divnix", + "ref": "0.2.1", + "repo": "dmerge", + "type": "github" + } + }, "flake-parts": { "inputs": { "nixpkgs-lib": [ @@ -120,6 +206,146 @@ "type": "github" } }, + "flake-parts_2": { + "inputs": { + "nixpkgs-lib": [ + "frappix", + "arion", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1733312601, + "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-utils": { + "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_2": { + "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" + } + }, + "flake-utils_3": { + "locked": { + "lastModified": 1653893745, + "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "frappix": { + "inputs": { + "arion": "arion", + "devshell": [ + "devshell" + ], + "microvm": "microvm", + "n2c": "n2c", + "nixago": "nixago", + "nixpkgs": [ + "nixpkgs" + ], + "std": "std" + }, + "locked": { + "lastModified": 1775622451, + "narHash": "sha256-6pLzYdGcabh+PcXxYBkZgrQpdF7NjuT5i6o9kewBBqU=", + "owner": "kurogeek", + "repo": "frappix", + "rev": "974d136f6d190a937e55f1e1a5332bdf96f57fab", + "type": "github" + }, + "original": { + "owner": "kurogeek", + "repo": "frappix", + "type": "github" + } + }, + "haskell-flake": { + "locked": { + "lastModified": 1675296942, + "narHash": "sha256-u1X1sblozi5qYEcLp1hxcyo8FfDHnRUVX3dJ/tW19jY=", + "owner": "srid", + "repo": "haskell-flake", + "rev": "c2cafce9d57bfca41794dc3b99c593155006c71e", + "type": "github" + }, + "original": { + "owner": "srid", + "ref": "0.1.0", + "repo": "haskell-flake", + "type": "github" + } + }, + "haumea": { + "inputs": { + "nixpkgs": [ + "frappix", + "std", + "lib" + ] + }, + "locked": { + "lastModified": 1685133229, + "narHash": "sha256-FePm/Gi9PBSNwiDFq3N+DWdfxFq0UKsVVTJS3cQPn94=", + "owner": "nix-community", + "repo": "haumea", + "rev": "34dd58385092a23018748b50f9b23de6266dffc2", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "v0.2.2", + "repo": "haumea", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -155,6 +381,43 @@ "type": "github" } }, + "incl": { + "inputs": { + "nixlib": [ + "frappix", + "std", + "lib" + ] + }, + "locked": { + "lastModified": 1693483555, + "narHash": "sha256-Beq4WhSeH3jRTZgC1XopTSU10yLpK1nmMcnGoXO0XYo=", + "owner": "divnix", + "repo": "incl", + "rev": "526751ad3d1e23b07944b14e3f6b7a5948d3007b", + "type": "github" + }, + "original": { + "owner": "divnix", + "repo": "incl", + "type": "github" + } + }, + "lib": { + "locked": { + "lastModified": 1722128034, + "narHash": "sha256-L8rwzYPsLo/TYtydPJoQyYOfetuiyQYnTWYcyB8UE/s=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "d15f6f6021693898fcd2c6a9bb13707383da9bbc", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixpkgs.lib", + "type": "github" + } + }, "liminix": { "flake": false, "locked": { @@ -171,6 +434,48 @@ "url": "https://gti.telent.net/dan/liminix" } }, + "microvm": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": [ + "frappix", + "nixpkgs" + ], + "spectrum": "spectrum" + }, + "locked": { + "lastModified": 1737981104, + "narHash": "sha256-7AGmPPBgLHHWgzzFYDJcyhv/NiuCrpgzg8IyA7Q/H9o=", + "owner": "astro", + "repo": "microvm.nix", + "rev": "3768f4937f38334898c67e03f40e244a57a74caa", + "type": "github" + }, + "original": { + "owner": "astro", + "repo": "microvm.nix", + "type": "github" + } + }, + "n2c": { + "inputs": { + "flake-utils": "flake-utils_2", + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1730479402, + "narHash": "sha256-79NLeNjpCa4mSasmFsE3QA6obURezF0TUO5Pm+1daog=", + "owner": "nlewo", + "repo": "nix2container", + "rev": "5fb215a1564baa74ce04ad7f903d94ad6617e17a", + "type": "github" + }, + "original": { + "owner": "nlewo", + "repo": "nix2container", + "type": "github" + } + }, "nix-darwin": { "inputs": { "nixpkgs": [ @@ -205,7 +510,47 @@ "url": "https://git.clan.lol/clan/nix-select/archive/main.tar.gz" } }, + "nixago": { + "inputs": { + "flake-utils": "flake-utils_3", + "nixago-exts": [ + "frappix" + ], + "nixpkgs": [ + "frappix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1714086354, + "narHash": "sha256-yKVQMxL9p7zCWUhnGhDzRVT8sDgHoI3V595lBK0C2YA=", + "owner": "nix-community", + "repo": "nixago", + "rev": "5133633e9fe6b144c8e00e3b212cdbd5a173b63d", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixago", + "type": "github" + } + }, "nixpkgs": { + "locked": { + "lastModified": 1712920918, + "narHash": "sha256-1yxFvUcJfUphK9V91KufIQom7gCsztza0H4Rz2VCWUU=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "92323443a56f4e9fc4e4b712e3119f66d0969297", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { "locked": { "lastModified": 1774794121, "narHash": "sha256-gih24b728CK8twDNU7VX9vVYK2tLEXvy9gm/GKq2VeE=", @@ -221,6 +566,68 @@ "type": "github" } }, + "nosys": { + "locked": { + "lastModified": 1668010795, + "narHash": "sha256-JBDVBnos8g0toU7EhIIqQ1If5m/nyBqtHhL3sicdPwI=", + "owner": "divnix", + "repo": "nosys", + "rev": "feade0141487801c71ff55623b421ed535dbdefa", + "type": "github" + }, + "original": { + "owner": "divnix", + "repo": "nosys", + "type": "github" + } + }, + "paisano": { + "inputs": { + "call-flake": "call-flake", + "nixpkgs": [ + "frappix", + "std", + "nixpkgs" + ], + "nosys": "nosys", + "yants": [ + "frappix", + "std", + "yants" + ] + }, + "locked": { + "lastModified": 1708640854, + "narHash": "sha256-EpcAmvIS4ErqhXtVEfd2GPpU/E/s8CCRSfYzk6FZ/fY=", + "owner": "paisano-nix", + "repo": "core", + "rev": "adcf742bc9463c08764ca9e6955bd5e7dcf3a3fe", + "type": "github" + }, + "original": { + "owner": "paisano-nix", + "ref": "0.2.0", + "repo": "core", + "type": "github" + } + }, + "paisano-tui": { + "flake": false, + "locked": { + "lastModified": 1708637035, + "narHash": "sha256-R19YURSK+MY/Rw6FZnojQS9zuDh+OoTAyngQAjjoubc=", + "owner": "paisano-nix", + "repo": "tui", + "rev": "231761b260587a64817e4ffae3afc15defaa15db", + "type": "github" + }, + "original": { + "owner": "paisano-nix", + "ref": "v0.5.0", + "repo": "tui", + "type": "github" + } + }, "plasma-manager": { "inputs": { "home-manager": [ @@ -249,10 +656,11 @@ "clan-core": "clan-core", "devshell": "devshell", "flake-parts": "flake-parts", + "frappix": "frappix", "home-manager": "home-manager", "import-tree": "import-tree", "liminix": "liminix", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_2", "plasma-manager": "plasma-manager", "treefmt-nix": "treefmt-nix" } @@ -278,6 +686,82 @@ "type": "github" } }, + "spectrum": { + "flake": false, + "locked": { + "lastModified": 1733308308, + "narHash": "sha256-+RcbMAjSxV1wW5UpS9abIG1lFZC8bITPiFIKNnE7RLs=", + "ref": "refs/heads/main", + "rev": "80c9e9830d460c944c8f730065f18bb733bc7ee2", + "revCount": 792, + "type": "git", + "url": "https://spectrum-os.org/git/spectrum" + }, + "original": { + "type": "git", + "url": "https://spectrum-os.org/git/spectrum" + } + }, + "std": { + "inputs": { + "arion": [ + "frappix", + "arion" + ], + "blank": "blank", + "devshell": [ + "frappix", + "devshell" + ], + "dmerge": "dmerge", + "haumea": "haumea", + "incl": "incl", + "lib": "lib", + "makes": [ + "frappix", + "std", + "blank" + ], + "microvm": [ + "frappix", + "microvm" + ], + "n2c": [ + "frappix", + "n2c" + ], + "nixago": [ + "frappix", + "nixago" + ], + "nixpkgs": [ + "frappix", + "nixpkgs" + ], + "paisano": "paisano", + "paisano-tui": "paisano-tui", + "terranix": [ + "frappix", + "std", + "blank" + ], + "yants": "yants" + }, + "locked": { + "lastModified": 1738072995, + "narHash": "sha256-jfwWnAVeQzIBS5Pex0xSUbGk88g1GFF2w+ohOtbRtcY=", + "owner": "divnix", + "repo": "std", + "rev": "2874513c4b76be4c4200779814993b546fe4a909", + "type": "github" + }, + "original": { + "owner": "divnix", + "ref": "v0.33.4", + "repo": "std", + "type": "github" + } + }, "systems": { "locked": { "lastModified": 1681028828, @@ -293,6 +777,36 @@ "type": "github" } }, + "systems_2": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "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" + } + }, "treefmt-nix": { "inputs": { "nixpkgs": [ @@ -312,6 +826,28 @@ "repo": "treefmt-nix", "type": "github" } + }, + "yants": { + "inputs": { + "nixpkgs": [ + "frappix", + "std", + "lib" + ] + }, + "locked": { + "lastModified": 1686863218, + "narHash": "sha256-kooxYm3/3ornWtVBNHM3Zh020gACUyFX2G0VQXnB+mk=", + "owner": "divnix", + "repo": "yants", + "rev": "8f0da0dba57149676aa4817ec0c880fbde7a648d", + "type": "github" + }, + "original": { + "owner": "divnix", + "repo": "yants", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 2894a35..a8819f7 100644 --- a/flake.nix +++ b/flake.nix @@ -34,6 +34,11 @@ url = "git+https://gti.telent.net/dan/liminix"; flake = false; }; + frappix = { + url = "github:kurogeek/frappix"; + inputs.nixpkgs.follows = "nixpkgs"; + inputs.devshell.follows = "devshell"; + }; }; outputs = { diff --git a/overlays/default.nix b/overlays/default.nix index 583c8e9..3a00279 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -1,6 +1,11 @@ -{ ... }: +{ inputs, ... }: { flake.overlays = { packagesOverlay = import ../pkgs/overlay.nix; + + frappixFrappeOverlay = inputs.frappix.frappeOverlay.x86_64-linux; + frappixLibsOverlay = inputs.frappix.libsOverlay.x86_64-linux; + frappixPythonOverlay = inputs.frappix.pythonOverlay.x86_64-linux; + frappixToolsOverlay = inputs.frappix.toolsOverlay.x86_64-linux; }; }