Revert "nix: use uplosi from nixpkgs-unstable instead of GitHub"

This reverts commit f4b3bbbb39e5c6dc465830801d45da57e6cc4664.
This commit is contained in:
Markus Rudy 2024-12-11 14:33:53 +01:00
parent 37e21b2ff0
commit 143b6300ac
2 changed files with 34 additions and 2 deletions

26
flake.lock generated
View File

@ -37,7 +37,8 @@
"root": {
"inputs": {
"flake-utils": "flake-utils",
"nixpkgsUnstable": "nixpkgsUnstable"
"nixpkgsUnstable": "nixpkgsUnstable",
"uplosi": "uplosi"
}
},
"systems": {
@ -54,6 +55,29 @@
"repo": "default",
"type": "github"
}
},
"uplosi": {
"inputs": {
"flake-utils": [
"flake-utils"
],
"nixpkgs": [
"nixpkgsUnstable"
]
},
"locked": {
"lastModified": 1733317519,
"narHash": "sha256-Q/qCh655Cga1nKs4qMF+2JYLxy+mLvFofKxukoREZ3Q=",
"owner": "edgelesssys",
"repo": "uplosi",
"rev": "137f7b6557087fc198e919b2ef8c167ecbe94f91",
"type": "github"
},
"original": {
"owner": "edgelesssys",
"repo": "uplosi",
"type": "github"
}
}
},
"root": "root",

View File

@ -8,6 +8,11 @@
flake-utils = {
url = "github:numtide/flake-utils";
};
uplosi = {
url = "github:edgelesssys/uplosi";
inputs.nixpkgs.follows = "nixpkgsUnstable";
inputs.flake-utils.follows = "flake-utils";
};
};
outputs =
@ -15,6 +20,7 @@
self,
nixpkgsUnstable,
flake-utils,
uplosi,
}:
flake-utils.lib.eachDefaultSystem (
system:
@ -50,11 +56,13 @@
]);
})
);
uplosiDev = uplosi.outputs.packages."${system}".uplosi;
in
{
packages.mkosi = mkosiDev;
packages.uplosi = pkgsUnstable.uplosi;
packages.uplosi = uplosiDev;
packages.openssl = callPackage ./nix/cc/openssl.nix { pkgs = pkgsUnstable; };