Merge master into staging-next
This commit is contained in:
nixpkgs-ci[bot]
@@ -25089,6 +25089,12 @@
|
||||
githubId = 2049686;
|
||||
name = "Sebastián Estrella";
|
||||
};
|
||||
seudonym = {
|
||||
name = "Wahid Khan";
|
||||
email = "wk170179+nixpkgs@gmail.com";
|
||||
github = "seudonym";
|
||||
githubId = 80459261;
|
||||
};
|
||||
seven_bear = {
|
||||
name = "Edmond Freeman";
|
||||
email = "edmondfreeman7@gmail.com";
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
}:
|
||||
mkLibretroCore {
|
||||
core = "fbneo";
|
||||
version = "0-unstable-2026-05-18";
|
||||
version = "0-unstable-2026-06-04";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libretro";
|
||||
repo = "fbneo";
|
||||
rev = "1a2d079aac28c540c20a9e4cac87bb02021c3eec";
|
||||
hash = "sha256-4q1q20Us7HVZr2CWsqujQWiqryc/xS9/bVBt/x7Y5H8=";
|
||||
rev = "298f913aeb781908c7f6a568a2ede3940a98738d";
|
||||
hash = "sha256-UP0jNsqXMzrO+EQY8Gbkl2lIizfsAKoKiGaXGp7Nok8=";
|
||||
};
|
||||
|
||||
makefile = "Makefile";
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
}:
|
||||
mkLibretroCore {
|
||||
core = "mame";
|
||||
version = "0-unstable-2026-04-23";
|
||||
version = "0-unstable-2026-05-31";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libretro";
|
||||
repo = "mame";
|
||||
rev = "da690d2f5393a45e20ef941980e7d940fb9d2f19";
|
||||
hash = "sha256-7OGD/OEAwVwT0Svepf1XtCqtWbLFXyFL8YTFqOOhVPc=";
|
||||
rev = "2ffec28bcf65eceb395722c9d721e7d4523fbb56";
|
||||
hash = "sha256-37SD78rFYgIoI7FDsgHhupYse8QbzwVRrJCXSVjpLCc=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -248,6 +248,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
* Full encryption, DHT, and PEX support
|
||||
'';
|
||||
homepage = "https://www.transmissionbt.com/";
|
||||
maintainers = with lib.maintainers; [ nyanloutre ];
|
||||
license = with lib.licenses; [
|
||||
gpl2Plus
|
||||
mit
|
||||
|
||||
@@ -23,13 +23,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bpftrace";
|
||||
version = "0.26.0";
|
||||
version = "0.26.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bpftrace";
|
||||
repo = "bpftrace";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-NYMMQKOWCLbECQX1FPYaLcQyO3H+LHCw02bF1sWsMuY=";
|
||||
hash = "sha256-h3gFnQq48oM5uK07xrykOCSJxhr6dqcyVUDoIKIRREY=";
|
||||
};
|
||||
|
||||
buildInputs = with llvmPackages; [
|
||||
|
||||
@@ -31,13 +31,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "cherry-studio";
|
||||
version = "1.9.4";
|
||||
version = "1.9.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "CherryHQ";
|
||||
repo = "cherry-studio";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-+mfetkw5SibvUky/QoUE4+5SL+v8S4JGq9ZlS9q6Uk0=";
|
||||
hash = "sha256-TFmzQmZlRFTJa7KaHVj370n2YZuwXy8mCRFrKsf0w24=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
inherit (finalAttrs) pname version src;
|
||||
inherit pnpm;
|
||||
fetcherVersion = 3;
|
||||
hash = "sha256-6zbnWaeSzvK1NDCXIySS54Pq6siBCuBRJkMa7/NAt1k=";
|
||||
hash = "sha256-wJPiEjIOReB/JCer6pdODnDfQ12zm9vPv79iaiyTp3I=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "deck";
|
||||
version = "1.62.0";
|
||||
version = "1.62.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Kong";
|
||||
repo = "deck";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-0XluNSLZ1yly/hfBvV9xOVROyS7dtK348fFdT2Iplsg=";
|
||||
hash = "sha256-14M0MTfELHvCmkGhzghXTSg1n2gl7S6a4yoGgjLfHzI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
@@ -28,7 +28,7 @@ buildGoModule (finalAttrs: {
|
||||
];
|
||||
|
||||
proxyVendor = true; # darwin/linux hash mismatch
|
||||
vendorHash = "sha256-77fkJJB/aHdxX2NItiwMAyVyH/OPE7N00PSTYHG0szA=";
|
||||
vendorHash = "sha256-pUA8GhDX6oQ1z1VvuAZyRf0trDFip5BfqnNcc37tAng=";
|
||||
|
||||
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
||||
installShellCompletion --cmd deck \
|
||||
|
||||
@@ -7,14 +7,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication (finalAttrs: {
|
||||
pname = "fetchtastic";
|
||||
version = "0.10.9";
|
||||
version = "0.10.10";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jeremiah-k";
|
||||
repo = "fetchtastic";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-eFDj3qv3cYt/7tf+v93QwqoVLEEfpt21g4l0MrLTaLc=";
|
||||
hash = "sha256-ImXBH1mvJE+Ae7fUqR/Z381TKGt6hq0BRHhdtOz3YO4=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [ "platformdirs" ];
|
||||
|
||||
@@ -1575,169 +1575,6 @@
|
||||
"version_string": "2.1.31"
|
||||
}
|
||||
},
|
||||
{
|
||||
"dependencies": [
|
||||
"bundled-python3-windows-x86",
|
||||
"bundled-python3-windows-x86_64",
|
||||
"core"
|
||||
],
|
||||
"details": {
|
||||
"description": "Provides stand-alone Python 3.14 install.",
|
||||
"display_name": "Bundled Python 3.14"
|
||||
},
|
||||
"gdu_only": false,
|
||||
"id": "bundled-python3",
|
||||
"is_configuration": false,
|
||||
"is_hidden": true,
|
||||
"is_required": false,
|
||||
"platform": {
|
||||
"architectures": [
|
||||
"x86",
|
||||
"x86_64"
|
||||
],
|
||||
"operating_systems": [
|
||||
"WINDOWS"
|
||||
]
|
||||
},
|
||||
"platform_required": false,
|
||||
"version": {
|
||||
"build_number": 0,
|
||||
"version_string": "3.14.4"
|
||||
}
|
||||
},
|
||||
{
|
||||
"dependencies": [
|
||||
"bundled-python3-unix-linux-x86_64",
|
||||
"core"
|
||||
],
|
||||
"details": {
|
||||
"description": "Provides stand-alone Python 3.14.5 installation for UNIX.",
|
||||
"display_name": "Bundled Python 3.14"
|
||||
},
|
||||
"gdu_only": false,
|
||||
"id": "bundled-python3-unix",
|
||||
"is_configuration": false,
|
||||
"is_hidden": false,
|
||||
"is_required": false,
|
||||
"platform": {
|
||||
"architectures": [
|
||||
"x86_64"
|
||||
],
|
||||
"operating_systems": [
|
||||
"LINUX"
|
||||
]
|
||||
},
|
||||
"platform_required": false,
|
||||
"version": {
|
||||
"build_number": 0,
|
||||
"version_string": "3.14.5"
|
||||
}
|
||||
},
|
||||
{
|
||||
"data": {
|
||||
"checksum": "5c4ce4eb75b99cd5e06fae99f6e45c42b88df3225699629715dba64a85a7fd39",
|
||||
"contents_checksum": "f23b948b0e0ed0d93d7e3e51375347b1f72212ce6b5d70b4e8729e404e415b8f",
|
||||
"size": 27198113,
|
||||
"source": "components/google-cloud-sdk-bundled-python3-unix-linux-x86_64-20260522195849.tar.gz",
|
||||
"type": "tar"
|
||||
},
|
||||
"dependencies": [
|
||||
"bundled-python3-unix",
|
||||
"core"
|
||||
],
|
||||
"details": {
|
||||
"description": "Provides stand-alone Python 3.14.5 installation for UNIX.",
|
||||
"display_name": "Bundled Python 3.14 (Platform Specific)"
|
||||
},
|
||||
"gdu_only": false,
|
||||
"id": "bundled-python3-unix-linux-x86_64",
|
||||
"is_configuration": false,
|
||||
"is_hidden": true,
|
||||
"is_required": false,
|
||||
"platform": {
|
||||
"architectures": [
|
||||
"x86_64"
|
||||
],
|
||||
"operating_systems": [
|
||||
"LINUX"
|
||||
]
|
||||
},
|
||||
"platform_required": false,
|
||||
"version": {
|
||||
"build_number": 20260522195849,
|
||||
"version_string": "3.14.5"
|
||||
}
|
||||
},
|
||||
{
|
||||
"data": {
|
||||
"checksum": "393967c25a467c4faaadda895810a1f725d1c2416fc29e1a4f3c08c57e0c6949",
|
||||
"contents_checksum": "78156598f73fc69a32f30a5efac14c526cf8f44ccf2a7e0ef2db75b915331772",
|
||||
"size": 21432688,
|
||||
"source": "components/google-cloud-sdk-bundled-python3-windows-x86-20260522195849.tar.gz",
|
||||
"type": "tar"
|
||||
},
|
||||
"dependencies": [
|
||||
"bundled-python3",
|
||||
"core"
|
||||
],
|
||||
"details": {
|
||||
"description": "Provides stand-alone Python 3.14 install.",
|
||||
"display_name": "Bundled Python 3.14 (Platform Specific)"
|
||||
},
|
||||
"gdu_only": false,
|
||||
"id": "bundled-python3-windows-x86",
|
||||
"is_configuration": false,
|
||||
"is_hidden": true,
|
||||
"is_required": false,
|
||||
"platform": {
|
||||
"architectures": [
|
||||
"x86"
|
||||
],
|
||||
"operating_systems": [
|
||||
"WINDOWS"
|
||||
]
|
||||
},
|
||||
"platform_required": false,
|
||||
"version": {
|
||||
"build_number": 20260522195849,
|
||||
"version_string": "3.14.4"
|
||||
}
|
||||
},
|
||||
{
|
||||
"data": {
|
||||
"checksum": "dbe1d783730a03c1fe04b47a1e8611754ee021433e2dbbaf8194fc958355f148",
|
||||
"contents_checksum": "0b369522fe69d7c12f178e1ed3b15f6dd15e8fa94d05f1be10c96e75930f81f4",
|
||||
"size": 23967274,
|
||||
"source": "components/google-cloud-sdk-bundled-python3-windows-x86_64-20260522195849.tar.gz",
|
||||
"type": "tar"
|
||||
},
|
||||
"dependencies": [
|
||||
"bundled-python3",
|
||||
"core"
|
||||
],
|
||||
"details": {
|
||||
"description": "Provides stand-alone Python 3.14 install.",
|
||||
"display_name": "Bundled Python 3.14 (Platform Specific)"
|
||||
},
|
||||
"gdu_only": false,
|
||||
"id": "bundled-python3-windows-x86_64",
|
||||
"is_configuration": false,
|
||||
"is_hidden": true,
|
||||
"is_required": false,
|
||||
"platform": {
|
||||
"architectures": [
|
||||
"x86_64"
|
||||
],
|
||||
"operating_systems": [
|
||||
"WINDOWS"
|
||||
]
|
||||
},
|
||||
"platform_required": false,
|
||||
"version": {
|
||||
"build_number": 20260522195849,
|
||||
"version_string": "3.14.4"
|
||||
}
|
||||
},
|
||||
{
|
||||
"dependencies": [
|
||||
"cbt-darwin-arm",
|
||||
@@ -3265,7 +3102,6 @@
|
||||
"type": "tar"
|
||||
},
|
||||
"dependencies": [
|
||||
"bundled-python3-unix",
|
||||
"core-nix",
|
||||
"core-win",
|
||||
"gcloud-deps",
|
||||
@@ -3296,7 +3132,6 @@
|
||||
"type": "tar"
|
||||
},
|
||||
"dependencies": [
|
||||
"bundled-python3-unix",
|
||||
"core",
|
||||
"gcloud-deps",
|
||||
"ssh-tools"
|
||||
@@ -3333,7 +3168,6 @@
|
||||
"type": "tar"
|
||||
},
|
||||
"dependencies": [
|
||||
"bundled-python3-unix",
|
||||
"core",
|
||||
"gcloud-deps",
|
||||
"ssh-tools"
|
||||
|
||||
@@ -6,8 +6,6 @@
|
||||
autoPatchelfHook,
|
||||
python3,
|
||||
libxcrypt-legacy,
|
||||
tcl-8_6,
|
||||
tclPackages,
|
||||
}:
|
||||
|
||||
let
|
||||
@@ -179,8 +177,6 @@ let
|
||||
];
|
||||
buildInputs = [
|
||||
libxcrypt-legacy
|
||||
tcl-8_6
|
||||
tclPackages.tk
|
||||
];
|
||||
passthru = {
|
||||
dependencies = filterForSystem dependencies;
|
||||
|
||||
@@ -79,6 +79,7 @@ stdenv.mkDerivation rec {
|
||||
if [ -d platform/bundledpythonunix ]; then
|
||||
rm -r platform/bundledpythonunix
|
||||
fi
|
||||
rm -f .install/bundled-python*
|
||||
cp -R * .install $out/google-cloud-sdk/
|
||||
|
||||
# Resolve readlink noise in shell initialization
|
||||
@@ -199,6 +200,9 @@ stdenv.mkDerivation rec {
|
||||
|
||||
passthru = {
|
||||
inherit components withExtraComponents;
|
||||
tests.gke-gcloud-auth-plugin = withExtraComponents [
|
||||
components.gke-gcloud-auth-plugin
|
||||
];
|
||||
updateScript = ./update.sh;
|
||||
};
|
||||
|
||||
|
||||
@@ -47,4 +47,10 @@ EOF
|
||||
|
||||
} > "${PACKAGE_DIR}/data.nix"
|
||||
|
||||
curl "${CHANNEL_URL}/components-v${VERSION}.json" -w "\n" > "${PACKAGE_DIR}/components.json"
|
||||
# nixpkgs uses its own Python wrapper; do not generate bundled Python components.
|
||||
curl -s "${CHANNEL_URL}/components-v${VERSION}.json" | jq '
|
||||
.components |= map(
|
||||
select(.id | startswith("bundled-python3") | not)
|
||||
| .dependencies = ((.dependencies // []) | map(select(startswith("bundled-python3") | not)))
|
||||
)
|
||||
' > "${PACKAGE_DIR}/components.json"
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "hcdiag";
|
||||
version = "0.5.12";
|
||||
version = "0.5.13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hashicorp";
|
||||
repo = "hcdiag";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-SXP5Poa4mjlvp4AQzSekHBCc07+a3bWVOPJWxfOuB/Q=";
|
||||
hash = "sha256-OHCxyBA4kCeCwvl8ZM33gLGc19wl7DtZ2gHveNCSAc0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-mUqXnUAnN052RMsMtiUpOTlDVb59Xh3+++E/BtEEQGk=";
|
||||
vendorHash = "sha256-otBZVOc0lS9IFk0w8A4gD+0MVEn35h0uk5Ul9eH9lFw=";
|
||||
|
||||
nativeInstallCheckHooks = [
|
||||
versionCheckHook
|
||||
|
||||
@@ -11,13 +11,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "manifold";
|
||||
version = "3.5.0";
|
||||
version = "3.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elalish";
|
||||
repo = "manifold";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-4TFS4toHzZsNO/vf3r2dW9QCpnHi2p0BAGSCZVswlYk=";
|
||||
hash = "sha256-ZsTGokNpWDT0EgA3VaU/aMh8WtUygIqcSxzLikeyQ9c=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@@ -32,7 +32,10 @@
|
||||
enablePython ? false,
|
||||
python3,
|
||||
swig,
|
||||
qt ? null,
|
||||
qtbase ? null,
|
||||
wrapQtAppsHook ? null,
|
||||
qtsvg ? null,
|
||||
qt5compat ? null,
|
||||
enableSDL2 ? true,
|
||||
SDL2,
|
||||
gitUpdater,
|
||||
@@ -59,6 +62,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
pkg-config
|
||||
which
|
||||
makeWrapper
|
||||
wrapQtAppsHook
|
||||
]
|
||||
++ lib.optionals cudaSupport [
|
||||
cudaPackages.cuda_nvcc
|
||||
@@ -66,9 +70,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
++ lib.optionals enablePython [
|
||||
python3
|
||||
swig
|
||||
]
|
||||
++ lib.optionals (qt != null) [
|
||||
qt.wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
@@ -96,10 +97,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
ladspa-sdk
|
||||
ladspaPlugins
|
||||
]
|
||||
++ lib.optionals (qt != null) [
|
||||
qt.qtbase
|
||||
qt.qtsvg
|
||||
(qt.qt5compat or null)
|
||||
++ lib.optionals (qtbase != null) [
|
||||
qtbase
|
||||
qtsvg
|
||||
qt5compat
|
||||
libarchive
|
||||
]
|
||||
++ lib.optionals enableSDL2 [
|
||||
@@ -114,31 +115,20 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
cmakeFlags = [
|
||||
# RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/
|
||||
"-DCMAKE_SKIP_BUILD_RPATH=ON"
|
||||
"-DMOD_OPENCV=ON"
|
||||
(lib.cmakeBool "CMAKE_SKIP_BUILD_RPATH" true)
|
||||
(lib.cmakeBool "MOD_OPENCV" true)
|
||||
(lib.cmakeBool "MOD_QT6" (qtbase != null && lib.versions.major qtbase.version == "6"))
|
||||
(lib.cmakeBool "MOD_GLAXNIMATE_QT6" (qtbase != null && lib.versions.major qtbase.version == "6"))
|
||||
]
|
||||
++ lib.optionals enablePython [
|
||||
"-DSWIG_PYTHON=ON"
|
||||
]
|
||||
++ lib.optionals (qt == null) [
|
||||
"-DMOD_QT6=OFF"
|
||||
]
|
||||
++ lib.optionals (qt != null && lib.versions.major qt.qtbase.version == "5") [
|
||||
"-DMOD_QT=ON"
|
||||
"-DMOD_QT6=OFF"
|
||||
"-DMOD_GLAXNIMATE=ON"
|
||||
]
|
||||
++ lib.optionals (qt != null && lib.versions.major qt.qtbase.version == "6") [
|
||||
"-DMOD_QT6=ON"
|
||||
"-DMOD_QT=OFF"
|
||||
"-DMOD_GLAXNIMATE_QT6=ON"
|
||||
(lib.cmakeBool "SWIG_PYTHON" true)
|
||||
];
|
||||
|
||||
preFixup = ''
|
||||
wrapProgram $out/bin/melt \
|
||||
--prefix FREI0R_PATH : ${frei0r}/lib/frei0r-1 \
|
||||
${lib.optionalString enableJackrack "--prefix LADSPA_PATH : ${ladspaPlugins}/lib/ladspa"} \
|
||||
${lib.optionalString (qt != null) "\${qtWrapperArgs[@]}"}
|
||||
${lib.optionalString (qtbase != null) "\${qtWrapperArgs[@]}"}
|
||||
|
||||
'';
|
||||
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
@@ -9,19 +10,28 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
version = "0.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Ivordir";
|
||||
owner = "IanManske";
|
||||
repo = "Okolors";
|
||||
rev = "v${finalAttrs.version}";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-RSkZUkwCn9uvvT2dIqM2Q4+mRqjUegVuXCms5DBugbk=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-ceFyFbNmC7PoleTejymQw9Ii9rxx2qJmFifNAQjLVUM=";
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script { };
|
||||
};
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
meta = {
|
||||
description = "Generate a color palette from an image using k-means clustering in the Oklab color space";
|
||||
homepage = "https://github.com/Ivordir/Okolors";
|
||||
homepage = "https://github.com/IanManske/Okolors";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ ];
|
||||
maintainers = with lib.maintainers; [
|
||||
sandarukasa
|
||||
];
|
||||
changelog = "https://github.com/IanManske/Okolors/releases/tag/v${finalAttrs.version}";
|
||||
mainProgram = "okolors";
|
||||
};
|
||||
})
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "phpstan";
|
||||
version = "2.1.56";
|
||||
version = "2.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "phpstan";
|
||||
repo = "phpstan";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-Ffn6rJhTKjXEjwWZ1tnSaUBsmLyLeIp5EQnGZcvxba8=";
|
||||
hash = "sha256-oZ4ph5pQimUuJVjIRhGDgFg4rbrMwVGxdXC71zVh6Lc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
+996
-216
File diff suppressed because it is too large
Load Diff
File diff suppressed because one or more lines are too long
@@ -9,15 +9,30 @@
|
||||
versionCheckHook,
|
||||
}:
|
||||
|
||||
let
|
||||
installer_src = fetchgit {
|
||||
url = "git://git.proxmox.com/git/pve-installer.git";
|
||||
rev = "32afcd4cd534d8e2f99ae76aa0234a0a5c697ba9";
|
||||
hash = "sha256-mlTSkBr5glkCr21l2Z1GFICLOn02IOWjMKBy8BvkSzc=";
|
||||
};
|
||||
|
||||
proxmox_crates_src = fetchgit {
|
||||
url = "git://git.proxmox.com/git/proxmox.git";
|
||||
rev = "b9bc28082f820dbf88f8dcc02ba2250fc999f9d0";
|
||||
name = "proxmox";
|
||||
hash = "sha256-NPJi2BzANBfQx995lzIcgCKthWSv+8NeD8zrYnoMye8=";
|
||||
};
|
||||
in
|
||||
rustPlatform.buildRustPackage {
|
||||
pname = "proxmox-auto-install-assistant";
|
||||
version = "9.1.6";
|
||||
version = "9.2.5";
|
||||
|
||||
src = fetchgit {
|
||||
url = "git://git.proxmox.com/git/pve-installer.git";
|
||||
rev = "eab66c74a79663008ab12990bd27195a8d5c4204";
|
||||
hash = "sha256-nMyi3GfdQv/L05hpReSIoFrvmpbs4+5t/lUXXgP0bUs=";
|
||||
};
|
||||
srcs = [
|
||||
installer_src
|
||||
proxmox_crates_src
|
||||
];
|
||||
|
||||
sourceRoot = installer_src.name;
|
||||
|
||||
postPatch = ''
|
||||
rm -v .cargo/config.toml
|
||||
@@ -26,18 +41,18 @@ rustPlatform.buildRustPackage {
|
||||
# pre-generated using `make locale-info.json`
|
||||
# depends on non-packaged perl modules and debian-specific files
|
||||
cp -v ${./locale-info.json} locale-info.json
|
||||
|
||||
# add necessary crates.io patches to redirect to checked-out repo
|
||||
cat <<EOF >>Cargo.toml
|
||||
proxmox-network-types.path = "../proxmox/proxmox-network-types"
|
||||
proxmox-installer-types.path = "../proxmox/proxmox-installer-types"
|
||||
proxmox-sys.path = "../proxmox/proxmox-sys"
|
||||
EOF
|
||||
'';
|
||||
|
||||
buildAndTestSubdir = "proxmox-auto-install-assistant";
|
||||
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"proxmox-io-1.2.1" = "sha256-1F5PJKJ/Ys1EfFPqpP08pRiiTKOAt9IHZ/fbeYxH7SQ=";
|
||||
"proxmox-lang-1.5.0" = "sha256-1F5PJKJ/Ys1EfFPqpP08pRiiTKOAt9IHZ/fbeYxH7SQ=";
|
||||
"proxmox-sys-1.0.0" = "sha256-1F5PJKJ/Ys1EfFPqpP08pRiiTKOAt9IHZ/fbeYxH7SQ=";
|
||||
};
|
||||
};
|
||||
cargoLock.lockFile = ./Cargo.lock;
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
gfortran,
|
||||
libzip,
|
||||
lhapdf,
|
||||
patchelf,
|
||||
testers,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
@@ -27,8 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
gfortran
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [ patchelf ];
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libzip
|
||||
@@ -38,15 +37,12 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
cmakeFlags = [
|
||||
# Needed to initialize a valid SHERPA_LIBRARY_PATH
|
||||
"-DCMAKE_INSTALL_LIBDIR=lib"
|
||||
(lib.cmakeFeature "CMAKE_INSTALL_NAME_DIR" "${placeholder "out"}/lib/SHERPA-MC")
|
||||
];
|
||||
|
||||
preFixup =
|
||||
lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
install_name_tool -add_rpath "$out"/lib/SHERPA-MC "$out"/bin/Sherpa
|
||||
''
|
||||
+ lib.optionalString stdenv.hostPlatform.isLinux ''
|
||||
patchelf --add-rpath "$out"/lib/SHERPA-MC "$out"/bin/Sherpa
|
||||
'';
|
||||
passthru.tests.version = testers.testVersion {
|
||||
package = finalAttrs.finalPackage;
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Monte Carlo event generator for the Simulation of High-Energy Reactions of PArticles";
|
||||
@@ -54,7 +50,5 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
homepage = "https://gitlab.com/sherpa-team/sherpa";
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = with lib.maintainers; [ veprbl ];
|
||||
# never built on aarch64-darwin since first introduction in nixpkgs
|
||||
broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64;
|
||||
};
|
||||
})
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "snakemake";
|
||||
version = "9.21.0";
|
||||
version = "9.21.1";
|
||||
pyproject = true;
|
||||
__structuredAttrs = true;
|
||||
|
||||
@@ -19,7 +19,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
|
||||
owner = "snakemake";
|
||||
repo = "snakemake";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-+EO+BTMkui0mJvEf0TOaCRBH8MzLsit8xK+71gujHt0=";
|
||||
hash = "sha256-i5F8Dt6DJtR3WBoAAt+/6WMaB+LDG18xKuNQ7HZ2zow=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -42,7 +42,7 @@ let
|
||||
in
|
||||
effectiveStdenv.mkDerivation (finalAttrs: {
|
||||
pname = "stable-diffusion-cpp";
|
||||
version = "master-625-f683c88";
|
||||
version = "master-652-92dc726";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -52,8 +52,8 @@ effectiveStdenv.mkDerivation (finalAttrs: {
|
||||
src = fetchFromGitHub {
|
||||
owner = "leejet";
|
||||
repo = "stable-diffusion.cpp";
|
||||
rev = "master-625-f683c88";
|
||||
hash = "sha256-eqVPgETCIwxvmpVwRUGx8hwqX9wV6ynER5uWxoctUw4=";
|
||||
rev = "master-652-92dc726";
|
||||
hash = "sha256-Gk8y2ZvEQHO+p/l4nuioErARYqfLH6qbDwlmS5RXVI4=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -18,18 +18,18 @@ in
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "surfpool-cli";
|
||||
version = "1.3.0";
|
||||
version = "1.3.1";
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "solana-foundation";
|
||||
repo = "surfpool";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Yy30n/dZgDkXmWZM5KmoK+CJNCPvNcKvk5N+fusELJ4=";
|
||||
hash = "sha256-ZxF2wysE48C14gm62hsWHh/i6BWTmTNUB/tBReqCue8=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
cargoHash = "sha256-GGuonsdJU/E6A5BM6qcx+f6yZEzvbrmTLBe2lNBdfDI=";
|
||||
cargoHash = "sha256-WYsTPgRhC44KF/phjSy3iCwQQCTaqrB40/jWA6IdW30=";
|
||||
|
||||
env = {
|
||||
RUSTFLAGS = "-Aunused";
|
||||
|
||||
@@ -24,14 +24,14 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tev";
|
||||
version = "2.12.1";
|
||||
version = "2.12.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Tom94";
|
||||
repo = "tev";
|
||||
tag = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-W/K70l4WXUyZUa1gVivr3y/CT4QYq12FuJqSLA2dyFU=";
|
||||
hash = "sha256-+7P45Vski0BvQLtraxhhos+h+yf8E8CiCbsaFcgObo0=";
|
||||
};
|
||||
|
||||
postPatch = lib.optionalString stdenv.hostPlatform.isLinux (
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
lib,
|
||||
stdenvNoCC,
|
||||
fetchzip,
|
||||
installFonts,
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "victor-mono";
|
||||
version = "1.5.6";
|
||||
@@ -21,22 +21,20 @@ stdenvNoCC.mkDerivation rec {
|
||||
hash = "sha256-PnCCU7PO+XcxUk445sU5xVl8XqdSPJighjtDTqI6qiw=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p "$out/share/fonts/"
|
||||
|
||||
mv OTF $out/share/fonts/opentype
|
||||
mv TTF $out/share/fonts/truetype
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
nativeBuildInputs = [ installFonts ];
|
||||
outputs = [
|
||||
"out"
|
||||
"webfont"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Free programming font with cursive italics and ligatures";
|
||||
homepage = "https://rubjo.github.io/victor-mono";
|
||||
license = lib.licenses.ofl;
|
||||
maintainers = with lib.maintainers; [ jpotier ];
|
||||
maintainers = with lib.maintainers; [
|
||||
jpotier
|
||||
seudonym
|
||||
];
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -2,11 +2,11 @@
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
versionCheckHook,
|
||||
elkhound,
|
||||
ocaml-ng,
|
||||
perl,
|
||||
which,
|
||||
fetchpatch,
|
||||
}:
|
||||
|
||||
let
|
||||
@@ -18,38 +18,27 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "weidu";
|
||||
version = "249.00";
|
||||
version = "251";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "WeiDUorg";
|
||||
repo = "weidu";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-+vkKTzFZdAzY2dL+mZ4A0PDxhTKGgs9bfArz7S6b4m4=";
|
||||
rev = "v${finalAttrs.version}.00";
|
||||
sha256 = "sha256-oVQYESBqp0fJ+ECLGQOPCECnDpGMR8U5ijvTVPc8z4g=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/WeiDUorg/weidu/commit/bb90190d8bf7d102952c07d8288a7dc6c7a3322e.patch";
|
||||
hash = "sha256-Z4hHdMR1dYjJeERJSqlYynyPu2CvE6+XJuCr9ogDmvk=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substitute sample.Configuration Configuration \
|
||||
--replace-fail /usr/bin ${lib.makeBinPath [ ocaml' ]} \
|
||||
--replace-fail /usr/local/bin ${lib.makeBinPath [ ocaml' ]} \
|
||||
--replace-fail elkhound ${lib.getExe elkhound}
|
||||
substituteInPlace Configuration \
|
||||
--replace-fail ' = elkhound' ' = ${lib.getExe elkhound}'
|
||||
|
||||
mkdir -p obj/{.depend,x86_LINUX}
|
||||
|
||||
# undefined reference to `caml_hash_univ_param'
|
||||
sed -i "20,21d;s/old_hash_param/hash_param/" hashtbl-4.03.0/myhashtbl.ml
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
elkhound
|
||||
ocaml'
|
||||
perl
|
||||
versionCheckHook
|
||||
which
|
||||
];
|
||||
|
||||
@@ -71,6 +60,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
doInstallCheck = true;
|
||||
|
||||
meta = {
|
||||
description = "InfinityEngine Modding Engine";
|
||||
homepage = "https://weidu.org";
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
}:
|
||||
mkYaziPlugin {
|
||||
pname = "close-and-restore-tab.yazi";
|
||||
version = "0-unstable-2026-05-23";
|
||||
version = "0-unstable-2026-05-30";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "MasouShizuka";
|
||||
repo = "close-and-restore-tab.yazi";
|
||||
rev = "d7638aadf1f6c4ca5ed2dbff2d3b07c6f86d9804";
|
||||
hash = "sha256-s9VOheYlUw7uqxZnd0+mN6lFghOi1shxf0DVIfn6unQ=";
|
||||
rev = "b2153bc68696edc8e17fc90e73310e274035c674";
|
||||
hash = "sha256-3bcnXXYfmvJGxxVKEHAy3so1KRFr1oIdj01A8WIU5VM=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
}:
|
||||
mkYaziPlugin {
|
||||
pname = "mediainfo.yazi";
|
||||
version = "0-unstable-2026-05-19";
|
||||
version = "0-unstable-2026-06-03";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "boydaihungst";
|
||||
repo = "mediainfo.yazi";
|
||||
rev = "4f80288c7286efb7ea3ffb6193027f2f1a027473";
|
||||
hash = "sha256-xxOM5cdAEGgUrcFViKWFgwwQdCYpsbvE+Ji0Gerk7UA=";
|
||||
rev = "ef8105a52b2f2bc59aeef38e02b2c69418131352";
|
||||
hash = "sha256-1qHCeLn6bPdOs3Z176367t6/m9sothyqHe+rqkKqgiI=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
}:
|
||||
mkYaziPlugin {
|
||||
pname = "projects.yazi";
|
||||
version = "0-unstable-2026-02-15";
|
||||
version = "0-unstable-2026-05-30";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "MasouShizuka";
|
||||
repo = "projects.yazi";
|
||||
rev = "198c2ba30e4916ca275d2a08bd329fcf32735866";
|
||||
hash = "sha256-Grvtx+N1DpdpMaVuDwaHu3S7zu6pQtmu1twvFIowbLM=";
|
||||
rev = "112a2707e9d37c02304449fbc8669d0264841e22";
|
||||
hash = "sha256-w7QTVogc7pqVa56fSCl22m8AkOHO5jq+yXLfCRaY1Yg=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -176,6 +176,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
description = "General-purpose programming language and toolchain for maintaining robust, optimal, and reusable software";
|
||||
homepage = "https://ziglang.org/";
|
||||
changelog = "https://ziglang.org/download/${finalAttrs.version}/release-notes.html";
|
||||
donationPage = "https://ziglang.org/zsf/";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ ];
|
||||
teams = [ lib.teams.zig ];
|
||||
|
||||
@@ -3,28 +3,31 @@
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
lib,
|
||||
openccu-data,
|
||||
pydantic,
|
||||
pytest-asyncio,
|
||||
pytest-xdist,
|
||||
pytestCheckHook,
|
||||
setuptools,
|
||||
}:
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "aiohomematic-config";
|
||||
version = "2026.4.1";
|
||||
version = "2026.5.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sukramj";
|
||||
repo = "aiohomematic-config";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-I75OPUA/gdLdMAJU0iYYQUk54f5cQQ5UWsRQHayqpyo=";
|
||||
hash = "sha256-uBIdBpjkEIPyuNxTEgTVc068K8UIVvdBXvwZ1MYh7rs=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [
|
||||
aiohomematic
|
||||
openccu-data
|
||||
pydantic
|
||||
];
|
||||
|
||||
@@ -32,6 +35,7 @@ buildPythonPackage (finalAttrs: {
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytest-asyncio
|
||||
pytest-xdist
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
|
||||
@@ -4,6 +4,7 @@
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
freezegun,
|
||||
openccu-data,
|
||||
orjson,
|
||||
pydantic,
|
||||
pydevccu,
|
||||
@@ -18,7 +19,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiohomematic";
|
||||
version = "2026.4.6";
|
||||
version = "2026.5.11";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.14";
|
||||
@@ -27,13 +28,14 @@ buildPythonPackage rec {
|
||||
owner = "SukramJ";
|
||||
repo = "aiohomematic";
|
||||
tag = version;
|
||||
hash = "sha256-R7hQprIAK7Xs+XpmMecAGGrAYzfBk+fQo17tkByC0Kc=";
|
||||
hash = "sha256-Ua7/sLhL0mbZvJwx+TNfXoP+z+jE2TyCO3DqsFpPe6A=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [
|
||||
aiohttp
|
||||
openccu-data
|
||||
orjson
|
||||
pydantic
|
||||
python-slugify
|
||||
|
||||
@@ -3,25 +3,28 @@
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
pytestCheckHook,
|
||||
setuptools,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "aqipy-atmotech";
|
||||
version = "0.1.5";
|
||||
format = "setuptools";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "atmotube";
|
||||
repo = "aqipy";
|
||||
rev = version;
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-tqHhfJmtVFUSO57Cid9y3LK4pOoG7ROtwDT2hY5IE1Y=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "'pytest-runner'" ""
|
||||
--replace-fail "'pytest-runner'" ""
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ "aqipy" ];
|
||||
@@ -29,7 +32,8 @@ buildPythonPackage rec {
|
||||
meta = {
|
||||
description = "Library for AQI calculation";
|
||||
homepage = "https://github.com/atmotube/aqipy";
|
||||
changelog = "https://github.com/atmotube/aqipy/releases/tag/${finalAttrs.version}";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -25,13 +25,13 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "llama-cloud";
|
||||
version = "2.7.0";
|
||||
version = "2.8.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "llama_cloud";
|
||||
inherit (finalAttrs) version;
|
||||
hash = "sha256-JlwSx3r31VWDTq97tN8Qp7gPDq6mlGmzrnk1rbya8eQ=";
|
||||
hash = "sha256-7hPs2yySQ2PrECOkNhnb0HLhgsWW7VwpK4pclbAaDOU=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -0,0 +1,36 @@
|
||||
{
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
lib,
|
||||
pytestCheckHook,
|
||||
setuptools,
|
||||
}:
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "openccu-data";
|
||||
version = "2026.5.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SukramJ";
|
||||
repo = "openccu-data";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-jJNNpBeEQ1CPZP/5ssenXSmvC7FMbUUBhG1Ty/3hGvk=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
pythonImportsCheck = [ "openccu_data" ];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/SukramJ/openccu-data/blob/${finalAttrs.src.tag}/changelog.md";
|
||||
description = "Extract and distribute Homematic CCU/OpenCCU configuration metadata";
|
||||
homepage = "https://github.com/SukramJ/openccu-data";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.dotlambda ];
|
||||
};
|
||||
})
|
||||
@@ -12,7 +12,7 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "pydevccu";
|
||||
version = "0.2.3";
|
||||
version = "0.2.4";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.13";
|
||||
@@ -21,7 +21,7 @@ buildPythonPackage (finalAttrs: {
|
||||
owner = "SukramJ";
|
||||
repo = "pydevccu";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-dOk0Sb7RR21Mzke+wkhEca8HMVt7pcU5eXs/hzojFBQ=";
|
||||
hash = "sha256-/Z1+k9CNTQsqTXSIqmUQn7r5WBTgZmqsg5Z+cq9nR3Q=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pypdf";
|
||||
version = "6.10.2";
|
||||
version = "6.12.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
@@ -32,7 +32,7 @@ buildPythonPackage rec {
|
||||
tag = version;
|
||||
# fetch sample files used in tests
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-f7U9kZrAnUHv0nBrcHI+Otd49jIJz0d1uWRHymWJnYo=";
|
||||
hash = "sha256-rRvRAasPgE5nCChYJYB9olSE3RWmztYSJoAbmh+a3Q0=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
pkgs,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
@@ -51,7 +52,9 @@ buildPythonPackage (finalAttrs: {
|
||||
xrootd
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "snakemake_storage_plugin_xrootd" ];
|
||||
# When doCheck is disabled, nnativeCheckInputs are not available and the package fails to import:
|
||||
# ModuleNotFoundError: No module named 'snakemake'
|
||||
pythonImportsCheck = lib.optionals finalAttrs.doCheck [ "snakemake_storage_plugin_xrootd" ];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
@@ -60,6 +63,16 @@ buildPythonPackage (finalAttrs: {
|
||||
|
||||
enabledTestPaths = [ "tests/tests.py" ];
|
||||
|
||||
# Tests fail on darwin even with:
|
||||
# - __darwinAllowLocalNetworking = true;
|
||||
# - sandbox = false
|
||||
# - writableTmpDirAsHomeHook
|
||||
#
|
||||
# Failed: XRootD server terminated unexpectedly.
|
||||
# 260604 22:16:56 259 XrdConfig: Unable to set permission for admin path /tmp/.xrd/; operation not permitted
|
||||
# ------ xrootd anon@91-224-148-58.tetaneutral.net:32293 initialization failed.
|
||||
doCheck = !stdenv.hostPlatform.isDarwin;
|
||||
|
||||
meta = {
|
||||
description = "Snakemake storage plugin for handling input and output via XRootD";
|
||||
homepage = "https://github.com/snakemake/snakemake-storage-plugin-xrootd";
|
||||
|
||||
@@ -7,20 +7,22 @@
|
||||
aiohomematic-config,
|
||||
aiohomematic-test-support,
|
||||
home-assistant,
|
||||
openccu-data,
|
||||
pytest-homeassistant-custom-component,
|
||||
pytest-xdist,
|
||||
pytestCheckHook,
|
||||
}:
|
||||
|
||||
buildHomeAssistantComponent rec {
|
||||
owner = "SukramJ";
|
||||
domain = "homematicip_local";
|
||||
version = "2.6.0";
|
||||
version = "2.7.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SukramJ";
|
||||
repo = "custom_homematic";
|
||||
tag = version;
|
||||
hash = "sha256-u3REMGuaQ+wQgDgiTvplBRMbzZJDUfcbyJm9tYOuYIw=";
|
||||
hash = "sha256-9dXvIxMMdHTOi9JbRsHbySqRUYq6dN+MzrOocq9cpdA=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@@ -33,20 +35,25 @@ buildHomeAssistantComponent rec {
|
||||
dependencies = [
|
||||
aiohomematic
|
||||
aiohomematic-config
|
||||
openccu-data
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
aiohomematic-test-support
|
||||
async-upnp-client
|
||||
pytest-homeassistant-custom-component
|
||||
pytest-xdist
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
# tries to write to the Nix store
|
||||
"tests/test_blueprints.py"
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# custom_components.homematicip_local.support.InvalidConfig: C
|
||||
"test_async_validate_config_and_get_system_information"
|
||||
# Failed: Lingering timer after test <TimerHandle when=3043632.864116499 Store._async_schedule_callback_delayed_write() created at /nix/store/5rh57mhaihd9wff1rqnskvs8nxh9sv3z-homeassistant-2026.6.0/lib/python3.14/site-packages/homeassistant/helpers/storage.py:516>
|
||||
"test_reauth_flow_success"
|
||||
];
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -11752,6 +11752,8 @@ self: super: with self; {
|
||||
|
||||
opencc = callPackage ../development/python-modules/opencc { };
|
||||
|
||||
openccu-data = callPackage ../development/python-modules/openccu-data { };
|
||||
|
||||
opencensus = callPackage ../development/python-modules/opencensus { };
|
||||
|
||||
opencensus-context = callPackage ../development/python-modules/opencensus-context { };
|
||||
|
||||
@@ -110,10 +110,6 @@ makeScopeWithSplicing' {
|
||||
|
||||
maplibre-native-qt = callPackage ../development/libraries/maplibre-native-qt { };
|
||||
|
||||
mlt = pkgs.mlt.override {
|
||||
qt = qt5;
|
||||
};
|
||||
|
||||
polkit-qt = callPackage ../development/libraries/polkit-qt-1 { };
|
||||
|
||||
poppler = callPackage ../development/libraries/poppler {
|
||||
@@ -124,9 +120,7 @@ makeScopeWithSplicing' {
|
||||
|
||||
pyotherside = callPackage ../development/libraries/pyotherside { };
|
||||
|
||||
qca = callPackage ../development/libraries/qca {
|
||||
inherit (libsForQt5) qtbase;
|
||||
};
|
||||
qca = callPackage ../development/libraries/qca { };
|
||||
qca-qt5 = self.qca;
|
||||
|
||||
qcoro = callPackage ../development/libraries/qcoro { };
|
||||
@@ -194,6 +188,7 @@ makeScopeWithSplicing' {
|
||||
timed = callPackage ../applications/system/timed { };
|
||||
}
|
||||
// lib.optionalAttrs config.allowAliases {
|
||||
mlt = throw "'libsForQt5.mlt' was removed due to lack of upstream support since v7.36.0, use 'qt6Packages.mlt'."; # Added 2026-06-05
|
||||
futuresql = throw "libsForQt5.futuresql has been removed"; # Added 2026-05-01
|
||||
kdb = throw "libsForQt5.kdb has been removed"; # Added 2026-05-01
|
||||
kdiagram = throw "libsForQt5.kdiagram has been removed"; # Added 2026-05-01
|
||||
|
||||
@@ -86,17 +86,13 @@ makeScopeWithSplicing' {
|
||||
};
|
||||
|
||||
libquotient = callPackage ../development/libraries/libquotient { };
|
||||
mlt = pkgs.mlt.override {
|
||||
qt = qt6;
|
||||
};
|
||||
mlt = callPackage ../by-name/ml/mlt/package.nix { };
|
||||
|
||||
maplibre-native-qt = callPackage ../development/libraries/maplibre-native-qt { };
|
||||
|
||||
pyotherside = callPackage ../development/libraries/pyotherside { };
|
||||
|
||||
qca = callPackage ../development/libraries/qca {
|
||||
inherit (qt6) qtbase qt5compat;
|
||||
};
|
||||
qca = callPackage ../development/libraries/qca { };
|
||||
qcoro = callPackage ../development/libraries/qcoro { };
|
||||
qcustomplot = callPackage ../development/libraries/qcustomplot { };
|
||||
qgpgme = callPackage ../development/libraries/qgpgme { };
|
||||
|
||||
Reference in New Issue
Block a user