From 055d481453a81170a796b3e8576c4dbfe690f16e Mon Sep 17 00:00:00 2001 From: Mikael Voss Date: Tue, 11 Feb 2025 17:16:05 +0100 Subject: [PATCH 1/4] xnec2c: use finalAttrs pattern --- pkgs/by-name/xn/xnec2c/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/xn/xnec2c/package.nix b/pkgs/by-name/xn/xnec2c/package.nix index aa9ad3322f3e..7e6e13526de7 100644 --- a/pkgs/by-name/xn/xnec2c/package.nix +++ b/pkgs/by-name/xn/xnec2c/package.nix @@ -13,12 +13,12 @@ assert (!blas.isILP64) && (!lapack.isILP64); -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xnec2c"; version = "4.4.16"; src = fetchurl { - url = "https://www.xnec2c.org/releases/${pname}-v${version}.tar.gz"; + url = "https://www.xnec2c.org/releases/${finalAttrs.pname}-v${finalAttrs.version}.tar.gz"; hash = "sha256-XiZi8pfmfHjGpePkRy/pF1TA+5RdxX4AGuKzG5Wqrmk="; }; @@ -45,4 +45,4 @@ stdenv.mkDerivation rec { # Darwin support likely to be fixed upstream in the next release broken = stdenv.hostPlatform.isDarwin; }; -} +}) From 00c05c84d9499de1f1f8df2c8da750454d9c4ede Mon Sep 17 00:00:00 2001 From: Mikael Voss Date: Tue, 11 Feb 2025 17:16:54 +0100 Subject: [PATCH 2/4] xnec2c: remove use of with lib; --- pkgs/by-name/xn/xnec2c/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/xn/xnec2c/package.nix b/pkgs/by-name/xn/xnec2c/package.nix index 7e6e13526de7..4e877ab95eda 100644 --- a/pkgs/by-name/xn/xnec2c/package.nix +++ b/pkgs/by-name/xn/xnec2c/package.nix @@ -34,13 +34,13 @@ stdenv.mkDerivation (finalAttrs: { lapack ]; - meta = with lib; { + meta = { homepage = "https://www.xnec2c.org/"; description = "Graphical antenna simulation"; mainProgram = "xnec2c"; - license = licenses.gpl3; - maintainers = with maintainers; [ mvs ]; - platforms = platforms.unix; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ mvs ]; + platforms = lib.platforms.unix; # Darwin support likely to be fixed upstream in the next release broken = stdenv.hostPlatform.isDarwin; From 4e16ef2206ff55fc14102f50e3f54b5751f01917 Mon Sep 17 00:00:00 2001 From: Mikael Voss Date: Wed, 12 Feb 2025 11:32:46 +0100 Subject: [PATCH 3/4] xnec2c: switch to GitHub source --- pkgs/by-name/xn/xnec2c/package.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/xn/xnec2c/package.nix b/pkgs/by-name/xn/xnec2c/package.nix index 4e877ab95eda..ac7d37291269 100644 --- a/pkgs/by-name/xn/xnec2c/package.nix +++ b/pkgs/by-name/xn/xnec2c/package.nix @@ -1,7 +1,7 @@ { lib, stdenv, - fetchurl, + fetchFromGitHub, autoreconfHook, wrapGAppsHook3, pkg-config, @@ -17,9 +17,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "xnec2c"; version = "4.4.16"; - src = fetchurl { - url = "https://www.xnec2c.org/releases/${finalAttrs.pname}-v${finalAttrs.version}.tar.gz"; - hash = "sha256-XiZi8pfmfHjGpePkRy/pF1TA+5RdxX4AGuKzG5Wqrmk="; + src = fetchFromGitHub { + owner = "KJ7LNW"; + repo = "xnec2c"; + tag = "v${finalAttrs.version}"; + hash = "sha256-W8JwbCSXt5cjgncOzV1wltPnJxwWC6B29eaT8emIU9Y="; }; nativeBuildInputs = [ From ceb84ba454f3f2562f4fe71e6c22046ac82d3708 Mon Sep 17 00:00:00 2001 From: Mikael Voss Date: Wed, 12 Feb 2025 11:33:12 +0100 Subject: [PATCH 4/4] xnec2c: provide update script --- pkgs/by-name/xn/xnec2c/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/xn/xnec2c/package.nix b/pkgs/by-name/xn/xnec2c/package.nix index ac7d37291269..5daa9c72b5f4 100644 --- a/pkgs/by-name/xn/xnec2c/package.nix +++ b/pkgs/by-name/xn/xnec2c/package.nix @@ -9,6 +9,7 @@ gtk3, blas, lapack, + nix-update-script, }: assert (!blas.isILP64) && (!lapack.isILP64); @@ -36,6 +37,8 @@ stdenv.mkDerivation (finalAttrs: { lapack ]; + passthru.updateScript = nix-update-script { }; + meta = { homepage = "https://www.xnec2c.org/"; description = "Graphical antenna simulation";