Merge staging-next into staging

Changed files
+153 -115
pkgs
applications
networking
browsers
ids
suricata
version-management
git-absorb
by-name
ht
httpdirfs
in
incus
xi
development
compilers
libraries
python-modules
aioairzone-cloud
aioopenexchangerates
nbconvert
tools
buf
rust
typeshare
web
os-specific
linux
facetimehd
servers
tools
filesystems
httpdirfs
networking
mozillavpn
top-level
+8 -8
pkgs/applications/networking/browsers/chromium/upstream-info.nix
···
version = "2024-02-19";
};
};
-
hash = "sha256-b72MiRv4uxolKE92tK224FvyA56NM3FcCjijkc9m3ro=";
-
hash_deb_amd64 = "sha256-JsEJw8aEptesRiCtIrfHRQu1xq27TzHSmUr+dsvnV7o=";
-
version = "123.0.6312.86";
+
hash = "sha256-C17TPDVFW3+cHO1tcEghjI6H59TVPm9hdCrF2s5NI68=";
+
hash_deb_amd64 = "sha256-zmnBi4UBx52fQKHHJuUaCMuDJl7ntQzhG6h/yH7YPNU=";
+
version = "123.0.6312.105";
};
ungoogled-chromium = {
deps = {
···
version = "2024-02-19";
};
ungoogled-patches = {
-
hash = "sha256-ET/fAQCpCx1wadA52mcEA3lBlIZPIK/DX2r2vhGf79o=";
-
rev = "123.0.6312.86-1";
+
hash = "sha256-81SoZBOAAV0cAVzz3yOzBstRW3vWjmkFoFNjYdPnme4=";
+
rev = "123.0.6312.105-1";
};
};
-
hash = "sha256-b72MiRv4uxolKE92tK224FvyA56NM3FcCjijkc9m3ro=";
-
hash_deb_amd64 = "sha256-JsEJw8aEptesRiCtIrfHRQu1xq27TzHSmUr+dsvnV7o=";
-
version = "123.0.6312.86";
+
hash = "sha256-C17TPDVFW3+cHO1tcEghjI6H59TVPm9hdCrF2s5NI68=";
+
hash_deb_amd64 = "sha256-zmnBi4UBx52fQKHHJuUaCMuDJl7ntQzhG6h/yH7YPNU=";
+
version = "123.0.6312.105";
};
}
+2 -2
pkgs/applications/networking/ids/suricata/default.nix
···
, llvm
, pkg-config
, makeWrapper
+
, elfutils
, file
, hyperscan
, jansson
, libbpf
, libcap_ng
-
, libelf
, libevent
, libmaxminddb
, libnet
···
;
buildInputs = [
+
elfutils
jansson
libbpf
libcap_ng
-
libelf
libevent
libmagic
libmaxminddb
+3 -3
pkgs/applications/version-management/git-absorb/default.nix
···
rustPlatform.buildRustPackage rec {
pname = "git-absorb";
-
version = "0.6.12";
+
version = "0.6.13";
src = fetchFromGitHub {
owner = "tummychow";
repo = "git-absorb";
rev = "refs/tags/${version}";
-
hash = "sha256-yHCO1v1d0MUakae16fFVvtKG3rVxU/Cii/G6IKzyebA=";
+
hash = "sha256-k0smjIpy/+y6M5p24Ju4CVJkThzWOgp5kBJuVnCrXiE=";
};
nativeBuildInputs = [ installShellFiles ];
buildInputs = lib.optionals stdenv.isDarwin [ Security ];
-
cargoHash = "sha256-Bx7gH7jSLizG95JyBtziPBby9mF1Nj3CQexIg6gaiM0=";
+
cargoHash = "sha256-bRPdtiC9Dwi21g4WtjawQ2AUdizUEX2zPHAnG08D3ac=";
postInstall = ''
installManPage Documentation/git-absorb.1
+70
pkgs/by-name/ht/httpdirfs/package.nix
···
+
{
+
curl,
+
expat,
+
fetchFromGitHub,
+
fuse,
+
gumbo,
+
help2man,
+
lib,
+
libuuid,
+
nix-update-script,
+
pkg-config,
+
stdenv,
+
testers,
+
}:
+
+
stdenv.mkDerivation (finalAttrs: {
+
pname = "httpdirfs";
+
version = "1.2.5";
+
+
src = fetchFromGitHub {
+
owner = "fangfufu";
+
repo = "httpdirfs";
+
rev = "refs/tags/${finalAttrs.version}";
+
sha256 = "sha256-PUYsT0VDEzerPqwrLJrET4kSsWsQhtnfmLepeaqtA+I=";
+
};
+
+
postPatch = lib.optional stdenv.isDarwin ''
+
substituteInPlace Makefile --replace-fail '-fanalyzer' '-Xanalyzer'
+
'';
+
+
nativeBuildInputs = [
+
help2man
+
pkg-config
+
];
+
+
buildInputs = [
+
curl
+
expat
+
fuse
+
gumbo
+
libuuid
+
];
+
+
makeFlags = [ "prefix=${placeholder "out"}" ];
+
+
postBuild = ''
+
make man
+
'';
+
+
passthru = {
+
# Disabled for Darwin because requires macFUSE installed outside NixOS
+
tests.version = lib.optionalAttrs stdenv.isLinux (
+
testers.testVersion {
+
command = "${lib.getExe finalAttrs.finalPackage} --version";
+
package = finalAttrs.finalPackage;
+
}
+
);
+
updateScript = nix-update-script { };
+
};
+
+
meta = {
+
changelog = "https://github.com/fangfufu/httpdirfs/releases/tag/${finalAttrs.version}";
+
description = "A FUSE filesystem for HTTP directory listings";
+
homepage = "https://github.com/fangfufu/httpdirfs";
+
license = lib.licenses.gpl3Only;
+
mainProgram = "httpdirfs";
+
maintainers = with lib.maintainers; [ sbruder schnusch anthonyroussel ];
+
platforms = lib.platforms.unix;
+
};
+
})
+5 -5
pkgs/by-name/in/incus/ui.nix
···
stdenv.mkDerivation rec {
pname = "incus-ui";
-
version = "0.6";
+
version = "0.7";
src = fetchFromGitHub {
owner = "canonical";
repo = "lxd-ui";
rev = "refs/tags/${version}";
-
hash = "sha256-3Ts6lKyzpMDVATCKD1fFIGTskWzWpQUT9S8cPFnlEOs=";
+
hash = "sha256-DJLkXZpParmEYHbTpl6KFC9l9y5DqzUTrC0pb2dJXI4=";
};
offlineCache = fetchYarnDeps {
yarnLock = "${src}/yarn.lock";
-
hash = "sha256-0pyxwMGGqogEe1w3sail8NUDHtxLQZU9Wg8E6rQNy4o=";
+
hash = "sha256-ckTWE/czzvxbGOF8fsJ3W1sal7+NaHquoSjZSPjkGj4=";
};
zabbly = fetchFromGitHub {
owner = "zabbly";
repo = "incus";
-
rev = "3eabc1960e99e7e515916e3ea7068a412a8c420b";
-
hash = "sha256-Kw53Qjurc6WPswB38v6wuRhuuGE34uYxNoAKH4UmTBE=";
+
rev = "c83023587eb0e3b01c99ba26e63f757ac15c6f9c";
+
hash = "sha256-cWKp4ALrae6nEBLvWcOM1T+Aca7eHLwsRguH9aSb10Y=";
};
patchPhase = ''
+3 -3
pkgs/by-name/xi/xiu/package.nix
···
rustPlatform.buildRustPackage rec {
pname = "xiu";
-
version = "0.12.5";
+
version = "0.12.6";
src = fetchFromGitHub {
owner = "harlanc";
repo = "xiu";
rev = "v${version}";
-
hash = "sha256-JST8nxsT+w524VzNeIW38Oct/n7VJ/nvrmgks2Vff30=";
+
hash = "sha256-53fVb5c9uS92/rPvZDWXxZX42p4cHqumGe6Dw+/hLvk=";
};
-
cargoHash = "sha256-te60gZdDmbgOF6rLDAnvDx6vUbmCz3pC/wbu/iXgxAw=";
+
cargoHash = "sha256-ICZQ+UJ4LPNSeT9SjdcCUXgam40hMAOrJmLIwPEfqs4=";
nativeBuildInputs = [
cmake
+2 -2
pkgs/development/compilers/go/1.21.nix
···
in
stdenv.mkDerivation (finalAttrs: {
pname = "go";
-
version = "1.21.8";
+
version = "1.21.9";
src = fetchurl {
url = "https://go.dev/dl/go${finalAttrs.version}.src.tar.gz";
-
hash = "sha256-3IBs91qH4UFLW0w9y53T6cyY9M/M7EK3r2F9WmWKPEM=";
+
hash = "sha256-WPDFztRaABK84v96nfA+Eoq8yIGOur5QJ7uSuv4g5CE=";
};
strictDeps = true;
+4 -2
pkgs/development/libraries/spdk/default.nix
···
, openssl
, pkg-config
, zlib
+
, zstd
, libpcap
, libnl
-
, libelf
+
, elfutils
, jansson
, ensureNewerSourcesForZipFilesHook
}:
···
jansson
libaio
libbsd
-
libelf
+
elfutils
libuuid
libpcap
libnl
···
openssl
ncurses
zlib
+
zstd
];
patches = [
+12 -17
pkgs/development/python-modules/aioairzone-cloud/default.nix
···
-
{ lib
-
, aiohttp
-
, buildPythonPackage
-
, fetchFromGitHub
-
, pythonOlder
-
, setuptools
+
{
+
lib,
+
aiohttp,
+
buildPythonPackage,
+
fetchFromGitHub,
+
pythonOlder,
+
setuptools,
}:
buildPythonPackage rec {
pname = "aioairzone-cloud";
-
version = "0.4.6";
+
version = "0.4.7";
pyproject = true;
disabled = pythonOlder "3.7";
···
owner = "Noltari";
repo = "aioairzone-cloud";
rev = "refs/tags/${version}";
-
hash = "sha256-EcvHwBSHjKvPqwGCPPpannuSZcDI2Lt2hT5NSgkwfq8=";
+
hash = "sha256-DIWRYGDdK/wq1TrPSo9I1oZv5jX4rY4z+u7CTwJtyts=";
};
-
nativeBuildInputs = [
-
setuptools
-
];
+
build-system = [ setuptools ];
-
propagatedBuildInputs = [
-
aiohttp
-
];
+
dependencies = [ aiohttp ];
-
pythonImportsCheck = [
-
"aioairzone_cloud"
-
];
+
pythonImportsCheck = [ "aioairzone_cloud" ];
# Module has no tests
doCheck = false;
+21 -25
pkgs/development/python-modules/aioopenexchangerates/default.nix
···
-
{ lib
-
, aiohttp
-
, aioresponses
-
, pydantic
-
, buildPythonPackage
-
, fetchFromGitHub
-
, poetry-core
-
, pytest-aiohttp
-
, pytestCheckHook
-
, pythonOlder
-
, pythonRelaxDepsHook
+
{
+
lib,
+
aiohttp,
+
aioresponses,
+
pydantic,
+
buildPythonPackage,
+
fetchFromGitHub,
+
poetry-core,
+
pytest-aiohttp,
+
pytestCheckHook,
+
pythonOlder,
+
pythonRelaxDepsHook,
}:
buildPythonPackage rec {
pname = "aioopenexchangerates";
-
version = "0.4.8";
+
version = "0.4.9";
pyproject = true;
disabled = pythonOlder "3.9";
···
owner = "MartinHjelmare";
repo = "aioopenexchangerates";
rev = "refs/tags/v${version}";
-
hash = "sha256-qwqhbHp4JPsbA6g7SI2frtqhayCmA1s3pTW2S4r6gmw=";
+
hash = "sha256-goOzp5nPkQCtGV7U71ek1LQ93Ko5BdEvawYb/feGRQQ=";
};
postPatch = ''
substituteInPlace pyproject.toml \
-
--replace " --cov=aioopenexchangerates --cov-report=term-missing:skip-covered" ""
+
--replace-fail " --cov=aioopenexchangerates --cov-report=term-missing:skip-covered" ""
'';
-
nativeBuildInputs = [
-
poetry-core
-
pythonRelaxDepsHook
-
];
+
pythonRelaxDeps = [ "pydantic" ];
+
+
build-system = [ poetry-core ];
-
pythonRelaxDeps = [
-
"pydantic"
-
];
+
nativeBuildInputs = [ pythonRelaxDepsHook ];
-
propagatedBuildInputs = [
+
dependencies = [
aiohttp
pydantic
];
···
pytestCheckHook
];
-
pythonImportsCheck = [
-
"aioopenexchangerates"
-
];
+
pythonImportsCheck = [ "aioopenexchangerates" ];
meta = with lib; {
description = "Library for the Openexchangerates API";
+2 -2
pkgs/development/python-modules/nbconvert/default.nix
···
};
in buildPythonPackage rec {
pname = "nbconvert";
-
version = "7.16.2";
+
version = "7.16.3";
pyproject = true;
disabled = pythonOlder "3.8";
src = fetchPypi {
inherit pname version;
-
hash = "sha256-gxDt1B4cQ5R+Ts8WYUxhRp68AkiY64CMzgmZhg/J+xY=";
+
hash = "sha256-pnM7eM49R8P4XlBJmElbB+bqnPm/bsHJjdpj7GrRkUI=";
};
# Add $out/share/jupyter to the list of paths that are used to search for
+3 -3
pkgs/development/tools/buf/default.nix
···
buildGoModule rec {
pname = "buf";
-
version = "1.30.0";
+
version = "1.30.1";
src = fetchFromGitHub {
owner = "bufbuild";
repo = pname;
rev = "v${version}";
-
hash = "sha256-SHwmX9/9qqhpTDVKf+0HAJqPvSKKoUyxHqCe8WXhMUc=";
+
hash = "sha256-1He9Vei2OXiBszZvATk1ALGWAneC4yucPohp/O6gsTo=";
};
-
vendorHash = "sha256-4ccctJ5C4/Ff+wLrZPR1oS0tjqkULAsTjKm3X8WDr6o=";
+
vendorHash = "sha256-OXzEcpEYnYndYHRhKm2oYsm463ZWeujOvQpIj0zz7+g=";
patches = [
# Skip a test that requires networking to be available to work,
+3 -3
pkgs/development/tools/rust/typeshare/default.nix
···
rustPlatform.buildRustPackage rec {
pname = "typeshare";
-
version = "1.8.0";
+
version = "1.9.0";
src = fetchFromGitHub {
owner = "1password";
repo = "typeshare";
rev = "v${version}";
-
hash = "sha256-ykrtvXPXxNYrUQNScit+REb7/6mE0FOzBQxPdbWodgk=";
+
hash = "sha256-20IaTC0fMt6ADSwyQh9yBn3i3z6cmQ1j/wy1KNB3Dog=";
};
-
cargoHash = "sha256-/oIezLqd3hkWrfO2pml31de+pgpEXhXHxIxt10rPJZo=";
+
cargoHash = "sha256-5jY4GO/EbBokE9p9e68bTKj6nJ0LhtWYHtFGfTIf9Po=";
nativeBuildInputs = [ installShellFiles ];
+5 -5
pkgs/development/web/bun/default.nix
···
}:
stdenvNoCC.mkDerivation rec {
-
version = "1.0.36";
+
version = "1.1.0";
pname = "bun";
src = passthru.sources.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}");
···
sources = {
"aarch64-darwin" = fetchurl {
url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-aarch64.zip";
-
hash = "sha256-NYsCwYdYL8cw5uPaViCA+fcaP1znNzvRCJuhnFixx84=";
+
hash = "sha256-ggODKY9y8J0xY1SImiQq0qVepi6ywXB95kyg6zPoaLw=";
};
"aarch64-linux" = fetchurl {
url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-aarch64.zip";
-
hash = "sha256-ztRE4MxrAkSvORTGU5veDj5qhchYbsY4BxP6duZLeoQ=";
+
hash = "sha256-QFA1MjtBAt3a/HAe2Mdv8LA2Iv5ayO279gOOuFqEZ/E=";
};
"x86_64-darwin" = fetchurl {
url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-x64.zip";
-
hash = "sha256-p8YqXW1iShvTX2bB0UrD9yh5PMpcaoiUJ5ZfCrEZmsI=";
+
hash = "sha256-Dwv5Osqel0wWuzprXOXiIq87259REPs5ZSczhXDG23k=";
};
"x86_64-linux" = fetchurl {
url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-x64.zip";
-
hash = "sha256-+AR0EYOVOgvElDzQjCtlCg5oZFBtLfdEmrL1jFWDAfQ=";
+
hash = "sha256-WhfqYTVkdaSjoN7zRcRodfLPK2K579tluSEEXTVzOFM=";
};
};
updateScript = writeShellScript "update-bun" ''
+2 -2
pkgs/os-specific/linux/facetimehd/default.nix
···
stdenv.mkDerivation rec {
name = "facetimehd-${version}-${kernel.version}";
-
version = "0.6.8";
+
version = "0.6.8.1";
# Note: When updating this revision:
# 1. Also update pkgs/os-specific/linux/firmware/facetimehd-firmware/
···
owner = "patjak";
repo = "facetimehd";
rev = version;
-
sha256 = "sha256-Tze85Hx1YmStAKenmF/S1JuMDq5eVjBcs3LSWXjyE7w=";
+
sha256 = "sha256-h5Erga2hlDIWdDKQbkmkLY1aNCibFM7SVSnxVcoToaM=";
};
preConfigure = ''
+3 -2
pkgs/servers/frr/clippy-helper.nix
···
, flex
, bison
, pkg-config
-
, libelf
+
, elfutils
, perl
, python3
···
];
buildInputs = [
-
libelf
python3
+
] ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform elfutils) [
+
elfutils
];
configureFlags = [
+3 -2
pkgs/servers/frr/default.nix
···
, c-ares
, json_c
, libcap
-
, libelf
+
, elfutils
, libunwind
, libyang
, net-snmp
···
buildInputs = [
c-ares
json_c
-
libelf
libunwind
libyang
openssl
···
libcap
] ++ lib.optionals snmpSupport [
net-snmp
+
] ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform elfutils) [
+
elfutils
];
# otherwise in cross-compilation: "configure: error: no working python version found"
-27
pkgs/tools/filesystems/httpdirfs/default.nix
···
-
{ lib, stdenv, fetchFromGitHub, pkg-config, curl, expat, fuse, gumbo, libuuid }:
-
-
stdenv.mkDerivation rec {
-
pname = "httpdirfs";
-
version = "1.2.3";
-
-
src = fetchFromGitHub {
-
owner = "fangfufu";
-
repo = pname;
-
rev = version;
-
sha256 = "sha256-rdeBlAV3t/si9x488tirUGLZRYAxh13zdRIQe0OPd+A=";
-
};
-
-
nativeBuildInputs = [ pkg-config ];
-
buildInputs = [ curl expat fuse gumbo libuuid ];
-
-
makeFlags = [ "prefix=${placeholder "out"}" ];
-
-
meta = with lib; {
-
description = "A FUSE filesystem for HTTP directory listings";
-
homepage = "https://github.com/fangfufu/httpdirfs";
-
license = licenses.gpl3Only;
-
maintainers = with maintainers; [ sbruder schnusch ];
-
platforms = platforms.unix;
-
mainProgram = "httpdirfs";
-
};
-
}
+2
pkgs/tools/networking/mozillavpn/default.nix
···
, qtnetworkauth
, qtsvg
, qttools
+
, qtwayland
, qtwebsockets
, rustPlatform
, rustc
···
qtbase
qtnetworkauth
qtsvg
+
qtwayland
qtwebsockets
];
nativeBuildInputs = [
-2
pkgs/top-level/all-packages.nix
···
http-getter = callPackage ../applications/networking/flent/http-getter.nix { };
-
httpdirfs = callPackage ../tools/filesystems/httpdirfs { };
-
httpdump = callPackage ../tools/security/httpdump { };
httpie = with python3Packages; toPythonApplication httpie;