commit 4a00253f6058c5d299cf7cc252f9accbc640070f parent 9c41143e6d6f89d2343ba3a899aba9dc47f93c7f Author: Nikolay Korotkiy <sikmir@disroot.org> Date: Thu, 13 Nov 2025 18:45:24 +0400 Up Diffstat:
28 files changed, 149 insertions(+), 124 deletions(-)
diff --git a/pkgs/by-name/am/amqtt/package.nix b/pkgs/by-name/am/amqtt/package.nix @@ -21,7 +21,10 @@ python3Packages.buildPythonApplication rec { --replace-fail ', "uv-dynamic-versioning"' "" ''; - build-system = with python3Packages; [ hatchling hatch-vcs ]; + build-system = with python3Packages; [ + hatchling + hatch-vcs + ]; dependencies = with python3Packages; [ passlib diff --git a/pkgs/by-name/as/ascii-dash/package.nix b/pkgs/by-name/as/ascii-dash/package.nix @@ -46,7 +46,8 @@ stdenv.mkDerivation (finalAttrs: { NIX_CFLAGS_COMPILE = [ "-Wno-error=mismatched-new-delete" - ] ++ lib.optional stdenv.cc.isGNU "-Wno-error=stringop-truncation"; + ] + ++ lib.optional stdenv.cc.isGNU "-Wno-error=stringop-truncation"; installPhase = '' install -Dm755 main $out/bin/ascii-dash diff --git a/pkgs/by-name/bw/bwh/package.nix b/pkgs/by-name/bw/bwh/package.nix @@ -31,7 +31,8 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ SDL2 the-foundation - ] ++ lib.optional stdenv.isLinux libX11; + ] + ++ lib.optional stdenv.isLinux libX11; installPhase = lib.optionalString stdenv.isDarwin '' runHook preInstall diff --git a/pkgs/by-name/ch/chdk/package.nix b/pkgs/by-name/ch/chdk/package.nix @@ -33,22 +33,21 @@ stdenv.mkDerivation { zip ]; - buildFlags = - [ - "DEF_SVN_REF=${revision}" - "HOSTCC=${stdenv.cc.targetPrefix}cc" - ] - ++ lib.optionals (optFI2 && !batchBuild) [ - "OPT_FI2=1" - "FI2KEY=${fi2key}" - "FI2IV=${fi2iv}" - ] - ++ lib.optionals (!batchBuild) [ - "PLATFORM=${platform}" - "PLATFORMSUB=${platformsub}" - "firzipsubcomplete" - ] - ++ lib.optional batchBuild "batch-zip-complete"; + buildFlags = [ + "DEF_SVN_REF=${revision}" + "HOSTCC=${stdenv.cc.targetPrefix}cc" + ] + ++ lib.optionals (optFI2 && !batchBuild) [ + "OPT_FI2=1" + "FI2KEY=${fi2key}" + "FI2IV=${fi2iv}" + ] + ++ lib.optionals (!batchBuild) [ + "PLATFORM=${platform}" + "PLATFORMSUB=${platformsub}" + "firzipsubcomplete" + ] + ++ lib.optional batchBuild "batch-zip-complete"; env.NIX_CFLAGS_COMPILE = "-Wno-format-security"; diff --git a/pkgs/by-name/co/comitium/package.nix b/pkgs/by-name/co/comitium/package.nix @@ -10,7 +10,7 @@ buildGoModule (finalAttrs: { version = "1.8.2"; src = fetchFromSourcehut { - owner= "~nytpu"; + owner = "~nytpu"; repo = "comitium"; rev = "v${finalAttrs.version}"; hash = "sha256-kydT2hLPb2Oj1/o+1N9Cvrdi4+DKi2tHX35oY6yGUU8="; diff --git a/pkgs/by-name/fa/farbfeld-utils/package.nix b/pkgs/by-name/fa/farbfeld-utils/package.nix @@ -28,7 +28,8 @@ stdenv.mkDerivation { SDL ghostscript sqlite - ] ++ lib.optional stdenv.isLinux libX11; + ] + ++ lib.optional stdenv.isLinux libX11; buildPhase = '' runHook preBuild diff --git a/pkgs/by-name/fm/fmreceiver/package.nix b/pkgs/by-name/fm/fmreceiver/package.nix @@ -32,17 +32,16 @@ stdenv.mkDerivation (finalAttrs: { }) ]; - postPatch = - '' - substituteInPlace fmreceiver.pro \ - --replace-fail "-lqwt-qt5" "-lqwt" \ - --replace-fail "CONFIG" "#CONFIG" - '' - + lib.optionalString stdenv.isDarwin '' - substituteInPlace fmreceiver.pro --replace-fail "-lrt " "" - substituteInPlace includes/fm-constants.h --replace-fail "<malloc.h>" "<stdlib.h>" - substituteInPlace devices/rtlsdr-handler/rtlsdr-handler.cpp --replace-fail ".so" ".dylib" - ''; + postPatch = '' + substituteInPlace fmreceiver.pro \ + --replace-fail "-lqwt-qt5" "-lqwt" \ + --replace-fail "CONFIG" "#CONFIG" + '' + + lib.optionalString stdenv.isDarwin '' + substituteInPlace fmreceiver.pro --replace-fail "-lrt " "" + substituteInPlace includes/fm-constants.h --replace-fail "<malloc.h>" "<stdlib.h>" + substituteInPlace devices/rtlsdr-handler/rtlsdr-handler.cpp --replace-fail ".so" ".dylib" + ''; nativeBuildInputs = [ qt5.qmake diff --git a/pkgs/by-name/ga/garminimg/package.nix b/pkgs/by-name/ga/garminimg/package.nix @@ -19,7 +19,6 @@ stdenv.mkDerivation { hash = "sha256-QkW3dri3qWMY1iLBH9+woHZ8CB/wD+QcTFw7sEW1b1k="; }; - nativeBuildInputs = [ cmake qt5.wrapQtAppsHook @@ -42,5 +41,6 @@ stdenv.mkDerivation { license = lib.licenses.gpl3Plus; maintainers = [ lib.maintainers.sikmir ]; platforms = lib.platforms.unix; + broken = true; }; } diff --git a/pkgs/by-name/gd/gdcv/package.nix b/pkgs/by-name/gd/gdcv/package.nix @@ -32,7 +32,8 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ emacs zlib - ] ++ lib.optional stdenv.isDarwin argp-standalone; + ] + ++ lib.optional stdenv.isDarwin argp-standalone; makeFlags = [ "CC:=$(CC)" diff --git a/pkgs/by-name/ge/geoflow/package.nix b/pkgs/by-name/ge/geoflow/package.nix @@ -5,6 +5,7 @@ cmake, pkg-config, glfw3, + gtk2, nlohmann_json, proj, sqlite, @@ -33,6 +34,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ glfw3 + gtk2 nlohmann_json proj sqlite diff --git a/pkgs/by-name/gp/gpx-layer/package.nix b/pkgs/by-name/gp/gpx-layer/package.nix @@ -25,16 +25,15 @@ perlPackages.buildPerlPackage { preConfigure = "touch Makefile.PL"; - installPhase = - '' - install -Dm755 parse-gpx $out/bin/datamaps-parse-gpx - '' - + lib.optionalString stdenv.isLinux '' - patchShebangs $out/bin/datamaps-parse-gpx - '' - + lib.optionalString stdenv.isDarwin '' - shortenPerlShebang $out/bin/datamaps-parse-gpx - ''; + installPhase = '' + install -Dm755 parse-gpx $out/bin/datamaps-parse-gpx + '' + + lib.optionalString stdenv.isLinux '' + patchShebangs $out/bin/datamaps-parse-gpx + '' + + lib.optionalString stdenv.isDarwin '' + shortenPerlShebang $out/bin/datamaps-parse-gpx + ''; meta = { description = "Tools to turn GPX files into a GPS map tracing layer"; diff --git a/pkgs/by-name/gp/gpxlib/package.nix b/pkgs/by-name/gp/gpxlib/package.nix @@ -24,6 +24,7 @@ stdenv.mkDerivation { cmakeFlags = [ (lib.cmakeBool "BUILD_EXAMPLES" false) (lib.cmakeBool "BUILD_TESTS" false) + (lib.cmakeFeature "CMAKE_POLICY_VERSION_MINIMUM" "3.10") ]; doCheck = false; diff --git a/pkgs/by-name/gp/gpxtrackposter/package.nix b/pkgs/by-name/gp/gpxtrackposter/package.nix @@ -52,7 +52,7 @@ python312Packages.buildPythonApplication { svgwrite stravalib polyline - timezonefinder + (timezonefinder.overridePythonAttrs { pythonRelaxDeps = true; }) setuptools ]; diff --git a/pkgs/by-name/gr/graphene/package.nix b/pkgs/by-name/gr/graphene/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, perl, pkg-config, wget, @@ -23,6 +24,13 @@ stdenv.mkDerivation (finalAttrs: { fetchSubmodules = true; }; + patches = [ + (fetchpatch { + url = "https://github.com/slazav/graphene/commit/76027a4a04e32a2d457934ab434788eeb27f60e4.patch"; + hash = "sha256-9IRrcgaW1Hmrw8ox+mDn1MzlZD/4RYH3qM2K91mW54M="; + }) + ]; + postPatch = '' patchShebangs . substituteInPlace graphene/Makefile --replace-fail "graphene_http.test2" "" diff --git a/pkgs/by-name/he/heapusage/package.nix b/pkgs/by-name/he/heapusage/package.nix @@ -18,6 +18,10 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake ]; + cmakeFlags = [ + (lib.cmakeFeature "CMAKE_POLICY_VERSION_MINIMUM" "3.10") + ]; + meta = { description = "Light-weight tool for finding heap memory errors"; homepage = "https://github.com/d99kris/heapusage"; diff --git a/pkgs/by-name/li/libumqtt/package.nix b/pkgs/by-name/li/libumqtt/package.nix @@ -35,6 +35,10 @@ stdenv.mkDerivation (finalAttrs: { zlib ]; + cmakeFlags = [ + (lib.cmakeFeature "CMAKE_POLICY_VERSION_MINIMUM" "3.10") + ]; + env.NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration -Wno-error=misleading-indentation"; meta = { diff --git a/pkgs/by-name/ma/mapsoft2/package.nix b/pkgs/by-name/ma/mapsoft2/package.nix @@ -62,7 +62,8 @@ stdenv.mkDerivation (finalAttrs: { extraPrefix = "modules/"; }) ./0002-fix-build.patch - ] ++ lib.optional (!finalAttrs.doCheck) ./0003-notests.patch; + ] + ++ lib.optional (!finalAttrs.doCheck) ./0003-notests.patch; postPatch = let @@ -110,7 +111,8 @@ stdenv.mkDerivation (finalAttrs: { pkg-config unzip wrapGAppsHook3 - ] ++ lib.optional stdenv.isDarwin desktopToDarwinBundle; + ] + ++ lib.optional stdenv.isDarwin desktopToDarwinBundle; buildInputs = [ db @@ -128,7 +130,8 @@ stdenv.mkDerivation (finalAttrs: { proj shapelib sqlite - ] ++ lib.optional stdenv.hostPlatform.isDarwin libiconv; + ] + ++ lib.optional stdenv.hostPlatform.isDarwin libiconv; env = { SKIP_IMG_DIFFS = 1; diff --git a/pkgs/by-name/me/messenger-gtk/package.nix b/pkgs/by-name/me/messenger-gtk/package.nix @@ -38,7 +38,8 @@ stdenv.mkDerivation (finalAttrs: { ninja pkg-config desktop-file-utils # for update-desktop-database - ] ++ lib.optional stdenv.isDarwin desktopToDarwinBundle; + ] + ++ lib.optional stdenv.isDarwin desktopToDarwinBundle; buildInputs = [ gnunet diff --git a/pkgs/by-name/mq/mqtt-to-influxdb/package.nix b/pkgs/by-name/mq/mqtt-to-influxdb/package.nix @@ -30,20 +30,19 @@ stdenv.mkDerivation (finalAttrs: { fetchSubmodules = true; }; - postPatch = - '' - substituteInPlace src/app/CMakeLists.txt \ - --replace-fail "/usr" "$out" - sed -i '1i #include <iostream>' src/app-validate/main.cpp - substituteInPlace src/app-validate/main.cpp \ - --replace-fail "OptionParseException" "exceptions::parsing" - substituteInPlace src/app/main.cpp \ - --replace-fail "OptionParseException" "exceptions::parsing" - '' - + lib.optionalString stdenv.cc.isClang '' - substituteInPlace src/libmqtt-to-influxdb/CMakeLists.txt \ - --replace-fail "stdc++fs" "" - ''; + postPatch = '' + substituteInPlace src/app/CMakeLists.txt \ + --replace-fail "/usr" "$out" + sed -i '1i #include <iostream>' src/app-validate/main.cpp + substituteInPlace src/app-validate/main.cpp \ + --replace-fail "OptionParseException" "exceptions::parsing" + substituteInPlace src/app/main.cpp \ + --replace-fail "OptionParseException" "exceptions::parsing" + '' + + lib.optionalString stdenv.cc.isClang '' + substituteInPlace src/libmqtt-to-influxdb/CMakeLists.txt \ + --replace-fail "stdc++fs" "" + ''; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/mq/mqttwarn/package.nix b/pkgs/by-name/mq/mqttwarn/package.nix @@ -61,7 +61,8 @@ python312Packages.buildPythonApplication rec { nativeCheckInputs = [ python312Packages.pytestCheckHook - ] ++ lib.flatten (lib.attrValues optional-dependencies); + ] + ++ lib.flatten (lib.attrValues optional-dependencies); meta = { description = "A highly configurable MQTT message router, where the routing targets are notification plugins"; diff --git a/pkgs/by-name/oc/ocelotgui/package.nix b/pkgs/by-name/oc/ocelotgui/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "ocelotgui"; - version = "2.1.0"; + version = "2.6.0"; src = fetchFromGitHub { owner = "ocelot-inc"; repo = "ocelotgui"; tag = finalAttrs.version; - hash = "sha256-CmLF8HrwdmWatFljSGLpy5YImlBGhjooB1K+axIDWhU="; + hash = "sha256-4hlYf5TIlWLpL4FczntCQWB8EGFff1KoCAYcSC4niMI="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/os/osm2mp/package.nix b/pkgs/by-name/os/osm2mp/package.nix @@ -45,20 +45,19 @@ perlPackages.buildPerlPackage { preConfigure = "touch Makefile.PL"; - installPhase = - '' - install -Dm755 osm2mp.pl $out/bin/osm2mp - install -dm755 $out/share/osm2mp/cfg - cp -r cfg/* $out/share/osm2mp/cfg - install -dm755 $out/lib/perl5/site_perl - cp -r lib/* $out/lib/perl5/site_perl - '' - + lib.optionalString stdenv.isLinux '' - patchShebangs $out/bin/osm2mp - '' - + lib.optionalString stdenv.isDarwin '' - shortenPerlShebang $out/bin/osm2mp - ''; + installPhase = '' + install -Dm755 osm2mp.pl $out/bin/osm2mp + install -dm755 $out/share/osm2mp/cfg + cp -r cfg/* $out/share/osm2mp/cfg + install -dm755 $out/lib/perl5/site_perl + cp -r lib/* $out/lib/perl5/site_perl + '' + + lib.optionalString stdenv.isLinux '' + patchShebangs $out/bin/osm2mp + '' + + lib.optionalString stdenv.isDarwin '' + shortenPerlShebang $out/bin/osm2mp + ''; meta = { description = "Convert Openstreetmap data to MP format"; diff --git a/pkgs/by-name/pl/plotjuggler/package.nix b/pkgs/by-name/pl/plotjuggler/package.nix @@ -33,7 +33,8 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake qt5.wrapQtAppsHook - ] ++ lib.optional stdenv.isDarwin desktopToDarwinBundle; + ] + ++ lib.optional stdenv.isDarwin desktopToDarwinBundle; buildInputs = [ qt5.qtsvg @@ -43,7 +44,8 @@ stdenv.mkDerivation (finalAttrs: { protobuf zeromq zstd - ] ++ lib.optionals stdenv.isLinux [ qt5.qtx11extras ]; + ] + ++ lib.optionals stdenv.isLinux [ qt5.qtx11extras ]; meta = { description = "The Time Series Visualization Tool"; diff --git a/pkgs/by-name/sa/sasplanet/package.nix b/pkgs/by-name/sa/sasplanet/package.nix @@ -47,21 +47,20 @@ stdenv.mkDerivation (finalAttrs: { # Post install regedit: # * increase font size: https://askubuntu.com/a/1313810 # * dark theme: https://gist.github.com/Zeinok/ceaf6ff204792dde0ae31e0199d89398 - installPhase = - '' - mkdir -p $out/opt/sasplanet - cp -r . $out/opt/sasplanet + installPhase = '' + mkdir -p $out/opt/sasplanet + cp -r . $out/opt/sasplanet - makeWrapper ${wineWow64Packages.stable}/bin/wine $out/bin/sasplanet \ - --run "[ -d \$HOME/.sasplanet ] || { cp -r $out/opt/sasplanet \$HOME/.sasplanet && chmod -R +w \$HOME/.sasplanet; }" \ - --add-flags "\$HOME/.sasplanet/SASPlanet.exe" - '' - + lib.optionalString withMaps '' - cp -r ${maps}/* $out/opt/sasplanet/Maps/sas.maps - '' - + lib.optionalString withExtremum '' - unzip ${extremum} -d $out/opt/sasplanet/Maps/sas.maps - ''; + makeWrapper ${wineWow64Packages.stable}/bin/wine $out/bin/sasplanet \ + --run "[ -d \$HOME/.sasplanet ] || { cp -r $out/opt/sasplanet \$HOME/.sasplanet && chmod -R +w \$HOME/.sasplanet; }" \ + --add-flags "\$HOME/.sasplanet/SASPlanet.exe" + '' + + lib.optionalString withMaps '' + cp -r ${maps}/* $out/opt/sasplanet/Maps/sas.maps + '' + + lib.optionalString withExtremum '' + unzip ${extremum} -d $out/opt/sasplanet/Maps/sas.maps + ''; preferLocalBuild = true; diff --git a/pkgs/by-name/sy/synwrite/package.nix b/pkgs/by-name/sy/synwrite/package.nix @@ -32,18 +32,17 @@ stdenv.mkDerivation rec { makeWrapper ]; - installPhase = - '' - mkdir -p $out/opt/synwrite - cp -r . $out/opt/synwrite + installPhase = '' + mkdir -p $out/opt/synwrite + cp -r . $out/opt/synwrite - makeWrapper ${wine}/bin/wine $out/bin/synwrite \ - --run "[ -d \$HOME/.synwrite ] || { cp -r $out/opt/synwrite \$HOME/.synwrite && chmod -R +w \$HOME/.synwrite; }" \ - --add-flags "\$HOME/.synwrite/Syn.exe" - '' - + lib.optionalString withExLexer '' - unzip ${exlexer} -d $out/opt/synwrite/Py/syn_exlexer - ''; + makeWrapper ${wine}/bin/wine $out/bin/synwrite \ + --run "[ -d \$HOME/.synwrite ] || { cp -r $out/opt/synwrite \$HOME/.synwrite && chmod -R +w \$HOME/.synwrite; }" \ + --add-flags "\$HOME/.synwrite/Syn.exe" + '' + + lib.optionalString withExLexer '' + unzip ${exlexer} -d $out/opt/synwrite/Py/syn_exlexer + ''; preferLocalBuild = true; diff --git a/pkgs/by-name/ta/tatoeba/package.nix b/pkgs/by-name/ta/tatoeba/package.nix @@ -49,15 +49,14 @@ stdenvNoCC.mkDerivation (finalAttrs: { srcs = lib.mapAttrsToList (name: spec: fetchurl spec) tatoeba; - unpackPhase = - '' - echo "{}" > versions.json - '' - + lib.concatMapStringsSep "\n" (src: '' - bzcat ${src} > ${lib.removeSuffix ".bz2" src.name} - jq '.+{"${lib.removeSuffix ".tsv.bz2" src.name}":"${finalAttrs.version} 00:00:00"}' versions.json | \ - sponge versions.json - '') finalAttrs.srcs; + unpackPhase = '' + echo "{}" > versions.json + '' + + lib.concatMapStringsSep "\n" (src: '' + bzcat ${src} > ${lib.removeSuffix ".bz2" src.name} + jq '.+{"${lib.removeSuffix ".tsv.bz2" src.name}":"${finalAttrs.version} 00:00:00"}' versions.json | \ + sponge versions.json + '') finalAttrs.srcs; nativeBuildInputs = [ dict diff --git a/pkgs/by-name/ta/tatoebatools/package.nix b/pkgs/by-name/ta/tatoebatools/package.nix @@ -19,8 +19,7 @@ python3Packages.buildPythonApplication rec { }; patches = - lib.optional (!checkLang) ./dont-check-lang-validity.patch - ++ lib.optional withCli ./cli.patch; + lib.optional (!checkLang) ./dont-check-lang-validity.patch ++ lib.optional withCli ./cli.patch; build-system = with python3Packages; [ setuptools ]; diff --git a/pkgs/by-name/wi/wikitextprocessor/package.nix b/pkgs/by-name/wi/wikitextprocessor/package.nix @@ -27,12 +27,13 @@ python3Packages.buildPythonPackage { nativeCheckInputs = with python3Packages; [ pytestCheckHook ]; - disabledTests = - [ "test_string_format2" ] - ++ lib.optionals stdenv.isDarwin [ - "test_long_twothread" - "test_expr29" - ]; + disabledTests = [ + "test_string_format2" + ] + ++ lib.optionals stdenv.isDarwin [ + "test_long_twothread" + "test_expr29" + ]; doCheck = false;