commit c69636513b490156298d8053eee38d3ad1cd9d09
parent 10765be0ca76b5c99c7eaa97864e68b0d78f2407
Author: Nikolay Korotkiy <sikmir@disroot.org>
Date: Sun, 28 Jan 2024 15:46:33 +0400
Up
Diffstat:
20 files changed, 165 insertions(+), 217 deletions(-)
diff --git a/flake.nix b/flake.nix
@@ -12,7 +12,7 @@
} // flake-utils.lib.eachDefaultSystem (system:
let
config = {
- permittedInsecurePackages = [ "openssl-1.1.1w" "qtwebkit-5.212.0-alpha4" ];
+ permittedInsecurePackages = [ "openssl-1.1.1w" "python-2.7.18.7" "qtwebkit-5.212.0-alpha4" ];
};
pkgs = import nixpkgs {
inherit system config;
diff --git a/pkgs/data/maps/freizeitkarte-osm/default.nix b/pkgs/data/maps/freizeitkarte-osm/default.nix
@@ -1,12 +1,12 @@
{ lib, fetchurl, unzip, country ? "FIN", lang ? "en" }:
let
pname = "freizeitkarte-osm";
- version = "2020-09-09";
+ version = "2023-12-09";
in
fetchurl {
name = "${pname}-${version}";
url = "http://download.freizeitkarte-osm.de/garmin/latest/${country}_${lang}_gmapsupp.img.zip";
- hash = "sha256-PKcO9m163R8a+rgFS2guh62iX2xHjyfL5uNODbURTCE=";
+ hash = "sha256-/+8F/3hYurS3GGM6teU8WlfU7IVsV8mUM2PlESWStpE=";
downloadToTemp = true;
recursiveHash = true;
preferLocalBuild = true;
diff --git a/pkgs/data/maps/maptourist/default.nix b/pkgs/data/maps/maptourist/default.nix
@@ -2,11 +2,11 @@
stdenvNoCC.mkDerivation rec {
pname = "maptourist";
- version = "2023-12-14";
+ version = "2024-01-26";
src = fetchurl {
url = "https://maptourist.org/osm-garmin/archive/OSM-MapTourist-Russia-gmapsupp-RU_${version}.zip";
- hash = "sha256-UCGatAtcqujwh9E8wumiP+73M2BGJdBO5KjFDIwlbyY=";
+ hash = "sha256-2NWJwXIaCYgKjdMzpB5DGCAeWoyWMqKtjRR+C/P1ZLA=";
};
sourceRoot = ".";
diff --git a/pkgs/data/maps/mtk-suomi/default.nix b/pkgs/data/maps/mtk-suomi/default.nix
@@ -2,11 +2,11 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "mtk-suomi";
- version = "2023-08-25";
+ version = "2024-01-23";
src = fetchurl {
url = "https://kartat-dl.hylly.org/${finalAttrs.version}/mtk_suomi.img";
- hash = "sha256-lyVYaef7W/qPvoay53m0B4UaP6oqUrS0U/DzfJrQ0jo=";
+ hash = "sha256-DDAJwJdcluqzo6U/zzkUZ1aq6QSDspnLpNzLsgejcz0=";
};
preferLocalBuild = true;
diff --git a/pkgs/data/maps/opentopomap/default.nix b/pkgs/data/maps/opentopomap/default.nix
@@ -1,12 +1,12 @@
{ lib, stdenv, fetchFromGitHub, fetchurl, unzip, mkgmap, mkgmap-splitter, osm-extracts }:
let
bounds = fetchurl {
- url = "https://www.thkukuk.de/osm/data/bounds-20231020.zip";
- hash = "sha256-fQyaYnmP5Qu1iV4R65LMfk8QlTQkKOoIOzxhPWAMD44=";
+ url = "https://www.thkukuk.de/osm/data/bounds-20240126.zip";
+ hash = "sha256-N3QHgWKmbTu6yz9ojKlfwZm46UGeTmtkI2yuB6C7n80=";
};
sea = fetchurl {
- url = "https://osm.thkukuk.de/osm/data/sea-20231021001503.zip";
- hash = "sha256-3xVcwNbA5bxNM82cLz48UhlcgFE7V2LC/VB0dFAvfu0=";
+ url = "https://www.thkukuk.de/osm/data/sea-20240126001517.zip";
+ hash = "sha256-YGtlp3K03PDFi3dfWG9bnv3qEWQOmx96eOFm1FU4AJw=";
};
in
stdenv.mkDerivation (finalAttrs: {
diff --git a/pkgs/default.nix b/pkgs/default.nix
@@ -285,7 +285,7 @@ lib.makeScope newScope (
gpxlib = callPackage ./gpx/gpxlib { };
gpxtools = callPackage ./gpx/gpxtools { };
gpxtrackposter = callPackage ./gpx/gpxtrackposter { };
- routeconverter = callPackage ./gpx/routeconverter { jre = pkgs.jdk11; };
+ routeconverter = callPackage ./gpx/routeconverter { };
trackanimation = callPackage ./gpx/trackanimation { };
### IMAGES
diff --git a/pkgs/development/python-modules/pytest-shell-utilities/default.nix b/pkgs/development/python-modules/pytest-shell-utilities/default.nix
@@ -17,7 +17,7 @@ python3Packages.buildPythonPackage rec {
nativeBuildInputs = with python3Packages; [ setuptools-scm setuptools-declarative-requirements ];
- propagatedBuildInputs = with python3Packages; [ psutil pytest-skip-markers pytest-subtests ];
+ propagatedBuildInputs = with python3Packages; [ psutil pytest-skip-markers pytest-subtests pytest-helpers-namespace ];
nativeCheckInputs = with python3Packages; [ pytestCheckHook ];
diff --git a/pkgs/development/python-modules/pytest-skip-markers/default.nix b/pkgs/development/python-modules/pytest-skip-markers/default.nix
@@ -2,7 +2,7 @@
python3Packages.buildPythonPackage rec {
pname = "pytest-skip-markers";
- version = "1.5.0";
+ version = "1.5.1";
pyproject = true;
disabled = python3Packages.pythonOlder "3.7";
@@ -10,14 +10,14 @@ python3Packages.buildPythonPackage rec {
owner = "saltstack";
repo = "pytest-skip-markers";
rev = version;
- hash = "sha256-P9O1kD7fnZmtdzQObHlHzrBmBFwq/RPzRFhvGScxFNE=";
+ hash = "sha256-jrNPF68sKpEmwU12ZbKK/24DqA1RrjIXYPyoKE/3FLM=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;
nativeBuildInputs = with python3Packages; [ setuptools-scm setuptools-declarative-requirements ];
- propagatedBuildInputs = with python3Packages; [ distro ];
+ propagatedBuildInputs = with python3Packages; [ attrs distro pytest ];
doCheck = false;
diff --git a/pkgs/gpx/routeconverter/default.nix b/pkgs/gpx/routeconverter/default.nix
@@ -2,16 +2,16 @@
stdenv.mkDerivation (finalAttrs: {
pname = "routeconverter";
- version = "2.33";
+ version = "3.0";
srcs = [
(fetchurl {
url = "https://static.routeconverter.com/download/previous-releases/${finalAttrs.version}/RouteConverterLinuxOpenSource.jar";
- hash = "sha256-GDvrn5YfLej+v5vJ9bRP2M4g6bESpl43rFsR39mRpRI=";
+ hash = "sha256-j8mzGa4s/oCurnwkeH3a/HiOsIaH7H5fWKcwucJxUB8=";
})
(fetchurl {
url = "https://static.routeconverter.com/download/previous-releases/${finalAttrs.version}/RouteConverterCmdLine.jar";
- hash = "sha256-pTA8/1zDwYMB02tkKGDTiTdyhVJwIl3sTkdiUAEwWZs=";
+ hash = "sha256-Dceii5IwFpwIuwoTA4VXogLLETkDgyyrtO7bM5YxiVA=";
})
];
diff --git a/pkgs/misc/docx2csv/default.nix b/pkgs/misc/docx2csv/default.nix
@@ -2,21 +2,27 @@
python3Packages.buildPythonApplication rec {
pname = "docx2csv";
- version = "2020-05-06";
+ version = "2023-10-11";
src = fetchFromGitHub {
owner = "ivbeg";
repo = "docx2csv";
- rev = "e397b6bd17c73d76b21404ce3422496b8da262db";
- hash = "sha256-7l8gWzwhIScWixzm+mRLntfilEgG7cZOvFhhiRhPEFg=";
+ rev = "f0c0231876e2ab1210865ded80e4d6105816b0a3";
+ hash = "sha256-A7Y1zgM+9xIDXsAQN2tGGoWbe8u/kvGch6sBNKz0Nw4=";
};
- propagatedBuildInputs = with python3Packages; [ click openpyxl python-docx xlwt ];
+ propagatedBuildInputs = with python3Packages; [
+ click
+ openpyxl
+ python-docx
+ xlwt
+ ];
meta = with lib; {
description = "Extracts tables from .docx files and saves them as .csv or .xls files";
inherit (src.meta) homepage;
license = licenses.bsd3;
maintainers = [ maintainers.sikmir ];
+ broken = true; # python-docx
};
}
diff --git a/pkgs/misc/graphene/default.nix b/pkgs/misc/graphene/default.nix
@@ -12,13 +12,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "graphene";
- version = "2.12";
+ version = "2.13";
src = fetchFromGitHub {
owner = "slazav";
repo = "graphene";
rev = finalAttrs.version;
- hash = "sha256-sWwPucJ59wTIweVsJpjHZ19zvRoc3pRP7j6GVQ2UCuU=";
+ hash = "sha256-N7Pdf/8+Yi+OBRvJMkz2EyRQOsnBYs5BQeO20JP8tWA=";
fetchSubmodules = true;
};
diff --git a/pkgs/misc/libmdbx/default.nix b/pkgs/misc/libmdbx/default.nix
@@ -2,22 +2,25 @@
stdenv.mkDerivation rec {
pname = "libmdbx";
- version = "0.12.3";
+ version = "0.12.9";
src = fetchurl {
- url = "https://libmdbx.dqdkfa.ru/release/libmdbx-amalgamated-0.12.3.tar.xz";
- hash = "sha256-YwH5Hh+4IbmUJ46g+SDsx+PSuBadg93+ytfxQTVnZZ0=";
+ url = "https://libmdbx.dqdkfa.ru/release/libmdbx-amalgamated-${version}.tar.xz";
+ hash = "sha256-bMxSd7+xPOdE+20hKN4LEcj1jIHB/gYXnOqsXCgSWm4=";
};
sourceRoot = ".";
nativeBuildInputs = [ cmake ];
+ cmakeFlags = [ "-DMDBX_BUILD_TIMESTAMP=unknown" ];
+
meta = with lib; {
description = "Extremely fast, compact, powerful, embedded, transactional key-value database";
homepage = "https://libmdbx.dqdkfa.ru/";
license = licenses.free; # OpenLDAP Public License
maintainers = [ maintainers.sikmir ];
platforms = platforms.unix;
+ broken = stdenv.isDarwin;
};
}
diff --git a/pkgs/misc/plotjuggler/default.nix b/pkgs/misc/plotjuggler/default.nix
@@ -16,13 +16,13 @@
stdenv.mkDerivation rec {
pname = "plotjuggler";
- version = "3.7.1";
+ version = "3.8.8";
src = fetchFromGitHub {
owner = "facontidavide";
repo = "PlotJuggler";
rev = version;
- hash = "sha256-3OLJV6MhnbldZRLmgvJl9nGBzdZx2yHlvvROG/hOcB0=";
+ hash = "sha256-xJ3MEDXZ+nRHNFEuXXeFb6Ed7fKTXtHZg1rH2tEgviQ=";
};
postPatch = ''
@@ -44,5 +44,6 @@ stdenv.mkDerivation rec {
license = licenses.mpl20;
maintainers = [ maintainers.sikmir ];
platforms = platforms.unix;
+ broken = stdenv.isDarwin; # _AbslInternalSpinLockWake_lts_20230125 not found
};
}
diff --git a/pkgs/misc/pvs-studio/default.nix b/pkgs/misc/pvs-studio/default.nix
@@ -10,13 +10,13 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "pvs-studio";
- version = "7.27.75620.346";
+ version = "7.28.78353.377";
src = fetchurl {
url = "https://cdn.pvs-studio.com/pvs-studio-${finalAttrs.version}-${suffix}.tgz";
hash = {
- x86_64-linux = "sha256-Jno4bnrgV4VS86sd2LcPJtGn7qo80mCA1htpiuFf/eQ=";
- x86_64-darwin = "sha256-T8i+slwpOOPKCLlZ0inz3WSAQNytZrysBGv5FA0IkqE=";
+ x86_64-linux = "sha256-XZFehz46Fkka5J2tYE66yxZhUzDYSwYhT6M9QnumFac=";
+ x86_64-darwin = "sha256-S8Tb5g+Dod9OAsL1+sv2CNt1a+aF6WfCUV4YeOIYp1k=";
}.${system} or throwSystem;
};
diff --git a/pkgs/misc/turbo/default.nix b/pkgs/misc/turbo/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "turbo";
- version = "2023-06-22";
+ version = "2024-01-24";
src = fetchFromGitHub {
owner = "magiblot";
repo = "turbo";
- rev = "45a02f7de283b404e3be40712adf0f125bda4641";
- hash = "sha256-hN8l536zPCvnBBlVFZGbdjIHQ0Lq3p6m5peXPdNEM6Q=";
+ rev = "f71a08e0adbfe7da38a93c4c02a5ae4dde60797f";
+ hash = "sha256-WgovWo3BuRjgb7jO+AcwAWrbB2z4SGeWBVGh5yNTIFE=";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/misc/tvision/default.nix b/pkgs/misc/tvision/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "tvision";
- version = "2023-06-22";
+ version = "2024-01-24";
src = fetchFromGitHub {
owner = "magiblot";
repo = "tvision";
- rev = "92177cb365b523b0bc3e17d865292045ed7e0073";
- hash = "sha256-6Itw1Uy9AXY5Zi+eBSMBtqft7xF+rYApLdH6dgSfepE=";
+ rev = "0917f04206fcfa1973dc49547af74e7399241899";
+ hash = "sha256-BWDMpHR7/ViKZtyZwLJEfgpHIUjkRfc/DRWiQTeo9ME=";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/misc/wik/default.nix b/pkgs/misc/wik/default.nix
@@ -2,14 +2,14 @@
python3Packages.buildPythonApplication rec {
pname = "wik";
- version = "2023-03-12";
+ version = "1.4.0";
pyproject = true;
src = fetchFromGitHub {
owner = "yashsinghcodes";
repo = "wik";
- rev = "7dd7b9ebd4070e4b3a1475948dac67b8288ce17a";
- hash = "sha256-aJnBY33JB4xsH8AIcQGVli8OuIqbTulB26t7uj2GzVk=";
+ rev = "37207e7cf2955c494a55701cb81d388cc349b6ea";
+ hash = "sha256-oSHL3jYFuvJY1W7N9/CvFClFakz9f35RHg77AbMRfsI=";
};
nativeBuildInputs = with python3Packages; [ flit ];
diff --git a/pkgs/misc/xtr/cargo-lock.patch b/pkgs/misc/xtr/cargo-lock.patch
@@ -1,18 +1,18 @@
diff --git c/Cargo.lock i/Cargo.lock
new file mode 100644
-index 0000000..d6f889f
+index 0000000..4e61317
--- /dev/null
+++ i/Cargo.lock
-@@ -0,0 +1,706 @@
+@@ -0,0 +1,642 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 3
+
+[[package]]
+name = "aho-corasick"
-+version = "1.0.2"
++version = "1.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41"
++checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0"
+dependencies = [
+ "memchr",
+]
@@ -34,48 +34,47 @@ index 0000000..d6f889f
+
+[[package]]
+name = "anstream"
-+version = "0.3.2"
++version = "0.6.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163"
++checksum = "6e2e1ebcb11de5c03c67de28a7df593d32191b44939c482e97702baaaa6ab6a5"
+dependencies = [
+ "anstyle",
+ "anstyle-parse",
+ "anstyle-query",
+ "anstyle-wincon",
+ "colorchoice",
-+ "is-terminal",
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle"
-+version = "1.0.0"
++version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "41ed9a86bf92ae6580e0a31281f65a1b1d867c0cc68d5346e2ae128dddfa6a7d"
++checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87"
+
+[[package]]
+name = "anstyle-parse"
-+version = "0.2.0"
++version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "e765fd216e48e067936442276d1d57399e37bce53c264d6fefbe298080cb57ee"
++checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c"
+dependencies = [
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle-query"
-+version = "1.0.0"
++version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b"
++checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648"
+dependencies = [
+ "windows-sys",
+]
+
+[[package]]
+name = "anstyle-wincon"
-+version = "1.0.1"
++version = "3.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188"
++checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7"
+dependencies = [
+ "anstyle",
+ "windows-sys",
@@ -83,9 +82,9 @@ index 0000000..d6f889f
+
+[[package]]
+name = "anyhow"
-+version = "1.0.71"
++version = "1.0.79"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8"
++checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca"
+
+[[package]]
+name = "autocfg"
@@ -94,12 +93,6 @@ index 0000000..d6f889f
+checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+
+[[package]]
-+name = "bitflags"
-+version = "1.3.2"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
-+
-+[[package]]
+name = "block"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -107,21 +100,24 @@ index 0000000..d6f889f
+
+[[package]]
+name = "bumpalo"
-+version = "3.13.0"
++version = "3.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1"
++checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec"
+
+[[package]]
+name = "byteorder"
-+version = "1.4.3"
++version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
++checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
+
+[[package]]
+name = "cc"
-+version = "1.0.79"
++version = "1.0.83"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f"
++checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0"
++dependencies = [
++ "libc",
++]
+
+[[package]]
+name = "cfg-if"
@@ -131,44 +127,42 @@ index 0000000..d6f889f
+
+[[package]]
+name = "chrono"
-+version = "0.4.26"
++version = "0.4.33"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5"
++checksum = "9f13690e35a5e4ace198e7beea2895d29f3a9cc55015fcebe6336bd2010af9eb"
+dependencies = [
+ "android-tzdata",
+ "iana-time-zone",
+ "num-traits",
-+ "winapi",
++ "windows-targets",
+]
+
+[[package]]
+name = "clap"
-+version = "4.3.3"
++version = "4.4.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "ca8f255e4b8027970e78db75e78831229c9815fdbfa67eb1a1b777a62e24b4a0"
++checksum = "1e578d6ec4194633722ccf9544794b71b1385c3c027efe0c55db226fc880865c"
+dependencies = [
+ "clap_builder",
+]
+
+[[package]]
+name = "clap_builder"
-+version = "4.3.3"
++version = "4.4.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "acd4f3c17c83b0ba34ffbc4f8bbd74f079413f747f84a6f89292f138057e36ab"
++checksum = "4df4df40ec50c46000231c914968278b1eb05098cf8f1b3a518a95030e71d1c7"
+dependencies = [
+ "anstream",
+ "anstyle",
-+ "bitflags",
+ "clap_lex",
-+ "once_cell",
+ "strsim",
+]
+
+[[package]]
+name = "clap_lex"
-+version = "0.5.0"
++version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b"
++checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1"
+
+[[package]]
+name = "colorchoice"
@@ -178,9 +172,9 @@ index 0000000..d6f889f
+
+[[package]]
+name = "core-foundation-sys"
-+version = "0.8.4"
++version = "0.8.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa"
++checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f"
+
+[[package]]
+name = "encoding"
@@ -247,27 +241,6 @@ index 0000000..d6f889f
+checksum = "a246d82be1c9d791c5dfde9a2bd045fc3cbba3fa2b11ad558f27d01712f00569"
+
+[[package]]
-+name = "errno"
-+version = "0.3.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a"
-+dependencies = [
-+ "errno-dragonfly",
-+ "libc",
-+ "windows-sys",
-+]
-+
-+[[package]]
-+name = "errno-dragonfly"
-+version = "0.1.2"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf"
-+dependencies = [
-+ "cc",
-+ "libc",
-+]
-+
-+[[package]]
+name = "gettext"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -298,23 +271,17 @@ index 0000000..d6f889f
+]
+
+[[package]]
-+name = "hermit-abi"
-+version = "0.3.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286"
-+
-+[[package]]
+name = "iana-time-zone"
-+version = "0.1.57"
++version = "0.1.59"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613"
++checksum = "b6a67363e2aa4443928ce15e57ebae94fd8949958fd1223c4cfc0cd473ad7539"
+dependencies = [
+ "android_system_properties",
+ "core-foundation-sys",
+ "iana-time-zone-haiku",
+ "js-sys",
+ "wasm-bindgen",
-+ "windows",
++ "windows-core",
+]
+
+[[package]]
@@ -327,33 +294,10 @@ index 0000000..d6f889f
+]
+
+[[package]]
-+name = "io-lifetimes"
-+version = "1.0.11"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2"
-+dependencies = [
-+ "hermit-abi",
-+ "libc",
-+ "windows-sys",
-+]
-+
-+[[package]]
-+name = "is-terminal"
-+version = "0.4.7"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f"
-+dependencies = [
-+ "hermit-abi",
-+ "io-lifetimes",
-+ "rustix",
-+ "windows-sys",
-+]
-+
-+[[package]]
+name = "js-sys"
-+version = "0.3.63"
++version = "0.3.67"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "2f37a4a5928311ac501dee68b3c7613a1037d0edb30c8e5427bd832d55d1b790"
++checksum = "9a1d36f1235bc969acba30b7f5990b864423a6068a10f7c90ae8f0112e3a59d1"
+dependencies = [
+ "wasm-bindgen",
+]
@@ -366,15 +310,9 @@ index 0000000..d6f889f
+
+[[package]]
+name = "libc"
-+version = "0.2.146"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "f92be4933c13fd498862a9e02a3055f8a8d9c039ce33db97306fd5a6caa7f29b"
-+
-+[[package]]
-+name = "linux-raw-sys"
-+version = "0.3.8"
++version = "0.2.152"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519"
++checksum = "13e3bf6590cbc649f4d1a3eefc9d5d6eb746f5200ffb04e5e142700b8faa56e7"
+
+[[package]]
+name = "locale_config"
@@ -391,9 +329,9 @@ index 0000000..d6f889f
+
+[[package]]
+name = "log"
-+version = "0.4.19"
++version = "0.4.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4"
++checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
+
+[[package]]
+name = "malloc_buf"
@@ -406,15 +344,15 @@ index 0000000..d6f889f
+
+[[package]]
+name = "memchr"
-+version = "2.5.0"
++version = "2.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
++checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149"
+
+[[package]]
+name = "num-traits"
-+version = "0.2.15"
++version = "0.2.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd"
++checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
+dependencies = [
+ "autocfg",
+]
@@ -450,58 +388,56 @@ index 0000000..d6f889f
+
+[[package]]
+name = "once_cell"
-+version = "1.18.0"
++version = "1.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
++checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+
+[[package]]
+name = "proc-macro2"
-+version = "1.0.60"
++version = "1.0.78"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "dec2b086b7a862cf4de201096214fa870344cf922b2b30c167badb3af3195406"
++checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "quote"
-+version = "1.0.28"
++version = "1.0.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488"
++checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "regex"
-+version = "1.8.4"
++version = "1.10.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "d0ab3ca65655bb1e41f2a8c8cd662eb4fb035e67c3f78da1d61dffe89d07300f"
++checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15"
+dependencies = [
+ "aho-corasick",
+ "memchr",
++ "regex-automata",
+ "regex-syntax",
+]
+
+[[package]]
-+name = "regex-syntax"
-+version = "0.7.2"
++name = "regex-automata"
++version = "0.4.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78"
++checksum = "5bb987efffd3c6d0d8f5f89510bb458559eab11e4f869acb20bf845e016259cd"
++dependencies = [
++ "aho-corasick",
++ "memchr",
++ "regex-syntax",
++]
+
+[[package]]
-+name = "rustix"
-+version = "0.37.20"
++name = "regex-syntax"
++version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "b96e891d04aa506a6d1f318d2771bcb1c7dfda84e126660ace067c9b474bb2c0"
-+dependencies = [
-+ "bitflags",
-+ "errno",
-+ "io-lifetimes",
-+ "libc",
-+ "linux-raw-sys",
-+ "windows-sys",
-+]
++checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"
+
+[[package]]
+name = "strsim"
@@ -511,9 +447,9 @@ index 0000000..d6f889f
+
+[[package]]
+name = "syn"
-+version = "2.0.18"
++version = "2.0.48"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "32d41677bcbe24c20c52e7c70b0d8db04134c5d1066bf98662e2871ad200ea3e"
++checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
+dependencies = [
+ "proc-macro2",
+ "quote",
@@ -522,9 +458,9 @@ index 0000000..d6f889f
+
+[[package]]
+name = "temp-dir"
-+version = "0.1.11"
++version = "0.1.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "af547b166dd1ea4b472165569fc456cfb6818116f854690b0ff205e636523dab"
++checksum = "dd16aa9ffe15fe021c6ee3766772132c6e98dfa395a167e16864f61a9cfb71d6"
+
+[[package]]
+name = "tr"
@@ -537,9 +473,9 @@ index 0000000..d6f889f
+
+[[package]]
+name = "unicode-ident"
-+version = "1.0.9"
++version = "1.0.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "b15811caf2415fb889178633e7724bad2509101cde276048e013b9def5e51fa0"
++checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+
+[[package]]
+name = "utf8parse"
@@ -549,9 +485,9 @@ index 0000000..d6f889f
+
+[[package]]
+name = "wasm-bindgen"
-+version = "0.2.86"
++version = "0.2.90"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "5bba0e8cb82ba49ff4e229459ff22a191bbe9a1cb3a341610c9c33efc27ddf73"
++checksum = "b1223296a201415c7fad14792dbefaace9bd52b62d33453ade1c5b5f07555406"
+dependencies = [
+ "cfg-if",
+ "wasm-bindgen-macro",
@@ -559,9 +495,9 @@ index 0000000..d6f889f
+
+[[package]]
+name = "wasm-bindgen-backend"
-+version = "0.2.86"
++version = "0.2.90"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "19b04bc93f9d6bdee709f6bd2118f57dd6679cf1176a1af464fca3ab0d66d8fb"
++checksum = "fcdc935b63408d58a32f8cc9738a0bffd8f05cc7c002086c6ef20b7312ad9dcd"
+dependencies = [
+ "bumpalo",
+ "log",
@@ -574,9 +510,9 @@ index 0000000..d6f889f
+
+[[package]]
+name = "wasm-bindgen-macro"
-+version = "0.2.86"
++version = "0.2.90"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "14d6b024f1a526bb0234f52840389927257beb670610081360e5a03c5df9c258"
++checksum = "3e4c238561b2d428924c49815533a8b9121c664599558a5d9ec51f8a1740a999"
+dependencies = [
+ "quote",
+ "wasm-bindgen-macro-support",
@@ -584,9 +520,9 @@ index 0000000..d6f889f
+
+[[package]]
+name = "wasm-bindgen-macro-support"
-+version = "0.2.86"
++version = "0.2.90"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "e128beba882dd1eb6200e1dc92ae6c5dbaa4311aa7bb211ca035779e5efc39f8"
++checksum = "bae1abb6806dc1ad9e560ed242107c0f6c84335f1749dd4e8ddb012ebd5e25a7"
+dependencies = [
+ "proc-macro2",
+ "quote",
@@ -597,9 +533,9 @@ index 0000000..d6f889f
+
+[[package]]
+name = "wasm-bindgen-shared"
-+version = "0.2.86"
++version = "0.2.90"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "ed9d5b4305409d1fc9482fee2d7f9bcbf24b3972bf59817ef757e23982242a93"
++checksum = "4d91413b1c31d7539ba5ef2451af3f0b833a005eb27a631cec32bc0635a8602b"
+
+[[package]]
+name = "winapi"
@@ -624,28 +560,28 @@ index 0000000..d6f889f
+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+
+[[package]]
-+name = "windows"
-+version = "0.48.0"
++name = "windows-core"
++version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f"
++checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
+dependencies = [
+ "windows-targets",
+]
+
+[[package]]
+name = "windows-sys"
-+version = "0.48.0"
++version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
++checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
+dependencies = [
+ "windows-targets",
+]
+
+[[package]]
+name = "windows-targets"
-+version = "0.48.0"
++version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5"
++checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd"
+dependencies = [
+ "windows_aarch64_gnullvm",
+ "windows_aarch64_msvc",
@@ -658,49 +594,49 @@ index 0000000..d6f889f
+
+[[package]]
+name = "windows_aarch64_gnullvm"
-+version = "0.48.0"
++version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc"
++checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea"
+
+[[package]]
+name = "windows_aarch64_msvc"
-+version = "0.48.0"
++version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3"
++checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef"
+
+[[package]]
+name = "windows_i686_gnu"
-+version = "0.48.0"
++version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241"
++checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313"
+
+[[package]]
+name = "windows_i686_msvc"
-+version = "0.48.0"
++version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00"
++checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a"
+
+[[package]]
+name = "windows_x86_64_gnu"
-+version = "0.48.0"
++version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1"
++checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
-+version = "0.48.0"
++version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953"
++checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e"
+
+[[package]]
+name = "windows_x86_64_msvc"
-+version = "0.48.0"
++version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"
++checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04"
+
+[[package]]
+name = "xtr"
-+version = "0.1.8"
++version = "0.1.9"
+dependencies = [
+ "anyhow",
+ "chrono",
diff --git a/pkgs/misc/xtr/default.nix b/pkgs/misc/xtr/default.nix
@@ -2,20 +2,22 @@
rustPlatform.buildRustPackage rec {
pname = "xtr";
- version = "0.1.8";
+ version = "0.1.9";
src = fetchFromGitHub {
owner = "woboq";
repo = "tr";
rev = "v${version}";
- hash = "sha256-8Ncoo5Nzm4dj2A0L02o8OoT3ZXRciDnwCbHfLIggPw4=";
+ hash = "sha256-Un7p8n0+rSyDzEaUGuFXXWUDShR6AZgIYza40ahdZU8=";
};
cargoPatches = [ ./cargo-lock.patch ];
- cargoHash = "sha256-g/8OZmMa2gzRr2ft6/0Tur23sjB+SEQq3/qiiAD5y6M=";
+ cargoHash = "sha256-1OII7TCmnlXO1pkY9MQe+Ig+UIUIE3aVIDU9PL4PW0Q=";
buildInputs = lib.optionals stdenv.isDarwin [ libiconv Foundation ];
+ env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-incompatible-function-pointer-types";
+
hardeningDisable = lib.optional stdenv.isDarwin "format";
meta = with lib; {
diff --git a/pkgs/mqtt/mqtt-c/default.nix b/pkgs/mqtt/mqtt-c/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: {
(lib.cmakeBool "MQTT_C_TESTS" true)
];
- doCheck = true;
+ doCheck = false;
checkPhase = ''
./tests
