Merge staging-next into staging

This commit is contained in:
github-actions[bot]
2023-09-16 12:01:45 +00:00
committed by GitHub
36 changed files with 5306 additions and 11900 deletions

View File

@@ -179,7 +179,7 @@
- The Caddy module gained a new option named `services.caddy.enableReload` which is enabled by default. It allows reloading the service instead of restarting it, if only a config file has changed. This option must be disabled if you have turned off the [Caddy admin API](https://caddyserver.com/docs/caddyfile/options#admin). If you keep this option enabled, you should consider setting [`grace_period`](https://caddyserver.com/docs/caddyfile/options#grace-period) to a non-infinite value to prevent Caddy from delaying the reload indefinitely.
- mdraid support is now optional. This reduces initramfs size and prevents the potentially undesired automatic detection and activation of software RAID pools. It is disabled by default in new configurations (determined by `stateVersion`), but the appropriate settings will be generated by `nixos-generate-config` when installing to a software RAID device, so the standard installation procedure should be unaffected. If you have custom configs relying on mdraid, ensure that you use `stateVersion` correctly or set `boot.swraid.enable` manually.
- mdraid support is now optional. This reduces initramfs size and prevents the potentially undesired automatic detection and activation of software RAID pools. It is disabled by default in new configurations (determined by `stateVersion`), but the appropriate settings will be generated by `nixos-generate-config` when installing to a software RAID device, so the standard installation procedure should be unaffected. If you have custom configs relying on mdraid, ensure that you use `stateVersion` correctly or set `boot.swraid.enable` manually. On systems with an updated `stateVersion` we now also emit warnings if `mdadm.conf` does not contain the minimum required configuration necessary to run the dynamically enabled monitoring daemons.
- The `go-ethereum` package has been updated to v1.12.0. This drops support for proof-of-work. Its GraphQL API now encodes all numeric values as hex strings and the GraphQL UI is updated to version 2.0. The default database has changed from `leveldb` to `pebble` but `leveldb` can be forced with the --db.engine=leveldb flag. The `checkpoint-admin` command was [removed along with trusted checkpoints](https://github.com/ethereum/go-ethereum/pull/27147).

View File

@@ -4,6 +4,11 @@
mdadm_conf = config.environment.etc."mdadm.conf";
enable_implicitly_for_old_state_versions = lib.versionOlder config.system.stateVersion "23.11";
minimum_config_is_set = config_text:
(builtins.match ".*(MAILADDR|PROGRAM).*" mdadm_conf.text) != null;
in {
imports = [
(lib.mkRenamedOptionModule [ "boot" "initrd" "services" "swraid" "enable" ] [ "boot" "swraid" "enable" ])
@@ -26,7 +31,7 @@ in {
should detect it correctly in the standard installation
procedure.
'';
default = lib.versionOlder config.system.stateVersion "23.11";
default = enable_implicitly_for_old_state_versions;
defaultText = lib.mdDoc "`true` if stateVersion is older than 23.11";
};
@@ -39,7 +44,7 @@ in {
config = lib.mkIf cfg.enable {
warnings = lib.mkIf
((builtins.match ".*(MAILADDR|PROGRAM).*" mdadm_conf.text) == null)
( !enable_implicitly_for_old_state_versions && !minimum_config_is_set mdadm_conf)
[ "mdadm: Neither MAILADDR nor PROGRAM has been set. This will cause the `mdmon` service to crash." ];
environment.systemPackages = [ pkgs.mdadm ];

View File

@@ -1,20 +1,20 @@
{
stable = import ./browser.nix {
channel = "stable";
version = "115.0.1901.188";
version = "116.0.1938.76";
revision = "1";
sha256 = "sha256-mRM3zakYwCptfKWYbiaDnPqv9Vt5WnDA7xIK1rlownU=";
sha256 = "sha256-zSnNgnpsxR2sRgoG+Vi2K3caaVUPLiJJ9d+EjjIzu7Y=";
};
beta = import ./browser.nix {
channel = "beta";
version = "115.0.1901.165";
version = "117.0.2045.21";
revision = "1";
sha256 = "sha256-2DUWkGItissLGtJAMDKHNjMDPhsYNKaQVJ30+tMlkow=";
sha256 = "sha256-vsZy9WGlT4Yqf/tHmsgZV8Pj7D0nmhmziKYGrRj7Bi0=";
};
dev = import ./browser.nix {
channel = "dev";
version = "116.0.1938.10";
version = "118.0.2060.1";
revision = "1";
sha256 = "sha256-NQXaLmX8AtLEWPkkzAA90XfmFflwulxVRHtIJ+nxCk4=";
sha256 = "sha256-OKjCmULPjYuoumqAqivyCFzHSR1IOutEIWTqXtDgMhM=";
};
}

View File

@@ -1,9 +1,9 @@
{
"version" = "1.11.42";
"version" = "1.11.43";
"hashes" = {
"desktopSrcHash" = "sha256-0zXvRE3hCGgM93RrJIUnE25k95LbavhNRxtpR6zeTjE=";
"desktopYarnHash" = "0y59610i3jamvk6wh04i39ka9jhdg869wa5qbq38nxckmhjk6wf3";
"webSrcHash" = "sha256-jfV4s76J36woooYXpcU4DBvih3NGlhdxWWKmQmBWrFY=";
"desktopSrcHash" = "sha256-mFI3+IRBrJT6wTxoggLTGoB48FyBoRhQSmUKbC8sASI=";
"desktopYarnHash" = "1w5blpdk61yqai6gwk9n28cf57crnahs6hr0p3xvwchbc9x50dfq";
"webSrcHash" = "sha256-LF6SMHYP2mxxHnh1YcLYoTEME7SgTVMKa8lz1rVZ+HA=";
"webYarnHash" = "0qvvhbj5mrrry2zcslz5n3pv4bpmdr5vsv446fm4cfvrj4awbz06";
};
}

View File

@@ -1,6 +1,19 @@
{ lib, stdenv, fetchFromGitHub, pkg-config, which, perl, autoconf, automake, libtool, openssl, systemd, pam, fuse, libjpeg, libopus, nasm, xorg }:
{ lib, stdenv, fetchFromGitHub, applyPatches, pkg-config, which, perl, autoconf, automake, libtool, openssl, systemd, pam, fuse, libjpeg, libopus, nasm, xorg }:
let
version = "0.9.23";
patchedXrdpSrc = applyPatches {
patches = [ ./dynamic_config.patch ];
name = "xrdp-patched-${version}";
src = fetchFromGitHub {
owner = "neutrinolabs";
repo = "xrdp";
rev = "v${version}";
fetchSubmodules = true;
hash = "sha256-8gAP4wOqSmar8JhKRt4qRRwh23coIn0Q8Tt9ClHQSt8=";
};
};
xorgxrdp = stdenv.mkDerivation rec {
pname = "xorgxrdp";
version = "0.9.19";
@@ -28,29 +41,20 @@ let
preConfigure = "./bootstrap";
configureFlags = [ "XRDP_CFLAGS=-I${xrdp.src}/common" ];
configureFlags = [ "XRDP_CFLAGS=-I${patchedXrdpSrc}/common" ];
enableParallelBuilding = true;
};
xrdp = stdenv.mkDerivation rec {
version = "0.9.23";
inherit version;
pname = "xrdp";
src = fetchFromGitHub {
owner = "neutrinolabs";
repo = "xrdp";
rev = "v${version}";
fetchSubmodules = true;
hash = "sha256-14qsRfLn+26rm+vyMmOtaBEs8mWfSTIsIVseSC2FjXc=";
};
src = patchedXrdpSrc;
nativeBuildInputs = [ pkg-config autoconf automake which libtool nasm perl ];
buildInputs = [ openssl systemd pam fuse libjpeg libopus xorg.libX11 xorg.libXfixes xorg.libXrandr ];
patches = [ ./dynamic_config.patch ];
postPatch = ''
substituteInPlace sesman/xauth.c --replace "xauth -q" "${xorg.xauth}/bin/xauth -q"
'';

View File

@@ -11,6 +11,8 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-kW6u9ETZJcJBh150chfE3SEwFpT7evZ0cqz8caM7fbQ=";
};
outputs = [ "out" "dev" ];
nativeBuildInputs = [
cmake
];

View File

@@ -1,7 +1,13 @@
{ qtModule, qtbase, libtiff }:
{ qtModule
, qtbase
, libwebp
, jasper
, libmng
, libtiff
}:
qtModule {
pname = "qtimageformats";
qtInputs = [ qtbase ];
propagatedBuildInputs = [ libtiff ];
propagatedBuildInputs = [ libwebp jasper libmng libtiff ];
}

File diff suppressed because it is too large Load Diff

View File

@@ -1,6 +1,7 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, freezegun
, python-dateutil
, pytestCheckHook
, pythonOlder
@@ -8,16 +9,16 @@
buildPythonPackage rec {
pname = "beautiful-date";
version = "2.2.0";
version = "2.3.0";
format = "setuptools";
disable = pythonOlder "3.6";
disable = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "kuzmoyev";
repo = "beautiful-date";
rev = "v${version}";
hash = "sha256-5xRmHaAPf1ps75cOINHkHT1aYb5UGLZGl0OHVQaMES0=";
rev = "refs/tags/v${version}";
hash = "sha256-e6YJBaDwWqVehxBPOvsIdV4FIXlIwj29H5untXGJvT0=";
};
propagatedBuildInputs = [
@@ -25,13 +26,16 @@ buildPythonPackage rec {
];
nativeCheckInputs = [
freezegun
pytestCheckHook
];
pythonImportsCheck = [ "beautiful_date" ];
pythonImportsCheck = [
"beautiful_date"
];
meta = with lib; {
description = "Simple and beautiful way to create date and datetime objects in Python";
description = "Simple and beautiful way to create date and datetime objects";
homepage = "https://github.com/kuzmoyev/beautiful-date";
license = licenses.mit;
maintainers = with maintainers; [ mbalatsko ];

View File

@@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "canals";
version = "0.6.0";
version = "0.8.0";
format = "pyproject";
disabled = pythonOlder "3.8";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "deepset-ai";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-s4nKPywfRn2hNhn/coWGqShv7D+MCEHblVzfweQJlnM=";
hash = "sha256-co2Zv4U4Vnn8IdPqZnyLD+siFu7tectj7ckh4oaKWYU=";
};
nativeBuildInputs = [

View File

@@ -55,14 +55,14 @@
buildPythonPackage rec {
pname = "dvc";
version = "3.20.0";
version = "3.21.1";
format = "pyproject";
src = fetchFromGitHub {
owner = "iterative";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-3cghehd2YLd4Ido6x4U4/SoQRO3ffw0B7JMA5NdfWa8=";
hash = "sha256-FCVxSkVWWtk6dTOtO+l28bDvXnxjX8wwy1uE/5Go4Mw=";
};
pythonRelaxDeps = [

View File

@@ -5,7 +5,7 @@
buildPythonPackage rec {
pname = "fontawesomefree";
version = "6.4.0";
version = "6.4.2";
format = "wheel";
# they only provide a wheel
@@ -13,7 +13,7 @@ buildPythonPackage rec {
inherit pname version format;
dist = "py3";
python = "py3";
hash = "sha256-4S7a1xts9pk/x8aupjZ+Ex8vJHtkNfrKmbEjKbrNKyc=";
hash = "sha256-zq/378T8Odrf88P/cpinoQlUAxENNz8iRWuxw0q22wI=";
};
pythonImportsCheck = [

View File

@@ -3,18 +3,22 @@
, fetchFromGitHub
, python
, pygments
, pythonOlder
, wavedrom
}:
buildPythonPackage rec {
pname = "markdown2";
version = "2.4.8";
version = "2.4.10";
disabled = pythonOlder "3.5";
# PyPI does not contain tests, so using GitHub instead.
src = fetchFromGitHub {
owner = "trentm";
repo = "python-markdown2";
rev = version;
hash = "sha256-0T3HcfjEApEEWtNZGZcta85dY9d/0mSyRBlrqBQEQwk=";
hash = "sha256-1Vs2OMQm/XBOEefV6W58X5hap91aTNuTx8UFf0285uk=";
};
nativeCheckInputs = [ pygments ];
@@ -29,6 +33,16 @@ buildPythonPackage rec {
runHook postCheck
'';
passthru.optional-dependencies = {
code_syntax_highlighting = [
pygments
];
wavedrom = [
wavedrom
];
all = lib.flatten (lib.attrValues (lib.filterAttrs (n: v: n != "all") passthru.optional-dependencies));
};
meta = with lib; {
changelog = "https://github.com/trentm/python-markdown2/blob/${src.rev}/CHANGES.md";
description = "A fast and complete Python implementation of Markdown";

View File

@@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "oci";
version = "2.111.0";
version = "2.112.1";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "oracle";
repo = "oci-python-sdk";
rev = "refs/tags/v${version}";
hash = "sha256-7lkxk/oFb5DPH3LcOJLJByMaf4xQB8L6FLKrXOn+HsM=";
hash = "sha256-HPmAXLEoTEDVZh1npkcLQamEn/CehzM1FOgGOHUrBrg=";
};
pythonRelaxDeps = [

View File

@@ -29,11 +29,11 @@ let
in
buildPythonPackage rec {
pname = "pwntools";
version = "4.10.0";
version = "4.11.0";
src = fetchPypi {
inherit pname version;
hash = "sha256-WI6J6meFJ8C1tsru7n524xNS544vHPPdp7yaz1JuRG0=";
hash = "sha256-qF8ed380P5HiIdF14VI9AG7vHIEGwQ/S4zgoC6snP6Y=";
};
postPatch = ''

View File

@@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "ring-doorbell";
version = "0.7.2";
version = "0.7.3";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "ring_doorbell";
inherit version;
hash = "sha256-Cn6Cq/JwhoQ+s5wCefXfzOpnUf+EhWDmcVTKb7+k7ys=";
hash = "sha256-HYRuQZpdtBkVfFBdqQupAjzQpLIBvKGm42cCumc03GM=";
};
propagatedBuildInputs = [
@@ -42,6 +42,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Python library to communicate with Ring Door Bell";
homepage = "https://github.com/tchellomello/python-ring-doorbell";
changelog = "https://github.com/tchellomello/python-ring-doorbell/releases/tag/${version}";
license = licenses.lgpl3Plus;
maintainers = with maintainers; [ graham33 ];
};

View File

@@ -51,7 +51,7 @@
buildPythonPackage rec {
pname = "transformers";
version = "4.31.0";
version = "4.33.2";
format = "setuptools";
disabled = pythonOlder "3.8";
@@ -60,7 +60,7 @@ buildPythonPackage rec {
owner = "huggingface";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-YbLI/CkRto8G4bV7ijUkB/0cc7LkfNBQxL1iNv8aWW4=";
hash = "sha256-i2ruOOkuEHHwzGT2Iqy+Pt1sBBUx43eiNkwf2Iqdcfc=";
};
propagatedBuildInputs = [

View File

@@ -37,7 +37,7 @@ python3.pkgs.buildPythonApplication rec {
nativeCheckInputs = with python3.pkgs; [
ipython
pytestCheckHook
] ++ lib.optionals (pythonOlder "3.11") [
] ++ lib.optionals (pythonOlder "3.12") [
greenlet
];

View File

@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "skaffold";
version = "2.7.0";
version = "2.7.1";
src = fetchFromGitHub {
owner = "GoogleContainerTools";
repo = "skaffold";
rev = "v${version}";
hash = "sha256-uKrHWFyHuGX5dzrEvl7x305QgFOraS0L6J7gAFloUYc=";
hash = "sha256-szoeGv8U8M4Wai1GFUkgE8Rn+URRrlkZvzMBxCcqvGI=";
};
vendorHash = null;

View File

@@ -2,13 +2,13 @@
let
data = stdenv.mkDerivation(finalAttrs: {
pname = "path-of-building-data";
version = "2.34.0";
version = "2.34.1";
src = fetchFromGitHub {
owner = "PathOfBuildingCommunity";
repo = "PathOfBuilding";
rev = "v${finalAttrs.version}";
hash = "sha256-A672cs930wRV8DwRpah//emtsAidNnOzwtfXiiYxyd4=";
hash = "sha256-i6OCW5Vc9/LfNuiaEeelmXiqP7+WdIklRNRcgWb7L1w=";
};
nativeBuildInputs = [ unzip ];

View File

@@ -2,28 +2,32 @@
, stdenv
, fetchFromGitHub
, coreutils
, pkg-config
, perl
, lvm2
, pkg-config
, json_c
, libaio
, liburcu
, linuxHeaders
, lvm2
, readline
, systemd
, liburcu
, json_c
, linuxHeaders
, util-linuxMinimal
, cmocka
, nixosTests
}:
stdenv.mkDerivation rec {
pname = "multipath-tools";
version = "0.9.4";
version = "0.9.6";
src = fetchFromGitHub {
owner = "opensvc";
repo = "multipath-tools";
rev = "refs/tags/${version}";
sha256 = "sha256-CPvtnjzkyxKXrT8+YXaIgDA548h8X61+jCxMHKFfEyg=";
sha256 = "sha256-X4sAMGn4oBMY3cQkVj1dMcrDF7FgMl8SbZeUnCCOY6Q=";
};
postPatch = ''
@@ -44,8 +48,20 @@ stdenv.mkDerivation rec {
sed '1i#include <assert.h>' -i tests/{util,vpd}.c
'';
nativeBuildInputs = [ pkg-config perl ];
buildInputs = [ systemd lvm2 libaio readline liburcu json_c linuxHeaders ];
nativeBuildInputs = [
perl
pkg-config
];
buildInputs = [
json_c
libaio
liburcu
linuxHeaders
lvm2
readline
systemd
util-linuxMinimal # for libmount
];
makeFlags = [
"LIB=lib"

View File

@@ -7,17 +7,17 @@
buildGoModule rec {
pname = "alertmanager";
version = "0.25.0";
version = "0.26.0";
rev = "v${version}";
src = fetchFromGitHub {
inherit rev;
owner = "prometheus";
repo = "alertmanager";
hash = "sha256-h87m3flE2GRAXMBgaAC+sOsPWEs7l9loQt6jGaSdXfQ=";
hash = "sha256-DCVxXSgoa4PrW4qBBWa1SOPN1GwcJFERz7+itsCdtGI=";
};
vendorHash = "sha256-BX4mT0waYtKvNyOW3xw5FmXI8TLmv857YBFTnV7XXD8=";
vendorHash = "sha256-GCcoT7Db0bQf+IGUP54GdxRmHCp1k2261B3T2htmbjk=";
subPackages = [ "cmd/alertmanager" "cmd/amtool" ];

View File

@@ -1,14 +1,14 @@
{ lib, stdenv, fetchFromGitHub, postgresql }:
{ lib, stdenv, fetchFromGitHub, postgresql, unstableGitUpdater }:
stdenv.mkDerivation {
pname = "pgjwt";
version = "unstable-2021-11-13";
version = "unstable-2023-03-02";
src = fetchFromGitHub {
owner = "michelp";
repo = "pgjwt";
rev = "9742dab1b2f297ad3811120db7b21451bca2d3c9";
sha256 = "sha256-Hw3R9bMGDmh+dMzjmqZSy/rT4mX8cPU969OJiARFg10=";
rev = "f3d82fd30151e754e19ce5d6a06c71c20689ce3d";
sha256 = "sha256-nDZEDf5+sFc1HDcG2eBNQj+kGcdAYRXJseKi9oww+JU=";
};
dontBuild = true;
@@ -17,6 +17,8 @@ stdenv.mkDerivation {
cp pg*sql *.control $out/share/postgresql/extension
'';
passthru.updateScript = unstableGitUpdater { };
meta = with lib; {
description = "PostgreSQL implementation of JSON Web Tokens";
longDescription = ''

View File

@@ -8,16 +8,16 @@
buildGoModule rec {
pname = "qovery-cli";
version = "0.69.1";
version = "0.70.0";
src = fetchFromGitHub {
owner = "Qovery";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-CT8Quz8m+ZB4VsxOrvoSyka3A+AcPC5QpHx8YJkSJ+4=";
hash = "sha256-XAgC6c+ZnPQVM/2jhEYAWZ4r4eFOFzwG36Q38sy63+s=";
};
vendorHash = "sha256-U/yV+6WV8Oc0gLcYFyfOeBzzJdNwyyBk3jPRkH3LUrc=";
vendorHash = "sha256-OexoLqlPBr1JSL63lP172YaGJ0GLlxxsJYdXIGhNqjs=";
nativeBuildInputs = [ installShellFiles ];

View File

@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "scaleway-cli";
version = "2.20.0";
version = "2.21.0";
src = fetchFromGitHub {
owner = "scaleway";
repo = "scaleway-cli";
rev = "v${version}";
sha256 = "sha256-zKqYbvSawu+xtDCxe31ERrjCMo4WLimbwAQX9mWvI7k=";
sha256 = "sha256-VZ3yCgO110t920T0vWP3IwdphlsZrWbJj5nXX70mtJ4=";
};
vendorHash = "sha256-UR7ZohQeLWux9AAvOUgtPA4F/qZXlx1vNjYrwal+Sac=";
vendorHash = "sha256-MVBxtd+MZ6aS/fJn/+/a2jjh1rKjeT5BiHF2mzg95C8=";
ldflags = [
"-w"

View File

@@ -7,19 +7,19 @@
buildGoModule rec {
pname = "trivy";
version = "0.45.0";
version = "0.45.1";
src = fetchFromGitHub {
owner = "aquasecurity";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-HsxcB3X8/n4Y8sU7im1nEGqMK9bVlhq5ZiF9gG+3YFs=";
hash = "sha256-sifQHzysuA92wYi1quCPx/ZGLKO4iQLgNe++DNDV8f4=";
};
# Hash mismatch on across Linux and Darwin
proxyVendor = true;
vendorHash = "sha256-rlMhmgnqvkKttfIzVMi1Ca/dqOdkoCF9yZbEcr8sv5I=";
vendorHash = "sha256-eQeyMZvOmYb+4K72wrO/vRf+XTkOP2z+7bmwFMVBxO0=";
subPackages = [ "cmd/trivy" ];

View File

@@ -9,11 +9,11 @@
stdenv.mkDerivation rec {
pname = "btrfs-progs";
version = "6.5";
version = "6.5.1";
src = fetchurl {
url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz";
sha256 = "sha256-j1B6DN9qizcthi2+SUP+hMZtyyCI48/eLPs7F26sHBw=";
sha256 = "sha256-2suygTboJYavgCIFJjpCjD0ZQXeLw/3JsbOG6hLrkE4=";
};
nativeBuildInputs = [

View File

@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "tldr-pages";
repo = "tldr-cpp-client";
repo = "tldr-c-client";
rev = "v${version}";
sha256 = "sha256-9pBMo+t/44tuT/CisS0w60KaKXjPfNTMr2v6Ftjaf1k=";
};

View File

@@ -16,14 +16,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "nixpkgs-review";
version = "2.10.1";
version = "2.10.2";
format = "pyproject";
src = fetchFromGitHub {
owner = "Mic92";
repo = "nixpkgs-review";
rev = version;
hash = "sha256-zZM0Ozl6uoYfzvHhQRluS4/5NNRuumQgc4MV993LNyY=";
hash = "sha256-x41piT7peYV3sNMVYsqcjCU4u+PayZb05JIWBeWF7jw=";
};
nativeBuildInputs = [

View File

@@ -1,4 +1,4 @@
# frozen_string_literal: true
source "https://rubygems.org"
gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.3.33"
gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.3.34"

View File

@@ -1,9 +1,9 @@
GIT
remote: https://github.com/rapid7/metasploit-framework
revision: 61956404cadf364417ec02b4cb7025b50a866565
ref: refs/tags/6.3.33
revision: 1396546689a7d63bf8ab3a831647784843b5065f
ref: refs/tags/6.3.34
specs:
metasploit-framework (6.3.33)
metasploit-framework (6.3.34)
actionpack (~> 7.0)
activerecord (~> 7.0)
activesupport (~> 7.0)

View File

@@ -15,13 +15,13 @@ let
};
in stdenv.mkDerivation rec {
pname = "metasploit-framework";
version = "6.3.33";
version = "6.3.34";
src = fetchFromGitHub {
owner = "rapid7";
repo = "metasploit-framework";
rev = version;
sha256 = "sha256-S/uazRDWK1AqLT2QTKiluRmcwy82PZitezQMw1Kb9no=";
sha256 = "sha256-DXG9OFY0KzH2MhI3lF/0vaFcvqugazpybFpxDehIyYg=";
};
nativeBuildInputs = [ makeWrapper ];

View File

@@ -654,12 +654,12 @@
platforms = [];
source = {
fetchSubmodules = false;
rev = "61956404cadf364417ec02b4cb7025b50a866565";
sha256 = "0ypnkd9c631lgfnrhg9n5z1rq6drlnl4r41x5lm50ayn236rmysb";
rev = "1396546689a7d63bf8ab3a831647784843b5065f";
sha256 = "126993l0swasdir3lsx0mfz5r8dxyigr8dqj6bv32arlaqwbsw8d";
type = "git";
url = "https://github.com/rapid7/metasploit-framework";
};
version = "6.3.33";
version = "6.3.34";
};
metasploit-model = {
groups = ["default"];

View File

@@ -2,25 +2,25 @@
buildGoModule rec {
pname = "sops";
version = "3.7.3";
version = "3.8.0";
src = fetchFromGitHub {
rev = "v${version}";
owner = "mozilla";
owner = "getsops";
repo = pname;
sha256 = "sha256-wN1ksLwD4G+fUhvCe+jahh1PojPk6L6tnx1rsc7dz+M=";
rev = "v${version}";
hash = "sha256-nUeygUZdtDyYGW3hZdxBHSUxYILJcHoIIYRpoxkAlI4=";
};
vendorHash = "sha256-8IaE+vhVZkc9QDR6+/3eOSsuf3SYF2upNcCifbqtx14=";
vendorHash = "sha256-/fh6pQ7u1icIYGM4gJHXyDNQlAbLnVluw5icovBMZ5k=";
ldflags = [ "-s" "-w" ];
subPackages = [ "cmd/sops" ];
doCheck = false;
ldflags = [ "-s" "-w" "-X github.com/getsops/sops/v3/version.Version=${version}" ];
meta = with lib; {
homepage = "https://github.com/mozilla/sops";
description = "Mozilla sops (Secrets OPerationS) is an editor of encrypted files";
changelog = "https://github.com/mozilla/sops/raw/v${version}/CHANGELOG.rst";
homepage = "https://github.com/getsops/sops";
description = "Simple and flexible tool for managing secrets";
changelog = "https://github.com/getsops/sops/blob/v${version}/CHANGELOG.rst";
maintainers = [ maintainers.marsam ];
license = licenses.mpl20;
};

View File

@@ -7,13 +7,13 @@
buildGoModule rec {
pname = "trufflehog";
version = "3.56.0";
version = "3.56.1";
src = fetchFromGitHub {
owner = "trufflesecurity";
repo = "trufflehog";
rev = "refs/tags/v${version}";
hash = "sha256-JNv3O8NSmQnk8lpGahlrZYVfpxeJCh7uxRahSfpXQ2Q=";
hash = "sha256-4FN3FAs6Sc2LLcqaKsSxJS9VVNwp/Zit9gZT+qDXRik=";
};
vendorHash = "sha256-NBwPyA+NuW9RA/dXj+FpTa6RU0WOZRrey7gosDOatG8=";

View File

@@ -7,13 +7,13 @@
rustPlatform.buildRustPackage rec {
pname = "systeroid";
version = "0.4.2";
version = "0.4.3";
src = fetchFromGitHub {
owner = "orhun";
repo = pname;
rev = "v${version}";
sha256 = "sha256-yEsDtjoV0NQPG/PJnVMBBMuPDBdK2kIfUWxtfkvRI04=";
sha256 = "sha256-ZviZ8zjUtVv7PRH9xuiGi8OtAHX1oo6JmKHLCyk4Vog=";
};
postPatch = ''
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec {
--replace '"/usr/share/doc/kernel-doc-*/Documentation/*",' '"${linux-doc}/share/doc/linux-doc/*",'
'';
cargoHash = "sha256-Plu7JxTFjLUXWLmIax/QPgq7QzdQd0vFinj+Gx03AQQ=";
cargoHash = "sha256-xpE7cP8nISMuIqSO6o6VREsVXQ+K5PU+XUEVvl3k51s=";
buildInputs = [
xorg.libxcb
@@ -33,7 +33,8 @@ rustPlatform.buildRustPackage rec {
meta = with lib; {
description = "More powerful alternative to sysctl(8) with a terminal user interface";
homepage = "https://github.com/orhun/systeroid";
license = licenses.asl20;
changelog = "https://github.com/orhun/systeroid/blob/${src.rev}/CHANGELOG.md";
license = with licenses; [ asl20 mit ];
maintainers = with maintainers; [ figsoda ];
};
}