commit b18d509c30bde6ec98cb11eb8d42fa24ae57af90
parent 550942df145148b3c4defd702504fa2e3f01b4ee
Author: Nikolay Korotkiy <sikmir@disroot.org>
Date: Sat, 26 Apr 2025 23:53:13 +0400
Up
Diffstat:
16 files changed, 73 insertions(+), 63 deletions(-)
diff --git a/pkgs/development/libraries/libgnunetchat/default.nix b/pkgs/development/libraries/libgnunetchat/default.nix
@@ -14,11 +14,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "libgnunetchat";
- version = "0.5.2";
+ version = "0.5.3";
src = fetchurl {
url = "mirror://gnu/gnunet/libgnunetchat-${finalAttrs.version}.tar.gz";
- hash = "sha256-ecdFfDF1uuqvCL7j465HYIPTq+6kAJugmyq8JSPdEIo=";
+ hash = "sha256-h9f0ox3Z/WhdTUXKA3zc70z++LRGYbH300+Ni6oo3bA=";
};
postPatch = ''
diff --git a/pkgs/development/libraries/plutosvg/default.nix b/pkgs/development/libraries/plutosvg/default.nix
@@ -27,5 +27,6 @@ stdenv.mkDerivation (finalAttrs: {
license = lib.licenses.mit;
maintainers = [ lib.maintainers.sikmir ];
platforms = lib.platforms.unix;
+ broken = true;
};
})
diff --git a/pkgs/garmin/garminimg/default.nix b/pkgs/garmin/garminimg/default.nix
@@ -50,5 +50,6 @@ stdenv.mkDerivation {
license = lib.licenses.gpl3Plus;
maintainers = [ lib.maintainers.sikmir ];
platforms = lib.platforms.unix;
+ broken = true; # proj_7 is broken
};
}
diff --git a/pkgs/geospatial/hecate/default.nix b/pkgs/geospatial/hecate/default.nix
@@ -34,5 +34,6 @@ rustPlatform.buildRustPackage rec {
homepage = "https://github.com/Hecate/Hecate";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.sikmir ];
+ broken = stdenv.isLinux;
};
}
diff --git a/pkgs/geospatial/starlette-cramjam/default.nix b/pkgs/geospatial/starlette-cramjam/default.nix
@@ -6,14 +6,14 @@
python3Packages.buildPythonPackage rec {
pname = "starlette-cramjam";
- version = "0.4.0";
+ version = "0.5.0";
pyproject = true;
src = fetchFromGitHub {
owner = "developmentseed";
repo = "starlette-cramjam";
tag = version;
- hash = "sha256-NgEW86+HV1zy9B5tRMF6Jw25Icrl6+CU9eZYInwv5To=";
+ hash = "sha256-D4kYEXL4WTle3HnWwzub/AWwMm9xDIYdAVgpPmkJmns=";
};
build-system = with python3Packages; [ flit ];
@@ -25,6 +25,7 @@ python3Packages.buildPythonPackage rec {
typing-extensions
];
+ doCheck = false;
nativeCheckInputs = with python3Packages; [ pytestCheckHook ];
meta = {
diff --git a/pkgs/geospatial/tilesets-cli/default.nix b/pkgs/geospatial/tilesets-cli/default.nix
@@ -32,6 +32,7 @@ python3Packages.buildPythonApplication rec {
geojson
];
+ doCheck = false;
nativeCheckInputs = with python3Packages; [
pytestCheckHook
supermercado
diff --git a/pkgs/misc/bwh/default.nix b/pkgs/misc/bwh/default.nix
@@ -8,6 +8,7 @@
SDL2,
the-foundation,
AppKit,
+ libX11,
}:
stdenv.mkDerivation (finalAttrs: {
@@ -31,7 +32,8 @@ stdenv.mkDerivation (finalAttrs: {
buildInputs = [
SDL2
the-foundation
- ] ++ lib.optional stdenv.isDarwin AppKit;
+ ] ++ lib.optional stdenv.isLinux libX11
+ ++ lib.optional stdenv.isDarwin AppKit;
installPhase = lib.optionalString stdenv.isDarwin ''
runHook preInstall
diff --git a/pkgs/misc/git-tui/default.nix b/pkgs/misc/git-tui/default.nix
@@ -9,13 +9,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "git-tui";
- version = "1.1.0";
+ version = "1.3.0";
src = fetchFromGitHub {
owner = "ArthurSonzogni";
repo = "git-tui";
tag = "v${finalAttrs.version}";
- hash = "sha256-RogDZeDgC7HanPd0I+BuU9CShUzaIqvH1R7/I1tAtG4=";
+ hash = "sha256-ozh09dcaFFVT+yocTRZPYY/BSx/z4J+0LTbitpL6XuQ=";
};
patches = [ ./subprocess.patch ];
diff --git a/pkgs/misc/json-tui/default.nix b/pkgs/misc/json-tui/default.nix
@@ -10,13 +10,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "json-tui";
- version = "1.3.0";
+ version = "1.4.1";
src = fetchFromGitHub {
owner = "ArthurSonzogni";
repo = "json-tui";
tag = "v${finalAttrs.version}";
- hash = "sha256-Rgan+Pki4kOFf4BiNmJV4mf/rgyIGgUVP1BcFCKG25w=";
+ hash = "sha256-qS2EbCxH8sUUJMu5hwm1+Nu6SsJRfLReX56YSd1RZU4=";
};
patches = [ ./no-deps.patch ];
@@ -35,5 +35,6 @@ stdenv.mkDerivation (finalAttrs: {
license = lib.licenses.mit;
maintainers = [ lib.maintainers.sikmir ];
platforms = lib.platforms.unix;
+ broken = lib.versionOlder nlohmann_json.version "3.12.0";
};
})
diff --git a/pkgs/misc/json-tui/no-deps.patch b/pkgs/misc/json-tui/no-deps.patch
@@ -1,79 +1,70 @@
-diff --git i/CMakeLists.txt w/CMakeLists.txt
-index 835401e..1a81954 100644
---- i/CMakeLists.txt
-+++ w/CMakeLists.txt
-@@ -1,46 +1,15 @@
- cmake_minimum_required (VERSION 3.11)
+diff --git c/CMakeLists.txt i/CMakeLists.txt
+index 62d14a5..2fe8069 100644
+--- c/CMakeLists.txt
++++ i/CMakeLists.txt
+@@ -8,49 +8,16 @@ project(json-tui
+ option(JSON_TUI_BUILD_TESTS "Set to ON to build tests" OFF)
+ option(JSON_TUI_CLANG_TIDY "Set to ON to use clang tidy" OFF)
+
++project(json-tui
++ LANGUAGES CXX
++ VERSION 1.3.0
++)
++
+ # Dependencies -----------------------------------------------------------------
--# Dependencies -----------------------------------------------------------------
--
-include(FetchContent)
-set(FETCHCONTENT_UPDATES_DISCONNECTED TRUE)
-set(FETCHCONTENT_QUIET FALSE)
-
-FetchContent_Declare(ftxui
- GIT_REPOSITORY https://github.com/ArthurSonzogni/ftxui
-- GIT_TAG 382205c05732a420a300e990218653b1c3ac0fc9
+- GIT_TAG v6.0.2
- GIT_PROGRESS TRUE
- GIT_SHALLOW FALSE
+- EXCLUDE_FROM_ALL
+- FIND_PACKAGE_ARGS
+- 6.0.2
+- NAMES ftxui
-)
-
--FetchContent_Declare(json
-- URL https://github.com/nlohmann/json/releases/download/v3.10.5/json-3.10.5.tar.xz
+-FetchContent_Declare(nlohmann_json
+- URL https://github.com/nlohmann/json/releases/download/v3.12.0/json.tar.xz
+- EXCLUDE_FROM_ALL
+- FIND_PACKAGE_ARGS
+- 3.12.0 # Breaking change nlohmann/json/pull/4517
+- NAMES nlohmann_json
-)
-
-FetchContent_Declare(args
- GIT_REPOSITORY https://github.com/Taywee/args
-- GIT_TAG a48e1f880813b367d2354963a58dedbf2b708584
+- GIT_TAG 114200a9ad5fe06c8dea76e15d92325695cf3e34
+- EXCLUDE_FROM_ALL
- GIT_PROGRESS TRUE
- GIT_SHALLOW FALSE
-+project(json-tui
-+ LANGUAGES CXX
-+ VERSION 1.3.0
- )
-
--FetchContent_GetProperties(ftxui)
--if(NOT ftxui_POPULATED)
-- FetchContent_Populate(ftxui)
-- add_subdirectory(${ftxui_SOURCE_DIR} ${ftxui_BINARY_DIR} EXCLUDE_FROM_ALL)
--endif()
+- FIND_PACKAGE_ARGS
+- 6.4.7
+- NAMES args
+-)
-
--FetchContent_GetProperties(json)
--if(NOT json_POPULATED)
-- FetchContent_Populate(json)
-- add_subdirectory(${json_SOURCE_DIR} ${json_BINARY_DIR} EXCLUDE_FROM_ALL)
--endif()
-+# Dependencies -----------------------------------------------------------------
-
+-FetchContent_GetProperties(ftxui)
+-FetchContent_GetProperties(nlohmann_json)
-FetchContent_GetProperties(args)
--if(NOT args_POPULATED)
-- FetchContent_Populate(args)
-- add_subdirectory(${args_SOURCE_DIR} ${args_BINARY_DIR} EXCLUDE_FROM_ALL)
--endif()
+-
+-FetchContent_MakeAvailable(ftxui)
+-FetchContent_MakeAvailable(nlohmann_json)
+-FetchContent_MakeAvailable(args)
+find_package(ftxui REQUIRED)
+find_package(nlohmann_json REQUIRED)
+find_package(args REQUIRED)
# Build ------------------------------------------------------------------------
-@@ -49,11 +18,6 @@ configure_file(
+@@ -59,7 +26,6 @@ configure_file(
${CMAKE_CURRENT_BINARY_DIR}/src/version.hpp
)
--project(json-tui
-- LANGUAGES CXX
-- VERSION 1.3.0
--)
-
- add_executable(json-tui
- src/main.cpp
- src/mytoggle.cpp
-@@ -70,7 +34,7 @@ target_link_libraries(json-tui
- PRIVATE ftxui::screen
- PRIVATE ftxui::dom
- PRIVATE ftxui::component
-- PRIVATE args
-+# PRIVATE args
- PRIVATE nlohmann_json::nlohmann_json
- )
-
+ add_library(json-tui-lib
+ src/button.cpp
+ src/button.hpp
diff --git a/pkgs/misc/serverpp/default.nix b/pkgs/misc/serverpp/default.nix
@@ -9,13 +9,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "serverpp";
- version = "0.2.0";
+ version = "0.3.0";
src = fetchFromGitHub {
owner = "KazDragon";
repo = "serverpp";
tag = "v${finalAttrs.version}";
- hash = "sha256-z7aLE7RyRGwUCpnJr0NS6yXUBPtHTnd81JOI/tGHDo0=";
+ hash = "sha256-22mwf0/fwqkXzlgs+RMpjBQVT2D4T/vGZ3t0kKUqNsk=";
};
nativeBuildInputs = [ cmake ];
@@ -31,5 +31,6 @@ stdenv.mkDerivation (finalAttrs: {
license = lib.licenses.mit;
maintainers = [ lib.maintainers.sikmir ];
platforms = lib.platforms.unix;
+ broken = stdenv.isDarwin;
};
})
diff --git a/pkgs/mqtt/mqtt-logger/default.nix b/pkgs/mqtt/mqtt-logger/default.nix
@@ -16,7 +16,10 @@ python3Packages.buildPythonPackage rec {
hash = "sha256-AG8L2CD+YN6gWswDtsUtUMOA3xC2ro1f1YKYgc4jwXE=";
};
- pythonRelaxDeps = [ "rich" ];
+ pythonRelaxDeps = [
+ "paho-mqtt"
+ "rich"
+ ];
build-system = with python3Packages; [ poetry-core ];
diff --git a/pkgs/mqtt/mqtt-to-influxdb/default.nix b/pkgs/mqtt/mqtt-to-influxdb/default.nix
@@ -69,5 +69,6 @@ stdenv.mkDerivation (finalAttrs: {
license = lib.licenses.mit;
maintainers = [ lib.maintainers.sikmir ];
platforms = lib.platforms.unix;
+ broken = stdenv.isDarwin; # paho-mqtt-cpp
};
})
diff --git a/pkgs/mqtt/mqttwarn/default.nix b/pkgs/mqtt/mqttwarn/default.nix
@@ -15,7 +15,11 @@ python3Packages.buildPythonApplication rec {
owner = "mqtt-tools";
repo = "mqttwarn";
tag = version;
- hash = "sha256-jdQNCmfGs1k52VKzcF132mmUSWkcdcsjx+AHxM+MRdw=";
+ hash =
+ if stdenv.hostPlatform.isDarwin then
+ "sha256-jdQNCmfGs1k52VKzcF132mmUSWkcdcsjx+AHxM+MRdw="
+ else
+ "sha256-lr1cJvfQtkSc/DQc0fagAn5LQBgfVIwlUfxdbogcofM=";
};
patches = [
diff --git a/pkgs/osm/abstreet/default.nix b/pkgs/osm/abstreet/default.nix
@@ -52,5 +52,6 @@ rustPlatform.buildRustPackage rec {
homepage = "https://github.com/a-b-street/abstreet";
license = lib.licenses.asl20;
maintainers = [ lib.maintainers.sikmir ];
+ broken = stdenv.isLinux;
};
}
diff --git a/pkgs/radio/dump1090_rs/default.nix b/pkgs/radio/dump1090_rs/default.nix
@@ -30,5 +30,6 @@ rustPlatform.buildRustPackage rec {
license = lib.licenses.gpl2;
maintainers = [ lib.maintainers.sikmir ];
platforms = lib.platforms.unix;
+ broken = true; # Unable to find libclang
};
}
