From 618670512e2e98bce495af79e4e36b1b9ea34026 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jalil=20David=20Salam=C3=A9=20Messina?= Date: Mon, 28 Oct 2024 22:37:24 +0100 Subject: [PATCH 1/2] fix: overlay was broken T-T --- Cargo.lock | 2 +- Cargo.toml | 2 +- flake-modules/default.nix | 1 - flake-modules/overlay.nix | 5 ----- flake-modules/package.nix | 13 +++++++++++-- 5 files changed, 13 insertions(+), 10 deletions(-) delete mode 100644 flake-modules/overlay.nix diff --git a/Cargo.lock b/Cargo.lock index 8d9f5c1..3f1ae0a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1162,7 +1162,7 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "webnsupdate" -version = "0.3.1-dev" +version = "0.3.1" dependencies = [ "axum", "axum-auth", diff --git a/Cargo.toml b/Cargo.toml index c01ab66..3f5944e 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.1" 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; -- 2.47.0 From 5a9b09bc7e95b2baebd1b2edc605d6fdf26ba037 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jalil=20David=20Salam=C3=A9=20Messina?= Date: Mon, 28 Oct 2024 22:42:15 +0100 Subject: [PATCH 2/2] chore: bump version New dev version --- Cargo.lock | 2 +- Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3f1ae0a..4b581b0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1162,7 +1162,7 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "webnsupdate" -version = "0.3.1" +version = "0.3.2-dev" dependencies = [ "axum", "axum-auth", diff --git a/Cargo.toml b/Cargo.toml index 3f5944e..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" +version = "0.3.2-dev" edition = "2021" [dependencies] -- 2.47.0