Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
a4504825b2
@ -121,7 +121,7 @@ with lib.maintainers; {
|
||||
bobby285271
|
||||
mkg20001
|
||||
];
|
||||
scope = "Maintain Cinnamon desktop environment and applications made by the LinuxMint team.";
|
||||
scope = "Maintain Cinnamon desktop environment and applications made by the Linux Mint team.";
|
||||
shortName = "Cinnamon";
|
||||
enableFeatureFreezePing = true;
|
||||
};
|
||||
|
||||
@ -12,6 +12,7 @@ let
|
||||
extraGSettingsOverrides = cfg.extraGSettingsOverrides;
|
||||
};
|
||||
|
||||
notExcluded = pkg: (!(lib.elem pkg config.environment.cinnamon.excludePackages));
|
||||
in
|
||||
|
||||
{
|
||||
@ -65,10 +66,14 @@ in
|
||||
enable = mkDefault true;
|
||||
|
||||
# Taken from mint-artwork.gschema.override
|
||||
theme.name = mkDefault "Mint-X";
|
||||
theme.package = mkDefault pkgs.cinnamon.mint-themes;
|
||||
iconTheme.name = mkDefault "Mint-X-Dark";
|
||||
iconTheme.package = mkDefault pkgs.cinnamon.mint-x-icons;
|
||||
theme = mkIf (notExcluded pkgs.cinnamon.mint-themes) {
|
||||
name = mkDefault "Mint-X";
|
||||
package = mkDefault pkgs.cinnamon.mint-themes;
|
||||
};
|
||||
iconTheme = mkIf (notExcluded pkgs.cinnamon.mint-x-icons) {
|
||||
name = mkDefault "Mint-X-Dark";
|
||||
package = mkDefault pkgs.cinnamon.mint-x-icons;
|
||||
};
|
||||
};
|
||||
services.xserver.displayManager.sessionCommands = ''
|
||||
if test "$XDG_CURRENT_DESKTOP" = "Cinnamon"; then
|
||||
@ -123,11 +128,8 @@ in
|
||||
cinnamon-screensaver = {};
|
||||
};
|
||||
|
||||
environment.systemPackages = with pkgs.cinnamon // pkgs; [
|
||||
environment.systemPackages = with pkgs.cinnamon // pkgs; ([
|
||||
desktop-file-utils
|
||||
nixos-artwork.wallpapers.simple-dark-gray
|
||||
onboard
|
||||
sound-theme-freedesktop
|
||||
|
||||
# common-files
|
||||
cinnamon-common
|
||||
@ -152,24 +154,32 @@ in
|
||||
cinnamon-control-center
|
||||
cinnamon-settings-daemon
|
||||
libgnomekbd
|
||||
orca
|
||||
|
||||
# theme
|
||||
gnome.adwaita-icon-theme
|
||||
hicolor-icon-theme
|
||||
gnome.gnome-themes-extra
|
||||
gtk3.out
|
||||
|
||||
# other
|
||||
glib # for gsettings
|
||||
xdg-user-dirs
|
||||
] ++ utils.removePackagesByName [
|
||||
# accessibility
|
||||
onboard
|
||||
orca
|
||||
|
||||
# theme
|
||||
sound-theme-freedesktop
|
||||
nixos-artwork.wallpapers.simple-dark-gray
|
||||
mint-artwork
|
||||
mint-themes
|
||||
mint-x-icons
|
||||
mint-y-icons
|
||||
vanilla-dmz
|
||||
] config.environment.cinnamon.excludePackages);
|
||||
|
||||
# other
|
||||
glib # for gsettings
|
||||
shared-mime-info # for update-mime-database
|
||||
xdg-user-dirs
|
||||
];
|
||||
xdg.mime.enable = true;
|
||||
xdg.icons.enable = true;
|
||||
|
||||
# Override GSettings schemas
|
||||
environment.sessionVariables.NIX_GSETTINGS_OVERRIDES_DIR = "${nixos-gsettings-overrides}/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas";
|
||||
@ -183,7 +193,7 @@ in
|
||||
programs.bash.vteIntegration = mkDefault true;
|
||||
programs.zsh.vteIntegration = mkDefault true;
|
||||
|
||||
# Harmonize Qt5 applications under Pantheon
|
||||
# Harmonize Qt5 applications under Cinnamon
|
||||
qt5.enable = true;
|
||||
qt5.platformTheme = "gnome";
|
||||
qt5.style = "adwaita";
|
||||
|
||||
@ -166,13 +166,13 @@
|
||||
"version": "1.16.0"
|
||||
},
|
||||
"bitbucket": {
|
||||
"hash": "sha256-0Sts826Yt6xVVwGpqTC1ZAiNB2+7S6z9rPXDGPNpmOk=",
|
||||
"hash": "sha256-7Xxu3Q+pAaZdvRvfIFQFx3pfH8N0gk2waoxW//zh2dA=",
|
||||
"owner": "DrFaust92",
|
||||
"provider-source-address": "registry.terraform.io/DrFaust92/bitbucket",
|
||||
"repo": "terraform-provider-bitbucket",
|
||||
"rev": "v2.21.3",
|
||||
"rev": "v2.21.4",
|
||||
"vendorHash": "sha256-VFh86MFKzgN7LvSYG7TooYapOZOJbDC8sntPzGVaNs8=",
|
||||
"version": "2.21.3"
|
||||
"version": "2.21.4"
|
||||
},
|
||||
"brightbox": {
|
||||
"hash": "sha256-l4gN7gxLMTuUMjf50Hc2Els5pJ4BId1QlRAhykseK7c=",
|
||||
@ -886,13 +886,13 @@
|
||||
"version": "1.31.7"
|
||||
},
|
||||
"opsgenie": {
|
||||
"hash": "sha256-DhECesGkBaQuk43pF4xk6zln+FzgL+1A1rSm0sqg7XQ=",
|
||||
"hash": "sha256-OTwQ/sF4/xSyJjYy1TvLOr1guGcho+Es9/WkonfVvcg=",
|
||||
"owner": "opsgenie",
|
||||
"provider-source-address": "registry.terraform.io/opsgenie/opsgenie",
|
||||
"repo": "terraform-provider-opsgenie",
|
||||
"rev": "v0.6.16",
|
||||
"rev": "v0.6.17",
|
||||
"vendorHash": null,
|
||||
"version": "0.6.16"
|
||||
"version": "0.6.17"
|
||||
},
|
||||
"ovh": {
|
||||
"hash": "sha256-QaJZQU6bnjXoTCxfP1NcsPqegFyZ6JwP2QgN7zrE0z0=",
|
||||
@ -1120,13 +1120,13 @@
|
||||
"version": "0.13.5"
|
||||
},
|
||||
"tencentcloud": {
|
||||
"hash": "sha256-vVwfKzA6qK6VzRRlYPEqL1QPlpiruD8JZRL6oF/u62w=",
|
||||
"hash": "sha256-ZoNmoeeRnZ/CDAfXRyKxgXcXpjzquncbaS5dpjq16Lw=",
|
||||
"owner": "tencentcloudstack",
|
||||
"provider-source-address": "registry.terraform.io/tencentcloudstack/tencentcloud",
|
||||
"repo": "terraform-provider-tencentcloud",
|
||||
"rev": "v1.78.9",
|
||||
"rev": "v1.78.10",
|
||||
"vendorHash": null,
|
||||
"version": "1.78.9"
|
||||
"version": "1.78.10"
|
||||
},
|
||||
"tfe": {
|
||||
"hash": "sha256-MDlRwB2iVi/Rv7/UtukI6mIDImz8Gnpm5Qv5R6EDpiU=",
|
||||
@ -1284,12 +1284,12 @@
|
||||
"version": "3.4.0"
|
||||
},
|
||||
"yandex": {
|
||||
"hash": "sha256-WdiJD1gt56VDFe2qVKwiYOvneixaGRie6mrxdOCklQY=",
|
||||
"hash": "sha256-HBGQ+WrAy+f0nK0iyd/Z+Mj5AshvHyGyBEN0E61ftn0=",
|
||||
"owner": "yandex-cloud",
|
||||
"provider-source-address": "registry.terraform.io/yandex-cloud/yandex",
|
||||
"repo": "terraform-provider-yandex",
|
||||
"rev": "v0.81.0",
|
||||
"vendorHash": "sha256-n+XARZuMzmxUGxFAseKyiBsKuGDUl8T6LWXzJ+6ZJ/E=",
|
||||
"version": "0.81.0"
|
||||
"rev": "v0.82.0",
|
||||
"vendorHash": "sha256-Tgfgq3nrfZP2ie4KLmJq83TfzZ41lc4gwWIULLOQmBw=",
|
||||
"version": "0.82.0"
|
||||
}
|
||||
}
|
||||
|
||||
@ -5,23 +5,20 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "flexget";
|
||||
version = "3.4.2";
|
||||
version = "3.5.4";
|
||||
format = "pyproject";
|
||||
|
||||
# Fetch from GitHub in order to use `requirements.in`
|
||||
src = fetchFromGitHub {
|
||||
owner = "flexget";
|
||||
repo = "flexget";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-mq1xk27mIB1iiCphwMZRVqlIRwlYHihXSowQ9GAkR1U=";
|
||||
hash = "sha256-KANnZLNNDEo8pVWumFRR/Y67F1eS2JeDeX33nQ5YWlk=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
# Symlink requirements.in because upstream uses `pip-compile` which yields
|
||||
# python-version dependent requirements
|
||||
ln -sf requirements.in requirements.txt
|
||||
|
||||
# remove dependency constraints
|
||||
sed 's/[~<>=].*//' -i requirements.txt
|
||||
# remove dependency constraints but keep environment constraints
|
||||
sed 's/[~<>=][^;]*//' -i requirements.txt
|
||||
|
||||
# "zxcvbn-python" was renamed to "zxcvbn", and we don't have the former in
|
||||
# nixpkgs. See: https://github.com/NixOS/nixpkgs/issues/62110
|
||||
@ -32,7 +29,7 @@ python3Packages.buildPythonApplication rec {
|
||||
doCheck = false;
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
# See https://github.com/Flexget/Flexget/blob/master/requirements.in
|
||||
# See https://github.com/Flexget/Flexget/blob/master/requirements.txt
|
||||
APScheduler
|
||||
beautifulsoup4
|
||||
click
|
||||
@ -55,6 +52,7 @@ python3Packages.buildPythonApplication rec {
|
||||
rich
|
||||
rpyc
|
||||
sqlalchemy
|
||||
typing-extensions
|
||||
|
||||
# WebUI requirements
|
||||
cherrypy
|
||||
|
||||
37
pkgs/data/fonts/hubot-sans/default.nix
Normal file
37
pkgs/data/fonts/hubot-sans/default.nix
Normal file
@ -0,0 +1,37 @@
|
||||
{ lib
|
||||
, stdenvNoCC
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "hubot-sans";
|
||||
version = "1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = "v" + version;
|
||||
owner = "github";
|
||||
repo = pname;
|
||||
sha256 = "GOql+V5TH4b3TmhlgnKcx3jzUAO2jm4HRJRNzdIKxgg=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
install -m644 --target $out/share/fonts/truetype/hubot-sans -D $src/dist/hubot-sans.ttf
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "A variable font from GitHub";
|
||||
homepage = "https://github.com/github/hubot-sans";
|
||||
license = lib.licenses.ofl;
|
||||
longDescription = ''
|
||||
Hubot Sans is Mona Sans’s robotic sidekick. The typeface is designed with
|
||||
more geometric accents to lend a technical and idiosyncratic feel—perfect
|
||||
for headers and pull-quotes. Made together with Degarism.
|
||||
|
||||
Hubot Sans is a variable font. Variable fonts enable different variations
|
||||
of a typeface to be incorporated into one single file, and are supported
|
||||
by all major browsers.
|
||||
'';
|
||||
maintainers = with lib.maintainers; [ drupol ];
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
}
|
||||
39
pkgs/data/fonts/mona-sans/default.nix
Normal file
39
pkgs/data/fonts/mona-sans/default.nix
Normal file
@ -0,0 +1,39 @@
|
||||
{ lib
|
||||
, stdenvNoCC
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "mona-sans";
|
||||
version = "1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = "v" + version;
|
||||
owner = "github";
|
||||
repo = pname;
|
||||
sha256 = "iJhbSGNByOvtJd9hEh0g7Ht6eoAJ18jco0oHGqjOiLQ=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
install -m644 --target $out/share/fonts/truetype/mona-sans -D $src/dist/*.ttf
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "A variable font from GitHub";
|
||||
homepage = "https://github.com/github/mona-sans";
|
||||
license = lib.licenses.ofl;
|
||||
longDescription = ''
|
||||
A strong and versatile typeface, designed together with Degarism and
|
||||
inspired by industrial-era grotesques. Mona Sans works well across
|
||||
product, web, and print. Made to work well together with Mona Sans's
|
||||
sidekick, Hubot Sans.
|
||||
|
||||
Mona Sans is a variable font. Variable fonts enable different variations
|
||||
of a typeface to be incorporated into one single file, and are supported
|
||||
by all major browsers, allowing for performance benefits and granular
|
||||
design control of the typeface's weight, width, and slant.
|
||||
'';
|
||||
maintainers = with lib.maintainers; [ drupol ];
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
}
|
||||
@ -9,12 +9,12 @@
|
||||
|
||||
ocamlPackages.buildDunePackage rec {
|
||||
pname = "ligo";
|
||||
version = "0.54.1";
|
||||
version = "0.55.0";
|
||||
src = fetchFromGitLab {
|
||||
owner = "ligolang";
|
||||
repo = "ligo";
|
||||
rev = version;
|
||||
sha256 = "sha256-P4oScKsf2A6qtkzpep8lewqSMM9A+vHyN5VaH7+/6xQ=";
|
||||
sha256 = "sha256-GEw9OEHXdTxBvb5ATIcL71wdUCLD+X/A7CYQxwTUQWw=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@ -14,13 +14,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "aws-c-auth";
|
||||
version = "0.6.18";
|
||||
version = "0.6.20";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "awslabs";
|
||||
repo = "aws-c-auth";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-id4PrPK40yG7DDVh5QWwq2PP7QAso47vgWT8TxIVYXY=";
|
||||
sha256 = "sha256-d6o+ClQMhoSU8wjdP0nr+g6r4ZqzXhxBJcEfTOSlS7o=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -7,13 +7,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "aws-c-compression";
|
||||
version = "0.2.15";
|
||||
version = "0.2.16";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "awslabs";
|
||||
repo = "aws-c-compression";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-VWQsPEanti6EyAfDbdUfFwe3sh/AhElytTQn2ZpLVgg=";
|
||||
sha256 = "sha256-aQ5UsMms8aJh5yrE9of1AQgIGTAk9vyBRaybwYqUY68=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -11,13 +11,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "aws-c-http";
|
||||
version = "0.6.24";
|
||||
version = "0.6.27";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "awslabs";
|
||||
repo = "aws-c-http";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-sY0R9Hn0keX4djkHVXszCCfdqa+rzokTe18e5YH0fqs=";
|
||||
sha256 = "sha256-prDQemFMIt33fna44tAaKlnblO4t5UU0vS6qyJKgJxk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -17,7 +17,7 @@ buildGoModule rec {
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X github.com/aquasecurity/tfsec/version.Version=${version}"
|
||||
"-X github.com/aquasecurity/tfsec/version.Version=v${version}"
|
||||
## not sure if this is needed (https://github.com/aquasecurity/tfsec/blob/master/.goreleaser.yml#L6)
|
||||
# "-extldflags '-fno-PIC -static'"
|
||||
];
|
||||
|
||||
@ -8,16 +8,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "ruff";
|
||||
version = "0.0.110";
|
||||
version = "0.0.112";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "charliermarsh";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-L7LqIov0Ifz4wRV6FD4PIcUFauQCBaL8HXea400j0tE=";
|
||||
sha256 = "sha256-6EV+DLwISo16JdvgI1gMajoAbuzKldjUtjpoe+VkGWI=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-CcLNgZqcfJK/1DwLNP+GTej+OwmJ4w6SXob0Y3ccwS8=";
|
||||
cargoSha256 = "sha256-7alnTKjrsBem/q10ojMGNwidACv4C+pr/mFs5wqL2ww=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [
|
||||
CoreServices
|
||||
|
||||
@ -2,14 +2,14 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-supply-chain";
|
||||
version = "0.3.1";
|
||||
version = "0.3.2";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-2iOAa0f0C3tS4oLrSJYjGnuoziPFxcQzXZLqENQq5PY=";
|
||||
sha256 = "sha256-0WyaenLyD1MNkV+mzCIodhtkU6FqbGnuTdw6PvzIrVU=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-7wjaakyh27U7jjQQ6wNKR4lKQ7Y/+EEfLCfjVojk3TU=";
|
||||
cargoSha256 = "sha256-K3qBhd090BUZyJIAbhPBCQpCwgudCSGL7i7EezOp66Y=";
|
||||
|
||||
buildInputs = lib.optional stdenv.isDarwin Security;
|
||||
|
||||
|
||||
@ -9,13 +9,13 @@
|
||||
|
||||
buildDotnetModule rec {
|
||||
pname = "jackett";
|
||||
version = "0.20.2225";
|
||||
version = "0.20.2236";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "HrI0B5gvN/UC9TmErwsmRc85aqCXfYYEQfPkRchHY5Q=";
|
||||
sha256 = "tCE/iicn2HbsdnINcRKp8D7sXCjO57uH/aBfaZrjRqc=";
|
||||
};
|
||||
|
||||
projectFile = "src/Jackett.Server/Jackett.Server.csproj";
|
||||
|
||||
@ -24,14 +24,14 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xrootd";
|
||||
version = "5.5.0";
|
||||
version = "5.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xrootd";
|
||||
repo = "xrootd";
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-a8qw8uHxd7OLMMq+HPMB36O0Yjctlnf8DkfEdMvc1NQ=";
|
||||
hash = "sha256-PaLT3+5FucPnWLStWxtBBqTKs8hvogKMrZteSNY+xXI=";
|
||||
};
|
||||
|
||||
outputs = [ "bin" "out" "dev" "man" ];
|
||||
@ -66,11 +66,6 @@ stdenv.mkDerivation rec {
|
||||
|
||||
preConfigure = ''
|
||||
patchShebangs genversion.sh
|
||||
|
||||
# Manually apply part of
|
||||
# https://github.com/xrootd/xrootd/pull/1619
|
||||
# Remove after the above PR is merged.
|
||||
sed -i 's/set\((\s*CMAKE_INSTALL_[A-Z_]\+DIR\s\+"[^"]\+"\s*)\)/define_default\1/g' cmake/XRootDOSDefs.cmake
|
||||
'';
|
||||
|
||||
# https://github.com/xrootd/xrootd/blob/master/packaging/rhel/xrootd.spec.in#L665-L675=
|
||||
|
||||
@ -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.2.25"
|
||||
gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.2.26"
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
GIT
|
||||
remote: https://github.com/rapid7/metasploit-framework
|
||||
revision: 2ab12336a4a6197c88ca4777c016311fa4fb7a3d
|
||||
ref: refs/tags/6.2.25
|
||||
revision: ef8b26c32cbcf48e9ba6a4d6c01d587a1d45f6cc
|
||||
ref: refs/tags/6.2.26
|
||||
specs:
|
||||
metasploit-framework (6.2.25)
|
||||
metasploit-framework (6.2.26)
|
||||
actionpack (~> 6.0)
|
||||
activerecord (~> 6.0)
|
||||
activesupport (~> 6.0)
|
||||
@ -32,7 +32,7 @@ GIT
|
||||
metasploit-concern
|
||||
metasploit-credential
|
||||
metasploit-model
|
||||
metasploit-payloads (= 2.0.97)
|
||||
metasploit-payloads (= 2.0.99)
|
||||
metasploit_data_models
|
||||
metasploit_payloads-mettle (= 1.0.20)
|
||||
mqtt
|
||||
@ -129,13 +129,13 @@ GEM
|
||||
arel-helpers (2.14.0)
|
||||
activerecord (>= 3.1.0, < 8)
|
||||
aws-eventstream (1.2.0)
|
||||
aws-partitions (1.656.0)
|
||||
aws-sdk-core (3.166.0)
|
||||
aws-partitions (1.659.0)
|
||||
aws-sdk-core (3.167.0)
|
||||
aws-eventstream (~> 1, >= 1.0.2)
|
||||
aws-partitions (~> 1, >= 1.651.0)
|
||||
aws-sigv4 (~> 1.5)
|
||||
jmespath (~> 1, >= 1.6.1)
|
||||
aws-sdk-ec2 (1.345.0)
|
||||
aws-sdk-ec2 (1.349.0)
|
||||
aws-sdk-core (~> 3, >= 3.165.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-iam (1.73.0)
|
||||
@ -236,7 +236,7 @@ GEM
|
||||
activemodel (~> 6.0)
|
||||
activesupport (~> 6.0)
|
||||
railties (~> 6.0)
|
||||
metasploit-payloads (2.0.97)
|
||||
metasploit-payloads (2.0.99)
|
||||
metasploit_data_models (5.0.6)
|
||||
activerecord (~> 6.0)
|
||||
activesupport (~> 6.0)
|
||||
@ -427,7 +427,7 @@ GEM
|
||||
activesupport (>= 4.2, < 8.0)
|
||||
xmlrpc (0.3.2)
|
||||
webrick
|
||||
zeitwerk (2.6.5)
|
||||
zeitwerk (2.6.6)
|
||||
|
||||
PLATFORMS
|
||||
ruby
|
||||
|
||||
@ -15,13 +15,13 @@ let
|
||||
};
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "metasploit-framework";
|
||||
version = "6.2.25";
|
||||
version = "6.2.26";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rapid7";
|
||||
repo = "metasploit-framework";
|
||||
rev = version;
|
||||
sha256 = "sha256-lrooEMmSu7pgG3Nm35G385ipdc4WdlM696Dd5KdwVJ0=";
|
||||
sha256 = "sha256-qPhN+N0AFSrkdxtUPZwJMicDafKpuwaQg+sDA6ssHow=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@ -104,30 +104,30 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1l4n8wrjhm4n9hn8c1dm92vwqlcf5wryw4dqmmp5whm6k2k9slkh";
|
||||
sha256 = "0iwkwvx56rivfrqgsjap7bkn0zd9d5m712fx0b1mgcfalm6xjcpl";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.656.0";
|
||||
version = "1.659.0";
|
||||
};
|
||||
aws-sdk-core = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1yj5975raq5abh6jfn66l1pkpb8rj2a032777jypy00k3yiq4yw2";
|
||||
sha256 = "095nj7sf8914y60m1grnpy7cm6ybnw4ywnc0j84gz2vgv1m8awfk";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.166.0";
|
||||
version = "3.167.0";
|
||||
};
|
||||
aws-sdk-ec2 = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1lqx1iadp1vdm3rgb79a219a7xkss409fadqnd5k7vl0cncxkg2s";
|
||||
sha256 = "1xk33r0q44ngsy9d6nh4isw9aa9rz31ajb69apk4b2wmc2gi1mcw";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.345.0";
|
||||
version = "1.349.0";
|
||||
};
|
||||
aws-sdk-iam = {
|
||||
groups = ["default"];
|
||||
@ -604,12 +604,12 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
fetchSubmodules = false;
|
||||
rev = "2ab12336a4a6197c88ca4777c016311fa4fb7a3d";
|
||||
sha256 = "17alf2ky9pd0ywx56xhnrrssk67kny8xyrkk3dhbmfwjr482ifln";
|
||||
rev = "ef8b26c32cbcf48e9ba6a4d6c01d587a1d45f6cc";
|
||||
sha256 = "130y5jmh60zbhf80dfx9y9lh69rj16f3sm0vfzj2l580vpw4vy58";
|
||||
type = "git";
|
||||
url = "https://github.com/rapid7/metasploit-framework";
|
||||
};
|
||||
version = "6.2.25";
|
||||
version = "6.2.26";
|
||||
};
|
||||
metasploit-model = {
|
||||
groups = ["default"];
|
||||
@ -626,10 +626,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1c3ymwqm3paa0sqpnbd2mfz6gwqskv3mg1nphaqns7s1kx1za5nm";
|
||||
sha256 = "1rfnxkg31ksylg1rjk05d9kk4af4rbw66ipwl3q0vl3qvnbymfm8";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.0.97";
|
||||
version = "2.0.99";
|
||||
};
|
||||
metasploit_data_models = {
|
||||
groups = ["default"];
|
||||
@ -1568,9 +1568,9 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "10ipi1b3rh2vgwskfzcrgagc6hw5ppsz7jamsimglvww8bvya3zy";
|
||||
sha256 = "09pqhdi6q4sqv0p1gnjpbcy4az0yv8hrpykjngdgh9qiqd87nfdv";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.6.5";
|
||||
version = "2.6.6";
|
||||
};
|
||||
}
|
||||
|
||||
@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "erikarvstedt";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-vtCZ0w1Kaiw9bIrzwEb4Jnv7QoQLp8JDjaGmAP91hpE=";
|
||||
hash = "sha256-ORe1tSWhmgIaDj3CTEovsFCq+60LQmYy8RUx9v7De30=";
|
||||
};
|
||||
|
||||
buildCommand = ''
|
||||
|
||||
@ -26432,6 +26432,8 @@ with pkgs;
|
||||
|
||||
hermit = callPackage ../data/fonts/hermit { };
|
||||
|
||||
hubot-sans = callPackage ../data/fonts/hubot-sans { };
|
||||
|
||||
humanity-icon-theme = callPackage ../data/icons/humanity-icon-theme { };
|
||||
|
||||
hyperscrypt-font = callPackage ../data/fonts/hyperscrypt { };
|
||||
@ -26649,6 +26651,8 @@ with pkgs;
|
||||
|
||||
moka-icon-theme = callPackage ../data/icons/moka-icon-theme { };
|
||||
|
||||
mona-sans = callPackage ../data/fonts/mona-sans { };
|
||||
|
||||
monoid = callPackage ../data/fonts/monoid { };
|
||||
|
||||
mononoki = callPackage ../data/fonts/mononoki { };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user