commit 37751c7c0bd2fdfe7531abeb0421fe8c3f51bc7b
parent 59626ef75f37123ab46030a32383e51ac69daf55
Author: Nikolay Korotkiy <sikmir@disroot.org>
Date: Tue, 7 Oct 2025 22:43:28 +0400
Up
Diffstat:
5 files changed, 31 insertions(+), 11 deletions(-)
diff --git a/flake.lock b/flake.lock
@@ -20,11 +20,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1759417375,
- "narHash": "sha256-O7eHcgkQXJNygY6AypkF9tFhsoDQjpNEojw3eFs73Ow=",
+ "lastModified": 1759632233,
+ "narHash": "sha256-krgZxGAIIIKFJS+UB0l8do3sYUDWJc75M72tepmVMzE=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "dc704e6102e76aad573f63b74c742cd96f8f1e6c",
+ "rev": "d7f52a7a640bc54c7bb414cca603835bf8dd4b10",
"type": "github"
},
"original": {
diff --git a/pkgs/by-name/ar/arnis/package.nix b/pkgs/by-name/ar/arnis/package.nix
@@ -7,16 +7,20 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "arnis";
- version = "2.2.1";
+ version = "2.3.0";
src = fetchFromGitHub {
owner = "louis-e";
repo = "arnis";
tag = "v${finalAttrs.version}";
- hash = "sha256-xvVG5LCVbAB7y+0usuVDQEeIH09geIL0s1n6rZGWvAU=";
+ hash = "sha256-pZS0tXoLzQW19n2zZZEgr4C1Y45q/JEX3loetLRb/WY=";
};
- cargoHash = "sha256-J2ymz+lV30UFZqIpynxH6TA8zNgauaoAQon5WsPJONY=";
+ cargoHash = "sha256-2wklCohCShRQaJACiLIYbLej4xSP70qTwMQ0iN2hSJ0=";
+
+ checkFlags = [
+ "--skip=map_transformation::translate::translator::tests::test_translate_by_vector"
+ ];
meta = {
description = "Generate real life cities in Minecraft";
diff --git a/pkgs/by-name/op/opcua-stack/package.nix b/pkgs/by-name/op/opcua-stack/package.nix
@@ -22,8 +22,13 @@ stdenv.mkDerivation (finalAttrs: {
postPatch = ''
substituteInPlace CMakeLists.txt --replace-fail "/usr" "$out"
+ substituteInPlace OpcUaClient/CMakeLists.txt \
+ --replace-fail "/etc" "$out/etc" \
+ --replace-fail "/var/log" "$out/var/log"
+ substituteInPlace OpcUaCtrl/CMakeLists.txt --replace-fail "/etc" "$out/etc"
substituteInPlace OpcUaStackCore/CMakeLists.txt --replace-fail "/usr" "$out"
substituteInPlace OpcUaStackServer/CMakeLists.txt --replace-fail "/usr" "$out"
+ substituteInPlace OpcUaGenerator/CMakeLists.txt --replace-fail "/usr" "$out"
'';
nativeBuildInputs = [ cmake ];
@@ -33,12 +38,14 @@ stdenv.mkDerivation (finalAttrs: {
openssl
];
+ installFlags = [ "INSTALL_PREFIX=$(out)" ];
+
meta = {
description = "Open Source OPC UA Application Server and OPC UA Client/Server C++ Libraries";
homepage = "https://asneg.github.io/projects/opcuastack";
license = lib.licenses.asl20;
maintainers = [ lib.maintainers.sikmir ];
platforms = lib.platforms.linux;
- skip.ci = stdenv.isDarwin;
+ skip.ci = true;
};
})
diff --git a/pkgs/by-name/pr/prettymapp/package.nix b/pkgs/by-name/pr/prettymapp/package.nix
@@ -21,6 +21,8 @@ python3Packages.buildPythonPackage rec {
dependencies = with python3Packages; [ osmnx ];
+ pythonRelaxDeps = true;
+
nativeCheckInputs = with python3Packages; [
pytestCheckHook
mock
@@ -38,6 +40,5 @@ python3Packages.buildPythonPackage rec {
homepage = "https://github.com/chrieke/prettymapp";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.sikmir ];
- broken = true; # osmnx
};
}
diff --git a/pkgs/by-name/py/pytorchtext/package.nix b/pkgs/by-name/py/pytorchtext/package.nix
@@ -4,27 +4,33 @@
fetchFromGitHub,
python3Packages,
cmake,
+ ninja,
which,
revtok,
}:
python3Packages.buildPythonPackage rec {
pname = "pytorchtext";
- version = "0.10.1";
+ version = "0.18.0";
pyproject = true;
src = fetchFromGitHub {
owner = "pytorch";
repo = "text";
tag = "v${version}";
- hash = "sha256-UCH/12jVeUY+h3Qop/RPtjIeXdddA1upsWIiwAs8+bc=";
+ hash = "sha256-ok91rw/76ivtTTd3DkdDG7N2aZE5WqPuZE4YbbQ0pYU=";
fetchSubmodules = true;
};
+ postPatch = ''
+ substituteInPlace setup.py --replace-fail "subprocess.check_call" "pass #"
+ '';
+
build-system = with python3Packages; [ setuptools ];
nativeBuildInputs = [
cmake
+ ninja
which
];
@@ -47,6 +53,8 @@ python3Packages.buildPythonPackage rec {
doCheck = false;
+ env.NIX_CFLAGS_COMPILE = "-Wno-error=enum-constexpr-conversion";
+
pythonImportsCheck = [ "torchtext" ];
meta = {
@@ -54,6 +62,6 @@ python3Packages.buildPythonPackage rec {
homepage = "https://github.com/pytorch/text";
license = lib.licenses.bsd3;
maintainers = [ lib.maintainers.sikmir ];
- broken = true; # spacy is broken
+ broken = true; # error: implicit instantiation of undefined template 'std::char_traits'
};
}