commit 5d7b3777b87cd8bcbc9e10eb687b42e7c7d730ef
parent b43c8ee7650d42d8b12aca195f30b4139b5c53fb
Author: Nikolay Korotkiy <sikmir@disroot.org>
Date: Thu, 29 Oct 2026 01:45:42 +0400
Up
Diffstat:
12 files changed, 30 insertions(+), 21 deletions(-)
diff --git a/pkgs/by-name/co/contextily/package.nix b/pkgs/by-name/co/contextily/package.nix
@@ -19,7 +19,7 @@ python3Packages.buildPythonPackage (finalAttrs: {
build-system = with python3Packages; [ setuptools-scm ];
- SETUPTOOLS_SCM_PRETEND_VERSION = finalAttrs.version;
+ env.SETUPTOOLS_SCM_PRETEND_VERSION = finalAttrs.version;
dependencies = with python3Packages; [
geopy
diff --git a/pkgs/by-name/cs/csvtools/package.nix b/pkgs/by-name/cs/csvtools/package.nix
@@ -2,24 +2,24 @@
lib,
stdenv,
fetchFromGitHub,
- pcre,
+ pcre2,
openssl,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "csvtools";
- version = "0-unstable-2023-10-10";
+ version = "0-unstable-2025-09-03";
__structuredAttrs = true;
src = fetchFromGitHub {
owner = "DavyLandman";
repo = "csvtools";
- rev = "0162d828ec7500cf01080f73fd28387a9cdada92";
- hash = "sha256-avdnbdKh/GFibIFfKmmLLcZOvijnQmJb5VNgaZA+NiY=";
+ rev = "8e1d2390851dad38ea87950762006e1bf9e642aa";
+ hash = "sha256-Ndz4Cqh7pIru+NzNvlU9Uek5Ke7i40AeJXrw4e0FGns=";
};
- buildInputs = [ pcre ];
+ buildInputs = [ pcre2 ];
makeFlags = [ "prefix=$(out)" ];
enableParallelBuilding = true;
@@ -37,5 +37,6 @@ stdenv.mkDerivation (finalAttrs: {
license = lib.licenses.mit;
maintainers = [ lib.maintainers.sikmir ];
platforms = lib.platforms.unix;
+ broken = true;
};
})
diff --git a/pkgs/by-name/el/elevation/package.nix b/pkgs/by-name/el/elevation/package.nix
@@ -26,7 +26,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
build-system = with python3Packages; [ setuptools-scm ];
- SETUPTOOLS_SCM_PRETEND_VERSION = finalAttrs.version;
+ env.SETUPTOOLS_SCM_PRETEND_VERSION = finalAttrs.version;
dependencies = with python3Packages; [
fasteners
diff --git a/pkgs/by-name/li/libgeodesk/package.nix b/pkgs/by-name/li/libgeodesk/package.nix
@@ -23,7 +23,7 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "libgeodesk";
- version = "2.2.0";
+ version = "2.3.0";
__structuredAttrs = true;
@@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "clarisma";
repo = "libgeodesk";
tag = "v${finalAttrs.version}";
- hash = "sha256-pwFbOTEE62u9iInp7lNi67Q+GgajIk2vbkuwAkfISLA=";
+ hash = "sha256-X8d+0+Xme6Fp080jiM2UuGIPPYVxY17Sg6dqkz9JNYk=";
};
patches = [
diff --git a/pkgs/by-name/op/openscada/package.nix b/pkgs/by-name/op/openscada/package.nix
@@ -13,7 +13,7 @@
libpq,
libz,
net-snmp,
- pcre,
+ pcre2,
portaudio,
qt6,
sqlite,
@@ -63,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: {
buildInputs = [
gd
libz
- pcre
+ pcre2
qt6.qtbase
sqlite
]
diff --git a/pkgs/by-name/ov/overpassforge/package.nix b/pkgs/by-name/ov/overpassforge/package.nix
@@ -18,7 +18,7 @@ python3Packages.buildPythonPackage (finalAttrs: {
build-system = with python3Packages; [ setuptools-scm ];
- SETUPTOOLS_SCM_PRETEND_VERSION = finalAttrs.version;
+ env.SETUPTOOLS_SCM_PRETEND_VERSION = finalAttrs.version;
nativeCheckInputs = with python3Packages; [ pytestCheckHook ];
diff --git a/pkgs/by-name/py/pyimagequant/package.nix b/pkgs/by-name/py/pyimagequant/package.nix
@@ -29,6 +29,8 @@ python3Packages.buildPythonPackage {
pythonImportsCheck = [ "imagequant" ];
+ dontCheckPythonMetadata = true;
+
meta = {
description = "Python bindings for libimagequant (pngquant core)";
homepage = "https://github.com/wladich/pyimagequant";
diff --git a/pkgs/by-name/py/pytest-shell-utilities/package.nix b/pkgs/by-name/py/pytest-shell-utilities/package.nix
@@ -26,7 +26,7 @@ python3Packages.buildPythonPackage (finalAttrs: {
})
];
- SETUPTOOLS_SCM_PRETEND_VERSION = finalAttrs.version;
+ env.SETUPTOOLS_SCM_PRETEND_VERSION = finalAttrs.version;
build-system = with python3Packages; [
setuptools-scm
diff --git a/pkgs/by-name/py/pytest-skip-markers/package.nix b/pkgs/by-name/py/pytest-skip-markers/package.nix
@@ -16,7 +16,7 @@ python3Packages.buildPythonPackage (finalAttrs: {
hash = "sha256-+e+VhNDVC/585IIhnL4ARouWCbB3QzlAhRtjPN5+jls=";
};
- SETUPTOOLS_SCM_PRETEND_VERSION = finalAttrs.version;
+ env.SETUPTOOLS_SCM_PRETEND_VERSION = finalAttrs.version;
build-system = with python3Packages; [
setuptools-scm
diff --git a/pkgs/by-name/rs/rst2txt/package.nix b/pkgs/by-name/rs/rst2txt/package.nix
@@ -18,7 +18,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
build-system = with python3Packages; [ setuptools-scm ];
- SETUPTOOLS_SCM_PRETEND_VERSION = finalAttrs.version;
+ env.SETUPTOOLS_SCM_PRETEND_VERSION = finalAttrs.version;
dependencies = with python3Packages; [
docutils
diff --git a/pkgs/by-name/st/stardict-tools/package.nix b/pkgs/by-name/st/stardict-tools/package.nix
@@ -4,39 +4,45 @@
fetchurl,
autoconf,
automake,
+ gnome-common,
libtool,
p7zip,
pkg-config,
gtk2,
libmysqlclient,
libxml2,
- pcre,
+ pcre2,
+ which,
+ yelp-tools,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "stardict-tools";
- version = "3.0.6.2";
+ version = "3.0.7-2";
__structuredAttrs = true;
src = fetchurl {
- url = "mirror://sourceforge/stardict-4/stardict-${finalAttrs.version}-2-src.7z";
- hash = "sha256-1XLfXs5v2ZvP5xqCN4x1+0BvkIGc8cHWrgiP0b0DP0U=";
+ url = "mirror://sourceforge/stardict-4/stardict-${finalAttrs.version}-src.7z";
+ hash = "sha256-U9Wfyz0eV3kw7k7XlvBEuHXPrqo+rdhP7fvviSYfyQc=";
};
nativeBuildInputs = [
autoconf
automake
+ gnome-common
libtool
p7zip
pkg-config
+ which
+ yelp-tools
];
buildInputs = [
gtk2
libmysqlclient
libxml2
- pcre
+ pcre2
];
hardeningDisable = [ "format" ];
diff --git a/pkgs/by-name/te/terracotta/package.nix b/pkgs/by-name/te/terracotta/package.nix
@@ -25,7 +25,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
#setuptools-scm-git-archive
];
- SETUPTOOLS_SCM_PRETEND_VERSION = finalAttrs.version;
+ env.SETUPTOOLS_SCM_PRETEND_VERSION = finalAttrs.version;
dependencies = with python3Packages; [
apispec
