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-23 06:05:11 +00:00
committed by GitHub
parent a0b6cef18b 78d778d5bc
commit 1fd51aa148
16 changed files with 972 additions and 910 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/by-name/ai/aiken/package.nix
+3 -3
View File
@@ -10,17 +10,17 @@
rustPlatform.buildRustPackage rec {
pname = "aiken";
version = "1.1.13";
version = "1.1.14";
src = fetchFromGitHub {
owner = "aiken-lang";
repo = "aiken";
rev = "v${version}";
hash = "sha256-es1opcYGoryRLpEPJuuuusTSVDnNAoEoGLg+LB8VnM0=";
hash = "sha256-aydujI8yPfUEEonasOT0uFCpLKOXSh/c9iw12kACLuw=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-g4DHkHw6Nog+ZtquvVaRaZdfcuH/ReLYsLeARbnCqac=";
cargoHash = "sha256-D7N9liDcthV4YLH+XzG4E1PAcLg9PQlTeGBmUcGOYes=";
buildInputs =
[ openssl ]
pkgs/by-name/li/lime3ds/package.nix → pkgs/by-name/az/azahar/package.nix
+16 -19
View File
@@ -37,7 +37,7 @@
enableSdl2Frontend ? true,
SDL2,
enableQt ? true,
kdePackages,
qt6,
enableQtTranslations ? enableQt,
enableCubeb ? true,
cubeb,
@@ -55,19 +55,21 @@ let
;
in
stdenv.mkDerivation (finalAttrs: {
pname = "lime3ds";
version = "2119.1";
pname = "azahar";
version = "2120.1";
src = fetchzip {
url = "https://github.com/Lime3DS/Lime3ds-archive/releases/download/${finalAttrs.version}/lime3ds-unified-source-${finalAttrs.version}.tar.xz";
hash = "sha256-37KFGCVyc4QW+D00CzN1+lpNYZxCWRkflt7rkIFcdM8=";
# TODO: use this when https://github.com/azahar-emu/azahar/issues/779 is resolved
# url = "https://github.com/azahar-emu/azahar/releases/download/${finalAttrs.version}/lime3ds-unified-source-${finalAttrs.version}.tar.xz";
url = "https://github.com/azahar-emu/azahar/releases/download/${finalAttrs.version}/azahar-unified-source-20250322-6ecee96.tar.xz";
hash = "sha256-d4JHp/BZEQTKErh476NZoizQjgAldR19Waq9GQg2Ebk=";
};
nativeBuildInputs = [
cmake
doxygen
pkg-config
] ++ lib.optionals enableQt [ kdePackages.wrapQtAppsHook ];
] ++ lib.optionals enableQt [ qt6.wrapQtAppsHook ];
buildInputs =
[
@@ -100,7 +102,7 @@ stdenv.mkDerivation (finalAttrs: {
zstd
]
++ optionals enableQt (
with kdePackages;
with qt6;
[
qtbase
qtmultimedia
@@ -109,7 +111,7 @@ stdenv.mkDerivation (finalAttrs: {
]
)
++ optionals enableSdl2Frontend [ SDL2 ]
++ optionals enableQtTranslations [ kdePackages.qttools ]
++ optionals enableQtTranslations [ qt6.qttools ]
++ optionals enableCubeb [ cubeb ]
++ optional useDiscordRichPresence rapidjson;
@@ -128,7 +130,7 @@ stdenv.mkDerivation (finalAttrs: {
];
postPatch = ''
# Fix file not found when looking in var/empty instead of opt
# Fix "file not found" bug when looking in var/empty instead of opt
mkdir externals/dynarmic/src/dynarmic/ir/var
ln -s ../opt externals/dynarmic/src/dynarmic/ir/var/empty
@@ -146,21 +148,16 @@ stdenv.mkDerivation (finalAttrs: {
libs = makeLibraryPath [ vulkan-loader ];
in
optionalString enableSdl2Frontend ''
for binfile in lime3ds lime3ds-room
for binfile in azahar azahar-room
do
wrapProgram "$out/bin/$binfile" \
--prefix LD_LIBRARY_PATH : ${libs}
''
+ optionalString enableQt ''
qtWrapperArgs+=(
--prefix LD_LIBRARY_PATH : ${libs}
)
done
'';
cmakeFlags =
[
(cmakeBool "LIME3DS_USE_PRECOMPILED_HEADERS" false)
(cmakeBool "CITRA_USE_PRECOMPILED_HEADERS" false)
(cmakeBool "USE_SYSTEM_LIBS" true)
(cmakeBool "DISABLE_SYSTEM_DYNARMIC" true)
(cmakeBool "DISABLE_SYSTEM_GLSLANG" true)
@@ -177,11 +174,11 @@ stdenv.mkDerivation (finalAttrs: {
];
meta = {
description = "A Nintendo 3DS emulator based on Citra";
homepage = "https://github.com/Lime3DS/Lime3ds-archive";
description = "An open-source 3DS emulator project based on Citra";
homepage = "https://github.com/azahar-emu/azahar";
license = lib.licenses.gpl2Only;
maintainers = with lib.maintainers; [ arthsmn ];
mainProgram = "lime3ds";
mainProgram = "azahar";
platforms = lib.platforms.linux;
};
})
pkgs/by-name/co/cosmic-greeter/package.nix
+37 -20
View File
@@ -3,50 +3,48 @@
stdenv,
fetchFromGitHub,
rustPlatform,
libcosmicAppHook,
cmake,
coreutils,
just,
libinput,
libxkbcommon,
linux-pam,
pkg-config,
udev,
wayland,
coreutils,
xkeyboard_config,
nix-update-script,
}:
rustPlatform.buildRustPackage rec {
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cosmic-greeter";
version = "1.0.0-alpha.2";
version = "1.0.0-alpha.6";
src = fetchFromGitHub {
owner = "pop-os";
repo = "cosmic-greeter";
rev = "epoch-${version}";
hash = "sha256-5BSsiGgL369/PePS0FmuE42tktK2bpgJziYuUEnZ2jY=";
tag = "epoch-${finalAttrs.version}";
hash = "sha256-K6kCBtlmFfav8UP4zorzDJBzHt4CoSaFFAufrW1DPrw=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-5TXFE/pIeIOvy8x8c5sR3YaI8R2RTA8fzloguIpE4TM=";
cargoHash = "sha256-nmkM/Jm2P5ftZFfzX+O1Fe6eobRbgBkajZsbyI67Zfw=";
cargoBuildFlags = [
"--all"
];
cargoBuildFlags = [ "--all" ];
nativeBuildInputs = [
rustPlatform.bindgenHook
cmake
just
pkg-config
libcosmicAppHook
];
buildInputs = [
libinput
libxkbcommon
linux-pam
udev
wayland
];
dontUseJustBuild = true;
dontUseJustCheck = true;
justFlags = [
"--set"
@@ -64,12 +62,31 @@ rustPlatform.buildRustPackage rec {
substituteInPlace src/greeter.rs --replace-fail '/usr/bin/env' '${lib.getExe' coreutils "env"}'
'';
meta = with lib; {
preFixup = ''
libcosmicAppWrapperArgs+=(
--set-default X11_BASE_RULES_XML ${xkeyboard_config}/share/X11/xkb/rules/base.xml
--set-default X11_BASE_EXTRA_RULES_XML ${xkeyboard_config}/share/X11/xkb/rules/extra.xml
)
'';
passthru.updateScript = nix-update-script {
extraArgs = [
"--version"
"unstable"
"--version-regex"
"epoch-(.*)"
];
};
meta = {
homepage = "https://github.com/pop-os/cosmic-greeter";
description = "Greeter for the COSMIC Desktop Environment";
mainProgram = "cosmic-greeter";
license = licenses.gpl3Only;
maintainers = with maintainers; [ nyabinary ];
platforms = platforms.linux;
license = lib.licenses.gpl3Only;
maintainers = with lib.maintainers; [
nyabinary
HeitorAugustoLN
];
platforms = lib.platforms.linux;
};
}
})
pkgs/by-name/er/erofs-utils/package.nix
+12 -1
View File
@@ -6,10 +6,12 @@
pkg-config,
fuse,
util-linux,
xxHash,
lz4,
xz,
zlib,
zstd,
libdeflate,
libselinux,
fuseSupport ? stdenv.hostPlatform.isLinux,
selinuxSupport ? false,
@@ -23,6 +25,9 @@ stdenv.mkDerivation (finalAttrs: {
"man"
];
enableParallelBuilding = true;
strictDeps = true;
src = fetchurl {
url = "https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/snapshot/erofs-utils-${finalAttrs.version}.tar.gz";
hash = "sha256-zYYRJw6chv4GL2RxA8pq2p7XEORDD91ZYNUUd3kZIA0=";
@@ -35,16 +40,22 @@ stdenv.mkDerivation (finalAttrs: {
buildInputs =
[
util-linux
xxHash
lz4
zlib
xz
zstd
libdeflate
]
++ lib.optionals fuseSupport [ fuse ]
++ lib.optionals selinuxSupport [ libselinux ];
configureFlags =
[ "MAX_BLOCK_SIZE=4096" ]
[
"MAX_BLOCK_SIZE=4096"
"--enable-multithreading"
"--with-libdeflate"
]
++ lib.optional fuseSupport "--enable-fuse"
++ lib.optional selinuxSupport "--with-selinux";
pkgs/by-name/ex/extension-manager/package.nix
-64
View File
@@ -1,64 +0,0 @@
{
lib,
stdenv,
fetchFromGitHub,
appstream,
blueprint-compiler,
desktop-file-utils,
meson,
ninja,
pkg-config,
wrapGAppsHook4,
gettext,
gtk4,
json-glib,
libadwaita,
libbacktrace,
libsoup_3,
libxml2,
nix-update-script,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "extension-manager";
version = "0.6.1";
src = fetchFromGitHub {
owner = "mjakeman";
repo = "extension-manager";
tag = "v${finalAttrs.version}";
hash = "sha256-0AK7wU04gQCS/3FvoAwAEmaP/jC23EduOSRncLjt4l8=";
};
nativeBuildInputs = [
appstream
blueprint-compiler
desktop-file-utils
meson
ninja
pkg-config
wrapGAppsHook4
];
buildInputs = [
gettext
gtk4
json-glib
libadwaita
libbacktrace
libsoup_3
libxml2
];
passthru.updateScript = nix-update-script { };
meta = {
description = "Utility for browsing and installing GNOME Shell Extensions";
homepage = "https://github.com/mjakeman/extension-manager";
changelog = "https://github.com/mjakeman/extension-manager/releases/tag/v${finalAttrs.version}";
license = lib.licenses.gpl3Only;
maintainers = with lib.maintainers; [ arthsmn ];
mainProgram = "extension-manager";
platforms = lib.platforms.linux;
};
})
pkgs/by-name/ho/home-manager/package.nix
+3 -3
View File
@@ -19,14 +19,14 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "home-manager";
version = "0-unstable-2025-03-08";
version = "0-unstable-2025-03-18";
src = fetchFromGitHub {
name = "home-manager-source";
owner = "nix-community";
repo = "home-manager";
rev = "26f6b862645ff281f3bada5d406e8c20de8d837c";
hash = "sha256-iqRxCsRxE/Q/3W1RHxQMthPKEda0hhY65uxEpE5TNk4=";
rev = "22a36aa709de7dd42b562a433b9cefecf104a6ee";
hash = "sha256-Tumt3tcMXJniSh7tw2gW+WAnVLeB3WWm+E+yYFnLBXo=";
};
nativeBuildInputs = [
pkgs/by-name/ne/nezha-theme-admin/package-lock.json
Generated
+837 -732
View File
File diff suppressed because it is too large Load Diff
pkgs/by-name/ne/nezha-theme-admin/package.nix
+3 -3
View File
@@ -7,13 +7,13 @@
buildNpmPackage rec {
pname = "nezha-theme-admin";
version = "1.6.4";
version = "1.10.0";
src = fetchFromGitHub {
owner = "nezhahq";
repo = "admin-frontend";
tag = "v${version}";
hash = "sha256-6dWf2vC7zCVx77OdCUd9iYAACZcvkhfQdVSKQp3DGnE=";
hash = "sha256-WA7NkXIJEtXRp+Nky5PjCl6afmnpj8p7TNrOuTNyQ/E=";
};
# TODO: Switch to the bun build function once available in nixpkgs
@@ -21,7 +21,7 @@ buildNpmPackage rec {
cp ${./package-lock.json} package-lock.json
'';
npmDepsHash = "sha256-8SvD6dycFWk4+PYNNnsbUb3e3H+CTRMwMeWLfx7xppc=";
npmDepsHash = "sha256-6lt2Z4RvVHaQ9MZs0D4BT7Rmwf9G79pdnp6l0ItFXeY=";
npmPackFlags = [ "--ignore-scripts" ];
pkgs/by-name/ow/owntone/package.nix
+2 -2
View File
@@ -37,14 +37,14 @@
}:
stdenv.mkDerivation (finalAttrs: {
version = "28.11";
version = "28.12";
pname = "owntone";
src = fetchFromGitHub {
owner = "owntone";
repo = "owntone-server";
tag = "${finalAttrs.version}";
hash = "sha256-lUelBZy7kAJ9tkvVbmxfXHiANJvhrnQydZkWiuoYTNU=";
hash = "sha256-Mj3G1+Hwa/zl0AM4SO6TcB4W3WJkpIDzrSPEFx0vaEk=";
};
nativeBuildInputs = [
pkgs/by-name/vh/vhdl-ls/package.nix
+3 -3
View File
@@ -6,17 +6,17 @@
rustPlatform.buildRustPackage rec {
pname = "vhdl-ls";
version = "0.83.1";
version = "0.84.0";
src = fetchFromGitHub {
owner = "VHDL-LS";
repo = "rust_hdl";
rev = "v${version}";
hash = "sha256-AO95J138d3m8CpJ7hWYeGP+rRd2009qQXwLxbuHDSDs=";
hash = "sha256-MzlsZoV09QeerpbE/Nmu5tMIvgscu84fk2bYlWn7bjg=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-7+isSSjF4V1FQaWRzmNAAW0q3/x/Tqkt8jNzGXsJHAo=";
cargoHash = "sha256-nKA38HbFFYRGd48VGqd7SHMY8fvTLE8to3iturKgWqM=";
postPatch = ''
substituteInPlace vhdl_lang/src/config.rs \
pkgs/development/libraries/physics/pythia/default.nix
+2 -2
View File
@@ -13,13 +13,13 @@
stdenv.mkDerivation rec {
pname = "pythia";
version = "8.312";
version = "8.313";
src = fetchurl {
url = "https://pythia.org/download/pythia83/pythia${
builtins.replaceStrings [ "." ] [ "" ] version
}.tgz";
sha256 = "sha256-utmOKWe2hwRsRWjJCR1jCgwxtih0XAIamUq6TR1Q+Oo=";
sha256 = "sha256-0H6AFQHE3LdtlI3GMoU3X1l0U8HW7GXnEodgPcd2cYw=";
};
nativeBuildInputs = [ rsync ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ fixDarwinDylibNames ];
pkgs/development/python-modules/google-cloud-artifact-registry/default.nix
+2 -2
View File
@@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "google-cloud-artifact-registry";
version = "1.15.1";
version = "1.15.2";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "google_cloud_artifact_registry";
inherit version;
hash = "sha256-k7SaOdk78EJhEwTlWRklr3+JlrRXVctekUjzgl4Xe/o=";
hash = "sha256-0w4HVBOqHnLechpkiVlnOrCPjSuQaXP84jDGtU6Q2RE=";
};
build-system = [ setuptools ];
pkgs/development/python-modules/tensorboard/default.nix
+31 -33
View File
@@ -2,37 +2,35 @@
lib,
fetchPypi,
buildPythonPackage,
pythonOlder,
numpy,
wheel,
werkzeug,
protobuf,
# dependencies
absl-py,
grpcio,
markdown,
absl-py,
google-auth-oauthlib,
numpy,
packaging,
protobuf,
setuptools,
standard-imghdr,
six,
tensorboard-data-server,
tensorboard-plugin-wit,
tensorboard-plugin-profile,
}:
werkzeug,
standard-imghdr,
# tensorflow/tensorboard is built from a downloaded wheel, because
# https://github.com/tensorflow/tensorboard/issues/719 blocks
# buildBazelPackage.
versionCheckHook,
}:
buildPythonPackage rec {
pname = "tensorboard";
version = "2.18.0";
version = "2.19.0";
format = "wheel";
disabled = pythonOlder "3.9";
# tensorflow/tensorboard is built from a downloaded wheel, because
# https://github.com/tensorflow/tensorboard/issues/719 blocks buildBazelPackage.
src = fetchPypi {
inherit pname version format;
dist = "py3";
python = "py3";
hash = "sha256-EHykghdF9z4q76AsUP9wqbaU8595CxHm9oL30yZ0Xqs=";
hash = "sha256-XnG5hmOmQafOim5wsL6OGkwMRdSHYLB2ODrEdVw1uaA=";
};
pythonRelaxDeps = [
@@ -40,28 +38,23 @@ buildPythonPackage rec {
"protobuf"
];
propagatedBuildInputs = [
dependencies = [
absl-py
grpcio
google-auth-oauthlib
markdown
numpy
packaging
protobuf
setuptools
standard-imghdr
six
tensorboard-data-server
tensorboard-plugin-profile
tensorboard-plugin-wit
werkzeug
# not declared in install_requires, but used at runtime
# https://github.com/NixOS/nixpkgs/issues/73840
wheel
];
# in the absence of a real test suite, run cli and imports
checkPhase = ''
$out/bin/tensorboard --help > /dev/null
'';
# Requires 'imghdr' which has been removed from python in 3.13
# ModuleNotFoundError: No module named 'imghdr'
# https://github.com/tensorflow/tensorboard/issues/6964
standard-imghdr
];
pythonImportsCheck = [
"tensorboard"
@@ -73,12 +66,17 @@ buildPythonPackage rec {
"tensorboard.util"
];
meta = with lib; {
nativeCheckInputs = [
versionCheckHook
];
versionCheckProgramArg = "--version";
meta = {
changelog = "https://github.com/tensorflow/tensorboard/blob/${version}/RELEASE.md";
description = "TensorFlow's Visualization Toolkit";
homepage = "https://www.tensorflow.org/";
license = licenses.asl20;
license = lib.licenses.asl20;
mainProgram = "tensorboard";
maintainers = with maintainers; [ abbradar ];
maintainers = with lib.maintainers; [ abbradar ];
};
}
pkgs/development/python-modules/torch/default.nix
+20 -19
View File
@@ -44,15 +44,18 @@
# dependencies
astunparse,
fsspec,
expecttest,
filelock,
fsspec,
hypothesis,
jinja2,
networkx,
sympy,
numpy,
packaging,
psutil,
pyyaml,
cffi,
click,
requests,
sympy,
types-dataclasses,
typing-extensions,
# ROCm build and `torch.compile` requires `triton`
tritonSupport ? (!stdenv.hostPlatform.isDarwin),
@@ -69,10 +72,6 @@
_tritonEffective ? if cudaSupport then triton-cuda else triton,
triton-cuda,
# Unit tests
hypothesis,
psutil,
# Disable MKLDNN on aarch64-darwin, it negatively impacts performance,
# this is also what official pytorch build does
mklDnnSupport ? !(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64),
@@ -510,18 +509,20 @@ buildPythonPackage rec {
dependencies =
[
astunparse
cffi
click
numpy
pyyaml
# From install_requires:
fsspec
expecttest
filelock
typing-extensions
sympy
networkx
fsspec
hypothesis
jinja2
networkx
ninja
packaging
psutil
pyyaml
requests
sympy
types-dataclasses
typing-extensions
# the following are required for tensorboard support
pillow
pkgs/top-level/aliases.nix
+1
View File
@@ -822,6 +822,7 @@ mapAliases {
licensor = throw "'licensor' has been removed due to lack of upstream maintenance"; # Added 2025-01-25
lightdm_gtk_greeter = lightdm-gtk-greeter; # Added 2022-08-01
lightstep-tracer-cpp = throw "lightstep-tracer-cpp is deprecated since 2022-08-29; the upstream recommends migration to opentelemetry projects.";
lime3ds = throw "lime3ds is deprecated, use 'azahar' instead."; # Added 2025-03-22
limesctl = throw "limesctl has been removed because it is insignificant."; # Added 2024-11-25
lispPackages_new = throw "Lisp packages have been redesigned. See 'lisp-modules' in the nixpkgs manual."; # Added 2024-05-07
lispPackages = throw "Lisp packages have been redesigned. See 'lisp-modules' in the nixpkgs manual."; # Added 2024-05-07
pkgs/top-level/python-packages.nix
-4
View File
@@ -16447,13 +16447,9 @@ self: super: with self; {
grpcioTF = self.grpcio.override {
protobuf = protobufTF;
};
tensorboard-plugin-profileTF = self.tensorboard-plugin-profile.override {
protobuf = protobuf-pythonTF;
};
tensorboardTF = self.tensorboard.override {
grpcio = grpcioTF;
protobuf = protobuf-pythonTF;
tensorboard-plugin-profile = tensorboard-plugin-profileTF;
};
};
in