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-06-25 07:14:39 +00:00
committed by GitHub
parent 02e9cd1abd 78002cb6bb
commit f0832b3de0
14 changed files with 70 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ci/treefmt.nix
-2
View File
@@ -118,8 +118,6 @@
"--ignore=sema-unused-def-lambda-witharg-arg"
"--ignore=sema-unused-def-lambda-witharg-formal"
"--ignore=sema-unused-def-let"
# Keep this rule, because we have `lib.or`.
"--ignore=or-identifier"
# TODO: remove after outstanding prelude diagnostics issues are fixed:
# https://github.com/nix-community/nixd/issues/761
# https://github.com/nix-community/nixd/issues/762
doc/release-notes/rl-2611.section.md
+2
View File
@@ -62,6 +62,8 @@
- `rebuilderd` has been updated to 0.27.0 introducing breaking changes. See upstream changelog for details: [0.26.0](https://github.com/kpcyrd/rebuilderd/releases/tag/v0.26.0), [0.27.0](https://github.com/kpcyrd/rebuilderd/releases/tag/v0.27.0)
- Starting with v14, `flameshot` will primarily utilise xdg-desktop-portal calls for screenshotting. This will directly affect users on X11 window managers due to the lack of a compatible portal with Screenshot feature. See [upstream changelog](https://github.com/flameshot-org/flameshot/releases/tag/v14.0.0) or [NixOS Flameshot](https://wiki.nixos.org/wiki/Flameshot) wiki page for workarounds.
## Other Notable Changes {#sec-nixpkgs-release-26.11-notable-changes}
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
pkgs/applications/editors/vscode/extensions/elijah-potter.harper/default.nix
+1 -2
View File
@@ -1,5 +1,4 @@
{
stdenvNoCC,
lib,
vscode-utils,
vscode-extension-update-script,
@@ -19,7 +18,7 @@ vscode-utils.buildVscodeMarketplaceExtension {
# it does not matter which binary is fetched. Using only a single
# hash makes this easier to maintain.
arch = "linux-x64";
hash = "sha256-xCkGgDc2XfM1A2RkXC4CiMadVCuizrCqR7ZKAjh34RE=";
hash = "sha256-/brjx/yY4JLLboI6dLwF/eyX7yhRyMlohhGNFGIrm54=";
};
nativeBuildInputs = [
pkgs/applications/networking/cluster/terraform-providers/providers.json
+8 -8
View File
@@ -27,13 +27,13 @@
"vendorHash": null
},
"aiven_aiven": {
"hash": "sha256-LfchOoquLq6YwRqwWv+q4V2+0wRE1zehWddlwf3GItI=",
"hash": "sha256-+iZbQ5V8DQXBRHlt3UuSa3WKbC5A0ootY4AQ6leTHBo=",
"homepage": "https://registry.terraform.io/providers/aiven/aiven",
"owner": "aiven",
"repo": "terraform-provider-aiven",
"rev": "v4.58.0",
"rev": "v4.59.0",
"spdx": "MIT",
"vendorHash": "sha256-0ttD+LdZaIKiVMRsck4o0ibKHpAGfYMSSOanUKq89Js="
"vendorHash": "sha256-NWkgbkjaaA0dxphUWhiNqBaUKobdjsMEvD05WShZHHQ="
},
"akamai_akamai": {
"hash": "sha256-M6Btq8wX1lsEs1HUaaTwGspnvS2IyE0L2ITe+ogDTlc=",
@@ -589,11 +589,11 @@
"vendorHash": "sha256-Ub+Dvddw5jcSy2hR72OSsy4EgHphhCW1kekPyrQGc9E="
},
"hashicorp_google-beta": {
"hash": "sha256-eqbMR7U6hBZ6eue7QTPeA1YeRBxk/XerbmZ+FP4oHQM=",
"hash": "sha256-LbNsD7R+TP9trNaMZq+OTyGlQPR6EZoSdUx3uo+3xUo=",
"homepage": "https://registry.terraform.io/providers/hashicorp/google-beta",
"owner": "hashicorp",
"repo": "terraform-provider-google-beta",
"rev": "v7.36.0",
"rev": "v7.38.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-JAxI/E8GlUZd3RlhsrIhGm4+G18/obms+czJORYCENY="
},
@@ -1409,13 +1409,13 @@
"vendorHash": null
},
"ubiquiti-community_unifi": {
"hash": "sha256-6VEnhqu+q16dNUO4OR0P6x0hS9wIHahr9wI/EPW0vBg=",
"hash": "sha256-7lmT0ZCRfu3nL1FXAdxMxvQURtNcZiz9GY+0d7HI2N0=",
"homepage": "https://registry.terraform.io/providers/ubiquiti-community/unifi",
"owner": "ubiquiti-community",
"repo": "terraform-provider-unifi",
"rev": "v0.52.4",
"rev": "v0.53.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-wGcF0Bwm3zMbxa9gD44QOJV74pTmv6jprDmxBDA6vos="
"vendorHash": "sha256-XPEH1zya7e/3N/HxBPN/vZxFU5GOOXfBPTrnZEUzdpw="
},
"ucloud_ucloud": {
"hash": "sha256-k+NkB1q0oiasLc4+b+mbJ0TNUD67XR9ga9MwSbEXjKQ=",
pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix
+1
View File
@@ -20,6 +20,7 @@ let
unwrapped = libsForQt5.callPackage ../telegram-desktop/unwrapped.nix {
inherit stdenv;
kcoreaddons = null;
qtshadertools = null;
};
};
version = "1.4.9";
pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/unwrapped.nix
+2
View File
@@ -8,6 +8,7 @@
ninja,
clang,
python3,
qtshadertools,
tdlib,
tg_owt ? callPackage ./tg_owt.nix { inherit stdenv; },
qtbase,
@@ -60,6 +61,7 @@ stdenv.mkDerivation (finalAttrs: {
cmake
ninja
python3
qtshadertools
]
++ lib.optionals stdenv.hostPlatform.isLinux [
# to build bundled libdispatch
pkgs/applications/networking/mailreaders/thunderbird/packages.nix
+2 -2
View File
@@ -91,8 +91,8 @@ rec {
thunderbird-140 = common {
applicationName = "Thunderbird ESR";
version = "140.11.1esr";
sha512 = "93dfdd26e6f4c7dd2f7dcc2e4994980d017868341c60c93775721467abd9192b815f2de63928e7d10c965fc045ed72ca5b49ed6502a61e50104ee5cd00941d1e";
version = "140.12.0esr";
sha512 = "ccbcc305d5cc10aa01aa5071f40a21b42de0300d9ad6763c4fc4ad71bf797566f2380c8fd84d46952e7c4eae0a35905173e6906b108192833660eae2ceea7b51";
updateScript = callPackage ./update.nix {
attrPath = "thunderbirdPackages.thunderbird-140";
pkgs/by-name/fl/flameshot/load-missing-deps.patch
+28 -28
View File
@@ -1,46 +1,46 @@
--- a/CMakeLists.txt 2025-08-21 13:12:55
+++ b/CMakeLists.txt 2025-08-21 13:16:26
@@ -24,28 +24,8 @@
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -35,27 +35,7 @@
#Needed due to linker error with QtColorWidget
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
+find_package(QtColorWidgets REQUIRED)
-
-# Dependency can be fetched via flatpak builder
-if(EXISTS "${CMAKE_SOURCE_DIR}/external/Qt-Color-Widgets/CMakeLists.txt")
- add_subdirectory("${CMAKE_SOURCE_DIR}/external/Qt-Color-Widgets" EXCLUDE_FROM_ALL)
- add_subdirectory("${CMAKE_SOURCE_DIR}/external/Qt-Color-Widgets" EXCLUDE_FROM_ALL)
-else()
- FetchContent_Declare(
- qtColorWidgets
- GIT_REPOSITORY https://gitlab.com/mattbas/Qt-Color-Widgets.git
- GIT_TAG 352bc8f99bf2174d5724ee70623427aa31ddc26a
- )
- FetchContent_Declare(
- qtColorWidgets
- GIT_REPOSITORY https://gitlab.com/mattbas/Qt-Color-Widgets.git
- GIT_TAG 5d52e907e50dc88cf969b41cea44665ff6c475b1
- )
- #Workaround for duplicate GUID in windows WIX installer
- if (WIN32)
- FetchContent_GetProperties(qtColorWidgets)
- if(NOT qtcolorwidgets_POPULATED)
- FetchContent_Populate(qtColorWidgets)
- add_subdirectory(${qtcolorwidgets_SOURCE_DIR} ${qtcolorwidgets_BINARY_DIR} EXCLUDE_FROM_ALL)
- endif()
- if(WIN32)
- FetchContent_GetProperties(qtColorWidgets)
- if(NOT qtcolorwidgets_POPULATED)
- FetchContent_Populate(qtColorWidgets)
- add_subdirectory(${qtcolorwidgets_SOURCE_DIR} ${qtcolorwidgets_BINARY_DIR} EXCLUDE_FROM_ALL)
- endif()
- else()
- FetchContent_MakeAvailable(qtColorWidgets)
- FetchContent_MakeAvailable(qtColorWidgets)
- endif()
-endif()
-
+find_package(QtColorWidgets REQUIRED)
# This can be read from ${PROJECT_NAME} after project() is called
if (APPLE)
set(CMAKE_OSX_DEPLOYMENT_TARGET "10.15" CACHE STRING "Minimum OS X deployment version")
@@ -133,12 +113,7 @@
if(APPLE)
@@ -124,12 +104,7 @@
# ToDo: Check if this is used anywhere
option(BUILD_STATIC_LIBS ON)
if (APPLE)
if(WIN32 OR APPLE)
- FetchContent_Declare(
- qHotKey
- GIT_REPOSITORY https://github.com/flameshot-org/QHotkey
- GIT_TAG master
- qHotKey
- GIT_REPOSITORY https://github.com/flameshot-org/QHotkey
- GIT_TAG master
- )
- FetchContent_MakeAvailable(QHotKey)
+ find_package(QHotKey REQUIRED)
endif()
add_subdirectory(src)
pkgs/by-name/fl/flameshot/package.nix
+2 -2
View File
@@ -19,13 +19,13 @@ assert stdenv.hostPlatform.isDarwin -> (!enableWlrSupport);
stdenv.mkDerivation (finalAttrs: {
pname = "flameshot";
version = "13.3.0";
version = "14.0.0";
src = fetchFromGitHub {
owner = "flameshot-org";
repo = "flameshot";
tag = "v${finalAttrs.version}";
hash = "sha256-RyoLniRmJRinLUwgmaA4RprYAVHnoPxCP9LyhHfUPe0=";
hash = "sha256-GnJ3nOJyyqQbCTMrTYhnQfEOXqCy0x3IapX/PsaZ3VI=";
};
cmakeFlags = [
pkgs/by-name/ha/harper/package.nix
+3 -3
View File
@@ -9,16 +9,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "harper";
version = "2.5.0";
version = "2.6.0";
src = fetchFromGitHub {
owner = "Automattic";
repo = "harper";
rev = "v${finalAttrs.version}";
hash = "sha256-D92Ung7nYFVUKH7SiLKf8fsoLGZkl+zVZV2/DGoWfnI=";
hash = "sha256-jNBtpW7rhuapVES6Dj1ue9PIJOit/Gh5RflNZL32gTw=";
};
cargoHash = "sha256-a1ATDCCZcXn9B1Ryx2oufFSvzECdH3+mXpojvW4/8nw=";
cargoHash = "sha256-xJmUyyU4Okvlh7m7tDJmfoOTXUglSltt4raPAf8O3/A=";
cargoBuildFlags = [
"--package=harper-cli"
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.30";
version = "0.3.31";
src = fetchFromGitHub {
owner = "better-slop";
repo = "hyprwhspr-rs";
tag = "v${finalAttrs.version}";
hash = "sha256-cOjxjfiJyTUr7NgHS2BRI8WQ5EaYV0Ku5oyLuhWlKwY=";
hash = "sha256-kQfv1J+eeYQyzoTf/Xnk5r5mUsTKqzZwBLGcWAoZIPY=";
};
cargoHash = "sha256-5vviwzVJDONle7baSulxkmRYOlN6NEslgN1TfyiKR2o=";
cargoHash = "sha256-gYeT48apcZtRfX5gZE1nNL0/62PMsiRNxtjb9JpreS4=";
nativeBuildInputs = [
pkg-config
pkgs/by-name/oc/oci-cli/package.nix
+2 -2
View File
@@ -31,14 +31,14 @@ in
py.pkgs.buildPythonApplication (finalAttrs: {
pname = "oci-cli";
version = "3.86.0";
version = "3.88.0";
pyproject = true;
src = fetchFromGitHub {
owner = "oracle";
repo = "oci-cli";
tag = "v${finalAttrs.version}";
hash = "sha256-bdHhM7ah1dnQYOK8TXheSqSbFZn3WgMfsfQtAT24wBM=";
hash = "sha256-Jjh6YNIOkHA1XaejIFl9JU9ktAr58aMGt4Zu4ZVaXFQ=";
};
nativeBuildInputs = [ installShellFiles ];
pkgs/development/python-modules/pylru/default.nix
+14 -6
View File
@@ -2,29 +2,37 @@
lib,
buildPythonPackage,
fetchFromGitHub,
setuptools,
}:
buildPythonPackage rec {
pname = "pylru";
version = "1.2.1";
format = "setuptools";
version = "1.3.1";
pyproject = true;
src = fetchFromGitHub {
owner = "jlhutch";
repo = "pylru";
rev = "v${version}";
hash = "sha256-dTYiD+/zt0ZSP+sefYyeD87To1nRXyoFodlBg8pm1YE=";
hash = "sha256-3qycUYmnLGiuNsrBOCL/QiRkrPVikaRqVBmQFURDGKs=";
};
# Check with the next release if tests are ready
doCheck = false;
build-system = [ setuptools ];
checkPhase = ''
runHook preCheck
python test.py
runHook postCheck
'';
pythonImportsCheck = [ "pylru" ];
meta = {
description = "Least recently used (LRU) cache implementation";
homepage = "https://github.com/jlhutch/pylru";
license = lib.licenses.gpl2Only;
license = lib.licenses.mit;
maintainers = [ ];
};
}
pkgs/development/python-modules/spotipyfree/default.nix
+2 -2
View File
@@ -9,13 +9,13 @@
buildPythonPackage (finalAttrs: {
pname = "spotipyfree";
version = "1.9.12";
version = "1.9.13";
pyproject = true;
# no tags on GitHub
src = fetchPypi {
inherit (finalAttrs) pname version;
hash = "sha256-66SITvhrKd1dJucd626Qy9jW9qZYgH/PWYyto3F4Big=";
hash = "sha256-jbeZNoB1Sep73ccJaggFZb2AGq5OSZf6f/OzWwFB+pA=";
};
build-system = [ setuptools ];