Almost add flake building
Build images / Build (builder) (push) Failing after 1s
Build images / Build (immich) (push) Failing after 1s
Build images / Build (sword-container-builder) (push) Failing after 1s
buildbot/nix-eval Build done.
buildbot/nix-build Build done.
buildbot/nix-effects Build done.
Build images / Build (vm-test) (push) Failing after 1s
Build images / Build (bitwarden) (push) Failing after 1s

This commit is contained in:
Greg Hellings
2026-01-20 13:26:45 -06:00
parent efe97b6aa6
commit 9f4f97ad55
2 changed files with 50 additions and 9 deletions
Generated
+39 -5
View File
@@ -18,18 +18,35 @@
"type": "github" "type": "github"
} }
}, },
"nix2container": {
"inputs": {
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1767430085,
"narHash": "sha256-SiXJ6xv4pS2MDUqfj0/mmG746cGeJrMQGmoFgHLS25Y=",
"owner": "nlewo",
"repo": "nix2container",
"rev": "66f4b8a47e92aa744ec43acbb5e9185078983909",
"type": "github"
},
"original": {
"owner": "nlewo",
"repo": "nix2container",
"type": "github"
}
},
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1763934636, "lastModified": 1767028467,
"narHash": "sha256-9glbI7f1uU+yzQCq5LwLgdZqx6svOhZWkd4JRY265fc=", "narHash": "sha256-7G+2aXClSMaTY1ogpX14CAxjRsvyVzpE0GRwL71WO7g=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ee09932cedcef15aaf476f9343d1dea2cb77e261", "rev": "1cabc318c11299f07ca53e3cb719854682fe6eb3",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@@ -49,10 +66,27 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_2": {
"locked": {
"lastModified": 1763934636,
"narHash": "sha256-9glbI7f1uU+yzQCq5LwLgdZqx6svOhZWkd4JRY265fc=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "ee09932cedcef15aaf476f9343d1dea2cb77e261",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"root": { "root": {
"inputs": { "inputs": {
"flake-parts": "flake-parts", "flake-parts": "flake-parts",
"nixpkgs": "nixpkgs" "nix2container": "nix2container",
"nixpkgs": "nixpkgs_2"
} }
} }
}, },
+9 -2
View File
@@ -1,8 +1,9 @@
{ {
description = "Standard images that Greg wants to build"; description = "Standard images that Greg wants to build";
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
flake-parts.url = "github:hercules-ci/flake-parts"; flake-parts.url = "github:hercules-ci/flake-parts";
nix2container.url = "github:nlewo/nix2container";
nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
}; };
outputs = outputs =
@@ -26,11 +27,17 @@
system, system,
... ...
}: }:
let
lib' = import ./lib { inherit (pkgs) lib; };
in
{ {
_module.args.pkgs = import nixpkgs { _module.args = {
pkgs = import nixpkgs {
inherit system; inherit system;
config.allowUnfree = true; config.allowUnfree = true;
}; };
lib = lib';
};
packages = packages =
let let
inherit (pkgs) callPackage; inherit (pkgs) callPackage;