chore: fix packages used in images
buildbot/nix-eval Build done.
buildbot/nix-build Build done.
buildbot/nix-effects Build done.
Build images / Build (immich) (push) Successful in 2m25s
Build images / Build (sword-container-builder) (push) Successful in 2m19s
Build images / Build (builder) (push) Successful in 6m24s
Build images / Build (bitwarden) (push) Successful in 7m16s
Build images / Build (vm-test) (push) Successful in 10m57s
buildbot/nix-eval Build done.
buildbot/nix-build Build done.
buildbot/nix-effects Build done.
Build images / Build (immich) (push) Successful in 2m25s
Build images / Build (sword-container-builder) (push) Successful in 2m19s
Build images / Build (builder) (push) Successful in 6m24s
Build images / Build (bitwarden) (push) Successful in 7m16s
Build images / Build (vm-test) (push) Successful in 10m57s
This commit is contained in:
@@ -30,6 +30,14 @@
|
|||||||
lib' = import ./lib.nix {
|
lib' = import ./lib.nix {
|
||||||
inherit pkgs;
|
inherit pkgs;
|
||||||
};
|
};
|
||||||
|
# The system the images will use packages from. There is no point in
|
||||||
|
# making the image using Darwin packages!
|
||||||
|
system' = builtins.replaceStrings ["darwin"] ["linux"] system;
|
||||||
|
pkgs' = import nixpkgs {
|
||||||
|
system = system';
|
||||||
|
config.allowUnfree = true;
|
||||||
|
lib = lib';
|
||||||
|
};
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
_module.args = {
|
_module.args = {
|
||||||
@@ -41,11 +49,10 @@
|
|||||||
};
|
};
|
||||||
packages =
|
packages =
|
||||||
let
|
let
|
||||||
inherit (pkgs) callPackage;
|
inherit (pkgs') callPackage;
|
||||||
name = n: "src.thehellings.com/greg/${n}";
|
name = n: "src.thehellings.com/greg/${n}";
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
base = lib'.baseImage pkgs;
|
|
||||||
bitwarden = callPackage ./img/bitwarden.nix { inherit name; };
|
bitwarden = callPackage ./img/bitwarden.nix { inherit name; };
|
||||||
builder = callPackage ./img/builder.nix { inherit name lib'; };
|
builder = callPackage ./img/builder.nix { inherit name lib'; };
|
||||||
immich = callPackage ./img/immich.nix { inherit name; };
|
immich = callPackage ./img/immich.nix { inherit name; };
|
||||||
|
|||||||
Reference in New Issue
Block a user