commit c6b88903ea28643b6682d703a11b79ae7b017307
parent e1b5a7ecc2c2d40f82d392e8a33ded9a787391e2
Author: Nikolay Korotkiy <sikmir@disroot.org>
Date: Wed, 7 Jan 2026 19:15:06 +0400
Up
Diffstat:
11 files changed, 60 insertions(+), 42 deletions(-)
diff --git a/flake.lock b/flake.lock
@@ -20,11 +20,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1767026758,
- "narHash": "sha256-7fsac/f7nh/VaKJ/qm3I338+wAJa/3J57cOGpXi0Sbg=",
+ "lastModified": 1767364772,
+ "narHash": "sha256-fFUnEYMla8b7UKjijLnMe+oVFOz6HjijGGNS1l7dYaQ=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "346dd96ad74dc4457a9db9de4f4f57dab2e5731d",
+ "rev": "16c7794d0a28b5a37904d55bcca36003b9109aaa",
"type": "github"
},
"original": {
diff --git a/pkgs/by-name/ge/geminid/package.nix b/pkgs/by-name/ge/geminid/package.nix
@@ -41,5 +41,6 @@ stdenv.mkDerivation (finalAttrs: {
license = lib.licenses.bsd3;
maintainers = [ lib.maintainers.sikmir ];
platforms = lib.platforms.unix;
+ broken = true;
};
})
diff --git a/pkgs/by-name/gf/gfp-gdal/package.nix b/pkgs/by-name/gf/gfp-gdal/package.nix
@@ -30,6 +30,8 @@ stdenv.mkDerivation (finalAttrs: {
nlohmann_json
];
+ env.NIX_CFLAGS_COMPILE = "-fpermissive";
+
installPhase = ''
install -Dm644 gfp_gdal.so -t $out/lib/geoflow-plugins
'';
diff --git a/pkgs/by-name/gn/gnsstk/package.nix b/pkgs/by-name/gn/gnsstk/package.nix
@@ -2,34 +2,28 @@
lib,
stdenv,
fetchFromGitHub,
- fetchpatch,
cmake,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "gnsstk";
- version = "14.6.1";
+ version = "15.0.0";
src = fetchFromGitHub {
owner = "SGL-UT";
repo = "gnsstk";
tag = "v${finalAttrs.version}";
- hash = "sha256-JdRCfrlF1WkuacDrly2zJ9pihKOAZws6wVf8tzdW/HM=";
+ hash = "sha256-bVVLFnV3FZl8cAkvaAp453UEDT9gJc8gN9fz7rMnw1k=";
};
- patches = [
- # Fix compilation with GCC13
- (fetchpatch {
- url = "https://github.com/SGL-UT/gnsstk/pull/21/commits/16c2c7e5b8dc80bb0eb46792fcb1f6e3dcbffbf4.patch";
- hash = "sha256-mIczf1OiHWl+poOulFPLSbNBu4ES8HNjhjOatACaAgI=";
- })
- ];
+ postPatch = ''
+ sed -i '43i #include <cstdint>' core/lib/NewNav/GLOCNavHeader.hpp
+ '';
nativeBuildInputs = [ cmake ];
cmakeFlags = [
(lib.cmakeBool "BUILD_EXT" true)
- (lib.cmakeFeature "CMAKE_CXX_STANDARD" "14")
];
meta = {
diff --git a/pkgs/by-name/li/libmdbx/package.nix b/pkgs/by-name/li/libmdbx/package.nix
@@ -7,11 +7,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "libmdbx";
- version = "0.13.3";
+ version = "0.14.1";
src = fetchurl {
url = "https://libmdbx.dqdkfa.ru/release/libmdbx-amalgamated-${finalAttrs.version}.tar.xz";
- hash = "sha256-LkJQXxzrV5RVads8Gl25tSFtj3LafHXCQP+BGW+Omgs=";
+ hash = "sha256-LtuLWdtbKwIcdjQBD429u/lI7aYJlC3TAFEMbpO9XSU=";
};
sourceRoot = ".";
diff --git a/pkgs/by-name/mq/mqttwarn/package.nix b/pkgs/by-name/mq/mqttwarn/package.nix
@@ -6,7 +6,10 @@
replaceVars,
}:
-python312Packages.buildPythonApplication rec {
+let
+ python3Packages = python312Packages;
+in
+python3Packages.buildPythonApplication rec {
pname = "mqttwarn";
version = "0.35.0";
pyproject = true;
@@ -28,12 +31,12 @@ python312Packages.buildPythonApplication rec {
})
];
- build-system = with python312Packages; [
+ build-system = with python3Packages; [
setuptools
versioningit
];
- dependencies = with python312Packages; [
+ dependencies = with python3Packages; [
attrs
docopt
funcy
@@ -46,7 +49,7 @@ python312Packages.buildPythonApplication rec {
pythonRelaxDeps = true;
- optional-dependencies = with python312Packages; {
+ optional-dependencies = with python3Packages; {
apprise = [ apprise ];
celery = [ celery ];
chromecast = [ pychromecast ];
@@ -60,7 +63,7 @@ python312Packages.buildPythonApplication rec {
doCheck = false;
nativeCheckInputs = [
- python312Packages.pytestCheckHook
+ python3Packages.pytestCheckHook
]
++ lib.flatten (lib.attrValues optional-dependencies);
diff --git a/pkgs/by-name/os/ossim/package.nix b/pkgs/by-name/os/ossim/package.nix
@@ -2,12 +2,14 @@
lib,
stdenv,
fetchFromGitHub,
+ fetchpatch,
cmake,
geos,
jsoncpp,
libgeotiff,
libjpeg,
libtiff,
+ makeWrapper,
}:
stdenv.mkDerivation (finalAttrs: {
@@ -21,7 +23,18 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-zmyzHEhf/JPBBP7yJyxyKHkJH5psRSl3h8ZcOJ7dr7o=";
};
- nativeBuildInputs = [ cmake ];
+ patches = [
+ # Fixed build error gcc version 15.0.1
+ (fetchpatch {
+ url = "https://github.com/ossimlabs/ossim/commit/13b9fa9ae54f79a7e7728408de6246e00d38f399.patch";
+ hash = "sha256-AKzOT+JurB/54gvzn2a5amw+uIupaNxssnEhc8CSfPM=";
+ })
+ ];
+
+ nativeBuildInputs = [
+ cmake
+ makeWrapper
+ ];
buildInputs = [
geos
@@ -32,11 +45,17 @@ stdenv.mkDerivation (finalAttrs: {
];
cmakeFlags = [
- (lib.cmakeBool "BUILD_OSSIM_APPS" false)
(lib.cmakeBool "BUILD_OSSIM_TESTS" false)
(lib.cmakeFeature "CMAKE_POLICY_VERSION_MINIMUM" "3.10")
];
+ postInstall = ''
+ for binary in $out/bin/ossim-*; do
+ wrapProgram $binary \
+ --prefix LD_LIBRARY_PATH ":" $out/lib
+ done
+ '';
+
meta = {
description = "Open Source Software Image Map library";
homepage = "https://trac.osgeo.org/ossim";
diff --git a/pkgs/by-name/sa/sasplanet/package.nix b/pkgs/by-name/sa/sasplanet/package.nix
@@ -31,13 +31,13 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "sasplanet";
- version = "251212";
+ version = "260101";
src = fetchfromgh {
owner = "sasgis";
repo = "sas.planet.src";
tag = "v.${finalAttrs.version}";
- hash = "sha256-HgdStoB8+nC42m63Y70EL9pJM7X7TG7pLgets4gAlxU=";
+ hash = "sha256-RGoVyb8agoIwoHFvswBTmqt2nDXMugjAqPaL9jbF4GY=";
name = "SAS.Planet.Release.${finalAttrs.version}.x64.zip";
};
diff --git a/pkgs/by-name/se/se/package.nix b/pkgs/by-name/se/se/package.nix
@@ -6,15 +6,15 @@
ncurses,
}:
-stdenv.mkDerivation (finalAttrs: {
+stdenv.mkDerivation {
pname = "se";
- version = "3.0.1";
+ version = "3.0.1-unstable-2023-08-06";
src = fetchFromGitHub {
owner = "screen-editor";
repo = "se";
- tag = "se-${finalAttrs.version}";
- hash = "sha256-2LyYZXaL/Q3G/StCUiY6MUXG55g2YQvkpoF/lcsifD8=";
+ rev = "e82c110205bb1da3871e0af970533011d4573b78";
+ hash = "sha256-abK8MogXh9SMSuLmj2oeBrh8tLPFqh+rKYt2CUvnw6w=";
};
nativeBuildInputs = [ autoreconfHook ];
@@ -28,4 +28,4 @@ stdenv.mkDerivation (finalAttrs: {
platforms = lib.platforms.unix;
maintainers = [ lib.maintainers.sikmir ];
};
-})
+}
diff --git a/pkgs/by-name/so/socketcand/package.nix b/pkgs/by-name/so/socketcand/package.nix
@@ -2,34 +2,33 @@
lib,
stdenv,
fetchFromGitHub,
- autoreconfHook,
installShellFiles,
libconfig,
+ meson,
+ ninja,
}:
stdenv.mkDerivation {
pname = "socketcand";
- version = "0.6.1-unstable-2023-12-06";
+ version = "0.6.1-unstable-2025-05-21";
src = fetchFromGitHub {
owner = "linux-can";
repo = "socketcand";
- rev = "02ad0f5a9c9387b8ccfdef837068584b721eff05";
- hash = "sha256-Fsx5eIbiIYctfRcEU5iyG2hKcSV/7R7EyR6WlVFDTCk=";
+ rev = "6dd5d33d4645ab221e8cd265c08607366e21ddf1";
+ hash = "sha256-Pvh0lowK3mQLRu+TotjZS75bwztNvbY7rC3gZUSdjVA=";
};
nativeBuildInputs = [
- autoreconfHook
installShellFiles
+ meson
+ ninja
];
buildInputs = [ libconfig ];
- installPhase = ''
- runHook preInstall
- install -Dm755 socketcand socketcandcl -t $out/bin
- installManPage socketcand.1
- runHook postInstall
+ postInstall = ''
+ installManPage $src/socketcand.1
'';
meta = {
diff --git a/pkgs/by-name/ze/zed-preview-bin/package.nix b/pkgs/by-name/ze/zed-preview-bin/package.nix
@@ -7,13 +7,13 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "zed-preview";
- version = "0.216.0-pre";
+ version = "0.218.5-pre";
src = fetchfromgh {
owner = "zed-industries";
repo = "zed";
tag = "v${finalAttrs.version}";
- hash = "sha256-jR2lDJhg4pZYd4rzqWzY3aqwfaIG4eF30rtXH0R/dkU=";
+ hash = "sha256-4ERwSKAA6yCuSVVpBa8DSuAB1CHW53vLbiwzG9Q48c0=";
name = "Zed-x86_64.dmg";
};
