From eac26713c7161cbce9c9cc1054af257878e31750 Mon Sep 17 00:00:00 2001 From: AG Date: Thu, 30 Oct 2025 15:12:38 +0100 Subject: [PATCH] Flake test --- flake.nix | 56 ++++++++++++++++++++----------------------------------- 1 file changed, 20 insertions(+), 36 deletions(-) diff --git a/flake.nix b/flake.nix index 56aeeff..8710ab1 100644 --- a/flake.nix +++ b/flake.nix @@ -1,44 +1,28 @@ { - description = "AOSPKGS: Nix package repository for Apache Hop and related packages"; + description = "aospkgs - collection of Nix packages (flake)"; - inputs.nixpkgs.url = "github:NixOS/nixpkgs"; + inputs = { + nixpkgs.url = "github:NixOS/nixpkgs"; + flake-utils.url = "github:numtide/flake-utils"; + }; outputs = - { self, nixpkgs }: - let - supportedSystems = [ - "x86_64-linux" - "aarch64-linux" - ]; - forAllSystems = f: nixpkgs.lib.genAttrs supportedSystems (system: f system); - in { - packages = forAllSystems ( - system: - let - pkgs = import nixpkgs { inherit system; }; - in - { + nixpkgs, + flake-utils, + ... + }: + flake-utils.lib.eachDefaultSystem ( + system: + let + pkgs = import nixpkgs { inherit system; }; + pkgset = { apache-hop = pkgs.callPackage ./pkgs/apache-hop { }; - } - ); + }; + in + { + packages = pkgset; - defaultPackage = forAllSystems (system: self.packages.${system}.apache-hop); - - overlay = final: prev: { - apache-hop = final.callPackage ./pkgs/apache-hop { }; - }; - - devShells = forAllSystems ( - system: - let - pkgs = import nixpkgs { inherit system; }; - in - { - default = pkgs.mkShell { - packages = [ self.packages.${system}.apache-hop ]; - }; - } - ); - }; + } + ); }