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-03-17 06:05:43 +00:00
committed by GitHub
parent b2de0856a2 e6b13b247a
commit 48ebff75fb
16 changed files with 300 additions and 293 deletions
Download Patch File Download Diff File Expand all files Collapse all files
maintainers/maintainer-list.nix
+1 -1
View File
@@ -5322,7 +5322,7 @@
};
danth = {
name = "Daniel Thwaites";
email = "danthwaites30@btinternet.com";
email = "danth@danth.me";
matrix = "@danth:danth.me";
github = "danth";
githubId = 28959268;
pkgs/applications/video/vdr/markad/default.nix
+2 -2
View File
@@ -7,12 +7,12 @@
}:
stdenv.mkDerivation rec {
pname = "vdr-markad";
version = "4.2.8";
version = "4.2.10";
src = fetchFromGitHub {
repo = "vdr-plugin-markad";
owner = "kfb77";
hash = "sha256-yv44hC1p56jRg3DRaeFWjnUHeooHhnZVXJPhVNy1mwQ=";
hash = "sha256-qnE/0gnuY982qYz3ouUKFPURNkxM0XKWqf3w5ZwczV0=";
rev = "V${version}";
};
pkgs/applications/video/vdr/streamdev/default.nix
+2 -2
View File
@@ -6,13 +6,13 @@
}:
stdenv.mkDerivation rec {
pname = "vdr-streamdev";
version = "0.6.3";
version = "0.6.4";
src = fetchFromGitHub {
owner = "vdr-projects";
repo = "vdr-plugin-streamdev";
rev = version;
sha256 = "sha256-12sASyFAnSuP2xQzr1KL/Am52ez6hiOUH/0zFH2bxhc=";
sha256 = "sha256-fFnRDe3n/ltanRvLhrQDB6aV0UmyuEJgNUip0gKBrBA=";
};
# configure don't accept argument --prefix
pkgs/by-name/ev/evcc/package.nix
+3 -3
View File
@@ -17,13 +17,13 @@
}:
let
version = "0.200.9";
version = "0.201.0";
src = fetchFromGitHub {
owner = "evcc-io";
repo = "evcc";
tag = version;
hash = "sha256-HIqehST3H4shxEdDyGYLkUXZVbHjHfdzyZ0vCGslozU=";
hash = "sha256-Hw2TIMcKkeSUEKtTwJezCRMUvicrZUjT9UmTvDgKy2s=";
};
vendorHash = "sha256-zWHysXjBNAAZfrVGzn39pdDqQrLUc1uYVLO/U7q0g04=";
@@ -52,7 +52,7 @@ buildGo124Module rec {
npmDeps = fetchNpmDeps {
inherit src;
hash = "sha256-VYAJO2HeswhBlCVKi08frkvhKc/AFepmrSGY4JccBZE=";
hash = "sha256-IOpT7YH85iHCK9UqKoomdKQBsPFm4MJ0bbEFbIIxVTc=";
};
nativeBuildInputs = [
pkgs/by-name/he/hexxy/package.nix
+3 -3
View File
@@ -6,13 +6,13 @@
}:
buildGoModule {
pname = "hexxy";
version = "0-unstable-2024-09-29";
version = "0-unstable-2025-03-16";
src = fetchFromGitHub {
owner = "sweetbbak";
repo = "hexxy";
# upstream does not publish releases, i.e., there are no tags
rev = "36174e436f9d57421b9e9515db32ca1425c382bd";
hash = "sha256-5r8yaKlRkIcZXubHBMhdGV0u52rs2WnEaWatm+D56Fs=";
rev = "d90f345ba80078b18baf006b3a5aec92d2c330e1";
hash = "sha256-htTGdcJ3oMgfsJ3FH1aRnI2vxMNpBcLksABA75EQUFo=";
};
vendorHash = "sha256-qkBpSVLWZPRgS9bqOVUWHpyj8z/nheQJON3vJOwPUj4=";
pkgs/by-name/oi/oils-for-unix/package.nix
+2 -2
View File
@@ -18,11 +18,11 @@ let
in
stdenv.mkDerivation rec {
pname = "oils-for-unix";
version = "0.27.0";
version = "0.28.0";
src = fetchurl {
url = "https://oils.pub/download/oils-for-unix-${version}.tar.gz";
hash = "sha256-q1ORYt/8FpT9WuicAOQFzF97c2YBWexbJpvt6mMd8X0=";
hash = "sha256-Jm0UsW2Q1KB/53SIHq+g7Nu8hBHPHHX4tuJWNwtmjjU=";
};
postPatch = ''
pkgs/by-name/pi/pinact/package.nix
+3 -3
View File
@@ -8,19 +8,19 @@
let
pname = "pinact";
version = "1.2.1";
version = "1.2.2";
src = fetchFromGitHub {
owner = "suzuki-shunsuke";
repo = "pinact";
tag = "v${version}";
hash = "sha256-WBKe398W9NXwZwiK6P5SDay45bFGkOf1+cmGlS+fWRc=";
hash = "sha256-p2kixWkJgQYanbsShMtDWoY6AT0WrTVLI+Borzm8XLA=";
};
mainProgram = "pinact";
in
buildGoModule {
inherit pname version src;
vendorHash = "sha256-Ix7C+Xs8Y4LoI06Xb5qVGwoJ+J87wTjYjmQp6aAeFhw=";
vendorHash = "sha256-EPQGozC2E+Q+12YBr2xXSzkI/X6bF6NX2kZ8UPh0BXs=";
env.CGO_ENABLED = 0;
pkgs/by-name/su/supabase-cli/package.nix
+3 -3
View File
@@ -10,16 +10,16 @@
buildGoModule rec {
pname = "supabase-cli";
version = "2.17.0";
version = "2.20.1";
src = fetchFromGitHub {
owner = "supabase";
repo = "cli";
rev = "v${version}";
hash = "sha256-NkXtpymrEBw5fMaRo1fvcoePuOw0sAROLL5NJsrHELE=";
hash = "sha256-AfRO1dFXy5uvMJR09OWc+TfK6PUQi+fC1ZC5FATKmoU=";
};
vendorHash = "sha256-2r1dYUOEA7uj7ZyShz6cgL8Vc6TFKfPp4863i+7x7Ik=";
vendorHash = "sha256-3n2j8zGWudnYLOWn8p/vc4sD/WB7rQxNzZU6CY4Ybik=";
ldflags = [
"-s"
pkgs/development/compilers/arocc/default.nix
+5 -5
View File
@@ -2,18 +2,18 @@
lib,
fetchFromGitHub,
callPackage,
zig_0_13,
zig_0_14,
}:
let
versions = [
{
zig = zig_0_13;
version = "0-unstable-06-01";
zig = zig_0_14;
version = "0-unstable-2025-03-05";
src = fetchFromGitHub {
owner = "Vexu";
repo = "arocc";
rev = "55cb6d1b682b83f75ad4f60e34c6fcd2336e8531";
hash = "sha256-xs3zNQIC5drrQYT4nxL7Q69xSEdbdMv5+3hQpsX3q5A=";
rev = "8c6bab43ba351fc045a1d262d8a8da4a11215e37";
hash = "sha256-J5Cj9UMwAMwH2JGby13FIKl5Qbj4N4XpSSY7zL21aoY=";
};
}
];
pkgs/development/compilers/llvm/common/default.nix
+2 -226
View File
@@ -27,6 +27,7 @@
officialRelease ? null,
monorepoSrc ? null,
version ? null,
patchesFn ? lib.id,
# Allows passthrough to packages via newScope. This makes it possible to
# do `(llvmPackages.override { <someLlvmDependency> = bar; }).clang` and get
# an llvmPackages whose packages are overridden in an internally consistent way.
@@ -80,232 +81,7 @@ let
name = builtins.baseNameOf p;
path =
let
patches = {
"clang/gnu-install-dirs.patch" = [
{
before = "14";
path = ../12;
}
{
after = "19";
path = ../19;
}
];
"clang/purity.patch" = [
{
after = "18";
path = ../18;
}
{
before = "17";
after = "15";
path = ../15;
}
{
before = "16";
path = ../12;
}
];
"clang/aarch64-tblgen.patch" = [
{
after = "17";
before = "18";
path = ../17;
}
];
"lld/add-table-base.patch" = [
{
after = "16";
path = ../16;
}
];
"lld/gnu-install-dirs.patch" = [
{
after = "18";
path = ../18;
}
{
before = "14";
path = ../12;
}
];
"llvm/gnu-install-dirs.patch" = [
{
after = "20";
path = ../20;
}
{
after = "18";
before = "20";
path = ../18;
}
];
"llvm/gnu-install-dirs-polly.patch" = [
{
after = "20";
path = ../20;
}
{
before = "20";
after = "18";
path = ../18;
}
{
before = "18";
after = "14";
path = ../14;
}
];
"llvm/llvm-lit-cfg-add-libs-to-dylib-path.patch" = [
{
before = "17";
after = "15";
path = ../15;
}
{
after = "17";
path = ../17;
}
];
"llvm/lit-shell-script-runner-set-dyld-library-path.patch" = [
{
after = "18";
path = ../18;
}
{
after = "16";
before = "18";
path = ../16;
}
];
"llvm/polly-lit-cfg-add-libs-to-dylib-path.patch" = [
{
after = "15";
path = ../15;
}
];
"libunwind/gnu-install-dirs.patch" = [
{
before = "17";
after = "15";
path = ../15;
}
];
"compiler-rt/X86-support-extension.patch" = [
{
after = "15";
path = ../15;
}
{
before = "15";
path = ../12;
}
];
"compiler-rt/armv6-scudo-libatomic.patch" = [
{
after = "19";
path = ../19;
}
{
after = "15";
before = "19";
path = ../15;
}
{
before = "15";
path = ../14;
}
];
"compiler-rt/armv7l.patch" = [
{
before = "15";
after = "13";
path = ../13;
}
];
"compiler-rt/gnu-install-dirs.patch" = [
{
before = "14";
path = ../12;
}
{
after = "13";
before = "15";
path = ../14;
}
{
after = "15";
before = "17";
path = ../15;
}
{
after = "16";
path = ../17;
}
];
"compiler-rt/darwin-targetconditionals.patch" = [
{
after = "13";
path = ../13;
}
];
"compiler-rt/codesign.patch" = [
{
after = "13";
path = ../13;
}
];
"compiler-rt/normalize-var.patch" = [
{
after = "16";
path = ../16;
}
{
before = "16";
path = ../12;
}
];
"lldb/procfs.patch" = [
{
after = "15";
path = ../15;
}
{
before = "15";
path = ../12;
}
];
"lldb/resource-dir.patch" = [
{
before = "16";
path = ../12;
}
];
"openmp/fix-find-tool.patch" = [
{
after = "17";
before = "19";
path = ../17;
}
];
"openmp/run-lit-directly.patch" = [
{
after = "16";
path = ../16;
}
{
after = "14";
before = "16";
path = ../14;
}
];
"libclc/use-default-paths.patch" = [
{
after = "19";
path = ../19;
}
];
};
patches = args.patchesFn (import ./patches.nix);
constraints = patches."${p}" or null;
matchConstraint =
pkgs/development/compilers/llvm/common/patches.nix
+226
View File
@@ -0,0 +1,226 @@
{
"clang/gnu-install-dirs.patch" = [
{
before = "14";
path = ../12;
}
{
after = "19";
path = ../19;
}
];
"clang/purity.patch" = [
{
after = "18";
path = ../18;
}
{
before = "17";
after = "15";
path = ../15;
}
{
before = "16";
path = ../12;
}
];
"clang/aarch64-tblgen.patch" = [
{
after = "17";
before = "18";
path = ../17;
}
];
"lld/add-table-base.patch" = [
{
after = "16";
path = ../16;
}
];
"lld/gnu-install-dirs.patch" = [
{
after = "18";
path = ../18;
}
{
before = "14";
path = ../12;
}
];
"llvm/gnu-install-dirs.patch" = [
{
after = "20";
path = ../20;
}
{
after = "18";
before = "20";
path = ../18;
}
];
"llvm/gnu-install-dirs-polly.patch" = [
{
after = "20";
path = ../20;
}
{
before = "20";
after = "18";
path = ../18;
}
{
before = "18";
after = "14";
path = ../14;
}
];
"llvm/llvm-lit-cfg-add-libs-to-dylib-path.patch" = [
{
before = "17";
after = "15";
path = ../15;
}
{
after = "17";
path = ../17;
}
];
"llvm/lit-shell-script-runner-set-dyld-library-path.patch" = [
{
after = "18";
path = ../18;
}
{
after = "16";
before = "18";
path = ../16;
}
];
"llvm/polly-lit-cfg-add-libs-to-dylib-path.patch" = [
{
after = "15";
path = ../15;
}
];
"libunwind/gnu-install-dirs.patch" = [
{
before = "17";
after = "15";
path = ../15;
}
];
"compiler-rt/X86-support-extension.patch" = [
{
after = "15";
path = ../15;
}
{
before = "15";
path = ../12;
}
];
"compiler-rt/armv6-scudo-libatomic.patch" = [
{
after = "19";
path = ../19;
}
{
after = "15";
before = "19";
path = ../15;
}
{
before = "15";
path = ../14;
}
];
"compiler-rt/armv7l.patch" = [
{
before = "15";
after = "13";
path = ../13;
}
];
"compiler-rt/gnu-install-dirs.patch" = [
{
before = "14";
path = ../12;
}
{
after = "13";
before = "15";
path = ../14;
}
{
after = "15";
before = "17";
path = ../15;
}
{
after = "16";
path = ../17;
}
];
"compiler-rt/darwin-targetconditionals.patch" = [
{
after = "13";
path = ../13;
}
];
"compiler-rt/codesign.patch" = [
{
after = "13";
path = ../13;
}
];
"compiler-rt/normalize-var.patch" = [
{
after = "16";
path = ../16;
}
{
before = "16";
path = ../12;
}
];
"lldb/procfs.patch" = [
{
after = "15";
path = ../15;
}
{
before = "15";
path = ../12;
}
];
"lldb/resource-dir.patch" = [
{
before = "16";
path = ../12;
}
];
"openmp/fix-find-tool.patch" = [
{
after = "17";
before = "19";
path = ../17;
}
];
"openmp/run-lit-directly.patch" = [
{
after = "16";
path = ../16;
}
{
after = "14";
before = "16";
path = ../14;
}
];
"libclc/use-default-paths.patch" = [
{
after = "19";
path = ../19;
}
];
}
pkgs/development/compilers/llvm/default.nix
+2
View File
@@ -14,6 +14,7 @@
bootBintoolsNoLibc ? if stdenv.targetPlatform.linker == "lld" then null else pkgs.bintoolsNoLibc,
bootBintools ? if stdenv.targetPlatform.linker == "lld" then null else pkgs.bintools,
llvmVersions ? { },
patchesFn ? lib.id,
# Allows passthrough to packages via newScope in ./common/default.nix.
# This makes it possible to do
# `(llvmPackages.override { <someLlvmDependency> = bar; }).clang` and get
@@ -74,6 +75,7 @@ let
gitRelease
monorepoSrc
version
patchesFn
;
}
// packageSetArgs # Allow overrides.
pkgs/development/interpreters/lua-5/tests/default.nix
+29 -37
View File
@@ -10,10 +10,10 @@ let
lua:
{ name, command }:
pkgs.runCommandLocal "test-${lua.name}-${name}"
({
{
nativeBuildInputs = [ lua ];
meta.platforms = lua.meta.platforms;
})
}
(
''
source ${./assert.sh}
@@ -58,9 +58,9 @@ let
";./?.lua;${lua}/share/luajit-2.1/?.lua;/usr/local/share/lua/5.1/?.lua;/usr/local/share/lua/5.1/?/init.lua;${lua}/share/lua/5.1/?.lua;${lua}/share/lua/5.1/?/init.lua;";
};
in
pkgs.recurseIntoAttrs ({
pkgs.recurseIntoAttrs {
checkInterpreterPatch =
checkInterpreterPath =
let
golden_LUA_PATH = golden_LUA_PATHS.${lib.versions.majorMinor lua.version};
in
@@ -73,14 +73,10 @@ pkgs.recurseIntoAttrs ({
'';
};
checkWrapping =
pkgs.runCommandLocal "test-${lua.name}-wrapping"
({
})
(''
grep -- 'LUA_PATH=' ${wrappedHello}/bin/hello
touch $out
'');
checkWrapping = pkgs.runCommandLocal "test-${lua.name}-wrapping" { } ''
grep -- 'LUA_PATH=' ${wrappedHello}/bin/hello
touch $out
'';
# checks that lua's setup-hook adds dependencies to LUA_PATH
# Prevents the following regressions
@@ -90,45 +86,41 @@ pkgs.recurseIntoAttrs ({
# stdin:1: module 'http.request' not found:
checkSetupHook =
pkgs.runCommandLocal "test-${lua.name}-setup-hook"
({
{
nativeBuildInputs = [ lua ];
buildInputs = [ lua.pkgs.http ];
meta.platforms = lua.meta.platforms;
})
(''
}
''
${lua}/bin/lua -e "require'http.request'"
touch $out
'');
'';
checkRelativeImports =
pkgs.runCommandLocal "test-${lua.name}-relative-imports"
({
})
(''
source ${./assert.sh}
checkRelativeImports = pkgs.runCommandLocal "test-${lua.name}-relative-imports" { } ''
source ${./assert.sh}
lua_vanilla_package_path="$(${lua}/bin/lua -e "print(package.path)")"
lua_with_module_package_path="$(${luaWithModule}/bin/lua -e "print(package.path)")"
lua_vanilla_package_path="$(${lua}/bin/lua -e "print(package.path)")"
lua_with_module_package_path="$(${luaWithModule}/bin/lua -e "print(package.path)")"
assertStringContains "$lua_vanilla_package_path" "./?.lua"
assertStringContains "$lua_vanilla_package_path" "./?/init.lua"
assertStringContains "$lua_vanilla_package_path" "./?.lua"
assertStringContains "$lua_vanilla_package_path" "./?/init.lua"
assertStringContains "$lua_with_module_package_path" "./?.lua"
assertStringContains "$lua_with_module_package_path" "./?/init.lua"
assertStringContains "$lua_with_module_package_path" "./?.lua"
assertStringContains "$lua_with_module_package_path" "./?/init.lua"
touch $out
'');
touch $out
'';
# Check that a lua package's propagatedBuildInputs end up in LUA_PATH
checkPropagatedBuildInputs =
pkgs.runCommandLocal "test-${lua.name}-setup-hook"
({
# lua-curl is a propagatedBuildInput of rest-nvim has
{
buildInputs = [ lua.pkgs.rest-nvim ];
})
(''
${lua}/bin/lua -e "require'cURL'"
}
# `xml2lua` is a propagatedBuildInput of rest-nvim
''
${lua}/bin/lua -e "require'xml2lua'"
touch $out
'');
'';
})
}
pkgs/development/python-modules/ical/default.nix
+6 -6
View File
@@ -17,16 +17,16 @@
buildPythonPackage rec {
pname = "ical";
version = "9.0.0";
version = "9.0.1";
pyproject = true;
disabled = pythonOlder "3.10";
disabled = pythonOlder "3.11";
src = fetchFromGitHub {
owner = "allenporter";
repo = "ical";
tag = version;
hash = "sha256-uAk+VYrcifRkUBLcXjBPwxrOlo1EKQUnPjUmR7+9cVo=";
hash = "sha256-VaFzN/Yzo0Ad1vsuZJ4P8+WWH+GtPJGOz3PWum8rLww=";
};
build-system = [ setuptools ];
@@ -48,11 +48,11 @@ buildPythonPackage rec {
pythonImportsCheck = [ "ical" ];
meta = with lib; {
meta = {
description = "Library for handling iCalendar";
homepage = "https://github.com/allenporter/ical";
changelog = "https://github.com/allenporter/ical/releases/tag/${src.tag}";
license = licenses.asl20;
maintainers = with maintainers; [ dotlambda ];
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ dotlambda ];
};
}
pkgs/kde/plasma/kinfocenter/default.nix
+2
View File
@@ -60,6 +60,8 @@ mkKdeDerivation {
extraNativeBuildInputs = [ pkg-config ];
extraBuildInputs = [ libusb1 ];
qtWrapperArgs = [ "--inherit-argv0" ];
# fix wrong symlink of infocenter pointing to a 'systemsettings5' binary in
# the same directory, while it is actually located in a completely different
# store path
pkgs/top-level/all-packages.nix
+9
View File
@@ -5742,6 +5742,15 @@ with pkgs;
};
}) else ccWrapper;
gnuStdenv =
if stdenv.cc.isGNU
then stdenv
else gccStdenv.override {
cc = gccStdenv.cc.override {
bintools = buildPackages.binutils;
};
};
gccStdenv =
if stdenv.cc.isGNU
then stdenv