commit 5598b92c231ecccbf1681f64c87dbcefc8103c5c
parent 621dd9412fa994dac3687f6233b55093bb4760f2
Author: Nikolay Korotkiy <sikmir@disroot.org>
Date: Wed, 29 Oct 2025 20:04:24 +0400
Up
Diffstat:
6 files changed, 56 insertions(+), 46 deletions(-)
diff --git a/flake.lock b/flake.lock
@@ -20,11 +20,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1761349956,
- "narHash": "sha256-tH3wHnOJms+U4k/rK2Nn1RfBrhffX92jLP/2VndSn0w=",
+ "lastModified": 1761656231,
+ "narHash": "sha256-EiED5k6gXTWoAIS8yQqi5mAX6ojnzpHwAQTS3ykeYMg=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "02f2cb8e0feb4596d20cc52fda73ccee960e3538",
+ "rev": "e99366c665bdd53b7b500ccdc5226675cfc51f45",
"type": "github"
},
"original": {
diff --git a/pkgs/by-name/ma/mapsoft2/0002-fix-build.patch b/pkgs/by-name/ma/mapsoft2/0002-fix-build.patch
@@ -1,5 +1,5 @@
diff --git i/docs/man/ms2render.htm w/docs/man/ms2render.htm
-index 62972dc..0195402 100644
+index 0664e9f..6cdbfa0 100644
--- i/docs/man/ms2render.htm
+++ w/docs/man/ms2render.htm
@@ -493,7 +493,7 @@
@@ -11,7 +11,7 @@ index 62972dc..0195402 100644
</dd>
<dt id="q---quite-arg"><b>-q, --quite <arg></b></dt>
-@@ -559,7 +559,7 @@
+@@ -553,7 +553,7 @@
<dt id="c---config-arg"><b>-c, --config <arg></b></dt>
<dd>
@@ -47,7 +47,7 @@ index 5469cac..c165c1a 100644
Some tips about viewer structure can be also find there.
B<$HOME/.mapsoft2/mapsoft2.css> -- user-specific file.
diff --git i/docs/man/ms2vmap.htm w/docs/man/ms2vmap.htm
-index 901374e..6dce51b 100644
+index 69fbda3..1fdfd43 100644
--- i/docs/man/ms2vmap.htm
+++ w/docs/man/ms2vmap.htm
@@ -64,7 +64,7 @@ ms2vmap <file> ... -o <out file> [<options>]</code></pre>
@@ -60,10 +60,10 @@ index 901374e..6dce51b 100644
</dd>
<dt id="D---define-arg"><b>-D, --define <arg></b></dt>
diff --git i/docs/man/ms2vmapdb.htm w/docs/man/ms2vmapdb.htm
-index 2b06fe4..2018bc6 100644
+index 8bdb701..c05835a 100644
--- i/docs/man/ms2vmapdb.htm
+++ w/docs/man/ms2vmapdb.htm
-@@ -238,7 +238,7 @@ ms2vmapdb fig_lib -- make fig library using typeinfo file</code></pre>
+@@ -230,7 +230,7 @@ ms2vmapdb export -- export vector map to a different format</code></pre>
<dt id="t---types-arg"><b>-t, --types <arg></b></dt>
<dd>
@@ -72,7 +72,7 @@ index 2b06fe4..2018bc6 100644
</dd>
<dt id="D---define-arg"><b>-D, --define <arg></b></dt>
-@@ -302,7 +302,7 @@ ms2vmapdb fig_lib -- make fig library using typeinfo file</code></pre>
+@@ -294,7 +294,7 @@ ms2vmapdb export -- export vector map to a different format</code></pre>
<dt id="t---types-arg1"><b>-t, --types <arg></b></dt>
<dd>
@@ -81,7 +81,7 @@ index 2b06fe4..2018bc6 100644
</dd>
<dt id="D---define-arg1"><b>-D, --define <arg></b></dt>
-@@ -436,7 +436,7 @@ ms2vmapdb fig_lib -- make fig library using typeinfo file</code></pre>
+@@ -418,7 +418,7 @@ ms2vmapdb export -- export vector map to a different format</code></pre>
<dt id="t---types-arg2"><b>-t, --types <arg></b></dt>
<dd>
@@ -90,15 +90,6 @@ index 2b06fe4..2018bc6 100644
</dd>
<dt id="D---define-arg2"><b>-D, --define <arg></b></dt>
-@@ -652,7 +652,7 @@ ms2vmapdb fig_lib -- make fig library using typeinfo file</code></pre>
- <dt id="t---types-arg3"><b>-t, --types <arg></b></dt>
- <dd>
-
--<p>File with type information. Default: /usr/share/mapsoft2/types.cfg</p>
-+<p>File with type information. Default: @out@/share/mapsoft2/types.cfg</p>
-
- </dd>
- <dt id="D---define-arg3"><b>-D, --define <arg></b></dt>
Submodule modules contains modified content
diff --git i/modules/mapview/action_manager.cpp w/modules/mapview/action_manager.cpp
index ab16dae..272b454 100644
@@ -127,7 +118,7 @@ index 997c127..43928bf 100644
css_provider->load_from_path(css_glo)){
auto screen = get_screen();
diff --git i/modules/vmap2/vmap2gobj.cpp w/modules/vmap2/vmap2gobj.cpp
-index 4b48cf8..724e444 100644
+index 6583699..5e6a6af 100644
--- i/modules/vmap2/vmap2gobj.cpp
+++ w/modules/vmap2/vmap2gobj.cpp
@@ -22,7 +22,7 @@ using namespace std;
@@ -149,10 +140,10 @@ index 4b48cf8..724e444 100644
}
diff --git i/modules/vmap2/vmap2types.cpp w/modules/vmap2/vmap2types.cpp
-index 6688736..ec77637 100644
+index 3a7ee9b..c904529 100644
--- i/modules/vmap2/vmap2types.cpp
+++ w/modules/vmap2/vmap2types.cpp
-@@ -7,12 +7,12 @@
+@@ -8,12 +8,12 @@
void
ms2opt_add_vmap2t(GetOptSet & opts){
const char *g = "VMAP2";
@@ -167,8 +158,21 @@ index 6688736..ec77637 100644
if (file == "") return;
read_words_defs defs(o.get("define", Opt()));
load(file, defs);
+diff --git i/programs/Makefile w/programs/Makefile
+index c81d62e..f7d5c7d 100644
+--- i/programs/Makefile
++++ w/programs/Makefile
+@@ -18,7 +18,7 @@ bindir ?= $(prefix)/bin
+ datadir ?= $(prefix)/share
+
+ all:
+- sh -e -c 'for i in $(PROGRAMS); do make -C $$i; done'
++ sh -e -c 'for i in $(PROGRAMS); do make -C $$i notests; done'
+
+ install:
+ sh -e -c 'for i in $(PROGRAMS); do install -D -m755 $$i/$$i $(bindir)/$$i; done'
diff --git i/vmap_data/scripts/vmaps.sh w/vmap_data/scripts/vmaps.sh
-index 460533a..7591f33 100644
+index 97ebf17..d0ca927 100644
--- i/vmap_data/scripts/vmaps.sh
+++ w/vmap_data/scripts/vmaps.sh
@@ -16,8 +16,8 @@ MAP_ATTR="mapsoft"
@@ -231,7 +235,7 @@ index 1e0599c..84413bb 100755
# read local configuration
. ./vmaps.conf ||:
diff --git i/vmap_data/scripts/vmaps_in w/vmap_data/scripts/vmaps_in
-index 4381dd7..cf9d9d9 100755
+index 48da7ff..70203bc 100755
--- i/vmap_data/scripts/vmaps_in
+++ w/vmap_data/scripts/vmaps_in
@@ -9,7 +9,7 @@
@@ -257,7 +261,7 @@ index ae225ec..e59c592 100755
# read local configuration
. ./vmaps.conf ||:
diff --git i/vmap_data/scripts/vmaps_out w/vmap_data/scripts/vmaps_out
-index d1d7903..d4d5318 100755
+index 8996a29..914546b 100755
--- i/vmap_data/scripts/vmaps_out
+++ w/vmap_data/scripts/vmaps_out
@@ -18,7 +18,7 @@
@@ -270,7 +274,7 @@ index d1d7903..d4d5318 100755
# read local configuration
. ./vmaps.conf ||:
diff --git i/vmap_data/scripts/vmaps_pack_img w/vmap_data/scripts/vmaps_pack_img
-index a91fc99..a692600 100755
+index f8ebf4f..c101941 100755
--- i/vmap_data/scripts/vmaps_pack_img
+++ w/vmap_data/scripts/vmaps_pack_img
@@ -5,7 +5,7 @@
@@ -374,10 +378,10 @@ index 6aff657..1b7df8c 100755
# read local configuration
. ./vmaps.conf ||:
diff --git i/vmap_data/scripts/vmaps_wp_update w/vmap_data/scripts/vmaps_wp_update
-index 24df3c1..5252dd0 100755
+index 0c3ec89..e235642 100755
--- i/vmap_data/scripts/vmaps_wp_update
+++ w/vmap_data/scripts/vmaps_wp_update
-@@ -25,7 +25,7 @@
+@@ -26,7 +26,7 @@
##################################################
# read global configuration and functions
diff --git a/pkgs/by-name/ma/mapsoft2/package.nix b/pkgs/by-name/ma/mapsoft2/package.nix
@@ -32,19 +32,19 @@ let
libs = fetchFromGitHub {
owner = "slazav";
repo = "mapsoft2-libs";
- rev = "31e4c004b2c00369f534c2629b9df6f40682125a";
- hash = "sha256-Tw76Ql2twogpCGZo2wyfvPIf1eRe4s2LZvrgJCUVfUs=";
+ rev = "a33c77c793f3f46b61d9129f91e2441316059fdc";
+ hash = "sha256-ecbxB8gMZen1kZTku8U45amOH4DP3B+uedK6rG2R8xc=";
};
in
stdenv.mkDerivation (finalAttrs: {
pname = "mapsoft2";
- version = "2.10-alt1";
+ version = "2.10-alt1-unstable-2025-09-28";
src = fetchFromGitHub {
owner = "slazav";
repo = "mapsoft2";
- tag = finalAttrs.version;
- hash = "sha256-lDicw224Sid6ir1VWeo1MPXHQHUyvlEm2Fz2BN1OuR4=";
+ rev = "e217d77bce2c0a3e64ca96156efdf20533b656ad";
+ hash = "sha256-/sWScmKxeVEI1+vEyZEXwqgEk99SS5CBOGeyENylSNw=";
};
prePatch = ''
diff --git a/pkgs/by-name/mq/mqtt-cli/package.nix b/pkgs/by-name/mq/mqtt-cli/package.nix
@@ -8,13 +8,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "mqtt-cli";
- version = "4.45.0";
+ version = "4.46.0";
src = fetchfromgh {
owner = "hivemq";
repo = "mqtt-cli";
tag = "v${finalAttrs.version}";
- hash = "sha256-vw8QT0H1DTyLgovbqSyUbajlbdBb3OtV4RiapHYIljU=";
+ hash = "sha256-thO9x745FZQsWG3qPXphjnQrUAGDPmV0vsEoMN55Zis=";
name = "mqtt-cli-${finalAttrs.version}.jar";
};
diff --git a/pkgs/by-name/op/opentopomap/package.nix b/pkgs/by-name/op/opentopomap/package.nix
@@ -9,7 +9,7 @@
mkgmap-splitter,
}:
let
- version = "251010";
+ version = "251028";
bounds = fetchwebarchive {
url = "https://www.thkukuk.de/osm/data/bounds-20250110.zip";
timestamp = "20250116113456";
@@ -22,7 +22,7 @@ let
};
armenia = fetchurl {
url = "https://download.geofabrik.de/asia/armenia-${version}.osm.pbf";
- hash = "sha256-HMkoAavJ+MLVdm/kr50BgyaHNU3mCGoX6TuM7i35sT4=";
+ hash = "sha256-5RVamKKGidYtH19RjHV7qKk4GmYxHnL1jKAU3Zd3RF0=";
};
in
stdenv.mkDerivation (finalAttrs: {
diff --git a/pkgs/by-name/sc/scc/package.nix b/pkgs/by-name/sc/scc/package.nix
@@ -5,16 +5,17 @@
ed,
qbe,
makeWrapper,
+ buildPackages,
}:
stdenv.mkDerivation {
pname = "scc";
- version = "0-unstable-2025-10-17";
+ version = "0-unstable-2025-10-29";
src = fetchgit {
url = "git://git.simple-cc.org/scc";
- rev = "e19109cd35b8d64480c74389b8faaedf5af9b0ed";
- hash = "sha256-YTHPCslPoI70z92JuPzGRQQyk0GVixPAvqPbAaiJNb4=";
+ rev = "1ed0ff0000999561feee336c289252faf2502a7e";
+ hash = "sha256-BVs+ypb6/aE2BsCsDMLZa2ppK6ypjLZQumUgzIehg/k=";
};
postPatch = ''
@@ -24,6 +25,10 @@ stdenv.mkDerivation {
--replace-fail "PREFIX = /usr/local" "PREFIX = $out"
substituteInPlace scripts/config \
--replace-fail "PREFIX:=/usr/local" "PREFIX:=$out"
+ substituteInPlace tests/Makefile \
+ --replace-fail "libc/execute" "" \
+ --replace-fail "cc/execute" "" \
+ --replace-fail "make/execute" ""
'';
nativeBuildInputs = [
@@ -32,12 +37,13 @@ stdenv.mkDerivation {
makeWrapper
];
- buildFlags = [
- "AR:=$(AR)"
- "AS:=$(AS)"
- "CC:=$(CC)"
- "RANLIB:=$(RANLIB)"
- "HOSTCC=${stdenv.cc.targetPrefix}cc"
+ makeFlags = [
+ "AR=${stdenv.cc.targetPrefix}ar"
+ "AS=${stdenv.cc.targetPrefix}as"
+ "CC=${stdenv.cc.targetPrefix}cc"
+ "LD=${stdenv.cc.targetPrefix}ld"
+ "RANLIB=${stdenv.cc.targetPrefix}ranlib"
+ "HOSTCC=${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}cc"
];
doCheck = true;
