From de5a2235621134434a932f0c6c97c0ddf83f4da2 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 1 Feb 2022 20:20:01 +0100 Subject: [PATCH 1/2] dogdns: 0.1.0 -> unstable-2021-10-07 ChangeLog: https://github.com/ogham/dog/compare/v0.1.0...master Last release happened quite a while ago and there are quite a few useful changes on `master`. --- pkgs/tools/networking/dogdns/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/networking/dogdns/default.nix b/pkgs/tools/networking/dogdns/default.nix index c101615855f6..cea89ce3cdb7 100644 --- a/pkgs/tools/networking/dogdns/default.nix +++ b/pkgs/tools/networking/dogdns/default.nix @@ -10,13 +10,13 @@ rustPlatform.buildRustPackage rec { pname = "dogdns"; - version = "0.1.0"; + version = "unstable-2021-10-07"; src = fetchFromGitHub { owner = "ogham"; repo = "dog"; - rev = "v${version}"; - sha256 = "088ib0sncv0vrvnqfvxf5zc79v7pnxd2cmgp4378r6pmgax9z9zy"; + rev = "721440b12ef01a812abe5dc6ced69af6e221fad5"; + sha256 = "sha256-y3T0vXg7631FZ4bzcbQjz3Buui/DFxh9LG8BZWwynp0="; }; nativeBuildInputs = [ installShellFiles ] @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { buildInputs = lib.optionals stdenv.isLinux [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ]; - cargoSha256 = "0zgzaq303zy8lymhldm6dpm5hwsxi2ph42zw5brvsdjmgm9ga0rb"; + cargoSha256 = "sha256-agepQVJbqbjzFbEBKbM7BNxc8FlklOrCsTgCAOcuptc="; postInstall = '' installShellCompletion completions/dog.{bash,fish,zsh} @@ -34,7 +34,7 @@ rustPlatform.buildRustPackage rec { description = "Command-line DNS client"; homepage = "https://dns.lookup.dog"; license = licenses.eupl12; - maintainers = with maintainers; [ bbigras ]; + maintainers = with maintainers; [ bbigras ma27 ]; mainProgram = "dog"; }; } From 4e9a5ef3bccd4e0c4fc5154a7c4807d22fca6636 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 1 Feb 2022 20:20:18 +0100 Subject: [PATCH 2/2] dogdns: install man pages --- pkgs/tools/networking/dogdns/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/networking/dogdns/default.nix b/pkgs/tools/networking/dogdns/default.nix index cea89ce3cdb7..0adca07798f2 100644 --- a/pkgs/tools/networking/dogdns/default.nix +++ b/pkgs/tools/networking/dogdns/default.nix @@ -5,6 +5,8 @@ , stdenv , pkg-config , openssl +, just +, pandoc , Security }: @@ -19,15 +21,22 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-y3T0vXg7631FZ4bzcbQjz3Buui/DFxh9LG8BZWwynp0="; }; - nativeBuildInputs = [ installShellFiles ] + nativeBuildInputs = [ installShellFiles just pandoc ] ++ lib.optionals stdenv.isLinux [ pkg-config ]; buildInputs = lib.optionals stdenv.isLinux [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ]; + outputs = [ "out" "man" ]; + + postBuild = '' + just man + ''; + cargoSha256 = "sha256-agepQVJbqbjzFbEBKbM7BNxc8FlklOrCsTgCAOcuptc="; postInstall = '' installShellCompletion completions/dog.{bash,fish,zsh} + installManPage ./target/man/*.1 ''; meta = with lib; {