1
0
Fork 0
mirror of https://codeberg.org/icewind/haze.git synced 2026-08-02 12:14:46 +02:00

switch to nix2container for image building

This commit is contained in:
Robin Appelman 2026-06-21 14:54:13 +02:00
commit 3f15ab0551
4 changed files with 230 additions and 142 deletions

View file

@ -1,6 +1,6 @@
{
inputs = {
nixpkgs.url = "nixpkgs/nixos-25.11";
nixpkgs.url = "nixpkgs/nixos-26.05";
flakelight = {
url = "github:nix-community/flakelight";
inputs.nixpkgs.follows = "nixpkgs";
@ -12,12 +12,18 @@
phps = {
url = "github:fossar/nix-phps";
};
nix2container = {
url = "github:nlewo/nix2container";
inputs.nixpkgs.follows = "nixpkgs";
};
};
outputs = {
mill-scale,
phps,
...
}:
outputs =
{
nix2container,
mill-scale,
phps,
...
}:
mill-scale ./. {
crossTargets = [
"x86_64-unknown-linux-gnu"
@ -36,8 +42,17 @@
withOverlays = [
(import ./nix/overlay.nix)
(prev: final: {
(final: prev: {
inherit (phps.packages.${prev.system}) php81 php80;
inherit (nix2container.packages.x86_64-linux) nix2container;
blackfire = prev.blackfire.overrideAttrs (
oldAttrs: finalAttrs: {
src = final.fetchurl {
url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${finalAttrs.version}_amd64.deb";
sha256 = "sha256-1fswfZEElLyXWqvNW76BpKTpBomK9cglJtitZgcpxhM=";
};
}
);
})
];
@ -50,20 +65,28 @@
"haze-image-php-8.0" = pkgs: pkgs.haze-image-php-80;
};
tools = pkgs: with pkgs; [cargo-edit bacon skopeo];
tools =
pkgs: with pkgs; [
cargo-edit
bacon
skopeo
dive
];
homeModules = {
default = {
pkgs,
config,
lib,
...
}: {
imports = [./nix/hm-module.nix];
config = lib.mkIf config.programs.haze.enable {
programs.haze.package = lib.mkDefault pkgs.haze;
default =
{
pkgs,
config,
lib,
...
}:
{
imports = [ ./nix/hm-module.nix ];
config = lib.mkIf config.programs.haze.enable {
programs.haze.package = lib.mkDefault pkgs.haze;
};
};
};
};
};
}