Merge staging-next into staging
This commit is contained in:
commit
75a5384ed5
|
@ -15,9 +15,9 @@
|
||||||
version = "2024-02-19";
|
version = "2024-02-19";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
hash = "sha256-b72MiRv4uxolKE92tK224FvyA56NM3FcCjijkc9m3ro=";
|
hash = "sha256-C17TPDVFW3+cHO1tcEghjI6H59TVPm9hdCrF2s5NI68=";
|
||||||
hash_deb_amd64 = "sha256-JsEJw8aEptesRiCtIrfHRQu1xq27TzHSmUr+dsvnV7o=";
|
hash_deb_amd64 = "sha256-zmnBi4UBx52fQKHHJuUaCMuDJl7ntQzhG6h/yH7YPNU=";
|
||||||
version = "123.0.6312.86";
|
version = "123.0.6312.105";
|
||||||
};
|
};
|
||||||
ungoogled-chromium = {
|
ungoogled-chromium = {
|
||||||
deps = {
|
deps = {
|
||||||
|
@ -28,12 +28,12 @@
|
||||||
version = "2024-02-19";
|
version = "2024-02-19";
|
||||||
};
|
};
|
||||||
ungoogled-patches = {
|
ungoogled-patches = {
|
||||||
hash = "sha256-ET/fAQCpCx1wadA52mcEA3lBlIZPIK/DX2r2vhGf79o=";
|
hash = "sha256-81SoZBOAAV0cAVzz3yOzBstRW3vWjmkFoFNjYdPnme4=";
|
||||||
rev = "123.0.6312.86-1";
|
rev = "123.0.6312.105-1";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
hash = "sha256-b72MiRv4uxolKE92tK224FvyA56NM3FcCjijkc9m3ro=";
|
hash = "sha256-C17TPDVFW3+cHO1tcEghjI6H59TVPm9hdCrF2s5NI68=";
|
||||||
hash_deb_amd64 = "sha256-JsEJw8aEptesRiCtIrfHRQu1xq27TzHSmUr+dsvnV7o=";
|
hash_deb_amd64 = "sha256-zmnBi4UBx52fQKHHJuUaCMuDJl7ntQzhG6h/yH7YPNU=";
|
||||||
version = "123.0.6312.86";
|
version = "123.0.6312.105";
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -5,12 +5,12 @@
|
||||||
, llvm
|
, llvm
|
||||||
, pkg-config
|
, pkg-config
|
||||||
, makeWrapper
|
, makeWrapper
|
||||||
|
, elfutils
|
||||||
, file
|
, file
|
||||||
, hyperscan
|
, hyperscan
|
||||||
, jansson
|
, jansson
|
||||||
, libbpf
|
, libbpf
|
||||||
, libcap_ng
|
, libcap_ng
|
||||||
, libelf
|
|
||||||
, libevent
|
, libevent
|
||||||
, libmaxminddb
|
, libmaxminddb
|
||||||
, libnet
|
, libnet
|
||||||
|
@ -50,10 +50,10 @@ stdenv.mkDerivation rec {
|
||||||
;
|
;
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
|
elfutils
|
||||||
jansson
|
jansson
|
||||||
libbpf
|
libbpf
|
||||||
libcap_ng
|
libcap_ng
|
||||||
libelf
|
|
||||||
libevent
|
libevent
|
||||||
libmagic
|
libmagic
|
||||||
libmaxminddb
|
libmaxminddb
|
||||||
|
|
|
@ -2,20 +2,20 @@
|
||||||
|
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "git-absorb";
|
pname = "git-absorb";
|
||||||
version = "0.6.12";
|
version = "0.6.13";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "tummychow";
|
owner = "tummychow";
|
||||||
repo = "git-absorb";
|
repo = "git-absorb";
|
||||||
rev = "refs/tags/${version}";
|
rev = "refs/tags/${version}";
|
||||||
hash = "sha256-yHCO1v1d0MUakae16fFVvtKG3rVxU/Cii/G6IKzyebA=";
|
hash = "sha256-k0smjIpy/+y6M5p24Ju4CVJkThzWOgp5kBJuVnCrXiE=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ installShellFiles ];
|
nativeBuildInputs = [ installShellFiles ];
|
||||||
|
|
||||||
buildInputs = lib.optionals stdenv.isDarwin [ Security ];
|
buildInputs = lib.optionals stdenv.isDarwin [ Security ];
|
||||||
|
|
||||||
cargoHash = "sha256-Bx7gH7jSLizG95JyBtziPBby9mF1Nj3CQexIg6gaiM0=";
|
cargoHash = "sha256-bRPdtiC9Dwi21g4WtjawQ2AUdizUEX2zPHAnG08D3ac=";
|
||||||
|
|
||||||
postInstall = ''
|
postInstall = ''
|
||||||
installManPage Documentation/git-absorb.1
|
installManPage Documentation/git-absorb.1
|
||||||
|
|
70
pkgs/by-name/ht/httpdirfs/package.nix
Normal file
70
pkgs/by-name/ht/httpdirfs/package.nix
Normal file
|
@ -0,0 +1,70 @@
|
||||||
|
{
|
||||||
|
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;
|
||||||
|
};
|
||||||
|
})
|
|
@ -11,25 +11,25 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "incus-ui";
|
pname = "incus-ui";
|
||||||
version = "0.6";
|
version = "0.7";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "canonical";
|
owner = "canonical";
|
||||||
repo = "lxd-ui";
|
repo = "lxd-ui";
|
||||||
rev = "refs/tags/${version}";
|
rev = "refs/tags/${version}";
|
||||||
hash = "sha256-3Ts6lKyzpMDVATCKD1fFIGTskWzWpQUT9S8cPFnlEOs=";
|
hash = "sha256-DJLkXZpParmEYHbTpl6KFC9l9y5DqzUTrC0pb2dJXI4=";
|
||||||
};
|
};
|
||||||
|
|
||||||
offlineCache = fetchYarnDeps {
|
offlineCache = fetchYarnDeps {
|
||||||
yarnLock = "${src}/yarn.lock";
|
yarnLock = "${src}/yarn.lock";
|
||||||
hash = "sha256-0pyxwMGGqogEe1w3sail8NUDHtxLQZU9Wg8E6rQNy4o=";
|
hash = "sha256-ckTWE/czzvxbGOF8fsJ3W1sal7+NaHquoSjZSPjkGj4=";
|
||||||
};
|
};
|
||||||
|
|
||||||
zabbly = fetchFromGitHub {
|
zabbly = fetchFromGitHub {
|
||||||
owner = "zabbly";
|
owner = "zabbly";
|
||||||
repo = "incus";
|
repo = "incus";
|
||||||
rev = "3eabc1960e99e7e515916e3ea7068a412a8c420b";
|
rev = "c83023587eb0e3b01c99ba26e63f757ac15c6f9c";
|
||||||
hash = "sha256-Kw53Qjurc6WPswB38v6wuRhuuGE34uYxNoAKH4UmTBE=";
|
hash = "sha256-cWKp4ALrae6nEBLvWcOM1T+Aca7eHLwsRguH9aSb10Y=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patchPhase = ''
|
patchPhase = ''
|
||||||
|
|
|
@ -11,16 +11,16 @@
|
||||||
|
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "xiu";
|
pname = "xiu";
|
||||||
version = "0.12.5";
|
version = "0.12.6";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "harlanc";
|
owner = "harlanc";
|
||||||
repo = "xiu";
|
repo = "xiu";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-JST8nxsT+w524VzNeIW38Oct/n7VJ/nvrmgks2Vff30=";
|
hash = "sha256-53fVb5c9uS92/rPvZDWXxZX42p4cHqumGe6Dw+/hLvk=";
|
||||||
};
|
};
|
||||||
|
|
||||||
cargoHash = "sha256-te60gZdDmbgOF6rLDAnvDx6vUbmCz3pC/wbu/iXgxAw=";
|
cargoHash = "sha256-ICZQ+UJ4LPNSeT9SjdcCUXgam40hMAOrJmLIwPEfqs4=";
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
cmake
|
cmake
|
||||||
|
|
|
@ -46,11 +46,11 @@ let
|
||||||
in
|
in
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "go";
|
pname = "go";
|
||||||
version = "1.21.8";
|
version = "1.21.9";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://go.dev/dl/go${finalAttrs.version}.src.tar.gz";
|
url = "https://go.dev/dl/go${finalAttrs.version}.src.tar.gz";
|
||||||
hash = "sha256-3IBs91qH4UFLW0w9y53T6cyY9M/M7EK3r2F9WmWKPEM=";
|
hash = "sha256-WPDFztRaABK84v96nfA+Eoq8yIGOur5QJ7uSuv4g5CE=";
|
||||||
};
|
};
|
||||||
|
|
||||||
strictDeps = true;
|
strictDeps = true;
|
||||||
|
|
|
@ -11,9 +11,10 @@
|
||||||
, openssl
|
, openssl
|
||||||
, pkg-config
|
, pkg-config
|
||||||
, zlib
|
, zlib
|
||||||
|
, zstd
|
||||||
, libpcap
|
, libpcap
|
||||||
, libnl
|
, libnl
|
||||||
, libelf
|
, elfutils
|
||||||
, jansson
|
, jansson
|
||||||
, ensureNewerSourcesForZipFilesHook
|
, ensureNewerSourcesForZipFilesHook
|
||||||
}:
|
}:
|
||||||
|
@ -44,7 +45,7 @@ stdenv.mkDerivation rec {
|
||||||
jansson
|
jansson
|
||||||
libaio
|
libaio
|
||||||
libbsd
|
libbsd
|
||||||
libelf
|
elfutils
|
||||||
libuuid
|
libuuid
|
||||||
libpcap
|
libpcap
|
||||||
libnl
|
libnl
|
||||||
|
@ -52,6 +53,7 @@ stdenv.mkDerivation rec {
|
||||||
openssl
|
openssl
|
||||||
ncurses
|
ncurses
|
||||||
zlib
|
zlib
|
||||||
|
zstd
|
||||||
];
|
];
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
|
|
|
@ -1,14 +1,15 @@
|
||||||
{ lib
|
{
|
||||||
, aiohttp
|
lib,
|
||||||
, buildPythonPackage
|
aiohttp,
|
||||||
, fetchFromGitHub
|
buildPythonPackage,
|
||||||
, pythonOlder
|
fetchFromGitHub,
|
||||||
, setuptools
|
pythonOlder,
|
||||||
|
setuptools,
|
||||||
}:
|
}:
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "aioairzone-cloud";
|
pname = "aioairzone-cloud";
|
||||||
version = "0.4.6";
|
version = "0.4.7";
|
||||||
pyproject = true;
|
pyproject = true;
|
||||||
|
|
||||||
disabled = pythonOlder "3.7";
|
disabled = pythonOlder "3.7";
|
||||||
|
@ -17,20 +18,14 @@ buildPythonPackage rec {
|
||||||
owner = "Noltari";
|
owner = "Noltari";
|
||||||
repo = "aioairzone-cloud";
|
repo = "aioairzone-cloud";
|
||||||
rev = "refs/tags/${version}";
|
rev = "refs/tags/${version}";
|
||||||
hash = "sha256-EcvHwBSHjKvPqwGCPPpannuSZcDI2Lt2hT5NSgkwfq8=";
|
hash = "sha256-DIWRYGDdK/wq1TrPSo9I1oZv5jX4rY4z+u7CTwJtyts=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
build-system = [ setuptools ];
|
||||||
setuptools
|
|
||||||
];
|
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
dependencies = [ aiohttp ];
|
||||||
aiohttp
|
|
||||||
];
|
|
||||||
|
|
||||||
pythonImportsCheck = [
|
pythonImportsCheck = [ "aioairzone_cloud" ];
|
||||||
"aioairzone_cloud"
|
|
||||||
];
|
|
||||||
|
|
||||||
# Module has no tests
|
# Module has no tests
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
|
|
|
@ -1,19 +1,20 @@
|
||||||
{ lib
|
{
|
||||||
, aiohttp
|
lib,
|
||||||
, aioresponses
|
aiohttp,
|
||||||
, pydantic
|
aioresponses,
|
||||||
, buildPythonPackage
|
pydantic,
|
||||||
, fetchFromGitHub
|
buildPythonPackage,
|
||||||
, poetry-core
|
fetchFromGitHub,
|
||||||
, pytest-aiohttp
|
poetry-core,
|
||||||
, pytestCheckHook
|
pytest-aiohttp,
|
||||||
, pythonOlder
|
pytestCheckHook,
|
||||||
, pythonRelaxDepsHook
|
pythonOlder,
|
||||||
|
pythonRelaxDepsHook,
|
||||||
}:
|
}:
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "aioopenexchangerates";
|
pname = "aioopenexchangerates";
|
||||||
version = "0.4.8";
|
version = "0.4.9";
|
||||||
pyproject = true;
|
pyproject = true;
|
||||||
|
|
||||||
disabled = pythonOlder "3.9";
|
disabled = pythonOlder "3.9";
|
||||||
|
@ -22,24 +23,21 @@ buildPythonPackage rec {
|
||||||
owner = "MartinHjelmare";
|
owner = "MartinHjelmare";
|
||||||
repo = "aioopenexchangerates";
|
repo = "aioopenexchangerates";
|
||||||
rev = "refs/tags/v${version}";
|
rev = "refs/tags/v${version}";
|
||||||
hash = "sha256-qwqhbHp4JPsbA6g7SI2frtqhayCmA1s3pTW2S4r6gmw=";
|
hash = "sha256-goOzp5nPkQCtGV7U71ek1LQ93Ko5BdEvawYb/feGRQQ=";
|
||||||
};
|
};
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
substituteInPlace pyproject.toml \
|
substituteInPlace pyproject.toml \
|
||||||
--replace " --cov=aioopenexchangerates --cov-report=term-missing:skip-covered" ""
|
--replace-fail " --cov=aioopenexchangerates --cov-report=term-missing:skip-covered" ""
|
||||||
'';
|
'';
|
||||||
|
|
||||||
nativeBuildInputs = [
|
pythonRelaxDeps = [ "pydantic" ];
|
||||||
poetry-core
|
|
||||||
pythonRelaxDepsHook
|
|
||||||
];
|
|
||||||
|
|
||||||
pythonRelaxDeps = [
|
build-system = [ poetry-core ];
|
||||||
"pydantic"
|
|
||||||
];
|
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
nativeBuildInputs = [ pythonRelaxDepsHook ];
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
aiohttp
|
aiohttp
|
||||||
pydantic
|
pydantic
|
||||||
];
|
];
|
||||||
|
@ -50,9 +48,7 @@ buildPythonPackage rec {
|
||||||
pytestCheckHook
|
pytestCheckHook
|
||||||
];
|
];
|
||||||
|
|
||||||
pythonImportsCheck = [
|
pythonImportsCheck = [ "aioopenexchangerates" ];
|
||||||
"aioopenexchangerates"
|
|
||||||
];
|
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Library for the Openexchangerates API";
|
description = "Library for the Openexchangerates API";
|
||||||
|
|
|
@ -33,14 +33,14 @@ let
|
||||||
};
|
};
|
||||||
in buildPythonPackage rec {
|
in buildPythonPackage rec {
|
||||||
pname = "nbconvert";
|
pname = "nbconvert";
|
||||||
version = "7.16.2";
|
version = "7.16.3";
|
||||||
pyproject = true;
|
pyproject = true;
|
||||||
|
|
||||||
disabled = pythonOlder "3.8";
|
disabled = pythonOlder "3.8";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
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
|
# Add $out/share/jupyter to the list of paths that are used to search for
|
||||||
|
|
|
@ -10,16 +10,16 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "buf";
|
pname = "buf";
|
||||||
version = "1.30.0";
|
version = "1.30.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "bufbuild";
|
owner = "bufbuild";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-SHwmX9/9qqhpTDVKf+0HAJqPvSKKoUyxHqCe8WXhMUc=";
|
hash = "sha256-1He9Vei2OXiBszZvATk1ALGWAneC4yucPohp/O6gsTo=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorHash = "sha256-4ccctJ5C4/Ff+wLrZPR1oS0tjqkULAsTjKm3X8WDr6o=";
|
vendorHash = "sha256-OXzEcpEYnYndYHRhKm2oYsm463ZWeujOvQpIj0zz7+g=";
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
# Skip a test that requires networking to be available to work,
|
# Skip a test that requires networking to be available to work,
|
||||||
|
|
|
@ -6,16 +6,16 @@
|
||||||
|
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "typeshare";
|
pname = "typeshare";
|
||||||
version = "1.8.0";
|
version = "1.9.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "1password";
|
owner = "1password";
|
||||||
repo = "typeshare";
|
repo = "typeshare";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-ykrtvXPXxNYrUQNScit+REb7/6mE0FOzBQxPdbWodgk=";
|
hash = "sha256-20IaTC0fMt6ADSwyQh9yBn3i3z6cmQ1j/wy1KNB3Dog=";
|
||||||
};
|
};
|
||||||
|
|
||||||
cargoHash = "sha256-/oIezLqd3hkWrfO2pml31de+pgpEXhXHxIxt10rPJZo=";
|
cargoHash = "sha256-5jY4GO/EbBokE9p9e68bTKj6nJ0LhtWYHtFGfTIf9Po=";
|
||||||
|
|
||||||
nativeBuildInputs = [ installShellFiles ];
|
nativeBuildInputs = [ installShellFiles ];
|
||||||
|
|
||||||
|
|
|
@ -12,7 +12,7 @@
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenvNoCC.mkDerivation rec {
|
stdenvNoCC.mkDerivation rec {
|
||||||
version = "1.0.36";
|
version = "1.1.0";
|
||||||
pname = "bun";
|
pname = "bun";
|
||||||
|
|
||||||
src = passthru.sources.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}");
|
src = passthru.sources.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}");
|
||||||
|
@ -51,19 +51,19 @@ stdenvNoCC.mkDerivation rec {
|
||||||
sources = {
|
sources = {
|
||||||
"aarch64-darwin" = fetchurl {
|
"aarch64-darwin" = fetchurl {
|
||||||
url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-aarch64.zip";
|
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 {
|
"aarch64-linux" = fetchurl {
|
||||||
url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-aarch64.zip";
|
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 {
|
"x86_64-darwin" = fetchurl {
|
||||||
url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-x64.zip";
|
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 {
|
"x86_64-linux" = fetchurl {
|
||||||
url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-x64.zip";
|
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" ''
|
updateScript = writeShellScript "update-bun" ''
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "facetimehd-${version}-${kernel.version}";
|
name = "facetimehd-${version}-${kernel.version}";
|
||||||
version = "0.6.8";
|
version = "0.6.8.1";
|
||||||
|
|
||||||
# Note: When updating this revision:
|
# Note: When updating this revision:
|
||||||
# 1. Also update pkgs/os-specific/linux/firmware/facetimehd-firmware/
|
# 1. Also update pkgs/os-specific/linux/firmware/facetimehd-firmware/
|
||||||
|
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
|
||||||
owner = "patjak";
|
owner = "patjak";
|
||||||
repo = "facetimehd";
|
repo = "facetimehd";
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "sha256-Tze85Hx1YmStAKenmF/S1JuMDq5eVjBcs3LSWXjyE7w=";
|
sha256 = "sha256-h5Erga2hlDIWdDKQbkmkLY1aNCibFM7SVSnxVcoToaM=";
|
||||||
};
|
};
|
||||||
|
|
||||||
preConfigure = ''
|
preConfigure = ''
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
, flex
|
, flex
|
||||||
, bison
|
, bison
|
||||||
, pkg-config
|
, pkg-config
|
||||||
, libelf
|
, elfutils
|
||||||
, perl
|
, perl
|
||||||
, python3
|
, python3
|
||||||
|
|
||||||
|
@ -29,8 +29,9 @@ stdenv.mkDerivation rec {
|
||||||
];
|
];
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
libelf
|
|
||||||
python3
|
python3
|
||||||
|
] ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform elfutils) [
|
||||||
|
elfutils
|
||||||
];
|
];
|
||||||
|
|
||||||
configureFlags = [
|
configureFlags = [
|
||||||
|
|
|
@ -16,7 +16,7 @@
|
||||||
, c-ares
|
, c-ares
|
||||||
, json_c
|
, json_c
|
||||||
, libcap
|
, libcap
|
||||||
, libelf
|
, elfutils
|
||||||
, libunwind
|
, libunwind
|
||||||
, libyang
|
, libyang
|
||||||
, net-snmp
|
, net-snmp
|
||||||
|
@ -118,7 +118,6 @@ stdenv.mkDerivation rec {
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
c-ares
|
c-ares
|
||||||
json_c
|
json_c
|
||||||
libelf
|
|
||||||
libunwind
|
libunwind
|
||||||
libyang
|
libyang
|
||||||
openssl
|
openssl
|
||||||
|
@ -132,6 +131,8 @@ stdenv.mkDerivation rec {
|
||||||
libcap
|
libcap
|
||||||
] ++ lib.optionals snmpSupport [
|
] ++ lib.optionals snmpSupport [
|
||||||
net-snmp
|
net-snmp
|
||||||
|
] ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform elfutils) [
|
||||||
|
elfutils
|
||||||
];
|
];
|
||||||
|
|
||||||
# otherwise in cross-compilation: "configure: error: no working python version found"
|
# otherwise in cross-compilation: "configure: error: no working python version found"
|
||||||
|
|
|
@ -1,27 +0,0 @@
|
||||||
{ 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";
|
|
||||||
};
|
|
||||||
}
|
|
|
@ -16,6 +16,7 @@
|
||||||
, qtnetworkauth
|
, qtnetworkauth
|
||||||
, qtsvg
|
, qtsvg
|
||||||
, qttools
|
, qttools
|
||||||
|
, qtwayland
|
||||||
, qtwebsockets
|
, qtwebsockets
|
||||||
, rustPlatform
|
, rustPlatform
|
||||||
, rustc
|
, rustc
|
||||||
|
@ -74,6 +75,7 @@ stdenv.mkDerivation {
|
||||||
qtbase
|
qtbase
|
||||||
qtnetworkauth
|
qtnetworkauth
|
||||||
qtsvg
|
qtsvg
|
||||||
|
qtwayland
|
||||||
qtwebsockets
|
qtwebsockets
|
||||||
];
|
];
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
|
@ -9142,8 +9142,6 @@ with pkgs;
|
||||||
|
|
||||||
http-getter = callPackage ../applications/networking/flent/http-getter.nix { };
|
http-getter = callPackage ../applications/networking/flent/http-getter.nix { };
|
||||||
|
|
||||||
httpdirfs = callPackage ../tools/filesystems/httpdirfs { };
|
|
||||||
|
|
||||||
httpdump = callPackage ../tools/security/httpdump { };
|
httpdump = callPackage ../tools/security/httpdump { };
|
||||||
|
|
||||||
httpie = with python3Packages; toPythonApplication httpie;
|
httpie = with python3Packages; toPythonApplication httpie;
|
||||||
|
|
Loading…
Reference in New Issue
Block a user