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]
2025-11-11 18:07:16 +00:00
committed by GitHub
parent 70cea5bab4 3d47aa5f41
commit 4743d0c170
24 changed files with 104 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/editors/vscode/extensions/default.nix
+2 -2
View File
@@ -4400,8 +4400,8 @@ let
mktplcRef = {
publisher = "streetsidesoftware";
name = "code-spell-checker";
version = "4.2.6";
hash = "sha256-veP2G/5vcaimjd98ur6Mhl4x1NKuvS21oO+HFJLHN+I=";
version = "4.3.0";
hash = "sha256-Wyy9DAHDYjMLf7bLG34yp7eNGY2k7IU10kmwhTw2vWA=";
};
meta = {
changelog = "https://marketplace.visualstudio.com/items/streetsidesoftware.code-spell-checker/changelog";
pkgs/applications/emulators/libretro/cores/gambatte.nix
+3 -3
View File
@@ -5,13 +5,13 @@
}:
mkLibretroCore {
core = "gambatte";
version = "0-unstable-2025-10-10";
version = "0-unstable-2025-11-07";
src = fetchFromGitHub {
owner = "libretro";
repo = "gambatte-libretro";
rev = "b75225203ffea8b65124bb31acb598e91e7f22d9";
hash = "sha256-q2gq4eBa1I89PROkxTt7XGIjI2H1eWFDi6lMH+emlmg=";
rev = "45ee875b71de88502f8c0a7fe497e3dc708c1fee";
hash = "sha256-E6rrPE/cu8xhM0dOY/MnWpYrqG/NKtmmbas9ieBle/8=";
};
meta = {
pkgs/by-name/li/limine/package.nix
+2 -2
View File
@@ -47,14 +47,14 @@ in
# as bootloader for various platforms and corresponding binary and helper files.
stdenv.mkDerivation (finalAttrs: {
pname = "limine";
version = "10.2.1";
version = "10.3.0";
# 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://codeberg.org/Limine/Limine/releases/download/v${finalAttrs.version}/limine-${finalAttrs.version}.tar.gz";
hash = "sha256-t9uNKbJKU9qvx9LJRCyDAeLeImDMBxl6m13VQt8E6BY=";
hash = "sha256-0LmbQ+BuzfPn2xBdcKqcBkxbR1nJrSwIkomaupmiJJk=";
};
enableParallelBuilding = true;
pkgs/by-name/ne/netbird/package.nix
+3 -3
View File
@@ -68,16 +68,16 @@ let
in
buildGoModule (finalAttrs: {
pname = "netbird-${componentName}";
version = "0.59.10";
version = "0.59.12";
src = fetchFromGitHub {
owner = "netbirdio";
repo = "netbird";
tag = "v${finalAttrs.version}";
hash = "sha256-TsDeDHLbgnKKCROn+nih9Ne0/cRQ2noLCXiyysC9uG4=";
hash = "sha256-w+zKuvbKp7d1zoEmkE0Tm34wYns9MHKFYe1BArotl+4=";
};
vendorHash = "sha256-t4uXuT6soKXxpv3Li9YhXHFMHPzbl1vPx5jcc7TR2pY=";
vendorHash = "sha256-zPXk3sjWnGBgzc9kjq9yUy6Ufg4G2armdIQ4hvm7Uf0=";
nativeBuildInputs = [ installShellFiles ] ++ lib.optional (componentName == "ui") pkg-config;
pkgs/by-name/yq/yq-go/package.nix
+1 -1
View File
@@ -22,7 +22,7 @@ buildGoModule (finalAttrs: {
vendorHash = "sha256-p+7dD3NVXg3XZowIgDaGs1MSaxXY5OPLmnw44p4m4A4=";
nativeBuildInputs = lib.optionalAttrs (stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
nativeBuildInputs = lib.optionals (stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
installShellFiles
pandoc
];
pkgs/development/haskell-modules/cabal2nix-unstable/cabal2nix.nix
+3 -3
View File
@@ -35,10 +35,10 @@
}:
mkDerivation {
pname = "cabal2nix";
version = "2.20.1-unstable-2025-10-31";
version = "2.20.1-unstable-2025-11-11";
src = fetchzip {
url = "https://github.com/NixOS/cabal2nix/archive/e89ec9afd5d6fd8a86e8514fb4406b2adf0783ab.tar.gz";
sha256 = "06mdyjy5yds5g51mby4n1jz3r32a24lnba61l0vjm707nzp31r9z";
url = "https://github.com/NixOS/cabal2nix/archive/a152152295a9fa6698583e84a2b8c7eee1446296.tar.gz";
sha256 = "1jpgzyc360g5snvc5ji6wqfvbsc7siwxvhrwafzzfg762niq0c49";
};
postUnpack = "sourceRoot+=/cabal2nix; echo source root reset to $sourceRoot";
isLibrary = true;
pkgs/development/haskell-modules/cabal2nix-unstable/distribution-nixpkgs.nix
+3 -3
View File
@@ -18,10 +18,10 @@
}:
mkDerivation {
pname = "distribution-nixpkgs";
version = "1.7.1.1-unstable-2025-10-31";
version = "1.7.1.1-unstable-2025-11-11";
src = fetchzip {
url = "https://github.com/NixOS/cabal2nix/archive/e89ec9afd5d6fd8a86e8514fb4406b2adf0783ab.tar.gz";
sha256 = "06mdyjy5yds5g51mby4n1jz3r32a24lnba61l0vjm707nzp31r9z";
url = "https://github.com/NixOS/cabal2nix/archive/a152152295a9fa6698583e84a2b8c7eee1446296.tar.gz";
sha256 = "1jpgzyc360g5snvc5ji6wqfvbsc7siwxvhrwafzzfg762niq0c49";
};
postUnpack = "sourceRoot+=/distribution-nixpkgs; echo source root reset to $sourceRoot";
enableSeparateDataOutput = true;
pkgs/development/haskell-modules/cabal2nix-unstable/hackage-db.nix
+3 -3
View File
@@ -17,10 +17,10 @@
}:
mkDerivation {
pname = "hackage-db";
version = "2.1.3-unstable-2025-10-31";
version = "2.1.3-unstable-2025-11-11";
src = fetchzip {
url = "https://github.com/NixOS/cabal2nix/archive/e89ec9afd5d6fd8a86e8514fb4406b2adf0783ab.tar.gz";
sha256 = "06mdyjy5yds5g51mby4n1jz3r32a24lnba61l0vjm707nzp31r9z";
url = "https://github.com/NixOS/cabal2nix/archive/a152152295a9fa6698583e84a2b8c7eee1446296.tar.gz";
sha256 = "1jpgzyc360g5snvc5ji6wqfvbsc7siwxvhrwafzzfg762niq0c49";
};
postUnpack = "sourceRoot+=/hackage-db; echo source root reset to $sourceRoot";
isLibrary = true;
pkgs/development/haskell-modules/cabal2nix-unstable/language-nix.nix
+3 -3
View File
@@ -13,10 +13,10 @@
}:
mkDerivation {
pname = "language-nix";
version = "2.3.0-unstable-2025-10-31";
version = "2.3.0-unstable-2025-11-11";
src = fetchzip {
url = "https://github.com/NixOS/cabal2nix/archive/e89ec9afd5d6fd8a86e8514fb4406b2adf0783ab.tar.gz";
sha256 = "06mdyjy5yds5g51mby4n1jz3r32a24lnba61l0vjm707nzp31r9z";
url = "https://github.com/NixOS/cabal2nix/archive/a152152295a9fa6698583e84a2b8c7eee1446296.tar.gz";
sha256 = "1jpgzyc360g5snvc5ji6wqfvbsc7siwxvhrwafzzfg762niq0c49";
};
postUnpack = "sourceRoot+=/language-nix; echo source root reset to $sourceRoot";
libraryHaskellDepends = [
pkgs/development/haskell-modules/configuration-common.nix
+1 -1
View File
@@ -2944,7 +2944,7 @@ with haskellLib;
substituteInPlace pdftotext.cabal --replace-quiet BSD3 BSD-3-Clause
''
+ (drv.postPatch or "");
}) (super.pdftotext.override { poppler-cpp = pkgs.poppler; });
}) super.pdftotext;
# QuickCheck <2.15
# https://github.com/google/proto-lens/issues/403
pkgs/development/haskell-modules/hackage-packages.nix
Generated
+3 -3
View File
@@ -510629,7 +510629,7 @@ self: {
hspec,
hspec-discover,
optparse-applicative,
poppler-cpp,
poppler,
range,
text,
}:
@@ -510644,7 +510644,7 @@ self: {
bytestring
text
];
libraryPkgconfigDepends = [ poppler-cpp ];
libraryPkgconfigDepends = [ poppler ];
executableHaskellDepends = [
aeson
ansi-wl-pprint
@@ -510664,7 +510664,7 @@ self: {
mainProgram = "pdftotext.hs";
maintainers = [ lib.maintainers.mpscholten ];
}
) { poppler-cpp = null; };
) { inherit (pkgs) poppler; };
pdynload = callPackage (
{
pkgs/development/python-modules/molecule/default.nix
+2 -2
View File
@@ -23,14 +23,14 @@
buildPythonPackage rec {
pname = "molecule";
version = "25.9.0";
version = "25.11.0";
pyproject = true;
disabled = pythonOlder "3.10";
src = fetchPypi {
inherit pname version;
hash = "sha256-GlbSg7H7VIhDnqyUWXHb1mt3LtQ7LGandpIsuT05+/0=";
hash = "sha256-8+W1HbBKMXtpi8vmgeHnRmwJ7dODjU1Qh9YhvZ5Etz8=";
};
nativeBuildInputs = [
pkgs/development/python-modules/rigour/default.nix
+2 -2
View File
@@ -21,14 +21,14 @@
buildPythonPackage rec {
pname = "rigour";
version = "1.4.0";
version = "1.4.1";
pyproject = true;
src = fetchFromGitHub {
owner = "opensanctions";
repo = "rigour";
tag = "v${version}";
hash = "sha256-PxlYJQN2y+mqS48Cbd3/dCubzNzMVL+Q+MR5YJmAVtI=";
hash = "sha256-714kmNVPreGsl8Kh70nD+zGzDVMZQg5vEjehPH7V5I8=";
};
build-system = [
pkgs/development/python-modules/unstructured/default.nix
+2 -2
View File
@@ -116,7 +116,7 @@
grpcio,
}:
let
version = "0.18.15";
version = "0.18.18";
in
buildPythonPackage rec {
pname = "unstructured";
@@ -127,7 +127,7 @@ buildPythonPackage rec {
owner = "Unstructured-IO";
repo = "unstructured";
tag = version;
hash = "sha256-rzspozQQ+WrS3cKAGe9O7clAIDo4P/6PdZzCXIRdNn8=";
hash = "sha256-v6g3melJAegYNJPtiDMob0VwgCu91iG0hdebmuya7Jw=";
};
build-system = [ setuptools ];
pkgs/os-specific/linux/nvidia-x11/default.nix
+26 -6
View File
@@ -72,12 +72,32 @@ rec {
stable = if stdenv.hostPlatform.system == "i686-linux" then legacy_390 else production;
production = generic {
version = "580.95.05";
sha256_64bit = "sha256-hJ7w746EK5gGss3p8RwTA9VPGpp2lGfk5dlhsv4Rgqc=";
sha256_aarch64 = "sha256-zLRCbpiik2fGDa+d80wqV3ZV1U1b4lRjzNQJsLLlICk=";
openSha256 = "sha256-RFwDGQOi9jVngVONCOB5m/IYKZIeGEle7h0+0yGnBEI=";
settingsSha256 = "sha256-F2wmUEaRrpR1Vz0TQSwVK4Fv13f3J9NJLtBe4UP2f14=";
persistencedSha256 = "sha256-QCwxXQfG/Pa7jSTBB0xD3lsIofcerAWWAHKvWjWGQtg=";
version = if stdenv.hostPlatform.system == "aarch64-linux" then "580.95.05" else "580.105.08";
sha256_64bit =
if stdenv.hostPlatform.system == "aarch64-linux" then
"sha256-hJ7w746EK5gGss3p8RwTA9VPGpp2lGfk5dlhsv4Rgqc="
else
"sha256-2cboGIZy8+t03QTPpp3VhHn6HQFiyMKMjRdiV2MpNHU=";
sha256_aarch64 =
if stdenv.hostPlatform.system == "aarch64-linux" then
"sha256-zLRCbpiik2fGDa+d80wqV3ZV1U1b4lRjzNQJsLLlICk="
else
null;
openSha256 =
if stdenv.hostPlatform.system == "aarch64-linux" then
"sha256-RFwDGQOi9jVngVONCOB5m/IYKZIeGEle7h0+0yGnBEI="
else
"sha256-FGmMt3ShQrw4q6wsk8DSvm96ie5yELoDFYinSlGZcwQ=";
settingsSha256 =
if stdenv.hostPlatform.system == "aarch64-linux" then
"sha256-F2wmUEaRrpR1Vz0TQSwVK4Fv13f3J9NJLtBe4UP2f14="
else
"sha256-YvzWO1U3am4Nt5cQ+b5IJ23yeWx5ud1HCu1U0KoojLY=";
persistencedSha256 =
if stdenv.hostPlatform.system == "aarch64-linux" then
"sha256-QCwxXQfG/Pa7jSTBB0xD3lsIofcerAWWAHKvWjWGQtg="
else
"sha256-qh8pKGxUjEimCgwH7q91IV7wdPyV5v5dc5/K/IcbruI=";
};
latest = selectHighestVersion production (generic {
pkgs/servers/sql/postgresql/13.nix
+5 -3
View File
@@ -1,7 +1,9 @@
import ./generic.nix {
version = "13.22";
rev = "refs/tags/REL_13_22";
hash = "sha256-6zHA+WU1FroUbGJcTAeEbPKBVQY7SKpT5+Kxe9ZhtoM=";
version = "13.23";
# TODO: Move back to tag, when they appear upstream:
# rev = "refs/tags/REL_13_23";
rev = "89df812eb890814b105d871185935b580478e660";
hash = "sha256-GSIHFSt2wzaI3HkA3yX/gZZF+LKwODHYislagdhQjmE=";
muslPatches = {
disable-test-collate-icu-utf8 = {
url = "https://git.alpinelinux.org/aports/plain/main/postgresql13/disable-test-collate.icu.utf8.patch?id=69faa146ec9fff3b981511068f17f9e629d4688b";
pkgs/servers/sql/postgresql/14.nix
+5 -3
View File
@@ -1,7 +1,9 @@
import ./generic.nix {
version = "14.19";
rev = "refs/tags/REL_14_19";
hash = "sha256-z8MEeLae4W4YqGBNcPtKnUENxnixugnv5Q6r+LW4uu8=";
version = "14.20";
# TODO: Move back to tag, when they appear upstream:
# rev = "refs/tags/REL_14_20";
rev = "9ad034be354da9af1cea76836a9e576c110d1ff3";
hash = "sha256-5wWuS78yn1p+ZjlUy5jCf1mLq78D3iI7mWPBVTd1Ufk=";
muslPatches = {
disable-test-collate-icu-utf8 = {
url = "https://git.alpinelinux.org/aports/plain/main/postgresql14/disable-test-collate.icu.utf8.patch?id=56999e6d0265ceff5c5239f85fdd33e146f06cb7";
pkgs/servers/sql/postgresql/15.nix
+5 -3
View File
@@ -1,7 +1,9 @@
import ./generic.nix {
version = "15.14";
rev = "refs/tags/REL_15_14";
hash = "sha256-KzN0gsEY6wFLqNYMxbTj2NH+4IWO0pplWP4XO/fqRLM=";
version = "15.15";
# TODO: Move back to tag, when they appear upstream:
# rev = "refs/tags/REL_15_15";
rev = "32f38816779420502d4a311835d5fe939e9548a0";
hash = "sha256-veGKXAvK+dNofBuSXsmCsPdXDJOC04+QV3HEr0XaE68=";
muslPatches = {
dont-use-locale-a = {
url = "https://git.alpinelinux.org/aports/plain/main/postgresql15/dont-use-locale-a-on-musl.patch?id=f424e934e6d076c4ae065ce45e734aa283eecb9c";
pkgs/servers/sql/postgresql/16.nix
+5 -3
View File
@@ -1,7 +1,9 @@
import ./generic.nix {
version = "16.10";
rev = "refs/tags/REL_16_10";
hash = "sha256-1zG8+G/lNA1xm0hxLVEilIaI+25d4gfpqA2aCb4+taY=";
version = "16.11";
# TODO: Move back to tag, when they appear upstream:
# rev = "refs/tags/REL_16_11";
rev = "d61dd817be70749d14e982a369e97fdda9d5cba6";
hash = "sha256-hxv+N+OWqiXmFmsB+SSYGKQLBbHtNMnneHFvOtUz8z4=";
muslPatches = {
dont-use-locale-a = {
url = "https://git.alpinelinux.org/aports/plain/main/postgresql16/dont-use-locale-a-on-musl.patch?id=08a24be262339fd093e641860680944c3590238e";
pkgs/servers/sql/postgresql/17.nix
+5 -3
View File
@@ -1,7 +1,9 @@
import ./generic.nix {
version = "17.6";
rev = "refs/tags/REL_17_6";
hash = "sha256-/7C+bjmiJ0/CvoAc8vzTC50vP7OsrM6o0w+lmmHvKvU=";
version = "17.7";
# TODO: Move back to tag, when they appear upstream:
# rev = "refs/tags/REL_17_7";
rev = "fbb530a3dff569222bea7098ad4de3d8bde97740";
hash = "sha256-W+505LAeiO5ln7wBhxZLv/p3GxiJp8MFfCGVDyvHREg=";
muslPatches = {
dont-use-locale-a = {
url = "https://git.alpinelinux.org/aports/plain/main/postgresql17/dont-use-locale-a-on-musl.patch?id=d69ead2c87230118ae7f72cef7d761e761e1f37e";
pkgs/servers/sql/postgresql/18.nix
+5 -3
View File
@@ -1,7 +1,9 @@
import ./generic.nix {
version = "18.0";
rev = "refs/tags/REL_18_0";
hash = "sha256-xA6gbJe4tIV9bYRFrdI4Rfy20ZwTkvyyjt7ZxvCFEec=";
version = "18.1";
# TODO: Move back to tag, when they appear upstream:
# rev = "refs/tags/REL_18_1";
rev = "4b324845ba5d24682b9b3708a769f00d160afbd7";
hash = "sha256-cZA2hWtr5RwsUrRWkvl/yvUzFPSfdtpyAKGXfrVUr0g=";
muslPatches = {
dont-use-locale-a = {
url = "https://git.alpinelinux.org/aports/plain/main/postgresql17/dont-use-locale-a-on-musl.patch?id=d69ead2c87230118ae7f72cef7d761e761e1f37e";
pkgs/servers/sql/postgresql/generic.nix
+3 -8
View File
@@ -163,11 +163,12 @@ let
dlSuffix = if olderThan "16" then ".so" else stdenv.hostPlatform.extensions.sharedLibrary;
# Pin LLVM 20 until upstream has resolved:
# Pin LLVM 20 until upstream has fully resolved:
# https://www.postgresql.org/message-id/flat/d25e6e4a-d1b4-84d3-2f8a-6c45b975f53d%40applied-asynchrony.com
# Currently still a problem on aarch64.
# TODO: Remove with next minor releases
llvmPackages = lib.warnIf (
version == "17.7"
version == "17.8"
) "PostgreSQL: Is the pin for LLVM 20 still needed?" llvmPackages_20;
stdenv' =
@@ -425,12 +426,6 @@ let
]
++ lib.optionals (stdenv'.hostPlatform.isDarwin && olderThan "16") [
./patches/export-dynamic-darwin-15-.patch
]
++ lib.optionals (atLeast "17") [
(fetchpatch2 {
url = "https://github.com/postgres/postgres/commit/a48d1ef58652229521ba4b5070e19f857608b22e.patch";
hash = "sha256-3FKQS1Vpu+p6z6c1GWs6GlrLl2Bgm9paEU/z81LrEus=";
})
];
installTargets = [ "install-world" ];
pkgs/servers/sql/postgresql/libpq.nix
+5 -3
View File
@@ -40,14 +40,16 @@
stdenv.mkDerivation (finalAttrs: {
pname = "libpq";
version = "18.0";
version = "18.1";
src = fetchFromGitHub {
owner = "postgres";
repo = "postgres";
# rev, not tag, on purpose: see generic.nix.
rev = "refs/tags/REL_18_0";
hash = "sha256-xA6gbJe4tIV9bYRFrdI4Rfy20ZwTkvyyjt7ZxvCFEec=";
# TODO: Move back to tag, when they appear upstream:
# rev = "refs/tags/REL_18_1";
rev = "4b324845ba5d24682b9b3708a769f00d160afbd7";
hash = "sha256-cZA2hWtr5RwsUrRWkvl/yvUzFPSfdtpyAKGXfrVUr0g=";
};
__structuredAttrs = true;
pkgs/tools/typesetting/tex/texlive/build-tex-env.nix
+7 -3
View File
@@ -45,13 +45,17 @@ lib.fix (
### buildEnv with custom attributes
buildEnv' =
args:
(
buildEnv { inherit (args) name paths; }
(buildEnv (
{
inherit (args) name paths;
}
// lib.optionalAttrs (args ? extraOutputsToInstall) { inherit (args) extraOutputsToInstall; }
).overrideAttrs
// lib.optionalAttrs (args ? pathsToLink) { inherit (args) pathsToLink; }
)).overrideAttrs
(
removeAttrs args [
"extraOutputsToInstall"
"pathsToLink"
"name"
"paths"
"pkgs"