commit 24e8a39cbd48ddf95380e9ad02ba41ddf796bcb7 parent 30420bcf5c66b5f5c358a396036747705122d4ea Author: Nikolay Korotkiy <sikmir@disroot.org> Date: Thu, 26 Jun 2025 21:23:31 +0400 Up Diffstat:
58 files changed, 816 insertions(+), 332 deletions(-)
diff --git a/pkgs/darwin/finch/default.nix b/pkgs/darwin/finch/default.nix @@ -6,14 +6,14 @@ writableTmpDirAsHomeHook, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "finch"; version = "1.8.3"; src = fetchFromGitHub { owner = "runfinch"; repo = "finch"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-x6qIUEKeetEIrI40F6IBItM1HA1lIiDBv0Y6SrABTNE="; fetchSubmodules = true; }; @@ -22,7 +22,11 @@ buildGoModule rec { subPackages = [ "cmd/finch" ]; - ldflags = [ "-X github.com/runfinch/finch/pkg/version.Version=${version}" ]; + ldflags = [ + "-s" + "-w" + "-X github.com/runfinch/finch/pkg/version.Version=${finalAttrs.version}" + ]; nativeCheckInputs = [ writableTmpDirAsHomeHook ]; @@ -36,4 +40,4 @@ buildGoModule rec { platforms = lib.platforms.darwin; skip.ci = true; }; -} +}) diff --git a/pkgs/darwin/pinentry-touchid/default.nix b/pkgs/darwin/pinentry-touchid/default.nix @@ -6,14 +6,14 @@ writableTmpDirAsHomeHook, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "pinentry-touchid"; version = "0.0.3"; src = fetchFromGitHub { owner = "jorgelbg"; repo = "pinentry-touchid"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-XMcJjVVAp5drLMVTShITl0v6uVazrG1/23dVerrsoj4="; }; @@ -33,4 +33,4 @@ buildGoModule rec { platforms = lib.platforms.darwin; skip.ci = !stdenv.isDarwin; }; -} +}) diff --git a/pkgs/darwin/zed/default.nix b/pkgs/darwin/zed/default.nix @@ -7,11 +7,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "zed"; - version = "0.192.3-pre"; + version = "0.193.1-pre"; src = fetchurl { url = "https://zed.dev/api/releases/stable/${finalAttrs.version}/Zed-x86_64.dmg"; - hash = "sha256-GBg7PnR6TIrbuagcleMSRRYbJVFIXmqn8p/t1vgtTek="; + hash = "sha256-SZP+ADU0YudFaAvgcyOIX7NA4zQXcGzM8Z/AEwmBwC8="; }; sourceRoot = "."; diff --git a/pkgs/gemini/astronaut/default.nix b/pkgs/gemini/astronaut/default.nix @@ -7,14 +7,14 @@ installShellFiles, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "astronaut"; version = "0.1.3"; src = fetchFromSourcehut { owner = "~adnano"; repo = "astronaut"; - rev = version; + rev = finalAttrs.version; hash = "sha256-YkaeJMabEHGcyYeEyiYXR2K8YKX7Qqo5mb1XzvKT2+U="; }; @@ -42,4 +42,4 @@ buildGoModule rec { license = lib.licenses.gpl3Only; maintainers = [ lib.maintainers.sikmir ]; }; -} +}) diff --git a/pkgs/gemini/comitium/default.nix b/pkgs/gemini/comitium/default.nix @@ -1,21 +1,22 @@ { lib, buildGoModule, - fetchgit, + fetchFromSourcehut, scdoc, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "comitium"; - version = "1.8.1"; + version = "1.8.2"; - src = fetchgit { - url = "git://git.nytpu.com/comitium"; - tag = "v${version}"; - hash = "sha256-rtsC9SAddRdmu82BRrZOEOq53ZYSOUGGZJDdTYs4WKY="; + src = fetchFromSourcehut { + owner= "~nytpu"; + repo = "comitium"; + rev = "v${finalAttrs.version}"; + hash = "sha256-kydT2hLPb2Oj1/o+1N9Cvrdi4+DKi2tHX35oY6yGUU8="; }; - vendorHash = "sha256-6xtXTmSqaN2me0kyRk948ASNNtv7P5XBvtv9UWjNHoo="; + vendorHash = "sha256-wzT5A55ZFCa34fDUWPuG11XWBpCk4QLZamYwMGKLprM="; nativeBuildInputs = [ scdoc ]; @@ -33,8 +34,9 @@ buildGoModule rec { meta = { description = "A feed aggregator for gemini supporting many formats and protocols"; - homepage = "https://git.nytpu.com/comitium/about/"; + homepage = "https://git.sr.ht/~nytpu/comitium"; license = lib.licenses.agpl3Only; maintainers = [ lib.maintainers.sikmir ]; + mainProgram = "comitium"; }; -} +}) diff --git a/pkgs/gemini/eva/default.nix b/pkgs/gemini/eva/default.nix @@ -9,7 +9,7 @@ wrapGAppsHook, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "eva"; version = "0.4.1"; @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { domain = "codeberg.org"; owner = "jeang3nie"; repo = "eva"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-beCILpBqW8kHcLkW3q6LRRduDTMDwsqnXUEkZbX9hL4="; }; @@ -42,4 +42,4 @@ rustPlatform.buildRustPackage rec { maintainers = [ lib.maintainers.sikmir ]; broken = stdenv.isDarwin; # gupnp-1.6.8 }; -} +}) diff --git a/pkgs/gemini/gelim/default.nix b/pkgs/gemini/gelim/default.nix @@ -7,25 +7,31 @@ installShellFiles, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "gelim"; - version = "0.9.3"; + version = "0.13.1"; src = fetchFromSourcehut { owner = "~hedy"; repo = "gelim"; - rev = "v${version}"; - hash = "sha256-xFOiE0OLaJ4WK+I8oNXNk7feP3nXp9wvH0bkNnBK1Yg="; + rev = "v${finalAttrs.version}"; + hash = "sha256-cP0dqgoe8P8W3qKTmDHSUhCLCBoPUvN/EMWql073rf0="; }; + patches = [ ./go.mod.patch ]; + nativeBuildInputs = [ scdoc installShellFiles ]; - vendorHash = "sha256-sWNPNZYcm296zhz57/NCaAlQxJ+Z1zzd/Y+KiLxZ46E="; + vendorHash = "sha256-MOdAUPAvodDdYE3f9CvodFCTYVcB0AUbt8T4FcYZWYc="; - ldflags = [ "-X main.Version=${version}" ]; + ldflags = [ + "-s" + "-w" + "-X main.Version=${finalAttrs.version}" + ]; postBuild = '' scdoc < gelim.1.scd > gelim.1 @@ -40,5 +46,6 @@ buildGoModule rec { homepage = "https://sr.ht/~hedy/gelim/"; license = lib.licenses.mit; maintainers = [ lib.maintainers.sikmir ]; + mainProgram = "gelim"; }; -} +}) diff --git a/pkgs/gemini/gelim/go.mod.patch b/pkgs/gemini/gelim/go.mod.patch @@ -0,0 +1,23 @@ +diff --git i/go.mod w/go.mod +index d04dc07..3992fab 100644 +--- i/go.mod ++++ w/go.mod +@@ -1,6 +1,6 @@ + module git.sr.ht/~hedy/gelim + +-go 1.16 ++go 1.18 + + require ( + git.sr.ht/~adnano/go-xdg v0.1.0 +@@ -12,3 +12,10 @@ require ( + github.com/spf13/pflag v1.0.5 + golang.org/x/term v0.0.0-20210429154555-c04ba851c2a4 + ) ++ ++require ( ++ github.com/mattn/go-colorable v0.1.13 // indirect ++ github.com/mattn/go-isatty v0.0.17 // indirect ++ github.com/mattn/go-runewidth v0.0.3 // indirect ++ golang.org/x/sys v0.6.0 // indirect ++) diff --git a/pkgs/gemini/gemgen/default.nix b/pkgs/gemini/gemgen/default.nix @@ -5,14 +5,14 @@ scdoc, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "gemgen"; version = "0.6.0"; src = fetchFromSourcehut { owner = "~kota"; repo = "gemgen"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-2oIgBcdq2tJCKyh5ob2cn2mLRd7YoeRsKy5qqu0+jPk="; }; @@ -26,4 +26,4 @@ buildGoModule rec { license = lib.licenses.gpl3Only; maintainers = [ lib.maintainers.sikmir ]; }; -} +}) diff --git a/pkgs/gemini/gemserv/default.nix b/pkgs/gemini/gemserv/default.nix @@ -7,14 +7,14 @@ openssl, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "gemserv"; version = "0.6.6"; src = fetchFromSourcehut { owner = "~int80h"; repo = "gemserv"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-jFh7OksYGXGWwLb4HtAuDQ7OsWxedqeLARPI20RyAgQ="; }; @@ -35,4 +35,4 @@ rustPlatform.buildRustPackage rec { license = lib.licenses.mit; maintainers = [ lib.maintainers.sikmir ]; }; -} +}) diff --git a/pkgs/gemini/gmnhg/default.nix b/pkgs/gemini/gmnhg/default.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "gmnhg"; version = "0.4.2"; src = fetchFromGitHub { owner = "tdemin"; repo = "gmnhg"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-ob1bt9SX9qFd9GQ5d8g+fS4z+aT9ob3a7iLY8zjUCp8="; }; @@ -23,4 +23,4 @@ buildGoModule rec { license = lib.licenses.gpl3Plus; maintainers = [ lib.maintainers.sikmir ]; }; -} +}) diff --git a/pkgs/gemini/mdtohtml/default.nix b/pkgs/gemini/mdtohtml/default.nix @@ -6,14 +6,14 @@ installShellFiles, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "mdtohtml"; version = "0.1.3"; src = fetchFromSourcehut { owner = "~adnano"; repo = "mdtohtml"; - rev = version; + rev = finalAttrs.version; hash = "sha256-qvd4Iz+1uNT1Y/DkHGRYBVCLeIpleQ58Ua4eSYv+ilQ="; }; @@ -39,4 +39,4 @@ buildGoModule rec { maintainers = [ lib.maintainers.sikmir ]; mainProgram = "mdtohtml"; }; -} +}) diff --git a/pkgs/gemini/satellite/default.nix b/pkgs/gemini/satellite/default.nix @@ -4,14 +4,14 @@ fetchFromSourcehut, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "satellite"; version = "1.0.0"; src = fetchFromSourcehut { owner = "~gsthnz"; repo = "satellite"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-fOsgTuJb/UFmOKb7xV+pvqOhokEuOgt47IYDEpa0DWg="; }; @@ -23,4 +23,4 @@ buildGoModule rec { license = lib.licenses.agpl3Only; maintainers = [ lib.maintainers.sikmir ]; }; -} +}) diff --git a/pkgs/geospatial/bbox/default.nix b/pkgs/geospatial/bbox/default.nix @@ -5,14 +5,14 @@ buildPackages, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "bbox"; version = "0.6.2"; src = fetchFromGitHub { owner = "bbox-services"; repo = "bbox"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-FmY9Hqwv9lWjdEMe4JZM/nw8BaeZ+4eK+nibOUwcE+8="; }; @@ -41,4 +41,4 @@ rustPlatform.buildRustPackage rec { ]; maintainers = [ lib.maintainers.sikmir ]; }; -} +}) diff --git a/pkgs/geospatial/hecate/default.nix b/pkgs/geospatial/hecate/default.nix @@ -7,14 +7,14 @@ openssl, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "hecate"; version = "0.87.0"; src = fetchFromGitHub { owner = "Hecate"; repo = "Hecate"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-X+49Mnls5xK6ag1QcvEm0GvLPmvcRBwNn/1vnC9GJO8="; }; @@ -35,4 +35,4 @@ rustPlatform.buildRustPackage rec { maintainers = [ lib.maintainers.sikmir ]; broken = stdenv.isLinux; }; -} +}) diff --git a/pkgs/gpx/garta/default.nix b/pkgs/gpx/garta/default.nix @@ -16,7 +16,7 @@ zlib, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "garta"; version = "0.1.0-unstable-2021-02-08"; @@ -54,7 +54,7 @@ rustPlatform.buildRustPackage rec { ''; configurePhase = '' - export PKG_CONFIG_PATH='${lib.makeSearchPathOutput "dev" "lib/pkgconfig" buildInputs}' + export PKG_CONFIG_PATH='${lib.makeSearchPathOutput "dev" "lib/pkgconfig" finalAttrs.buildInputs}' ./configure.sh --prefix $out @@ -81,4 +81,4 @@ rustPlatform.buildRustPackage rec { maintainers = [ lib.maintainers.sikmir ]; skip.ci = true; }; -} +}) diff --git a/pkgs/misc/acp/default.nix b/pkgs/misc/acp/default.nix @@ -4,14 +4,14 @@ buildGoModule, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "acp"; version = "0.3.1"; src = fetchFromGitHub { owner = "Contextualist"; repo = "acp"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-FxpIfJ6WWWgaBQnTbvp0DqRrmPmT0ZUjueBFgJ24HAY="; }; @@ -20,7 +20,7 @@ buildGoModule rec { ldflags = [ "-s" "-w" - "-X main.buildTag=${version}" + "-X main.buildTag=${finalAttrs.version}" ]; __darwinAllowLocalNetworking = true; @@ -32,4 +32,4 @@ buildGoModule rec { maintainers = [ lib.maintainers.sikmir ]; mainProgram = "acp"; }; -} +}) diff --git a/pkgs/misc/brink/default.nix b/pkgs/misc/brink/default.nix @@ -4,14 +4,14 @@ buildGoModule, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "brink"; version = "0.8.0"; src = fetchFromGitHub { owner = "jsiebens"; repo = "brink"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-MXFqZY4ffSNyspoHqlGJ4kBm1eESyFoi1LzssEdNfos="; }; @@ -20,7 +20,7 @@ buildGoModule rec { ldflags = [ "-s" "-w" - "-X github.com/jsiebens/brink/internal/version.Version=${version}" + "-X github.com/jsiebens/brink/internal/version.Version=${finalAttrs.version}" ]; meta = { @@ -30,4 +30,4 @@ buildGoModule rec { maintainers = [ lib.maintainers.sikmir ]; mainProgram = "brink"; }; -} +}) diff --git a/pkgs/misc/chasquid/default.nix b/pkgs/misc/chasquid/default.nix @@ -6,18 +6,18 @@ installShellFiles, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "chasquid"; - version = "1.14.0"; + version = "1.16.0"; src = fetchFromGitHub { owner = "albertito"; repo = "chasquid"; - tag = "v${version}"; - hash = "sha256-BgW3qZlP6KPiD/gNJ68dSiwt+Xg3FhC0Q8aoK+Ud1sM="; + tag = "v${finalAttrs.version}"; + hash = "sha256-IWGO7sIesVg6n2mFeZEHHmT2qRAO7/PbrQiNhvEDhrI="; }; - vendorHash = "sha256-dOQJJ2U9Y7zyCNNxUMX85BNMlqn9/KQbZB2CWiYaylc="; + vendorHash = "sha256-rI4ClDcRWKywohe9uM3dXDrn5YfZjtJ4pxzheKDqIUk="; subPackages = [ "." @@ -31,7 +31,7 @@ buildGoModule rec { ldflags = [ "-s" "-w" - "-X main.version=${version}" + "-X main.version=${finalAttrs.version}" ]; postInstall = '' @@ -45,4 +45,4 @@ buildGoModule rec { maintainers = [ lib.maintainers.sikmir ]; mainProgram = "chasquid"; }; -} +}) diff --git a/pkgs/misc/csv2html/default.nix b/pkgs/misc/csv2html/default.nix @@ -5,14 +5,14 @@ fetchFromGitHub, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "csv2html"; version = "3.1.1"; src = fetchFromGitHub { owner = "dbohdan"; repo = "csv2html"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-H8nUwK72opUohBN2exZURRAPr1RXLa87exYaGigly0Q="; }; @@ -26,4 +26,4 @@ rustPlatform.buildRustPackage rec { maintainers = [ lib.maintainers.sikmir ]; mainProgram = "csv2html"; }; -} +}) diff --git a/pkgs/misc/exercisediary/default.nix b/pkgs/misc/exercisediary/default.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "exercisediary"; version = "0.1.9"; src = fetchFromGitHub { owner = "aceberg"; repo = "ExerciseDiary"; - tag = version; + tag = finalAttrs.version; hash = "sha256-ekGluDuBF4Zb/XTxLRdztVg447x13uo24nNTBuVSfj8="; }; @@ -29,4 +29,4 @@ buildGoModule rec { mainProgram = "ExerciseDiary"; maintainers = [ lib.maintainers.sikmir ]; }; -} +}) diff --git a/pkgs/misc/ffs/default.nix b/pkgs/misc/ffs/default.nix @@ -11,14 +11,14 @@ let fuse = if stdenv.isDarwin then macfuse-stubs else fuse3; in -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "ffs"; version = "0.1.2"; src = fetchFromGitHub { owner = "mgree"; repo = "ffs"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-7hYH+utmAoWtV2xZLvSnE8779qKvzIJVJt9mNwH82sY="; }; @@ -38,4 +38,4 @@ rustPlatform.buildRustPackage rec { maintainers = [ lib.maintainers.sikmir ]; mainProgram = "ffs"; }; -} +}) diff --git a/pkgs/misc/goto/default.nix b/pkgs/misc/goto/default.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "goto"; version = "1.4.0"; src = fetchFromGitHub { owner = "grafviktor"; repo = "goto"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-xQIsA/UC9daR1k6c3TMsWWIt3iYVeHd96OxYlFo27oI="; }; @@ -20,7 +20,7 @@ buildGoModule rec { ldflags = [ "-s" "-w" - "-X main.buildVersion=${version}" + "-X main.buildVersion=${finalAttrs.version}" ]; meta = { @@ -30,4 +30,4 @@ buildGoModule rec { mainProgram = "goto"; maintainers = [ lib.maintainers.sikmir ]; }; -} +}) diff --git a/pkgs/misc/ionscale/default.nix b/pkgs/misc/ionscale/default.nix @@ -4,23 +4,23 @@ buildGoModule, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "ionscale"; - version = "0.17.0"; + version = "0.18.0"; src = fetchFromGitHub { owner = "jsiebens"; repo = "ionscale"; - tag = "v${version}"; - hash = "sha256-i0b+08wh1Z1gspkTz/Bbh8CSe8Sqd7UsiBnMofA1dh8="; + tag = "v${finalAttrs.version}"; + hash = "sha256-l8l7zH146M3+kEy7nl4pRFDJjzmz8hf0MJ+G3BYYSbA="; }; - vendorHash = "sha256-xzHJ81mM+evqNBwYyYVHeRwtnepgFdqc/fgrMTgkQPE="; + vendorHash = "sha256-87Ef2idpQ0Jnm+uYS6r3yMcrakiDAXkOitOaXUDdRo8="; ldflags = [ "-s" "-w" - "-X github.com/jsiebens/ionscale/internal/version.Version=${version}" + "-X github.com/jsiebens/ionscale/internal/version.Version=${finalAttrs.version}" ]; doCheck = false; @@ -32,4 +32,4 @@ buildGoModule rec { maintainers = [ lib.maintainers.sikmir ]; mainProgram = "ionscale"; }; -} +}) diff --git a/pkgs/misc/md2html/default.nix b/pkgs/misc/md2html/default.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "md2html"; version = "2.0.1"; src = fetchFromGitHub { owner = "nocd5"; repo = "md2html"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-3DnCLoX0x872zB90Z172iGwc6kQk9tpG1drw4s7LI0o="; }; @@ -23,4 +23,4 @@ buildGoModule rec { license = lib.licenses.mit; maintainers = [ lib.maintainers.sikmir ]; }; -} +}) diff --git a/pkgs/misc/modbus-tools/default.nix b/pkgs/misc/modbus-tools/default.nix @@ -4,14 +4,14 @@ fetchFromGitLab, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "modbus-tools"; version = "0.2"; src = fetchFromGitLab { owner = "alexs-sh"; repo = "modbus-tools"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-PA8EuZa2jKkd/pn6UGGJ6f7jac1bN2sS2fX3qmYVduQ="; }; @@ -27,4 +27,4 @@ rustPlatform.buildRustPackage rec { license = lib.licenses.mit; maintainers = [ lib.maintainers.sikmir ]; }; -} +}) diff --git a/pkgs/misc/msg-cli/default.nix b/pkgs/misc/msg-cli/default.nix @@ -9,7 +9,7 @@ guile, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "msg-cli"; version = "0.1.1"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { domain = "forge.superkamiguru.org"; owner = "MSG"; repo = "msg-cli"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-M/MksKwmV/PQxRtv9cT3KwMquhu2yUyBI9+jQL/vsfA="; }; @@ -49,4 +49,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.sikmir ]; mainProgram = "msg"; }; -} +}) diff --git a/pkgs/misc/musig/default.nix b/pkgs/misc/musig/default.nix @@ -6,17 +6,16 @@ pkg-config, portaudio, testers, - musig, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "musig"; version = "1.0.0"; src = fetchFromGitHub { owner = "sfluor"; repo = "musig"; - tag = version; + tag = finalAttrs.version; hash = "sha256-FL9FkNOR6/WKRKFroFE3otBM5AYFvyj71QySY3EOQMA="; }; @@ -26,9 +25,9 @@ buildGoModule rec { buildInputs = [ portaudio ]; - ldflags = [ "-X main.VERSION=${version}" ]; + ldflags = [ "-X main.VERSION=${finalAttrs.version}" ]; - passthru.tests.version = testers.testVersion { package = musig; }; + passthru.tests.version = testers.testVersion { package = finalAttrs.finalPackage; }; meta = { description = "A shazam like tool to store songs fingerprints and retrieve them"; @@ -37,4 +36,4 @@ buildGoModule rec { maintainers = [ lib.maintainers.sikmir ]; broken = stdenv.isDarwin; }; -} +}) diff --git a/pkgs/misc/opcua/default.nix b/pkgs/misc/opcua/default.nix @@ -6,7 +6,7 @@ openssl, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage { pname = "opcua"; version = "0.12.0-unstable-2024-10-09"; diff --git a/pkgs/misc/shifu/default.nix b/pkgs/misc/shifu/default.nix @@ -7,18 +7,18 @@ libpcap, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "shifu"; - version = "0.57.0"; + version = "0.73.0"; src = fetchFromGitHub { owner = "Edgenesis"; repo = "shifu"; - tag = "v${version}"; - hash = "sha256-RRK8N/CLNWf9Jkq1Y2wJ2BGgjJNNc2roI9ChREkF06I="; + tag = "v${finalAttrs.version}"; + hash = "sha256-XKfnBXKdob+mxVVmjro8LUZoxUFYWRemyNfD5fo+FQU="; }; - vendorHash = "sha256-SCse0FybcWNLshY0stgbV/AC3Y17znFtAKKhtCaZeGM="; + vendorHash = "sha256-YCHEOe1VpmqJhBirmeIU5MyrxRnDOXdahr+gr4EDKXY="; nativeBuildInputs = [ installShellFiles ]; @@ -50,4 +50,4 @@ buildGoModule rec { maintainers = [ lib.maintainers.sikmir ]; mainProgram = "shifuctl"; }; -} +}) diff --git a/pkgs/misc/telegabber/default.nix b/pkgs/misc/telegabber/default.nix @@ -7,7 +7,6 @@ tdlib, zlib, testers, - telegabber, }: let @@ -23,20 +22,20 @@ let } ); in -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "telegabber"; - version = "1.9.7"; + version = "1.12.4"; src = fetchFromGitea { domain = "dev.narayana.im"; owner = "narayana"; repo = "telegabber"; - tag = "v${version}"; - hash = "sha256-UrfTPYZMfYZcmE4bLyUZ8mCgvj2IF6AA+8f6ToNhsvU="; + tag = "v${finalAttrs.version}"; + hash = "sha256-//S4bh2H747059KqDQNWA4lpH3OXPzl+OndGY7WNwg8="; forceFetchGit = true; }; - vendorHash = "sha256-3qSa6yJXSjrmTIBrulCnZMZzqNtpkzpzWeYAzHl8uUM="; + vendorHash = "sha256-qiPMQuk1fUx7GFlJUu71n2pLVqd7vUPnRva3p/iDkr4="; buildInputs = [ openssl @@ -48,12 +47,15 @@ buildGoModule rec { install -Dm644 config_schema.json config.yml.example -t $out/share/telegabber ''; - passthru.tests.version = testers.testVersion { package = telegabber; }; + checkFlags = [ "-skip=TestSessionToMap" ]; + + passthru.tests.version = testers.testVersion { package = finalAttrs.finalPackage; }; meta = { description = "XMPP/Jabber transport to Telegram network"; homepage = "https://dev.narayana.im/narayana/telegabber"; license = lib.licenses.asl20; maintainers = [ lib.maintainers.sikmir ]; + mainProgram = "telegabber"; }; -} +}) diff --git a/pkgs/misc/tg-spam/default.nix b/pkgs/misc/tg-spam/default.nix @@ -4,15 +4,15 @@ fetchFromGitHub, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "tg-spam"; - version = "1.18.0"; + version = "1.18.1"; src = fetchFromGitHub { owner = "umputun"; repo = "tg-spam"; - tag = "v${version}"; - hash = "sha256-lGYE5ixrWpqjQ0IEv6SK9S2cn81MtLPLstyG5psm2TQ="; + tag = "v${finalAttrs.version}"; + hash = "sha256-ZLn5SCQ8ol16+OFrFb6xutUsUYJH96NAjl3xR8gc4JM="; }; vendorHash = null; @@ -20,7 +20,7 @@ buildGoModule rec { ldflags = [ "-s" "-w" - "-X main.revision=${version}" + "-X main.revision=${finalAttrs.version}" ]; postInstall = '' @@ -36,4 +36,4 @@ buildGoModule rec { mainProgram = "tg-spam"; maintainers = [ lib.maintainers.sikmir ]; }; -} +}) diff --git a/pkgs/misc/tiny-frpc/default.nix b/pkgs/misc/tiny-frpc/default.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "tiny-frpc"; version = "0.1.3"; src = fetchFromGitHub { owner = "gofrp"; repo = "tiny-frpc"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; sha256 = "sha256-vrIkSacqjt3lG5LaOXV1m3NI+j0KLFOTV/P5OacwrcU="; }; @@ -25,9 +25,9 @@ buildGoModule rec { meta = { description = "tiny frpc using ssh protocol with frps"; homepage = "https://github.com/gofrp/tiny-frpc"; - changelog = "https://github.com/gofrp/tiny-frpc/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/gofrp/tiny-frpc/blob/v${finalAttrs.version}/CHANGELOG.md"; license = lib.licenses.asl20; maintainers = [ lib.maintainers.sikmir ]; - mainProgram = "tiny-frpc"; + mainProgram = "frpc"; }; -} +}) diff --git a/pkgs/misc/tsnsrv/default.nix b/pkgs/misc/tsnsrv/default.nix @@ -4,20 +4,20 @@ fetchFromGitHub, }: -buildGoModule rec { +buildGoModule { pname = "tsnsrv"; - version = "0-unstable-2024-07-22"; + version = "0-unstable-2025-06-05"; src = fetchFromGitHub { owner = "boinkor-net"; repo = "tsnsrv"; - rev = "0260f4f52d452d15f71e0297561bba367f92d7fd"; - hash = "sha256-LrMqwcX6e6F93y0+gr1rmABp2eerq6bRu58QftDXLU0="; + rev = "e2537464e45db0f173e8e68d0316b40c13e1e49c"; + hash = "sha256-tVHkh0AGDl+de9itdLsi3lfMOyOLyQjtnp1zw2zyYV8="; }; subPackages = [ "cmd/tsnsrv" ]; - vendorHash = "sha256-5Z2qPuQBvLRgsMd9z8WrtGJcLwyJjclyh2g0KdFR3hc="; + vendorHash = "sha256-iGW7+jpxfM421RYvmaqaOJ/wKeJDkXn7baHZXYkAqEk="; meta = { description = "A reverse proxy that exposes services on your tailnet"; diff --git a/pkgs/misc/wirefire/default.nix b/pkgs/misc/wirefire/default.nix @@ -4,7 +4,7 @@ buildGoModule, }: -buildGoModule rec { +buildGoModule { pname = "wirefire"; version = "0-unstable-2024-11-08"; diff --git a/pkgs/misc/xtr/Cargo.lock b/pkgs/misc/xtr/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "aho-corasick" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" dependencies = [ "memchr", ] @@ -27,64 +27,72 @@ dependencies = [ ] [[package]] +name = "anes" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" + +[[package]] name = "anstream" -version = "0.6.12" +version = "0.6.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96b09b5178381e0874812a9b157f7fe84982617e48f71f4e3235482775e5b540" +checksum = "301af1932e46185686725e0fad2f8f2aa7da69dd70bf6ecc44d6b703844a3933" dependencies = [ "anstyle", "anstyle-parse", "anstyle-query", "anstyle-wincon", "colorchoice", + "is_terminal_polyfill", "utf8parse", ] [[package]] name = "anstyle" -version = "1.0.6" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" +checksum = "862ed96ca487e809f1c8e5a8447f6ee2cf102f846893800b20cebdf541fc6bbd" [[package]] name = "anstyle-parse" -version = "0.2.3" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" +checksum = "4e7644824f0aa2c7b9384579234ef10eb7efb6a0deb83f9630a49594dd9c15c2" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.0.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" +checksum = "6c8bdeb6047d8983be085bab0ba1472e6dc604e7041dbf6fcd5e71523014fae9" dependencies = [ "windows-sys", ] [[package]] name = "anstyle-wincon" -version = "3.0.2" +version = "3.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" +checksum = "403f75924867bb1033c59fbf0797484329750cfbe3c4325cd33127941fabc882" dependencies = [ "anstyle", + "once_cell_polyfill", "windows-sys", ] [[package]] name = "anyhow" -version = "1.0.80" +version = "1.0.98" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ad32ce52e4161730f7098c077cd2ed6229b5804ccf99e5366be1ab72a98b4e1" +checksum = "e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e85f964c2404b969bdcd487" [[package]] name = "autocfg" -version = "1.1.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" [[package]] name = "block" @@ -94,9 +102,9 @@ checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" [[package]] name = "bumpalo" -version = "3.15.3" +version = "3.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ea184aa71bb362a1157c896979544cc23974e08fd265f29ea96b59f0b4a555b" +checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43" [[package]] name = "byteorder" @@ -105,43 +113,79 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] +name = "cast" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" + +[[package]] name = "cc" -version = "1.0.88" +version = "1.2.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02f341c093d19155a6e41631ce5971aac4e9a868262212153124c15fa22d1cdc" +checksum = "d487aa071b5f64da6f19a3e848e3578944b726ee5a4854b82172f02aa876bfdc" +dependencies = [ + "shlex", +] [[package]] name = "cfg-if" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +checksum = "9555578bc9e57714c812a1f84e4fc5b4d21fcb063490c624de019f7464c91268" [[package]] name = "chrono" -version = "0.4.34" +version = "0.4.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bc015644b92d5890fab7489e49d21f879d5c990186827d42ec511919404f38b" +checksum = "c469d952047f47f91b68d1cba3f10d63c11d73e4636f24f08daf0278abf01c4d" dependencies = [ "android-tzdata", "iana-time-zone", "num-traits", - "windows-targets", + "windows-link", +] + +[[package]] +name = "ciborium" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42e69ffd6f0917f5c029256a24d0161db17cea3997d185db0d35926308770f0e" +dependencies = [ + "ciborium-io", + "ciborium-ll", + "serde", +] + +[[package]] +name = "ciborium-io" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05afea1e0a06c9be33d539b876f1ce3692f4afea2cb41f740e7743225ed1c757" + +[[package]] +name = "ciborium-ll" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57663b653d948a338bfb3eeba9bb2fd5fcfaecb9e199e87e1eda4d9e8b240fd9" +dependencies = [ + "ciborium-io", + "half", ] [[package]] name = "clap" -version = "4.5.1" +version = "4.5.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c918d541ef2913577a0f9566e9ce27cb35b6df072075769e0b26cb5a554520da" +checksum = "40b6887a1d8685cebccf115538db5c0efe625ccac9696ad45c409d96566e910f" dependencies = [ "clap_builder", ] [[package]] name = "clap_builder" -version = "4.5.1" +version = "4.5.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f3e7391dad68afb0c2ede1bf619f579a3dc9c2ec67f089baa397123a2f3d1eb" +checksum = "e0c66c08ce9f0c698cbce5c0279d0bb6ac936d8674174fe48f736533b964f59e" dependencies = [ "anstream", "anstyle", @@ -151,21 +195,91 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.7.0" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" +checksum = "b94f61472cee1439c0b966b47e3aca9ae07e45d070759512cd390ea2bebc6675" [[package]] name = "colorchoice" -version = "1.0.0" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" +checksum = "b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75" [[package]] name = "core-foundation-sys" +version = "0.8.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" + +[[package]] +name = "criterion" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3bf7af66b0989381bd0be551bd7cc91912a655a58c6918420c9527b1fd8b4679" +dependencies = [ + "anes", + "cast", + "ciborium", + "clap", + "criterion-plot", + "itertools 0.13.0", + "num-traits", + "oorandom", + "plotters", + "rayon", + "regex", + "serde", + "serde_json", + "tinytemplate", + "walkdir", +] + +[[package]] +name = "criterion-plot" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1" +dependencies = [ + "cast", + "itertools 0.10.5", +] + +[[package]] +name = "crossbeam-deque" version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" +checksum = "9dd111b7b7f7d55b72c0a6ae361660ee5853c9af73f70c3c2ef6858b950e2e51" +dependencies = [ + "crossbeam-epoch", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" + +[[package]] +name = "crunchy" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "460fbee9c2c2f33933d720630a6a0bac33ba7053db5344fac858d4b8952d77d5" + +[[package]] +name = "either" +version = "1.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719" [[package]] name = "encoding" @@ -243,9 +357,9 @@ dependencies = [ [[package]] name = "gettext-rs" -version = "0.7.0" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e49ea8a8fad198aaa1f9655a2524b64b70eb06b2f3ff37da407566c93054f364" +checksum = "a44e92f7dc08430aca7ed55de161253a22276dfd69c5526e5c5e95d1f7cf338a" dependencies = [ "gettext-sys", "locale_config", @@ -253,24 +367,41 @@ dependencies = [ [[package]] name = "gettext-sys" -version = "0.21.3" +version = "0.22.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c63ce2e00f56a206778276704bbe38564c8695249fdc8f354b4ef71c57c3839d" +checksum = "bb45773f5b8945f12aecd04558f545964f943dacda1b1155b3d738f5469ef661" dependencies = [ "cc", "temp-dir", ] [[package]] +name = "half" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "459196ed295495a68f7d7fe1d84f6c4b7ff0e21fe3017b2f283c6fac3ad803c9" +dependencies = [ + "cfg-if", + "crunchy", +] + +[[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + +[[package]] name = "iana-time-zone" -version = "0.1.60" +version = "0.1.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" +checksum = "b0c919e5debc312ad217002b8048a17b7d83f80703865bbfcfebb0458b0b27d8" dependencies = [ "android_system_properties", "core-foundation-sys", "iana-time-zone-haiku", "js-sys", + "log", "wasm-bindgen", "windows-core", ] @@ -285,25 +416,56 @@ dependencies = [ ] [[package]] +name = "is_terminal_polyfill" +version = "1.70.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" + +[[package]] +name = "itertools" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" +dependencies = [ + "either", +] + +[[package]] +name = "itertools" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" +dependencies = [ + "either", +] + +[[package]] +name = "itoa" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c" + +[[package]] name = "js-sys" -version = "0.3.68" +version = "0.3.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "406cda4b368d531c842222cf9d2600a9a4acce8d29423695379c6868a143a9ee" +checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f" dependencies = [ + "once_cell", "wasm-bindgen", ] [[package]] name = "lazy_static" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "libc" -version = "0.2.153" +version = "0.2.174" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" +checksum = "1171693293099992e19cddea4e8b849964e9846f4acee11b3948bcc337be8776" [[package]] name = "locale_config" @@ -320,9 +482,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.20" +version = "0.4.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" +checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94" [[package]] name = "malloc_buf" @@ -335,15 +497,21 @@ dependencies = [ [[package]] name = "memchr" -version = "2.7.1" +version = "2.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" +checksum = "32a282da65faaf38286cf3be983213fcf1d2e2a58700e808f83f4ea9a4804bc0" + +[[package]] +name = "natord" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "308d96db8debc727c3fd9744aac51751243420e46edf401010908da7f8d5e57c" [[package]] name = "num-traits" -version = "0.2.18" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", ] @@ -379,33 +547,93 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.19.0" +version = "1.21.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" + +[[package]] +name = "once_cell_polyfill" +version = "1.70.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4895175b425cb1f87721b59f0f286c2092bd4af812243672510e1ac53e2e0ad" + +[[package]] +name = "oorandom" +version = "11.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6790f58c7ff633d8771f42965289203411a5e5c68388703c06e14f24770b41e" + +[[package]] +name = "plotters" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5aeb6f403d7a4911efb1e33402027fc44f29b5bf6def3effcc22d7bb75f2b747" +dependencies = [ + "num-traits", + "plotters-backend", + "plotters-svg", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "plotters-backend" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" +checksum = "df42e13c12958a16b3f7f4386b9ab1f3e7933914ecea48da7139435263a4172a" + +[[package]] +name = "plotters-svg" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51bae2ac328883f7acdfea3d66a7c35751187f870bc81f94563733a154d7a670" +dependencies = [ + "plotters-backend", +] [[package]] name = "proc-macro2" -version = "1.0.78" +version = "1.0.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" +checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.35" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" +checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d" dependencies = [ "proc-macro2", ] [[package]] +name = "rayon" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" +dependencies = [ + "either", + "rayon-core", +] + +[[package]] +name = "rayon-core" +version = "1.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" +dependencies = [ + "crossbeam-deque", + "crossbeam-utils", +] + +[[package]] name = "regex" -version = "1.10.3" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" +checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" dependencies = [ "aho-corasick", "memchr", @@ -415,9 +643,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.5" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bb987efffd3c6d0d8f5f89510bb458559eab11e4f869acb20bf845e016259cd" +checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" dependencies = [ "aho-corasick", "memchr", @@ -426,21 +654,114 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.2" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" + +[[package]] +name = "rspolib" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" +checksum = "5f37ad43928575b1f1883fbd0eae846d6bc3c480347b64e724d3f23d38273968" +dependencies = [ + "lazy_static", + "natord", + "snafu", + "unicode-linebreak", + "unicode-width", +] + +[[package]] +name = "rustversion" +version = "1.0.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a0d197bd2c9dc6e53b84da9556a69ba4cdfab8619eb41a8bd1cc2027a0f6b1d" + +[[package]] +name = "ryu" +version = "1.0.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f" + +[[package]] +name = "same-file" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "serde" +version = "1.0.219" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.219" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "serde_json" +version = "1.0.140" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373" +dependencies = [ + "itoa", + "memchr", + "ryu", + "serde", +] + +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + +[[package]] +name = "snafu" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "320b01e011bf8d5d7a4a4a4be966d9160968935849c83b918827f6a435e7f627" +dependencies = [ + "snafu-derive", +] + +[[package]] +name = "snafu-derive" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1961e2ef424c1424204d3a5d6975f934f56b6d50ff5732382d84ebf460e147f7" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn", +] [[package]] name = "strsim" -version = "0.11.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ee073c9e4cd00e28217186dbe12796d692868f432bf2e97ee73bed0c56dfa01" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "syn" -version = "2.0.51" +version = "2.0.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ab617d94515e94ae53b8406c628598680aa0c9587474ecbe58188f7b345d66c" +checksum = "17b6f705963418cdb9927482fa304bc562ece2fdd4f616084c50b7023b435a40" dependencies = [ "proc-macro2", "quote", @@ -449,50 +770,84 @@ dependencies = [ [[package]] name = "temp-dir" -version = "0.1.12" +version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd16aa9ffe15fe021c6ee3766772132c6e98dfa395a167e16864f61a9cfb71d6" +checksum = "83176759e9416cf81ee66cb6508dbfe9c96f20b8b56265a39917551c23c70964" + +[[package]] +name = "tinytemplate" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc" +dependencies = [ + "serde", + "serde_json", +] [[package]] name = "tr" -version = "0.1.7" +version = "0.1.11" dependencies = [ + "criterion", "gettext", "gettext-rs", - "lazy_static", + "rspolib", ] [[package]] name = "unicode-ident" -version = "1.0.12" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" +checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512" [[package]] -name = "utf8parse" +name = "unicode-linebreak" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f" + +[[package]] +name = "unicode-width" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" +checksum = "4a1a07cc7db3810833284e8d372ccdc6da29741639ecc70c9ec107df0fa6154c" + +[[package]] +name = "utf8parse" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" + +[[package]] +name = "walkdir" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" +dependencies = [ + "same-file", + "winapi-util", +] [[package]] name = "wasm-bindgen" -version = "0.2.91" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1e124130aee3fb58c5bdd6b639a0509486b0338acaaae0c84a5124b0f588b7f" +checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5" dependencies = [ "cfg-if", + "once_cell", + "rustversion", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.91" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9e7e1900c352b609c8488ad12639a311045f40a35491fb69ba8c12f758af70b" +checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6" dependencies = [ "bumpalo", "log", - "once_cell", "proc-macro2", "quote", "syn", @@ -501,9 +856,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.91" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b30af9e2d358182b5c7449424f017eba305ed32a7010509ede96cdc4696c46ed" +checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -511,9 +866,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.91" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "642f325be6301eb8107a83d12a8ac6c1e1c54345a7ef1a9261962dfefda09e66" +checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de" dependencies = [ "proc-macro2", "quote", @@ -524,9 +879,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.91" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f186bd2dcf04330886ce82d6f33dd75a7bfcf69ecf5763b89fcde53b6ac9838" +checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "web-sys" +version = "0.3.77" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33b6dd2ef9186f1f2072e409e99cd22a975331a6b3591b12c764e0e55c60d5d2" +dependencies = [ + "js-sys", + "wasm-bindgen", +] [[package]] name = "winapi" @@ -545,6 +913,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] +name = "winapi-util" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" +dependencies = [ + "windows-sys", +] + +[[package]] name = "winapi-x86_64-pc-windows-gnu" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -552,31 +929,82 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows-core" -version = "0.52.0" +version = "0.61.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" +checksum = "c0fdd3ddb90610c7638aa2b3a3ab2904fb9e5cdbecc643ddb3647212781c4ae3" dependencies = [ - "windows-targets", + "windows-implement", + "windows-interface", + "windows-link", + "windows-result", + "windows-strings", +] + +[[package]] +name = "windows-implement" +version = "0.60.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a47fddd13af08290e67f4acabf4b459f647552718f683a7b415d290ac744a836" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "windows-interface" +version = "0.59.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd9211b69f8dcdfa817bfd14bf1c97c9188afa36f4750130fcdf3f400eca9fa8" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "windows-link" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a" + +[[package]] +name = "windows-result" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56f42bd332cc6c8eac5af113fc0c1fd6a8fd2aa08a0119358686e5160d0586c6" +dependencies = [ + "windows-link", +] + +[[package]] +name = "windows-strings" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56e6c93f3a0c3b36176cb1327a4958a0353d5d166c2a35cb268ace15e91d3b57" +dependencies = [ + "windows-link", ] [[package]] name = "windows-sys" -version = "0.52.0" +version = "0.59.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" dependencies = [ "windows-targets", ] [[package]] name = "windows-targets" -version = "0.52.3" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d380ba1dc7187569a8a9e91ed34b8ccfc33123bbacb8c0aed2d1ad7f3ef2dc5f" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ "windows_aarch64_gnullvm", "windows_aarch64_msvc", "windows_i686_gnu", + "windows_i686_gnullvm", "windows_i686_msvc", "windows_x86_64_gnu", "windows_x86_64_gnullvm", @@ -585,49 +1013,55 @@ dependencies = [ [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.3" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68e5dcfb9413f53afd9c8f86e56a7b4d86d9a2fa26090ea2dc9e40fba56c6ec6" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" [[package]] name = "windows_aarch64_msvc" -version = "0.52.3" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8dab469ebbc45798319e69eebf92308e541ce46760b49b18c6b3fe5e8965b30f" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" [[package]] name = "windows_i686_gnu" -version = "0.52.3" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a4e9b6a7cac734a8b4138a4e1044eac3404d8326b6c0f939276560687a033fb" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" [[package]] name = "windows_i686_msvc" -version = "0.52.3" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28b0ec9c422ca95ff34a78755cfa6ad4a51371da2a5ace67500cf7ca5f232c58" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" [[package]] name = "windows_x86_64_gnu" -version = "0.52.3" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "704131571ba93e89d7cd43482277d6632589b18ecf4468f591fbae0a8b101614" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.3" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42079295511643151e98d61c38c0acc444e52dd42ab456f7ccfd5152e8ecf21c" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" [[package]] name = "windows_x86_64_msvc" -version = "0.52.3" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0770833d60a970638e989b3fa9fd2bb1aaadcf88963d1659fd7d9990196ed2d6" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "xtr" -version = "0.1.9" +version = "0.1.11" dependencies = [ "anyhow", "chrono", diff --git a/pkgs/misc/xtr/default.nix b/pkgs/misc/xtr/default.nix @@ -6,15 +6,15 @@ libiconv, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "xtr"; - version = "0.1.9"; + version = "0.1.11"; src = fetchFromGitHub { owner = "woboq"; repo = "tr"; - tag = "v${version}"; - hash = "sha256-Un7p8n0+rSyDzEaUGuFXXWUDShR6AZgIYza40ahdZU8="; + tag = "v${finalAttrs.version}"; + hash = "sha256-ob5vGM/YeD8JLiNX8UtYBDr5qTEaPuuZfJ+SC+jiDXA="; }; cargoLock.lockFile = ./Cargo.lock; @@ -41,4 +41,4 @@ rustPlatform.buildRustPackage rec { maintainers = [ lib.maintainers.sikmir ]; mainProgram = "xtr"; }; -} +}) diff --git a/pkgs/misc/youtimetrack/default.nix b/pkgs/misc/youtimetrack/default.nix @@ -4,14 +4,14 @@ buildGoModule, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "youtimetrack"; version = "0.1.1"; src = fetchFromGitHub { owner = "bullshitsoftware"; repo = "youtimetrack"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-MZzXeCMlSLriDKg8yqeOzJBA5T47ImKjr+Mdu/wUjzU="; }; @@ -25,4 +25,4 @@ buildGoModule rec { license = lib.licenses.wtfpl; maintainers = [ lib.maintainers.sikmir ]; }; -} +}) diff --git a/pkgs/mqtt/akasa/default.nix b/pkgs/mqtt/akasa/default.nix @@ -7,14 +7,14 @@ perl, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "akasa"; version = "0.1.1"; src = fetchFromGitHub { owner = "akasamq"; repo = "akasa"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-ff5B8vJ0r0VGf72oiEUHLI1SbuNupBQ+w59MqVZO8/Q="; }; @@ -32,5 +32,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/akasamq/akasa"; license = lib.licenses.mit; maintainers = [ lib.maintainers.sikmir ]; + mainProgram = "akasa"; }; -} +}) diff --git a/pkgs/mqtt/comqtt/default.nix b/pkgs/mqtt/comqtt/default.nix @@ -4,18 +4,18 @@ buildGoModule, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "comqtt"; - version = "2.6.0"; + version = "2.6.1"; src = fetchFromGitHub { owner = "wind-c"; repo = "comqtt"; - tag = "v${version}"; - hash = "sha256-h8mHneZisky62axAkT0WwR89g76uIqoW+lit7siaJew="; + tag = "v${finalAttrs.version}"; + hash = "sha256-FUdOzJ2COMrzU4C/xYblrUsW0SzYhESG68DF8Dg1KMM="; }; - vendorHash = "sha256-PHwLKuFweQcGgnjq/L7bOTd0czYvw2YeVmlVFCafPMU="; + vendorHash = "sha256-aw9sdkDaa2Z1ZrJ38RxilRRnMMMnWRzBrNIq58ia7zE="; subPackages = [ "cmd/single" @@ -34,5 +34,6 @@ buildGoModule rec { homepage = "https://github.com/wind-c/comqtt"; license = lib.licenses.mit; maintainers = [ lib.maintainers.sikmir ]; + mainProgram = "comqtt"; }; -} +}) diff --git a/pkgs/mqtt/go-mqtt-to-influxdb/default.nix b/pkgs/mqtt/go-mqtt-to-influxdb/default.nix @@ -4,14 +4,14 @@ buildGoModule, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "go-mqtt-to-influxdb"; version = "0.0.7"; src = fetchFromGitHub { owner = "elgohr"; repo = "mqtt-to-influxdb"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-wO/TS+J68UvnadeMqm3xzZ/qv7gitW3Hi84v32UlZKI="; }; @@ -23,5 +23,6 @@ buildGoModule rec { homepage = "https://github.com/elgohr/mqtt-to-influxdb"; license = lib.licenses.mit; maintainers = [ lib.maintainers.sikmir ]; + mainProgram = "mqtt-to-influxdb"; }; -} +}) diff --git a/pkgs/mqtt/hmq/default.nix b/pkgs/mqtt/hmq/default.nix @@ -4,14 +4,14 @@ buildGoModule, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "hmq"; version = "1.5.6"; src = fetchFromGitHub { owner = "fhmq"; repo = "hmq"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-vBsUDKrs7add8gFF6dMK5WK8irfWowCrRdB3N4Aegwg="; }; @@ -27,5 +27,6 @@ buildGoModule rec { homepage = "https://github.com/fhmq/hmq"; license = lib.licenses.asl20; maintainers = [ lib.maintainers.sikmir ]; + mainProgram = "hmq"; }; -} +}) diff --git a/pkgs/mqtt/ioxy/default.nix b/pkgs/mqtt/ioxy/default.nix @@ -4,7 +4,7 @@ buildGoModule, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "ioxy"; version = "0-unstable-2023-08-20"; @@ -15,7 +15,7 @@ buildGoModule rec { hash = "sha256-j3qKlR0dwu0ZHc38JMGUjwVpN2s16ZIiRU8W+lI/X0s="; }; - sourceRoot = "${src.name}/ioxy"; + sourceRoot = "${finalAttrs.src.name}/ioxy"; vendorHash = "sha256-VWw9yuwNnJYvIvl6ov24An867koyzPPbqNg0VIXCJiM="; @@ -24,5 +24,6 @@ buildGoModule rec { homepage = "https://github.com/NVISOsecurity/IOXY"; license = lib.licenses.gpl3; maintainers = [ lib.maintainers.sikmir ]; + mainProgram = "ioxy"; }; -} +}) diff --git a/pkgs/mqtt/mochi/default.nix b/pkgs/mqtt/mochi/default.nix @@ -4,15 +4,15 @@ buildGoModule, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "mochi"; - version = "2.7.7"; + version = "2.7.9"; src = fetchFromGitHub { owner = "mochi-mqtt"; repo = "server"; - tag = "v${version}"; - hash = "sha256-gwkiRNXsInD6m3TGC1qQlyMwbkqN+rl8KRZ6MOEp26E="; + tag = "v${finalAttrs.version}"; + hash = "sha256-ZdKaCzQsigf7G9uMthnm7n3fdyesZul+LNq6i+X8Yls="; }; vendorHash = "sha256-qxAl8cyT206jWhC2dEGRikDWmXs9PprmfyFp9nUBUVI="; @@ -29,5 +29,6 @@ buildGoModule rec { homepage = "https://github.com/mochi-mqtt/server"; license = lib.licenses.mit; maintainers = [ lib.maintainers.sikmir ]; + mainProgram = "mochi"; }; -} +}) diff --git a/pkgs/mqtt/mproxy/default.nix b/pkgs/mqtt/mproxy/default.nix @@ -4,15 +4,15 @@ buildGoModule, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "mproxy"; - version = "0.3.0"; + version = "0.2.3"; src = fetchFromGitHub { owner = "mainflux"; repo = "mproxy"; - tag = "v${version}"; - hash = "sha256-gjFAuYDOFslhfDN+uWY3RZroUDrMERvBGi+gTtl4eLo="; + tag = "v${finalAttrs.version}"; + hash = "sha256-ImZbgl+8W2ApqF5s70WGYVLbS1kN5VEXOO28LYtGozM="; }; vendorHash = null; @@ -27,5 +27,6 @@ buildGoModule rec { homepage = "https://github.com/mainflux/mproxy"; license = lib.licenses.asl20; maintainers = [ lib.maintainers.sikmir ]; + mainProgram = "mproxy"; }; -} +}) diff --git a/pkgs/mqtt/mqcontrol/default.nix b/pkgs/mqtt/mqcontrol/default.nix @@ -4,23 +4,24 @@ buildGoModule, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "mqcontrol"; - version = "0.5.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "albertnis"; repo = "mqcontrol"; - tag = "v${version}"; - hash = "sha256-rsmWrKOEJjd74ElsaR7Rk7FsY0wwSgG/AzYB5LcmWNQ="; + tag = "v${finalAttrs.version}"; + hash = "sha256-qztn2DSsna7VJnHPSQJn2vUVIAIOC+D4YLihcsagonk="; }; - vendorHash = "sha256-tuSrIq2DHMy2KY2z3ZMAwC28UGHrZifAWmOFx5Y4pKU="; + vendorHash = "sha256-oLko4fdABrcrSs/hm8p4ELvhzB/VgWvEjIlA3u7DCGk="; meta = { description = "Cross-platform utility to execute commands remotely using MQTT"; homepage = "https://github.com/albertnis/mqcontrol"; license = lib.licenses.free; maintainers = [ lib.maintainers.sikmir ]; + mainProgram = "mqcontrol"; }; -} +}) diff --git a/pkgs/mqtt/mqtt-proxy/default.nix b/pkgs/mqtt/mqtt-proxy/default.nix @@ -5,14 +5,14 @@ cyrus_sasl, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "mqtt-proxy"; version = "0.5.0"; src = fetchFromGitHub { owner = "grepplabs"; repo = "mqtt-proxy"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-odSVoBBjg4TGP5Jw+7p9+kTBR2JP1ZJUKR3lBcOjK4g="; }; @@ -23,7 +23,7 @@ buildGoModule rec { ldflags = [ "-s" "-w" - "-X github.com/prometheus/common/version.Version=${version}" + "-X github.com/prometheus/common/version.Version=${finalAttrs.version}" ]; meta = { @@ -31,5 +31,6 @@ buildGoModule rec { homepage = "https://github.com/grepplabs/mqtt-proxy"; #license = lib.licenses.cc-by-nc-nd-40; maintainers = [ lib.maintainers.sikmir ]; + mainProgram = "mqtt-proxy"; }; -} +}) diff --git a/pkgs/mqtt/mqtt-shell/default.nix b/pkgs/mqtt/mqtt-shell/default.nix @@ -4,14 +4,14 @@ buildGoModule, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "mqtt-shell"; version = "2.3.0"; src = fetchFromGitHub { owner = "rainu"; repo = "mqtt-shell"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-nyNNdlNC5AWJ9jTnBggUf4OVME3OPXWd1MAj2pWwQL4="; }; @@ -20,7 +20,7 @@ buildGoModule rec { ldflags = [ "-s" "-w" - "-X main.ApplicationVersion=${version}" + "-X main.ApplicationVersion=${finalAttrs.version}" ]; doCheck = false; @@ -30,5 +30,6 @@ buildGoModule rec { homepage = "https://github.com/rainu/mqtt-shell"; license = lib.licenses.mit; maintainers = [ lib.maintainers.sikmir ]; + mainProgram = "mqtt-shell"; }; -} +}) diff --git a/pkgs/mqtt/mqtt-stresser/default.nix b/pkgs/mqtt/mqtt-stresser/default.nix @@ -4,14 +4,14 @@ buildGoModule, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "mqtt-stresser"; version = "4"; src = fetchFromGitHub { owner = "inovex"; repo = "mqtt-stresser"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-4xcoqsbTDxpaR1T7KgkqqT7iOUh8k8GFHYTPoapfjJQ="; }; @@ -27,5 +27,6 @@ buildGoModule rec { homepage = "https://github.com/inovex/mqtt-stresser"; license = lib.licenses.asl20; maintainers = [ lib.maintainers.sikmir ]; + mainProgram = "mqtt-stresser"; }; -} +}) diff --git a/pkgs/mqtt/rumqtt/default.nix b/pkgs/mqtt/rumqtt/default.nix @@ -5,14 +5,14 @@ cmake, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "rumqtt"; version = "0.19.0"; src = fetchFromGitHub { owner = "bytebeamio"; repo = "rumqtt"; - tag = "rumqttd-${version}"; + tag = "rumqttd-${finalAttrs.version}"; hash = "sha256-3rDnJ1VsyGBDhjOq0Rd55WI1EbIo+17tcFZCoeJB3Kc="; }; @@ -27,5 +27,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/bytebeamio/rumqtt"; license = lib.licenses.asl20; maintainers = [ lib.maintainers.sikmir ]; + mainProgram = "rumqttd"; }; -} +}) diff --git a/pkgs/mqtt/volantmq/default.nix b/pkgs/mqtt/volantmq/default.nix @@ -4,14 +4,14 @@ buildGoModule, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "volantmq"; version = "0.4.0-rc.8"; src = fetchFromGitHub { owner = "VolantMQ"; repo = "volantmq"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-c/Ae3wYWzi7btzr8+ia6su7NPtvgjtkTxRyPRJduAcY="; }; @@ -26,7 +26,7 @@ buildGoModule rec { ldflags = [ "-s" "-w" - "-X main.version=${version}" + "-X main.version=${finalAttrs.version}" ]; postBuild = @@ -42,7 +42,7 @@ buildGoModule rec { in '' ${lib.concatMapStringsSep "\n" (plugin: '' - go build -buildmode=plugin -ldflags "${builtins.toString ldflags}" -o plugins/${plugin}.so + go build -buildmode=plugin -ldflags "${builtins.toString finalAttrs.ldflags}" -o plugins/${plugin}.so '') plugins} ''; @@ -55,5 +55,6 @@ buildGoModule rec { homepage = "https://github.com/VolantMQ/volantmq"; license = lib.licenses.asl20; maintainers = [ lib.maintainers.sikmir ]; + mainProgram = "volantmq"; }; -} +}) diff --git a/pkgs/nakarte/mapillary-render/default.nix b/pkgs/nakarte/mapillary-render/default.nix @@ -7,14 +7,14 @@ cairo, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "mapillary-render"; version = "1.1.0"; src = fetchFromGitHub { owner = "wladich"; repo = "mapillaryRender"; - tag = version; + tag = finalAttrs.version; hash = "sha256-B2yDjbvpaa9zjPG9yF64s0tJ/bPAH0sOYqY74+f/TYE="; }; @@ -36,4 +36,4 @@ buildGoModule rec { maintainers = [ lib.maintainers.sikmir ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/osm/abstreet/default.nix b/pkgs/osm/abstreet/default.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "abstreet"; version = "0.3.49"; src = fetchFromGitHub { owner = "a-b-street"; repo = "abstreet"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-6Gggio3/4QQXMoQoipIkb0rUaa+TarFmj+lJs1avFOE="; }; @@ -47,4 +47,4 @@ rustPlatform.buildRustPackage rec { maintainers = [ lib.maintainers.sikmir ]; broken = true; }; -} +}) diff --git a/pkgs/osm/osm-lump-ways/default.nix b/pkgs/osm/osm-lump-ways/default.nix @@ -4,19 +4,19 @@ fetchFromGitHub, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "osm-lump-ways"; - version = "2.2.0"; + version = "3.1.0"; src = fetchFromGitHub { owner = "amandasaurus"; repo = "osm-lump-ways"; - tag = "v${version}"; - hash = "sha256-gHGszPt3rgzm3Q4T3nSBE6y92ovBxa7AUDHvF6/UAE4="; + tag = "v${finalAttrs.version}"; + hash = "sha256-37DdtTPnzmfIjfTiQhOJwq7ieMTpKiOpmEJG7UXaxQo="; }; useFetchCargoVendor = true; - cargoHash = "sha256-nskIJ4dOih2OsDlGOhL1xTsMwcwY8H8Z32hQZmzgazM="; + cargoHash = "sha256-JqHm2oKWFuHrayU5pnDxrrfbi84tmMecRDCrq7fQFuw="; meta = { description = "Group OSM ways together based on topology & tags"; @@ -27,4 +27,4 @@ rustPlatform.buildRustPackage rec { ]; maintainers = [ lib.maintainers.sikmir ]; }; -} +}) diff --git a/pkgs/osm/osmptparser/default.nix b/pkgs/osm/osmptparser/default.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "osmptparser"; version = "2.2.0"; src = fetchFromGitHub { owner = "cualbondi"; repo = "osmptparser"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-/Uokg1CPn/ut2k0u/QCBAFECOctgHkUZMVMgcvkDYnw="; }; @@ -27,4 +27,4 @@ rustPlatform.buildRustPackage rec { maintainers = [ lib.maintainers.sikmir ]; mainProgram = "osmptparser"; }; -} +}) diff --git a/pkgs/radio/adsb_deku/default.nix b/pkgs/radio/adsb_deku/default.nix @@ -5,14 +5,14 @@ fetchFromGitHub, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "adsb_deku"; version = "2025.05.03"; src = fetchFromGitHub { owner = "rsadsb"; repo = "adsb_deku"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-MmCaH9SNxuDLOJGd/lc68fYnZyg01S7m9u9cVQxmBTw="; }; @@ -26,4 +26,4 @@ rustPlatform.buildRustPackage rec { maintainers = [ lib.maintainers.sikmir ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/radio/dump1090_rs/default.nix b/pkgs/radio/dump1090_rs/default.nix @@ -6,14 +6,14 @@ soapysdr, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "dump1090_rs"; version = "0.8.1"; src = fetchFromGitHub { owner = "rsadsb"; repo = "dump1090_rs"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-YMi+DaLORiy36rl02sKoCanI1hQSh4eRKJdrruxvMWg="; }; @@ -32,4 +32,4 @@ rustPlatform.buildRustPackage rec { platforms = lib.platforms.unix; broken = true; # Unable to find libclang }; -} +}) diff --git a/pkgs/radio/rtltcp/default.nix b/pkgs/radio/rtltcp/default.nix @@ -8,14 +8,14 @@ systemd, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "rtltcp"; version = "0.1.1"; src = fetchFromGitHub { owner = "niclashoyer"; repo = "rtltcp"; - tag = version; + tag = finalAttrs.version; hash = "sha256-mGBU4O4RMTZPoxfg1zr2WeiZsfnIba6VHYX3FYTY+OY="; }; @@ -41,4 +41,4 @@ rustPlatform.buildRustPackage rec { platforms = lib.platforms.linux; skip.ci = stdenv.isDarwin; }; -} +})