Skip to content

Commit

Permalink
Fix flake outputs
Browse files Browse the repository at this point in the history
Newer versions of Nix do not work with the old `flake.nix`
because of the change described in:

NixOS/nix#5532

This change fixes that while still preserving compatibility with
older versions of Nix.
  • Loading branch information
Gabriella439 authored and pasqui23 committed Jan 31, 2023
1 parent 5219ddf commit 1d3e339
Showing 1 changed file with 10 additions and 4 deletions.
14 changes: 10 additions & 4 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
${pythonEnv}/bin/sphinx-build -n doc/ doc/_build
'';

in {
devShell = pkgs.mkShell {
in rec {
devShells.default = pkgs.mkShell {
buildInputs = [
pythonEnv
pkgs.openssh
Expand All @@ -45,12 +45,16 @@
'';
};

defaultApp = {
devShell = devShells.default;

apps.default = {
type = "app";
program = "${self.defaultPackage."${system}"}/bin/nixops";
};

defaultPackage = let
defaultApp = apps.default;

packages.default = let
overrides = import ./overrides.nix { inherit pkgs; };

in pkgs.poetry2nix.mkPoetryApplication {
Expand All @@ -73,6 +77,8 @@
# TODO: Re-add manual build
};

defaultPackage = packages.default;

nixosOptions = pkgs.nixosOptionsDoc {
inherit (pkgs.lib.fixMergeModules [ ./nix/options.nix ] {
inherit pkgs;
Expand Down

0 comments on commit 1d3e339

Please sign in to comment.