From ca88d1353584296a1e1c30d6f0a1580d0f964387 Mon Sep 17 00:00:00 2001 From: Oleks Date: Tue, 19 May 2026 16:31:09 +0300 Subject: [PATCH] nix-deps: re-expose github:manelinux/nix-deps through the hub Adds nix-deps as an input following our nixpkgs and re-exports its package via mkPackages (gated to native x86_64/aarch64, since its flake only emits eachDefaultSystem and would break the s390x cross). Also adds .gitignore for build result symlinks. --- .gitignore | 2 ++ flake.lock | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ flake.nix | 11 +++++++++++ 3 files changed, 68 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..750baeb --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +result +result-* diff --git a/flake.lock b/flake.lock index 112baa5..744a1e5 100644 --- a/flake.lock +++ b/flake.lock @@ -57,6 +57,24 @@ "type": "github" } }, + "flake-utils_3": { + "inputs": { + "systems": "systems_3" + }, + "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" + } + }, "fleet-pins": { "inputs": { "nixpkgs": "nixpkgs", @@ -125,6 +143,27 @@ "type": "github" } }, + "nix-deps": { + "inputs": { + "flake-utils": "flake-utils_3", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1778863463, + "narHash": "sha256-TynOVZBZHiBZAjZbW2sQfaVEh5UXi4UgZ3X0pcu4nYE=", + "owner": "manelinux", + "repo": "nix-deps", + "rev": "5fdd0979c6254969eeb34ff49da2fa73c02972f3", + "type": "github" + }, + "original": { + "owner": "manelinux", + "repo": "nix-deps", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1771848320, @@ -147,6 +186,7 @@ "flake-utils": "flake-utils_2", "fleet-pins": "fleet-pins", "hyprspace": "hyprspace", + "nix-deps": "nix-deps", "nixpkgs": [ "fleet-pins", "nixpkgs-projects" @@ -182,6 +222,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 72ed57e..1e75901 100644 --- a/flake.nix +++ b/flake.nix @@ -19,6 +19,13 @@ url = "github:jacopone/antigravity-nix"; inputs.nixpkgs.follows = "nixpkgs"; }; + + # nix-deps: "see the real cost of installing packages on NixOS". + # Re-exposed through our overlay so CI builds it into attic. + nix-deps = { + url = "github:manelinux/nix-deps"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; outputs = @@ -29,6 +36,7 @@ flake-utils, hyprspace, antigravity-nix, + nix-deps, ... }: let @@ -93,6 +101,9 @@ google-antigravity google-antigravity-no-fhs ; + # nix-deps' flake only outputs eachDefaultSystem (no s390x), so + # gate it on the same native x86_64/aarch64 condition. + nix-deps = nix-deps.packages.${sys}.default; }; # Overlay providing Hyprspace. Requires `pkgs.hyprland` to be present