flake: format

This commit is contained in:
Moritz Sanft 2024-09-09 09:12:01 +02:00
parent 5720fcc330
commit 7199f80903
No known key found for this signature in database
GPG Key ID: 335D28368B1DA615
2 changed files with 87 additions and 65 deletions

12
flake.lock generated
View File

@ -36,11 +36,11 @@
},
"nixpkgsUnstable": {
"locked": {
"lastModified": 1717399147,
"narHash": "sha256-eCWaE/q1VItpFAxxLVt171MdtDcjEnwi6QB/yuF73JU=",
"lastModified": 1725194671,
"narHash": "sha256-tLGCFEFTB5TaOKkpfw3iYT9dnk4awTP/q4w+ROpMfuw=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "4a4ecb0ab415c9fccfb005567a215e6a9564cdf5",
"rev": "b833ff01a0d694b910daca6e2ff4a3f26dee478c",
"type": "github"
},
"original": {
@ -83,11 +83,11 @@
]
},
"locked": {
"lastModified": 1715947971,
"narHash": "sha256-1YpxN5R3lEQnOUg94B2B/Ah2WDABUQTZ6kpyQMPt/xI=",
"lastModified": 1718003967,
"narHash": "sha256-PJbw9L8NgRKYkKqc1Pywv1glSyT+iE1D79GuF7ec4tc=",
"owner": "edgelesssys",
"repo": "uplosi",
"rev": "73b6208ac21603bb69e8079fa8be821e590de286",
"rev": "b7edeef9b9eb1226998c86ffc8fbf9eacce94549",
"type": "github"
},
"original": {

140
flake.nix
View File

@ -21,76 +21,98 @@
};
outputs =
{ self
, nixpkgsUnstable
, nixpkgsBazel
, flake-utils
, uplosi
}:
flake-utils.lib.eachDefaultSystem (system:
let
pkgsUnstable = import nixpkgsUnstable { inherit system; };
bazelPkgsUnstable = import nixpkgsBazel { inherit system; };
callPackage = pkgsUnstable.callPackage;
mkosiDev = (pkgsUnstable.mkosi.overrideAttrs (oldAttrs: rec {
propagatedBuildInputs = oldAttrs.propagatedBuildInputs ++ (with pkgsUnstable; [
# package management
dnf5
rpm
createrepo_c
# filesystem tools
squashfsTools # mksquashfs
dosfstools # mkfs.vfat
mtools # mcopy
cryptsetup # dm-verity
util-linux # flock
kmod # depmod
cpio # cpio
zstd # zstd
xz # xz
# utils
gnused # sed
gnugrep # grep
]);
}));
uplosiDev = uplosi.outputs.packages."${system}".uplosi;
openssl-static = pkgsUnstable.openssl.override { static = true; };
bazel_7 = bazelPkgsUnstable.callPackage ./nix/packages/bazel.nix { pkgs = bazelPkgsUnstable; nixpkgs = nixpkgsBazel; };
in
{
packages.mkosi = mkosiDev;
self,
nixpkgsUnstable,
nixpkgsBazel,
flake-utils,
uplosi,
}:
flake-utils.lib.eachDefaultSystem (
system:
let
pkgsUnstable = import nixpkgsUnstable { inherit system; };
packages.uplosi = uplosiDev;
bazelPkgsUnstable = import nixpkgsBazel { inherit system; };
packages.openssl = callPackage ./nix/cc/openssl.nix { pkgs = pkgsUnstable; };
callPackage = pkgsUnstable.callPackage;
packages.cryptsetup = callPackage ./nix/cc/cryptsetup.nix { pkgs = pkgsUnstable; pkgsLinux = import nixpkgsUnstable { system = "x86_64-linux"; }; };
mkosiDev = (
pkgsUnstable.mkosi.overrideAttrs (oldAttrs: rec {
propagatedBuildInputs =
oldAttrs.propagatedBuildInputs
++ (with pkgsUnstable; [
# package management
dnf5
rpm
createrepo_c
packages.libvirt = callPackage ./nix/cc/libvirt.nix { pkgs = pkgsUnstable; pkgsLinux = import nixpkgsUnstable { system = "x86_64-linux"; }; };
# filesystem tools
squashfsTools # mksquashfs
dosfstools # mkfs.vfat
mtools # mcopy
cryptsetup # dm-verity
util-linux # flock
kmod # depmod
cpio # cpio
zstd # zstd
xz # xz
packages.libvirtd_base = callPackage ./nix/container/libvirtd_base.nix { pkgs = pkgsUnstable; pkgsLinux = import nixpkgsUnstable { system = "x86_64-linux"; }; };
# utils
gnused # sed
gnugrep # grep
]);
})
);
packages.vpn = callPackage ./nix/container/vpn/vpn.nix { pkgs = pkgsUnstable; pkgsLinux = import nixpkgsUnstable { system = "x86_64-linux"; }; };
uplosiDev = uplosi.outputs.packages."${system}".uplosi;
packages.awscli2 = pkgsUnstable.awscli2;
openssl-static = pkgsUnstable.openssl.override { static = true; };
packages.bazel_7 = bazel_7;
bazel_7 = bazelPkgsUnstable.callPackage ./nix/packages/bazel.nix {
pkgs = bazelPkgsUnstable;
nixpkgs = nixpkgsBazel;
};
packages.createrepo_c = pkgsUnstable.createrepo_c;
in
{
packages.mkosi = mkosiDev;
packages.dnf5 = pkgsUnstable.dnf5;
packages.uplosi = uplosiDev;
devShells.default = callPackage ./nix/shells/default.nix { inherit bazel_7; };
packages.openssl = callPackage ./nix/cc/openssl.nix { pkgs = pkgsUnstable; };
formatter = nixpkgsUnstable.legacyPackages.${system}.nixpkgs-fmt;
});
packages.cryptsetup = callPackage ./nix/cc/cryptsetup.nix {
pkgs = pkgsUnstable;
pkgsLinux = import nixpkgsUnstable { system = "x86_64-linux"; };
};
packages.libvirt = callPackage ./nix/cc/libvirt.nix {
pkgs = pkgsUnstable;
pkgsLinux = import nixpkgsUnstable { system = "x86_64-linux"; };
};
packages.libvirtd_base = callPackage ./nix/container/libvirtd_base.nix {
pkgs = pkgsUnstable;
pkgsLinux = import nixpkgsUnstable { system = "x86_64-linux"; };
};
packages.vpn = callPackage ./nix/container/vpn/vpn.nix {
pkgs = pkgsUnstable;
pkgsLinux = import nixpkgsUnstable { system = "x86_64-linux"; };
};
packages.awscli2 = pkgsUnstable.awscli2;
packages.bazel_7 = bazel_7;
packages.createrepo_c = pkgsUnstable.createrepo_c;
packages.dnf5 = pkgsUnstable.dnf5;
devShells.default = callPackage ./nix/shells/default.nix { inherit bazel_7; };
formatter = nixpkgsUnstable.legacyPackages.${system}.nixpkgs-fmt;
}
);
}