Skip to content

Commit

Permalink
technitium-dns-server: 13.2 -> 13.3, merge library and server
Browse files Browse the repository at this point in the history
  • Loading branch information
FabianRig committed Dec 22, 2024
1 parent 5f02383 commit 522576d
Show file tree
Hide file tree
Showing 4 changed files with 33 additions and 48 deletions.
40 changes: 0 additions & 40 deletions pkgs/by-name/te/technitium-dns-server-library/package.nix

This file was deleted.

6 changes: 6 additions & 0 deletions pkgs/by-name/te/technitium-dns-server/library-nuget-deps.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# This file was automatically generated by passthru.fetch-deps.
# Please dont edit it manually, your changes might get overwritten!

{ fetchNuGet }:
[
]
35 changes: 27 additions & 8 deletions pkgs/by-name/te/technitium-dns-server/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,40 @@
buildDotnetModule,
fetchFromGitHub,
dotnetCorePackages,
technitium-dns-server-library,
nixosTests,
nix-update-script,
}:
let
technitium-library = buildDotnetModule rec {
pname = "TechnitiumLibrary";
version = "13.3";

src = fetchFromGitHub {
owner = "TechnitiumSoftware";
repo = "TechnitiumLibrary";
tag = "dns-server-v${version}";
hash = "sha256-SyCeLiowbqqABdhQTs/u3R0ogzojLZZLr75Kr3YtCdE=";
name = "${pname}-${version}";
};

dotnet-sdk = dotnetCorePackages.sdk_8_0;

nugetDeps = ./library-nuget-deps.json;

projectFile = [
"TechnitiumLibrary.ByteTree/TechnitiumLibrary.ByteTree.csproj"
"TechnitiumLibrary.Net/TechnitiumLibrary.Net.csproj"
];
};
in
buildDotnetModule rec {
pname = "technitium-dns-server";
version = "13.2";
version = "13.3";

src = fetchFromGitHub {
owner = "TechnitiumSoftware";
repo = "DnsServer";
rev = "refs/tags/v${version}";
hash = "sha256-oxLMBs+XkzvlfSst6ZD56ZIgiXwm0Px8Tn3Trdd/6H8=";
tag = "v${version}";
hash = "sha256-Ab/LG6JsJY8H2CthjJaAhYUWLuGT7vNw+mStSF41CDs=";
name = "${pname}-${version}";
};

Expand All @@ -29,7 +50,7 @@ buildDotnetModule rec {
# move dependencies from TechnitiumLibrary to the expected directory
preBuild = ''
mkdir -p ../TechnitiumLibrary/bin
cp -r ${technitium-dns-server-library}/lib/${technitium-dns-server-library.pname}/* ../TechnitiumLibrary/bin/
cp -r ${technitium-library}/lib/TechnitiumLibrary/* ../TechnitiumLibrary/bin/
'';

postFixup = ''
Expand All @@ -40,8 +61,6 @@ buildDotnetModule rec {
inherit (nixosTests) technitium-dns-server;
};

passthru.updateScript = nix-update-script { };

meta = {
changelog = "https://github.com/TechnitiumSoftware/DnsServer/blob/master/CHANGELOG.md";
description = "Authorative and Recursive DNS server for Privacy and Security";
Expand Down

0 comments on commit 522576d

Please sign in to comment.