digiham: 0.6.0 -> 0.6.2, fix build (#384311)
This commit is contained in:
@@ -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)
|
||||
@@ -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 = "digiham";
|
||||
tag = 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;
|
||||
description = "Tools for decoding digital ham communication";
|
||||
license = lib.licenses.gpl3Only;
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = lib.teams.c3d2.members;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -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 ];
|
||||
|
||||
Reference in New Issue
Block a user