Merge master into staging-next

Changed files
+141 -159
pkgs
applications
science
electronics
appcsxcad
by-name
ap
appcsxcad
fl
flarectl
gh
gh-gei
mm
mmdbctl
po
powershell-editor-services
qc
qcsxcad
ro
roddhjav-apparmor-rules
tf
tfswitch
development
libraries
science
electronics
qcsxcad
webkitgtk
python-modules
aioboto3
chalice
internetarchive
top-level
-56
pkgs/applications/science/electronics/appcsxcad/default.nix
···
-
{
-
lib,
-
mkDerivation,
-
fetchFromGitHub,
-
cmake,
-
csxcad,
-
qcsxcad,
-
hdf5,
-
vtkWithQt5,
-
qtbase,
-
fparser,
-
tinyxml,
-
cgal,
-
boost,
-
}:
-
-
mkDerivation {
-
pname = "appcsxcad";
-
version = "unstable-2023-01-06";
-
-
src = fetchFromGitHub {
-
owner = "thliebig";
-
repo = "AppCSXCAD";
-
rev = "379ede4b8e00c11e8d0fb724c35547991b30c423";
-
hash = "sha256-L0ZEyovnfMzM7JuITBuhb4tJ2Aqgw52IiKEfEGq7Yo0=";
-
};
-
-
nativeBuildInputs = [
-
cmake
-
];
-
-
buildInputs = [
-
csxcad
-
qcsxcad
-
hdf5
-
vtkWithQt5
-
qtbase
-
fparser
-
tinyxml
-
cgal
-
boost
-
];
-
-
postFixup = ''
-
rm $out/bin/AppCSXCAD.sh
-
'';
-
-
meta = with lib; {
-
description = "Minimal Application using the QCSXCAD library";
-
mainProgram = "AppCSXCAD";
-
homepage = "https://github.com/thliebig/AppCSXCAD";
-
license = licenses.gpl3;
-
maintainers = with maintainers; [ matthuszagh ];
-
platforms = platforms.linux;
-
};
-
}
+58
pkgs/by-name/ap/appcsxcad/package.nix
···
+
{
+
lib,
+
stdenv,
+
fetchFromGitHub,
+
cmake,
+
csxcad,
+
qcsxcad,
+
hdf5,
+
vtkWithQt6,
+
qt6,
+
fparser,
+
tinyxml,
+
cgal,
+
boost,
+
}:
+
+
stdenv.mkDerivation (finalAttrs: {
+
pname = "appcsxcad";
+
version = "0.2.3";
+
+
src = fetchFromGitHub {
+
owner = "thliebig";
+
repo = "AppCSXCAD";
+
rev = "v${finalAttrs.version}";
+
hash = "sha256-KrsnCnRZRTbkgEH3hOETrYhseg5mCHPqhAbYyHlS3sk=";
+
};
+
+
nativeBuildInputs = [
+
cmake
+
qt6.wrapQtAppsHook
+
];
+
+
buildInputs = [
+
csxcad
+
qcsxcad
+
hdf5
+
vtkWithQt6
+
qt6.qtbase
+
qt6.qtwayland
+
fparser
+
tinyxml
+
cgal
+
boost
+
];
+
+
postFixup = ''
+
rm $out/bin/AppCSXCAD.sh
+
'';
+
+
meta = {
+
description = "Minimal Application using the QCSXCAD library";
+
mainProgram = "AppCSXCAD";
+
homepage = "https://github.com/thliebig/AppCSXCAD";
+
license = lib.licenses.gpl3;
+
maintainers = with lib.maintainers; [ matthuszagh ];
+
platforms = lib.platforms.linux;
+
};
+
})
+2 -2
pkgs/by-name/fl/flarectl/package.nix
···
buildGoModule rec {
pname = "flarectl";
-
version = "0.115.0";
+
version = "0.116.0";
src = fetchFromGitHub {
owner = "cloudflare";
repo = "cloudflare-go";
rev = "v${version}";
-
hash = "sha256-2LdsqCqRTruTHYPwuI9Gm07cpvQNOrZvIl6rjZU+0aU=";
+
hash = "sha256-DibRQmvwe58O1pcelx37fv3WFlWDcEbWeg+sJlxzDMU=";
};
vendorHash = "sha256-f+bNNwbTj348JJJLST2j7h8/A79qzvGlf8MjldVvtGU=";
+2 -2
pkgs/by-name/gh/gh-gei/package.nix
···
buildDotnetModule rec {
pname = "gh-gei";
-
version = "1.18.0";
+
version = "1.18.1";
src = fetchFromGitHub {
owner = "github";
repo = "gh-gei";
rev = "v${version}";
-
hash = "sha256-AMmeuobgJ+DSRG4zS7RP5l3/BraqQxXB+ygLDc3XnOs=";
+
hash = "sha256-ZMFom0irZa63Nzx7wViinmN6yRfiHxQFprJdIx1Ak2Y=";
};
dotnet-sdk = dotnetCorePackages.sdk_8_0_4xx;
+2 -2
pkgs/by-name/mm/mmdbctl/package.nix
···
buildGoModule rec {
pname = "mmdbctl";
-
version = "1.4.7";
+
version = "1.4.8";
src = fetchFromGitHub {
owner = "ipinfo";
repo = "mmdbctl";
tag = "mmdbctl-${version}";
-
hash = "sha256-drYtuL4TzutzitLVKyUotxgyDjL7AMNnt0vVtfQhu4A=";
+
hash = "sha256-9s/dyORfv3lNf9W6oE1PHhaTgJFdeFa46pf54c/cwH0=";
};
vendorHash = "sha256-4T3HEzRerC4KrGQnMNSW3OVzChUIf4yJ7qS9v8mWIX4=";
+2 -2
pkgs/by-name/po/powershell-editor-services/package.nix
···
}:
stdenvNoCC.mkDerivation rec {
pname = "powershell-editor-services";
-
version = "4.3.0";
+
version = "4.4.0";
src = fetchzip {
url = "https://github.com/PowerShell/PowerShellEditorServices/releases/download/v${version}/PowerShellEditorServices.zip";
-
hash = "sha256-YiXxztfsYujJK6+56Lwi4QdRIZb7NH+dAUJTOYk8pGI=";
+
hash = "sha256-tmz6xkcF44xnG5VwSeHNWzjRQK6wxQ7Ii6mDNisCMb8=";
stripRoot = false;
};
+54
pkgs/by-name/qc/qcsxcad/package.nix
···
+
{
+
lib,
+
stdenv,
+
fetchFromGitHub,
+
cmake,
+
csxcad,
+
tinyxml,
+
vtkWithQt6,
+
qt6,
+
}:
+
+
stdenv.mkDerivation (finalAttrs: {
+
pname = "qcsxcad";
+
version = "0.6.3";
+
+
src = fetchFromGitHub {
+
owner = "thliebig";
+
repo = "QCSXCAD";
+
tag = "v${finalAttrs.version}";
+
hash = "sha256-bX6e3ugHJynU9tP70BV8TadnoGg1VO7SAYJueMkMAyo=";
+
};
+
+
outputs = [
+
"out"
+
"dev"
+
];
+
+
nativeBuildInputs = [
+
cmake
+
];
+
+
cmakeFlags = [
+
(lib.cmakeBool "ENABLE_RPATH" false)
+
];
+
+
buildInputs = [
+
csxcad
+
tinyxml
+
vtkWithQt6
+
qt6.qtbase
+
qt6.qt5compat
+
qt6.qtwayland
+
];
+
+
dontWrapQtApps = true;
+
+
meta = {
+
description = "Qt library for CSXCAD";
+
homepage = "https://github.com/thliebig/QCSXCAD";
+
license = lib.licenses.gpl3;
+
maintainers = with lib.maintainers; [ matthuszagh ];
+
platforms = lib.platforms.linux;
+
};
+
})
+3 -3
pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix
···
stdenvNoCC.mkDerivation {
pname = "roddhjav-apparmor-rules";
-
version = "0-unstable-2025-08-25";
+
version = "0-unstable-2025-09-03";
src = fetchFromGitHub {
owner = "roddhjav";
repo = "apparmor.d";
-
rev = "7ecc84d3b0e13f5d346a906dceda14321fddae1a";
-
hash = "sha256-XOatGZxhlcd1JXYJzgye/2Dok+Jmppj4cJuiYy6uhxc=";
+
rev = "4c84b572cda4433a664b1488e980034886652629";
+
hash = "sha256-GoH7LR3jIgeSTjVpz8jAzDGWrAAM7Bw3OAzwmjdnRmE=";
};
dontConfigure = true;
+3 -3
pkgs/by-name/tf/tfswitch/package.nix
···
}:
buildGoModule rec {
pname = "tfswitch";
-
version = "1.5.0";
+
version = "1.5.1";
src = fetchFromGitHub {
owner = "warrensbox";
repo = "terraform-switcher";
rev = "v${version}";
-
sha256 = "sha256-u7EnixxFds3dqNcyv+rHrGZdmwc34amq4tGGmBw0RsU=";
+
sha256 = "sha256-gXf6lqxWTX44fhAa34QlcKBxc4xLNVFUsGOlKvWnWKc=";
};
-
vendorHash = "sha256-HbNdWvKvmZDalDQoMtQMaXiT0NIFNtVowSIYO4z9h8c=";
+
vendorHash = "sha256-cc1ZvVCcjFlJcHs0DH4atyWISrrDfyXPK6j2dSgWD0k=";
# Disable tests since it requires network access and relies on the
# presence of release.hashicorp.com
-51
pkgs/development/libraries/science/electronics/qcsxcad/default.nix
···
-
{
-
lib,
-
mkDerivation,
-
fetchFromGitHub,
-
cmake,
-
csxcad,
-
tinyxml,
-
vtkWithQt5,
-
qtbase,
-
}:
-
-
mkDerivation {
-
pname = "qcsxcad";
-
version = "unstable-2023-01-06";
-
-
src = fetchFromGitHub {
-
owner = "thliebig";
-
repo = "QCSXCAD";
-
rev = "1cde9d560a5000f4c24c249d2dd5ccda12de38b6";
-
hash = "sha256-kc9Vnx6jGiQC2K88ZH00b61D/DbWxAIZZwYCsINqtrY=";
-
};
-
-
outputs = [
-
"out"
-
"dev"
-
];
-
-
nativeBuildInputs = [
-
cmake
-
];
-
-
cmakeFlags = [
-
"-DCSXCAD_ROOT_DIR=${csxcad}"
-
"-DENABLE_RPATH=OFF"
-
];
-
-
buildInputs = [
-
csxcad
-
tinyxml
-
vtkWithQt5
-
qtbase
-
];
-
-
meta = with lib; {
-
description = "Qt library for CSXCAD";
-
homepage = "https://github.com/thliebig/QCSXCAD";
-
license = licenses.gpl3;
-
maintainers = with maintainers; [ matthuszagh ];
-
platforms = platforms.linux;
-
};
-
}
+2 -2
pkgs/development/libraries/webkitgtk/default.nix
···
# https://webkitgtk.org/2024/10/04/webkitgtk-2.46.html recommends building with clang.
clangStdenv.mkDerivation (finalAttrs: {
pname = "webkitgtk";
-
version = "2.48.5";
+
version = "2.48.6";
name = "${finalAttrs.pname}-${finalAttrs.version}+abi=${
if lib.versionAtLeast gtk3.version "4.0" then
"6.0"
···
src = fetchurl {
url = "https://webkitgtk.org/releases/webkitgtk-${finalAttrs.version}.tar.xz";
-
hash = "sha256-u2TtnRz9WOi16JzK1x3TGt/tVjNrrXaVAxrQtmjhmHw=";
+
hash = "sha256-2awwNLejnCqqVn5hErMSSxWOWRp0Q55Gl0oDHdDkTiQ=";
};
patches = lib.optionals clangStdenv.hostPlatform.isLinux [
+2 -2
pkgs/development/python-modules/aioboto3/default.nix
···
buildPythonPackage rec {
pname = "aioboto3";
-
version = "15.0.0";
+
version = "15.1.0";
pyproject = true;
src = fetchFromGitHub {
owner = "terricain";
repo = "aioboto3";
tag = "v${version}";
-
hash = "sha256-Z4tUwTFaXC3BGUKc1FPY0xoaUViAEiZNeP5REWotw2M=";
+
hash = "sha256-H/hAfFyBfeBoR6nW0sv3/AzFPATUl2uJ+JbzNB5xemo=";
};
# https://github.com/terricain/aioboto3/pull/377
+8 -24
pkgs/development/python-modules/chalice/default.nix
···
hypothesis,
inquirer,
jmespath,
-
mock,
mypy-extensions,
pip,
-
pytest7CheckHook,
-
pythonOlder,
+
pytestCheckHook,
pyyaml,
requests,
setuptools,
···
buildPythonPackage rec {
pname = "chalice";
-
version = "1.28.0";
-
format = "setuptools";
-
-
disabled = pythonOlder "3.7";
+
version = "1.32.0";
+
pyproject = true;
src = fetchFromGitHub {
owner = "aws";
repo = "chalice";
tag = version;
-
hash = "sha256-m3pSD4fahBW6Yt/w07Co4fTZD7k6as5cPwoK5QSry6M=";
+
hash = "sha256-7qmE78aFfq9XCl2zcx1dAVKZZb96Bu47tSW1Qp2vFl4=";
};
-
postPatch = ''
-
substituteInPlace setup.py \
-
--replace "inquirer>=2.7.0,<3.0.0" "inquirer" \
-
--replace "pip>=9,<23.1" "pip" \
-
'';
+
build-system = [ setuptools ];
-
propagatedBuildInputs = [
-
attrs
+
dependencies = [
botocore
click
inquirer
jmespath
-
mypy-extensions
pip
pyyaml
setuptools
six
-
typing-extensions
wheel
-
watchdog
];
nativeCheckInputs = [
hypothesis
-
mock
-
pytest7CheckHook
+
pytestCheckHook
requests
websocket-client
];
···
# Don't build
"test_can_generate_pipeline_for_all"
"test_build_wheel"
-
# https://github.com/aws/chalice/issues/1850
-
"test_resolve_endpoint"
-
"test_endpoint_from_arn"
# Tests require dist
"test_setup_tar_gz_hyphens_in_name"
"test_both_tar_gz"
···
description = "Python Serverless Microframework for AWS";
mainProgram = "chalice";
homepage = "https://github.com/aws/chalice";
-
changelog = "https://github.com/aws/chalice/blob/${version}/CHANGELOG.rst";
+
changelog = "https://github.com/aws/chalice/blob/${src.tag}/CHANGELOG.md";
license = licenses.asl20;
maintainers = [ ];
};
+2 -2
pkgs/development/python-modules/internetarchive/default.nix
···
buildPythonPackage rec {
pname = "internetarchive";
-
version = "5.5.0";
+
version = "5.5.1";
pyproject = true;
disabled = pythonOlder "3.9";
···
owner = "jjjake";
repo = "internetarchive";
tag = "v${version}";
-
hash = "sha256-jGzY/m7FpQPobyUaftsTQ0YX/sc6/s0xCVsMAK10ZSk=";
+
hash = "sha256-Og0EPdaxu4etWj+9WPSyAHlz/BNUanu2gf+6k4FzN90=";
};
build-system = [ setuptools ];
-1
pkgs/top-level/aliases.nix
···
qbittorrent-qt5 = throw "'qbittorrent-qt5' has been removed as qBittorrent 5 dropped support for Qt 5. Please use 'qbittorrent'"; # Added 2024-09-30
qcachegrind = throw "'qcachegrind' has been removed, as it depends on KDE Gear 5, which has reached EOL"; # Added 2025-08-20
-
qcsxcad = throw "'qcsxcad' has been renamed to/replaced by 'libsForQt5.qcsxcad'"; # Converted to throw 2024-10-17
qflipper = qFlipper; # Added 2022-02-11
qnial = throw "'qnial' has been removed due to failing to build and being unmaintained"; # Added 2025-06-26
qscintilla = libsForQt5.qscintilla; # Added 2023-09-20
+1 -5
pkgs/top-level/all-packages.nix
···
### SCIENCE / ELECTRONICS
-
appcsxcad = libsForQt5.callPackage ../applications/science/electronics/appcsxcad { };
-
simulide_0_4_15 = callPackage ../by-name/si/simulide/package.nix { versionNum = "0.4.15"; };
simulide_1_0_0 = callPackage ../by-name/si/simulide/package.nix { versionNum = "1.0.0"; };
simulide_1_1_0 = callPackage ../by-name/si/simulide/package.nix { versionNum = "1.1.0"; };
···
withNgshared = false;
-
openems = callPackage ../applications/science/electronics/openems {
-
qcsxcad = libsForQt5.qcsxcad;
-
};
+
openems = callPackage ../applications/science/electronics/openems { };
xyce-parallel = callPackage ../by-name/xy/xyce/package.nix {
withMPI = true;
-2
pkgs/top-level/qt5-packages.nix
···
qcoro = callPackage ../development/libraries/qcoro { };
-
qcsxcad = callPackage ../development/libraries/science/electronics/qcsxcad { };
-
qcustomplot = callPackage ../development/libraries/qcustomplot { };
qjson = callPackage ../development/libraries/qjson { };