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

Merge staging-next into staging

Browse Source
This commit is contained in:
nixpkgs-ci[bot]
2026-07-14 06:46:09 +00:00
committed by GitHub
parent a4c734219b 62a0b7a2c5
commit bc21b349f4
17 changed files with 201 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/networking/cluster/terraform-providers/providers.json
+3 -3
View File
@@ -1508,12 +1508,12 @@
"vendorHash": "sha256-8p6dJwGyTK+qtgplSLtIRKxnNAQAgHfs4z/EsBcg/iY="
},
"yandex-cloud_yandex": {
"hash": "sha256-7IyFMqzkdZ2wd5KUo5eNXUr847f3VhyYKDxwMKYZ+j0=",
"hash": "sha256-YiUARVEsGfD4IUuTFSrkAIAD6kOyFUoLebSaZtW9FcE=",
"homepage": "https://registry.terraform.io/providers/yandex-cloud/yandex",
"owner": "yandex-cloud",
"repo": "terraform-provider-yandex",
"rev": "v0.213.0",
"rev": "v0.215.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-JoOuqaiQFWWjnH/HjLxvznnyqQauxSef1KRQTMrhoGQ="
"vendorHash": "sha256-YNCd1i2HDa0aToZ0vEr6tRugXnBXE+zymhLM+rmRNPI="
}
}
pkgs/applications/networking/instant-messengers/gajim/default.nix
+5 -3
View File
@@ -38,14 +38,14 @@
python3.pkgs.buildPythonApplication (finalAttrs: {
pname = "gajim";
version = "2.4.7";
version = "2.4.7.1";
src = fetchFromGitLab {
domain = "dev.gajim.org";
owner = "gajim";
repo = "gajim";
tag = finalAttrs.version;
hash = "sha256-tZ1+DRVCzwaWeur9mwc/zE34H2xdqk96upqWfqNTl3g=";
tag = "${finalAttrs.version}+win";
hash = "sha256-/X2Xp1ZnPLTZc1Hf4Kp6R/+mezU6qoUhaT9OskYlnOY=";
};
pyproject = true;
@@ -135,8 +135,10 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
vbgl
haansn08
];
donationPage = "https://liberapay.com/Gajim";
downloadPage = "http://gajim.org/download/";
platforms = lib.platforms.linux;
mainProgram = "gajim";
identifiers.cpeParts = lib.meta.cpeFullVersionWithVendor "gajim" finalAttrs.version;
};
})
pkgs/by-name/hy/hyprwhspr-rs/package.nix
+3 -3
View File
@@ -16,16 +16,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "hyprwhspr-rs";
version = "0.3.31";
version = "0.3.32";
src = fetchFromGitHub {
owner = "better-slop";
repo = "hyprwhspr-rs";
tag = "v${finalAttrs.version}";
hash = "sha256-kQfv1J+eeYQyzoTf/Xnk5r5mUsTKqzZwBLGcWAoZIPY=";
hash = "sha256-z1ITwHiiBubeCnMw/e40XDtLyayDs4UmyEP3CrwlwFQ=";
};
cargoHash = "sha256-gYeT48apcZtRfX5gZE1nNL0/62PMsiRNxtjb9JpreS4=";
cargoHash = "sha256-MbAUCxTvPw+ERjEa/2C9rjujq9rZG1oU8xvI6jKxHlI=";
nativeBuildInputs = [
pkg-config
pkgs/by-name/ju/just/package.nix
+3 -3
View File
@@ -17,7 +17,7 @@
withDocumentation ? stdenv.buildPlatform.canExecute stdenv.hostPlatform,
}:
let
version = "1.55.1";
version = "1.56.0";
in
rustPlatform.buildRustPackage {
inherit version;
@@ -36,10 +36,10 @@ rustPlatform.buildRustPackage {
owner = "casey";
repo = "just";
tag = version;
hash = "sha256-yRG4nRaFE1wW0pPi6hj1uhWK+VSlmU5fIbxFtGocoZs=";
hash = "sha256-ZDaSZnn/2oncsl5JTBctUXXSqw2WQnIUIWfYRh2N70A=";
};
cargoHash = "sha256-m3wXn9uowFs9szYGkuh+pdtwjM39yhhB+OuxRWRcRMw=";
cargoHash = "sha256-I0aWzBSpU2gu1wjsUJ0jPO5oifXFcMcRdqs9P4j2vnA=";
nativeBuildInputs =
lib.optionals (installShellCompletions || installManPages) [ installShellFiles ]
pkgs/by-name/la/layerx/package.nix
+2 -2
View File
@@ -10,14 +10,14 @@
buildGoModule (finalAttrs: {
pname = "layerx";
version = "1.5.0";
version = "1.5.2";
__structuredAttrs = true;
src = fetchFromGitHub {
owner = "deveshctl";
repo = "layerx";
tag = "v${finalAttrs.version}";
hash = "sha256-Bkz0ETQEdy0GOlyGFmP8y80NdmNgRvLV0xRf/zd91ZY=";
hash = "sha256-2FttqXnc6o8EXbLBk7BpLS0Xf6ZozydD7a5gFspPQoo=";
};
vendorHash = "sha256-7wbyz6fKB3HMFhKJVIWrOIczLfqF4yInyszdh2Ky8WU=";
pkgs/by-name/li/limine/package.nix
+2 -3
View File
@@ -1,6 +1,5 @@
# Derivation containing the Limine host tool and the compiled bootloader
{
fetchpatch,
fetchurl,
lib,
llvmPackages,
@@ -48,14 +47,14 @@ in
# as bootloader for various platforms and corresponding binary and helper files.
stdenv.mkDerivation (finalAttrs: {
pname = "limine";
version = "12.4.1";
version = "12.4.2";
# We don't use the Git source but the release tarball, as the source has a
# `./bootstrap` script performing network access to download resources.
# Packaging that in Nix is very cumbersome.
src = fetchurl {
url = "https://github.com/Limine-Bootloader/Limine/releases/download/v${finalAttrs.version}/limine-${finalAttrs.version}.tar.gz";
hash = "sha256-LcpQkn1WTYCiRvLEmk31ii1KN62jHINb0oAoiF9t5V8=";
hash = "sha256-mrNz84nKqeY9wpintFr1NRrJpNAPgE9owcumGYZc2t4=";
};
enableParallelBuilding = true;
pkgs/by-name/op/opentrack/package.nix
+73 -16
View File
@@ -12,8 +12,11 @@
opencv4,
procps,
eigen,
imagemagick,
libxdmcp,
libevdev,
libicns,
llvmPackages,
makeDesktopItem,
wineWow64Packages,
onnxruntime,
@@ -21,15 +24,18 @@
v4l-utils,
withWine ? stdenv.targetPlatform.isx86_64,
}:
let
inherit (stdenv.hostPlatform) isLinux isDarwin;
in
stdenv.mkDerivation (finalAttrs: {
pname = "opentrack";
version = "2026.1.0-unstable-2026-06-18";
version = "2026.1.0-unstable-2026-07-09";
src = fetchFromGitHub {
owner = "opentrack";
repo = "opentrack";
rev = "3661aa28bb9489a798d9c42eb1c0ccf30876c848";
hash = "sha256-CClUz8g/fSL+NZzikKZuZx4pZsGhIdH70ax6clSG2xk=";
rev = "5ce3de85301c9cdb0e2c2e024f03d94cb42bfd62";
hash = "sha256-k4uAdsEIVYgHPrfl5m2CezQwi4ZGlItgq/e0cHd1TzY=";
};
aruco = callPackage ./aruco.nix { };
@@ -51,6 +57,8 @@ stdenv.mkDerivation (finalAttrs: {
patches = [
# calls `app.setDesktopFileName("opentrack");` - distros that don't wrap the binary apparently don't need this.
./desktop-filename.patch
# disables the upstream macOS .app artifact script
./remove_app_bundle_script.patch
];
strictDeps = true;
@@ -62,40 +70,89 @@ stdenv.mkDerivation (finalAttrs: {
pkg-config
qt6.wrapQtAppsHook
]
++ lib.optionals isDarwin [
libicns
imagemagick
]
++ lib.optionals withWine [ wineWow64Packages.stable ];
buildInputs = [
finalAttrs.aruco
eigen
libxdmcp
libevdev
onnxruntime
opencv4
procps
qt6.qtbase
qt6.qttools
];
]
++ lib.optionals isLinux [
finalAttrs.aruco
libevdev
]
++ lib.optionals isDarwin [
qt6.qtmultimedia
]
# <omp.h> is available-by-default on gcc
++ lib.optionals stdenv.cc.isClang [ llvmPackages.openmp ];
cmakeFlags = [
(lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_AHRSFUSION" "${finalAttrs.fusion}")
(lib.cmakeFeature "OPENTRACK_COMMIT" "opentrack-${finalAttrs.version}")
(lib.cmakeBool "SDK_WINE" withWine)
(lib.cmakeFeature "SDK_ARUCO_LIBPATH" "${finalAttrs.aruco}/lib/libaruco.a")
(lib.cmakeFeature "SDK_XPLANE" finalAttrs.xplaneSdk.outPath)
]
++ lib.optionals isLinux [
(lib.cmakeFeature "SDK_ARUCO_LIBPATH" "${finalAttrs.aruco}/lib/libaruco.a")
];
postInstall = ''
install -Dt $out/share/icons/hicolor/256x256/apps ../gui/images/opentrack.png
'';
postInstall =
lib.optionalString isLinux ''
install -Dt $out/share/icons/hicolor/256x256/apps ../gui/images/opentrack.png
''
+ lib.optionalString isDarwin ''
mkdir -p $out/Applications
mv $out/opentrack.app $out/Applications/
chmod -R +w "$out/Applications/opentrack.app"
# use upstream Info.plist for correct permissions etc.
cp "../macosx/Info.plist" "$out/Applications/opentrack.app/Contents/"
substituteInPlace "$out/Applications/opentrack.app/Contents/Info.plist" \
--subst-var-by "OPENTRACK-VERSION" "${finalAttrs.version}"
cp "../macosx/PkgInfo" "$out/Applications/opentrack.app/Contents/"
mv "$out/Plugins" "$out/Applications/opentrack.app/Contents/MacOS/Plugins"
# create the macOS iconset
tmp="$(mktemp -d)"
files=""
for size in 16 32 64 128 256 512; do
outfile="$tmp/opentrack_''${size}x''${size}.png"
magick "../gui/images/opentrack.png" -filter triangle -resize "''${size}x''${size}" "$outfile"
files="$files $outfile"
done
png2icns "$out/Applications/opentrack.app/Contents/Resources/opentrack.icns" $files
rm -rf "$tmp"
'';
# manually wrap just the main binary
dontWrapQtApps = true;
preFixup = ''
wrapQtApp $out/bin/opentrack \
--prefix PATH : ${lib.makeBinPath [ v4l-utils ]}
'';
qtWrapperArgs =
lib.optionals isLinux [
"--prefix PATH : ${lib.makeBinPath [ v4l-utils ]}"
]
++ lib.optionals isDarwin [
"--set DYLD_LIBRARY_PATH ${placeholder "out"}/Library"
];
preFixup =
lib.optionalString isLinux ''
wrapQtApp $out/bin/opentrack
''
+ lib.optionalString isDarwin ''
wrapQtApp $out/Applications/opentrack.app/Contents/MacOS/opentrack
'';
desktopItems = [
desktopItems = lib.optionals isLinux [
(makeDesktopItem {
name = "opentrack";
exec = "opentrack";
@@ -124,6 +181,6 @@ stdenv.mkDerivation (finalAttrs: {
lib.maintainers.nekowinston
lib.maintainers.zaninime
];
platforms = lib.platforms.linux;
platforms = lib.platforms.unix;
};
})
pkgs/by-name/op/opentrack/remove_app_bundle_script.patch
+15
View File
@@ -0,0 +1,15 @@
diff --git a/macosx/CMakeLists.txt b/macosx/CMakeLists.txt
index 8520e9e9..6428e91e 100644
--- a/macosx/CMakeLists.txt
+++ b/macosx/CMakeLists.txt
@@ -2,10 +2,4 @@ if(APPLE)
otr_escape_string(srcdir "${CMAKE_SOURCE_DIR}")
otr_escape_string(instdir "${CMAKE_INSTALL_PREFIX}")
otr_escape_string(commit "${OPENTRACK_COMMIT}")
- install(CODE "
- execute_process(COMMAND /bin/sh \"${srcdir}/macosx/make-app-bundle.sh\"
- \"${srcdir}/macosx\"
- \"${instdir}\"
- \"${commit}\")
- ")
endif()
pkgs/by-name/se/sesh/package.nix
+2 -2
View File
@@ -8,7 +8,7 @@
}:
buildGoModule (finalAttrs: {
pname = "sesh";
version = "2.26.2";
version = "2.27.0";
__structuredAttrs = true;
nativeBuildInputs = [
@@ -20,7 +20,7 @@ buildGoModule (finalAttrs: {
owner = "joshmedeski";
repo = "sesh";
tag = "v${finalAttrs.version}";
hash = "sha256-zx3PvPBV+IP61i+eJOmuC+ck9sOFsZZ9jj1fD3p4ccI=";
hash = "sha256-py4Dok8nyyxqenaY5Clhik0W8vo3dsw2EhzUZxQtA38=";
};
# NOTE: prevent crash when getting vendor deps/hash
pkgs/by-name/tu/tuicr/package.nix
+3 -3
View File
@@ -9,7 +9,7 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "tuicr";
version = "0.18.0";
version = "0.19.1";
__structuredAttrs = true;
@@ -17,10 +17,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
owner = "agavra";
repo = "tuicr";
tag = "v${finalAttrs.version}";
hash = "sha256-cMIUVBEtyS+AB9QqqRSu+Rd+9dyMzw+EmHSIzY2UmiQ=";
hash = "sha256-uLtwpieKBTbLLDmgE4LLNljvv69i0cBRvU1WEgy09Xo=";
};
cargoHash = "sha256-ErEpUo9RPOHMHlmlPH2S6jHvnVhi4DKO7EnoMToj5t0=";
cargoHash = "sha256-jEPgXXlqTgVX+GutQX8JCwtLS0J3cx7RV76NdM5m6QE=";
strictDeps = true;
pkgs/development/python-modules/layoutparser/default.nix
+5
View File
@@ -54,6 +54,11 @@ buildPythonPackage {
hash = "sha256-qBzcIUmgnGy/Xn/B+7UrLrRhCvCkapL+ymqGS2sMVgA=";
};
patches = [
# https://github.com/Layout-Parser/layout-parser/pull/230
./pandas-v3.patch
];
propagatedBuildInputs = [
numpy
opencv-python
pkgs/development/python-modules/layoutparser/pandas-v3.patch
+13
View File
@@ -0,0 +1,13 @@
diff --git a/src/layoutparser/io/basic.py b/src/layoutparser/io/basic.py
index 0b2df36..26dcccc 100644
--- a/src/layoutparser/io/basic.py
+++ b/src/layoutparser/io/basic.py
@@ -127,7 +127,7 @@ def load_dataframe(df: pd.DataFrame, block_type: str = None) -> Layout:
"""
df = df.copy()
if "points" in df.columns:
- if df["points"].dtype == object:
+ if df["points"].dtype == object or isinstance(df["points"].dtype, pd.StringDtype):
df["points"] = df["points"].map(
lambda x: ast.literal_eval(x) if not pd.isna(x) else x
)
pkgs/development/python-modules/urllib3-future/default.nix
+2 -2
View File
@@ -25,14 +25,14 @@
buildPythonPackage rec {
pname = "urllib3-future";
version = "2.22.900";
version = "2.22.901";
pyproject = true;
src = fetchFromGitHub {
owner = "jawah";
repo = "urllib3.future";
tag = version;
hash = "sha256-y31EzgiRN6X5lWlgv8MNYbMIuoTR13w9wgAT9rklx5s=";
hash = "sha256-SP6C6xF9McRbmCAfARKrFVSxKRkNZvs7fLdcR9pIEyM=";
};
postPatch = ''
pkgs/os-specific/darwin/by-name/po/PowerManagement/package.nix
+1 -1
View File
@@ -20,7 +20,7 @@ in
mkAppleDerivation {
releaseName = "PowerManagement";
xcodeHash = "sha256-06rCxqBUrYqBY7BDZ6s/vSoviUAmIbsQP1pfrvR2Gpk=";
xcodeHash = "sha256-8dASJnzc7yZ4LNbanNjWuCoJunxAz/7R1Ulj/zOrkkI=";
env.NIX_CFLAGS_COMPILE = "-I${privateHeaders}/include";
pkgs/os-specific/darwin/mk-apple-derivation/default.nix
+40 -18
View File
@@ -3,6 +3,7 @@
bootstrapStdenv,
meson,
ninja,
runCommand,
sourceRelease,
xcodeProjectCheckHook,
}:
@@ -51,25 +52,46 @@ lib.extendMkDerivation {
}
// args.meta or { };
}
// lib.optionalAttrs (args ? xcodeHash) {
postUnpack =
args.postUnpack or ""
+ lib.concatMapStrings (
file:
if baseNameOf file == "meson.build.in" then
"substitute ${lib.escapeShellArg "${file}"} \"$sourceRoot/meson.build\" --subst-var version\n"
else
"cp ${lib.escapeShellArg "${file}"} \"$sourceRoot/\"${lib.escapeShellArg (baseNameOf file)}\n"
) mesonFiles;
// lib.optionalAttrs (args ? xcodeHash) (
let
xcodeProject = args.xcodeProject or "${releaseName}.xcodeproj";
in
{
postUnpack =
args.postUnpack or ""
+ lib.concatMapStrings (
file:
if baseNameOf file == "meson.build.in" then
"substitute ${lib.escapeShellArg "${file}"} \"$sourceRoot/meson.build\" --subst-var version\n"
else
"cp ${lib.escapeShellArg "${file}"} \"$sourceRoot/\"${lib.escapeShellArg (baseNameOf file)}\n"
) mesonFiles;
xcodeProject = args.xcodeProject or "${releaseName}.xcodeproj";
inherit xcodeProject;
nativeBuildInputs = args.nativeBuildInputs or [ ] ++ [
meson
ninja
xcodeProjectCheckHook
];
nativeBuildInputs = args.nativeBuildInputs or [ ] ++ [
meson
ninja
xcodeProjectCheckHook
];
mesonBuildType = "release";
};
mesonBuildType = "release";
# build-platform check so CI catches stale xcodeHashes the Darwin-only postUnpack hook misses
passthru = lib.recursiveUpdate (args.passthru or { }) {
tests.xcodeProjectHash =
runCommand "${finalAttrs.pname}-xcodeproject-hash-check"
{
sourceRoot = "${finalAttrs.src}";
inherit xcodeProject;
inherit (args) xcodeHash;
nativeBuildInputs = [ xcodeProjectCheckHook ];
}
''
verifyXcodeProjectHash
touch "$out"
'';
};
}
);
}
pkgs/tools/package-management/nix/default.nix
+17 -1
View File
@@ -187,6 +187,22 @@ lib.makeExtensible (
nix_2_34 = addTests "nix_2_34" self.nixComponents_2_34.nix-everything;
nixComponents_2_35 =
(nixDependencies.callPackage ./modular/packages.nix rec {
version = "2.35.1";
inherit teams;
otherSplices = generateSplicesForNixComponents "nixComponents_2_35";
src = removeFunctionalTests commonDisabledTests (fetchFromGitHub {
owner = "NixOS";
repo = "nix";
tag = version;
hash = "sha256-ldhnx4+Ya3OfRT9Sh7Nzk+H+9D3CjonomPBjGSfXdJk=";
});
}).appendPatches
[ ];
nix_2_35 = addTests "nix_2_35" self.nixComponents_2_35.nix-everything;
nixComponents_git =
let
src = fetchFromGitHub {
@@ -206,7 +222,7 @@ lib.makeExtensible (
git = addTests "git" self.nixComponents_git.nix-everything;
latest = self.nix_2_34;
latest = self.nix_2_35;
# Read ./README.md before bumping a major release
stable = addFallbackPathsCheck self.nix_2_34;
pkgs/top-level/python-packages.nix
+12 -5
View File
@@ -9180,11 +9180,18 @@ self: super: with self; {
libais = callPackage ../development/python-modules/libais { };
libapparmor = toPythonModule (
pkgs.libapparmor.override {
python3Packages = self;
}
);
libapparmor = callPackage (
{
python,
pythonImportsCheckHook,
setuptools,
}@python3Packages:
toPythonModule (
pkgs.libapparmor.override {
inherit python3Packages;
}
)
) { };
libarchive-c = callPackage ../development/python-modules/libarchive-c {
inherit (pkgs) libarchive;