commit 820e68c02e59b7026441e8ec709b2c1c62c515a6 parent 2302750fccacee5055948b0e31672884eaddc759 Author: Nikolay Korotkiy <sikmir@disroot.org> Date: Sun, 25 Feb 2024 03:31:18 +0400 Up Diffstat:
83 files changed, 164 insertions(+), 150 deletions(-)
diff --git a/pkgs/default.nix b/pkgs/default.nix @@ -108,7 +108,9 @@ lib.makeScope newScope ( jsonseq = callPackage ./development/python-modules/jsonseq { }; large-image = callPackage ./development/python-modules/large-image { }; large-image-source-gdal = (callPackage ./development/python-modules/large-image/sources.nix { }).source-gdal; - modbus_tk = callPackage ./development/python-modules/modbus_tk { }; + modbus_tk = callPackage ./development/python-modules/modbus_tk { + python3Packages = pkgs.python310Packages; + }; portolan = callPackage ./development/python-modules/portolan { }; pymbtiles = callPackage ./development/python-modules/pymbtiles { }; pytest-mp = callPackage ./development/python-modules/pytest-mp { }; @@ -376,7 +378,9 @@ lib.makeScope newScope ( modbus-tools = callPackage ./misc/modbus-tools { inherit (darwin.apple_sdk.frameworks) IOKit; }; - modbus_sim_cli = callPackage ./misc/modbus_sim_cli { }; + modbus_sim_cli = callPackage ./misc/modbus_sim_cli { + python3Packages = pkgs.python310Packages; + }; morse-talk = callPackage ./misc/morse-talk { }; musig = callPackage ./misc/musig { }; mysql-to-sqlite3 = callPackage ./misc/mysql-to-sqlite3 { }; diff --git a/pkgs/development/python-modules/modbus_tk/default.nix b/pkgs/development/python-modules/modbus_tk/default.nix @@ -2,19 +2,19 @@ python3Packages.buildPythonPackage rec { pname = "modbus_tk"; - version = "2022-07-28"; + version = "1.1.1"; src = fetchFromGitHub { - owner = "dhoomakethu"; + owner = "ljean"; repo = "modbus-tk"; - rev = "9fe168ca06164a4887c85a272c616a86871dddd8"; - hash = "sha256-2fHYFQIeYdtpx+j4S7LRwyG9NLPQ4T/0SgYaQDMQsFA="; + rev = version; + hash = "sha256-zikfVMFdlOJvuKVQGEsK03i58X6BGFsGWGrGOJZGC0g="; }; propagatedBuildInputs = with python3Packages; [ pyserial ]; meta = with lib; { - description = "Modbus testkit"; + description = "Implementation of modbus protocol in python"; inherit (src.meta) homepage; license = licenses.lgpl2; maintainers = [ maintainers.sikmir ]; diff --git a/pkgs/development/python-modules/pymbtiles/default.nix b/pkgs/development/python-modules/pymbtiles/default.nix @@ -2,7 +2,7 @@ python3Packages.buildPythonPackage rec { pname = "pymbtiles"; - version = "2021-02-16"; + version = "0.5.0-unstable-2021-02-16"; src = fetchFromGitHub { owner = "consbio"; diff --git a/pkgs/garmin/ocad2mp/default.nix b/pkgs/garmin/ocad2mp/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation { pname = "ocad2mp"; - version = "2011-01-26"; + version = "1.14-unstable-2011-01-26"; src = fetchsvn { url = "svn://svn.code.sf.net/p/ocad2mp/code/trunk/ocad2mp"; diff --git a/pkgs/gemini/gemcert/default.nix b/pkgs/gemini/gemcert/default.nix @@ -1,11 +1,13 @@ -{ lib, buildGoPackage, fetchgit }: +{ lib, buildGoPackage, fetchFromGitea }: buildGoPackage { pname = "gemcert"; - version = "2020-12-08"; + version = "2020-08-01"; - src = fetchgit { - url = "https://tildegit.org/solderpunk/gemcert"; + src = fetchFromGitea { + domain = "tildegit.org"; + owner = "solderpunk"; + repo = "gemcert"; rev = "fc14deb2751274d2df01f8d5abef023ec7e12a8c"; hash = "sha256-za3pS6WlOJ+NKqhyCfhlj7gH4U5yFXtJ6gLta7WXhb0="; }; @@ -18,5 +20,6 @@ buildGoPackage { license = licenses.bsd2; maintainers = [ maintainers.sikmir ]; platforms = platforms.unix; + mainProgram = "gemcert"; }; } diff --git a/pkgs/gemini/gemini-ipfs-gateway/default.nix b/pkgs/gemini/gemini-ipfs-gateway/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "gemini-ipfs-gateway"; - version = "2023-10-19"; + version = "0-unstable-2023-10-19"; src = fetchFromSourcehut { owner = "~hsanjuan"; diff --git a/pkgs/gemini/geminid/default.nix b/pkgs/gemini/geminid/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "geminid"; - version = "2022-04-15"; + version = "0-unstable-2022-04-15"; src = fetchFromGitHub { owner = "jovoro"; diff --git a/pkgs/gemini/gmnigit/default.nix b/pkgs/gemini/gmnigit/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "gmnigit"; - version = "2022-01-10"; + version = "0-unstable-2022-01-10"; src = fetchFromSourcehut { owner = "~kornellapacz"; @@ -18,5 +18,6 @@ buildGoModule rec { inherit (src.meta) homepage; license = licenses.mit; maintainers = [ maintainers.sikmir ]; + mainProgram = "gmnigit"; }; } diff --git a/pkgs/gemini/gssg/default.nix b/pkgs/gemini/gssg/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "gssg"; - version = "2022-03-31"; + version = "0-unstable-2023-05-29"; src = fetchFromSourcehut { owner = "~gsthnz"; repo = "gssg"; - rev = "a842c013b9fa044b720b32ee015fedcde3f24ab1"; - hash = "sha256-OwS6nUQ8AUbzm8ibckbvyfjdxT+KYyuDzcJAR95wUoU="; + rev = "fc755f281d750d0b022689d58d0f32e6799dfef8"; + hash = "sha256-m0bVH6upLSA1dcxds3VJFFaSYs7YoMuoAmEe5qAUTmw="; }; vendorHash = "sha256-NxfZbwKo8SY0XfWivQ42cNqIbJQ1EBsxPFr70ZU9G6E="; @@ -18,5 +18,6 @@ buildGoModule rec { inherit (src.meta) homepage; license = licenses.gpl3Only; maintainers = [ maintainers.sikmir ]; + mainProgram = "gssg"; }; } diff --git a/pkgs/gemini/kineto/default.nix b/pkgs/gemini/kineto/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "kineto"; - version = "2021-11-04"; + version = "0-unstable-2021-11-04"; src = fetchFromSourcehut { owner = "~sircmpwn"; @@ -18,5 +18,6 @@ buildGoModule rec { inherit (src.meta) homepage; license = licenses.gpl3; maintainers = [ maintainers.sikmir ]; + mainProgram = "kineto"; }; } diff --git a/pkgs/gemini/py-gmi2html/default.nix b/pkgs/gemini/py-gmi2html/default.nix @@ -2,7 +2,7 @@ python3Packages.buildPythonApplication rec { pname = "gmi2html"; - version = "2022-02-16"; + version = "1.0-unstable-2022-02-16"; src = fetchFromGitea { domain = "notabug.org"; diff --git a/pkgs/geospatial/datamaps/default.nix b/pkgs/geospatial/datamaps/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "datamaps"; - version = "2014-08-19"; + version = "0-unstable-2014-08-19"; src = fetchFromGitHub { owner = "e-n-f"; diff --git a/pkgs/geospatial/go-staticmaps/default.nix b/pkgs/geospatial/go-staticmaps/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "go-staticmaps"; - version = "2021-12-31"; + version = "0-unstable-2021-12-31"; src = fetchFromGitHub { owner = "flopp"; diff --git a/pkgs/geospatial/mbtiles2osmand/default.nix b/pkgs/geospatial/mbtiles2osmand/default.nix @@ -5,7 +5,7 @@ python3Packages.buildPythonApplication rec { pname = "mbtiles2osmand"; - version = "2021-01-01"; + version = "0-unstable-2021-01-01"; format = "other"; src = fetchFromGitHub { diff --git a/pkgs/geospatial/polyvectorization/default.nix b/pkgs/geospatial/polyvectorization/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "polyvectorization"; - version = "2019-08-23"; + version = "0-unstable-2019-08-23"; src = fetchFromGitHub { owner = "bmpix"; diff --git a/pkgs/geospatial/render_geojson/default.nix b/pkgs/geospatial/render_geojson/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "render_geojson"; - version = "2018-07-11"; + version = "0-unstable-2018-07-11"; src = fetchFromGitHub { owner = "pedro-vicente"; diff --git a/pkgs/geospatial/tile-stitch/default.nix b/pkgs/geospatial/tile-stitch/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "tile-stitch"; - version = "2019-07-11"; + version = "0-unstable-2019-07-11"; src = fetchFromGitHub { owner = "e-n-f"; diff --git a/pkgs/gnss/gps-sdr-sim/default.nix b/pkgs/gnss/gps-sdr-sim/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "gps-sdr-sim"; - version = "2023-09-02"; + version = "0-unstable-2024-01-05"; src = fetchFromGitHub { owner = "osqzss"; repo = "gps-sdr-sim"; - rev = "e7b948ff496917ade58ab7f59d448b7ee6e55f43"; - hash = "sha256-jPku4QjCDGZvuhkYSI4I6HMlnjLHa245rjzAQ1DkLb4="; + rev = "4fdf282763867aeede0c8308bfa65d01e56c5ec2"; + hash = "sha256-Txc5iwj9gzNyzIMFS4h+wdQTif7dJ67IsCl3IfF2wGE="; }; makeFlags = [ "CC:=$(CC)" ]; diff --git a/pkgs/gnss/visualgps/default.nix b/pkgs/gnss/visualgps/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation { pname = "visualgps"; - version = "2020-03-29"; + version = "1.0-unstable-2020-03-29"; src = fetchFromGitHub { owner = "VisualGPS"; diff --git a/pkgs/gpx/garta/default.nix b/pkgs/gpx/garta/default.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { pname = "garta"; - version = "2021-02-08"; + version = "0.1.0-unstable-2021-02-08"; src = fetchFromGitLab { owner = "timosaarinen"; diff --git a/pkgs/gpx/geojson2dm/default.nix b/pkgs/gpx/geojson2dm/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation { pname = "geojson2dm"; - version = "2021-08-25"; + version = "0-unstable-2021-08-25"; src = fetchFromSourcehut { owner = "~sikmir"; diff --git a/pkgs/gpx/gpx-cmd-tools/default.nix b/pkgs/gpx/gpx-cmd-tools/default.nix @@ -2,7 +2,7 @@ python3Packages.buildPythonApplication rec { pname = "gpx-cmd-tools"; - version = "2020-08-08"; + version = "0-unstable-2020-08-08"; src = fetchFromGitHub { owner = "tkrajina"; diff --git a/pkgs/gpx/gpx-converter/default.nix b/pkgs/gpx/gpx-converter/default.nix @@ -2,19 +2,21 @@ python3Packages.buildPythonApplication rec { pname = "gpx-converter"; - version = "2021-11-19"; + version = "0-unstable-2023-04-07"; src = fetchFromGitHub { owner = "nidhaloff"; repo = "gpx-converter"; - rev = "77790e9258ce845daf640f25614cd2e51cef7eb6"; - hash = "sha256-T7CxFeWoK7lR0oL4kIQoKqirw5oLnh6+SBC5fcnaANc="; + rev = "0dac5d7eaf83d7bb99631b52d4d210dc010e4b60"; + hash = "sha256-bT94phfkJiOQ8rZn783qOmIph6ck27z18rQQby9uEeg="; }; propagatedBuildInputs = with python3Packages; [ gpxpy numpy pandas ]; nativeCheckInputs = with python3Packages; [ pytestCheckHook pytest-runner ]; + disabledTests = [ "test_gpx_to_dictionary" ]; + meta = with lib; { description = "Python package for manipulating gpx files and easily convert gpx to other different formats"; inherit (src.meta) homepage; diff --git a/pkgs/gpx/gpx-interpolate/default.nix b/pkgs/gpx/gpx-interpolate/default.nix @@ -1,15 +1,15 @@ { lib, fetchFromGitHub, python3Packages }: python3Packages.buildPythonApplication rec { - pname = "gpx_interpolate"; - version = "2021-01-24"; + pname = "gpx-interpolate"; + version = "0-unstable-2023-10-28"; format = "other"; src = fetchFromGitHub { owner = "remisalmon"; - repo = "gpx_interpolate"; - rev = "24236e45e3d8baa0662c329b735b79a17e84c1bd"; - hash = "sha256-bN8ED3H4FXjfG9q7sIC7UmhvIFCgkbueUSFW/Q7uKD4="; + repo = "gpx-interpolate"; + rev = "00af3c636d566d049f6a140c093af4e91d0482d5"; + hash = "sha256-cCiRXpX6qj2o+vPs3V0/+UwnnHKvDFOgTbCV347BKkc="; }; propagatedBuildInputs = with python3Packages; [ gpxpy scipy numpy ]; @@ -17,17 +17,19 @@ python3Packages.buildPythonApplication rec { dontUseSetuptoolsBuild = true; checkPhase = '' - ${python3Packages.python.interpreter} -m doctest -o IGNORE_EXCEPTION_DETAIL -f test/test.txt + ${python3Packages.python.interpreter} -m doctest -o IGNORE_EXCEPTION_DETAIL -f tests/tests.txt ''; installPhase = '' - install -Dm755 gpx_interpolate.py $out/bin/gpx_interpolate + sed -i '1i #!/usr/bin/env python3' gpx_interpolate.py + install -Dm755 gpx_interpolate.py $out/bin/gpx-interpolate ''; meta = with lib; { - description = "Python script to interpolate GPX files using linear or spline interpolation"; + description = "Python script to interpolate GPX files using piecewise cubic Hermite splines"; inherit (src.meta) homepage; license = licenses.mit; maintainers = [ maintainers.sikmir ]; + mainProgram = "gpx-interpolate"; }; } diff --git a/pkgs/gpx/gpx-layer/default.nix b/pkgs/gpx/gpx-layer/default.nix @@ -2,7 +2,7 @@ buildPerlPackage rec { pname = "gpx-layer"; - version = "2013-09-19"; + version = "0-unstable-2013-09-19"; src = fetchFromGitHub { owner = "e-n-f"; diff --git a/pkgs/gpx/gpx2yaml/default.nix b/pkgs/gpx/gpx2yaml/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation { pname = "gpx2yaml"; - version = "2021-08-19"; + version = "0-unstable-2021-08-19"; src = fetchFromSourcehut { owner = "~sikmir"; diff --git a/pkgs/gpx/gpxlib/default.nix b/pkgs/gpx/gpxlib/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation { pname = "gpxlib"; - version = "2021-02-16"; + version = "0-unstable-2021-02-16"; src = fetchFromGitHub { owner = "irdvo"; diff --git a/pkgs/gpx/gpxtools/default.nix b/pkgs/gpx/gpxtools/default.nix @@ -1,13 +1,15 @@ -{ lib, stdenv, fetchgit, cmake, expat, exiv2 }: +{ lib, stdenv, fetchFromGitea, cmake, expat, exiv2 }: stdenv.mkDerivation { pname = "gpxtools"; - version = "2022-01-11"; + version = "0-unstable-2023-08-13"; - src = fetchgit { - url = "https://notabug.org/irdvo/gpxtools.git"; - rev = "45b7b8f5a42d8426f2fc998d017d2f224943f959"; - hash = "sha256-hhvxQ+2jOvY0OVt8iKQ9XcHgRN4ECywV1W1fKV7Q9Mo="; + src = fetchFromGitea { + domain = "notabug.org"; + owner = "irdvo"; + repo = "gpxtools"; + rev = "bad31cc7e278c835db196ed4013551034c606f09"; + hash = "sha256-QFjHlUByD4iqEUDYhl3dcol3B8sGV+BLN7IumqQXxdA="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/gpx/gpxtrackposter/default.nix b/pkgs/gpx/gpxtrackposter/default.nix @@ -2,7 +2,7 @@ python3Packages.buildPythonApplication rec { pname = "gpxtrackposter"; - version = "2023-02-19"; + version = "0-unstable-2023-02-19"; src = fetchFromGitHub { owner = "flopp"; diff --git a/pkgs/linguistics/gdcv/default.nix b/pkgs/linguistics/gdcv/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "gdcv"; - version = "2023-08-27"; + version = "0-unstable-2023-08-27"; src = fetchFromGitHub { owner = "konstare"; diff --git a/pkgs/linguistics/ttb/default.nix b/pkgs/linguistics/ttb/default.nix @@ -2,7 +2,7 @@ rustPlatform.buildRustPackage rec { pname = "ttb"; - version = "2022-12-14"; + version = "0-unstable-2022-12-14"; src = fetchFromGitHub { owner = "TheOpenDictionary"; diff --git a/pkgs/misc/csvtools/default.nix b/pkgs/misc/csvtools/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "csvtools"; - version = "2019-08-03"; + version = "0-unstable-2023-10-10"; src = fetchFromGitHub { owner = "DavyLandman"; repo = "csvtools"; - rev = "efd3ef1c94c26c673e958ecb045056bfc2c7b4f3"; - hash = "sha256-hNEI5vQ3j6zyn31H2G+0xywdff7uaXi0kv2q4Hjiimg="; + rev = "0162d828ec7500cf01080f73fd28387a9cdada92"; + hash = "sha256-avdnbdKh/GFibIFfKmmLLcZOvijnQmJb5VNgaZA+NiY="; }; buildInputs = [ pcre ]; diff --git a/pkgs/misc/dns-filter/default.nix b/pkgs/misc/dns-filter/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "dns-filter"; - version = "2021-04-14"; + version = "0-unstable-2021-04-14"; src = fetchFromGitHub { owner = "depler"; diff --git a/pkgs/misc/docx2csv/default.nix b/pkgs/misc/docx2csv/default.nix @@ -2,7 +2,7 @@ python3Packages.buildPythonApplication rec { pname = "docx2csv"; - version = "2023-10-11"; + version = "0-unstable-2023-10-11"; src = fetchFromGitHub { owner = "ivbeg"; @@ -23,6 +23,5 @@ python3Packages.buildPythonApplication rec { inherit (src.meta) homepage; license = licenses.bsd3; maintainers = [ maintainers.sikmir ]; - broken = true; # python-docx }; } diff --git a/pkgs/misc/freeopcua/default.nix b/pkgs/misc/freeopcua/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "freeopcua"; - version = "2023-05-30"; + version = "0-unstable-2023-05-30"; src = fetchFromGitHub { owner = "FreeOpcUa"; diff --git a/pkgs/misc/gaiagpsclient/default.nix b/pkgs/misc/gaiagpsclient/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "gaiagpsclient"; - version = "2021-06-22"; + version = "0-unstable-2023-08-26"; src = fetchFromGitHub { owner = "kk7ds"; repo = "gaiagpsclient"; - rev = "db3c8d197fa00d0bededa4ae96f06c39d7a85abc"; - hash = "sha256-yA3reda+ik3koHdb4OXDERfI01D7iEqgem8+XFn4YOM="; + rev = "1ba0ea4266260ff979c7df483381d01d29fae25d"; + hash = "sha256-qCpyJfa8TeMfawf1+wCFu04sYHfDejyStNl6Q6XEUeA="; }; propagatedBuildInputs = with python3Packages; [ @@ -29,5 +29,6 @@ python3Packages.buildPythonApplication rec { inherit (src.meta) homepage; license = licenses.gpl3Only; maintainers = [ maintainers.sikmir ]; + mainProgram = "gaiagps"; }; } diff --git a/pkgs/misc/miband4/default.nix b/pkgs/misc/miband4/default.nix @@ -2,7 +2,7 @@ python3Packages.buildPythonApplication rec { pname = "miband4"; - version = "2022-10-07"; + version = "0-unstable-2022-10-07"; format = "other"; src = fetchFromGitHub { diff --git a/pkgs/misc/modbus_sim_cli/default.nix b/pkgs/misc/modbus_sim_cli/default.nix @@ -2,7 +2,7 @@ python3Packages.buildPythonApplication rec { pname = "modbus_sim_cli"; - version = "2019-02-27"; + version = "0-unstable-2019-02-27"; src = fetchFromGitHub { owner = "dhoomakethu"; @@ -36,6 +36,5 @@ python3Packages.buildPythonApplication rec { inherit (src.meta) homepage; license = licenses.mit; maintainers = [ maintainers.sikmir ]; - broken = true; }; } diff --git a/pkgs/misc/nanodns/default.nix b/pkgs/misc/nanodns/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "nanodns"; - version = "2021-10-29"; + version = "0-unstable-2021-10-29"; src = fetchFromGitHub { owner = "Sina-Ghaderi"; diff --git a/pkgs/misc/repolocli/default.nix b/pkgs/misc/repolocli/default.nix @@ -2,7 +2,7 @@ rustPlatform.buildRustPackage rec { pname = "repolocli"; - version = "2021-04-06"; + version = "0-unstable-2021-04-06"; src = fetchFromSourcehut { owner = "~matthiasbeyer"; diff --git a/pkgs/misc/shellprof/default.nix b/pkgs/misc/shellprof/default.nix @@ -2,7 +2,7 @@ python3Packages.buildPythonApplication rec { pname = "shellprof"; - version = "2021-04-27"; + version = "0-unstable-2021-04-27"; format = "other"; src = fetchFromGitHub { diff --git a/pkgs/misc/socketcand/default.nix b/pkgs/misc/socketcand/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "socketcand"; - version = "2023-12-06"; + version = "0.6.1-unstable-2023-12-06"; src = fetchFromGitHub { owner = "linux-can"; diff --git a/pkgs/misc/tcvt/default.nix b/pkgs/misc/tcvt/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation { pname = "tcvt"; - version = "2021-01-22"; + version = "0-unstable-2022-09-28"; src = fetchgit { url = "git://git.subdivi.de/~helmut/tcvt.git"; - rev = "2747b2ba0dff190380f9eb7a078c94192dd310f1"; - hash = "sha256-/QT5/NfaIpPKR88Byo7HgS6qs3Zwq06jiMCTRR/tcBU="; + rev = "4b6275c0617628c306c42b98b9c7f2107bf64d48"; + hash = "sha256-32oCtTOYFoPKHgJ7RzamcSW5H+Z1WR+iQK02yC/62Sk="; }; buildInputs = [ python3 ]; diff --git a/pkgs/misc/telegram-send/default.nix b/pkgs/misc/telegram-send/default.nix @@ -2,7 +2,7 @@ python3Packages.buildPythonApplication rec { pname = "telegram-send"; - version = "2023-10-07"; + version = "0-unstable-2023-10-07"; src = fetchFromGitHub { owner = "rahiel"; diff --git a/pkgs/misc/tlstunnel/default.nix b/pkgs/misc/tlstunnel/default.nix @@ -2,7 +2,7 @@ ocamlPackages.buildDunePackage rec { pname = "tlstunnel"; - version = "2024-01-10"; + version = "0-unstable-2024-01-10"; src = fetchFromGitHub { owner = "robur-coop"; diff --git a/pkgs/misc/turbo/default.nix b/pkgs/misc/turbo/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "turbo"; - version = "2024-01-24"; + version = "0-unstable-2024-02-05"; src = fetchFromGitHub { owner = "magiblot"; repo = "turbo"; - rev = "f71a08e0adbfe7da38a93c4c02a5ae4dde60797f"; - hash = "sha256-WgovWo3BuRjgb7jO+AcwAWrbB2z4SGeWBVGh5yNTIFE="; + rev = "3251358bb06e277309b9ae678f1c88c315c7f856"; + hash = "sha256-5EdVrzu9MxXTfQSfenjPQJ8pBizRAhhAAxyA3aObCvU="; }; 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 = "2024-01-24"; + version = "0-unstable-2024-02-05"; src = fetchFromGitHub { owner = "magiblot"; repo = "tvision"; - rev = "0917f04206fcfa1973dc49547af74e7399241899"; - hash = "sha256-BWDMpHR7/ViKZtyZwLJEfgpHIUjkRfc/DRWiQTeo9ME="; + rev = "be6e64f85355c6c96b7c09174986fafb6a411c6a"; + hash = "sha256-ngI5VX2SwLdKYLqD65/B93ZhNhHZWaAkIRgF3LLaRxM="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/misc/wptools/default.nix b/pkgs/misc/wptools/default.nix @@ -2,7 +2,7 @@ python3Packages.buildPythonPackage rec { pname = "wptools"; - version = "2022-02-22"; + version = "0.4.17-unstable-2022-02-22"; src = fetchFromGitHub { owner = "siznax"; diff --git a/pkgs/mqtt/ioxy/default.nix b/pkgs/mqtt/ioxy/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "ioxy"; - version = "2023-08-20"; + version = "0-unstable-2023-08-20"; src = fetchFromGitHub { owner = "NVISOsecurity"; diff --git a/pkgs/mqtt/janus-mqtt-proxy/default.nix b/pkgs/mqtt/janus-mqtt-proxy/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "janus-mqtt-proxy"; - version = "2022-02-19"; + version = "0-unstable-2022-02-19"; src = fetchFromGitHub { owner = "phoenix-mstu"; diff --git a/pkgs/mqtt/mqtt-launcher/default.nix b/pkgs/mqtt/mqtt-launcher/default.nix @@ -2,7 +2,7 @@ python3Packages.buildPythonApplication rec { pname = "mqtt-launcher"; - version = "2021-09-17"; + version = "0-unstable-2021-09-17"; format = "other"; src = fetchFromGitHub { diff --git a/pkgs/nakarte/map-tiler/default.nix b/pkgs/nakarte/map-tiler/default.nix @@ -13,13 +13,13 @@ python3Packages.buildPythonApplication rec { pname = "map-tiler"; - version = "2022-08-06"; + version = "0-unstable-2022-08-06"; src = fetchFromGitHub { owner = "wladich"; repo = "map-tiler"; - rev = "28372c77f73282c234a236ad59672ed28721d88b"; - hash = "sha256-P5HXWCxxcGX/QRcRVsMAng/aZI0zBjkOgSEyVCjuAYg="; + rev = "5554d207730e2cbcb59004a50c83c9420769a49c"; + hash = "sha256-suBS0jCGX09mY2fc2UsWr1ptySZkA68Kp6iSIJQeWuA="; }; postPatch = '' @@ -54,6 +54,5 @@ python3Packages.buildPythonApplication rec { inherit (src.meta) homepage; license = licenses.free; maintainers = [ maintainers.sikmir ]; - broken = stdenv.isDarwin; }; } diff --git a/pkgs/nakarte/maprec/default.nix b/pkgs/nakarte/maprec/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonPackage rec { pname = "maprec"; - version = "2022-08-06"; + version = "0-unstable-2023-04-18"; src = fetchFromGitHub { owner = "wladich"; repo = "maprec"; - rev = "3332183a8010bceba564078cdb05ab6c02ac852e"; - hash = "sha256-2V1n6XEXPePA5YB8dKlBgTtbL2/2qG2KBdsHbekETXE="; + rev = "ccefe661659a30c1bd334710e5884256b945a042"; + hash = "sha256-jm7B5I5OxG3oVxq/AUzN2P1GPa5uQIx0TWMKgx47C28="; }; postPatch = '' diff --git a/pkgs/nakarte/ozi_map/default.nix b/pkgs/nakarte/ozi_map/default.nix @@ -2,7 +2,7 @@ python3Packages.buildPythonPackage rec { pname = "ozi_map"; - version = "2022-08-05"; + version = "0-unstable-2022-08-05"; src = fetchFromGitHub { owner = "wladich"; diff --git a/pkgs/nakarte/pyimagequant/default.nix b/pkgs/nakarte/pyimagequant/default.nix @@ -2,7 +2,7 @@ python3Packages.buildPythonPackage rec { pname = "pyimagequant"; - version = "2022-06-10"; + version = "0-unstable-2022-06-10"; src = fetchFromGitHub { owner = "wladich"; @@ -12,6 +12,11 @@ python3Packages.buildPythonPackage rec { fetchSubmodules = true; }; + postPatch = '' + # error: could not create 'build': File exists + rm BUILD + ''; + propagatedBuildInputs = with python3Packages; [ cython ]; pythonImportsCheck = [ "imagequant" ]; @@ -21,6 +26,5 @@ python3Packages.buildPythonPackage rec { inherit (src.meta) homepage; license = licenses.free; maintainers = [ maintainers.sikmir ]; - broken = stdenv.isDarwin; }; } diff --git a/pkgs/nakarte/thinplatespline/default.nix b/pkgs/nakarte/thinplatespline/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonPackage rec { pname = "thinplatespline"; - version = "2022-06-02"; + version = "0-unstable-2024-02-06"; src = fetchFromGitHub { owner = "wladich"; repo = "thinplatespline"; - rev = "acedd7aa9eef7f66a54df53a9596a0b4d95af92b"; - hash = "sha256-/RLcB+xq1U7AKx26brw4gG29AMJB1LedC+5MNbK/rxI="; + rev = "81f40c74663d9510ceedf57a04a711ec7fc8b7fa"; + hash = "sha256-1U5WEPFH5dhf2lkfZY6rrwlUNq/rY2mSlgEZVnReyng="; }; doCheck = false; diff --git a/pkgs/osm/map-stylizer/default.nix b/pkgs/osm/map-stylizer/default.nix @@ -2,7 +2,7 @@ python3Packages.buildPythonApplication rec { pname = "map-stylizer"; - version = "2020-06-30"; + version = "0-unstable-2020-06-30"; format = "other"; src = fetchFromGitHub { diff --git a/pkgs/osm/osm-area-tools/default.nix b/pkgs/osm/osm-area-tools/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { pname = "osm-area-tools"; - version = "2023-06-15"; + version = "o-unstable-2023-06-15"; src = fetchFromGitHub { owner = "osmcode"; diff --git a/pkgs/osm/osm-tags-transform/default.nix b/pkgs/osm/osm-tags-transform/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "osm-tags-transform"; - version = "2023-08-06"; + version = "0-unstable-2023-08-06"; src = fetchFromGitHub { owner = "osmcode"; diff --git a/pkgs/osm/osmium-surplus/default.nix b/pkgs/osm/osmium-surplus/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { pname = "osmium-surplus"; - version = "2023-08-27"; + version = "0-unstable-2023-08-27"; src = fetchFromGitHub { owner = "osmcode"; diff --git a/pkgs/osm/taginfo-tools/default.nix b/pkgs/osm/taginfo-tools/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation { pname = "taginfo-tools"; - version = "2022-05-24"; + version = "0-unstable-2022-05-24"; src = fetchFromGitHub { owner = "taginfo"; diff --git a/pkgs/radio/goestools/default.nix b/pkgs/radio/goestools/default.nix @@ -2,21 +2,16 @@ stdenv.mkDerivation rec { pname = "goestools"; - version = "2022-11-11"; + version = "0-unstable-2024-02-10"; src = fetchFromGitHub { owner = "pietern"; repo = "goestools"; - rev = "865e5c73683f8f688d102748e6b495ab5978768f"; - hash = "sha256-sbYQAh7auQ/lDYyk0b5q1SScU6q7O0Q7DNgZ0t9pHag="; + rev = "80ece1a7ab8a93fb5dfa50d47387ae7c4a8f2a73"; + hash = "sha256-qrtLiS1nFsGIFrazitLQetrEPiMP5SbBSbwp0bPhCV0="; fetchSubmodules = true; }; - postPatch = '' - sed -i '8i #include <cstdint>' src/dcs/dcs.h - sed -i '4i #include <cstdint>' src/assembler/vcdu.h - ''; - nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ opencv4 rtl-sdr zlib ]; diff --git a/pkgs/radio/smallrx/default.nix b/pkgs/radio/smallrx/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "smallrx"; - version = "2018-12-18"; + version = "0-unstable-2018-12-18"; src = fetchFromGitHub { owner = "ha7ilm"; diff --git a/pkgs/suckless/chibicc/default.nix b/pkgs/suckless/chibicc/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "chibicc"; - version = "2020-12-07"; + version = "0-unstable-2020-12-07"; src = fetchFromGitHub { owner = "rui314"; diff --git a/pkgs/suckless/cproc/default.nix b/pkgs/suckless/cproc/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "cproc"; - version = "2022-12-14"; + version = "0-unstable-2024-01-27"; src = fetchFromSourcehut { owner = "~mcf"; repo = "cproc"; - rev = "0985a7893a4b5de63a67ebab445892d9fffe275b"; - hash = "sha256-7wZw4YxMHTC7fDxl8JE1cfSEPXw30YbvwoV1YH/PHPw="; + rev = "e96df56b734d0a2619e7690c60a5472449d086c1"; + hash = "sha256-SC/Kn2seS/SLN85K/VXsLFCYXUqdwKjg3KiWkbNdu7I="; }; buildInputs = [ qbe ]; diff --git a/pkgs/suckless/edit/default.nix b/pkgs/suckless/edit/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "edit"; - version = "2023-10-11"; + version = "0-unstable-2024-02-04"; src = fetchFromGitHub { owner = "arthur-jacquin"; repo = "edit"; - rev = "d2a9b26f21e45b699afb99180238f90055cd7332"; - hash = "sha256-pXo5HnfJPpiXw7RApvaQcl4xvosUnyi3ov43dLcym48="; + rev = "d0814100f003649c5afe3ec6cdd0c8d3fd7593f9"; + hash = "sha256-woFX3nGSOY4RSNPGRAt40xHDNOPlO2t1kgzb8U2v5+U="; }; postPatch = '' @@ -23,6 +23,7 @@ stdenv.mkDerivation (finalAttrs: { inherit (finalAttrs.src.meta) homepage; license = licenses.gpl3; maintainers = [ maintainers.sikmir ]; - platforms = platforms.unix; + platforms = platforms.linux; + skip.ci = stdenv.isDarwin; }; }) diff --git a/pkgs/suckless/farbfeld-utils/default.nix b/pkgs/suckless/farbfeld-utils/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation { pname = "farbfeld-utils"; - version = "2022-12-16"; + version = "0-unstable-2022-12-16"; src = fetchfossil { url = "http://zzo38computer.org/fossil/farbfeld.ui"; diff --git a/pkgs/suckless/ff-tools/default.nix b/pkgs/suckless/ff-tools/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "ff-tools"; - version = "2019-06-08"; + version = "0-unstable-2019-06-08"; src = fetchFromGitHub { owner = "sirjofri"; diff --git a/pkgs/suckless/ffshot/default.nix b/pkgs/suckless/ffshot/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "ffshot"; - version = "2022-05-29"; + version = "1.0.0"; src = fetchFromGitHub { owner = "shinyblink"; repo = "ffshot"; - rev = "07d86c717d764690cbb765ea658405f14364556c"; + rev = "v${finalAttrs.version}"; hash = "sha256-lPHPwieotSgA6qF3EGDZk+lME0rqglOnEreYLk0/oUY="; }; diff --git a/pkgs/suckless/imscript/default.nix b/pkgs/suckless/imscript/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "imscript"; - version = "2023-12-15"; + version = "0-unstable-2024-02-08"; src = fetchFromSourcehut { owner = "~coco"; repo = "imscript"; - rev = "ff6ba8c4c6a2c5b569cac9b48e7ef3e00a24f3bb"; - hash = "sha256-VdPdmCPYWhFtRjlvd7ikaPV1aNDWTeNRSMbO6fTIyWU="; + rev = "5623dd9b49377166fdb19ba4329db787b89aa447"; + hash = "sha256-+w6ceMmiU2JzbQnaSk9XV8N6qhV+oftljZ6ynXOAfsE="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/suckless/kilo/default.nix b/pkgs/suckless/kilo/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "kilo"; - version = "2020-07-05"; + version = "0-unstable-2020-07-05"; src = fetchFromGitHub { owner = "antirez"; diff --git a/pkgs/suckless/lacc/default.nix b/pkgs/suckless/lacc/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "lacc"; - version = "2022-05-21"; + version = "0-unstable-2022-05-21"; src = fetchFromGitHub { owner = "larmel"; diff --git a/pkgs/suckless/lchat/default.nix b/pkgs/suckless/lchat/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "lchat"; - version = "2023-09-24"; + version = "1.0-unstable-2023-09-24"; src = fetchFromGitHub { owner = "younix"; diff --git a/pkgs/suckless/libst/default.nix b/pkgs/suckless/libst/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "libst"; - version = "2021-06-06"; + version = "0-unstable-2021-06-06"; src = fetchFromGitHub { owner = "jeremybobbin"; diff --git a/pkgs/suckless/libutf/default.nix b/pkgs/suckless/libutf/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "libutf"; - version = "2018-11-13"; + version = "0.1-unstable-2018-11-13"; src = fetchFromGitHub { owner = "cls"; diff --git a/pkgs/suckless/mage/default.nix b/pkgs/suckless/mage/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "mage"; - version = "2022-12-30"; + version = "0.8-unstable-2022-12-30"; src = fetchFromGitHub { owner = "explosion-mental"; diff --git a/pkgs/suckless/makel/default.nix b/pkgs/suckless/makel/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "makel"; - version = "2022-01-24"; + version = "0-unstable-2022-01-24"; src = fetchFromGitHub { owner = "maandree"; diff --git a/pkgs/suckless/nextvi/default.nix b/pkgs/suckless/nextvi/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "nextvi"; - version = "2023-11-30"; + version = "0-unstable-2024-02-18"; src = fetchFromGitHub { owner = "kyx0r"; repo = "nextvi"; - rev = "2ff52843c81ab1c11b534b8107ed9bfa160ab69f"; - hash = "sha256-qXI0LnH/NRG9fRetymkkg5ESxSLuYMLewzYwvgyU7TU="; + rev = "31c890ef8adb0e729249ea818c283bf143b98e84"; + hash = "sha256-fo0k3zN+werG4WnhYwj9taWNstB8ypVknWagtYUWiHs="; }; buildPhase = '' diff --git a/pkgs/suckless/sbase/default.nix b/pkgs/suckless/sbase/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation { pname = "sbase"; - version = "2023-12-29"; + version = "0-unstable-2024-01-22"; src = fetchgit { url = "git://git.suckless.org/sbase"; - rev = "2732217a407c03900145e6f4191936ff6a33945a"; - hash = "sha256-/yYGxu2eGI86mGPUGcW2MqAPiTY1GYRaoL+YTadQZw0="; + rev = "d335c366f7a2ef74ab8da19b721707110ec821c8"; + hash = "sha256-CkfrtL4yV/HtLnJsMODjArRMzoT4FSgJqDYPHl0MtUU="; }; makeFlags = [ "AR:=$(AR)" "CC:=$(CC)" "RANLIB:=$(RANLIB)" ]; diff --git a/pkgs/suckless/scc/default.nix b/pkgs/suckless/scc/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation { pname = "scc"; - version = "2023-10-20"; + version = "0-unstable-2024-02-11"; src = fetchgit { url = "git://git.simple-cc.org/scc"; - rev = "1f350b8f200581b66c4a5fc2dd74ee2fbf574c4a"; - sha256 = "sha256-2tR2ETiMFZABY3GPr8ovHRZ2d48Hrck0vK8RqID65Us="; + rev = "527601ad4c29e586f0ce307353583c5c09f3c321"; + sha256 = "sha256-tog3LCUQwjNb8ZIoztmnKNL8mo/9ik9NXNJLQmAPltA="; fetchSubmodules = true; }; diff --git a/pkgs/suckless/sdhcp/default.nix b/pkgs/suckless/sdhcp/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "sdhcp"; - version = "2018-11-22"; + version = "0.1-unstable-2018-11-22"; src = fetchgit { url = "git://git.2f30.org/sdhcp"; diff --git a/pkgs/suckless/sthkd/default.nix b/pkgs/suckless/sthkd/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "sthkd"; - version = "2020-11-15"; + version = "0-unstable-2020-11-15"; src = fetchFromGitHub { owner = "jeremybobbin"; diff --git a/pkgs/suckless/svtm/default.nix b/pkgs/suckless/svtm/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "svtm"; - version = "2021-04-28"; + version = "0-unstable-2021-04-28"; src = fetchFromGitHub { owner = "jeremybobbin";