set default value for nixops4Package (#412)

Co-authored-by: Valentin Gagarin <valentin.gagarin@tweag.io>
Reviewed-on: Fediversity/Fediversity#412
Reviewed-by: Valentin Gagarin <valentin.gagarin@tweag.io>
Co-authored-by: Kiara Grouwstra <kiara@procolix.eu>
Co-committed-by: Kiara Grouwstra <kiara@procolix.eu>
This commit is contained in:
Kiara Grouwstra 2025-06-30 12:44:53 +02:00 committed by kiara Grouwstra
parent d7dbdd923c
commit 737aecaba6
6 changed files with 17 additions and 6 deletions

View file

@ -155,7 +155,6 @@ in
SECRET_KEY = dummyFile;
};
port = panelPort;
nixops4Package = inputs.nixops4.packages.${pkgs.system}.default;
deployment = {
flake = "/run/fedipanel/flake";

View file

@ -4,9 +4,9 @@ The Fediversity Panel is a web service for managing Fediversity deployments with
## Development
- To obtain all tools related to this project, enter the development environment in the root directory by `nix-shell`, then similar from this directory.
- To obtain all tools related to this project, enter the development environment with `nix-shell`.
If you want to do that automatically on entering a directory:
If you want to do that automatically on entering this directory:
- [Set up `direnv`](https://github.com/nix-community/nix-direnv#installation)
- Run `direnv allow` in the directory where repository is stored on your machine

View file

@ -21,8 +21,7 @@ in
pkgs.npins
manage
# NixOps4 and its dependencies
# FIXME: grab NixOps4 and add it here
pkgs.nixops4
pkgs.nix
pkgs.openssh
];

View file

@ -147,6 +147,7 @@ in
NixOps4 from the package's npins-based code, we will have to do with
this workaround.
'';
default = pkgs.nixops4;
};
deployment = {

View file

@ -8,4 +8,17 @@ let
in
{
python3 = prev.lib.attrsets.recursiveUpdate prev.python3 { pkgs = extraPython3Packages; };
nixops4 =
let
sources = import ../../npins;
inherit (import sources.flake-inputs) import-flake;
inherit
(import-flake {
src = ../../.;
})
inputs
;
inherit (inputs) nixops4;
in
nixops4.packages.${prev.system}.default;
}

View file

@ -13,7 +13,6 @@ let
secrets = {
SECRET_KEY = pkgs.writeText "SECRET_KEY" "secret";
};
nixops4Package = pkgs.hello; # FIXME: actually pass NixOps4
};
virtualisation = {