diff --git a/Cargo.lock b/Cargo.lock index 8d9f5c1..4b581b0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1162,7 +1162,7 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "webnsupdate" -version = "0.3.1-dev" +version = "0.3.2-dev" dependencies = [ "axum", "axum-auth", diff --git a/Cargo.toml b/Cargo.toml index c01ab66..3e60cac 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,7 +3,7 @@ cargo-features = ["codegen-backend"] [package] description = "An HTTP server using HTTP basic auth to make secure calls to nsupdate" name = "webnsupdate" -version = "0.3.1-dev" +version = "0.3.2-dev" edition = "2021" [dependencies] diff --git a/flake-modules/default.nix b/flake-modules/default.nix index 7a60543..f4d7398 100644 --- a/flake-modules/default.nix +++ b/flake-modules/default.nix @@ -3,7 +3,6 @@ imports = [ inputs.treefmt-nix.flakeModule ./package.nix - ./overlay.nix ./module.nix ./tests.nix ]; diff --git a/flake-modules/overlay.nix b/flake-modules/overlay.nix deleted file mode 100644 index fba3bc1..0000000 --- a/flake-modules/overlay.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ - flake = { - overlays.default = _final: prev: { webnsupdate = prev.callPackage ../default.nix { }; }; - }; -} diff --git a/flake-modules/package.nix b/flake-modules/package.nix index f4d0cd0..86fc8b0 100644 --- a/flake-modules/package.nix +++ b/flake-modules/package.nix @@ -1,7 +1,16 @@ -{ inputs, lib, ... }: +{ withSystem, inputs, ... }: { + flake.overlays.default = + final: prev: + withSystem prev.stdenv.hostPlatform.system ( + { self', ... }: + { + inherit (self'.packages) webnsupdate; + } + ); + perSystem = - { pkgs, ... }: + { pkgs, lib, ... }: let craneLib = inputs.crane.mkLib pkgs; src = craneLib.cleanCargoSource inputs.self;