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-12-20 10:00:37 +00:00
committed by GitHub
parent 87e1fa05bf 98c1d429c8
commit 420b3f6b38
29 changed files with 2741 additions and 320 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nixos/modules/services/audio/botamusique.nix
-2
View File
@@ -11,8 +11,6 @@ let
configFile = format.generate "botamusique.ini" cfg.settings;
in
{
meta.maintainers = with lib.maintainers; [ hexa ];
options.services.botamusique = {
enable = lib.mkEnableOption "botamusique, a bot to play audio streams on mumble";
nixos/modules/services/networking/babeld.nix
-2
View File
@@ -41,8 +41,6 @@ in
{
meta.maintainers = with lib.maintainers; [ hexa ];
###### interface
options = {
nixos/tests/botamusique.nix
+18 -27
View File
@@ -1,39 +1,30 @@
{
pkgs,
lib,
...
}:
{
name = "botamusique";
meta.maintainers = with lib.maintainers; [ hexa ];
nodes = {
machine =
{ config, ... }:
{
networking.extraHosts = ''
127.0.0.1 all.api.radio-browser.info
'';
machine = {
networking.extraHosts = ''
127.0.0.1 all.api.radio-browser.info
'';
services.murmur = {
enable = true;
registerName = "NixOS tests";
};
services.murmur = {
enable = true;
registerName = "NixOS tests";
};
services.botamusique = {
enable = true;
settings = {
server = {
channel = "NixOS tests";
};
bot = {
version = false;
auto_check_update = false;
};
services.botamusique = {
enable = true;
settings = {
server = {
channel = "NixOS tests";
};
bot = {
version = false;
auto_check_update = false;
};
};
};
};
};
testScript = ''
pkgs/applications/editors/vim/plugins/overrides.nix
-4
View File
@@ -3274,10 +3274,6 @@ assertNoAdditions {
}
);
ssr-nvim = super.ssr-nvim.overrideAttrs {
dependencies = [ self.nvim-treesitter ];
};
startup-nvim = super.startup-nvim.overrideAttrs {
dependencies = [ self.plenary-nvim ];
};
pkgs/applications/networking/cluster/terraform-providers/providers.json
+3 -3
View File
@@ -580,13 +580,13 @@
"vendorHash": "sha256-H6NjQhSokIMhFAKyirr2LTvgu6/c2p++YYDHO/SLuN8="
},
"hashicorp_google-beta": {
"hash": "sha256-NHnKafm46W/owbugb/TTxZS/hKjSPpEt7WdRmxTCWVw=",
"hash": "sha256-BQ5AjO1SrODFyEzM6WTpqUqGURusNRQ/4W4fttoc0Rk=",
"homepage": "https://registry.terraform.io/providers/hashicorp/google-beta",
"owner": "hashicorp",
"repo": "terraform-provider-google-beta",
"rev": "v7.13.0",
"rev": "v7.14.1",
"spdx": "MPL-2.0",
"vendorHash": "sha256-nfFfXnFBaCWiGryTigB/dTxFvclKJ7ocVcV7rbnBMWI="
"vendorHash": "sha256-7sM6Rvs0zzXesT6uW335Q3JcYKBqU942voOa1i3H4ds="
},
"hashicorp_helm": {
"hash": "sha256-S4Fe65f+gEWWxRMC+/i93dwwe7QigPccx4wiqNBpcL8=",
pkgs/by-name/aa/aardvark-dns/package.nix
+3 -3
View File
@@ -7,16 +7,16 @@
rustPlatform.buildRustPackage rec {
pname = "aardvark-dns";
version = "1.16.0";
version = "1.17.0";
src = fetchFromGitHub {
owner = "containers";
repo = "aardvark-dns";
tag = "v${version}";
hash = "sha256-mC+PP5sXt2O0CgxxyzS2WjtQe0RjuKNCamrjRY7qBP8=";
hash = "sha256-NJ1ViJpN6fBO9U1RkCkqyr6JXiHa5zX1BQAGGqKWVYY=";
};
cargoHash = "sha256-e/VxQgpTOS4snM78BewvloWap9cU+Vzlahlr00BWmVY=";
cargoHash = "sha256-rQQ+Y7uWsjGSp6CeIs794/mGPceJ31OTxAmRonP1WL0=";
passthru.tests = { inherit (nixosTests) podman; };
pkgs/by-name/ba/babeld/package.nix
-1
View File
@@ -30,7 +30,6 @@ stdenv.mkDerivation rec {
homepage = "http://www.irif.fr/~jch/software/babel/";
description = "Loop-avoiding distance-vector routing protocol";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ hexa ];
platforms = lib.platforms.linux;
mainProgram = "babeld";
};
pkgs/by-name/co/codex/package.nix
+3 -3
View File
@@ -14,18 +14,18 @@
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "codex";
version = "0.75.0";
version = "0.76.0";
src = fetchFromGitHub {
owner = "openai";
repo = "codex";
tag = "rust-v${finalAttrs.version}";
hash = "sha256-XsFJjXFBsj8jeOMLuP+sMW1ZiAQIuL+XBFjUhgCLJmU=";
hash = "sha256-a6jpYIcfTubSncK1Bxx04X30gkb0J7wi7W6JBXbBBcA=";
};
sourceRoot = "${finalAttrs.src.name}/codex-rs";
cargoHash = "sha256-9zf9xpnh9w3DWizLSHUR2CfN+E9fYxamKkyMLkYiIP8=";
cargoHash = "sha256-fg8OdKKGZ5QjJ/U/7cAFUWNBBa9GbR6OSbYcKeBLP1A=";
nativeBuildInputs = [
installShellFiles
pkgs/by-name/gr/greaseweazle/package.nix
+2 -2
View File
@@ -6,14 +6,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "greaseweazle";
version = "1.22";
version = "1.23";
pyproject = true;
src = fetchFromGitHub {
owner = "keirf";
repo = "greaseweazle";
rev = "v${version}";
hash = "sha256-Ki4OvtcFn5DH87OCWY7xN9fRhGxlzS9QIuQCJxPWJco=";
hash = "sha256-ey9srzGnyaZ5TmeSXo7AQwh93Iufim41mgJnJXHSIyc=";
};
build-system = with python3.pkgs; [
pkgs/by-name/kd/kde-rounded-corners/package.nix
+2 -10
View File
@@ -1,7 +1,6 @@
{
stdenv,
fetchFromGitHub,
fetchpatch2,
cmake,
kdePackages,
libepoxy,
@@ -11,22 +10,15 @@
stdenv.mkDerivation rec {
pname = "kde-rounded-corners";
version = "0.8.5";
version = "0.8.6";
src = fetchFromGitHub {
owner = "matinlotfali";
repo = "KDE-Rounded-Corners";
rev = "v${version}";
hash = "sha256-ef63PVG0JOHY4zyq5M5oAAcxtfhm1XOvpsxgSeXvgDo=";
hash = "sha256-v/kobtUoWBbYP4iMiUqWNnpIYyu5CBmYHnwxfN4eoQ0=";
};
patches = [
(fetchpatch2 {
url = "https://github.com/matinlotfali/KDE-Rounded-Corners/commit/5d63212e65ed06ca65a2a7f0ad2436045b839ddd.patch";
hash = "sha256-wfjxMKRmJu3gflldNvWLghw5oFyyxY2ml1lsl/TVzxI=";
})
];
nativeBuildInputs = [
cmake
kdePackages.extra-cmake-modules
pkgs/by-name/ma/matrix-media-repo/package.nix
-1
View File
@@ -65,7 +65,6 @@ buildGoModule {
homepage = "https://github.com/t2bot/matrix-media-repo";
changelog = "https://github.com/t2bot/matrix-media-repo/blob/${src.rev}/CHANGELOG.md";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ hexa ];
mainProgram = "media_repo";
};
}
pkgs/by-name/me/meerk40t-camera/package.nix
-1
View File
@@ -32,6 +32,5 @@ python3Packages.buildPythonPackage rec {
description = "MeerK40t camera plugin";
license = lib.licenses.mit;
homepage = "https://github.com/meerk40t/meerk40t-camera";
maintainers = with lib.maintainers; [ hexa ];
};
}
pkgs/by-name/me/meerk40t/package.nix
-1
View File
@@ -81,6 +81,5 @@ python3Packages.buildPythonApplication rec {
mainProgram = "meerk40t";
homepage = "https://github.com/meerk40t/meerk40t";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ hexa ];
};
}
pkgs/by-name/ne/nextcloud-talk-desktop/package.nix
+3 -3
View File
@@ -26,11 +26,11 @@
}:
let
pname = "nextcloud-talk-desktop";
version = "2.0.4"; # Ensure both hashes (Linux and Darwin) are updated!
version = "2.0.5"; # Ensure both hashes (Linux and Darwin) are updated!
hashes = {
linux = "sha256-Nky3ws1UV0F4qjbBog53BjXkZ/ttTER/32NlB2ONJaE=";
darwin = "sha256-N/v1842rheqrjG4pAwrSDYNWhQDgWinTiZPusD1dvaM=";
linux = "sha256-aKNrIbv6kaLoLmTZVgwncqzF4o/5C/hFXef3QqM7oBk=";
darwin = "sha256-Nli2z8eyAq5W3ALwHiH6+Ightk3Jf0gaWtwabOJS4gw=";
};
# Only x86_64-linux is supported with Darwin support being universal
pkgs/by-name/ne/nextvi/package.nix
+2 -2
View File
@@ -7,13 +7,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "nextvi";
version = "2.5";
version = "3.0";
src = fetchFromGitHub {
owner = "kyx0r";
repo = "nextvi";
tag = finalAttrs.version;
hash = "sha256-K5iE+76Bu03NYx8eQxVgY2NN1r7Acawj8w7W1QTVyv4=";
hash = "sha256-SMPPG/pDtuS87PLyeUvmEqyqD9+Pye9rPQW1TpDGNc4=";
};
nativeBuildInputs = [ installShellFiles ];
pkgs/by-name/ni/nix-bisect/package.nix
-1
View File
@@ -35,6 +35,5 @@ python3.pkgs.buildPythonApplication {
description = "Bisect nix builds";
homepage = "https://github.com/timokau/nix-bisect";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ hexa ];
};
}
pkgs/by-name/op/openldap/package.nix
-1
View File
@@ -159,7 +159,6 @@ stdenv.mkDerivation rec {
homepage = "https://www.openldap.org/";
description = "Open source implementation of the Lightweight Directory Access Protocol";
license = lib.licenses.openldap;
maintainers = with lib.maintainers; [ hexa ];
teams = [ lib.teams.helsinki-systems ];
platforms = lib.platforms.unix;
};
pkgs/by-name/pi/pim6sd/package.nix
-1
View File
@@ -28,7 +28,6 @@ stdenv.mkDerivation {
description = "PIM for IPv6 sparse mode daemon";
homepage = "https://github.com/troglobit/pim6sd";
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [ hexa ];
platforms = lib.platforms.unix;
broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/pim6sd.x86_64-darwin
};
pkgs/by-name/sc/schleuder-cli/package.nix
-1
View File
@@ -30,6 +30,5 @@ bundlerApp {
homepage = "https://schleuder.org";
changelog = "https://0xacab.org/schleuder/schleuder-cli/-/blob/main/CHANGELOG.md";
license = lib.licenses.gpl3Plus;
maintainers = with lib.maintainers; [ hexa ];
};
}
pkgs/by-name/sc/schleuder/package.nix
-1
View File
@@ -35,6 +35,5 @@ bundlerApp {
homepage = "https://schleuder.org";
changelog = "https://0xacab.org/schleuder/schleuder/blob/main/CHANGELOG.md";
license = lib.licenses.gpl3Plus;
maintainers = with lib.maintainers; [ hexa ];
};
}
pkgs/by-name/sh/shader-slang/package.nix
+2 -2
View File
@@ -21,13 +21,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "shader-slang";
version = "2025.24.1";
version = "2025.24.2";
src = fetchFromGitHub {
owner = "shader-slang";
repo = "slang";
tag = "v${finalAttrs.version}";
hash = "sha256-w99pRi03HyI8xlvxbJL+i5k6Sr0ITkh28qB9nRY2iiU=";
hash = "sha256-GBiGeVboAO4XqnO7ZIWCUjsb3M/+MEtIxausOs3unyQ=";
fetchSubmodules = true;
};
pkgs/by-name/tr/trealla/package.nix
+2 -2
View File
@@ -23,13 +23,13 @@ assert lib.elem lineEditingLibrary [
];
stdenv.mkDerivation (finalAttrs: {
pname = "trealla";
version = "2.86.10";
version = "2.87.5";
src = fetchFromGitHub {
owner = "trealla-prolog";
repo = "trealla";
rev = "v${finalAttrs.version}";
hash = "sha256-R/eaDkP3uQcaGMWfECyWpWeMoSBukXLrG6t+NT2bO50=";
hash = "sha256-0lsDNXdZTmhH+rODGi4qVjX8dQNypkiVnqGoYvENbQM=";
};
postPatch = ''
pkgs/by-name/ve/veloren/fix-on-rust-stable.patch
+2691 -235
View File
File diff suppressed because it is too large Load Diff
pkgs/by-name/ve/veloren/package.nix
+1 -1
View File
@@ -42,7 +42,7 @@ rustPlatform.buildRustPackage {
./fix-assets-path.patch
];
cargoHash = "sha256-Uj0gFcStWhIS+GbM/Hn/vD2PrA0ftzEnMnCwV0n0g7g=";
cargoHash = "sha256-hxDVFJxZQ2Seg4vapSE8PsT527GOs9DFWFnacKwWkiM=";
postPatch = ''
# Force vek to build in unstable mode
pkgs/by-name/wh/whisper-ctranslate2/package.nix
+2 -2
View File
@@ -8,7 +8,7 @@
}:
let
pname = "whisper-ctranslate2";
version = "0.5.5";
version = "0.5.6";
in
python3Packages.buildPythonApplication {
inherit pname version;
@@ -18,7 +18,7 @@ python3Packages.buildPythonApplication {
owner = "Softcatala";
repo = "whisper-ctranslate2";
tag = version;
hash = "sha256-YK7PoZwu7kB2rxA14iTeWyy+Ya5/eoxq0c8DKb4UCT4=";
hash = "sha256-IgHTSOlF6fBX0oLWejKO5510e9M7ZTQf4CiIlb2xalM=";
};
build-system = [ python3Packages.setuptools ];
pkgs/development/python-modules/simsimd/default.nix
+2 -2
View File
@@ -11,14 +11,14 @@
buildPythonPackage rec {
pname = "simsimd";
version = "6.5.5";
version = "6.5.10";
pyproject = true;
src = fetchFromGitHub {
owner = "ashvardanian";
repo = "SimSIMD";
tag = "v${version}";
hash = "sha256-r7PEg/A7UXjr7xq2mAk3i1MqdsWITpoV8ZbefoC1+kw=";
hash = "sha256-tiKU8vxcTYA/9J0uUb9Q4NGCDNeBkF/g4PL69rZezCs=";
};
build-system = [
pkgs/development/python-modules/wxpython/4.2.nix
-1
View File
@@ -185,6 +185,5 @@ buildPythonPackage rec {
lgpl2Plus
wxWindowsException31
];
maintainers = with lib.maintainers; [ hexa ];
};
}
pkgs/os-specific/linux/nvidia-x11/default.nix
+3 -3
View File
@@ -101,11 +101,11 @@ rec {
# Vulkan developer beta driver
# See here for more information: https://developer.nvidia.com/vulkan-driver
vulkan_beta = generic rec {
version = "580.94.11";
version = "580.94.13";
persistencedVersion = "580.95.05";
settingsVersion = "580.95.05";
sha256_64bit = "sha256-zcyK5mz8XubxdjdNbTJvaIHW1ehyV4jKZ8kNByKNDQU=";
openSha256 = "sha256-Eb6RJo4u08lWp1cs8WBThPH7r90Pj6MPtUYI5N3rOEI=";
sha256_64bit = "sha256-Hg9LOxG1n2cupWUIi/miGf67y/vvzQEsOtni8KzGx40=";
openSha256 = "sha256-vDXx6cH/02TAaM7pWrJdTFw65GmydRMmyIYFeUAzHFg=";
settingsSha256 = "sha256-F2wmUEaRrpR1Vz0TQSwVK4Fv13f3J9NJLtBe4UP2f14=";
persistencedSha256 = "sha256-QCwxXQfG/Pa7jSTBB0xD3lsIofcerAWWAHKvWjWGQtg=";
url = "https://developer.nvidia.com/downloads/vulkan-beta-${lib.concatStrings (lib.splitVersion version)}-linux";
pkgs/servers/http/jetty/default.nix
+2 -2
View File
@@ -57,7 +57,7 @@ in
};
jetty_12 = common {
version = "12.1.4";
hash = "sha256-no5Ge4pdYKN+tXUJq10RKCTtRLFNdz5sOuw6o+ZxXdY=";
version = "12.1.5";
hash = "sha256-tjZO7OtQ7FZQAGA9lI4YIKwm+ZW0eJgGTaNd+ZasDY4=";
};
}