Remove unneeded flake inputs

Reviewed-by: Aleix Boné <abonerib@bsc.es>
Tested-by: Rodrigo Arias Mallo <rodrigo.arias@bsc.es>

.gitea/workflows/ci.yaml

@@ -12,4 +12,9 @@ jobs:
     runs-on: native
     steps:
       - uses: https://gitea.com/ScMi1/checkout@v1.4
-      - run: nix build -L --no-link --print-out-paths .#bsc-ci.all
+      - run: nix build -L --no-link --print-out-paths .#bsc.ci.all
+  build:cross:
+    runs-on: native
+    steps:
+      - uses: https://gitea.com/ScMi1/checkout@v1.4
+      - run: nix build -L --no-link --print-out-paths .#bsc.ci.cross

flake.lock

@@ -2,12 +2,14 @@
   "nodes": {
     "agenix": {
       "inputs": {
-        "darwin": "darwin",
+        "darwin": [],
-        "home-manager": "home-manager",
+        "home-manager": [],
         "nixpkgs": [
           "nixpkgs"
         ],
-        "systems": "systems"
+        "systems": [
+          "systems"
+        ]
       },
       "locked": {
         "lastModified": 1750173260,
@@ -23,49 +25,6 @@
         "type": "github"
       }
     },
-    "darwin": {
-      "inputs": {
-        "nixpkgs": [
-          "agenix",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1744478979,
-        "narHash": "sha256-dyN+teG9G82G+m+PX/aSAagkC+vUv0SgUw3XkPhQodQ=",
-        "owner": "lnl7",
-        "repo": "nix-darwin",
-        "rev": "43975d782b418ebf4969e9ccba82466728c2851b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "lnl7",
-        "ref": "master",
-        "repo": "nix-darwin",
-        "type": "github"
-      }
-    },
-    "home-manager": {
-      "inputs": {
-        "nixpkgs": [
-          "agenix",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1745494811,
-        "narHash": "sha256-YZCh2o9Ua1n9uCvrvi5pRxtuVNml8X2a03qIFfRKpFs=",
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "rev": "abfad3d2958c9e6300a883bd443512c55dfeb1be",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "type": "github"
-      }
-    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1752436162,
@@ -85,23 +44,21 @@
     "root": {
       "inputs": {
         "agenix": "agenix",
-        "nixpkgs": "nixpkgs"
+        "nixpkgs": "nixpkgs",
+        "systems": "systems"
       }
     },
     "systems": {
+      "flake": false,
       "locked": {
-        "lastModified": 1681028828,
+        "path": "./pkgs/systems.nix",
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "type": "path"
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
       },
       "original": {
-        "owner": "nix-systems",
+        "path": "./pkgs/systems.nix",
-        "repo": "default",
+        "type": "path"
-        "type": "github"
+      },
-      }
+      "parent": []
     }
   },
   "root": "root",

flake.nix

@@ -1,8 +1,15 @@
 {
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05";
+
+    systems.url = "path:./pkgs/systems.nix";
+    systems.flake = false;
+
     agenix.url = "github:ryantm/agenix";
     agenix.inputs.nixpkgs.follows = "nixpkgs";
+    agenix.inputs.systems.follows = "systems";
+    agenix.inputs.darwin.follows = "";
+    agenix.inputs.home-manager.follows = "";
   };
 
   outputs = { self, nixpkgs, agenix, ... }:
@@ -42,9 +49,7 @@ in
     # full nixpkgs with our overlay applied
     legacyPackages.${system} = pkgs;
 
-    hydraJobs = {
+    hydraJobs = self.legacyPackages.${system}.bsc.hydraJobs;
-      inherit (self.legacyPackages.${system}.bsc-ci) tests pkgs cross;
-    };
 
     # propagate nixpkgs lib, so we can do bscpkgs.lib
     inherit (nixpkgs) lib;

overlay.nix

@@ -94,12 +94,18 @@ let
     };
   };
 
-  pkgs = filterAttrs (_: isDerivation) bscPkgs;
+  # For now, only build toplevel packages in CI/Hydra
+  pkgsTopLevel = filterAttrs (_: isDerivation) bscPkgs;
 
-  crossTargets = [ "riscv64" ];
+  # Native build in that platform doesn't imply cross build works
-  cross = prev.lib.genAttrs crossTargets (target:
+  canCrossCompile = platform: pkg:
-    final.pkgsCross.${target}.bsc-ci.pkgs
+    (isDerivation pkg) &&
-  );
+    # Must be defined explicitly
+    (pkg.meta.cross or false) &&
+    (meta.availableOn platform pkg);
+
+  # For now only RISC-V
+  crossSet = { riscv64 = final.pkgsCross.riscv64.bsc.pkgsTopLevel; };
 
   buildList = name: paths:
     final.runCommandLocal name { } ''
@@ -113,22 +119,31 @@ let
       printf '%s\n' $deps >$out
     '';
 
-  crossList = builtins.mapAttrs (t: v: buildList t (builtins.attrValues v)) cross;
+  pkgsList = buildList "ci-pkgs" (builtins.attrValues pkgsTopLevel);
-
+  testsList = buildList "ci-tests" (collect isDerivation tests);
-  pkgsList = buildList "ci-pkgs" (builtins.attrValues pkgs);
+  allList = buildList' "ci-all" [ pkgsList testsList ];
-  testList = buildList "ci-tests" (collect isDerivation tests);
+  # For now only RISC-V
-
+  crossList = buildList "ci-cross"
-  all = buildList' "ci-all" [ pkgsList testList ];
+    (filter
+      (canCrossCompile final.pkgsCross.riscv64.stdenv.hostPlatform)
+        (builtins.attrValues crossSet.riscv64));
 
 in bscPkgs // {
-  # Prevent accidental usage of bsc attribute
+  # Prevent accidental usage of bsc-ci attribute
-  bsc = throw "the bsc attribute is deprecated, packages are now in the root";
+  bsc-ci = throw "the bsc-ci attribute is deprecated, use bsc.ci";
 
   # Internal for our CI tests
-  bsc-ci = {
+  bsc = {
-    inherit pkgs pkgsList;
+    # CI targets for nix build
-    inherit tests testList;
+    ci = { pkgs = pkgsList; tests = testsList; all = allList; cross = crossList; };
-    inherit cross crossList;
+
-    inherit all;
+    # Direct access to package sets
+    tests = tests;
+    pkgs = bscPkgs;
+    pkgsTopLevel = pkgsTopLevel;
+    cross = crossSet;
+
+    # Hydra uses attribute sets of pkgs
+    hydraJobs = { tests = tests; pkgs = pkgsTopLevel; cross = crossSet; };
   };
 }

pkgs/ovni/default.nix

@@ -55,4 +55,7 @@ in
     doCheck = true;
     checkTarget = "test";
     hardeningDisable = [ "all" ];
+    meta = {
+      cross = true;
+    };
   }

pkgs/systems.nix

@@ -0,0 +1,4 @@
+# See https://github.com/nix-systems/nix-systems
+[
+  "x86_64-linux"
+]