Skip to content

Commit

Permalink
Merge pull request #63 from edolstra/modernize-flake
Browse files Browse the repository at this point in the history
Rename deprecated flake outputs
  • Loading branch information
edolstra authored Sep 20, 2024
2 parents 9e7c3fc + 0cd37c6 commit a7e046d
Showing 1 changed file with 5 additions and 6 deletions.
11 changes: 5 additions & 6 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
];
in {

overlay = final: prev: {
overlays.default = final: prev: {
nix-serve = final.pkgs.callPackage ./package.nix {
inherit self;
nix = final.nixVersions.git;
Expand All @@ -25,22 +25,21 @@

packages = forAllSystems (system: let
pkgs = nixpkgs.legacyPackages.${system};
in {
in rec {
default = nix-serve;
nix-serve = nixpkgs.legacyPackages.${system}.callPackage ./package.nix {
inherit self;
nix = pkgs.nixVersions.git;
};
});

defaultPackage = forAllSystems (system: self.packages.${system}.nix-serve);

checks = forAllSystems (system: let
pkgs = nixpkgs.legacyPackages.${system};
in {
build = self.defaultPackage.${system};
build = self.packages.${system}.nix-serve;
} // nixpkgs.lib.optionalAttrs (pkgs.stdenv.isLinux) {
nixos-test = pkgs.callPackage ./nixos-test.nix {
nix-serve = self.defaultPackage.${system};
nix-serve = self.packages.${system}.nix-serve;
};
});
};
Expand Down

0 comments on commit a7e046d

Please sign in to comment.