From 37e21b2ff04f89b64e1dd98ad0a872217043c79b Mon Sep 17 00:00:00 2001 From: Markus Rudy Date: Wed, 11 Dec 2024 11:51:58 +0100 Subject: [PATCH] image: use uplosi from nixpkgs-unstable (#3543) * image: correct sharing profile for Azure gallery * nix: use uplosi from nixpkgs-unstable instead of GitHub --- flake.lock | 26 +------------------------- flake.nix | 10 +--------- internal/osimage/uplosi/uplosi.conf.in | 1 + 3 files changed, 3 insertions(+), 34 deletions(-) diff --git a/flake.lock b/flake.lock index 400acf062..8af6033f5 100644 --- a/flake.lock +++ b/flake.lock @@ -37,8 +37,7 @@ "root": { "inputs": { "flake-utils": "flake-utils", - "nixpkgsUnstable": "nixpkgsUnstable", - "uplosi": "uplosi" + "nixpkgsUnstable": "nixpkgsUnstable" } }, "systems": { @@ -55,29 +54,6 @@ "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", diff --git a/flake.nix b/flake.nix index e972da05b..16bd15b4a 100644 --- a/flake.nix +++ b/flake.nix @@ -8,11 +8,6 @@ flake-utils = { url = "github:numtide/flake-utils"; }; - uplosi = { - url = "github:edgelesssys/uplosi"; - inputs.nixpkgs.follows = "nixpkgsUnstable"; - inputs.flake-utils.follows = "flake-utils"; - }; }; outputs = @@ -20,7 +15,6 @@ self, nixpkgsUnstable, flake-utils, - uplosi, }: flake-utils.lib.eachDefaultSystem ( system: @@ -56,13 +50,11 @@ ]); }) ); - - uplosiDev = uplosi.outputs.packages."${system}".uplosi; in { packages.mkosi = mkosiDev; - packages.uplosi = uplosiDev; + packages.uplosi = pkgsUnstable.uplosi; packages.openssl = callPackage ./nix/cc/openssl.nix { pkgs = pkgsUnstable; }; diff --git a/internal/osimage/uplosi/uplosi.conf.in b/internal/osimage/uplosi/uplosi.conf.in index 74ec45434..2978d31e0 100644 --- a/internal/osimage/uplosi/uplosi.conf.in +++ b/internal/osimage/uplosi/uplosi.conf.in @@ -12,6 +12,7 @@ subscriptionID = "0d202bbb-4fa7-4af8-8125-58c269a05435" location = "northeurope" resourceGroup = "constellation-images" sharingNamePrefix = "constellation" +sharingProfile = "community" sku = "constellation" publisher = "edgelesssys"