diff --git a/pkgs/applications/goldencheetah/bin.nix b/pkgs/applications/goldencheetah/bin.nix

index 4b5b5e73f3c962ae881a6987d0375ea2ccfc9f71..5b07b945e6d1ec3ef7d9e3d29f53fc2dce633be0 100644

--- a/pkgs/applications/goldencheetah/bin.nix

+++ b/pkgs/applications/goldencheetah/bin.nix

@@ -29,6 +29,7 @@

meta = with lib; {

 description = "Performance software for cyclists, runners and triathletes";

 homepage = "https://www.goldencheetah.org/";

• sourceProvenance = with sourceTypes; [ binaryNativeCode ];

 license = licenses.gpl3;

 maintainers = [ maintainers.sikmir ];

 platforms = [ "x86_64-linux" "x86_64-darwin" ];

diff --git a/pkgs/applications/synwrite/bin.nix b/pkgs/applications/synwrite/default.nix

rename from pkgs/applications/synwrite/bin.nix

rename to pkgs/applications/synwrite/default.nix

index 1e47172478e43cb0a6c3b901fa80973e9546535a..1bf7c1da29c5f121ab5bb9357ddc8eee4c72a513 100644

--- a/pkgs/applications/synwrite/bin.nix

+++ b/pkgs/applications/synwrite/default.nix

@@ -6,7 +6,7 @@ hash = "sha256-O9wOglJp4XExWV8ODoVra3VyaqRmhB51/tupRmqDdqY=";

};

in

stdenv.mkDerivation rec {

• pname = "synwrite-bin";

• pname = "synwrite";

version = "6.41.2780";

src = fetchurl {

@@ -37,6 +37,7 @@

meta = with lib; {

 description = "Advanced text editor for programmers and Notepad replacement";

 homepage = "http://uvviewsoft.com/synwrite/";

• sourceProvenance = with sourceTypes; [ binaryNativeCode ];

 license = licenses.mpl11;

 maintainers = [ maintainers.sikmir ];

 platforms = platforms.all;

diff --git a/pkgs/darwin/amethyst/bin.nix b/pkgs/darwin/amethyst/default.nix

rename from pkgs/darwin/amethyst/bin.nix

rename to pkgs/darwin/amethyst/default.nix

index 66ccad44369d35e4ce2fd78147801e9a16308d38..470fcf59b122946af02c3bee0afb8ac069464b63 100644

--- a/pkgs/darwin/amethyst/bin.nix

+++ b/pkgs/darwin/amethyst/default.nix

@@ -1,15 +1,15 @@

{ lib, stdenv, fetchfromgh, unzip }:

stdenv.mkDerivation (finalAttrs: {

• pname = "Amethyst-bin";

• version = "0.16.0";

• pname = "Amethyst";

• version = "0.20.0";

src = fetchfromgh {

 owner = "ianyh";

 repo = "Amethyst";

 version = "v${finalAttrs.version}";

 name = "Amethyst.zip";

• hash = "sha256-pghX74T0JsAWkxAaAaQ5NIhYqj89fo0ZqRtxPThJZ/M=";

• hash = "sha256-GYorvoCDLOd/xYStIGkSBqF5QjVR3PHL30b/Hm+CnAk=";

};

sourceRoot = ".";

@@ -26,6 +26,7 @@

meta = with lib; {

 description = "Automatic tiling window manager for macOS à la xmonad";

 homepage = "https://ianyh.com/amethyst/";

• sourceProvenance = with sourceTypes; [ binaryNativeCode ];

 license = licenses.mit;

 maintainers = [ maintainers.sikmir ];

 platforms = [ "x86_64-darwin" ];

diff --git a/pkgs/darwin/cudatext/bin.nix b/pkgs/darwin/cudatext/bin.nix

index 0c6772c11a011c1843858ac5be4b6d9a62383e90..1867053648faf7e3b73de97872ba855851491cfc 100644

--- a/pkgs/darwin/cudatext/bin.nix

+++ b/pkgs/darwin/cudatext/bin.nix

@@ -31,6 +31,7 @@ '';

meta = with lib; {

 inherit (cudatext.meta) description homepage changelog license;

• sourceProvenance = with sourceTypes; [ binaryNativeCode ];

 platforms = [ "aarch64-darwin" "x86_64-darwin" ];

 maintainers = [ maintainers.sikmir ];

 skip.ci = true;

diff --git a/pkgs/darwin/darktable/bin.nix b/pkgs/darwin/darktable/bin.nix

index 27d2b8de4555d8bcac9ce4a2cdd98d3349540b40..dcf42cbb1b2aa9118bc99986f1a6813abfb31098 100644

--- a/pkgs/darwin/darktable/bin.nix

+++ b/pkgs/darwin/darktable/bin.nix

@@ -27,6 +27,7 @@ '';

meta = with lib;

 darktable.meta // {

•  sourceProvenance = with sourceTypes; [ binaryNativeCode ];
  

   maintainers = [ maintainers.sikmir ];

   platforms = [ "x86_64-darwin" ];

   skip.ci = true;

diff --git a/pkgs/darwin/macpass/bin.nix b/pkgs/darwin/macpass/default.nix

rename from pkgs/darwin/macpass/bin.nix

rename to pkgs/darwin/macpass/default.nix

index f64b1045f52f34b45612fd609a668256c5b9fa4f..50be49645abc64b788ad8a2a5786354f6280fe5c 100644

--- a/pkgs/darwin/macpass/bin.nix

+++ b/pkgs/darwin/macpass/default.nix

@@ -1,7 +1,7 @@

{ lib, stdenv, fetchfromgh, unzip }:

stdenv.mkDerivation (finalAttrs: {

• pname = "MacPass-bin";

• pname = "MacPass";

version = "0.8.1";

src = fetchfromgh {

@@ -26,6 +26,7 @@

meta = with lib; {

 description = "A native OS X KeePass client";

 homepage = "https://macpassapp.org/";

• sourceProvenance = with sourceTypes; [ binaryNativeCode ];

 license = licenses.gpl3Plus;

 maintainers = [ maintainers.sikmir ];

 platforms = [ "x86_64-darwin" ];

diff --git a/pkgs/darwin/macsvg/default.nix b/pkgs/darwin/macsvg/default.nix

index 798e292938c15e573b2948fcf648c81a79e4b3b3..1c02d73266343151e0b9875faceae9a370208bd9 100644

--- a/pkgs/darwin/macsvg/default.nix

+++ b/pkgs/darwin/macsvg/default.nix

@@ -1,7 +1,7 @@

{ lib, stdenv, fetchfromgh, unzip, makeWrapper }:

stdenv.mkDerivation (finalAttrs: {

• pname = "macsvg-bin";

• pname = "macsvg";

version = "1.2.0";

src = fetchfromgh {

@@ -27,6 +27,7 @@

meta = with lib; {

 description = "An open-source macOS app for designing HTML5 SVG";

 homepage = "https://macsvg.org/";

• sourceProvenance = with sourceTypes; [ binaryNativeCode ];

 license = licenses.mit;

 maintainers = [ maintainers.sikmir ];

 platforms = [ "aarch64-darwin" "x86_64-darwin" ];

diff --git a/pkgs/darwin/marta/default.nix b/pkgs/darwin/marta/default.nix

index 685c532c79dde407c3a20b2bb46eadb79902342d..a691308f531bc26f88230e03a01c06e358edfd52 100644

--- a/pkgs/darwin/marta/default.nix

+++ b/pkgs/darwin/marta/default.nix

@@ -1,7 +1,7 @@

{ lib, stdenvNoCC, fetchurl, undmg, makeWrapper }:

stdenvNoCC.mkDerivation (finalAttrs: {

• pname = "marta-bin";

• pname = "marta";

version = "0.8.1";

src = fetchurl {

@@ -24,6 +24,7 @@

meta = with lib; {

 description = "File Manager for macOS";

 homepage = "https://marta.sh/";

• sourceProvenance = with sourceTypes; [ binaryNativeCode ];

 license = licenses.free;

 maintainers = [ maintainers.sikmir ];

 platforms = [ "x86_64-darwin" ];

diff --git a/pkgs/darwin/qtcreator/bin.nix b/pkgs/darwin/qtcreator/bin.nix

index 4bacae22cd0b05b47681424801a2d0f20b35edb0..cb41c6d78f5a125790c69fd6720fa806a03220d5 100644

--- a/pkgs/darwin/qtcreator/bin.nix

+++ b/pkgs/darwin/qtcreator/bin.nix

@@ -26,6 +26,7 @@ '';

meta = with lib;

 qtcreator.meta // {

•  sourceProvenance = with sourceTypes; [ binaryNativeCode ];
  

   maintainers = [ maintainers.sikmir ];

   platforms = [ "x86_64-darwin" ];

   skip.ci = true;

diff --git a/pkgs/darwin/qutebrowser/bin.nix b/pkgs/darwin/qutebrowser/bin.nix

index 4c0c9a6b6e33d716552944285dd6289e87d834dd..2d43994de13d43781c78c0c2b7d39cd3eb6905bf 100644

--- a/pkgs/darwin/qutebrowser/bin.nix

+++ b/pkgs/darwin/qutebrowser/bin.nix

@@ -38,6 +38,7 @@ passthru.userscripts = "${finalAttrs.finalPackage}/Applications/qutebrowser.app/Contents/Resources/userscripts";

meta = with lib;

 qutebrowser.meta // {

•  sourceProvenance = with sourceTypes; [ binaryNativeCode ];
  

   maintainers = [ maintainers.sikmir ];

   platforms = [ "x86_64-darwin" ];

   skip.ci = true;

diff --git a/pkgs/darwin/sequel-ace/default.nix b/pkgs/darwin/sequel-ace/default.nix

index 22e4d20e1fa2d68788547c6c8240411a3d17a371..4a2e85198485ee479518c3ccf2b3cd4e0bc54d42 100644

--- a/pkgs/darwin/sequel-ace/default.nix

+++ b/pkgs/darwin/sequel-ace/default.nix

@@ -1,7 +1,7 @@

{ lib, stdenvNoCC, fetchfromgh, unzip }:

stdenvNoCC.mkDerivation (finalAttrs: {

• pname = "sequel-ace-bin";

• pname = "sequel-ace";

version = "4.0.13-20062";

src = fetchfromgh {

@@ -24,6 +24,7 @@

meta = with lib; {

 description = "MySQL/MariaDB database management for macOS";

 homepage = "https://sequel-ace.com/";

• sourceProvenance = with sourceTypes; [ binaryNativeCode ];

 license = licenses.free;

 maintainers = [ maintainers.sikmir ];

 platforms = [ "x86_64-darwin" ];

diff --git a/pkgs/darwin/sloth/default.nix b/pkgs/darwin/sloth/default.nix

index e217cfe0e5daa2bb88d765f0e94c08ac0a5343b9..34d482e2d89e8606ca8d13afc0117c0b8d05e013 100644

--- a/pkgs/darwin/sloth/default.nix

+++ b/pkgs/darwin/sloth/default.nix

@@ -1,7 +1,7 @@

{ lib, stdenvNoCC, fetchfromgh, unzip, makeWrapper }:

stdenvNoCC.mkDerivation (finalAttrs: {

• pname = "sloth-bin";

• pname = "sloth";

version = "3.2";

src = fetchfromgh {

@@ -27,6 +27,7 @@

meta = with lib; {

 description = "Nice GUI for lsof";

 homepage = "https://sveinbjorn.org/sloth";

• sourceProvenance = with sourceTypes; [ binaryNativeCode ];

 license = licenses.bsd3;

 maintainers = [ maintainers.sikmir ];

 platforms = [ "x86_64-darwin" ];

diff --git a/pkgs/default.nix b/pkgs/default.nix

index 1b62c0a31fc753d7db5ce5385bb9ff94ca4640e2..8ae78b0f60da97b8fb8c7a7b9ed1a8f95f69f34a 100644

--- a/pkgs/default.nix

+++ b/pkgs/default.nix

@@ -14,7 +14,7 @@

 goldencheetah-bin = callPackage ./applications/goldencheetah/bin.nix { };

 klogg = libsForQt5.callPackage ./applications/misc/klogg { };

 klogg-bin = callPackage ./applications/misc/klogg/bin.nix { };

• synwrite-bin = callPackage ./applications/synwrite/bin.nix { };

• synwrite = callPackage ./applications/synwrite { };

 ### BUILD SUPPORT

@@ -25,23 +25,23 @@ fetchymaps = callPackage ./build-support/fetchymaps { };

 ### DARWIN

• amethyst-bin = callPackage ./darwin/amethyst/bin.nix { };

• amethyst = callPackage ./darwin/amethyst { };

 cudatext-bin = callPackage ./darwin/cudatext/bin.nix { };

 darktable-bin = callPackage ./darwin/darktable/bin.nix { };

 finch = callPackage ./darwin/finch {

   buildGoModule = pkgs.buildGo120Module;

 };

• macpass-bin = callPackage ./darwin/macpass/bin.nix { };

• macsvg-bin = callPackage ./darwin/macsvg { };

• marta-bin = callPackage ./darwin/marta { };

• macpass = callPackage ./darwin/macpass { };

• macsvg = callPackage ./darwin/macsvg { };

• marta = callPackage ./darwin/marta { };

 pinentry-touchid = callPackage ./darwin/pinentry-touchid {

   inherit (darwin.apple_sdk.frameworks) LocalAuthentication;

 };

 podman-desktop-bin = callPackage ./darwin/podman-desktop/bin.nix { };

 qtcreator-bin = callPackage ./darwin/qtcreator/bin.nix { };

 qutebrowser-bin = callPackage ./darwin/qutebrowser/bin.nix { };

• sequel-ace-bin = callPackage ./darwin/sequel-ace { };

• sloth-bin = callPackage ./darwin/sloth { };

• sequel-ace = callPackage ./darwin/sequel-ace { };

• sloth = callPackage ./darwin/sloth { };

 ### DATA

@@ -218,7 +218,7 @@ mbtiles2osmand = callPackage ./geospatial/mbtiles2osmand { };

 mbutiles = callPackage ./geospatial/mbutiles { };

 mobroute = callPackage ./geospatial/mobroute { };

 morecantile = callPackage ./geospatial/morecantile { };

• orbisgis-bin = callPackage ./geospatial/orbisgis/bin.nix { jre = pkgs.jre8; };

• orbisgis = callPackage ./geospatial/orbisgis { jre = pkgs.jre8; };

 ossim = callPackage ./geospatial/ossim { };

 pmtiles = callPackage ./geospatial/pmtiles { };

 pipfile = callPackage ./geospatial/pipfile { };

@@ -243,7 +243,7 @@ rio-mbtiles = callPackage ./geospatial/rio-mbtiles { };

 rio-mucho = callPackage ./geospatial/rio-mucho { };

 rio-stac = callPackage ./geospatial/rio-stac { };

 rio-tiler = callPackage ./geospatial/rio-tiler { };

• sasplanet-bin = callPackage ./geospatial/sasplanet/bin.nix { };

• sasplanet = callPackage ./geospatial/sasplanet { };

 server-thread = callPackage ./geospatial/server-thread { };

 starlette-cramjam = callPackage ./geospatial/starlette-cramjam { };

 supermercado = callPackage ./geospatial/supermercado { };

@@ -310,7 +310,7 @@ gdcv = callPackage ./linguistics/gdcv { };

 goldendict-bin = callPackage ./linguistics/goldendict/bin.nix { };

 gt-bash-client = callPackage ./linguistics/gt-bash-client { };

 gt4gd = callPackage ./linguistics/gt4gd { };

• i18n-editor-bin = callPackage ./linguistics/i18n-editor { jre = pkgs.jdk11; };

• i18n-editor = callPackage ./linguistics/i18n-editor { jre = pkgs.jdk11; };

 lsdreader = callPackage ./linguistics/lsdreader { };

 mikatools = callPackage ./linguistics/mikatools { };

 odict = callPackage ./linguistics/odict { };

@@ -462,7 +462,7 @@ gcgn-converter = callPackage ./osm/gcgn-converter { };

 imposm = callPackage ./osm/imposm { };

 map-machine = callPackage ./osm/map-machine { };

 map-stylizer = callPackage ./osm/map-stylizer { };

• maperitive-bin = callPackage ./osm/maperitive/bin.nix { };

• maperitive = callPackage ./osm/maperitive { };

 memphis = callPackage ./osm/memphis { };

 osm-3s = callPackage ./osm/osm-3s { };

 osm-area-tools = callPackage ./osm/osm-area-tools { };

diff --git a/pkgs/gemini/gplaces/default.nix b/pkgs/gemini/gplaces/default.nix

index fc8bc705dfa2f9d16dd0f681209089849077bc6e..2ac56bb07dabc2f084d4a56acff558ac0755753e 100644

--- a/pkgs/gemini/gplaces/default.nix

+++ b/pkgs/gemini/gplaces/default.nix

@@ -2,13 +2,13 @@ { lib, stdenv, fetchFromGitHub, pkg-config, curl, openssl, memstreamHook }:

stdenv.mkDerivation (finalAttrs: {

pname = "gplaces";

• version = "0.18.0";

• version = "0.18.1";

src = fetchFromGitHub {

 owner = "dimkr";

 repo = "gplaces";

 rev = "v${finalAttrs.version}";

• hash = "sha256-6b/SqkY/C45NAsHzRyoMv5vSXOTiVisXO2GCIL7reN4=";

• hash = "sha256-d5HGgHknht3wLzY8yQ62odU8oZdBgKgv6I2Z0RU+ouk=";

 fetchSubmodules = true;

};

diff --git a/pkgs/gemini/tootik/default.nix b/pkgs/gemini/tootik/default.nix

index d931e3d0a9b0c5bffbafff973ff329f4fca5235e..05cc3a307c4b6aa84de888328d80893cf59fda38 100644

--- a/pkgs/gemini/tootik/default.nix

+++ b/pkgs/gemini/tootik/default.nix

@@ -2,22 +2,24 @@ { lib, buildGoModule, fetchFromGitHub, openssl }:

buildGoModule rec {

pname = "tootik";

• version = "0.5.11";

• version = "0.6.0";

src = fetchFromGitHub {

 owner = "dimkr";

 repo = "tootik";

 rev = version;

• hash = "sha256-PmBj48JoCTv1S9QjdJK34m/WBPLyXc8ewjMFEfdigAQ=";

• hash = "sha256-3QqZXy3Mv7IR/+4DZm6+1riW2NRq3mPs1ViD+7WwjtM=";

};

• vendorHash = "sha256-uxY+mdUm67a7dEBezs6VWcsb+RUs1zsoFeU9DXek+Lg=";

• vendorHash = "sha256-2ZJ1WRrnt4aW3SC+cGgcavQqyOdgMNOLr3/f2lPeQYg=";

nativeBuildInputs = [ openssl ];

preBuild = ''

 go generate ./migrations

'';

• tags = [ "fts5" ];

meta = with lib; {

 description = "A federated nanoblogging service with a Gemini frontend";

diff --git a/pkgs/geospatial/orbisgis/bin.nix b/pkgs/geospatial/orbisgis/default.nix

rename from pkgs/geospatial/orbisgis/bin.nix

rename to pkgs/geospatial/orbisgis/default.nix

index 96aa8c83a540081fa00f854518a73f616273ab3f..0fe5ba93e9754a2b6c0a82f5c077d672831e5d8c 100644

--- a/pkgs/geospatial/orbisgis/bin.nix

+++ b/pkgs/geospatial/orbisgis/default.nix

@@ -1,7 +1,7 @@

{ lib, stdenv, fetchfromgh, unzip, rsync, makeWrapper, jre }:

stdenv.mkDerivation (finalAttrs: {

• pname = "orbisgis-bin";

• pname = "orbisgis";

version = "5.1.0";

src = fetchfromgh {

diff --git a/pkgs/geospatial/sasplanet/bin.nix b/pkgs/geospatial/sasplanet/default.nix

rename from pkgs/geospatial/sasplanet/bin.nix

rename to pkgs/geospatial/sasplanet/default.nix

index 922098f8ab2a63adf500340086197e5033e48d35..2b1d925651c42298803169c3e0ca33c1a62bb2f0 100644

--- a/pkgs/geospatial/sasplanet/bin.nix

+++ b/pkgs/geospatial/sasplanet/default.nix

@@ -22,7 +22,7 @@ name = "Extremum.zip";

};

in

stdenv.mkDerivation (finalAttrs: {

• pname = "sasplanet-bin";

• pname = "sasplanet";

version = "230909";

src = fetchurl {

@@ -54,6 +54,7 @@ meta = with lib; {

 description = "SAS.Planet is a program designed for viewing and downloading high-resolution satellite imagery and conventional maps";

 homepage = "http://www.sasgis.org/sasplaneta/";

 changelog = "http://www.sasgis.org/mantis/changelog_page.php";

• sourceProvenance = with sourceTypes; [ binaryNativeCode ];

 license = licenses.gpl3Plus;

 maintainers = [ maintainers.sikmir ];

 platforms = platforms.all;

diff --git a/pkgs/linguistics/goldendict/bin.nix b/pkgs/linguistics/goldendict/bin.nix

index 517ae1fc0be367437493a4ab3f5cf508216062f0..b3d35a0f4ded464af4660527881f47fa2108602e 100644

--- a/pkgs/linguistics/goldendict/bin.nix

+++ b/pkgs/linguistics/goldendict/bin.nix

@@ -22,6 +22,7 @@

meta = with lib; {

 description = "A feature-rich dictionary lookup program";

 homepage = "http://goldendict.org/";

• sourceProvenance = with sourceTypes; [ binaryNativeCode ];

 license = licenses.gpl3Plus;

 maintainers = [ maintainers.sikmir ];

 platforms = [ "x86_64-darwin" ];

diff --git a/pkgs/linguistics/i18n-editor/default.nix b/pkgs/linguistics/i18n-editor/default.nix

index 8642578e80e42042376c99b5a5b0fef20398b570..4fa51e321375dde60aa70a2aa4ef096a8b393235 100644

--- a/pkgs/linguistics/i18n-editor/default.nix

+++ b/pkgs/linguistics/i18n-editor/default.nix

@@ -1,7 +1,7 @@

{ lib, stdenv, fetchfromgh, unzip, jre, makeWrapper }:

stdenv.mkDerivation (finalAttrs: {

• pname = "i18n-editor-bin";

• pname = "i18n-editor";

version = "2.0.0-beta.1";

src = fetchfromgh {

diff --git a/pkgs/misc/serial-studio/bin.nix b/pkgs/misc/serial-studio/bin.nix

index 671ce48c813a259e41d7e60c44086f8a63499af4..698e024b1639205e81afc7cf8f92b243d78134d6 100644

--- a/pkgs/misc/serial-studio/bin.nix

+++ b/pkgs/misc/serial-studio/bin.nix

@@ -27,6 +27,7 @@

meta = with lib; {

 description = "Multi-purpose serial data visualization & processing program";

 homepage = "https://serial-studio.github.io/";

• sourceProvenance = with sourceTypes; [ binaryNativeCode ];

 license = licenses.mit;

 maintainers = [ maintainers.sikmir ];

 platforms = [ "aarch64-darwin" "x86_64-darwin" ];

diff --git a/pkgs/mqtt/influxdb-cxx/default.nix b/pkgs/mqtt/influxdb-cxx/default.nix

index 6cc98c0388093bc0eca1271b958a4ab7b6b98993..5cb2230d96afd30b009ea4fe4ad53122edfa90a8 100644

--- a/pkgs/mqtt/influxdb-cxx/default.nix

+++ b/pkgs/mqtt/influxdb-cxx/default.nix

@@ -1,26 +1,34 @@

-{ lib, stdenv, fetchFromGitHub, cmake, libcpr, boost, catch2, trompeloeil }:

+{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, boost, catch2_3, libcpr, trompeloeil }:

stdenv.mkDerivation (finalAttrs: {

pname = "influxdb-cxx";

• version = "0.7.0";

• version = "0.7.2";

src = fetchFromGitHub {

 owner = "offa";

 repo = "influxdb-cxx";

 rev = "v${finalAttrs.version}";

• hash = "sha256-ALv6RnWcvonNfoFJfbjVyUdPZ3FWBavGXhvppr5UdWM=";

• hash = "sha256-DFslPrbgqS3JGx62oWlsC+AN5J2CsFjGcDaDRCadw7E=";

};

• patches = [

• Fix unclosed test case tag

• (fetchpatch {

•  url = "https://github.com/offa/influxdb-cxx/commit/b31f94982fd1d50e89ce04f66c694bec108bf470.patch";
  

•  hash = "sha256-oSdpNlWV744VpzfiWzp0ziNKaReLTlyfJ+SF2qyH+TU=";
  

• })

• ];

nativeBuildInputs = [ cmake ];

• buildInputs = [ libcpr boost ]

• ++ lib.optionals finalAttrs.doCheck [ catch2 trompeloeil ];

• buildInputs = [ boost libcpr ]

• ++ lib.optionals finalAttrs.doCheck [ catch2_3 trompeloeil ];

cmakeFlags = [

 (lib.cmakeBool "INFLUXCXX_TESTING" finalAttrs.doCheck)

];

• doCheck = false;

• doCheck = true;

meta = with lib; {

 description = "InfluxDB C++ client library";

diff --git a/pkgs/mqtt/ioxy/default.nix b/pkgs/mqtt/ioxy/default.nix

index 7415fc4b4dd1252c366ec63d1cdad60404b31ac2..082f9cf70c227935ff70e34bf0a5443eaa46673b 100644

--- a/pkgs/mqtt/ioxy/default.nix

+++ b/pkgs/mqtt/ioxy/default.nix

@@ -2,13 +2,13 @@ { stdenv, lib, fetchFromGitHub, buildGoModule }:

buildGoModule rec {

pname = "ioxy";

• version = "2022-11-25";

• version = "2023-08-20";

src = fetchFromGitHub {

 owner = "NVISOsecurity";

 repo = "IOXY";

• rev = "023e9e64cc3e9fe6a330c640fc56f7abb985c64e";

• hash = "sha256-bhJgWnscT+qEVZHXQb9l72pm0q4NTBFnWmTqnhA6PSM=";

• rev = "6f1d0ffc02cde306caa837713f9a9f81352f13cf";

• hash = "sha256-j3qKlR0dwu0ZHc38JMGUjwVpN2s16ZIiRU8W+lI/X0s=";

};

sourceRoot = "${src.name}/ioxy";

diff --git a/pkgs/osm/maperitive/bin.nix b/pkgs/osm/maperitive/default.nix

rename from pkgs/osm/maperitive/bin.nix

rename to pkgs/osm/maperitive/default.nix

index 87e57d706132a1fd98eadacac0e0a14593d593f9..ef5ff55ebaa5217baed44c3ab5f317003547794d 100644

--- a/pkgs/osm/maperitive/bin.nix

+++ b/pkgs/osm/maperitive/default.nix

@@ -1,7 +1,7 @@

{ lib, stdenv, fetchurl, unzip, mono, gtk2, makeWrapper }:

stdenv.mkDerivation (finalAttrs: {

• pname = "maperitive-bin";

• pname = "maperitive";

version = "2.4.3";

src = fetchurl {

@@ -25,6 +25,7 @@ meta = with lib; {

 description = "Desktop application for drawing maps based on OpenStreetMap and GPS data";

 homepage = "http://maperitive.net/";

 changelog = "http://maperitive.net/updates.xml";

• sourceProvenance = with sourceTypes; [ binaryNativeCode ];

 license = licenses.free;

 maintainers = [ maintainers.sikmir ];

 platforms = platforms.linux;