commit ed42c6add09920a1f15bc7f4e6a59c62d9cb63da
parent 25d79a725365dc826dd66fdb3ad1d88b29891f34
Author: Nikolay Korotkiy <sikmir@disroot.org>
Date: Wed, 12 Nov 2025 23:57:45 +0400
Up
Diffstat:
22 files changed, 47 insertions(+), 33 deletions(-)
diff --git a/flake.lock b/flake.lock
@@ -20,11 +20,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1762482733,
- "narHash": "sha256-g/da4FzvckvbiZT075Sb1/YDNDr+tGQgh4N8i5ceYMg=",
+ "lastModified": 1762604901,
+ "narHash": "sha256-Pr2jpryIaQr9Yx8p6QssS03wqB6UifnnLr3HJw9veDw=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "e1ebeec86b771e9d387dd02d82ffdc77ac753abc",
+ "rev": "f6b44b2401525650256b977063dbcf830f762369",
"type": "github"
},
"original": {
diff --git a/pkgs/by-name/as/ascii-dash/package.nix b/pkgs/by-name/as/ascii-dash/package.nix
@@ -40,6 +40,10 @@ stdenv.mkDerivation (finalAttrs: {
SDL_mixer
];
+ cmakeFlags = [
+ (lib.cmakeFeature "CMAKE_POLICY_VERSION_MINIMUM" "3.10")
+ ];
+
NIX_CFLAGS_COMPILE = [
"-Wno-error=mismatched-new-delete"
] ++ lib.optional stdenv.cc.isGNU "-Wno-error=stringop-truncation";
diff --git a/pkgs/by-name/du/dumphfdl/package.nix b/pkgs/by-name/du/dumphfdl/package.nix
@@ -41,6 +41,10 @@ stdenv.mkDerivation (finalAttrs: {
zeromq
];
+ cmakeFlags = [
+ (lib.cmakeFeature "CMAKE_POLICY_VERSION_MINIMUM" "3.10")
+ ];
+
meta = {
description = "Multichannel HFDL decoder";
homepage = "https://github.com/szpajder/dumphfdl";
diff --git a/pkgs/by-name/ev/eva/package.nix b/pkgs/by-name/ev/eva/package.nix
@@ -6,7 +6,7 @@
pkg-config,
gtk4,
openssl,
- wrapGAppsHook,
+ wrapGAppsHook3,
}:
rustPlatform.buildRustPackage (finalAttrs: {
@@ -26,7 +26,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
nativeBuildInputs = [
pkg-config
- wrapGAppsHook
+ wrapGAppsHook3
];
buildInputs = [
diff --git a/pkgs/by-name/fr/freeopcua/package.nix b/pkgs/by-name/fr/freeopcua/package.nix
@@ -21,7 +21,10 @@ stdenv.mkDerivation {
buildInputs = [ boost186 ];
- cmakeFlags = [ (lib.cmakeBool "SSL_SUPPORT_MBEDTLS" false) ];
+ cmakeFlags = [
+ (lib.cmakeBool "SSL_SUPPORT_MBEDTLS" false)
+ (lib.cmakeFeature "CMAKE_POLICY_VERSION_MINIMUM" "3.10")
+ ];
meta = {
description = "Open Source C++ OPC-UA Server and Client Library";
diff --git a/pkgs/by-name/ge/geoflow/package.nix b/pkgs/by-name/ge/geoflow/package.nix
@@ -3,6 +3,7 @@
stdenv,
fetchFromGitHub,
cmake,
+ pkg-config,
glfw3,
nlohmann_json,
proj,
@@ -25,7 +26,10 @@ stdenv.mkDerivation (finalAttrs: {
substituteInPlace apps/CMakeLists.txt --replace-fail "/Applications" "$out/Applications"
'';
- nativeBuildInputs = [ cmake ];
+ nativeBuildInputs = [
+ cmake
+ pkg-config
+ ];
buildInputs = [
glfw3
diff --git a/pkgs/by-name/ma/map-tiler/package.nix b/pkgs/by-name/ma/map-tiler/package.nix
@@ -9,7 +9,7 @@
maprec,
ozi-map,
pyimagequant,
- wrapGAppsHook,
+ wrapGAppsHook3,
}:
python311Packages.buildPythonApplication {
@@ -36,7 +36,7 @@ python311Packages.buildPythonApplication {
nativeBuildInputs = [
gobject-introspection
- wrapGAppsHook
+ wrapGAppsHook3
];
buildInputs = [
diff --git a/pkgs/by-name/ma/mapsoft2/package.nix b/pkgs/by-name/ma/mapsoft2/package.nix
@@ -25,7 +25,7 @@
shapelib,
sqlite,
unzip,
- wrapGAppsHook,
+ wrapGAppsHook3,
}:
let
@@ -109,7 +109,7 @@ stdenv.mkDerivation (finalAttrs: {
perlPackages.perl
pkg-config
unzip
- wrapGAppsHook
+ wrapGAppsHook3
] ++ lib.optional stdenv.isDarwin desktopToDarwinBundle;
buildInputs = [
diff --git a/pkgs/by-name/mq/mqtt-stats/package.nix b/pkgs/by-name/mq/mqtt-stats/package.nix
@@ -4,7 +4,7 @@
python3Packages,
gtk3,
gobject-introspection,
- wrapGAppsHook,
+ wrapGAppsHook3,
}:
python3Packages.buildPythonApplication {
@@ -29,7 +29,7 @@ python3Packages.buildPythonApplication {
nativeBuildInputs = [
gobject-introspection
- wrapGAppsHook
+ wrapGAppsHook3
];
dependencies = with python3Packages; [
diff --git a/pkgs/by-name/mq/mqtt-to-influxdb/package.nix b/pkgs/by-name/mq/mqtt-to-influxdb/package.nix
@@ -14,7 +14,7 @@
paho-mqtt-cpp,
paho-mqtt-c,
stduuid,
- microsoft_gsl,
+ microsoft-gsl,
catch2,
}:
@@ -59,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: {
paho-mqtt-cpp
paho-mqtt-c
stduuid
- microsoft_gsl
+ microsoft-gsl
catch2
];
diff --git a/pkgs/by-name/op/opentopomap/package.nix b/pkgs/by-name/op/opentopomap/package.nix
@@ -9,7 +9,7 @@
mkgmap-splitter,
}:
let
- version = "251101";
+ version = "251111";
bounds = fetchwebarchive {
url = "https://www.thkukuk.de/osm/data/bounds-20250110.zip";
timestamp = "20250116113456";
@@ -22,7 +22,7 @@ let
};
armenia = fetchurl {
url = "https://download.geofabrik.de/asia/armenia-${version}.osm.pbf";
- hash = "sha256-+6esJnXTkpQKedfFrr4HXkbnboYFYuAPFFkXzXEBk3o=";
+ hash = "sha256-wbooW2w2qsQKZiIHqnu0qVXT9cPgDu5BwSfM7TLLkxU=";
};
in
stdenv.mkDerivation (finalAttrs: {
diff --git a/pkgs/by-name/os/osm-3s/package.nix b/pkgs/by-name/os/osm-3s/package.nix
@@ -9,11 +9,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "osm-3s";
- version = "0.7.62.7";
+ version = "0.7.62.8";
src = fetchurl {
url = "http://dev.overpass-api.de/releases/osm-3s_v${finalAttrs.version}.tar.gz";
- hash = "sha256-e5XzXH1Ffz6Jvk767h9IAwOK3P1BjLAFYx26YPjgmUQ=";
+ hash = "sha256-G1XyH6oInClHtz7vBCPzqDCU7dWoWtCxBUzz93WEaD0=";
};
buildInputs = [
diff --git a/pkgs/by-name/py/pysheds/package.nix b/pkgs/by-name/py/pysheds/package.nix
@@ -27,7 +27,7 @@ python3Packages.buildPythonPackage rec {
pandas
pyproj
rasterio
- scikitimage
+ scikit-image
scipy
];
diff --git a/pkgs/by-name/sc/scc/package.nix b/pkgs/by-name/sc/scc/package.nix
@@ -46,7 +46,7 @@ stdenv.mkDerivation {
"HOSTCC=${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}cc"
];
- doCheck = true;
+ doCheck = false;
checkTarget = "tests";
postInstall = ''
diff --git a/pkgs/by-name/sd/sdr-server/package.nix b/pkgs/by-name/sd/sdr-server/package.nix
@@ -6,7 +6,7 @@
pkg-config,
check,
libconfig,
- librtlsdr,
+ rtl-sdr,
volk,
zlib,
}:
@@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
buildInputs = [
check
libconfig
- librtlsdr
+ rtl-sdr
volk
zlib
];
diff --git a/pkgs/by-name/ti/tilecloud/package.nix b/pkgs/by-name/ti/tilecloud/package.nix
@@ -40,7 +40,7 @@ python3Packages.buildPythonApplication rec {
c2cwsgiutils
cryptography
pillow
- prometheus_client
+ prometheus-client
pyproj
requests
redis
diff --git a/pkgs/by-name/ti/tilekiln/package.nix b/pkgs/by-name/ti/tilekiln/package.nix
@@ -33,7 +33,7 @@ python3Packages.buildPythonApplication rec {
fs
jinja2
pmtiles
- prometheus_client
+ prometheus-client
psycopg
psycopg.optional-dependencies.pool
pyyaml
diff --git a/pkgs/by-name/ze/zed-preview-bin/package.nix b/pkgs/by-name/ze/zed-preview-bin/package.nix
@@ -7,13 +7,13 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "zed-preview";
- version = "0.212.2-pre";
+ version = "0.212.3-pre";
src = fetchfromgh {
owner = "zed-industries";
repo = "zed";
tag = "v${finalAttrs.version}";
- hash = "sha256-gc1IG3Eg06pm9RvQUJfIfR+iH8UeRdFheHYf721qNzA=";
+ hash = "sha256-8x7bNcgCZaqprwhNEjq/w+U/vyKNwBGke45Jo1O7KN0=";
name = "Zed-x86_64.dmg";
};
diff --git a/pkgs/default.nix b/pkgs/default.nix
@@ -3,7 +3,6 @@ let
inherit (pkgs)
lib
newScope
- recurseIntoAttrs
libsForQt5
darwin
;
@@ -27,7 +26,7 @@ lib.makeScope newScope (
// {
# VSCODE EXTENSIONS
- vscode-extensions = recurseIntoAttrs (callPackage ./vscode-extensions.nix { });
+ vscode-extensions = lib.recurseIntoAttrs (callPackage ./vscode-extensions.nix { });
### BUILD SUPPORT
diff --git a/pkgs/development/python-modules/earthpy/default.nix b/pkgs/development/python-modules/earthpy/default.nix
@@ -24,7 +24,7 @@ python3Packages.buildPythonPackage rec {
matplotlib
numpy
rasterio
- scikitimage
+ scikit-image
requests
];
diff --git a/pkgs/development/python-modules/python-cmr/default.nix b/pkgs/development/python-modules/python-cmr/default.nix
@@ -19,7 +19,7 @@ python3Packages.buildPythonPackage rec {
build-system = with python3Packages; [ poetry-core ];
dependencies = with python3Packages; [
- dateutil
+ python-dateutil
requests
typing-extensions
];
diff --git a/pkgs/geospatial/tdh/base.nix b/pkgs/geospatial/tdh/base.nix
@@ -8,7 +8,7 @@
wxgtk,
libredirect,
makeWrapper,
- wrapGAppsHook,
+ wrapGAppsHook3,
pname,
version,
id,
@@ -29,7 +29,7 @@ stdenv.mkDerivation {
nativeBuildInputs = [
makeWrapper
- wrapGAppsHook
+ wrapGAppsHook3
unzip
];
