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-04-07 00:16:45 +00:00
committed by GitHub
parent 62adb4e378 c7c96c5a63
commit b82a1fffdc
53 changed files with 229 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nixos/modules/services/web-apps/part-db.nix
+1 -1
View File
@@ -27,7 +27,7 @@ in
phpPackage = mkPackageOption pkgs "php" { } // {
apply =
pkg:
pkg.override {
pkg.buildEnv {
extraConfig = ''
memory_limit = 256M;
'';
nixos/tests/all-tests.nix
+2 -2
View File
@@ -274,8 +274,8 @@ in
cadvisor = handleTestOn [ "x86_64-linux" ] ./cadvisor.nix { };
cage = handleTest ./cage.nix { };
cagebreak = handleTest ./cagebreak.nix { };
calibre-web = handleTest ./calibre-web.nix { };
calibre-server = handleTest ./calibre-server.nix { };
calibre-web = runTest ./calibre-web.nix;
calibre-server = import ./calibre-server.nix { inherit pkgs runTest; };
canaille = handleTest ./canaille.nix { };
castopod = handleTest ./castopod.nix { };
cassandra_3_0 = handleTest ./cassandra.nix { testPackage = pkgs.cassandra_3_0; };
nixos/tests/calibre-server.nix
+4 -5
View File
@@ -1,11 +1,10 @@
{
system ? builtins.currentSystem,
config ? { },
pkgs ? import ../.. { inherit system config; },
pkgs,
runTest,
...
}:
let
inherit (import ../lib/testing-python.nix { inherit system pkgs; }) makeTest;
inherit (pkgs.lib)
concatStringsSep
maintainers
@@ -74,7 +73,7 @@ let
in
mapAttrs (
test: testConfig:
(makeTest (
(runTest (
let
nodeName = testConfig.nodeName or test;
calibreConfig = {
nixos/tests/calibre-web.nix
+36 -38
View File
@@ -1,44 +1,42 @@
import ./make-test-python.nix (
{ pkgs, lib, ... }:
{ lib, ... }:
let
port = 3142;
defaultPort = 8083;
in
{
name = "calibre-web";
meta.maintainers = with lib.maintainers; [ pborzenkov ];
let
port = 3142;
defaultPort = 8083;
in
{
name = "calibre-web";
meta.maintainers = with lib.maintainers; [ pborzenkov ];
nodes = {
customized =
{ pkgs, ... }:
{
services.calibre-web = {
enable = true;
listen.port = port;
options = {
calibreLibrary = "/tmp/books";
reverseProxyAuth = {
enable = true;
header = "X-User";
};
nodes = {
customized =
{ pkgs, ... }:
{
services.calibre-web = {
enable = true;
listen.port = port;
options = {
calibreLibrary = "/tmp/books";
reverseProxyAuth = {
enable = true;
header = "X-User";
};
};
environment.systemPackages = [ pkgs.calibre ];
};
};
testScript = ''
start_all()
environment.systemPackages = [ pkgs.calibre ];
};
};
testScript = ''
start_all()
customized.succeed(
"mkdir /tmp/books && calibredb --library-path /tmp/books add -e --title test-book"
)
customized.succeed("systemctl restart calibre-web")
customized.wait_for_unit("calibre-web.service")
customized.wait_for_open_port(${toString port})
customized.succeed(
"curl --fail -H X-User:admin 'http://localhost:${toString port}' | grep test-book"
)
'';
}
)
customized.succeed(
"mkdir /tmp/books && calibredb --library-path /tmp/books add -e --title test-book"
)
customized.succeed("systemctl restart calibre-web")
customized.wait_for_unit("calibre-web.service")
customized.wait_for_open_port(${toString port})
customized.succeed(
"curl --fail -H X-User:admin 'http://localhost:${toString port}' | grep test-book"
)
'';
}
pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix
+2 -2
View File
@@ -30,12 +30,12 @@
stdenv.mkDerivation rec {
pname = "bitwig-studio-unwrapped";
version = "5.3.1";
version = "5.3.2";
src = fetchurl {
name = "bitwig-studio-${version}.deb";
url = "https://www.bitwig.com/dl/Bitwig%20Studio/${version}/installer_linux/";
hash = "sha256-mxodFCu4SDzofnoZZZ7TPDUIrRc3UJt8TuEBwDOo2wQ=";
hash = "sha256-QKt/myqmoVVffNwkfGcAoknAiZu3D+s7d2lJgtWpvk4=";
};
nativeBuildInputs = [
pkgs/applications/audio/deadbeef/default.nix
+2 -2
View File
@@ -70,7 +70,7 @@ assert gtk2Support || gtk3Support;
let
inherit (lib) optionals;
version = "1.9.6";
version = "1.10.0";
in
clangStdenv.mkDerivation {
pname = "deadbeef";
@@ -81,7 +81,7 @@ clangStdenv.mkDerivation {
repo = "deadbeef";
fetchSubmodules = true;
rev = version;
hash = "sha256-Q6hL4fOFPHn26ZqvrebgTMTgQZrhbXCEhM4ZFzNeyJE=";
hash = "sha256-qa0ULmE15lV2vkyXPNW9kSISQZEANrjwJwykTiifk5Q=";
};
buildInputs =
pkgs/applications/editors/vim/plugins/generated.nix
+13
View File
@@ -9347,6 +9347,19 @@ final: prev: {
meta.hydraPlatforms = [ ];
};
neovim-trunk = buildVimPlugin {
pname = "neovim-trunk";
version = "2024-06-19";
src = fetchFromGitHub {
owner = "trunk-io";
repo = "neovim-trunk";
rev = "835180d0cb2db4aa3a934daf65b1a56549018b94";
sha256 = "086l7zf2k2p537a13zwivfkamfgpdkrfgq5r23y014s2x2jrh5dw";
};
meta.homepage = "https://github.com/trunk-io/neovim-trunk/";
meta.hydraPlatforms = [ ];
};
neoyank-vim = buildVimPlugin {
pname = "neoyank.vim";
version = "2020-12-20";
pkgs/applications/editors/vim/plugins/overrides.nix
+7
View File
@@ -2153,6 +2153,13 @@ in
];
};
neovim-trunk = super.neovim-trunk.overrideAttrs {
dependencies = with self; [
plenary-nvim
telescope-nvim
];
};
nlsp-settings-nvim = super.nlsp-settings-nvim.overrideAttrs {
dependencies = [ self.nvim-lspconfig ];
};
pkgs/applications/editors/vim/plugins/vim-plugin-names
+1
View File
@@ -717,6 +717,7 @@ https://github.com/lawrence-laz/neotest-zig/,HEAD,
https://github.com/Shatur/neovim-ayu/,,
https://github.com/cloudhead/neovim-fuzzy/,,
https://github.com/jeffkreeftmeijer/neovim-sensible/,,
https://github.com/trunk-io/neovim-trunk/,HEAD,
https://github.com/Shougo/neoyank.vim/,,
https://github.com/preservim/nerdcommenter/,,
https://github.com/preservim/nerdtree/,,
pkgs/applications/misc/inochi2d/generic.nix
+3
View File
@@ -16,6 +16,7 @@
zenity,
luajit_2_1,
libGL,
libX11,
builderArgs,
}:
@@ -56,6 +57,8 @@ buildDubPackage (
dbus
freetype
SDL2
libGL
libX11
];
dontUseCmakeConfigure = true;
pkgs/applications/networking/cluster/calico/default.nix
+3 -3
View File
@@ -14,16 +14,16 @@ builtins.mapAttrs
}:
buildGoModule rec {
inherit pname;
version = "3.29.1";
version = "3.29.3";
src = fetchFromGitHub {
owner = "projectcalico";
repo = "calico";
rev = "v${version}";
hash = "sha256-e/xyrFJ9t+awpU8u8uYmXFRnk92/06vI5OoClyAMKTU=";
hash = "sha256-JK/iKVLXT8h+xZpkjVBEI8vfgRuoTHwWaoKikjBsJgI=";
};
vendorHash = "sha256-OP3J2NE491Aivzo80OmLAyQGe3hixLTz0p9FSA897ao=";
vendorHash = "sha256-dkBOhuX/tf+emLLeZ+7fI+z1pKwZLD0ZqZNxUMS32NE=";
inherit doCheck subPackages;
pkgs/by-name/bi/bind/package.nix
+2 -2
View File
@@ -28,11 +28,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "bind";
version = "9.20.6";
version = "9.20.7";
src = fetchurl {
url = "https://downloads.isc.org/isc/bind9/${finalAttrs.version}/${finalAttrs.pname}-${finalAttrs.version}.tar.xz";
hash = "sha256-7X9UtE+EpyAaL6epSfMCHqVoUpv62Q/KZk/VXAUQQTQ=";
hash = "sha256-QzI8jSLSFEKCw3tAYOwR6Ywkg14iVoiHb60IunuV3KY=";
};
outputs = [
pkgs/by-name/cp/cpuinfo/package.nix
+3 -3
View File
@@ -10,13 +10,13 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "cpuinfo";
version = "0-unstable-2025-02-19";
version = "0-unstable-2025-03-27";
src = fetchFromGitHub {
owner = "pytorch";
repo = "cpuinfo";
rev = "b73ae6ce38d5dd0b7fe46dbe0a4b5f4bab91c7ea";
hash = "sha256-JNLaK105qDk9DxTqCFyXFfYn46dF+nZIaF5urSVRa0U=";
rev = "39ea79a3c132f4e678695c579ea9353d2bd29968";
hash = "sha256-uochXC0AtOw8N/ycyVJdiRw4pibCW2ENrFMT3jtxDSg=";
};
passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
pkgs/by-name/cr/cro-mag-rally/package.nix
+2
View File
@@ -3,6 +3,7 @@
stdenv,
fetchFromGitHub,
SDL2,
libGL,
cmake,
makeWrapper,
}:
@@ -25,6 +26,7 @@ stdenv.mkDerivation {
];
buildInputs = [
SDL2
libGL
];
installPhase = ''
pkgs/by-name/de/deno/librusty_v8.nix
+5 -5
View File
@@ -2,11 +2,11 @@
{ fetchLibrustyV8 }:
fetchLibrustyV8 {
version = "135.0.0";
version = "135.1.0";
shas = {
x86_64-linux = "sha256-jA/cUjzT3KhpBGFyxZSp61X05PhD6XKAGtZyKdnts7U=";
aarch64-linux = "sha256-+jqLUIv96994e1fFJcYCQNJJ8smF18sU76lq0sirszo=";
x86_64-darwin = "sha256-atemob6PgxMncD4F+b5mfleTHSTMdKvJAwFD9ul/eJ4=";
aarch64-darwin = "sha256-0fDaHgvUTDFKEhQp7WaNe+54e3+GScGO5+8+Qa89nLQ=";
x86_64-linux = "sha256-QGpFNkVHO9j4uagYNC5X3JVif80RVazp63oqrdWYUoU=";
aarch64-linux = "sha256-J4E32qZNyqmJyFKBuU+6doRYL3ZSaEMSBlML+hSkj+o=";
x86_64-darwin = "sha256-UnulsDS1LlrVR2+cz+4zgWxKqbkB5ch3T9UofGCZduQ=";
aarch64-darwin = "sha256-mU7N/1vXzCP+mwjzLTsDkT+8YOJifwNju3Rv9Cq5Loo=";
};
}
pkgs/by-name/de/deno/package.nix
+3 -3
View File
@@ -20,17 +20,17 @@ let
in
rustPlatform.buildRustPackage rec {
pname = "deno";
version = "2.2.6";
version = "2.2.8";
src = fetchFromGitHub {
owner = "denoland";
repo = "deno";
tag = "v${version}";
hash = "sha256-Ner3178YukKKqMVQAGpU3bE+fxo9UXrRPp7iqCFSUjs=";
hash = "sha256-pGhqfQR+42XUY0v99fvSyLQPlvzCWntq4qS9vyuJEpY=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-dakHDPGv7trd2Kib9Hk5jHZHR3pzk1YIyJW/0uY6WSg=";
cargoHash = "sha256-FJ3wPkL1Pgw6S66n5hyQfUZWTVXs4oZ0bJJaN22OxoY=";
postPatch = ''
# Use patched nixpkgs libffi in order to fix https://github.com/libffi/libffi/pull/857
pkgs/by-name/en/endless-sky/package.nix
+2
View File
@@ -5,6 +5,7 @@
SDL2,
libpng,
libjpeg,
libX11,
glew,
openal,
scons,
@@ -49,6 +50,7 @@ stdenv.mkDerivation rec {
SDL2
libpng
libjpeg
libX11
glew
openal
libmad
pkgs/by-name/fe/fex/package.nix
+16 -11
View File
@@ -1,24 +1,24 @@
{
fetchFromGitHub,
lib,
llvmPackages,
fetchFromGitHub,
cmake,
ninja,
pkg-config,
gitMinimal,
qt5,
python3,
nix-update-script,
}:
llvmPackages.stdenv.mkDerivation (finalAttrs: rec {
llvmPackages.stdenv.mkDerivation (finalAttrs: {
pname = "fex";
version = "2503";
version = "2504";
src = fetchFromGitHub {
owner = "FEX-Emu";
repo = "FEX";
tag = "FEX-${version}";
hash = "sha256-NnYod6DeRv3/6h8SGkGYtgC+RRuIafxoQm3j1Sqk0mU=";
tag = "FEX-${finalAttrs.version}";
hash = "sha256-tqUJBHYSRlEUaLI4WItzotIHGMUNbdjA7o9NjBYZmHw=";
fetchSubmodules = true;
};
@@ -26,7 +26,6 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: rec {
cmake
ninja
pkg-config
gitMinimal
qt5.wrapQtAppsHook
llvmPackages.bintools
@@ -46,10 +45,11 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: rec {
];
cmakeFlags = [
"-DCMAKE_BUILD_TYPE=Release"
"-DUSE_LINKER=lld"
"-DENABLE_LTO=True"
"-DENABLE_ASSERTIONS=False"
(lib.cmakeFeature "CMAKE_BUILD_TYPE" "Release")
(lib.cmakeFeature "USE_LINKER" "lld")
(lib.cmakeBool "ENABLE_LTO" true)
(lib.cmakeBool "ENABLE_ASSERTIONS" false)
(lib.cmakeFeature "OVERRIDE_VERSION" finalAttrs.version)
(lib.cmakeBool "BUILD_TESTS" finalAttrs.finalPackage.doCheck)
];
@@ -63,9 +63,14 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: rec {
wrapQtApp $out/bin/FEXConfig
'';
passthru = {
updateScript = nix-update-script { };
};
meta = {
description = "Fast usermode x86 and x86-64 emulator for Arm64 Linux";
homepage = "https://fex-emu.com/";
changelog = "https://github.com/FEX-Emu/FEX/releases/tag/FEX-${finalAttrs.version}";
platforms = [ "aarch64-linux" ];
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ andre4ik3 ];
pkgs/by-name/gi/git-repo/package.nix
+2 -2
View File
@@ -13,13 +13,13 @@
stdenv.mkDerivation rec {
pname = "git-repo";
version = "2.52";
version = "2.53";
src = fetchFromGitHub {
owner = "android";
repo = "tools_repo";
rev = "v${version}";
hash = "sha256-x8i09tqxfwek6z351ZJ2l/CdTx1p2EtbHX38Lu8mge0=";
hash = "sha256-mPmOnq9j9vnfTynGbOoChLslpyTpIzH6+B2fv5PTHZY=";
};
# Fix 'NameError: name 'ssl' is not defined'
pkgs/by-name/gs/gsasl/package.nix
+2 -2
View File
@@ -9,11 +9,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "gsasl";
version = "2.2.1";
version = "2.2.2";
src = fetchurl {
url = "mirror://gnu/gsasl/gsasl-${finalAttrs.version}.tar.gz";
sha256 = "sha256-1FtWLhO9E7n8ILNy9LUyaXQM9iefg28JzhG50yvO4HU=";
sha256 = "sha256-QejkQmSOzK9kWdmtk9SxhTC5bI6vUOPzQlMu8nXv87o=";
};
buildInputs = [
pkgs/by-name/it/itch-dl/package.nix
+4 -5
View File
@@ -6,14 +6,14 @@
python3Packages.buildPythonApplication rec {
pname = "itch-dl";
version = "0.5.2";
version = "0.6.1";
pyproject = true;
src = fetchFromGitHub {
owner = "DragoonAethis";
repo = "itch-dl";
tag = version;
hash = "sha256-MkhXM9CQXbVcnztMPnBscryXWSaSQUeoG6KtVuS8YEo=";
hash = "sha256-zwsiG38wOVi3pP0gQWkZqfAmdWKadjB65qiTg68tZWg=";
};
nativeBuildInputs = with python3Packages; [
@@ -21,21 +21,20 @@ python3Packages.buildPythonApplication rec {
];
build-system = with python3Packages; [
poetry-core
hatchling
];
dependencies = with python3Packages; [
beautifulsoup4
lxml
pydantic
requests
tqdm
urllib3
];
pythonRelaxDeps = [
"pydantic"
"urllib3"
"beautifulsoup4"
];
meta = {
pkgs/by-name/ja/jazz2/package.nix
+2
View File
@@ -8,6 +8,7 @@
libvorbis,
openal,
SDL2,
libGL,
zlib,
versionCheckHook,
gitUpdater,
@@ -28,6 +29,7 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [ cmake ];
buildInputs = [
libGL
libopenmpt
libvorbis
openal
pkgs/by-name/ju/jujutsu/package.nix
-2
View File
@@ -5,7 +5,6 @@
fetchFromGitHub,
installShellFiles,
pkg-config,
zstd,
libgit2,
libssh2,
openssl,
@@ -38,7 +37,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
];
buildInputs = [
zstd
libgit2
libssh2
] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ openssl ];
pkgs/by-name/ku/kubernetes-validate/unwrapped.nix
+6 -8
View File
@@ -1,7 +1,7 @@
{
lib,
buildPythonPackage,
fetchFromGitHub,
fetchPypi,
setuptools,
importlib-resources,
jsonschema,
@@ -14,14 +14,13 @@
}:
buildPythonPackage rec {
pname = "kubernetes-validate";
version = "1.31.0";
version = "1.32.0";
pyproject = true;
src = fetchFromGitHub {
owner = "willthames";
repo = "kubernetes-validate";
tag = "v${version}";
hash = "sha256-vxsftuipw0rHQIngxKlPHwBIW+rYAjfnEEaJDKmPyfQ=";
src = fetchPypi {
pname = "kubernetes_validate";
inherit version;
hash = "sha256-GSg3/cLBkWUlAf4mjdo0JT36yuADRQWlGwo4hNFZNh0=";
};
build-system = [
@@ -38,7 +37,6 @@ buildPythonPackage rec {
];
nativeCheckInputs = [
pytestCheckHook
versionCheckHook
];
versionCheckProgramArg = "--version";
pkgs/by-name/li/lightburn/package.nix
+2 -2
View File
@@ -22,11 +22,11 @@
stdenv.mkDerivation rec {
pname = "lightburn";
version = "1.7.07";
version = "1.7.08";
src = fetchurl {
url = "https://release.lightburnsoftware.com/LightBurn/Release/LightBurn-v${version}/LightBurn-Linux64-v${version}.7z";
hash = "sha256-MFv+y1GVoio4ok7negpX4ABaya7Z+s8zqM85YhOFxVo=";
hash = "sha256-dG/A39/SapyS6GGSKCsHUvYN+CONul/s55HTi9Cc59g=";
};
nativeBuildInputs = [
pkgs/by-name/ll/llama-cpp/package.nix
+2 -2
View File
@@ -82,13 +82,13 @@ let
in
effectiveStdenv.mkDerivation (finalAttrs: {
pname = "llama-cpp";
version = "4958";
version = "5060";
src = fetchFromGitHub {
owner = "ggml-org";
repo = "llama.cpp";
tag = "b${finalAttrs.version}";
hash = "sha256-Llw2lDLNjkG6nDMQG4hQCPokKgUg/tnPVJQId75XR9g=";
hash = "sha256-hReqnwPyzKXR+Nwl4auDCCQqLLNCpM0zILqjs+TB9uk=";
leaveDotGit = true;
postFetch = ''
git -C "$out" rev-parse --short HEAD > $out/COMMIT
pkgs/by-name/md/mdbook/package.nix
+3 -3
View File
@@ -9,7 +9,7 @@
installShellFiles,
}:
let
version = "0.4.47";
version = "0.4.48";
in
rustPlatform.buildRustPackage rec {
inherit version;
@@ -19,11 +19,11 @@ rustPlatform.buildRustPackage rec {
owner = "rust-lang";
repo = "mdBook";
tag = "v${version}";
hash = "sha256-XTvC2pGRVat0kOybNb9TziG32wDVexnFx2ahmpUFmaA=";
hash = "sha256-ZCV8BSoaYIhNZV3Spsd7rsp8D2zTZSdWMuicQrgax2I=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-ASPRBAB+elJuyXpPQBm3WI97wD3mjoO1hw0fNHc+KAw=";
cargoHash = "sha256-ZpfzAzqVL7/GaI4C7X0UqZAPFT/Y/OCQ53wDcmgM2zI=";
nativeBuildInputs = [ installShellFiles ];
pkgs/by-name/na/nanosaur2/package.nix
+2
View File
@@ -3,6 +3,7 @@
stdenv,
fetchFromGitHub,
SDL2,
libGL,
cmake,
makeWrapper,
unstableGitUpdater,
@@ -26,6 +27,7 @@ stdenv.mkDerivation rec {
];
buildInputs = [
SDL2
libGL
];
installPhase = ''
pkgs/by-name/ne/neverball/package.nix
+2
View File
@@ -7,6 +7,7 @@
libGL,
libpng,
libjpeg,
libX11,
SDL2_ttf,
libvorbis,
gettext,
@@ -37,6 +38,7 @@ stdenv.mkDerivation rec {
libjpeg
SDL2_ttf
libvorbis
libX11
gettext
physfs
];
pkgs/by-name/op/opensoldat/package.nix
+1
View File
@@ -79,6 +79,7 @@ stdenv.mkDerivation rec {
physfs
openal
gamenetworkingsockets
xorg.libX11
];
# TODO(@sternenseemann): set proper rpath via cmake, so we don't need autoPatchelfHook
runtimeDependencies = [ xorg.libX11 ];
pkgs/by-name/pi/pioneer/package.nix
+2
View File
@@ -13,6 +13,7 @@
libpng,
libsigcxx,
libvorbis,
libX11,
lua5_2,
libgbm,
SDL2,
@@ -49,6 +50,7 @@ stdenv.mkDerivation rec {
libpng
libsigcxx
libvorbis
libX11
lua5_2
libgbm
SDL2
pkgs/by-name/q2/q2pro/package.nix
+4
View File
@@ -11,8 +11,10 @@
curl,
SDL2,
openalSoft,
libGL,
libogg,
libvorbis,
libX11,
libXi,
wayland,
wayland-protocols,
@@ -61,8 +63,10 @@ stdenv.mkDerivation (finalAttrs: rec {
libjpeg
curl
SDL2
libGL
libogg
libvorbis
libX11
ffmpeg
openalSoft
]
pkgs/by-name/su/super-productivity/package.nix
+3 -3
View File
@@ -13,20 +13,20 @@
buildNpmPackage rec {
pname = "super-productivity";
version = "12.0.1";
version = "12.0.3";
src = fetchFromGitHub {
owner = "johannesjo";
repo = "super-productivity";
tag = "v${version}";
hash = "sha256-s+j9TPdyA5OBGv+fxwz9Ze4SzME9m2nusbwrEsntvQc=";
hash = "sha256-6IR4oxucmbmAjAYl+QMEreyTp6aFn8lGzNxA3kNuJOs=";
postFetch = ''
${lib.getExe npm-lockfile-fix} -r $out/package-lock.json
'';
};
npmDepsHash = "sha256-uPdfUiFEb9MLdgfLXo5g7EEs2RUJpCxwKR02kqlD7P8=";
npmDepsHash = "sha256-42DK/03nxYq4iYVNwyFUXuE0lX7TJbdg0EUMKW1juhY=";
npmFlags = [ "--legacy-peer-deps" ];
makeCacheWritable = true;
pkgs/by-name/sy/syncterm/package.nix
+2
View File
@@ -8,6 +8,7 @@
autoPatchelfHook,
ncurses,
SDL2,
libX11,
alsa-lib,
}:
@@ -45,6 +46,7 @@ stdenv.mkDerivation rec {
autoPatchelfHook
pkg-config
SDL2
libX11
perl
unzip
]; # SDL2 for `sdl2-config`.
pkgs/by-name/ty/typst/package.nix
-2
View File
@@ -5,7 +5,6 @@
installShellFiles,
pkg-config,
openssl,
xz,
nix-update-script,
versionCheckHook,
}:
@@ -31,7 +30,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
buildInputs = [
openssl
xz
];
env = {
pkgs/by-name/vd/vdrift/package.nix
+2
View File
@@ -10,6 +10,7 @@
SDL2,
SDL2_image,
libvorbis,
libX11,
bullet,
curl,
gettext,
@@ -49,6 +50,7 @@ let
SDL2
SDL2_image
libvorbis
libX11
bullet
curl
gettext
pkgs/by-name/vi/vivictpp/package.nix
+2
View File
@@ -10,6 +10,7 @@
git,
SDL2,
SDL2_ttf,
libX11,
freetype,
harfbuzz,
ffmpeg,
@@ -65,6 +66,7 @@ stdenv.mkDerivation {
buildInputs = [
SDL2
libX11
SDL2_ttf
freetype
harfbuzz
pkgs/by-name/vp/vpv/package.nix
+4
View File
@@ -4,9 +4,11 @@
fetchFromGitHub,
cmake,
pkg-config,
libGL,
libpng,
libtiff,
libjpeg,
libX11,
SDL2,
gdal,
octave,
@@ -39,9 +41,11 @@ stdenv.mkDerivation (finalAttrs: {
];
buildInputs = [
libGL
libpng
libtiff
libjpeg
libX11
SDL2
gdal
octave
pkgs/development/libraries/capstone/default.nix
+2 -2
View File
@@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "capstone";
version = "5.0.5";
version = "5.0.6";
src = fetchFromGitHub {
owner = "capstone-engine";
repo = "capstone";
rev = version;
hash = "sha256-VGqqrixg7LaqRWTAEBzpC+gUTchncz3Oa2pSq8GLskI=";
hash = "sha256-ovIvsxVq+/q5UUMzP4WpxzaE0898uayNc1g2Coignnc=";
};
cmakeFlags =
pkgs/development/lua-modules/generated-packages.nix
+5 -5
View File
@@ -4616,15 +4616,15 @@ final: prev: {
}:
buildLuarocksPackage {
pname = "rustaceanvim";
version = "6.0.0-1";
version = "6.0.1-1";
knownRockspec =
(fetchurl {
url = "mirror://luarocks/rustaceanvim-6.0.0-1.rockspec";
sha256 = "1vp162iksmgrhqql2fjjjin3hi5jxnrkggx0gngnlnrzjpc054iw";
url = "mirror://luarocks/rustaceanvim-6.0.1-1.rockspec";
sha256 = "02qxbrk32fay17nlxs4sf4dpkvsfnj5lkm8wsb2q0a8jaa2v7dxv";
}).outPath;
src = fetchzip {
url = "https://github.com/mrcjkb/rustaceanvim/archive/v6.0.0.zip";
sha256 = "15ljsnifbml7v7012p6bnl9cxzxijzgm8n8p6isin23rz0kgasgz";
url = "https://github.com/mrcjkb/rustaceanvim/archive/v6.0.1.zip";
sha256 = "032barkibbsjjwzq87jbn2sqni3f5bmfvxn2bcq589viwdrziwgf";
};
disabled = luaOlder "5.1";
pkgs/development/python-modules/fastcore/default.nix
+3 -3
View File
@@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "fastcore";
version = "1.8.0";
version = "1.8.1";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "fastai";
repo = "fastcore";
tag = version;
hash = "sha256-YsZBPcGWKxE5Cl3HCmB2ZDecFuQa5Q5aTEbZ5ijmB24=";
hash = "sha256-slUOh7KBVJ11NqsAR7yC+4Tyqxy3Yq6f9OTlQesJ608=";
};
build-system = [ setuptools ];
@@ -33,7 +33,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Python module for Fast AI";
homepage = "https://github.com/fastai/fastcore";
changelog = "https://github.com/fastai/fastcore/blob/${version}/CHANGELOG.md";
changelog = "https://github.com/fastai/fastcore/blob/${src.tag}/CHANGELOG.md";
license = with licenses; [ asl20 ];
maintainers = with maintainers; [ fab ];
};
pkgs/development/python-modules/netbox-attachments/default.nix
+41
View File
@@ -0,0 +1,41 @@
{
lib,
buildPythonPackage,
pythonAtLeast,
fetchFromGitHub,
setuptools,
netbox,
}:
buildPythonPackage rec {
pname = "netbox-attachments";
version = "7.1.0";
pyproject = true;
disabled = pythonAtLeast "3.13";
src = fetchFromGitHub {
owner = "Kani999";
repo = "netbox-attachments";
tag = version;
hash = "sha256-uSp6z2jSb+kX5YspIV0essqRHGtOlZ5m0hMS6OO9Trk=";
};
build-system = [ setuptools ];
nativeCheckInputs = [ netbox ];
preFixup = ''
export PYTHONPATH=${netbox}/opt/netbox/netbox:$PYTHONPATH
'';
pythonImportsCheck = [ "netbox_attachments" ];
meta = {
description = "Plugin to manage attachments for any model";
homepage = "https://github.com/Kani999/netbox-attachments";
changelog = "https://github.com/Kani999/netbox-attachments/releases/tag/${src.tag}";
license = lib.licenses.asl20;
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ felbinger ];
};
}
pkgs/development/python-modules/pyside6/default.nix
+1 -8
View File
@@ -55,14 +55,7 @@ stdenv.mkDerivation (finalAttrs: {
inherit (shiboken6) version src;
sourceRoot = "pyside-setup-everywhere-src-6.8.0/sources/pyside6";
patches = [
# Manual backport of https://code.qt.io/cgit/pyside/pyside-setup.git/patch/?id=cacc9c5803a6dec820dd46211a836453183c8dab
# to fit our structure.
# FIXME: remove for 6.8.1
./fix-installing-docs.patch
];
sourceRoot = "pyside-setup-everywhere-src-${finalAttrs.version}/sources/pyside6";
# cmake/Macros/PySideModules.cmake supposes that all Qt frameworks on macOS
# reside in the same directory as QtCore.framework, which is not true for Nix.
pkgs/development/python-modules/pyside6/fix-installing-docs.patch
-25
View File
@@ -1,25 +0,0 @@
--- a/cmake/Macros/PySideModules.cmake
+++ b/cmake/Macros/PySideModules.cmake
@@ -176,6 +176,14 @@ macro(create_pyside_module)
set(${module_NAME}_glue_dependency ${${module_NAME}_glue})
endif()
+ # Install module doc files.
+ set(${module_NAME}_doc "${CMAKE_CURRENT_SOURCE_DIR}/../doc/${lower_module_name}.rst")
+ set(${module_name}_doc_dependency "")
+ if(EXISTS ${${module_NAME}_doc})
+ install(FILES ${${module_NAME}_doc} DESTINATION share/PySide6${pyside6_SUFFIX}/doc)
+ set(${module_NAME}_doc_dependency ${${module_NAME}_doc})
+ endif()
+
# Install standalone glue files into typesystems subfolder, so that the resolved relative
# paths remain correct.
if (module_GLUE_SOURCES)
@@ -245,6 +253,7 @@ macro(create_pyside_module)
DEPENDS ${total_type_system_files}
${module_GLUE_SOURCES}
${${module_NAME}_glue_dependency}
+ ${${module_NAME}_doc_dependency}
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
COMMENT "Running generator for ${module_NAME}...")
pkgs/development/python-modules/shiboken6/default.nix
+4 -6
View File
@@ -13,16 +13,14 @@ let
in
stdenv'.mkDerivation (finalAttrs: {
pname = "shiboken6";
version = "6.8.0.2";
version = "6.9.0";
src = fetchurl {
# https://download.qt.io/official_releases/QtForPython/shiboken6/
# FIXME: inconsistent version numbers in directory name and tarball?
url = "mirror://qt/official_releases/QtForPython/shiboken6/PySide6-6.8.0.2-src/pyside-setup-everywhere-src-6.8.0.tar.xz";
hash = "sha256-Ghohmo8yfjQNJYJ1+tOp8mG48EvFcEF0fnPdatJStOE=";
url = "mirror://qt/official_releases/QtForPython/pyside6/PySide6-${finalAttrs.version}-src/pyside-setup-everywhere-src-${finalAttrs.version}.tar.xz";
hash = "sha256-MVtzu3Vw1bnmeTqNP6/R0t1/Q9Ne67AdK1VOogaq2I4=";
};
sourceRoot = "pyside-setup-everywhere-src-6.8.0/sources/shiboken6";
sourceRoot = "pyside-setup-everywhere-src-${finalAttrs.version}/sources/shiboken6";
patches = [ ./fix-include-qt-headers.patch ];
pkgs/development/python-modules/shiboken6/fix-include-qt-headers.patch
+4 -4
View File
@@ -1,10 +1,10 @@
--- a/ApiExtractor/clangparser/compilersupport.cpp
+++ b/ApiExtractor/clangparser/compilersupport.cpp
@@ -16,6 +16,7 @@
#include <QtCore/QStandardPaths>
#include <QtCore/QStringList>
#include <QtCore/QVersionNumber>
+#include <QtCore/QRegularExpression>
#include <QtCore/qstandardpaths.h>
#include <QtCore/qstringlist.h>
#include <QtCore/qversionnumber.h>
+#include <QtCore/qregularexpression.h>
#include <clang-c/Index.h>
pkgs/games/bugdom/default.nix
+2
View File
@@ -3,6 +3,7 @@
stdenv,
fetchFromGitHub,
SDL2,
libGL,
IOKit,
Foundation,
OpenGL,
@@ -34,6 +35,7 @@ stdenv.mkDerivation rec {
buildInputs =
[
SDL2
libGL
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
IOKit
pkgs/games/cataclysm-dda/common.nix
+2
View File
@@ -10,6 +10,7 @@
SDL2_image,
SDL2_mixer,
SDL2_ttf,
libX11,
freetype,
zlib,
debug,
@@ -31,6 +32,7 @@ let
SDL2_image
SDL2_mixer
SDL2_ttf
libX11
freetype
];
pkgs/games/quakespasm/vulkan.nix
+2
View File
@@ -8,6 +8,7 @@
libmpg123,
libopus,
libvorbis,
libX11,
makeWrapper,
meson,
moltenvk,
@@ -48,6 +49,7 @@ stdenv.mkDerivation (finalAttrs: {
libmpg123
libopus
libvorbis
libX11
opusfile
vulkan-loader
]
pkgs/games/warsow/engine.nix
+2
View File
@@ -13,6 +13,7 @@
libpng,
SDL2,
libGL,
libX11,
openal,
zlib,
}:
@@ -52,6 +53,7 @@ stdenv.mkDerivation {
libjpeg
SDL2
libGL
libX11
openal
zlib
libpng
pkgs/misc/fastly/default.nix
+2 -2
View File
@@ -11,13 +11,13 @@
buildGoModule rec {
pname = "fastly";
version = "11.0.0";
version = "11.1.0";
src = fetchFromGitHub {
owner = "fastly";
repo = "cli";
tag = "v${version}";
hash = "sha256-6j8r4Rh/FrHSp/Frearot4DSabqU0UHUE13xhkLVI1c=";
hash = "sha256-f1GzxDd7ZG9WyB91vqCsKemp9zyBTliKHznWnQhY9/s=";
# The git commit is part of the `fastly version` original output;
# leave that output the same in nixpkgs. Use the `.git` directory
# to retrieve the commit SHA, and remove the directory afterwards,
pkgs/servers/search/qdrant/default.nix
+3 -3
View File
@@ -15,18 +15,18 @@
rustPlatform.buildRustPackage rec {
pname = "qdrant";
version = "1.13.4";
version = "1.13.6";
src = fetchFromGitHub {
owner = "qdrant";
repo = "qdrant";
tag = "v${version}";
hash = "sha256-77BuXTrQPtg7lus4WXukYSrJllR9hBMqn8+xAaq96z8=";
hash = "sha256-l/nWlpV3eecTzFK3MnHzmXGYocxKw+YPsyfHWuE/rwg=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-r+UilkSsV875j7tNkGJxuR/XC8Y1Fk4nqHYah9Z9q9c=";
cargoHash = "sha256-VUUL+oz8nCCNvDohDLfRai+KKd6uG0RLti31mk40wVY=";
nativeBuildInputs = [
protobuf
pkgs/top-level/python-packages.nix
+2
View File
@@ -9693,6 +9693,8 @@ self: super: with self; {
netapp-ontap = callPackage ../development/python-modules/netapp-ontap { };
netbox-attachments = callPackage ../development/python-modules/netbox-attachments { };
netbox-bgp = callPackage ../development/python-modules/netbox-bgp { };
netbox-contract = callPackage ../development/python-modules/netbox-contract { };