diff --git a/flake.nix b/flake.nix index 2e4eafa..9e612b4 100644 --- a/flake.nix +++ b/flake.nix @@ -17,17 +17,27 @@ let pkgs = import nixpkgs { inherit system; }; patosPkgs = self.packages.${system}; + version = "0.0.1"; in { packages = { - default = self.packages.${system}.image; - image = pkgs.callPackage ./image { inherit patosPkgs; }; + default = patosPkgs.image; + image = pkgs.callPackage ./image { + inherit patosPkgs; + inherit version; + }; + rootfs = pkgs.callPackage ./rootfs { + inherit patosPkgs; + inherit version; + }; + initrd = pkgs.callPackage ./rootfs/mkinitrd.nix { + inherit patosPkgs; + inherit version; + }; kernel = pkgs.callPackage ./kernel { }; glibc = pkgs.callPackage ./glibc { }; systemd = pkgs.callPackage ./systemd { }; dbus-broker = pkgs.callPackage ./dbus-broker { }; - rootfs = pkgs.callPackage ./rootfs { inherit patosPkgs; }; - initrd = pkgs.callPackage ./rootfs/mkinitrd.nix { inherit patosPkgs; }; qemu-uefi-tpm = pkgs.callPackage ./utils/qemu-uefi-tpm.nix { }; }; @@ -43,12 +53,10 @@ devShells.default = pkgs.mkShell { buildInputs = with pkgs; [ - erofs-utils just nixd nixfmt-rfc-style - squashfs-tools-ng - self.packages.${system}.qemu-uefi-tpm + patosPkgs.qemu-uefi-tpm ]; }; diff --git a/image/default.nix b/image/default.nix index e116625..553d87f 100644 --- a/image/default.nix +++ b/image/default.nix @@ -2,10 +2,10 @@ pkgs, stdenvNoCC, patosPkgs, + version, ... }: let - version = "0.0.1"; pname = "patos-image"; in stdenvNoCC.mkDerivation (finalAttrs: { diff --git a/rootfs/default.nix b/rootfs/default.nix index a180f8e..b206a0c 100644 --- a/rootfs/default.nix +++ b/rootfs/default.nix @@ -2,10 +2,10 @@ pkgs, stdenvNoCC, patosPkgs, + version, ... }: let - version = "0.0.1"; pname = "patos-rootfs"; in stdenvNoCC.mkDerivation (finalAttrs: { diff --git a/rootfs/mkinitrd.nix b/rootfs/mkinitrd.nix index f564813..3708483 100644 --- a/rootfs/mkinitrd.nix +++ b/rootfs/mkinitrd.nix @@ -2,10 +2,10 @@ pkgs, stdenvNoCC, patosPkgs, + version, ... }: let - version = "0.0.1"; pname = "patos-ramdisk"; in stdenvNoCC.mkDerivation (finalAttrs: {