Merge master into staging-next
This commit is contained in:
nixpkgs-ci[bot]
@@ -35,38 +35,6 @@ import ./make-test-python.nix (
|
||||
];
|
||||
};
|
||||
|
||||
server-x11 =
|
||||
{ ... }:
|
||||
|
||||
{
|
||||
environment.systemPackages = [ pkgs.xorg.xauth ];
|
||||
services.openssh = {
|
||||
enable = true;
|
||||
settings.X11Forwarding = true;
|
||||
};
|
||||
users.users.root.openssh.authorizedKeys.keys = [
|
||||
snakeOilPublicKey
|
||||
];
|
||||
};
|
||||
|
||||
server-x11-disable =
|
||||
{ ... }:
|
||||
|
||||
{
|
||||
environment.systemPackages = [ pkgs.xorg.xauth ];
|
||||
services.openssh = {
|
||||
enable = true;
|
||||
settings = {
|
||||
X11Forwarding = true;
|
||||
# CVE-2025-32728: the following line is ineffectual
|
||||
DisableForwarding = true;
|
||||
};
|
||||
};
|
||||
users.users.root.openssh.authorizedKeys.keys = [
|
||||
snakeOilPublicKey
|
||||
];
|
||||
};
|
||||
|
||||
server-allowed-users =
|
||||
{ ... }:
|
||||
|
||||
@@ -272,8 +240,6 @@ import ./make-test-python.nix (
|
||||
start_all()
|
||||
|
||||
server.wait_for_unit("sshd", timeout=30)
|
||||
server_x11.wait_for_unit("sshd", timeout=30)
|
||||
server_x11_disable.wait_for_unit("sshd", timeout=30)
|
||||
server_allowed_users.wait_for_unit("sshd", timeout=30)
|
||||
server_localhost_only.wait_for_unit("sshd", timeout=30)
|
||||
server_match_rule.wait_for_unit("sshd", timeout=30)
|
||||
@@ -341,16 +307,6 @@ import ./make-test-python.nix (
|
||||
timeout=30
|
||||
)
|
||||
|
||||
with subtest("x11-forwarding"):
|
||||
client.succeed(
|
||||
"[ \"$(ssh -Y -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i privkey.snakeoil server-x11 'xauth list' | tee /dev/stderr | wc -l)\" -eq 1 ]",
|
||||
timeout=30
|
||||
)
|
||||
client.succeed(
|
||||
"[ \"$(ssh -Y -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i privkey.snakeoil server-x11-disable 'xauth list' | tee /dev/stderr | wc -l)\" -eq 0 ]",
|
||||
timeout=30
|
||||
)
|
||||
|
||||
with subtest("localhost-only"):
|
||||
server_localhost_only.succeed("ss -nlt | grep '127.0.0.1:22'")
|
||||
server_localhost_only_lazy.succeed("ss -nlt | grep '127.0.0.1:22'")
|
||||
|
||||
@@ -15,12 +15,12 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "slstatus";
|
||||
version = "1.0";
|
||||
version = "1.1";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://git.suckless.org/slstatus";
|
||||
rev = version;
|
||||
hash = "sha256-cFah6EgApslLSlJaOy/5W9ZV9Z1lzfKye/rRh9Om3T4=";
|
||||
hash = "sha256-MRDovZpQsvnLEvsbJNBzprkzQQ4nIs1T9BLT+tSGta8=";
|
||||
};
|
||||
|
||||
preBuild =
|
||||
|
||||
@@ -15,8 +15,12 @@ rec {
|
||||
|
||||
extraPostPatch = ''
|
||||
while read patch_name; do
|
||||
echo "applying LibreWolf patch: $patch_name"
|
||||
patch -p1 < ${source}/$patch_name
|
||||
if [ "$patch_name" -neq "patches/macos-import-vector.patch"]; then
|
||||
echo "applying LibreWolf patch: $patch_name"
|
||||
patch -p1 < ${source}/$patch_name
|
||||
else
|
||||
echo "skipping LibreWolf patch: $patch"
|
||||
fi
|
||||
done <${source}/assets/patches.txt
|
||||
|
||||
cp -r ${source}/themes/browser .
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
{
|
||||
"packageVersion": "137.0.2-1",
|
||||
"packageVersion": "138.0.1-2",
|
||||
"source": {
|
||||
"rev": "137.0.2-1",
|
||||
"hash": "sha256-PZapXnpVGdQrTXWjlNuFj3idqelTKTpwapuwx+XuwW8="
|
||||
"rev": "138.0.1-2",
|
||||
"hash": "sha256-H4GvKTrx0+GdUFOjW+E53VwZcZnrrBiXiMvR6aCEKDE="
|
||||
},
|
||||
"firefox": {
|
||||
"version": "137.0.2",
|
||||
"hash": "sha512-ghQMQyUjPqLi9XkIjOu5jA6NuISLQBjP+V1O1Cv4RwSe1lIPwFHZMO4melrLAIkIFwgl04FYnaDRCcoEph4cJA=="
|
||||
"version": "138.0.1",
|
||||
"hash": "sha512-vFqNZYFAxMPbKdURNMlxBaAiVWfVzhR1f2lZQGa/akShPgYmzr3it6B4usEooUaQ7gYIPQMG13id4qXp2DlLIw=="
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
pkg-config,
|
||||
@@ -18,7 +19,7 @@ rustPlatform.buildRustPackage {
|
||||
hash = "sha256-C8eFQFHYIj2P+zPOKLVBNX97UDVbbcdjbqh5n53ktCU=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
|
||||
udev
|
||||
];
|
||||
|
||||
@@ -34,6 +35,7 @@ rustPlatform.buildRustPackage {
|
||||
homepage = "https://github.com/adinack/cargo-embassy";
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = [ lib.maintainers.samw ];
|
||||
platforms = lib.platforms.unix;
|
||||
mainProgram = "cargo-embassy";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -188,7 +188,6 @@ stdenvNoCC.mkDerivation {
|
||||
license = lib.licenses.unfree;
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
maintainers = with lib.maintainers; [
|
||||
sarahec
|
||||
aspauldingcode
|
||||
];
|
||||
platforms = lib.platforms.linux ++ lib.platforms.darwin;
|
||||
|
||||
@@ -25,6 +25,9 @@ buildGoModule {
|
||||
changelog = "https://github.com/keidarcy/e1s/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
mainProgram = "e1s";
|
||||
maintainers = with maintainers; [ zelkourban ];
|
||||
maintainers = with maintainers; [
|
||||
zelkourban
|
||||
carlossless
|
||||
];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
}:
|
||||
buildGoModule rec {
|
||||
pname = "immich-go";
|
||||
version = "0.25.3";
|
||||
version = "0.26.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "simulot";
|
||||
repo = "immich-go";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-l4D0tE0yB2eLy9QlB9kraOtCUfqVRhYyaMUb/Xvv82c=";
|
||||
hash = "sha256-ya2KCUGHLdKcoxR83YqNG/4GiSgPABUeVaf1jqHtdzE=";
|
||||
|
||||
# Inspired by: https://github.com/NixOS/nixpkgs/blob/f2d7a289c5a5ece8521dd082b81ac7e4a57c2c5c/pkgs/applications/graphics/pdfcpu/default.nix#L20-L32
|
||||
# The intention here is to write the information into files in the `src`'s
|
||||
|
||||
@@ -18,17 +18,18 @@
|
||||
makeDesktopItem,
|
||||
freetype,
|
||||
mumble,
|
||||
unstableGitUpdater,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "ioquake3";
|
||||
version = "unstable-2023-08-13";
|
||||
version = "0-unstable-2025-04-25";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ioquake";
|
||||
repo = "ioq3";
|
||||
rev = "ee950eb7b0e41437cc23a9943254c958da8a61ab";
|
||||
sha256 = "sha256-NfhInwrtw85i2mnv7EtBrrpNaslaQaVhLNlK0I9aYto=";
|
||||
rev = "10afd421f23876e03535bb1958eae8b76371565d";
|
||||
hash = "sha256-5ByaIjmyndiliU5qnt62mj2CFByVv4M4+d3KBAgysck=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -83,6 +84,8 @@ stdenv.mkDerivation {
|
||||
})
|
||||
];
|
||||
|
||||
passthru.updateScript = unstableGitUpdater { };
|
||||
|
||||
meta = {
|
||||
homepage = "https://ioquake3.org/";
|
||||
description = "Fast-paced 3D first-person shooter, a community effort to continue supporting/developing id's Quake III Arena";
|
||||
|
||||
@@ -3,19 +3,19 @@
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
gitUpdater,
|
||||
llvmPackages,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "luau";
|
||||
version = "0.671";
|
||||
version = "0.672";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "luau-lang";
|
||||
repo = "luau";
|
||||
rev = version;
|
||||
hash = "sha256-iiIQKXByHuGCH5ypr7uSAcABaQagLw008Z0HRCsREIM=";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-FMFW7AikBnoT6FZhmCOHKqRVCi2qcO8kXxYCaAfCfNY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
@@ -43,15 +43,18 @@ stdenv.mkDerivation rec {
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
passthru.updateScript = gitUpdater { };
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Fast, small, safe, gradually typed embeddable scripting language derived from Lua";
|
||||
homepage = "https://luau-lang.org/";
|
||||
changelog = "https://github.com/luau-lang/luau/releases/tag/${version}";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ prince213 ];
|
||||
changelog = "https://github.com/luau-lang/luau/releases/tag/${finalAttrs.version}";
|
||||
license = lib.licenses.mit;
|
||||
platforms = lib.platforms.all;
|
||||
maintainers = with lib.maintainers; [
|
||||
prince213
|
||||
HeitorAugustoLN
|
||||
];
|
||||
mainProgram = "luau";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -0,0 +1,34 @@
|
||||
{
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
pkg-config,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "meowpdf";
|
||||
version = "1.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "monoamine11231";
|
||||
repo = "meowpdf";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-C5GqyZW0pDmBuaKM890hx2JZtkZqZx+x/RZFCPhpjho=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-hCGMm0ORKuyyWU5D9k+nthSwmq8ALz0qASLDaMiW30U=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
rustPlatform.bindgenHook
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "PDF viewer for the Kitty terminal with GUI-like usage and Vim-like keybindings written in Rust";
|
||||
homepage = "https://github.com/monoamine11231/meowpdf";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ arthsmn ];
|
||||
mainProgram = "meowpdf";
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
})
|
||||
@@ -23,13 +23,13 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "nwg-panel";
|
||||
version = "0.10.1";
|
||||
version = "0.10.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nwg-piotr";
|
||||
repo = "nwg-panel";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-ZQQRuYcctVKkE1GLx0VRAOZc0VTl1DuyR6y9CE5TbcE=";
|
||||
hash = "sha256-Wml9FXktLjTtYWTE/yoYDwFcPXeL1zhY3VgzrMW8DzE=";
|
||||
};
|
||||
|
||||
# No tests
|
||||
|
||||
@@ -63,6 +63,23 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
gputils
|
||||
];
|
||||
|
||||
# sdcc 4.5.0 massively rewrote sim/ucsim/Makefile.in, and lost the `.PHONY`
|
||||
# rule in the process. As a result, on macOS (which uses a case-insensitive
|
||||
# filesystem), the INSTALL file keeps the `install` target in the ucsim
|
||||
# directory from running. Nothing else creates the `man` output, causing the
|
||||
# entire build to fail.
|
||||
#
|
||||
# TODO: remove this when updating to the next release - it's been fixed in
|
||||
# upstream sdcc r15384 <https://sourceforge.net/p/sdcc/code/15384/>.
|
||||
|
||||
postPatch = ''
|
||||
if grep -q '\.PHONY:.*install' sim/ucsim/Makefile.in; then
|
||||
echo 'Upstream has added `.PHONY: install` rule; must remove `postPatch` from the Nix file.' >&2
|
||||
exit 1
|
||||
fi
|
||||
echo '.PHONY: install' >> sim/ucsim/Makefile.in
|
||||
'';
|
||||
|
||||
configureFlags =
|
||||
let
|
||||
excludedPorts =
|
||||
|
||||
@@ -19,17 +19,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "stalwart-mail";
|
||||
version = "0.11.7";
|
||||
version = "0.11.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "stalwartlabs";
|
||||
repo = "mail-server";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-pBCj/im5UB7A92LBuLeB6EAHTJEuN62BG5Nkj8qsNNA=";
|
||||
hash = "sha256-VqGosbSQxNeOS+kGtvXAmz6vyz5mJlXvKZM57B1Xue4=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-B+xsTVsh9QBAybKiJq0Sb7rveOsH05vuCmNQ5t/UZnk=";
|
||||
cargoHash = "sha256-iheURWxO0cOvO+FV01l2Vmo0B+S2mXzue6mx3gapftQ=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -7,16 +7,16 @@
|
||||
|
||||
php.buildComposerProject2 (finalAttrs: {
|
||||
pname = "phpstan";
|
||||
version = "2.1.13";
|
||||
version = "2.1.14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "phpstan";
|
||||
repo = "phpstan-src";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-/danRcl5yTJNtJFhuIRMvNuii7SZc/e9B+gM6MB6Avc=";
|
||||
hash = "sha256-Bo+jjTJ0EoU09z/lWl1ZyD639lz/C8v7OwPspSFNNp8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-IYcpPaXrML+YM3kcU527RMQjluczsISSyHGzsQFZuuc=";
|
||||
vendorHash = "sha256-exm2AofvmRqRF+TZ3hI5lsacMn+AvceNMWQvRrMTjsU=";
|
||||
composerStrictValidation = false;
|
||||
|
||||
doInstallCheck = true;
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
setuptools,
|
||||
@@ -31,6 +32,10 @@ buildPythonPackage rec {
|
||||
|
||||
pythonImportsCheck = [ "geocodio" ];
|
||||
|
||||
disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
"test_timeout"
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
@@ -1,26 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "sabyenc";
|
||||
version = "3.3.6";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1qbymi1626mmcxnsqdwnz2krxg7jvl4qbh8nwjj54z2p681wvjm4";
|
||||
};
|
||||
|
||||
# tests are not included in pypi distribution
|
||||
doCheck = false;
|
||||
|
||||
meta = {
|
||||
description = "Python yEnc package optimized for use within SABnzbd";
|
||||
homepage = "https://github.com/sabnzbd/sabyenc/";
|
||||
license = lib.licenses.lgpl3;
|
||||
maintainers = [ lib.maintainers.georgewhewell ];
|
||||
};
|
||||
}
|
||||
@@ -686,6 +686,7 @@ mapAliases ({
|
||||
ruff-lsp = throw "ruff-lsp has been deprecated, use `ruff server` instead"; # added 2025-04-21
|
||||
runway-python = throw "SDK has been deprecated and was archived by upstream"; # added 2023-05-03
|
||||
safe = throw "safe has been removed, it was unmaintained sinced October 2019"; # added 2024-07-28
|
||||
sabyenc = throw "sabyenc has been removed, due to no updates since June 2019 and being superseded by sabyenc3"; # added 2025-05-03
|
||||
sampledata = throw "sampledata has been removed, it was unmaintained since 2017"; # added 2024-07-27
|
||||
sapi-python-client = kbcstorage; # added 2022-04-20
|
||||
scikitimage = scikit-image; # added 2023-05-14
|
||||
|
||||
@@ -15356,8 +15356,6 @@ self: super: with self; {
|
||||
|
||||
sabctools = callPackage ../development/python-modules/sabctools { };
|
||||
|
||||
sabyenc = callPackage ../development/python-modules/sabyenc { };
|
||||
|
||||
sabyenc3 = callPackage ../development/python-modules/sabyenc3 { };
|
||||
|
||||
sacn = callPackage ../development/python-modules/sacn { };
|
||||
|
||||
Reference in New Issue
Block a user