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