Merge staging-next into staging

This commit is contained in:
nixpkgs-ci[bot]
2025-03-20 12:10:38 +00:00
committed by GitHub
40 changed files with 301 additions and 4910 deletions
+1 -2
View File
@@ -79,8 +79,7 @@ in
description = ''
The package which contains the `yabar` binary.
Nixpkgs provides the `yabar` and `yabar-unstable`,
so it's possible to choose.
Nixpkgs offers both a stable (`yabar`) and unstable (`yabar-unstable`) version of Yabar.
'';
};
@@ -38,5 +38,11 @@ mkLibretroCore {
description = "Parallel Mupen64plus rewrite for libretro";
homepage = "https://github.com/libretro/parallel-n64";
license = lib.licenses.gpl3Only;
badPlatforms = [
# ./mupen64plus-core/src/r4300/new_dynarec/arm64/linkage_aarch64.o: in function `.E12':
# (.text+0x5b4): relocation truncated to fit: R_AARCH64_CONDBR19 against symbol `invalidate_block' defined in .text section in ./mupen64plus-core/src/r4300/new_dynarec/new_dynarec_64.o
# collect2: error: ld returned 1 exit status
"aarch64-linux"
];
};
}
@@ -51,5 +51,9 @@ mkLibretroCore {
description = "PPSSPP libretro port";
homepage = "https://github.com/hrydgard/ppsspp";
license = lib.licenses.gpl2Plus;
badPlatforms = [
# error: cannot convert 'uint32x4_t' to 'int' in initialization
"aarch64-linux"
];
};
}
@@ -1,11 +1,11 @@
{
rke2Version = "1.29.13+rke2r1";
rke2Commit = "00803ef95072be9d13b6e52a56fa9b6d9e7b0a51";
rke2TarballHash = "sha256-1OphaTrEU2MvV0kdEyxomRGgbl/YSVikcYtLuL3QnBI=";
rke2VendorHash = "sha256-6XczvyQMqYqHHu+cSsmXsi7zMG128ZwiAHr482qQqpI=";
k8sImageTag = "v1.29.13-rke2r1-build20250117";
etcdVersion = "v3.5.16-k3s1-build20241106";
rke2Version = "1.29.14+rke2r1";
rke2Commit = "700728b7c1efe5db28004c747819b635254e9a91";
rke2TarballHash = "sha256-K1Yn85NBl4t0OwaETfqgeZVIgAzbLevY0lyOHs5YwfM=";
rke2VendorHash = "sha256-WG++RPbIhDNnd9BRbEop4qtDcaKJTUz+YzeygZfDxLI=";
k8sImageTag = "v1.29.14-rke2r1-build20250213";
etcdVersion = "v3.5.18-k3s1-build20250210";
pauseVersion = "3.6";
ccmVersion = "v1.29.10-0.20241016053521-9510ac25fefb-build20241016";
dockerizedVersion = "v1.29.13-rke2r1";
dockerizedVersion = "v1.29.14-rke2r1";
}
@@ -1,11 +1,11 @@
{
rke2Version = "1.30.9+rke2r1";
rke2Commit = "bfd23524f32a4d9fa6f19ab58a2d47572e56f813";
rke2TarballHash = "sha256-/WVKmK9ZackY9ULST0zFi/RRwA4ZR3u1DXULWTc6G3o=";
rke2VendorHash = "sha256-kghiYswm3s7bILGp8t452jx84MY73EF9OTaWdncFr34=";
k8sImageTag = "v1.30.9-rke2r1-build20250116";
etcdVersion = "v3.5.16-k3s1-build20241106";
rke2Version = "1.30.10+rke2r1";
rke2Commit = "b83bb8e150236c43aa3d52d31523feb879d09911";
rke2TarballHash = "sha256-YpF2SBIH3GwWOtSIbIZb88Nd1GNUvOmbgeyNDKAo+qU=";
rke2VendorHash = "sha256-aExBaQuqW2ZNCniHjur5OcvBogC4zofn5UNQS8gHSrA=";
k8sImageTag = "v1.30.10-rke2r1-build20250213";
etcdVersion = "v3.5.18-k3s1-build20250210";
pauseVersion = "3.6";
ccmVersion = "v1.30.6-0.20241016053533-5ec454f50e7a-build20241016";
dockerizedVersion = "v1.30.9-rke2r1";
dockerizedVersion = "v1.30.10-rke2r1";
}
@@ -1,11 +1,11 @@
{
rke2Version = "1.32.1+rke2r1";
rke2Commit = "c0f7be4407cf2c437cacfe735e5c943e827f2ff8";
rke2TarballHash = "sha256-clZpTnMnj2PRDDYz7+r11RlyX2ExwsE1Tmdt3/kUmtE=";
rke2VendorHash = "sha256-aIB2fRkccx5fXMnFxZ+tirXp5gg8o/h/a6Lgc+EG4L4=";
k8sImageTag = "v1.32.1-rke2r1-build20250115";
etcdVersion = "v3.5.16-k3s1-build20241106";
rke2Version = "1.32.2+rke2r1";
rke2Commit = "8a5c3a23c25cc9b423a303be5f4f1c0e8b885726";
rke2TarballHash = "sha256-9sNlOkzPCTqHSqaphuSUsfRpS39QYcTDHgjMuYdircc=";
rke2VendorHash = "sha256-fECmrfLayXRhACH7YkuIAUVFqSyPpy/JZb2ZPvITfqQ=";
k8sImageTag = "v1.32.2-rke2r1-build20250213";
etcdVersion = "v3.5.18-k3s1-build20250210";
pauseVersion = "3.6";
ccmVersion = "v1.32.0-rc3.0.20241220224140-68fbd1a6b543-build20250101";
dockerizedVersion = "v1.32.1-rke2r1";
dockerizedVersion = "v1.32.2-rke2r1";
}
+3 -3
View File
@@ -12,16 +12,16 @@
buildGoModule rec {
pname = "gocryptfs";
version = "2.5.1";
version = "2.5.2";
src = fetchFromGitHub {
owner = "rfjakob";
repo = pname;
rev = "v${version}";
sha256 = "sha256-yTZD4Q/krl6pW6EdtU+sdCWOOo9LHJqHCuNubAoEIyo=";
sha256 = "sha256-H3J+1a4Y6/BqgU7D9j/PNtP6Ci3EjrtO/ADx3GpJMgI=";
};
vendorHash = "sha256-bzhwYiTqI3MV0KxDT5j9TVnWJxM0BuLgEC8/r+2aQjI=";
vendorHash = "sha256-WfTJ8TuFupEa391XQMDl3hKTjrmRHJqvYb1haAGHW/U=";
nativeBuildInputs = [
makeWrapper
-4675
View File
File diff suppressed because it is too large Load Diff
+4 -13
View File
@@ -13,26 +13,17 @@
rustPlatform.buildRustPackage rec {
pname = "habitat";
version = "1.6.848";
version = "1.6.1243";
src = fetchFromGitHub {
owner = "habitat-sh";
repo = "habitat";
rev = version;
hash = "sha256-oK9ZzENwpEq6W1qnhSgkr7Rhy7Fxt/BS4U5nxecyPu8=";
hash = "sha256-+5If4veDOGTTIhYxhAiq1cC4Sy6vAmjX5hrmUmpGlFU=";
};
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"clap-2.33.1" = "sha256-ixyNr91VNB2ce2cIr0CdPmvKYRlckhKLeaSbqxouIAY=";
"configopt-0.1.0" = "sha256-76MeSoRD796ZzBqX3CoDJnunekVo2XfctpxrpspxmAU=";
"rants-0.6.0" = "sha256-B8uDoiqddCki3j7aC8kilEcmJjvB4ICjZjjTun2UEkY=";
"retry-1.0.0" = "sha256-ZaHnzOCelV4V0+MTIbH3DXxdz8QZVgcMq2YeV0S6X6o=";
"structopt-0.3.15" = "sha256-0vIX7J7VktKytT3ZnOm45qPRMHDkdJg20eU6pZBIH+Q=";
"zmq-0.9.2" = "sha256-bsDCPYLb9hUr6htPQ7rSoasKAqoWBx5FiEY1gOOtdJQ=";
};
};
useFetchCargoVendor = true;
cargoHash = "sha256-AI7Ij9F/K/chjxQUC0SnBsQQPLlVS6esa5LJAGRS9YI=";
nativeBuildInputs = [
pkg-config
+2 -2
View File
@@ -33,11 +33,11 @@
stdenv.mkDerivation rec {
pname = "knot-dns";
version = "3.4.4";
version = "3.4.5";
src = fetchurl {
url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz";
sha256 = "sha256-59nW3pfyG/M+kHvZhqQDgCXzlIea8KX9GXhyA6w7ITE=";
sha256 = "sha256-NZr3Cvr6fMqhhDmnwes1Jw/57s6B0HVq5MpxaxQzy0s=";
};
outputs = [
@@ -8,11 +8,11 @@
let
pname = "ledger-live-desktop";
version = "2.102.0";
version = "2.104.0";
src = fetchurl {
url = "https://download.live.ledger.com/${pname}-${version}-linux-x86_64.AppImage";
hash = "sha256-mi4YOY8TYorLiUbRCmknY3NBzTXId7/vfdvzUJSrdrI=";
hash = "sha256-RZweB6zE4POJRyvUXMC2nPyyIsZrTc2KkrxuZtmdZYY=";
};
appimageContents = appimageTools.extractType2 {
+3 -3
View File
@@ -9,7 +9,7 @@
installShellFiles,
}:
let
version = "0.4.45";
version = "0.4.47";
in
rustPlatform.buildRustPackage rec {
inherit version;
@@ -19,13 +19,13 @@ rustPlatform.buildRustPackage rec {
owner = "rust-lang";
repo = "mdBook";
tag = "v${version}";
hash = "sha256-LgjJUz1apE1MejVjl4/5O6ISpnGkBXY33g6xfoukZxA=";
hash = "sha256-XTvC2pGRVat0kOybNb9TziG32wDVexnFx2ahmpUFmaA=";
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit pname version src;
allowGitDependencies = false;
hash = "sha256-+7fC6cq6NQIUPtmNc5S5y4lRIS47v0tg1ru/AAYA6TM=";
hash = "sha256-ASPRBAB+elJuyXpPQBm3WI97wD3mjoO1hw0fNHc+KAw=";
};
nativeBuildInputs = [ installShellFiles ];
+2 -5
View File
@@ -9,18 +9,15 @@
buildGoModule rec {
pname = "paretosecurity";
version = "0.0.87";
version = "0.0.88";
src = fetchFromGitHub {
owner = "ParetoSecurity";
repo = "agent";
rev = version;
hash = "sha256-SgMALLuGq4HGj5eo7JdvtcWOEGuUoLyC3pgamB1WBzI=";
hash = "sha256-UVnZhkajrc9q6AZvIU7oi931ugxkiVSPk1NugAERnek=";
};
# tests do network access, fix pending
doCheck = false;
vendorHash = "sha256-HReQu23sHLaxc5N8h2vYv64ruJPmY4HM9whAEKV+3Eo=";
proxyVendor = true;
+3 -3
View File
@@ -8,17 +8,17 @@
rustPlatform.buildRustPackage rec {
pname = "pik";
version = "0.16.0";
version = "0.18.1";
src = fetchFromGitHub {
owner = "jacek-kurlit";
repo = "pik";
rev = version;
hash = "sha256-L5r8ds5Avh6WqiYYg/0hVDjdp/TBGgCZgKnJoDzs7Rw=";
hash = "sha256-8+Q5j9PWiITVgZkJnX+oWbC6QnNDhFxX4jLiMDWnw/g=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-d2I4RDo/U+69WwXjxHRsRNUxY2ymxzHqObR6X68xXRo=";
cargoHash = "sha256-6U0QkLgGEONGRDfrDVkxeHSJy9QnfQqn2YiZEswunTk=";
passthru.tests.version = testers.testVersion { package = pik; };
+3 -3
View File
@@ -15,13 +15,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "renovate";
version = "39.191.0";
version = "39.208.1";
src = fetchFromGitHub {
owner = "renovatebot";
repo = "renovate";
tag = finalAttrs.version;
hash = "sha256-HJvtYqEUmIr+P8g6cCr+NSgmZkzF7TZaVifyhI84oSY=";
hash = "sha256-Y4EJCbIK3XZAilbf/zMEfjEDYHNrUrAGRfsNmY0h/Bw=";
};
postPatch = ''
@@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
pnpmDeps = pnpm_10.fetchDeps {
inherit (finalAttrs) pname version src;
hash = "sha256-w0BaiLwP2AC2KsP2+GTgagMcfFbP/FBaUurbL9y+pXw=";
hash = "sha256-5KGTt6lx44LNpHG/RelCQ1ZlQOMOL6bJi66M2nCiirg=";
};
env.COREPACK_ENABLE_STRICT = 0;
+2 -7
View File
@@ -22,15 +22,10 @@ stdenv.mkDerivation rec {
buildInputs = [ libusb1 ];
nativeBuildInputs = [ pkg-config ];
patchPhase = ''
sed -i "s@/usr/@$out/@g" main.c
'';
makeFlags = [ "INSTALL_PREFIX=$(out)" ];
installPhase = ''
preInstall = ''
mkdir -p $out/bin
mkdir -p $out/share/rpiboot
cp rpiboot $out/bin
cp -r msd firmware eeprom-erase mass-storage-gadget* recovery* secure-boot* rpi-eeprom rpi-imager-embedded $out/share/rpiboot
'';
passthru.updateScript = gitUpdater { };
+3 -3
View File
@@ -8,16 +8,16 @@
rustPlatform.buildRustPackage rec {
pname = "yew-fmt";
version = "0.5.5";
version = "0.6";
src = fetchFromGitHub {
owner = "its-the-shrimp";
repo = "yew-fmt";
tag = "v${version}";
hash = "sha256-2sOw8wWfnEphYsruQyhZMW3KofcGkNHJB6Q1jhFP3oo=";
hash = "sha256-KhZezkR9VhdfGkNe1hSF90pe9K4VGDlBltasb7xnmRI=";
};
cargoHash = "sha256-o4oRVI3+Nz8fwdwlyVvXUuhCQr4Bbg5Kife/PJoJCJY=";
cargoHash = "sha256-Y6OicST0GbUL4RpvdvtBLFlLwryQMKlaut5x9+cNiM8=";
nativeCheckInputs = [ rustfmt ];
passthru.updateScript = nix-update-script { };
useFetchCargoVendor = true;
@@ -77,6 +77,7 @@ stdenv.mkDerivation (finalAttrs: {
};
meta = llvm_meta // {
broken = stdenv.hostPlatform.isDarwin;
homepage = "https://libc.llvm.org/";
description = "Standard C library for LLVM";
};
@@ -513,12 +513,19 @@ stdenv.mkDerivation (finalAttrs: {
] ++ [
"-DLLVM_TABLEGEN=${buildLlvmTools.tblgen}/bin/llvm-tblgen"
];
triple =
if stdenv.hostPlatform.isDarwin && lib.versionAtLeast release_version "20" then
# JIT tests expect the triple to use Darwin arch's naming for CPU architectures.
"${stdenv.hostPlatform.darwinArch}-apple-${stdenv.hostPlatform.darwinPlatform}"
else
stdenv.hostPlatform.config;
in flagsForLlvmConfig ++ [
"-DLLVM_INSTALL_UTILS=ON" # Needed by rustc
"-DLLVM_BUILD_TESTS=${if finalAttrs.finalPackage.doCheck then "ON" else "OFF"}"
"-DLLVM_ENABLE_FFI=ON"
"-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}"
"-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.hostPlatform.config}"
"-DLLVM_HOST_TRIPLE=${triple}"
"-DLLVM_DEFAULT_TARGET_TRIPLE=${triple}"
"-DLLVM_ENABLE_DUMP=ON"
(lib.cmakeBool "LLVM_ENABLE_TERMINFO" enableTerminfo)
] ++ optionals (!finalAttrs.finalPackage.doCheck) [
@@ -71,6 +71,8 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" ];
meta = llvm_meta // {
# Very broken since the dependencies aren't propagating at all with tblgen through the CMake.
broken = lib.versionAtLeast release_version "20";
homepage = "https://mlir.llvm.org/";
description = "Multi-Level IR Compiler Framework";
longDescription = ''
+1 -1
View File
@@ -31,7 +31,7 @@ let
"17.0.6".officialRelease.sha256 = "sha256-8MEDLLhocshmxoEBRSKlJ/GzJ8nfuzQ8qn0X/vLA+ag=";
"18.1.8".officialRelease.sha256 = "sha256-iiZKMRo/WxJaBXct9GdAcAT3cz9d9pnAcO1mmR6oPNE=";
"19.1.7".officialRelease.sha256 = "sha256-cZAB5vZjeTsXt9QHbP5xluWNQnAHByHtHnAhVDV0E6I=";
"20.1.0-rc3".officialRelease.sha256 = "sha256-mLSBoyq24FD+khynC6sC5IkDFqizgAn07lR9+ZRXlV0=";
"20.1.1".officialRelease.sha256 = "sha256-hDFYi5wAUDQ8xfjvbGFi05KdawrN9lwrrSC8AcTpCEE=";
"21.0.0-git".gitRelease = {
rev = "4fde8c341f9166e6ec6dff6e7704be175e382f5b";
rev-version = "21.0.0-unstable-2025-03-16";
@@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "aioshelly";
version = "13.3.0";
version = "13.4.0";
pyproject = true;
disabled = pythonOlder "3.11";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
owner = "home-assistant-libs";
repo = "aioshelly";
tag = version;
hash = "sha256-kPFTY1SDysNh64XYaW873SsZKT7uGmaugitXnkpAhA0=";
hash = "sha256-sGcI8+y/l8meYmlerWC2cEhW+LMKnZpoCw4ZWG26c6g=";
};
build-system = [ setuptools ];
@@ -49,7 +49,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Python library to control Shelly";
homepage = "https://github.com/home-assistant-libs/aioshelly";
changelog = "https://github.com/home-assistant-libs/aioshelly/releases/tag/${version}";
changelog = "https://github.com/home-assistant-libs/aioshelly/releases/tag/${src.tag}";
license = licenses.asl20;
maintainers = with maintainers; [ fab ];
};
@@ -31,7 +31,7 @@ buildPythonPackage rec {
changelog = "https://github.com/nilp0inter/cpe/releases/tag/v${version}";
description = "Common platform enumeration for python";
homepage = "https://github.com/nilp0inter/cpe";
license = lib.licenses.gpl3Only;
license = lib.licenses.lgpl3Only;
maintainers = with lib.maintainers; [ tochiaha ];
};
}
@@ -9,17 +9,16 @@
# dependencies
anytree,
cached-property,
cgen,
click,
cloudpickle,
codepy,
distributed,
llvmPackages,
multidict,
nbval,
numpy,
packaging,
psutil,
py-cpuinfo,
scipy,
sympy,
# tests
@@ -27,18 +26,19 @@
matplotlib,
pytest-xdist,
pytestCheckHook,
scipy,
}:
buildPythonPackage rec {
pname = "devito";
version = "4.8.12";
version = "4.8.14";
pyproject = true;
src = fetchFromGitHub {
owner = "devitocodes";
repo = "devito";
tag = "v${version}";
hash = "sha256-Eqyq96mVB5ZhPaLASesWhzjjHcXz/tAIOPP//8yGoBM=";
hash = "sha256-NM60H8Fx0pe4JEF7K8A+1i1MbxKhgab5cGcCD8wl9l8=";
};
pythonRemoveDeps = [ "pip" ];
@@ -49,16 +49,15 @@ buildPythonPackage rec {
dependencies = [
anytree
cached-property
cgen
click
cloudpickle
codepy
distributed
nbval
multidict
numpy
packaging
psutil
py-cpuinfo
scipy
sympy
] ++ lib.optionals stdenv.cc.isClang [ llvmPackages.openmp ];
@@ -67,36 +66,45 @@ buildPythonPackage rec {
matplotlib
pytest-xdist
pytestCheckHook
scipy
];
pytestFlagsArray = [ "-x" ];
pytestFlagsArray =
[
"-x"
# Tests marked as 'parallel' require mpi and fail in the sandbox:
# FileNotFoundError: [Errno 2] No such file or directory: 'mpiexec'
"-m 'not parallel'"
]
++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [
# assert np.all(f.data == check)
# assert Data(False)
"--deselect tests/test_data.py::TestDataReference::test_w_data"
# AssertionError: assert 'omp for schedule(dynamic,1)' == 'omp for coll...le(dynamic,1)'
"--deselect tests/test_dle.py::TestNestedParallelism::test_nested_cache_blocking_structure_subdims"
# codepy.CompileError: module compilation failed
# FAILED compiler invocation
"--deselect tests/test_dle.py::TestNodeParallelism::test_dynamic_nthreads"
# AssertionError: assert all(not i.pragmas for i in iters[2:])
"--deselect tests/test_dle.py::TestNodeParallelism::test_incr_perfect_sparse_outer"
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
# IndexError: tuple index out of range
"--deselect tests/test_dle.py::TestNestedParallelism"
# codepy.CompileError: module compilation failed
"--deselect tests/test_autotuner.py::test_nested_nthreads"
# assert np.all(np.isclose(f0.data, check0))
# assert Data(false)
"--deselect tests/test_interpolation.py::TestSubDomainInterpolation::test_inject_subdomain"
];
# I've had to disable the following tests since they fail while using nix-build, but they do pass
# outside the build. They mostly related to the usage of MPI in a sandboxed environment.
disabledTests =
[
"test_assign_parallel"
"test_cache_blocking_structure_distributed"
"test_codegen_quality0"
"test_coefficients_w_xreplace"
"test_docstrings"
"test_docstrings[finite_differences.coefficients]"
"test_gs_parallel"
"test_if_halo_mpi"
"test_if_parallel"
"test_index_derivative"
"test_init_omp_env_w_mpi"
"test_loop_bounds_forward"
"test_min_max_mpi"
"test_mpi"
"test_mpi_nocomms"
"test_new_distributor"
"test_setupWOverQ"
"test_shortcuts"
"test_stability_mpi"
"test_subdomainset_mpi"
"test_subdomains_mpi"
# Download dataset from the internet
"test_gs_2d_float"
"test_gs_2d_int"
@@ -111,6 +119,9 @@ buildPythonPackage rec {
# FAILED tests/test_unexpansion.py::Test2Pass::test_v0 - codepy.CompileError: module compilation failed
"test_v0"
# AssertionError: assert(np.allclose(grad_u.data, grad_v.data, rtol=tolerance, atol=tolerance))
"test_gradient_equivalence"
]
++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
# Numerical tests
@@ -123,18 +134,12 @@ buildPythonPackage rec {
];
disabledTestPaths =
[
"tests/test_pickle.py"
"tests/test_benchmark.py"
"tests/test_mpi.py"
"tests/test_autotuner.py"
"tests/test_data.py"
"tests/test_dse.py"
"tests/test_gradient.py"
]
++ lib.optionals (
(stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) || stdenv.hostPlatform.isDarwin
) [ "tests/test_dle.py" ];
lib.optionals
((stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) || stdenv.hostPlatform.isDarwin)
[
# Flaky: codepy.CompileError: module compilation failed
"tests/test_dse.py"
];
pythonImportsCheck = [ "devito" ];
@@ -3,23 +3,24 @@
stdenv,
buildPythonPackage,
fetchFromGitHub,
fetchpatch,
# build-system
setuptools,
versioneer,
# dependencies
spake2,
pynacl,
six,
attrs,
twisted,
autobahn,
automat,
tqdm,
click,
cryptography,
humanize,
iterable-io,
pynacl,
qrcode,
spake2,
tqdm,
twisted,
txtorcon,
zipstream-ng,
@@ -36,25 +37,16 @@
buildPythonPackage rec {
pname = "magic-wormhole";
version = "0.17.0";
version = "0.18.0";
pyproject = true;
src = fetchFromGitHub {
owner = "magic-wormhole";
repo = "magic-wormhole";
tag = version;
hash = "sha256-BxPF4iQ91wLBagdvQ/Y89VIZBkMxFiEHnK+BU55Bwr4=";
hash = "sha256-FQ7m6hkJcFZaE+ptDALq/gijn/RcAM1Zvzi2+xpoXBU=";
};
patches = [
# TODO: drop patch for magic-wormhole > 0.17.0
# fix test for twisted 24.10.0 (https://github.com/magic-wormhole/magic-wormhole/pull/554)
(fetchpatch {
name = "fix-twisted-24.10.0.patch";
url = "https://github.com/magic-wormhole/magic-wormhole/commit/d7353cad6fe9d43620a0de33a634f395757d2e5c.patch";
hash = "sha256-mvgVFW3Fa2I8/39ron0bYYsJNm2r97jnLFCfhtHSIP0=";
})
];
postPatch =
# enable tests by fixing the location of the wormhole binary
''
@@ -67,7 +59,10 @@ buildPythonPackage rec {
sed -i -e "s|'ifconfig'|'${nettools}/bin/ifconfig'|" src/wormhole/ipaddrs.py
'';
build-system = [ setuptools ];
build-system = [
setuptools
versioneer
];
dependencies =
[
@@ -75,10 +70,11 @@ buildPythonPackage rec {
autobahn
automat
click
cryptography
humanize
iterable-io
pynacl
six
qrcode
spake2
tqdm
twisted
@@ -8,13 +8,13 @@
buildPythonPackage rec {
pname = "types-tqdm";
version = "4.67.0.20250301";
version = "4.67.0.20250319";
pyproject = true;
src = fetchPypi {
pname = "types_tqdm";
inherit version;
hash = "sha256-XomjitibhngjNo65fZ+Q0vxpgGuwVd3mJxagXaYrXg0=";
hash = "sha256-rpR6ZL2Nfte30rc2nfBfkYH4R+woKP3Iot6wu4cBrao=";
};
build-system = [ setuptools ];
+1 -4
View File
@@ -40,10 +40,7 @@ let
) allUrls;
in
(
# This removes reference to deprecated `qt6Packages.stdenv`
# so when a KDE package asks for a stdenv, it won't trigger
# an eval warning
(lib.removeAttrs qt6Packages [ "stdenv" ])
qt6Packages
// frameworks
// gear
// plasma
@@ -2,42 +2,42 @@
"5.10": {
"patch": {
"extra": "-hardened1",
"name": "linux-hardened-v5.10.234-hardened1.patch",
"sha256": "0155pikfzyrmrf9xc2bid6s7jz6qw6pb1x1pbzgphsvsi83jm886",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/v5.10.234-hardened1/linux-hardened-v5.10.234-hardened1.patch"
"name": "linux-hardened-v5.10.235-hardened1.patch",
"sha256": "1xhpwy62jbwbc71s2cglxhrn7radpp256v05d587gf7jwhbi2zmc",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/v5.10.235-hardened1/linux-hardened-v5.10.235-hardened1.patch"
},
"sha256": "1rgb4v6dvqlw1mgzsli0hxaj2d5d4m1nylgcrwm4bkpiwbzc95wm",
"version": "5.10.234"
"sha256": "1k7iq4np3pflkq3d71ya8xs5czhslhy2iha4ls9lma81269y6fwm",
"version": "5.10.235"
},
"5.15": {
"patch": {
"extra": "-hardened1",
"name": "linux-hardened-v5.15.178-hardened1.patch",
"sha256": "01gbhdfnbxsb20qvgchk1qar7mf9phrzfidx825jags1v565jbpf",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/v5.15.178-hardened1/linux-hardened-v5.15.178-hardened1.patch"
"name": "linux-hardened-v5.15.179-hardened1.patch",
"sha256": "18255w5x7fjx37zdzbmigp641izc5h8fp2h8z7lj33z2mf7gfs9y",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/v5.15.179-hardened1/linux-hardened-v5.15.179-hardened1.patch"
},
"sha256": "0hkw2l4gr5m6jw2adxcgm2sb6kl0w51r6s4hcbn6rlm4bvmzgsgg",
"version": "5.15.178"
"sha256": "0vqk4wd0cacigz42gigdzbj415hcdn2k2m01yr7k8pcv3rxs86ck",
"version": "5.15.179"
},
"5.4": {
"patch": {
"extra": "-hardened1",
"name": "linux-hardened-v5.4.290-hardened1.patch",
"sha256": "0bd1g3zx5x5hxljw0qfis6h5y13pjlw1sizj7cx261iqb35vsv3x",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/v5.4.290-hardened1/linux-hardened-v5.4.290-hardened1.patch"
"name": "linux-hardened-v5.4.291-hardened1.patch",
"sha256": "1i7x7pdmqbrj306jbqv75ij1lq4hvdmw1qnfa4975zyzdd8d0khq",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/v5.4.291-hardened1/linux-hardened-v5.4.291-hardened1.patch"
},
"sha256": "0mm4q8f6kbqddy4zaxjf5xyqpnla5qprvsf7v3vq01gmlzr3rivc",
"version": "5.4.290"
"sha256": "0vpgb3lmhgv5iw9b1z0kqr6vdv44if49marfp5858z3a8yj69bdk",
"version": "5.4.291"
},
"6.1": {
"patch": {
"extra": "-hardened1",
"name": "linux-hardened-v6.1.129-hardened1.patch",
"sha256": "0lacg5p2pw56cwijiiby6isa5r4nwmi5lh1p1lr1n1yy8nzzs3kx",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.1.129-hardened1/linux-hardened-v6.1.129-hardened1.patch"
"name": "linux-hardened-v6.1.131-hardened1.patch",
"sha256": "005qvy3r69cy007fvj7m4b49m3vplndb280p2q72wnk9mpw8axrp",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.1.131-hardened1/linux-hardened-v6.1.131-hardened1.patch"
},
"sha256": "0axm373w49cjga541nxk9rxpkh75wl1b04l8w6clm93mvszy6qwx",
"version": "6.1.129"
"sha256": "05jvvv3khadvfgdrv43fcrnm606jk4064a7qivkvnk1vc08gbjj4",
"version": "6.1.131"
},
"6.11": {
"patch": {
@@ -52,31 +52,31 @@
"6.12": {
"patch": {
"extra": "-hardened1",
"name": "linux-hardened-v6.12.17-hardened1.patch",
"sha256": "15glq35gdh4mn69qqlv2hr79clwk1xphf6cfhh5n67xjkxri8jxw",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.12.17-hardened1/linux-hardened-v6.12.17-hardened1.patch"
"name": "linux-hardened-v6.12.19-hardened1.patch",
"sha256": "1f78k1bns49gfb8ari5jg5wkfai206nfpsnwj0y5h5yrjg0x8sx8",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.12.19-hardened1/linux-hardened-v6.12.19-hardened1.patch"
},
"sha256": "1cv3vrvwsj4ldbq7f9ccmal9as2ziw0cn8g3fd4lx5w09z9mq82w",
"version": "6.12.17"
"sha256": "0cb5ri6xsd9fyf0s48xrrsbhqzbgjd0iddnid6qk8i60prbz0fyp",
"version": "6.12.19"
},
"6.13": {
"patch": {
"extra": "-hardened1",
"name": "linux-hardened-v6.13.5-hardened1.patch",
"sha256": "04adsib4g7rfgmq1sc7przp3fpw6djb4vvf8ypn94a7dihg7f8ip",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.13.5-hardened1/linux-hardened-v6.13.5-hardened1.patch"
"name": "linux-hardened-v6.13.7-hardened1.patch",
"sha256": "0s0h6z9qxqcfdz14zbaalapl2py7z40hf4p6405f2hy5hajdcxq3",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.13.7-hardened1/linux-hardened-v6.13.7-hardened1.patch"
},
"sha256": "1qp6aprkkf2iwlhg2czd2msyqc728ab1vyr2v1nw3yzkhh3wngi8",
"version": "6.13.5"
"sha256": "07c08x68fgcsgriss5z8w427h69y52s887vas91jzb5p70hbcf9s",
"version": "6.13.7"
},
"6.6": {
"patch": {
"extra": "-hardened1",
"name": "linux-hardened-v6.6.80-hardened1.patch",
"sha256": "09hhswaslihs5w58jka5xfw2kz70mg7awsvhbca9il5wn7wppp0j",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.6.80-hardened1/linux-hardened-v6.6.80-hardened1.patch"
"name": "linux-hardened-v6.6.83-hardened1.patch",
"sha256": "0wzgkj4ypa3clbzq40jkm3qjhbnj8wj48wc9vxx8v15gl4rppgga",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.6.83-hardened1/linux-hardened-v6.6.83-hardened1.patch"
},
"sha256": "09qkadl9fm0c589qyjdwhgryr85xampz0k7lsafmrx142g813ybc",
"version": "6.6.80"
"sha256": "0262q81mwhy8plql8hnnfvagp460vfl127kaayya113l7gkbnjw9",
"version": "6.6.83"
}
}
+6 -6
View File
@@ -60,20 +60,20 @@ let
in
{
nextcloud29 = generic {
version = "29.0.13";
hash = "sha256-B3hipF/CzO/mSJA3MIYh8H3Gw2bK20/Wo1JbiRGaXb8=";
version = "29.0.14";
hash = "sha256-mjMuAywSnD6Sp6EBkktfJnsJNvaJdJxF0DE0PIikavs=";
packages = nextcloud29Packages;
};
nextcloud30 = generic {
version = "30.0.7";
hash = "sha256-3HIxyDKEBoPLcsPYognaFETVXBNVSoTrn656dfDBJQY=";
version = "30.0.8";
hash = "sha256-uwhqES+zUW50SSHXrhSCzBvVN+39HxQFHBNI1LatWKI=";
packages = nextcloud30Packages;
};
nextcloud31 = generic {
version = "31.0.1";
hash = "sha256-ufoEWK7JS+e7KHhp+WC7yHBZLZP7w1JxYGwx5Hfk57I=";
version = "31.0.2";
hash = "sha256-ALVyERt8K5iELZXARt5570Y8z63IoEtUAGx4bh+UwxA=";
packages = nextcloud31Packages;
};
+4 -4
View File
@@ -143,7 +143,7 @@
"hash": "sha256-yfTZjAsmv2wdMNNP1Tm0fmzSIlUwRfMraNPgFEHW238=",
"url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v17.0.10/groupfolders-v17.0.10.tar.gz",
"version": "17.0.10",
"description": "Admin configured folders shared with everyone in a group.\n\nFolders can be configured from *Group folders* in the admin settings.\n\nAfter a folder is created, the admin can give access to the folder to one or more groups, control their write/sharing permissions and assign a quota for the folder.",
"description": "Admin configured folders shared with everyone in a team.\n\nFolders can be configured from *Team folders* in the admin settings.\n\nAfter a folder is created, the admin can give access to the folder to one or more teams, control their write/sharing permissions and assign a quota for the folder.",
"homepage": "https://github.com/nextcloud/groupfolders",
"licenses": [
"agpl"
@@ -190,9 +190,9 @@
]
},
"mail": {
"hash": "sha256-nx9trnOjtl/jd081DB8/5BjtDe6WVwcss0ynxyT/dEU=",
"url": "https://github.com/nextcloud-releases/mail/releases/download/v3.7.23/mail-v3.7.23.tar.gz",
"version": "3.7.23",
"hash": "sha256-4XLoP07M614QM2n86QvNlol3NVmrfQLBDLZCZ013Lsc=",
"url": "https://github.com/nextcloud-releases/mail/releases/download/v3.7.24/mail-stable3.7.tar.gz",
"version": "3.7.24",
"description": "**💌 A mail app for Nextcloud**\n\n- **🚀 Integration with other Nextcloud apps!** Currently Contacts, Calendar & Files more to come.\n- **📥 Multiple mail accounts!** Personal and company account? No problem, and a nice unified inbox. Connect any IMAP account.\n- **🔒 Send & receive encrypted mails!** Using the great [Mailvelope](https://mailvelope.com) browser extension.\n- **🙈 Were not reinventing the wheel!** Based on the great [Horde](https://horde.org) libraries.\n- **📬 Want to host your own mail server?** We do not have to reimplement this as you could set up [Mail-in-a-Box](https://mailinabox.email)!\n\n## Ethical AI Rating\n\n### Priority Inbox\n\nPositive:\n* The software for training and inferencing of this model is open source.\n* The model is created and trained on-premises based on the user's own data.\n* The training data is accessible to the user, making it possible to check or correct for bias or optimise the performance and CO2 usage.\n\n### Thread Summaries (opt-in)\n\n**Rating:** 🟢/🟡/🟠/🔴\n\nThe rating depends on the installed text processing backend. See [the rating overview](https://docs.nextcloud.com/server/latest/admin_manual/ai/index.html) for details.\n\nLearn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud.com/blog/nextcloud-ethical-ai-rating/).",
"homepage": "https://github.com/nextcloud/mail#readme",
"licenses": [
+10 -10
View File
@@ -20,9 +20,9 @@
]
},
"calendar": {
"hash": "sha256-MpWmWSyC6ZxzE8Xu+rjCxl9OhdmSydGMR+zcJyoH7uE=",
"url": "https://github.com/nextcloud-releases/calendar/releases/download/v5.1.3/calendar-v5.1.3.tar.gz",
"version": "5.1.3",
"hash": "sha256-mAH/A5oiPwIh6K6bb9wd55CmqMoEAaKQVVr8zFNbXE8=",
"url": "https://github.com/nextcloud-releases/calendar/releases/download/v5.2.0/calendar-v5.2.0.tar.gz",
"version": "5.2.0",
"description": "The Calendar app is a user interface for Nextcloud's CalDAV server. Easily sync events from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Contacts - more to come.\n* 🌐 **WebCal Support!** Want to see your favorite teams matchdays in your calendar? No problem!\n* 🙋 **Attendees!** Invite people to your events\n* ⌚️ **Free/Busy!** See when your attendees are available to meet\n* ⏰ **Reminders!** Get alarms for events inside your browser and via email\n* 🔍 Search! Find your events at ease\n* ☑️ Tasks! See tasks with a due date directly in the calendar\n* 🙈 **Were not reinventing the wheel!** Based on the great [c-dav library](https://github.com/nextcloud/cdav-library), [ical.js](https://github.com/mozilla-comm/ical.js) and [fullcalendar](https://github.com/fullcalendar/fullcalendar) libraries.",
"homepage": "https://github.com/nextcloud/calendar/",
"licenses": [
@@ -140,10 +140,10 @@
]
},
"groupfolders": {
"hash": "sha256-zWRg9oqEhD0SGL82LB1HxbkLt3CbcQsgrBXlCLy94h8=",
"url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v18.1.1/groupfolders-v18.1.1.tar.gz",
"version": "18.1.1",
"description": "Admin configured folders shared with everyone in a group.\n\nFolders can be configured from *Group folders* in the admin settings.\n\nAfter a folder is created, the admin can give access to the folder to one or more groups, control their write/sharing permissions and assign a quota for the folder.",
"hash": "sha256-xlxc4m0xxjrI3Pi+1L63Sm4wQCjJdkHD9JPorsrI5e0=",
"url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v18.1.2/groupfolders-v18.1.2.tar.gz",
"version": "18.1.2",
"description": "Admin configured folders shared with everyone in a team.\n\nFolders can be configured from *Team folders* in the admin settings.\n\nAfter a folder is created, the admin can give access to the folder to one or more teams, control their write/sharing permissions and assign a quota for the folder.",
"homepage": "https://github.com/nextcloud/groupfolders",
"licenses": [
"agpl"
@@ -190,9 +190,9 @@
]
},
"mail": {
"hash": "sha256-c/inKInFwLG7MdNcJPV7NzF1QNRgKNWyC+rjnza2/K8=",
"url": "https://github.com/nextcloud-releases/mail/releases/download/v4.2.6/mail-stable4.2.tar.gz",
"version": "4.2.6",
"hash": "sha256-EFhjy0LcJCsNHJy//rGwM1f3UkAGLNXzC6lz6k5JstY=",
"url": "https://github.com/nextcloud-releases/mail/releases/download/v4.3.1/mail-v4.3.1.tar.gz",
"version": "4.3.1",
"description": "**💌 A mail app for Nextcloud**\n\n- **🚀 Integration with other Nextcloud apps!** Currently Contacts, Calendar & Files more to come.\n- **📥 Multiple mail accounts!** Personal and company account? No problem, and a nice unified inbox. Connect any IMAP account.\n- **🔒 Send & receive encrypted mails!** Using the great [Mailvelope](https://mailvelope.com) browser extension.\n- **🙈 Were not reinventing the wheel!** Based on the great [Horde](https://horde.org) libraries.\n- **📬 Want to host your own mail server?** We do not have to reimplement this as you could set up [Mail-in-a-Box](https://mailinabox.email)!\n\n## Ethical AI Rating\n\n### Priority Inbox\n\nPositive:\n* The software for training and inferencing of this model is open source.\n* The model is created and trained on-premises based on the user's own data.\n* The training data is accessible to the user, making it possible to check or correct for bias or optimise the performance and CO2 usage.\n\n### Thread Summaries (opt-in)\n\n**Rating:** 🟢/🟡/🟠/🔴\n\nThe rating depends on the installed text processing backend. See [the rating overview](https://docs.nextcloud.com/server/latest/admin_manual/ai/index.html) for details.\n\nLearn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud.com/blog/nextcloud-ethical-ai-rating/).",
"homepage": "https://github.com/nextcloud/mail#readme",
"licenses": [
+10 -10
View File
@@ -20,9 +20,9 @@
]
},
"calendar": {
"hash": "sha256-MpWmWSyC6ZxzE8Xu+rjCxl9OhdmSydGMR+zcJyoH7uE=",
"url": "https://github.com/nextcloud-releases/calendar/releases/download/v5.1.3/calendar-v5.1.3.tar.gz",
"version": "5.1.3",
"hash": "sha256-mAH/A5oiPwIh6K6bb9wd55CmqMoEAaKQVVr8zFNbXE8=",
"url": "https://github.com/nextcloud-releases/calendar/releases/download/v5.2.0/calendar-v5.2.0.tar.gz",
"version": "5.2.0",
"description": "The Calendar app is a user interface for Nextcloud's CalDAV server. Easily sync events from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Contacts - more to come.\n* 🌐 **WebCal Support!** Want to see your favorite teams matchdays in your calendar? No problem!\n* 🙋 **Attendees!** Invite people to your events\n* ⌚️ **Free/Busy!** See when your attendees are available to meet\n* ⏰ **Reminders!** Get alarms for events inside your browser and via email\n* 🔍 Search! Find your events at ease\n* ☑️ Tasks! See tasks with a due date directly in the calendar\n* 🙈 **Were not reinventing the wheel!** Based on the great [c-dav library](https://github.com/nextcloud/cdav-library), [ical.js](https://github.com/mozilla-comm/ical.js) and [fullcalendar](https://github.com/fullcalendar/fullcalendar) libraries.",
"homepage": "https://github.com/nextcloud/calendar/",
"licenses": [
@@ -140,10 +140,10 @@
]
},
"groupfolders": {
"hash": "sha256-xotf3sAiP1sQNHfL+2kuE04YsbV4rGfDYDyZUkteGHY=",
"url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v19.0.3/groupfolders-v19.0.3.tar.gz",
"version": "19.0.3",
"description": "Admin configured folders shared with everyone in a group.\n\nFolders can be configured from *Group folders* in the admin settings.\n\nAfter a folder is created, the admin can give access to the folder to one or more groups, control their write/sharing permissions and assign a quota for the folder.",
"hash": "sha256-lFIXNbBqdRHEvNFu2P68IF4v0+E4rFWLdRJYWm3RM/k=",
"url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v19.0.4/groupfolders-v19.0.4.tar.gz",
"version": "19.0.4",
"description": "Admin configured folders shared with everyone in a team.\n\nFolders can be configured from *Team folders* in the admin settings.\n\nAfter a folder is created, the admin can give access to the folder to one or more teams, control their write/sharing permissions and assign a quota for the folder.",
"homepage": "https://github.com/nextcloud/groupfolders",
"licenses": [
"agpl"
@@ -190,9 +190,9 @@
]
},
"mail": {
"hash": "sha256-c/inKInFwLG7MdNcJPV7NzF1QNRgKNWyC+rjnza2/K8=",
"url": "https://github.com/nextcloud-releases/mail/releases/download/v4.2.6/mail-stable4.2.tar.gz",
"version": "4.2.6",
"hash": "sha256-EFhjy0LcJCsNHJy//rGwM1f3UkAGLNXzC6lz6k5JstY=",
"url": "https://github.com/nextcloud-releases/mail/releases/download/v4.3.1/mail-v4.3.1.tar.gz",
"version": "4.3.1",
"description": "**💌 A mail app for Nextcloud**\n\n- **🚀 Integration with other Nextcloud apps!** Currently Contacts, Calendar & Files more to come.\n- **📥 Multiple mail accounts!** Personal and company account? No problem, and a nice unified inbox. Connect any IMAP account.\n- **🔒 Send & receive encrypted mails!** Using the great [Mailvelope](https://mailvelope.com) browser extension.\n- **🙈 Were not reinventing the wheel!** Based on the great [Horde](https://horde.org) libraries.\n- **📬 Want to host your own mail server?** We do not have to reimplement this as you could set up [Mail-in-a-Box](https://mailinabox.email)!\n\n## Ethical AI Rating\n\n### Priority Inbox\n\nPositive:\n* The software for training and inferencing of this model is open source.\n* The model is created and trained on-premises based on the user's own data.\n* The training data is accessible to the user, making it possible to check or correct for bias or optimise the performance and CO2 usage.\n\n### Thread Summaries (opt-in)\n\n**Rating:** 🟢/🟡/🟠/🔴\n\nThe rating depends on the installed text processing backend. See [the rating overview](https://docs.nextcloud.com/server/latest/admin_manual/ai/index.html) for details.\n\nLearn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud.com/blog/nextcloud-ethical-ai-rating/).",
"homepage": "https://github.com/nextcloud/mail#readme",
"licenses": [
+3 -3
View File
@@ -6,18 +6,18 @@
buildGoModule rec {
pname = "cnspec";
version = "11.45.1";
version = "11.46.0";
src = fetchFromGitHub {
owner = "mondoohq";
repo = "cnspec";
tag = "v${version}";
hash = "sha256-vLo4ehr2QNErfJ+PQJ4CDSrUqtxMlHsYaAzsSgxoInI=";
hash = "sha256-Bf3+W2F44mTCEyMnKUSoeft4HKY4C3kYmLtuKG4SWls=";
};
proxyVendor = true;
vendorHash = "sha256-gPZ8oLuHuwOqQK1RJHMYvWXnyZPenMiNEFaZzDwHsCo=";
vendorHash = "sha256-Q+CHJRroYAhgYLVemC/dcHfS03GHuUoaz/s+hrntdGQ=";
subPackages = [ "apps/cnspec" ];
+3 -1
View File
@@ -1,4 +1,6 @@
# frozen_string_literal: true
source "https://rubygems.org"
gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.4.43"
gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.4.53"
gem "syslog", "~> 0.3.0"
+16 -5
View File
@@ -1,9 +1,9 @@
GIT
remote: https://github.com/rapid7/metasploit-framework
revision: 726e819f87e3022dc90232087bf30edb0d149ba5
ref: refs/tags/6.4.43
revision: ce6990ff84c944186dfa104b3aa1edd98962b468
ref: refs/tags/6.4.53
specs:
metasploit-framework (6.4.43)
metasploit-framework (6.4.53)
aarch64
abbrev
actionpack (~> 7.0.0)
@@ -17,10 +17,12 @@ GIT
base64
bcrypt
bcrypt_pbkdf
benchmark
bigdecimal
bootsnap
bson
chunky_png
concurrent-ruby (= 1.3.4)
csv
dnsruby
drb
@@ -33,6 +35,7 @@ GIT
faraday-retry
faye-websocket
ffi (< 1.17.0)
fiddle
filesize
getoptlong
hrr_rb_ssh-ed25519
@@ -62,6 +65,7 @@ GIT
octokit (~> 4.0)
openssl-ccm
openvas-omp
ostruct
packetfu
patch_finder
pcaprub
@@ -69,7 +73,7 @@ GIT
pg
puma
railties
rasn1 (= 0.13.0)
rasn1 (= 0.14.0)
rb-readline
recog
redcarpet
@@ -179,6 +183,7 @@ GEM
base64 (0.2.0)
bcrypt (3.1.20)
bcrypt_pbkdf (1.1.1)
benchmark (0.4.0)
bigdecimal (3.1.8)
bindata (2.4.15)
bootsnap (1.18.4)
@@ -223,6 +228,7 @@ GEM
eventmachine (>= 0.12.0)
websocket-driver (>= 0.5.1)
ffi (1.16.3)
fiddle (1.1.6)
filesize (0.2.0)
getoptlong (0.2.1)
gssapi (1.3.1)
@@ -249,6 +255,7 @@ GEM
rkelly-remix
json (2.7.5)
little-plugger (1.1.4)
logger (1.6.6)
logging (2.4.0)
little-plugger (~> 1.1)
multi_json (~> 1.14)
@@ -322,6 +329,7 @@ GEM
openssl-ccm (1.2.3)
openssl-cmac (2.0.2)
openvas-omp (0.0.4)
ostruct (0.6.1)
packetfu (2.0.0)
pcaprub (~> 0.13.1)
patch_finder (1.0.2)
@@ -358,7 +366,7 @@ GEM
thor (~> 1.0)
zeitwerk (~> 2.5)
rake (13.2.1)
rasn1 (0.13.0)
rasn1 (0.14.0)
strptime (~> 0.2.5)
rb-readline (0.5.5)
recog (3.1.11)
@@ -443,6 +451,8 @@ GEM
sshkey (3.0.0)
strptime (0.2.5)
swagger-blocks (3.0.0)
syslog (0.3.0)
logger
thin (1.8.2)
daemons (~> 1.0, >= 1.0.9)
eventmachine (~> 1.0, >= 1.0.4)
@@ -487,6 +497,7 @@ PLATFORMS
DEPENDENCIES
metasploit-framework!
syslog (~> 0.3.0)
BUNDLED WITH
2.5.22
+2 -2
View File
@@ -18,13 +18,13 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "metasploit-framework";
version = "6.4.43";
version = "6.4.53";
src = fetchFromGitHub {
owner = "rapid7";
repo = "metasploit-framework";
tag = finalAttrs.version;
hash = "sha256-1zUt6nInDUIY97fBJa0dQ/hD4WZ1v5LXYdPQhnYKlYw=";
hash = "sha256-yHat9U8EZbUWo4j9ut6K9IPtPFm130pfSmIuhtQhFoQ=";
};
nativeBuildInputs = [
+55 -5
View File
@@ -239,6 +239,16 @@
};
version = "1.1.1";
};
benchmark = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0jl71qcgamm96dzyqk695j24qszhcc7liw74qc83fpjljp2gh4hg";
type = "gem";
};
version = "0.4.0";
};
bigdecimal = {
groups = [ "default" ];
platforms = [ ];
@@ -509,6 +519,16 @@
};
version = "1.16.3";
};
fiddle = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1as92bp6pgkab73kj3mh5d1idjr9wykczz7r9i1pkn82wq4xks3r";
type = "gem";
};
version = "1.1.6";
};
filesize = {
groups = [ "default" ];
platforms = [ ];
@@ -679,6 +699,16 @@
};
version = "1.1.4";
};
logger = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "05s008w9vy7is3njblmavrbdzyrwwc1fsziffdr58w9pwqj8sqfx";
type = "gem";
};
version = "1.6.6";
};
logging = {
groups = [ "default" ];
platforms = [ ];
@@ -734,12 +764,12 @@
platforms = [ ];
source = {
fetchSubmodules = false;
rev = "726e819f87e3022dc90232087bf30edb0d149ba5";
sha256 = "134m19v8dl6kc7br5gvmcvhl7y233nnjbhdpywc44397fbm2sdfp";
rev = "ce6990ff84c944186dfa104b3aa1edd98962b468";
sha256 = "110n47a8cbk299glmpxmb4yfv0zlibgbmzc8lcbbar849zsssxn8";
type = "git";
url = "https://github.com/rapid7/metasploit-framework";
};
version = "6.4.43";
version = "6.4.53";
};
metasploit-model = {
groups = [ "default" ];
@@ -1025,6 +1055,16 @@
};
version = "0.0.4";
};
ostruct = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "05xqijcf80sza5pnlp1c8whdaay8x5dc13214ngh790zrizgp8q9";
type = "gem";
};
version = "0.6.1";
};
packetfu = {
groups = [ "default" ];
platforms = [ ];
@@ -1180,10 +1220,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "07dvrv2s9hs2vcbr6lai8vj4vk2i3m4jf468hyvkp9k8xzjvc0fi";
sha256 = "1rz96j4jzm02rdxrs70hj5an3kmxrfd77d4hy97b80fasj049992";
type = "gem";
};
version = "0.13.0";
version = "0.14.0";
};
rb-readline = {
groups = [ "default" ];
@@ -1565,6 +1605,16 @@
};
version = "3.0.0";
};
syslog = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "023lbh48fcn72gwyh1x52ycs1wx1bnhdajmv0qvkidmdsmxnxzjd";
type = "gem";
};
version = "0.3.0";
};
thin = {
groups = [ "default" ];
platforms = [ ];
+10 -4
View File
@@ -1,10 +1,11 @@
# Env to update Gemfile.lock / gemset.nix
{
pkgs ? import ../../../.. { },
}:
pkgs.stdenv.mkDerivation {
name = "env";
nativeBuildInputs = [ pkgs.pkg-config ];
pkgs.mkShell {
nativeBuildInputs = [
pkgs.pkg-config
pkgs.libffi # libffi as native input
];
buildInputs = with pkgs; [
bundix
git
@@ -16,4 +17,9 @@ pkgs.stdenv.mkDerivation {
ruby.devEnv
sqlite
];
# Ensure that pkg-config finds libffi
shellHook = ''
export PKG_CONFIG_PATH="${pkgs.libffi.out}/lib/pkgconfig:$PKG_CONFIG_PATH"
echo "PKG_CONFIG_PATH set to: $PKG_CONFIG_PATH"
'';
}
+1 -1
View File
@@ -1736,7 +1736,7 @@ mapAliases {
openbsdCross = openbsd; # Added 2024-09-06
# LLVM packages for (integration) testing that should not be used inside Nixpkgs:
llvmPackages_latest = llvmPackages_19;
llvmPackages_latest = llvmPackages_20;
/* If these are in the scope of all-packages.nix, they cause collisions
between mixed versions of qt. See:
-3
View File
@@ -134,7 +134,4 @@ makeScopeWithSplicing' {
xwaylandvideobridge = kdePackages.callPackage ../tools/wayland/xwaylandvideobridge { };
});
} // lib.optionalAttrs config.allowAliases {
# when removing, don't forget to remove a workaround in `pkgs/kde/default.nix`
stdenv = lib.warn "qt6Packages.stdenv is deprecated. Use stdenv instead." stdenv; # Added for 25.05
}