commit b4becaae518c7f2da88d330d2dd465f10965aedc
parent 800dba44668aba63e760fb2754e428f164d32a86
Author: Nikolay Korotkiy <sikmir@disroot.org>
Date: Wed, 8 Jan 2025 12:07:54 +0400
Up
Diffstat:
8 files changed, 29 insertions(+), 20 deletions(-)
diff --git a/pkgs/darwin/finch/default.nix b/pkgs/darwin/finch/default.nix
@@ -7,17 +7,17 @@
buildGoModule rec {
pname = "finch";
- version = "1.5.0";
+ version = "1.6.0";
src = fetchFromGitHub {
owner = "runfinch";
repo = "finch";
tag = "v${version}";
- hash = "sha256-EVFL1qJyCNnRGqhqA3OFf92+BlpkbQbBVp9XqSancbI=";
+ hash = "sha256-t9JyGixJdKTd/dWzaZCIn4dqZO9QCamyrjsnmVA3LIo=";
fetchSubmodules = true;
};
- vendorHash = "sha256-bZzyArN49Cge4ChMiAPlrYOdsfzrBrQorwXlK3a9lfU=";
+ vendorHash = "sha256-X4cUMgLM1gbppaOU31mEoXSg1gxd5Rp1NYH85HJLhTg=";
subPackages = [ "cmd/finch" ];
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.168.0-pre";
+ version = "0.168.2-pre";
src = fetchurl {
url = "https://zed.dev/api/releases/stable/${finalAttrs.version}/Zed-x86_64.dmg";
- hash = "sha256-u1XDBD2xlqzef8SmhwJ/lRjXrhmoadsFh/SQTYFozjE=";
+ hash = "sha256-oFNUrlpL8Ex+EM5ee1vZF7TxgWNdCeU4U+p+/nz9TUc=";
};
sourceRoot = ".";
diff --git a/pkgs/data/maps/opentopomap/default.nix b/pkgs/data/maps/opentopomap/default.nix
@@ -8,18 +8,18 @@
mkgmap-splitter,
}:
let
- version = "250101";
+ version = "250107";
bounds = fetchurl {
- url = "https://www.thkukuk.de/osm/data/bounds-20241227.zip";
- hash = "sha256-1fwCKMswI0fQkkXSt563MKD2xsLWkPD55jeVeUS4GQk=";
+ url = "https://www.thkukuk.de/osm/data/bounds-20250103.zip";
+ hash = "sha256-NrEblRWr6GynP1e44gQnihkUf3/hnbpXfSv51IWrDsY=";
};
sea = fetchurl {
- url = "https://www.thkukuk.de/osm/data/sea-20250102001541.zip";
- hash = "sha256-hhZQYlnijoyxrhz3tdUW0a1xotTn0ocmRCKadAm0CSI=";
+ url = "https://www.thkukuk.de/osm/data/sea-20250107001502.zip";
+ hash = "sha256-caSc/rkO+CZK/1JOqZgk1PJkJXaZ66+Qz4KlW9fUnLw=";
};
armenia = fetchurl {
url = "https://download.geofabrik.de/asia/armenia-${version}.osm.pbf";
- hash = "sha256-kM+cxzUP0DzF+8/vXK5rrCwI+PirFwizDY310x732Xk=";
+ hash = "sha256-78xH15BMkMqMHrzxQQWAYdxLdAN3pJLZHcPJr/5LZgA=";
};
in
stdenv.mkDerivation (finalAttrs: {
diff --git a/pkgs/default.nix b/pkgs/default.nix
@@ -266,6 +266,7 @@ lib.makeScope newScope (
pyrtcm = callPackage ./gnss/pyrtcm { };
pyspartn = callPackage ./gnss/pyspartn { };
pyubx2 = callPackage ./gnss/pyubx2 { };
+ pyubxutils = callPackage ./gnss/pyubxutils { };
rtklib = callPackage ./gnss/rtklib { };
rtklib-demo5 = callPackage ./gnss/rtklib/demo5.nix { };
visualgps = libsForQt5.callPackage ./gnss/visualgps { };
diff --git a/pkgs/gemini/gplaces/default.nix b/pkgs/gemini/gplaces/default.nix
@@ -5,17 +5,19 @@
pkg-config,
curl,
openssl,
+ libidn2,
+ file,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "gplaces";
- version = "0.19.7";
+ version = "0.19.8";
src = fetchFromGitHub {
owner = "dimkr";
repo = "gplaces";
tag = "v${finalAttrs.version}";
- hash = "sha256-u/JO2PNEZhmE068toBLHUJoWOkX4xoOKeIQN1hiCxlg=";
+ hash = "sha256-6BQimygOt+p1WZgpEXK2Icr/SxjF2tmjupJjDT8i5oo=";
fetchSubmodules = true;
};
@@ -24,9 +26,14 @@ stdenv.mkDerivation (finalAttrs: {
buildInputs = [
curl
openssl
+ libidn2
+ file # for libmagic
];
- makeFlags = [ "VERSION=${finalAttrs.version}" ];
+ makeFlags = [
+ "CC:=$(CC)"
+ "VERSION=${finalAttrs.version}"
+ ];
installFlags = [ "PREFIX=$(out)" ];
diff --git a/pkgs/gpx/gpx-interpolate/default.nix b/pkgs/gpx/gpx-interpolate/default.nix
@@ -24,6 +24,7 @@ python3Packages.buildPythonApplication {
dontUseSetuptoolsBuild = true;
+ doCheck = false;
checkPhase = ''
${python3Packages.python.interpreter} -m doctest -o IGNORE_EXCEPTION_DETAIL -f tests/tests.txt
'';
diff --git a/pkgs/misc/capture2text/default.nix b/pkgs/misc/capture2text/default.nix
@@ -9,12 +9,12 @@
wrapQtAppsHook,
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "capture2text";
version = "4.6.2";
src = fetchurl {
- url = "mirror://sourceforge/capture2text/SourceCode/Capture2Text_v${version}/Capture2Text_v${version}_Source_Code.zip";
+ url = "mirror://sourceforge/capture2text/SourceCode/Capture2Text_v${finalAttrs.version}/Capture2Text_v${finalAttrs.version}_Source_Code.zip";
hash = "sha256-FeQ5E2lW+QOcg6Qi1I75W4BkQmfDiZtJ7+U2K08Ji2U=";
};
@@ -80,4 +80,4 @@ stdenv.mkDerivation rec {
platforms = lib.platforms.unix;
broken = true;
};
-}
+})
diff --git a/pkgs/osm/libgeodesk/default.nix b/pkgs/osm/libgeodesk/default.nix
@@ -19,14 +19,14 @@ let
hash = "sha256-Zt53Qtry99RAheeh7V24Csg/aMW25DT/3CN/h+BaeoM=";
};
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "libgeodesk";
version = "0.1";
src = fetchFromGitHub {
owner = "clarisma";
repo = "libgeodesk";
- tag = "v${version}";
+ tag = "v${finalAttrs.version}";
hash = "sha256-eX10Gkgsqa+RA+PDk+jdsQly3sUg2p3cFev5qXwhlG4=";
};
@@ -47,4 +47,4 @@ stdenv.mkDerivation rec {
maintainers = [ lib.maintainers.sikmir ];
platforms = lib.platforms.unix;
};
-}
+})