nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-09-29 19:30:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
nixpkgs-ci[bot]
2026-09-27 06:16:12 +00:00
committed by GitHub
parent 2c07ff3592 70eef449a3
commit 1036995706
12 changed files with 156 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/networking/cluster/terraform-providers/providers.json
View File

@@ -851,11 +851,11 @@
"vendorHash": "sha256-BFhxDYfbHNY4omovikg01UDqt2oxCtg9Q85DPuHSUeE="
},
"launchdarkly_launchdarkly": {
"hash": "sha256-DVpsm3adZEwWzgvIFu8pXUGVTch18oW4UdXPQ8XZZb0=",
"hash": "sha256-4n7QRhQd/9juZ+qdO3G9Qs+uwokmia82/xJ254A+9q0=",
"homepage": "https://registry.terraform.io/providers/launchdarkly/launchdarkly",
"owner": "launchdarkly",
"repo": "terraform-provider-launchdarkly",
"rev": "v3.1.5",
"rev": "v3.1.6",
"spdx": "MPL-2.0",
"vendorHash": "sha256-d8RQfuLRNGTUzA2Ygy3QEis5j5Ape5kmcnZSs77c84M="
},

63
pkgs/by-name/bi/bitbake-setup/package.nix Normal file
View File

@@ -0,0 +1,63 @@
{
lib,
python3Packages,
fetchPypi,
git,
nix-update-script,
versionCheckHook,
}:
python3Packages.buildPythonApplication (finalAttrs: {
pname = "bitbake-setup";
version = "2.19.0";
format = "wheel";
__structuredAttrs = true;
src = fetchPypi {
pname = "bitbake_setup";
inherit (finalAttrs) version;
format = "wheel";
dist = "py3";
python = "py3";
hash = "sha256-tq53r8I02HL4mTgnIxcVf4VTYhRngYgl232/cDgLzdI=";
};
makeWrapperArgs = [
"--prefix"
"PATH"
":"
(lib.makeBinPath [ git ])
];
pythonImportsCheck = [ "bitbake_setup" ];
versionCheckProgramArg = "--version";
nativeInstallCheckInputs = [ versionCheckHook ];
doInstallCheck = true;
passthru.updateScript = nix-update-script {
extraArgs = [
"--url"
"mirror://pypi/b/bitbake_setup/"
];
};
meta = {
description = "Command that sets up a BitBake build environment from a published configuration";
homepage = "https://git.openembedded.org/bitbake/";
downloadPage = "https://pypi.org/project/bitbake-setup/";
license = with lib.licenses; [
gpl2Only
mit
psfl
zlib
lgpl21Plus
bsd3Clear
];
mainProgram = "bitbake-setup";
maintainers = with lib.maintainers; [ otavio ];
platforms = lib.platforms.linux;
};
})

4
pkgs/by-name/ca/catt/package.nix
View File

@@ -7,7 +7,7 @@
}:
python3Packages.buildPythonApplication (finalAttrs: {
pname = "catt";
version = "0.13.2";
version = "0.13.3";
pyproject = true;
__structuredAttrs = true;
@@ -15,7 +15,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
owner = "skorokithakis";
repo = "catt";
tag = "v${finalAttrs.version}";
hash = "sha256-VjwYfaBoQ7HMKG6BztAB3mmQps42MoHSAiC2jHbRS/Q=";
hash = "sha256-UiO46HNzeO2wg41Zn89bUdl34UeZZmWjekGxxsLgGwQ=";
};
build-system = [

7
pkgs/by-name/ch/chatzone-desktop/package.nix
View File

@@ -30,7 +30,7 @@ stdenvNoCC.mkDerivation {
desktopItems = [
(makeDesktopItem {
name = "chatzone";
exec = "chatzone-desktop";
exec = "chatzone-desktop %U";
icon = "chatzone-desktop";
terminal = false;
desktopName = "Chatzone";
@@ -42,7 +42,10 @@ stdenvNoCC.mkDerivation {
"Chat"
];
startupWMClass = "Chatzone";
mimeTypes = [ "x-scheme-handler/mattermost" ];
mimeTypes = [
"x-scheme-handler/mattermost"
"x-scheme-handler/chatzone"
];
})
];

6
pkgs/by-name/le/leviculum/package.nix
View File

@@ -10,7 +10,7 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "leviculum";
version = "0.8.1";
version = "0.9.0";
__structuredAttrs = true;
src = fetchFromGitea {
@@ -19,10 +19,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
repo = "leviculum";
tag = "v${finalAttrs.version}";
fetchSubmodules = false;
hash = "sha256-ehAKFOZKgGwQh7V8XC4bphDA1vAQjEZ3Hav1DtW0DfY=";
hash = "sha256-mkYhTvareotglj03jRkcIaj0SN2IBFyioDxQN3Wuu+I=";
};
cargoHash = "sha256-se+2aqR9S+470MZ1Ghny1dmIqY3MGmVHsOTFiYdFEoA=";
cargoHash = "sha256-0LuzJK7I4+WofgSDJZM5ggo5z5TAk7kPJsEjkO7QIHg=";
nativeBuildInputs = [
pkg-config

7
pkgs/by-name/md/mdctags/package.nix
View File

@@ -6,13 +6,16 @@
rustPlatform.buildRustPackage {
pname = "mdctags";
version = "unstable-2020-06-11"; # v0.1.0 does not build with our rust version
version = "0.1.0-unstable-2020-07-11"; # v0.1.0 does not build with our rust version
strictDeps = true;
__structuredAttrs = true;
src = fetchFromGitHub {
owner = "wsdjeg";
repo = "mdctags.rs";
rev = "0ed9736ea0c77e6ff5b560dda46f5ed0a983ed82";
sha256 = "14gryhgh9czlkfk75ml0620c6v8r74i6h3ykkkmc7gx2z8h1jxrb";
hash = "sha256-K3cZIPqiv8PqnNMPaCI5GW3DgDCA1nKmm/SzBB/0+ZE=";
};
cargoHash = "sha256-xg9tBBo3Al8x0HkgRnfdZybcjaHsNMv/Ot3NwGiHkBg=";

7
pkgs/by-name/mi/minc_widgets/package.nix
View File

@@ -14,13 +14,16 @@
stdenv.mkDerivation {
pname = "minc-widgets";
version = "unstable-2016-04-20";
version = "1.0.0-unstable-2016-04-20";
strictDeps = true;
__structuredAttrs = true;
src = fetchFromGitHub {
owner = "BIC-MNI";
repo = "minc-widgets";
rev = "f08b643894c81a1a2e0fbfe595a17a42ba8906db";
sha256 = "1b9g6lf37wpp211ikaji4rf74rl9xcmrlyqcw1zq3z12ji9y33bm";
hash = "sha256-dY3hU5Qi/IF/4Ax7mivriWZyXCZRqhlDEPfyMxw1L60=";
};
patches = [

4
pkgs/by-name/mo/mons/package.nix
View File

@@ -13,13 +13,13 @@
resholve.mkDerivation {
pname = "mons";
version = "unstable-2020-03-20";
version = "0.8.2-unstable-2020-03-20";
src = fetchFromGitHub {
owner = "Ventto";
repo = "mons";
rev = "375bbba3aa700c8b3b33645a7fb70605c8b0ff0c";
sha256 = "19r5y721yrxhd9jp99s29jjvm0p87vl6xfjlcj38bljq903f21cl";
hash = "sha256-lAXhBkhY0oWGZFS6bug+6IK6pUxCp3RlarBnH8TxJac=";
fetchSubmodules = true;
};

6
pkgs/by-name/mp/mprisence/package.nix
View File

@@ -9,16 +9,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "mprisence";
version = "1.8.5";
version = "1.8.8";
src = fetchFromGitHub {
owner = "lazykern";
repo = "mprisence";
tag = "v${finalAttrs.version}";
hash = "sha256-GiRhhJv6CHRWaTNdMLkEbldZJcL9ol849JwCky64H/s=";
hash = "sha256-+TZnhA9z6duk7d9U2OBPlXJyrTFoVyKRIS35l6E62/c=";
};
cargoHash = "sha256-maEBwe14jMy608fs9yJ4T9Z0xvYgGWDrMnPaSic4PCs=";
cargoHash = "sha256-B3Z/GkHOy4R9hhRZtVIItHs6J6wQSNVv0KNGF2/NSlo=";
nativeBuildInputs = [ pkg-config ];

4
pkgs/by-name/ne/newflasher/package.nix
View File

@@ -8,13 +8,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "newflasher";
version = "60";
version = "61";
src = fetchFromGitHub {
owner = "munjeni";
repo = "newflasher";
tag = "${finalAttrs.version}";
hash = "sha256-YmFY0WPT92f5zN10TEfuRv2mzhEweqeZEpzWCK4otYg=";
hash = "sha256-9qEGFzA5sMn+1MOKNTJeBukurzytksXitgXraPL0KDU=";
};
buildInputs = [

34
pkgs/by-name/se/secretspec/package.nix
View File

@@ -2,7 +2,6 @@
lib,
rustPlatform,
fetchCrate,
fetchFromGitHub,
cacert,
gitMinimal,
jq,
@@ -12,33 +11,17 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "secretspec";
version = "0.21.0";
version = "0.21.1";
src = fetchCrate {
inherit (finalAttrs) pname version;
hash = "sha256-U7cSQbkOsmTfJynb1YizyZI2STpX7fz9N8JmJDHNr9w=";
hash = "sha256-VCvo+O3IHVUeZG6cxBmWy8/CEDZOwVr8IVcWxroUd00=";
};
cargoHash = "sha256-rPtPWBq7MK/e9J4IHRpXlFtSwFom14QIgWXBEwJc/bI=";
cargoHash = "sha256-cA7HmOxCrfPiBKI8xxxpRBvGLUgyl4Ts1uhoCt0bBuk=";
# The tests read fixtures from the repository that are not part of the
# published crate.
postPatch = ''
cp -r --no-preserve=mode ${
fetchFromGitHub {
owner = "cachix";
repo = "secretspec";
tag = "v${finalAttrs.version}";
sparseCheckout = [
"conformance/ipc/cases"
"docs/public/schema"
"tests/fixtures"
];
hash = "sha256-nSX5ctVUuTIqgunQ8RRCJi26bS19ohj5HNedXc8rfE0=";
}
}/{conformance,docs,tests} ..
chmod +x ../tests/fixtures/bw-shim.sh
patchShebangs ../tests/fixtures/bw-shim.sh
patchShebangs tests/fixtures/bw-shim.sh
'';
nativeCheckInputs = [
@@ -53,15 +36,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
export SSL_CERT_FILE="${cacert}/etc/ssl/certs/ca-bundle.crt"
'';
checkFlags = [
# These walk every ancestor of the temporary directory and require root or
# user ownership; the sandbox root is owned by the overflow uid.
"--skip=provider::external::tests::a_sticky_world_writable_ancestor_is_accepted"
"--skip=provider::external::tests::a_symlinked_component_is_validated_through_to_its_target"
"--skip=provider::external::tests::a_writable_ancestor_above_a_tight_parent_is_rejected"
"--skip=provider::external::tests::platform_policy_accepts_owner_only_files_and_rejects_writable_registration"
];
# A test binds to localhost, which requires an explicit Darwin sandbox exception.
__darwinAllowLocalNetworking = true;

60
pkgs/development/rocm-modules/llvm/default.nix
View File

@@ -314,6 +314,35 @@ overrideLlvmPackagesRocm (s: {
hash = "sha256-6Pj3pRESaho60YhXWwaQxEKteSuziZseeT4FbZqZANk=";
})
]
# https://github.com/NixOS/nixpkgs/pull/564039 introduces minimal-arm64e_x1-support.patch that depends on llvm 22.1.0
# Patches to clang, compiler-rt-libc, and these patches bridge the gap between llvm 22.0.0 and ~22.1.8
# arm64e_x1: Can be removed when upgrading to rocm 10
++ [
(fetchpatch {
name = "wasm-add-wasm32-linux-muslwali-target.patch";
url = "https://github.com/llvm/llvm-project/commit/7e7c923b5890e62f4b5920c2f8a2e51f586a186c.patch";
relative = "llvm";
hash = "sha256-KbM7M4osxaaxkn5UN+csNm+aKvaWgJ0KQnKHHpI+Qxo=";
})
(fetchpatch {
name = "adt-allow-arbitrary-number-of-cases-in-stringswitch.patch";
url = "https://github.com/llvm/llvm-project/commit/8642762ac356f0b8432b78d7a32c1f5213e494b3.patch";
relative = "llvm";
hash = "sha256-aQBmMSJ+aunE7HLpfIizBH7Be1kmcN6nxUk2sV9d3Qo=";
})
(fetchpatch {
name = "adt-migrate-stringswitch-cases-to-new-overload.patch";
url = "https://github.com/llvm/llvm-project/commit/2ed7baafc3bf5b4321e3f77dfb1ce291e62bcadc.patch";
relative = "llvm";
hash = "sha256-cV9POhuJFCnjCdPL6Lym2cmKLeW/2k34N2rwauxU7MA=";
})
(fetchpatch {
name = "lfi-introduce-aarch64-lfi-target.patch";
url = "https://github.com/llvm/llvm-project/commit/2c05ae4b8f85927d55f862fdf61bea564e2ea944.patch";
relative = "llvm";
hash = "sha256-yxvmZg3BTlIrNeer90cYnF7yuRyraeVg1nbiaRVr+zc=";
})
]
++ old.patches
++ [
./perf-increase-namestring-size.patch
@@ -408,6 +437,27 @@ overrideLlvmPackagesRocm (s: {
hash = "sha256-73IDPGZWKX4vny3x5FJ3/NQw8XRad9UNwfYkvQdMB4s=";
})
]
# arm64e_x1: Can be removed when upgrading to rocm 10
++ [
(fetchpatch {
name = "wasm-add-wasm32-linux-muslwali-target.patch";
url = "https://github.com/llvm/llvm-project/commit/7e7c923b5890e62f4b5920c2f8a2e51f586a186c.patch";
relative = "clang";
hash = "sha256-QGqil4rs9wFFa8J25ghWKTE8YG2+AbGG81dt5ReAw9k=";
})
(fetchpatch {
name = "adt-migrate-stringswitch-cases-to-new-overload.patch";
url = "https://github.com/llvm/llvm-project/commit/2ed7baafc3bf5b4321e3f77dfb1ce291e62bcadc.patch";
relative = "clang";
hash = "sha256-w9sS+pwawHqxGkTAWMinzF1r9ZyWMTmI119X/NdQoc8=";
})
(fetchpatch {
name = "lfi-introduce-aarch64-lfi-target.patch";
url = "https://github.com/llvm/llvm-project/commit/2c05ae4b8f85927d55f862fdf61bea564e2ea944.patch";
relative = "clang";
hash = "sha256-CcwqLvhDAJSr3dkRDqJKe3pVD2G+w5JMgtGkUx6pUPc=";
})
]
++ old.patches
++ [
# Never add FHS include paths
@@ -509,6 +559,16 @@ overrideLlvmPackagesRocm (s: {
isGNU = false;
};
compiler-rt-libc = s.prev.compiler-rt-libc.overrideAttrs (old: {
patches = [
# arm64e_x1: Can be removed when upgrading to rocm 10
(fetchpatch {
name = "lfi-introduce-aarch64-lfi-target.patch";
url = "https://github.com/llvm/llvm-project/commit/2c05ae4b8f85927d55f862fdf61bea564e2ea944.patch";
relative = "compiler-rt";
hash = "sha256-xgvVXG+IGa9qwv60ioER6N5nC7XPRPEDHVUrQ5n9RBI=";
})
]
++ old.patches;
meta = old.meta // llvmMeta;
});
compiler-rt = s.final.compiler-rt-libc;