From f57a69236018b07195845ce26876aaa5626b67d1 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Mon, 7 Nov 2022 08:48:39 +0100 Subject: [PATCH 01/25] flexget: 3.4.2 -> 3.5.4 --- pkgs/applications/networking/flexget/default.nix | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index a469287ed4d0..8caef5528ba3 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -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 From fa3008b93c251a0f4a6dc9510b2b021676246045 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 8 Nov 2022 15:57:03 +0800 Subject: [PATCH 02/25] nixos/cinnamon: switch to xdg.mime.enable We enable this option explicitly to prevent users from accidentally disabling it and getting a broken desktop. --- nixos/modules/services/x11/desktop-managers/cinnamon.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/x11/desktop-managers/cinnamon.nix b/nixos/modules/services/x11/desktop-managers/cinnamon.nix index 3d79a3b8513b..f5a03aee614f 100644 --- a/nixos/modules/services/x11/desktop-managers/cinnamon.nix +++ b/nixos/modules/services/x11/desktop-managers/cinnamon.nix @@ -167,10 +167,11 @@ in # other glib # for gsettings - shared-mime-info # for update-mime-database xdg-user-dirs ]; + xdg.mime.enable = true; + # Override GSettings schemas environment.sessionVariables.NIX_GSETTINGS_OVERRIDES_DIR = "${nixos-gsettings-overrides}/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas"; From e88b1dc9c8885b2853499f013101bfc68c80b1fe Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 8 Nov 2022 15:58:04 +0800 Subject: [PATCH 03/25] nixos/cinnamon: switch to xdg.icons.enable We enable this option explicitly to prevent users from accidentally disabling it and getting a broken desktop. --- nixos/modules/services/x11/desktop-managers/cinnamon.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/x11/desktop-managers/cinnamon.nix b/nixos/modules/services/x11/desktop-managers/cinnamon.nix index f5a03aee614f..9b29a5ddc6a2 100644 --- a/nixos/modules/services/x11/desktop-managers/cinnamon.nix +++ b/nixos/modules/services/x11/desktop-managers/cinnamon.nix @@ -156,7 +156,6 @@ in # theme gnome.adwaita-icon-theme - hicolor-icon-theme gnome.gnome-themes-extra gtk3.out mint-artwork @@ -171,6 +170,7 @@ in ]; 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"; From bb307797918a9b3a5c0e1c50ecdc7db154eb1944 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 8 Nov 2022 15:58:54 +0800 Subject: [PATCH 04/25] nixos/cinnamon: fix some typos --- maintainers/team-list.nix | 2 +- nixos/modules/services/x11/desktop-managers/cinnamon.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 34d847b01c20..994804deb802 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -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; }; diff --git a/nixos/modules/services/x11/desktop-managers/cinnamon.nix b/nixos/modules/services/x11/desktop-managers/cinnamon.nix index 9b29a5ddc6a2..5548d7a3eef2 100644 --- a/nixos/modules/services/x11/desktop-managers/cinnamon.nix +++ b/nixos/modules/services/x11/desktop-managers/cinnamon.nix @@ -184,7 +184,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"; From ba4494f8f67b3a160ecfd24391cea477f6a4ff6a Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 9 Nov 2022 22:40:05 +0800 Subject: [PATCH 05/25] nixos/cinnamon: make it possible to remove more non-essential packages Packages for accessibility and theme can now be removed with excludePackages --- .../x11/desktop-managers/cinnamon.nix | 24 +++++++++++-------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/nixos/modules/services/x11/desktop-managers/cinnamon.nix b/nixos/modules/services/x11/desktop-managers/cinnamon.nix index 5548d7a3eef2..1bc5d108af0a 100644 --- a/nixos/modules/services/x11/desktop-managers/cinnamon.nix +++ b/nixos/modules/services/x11/desktop-managers/cinnamon.nix @@ -123,11 +123,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,22 +149,29 @@ in cinnamon-control-center cinnamon-settings-daemon libgnomekbd - orca # theme gnome.adwaita-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 - - # other - glib # for gsettings - xdg-user-dirs - ]; + ] config.environment.cinnamon.excludePackages); xdg.mime.enable = true; xdg.icons.enable = true; From 8380ac45386c8dcd9ea372eb761ce2ef74f71cbc Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 10 Nov 2022 14:21:42 +0800 Subject: [PATCH 06/25] nixos/cinnamon: don't override greeter theme if the package is excluded This makes it possible to remove mint themes in an easy way, in this case we will just use the default from slick-greeter module, i.e. the Adwaita theme. --- .../services/x11/desktop-managers/cinnamon.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/x11/desktop-managers/cinnamon.nix b/nixos/modules/services/x11/desktop-managers/cinnamon.nix index 1bc5d108af0a..2c59ee410d5f 100644 --- a/nixos/modules/services/x11/desktop-managers/cinnamon.nix +++ b/nixos/modules/services/x11/desktop-managers/cinnamon.nix @@ -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 From 3c8235ed7d0a9817195f6b98469db394e3c2fff7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 11 Nov 2022 05:15:13 +0000 Subject: [PATCH 07/25] aws-c-http: 0.6.24 -> 0.6.25 --- pkgs/development/libraries/aws-c-http/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/aws-c-http/default.nix b/pkgs/development/libraries/aws-c-http/default.nix index 73ed621c6516..4bdf31953f20 100644 --- a/pkgs/development/libraries/aws-c-http/default.nix +++ b/pkgs/development/libraries/aws-c-http/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "aws-c-http"; - version = "0.6.24"; + version = "0.6.25"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-c-http"; rev = "v${version}"; - sha256 = "sha256-sY0R9Hn0keX4djkHVXszCCfdqa+rzokTe18e5YH0fqs="; + sha256 = "sha256-kpUdIKEn5J/M6WmtBYyvpQQd2PDhrCPH5BSwedOVcJM="; }; nativeBuildInputs = [ From 8058931a66b9fe7a527195f6bb7b70c258f15206 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 11 Nov 2022 05:16:00 +0000 Subject: [PATCH 08/25] aws-c-http: 0.6.25 -> 0.6.27 https://github.com/awslabs/aws-c-http/releases/tag/v0.6.26 https://github.com/awslabs/aws-c-http/releases/tag/v0.6.27 --- pkgs/development/libraries/aws-c-http/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/aws-c-http/default.nix b/pkgs/development/libraries/aws-c-http/default.nix index 4bdf31953f20..4f9a46820b08 100644 --- a/pkgs/development/libraries/aws-c-http/default.nix +++ b/pkgs/development/libraries/aws-c-http/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "aws-c-http"; - version = "0.6.25"; + version = "0.6.27"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-c-http"; rev = "v${version}"; - sha256 = "sha256-kpUdIKEn5J/M6WmtBYyvpQQd2PDhrCPH5BSwedOVcJM="; + sha256 = "sha256-prDQemFMIt33fna44tAaKlnblO4t5UU0vS6qyJKgJxk="; }; nativeBuildInputs = [ From 8367902e491055e3f084d01ad9eae5afc03e3874 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 11 Nov 2022 06:49:20 +0000 Subject: [PATCH 09/25] aws-c-auth: 0.6.18 -> 0.6.19 --- pkgs/development/libraries/aws-c-auth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/aws-c-auth/default.nix b/pkgs/development/libraries/aws-c-auth/default.nix index 156f45f873bf..c8e6f6a1faf5 100644 --- a/pkgs/development/libraries/aws-c-auth/default.nix +++ b/pkgs/development/libraries/aws-c-auth/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "aws-c-auth"; - version = "0.6.18"; + version = "0.6.19"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-c-auth"; rev = "v${version}"; - sha256 = "sha256-id4PrPK40yG7DDVh5QWwq2PP7QAso47vgWT8TxIVYXY="; + sha256 = "sha256-UozpsGdn/Y9lFot/QMIYcLhUcBfbXu/3gQHEzY5zPD0="; }; nativeBuildInputs = [ From f5695368dcf01c837dff9172a9e1c901956c409f Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 11 Nov 2022 06:50:00 +0000 Subject: [PATCH 10/25] aws-c-auth: 0.6.19 -> 0.6.20 https://github.com/awslabs/aws-c-auth/releases/tag/v0.6.20 --- pkgs/development/libraries/aws-c-auth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/aws-c-auth/default.nix b/pkgs/development/libraries/aws-c-auth/default.nix index c8e6f6a1faf5..0720b836388b 100644 --- a/pkgs/development/libraries/aws-c-auth/default.nix +++ b/pkgs/development/libraries/aws-c-auth/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "aws-c-auth"; - version = "0.6.19"; + version = "0.6.20"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-c-auth"; rev = "v${version}"; - sha256 = "sha256-UozpsGdn/Y9lFot/QMIYcLhUcBfbXu/3gQHEzY5zPD0="; + sha256 = "sha256-d6o+ClQMhoSU8wjdP0nr+g6r4ZqzXhxBJcEfTOSlS7o="; }; nativeBuildInputs = [ From 0f5c694e413ec60c37d6b57d384cbad2e66bea91 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 11 Nov 2022 07:32:23 +0000 Subject: [PATCH 11/25] aws-c-compression: 0.2.15 -> 0.2.16 --- pkgs/development/libraries/aws-c-compression/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/aws-c-compression/default.nix b/pkgs/development/libraries/aws-c-compression/default.nix index 8627ea5b8931..32b16d5f388b 100644 --- a/pkgs/development/libraries/aws-c-compression/default.nix +++ b/pkgs/development/libraries/aws-c-compression/default.nix @@ -6,13 +6,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 = [ From 9a392408f8a5daee9fe38adf28b334c565436b1b Mon Sep 17 00:00:00 2001 From: Ulrik Strid Date: Fri, 11 Nov 2022 09:21:05 +0100 Subject: [PATCH 12/25] ligo: 0.54.1 -> 0.55.0 --- pkgs/development/compilers/ligo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/ligo/default.nix b/pkgs/development/compilers/ligo/default.nix index 1f6492b911a6..f0edb4815d6a 100644 --- a/pkgs/development/compilers/ligo/default.nix +++ b/pkgs/development/compilers/ligo/default.nix @@ -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; }; From 2d2f9506d0d7c84a32cc8962951751957c658a76 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 11 Nov 2022 09:31:39 +0100 Subject: [PATCH 13/25] metasploit: 6.2.25 -> 6.2.26 --- pkgs/tools/security/metasploit/Gemfile | 2 +- pkgs/tools/security/metasploit/Gemfile.lock | 18 +++++++------- pkgs/tools/security/metasploit/default.nix | 4 ++-- pkgs/tools/security/metasploit/gemset.nix | 26 ++++++++++----------- 4 files changed, 25 insertions(+), 25 deletions(-) diff --git a/pkgs/tools/security/metasploit/Gemfile b/pkgs/tools/security/metasploit/Gemfile index 4a6dd4336fab..7959e18698d2 100644 --- a/pkgs/tools/security/metasploit/Gemfile +++ b/pkgs/tools/security/metasploit/Gemfile @@ -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" diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock index 1817df3c473a..d635a1231580 100644 --- a/pkgs/tools/security/metasploit/Gemfile.lock +++ b/pkgs/tools/security/metasploit/Gemfile.lock @@ -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 diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix index 6b3578105cf7..cae6648f5ef9 100644 --- a/pkgs/tools/security/metasploit/default.nix +++ b/pkgs/tools/security/metasploit/default.nix @@ -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 ]; diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/tools/security/metasploit/gemset.nix index 0e3186c100be..8e9709c984e3 100644 --- a/pkgs/tools/security/metasploit/gemset.nix +++ b/pkgs/tools/security/metasploit/gemset.nix @@ -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"; }; } From 9f59a993d1f95e44ca8ebae1bd91535d1c1cc207 Mon Sep 17 00:00:00 2001 From: figsoda Date: Fri, 11 Nov 2022 09:47:28 -0500 Subject: [PATCH 14/25] cargo-supply-chain: 0.3.1 -> 0.3.2 --- pkgs/development/tools/rust/cargo-supply-chain/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-supply-chain/default.nix b/pkgs/development/tools/rust/cargo-supply-chain/default.nix index d938b93c2456..9e2eb3ee7e1e 100644 --- a/pkgs/development/tools/rust/cargo-supply-chain/default.nix +++ b/pkgs/development/tools/rust/cargo-supply-chain/default.nix @@ -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; From c14697d8031feae1f2b4dd399cdcb4783e0925f3 Mon Sep 17 00:00:00 2001 From: Felix Uhl Date: Fri, 11 Nov 2022 16:09:23 +0100 Subject: [PATCH 15/25] tfsec: fix broken info links and version string Fixes #200710. The version string must be prefixed with a v, otherwise links to information about the findings from tfsec will 404. --- pkgs/development/tools/analysis/tfsec/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/analysis/tfsec/default.nix b/pkgs/development/tools/analysis/tfsec/default.nix index 89f23062692a..1127e6323de5 100644 --- a/pkgs/development/tools/analysis/tfsec/default.nix +++ b/pkgs/development/tools/analysis/tfsec/default.nix @@ -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'" ]; From e32b81f3b33e62a6ea1930ecf12c90ee4d406254 Mon Sep 17 00:00:00 2001 From: Erik Arvstedt Date: Fri, 11 Nov 2022 16:57:16 +0100 Subject: [PATCH 16/25] extra-container: fix src hash I forgot to update it during the last version update. --- pkgs/tools/virtualization/extra-container/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/virtualization/extra-container/default.nix b/pkgs/tools/virtualization/extra-container/default.nix index e57c43059774..bb06d3f33fa7 100644 --- a/pkgs/tools/virtualization/extra-container/default.nix +++ b/pkgs/tools/virtualization/extra-container/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { owner = "erikarvstedt"; repo = pname; rev = version; - hash = "sha256-vtCZ0w1Kaiw9bIrzwEb4Jnv7QoQLp8JDjaGmAP91hpE="; + hash = "sha256-ORe1tSWhmgIaDj3CTEovsFCq+60LQmYy8RUx9v7De30="; }; buildCommand = '' From a96cf7c32ba70716250063506c1791df33aff3e3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 11 Nov 2022 17:59:11 +0000 Subject: [PATCH 17/25] jackett: 0.20.2225 -> 0.20.2236 --- pkgs/servers/jackett/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index 8004993a2094..2f7ffd7818e3 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -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"; From eab9b5f7a1d04ee6cc113ae845caa4e3650aecdc Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Fri, 11 Nov 2022 21:53:17 +0100 Subject: [PATCH 18/25] hubot-sans: init at v1.0 --- pkgs/data/fonts/hubot-sans/default.nix | 37 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 39 insertions(+) create mode 100644 pkgs/data/fonts/hubot-sans/default.nix diff --git a/pkgs/data/fonts/hubot-sans/default.nix b/pkgs/data/fonts/hubot-sans/default.nix new file mode 100644 index 000000000000..2458911fda38 --- /dev/null +++ b/pkgs/data/fonts/hubot-sans/default.nix @@ -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; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d20b4d8e8d40..2c9ed1f2a477 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26436,6 +26436,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 { }; From d0d865125bb8b90f85b34ff9f06f364c5dff1dce Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Fri, 11 Nov 2022 21:53:56 +0100 Subject: [PATCH 19/25] mona-sans: init at v1.0 --- pkgs/data/fonts/mona-sans/default.nix | 39 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 41 insertions(+) create mode 100644 pkgs/data/fonts/mona-sans/default.nix diff --git a/pkgs/data/fonts/mona-sans/default.nix b/pkgs/data/fonts/mona-sans/default.nix new file mode 100644 index 000000000000..b43a01b4fecf --- /dev/null +++ b/pkgs/data/fonts/mona-sans/default.nix @@ -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; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2c9ed1f2a477..4e945d30916a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26655,6 +26655,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 { }; From cd28acf702563e6a645c0807fabc475643ce5d83 Mon Sep 17 00:00:00 2001 From: figsoda Date: Fri, 11 Nov 2022 12:54:26 -0500 Subject: [PATCH 20/25] ruff: 0.0.110 -> 0.0.112 --- pkgs/development/tools/ruff/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/ruff/default.nix b/pkgs/development/tools/ruff/default.nix index 36a1d90cf761..47d830a512e4 100644 --- a/pkgs/development/tools/ruff/default.nix +++ b/pkgs/development/tools/ruff/default.nix @@ -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 From afe243f3c9efe77ced675986875d547425a4a8f6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 20 Oct 2022 03:15:25 +0000 Subject: [PATCH 21/25] xrootd: 5.5.0 -> 5.5.1 Base the update on r-ryantm's automatic work. Remove the already included patch. --- pkgs/tools/networking/xrootd/default.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/networking/xrootd/default.nix b/pkgs/tools/networking/xrootd/default.nix index 454ee0944620..93683bc6f7fa 100644 --- a/pkgs/tools/networking/xrootd/default.nix +++ b/pkgs/tools/networking/xrootd/default.nix @@ -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= From 7f8be3a7e4f70c9e804eec28ace0f5986289c80d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 12 Nov 2022 03:32:15 +0000 Subject: [PATCH 22/25] =?UTF-8?q?terraform-providers.bitbucket:=202.21.3?= =?UTF-8?q?=20=E2=86=92=202.21.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 029e88fb29a8..967ee6106e0e 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -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=", From 684169b5bb111e701f96a775b2b398629f80f109 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 12 Nov 2022 03:34:01 +0000 Subject: [PATCH 23/25] =?UTF-8?q?terraform-providers.opsgenie:=200.6.16=20?= =?UTF-8?q?=E2=86=92=200.6.17?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 967ee6106e0e..63c2f8ccb854 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -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=", From c107dd3c00d0ede7fdf10fc58dc79a1459563729 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 12 Nov 2022 03:38:10 +0000 Subject: [PATCH 24/25] =?UTF-8?q?terraform-providers.yandex:=200.81.0=20?= =?UTF-8?q?=E2=86=92=200.82.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 63c2f8ccb854..61f0429d6f90 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -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" } } From dd4767bf613bf9553eee6ff37c0996b9c876e7d8 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 12 Nov 2022 03:38:14 +0000 Subject: [PATCH 25/25] =?UTF-8?q?terraform-providers.tencentcloud:=201.78.?= =?UTF-8?q?9=20=E2=86=92=201.78.10?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 61f0429d6f90..a8948246f3f2 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -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=",