gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into staging-nixos

Browse Source
This commit is contained in:
nixpkgs-ci[bot]
2026-07-17 06:49:31 +00:00
committed by GitHub
parent 866d350c81 705ffce919
commit 0a636e2dc1
33 changed files with 284 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/networking/browsers/firefox/packages/firefox-beta.nix
+2 -2
View File
@@ -10,11 +10,11 @@
buildMozillaMach rec {
pname = "firefox-beta";
binaryName = "firefox-beta";
version = "152.0b10";
version = "153.0b13";
applicationName = "Firefox Beta";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "531117225f690736e529d654766136878e3c719ec500860fcd578d9bf93f2e46f2887f0c4ba21dd17884cc41bda37fbd735c998091a0e1b0eb72d5d43f4f2339";
sha512 = "fecfb1837d1907d54ed52bc40113804b6637352c2cbe6eb906f950d7749cbece32446b42c392102fa9e16591949619237dc2dbeb13bec18697ddd42e9ce8d4dd";
};
meta = {
pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix
+2 -2
View File
@@ -10,13 +10,13 @@
buildMozillaMach rec {
pname = "firefox-devedition";
binaryName = "firefox-devedition";
version = "153.0b11";
version = "153.0b13";
applicationName = "Firefox Developer Edition";
requireSigning = false;
branding = "browser/branding/aurora";
src = fetchurl {
url = "mirror://mozilla/devedition/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "b9cba9de51157db94ae421fcb82e2172e3a3b5026b01b1049c858e45302603dde9e8d859a163d1ec00e225788516fb769c1b7b1a4bd4f4ed3785c9552aab4e78";
sha512 = "ee1a699ab3f390031e7eb85b6cc394d3431cc2e2960e97cabc393cc4edad1bd1a2ba62e7d834e2ae52fa7fcf3a08c6194c1801ba7e62fa3ceb98ee08ac27981d";
};
# buildMozillaMach sets MOZ_APP_REMOTINGNAME during configuration, but
pkgs/applications/window-managers/hyprwm/hyprland-plugins/hypr-darkwindow.nix
+1 -1
View File
@@ -13,7 +13,7 @@ mkHyprlandPlugin (finalAttrs: {
owner = "micha4w";
repo = "Hypr-DarkWindow";
tag = "v${finalAttrs.version}";
hash = "sha256-By/4CmpJvVvcBoyTtelH7MSLCKRaoXLCpiSfrbZIePc=";
hash = "sha256-91l5TD46OMfvmhd1WqWxm42cEnjR1yAj2Qk/73mr3ks=";
};
installPhase = ''
pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprgrass.nix
+4 -4
View File
@@ -12,13 +12,13 @@
mkHyprlandPlugin {
pluginName = "hyprgrass";
version = "0.8.2-unstable-2025-10-08";
version = "0.8.2-unstable-2026-06-10";
src = fetchFromGitHub {
owner = "horriblename";
repo = "hyprgrass";
rev = "fdfa60d464a18ae20b7a7bc63c0d2336f37c164b";
hash = "sha256-2Y2D2wuNqSldprawq8BSca90gSYSR5ZKL5ZW2YAV2F8=";
rev = "d094a3e62f6ecaeb41515982d3e13edefaf8a4e7";
hash = "sha256-tCt7FNc1RBHou/ym7B0XzoOqqNq8Df+dizEDkAgJ4U0=";
};
nativeBuildInputs = [
@@ -34,7 +34,7 @@ mkHyprlandPlugin {
doCheck = true;
passthru.updateScript = nix-update-script { };
passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
meta = {
description = "Hyprland plugin for touch gestures";
pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprsplit.nix
+4 -4
View File
@@ -8,13 +8,13 @@
}:
mkHyprlandPlugin (finalAttrs: {
pluginName = "hyprsplit";
version = "0.54.2";
version = "0.54.3-unstable-2026-06-11";
src = fetchFromGitHub {
owner = "shezdy";
repo = "hyprsplit";
tag = "v${finalAttrs.version}";
hash = "sha256-NFMLZmM6lM7v6WFcewOp7pKPlr6ampX/MB/kGxt/gPE=";
rev = "6b00b677d8905fb38779c91e12d6294e0e586a44";
hash = "sha256-PaoUtmk+qIP/ESdxkxnY7mUMpMHjix88qu22R5GLQqE=";
};
nativeBuildInputs = [
@@ -22,7 +22,7 @@ mkHyprlandPlugin (finalAttrs: {
ninja
];
passthru.updateScript = nix-update-script { };
passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
meta = {
homepage = "https://github.com/shezdy/hyprsplit";
pkgs/applications/window-managers/hyprwm/hyprland-plugins/imgborders.nix
+6 -15
View File
@@ -5,31 +5,22 @@
cmake,
nix-update-script,
}:
mkHyprlandPlugin (finalAttrs: {
mkHyprlandPlugin {
pluginName = "imgborders";
version = "1.0.1";
version = "1.0.2-unstable-2026-05-17";
src = fetchFromCodeberg {
owner = "zacoons";
repo = "imgborders";
tag = finalAttrs.version;
hash = "sha256-fCzz4gh8pd7J6KQJB/avYcS0Z7NYpxjznPMtOwypPSQ=";
rev = "a20b4d36d01f82823ba3749db95c91743d26f656";
hash = "sha256-e3PiaR7G6l/lMJ41xtSPcfMKhZcx8UHj13lr0u+8JAk=";
};
nativeBuildInputs = [
cmake
];
installPhase = ''
runHook preInstall
mkdir -p $out/lib
mv imgborders.so $out/lib/libimgborders.so
runHook postInstall
'';
passthru.updateScript = nix-update-script { };
passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
meta = {
homepage = "https://codeberg.org/zacoons/imgborders";
@@ -39,4 +30,4 @@ mkHyprlandPlugin (finalAttrs: {
mrdev023
];
};
})
}
pkgs/build-support/build-mozilla-mach/default.nix
-18
View File
@@ -349,24 +349,6 @@ buildStdenv.mkDerivation {
# https://bugzilla.mozilla.org/show_bug.cgi?id=2046162
./153-cbindgen-0.29.4-compat.patch
]
++
# Fixes `ld.lld: error: undefined symbol: FREEBL_GetVector`
# https://bugzilla.mozilla.org/show_bug.cgi?id=2047651
lib.optionals
(
lib.versionAtLeast version "153"
&& lib.versionOlder version "154"
# We don't set --with-system-nss on Darwin, so it should be
# unaffected.
&& !stdenv.hostPlatform.isDarwin
)
[
(fetchpatch {
name = "link-freebl-explicitly-for-system-nss-builds.patch";
url = "https://hg-edge.mozilla.org/mozilla-central/raw-rev/1a56071ddc0fe97a55c3b825e1dd33c8422b9fc1";
hash = "sha256-+HiU7RMPmV7I7SIzjP0Q6iSDJL/vBjc3UcwUTg57lNQ=";
})
]
++ extraPatches;
postPatch = ''
pkgs/by-name/au/automatic-timezoned/package.nix
+3 -3
View File
@@ -7,16 +7,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "automatic-timezoned";
version = "2.0.126";
version = "2.0.143";
src = fetchFromGitHub {
owner = "maxbrunet";
repo = "automatic-timezoned";
rev = "v${finalAttrs.version}";
sha256 = "sha256-e6r8XfzwIdcGlQwN64bfSQ481b1ViLI+9jTxUYNsA3w=";
sha256 = "sha256-bbdhvQ9THiBRf1rLExXQiwlrkgZBFZlaV2CUszDmwo4=";
};
cargoHash = "sha256-0iUBZXybkK6y19RsZXSibcSRh4jEYwSSYUDyCI3ihOc=";
cargoHash = "sha256-J7h1hVp8wK6UlkstcLCq4uMKJ9ZyLwGR75tcxpWnHT8=";
nativeInstallCheckInputs = [ versionCheckHook ];
pkgs/by-name/bb/bbrew/package.nix
+45
View File
@@ -0,0 +1,45 @@
{
lib,
buildGoModule,
fetchFromGitHub,
nix-update-script,
versionCheckHook,
}:
buildGoModule (finalAttrs: {
pname = "bbrew";
version = "2.3.1";
__structuredAttrs = true;
src = fetchFromGitHub {
owner = "Valkyrie00";
repo = "bold-brew";
tag = "v${finalAttrs.version}";
hash = "sha256-g74rBvBlw/rlLmZdJtIeIp0sba0Q6kFyhlHTwegOA+0=";
};
vendorHash = "sha256-5gFyfyerRKfq0uGkyIJ1W4XLhyRR5qPyhc/f2Y2skrI=";
subPackages = [ "cmd/bbrew" ];
ldflags = [
"-s"
"-w"
"-X bbrew/internal/services.AppVersion=${finalAttrs.version}"
];
doInstallCheck = true;
nativeInstallCheckInputs = [ versionCheckHook ];
passthru.updateScript = nix-update-script { };
meta = {
description = "TUI for managing Homebrew, Flatpak, and Mac App Store packages";
homepage = "https://bold-brew.com";
changelog = "https://github.com/Valkyrie00/bold-brew/releases/tag/v${finalAttrs.version}";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ tyceherrman ];
platforms = lib.platforms.unix;
mainProgram = "bbrew";
};
})
pkgs/by-name/bl/blackfire/package.nix
+5 -5
View File
@@ -11,7 +11,7 @@
stdenv.mkDerivation rec {
pname = "blackfire";
version = "2026.6.1";
version = "2026.7.0";
src =
passthru.sources.${stdenv.hostPlatform.system}
@@ -60,19 +60,19 @@ stdenv.mkDerivation rec {
sources = {
"x86_64-linux" = fetchurl {
url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_amd64.deb";
hash = "sha256-doeqXoS0B7AyzyhkLB9wUC6iuD0c2KIhAIEPeYaDC5E=";
hash = "sha256-GzhcK+7NrQEP48XFmOQ9PVrvvsUzrCy/VRcshTSic9E=";
};
"i686-linux" = fetchurl {
url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_i386.deb";
hash = "sha256-bQWhiSw9/gGyGoLEyz6BHaRPNLxuqouiobBMfB5ytYk=";
hash = "sha256-F6U7YHSBE5Ogie2yBSGGUKt0XsE8jogKi2GP28H1Eeo=";
};
"aarch64-linux" = fetchurl {
url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_arm64.deb";
hash = "sha256-B+rhmnM2sVICVLDcYq2OEp402Wz6kywCRqeS95Vdzlw=";
hash = "sha256-eDJAjd/5omgUJ6sw5kCqxu7Ok2AYei/WGlXV96Ynd/U=";
};
"aarch64-darwin" = fetchurl {
url = "https://packages.blackfire.io/blackfire/${version}/blackfire-darwin_arm64.pkg.tar.gz";
hash = "sha256-Ofs9raAtx/duS8dXWfvjKGzhJr3j9+gkH8lP/VLfnkE=";
hash = "sha256-xzWw6us+9/r8lMMHZTgE++rX7ZZShAL7L7fOneALA4Q=";
};
};
pkgs/by-name/cy/cyrus-imapd/package.nix
+2 -2
View File
@@ -66,13 +66,13 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "cyrus-imapd";
version = "3.12.2";
version = "3.12.3";
src = fetchFromGitHub {
owner = "cyrusimap";
repo = "cyrus-imapd";
tag = "cyrus-imapd-${finalAttrs.version}";
hash = "sha256-zPEaxETzG4Aj8JYP/aZpN2xXrD+O22io/HzI4LK+s/o=";
hash = "sha256-2HTrFjFlFFqF1TWtClPSOJSCgmomjSgEU7o2UPgd/Cs=";
};
nativeBuildInputs = [
pkgs/by-name/fi/fish/package.nix
+3 -3
View File
@@ -150,13 +150,13 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "fish";
version = "4.8.0";
version = "4.8.1";
src = fetchFromGitHub {
owner = "fish-shell";
repo = "fish-shell";
tag = finalAttrs.version;
hash = "sha256-ttjLM1uBY8sL+jVcxdHUnHYlRFe5jGjnkgBLy17qGso=";
hash = "sha256-i9Ng9RYqlMGRShu2sDSXCZ6KD7n7A0TKzLdyatXjBmY=";
};
env = {
@@ -169,7 +169,7 @@ stdenv.mkDerivation (finalAttrs: {
cargoDeps = rustPlatform.fetchCargoVendor {
inherit (finalAttrs) src patches;
hash = "sha256-w8MuabpZ5ronQL3iaXbLErxPlTe1Mg8OsRb5foR59II=";
hash = "sha256-ikHv1WP38ClHGZy3StiyGS+lDHOjBT8ohJ/HdJwtYgw=";
};
patches = [
pkgs/by-name/ga/gamma-launcher/package.nix
+2 -2
View File
@@ -17,14 +17,14 @@ let
in
python3Packages.buildPythonApplication rec {
pname = "gamma-launcher";
version = "3.0";
version = "3.1";
pyproject = true;
src = fetchFromGitHub {
owner = "Mord3rca";
repo = "gamma-launcher";
tag = "v${version}";
hash = "sha256-bvlNmpl2L9MAhZMyHwosXrypH1CQrSI1RQwo+sXO7/w=";
hash = "sha256-FLxJfP1fl3efRk9iAIAsMUrjQcUNa04GjiAKrYequF8=";
};
build-system = [ python3Packages.setuptools ];
pkgs/by-name/go/google-chrome/package.nix
+5 -5
View File
@@ -179,11 +179,11 @@ let
linux = stdenvNoCC.mkDerivation (finalAttrs: {
inherit pname meta passthru;
version = "150.0.7871.124";
version = "150.0.7871.128";
src = fetchurl {
url = "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${finalAttrs.version}-1_amd64.deb";
hash = "sha256-TGNqvSrB9vMXb1K7QBCqN9ErWsBMQNyp6rEZksHHXNw=";
hash = "sha256-g+1ZyFh467j6U5FevnBmyvxY0cBMHJVElIbm+dmaHvs=";
};
# With strictDeps on, some shebangs were not being patched correctly
@@ -289,11 +289,11 @@ let
darwin = stdenvNoCC.mkDerivation (finalAttrs: {
inherit pname meta passthru;
version = "150.0.7871.125";
version = "150.0.7871.129";
src = fetchurl {
url = "http://dl.google.com/release2/chrome/kjpfr4hhda65lyoxi6u4o42bke_150.0.7871.125/GoogleChrome-150.0.7871.125.dmg";
hash = "sha256-ulMe+AP65d9VB2O7vhLnSX+dUfC7XqWd4GaOEQXGBac=";
url = "http://dl.google.com/release2/chrome/ggb3e3myl2poiiaqd2bbvqlrqa_150.0.7871.129/GoogleChrome-150.0.7871.129.dmg";
hash = "sha256-ym9rF6yrGMSibQDM4gKlAbOsIHnV1tPxyNq9KNLnR0I=";
};
dontPatch = true;
pkgs/by-name/ma/martin/package.nix
+10 -8
View File
@@ -7,6 +7,7 @@
rustPlatform,
pkg-config,
curl,
libuv,
libz,
openssl,
postgresql,
@@ -16,21 +17,21 @@
let
# check package.metadata.mln in https://github.com/maplibre/maplibre-native-rs/blob/main/Cargo.toml
mlnRelease = "core-9b6325a14e2cf1cc29ab28c1855ad376f1ba4903";
mlnRelease = "core-fa8a9c8e3261ce64940127aecc1d52f540c21c57";
mlnHeaders = fetchurl {
url = "https://github.com/maplibre/maplibre-native/releases/download/${mlnRelease}/maplibre-native-headers.tar.gz";
hash = "sha256-VjVEc/+IZTBG9ixP/i7oeel+7gy3+DhSEOi2UDIqeLc=";
hash = "sha256-SqZaqePNbqBZoUgMJIsZf0zqKc8EAwInYNRciv/jX1A=";
};
mlnLibrary = fetchurl (
let
sources = {
aarch64-linux = {
url = "https://github.com/maplibre/maplibre-native/releases/download/${mlnRelease}/libmaplibre-native-core-amalgam-linux-arm64-vulkan.a";
hash = "sha256-PHFNdzcG3+kngZmziMccCTnwBUbtsS2RAUNkTyNYXmc";
hash = "sha256-iug/ZEIoM0LUczPkVbzVelILoc1uzsM519V2em7Va4U=";
};
x86_64-linux = {
url = "https://github.com/maplibre/maplibre-native/releases/download/${mlnRelease}/libmaplibre-native-core-amalgam-linux-x64-vulkan.a";
hash = "sha256-T9H7NiXHv+hbMgOd5QetQzxjIX1Ufn6gNmBJJ/7Ha50=";
hash = "sha256-FoUFDoUw+eM/aaXMfO7iuoUrv8gUGVdBW1tiqxjYCbI=";
};
};
in
@@ -46,18 +47,18 @@ let
in
rustPlatform.buildRustPackage (finalAttrs: {
pname = "martin";
version = "1.10.1";
version = "1.12.0";
src = fetchFromGitHub {
owner = "maplibre";
repo = "martin";
tag = "martin-v${finalAttrs.version}";
hash = "sha256-Zu3vkU7HQcSqzCL7n0uX4M+DxBDMC0Sii7esxM9AtpA=";
hash = "sha256-zCiyJw79KBrK/JqZFx93cPeCnS02/HrH+F1A6EBras0=";
};
patches = [ ./dont-build-webui.patch ];
cargoHash = "sha256-OPuUvm4ez5TZUWwJ6D6fqy++cCiVt7f1qP6OPdsOEDA=";
cargoHash = "sha256-1VSErzoJ0Xdzefaq++8lCGnJfh7LyQCsWmq1xSl4iqg=";
webui = buildNpmPackage {
pname = "martin-ui";
@@ -71,7 +72,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
ln -sf ${finalAttrs.src}/demo/frontend/public/favicon.ico public/_/assets/favicon.ico
'';
npmDepsHash = "sha256-lX5FSWAQyy4Sa7OPnNyTYttjHiPuYxgrPsmZpwCnpO8=";
npmDepsHash = "sha256-4BNjrYMAB8VBwCD4bREWw2vXwE9FCdfOFHsRgYNdiBI=";
buildPhase = ''
runHook preBuild
@@ -99,6 +100,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
buildInputs = [
curl
libuv
libz
openssl
];
pkgs/by-name/mu/music-assistant/frontend.nix
+2 -2
View File
@@ -8,13 +8,13 @@
buildPythonPackage rec {
pname = "music-assistant-frontend";
version = "2.17.186";
version = "2.17.186.post3";
pyproject = true;
src = fetchPypi {
pname = "music_assistant_frontend";
inherit version;
hash = "sha256-dNGzXDRZuQLRkMY0erjJZE4h26yFP4Fdn9a3K6T0RvM=";
hash = "sha256-a+Z2HuUuvkZQragrRP6vlofk6x/xJHWmnZPBa2BHpso=";
};
build-system = [ setuptools ];
pkgs/by-name/mu/music-assistant/package.nix
+2 -2
View File
@@ -40,7 +40,7 @@ assert
pythonPackages.buildPythonApplication (finalAttrs: {
pname = "music-assistant";
version = "2.9.6";
version = "2.9.8";
pyproject = true;
__structuredAttrs = true;
@@ -48,7 +48,7 @@ pythonPackages.buildPythonApplication (finalAttrs: {
owner = "music-assistant";
repo = "server";
tag = finalAttrs.version;
hash = "sha256-lEbWQi6iUvqL2MXk/ZqkdX4Ou5pFWIVi6qfSyWCs8uQ=";
hash = "sha256-Zk9jgcGwksMQo45qzzlE2Dqw1IQr0rsBkzMnFHTdl1U=";
};
patches = [
pkgs/by-name/mu/music-assistant/providers.nix
+1 -1
View File
@@ -1,7 +1,7 @@
# Do not edit manually, run ./update-providers.py
{
version = "2.9.6";
version = "2.9.8";
builtins = [
"builtin"
"coverartarchive"
pkgs/by-name/pm/pmbootstrap/package.nix
+2 -2
View File
@@ -15,14 +15,14 @@
python3Packages.buildPythonApplication rec {
pname = "pmbootstrap";
version = "3.10.3";
version = "3.11.1";
pyproject = true;
src = fetchFromGitLab {
owner = "postmarketOS";
repo = "pmbootstrap";
tag = version;
hash = "sha256-Zl7Ti0HwMQSjMeW4GjdEKIRoCNjV15Qiv8bzhktNoyQ=";
hash = "sha256-8i2CUJL/FALS3B/q39OlpQbhrY4ar2qdn0gnbFuJjUk=";
domain = "gitlab.postmarketos.org";
};
pkgs/by-name/pm/pmtiles/package.nix
+2 -2
View File
@@ -5,13 +5,13 @@
}:
buildGoModule (finalAttrs: {
pname = "pmtiles";
version = "1.31.0";
version = "1.31.1";
src = fetchFromGitHub {
owner = "protomaps";
repo = "go-pmtiles";
tag = "v${finalAttrs.version}";
hash = "sha256-OWf66RsOvYoJEsDI4rVsimX60uxuZoqTgIwAI7kxvs0=";
hash = "sha256-Hx20rNKmoxryD+/GClJpbXvjta6TUzaHJIRCu1f+lRU=";
};
vendorHash = "sha256-0u/04mpqhpRideIf8eOzgC7ZWNp4P2c2ssQvyWlcD4M=";
pkgs/by-name/pv/pvz-portable-unwrapped/package.nix
+2 -2
View File
@@ -23,13 +23,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "pvz-portable-unwrapped";
version = "0.1.26";
version = "0.1.27";
src = fetchFromGitHub {
owner = "wszqkzqk";
repo = "PvZ-Portable";
tag = finalAttrs.version;
hash = "sha256-IsU/l7k7F79nfM6TYdbcofOmJKm6v55HR7HHAZc7sH0=";
hash = "sha256-kebgKQRju2CRboKRytkTEIjm7Hl+1KkIOdrvbwG/ufs=";
};
nativeBuildInputs = [
pkgs/by-name/re/regal/package.nix
+3 -3
View File
@@ -6,16 +6,16 @@
buildGoModule (finalAttrs: {
pname = "regal";
version = "0.41.1";
version = "0.42.0";
src = fetchFromGitHub {
owner = "open-policy-agent";
repo = "regal";
tag = "v${finalAttrs.version}";
hash = "sha256-mrNdzzwgLmP3PNnoVI4vC05rq9vGCnlWHquwXh1HDX0=";
hash = "sha256-52kYnkOEhNk491vaoCSgR47frmN/mFCKyHqWnIBcEE8=";
};
vendorHash = "sha256-kp0EkieTIzC+nO9fFnUQMP4COCY9wxe4Nb2kSUgnInA=";
vendorHash = "sha256-Vl6u/dwtG8RBpSQUrS5rAQ0Hag2R5X6rVQe9PHb/4U8=";
# Only build the main binary, exclude build/lsp/main.go
subPackages = [ "." ];
pkgs/by-name/vo/voxtype/package.nix
+3 -3
View File
@@ -52,16 +52,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "voxtype";
version = "0.7.2";
version = "0.7.5";
src = fetchFromGitHub {
owner = "peteonrails";
repo = "voxtype";
tag = "v${finalAttrs.version}";
hash = "sha256-CpG/5ws9VX8ZQjwtJMxyUF0L90u+j0veHHLHGqTvoIw=";
hash = "sha256-zsOG1mBTXN4gdsTb1pUPKXATfhV5ZjgEsIUk07asaGo=";
};
cargoHash = "sha256-gHnYssFZixWt7F8oa1yYyfqThCrRsv0U7ezgZUcq1nk=";
cargoHash = "sha256-YK5xZWPo7KAeWZeuMxNxHA3k6RR/MT2MIfEPcgMND00=";
buildFeatures =
[ ]
pkgs/development/python-modules/amply/default.nix
+13 -6
View File
@@ -8,21 +8,28 @@
pytestCheckHook,
}:
buildPythonPackage rec {
buildPythonPackage (finalAttrs: {
pname = "amply";
version = "0.1.7";
format = "setuptools";
pyproject = true;
src = fetchPypi {
inherit pname version;
inherit (finalAttrs) pname version;
hash = "sha256-Z1tzt9dhE922z3Q8wW7ZJbzMTnLvZpkfDHNyBkYys8k=";
};
nativeBuildInputs = [ setuptools-scm ];
propagatedBuildInputs = [
build-system = [ setuptools-scm ];
postPatch = ''
substituteInPlace pyproject.toml \
--replace-fail "setuptools_scm[toml]>=10.1.2" "setuptools_scm"
'';
dependencies = [
docutils
pyparsing
];
nativeCheckInputs = [ pytestCheckHook ];
pythonImportsCheck = [ "amply" ];
@@ -35,4 +42,4 @@ buildPythonPackage rec {
maintainers = with lib.maintainers; [ ris ];
license = lib.licenses.epl10;
};
}
})
pkgs/development/python-modules/modbus-connection/default.nix
+7 -2
View File
@@ -12,7 +12,7 @@
buildPythonPackage (finalAttrs: {
pname = "modbus-connection";
version = "3.6.0";
version = "3.7.0";
pyproject = true;
__structuredAttrs = true;
@@ -20,7 +20,7 @@ buildPythonPackage (finalAttrs: {
owner = "home-assistant-libs";
repo = "modbus-connection";
tag = finalAttrs.version;
hash = "sha256-qDrtLziEMH0lsJ2o3p/6lMlPTdNIFqCvhtpbMJ89uKw=";
hash = "sha256-Tys1o0hbAONGbb24mQcOz8mM8+numl5RO8zHZKmxLv4=";
};
nativeBuildInputs = [
@@ -49,6 +49,11 @@ buildPythonPackage (finalAttrs: {
]
++ lib.concatAttrValues finalAttrs.passthru.optional-dependencies;
disabledTests = [
# tries to git clone https://github.com/sunspec/models
"test_official_model_catalogue_generates_and_imports"
];
pythonImportsCheck = [
"modbus_connection"
];
pkgs/development/python-modules/pydantic-ai-slim/default.nix
+2 -2
View File
@@ -20,14 +20,14 @@
buildPythonPackage (finalAttrs: {
pname = "pydantic-ai-slim";
version = "2.8.0";
version = "2.11.0";
pyproject = true;
src = fetchFromGitHub {
owner = "pydantic";
repo = "pydantic-ai";
tag = "v${finalAttrs.version}";
hash = "sha256-KwuhRZWGOofglR5SVsUOijtgYnhVV3Fc9DLtUwL+KSU=";
hash = "sha256-nt51tvNcB01i6Z1+8ueIW6ffIiS3Jh9MC2hSNgzN+90=";
};
sourceRoot = "${finalAttrs.src.name}/pydantic_ai_slim";
pkgs/development/python-modules/pydantic-graph/default.nix
+2 -2
View File
@@ -16,14 +16,14 @@
buildPythonPackage (finalAttrs: {
pname = "pydantic-graph";
version = "2.8.0";
version = "2.11.0";
pyproject = true;
src = fetchFromGitHub {
owner = "pydantic";
repo = "pydantic-ai";
tag = "v${finalAttrs.version}";
hash = "sha256-KwuhRZWGOofglR5SVsUOijtgYnhVV3Fc9DLtUwL+KSU=";
hash = "sha256-nt51tvNcB01i6Z1+8ueIW6ffIiS3Jh9MC2hSNgzN+90=";
};
sourceRoot = "${finalAttrs.src.name}/pydantic_graph";
pkgs/development/python-modules/sphinx-llm/default.nix
+49
View File
@@ -0,0 +1,49 @@
{
lib,
fetchFromGitHub,
buildPythonPackage,
hatchling,
hatch-vcs,
sphinx,
sphinx-markdown-builder,
langchain-ollama,
pytestCheckHook,
}:
buildPythonPackage (finalAttrs: {
pname = "sphinx-llm";
version = "0.4.1";
pyproject = true;
__structuredAttrs = true;
src = fetchFromGitHub {
owner = "NVIDIA";
repo = "sphinx-llm";
tag = finalAttrs.version;
hash = "sha256-hrJ2g4Zcjs0ojueCtrMpsMv1MRwd5kuBFYI4cnhPZrs=";
};
build-system = [
hatchling
hatch-vcs
];
dependencies = [
sphinx
sphinx-markdown-builder
langchain-ollama
];
nativeCheckInputs = [ pytestCheckHook ];
pythonImportsCheck = [
"sphinx_llm.txt"
"sphinx_llm.docref"
];
meta = {
description = "LLM extensions for Sphinx Documentation";
homepage = "https://github.com/NVIDIA/sphinx-llm";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ benley ];
};
})
pkgs/development/python-modules/stopit/default.nix
+12 -5
View File
@@ -6,29 +6,36 @@
}:
buildPythonPackage rec {
buildPythonPackage (finalAttrs: {
pname = "stopit";
version = "1.1.2";
format = "setuptools";
pyproject = true;
__structuredAttrs = true;
# tests are missing from the PyPi tarball
src = fetchFromGitHub {
owner = "glenfant";
repo = "stopit";
rev = version;
tag = finalAttrs.version;
hash = "sha256-uXJUA70JOGWT2NmS6S7fPrTWAJZ0mZ/hICahIUzjfbw=";
};
propagatedBuildInputs = [
build-system = [
setuptools # for pkg_resources
];
patches = [
# https://github.com/glenfant/stopit/pull/34
./import_lib.patch
];
pythonImportsCheck = [ "stopit" ];
meta = {
description = "Raise asynchronous exceptions in other thread, control the timeout of blocks or callables with a context manager or a decorator";
homepage = "https://github.com/glenfant/stopit";
changelog = "https://github.com/glenfant/stopit/blob/${finalAttrs.version}/CHANGES.rst";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ veprbl ];
};
}
})
pkgs/development/python-modules/stopit/import_lib.patch
+81
View File
@@ -0,0 +1,81 @@
From 9204d1de2ae294b878ed726c8278b28696a91f87 Mon Sep 17 00:00:00 2001
From: Jonathan Kamens <jik@jik6.kamens.us>
Date: Wed, 25 Sep 2024 15:52:03 -0400
Subject: [PATCH 1/2] Use importlib instead of pkg_resources to determine
package version
`pkg_resources` is deprecated and no longer available for import by
default as of Python 3.12.
---
src/stopit/__init__.py | 22 ++++++++++++++--------
1 file changed, 14 insertions(+), 8 deletions(-)
diff --git a/src/stopit/__init__.py b/src/stopit/__init__.py
index 6ca0180..d2fb01e 100644
--- a/src/stopit/__init__.py
+++ b/src/stopit/__init__.py
@@ -7,19 +7,25 @@
Public resources from ``stopit``
"""
-import pkg_resources
+try:
+ from importlib.metadata import version
+ __version__ = version(__name__)
+except Exception:
+ # pkg_resources is deprecated as of Python 3.12 and no longer available for
+ # import by default.
+ try:
+ import pkg_resources
+ except Exception:
+ LOG.warning(
+ "Could not get the package version from importlib or pkg_resources")
+ __version__ = 'unknown'
+ else:
+ __version__ = pkg_resources.get_distribution(__name__).version
from .utils import LOG, TimeoutException
from .threadstop import ThreadingTimeout, async_raise, threading_timeoutable
from .signalstop import SignalTimeout, signal_timeoutable
-# PEP 396 style version marker
-try:
- __version__ = pkg_resources.get_distribution(__name__).version
-except:
- LOG.warning("Could not get the package version from pkg_resources")
- __version__ = 'unknown'
-
__all__ = (
'ThreadingTimeout', 'async_raise', 'threading_timeoutable',
'SignalTimeout', 'signal_timeoutable'
From a2f6bde8a29cd281577426800b186802c68dbd86 Mon Sep 17 00:00:00 2001
From: Jonathan Kamens <jik@jik7>
Date: Mon, 28 Jul 2025 09:13:25 -0400
Subject: [PATCH 2/2] Import LOG before trying to use it
---
src/stopit/__init__.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/stopit/__init__.py b/src/stopit/__init__.py
index d2fb01e..bbf7068 100644
--- a/src/stopit/__init__.py
+++ b/src/stopit/__init__.py
@@ -7,6 +7,8 @@
Public resources from ``stopit``
"""
+from .utils import LOG, TimeoutException
+
try:
from importlib.metadata import version
__version__ = version(__name__)
@@ -22,7 +24,6 @@
else:
__version__ = pkg_resources.get_distribution(__name__).version
-from .utils import LOG, TimeoutException
from .threadstop import ThreadingTimeout, async_raise, threading_timeoutable
from .signalstop import SignalTimeout, signal_timeoutable
pkgs/development/python-modules/vallox-websocket-api/default.nix
+2 -2
View File
@@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "vallox-websocket-api";
version = "6.0.0";
version = "6.1.0";
pyproject = true;
src = fetchFromGitHub {
owner = "yozik04";
repo = "vallox_websocket_api";
tag = version;
hash = "sha256-i4KUXvDz6FCdQguZtpNybyIPC/gn+O3SAYWh2CIbAeI=";
hash = "sha256-tJuZl6sWOWpdfq5RJVCWehz6y0Du1VXz++aOWaf9WLY=";
};
build-system = [
pkgs/servers/sql/postgresql/ext/timescaledb.nix
+3 -3
View File
@@ -13,13 +13,13 @@
postgresqlBuildExtension (finalAttrs: {
pname = "timescaledb${lib.optionalString (!enableUnfree) "-apache"}";
version = "2.28.2";
version = "2.28.3";
src = fetchFromGitHub {
owner = "timescale";
repo = "timescaledb";
tag = finalAttrs.version;
hash = "sha256-oEH6h3OGwdDYIKAtwWpVgIQJdB+IJhN2U/WJu9aHlbQ=";
hash = "sha256-SoieJvdZQXazi2oJVShifYy0XXD1vdq/u2/Pw+KF2rU=";
};
nativeBuildInputs = [ cmake ];
@@ -105,7 +105,7 @@ postgresqlBuildExtension (finalAttrs: {
lib.versionOlder postgresql.version "15"
||
# Check after next package update.
lib.warnIf (finalAttrs.version != "2.28.2") "Is postgresql19Packages.timescaledb still broken?" (
lib.warnIf (finalAttrs.version != "2.28.3") "Is postgresql19Packages.timescaledb still broken?" (
lib.versionAtLeast postgresql.version "19"
);
};
pkgs/top-level/python-packages.nix
+2
View File
@@ -19132,6 +19132,8 @@ self: super: with self; {
callPackage ../development/python-modules/sphinx-last-updated-by-git
{ };
sphinx-llm = callPackage ../development/python-modules/sphinx-llm { };
sphinx-llms-txt = callPackage ../development/python-modules/sphinx-llms-txt { };
sphinx-lv2-theme = callPackage ../development/python-modules/sphinx-lv2-theme { };