Merge master into staging-nixos

This commit is contained in:
nixpkgs-ci[bot]
2026-05-25 07:36:58 +00:00
committed by GitHub
57 changed files with 325 additions and 561 deletions
@@ -26,9 +26,9 @@ let
url = "https://edgedl.me.gvt1.com/android/studio/ide-zips/2025.3.4.5/android-studio-panda4-rc1-linux.tar.gz";
};
latestVersion = {
version = "2026.1.1.5"; # "Android Studio Quail 1 | 2026.1.1 Canary 5"
sha256Hash = "sha256-k4rM0MyTh0wnpsK8m6Hs1nSdwYpqUiQ+z7oiO6hn9YQ=";
url = "https://edgedl.me.gvt1.com/android/studio/ide-zips/2026.1.1.5/android-studio-quail1-canary5-linux.tar.gz";
version = "2026.1.2.2"; # "Android Studio Quail 2 | 2026.1.2 Canary 2"
sha256Hash = "sha256-+FmW72k48GF71yzCdpIAl//qi6w26Qg8gZUW5/Nuh58=";
url = "https://edgedl.me.gvt1.com/android/studio/ide-zips/2026.1.2.2/android-studio-quail2-canary2-linux.tar.gz";
};
in
{
@@ -13,13 +13,13 @@ let
pname = "ghostel";
version = "0-unstable-2026-05-06";
version = "0-unstable-2026-05-23";
src = fetchFromGitHub {
owner = "dakra";
repo = "ghostel";
rev = "5bce751687f3b33978a4244a1611648bbedb7124";
hash = "sha256-MAV3iQeriZhE9SGwVEnKs2rwebbEnPP1LiHuCAjlGE8=";
rev = "cd32af7bd6b9c827701a62ed8f0c3bc705800f13";
hash = "sha256-5XmHI+lkzLFW8VNVC3eyc+msi6y+Qh6q6WsBZpHNEf4=";
};
module = stdenv.mkDerivation (finalAttrs: {
@@ -5,13 +5,13 @@
}:
mkLibretroCore {
core = "mame2003";
version = "0-unstable-2026-04-02";
version = "0-unstable-2026-05-22";
src = fetchFromGitHub {
owner = "libretro";
repo = "mame2003-libretro";
rev = "c651c573655218428d7c524f611f7d62d13861a1";
hash = "sha256-7tAmLBClwM6gMILiWN3cIl452EX0JVFtTSEdxPoRs/4=";
rev = "099c2ef21c67c463a97b9ab19403e58b31c69740";
hash = "sha256-D3/d/TzTjK0t4bh6Il9CMfHTHdYgMsQNE52PxjrXeyE=";
};
# Fix build with GCC 14
-84
View File
@@ -1,84 +0,0 @@
{
lib,
stdenv,
fetchFromGitHub,
python3Packages,
libspnav,
jq,
}:
let
self = {
octoprint = stdenv.mkDerivation {
pname = "Cura-OctoPrintPlugin";
version = "3.5.18";
src = fetchFromGitHub {
owner = "fieldOfView";
repo = "Cura-OctoPrintPlugin";
rev = "7bd73946fbf22d18337dc900a81a011ece26bee0";
sha256 = "057b2f5f49p96lkh2wsr9w6yh2003x4a85irqsgbzp6igmk8imdn";
};
propagatedBuildInputs = with python3Packages; [
netifaces
];
installPhase = ''
mkdir -p $out/lib/cura/plugins/OctoPrintPlugin
cp -rv . $out/lib/cura/plugins/OctoPrintPlugin/
'';
meta = {
description = "Enables printing directly to OctoPrint and monitoring the process";
homepage = "https://github.com/fieldOfView/Cura-OctoPrintPlugin";
license = lib.licenses.agpl3Plus;
maintainers = [ ];
};
};
rawmouse = stdenv.mkDerivation rec {
pname = "RawMouse";
version = "1.1.0";
src = fetchFromGitHub {
owner = "smartavionics";
repo = "RawMouse";
rev = version;
sha256 = "0hvi7qwd4xfnqnhbj9dgfjmvv9df7s42asf3fdfxv43n6nx74scw";
};
nativeBuildInputs = [ jq ];
propagatedBuildInputs = with python3Packages; [
hidapi
];
buildPhase = ''
jq 'del(.devices) | .libspnav="${libspnav}/lib/libspnav.so"' \
<RawMouse/config.json >RawMouse/config.json.new
mv RawMouse/config.json.new RawMouse/config.json
# remove prebuilt binaries
rm -r RawMouse/hidapi
'';
installPhase = ''
mkdir -p $out/lib/cura/plugins/RawMouse
cp -rv . $out/lib/cura/plugins/RawMouse/
'';
meta = {
description = "Cura plugin for HID mice such as 3Dconnexion spacemouse";
homepage = "https://github.com/smartavionics/RawMouse";
license = lib.licenses.agpl3Plus;
maintainers = [ ];
};
};
};
in
self
@@ -1,49 +0,0 @@
{
lib,
stdenv,
fetchFromGitHub,
cmake,
libarcus,
stb,
protobuf,
fetchpatch,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "curaengine";
version = "4.13.1";
src = fetchFromGitHub {
owner = "Ultimaker";
repo = "CuraEngine";
rev = finalAttrs.version;
sha256 = "sha256-dx0Q6cuA66lG4nwR7quW5Tvs9sdxjdV4gtpxXirI4nY=";
};
nativeBuildInputs = [ cmake ];
buildInputs = [
libarcus
stb
protobuf
];
cmakeFlags = [ "-DCURA_ENGINE_VERSION=${finalAttrs.version}" ];
# TODO already fixed in master, remove in next release
patches = [
(fetchpatch {
url = "https://github.com/Ultimaker/CuraEngine/commit/de60e86a6ea11cb7d121471b5dd192e5deac0f3d.patch";
hash = "sha256-/gT9yErIDDYAXvZ6vX5TGlwljy31K563+sqkm1UGljQ=";
includes = [ "src/utils/math.h" ];
})
];
meta = {
description = "Powerful, fast and robust engine for processing 3D models into 3D printing instruction";
homepage = "https://github.com/Ultimaker/CuraEngine";
license = lib.licenses.agpl3Only;
platforms = lib.platforms.linux;
maintainers = [ ];
mainProgram = "CuraEngine";
};
})
@@ -110,13 +110,13 @@
"vendorHash": null
},
"bpg_proxmox": {
"hash": "sha256-RgyPVv3CWHgArDjmcz46j578hgleHFQ81MJ5OUWXnBk=",
"hash": "sha256-eOllsoXIHOym4pn2pBh5Air5eDvgvppVcnw+FfxRet4=",
"homepage": "https://registry.terraform.io/providers/bpg/proxmox",
"owner": "bpg",
"repo": "terraform-provider-proxmox",
"rev": "v0.106.0",
"rev": "v0.107.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-AxXZRn2D6iEIG6p00KGQi1kMkt2F/ZyeBsXHR345wag="
"vendorHash": "sha256-IbxQVfNvMiXGMkrNQoSBQW3VemK9NW8zs8o1epTZydE="
},
"brightbox_brightbox": {
"hash": "sha256-pwFbCP+qDL/4IUfbPRCkddkbsEEeAu7Wp12/mDL0ABA=",
@@ -1184,13 +1184,13 @@
"vendorHash": "sha256-w/AmSHydCeyp/EURgPY2c/E2LjqAXXCORI53X1hEdxY="
},
"scaleway_scaleway": {
"hash": "sha256-daBVjUAmFbi5MlrroyVggXOr3i6dIfG8gT9+P8+GsIg=",
"hash": "sha256-79oqPfnfX1jFDM9hSXqGF1r3B6S0JEj2+6whxLEmq+Q=",
"homepage": "https://registry.terraform.io/providers/scaleway/scaleway",
"owner": "scaleway",
"repo": "terraform-provider-scaleway",
"rev": "v2.74.0",
"rev": "v2.75.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-MlhvbUewtVvfqM0aNM9VWmha30hoXLvCG9E3o8dsH4s="
"vendorHash": "sha256-GwOKy2H06s+byyb0k4lta30lfAVmLSbEcyyQm0giw1E="
},
"scottwinkler_shell": {
"hash": "sha256-LTWEdXxi13sC09jh+EFZ6pOi1mzuvgBz5vceIkNE/JY=",
+2 -2
View File
@@ -25,14 +25,14 @@
stdenv.mkDerivation (finalAttrs: {
pname = "abiword";
version = "3.0.7";
version = "3.0.8";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "World";
repo = "AbiWord";
tag = "release-${finalAttrs.version}";
hash = "sha256-dYbJ726Zuxs7+VTTCWHYQLsVZ/86hRUBQRac6toO4UI=";
hash = "sha256-TjOHixfCXDQlUUbD1L5wcGe4Nl0+1UqZw4EF+1/eZ4w=";
};
nativeBuildInputs = [
@@ -1,5 +1,6 @@
{
lib,
stdenv,
buildGoModule,
fetchFromGitHub,
libfido2,
@@ -26,6 +27,24 @@ buildGoModule (finalAttrs: {
buildInputs = [ libfido2 ];
postConfigure = lib.optionalString stdenv.hostPlatform.isDarwin ''
chmod -R +w vendor/github.com/keys-pub/go-libfido2
substituteInPlace vendor/github.com/keys-pub/go-libfido2/fido2_static_arm64.go \
--replace-fail \
'/opt/homebrew/opt/libfido2/lib/libfido2.a /opt/homebrew/opt/openssl@3/lib/libcrypto.a ''${SRCDIR}/darwin/arm64/lib/libcbor.a' \
'-lfido2' \
--replace-fail \
'-I/opt/homebrew/opt/libfido2/include -I/opt/homebrew/opt/openssl@3/include' \
'-I${libfido2.dev}/include'
substituteInPlace vendor/github.com/keys-pub/go-libfido2/fido2_static_amd64.go \
--replace-fail \
'/usr/local/lib/libfido2.a /usr/local/opt/openssl@3/lib/libcrypto.a ''${SRCDIR}/darwin/amd64/lib/libcbor.a' \
'-lfido2' \
--replace-fail \
'-I/usr/local/opt/libfido2/include -I/usr/local/opt/openssl@3/include' \
'-I${libfido2.dev}/include'
'';
meta = {
description = "Age plugin to encrypt files with FIDO2 tokens in a way compatible to typage";
homepage = "https://github.com/FiloSottile/typage/";
+5 -1
View File
@@ -2,6 +2,7 @@
lib,
stdenv,
fetchFromGitea,
cctools,
yarn-berry_3,
nodejs,
python311,
@@ -42,7 +43,10 @@ stdenv.mkDerivation (finalAttrs: {
python311
libsass
]
++ lib.optional stdenv.hostPlatform.isDarwin xcbuild;
++ lib.optionals stdenv.hostPlatform.isDarwin [
xcbuild
cctools.libtool
];
buildPhase = ''
runHook preBuild
+2 -2
View File
@@ -32,11 +32,11 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "alsa-utils";
version = "1.2.14";
version = "1.2.15.2";
src = fetchurl {
url = "mirror://alsa/utils/alsa-utils-${finalAttrs.version}.tar.bz2";
hash = "sha256-B5THTTP+2UPnxQYJwTCJ5AkxK2xAPWromE/EKcCWB0E=";
hash = "sha256-eqqvv7AZQhE+wMMeUfcFkQ6BB5IFCIyi+PE3o4aeGjo=";
};
nativeBuildInputs = [
+2 -2
View File
@@ -11,13 +11,13 @@
buildGoModule (finalAttrs: {
pname = "boring";
version = "0.13.0";
version = "0.14.0";
src = fetchFromGitHub {
owner = "alebeck";
repo = "boring";
tag = "v${finalAttrs.version}";
hash = "sha256-9ei2Kl2590DY0S9jrc+MxsL5srxmwx8wD6uFlVQ6o4o=";
hash = "sha256-cyRy7lF2wGupzDnW4zPKEuM0X0aaHrWbF/3p13xb2DA=";
};
nativeBuildInputs = [
-93
View File
@@ -1,93 +0,0 @@
{
lib,
stdenv,
fetchFromGitHub,
cmake,
python3,
libsForQt5,
curaengine,
plugins ? [ ],
}:
stdenv.mkDerivation (finalAttrs: {
pname = "cura";
version = "4.13.1";
src = fetchFromGitHub {
owner = "Ultimaker";
repo = "Cura";
rev = finalAttrs.version;
sha256 = "sha256-R88SdAxx3tkQCDInrFTKad1tPSDTSYaVAPUVmdk94Xk=";
};
materials = fetchFromGitHub {
owner = "Ultimaker";
repo = "fdm_materials";
rev = "4.13.2";
sha256 = "sha256-7y4OcbeQHv+loJ4cMgPU0e818Zsv90EwARdztNWS8zM=";
};
buildInputs = [
libsForQt5.qtbase
libsForQt5.qtquickcontrols2
libsForQt5.qtgraphicaleffects
];
propagatedBuildInputs =
with python3.pkgs;
[
libsavitar
numpy-stl
pyserial
requests
uranium
zeroconf
pynest2d
sentry-sdk
trimesh
keyring
]
++ plugins;
nativeBuildInputs = [
cmake
python3.pkgs.wrapPython
libsForQt5.wrapQtAppsHook
];
cmakeFlags = [
"-DURANIUM_DIR=${python3.pkgs.uranium.src}"
"-DCURA_VERSION=${finalAttrs.version}"
];
makeWrapperArgs = [
# hacky workaround for https://github.com/NixOS/nixpkgs/issues/59901
"--set OMP_NUM_THREADS 1"
];
postPatch = ''
sed -i 's,/python''${PYTHON_VERSION_MAJOR}/dist-packages,/python''${PYTHON_VERSION_MAJOR}.''${PYTHON_VERSION_MINOR}/site-packages,g' CMakeLists.txt
sed -i 's, executable_name = .*, executable_name = "${curaengine}/bin/CuraEngine",' plugins/CuraEngineBackend/CuraEngineBackend.py
'';
postInstall = ''
mkdir -p $out/share/cura/resources/materials
cp ${finalAttrs.materials}/*.fdm_material $out/share/cura/resources/materials/
mkdir -p $out/lib/cura/plugins
for plugin in ${toString plugins}; do
ln -s $plugin/lib/cura/plugins/* $out/lib/cura/plugins
done
'';
postFixup = ''
wrapPythonPrograms
wrapQtApp $out/bin/cura
'';
meta = {
description = "3D printer / slicing GUI built on top of the Uranium framework";
mainProgram = "cura";
homepage = "https://github.com/Ultimaker/Cura";
license = lib.licenses.lgpl3Plus;
platforms = lib.platforms.linux;
maintainers = [ ];
};
})
+3 -3
View File
@@ -7,16 +7,16 @@
buildNpmPackage (finalAttrs: {
pname = "dotenvx";
version = "1.66.0";
version = "1.68.0";
src = fetchFromGitHub {
owner = "dotenvx";
repo = "dotenvx";
tag = "v${finalAttrs.version}";
hash = "sha256-dW/7dD24zCyGwKf6QDtT6WRglHJwJwI+peiPdmdxoOQ=";
hash = "sha256-w2AljviPNkXC+f4x3QEuR9FSkg0Dy+zYqVPrSWjbrDU=";
};
npmDepsHash = "sha256-jDqlcRMU2nzL4l1N/cFhYFpXOur9+RH4JFb7Sgdd7wU=";
npmDepsHash = "sha256-l9nRDYg7mrgF2GAYbQgoes0VzpTGAn9TMHrmWjvZnMY=";
dontNpmBuild = true;
+2 -2
View File
@@ -33,14 +33,14 @@ let
in
python.pkgs.buildPythonApplication (finalAttrs: {
pname = "esphome";
version = "2026.5.0";
version = "2026.5.1";
pyproject = true;
src = fetchFromGitHub {
owner = "esphome";
repo = "esphome";
tag = finalAttrs.version;
hash = "sha256-oWlzpBzDOSrXv+gOnFSL7TQqDZJc3oN2RoAW2ywFCGo=";
hash = "sha256-faW44FhAymqGQG4khAUEcv6QoAn49KPSghi3YcXttNk=";
};
patches = [
+3 -3
View File
@@ -34,7 +34,7 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "field-monitor";
version = "50.0";
version = "50.1";
strictDeps = true;
@@ -42,12 +42,12 @@ stdenv.mkDerivation (finalAttrs: {
owner = "theCapypara";
repo = "field-monitor";
tag = "v${finalAttrs.version}";
hash = "sha256-IVHzMUjjVZHDTI6Jjq7i8wrENPerKzEiDT15otPFx9A=";
hash = "sha256-waMa70oLKvIoljvE+MjWWKVL1Cd0xnasVeB17tfMQW8=";
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit (finalAttrs) src;
hash = "sha256-c4ANjQ1OoDMMifAUpU8iNE9lSBamAR+XbEmYrYphixU=";
hash = "sha256-fsrczFhoIilxgZRH2PVXC67YdkMsIjA6zTfix57TTzo=";
};
mesonBuildType = "release";
+3 -3
View File
@@ -10,16 +10,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "inputplumber";
version = "0.77.1";
version = "0.77.2";
src = fetchFromGitHub {
owner = "ShadowBlip";
repo = "InputPlumber";
tag = "v${finalAttrs.version}";
hash = "sha256-S3fyhgCNJFx9w64E/BfNh8i4nIBEFwoVLTcTFb8Escw=";
hash = "sha256-QxGDmuRTZLHBqZ+S73CtNKdLg/XumutGSpTSz4sGFYQ=";
};
cargoHash = "sha256-mnWjVM5nWkYMeRRKLsak0SZUUsVg9odjy7KFa/sldC8=";
cargoHash = "sha256-EtCK/zYRW2LdZhPSrO6ydBXBQwIrkqaJmH+3XfwERTw=";
nativeBuildInputs = [
pkg-config
+15 -2
View File
@@ -15,6 +15,8 @@
rocmPackages ? { },
rocmGpuTargets ? rocmPackages.clr.localGpuTargets or rocmPackages.clr.gpuTargets,
cpuArchDynamicDispatch ? true,
openclSupport ? false,
clblast,
@@ -141,8 +143,7 @@ effectiveStdenv.mkDerivation (finalAttrs: {
'';
cmakeFlags = [
# -march=native is non-deterministic; override with platform-specific flags if needed
(cmakeBool "GGML_NATIVE" false)
(cmakeBool "GGML_NATIVE" false) # -march=native would make builds non-deterministic
(cmakeBool "LLAMA_BUILD_EXAMPLES" false)
(cmakeBool "LLAMA_BUILD_SERVER" true)
(cmakeBool "LLAMA_BUILD_TESTS" (finalAttrs.finalPackage.doCheck or false))
@@ -157,6 +158,18 @@ effectiveStdenv.mkDerivation (finalAttrs: {
(cmakeBool "GGML_VULKAN" vulkanSupport)
(cmakeFeature "LLAMA_BUILD_NUMBER" finalAttrs.version)
]
++ optionals cpuArchDynamicDispatch [
# Build all CPU backend variants for runtime dynamic dispatch.
# This avoids illegal instructions on older CPUs and gives optimal performance
# on newer ones without needing separate builds.
# Enabling AVX2 can make CPU inference 13x faster compared to NixOS's x86_64 defaults.
# Note it is not a bug that the CPU variant .so files are placed in `bin/`
# (as opposed to `lib/`) alongside the executables by upstream's `CMakeLists.txt` design:
# * https://github.com/ggml-org/llama.cpp/blob/b46812de78f8fbcb6cf0154947e8633ebc78d9ac/ggml/src/CMakeLists.txt#L249-L252
# * https://github.com/ggml-org/llama.cpp/blob/b46812de78f8fbcb6cf0154947e8633ebc78d9ac/ggml/src/ggml-backend-reg.cpp#L480-L486
(cmakeBool "GGML_CPU_ALL_VARIANTS" true)
(cmakeBool "GGML_BACKEND_DL" true)
]
++ optionals cudaSupport [
(cmakeFeature "CMAKE_CUDA_ARCHITECTURES" cudaPackages.flags.cmakeCudaArchitecturesString)
]
+6 -6
View File
@@ -7,12 +7,12 @@
let
pname = "lmstudio";
version_aarch64-linux = "0.4.13-1";
hash_aarch64-linux = "sha256-3Z+wt8H8QdFiz190Pa+33fkKHf1Df7nzWoUNYz2TrYw=";
version_aarch64-darwin = "0.4.13-1";
hash_aarch64-darwin = "sha256-cj1KqM55iyJzg7O6SuQmUn2RHUZpE9fzljft8tYWHUE=";
version_x86_64-linux = "0.4.13-1";
hash_x86_64-linux = "sha256-IHhqAsYVi1XCaryxrEyhakDyye2vehbsJ77eF68KaIg=";
version_aarch64-linux = "0.4.14-4";
hash_aarch64-linux = "sha256-mlPeSTPUVJ8C7zheuX7ZJnDFQtg9oTg/LBqXJrbPfMs=";
version_aarch64-darwin = "0.4.14-4";
hash_aarch64-darwin = "sha256-9Kcj+IA5DhJuxSetKCHCPJ5GECCpnjnZlYPXD9jafy0=";
version_x86_64-linux = "0.4.14-4";
hash_x86_64-linux = "sha256-oDPL/m1Ghutxmi3iumsy2/Hs6Bp8UDWsJeup1Vlu/i8=";
meta = {
description = "LM Studio is an easy to use desktop app for experimenting with local and open-source Large Language Models (LLMs)";
+7
View File
@@ -2,6 +2,7 @@
lib,
stdenv,
fetchurl,
autoreconfHook,
boost,
}:
@@ -14,6 +15,12 @@ stdenv.mkDerivation (finalAttrs: {
sha256 = "0jggmlaywjfbdljzv5hyiz49plnxh0har2bnc9dq4xmj1pmjgs49";
};
patches = [
./remove-boost-system.patch
];
nativeBuildInputs = [ autoreconfHook ];
buildInputs = [ boost ];
enableParallelBuilding = true;
@@ -0,0 +1,13 @@
diff --git a/configure.ac b/configure.ac
index fd06d1a..337178c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -14,8 +14,6 @@ AC_PROG_RANLIB
AC_LANG([C++])
AC_CHECK_HEADER(boost/spirit.hpp, :,
AC_MSG_ERROR([Cannot find the Boost library headers! See the README for details.]))
-AC_CHECK_LIB([boost_system], [main], [LIBS="-lboost_system"],
- [AC_MSG_ERROR([cannot link required boost.system library])])
gl_INIT
AC_SYS_LARGEFILE
+3 -3
View File
@@ -8,12 +8,12 @@
}:
let
pname = "models-dev";
version = "0-unstable-2026-05-19";
version = "0-unstable-2026-05-23";
src = fetchFromGitHub {
owner = "anomalyco";
repo = "models.dev";
rev = "db0a7cf6113f380b15e8ab21944e5de18bb30feb";
hash = "sha256-kFskkQ5YrK7ler8s+vC5ONEjmNmOpiIKAZqoiCk97Qk=";
rev = "d497a446eb9335623904006cbe5f4ac7308a7a80";
hash = "sha256-gS90dc6NGNJnuvQ7CAcM5DhGWqjrp0Ox59tHzQPj9R0=";
};
node_modules = stdenvNoCC.mkDerivation {
+17 -13
View File
@@ -1,10 +1,11 @@
{
lib,
stdenv,
fetchurl,
fetchFromGitHub,
m4,
which,
yasm,
texinfo,
autoreconfHook,
fetchpatch,
buildPackages,
@@ -14,18 +15,11 @@ stdenv.mkDerivation (finalAttrs: {
pname = "mpir";
version = "3.0.0";
depsBuildBuild = [ buildPackages.stdenv.cc ];
nativeBuildInputs = [
m4
which
yasm
autoreconfHook
];
src = fetchurl {
url = "https://mpir.org/mpir-${finalAttrs.version}.tar.bz2";
sha256 = "1fvmhrqdjs925hzr2i8bszm50h00gwsh17p2kn2pi51zrxck9xjj";
src = fetchFromGitHub {
owner = "wbhart";
repo = "mpir";
tag = "mpir-${finalAttrs.version}";
hash = "sha256-Q5P3N2w6NX+s5Fu3obTDOg+tEAWnAMDgbRlzFTpolmg=";
};
patches = [
@@ -47,6 +41,16 @@ stdenv.mkDerivation (finalAttrs: {
})
];
depsBuildBuild = [ buildPackages.stdenv.cc ];
nativeBuildInputs = [
m4
which
yasm
texinfo
autoreconfHook
];
configureFlags = [ "--enable-cxx" ] ++ lib.optionals stdenv.hostPlatform.isLinux [ "--enable-fat" ];
meta = {
+3 -3
View File
@@ -7,13 +7,13 @@
buildGoModule {
pname = "pkgsite";
version = "0-unstable-2026-05-14";
version = "0-unstable-2026-05-22";
src = fetchFromGitHub {
owner = "golang";
repo = "pkgsite";
rev = "a5fcada8aa006fec3698037f4702e66122994e6c";
hash = "sha256-kY3uXHsXDYRml4mZAZaFK95BDju92cmMZ4XoSNoNquo=";
rev = "866fa310855a76cf898838dac1cc56850e15cca6";
hash = "sha256-zhBJ7sYXyzK9Rs2qA9CziIG50cCZ88a/msKzqIQIlJM=";
};
vendorHash = "sha256-A5gfYxgbq+5WG4W642fhRHw78oWGOrI+OyJ66W/gl00=";
+3 -3
View File
@@ -7,16 +7,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "protols";
version = "0.13.4";
version = "0.14.0";
src = fetchFromGitHub {
owner = "coder3101";
repo = "protols";
tag = finalAttrs.version;
hash = "sha256-OREJDG0RycYhULTbqx2dXaXlIYexebUFdCiJbBN3cXE=";
hash = "sha256-VB7Zs1Zo+hn+M4vhBmOZNod3Q9dbwcMNwRvTIIP+Gk4=";
};
cargoHash = "sha256-uero/p1ATagY6k8t6QCdfPRLeZreVrvshe3dE/M9dkg=";
cargoHash = "sha256-qfNWZmJYVKDKZ8/JIXtSWYnq4pZXmU7rXQDV117j/a0=";
env.FALLBACK_INCLUDE_PATH = "${protobuf}/include";
+2 -2
View File
@@ -19,11 +19,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "qownnotes";
appname = "QOwnNotes";
version = "26.5.12";
version = "26.5.15";
src = fetchurl {
url = "https://github.com/pbek/QOwnNotes/releases/download/v${finalAttrs.version}/qownnotes-${finalAttrs.version}.tar.xz";
hash = "sha256-xb7bRcqxO51u3ZDxIlPaK7rUxsl2W5+81u8OLPFSgPs=";
hash = "sha256-Hx/OMImjjMdQLl5bhp3tQ+tDQjbEkptQjHavj7An4c0=";
};
nativeBuildInputs = [
+3 -3
View File
@@ -8,7 +8,7 @@
buildGoModule (finalAttrs: {
pname = "spire";
version = "1.14.6";
version = "1.15.0";
outputs = [
"out"
@@ -21,12 +21,12 @@ buildGoModule (finalAttrs: {
owner = "spiffe";
repo = "spire";
tag = "v${finalAttrs.version}";
sha256 = "sha256-3NboIbLRxs4yPjQUKdK7B+Rhl08SxEDPuj5N8lWd1gA=";
sha256 = "sha256-mOYPVvumMIXgfJGQeStU62DlBOIwI0Sav5cQonU28r0=";
};
# Needed for github.co/google/go-tpm-tools/simulator which contains non-go files that `go mod vendor` strips
proxyVendor = true;
vendorHash = "sha256-Ajoxxpf6oWW6jioMTgeyaIszVhp4j7E2+msE0nhfKpk=";
vendorHash = "sha256-F9M7Tvo/yF1QVnjB7Gp3mbZc7159Dx7wgttjstkA/1w=";
buildInputs = [ openssl ];
+2 -2
View File
@@ -27,14 +27,14 @@
}:
stdenv.mkDerivation (finalAttrs: {
version = "2.1.0";
version = "2.1.1";
pname = "syncthingtray";
src = fetchFromGitHub {
owner = "Martchus";
repo = "syncthingtray";
rev = "v${finalAttrs.version}";
hash = "sha256-trmNK6lyKL6zNcL/FKELkLOJK9vVpFcS3uGMeMrlpPI=";
hash = "sha256-JaekoeY9owh9GNR2f26Po5BoNu+sTvLPfvn/O0VBEdM=";
};
buildInputs = [
+3 -3
View File
@@ -9,19 +9,19 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "tombi";
version = "0.10.4";
version = "0.11.6";
src = fetchFromGitHub {
owner = "tombi-toml";
repo = "tombi";
tag = "v${finalAttrs.version}";
hash = "sha256-Hs274ROPzyhVyvcvA7pDZ6+EELj4uUZylz94BoZNe6M=";
hash = "sha256-m9ppr3P4HIzIzNYbLukbcCoYwRdcTWIpMmcmteIfo84=";
};
# Tests relies on the presence of network
doCheck = false;
cargoBuildFlags = [ "--package tombi-cli" ];
cargoHash = "sha256-i7OeWuGLrDFjBhFjuygIZ35LbzENM39+cCwHJ98ECyQ=";
cargoHash = "sha256-f67OkZEB98KCtvkjszrcPLoC2QWl/5rd/qvb8jmonxc=";
postPatch = ''
substituteInPlace Cargo.toml \
+2 -2
View File
@@ -46,13 +46,13 @@ let
in
chosenStdenv.mkDerivation (finalAttrs: {
pname = "tpm2-pkcs11";
version = "1.9.2";
version = "1.10.0";
src = fetchFromGitHub {
owner = "tpm2-software";
repo = "tpm2-pkcs11";
tag = finalAttrs.version;
hash = "sha256-o0a5MiFqLH7SuHG/BEtPVGOaDoV+kCu2l1MCHt5rWFc=";
hash = "sha256-89lChdkheSEC0JKMKNXN11BqjeJgt1Hdk+QxjLPY72M=";
};
# Disable Javabased tests because of missing dependencies
+3 -4
View File
@@ -13,7 +13,6 @@
libjpeg,
libtool,
libxkbcommon,
nss,
nspr,
udev,
gtk3,
@@ -168,9 +167,9 @@ else
tar -xf data.tar.xz
# Remove unneeded files
rm -rf usr/share/{fonts,locale}
rm -rf usr/share/{fonts,locale,templates}
rm -f usr/bin/misc
rm -rf opt/kingsoft/wps-office/{desktops,INSTALL}
rm -rf opt/kingsoft/wps-office/{desktops,INSTALL,templates}
rm -f opt/kingsoft/wps-office/office6/lib{peony-wpsprint-menu-plugin,bz2,jpeg,stdc++,gcc_s,odbc*,dbus-1}.so*
'';
@@ -189,7 +188,7 @@ else
for i in $out/share/applications/*; do
substituteInPlace $i \
--replace-fail /usr/bin $out/bin
--replace-fail /usr/bin/ ""
done
runHook postInstall
+3 -3
View File
@@ -10,18 +10,18 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "zerofs";
version = "1.1.7";
version = "1.1.10";
src = fetchFromGitHub {
owner = "Barre";
repo = "ZeroFS";
tag = "v${finalAttrs.version}";
hash = "sha256-DNdSrDlknZhUG7yQ5ckBcCJFktguDG1qfOtRz3MMmG4=";
hash = "sha256-1nCtfFxIH0DJCNSTcUlxkxqyLONualGMKfcVZP5b24Q=";
};
sourceRoot = "${finalAttrs.src.name}/zerofs";
cargoHash = "sha256-rS40vg3x+tWhlPv3KfK0mpoUeYa5O9QpTxuZm2IYZ3k=";
cargoHash = "sha256-vbiRllYMRVufwNPA987keP0MJK+DRms6TnSA8UAn+Bw=";
nativeBuildInputs = [ cmake ];
@@ -10,13 +10,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "qtutilities";
version = "6.21.1";
version = "6.21.2";
src = fetchFromGitHub {
owner = "Martchus";
repo = "qtutilities";
rev = "v${finalAttrs.version}";
hash = "sha256-kZ9Iql4QRxxm/NUPKFMMqYlAMV3zsHWzyaSH7k//Bnw=";
hash = "sha256-pPCXhk6ujIu+TmxeLP8FPkHopjhy0dVUj/kR9yXxmrc=";
};
nativeBuildInputs = [
@@ -168,7 +168,7 @@ in
};
wlroots_0_20 = generic {
version = "0.20.0";
hash = "sha256-hVJlJiJK6+9RkgkmQzUzb8ypVMqsNhbQG6KfeCvxtb0=";
version = "0.20.1";
hash = "sha256-uuc1dn13FXvFSBvE3+QOi35rLJZmWIUst64oaXGdPFk=";
};
}
@@ -2,6 +2,7 @@
lib,
fetchFromGitHub,
buildPythonPackage,
pythonOlder,
unittestCheckHook,
cargo,
rustc,
@@ -36,6 +37,9 @@ buildPythonPackage rec {
unittestFlagsArray = [ "tests/" ]; # Not sure why it isn't autodiscovered
# pyo3-asyncio 0.20 segfaults on the python 3.14 interpreter state.
doCheck = pythonOlder "3.14";
pythonImportsCheck = [ "aiotarfile" ];
meta = {
@@ -18,14 +18,14 @@
buildPythonPackage rec {
pname = "beaupy";
version = "3.11.0";
version = "3.12.0";
pyproject = true;
src = fetchFromGitHub {
owner = "petereon";
repo = "beaupy";
rev = "v${version}";
hash = "sha256-EQekSvjhL2qVQTjbdv4OqYMRUXrS9VzAIWiDjGdy3Rc=";
hash = "sha256-9iJZFOtQ6UTc8i4cN4soEG0SLcljenAQwq0wfK6r/Rw=";
};
build-system = [
@@ -49,6 +49,8 @@ buildPythonPackage rec {
cmake
gfortran
];
env.NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isLinux "-z,noexecstack";
};
NIX_CFLAGS_COMPILE = toString [
"-Wno-error=incompatible-pointer-types"
@@ -7,16 +7,18 @@
setuptools,
}:
buildPythonPackage rec {
buildPythonPackage (finalAttrs: {
pname = "braintree";
version = "4.41.0";
version = "4.43.0";
pyproject = true;
__structuredAttrs = true;
src = fetchFromGitHub {
owner = "braintree";
repo = "braintree_python";
rev = version;
hash = "sha256-5rTYRzlx/XueL6vF0/kM73bgN/QjvM55ZSLIWNI8YiQ=";
tag = finalAttrs.version;
hash = "sha256-4qLi6MplXaIT8+Us3Yb9fTph74XntagBNzyS//4K5Fk=";
};
build-system = [ setuptools ];
@@ -27,9 +29,8 @@ buildPythonPackage rec {
pythonImportsCheck = [ "braintree" ];
# Most integration tests require a running Braintree gateway.
enabledTestPaths = [
"tests/"
"tests/fixtures"
"tests/unit"
"tests/integration/test_credentials_parser.py"
];
@@ -40,4 +41,4 @@ buildPythonPackage rec {
license = lib.licenses.mit;
maintainers = [ ];
};
}
})
@@ -5,11 +5,21 @@
rustPlatform,
pytestCheckHook,
arro3-core,
pyarrow,
pyproj,
obstore,
# tests
arro3-compute,
arro3-io,
geoarrow-types,
geodatasets,
geopandas,
numpy,
pandas,
geoarrow-types,
pyarrow,
pyogrio,
pyproj,
pytest-asyncio,
shapely,
}:
let
version = "0.6.1";
@@ -100,6 +110,7 @@ let
pythonImportsCheck = [ "geoarrow.rust.io" ];
dependencies = [
arro3-core
obstore
pyproj
];
};
@@ -113,16 +124,40 @@ let
dontInstall = true;
nativeCheckInputs = [
pytestCheckHook
geoarrow-types
pandas
pyarrow
numpy
arro3-compute
arro3-io
geoarrow-rust-core
geoarrow-rust-io
geoarrow-types
geodatasets
geopandas
numpy
obstore
pandas
pyarrow
pyogrio
pytest-asyncio
pytestCheckHook
shapely
];
pytestFlags = [ "python" ];
# use the latest test folder (skips the tests_old folder)
pytestFlags = [ "python/tests" ];
disabledTests = [
# require internet access to download datasets
"test_parse_nybb"
"test_parse_nybb_chunked"
"test_getitem"
"test_geo_interface_polygon"
"test_parquet_file"
];
# fix the directory name, as it is named as source for nix build
postPatch = ''
substituteInPlace python/tests/utils.py \
--replace-fail 'while current_dir.stem != "geoarrow-rs":' 'while current_dir.stem != "source":'
'';
};
in
{
@@ -24,6 +24,11 @@ buildPythonPackage (finalAttrs: {
hash = "sha256-jdv9GfcSBM7Ount8cnJLFbP6h7q16B5Fp1vvc2oaPHY=";
};
patches = [
# https://github.com/jaraco/irc/pull/236
./python-3.14-event-loop.patch
];
nativeBuildInputs = [ setuptools-scm ];
propagatedBuildInputs = [
@@ -0,0 +1,33 @@
--- a/irc/tests/test_client_aio.py
+++ b/irc/tests/test_client_aio.py
@@ -1,6 +1,4 @@
import asyncio
-import contextlib
-import warnings
from unittest.mock import MagicMock
from irc import client_aio
@@ -13,21 +11,14 @@ async def mock_create_connection(*args, **kwargs):
return mock_create_connection
-@contextlib.contextmanager
-def suppress_issue_197():
- with warnings.catch_warnings():
- warnings.filterwarnings('ignore', 'There is no current event loop')
- yield
-
-
def test_privmsg_sends_msg():
# create dummy transport, protocol
mock_transport = MagicMock()
mock_protocol = MagicMock()
# connect to dummy server
- with suppress_issue_197():
- loop = asyncio.get_event_loop()
+ loop = asyncio.new_event_loop()
+ asyncio.set_event_loop(loop)
loop.create_connection = make_mocked_create_connection(
mock_transport, mock_protocol
)
@@ -1,59 +0,0 @@
{
lib,
buildPythonPackage,
python,
fetchFromGitHub,
fetchpatch,
cmake,
sip4,
protobuf,
distutils,
}:
buildPythonPackage rec {
pname = "libarcus";
version = "4.12.0";
pyproject = false;
src = fetchFromGitHub {
owner = "Ultimaker";
repo = "libArcus";
rev = version;
hash = "sha256-X33ptwYj9YkVWqUDPP+Ic+hoIb+rwsLdQXvHLA9z+3w=";
};
patches = [
# Fix build against protobuf 3.18+
# https://github.com/Ultimaker/libArcus/issues/121
(fetchpatch {
url = "https://raw.githubusercontent.com/coryan/vcpkg/f69b85aa403b04e7d442c90db3418d484e44024f/ports/arcus/0001-fix-protobuf-deprecated.patch";
sha256 = "0bqj7pxzpwsamknd6gadj419x6mwx8wnlfzg4zqn6cax3cmasjb2";
})
];
propagatedBuildInputs = [
sip4
distutils
];
nativeBuildInputs = [
cmake
sip4
];
buildInputs = [ protobuf ];
strictDeps = true;
postPatch = ''
sed -i 's#''${Python3_SITEARCH}#${placeholder "out"}/${python.sitePackages}#' cmake/SIPMacros.cmake
'';
meta = {
description = "Communication library between internal components for Ultimaker software";
homepage = "https://github.com/Ultimaker/libArcus";
license = lib.licenses.lgpl3Plus;
platforms = lib.platforms.linux;
maintainers = [ ];
};
}
@@ -2,6 +2,7 @@
lib,
buildPythonPackage,
fetchPypi,
fetchpatch2,
setuptools,
pylint,
pytest,
@@ -19,6 +20,17 @@ buildPythonPackage rec {
hash = "sha256-iHZLjh1c+hiAkkjgzML8BQNfCMNfCwIi3c/qHDxOVT4=";
};
patches = [
# Use pathlib.Path in plugin hooks for pytest 8.1+ compatibility.
(fetchpatch2 {
url = "https://github.com/carsongee/pytest-pylint/commit/62457e8013df106116fb2a62c7c44870103ff393.patch?full_index=1";
hash = "sha256-EnlHEe5uZkvrWO8B33xkQ3LCQ7Bj5/oLES//NP8vkwE=";
})
# Handle test output difference in pytest 9.
# https://github.com/carsongee/pytest-pylint/pull/196
./pytest-9.patch
];
postPatch = ''
substituteInPlace setup.py \
--replace-fail "pytest-runner" ""
@@ -0,0 +1,13 @@
diff --git a/pytest_pylint/tests/test_pytest_pylint.py b/pytest_pylint/tests/test_pytest_pylint.py
index 4c87ac336690defb2f2d472b389945c91fae5d31..f6478c018f5974acb2fdd95f1d461ca71e1302ba 100644
--- a/pytest_pylint/tests/test_pytest_pylint.py
+++ b/pytest_pylint/tests/test_pytest_pylint.py
@@ -38,7 +38,7 @@ def test_nodeid_no_dupepath(testdir):
testdir.makepyfile(app="import sys")
result = testdir.runpytest("--pylint", "--verbose")
assert re.search(
- r"^FAILED\s+app\.py::PYLINT$", result.stdout.str(), flags=re.MULTILINE
+ r"^FAILED\s+app\.py::PYLINT( |$)", result.stdout.str(), flags=re.MULTILINE
)
@@ -23,7 +23,7 @@
}:
buildPythonPackage (finalAttrs: {
pname = "qtile-extras";
version = "0.35.0";
version = "0.36.0";
# nixpkgs-update: no auto update
# should be updated alongside with `qtile`
pyproject = true;
@@ -32,7 +32,7 @@ buildPythonPackage (finalAttrs: {
owner = "elParaguayo";
repo = "qtile-extras";
tag = "v${finalAttrs.version}";
hash = "sha256-xZ1pxe1EUnnjqz+46R4R9DWKi7M2j1pgvY4uy1dBak8=";
hash = "sha256-H2A5Y+ukTkUqjQB5eQVuOMYpf7T8RgQlNlQ25wlWwr8=";
};
build-system = [ setuptools-scm ];
@@ -72,8 +72,6 @@ buildPythonPackage (finalAttrs: {
# AttributeError: 'NoneType' object has no attribute 'theta'
"test_image_size_horizontal"
"test_image_size_vertical"
# flaky, timing sensitive
"test_visualiser"
];
disabledTestPaths = [
@@ -84,6 +82,11 @@ buildPythonPackage (finalAttrs: {
"test/widget/test_strava.py"
];
pytestFlags = [
"--reruns 3"
"--reruns-delay 5"
];
preCheck = ''
export HOME=$(mktemp -d)
export GDK_PIXBUF_MODULE_FILE=${librsvg}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache
@@ -20,7 +20,6 @@
psutil,
pulsectl-asyncio,
pygobject3,
pytz,
pyxdg,
xcffib,
extraPackages ? [ ],
@@ -52,6 +51,7 @@
pytestCheckHook,
pytest-asyncio,
pytest-httpbin,
pytest-rerunfailures,
pytest-xdist,
writableTmpDirAsHomeHook,
anyio,
@@ -70,7 +70,7 @@
buildPythonPackage (finalAttrs: {
pname = "qtile";
version = "0.35.0";
version = "0.36.0";
# nixpkgs-update: no auto update
# should be updated alongside with `qtile-extras`
@@ -80,14 +80,9 @@ buildPythonPackage (finalAttrs: {
owner = "qtile";
repo = "qtile";
tag = "v${finalAttrs.version}";
hash = "sha256-5XHzlS/Knw/VmVtnM7wToJ/F12GAa2lwdWuXBJHXnZM=";
hash = "sha256-yFh9h3djV52zdZjPYwOWaMzN9ZNhFdZYyxFJreoJBCk=";
};
patches = [
# https://github.com/qtile/qtile/pull/5889
./fix-test-net.patch
];
build-system = [
setuptools
setuptools-scm
@@ -108,6 +103,7 @@ buildPythonPackage (finalAttrs: {
pypaBuildFlags = [
"--config-setting=backend=wayland"
"--config-setting=FONTCONFIG=${lib.getLib fontconfig}/lib/libfontconfig.so"
"--config-setting=GOBJECT=${lib.getLib glib}/lib/libgobject-2.0.so"
"--config-setting=PANGO=${lib.getLib pango}/lib/libpango-1.0.so"
"--config-setting=PANGOCAIRO=${lib.getLib pango}/lib/libpangocairo-1.0.so"
@@ -125,7 +121,6 @@ buildPythonPackage (finalAttrs: {
psutil
pulsectl-asyncio
pygobject3
pytz
pyxdg
xcffib
];
@@ -154,10 +149,10 @@ buildPythonPackage (finalAttrs: {
pytestCheckHook
pytest-asyncio
pytest-httpbin
pytest-rerunfailures
pytest-xdist
writableTmpDirAsHomeHook
anyio
fontconfig
gdk-pixbuf
gobject-introspection
isort
@@ -167,15 +162,16 @@ buildPythonPackage (finalAttrs: {
xvfb
];
pytestFlags = [
"--reruns 3"
"--reruns-delay 5"
];
preCheck = ''
export PATH=$PATH:$out/bin
'';
disabledTests = [
# ModuleNotFoundError: No module named 'libqtile'
# known issue upstream: https://github.com/qtile/qtile/issues/5883
"test_identify_output"
# caused by dbus-fast trying to read '/var/lib/dbus/machine-id'
"test_defaults"
"test_device_actions"
@@ -196,12 +192,6 @@ buildPythonPackage (finalAttrs: {
# Probably won't work in the Nix sandbox due to `xcffib.ConnectionException`
"test_urgent_hook_fire"
# flaky: race between force_update() executor task and widget.info() read
"test_threadpolltext_force_update"
# flaky: race between repl server bind and client connect
"test_repl_server_executes_code"
];
passthru = {
@@ -218,6 +208,7 @@ buildPythonPackage (finalAttrs: {
homepage = "http://www.qtile.org/";
license = lib.licenses.mit;
description = "Small, flexible, scriptable tiling window manager written in Python";
changelog = "https://github.com/qtile/qtile/blob/v${finalAttrs.version}/CHANGELOG";
mainProgram = "qtile";
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [
@@ -1,63 +0,0 @@
From 71c70072524ee2fb2f4683861236894e51c50d6e Mon Sep 17 00:00:00 2001
From: elParaguayo <elparaguayocode@gmail.com>
Date: Tue, 24 Mar 2026 20:38:18 +0000
Subject: [PATCH] Fix test_net.py
The test uses a fake psutil module to get net statistics. However,
values are increased between tests and so will fail if tests are run in
a different order. We fix this by resetting stats between tests.
---
test/widgets/test_net.py | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/test/widgets/test_net.py b/test/widgets/test_net.py
index dcb0966c50..ea6a849a3a 100644
--- a/test/widgets/test_net.py
+++ b/test/widgets/test_net.py
@@ -34,6 +34,8 @@ def __init__(self, up, down):
@pytest.fixture
def patch_net(fake_qtile, monkeypatch, fake_window):
def build_widget(**kwargs):
+ MockPsutil.up = 0
+ MockPsutil.down = 0
monkeypatch.setitem(sys.modules, "psutil", MockPsutil("psutil"))
from libqtile.widget import net
@@ -62,15 +64,15 @@ def test_net_defaults(patch_net):
def test_net_single_interface(patch_net):
"""Display single named interface"""
net2 = patch_net(interface="wlp58s0")
- assert net2.poll() == "wlp58s0: U 40.0kB 160.0kB D 1.2MB 4.8MB T 1.24MB 4.96MB"
+ assert net2.poll() == "wlp58s0: U 40.0kB 80.0kB D 1.2MB 2.4MB T 1.24MB 2.48MB"
def test_net_list_interface(patch_net):
"""Display multiple named interfaces"""
net2 = patch_net(interface=["wlp58s0", "lo"])
assert net2.poll() == (
- "wlp58s0: U 40.0kB 240.0kB D 1.2MB 7.2MB T 1.24MB 7.44MB lo: U 40.0kB "
- "240.0kB D 1.2MB 7.2MB T 1.24MB 7.44MB"
+ "wlp58s0: U 40.0kB 80.0kB D 1.2MB 2.4MB T 1.24MB 2.48MB "
+ "lo: U 40.0kB 80.0kB D 1.2MB 2.4MB T 1.24MB 2.48MB"
)
@@ -83,7 +85,7 @@ def test_net_invalid_interface(patch_net):
def test_net_use_bits(patch_net):
"""Display all interfaces in bits rather than bytes"""
net4 = patch_net(use_bits=True)
- assert net4.poll() == "all: U 320.0kb 2.56Mb D 9.6Mb 76.8Mb T 9.92Mb 79.36Mb"
+ assert net4.poll() == "all: U 320.0kb 640.0kb D 9.6Mb 19.2Mb T 9.92Mb 19.84Mb"
def test_net_convert_zero_b(patch_net):
@@ -95,7 +97,7 @@ def test_net_convert_zero_b(patch_net):
def test_net_use_prefix(patch_net):
"""Tests `prefix` configurable option"""
net6 = patch_net(prefix="M")
- assert net6.poll() == "all: U 0.04MB 440.0kB D 1.2MB 13.2MB T 1.24MB 13.64MB"
+ assert net6.poll() == "all: U 0.04MB 80.0kB D 1.2MB 2.4MB T 1.24MB 2.48MB"
def test_net_missing_interface(patch_net):
@@ -1,61 +0,0 @@
{
lib,
buildPythonPackage,
fetchFromGitHub,
python,
cmake,
pyqt5,
numpy,
scipy,
shapely,
libarcus,
cryptography,
doxygen,
gettext,
}:
buildPythonPackage rec {
version = "4.12.0";
pname = "uranium";
pyproject = false;
src = fetchFromGitHub {
owner = "Ultimaker";
repo = "Uranium";
rev = version;
hash = "sha256-SE9xqrloPXIRTJiiqUdRKFmb4c0OjmJK5CMn6VXMFmk=";
};
buildInputs = [
python
gettext
];
propagatedBuildInputs = [
pyqt5
numpy
scipy
shapely
libarcus
cryptography
];
nativeBuildInputs = [
cmake
doxygen
];
postPatch = ''
sed -i 's,/python''${PYTHON_VERSION_MAJOR}/dist-packages,/python''${PYTHON_VERSION_MAJOR}.''${PYTHON_VERSION_MINOR}/site-packages,g' CMakeLists.txt
sed -i \
-e "s,Resources.addSearchPath(os.path.join(os.path.abspath(os.path.dirname(__file__)).*,Resources.addSearchPath(\"$out/share/uranium/resources\")," \
-e "s,self._plugin_registry.addPluginLocation(os.path.join(os.path.abspath(os.path.dirname(__file__)).*,self._plugin_registry.addPluginLocation(\"$out/lib/uranium/plugins\")," \
UM/Application.py
'';
meta = {
description = "Python framework for building Desktop applications";
homepage = "https://github.com/Ultimaker/Uranium";
license = lib.licenses.lgpl3Plus;
platforms = lib.platforms.linux;
maintainers = [ ];
};
}
+9 -9
View File
@@ -1,28 +1,28 @@
{
"game": {
"latest": {
"linux": "53.11",
"linux": "53.14",
"darwin": "0.47.05"
},
"versions": {
"53.11": {
"53.14": {
"df": {
"version": "53.11",
"version": "53.14",
"urls": {
"linux": {
"url": "https://www.bay12games.com/dwarves/df_53_11_linux.tar.bz2",
"outputHash": "sha256-Ss1SHsLr3V9aMWptIpd6PTO9ZmqPZiR8P97vNRBuLZs="
"url": "https://www.bay12games.com/dwarves/df_53_14_linux.tar.bz2",
"outputHash": "sha256-ZU/va7bblzh5UuPuuctjUHzEmcFLtzjXp9R86UV+G9k="
}
}
},
"hack": {
"version": "53.11-r1",
"version": "53.14-r2",
"git": {
"url": "https://github.com/DFHack/dfhack.git",
"revision": "53.11-r1",
"outputHash": "sha256-w2yfR9kOw13Ag3wxEHMXI9tVZMUwfgUWmrSVD1ViU4U="
"revision": "53.14-r2",
"outputHash": "sha256-UOmp84VoY/pam99T2ktAYH3N3cFMSIb9v8KOTZCof8U="
},
"xmlRev": "d79288374802cc63b1507900030b32231ffd244b"
"xmlRev": "01aae95cacd98850e4f477c45a4b75f800bacecc"
}
},
"52.05": {
@@ -76,7 +76,7 @@ stdenv.mkDerivation {
echo "It doesn't support DF $dfVersion out of the box, so we're doing it the hard way."
export HOME="$(mktemp -dt dfhack.XXXXXX)"
export XDG_DATA_HOME="$HOME/.local/share"
expect ${dfHackExpectScript}
expect ${dfHackExpectScript} | tr -d '\r'
local ini="$XDG_DATA_HOME/df_linux/therapist.ini"
if [ -f "$ini" ]; then
if grep -q "$patched_md5" "$ini"; then
@@ -281,18 +281,18 @@ lib.throwIf (enableTWBT' && !enableDFHack) "dwarf-fortress: TWBT requires DFHack
export HOME="$(mktemp -dt dwarf-fortress.XXXXXX)"
''
+ lib.optionalString enableDFHack ''
expect ${dfHackExpectScript}
expect ${dfHackExpectScript} | tr -d '\r'
df_home="$(find ~ -name "df_*" | head -n1)"
test -f "$df_home/dfhack"
''
+ lib.optionalString isAtLeast50 ''
expect ${vanillaExpectScript true}
expect ${vanillaExpectScript true} | tr -d '\r'
df_home="$(find ~ -name "df_*" | head -n1)"
test ! -f "$df_home/dfhack"
test -f "$df_home/libfmod_plugin.so"
''
+ ''
expect ${vanillaExpectScript false}
expect ${vanillaExpectScript false} | tr -d '\r'
df_home="$(find ~ -name "df_*" | head -n1)"
test ! -f "$df_home/dfhack"
test ! -f "$df_home/libfmod_plugin.so"
@@ -37,11 +37,19 @@ dfhack_files=(
libdfhooks.so
dfhack-config/default
dfhack-config/init
dfhooks_*.ini
hack/*
stonesense/*
*.init *.init-example
)
# May be stale top-level libdfhooks_*.so symlinks in $NIXPKGS_DF_HOME, fix them
shopt -s nullglob
for stale in "$NIXPKGS_DF_HOME"/libdfhooks_*.so; do
dfhack_files+=( "${stale##*/}" )
done
shopt -u nullglob
if [ "${NIXPKGS_DF_EXE##*/}" == dfhack ]; then
for i in "${dfhack_files[@]}"; do
if [ -e "$i" ]; then
@@ -2,6 +2,8 @@
lib,
stdenv,
fetchFromGitHub,
dtc,
gcc,
openssl,
pkgsCross,
buildPackages,
@@ -61,6 +63,10 @@ let
nativeBuildInputs = [
pkgsCross.arm-embedded.stdenv.cc # For Cortex-M0 firmware in RK3399
openssl # For fiptool
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
dtc
gcc
];
# Make the new toolchain guessing (from 2.14+) happy
+3
View File
@@ -584,6 +584,9 @@ mapAliases {
cudaPackages_12_4 = throw "CUDA 12.4 has been removed from Nixpkgs, as it is unmaintained upstream and depends on unsupported compilers"; # Added 2025-08-08
cudaPackages_12_5 = throw "CUDA 12.5 has been removed from Nixpkgs, as it is unmaintained upstream and depends on unsupported compilers"; # Added 2025-08-08
cups-kyodialog3 = throw "'cups-kyodialog3' has been renamed to/replaced by 'cups-kyodialog'"; # Converted to throw 2025-10-27
cura = throw "'cura' has been removed, as it was unmaintained in nixpkgs"; # Added 2026-05-22
curaengine = throw "'curaengine' has been removed, as it was unmaintained in nixpkgs"; # Added 2026-05-22
curaPlugins = throw "'curaPlugins' has been removed, as it was unmaintained in nixpkgs"; # Added 2026-05-22
curl-impersonate-chrome = warnAlias "curl-impersonate-chrome has been renamed to curl-impersonate" curl-impersonate; # Added 2025-11-02
curl-impersonate-ff = throw "curl-impersonate-ff has been removed because it is unmaintained upstream and has vulnerable dependencies. Use curl-impersonate instead."; # Added 2025-11-02
curlHTTP3 = warnAlias "'curlHTTP3' has been removed, as 'curl' now has HTTP/3 support enabled by default" curl; # Added 2025-08-22
-7
View File
@@ -10002,13 +10002,6 @@ with pkgs;
curaengine_stable = callPackage ../applications/misc/curaengine/stable.nix { };
curaengine = callPackage ../applications/misc/curaengine {
inherit (python3.pkgs) libarcus;
protobuf = protobuf_21;
};
curaPlugins = recurseIntoAttrs (callPackage ../applications/misc/cura/plugins.nix { });
super-slicer-beta = super-slicer.beta;
super-slicer-latest = super-slicer.latest;
+7
View File
@@ -30635,6 +30635,13 @@ with self;
url = "https://github.com/hoytech/Session-Token/commit/cd64e7b69986054bb715755290811308159b7959.patch";
hash = "sha256-nMQmdvVQW8cQYO0+bLJcdVfSOLVIsongk+71fQ7fQdU=";
})
(fetchDebianPatch {
version = "1.503";
pname = "libsession-token-perl";
debianRevision = "3";
patch = "fix-gcc15-build.patch";
hash = "sha256-b6Yr5w++3lQcaI8JilthLykq4D4nEczz0h+r6LJ8hGI=";
})
];
meta = {
description = "Secure, efficient, simple random session token generation";
+2
View File
@@ -304,6 +304,7 @@ mapAliases {
lcov_cobertura = throw "'lcov_cobertura' has been renamed to/replaced by 'lcov-cobertura'"; # Converted to throw 2025-10-29
ldap = throw "'ldap' has been renamed to/replaced by 'python-ldap'"; # Converted to throw 2025-10-29
ledger_agent = throw "'ledger_agent' has been renamed to/replaced by 'ledger-agent'"; # Converted to throw 2025-10-29
libarcus = throw "'libarcus' has been removed, as it was unmaintained in nixpkgs"; # Added 2026-05-22
libgpiod = gpiod; # added 2026-03-30
libpyfoscam = throw "libpyfoscam was removed because Home Assistant switched to libpyfoscamcgi"; # added 2025-07-03
line_profiler = throw "'line_profiler' has been renamed to/replaced by 'line-profiler'"; # Converted to throw 2025-10-29
@@ -619,6 +620,7 @@ mapAliases {
unifi = throw "'unifi' has been removed as upstream was archived in 2017"; # Added 2025-08-25
unittest-data-provider = throw "'unittest-data-provider' has been removed as it was unused, unmaintained, and upstream suggests 'pytest parameterize' instead."; # Added 2026-05-22
update_checker = throw "'update_checker' has been renamed to/replaced by 'update-checker'"; # Converted to throw 2025-10-29
uranium = throw "'uranium' has been removed, as it was unmaintained in nixpkgs"; # Added 2026-05-22
vcver = throw "vcver has been removed, since it was an unused leaf package"; # added 2025-08-25
vega_datasets = throw "'vega_datasets' has been renamed to/replaced by 'vega-datasets'"; # Converted to throw 2025-10-29
ViennaRNA = throw "'ViennaRNA' has been renamed to/replaced by 'viennarna'"; # Converted to throw 2025-10-29
-4
View File
@@ -8785,8 +8785,6 @@ self: super: with self; {
inherit (pkgs) libarchive;
};
libarcus = callPackage ../development/python-modules/libarcus { protobuf = pkgs.protobuf_21; };
libasyncns = callPackage ../development/python-modules/libasyncns { inherit (pkgs) libasyncns; };
libbs = callPackage ../development/python-modules/libbs { };
@@ -20912,8 +20910,6 @@ self: super: with self; {
uqbar = callPackage ../development/python-modules/uqbar { };
uranium = callPackage ../development/python-modules/uranium { };
uri-template = callPackage ../development/python-modules/uri-template { };
uritemplate = callPackage ../development/python-modules/uritemplate { };