From ff4cc43a860c36628630accef653a009c9d61f71 Mon Sep 17 00:00:00 2001 From: Petr Zahradnik Date: Sat, 22 Feb 2025 19:26:28 +0100 Subject: [PATCH 1/3] digiham: 0.6.0 -> 0.6.2, fix build --- pkgs/by-name/di/digiham/cpp-17.patch | 14 +++++++++++++ pkgs/by-name/di/digiham/package.nix | 30 ++++++++++++++++++---------- 2 files changed, 34 insertions(+), 10 deletions(-) create mode 100644 pkgs/by-name/di/digiham/cpp-17.patch diff --git a/pkgs/by-name/di/digiham/cpp-17.patch b/pkgs/by-name/di/digiham/cpp-17.patch new file mode 100644 index 000000000000..98e210f0bcff --- /dev/null +++ b/pkgs/by-name/di/digiham/cpp-17.patch @@ -0,0 +1,14 @@ +Index: file.txt +=================================================================== +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -7,9 +7,8 @@ + project (digiham VERSION 0.6.2) + add_definitions(-DVERSION="${PROJECT_VERSION}") + + enable_language(CXX) +-set(CMAKE_CXX_STANDARD 11) + + include(GNUInstallDirs) + + find_package(CodecServer REQUIRED) diff --git a/pkgs/by-name/di/digiham/package.nix b/pkgs/by-name/di/digiham/package.nix index 78847bf00236..4d42b9bcdd9c 100644 --- a/pkgs/by-name/di/digiham/package.nix +++ b/pkgs/by-name/di/digiham/package.nix @@ -7,19 +7,25 @@ icu, csdr, codecserver, + versionCheckHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "digiham"; - version = "0.6.0"; + version = "0.6.2"; src = fetchFromGitHub { owner = "jketterl"; - repo = pname; - rev = version; - sha256 = "sha256-nKNA5xAhM/lyyvFJnajWwY0hwVZhLApbDkXoUYFjlt0="; + repo = finalAttrs.pname; + rev = finalAttrs.version; + hash = "sha256-v7qp6Lv94Ec0yzHsc08YDfE5OU54nglosRLWb98yDiQ="; }; + patches = [ + # libicu headers require C++ 17, remove `set(CMAKE_CXX_STANDARD 11)` + ./cpp-17.patch + ]; + nativeBuildInputs = [ cmake ]; @@ -31,11 +37,15 @@ stdenv.mkDerivation rec { icu ]; - meta = with lib; { + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgram = "${builtins.placeholder "out"}/bin/dmr_decoder"; + doInstallCheck = true; + + meta = { homepage = "https://github.com/jketterl/digiham"; description = "tools for decoding digital ham communication"; - license = licenses.gpl3Only; - platforms = platforms.unix; - maintainers = teams.c3d2.members; + license = lib.licenses.gpl3Only; + platforms = lib.platforms.unix; + maintainers = lib.teams.c3d2.members; }; -} +}) From 524e5425474b3d55dff6cc8b34b2206426f11a93 Mon Sep 17 00:00:00 2001 From: Petr Zahradnik Date: Sat, 22 Feb 2025 20:01:58 +0100 Subject: [PATCH 2/3] python312Packages.pydigiham: 0.6.0 -> 0.6.2 --- pkgs/development/python-modules/pydigiham/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pydigiham/default.nix b/pkgs/development/python-modules/pydigiham/default.nix index 1bc5fd33e59e..77653bc83c34 100644 --- a/pkgs/development/python-modules/pydigiham/default.nix +++ b/pkgs/development/python-modules/pydigiham/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pydigiham"; - version = "0.6.0"; + version = "0.6.2"; format = "setuptools"; src = fetchFromGitHub { owner = "jketterl"; repo = "pydigiham"; rev = version; - hash = "sha256-kiEvQl3SuDnHI4Fh97AarsszHGFt7tbWBvBRW84Qv18="; + hash = "sha256-QenoMyVFs8MEDPoMV6TT6XfzktfN/gAMIHR0Scq11wk="; }; propagatedBuildInputs = [ digiham ]; From 4088f58a99da59bea45a3d4f0cdc4b7ddd4aef41 Mon Sep 17 00:00:00 2001 From: Petr Zahradnik Date: Sun, 2 Mar 2025 21:34:34 +0100 Subject: [PATCH 3/3] digiham: fix repo, tag, description --- pkgs/by-name/di/digiham/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/di/digiham/package.nix b/pkgs/by-name/di/digiham/package.nix index 4d42b9bcdd9c..ce97f31ebe2e 100644 --- a/pkgs/by-name/di/digiham/package.nix +++ b/pkgs/by-name/di/digiham/package.nix @@ -16,8 +16,8 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "jketterl"; - repo = finalAttrs.pname; - rev = finalAttrs.version; + repo = "digiham"; + tag = finalAttrs.version; hash = "sha256-v7qp6Lv94Ec0yzHsc08YDfE5OU54nglosRLWb98yDiQ="; }; @@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://github.com/jketterl/digiham"; - description = "tools for decoding digital ham communication"; + description = "Tools for decoding digital ham communication"; license = lib.licenses.gpl3Only; platforms = lib.platforms.unix; maintainers = lib.teams.c3d2.members;