mirror of
https://github.com/edgelesssys/constellation.git
synced 2025-02-08 02:55:33 -05:00
Revert "nix: use uplosi from nixpkgs-unstable instead of GitHub"
This reverts commit f4b3bbbb39e5c6dc465830801d45da57e6cc4664.
This commit is contained in:
parent
37e21b2ff0
commit
143b6300ac
26
flake.lock
generated
26
flake.lock
generated
@ -37,7 +37,8 @@
|
|||||||
"root": {
|
"root": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-utils": "flake-utils",
|
"flake-utils": "flake-utils",
|
||||||
"nixpkgsUnstable": "nixpkgsUnstable"
|
"nixpkgsUnstable": "nixpkgsUnstable",
|
||||||
|
"uplosi": "uplosi"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"systems": {
|
"systems": {
|
||||||
@ -54,6 +55,29 @@
|
|||||||
"repo": "default",
|
"repo": "default",
|
||||||
"type": "github"
|
"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",
|
"root": "root",
|
||||||
|
10
flake.nix
10
flake.nix
@ -8,6 +8,11 @@
|
|||||||
flake-utils = {
|
flake-utils = {
|
||||||
url = "github:numtide/flake-utils";
|
url = "github:numtide/flake-utils";
|
||||||
};
|
};
|
||||||
|
uplosi = {
|
||||||
|
url = "github:edgelesssys/uplosi";
|
||||||
|
inputs.nixpkgs.follows = "nixpkgsUnstable";
|
||||||
|
inputs.flake-utils.follows = "flake-utils";
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs =
|
outputs =
|
||||||
@ -15,6 +20,7 @@
|
|||||||
self,
|
self,
|
||||||
nixpkgsUnstable,
|
nixpkgsUnstable,
|
||||||
flake-utils,
|
flake-utils,
|
||||||
|
uplosi,
|
||||||
}:
|
}:
|
||||||
flake-utils.lib.eachDefaultSystem (
|
flake-utils.lib.eachDefaultSystem (
|
||||||
system:
|
system:
|
||||||
@ -50,11 +56,13 @@
|
|||||||
]);
|
]);
|
||||||
})
|
})
|
||||||
);
|
);
|
||||||
|
|
||||||
|
uplosiDev = uplosi.outputs.packages."${system}".uplosi;
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
packages.mkosi = mkosiDev;
|
packages.mkosi = mkosiDev;
|
||||||
|
|
||||||
packages.uplosi = pkgsUnstable.uplosi;
|
packages.uplosi = uplosiDev;
|
||||||
|
|
||||||
packages.openssl = callPackage ./nix/cc/openssl.nix { pkgs = pkgsUnstable; };
|
packages.openssl = callPackage ./nix/cc/openssl.nix { pkgs = pkgsUnstable; };
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user