From eaffd2500fb3ab7b073f3b3bf9e80deb9044b7a7 Mon Sep 17 00:00:00 2001 From: Adam Jedrzejewski Date: Tue, 20 Feb 2024 14:36:19 +0100 Subject: [PATCH 01/54] nethack: enable curses on darwin --- pkgs/games/nethack/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/games/nethack/default.nix b/pkgs/games/nethack/default.nix index fbbdfeabe31b..524d58e0d6d8 100644 --- a/pkgs/games/nethack/default.nix +++ b/pkgs/games/nethack/default.nix @@ -61,6 +61,7 @@ in stdenv.mkDerivation rec { -e 's,^WINTTYLIB=.*,WINTTYLIB=-lncurses,' \ -i sys/unix/hints/linux sed \ + -e 's,^#WANT_WIN_CURSES=1$,WANT_WIN_CURSES=1,' \ -e 's,^CC=.*$,CC=${stdenv.cc.targetPrefix}cc,' \ -e 's,^HACKDIR=.*$,HACKDIR=\$(PREFIX)/games/lib/\$(GAME)dir,' \ -e 's,^SHELLDIR=.*$,SHELLDIR=\$(PREFIX)/games,' \ From 28665e1e5e6b35c433578b22613a5d8e44a6d4ef Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Fri, 5 Jan 2024 15:15:38 +0100 Subject: [PATCH 02/54] capslock: init at 0.1.1 Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- pkgs/by-name/ca/capslock/package.nix | 37 ++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 pkgs/by-name/ca/capslock/package.nix diff --git a/pkgs/by-name/ca/capslock/package.nix b/pkgs/by-name/ca/capslock/package.nix new file mode 100644 index 000000000000..87da681fe958 --- /dev/null +++ b/pkgs/by-name/ca/capslock/package.nix @@ -0,0 +1,37 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "capslock"; + version = "0.1.1"; + + src = fetchFromGitHub { + owner = "google"; + repo = "capslock"; + rev = "v${version}"; + hash = "sha256-mGrq43YCjF137c5ynQxL7IXDCUbnbBLv5E0tw/boObE="; + }; + + vendorHash = "sha256-WTbHcVARbz7cvAY7IZnACTrN5h9NXWXfxxEWq4hssOM="; + + subPackages = [ + "cmd/capslock" + ]; + + CGO_ENABLED = "0"; + + ldflags = [ + "-s" + "-w" + ]; + + meta = with lib; { + description = "Capability analysis CLI for Go packages that informs users of which privileged operations a given package can access"; + homepage = "https://github.com/google/capslock"; + license = licenses.bsd3; + mainProgram = "capslock"; + maintainers = with maintainers; [ katexochen ]; + }; +} From f1731f2e28eae6164a31868c024ae9c1b9d4fdb9 Mon Sep 17 00:00:00 2001 From: Will Fancher Date: Fri, 19 Jan 2024 05:39:01 -0500 Subject: [PATCH 03/54] nixos: Support systemd-gpt-auto-root --- nixos/modules/system/boot/stage-1.nix | 2 +- nixos/modules/system/boot/systemd/initrd.nix | 29 ++++++++++++-- nixos/tests/installer-systemd-stage-1.nix | 1 + nixos/tests/installer.nix | 42 +++++++++++++++++++- pkgs/os-specific/linux/systemd/default.nix | 2 +- 5 files changed, 68 insertions(+), 8 deletions(-) diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix index 90a74c0ac578..6462e4fd51fc 100644 --- a/nixos/modules/system/boot/stage-1.nix +++ b/nixos/modules/system/boot/stage-1.nix @@ -688,7 +688,7 @@ in config = mkIf config.boot.initrd.enable { assertions = [ - { assertion = any (fs: fs.mountPoint == "/") fileSystems; + { assertion = !config.boot.initrd.systemd.enable -> any (fs: fs.mountPoint == "/") fileSystems; message = "The ‘fileSystems’ option does not specify your root file system."; } { assertion = let inherit (config.boot) resumeDevice; in diff --git a/nixos/modules/system/boot/systemd/initrd.nix b/nixos/modules/system/boot/systemd/initrd.nix index f83837fbc6d4..7abba80fbefb 100644 --- a/nixos/modules/system/boot/systemd/initrd.nix +++ b/nixos/modules/system/boot/systemd/initrd.nix @@ -212,6 +212,19 @@ in { default = []; }; + root = lib.mkOption { + type = lib.types.enum [ "fstab" "gpt-auto" ]; + default = "fstab"; + example = "gpt-auto"; + description = '' + Controls how systemd will interpret the root FS in initrd. See + {manpage}`kernel-command-line(7)`. NixOS currently does not + allow specifying the root file system itself this + way. Instead, the `fstab` value is used in order to interpret + the root file system specified with the `fileSystems` option. + ''; + }; + emergencyAccess = mkOption { type = with types; oneOf [ bool (nullOr (passwdEntry str)) ]; description = lib.mdDoc '' @@ -342,7 +355,12 @@ in { }; config = mkIf (config.boot.initrd.enable && cfg.enable) { - assertions = map (name: { + assertions = [ + { + assertion = cfg.root == "fstab" -> any (fs: fs.mountPoint == "/") (builtins.attrValues config.fileSystems); + message = "The ‘fileSystems’ option does not specify your root file system."; + } + ] ++ map (name: { assertion = lib.attrByPath name (throw "impossible") config.boot.initrd == ""; message = '' systemd stage 1 does not support 'boot.initrd.${lib.concatStringsSep "." name}'. Please @@ -371,7 +389,12 @@ in { "autofs" # systemd-cryptenroll ] ++ lib.optional cfg.enableTpm2 "tpm-tis" - ++ lib.optional (cfg.enableTpm2 && !(pkgs.stdenv.hostPlatform.isRiscV64 || pkgs.stdenv.hostPlatform.isArmv7)) "tpm-crb"; + ++ lib.optional (cfg.enableTpm2 && !(pkgs.stdenv.hostPlatform.isRiscV64 || pkgs.stdenv.hostPlatform.isArmv7)) "tpm-crb" + ++ lib.optional cfg.package.withEfi "efivarfs"; + + boot.kernelParams = [ + "root=${config.boot.initrd.systemd.root}" + ] ++ lib.optional (config.boot.resumeDevice != "") "resume=${config.boot.resumeDevice}"; boot.initrd.systemd = { initrdBin = [pkgs.bash pkgs.coreutils cfg.package.kmod cfg.package]; @@ -554,7 +577,5 @@ in { serviceConfig.Type = "oneshot"; }; }; - - boot.kernelParams = lib.mkIf (config.boot.resumeDevice != "") [ "resume=${config.boot.resumeDevice}" ]; }; } diff --git a/nixos/tests/installer-systemd-stage-1.nix b/nixos/tests/installer-systemd-stage-1.nix index 662017935412..d10256d91d7f 100644 --- a/nixos/tests/installer-systemd-stage-1.nix +++ b/nixos/tests/installer-systemd-stage-1.nix @@ -37,6 +37,7 @@ clevisLuksFallback clevisZfs clevisZfsFallback + gptAutoRoot ; } diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index 97bb7f8def59..1de886d6a0d1 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -82,6 +82,7 @@ let testScriptFun = { bootLoader, createPartitions, grubDevice, grubUseEfi, grubIdentifier , postInstallCommands, preBootCommands, postBootCommands, extraConfig , testSpecialisationConfig, testFlakeSwitch, clevisTest, clevisFallbackTest + , disableFileSystems }: let qemu-common = import ../lib/qemu-common.nix { inherit (pkgs) lib pkgs; }; @@ -163,7 +164,7 @@ let ${createPartitions} with subtest("Create the NixOS configuration"): - machine.succeed("nixos-generate-config --root /mnt") + machine.succeed("nixos-generate-config ${optionalString disableFileSystems "--no-filesystems"} --root /mnt") machine.succeed("cat /mnt/etc/nixos/hardware-configuration.nix >&2") machine.copy_from_host( "${ makeConfig { @@ -433,6 +434,7 @@ let , testFlakeSwitch ? false , clevisTest ? false , clevisFallbackTest ? false + , disableFileSystems ? false }: makeTest { inherit enableOCR; @@ -541,7 +543,8 @@ let testScript = testScriptFun { inherit bootLoader createPartitions postInstallCommands preBootCommands postBootCommands grubDevice grubIdentifier grubUseEfi extraConfig - testSpecialisationConfig testFlakeSwitch clevisTest clevisFallbackTest; + testSpecialisationConfig testFlakeSwitch clevisTest clevisFallbackTest + disableFileSystems; }; }; @@ -1414,4 +1417,39 @@ in { }; }; }; + + gptAutoRoot = let + rootPartType = { + ia32 = "44479540-F297-41B2-9AF7-D131D5F0458A"; + x64 = "4F68BCE3-E8CD-4DB1-96E7-FBCAF984B709"; + arm = "69DAD710-2CE4-4E3C-B16C-21A1D49ABED3"; + aa64 = "B921B045-1DF0-41C3-AF44-4C6F280D3FAE"; + }.${pkgs.stdenv.hostPlatform.efiArch}; + in makeInstallerTest "gptAutoRoot" { + disableFileSystems = true; + createPartitions = '' + machine.succeed( + "sgdisk --zap-all /dev/vda", + "sgdisk --new=1:0:+100M --typecode=0:ef00 /dev/vda", # /boot + "sgdisk --new=2:0:+1G --typecode=0:8200 /dev/vda", # swap + "sgdisk --new=3:0:+5G --typecode=0:${rootPartType} /dev/vda", # / + "udevadm settle", + + "mkfs.vfat /dev/vda1", + "mkswap /dev/vda2 -L swap", + "swapon -L swap", + "mkfs.ext4 -L root /dev/vda3", + "udevadm settle", + + "mount /dev/vda3 /mnt", + "mkdir -p /mnt/boot", + "mount /dev/vda1 /mnt/boot" + ) + ''; + bootLoader = "systemd-boot"; + extraConfig = '' + boot.initrd.systemd.root = "gpt-auto"; + boot.initrd.supportedFilesystems = ["ext4"]; + ''; + }; } diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 135d61fd71d7..05e66dd704af 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -866,7 +866,7 @@ stdenv.mkDerivation (finalAttrs: { # needed - and therefore `interfaceVersion` should be incremented. interfaceVersion = 2; - inherit withBootloader withCryptsetup withHostnamed withImportd withKmod + inherit withBootloader withCryptsetup withEfi withHostnamed withImportd withKmod withLocaled withMachined withPortabled withTimedated withUtmp util-linux kmod kbd; tests = { From c790369574b22b5e5dd8b9916e6cccb6f6b9ea51 Mon Sep 17 00:00:00 2001 From: yellowhat Date: Sat, 16 Mar 2024 08:00:37 +0100 Subject: [PATCH 04/54] kubernetes: 1.29.2 -> 1.29.3 --- pkgs/applications/networking/cluster/kubernetes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index 5e8cfc2b166c..11666ef5c0bf 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -20,13 +20,13 @@ buildGoModule rec { pname = "kubernetes"; - version = "1.29.2"; + version = "1.29.3"; src = fetchFromGitHub { owner = "kubernetes"; repo = "kubernetes"; rev = "v${version}"; - hash = "sha256-DFQaDlp8CqN0jKTVO5N9ZQYyM2gm/VnQfO4/bfvYrTE="; + hash = "sha256-mtYxFy2d892uMLrtaR6ao07gjbThuGa7bzauwvJ0WOo="; }; vendorHash = null; From 82b52feda929eac96805f35b0d2f0356c545949d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 15 Mar 2024 21:04:16 +0100 Subject: [PATCH 05/54] nuclei: 3.2.0 -> 3.2.1 Diff: https://github.com/projectdiscovery/nuclei/compare/refs/tags/v3.2.0...v3.2.1 Changelog: https://github.com/projectdiscovery/nuclei/releases/tag/v3.2.1 --- pkgs/tools/security/nuclei/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/nuclei/default.nix b/pkgs/tools/security/nuclei/default.nix index 6d2c932d47d8..8f3f2cb0054d 100644 --- a/pkgs/tools/security/nuclei/default.nix +++ b/pkgs/tools/security/nuclei/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "nuclei"; - version = "3.2.0"; + version = "3.2.1"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "nuclei"; rev = "refs/tags/v${version}"; - hash = "sha256-LjRhJoPK/zaM0Wuy2IC3H3jfmNvhAP5hZpywjaRM6t4="; + hash = "sha256-3JUCbeAFHoSo5kjV9/8Vn3Nt5kgrjytNej3x5WfPbR0="; }; - vendorHash = "sha256-OInqR1+5XgMlTSbH6E8X7Ljny6BEHk1Sh+72NoDxtAI="; + vendorHash = "sha256-s0hspa3fKMHmFPPwB0tCDJoGEH2JpgFUaIbiSQJTtr0="; subPackages = [ "cmd/nuclei/" From 375868120042070daaf715f72d1a6df94e714a26 Mon Sep 17 00:00:00 2001 From: Will Fancher Date: Sat, 16 Mar 2024 15:12:15 -0400 Subject: [PATCH 06/54] nixos/tests/hibernate: Use EFI So that resumeDevice isn't needed to make systemd stage 1 work. --- nixos/tests/hibernate.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/hibernate.nix b/nixos/tests/hibernate.nix index 296aa9ba68b9..6de287f63e08 100644 --- a/nixos/tests/hibernate.nix +++ b/nixos/tests/hibernate.nix @@ -24,8 +24,8 @@ makeTest { virtualisation.useNixStoreImage = true; swapDevices = lib.mkOverride 0 [ { device = "/dev/vdc"; options = [ "x-systemd.makefs" ]; } ]; - boot.resumeDevice = "/dev/vdc"; boot.initrd.systemd.enable = systemdStage1; + virtualisation.useEFIBoot = true; }; }; From b1b609b2cd8bbc1306838a856bc9e4a958a6c769 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 17 Mar 2024 12:07:20 +0100 Subject: [PATCH 07/54] adidnsdump: init at 1.3.1-unstable-2023-12-13 Active Directory Integrated DNS dumping by any authenticated user https://github.com/dirkjanm/adidnsdump --- pkgs/by-name/ad/adidnsdump/package.nix | 39 ++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 pkgs/by-name/ad/adidnsdump/package.nix diff --git a/pkgs/by-name/ad/adidnsdump/package.nix b/pkgs/by-name/ad/adidnsdump/package.nix new file mode 100644 index 000000000000..dc2268d892d9 --- /dev/null +++ b/pkgs/by-name/ad/adidnsdump/package.nix @@ -0,0 +1,39 @@ +{ lib +, fetchFromGitHub +, python3 +}: + +python3.pkgs.buildPythonApplication rec { + pname = "adidnsdump"; + version = "1.3.1-unstable-2023-12-13"; + pyproject = true; + + src = fetchFromGitHub { + owner = "dirkjanm"; + repo = "adidnsdump"; + rev = "8bbb4b05b2d1b792f3c77ce0a4a762ab9e08727d"; + hash = "sha256-dIbnUyV3gdWHHoyzD0ME2fXlMoiQkdrqQ7qQ6Ab6qs0="; + }; + + nativeBuildInputs = with python3.pkgs; [ + setuptools + ]; + + propagatedBuildInputs = with python3.pkgs; [ + impacket + ldap3 + ]; + + pythonImportsCheck = [ + "adidnsdump" + ]; + + meta = with lib; { + description = "Active Directory Integrated DNS dumping by any authenticated user"; + homepage = "https://github.com/dirkjanm/adidnsdump"; + changelog = "https://github.com/dirkjanm/adidnsdump/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + mainProgram = "adidnsdump"; + }; +} From c610ee821ebd8be7c737d2bae6183365c3dc219e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 17 Mar 2024 12:19:07 +0100 Subject: [PATCH 08/54] krbjack: init at 0-unstable-2024-02-08 Kerberos AP-REQ hijacking tool with DNS unsecure updates abuse https://github.com/almandin/krbjack --- pkgs/by-name/kr/krbjack/package.nix | 48 +++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 pkgs/by-name/kr/krbjack/package.nix diff --git a/pkgs/by-name/kr/krbjack/package.nix b/pkgs/by-name/kr/krbjack/package.nix new file mode 100644 index 000000000000..59a58f289b00 --- /dev/null +++ b/pkgs/by-name/kr/krbjack/package.nix @@ -0,0 +1,48 @@ +{ lib +, fetchFromGitHub +, python3 +}: + +python3.pkgs.buildPythonApplication rec { + pname = "krbjack"; + version = "0-unstable-2024-02-08"; + pyproject = true; + + src = fetchFromGitHub { + owner = "almandin"; + repo = "krbjack"; + rev = "0abaf7039c11fe735120c44a9420a311b42f7551"; + hash = "sha256-rvK0I8WlXqJtau9f+6ximfzYCjX21dPIyDN56IMI0gE="; + }; + + pythonRelaxDeps = [ + "impacket" + ]; + + nativeBuildInputs = with python3.pkgs; [ + poetry-core + pythonRelaxDepsHook + ]; + + propagatedBuildInputs = with python3.pkgs; [ + colorama + dnspython + impacket + scapy + ]; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ + "krbjack" + ]; + + meta = with lib; { + description = "Kerberos AP-REQ hijacking tool with DNS unsecure updates abuse"; + homepage = "https://github.com/almandin/krbjack"; + license = licenses.beerware; + maintainers = with maintainers; [ fab ]; + mainProgram = "krbjack"; + }; +} From 3a223be67a46c4cd8e07f187da9714c0e90071a2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 17 Mar 2024 12:48:50 +0100 Subject: [PATCH 09/54] silenthound: unstable-2022-09-02 -> 0-unstable-2022-12-14 --- pkgs/tools/security/silenthound/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/security/silenthound/default.nix b/pkgs/tools/security/silenthound/default.nix index f2915c447675..22ecb946d4a6 100644 --- a/pkgs/tools/security/silenthound/default.nix +++ b/pkgs/tools/security/silenthound/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "silenthound"; - version = "unstable-2022-09-02"; + version = "0-unstable-2022-12-14"; format = "other"; src = fetchFromGitHub { owner = "layer8secure"; repo = "SilentHound"; - rev = "44d361f6c95b79bd848603c8050af86db3d072b0"; - hash = "sha256-6JcU6FIE+9fsMawI1RSNQyx9ubjxmchEKmeg6/kmI4s="; + rev = "f04746aaca29e377c8badcbd6d8f6584deb9e919"; + hash = "sha256-alTgo8/aqwERt/JC4W3KodAdyfNZyG3XqCp3z4OpS68="; }; propagatedBuildInputs = with python3.pkgs; [ @@ -36,8 +36,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "Tool to enumerate an Active Directory Domain"; homepage = "https://github.com/layer8secure/SilentHound"; - # Unknown license, https://github.com/layer8secure/SilentHound/issues/1 - license = licenses.unfree; + license = licenses.mit; maintainers = with maintainers; [ fab ]; mainProgram = "silenthound"; }; From a23d9bd72933aa13a996e0a55f2ed8f7dc1b2068 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 17 Mar 2024 12:58:09 +0100 Subject: [PATCH 10/54] certsync: unstable-2023-04-14 -> 1.5-unstable-2024-03-08 --- pkgs/tools/security/certsync/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/security/certsync/default.nix b/pkgs/tools/security/certsync/default.nix index 15878c7826fb..e12868ac7f9c 100644 --- a/pkgs/tools/security/certsync/default.nix +++ b/pkgs/tools/security/certsync/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "certsync"; - version = "unstable-2023-04-14"; - format = "pyproject"; + version = "1.5-unstable-2024-03-08"; + pyproject = true; src = fetchFromGitHub { owner = "zblurx"; repo = "certsync"; - rev = "f3c8b61f0967a6403d4c592dcbfa8921682452a6"; - hash = "sha256-7Pzss83jf3zKmgQZki18R47OWn5VniZZ/d4N8JgZs+0="; + rev = "712e34c54a63537efd630561aa55dc9d35962c3f"; + hash = "sha256-YkxEExeu3sBJ93WJGtU5oe3rDS0Ki88vAeGpE23xRwo="; }; nativeBuildInputs = with python3.pkgs; [ @@ -33,5 +33,6 @@ python3.pkgs.buildPythonApplication rec { homepage = "https://github.com/zblurx/certsync"; license = licenses.mit; maintainers = with maintainers; [ fab ]; + mainProgram = "certsync"; }; } From fb8dcaef04c61ba3a3cc8e52ed0d42a3394ebcc7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 17 Mar 2024 13:06:29 +0100 Subject: [PATCH 11/54] hekatomb: init at 1.5.14-unstable-2024-02-14 Tool to connect to LDAP directory to retrieve informations https://github.com/ProcessusT/HEKATOMB --- pkgs/by-name/he/hekatomb/package.nix | 49 ++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 pkgs/by-name/he/hekatomb/package.nix diff --git a/pkgs/by-name/he/hekatomb/package.nix b/pkgs/by-name/he/hekatomb/package.nix new file mode 100644 index 000000000000..1d9df3a03215 --- /dev/null +++ b/pkgs/by-name/he/hekatomb/package.nix @@ -0,0 +1,49 @@ +{ lib +, python3 +, fetchFromGitHub +}: + +python3.pkgs.buildPythonApplication rec { + pname = "hekatomb"; + version = "1.5.14-unstable-2024-02-14"; + pyproject = true; + + src = fetchFromGitHub { + owner = "ProcessusT"; + repo = "HEKATOMB"; + rev = "8cd372fd5d93e8b43c2cbe2ab2cada635f00e9dd"; + hash = "sha256-2juP2SuCfY4z2J27BlodrsP+29BjGxKDIDOW0mmwCPY="; + }; + + pythonRelaxDeps = [ + "impacket" + ]; + + nativeBuildInputs = with python3.pkgs; [ + poetry-core + pythonRelaxDepsHook + ]; + + propagatedBuildInputs = with python3.pkgs; [ + chardet + dnspython + impacket + ldap3 + pycryptodomex + ]; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ + "hekatomb" + ]; + + meta = with lib; { + description = "Tool to connect to LDAP directory to retrieve informations"; + homepage = "https://github.com/ProcessusT/HEKATOMB"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ fab ]; + mainProgram = "hekatomb"; + }; +} From 697457282d339e04eb7d6f408ea197b2b700ff50 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 17 Mar 2024 13:23:16 +0100 Subject: [PATCH 12/54] pre2k: init at 3.0-unstable-2024-03-14 Tool to query for the existence of pre-windows 2000 computer objects https://github.com/garrettfoster13/pre2k --- pkgs/by-name/pr/pre2k/package.nix | 49 +++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 pkgs/by-name/pr/pre2k/package.nix diff --git a/pkgs/by-name/pr/pre2k/package.nix b/pkgs/by-name/pr/pre2k/package.nix new file mode 100644 index 000000000000..59353d9806ed --- /dev/null +++ b/pkgs/by-name/pr/pre2k/package.nix @@ -0,0 +1,49 @@ +{ lib +, fetchFromGitHub +, python3 +}: + +python3.pkgs.buildPythonApplication rec { + pname = "pre2k"; + version = "3.0-unstable-2024-03-14"; + pyproject = true; + + src = fetchFromGitHub { + owner = "garrettfoster13"; + repo = "pre2k"; + rev = "3baa7b73aedd45f52e417210081da3dd010c1b22"; + hash = "sha256-0lgH7Z9LuiZwODdFvKWcqS1TV02aVjzD9RgOhX0lU6s="; + }; + + pythonRelaxDeps = [ + "impacket" + "pyasn1" + "rich" + "typer" + ]; + + nativeBuildInputs = with python3.pkgs; [ + poetry-core + pythonRelaxDepsHook + ]; + + propagatedBuildInputs = with python3.pkgs; [ + impacket + ldap3 + pyasn1 + rich + typer + ]; + + pythonImportsCheck = [ + "pre2k" + ]; + + meta = with lib; { + description = "Tool to query for the existence of pre-windows 2000 computer objects"; + homepage = "https://github.com/garrettfoster13/pre2k"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + mainProgram = "pre2k"; + }; +} From 92c5b9cd495e8082725d241878dea85178bf554d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 17 Mar 2024 13:39:22 +0100 Subject: [PATCH 13/54] python311Packages.certipy-ad: refactor --- pkgs/development/python-modules/certipy-ad/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/certipy-ad/default.nix b/pkgs/development/python-modules/certipy-ad/default.nix index dd3b161caf5d..0b1d9de3360a 100644 --- a/pkgs/development/python-modules/certipy-ad/default.nix +++ b/pkgs/development/python-modules/certipy-ad/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "certipy-ad"; version = "4.8.2"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -37,6 +37,10 @@ buildPythonPackage rec { --replace "pyasn1==0.4.8" "pyasn1" ''; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ asn1crypto cryptography @@ -49,8 +53,8 @@ buildPythonPackage rec { pyopenssl requests requests-ntlm - unicrypto setuptools + unicrypto ]; # Project has no tests From d25d71dd225696c642a3c38fd1b99ab018560194 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 17 Mar 2024 14:55:42 +0100 Subject: [PATCH 14/54] rdwatool: init at 1.2-unstable-2023-11-27 Tool to extract information from a Microsoft Remote Desktop Web Access (RDWA) application https://github.com/p0dalirius/RDWAtool --- pkgs/by-name/rd/rdwatool/package.nix | 49 ++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 pkgs/by-name/rd/rdwatool/package.nix diff --git a/pkgs/by-name/rd/rdwatool/package.nix b/pkgs/by-name/rd/rdwatool/package.nix new file mode 100644 index 000000000000..49459eb39a9e --- /dev/null +++ b/pkgs/by-name/rd/rdwatool/package.nix @@ -0,0 +1,49 @@ +{ lib +, fetchFromGitHub +, python3 +}: + +python3.pkgs.buildPythonApplication rec { + pname = "rdwatool"; + version = "1.2-unstable-2023-11-27"; + pyproject = true; + + src = fetchFromGitHub { + owner = "p0dalirius"; + repo = "RDWAtool"; + rev = "60b7816f06d155bd3d218b76b69d9419b8a82dbe"; + hash = "sha256-0mjnZiF8DxVbI8Lr12b7jzn+x+mn6Mel8LaIy8heEdI="; + }; + + pythonRelaxDeps = [ + "urllib3" + ]; + + pythonRemoveDeps = [ + "bs4" + ]; + + nativeBuildInputs = with python3.pkgs; [ + pythonRelaxDepsHook + setuptools + ]; + + propagatedBuildInputs = with python3.pkgs; [ + beautifulsoup4 + requests + urllib3 + xlsxwriter + ]; + + pythonImportsCheck = [ + "rdwatool" + ]; + + meta = with lib; { + description = "Tool to extract information from a Microsoft Remote Desktop Web Access (RDWA) application"; + homepage = "https://github.com/p0dalirius/RDWAtool"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ fab ]; + mainProgram = "rdwatool"; + }; +} From 9b551bf0178032b8944c34020f0efa4555022321 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 17 Mar 2024 16:15:03 +0100 Subject: [PATCH 15/54] python311Packages.bloodyad: init at 1.1.1 Module for Active Directory Privilege Escalations https://github.com/CravateRouge/bloodyAD --- .../python-modules/bloodyad/default.nix | 64 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 66 insertions(+) create mode 100644 pkgs/development/python-modules/bloodyad/default.nix diff --git a/pkgs/development/python-modules/bloodyad/default.nix b/pkgs/development/python-modules/bloodyad/default.nix new file mode 100644 index 000000000000..11d26f32fbae --- /dev/null +++ b/pkgs/development/python-modules/bloodyad/default.nix @@ -0,0 +1,64 @@ +{ lib +, buildPythonPackage +, cryptography +, fetchFromGitHub +, gssapi +, hatchling +, ldap3 +, pyasn1 +, pytestCheckHook +, pythonOlder +, winacl +}: + +buildPythonPackage rec { + pname = "bloodyad"; + version = "1.1.1"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "CravateRouge"; + repo = "bloodyAD"; + rev = "refs/tags/v${version}"; + hash = "sha256-wnq+HTAPnC7pSGI2iytSyHmdqtUq2pUnNwZnsGX8CL4="; + }; + + nativeBuildInputs = [ + hatchling + ]; + + propagatedBuildInputs = [ + cryptography + gssapi + ldap3 + pyasn1 + winacl + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "bloodyAD" + ]; + + disabledTests = [ + # Tests require network access + "test_01AuthCreateUser" + "test_02SearchAndGetChildAndGetWritable" + "test_03UacOwnerGenericShadowGroupPasswordDCSync" + "test_04ComputerRbcdGetSetAttribute" + "test_06AddRemoveGetDnsRecord" + ]; + + meta = with lib; { + description = "Module for Active Directory Privilege Escalations"; + homepage = "https://github.com/CravateRouge/bloodyAD"; + changelog = "https://github.com/CravateRouge/bloodyAD/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 49bf6892a03f..5710a4a6fd4b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1593,6 +1593,8 @@ self: super: with self; { bloodhound-py = callPackage ../development/python-modules/bloodhound-py { }; + bloodyad = callPackage ../development/python-modules/bloodyad { }; + blosc2 = callPackage ../development/python-modules/blosc2 { }; bluecurrent-api = callPackage ../development/python-modules/bluecurrent-api { }; From 5a6e976f301474429e1e99dffffcd8d40bc9eaf4 Mon Sep 17 00:00:00 2001 From: Misaka13514 Date: Fri, 15 Mar 2024 23:33:06 +0800 Subject: [PATCH 16/54] nuclei: 3.2.0 -> 3.2.1 Diff: https://github.com/projectdiscovery/nuclei/compare/v3.2.0...v3.2.1 Changelog: https://github.com/projectdiscovery/nuclei/releases/tag/v3.2.1 --- pkgs/tools/security/nuclei/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/nuclei/default.nix b/pkgs/tools/security/nuclei/default.nix index 6d2c932d47d8..8f3f2cb0054d 100644 --- a/pkgs/tools/security/nuclei/default.nix +++ b/pkgs/tools/security/nuclei/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "nuclei"; - version = "3.2.0"; + version = "3.2.1"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "nuclei"; rev = "refs/tags/v${version}"; - hash = "sha256-LjRhJoPK/zaM0Wuy2IC3H3jfmNvhAP5hZpywjaRM6t4="; + hash = "sha256-3JUCbeAFHoSo5kjV9/8Vn3Nt5kgrjytNej3x5WfPbR0="; }; - vendorHash = "sha256-OInqR1+5XgMlTSbH6E8X7Ljny6BEHk1Sh+72NoDxtAI="; + vendorHash = "sha256-s0hspa3fKMHmFPPwB0tCDJoGEH2JpgFUaIbiSQJTtr0="; subPackages = [ "cmd/nuclei/" From 019af45073f9987930cc6fddd1ee5236bccb6676 Mon Sep 17 00:00:00 2001 From: Misaka13514 Date: Sun, 17 Mar 2024 23:37:47 +0800 Subject: [PATCH 17/54] nuclei: 3.2.1 -> 3.2.2 Diff: https://github.com/projectdiscovery/nuclei/compare/v3.2.1...v3.2.2 Changelog: https://github.com/projectdiscovery/nuclei/releases/tag/v3.2.2 --- pkgs/tools/security/nuclei/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/nuclei/default.nix b/pkgs/tools/security/nuclei/default.nix index 8f3f2cb0054d..a89bb3cbf62e 100644 --- a/pkgs/tools/security/nuclei/default.nix +++ b/pkgs/tools/security/nuclei/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "nuclei"; - version = "3.2.1"; + version = "3.2.2"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "nuclei"; rev = "refs/tags/v${version}"; - hash = "sha256-3JUCbeAFHoSo5kjV9/8Vn3Nt5kgrjytNej3x5WfPbR0="; + hash = "sha256-eYFHKXB6TSCLPMKiXvuSpt/2B+rbn7VZqoGEHp2vito="; }; vendorHash = "sha256-s0hspa3fKMHmFPPwB0tCDJoGEH2JpgFUaIbiSQJTtr0="; From 420805c9c08df112a13deb82d5393042024fc1e4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 17 Mar 2024 17:00:13 +0100 Subject: [PATCH 18/54] autobloody: init at 0.1.8 Tool to automatically exploit Active Directory privilege escalation paths https://github.com/CravateRouge/autobloody --- pkgs/by-name/au/autobloody/package.nix | 46 ++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 pkgs/by-name/au/autobloody/package.nix diff --git a/pkgs/by-name/au/autobloody/package.nix b/pkgs/by-name/au/autobloody/package.nix new file mode 100644 index 000000000000..c55689350211 --- /dev/null +++ b/pkgs/by-name/au/autobloody/package.nix @@ -0,0 +1,46 @@ +{ lib +, python3 +, fetchFromGitHub +}: + +python3.pkgs.buildPythonApplication rec { + pname = "autobloody"; + version = "0.1.8"; + pyproject = true; + + src = fetchFromGitHub { + owner = "CravateRouge"; + repo = "autobloody"; + rev = "refs/tags/v${version}"; + hash = "sha256-0MwhdT9GYLcrdZSqszx1DC9lyz8K61lJZZCzeFfWB0E="; + }; + + nativeBuildInputs = with python3.pkgs; [ + hatchling + ]; + + propagatedBuildInputs = with python3.pkgs; [ + bloodyad + neo4j + ]; + + # Tests require a test file which is not available in the current release + doCheck = false; + + nativeCheckInputs = with python3.pkgs; [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "autobloody" + ]; + + meta = with lib; { + description = "Tool to automatically exploit Active Directory privilege escalation paths"; + homepage = "https://github.com/CravateRouge/autobloody"; + changelog = "https://github.com/CravateRouge/autobloody/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + mainProgram = "autobloody"; + }; +} From 19cf6d3ba57b18c073c0d5a4438571ba8469f528 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sun, 17 Mar 2024 17:09:43 +0100 Subject: [PATCH 19/54] python312Packages.pydoe: normalize pname --- pkgs/development/python-modules/pydoe/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pydoe/default.nix b/pkgs/development/python-modules/pydoe/default.nix index e361d09ced3b..5767442bef25 100644 --- a/pkgs/development/python-modules/pydoe/default.nix +++ b/pkgs/development/python-modules/pydoe/default.nix @@ -8,12 +8,13 @@ }: buildPythonPackage rec { - pname = "pyDOE"; + pname = "pydoe"; version = "0.3.8"; pyproject = true; src = fetchPypi { - inherit pname version; + pname = "pyDOE"; + inherit version; hash = "sha256-y9bxSuJtPJ9zYBMgX1PqEZGt1FZwM8Pud7fdNWVmxLY="; extension = "zip"; }; From f017802bcc94c76b08de213553a2b7352064d72d Mon Sep 17 00:00:00 2001 From: whonore Date: Sun, 17 Mar 2024 12:30:18 -0400 Subject: [PATCH 20/54] dafny: 4.4.0 -> 4.5.0 --- .../science/logic/dafny/default.nix | 4 +- .../applications/science/logic/dafny/deps.nix | 41 +++++++++---------- 2 files changed, 21 insertions(+), 24 deletions(-) diff --git a/pkgs/applications/science/logic/dafny/default.nix b/pkgs/applications/science/logic/dafny/default.nix index 5f56d612ab24..83d472c1abb1 100644 --- a/pkgs/applications/science/logic/dafny/default.nix +++ b/pkgs/applications/science/logic/dafny/default.nix @@ -8,13 +8,13 @@ buildDotnetModule rec { pname = "Dafny"; - version = "4.4.0"; + version = "4.5.0"; src = fetchFromGitHub { owner = "dafny-lang"; repo = "dafny"; rev = "v${version}"; - hash = "sha256-rnPZms60vRtefEV+3IeVXoZJU9WMjVxPVioRaEcyw/o="; + hash = "sha256-NsQhJY++IaLyFc5jqo7TyZBcz0P8VUizGLxdIe9KEO4="; }; postPatch = '' diff --git a/pkgs/applications/science/logic/dafny/deps.nix b/pkgs/applications/science/logic/dafny/deps.nix index a786d8b3d6fd..91fe5624ac7f 100644 --- a/pkgs/applications/science/logic/dafny/deps.nix +++ b/pkgs/applications/science/logic/dafny/deps.nix @@ -2,19 +2,19 @@ # Please dont edit it manually, your changes might get overwritten! { fetchNuGet }: [ - (fetchNuGet { pname = "Boogie"; version = "3.0.9"; sha256 = "12700rvm3zj73pkkjaypfa72fvqz8bp78hi3jkh89dqavhg3l7p5"; }) - (fetchNuGet { pname = "Boogie.AbstractInterpretation"; version = "3.0.9"; sha256 = "1612d1x7smhcczmk21z9kswjjvq3h0r5mlf1zb8mznyx0154pckg"; }) - (fetchNuGet { pname = "Boogie.BaseTypes"; version = "3.0.9"; sha256 = "0v6x8k61rl6bvp1zbvbhnlpkakbw11c2mf8glafmf4znrakwil23"; }) - (fetchNuGet { pname = "Boogie.CodeContractsExtender"; version = "3.0.9"; sha256 = "045z0j7bhsb8fypzkz8spixfqdchcpsq3bb9bfwb95if2mna4zx2"; }) - (fetchNuGet { pname = "Boogie.Concurrency"; version = "3.0.9"; sha256 = "00k08qh614vciadzk7lr1dcwsvrcfpslvs342amq12c25rxh3125"; }) - (fetchNuGet { pname = "Boogie.Core"; version = "3.0.9"; sha256 = "03fip919iw7y3vwk5nj53jj73ry43z9fpn752j5fbgygkl2zbx4q"; }) - (fetchNuGet { pname = "Boogie.ExecutionEngine"; version = "3.0.9"; sha256 = "098l1qmya021raqgdapxvwq3pra4v7wpv7j3dmmhsnpg8zs30jgi"; }) - (fetchNuGet { pname = "Boogie.Graph"; version = "3.0.9"; sha256 = "1y8aai7wmsyh2pn9bl1rp2nifs3k9b8kb2lqx5rgs1fdiyk2q24j"; }) - (fetchNuGet { pname = "Boogie.Houdini"; version = "3.0.9"; sha256 = "1ssr82swqmjsap6v344v2kwkfsv70gx082dk54x7vpapr56f1fgp"; }) - (fetchNuGet { pname = "Boogie.Model"; version = "3.0.9"; sha256 = "1cy04a7dr1z7dxfkx6l9kfm30rx5wsn7g50b0wyzp4ns6sbkh47f"; }) - (fetchNuGet { pname = "Boogie.Provers.SMTLib"; version = "3.0.9"; sha256 = "1ijzn67wl82ycr1k7gbh8dhq99zxqqjdc48glf4ld832l7sp3vam"; }) - (fetchNuGet { pname = "Boogie.VCExpr"; version = "3.0.9"; sha256 = "0hivg31c8v9ix5b8mici6mxz1yzydwiyvgb510bnghxciwbnd4gp"; }) - (fetchNuGet { pname = "Boogie.VCGeneration"; version = "3.0.9"; sha256 = "1j9853vixzpgdfd60c3hr5padfdj3sbrbhmr6jg9a0cr3afk72sm"; }) + (fetchNuGet { pname = "Boogie"; version = "3.1.3"; sha256 = "0xzc7s0rjb8dhdkdf71g6pdsnyhbl534xpwd8gbx6g16a87iqx6i"; }) + (fetchNuGet { pname = "Boogie.AbstractInterpretation"; version = "3.1.3"; sha256 = "0a7v2jkkbh59pyc5nz4avszm3dbmp4amkmr6lvn0gyc3hxgn8d3k"; }) + (fetchNuGet { pname = "Boogie.BaseTypes"; version = "3.1.3"; sha256 = "1h94yl4ymhd2g14i5w8lnnh2zw7gx65qydzvv8cm8d5yn64gch63"; }) + (fetchNuGet { pname = "Boogie.CodeContractsExtender"; version = "3.1.3"; sha256 = "0b1h1lz997lgyq34bx3ngnhgcrw8j4qvsa6iygb6bydxz7rirrf4"; }) + (fetchNuGet { pname = "Boogie.Concurrency"; version = "3.1.3"; sha256 = "1aq0gdz1xkmp82c67vrmyvkncfbbj5zxrsg78lsmmi22h9qbkzm3"; }) + (fetchNuGet { pname = "Boogie.Core"; version = "3.1.3"; sha256 = "0yhl272lv9lncjval2z7zl9wavlxx8bivj467zl2zzbrxw2k5wz8"; }) + (fetchNuGet { pname = "Boogie.ExecutionEngine"; version = "3.1.3"; sha256 = "0p0zp329h6mddbswm3pdcyvy03y69vyznv11ph6bkpya21lsxqy7"; }) + (fetchNuGet { pname = "Boogie.Graph"; version = "3.1.3"; sha256 = "1p8vb4x4iy7f0ycwb8f71j9a2ci8irwg3rvad2hg3rgbihbwp1qj"; }) + (fetchNuGet { pname = "Boogie.Houdini"; version = "3.1.3"; sha256 = "06qlgi9f70r2w7w6h9qw3lx9dd4pbddpdplqjxi090rpry6dhrbz"; }) + (fetchNuGet { pname = "Boogie.Model"; version = "3.1.3"; sha256 = "0fbvnrghaq17fdpjx12axxrrjp1mh99skaznmvxd1ylsqqnn4cbk"; }) + (fetchNuGet { pname = "Boogie.Provers.SMTLib"; version = "3.1.3"; sha256 = "0x7gpc7m04in2gzdn4jgjphd2xjqrdfmh84wzwnwpvi5wyn869jc"; }) + (fetchNuGet { pname = "Boogie.VCExpr"; version = "3.1.3"; sha256 = "0dyndhqz1yf9qnq9mw73g53rnz0xfbdbi3yk6pg7fdm1m3363h5p"; }) + (fetchNuGet { pname = "Boogie.VCGeneration"; version = "3.1.3"; sha256 = "1bl83727zc1rhskx548p5pa27804n3f5i9n233jvcz6n6bfjn74k"; }) (fetchNuGet { pname = "CocoR"; version = "2014.12.24"; sha256 = "0ps8h7aawkcc1910qnh13llzb01pvgsjmg862pxp0p4wca2dn7a2"; }) (fetchNuGet { pname = "JetBrains.Annotations"; version = "2021.1.0"; sha256 = "07pnhxxlgx8spmwmakz37nmbvgyb6yjrbrhad5rrn6y767z5r1gb"; }) (fetchNuGet { pname = "MediatR"; version = "8.1.0"; sha256 = "0cqx7yfh998xhsfk5pr6229lcjcs1jxxyqz7dwskc9jddl6a2akp"; }) @@ -40,6 +40,7 @@ (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Abstractions"; version = "5.0.0"; sha256 = "01ahgd0b2z2zycrr2lcsq2cl59fn04bh51hdwdp9dcsdkpvnasj1"; }) (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Physical"; version = "5.0.0"; sha256 = "00vii8148a6pk12l9jl0rhjp7apil5q5qcy7v1smnv17lj4p8szd"; }) (fetchNuGet { pname = "Microsoft.Extensions.FileSystemGlobbing"; version = "5.0.0"; sha256 = "0lm6n9vbyjh0l17qcc2y9qwn1cns3dyjmkvbxjp0g9sll32kjpmb"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "2.0.0"; sha256 = "1jkwjcq1ld9znz1haazk8ili2g4pzfdp6i7r7rki4hg3jcadn386"; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "5.0.0"; sha256 = "1qa1l18q2jh9azya8gv1p8anzcdirjzd9dxxisb4911i9m1648i3"; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "5.0.0"; sha256 = "1yza38675dbv1qqnnhqm23alv2bbaqxp0pb7zinjmw8j2mr5r6wc"; }) (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "2.0.0"; sha256 = "0g4zadlg73f507krilhaaa7h0jdga216syrzjlyf5fdk25gxmjqh"; }) @@ -53,10 +54,9 @@ (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "3.0.0"; sha256 = "1bk8r4r3ihmi6322jmcag14jmw11mjqys202azqjzglcx59pxh51"; }) (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.0.1"; sha256 = "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p"; }) (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; }) - (fetchNuGet { pname = "Microsoft.TestPlatform.Extensions.TrxLogger"; version = "17.0.0"; sha256 = "067vpfk5690j0d01lfy8mry42pkzz79l873cp2dby0hi8skfklaq"; }) - (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "16.11.0"; sha256 = "1fc0ghk1cny4i8w43b94pxhl0srxisv6kaflkkp30ncsa9szhkxh"; }) - (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.0.0"; sha256 = "1bh5scbvl6ndldqv20sl34h4y257irm9ziv2wyfc3hka6912fhn7"; }) - (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "16.11.0"; sha256 = "0hp1vndf2jhyg1f3miq4g2068z5kpfzy6nmswm25vymghxp1ws4k"; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.Extensions.TrxLogger"; version = "17.9.0"; sha256 = "0wn38vj9i4gjw5zsl4wcivpqrmp1h5n6m1zxcfwj7yjn9hf45rz9"; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.9.0"; sha256 = "1kgsl9w9fganbm9wvlkqgk0ag9hfi58z88rkfybc6kvg78bx89ca"; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.9.0"; sha256 = "19ffh31a1jxzn8j69m1vnk5hyfz3dbxmflq77b8x82zybiilh5nl"; }) (fetchNuGet { pname = "Microsoft.VisualStudio.Threading"; version = "16.7.56"; sha256 = "13x0xrsjxd86clf9cjjwmpzlyp8pkrf13riya7igs8zy93zw2qap"; }) (fetchNuGet { pname = "Microsoft.VisualStudio.Threading.Analyzers"; version = "16.7.56"; sha256 = "04v9df0k7bsc0rzgkw4mnvi43pdrh42vk6xdcwn9m6im33m0nnz2"; }) (fetchNuGet { pname = "Microsoft.VisualStudio.Validation"; version = "15.5.31"; sha256 = "1ah99rn922qa0sd2k3h64m324f2r32pw8cn4cfihgvwx4qdrpmgw"; }) @@ -64,8 +64,8 @@ (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "4.6.0"; sha256 = "0i4y782yrqqyx85pg597m20gm0v126w0j9ddk5z7xb3crx4z9f2s"; }) (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "6.0.0"; sha256 = "0c6pcj088g1yd1vs529q3ybgsd2vjlk5y1ic6dkmbhvrp5jibl9p"; }) (fetchNuGet { pname = "Nerdbank.Streams"; version = "2.6.81"; sha256 = "06wihcaga8537ibh0mkj28m720m6vzkqk562zkynhca85nd236yi"; }) + (fetchNuGet { pname = "Newtonsoft.Json"; version = "11.0.2"; sha256 = "1784xi44f4k8v1fr696hsccmwpy94bz7kixxqlri98zhcxn406b2"; }) (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; sha256 = "0fijg0w6iwap8gvzyjnndds0q4b8anwxxvik7y8vgq97dram4srb"; }) - (fetchNuGet { pname = "NuGet.Frameworks"; version = "5.0.0"; sha256 = "18ijvmj13cwjdrrm52c8fpq021531zaz4mj4b4zapxaqzzxf2qjr"; }) (fetchNuGet { pname = "OmniSharp.Extensions.JsonRpc"; version = "0.19.5"; sha256 = "0ilcv3cxcvjkd8ngiydi69pzll07rhqdv5nq9yjnhyj142ynw2cb"; }) (fetchNuGet { pname = "OmniSharp.Extensions.JsonRpc.Generators"; version = "0.19.5"; sha256 = "1mac4yx29ld8fyirg7n0vqn81hzdvcrl8w0l9w5xhnnm6bcd42v8"; }) (fetchNuGet { pname = "OmniSharp.Extensions.LanguageProtocol"; version = "0.19.5"; sha256 = "1clgrbw6dlh46iiiqhavwh15xqar41az352mb5r4ln8ql3wnmk1i"; }) @@ -104,7 +104,7 @@ (fetchNuGet { pname = "runtime.unix.System.IO.FileSystem"; version = "4.3.0"; sha256 = "14nbkhvs7sji5r1saj2x8daz82rnf9kx28d3v2qss34qbr32dzix"; }) (fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.3.0"; sha256 = "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk"; }) (fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; sha256 = "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p"; }) - (fetchNuGet { pname = "Serilog"; version = "2.10.0"; sha256 = "08bih205i632ywryn3zxkhb15dwgyaxbhmm1z3b5nmby9fb25k7v"; }) + (fetchNuGet { pname = "Serilog"; version = "2.12.0"; sha256 = "0lqxpc96qcjkv9pr1rln7mi4y7n7jdi4vb36c2fv3845w1vswgr4"; }) (fetchNuGet { pname = "Serilog.Extensions.Logging"; version = "3.0.1"; sha256 = "069qy7dm5nxb372ij112ppa6m99b4iaimj3sji74m659fwrcrl9a"; }) (fetchNuGet { pname = "Serilog.Settings.Configuration"; version = "3.1.0"; sha256 = "1cj5am4n073331gbfm2ylqb9cadl4q3ppzgwmm5c8m1drxpiwkb5"; }) (fetchNuGet { pname = "Serilog.Sinks.Debug"; version = "2.0.0"; sha256 = "1i7j870l47gan3gpnnlzkccn5lbm7518cnkp25a3g5gp9l0dbwpw"; }) @@ -114,8 +114,6 @@ (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; }) (fetchNuGet { pname = "System.Collections.Immutable"; version = "1.7.0"; sha256 = "1gik4sn9jsi1wcy1pyyp0r4sn2g17cwrsh24b2d52vif8p2h24zx"; }) (fetchNuGet { pname = "System.Collections.Immutable"; version = "1.7.1"; sha256 = "1nh4nlxfc7lbnbl86wwk1a3jwl6myz5j6hvgh5sp4krim9901hsq"; }) - (fetchNuGet { pname = "System.Collections.NonGeneric"; version = "4.0.1"; sha256 = "19994r5y5bpdhj7di6w047apvil8lh06lh2c2yv9zc4fc5g9bl4d"; }) - (fetchNuGet { pname = "System.Collections.Specialized"; version = "4.0.1"; sha256 = "1wbv7y686p5x169rnaim7sln67ivmv6r57falrnx8aap9y33mam9"; }) (fetchNuGet { pname = "System.CommandLine"; version = "2.0.0-beta4.22272.1"; sha256 = "1iy5hwwgvx911g3yq65p4zsgpy08w4qz9j3h0igcf7yci44vw8yd"; }) (fetchNuGet { pname = "System.Configuration.ConfigurationManager"; version = "6.0.0"; sha256 = "0sqapr697jbb4ljkq46msg0xx1qpmc31ivva6llyz2wzq3mpmxbw"; }) (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; }) @@ -124,7 +122,6 @@ (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.0.11"; sha256 = "1pla2dx8gkidf7xkciig6nifdsb494axjvzvann8g2lp3dbqasm9"; }) (fetchNuGet { pname = "System.Globalization"; version = "4.0.11"; sha256 = "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d"; }) (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; }) - (fetchNuGet { pname = "System.Globalization.Extensions"; version = "4.0.1"; sha256 = "0hjhdb5ri8z9l93bw04s7ynwrjrhx2n0p34sf33a9hl9phz69fyc"; }) (fetchNuGet { pname = "System.IO"; version = "4.1.0"; sha256 = "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp"; }) (fetchNuGet { pname = "System.IO"; version = "4.3.0"; sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; }) (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.0.1"; sha256 = "0kgfpw6w4djqra3w5crrg8xivbanh1w9dh3qapb28q060wb9flp1"; }) From 2d5eaeca0805667736ffe4373057c4ed0f823f29 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 17 Mar 2024 19:38:16 +0100 Subject: [PATCH 21/54] python311Packages.roadlib: init at 0.23.0 ROADtools common components library https://pypi.org/project/roadlib/ --- .../python-modules/roadlib/default.nix | 46 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 48 insertions(+) create mode 100644 pkgs/development/python-modules/roadlib/default.nix diff --git a/pkgs/development/python-modules/roadlib/default.nix b/pkgs/development/python-modules/roadlib/default.nix new file mode 100644 index 000000000000..303024a90f52 --- /dev/null +++ b/pkgs/development/python-modules/roadlib/default.nix @@ -0,0 +1,46 @@ +{ lib +, adal +, buildPythonPackage +, fetchPypi +, pyjwt +, pythonOlder +, setuptools +, sqlalchemy +}: + +buildPythonPackage rec { + pname = "roadlib"; + version = "0.23.0"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-0hDiuF0dBRyR2B9dp4c7/jsC6li8uOduQBbhs6fFLfU="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + adal + pyjwt + sqlalchemy + ]; + + # Module has no test + doCheck = false; + + pythonImportsCheck = [ + "roadtools.roadlib" + ]; + + meta = with lib; { + description = "ROADtools common components library"; + homepage = "https://pypi.org/project/roadlib/"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 49bf6892a03f..5ad7587c97eb 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13006,6 +13006,8 @@ self: super: with self; { rns = callPackage ../development/python-modules/rns { }; + roadlib = callPackage ../development/python-modules/roadlib { }; + robomachine = callPackage ../development/python-modules/robomachine { }; robot-detection = callPackage ../development/python-modules/robot-detection { }; From e9c95dbb49c7ebd4cd09e4b24f4354f0221a934b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 17 Mar 2024 20:02:51 +0100 Subject: [PATCH 22/54] python311Packages.selenium-wire: init at 5.1.0 Extends Selenium's Python bindings to give you the ability to inspect requests made by the browser https://github.com/wkeeling/selenium-wire --- .../python-modules/selenium-wire/default.nix | 80 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 82 insertions(+) create mode 100644 pkgs/development/python-modules/selenium-wire/default.nix diff --git a/pkgs/development/python-modules/selenium-wire/default.nix b/pkgs/development/python-modules/selenium-wire/default.nix new file mode 100644 index 000000000000..bbc98666394b --- /dev/null +++ b/pkgs/development/python-modules/selenium-wire/default.nix @@ -0,0 +1,80 @@ +{ lib +, blinker +, brotli +, buildPythonPackage +, certifi +, fetchFromGitHub +, h2 +, hyperframe +, kaitaistruct +, pyasn1 +, httpbin +, pyopenssl +, pyparsing +, pysocks +, gunicorn +, pytestCheckHook +, pythonOlder +, selenium +, setuptools +, wsproto +, zstandard +}: + +buildPythonPackage rec { + pname = "selenium-wire"; + version = "5.1.0"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "wkeeling"; + repo = "selenium-wire"; + rev = "refs/tags/${version}"; + hash = "sha256-KgaDxHS0dAK6CT53L1qqx1aORMmkeaiXAUtGC82hiIQ="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + blinker + brotli + certifi + h2 + hyperframe + kaitaistruct + pyasn1 + pyopenssl + pyparsing + pysocks + selenium + wsproto + zstandard + ]; + + nativeCheckInputs = [ + gunicorn + httpbin + pytestCheckHook + ]; + + pythonImportsCheck = [ + "seleniumwire" + ]; + + disabledTestPaths = [ + # Don't run End2End tests + "tests/end2end/test_end2end.py" + ]; + + meta = with lib; { + description = "Extends Selenium's Python bindings to give you the ability to inspect requests made by the browser"; + homepage = "https://github.com/wkeeling/selenium-wire"; + changelog = "https://github.com/wkeeling/selenium-wire/blob/${version}/HISTORY.rst"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5ad7587c97eb..bd88b3e03089 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13368,6 +13368,8 @@ self: super: with self; { selenium = callPackage ../development/python-modules/selenium { }; + selenium-wire = callPackage ../development/python-modules/selenium-wire { }; + semantic-version = callPackage ../development/python-modules/semantic-version { }; semaphore-bot = callPackage ../development/python-modules/semaphore-bot { }; From cb408e09cba81a8b6523bc74426357a79ea7d3fa Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 17 Mar 2024 20:29:43 +0100 Subject: [PATCH 23/54] python311Packages.signxml: init at 3.2.2 Python XML Signature and XAdES library https://github.com/XML-Security/signxml --- .../python-modules/signxml/default.nix | 57 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 59 insertions(+) create mode 100644 pkgs/development/python-modules/signxml/default.nix diff --git a/pkgs/development/python-modules/signxml/default.nix b/pkgs/development/python-modules/signxml/default.nix new file mode 100644 index 000000000000..c6c6ccea9b15 --- /dev/null +++ b/pkgs/development/python-modules/signxml/default.nix @@ -0,0 +1,57 @@ +{ lib +, buildPythonPackage +, certifi +, cryptography +, fetchFromGitHub +, lxml +, pyopenssl +, pytestCheckHook +, pythonOlder +, setuptools +}: + +buildPythonPackage rec { + pname = "signxml"; + version = "3.2.2"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "XML-Security"; + repo = "signxml"; + rev = "refs/tags/v${version}"; + hash = "sha256-TlOIHYvx1o46nr/3qq45pgeOqmuyWaaTGvOS0Jwz1zs="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + certifi + cryptography + lxml + pyopenssl + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "signxml" + ]; + + pytestFlagsArray = [ + "test/test.py" + ]; + + meta = with lib; { + description = "Python XML Signature and XAdES library"; + homepage = "https://github.com/XML-Security/signxml"; + changelog = "https://github.com/XML-Security/signxml/blob/${src.rev}/Changes.rst"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index bd88b3e03089..85c75e424147 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13528,6 +13528,8 @@ self: super: with self; { signedjson = callPackage ../development/python-modules/signedjson { }; + signxml = callPackage ../development/python-modules/signxml { }; + sigrok = callPackage ../development/python-modules/sigrok { }; sigstore = callPackage ../development/python-modules/sigstore { }; From 7d5165e789a09a0e5fe7ba2e4e1d0574bb235142 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 17 Mar 2024 20:32:19 +0100 Subject: [PATCH 24/54] python311Packages.roadtx: init at 1.7.0 ROADtools Token eXchange https://pypi.org/project/roadtx/ --- .../python-modules/roadtx/default.nix | 51 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 53 insertions(+) create mode 100644 pkgs/development/python-modules/roadtx/default.nix diff --git a/pkgs/development/python-modules/roadtx/default.nix b/pkgs/development/python-modules/roadtx/default.nix new file mode 100644 index 000000000000..4ea50269cd76 --- /dev/null +++ b/pkgs/development/python-modules/roadtx/default.nix @@ -0,0 +1,51 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pycryptodomex +, pyotp +, pythonOlder +, requests +, roadlib +, selenium +, selenium-wire +, setuptools +, signxml +}: + +buildPythonPackage rec { + pname = "roadtx"; + version = "1.7.0"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-qnumJbuBH+ajzfG+bLTrYPvB5uNnL8dJsTZoT2vo6g0="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + pycryptodomex + pyotp + requests + roadlib + selenium + selenium-wire + signxml + ]; + + pythonImportsCheck = [ + "roadtools.roadtx" + ]; + + meta = with lib; { + description = "ROADtools Token eXchange"; + homepage = "https://pypi.org/project/roadtx/"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 85c75e424147..58987463a6cd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13008,6 +13008,8 @@ self: super: with self; { roadlib = callPackage ../development/python-modules/roadlib { }; + roadtx = callPackage ../development/python-modules/roadtx { }; + robomachine = callPackage ../development/python-modules/robomachine { }; robot-detection = callPackage ../development/python-modules/robot-detection { }; From ef842553a5f00e7a7813e7e13ad53dbf88e4dc93 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 17 Mar 2024 20:46:02 +0100 Subject: [PATCH 25/54] python311Packages.roadrecon: init at 1.4.0 Azure AD recon https://pypi.org/project/roadrecon/ --- .../python-modules/roadrecon/default.nix | 63 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 65 insertions(+) create mode 100644 pkgs/development/python-modules/roadrecon/default.nix diff --git a/pkgs/development/python-modules/roadrecon/default.nix b/pkgs/development/python-modules/roadrecon/default.nix new file mode 100644 index 000000000000..0f1f412919b2 --- /dev/null +++ b/pkgs/development/python-modules/roadrecon/default.nix @@ -0,0 +1,63 @@ +{ lib +, aiohttp +, buildPythonPackage +, fetchPypi +, flask +, flask-cors +, flask-marshmallow +, flask-sqlalchemy +, marshmallow +, marshmallow-sqlalchemy +, openpyxl +, pythonOlder +, pythonRelaxDepsHook +, roadlib +, setuptools +, sqlalchemy +}: + +buildPythonPackage rec { + pname = "roadrecon"; + version = "1.4.0"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-OEftVwU30tLP091Z5CIl67hkjjcqY+Qo04/wHZlbuFc="; + }; + + pythonRelaxDeps = [ + "flask" + ]; + + nativeBuildInputs = [ + pythonRelaxDepsHook + setuptools + ]; + + propagatedBuildInputs = [ + aiohttp + flask + flask-cors + flask-marshmallow + flask-sqlalchemy + marshmallow + marshmallow-sqlalchemy + openpyxl + roadlib + sqlalchemy + ]; + + pythonImportsCheck = [ + "roadtools.roadrecon" + ]; + + meta = with lib; { + description = "Azure AD recon"; + homepage = "https://pypi.org/project/roadrecon/"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 58987463a6cd..36d7d2f90429 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13010,6 +13010,8 @@ self: super: with self; { roadtx = callPackage ../development/python-modules/roadtx { }; + roadrecon = callPackage ../development/python-modules/roadrecon { }; + robomachine = callPackage ../development/python-modules/robomachine { }; robot-detection = callPackage ../development/python-modules/robot-detection { }; From 737abed250729e83b811f0e6a6c66a6b73d17104 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 17 Mar 2024 20:50:50 +0100 Subject: [PATCH 26/54] python311Packages.roadtools: init at 0.0.1 Azure AD tooling framework https://github.com/dirkjanm/ROADtools --- .../python-modules/roadtools/default.nix | 43 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 6 ++- 2 files changed, 47 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/python-modules/roadtools/default.nix diff --git a/pkgs/development/python-modules/roadtools/default.nix b/pkgs/development/python-modules/roadtools/default.nix new file mode 100644 index 000000000000..6ea6bc5138b2 --- /dev/null +++ b/pkgs/development/python-modules/roadtools/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, setuptools +, roadrecon +, roadlib +, roadtx +}: + +buildPythonPackage rec { + pname = "roadtools"; + version = "0.0.1"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-Cqcd+bKkfYXCeJBXu6peMjBoA6gve2XBPdCAAuTKGEE="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + roadrecon + roadlib + roadtx + ]; + + pythonImportsCheck = [ + "roadtools" + ]; + + meta = with lib; { + description = "Azure AD tooling framework"; + homepage = "https://github.com/dirkjanm/ROADtools"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 36d7d2f90429..3fd2952602c3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13008,10 +13008,12 @@ self: super: with self; { roadlib = callPackage ../development/python-modules/roadlib { }; - roadtx = callPackage ../development/python-modules/roadtx { }; - roadrecon = callPackage ../development/python-modules/roadrecon { }; + roadtools = callPackage ../development/python-modules/roadtools { }; + + roadtx = callPackage ../development/python-modules/roadtx { }; + robomachine = callPackage ../development/python-modules/robomachine { }; robot-detection = callPackage ../development/python-modules/robot-detection { }; From 0172dccfe725c4e239069a822cc3884f6859b1c6 Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Mon, 19 Feb 2024 21:00:38 +0100 Subject: [PATCH 27/54] certificate-ripper: 2.2.0 -> 2.3.0 --- pkgs/by-name/ce/certificate-ripper/package.nix | 13 +++++++++---- ...atch => pin-default-maven-plguin-versions.patch} | 10 +--------- 2 files changed, 10 insertions(+), 13 deletions(-) rename pkgs/by-name/ce/certificate-ripper/{make-deterministic.patch => pin-default-maven-plguin-versions.patch} (85%) diff --git a/pkgs/by-name/ce/certificate-ripper/package.nix b/pkgs/by-name/ce/certificate-ripper/package.nix index 0b03b395789f..439d8079d764 100644 --- a/pkgs/by-name/ce/certificate-ripper/package.nix +++ b/pkgs/by-name/ce/certificate-ripper/package.nix @@ -6,7 +6,7 @@ let pname = "certificate-ripper"; - version = "2.2.0"; + version = "2.3.0"; jar = maven.buildMavenPackage { pname = "${pname}-jar"; @@ -16,15 +16,20 @@ let owner = "Hakky54"; repo = "certificate-ripper"; rev = version; - hash = "sha256-snavZVLY8sHinLnG6k61eSQlR9sb8+k5tRHqu4kzQKM="; + hash = "sha256-q/UhKLFAre3YUH2W7e+SH4kRM0GIZAUyNJFDm02eL+8="; }; patches = [ - ./make-deterministic.patch + ./pin-default-maven-plguin-versions.patch ./fix-test-temp-dir-path.patch ]; - mvnHash = "sha256-ahw9VVlvBPlWChcJzXFna55kxqVeJMmdaLtwWcJ+qSA="; + mvnHash = "sha256-/iy7DXBAyq8TIpvrd2WAQh+9OApfxCWo1NoGwbzbq7s="; + + mvnParameters = lib.escapeShellArgs [ + "-Dproject.build.outputTimestamp=1980-01-01T00:00:02Z" # make timestamp deterministic + "-Dtest=!PemExportCommandShould#resolveRootCaOnlyWhenEnabled" # disable test using network + ]; installPhase = '' install -Dm644 target/crip.jar $out diff --git a/pkgs/by-name/ce/certificate-ripper/make-deterministic.patch b/pkgs/by-name/ce/certificate-ripper/pin-default-maven-plguin-versions.patch similarity index 85% rename from pkgs/by-name/ce/certificate-ripper/make-deterministic.patch rename to pkgs/by-name/ce/certificate-ripper/pin-default-maven-plguin-versions.patch index b9e7aa1d0a1e..bce8fab057a7 100644 --- a/pkgs/by-name/ce/certificate-ripper/make-deterministic.patch +++ b/pkgs/by-name/ce/certificate-ripper/pin-default-maven-plguin-versions.patch @@ -2,15 +2,7 @@ diff --git a/pom.xml b/pom.xml index dd0075d..46ac184 100644 --- a/pom.xml +++ b/pom.xml -@@ -46,6 +46,7 @@ - 4.2.rc3 - 2021 - UTF-8 -+ 1980-01-01T00:00:02Z - - - -@@ -103,6 +104,55 @@ +@@ -103,6 +103,55 @@ From ac9d79b6a0a260af992f3b2d1eb641abc2ab9ca0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 17 Mar 2024 22:18:31 +0100 Subject: [PATCH 28/54] nuclei: 3.2.1 -> 3.2.2 Diff: https://github.com/projectdiscovery/nuclei/compare/refs/tags/v3.2.1...v3.2.2 Changelog: https://github.com/projectdiscovery/nuclei/releases/tag/v3.2.2 --- pkgs/tools/security/nuclei/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/nuclei/default.nix b/pkgs/tools/security/nuclei/default.nix index 8f3f2cb0054d..a89bb3cbf62e 100644 --- a/pkgs/tools/security/nuclei/default.nix +++ b/pkgs/tools/security/nuclei/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "nuclei"; - version = "3.2.1"; + version = "3.2.2"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "nuclei"; rev = "refs/tags/v${version}"; - hash = "sha256-3JUCbeAFHoSo5kjV9/8Vn3Nt5kgrjytNej3x5WfPbR0="; + hash = "sha256-eYFHKXB6TSCLPMKiXvuSpt/2B+rbn7VZqoGEHp2vito="; }; vendorHash = "sha256-s0hspa3fKMHmFPPwB0tCDJoGEH2JpgFUaIbiSQJTtr0="; From 16b48b8c171c69a15df6e458a47aa141d781af4b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 17 Mar 2024 22:22:56 +0100 Subject: [PATCH 29/54] python312Packages.tencentcloud-sdk-python: 3.0.1108 -> 3.0.1110 Diff: https://github.com/TencentCloud/tencentcloud-sdk-python/compare/refs/tags/3.0.1108...3.0.1110 Changelog: https://github.com/TencentCloud/tencentcloud-sdk-python/blob/3.0.1110/CHANGELOG.md --- .../python-modules/tencentcloud-sdk-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix index c114f157986f..e37689a3c1ac 100644 --- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix +++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "tencentcloud-sdk-python"; - version = "3.0.1108"; + version = "3.0.1110"; pyproject = true; disabled = pythonOlder "3.9"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "TencentCloud"; repo = "tencentcloud-sdk-python"; rev = "refs/tags/${version}"; - hash = "sha256-aeQPoVHrRMxXzutaBkEjD2ek4zU/ZV4aBgm17r0ZRPU="; + hash = "sha256-BJCrpeMR+wbVdkBLVtq5BN4i5nqOQd7A08wVxz1MPSw="; }; nativeBuildInputs = [ From 5462cbed9b49658348935eb74b15543a1cf5f51c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 17 Mar 2024 22:33:27 +0100 Subject: [PATCH 30/54] tgpt: 2.7.1 -> 2.7.2 Diff: https://github.com/aandrew-me/tgpt/compare/refs/tags/v2.7.1...v2.7.2 Changelog: https://github.com/aandrew-me/tgpt/releases/tag/v2.7.2 --- pkgs/by-name/tg/tgpt/package.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/tg/tgpt/package.nix b/pkgs/by-name/tg/tgpt/package.nix index 5846639beb07..d63ff34c21d3 100644 --- a/pkgs/by-name/tg/tgpt/package.nix +++ b/pkgs/by-name/tg/tgpt/package.nix @@ -1,18 +1,17 @@ { lib , buildGoModule , fetchFromGitHub -, nix-update-script }: buildGoModule rec { pname = "tgpt"; - version = "2.7.1"; + version = "2.7.2"; src = fetchFromGitHub { owner = "aandrew-me"; repo = "tgpt"; rev = "refs/tags/v${version}"; - hash = "sha256-XuTDEcs1wIrAe7Oaok4aFP01jDcyWB01R3HNrx6UEpo="; + hash = "sha256-FbnweHiKfxqFegZnRlvdVbTmH4ImjddVOBlbGRT/SGw="; }; vendorHash = "sha256-docq/r6yyMPsuUyFbtCMaYfEVL0gLmyTy4PbrAemR00="; @@ -22,10 +21,10 @@ buildGoModule rec { "-w" ]; - # test tries to access the network - doCheck = false; - - passthru.updateScript = nix-update-script { }; + preCheck = '' + # Remove test which need network access + rm providers/koboldai/koboldai_test.go + ''; meta = with lib; { description = "ChatGPT in terminal without needing API keys"; From 0fd65c0bf7013cbb2437496744b1ae2c8d8dcf8b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 18 Mar 2024 01:39:25 +0000 Subject: [PATCH 31/54] python312Packages.pymongo-inmemory: 0.4.0 -> 0.4.1 --- pkgs/development/python-modules/pymongo-inmemory/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pymongo-inmemory/default.nix b/pkgs/development/python-modules/pymongo-inmemory/default.nix index f0930c8c54c0..604f0c1c3cd3 100644 --- a/pkgs/development/python-modules/pymongo-inmemory/default.nix +++ b/pkgs/development/python-modules/pymongo-inmemory/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pymongo-inmemory"; - version = "0.4.0"; + version = "0.4.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "kaizendorks"; repo = "pymongo_inmemory"; rev = "refs/tags/v${version}"; - hash = "sha256-h6/yKvAHqvw0L3Z1+PUQi36Ja6yvFiaX7Cn5Ypcg1Zs="; + hash = "sha256-vYWVMSawk+03ie3PtqOyzd6wxiviq+IzyQ8bvEHNHfc="; }; postPatch = '' From 522722a70fe12396ddab54826c2badcef2c3e162 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 18 Mar 2024 02:46:10 +0000 Subject: [PATCH 32/54] python312Packages.garth: 0.4.44 -> 0.4.45 --- pkgs/development/python-modules/garth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/garth/default.nix b/pkgs/development/python-modules/garth/default.nix index f6612811a692..c3e6bae9ed42 100644 --- a/pkgs/development/python-modules/garth/default.nix +++ b/pkgs/development/python-modules/garth/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "garth"; - version = "0.4.44"; + version = "0.4.45"; pyproject = true; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-CgLWstmhWXI2w6KBSpIGp8G1smWAKXC0goHKw3I9rJ4="; + hash = "sha256-dN4WQZ2FLkyqCGYFBICodHR7yBdrLvx4NE6OqB0SgZo="; }; nativeBuildInputs = [ From 915aae3d1f899d2acb695d2399604256a4de4adb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 18 Mar 2024 03:01:21 +0000 Subject: [PATCH 33/54] checkSSLCert: 2.80.0 -> 2.81.0 --- pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix b/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix index 783384eb9610..6e486b0b33ff 100644 --- a/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix +++ b/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "check_ssl_cert"; - version = "2.80.0"; + version = "2.81.0"; src = fetchFromGitHub { owner = "matteocorti"; repo = "check_ssl_cert"; rev = "refs/tags/v${version}"; - hash = "sha256-1KYolUA5AZ9fQLfNb4UE1WlMTj6GiAnNszPTLlERBvc="; + hash = "sha256-6C6shxu9ze0ffx6Mg2K9TkqJl98Wz7loTcCptg92IY8="; }; nativeBuildInputs = [ From b8611a58f3f71865c0edff0be788c4e9546cf9ce Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 18 Mar 2024 03:01:32 +0000 Subject: [PATCH 34/54] python312Packages.tplink-omada-client: 1.3.11 -> 1.3.12 --- .../python-modules/tplink-omada-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tplink-omada-client/default.nix b/pkgs/development/python-modules/tplink-omada-client/default.nix index d71d2c86194f..f55f437feb54 100644 --- a/pkgs/development/python-modules/tplink-omada-client/default.nix +++ b/pkgs/development/python-modules/tplink-omada-client/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "tplink-omada-client"; - version = "1.3.11"; + version = "1.3.12"; pyproject = true; disabled = pythonOlder "3.9"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "tplink_omada_client"; inherit version; - hash = "sha256-/mH9VqdF1l89qtAhug+ii4PCRO0PxKDr7LzvevjuZgc="; + hash = "sha256-ND+n2KCj5g1KdSWf/MxJwzprLZOkSUUC4Sp9Z51Tzkw="; }; nativeBuildInputs = [ From 05297b2ab008611375f98cf2aa8e120f3d06681d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 18 Mar 2024 04:03:14 +0000 Subject: [PATCH 35/54] bpftop: 0.2.3 -> 0.3.0 --- pkgs/by-name/bp/bpftop/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/bp/bpftop/package.nix b/pkgs/by-name/bp/bpftop/package.nix index 7a87f202a65e..db954a57e069 100644 --- a/pkgs/by-name/bp/bpftop/package.nix +++ b/pkgs/by-name/bp/bpftop/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "bpftop"; - version = "0.2.3"; + version = "0.3.0"; src = fetchFromGitHub { owner = "Netflix"; repo = "bpftop"; rev = "v${version}"; - hash = "sha256-mtif1VRlDL1LsJQ3NQmBEaHTxrt2qMbZAFCEhtm/CtI="; + hash = "sha256-5MrfnKbrL8VoQBhtIcNmbkUfdjBXhTUW3d0GypvCuY8="; }; - cargoHash = "sha256-N3pmet7OkIaI3EnzHfqe5P24RHabNUArEB1cKUYM5rA="; + cargoHash = "sha256-OjbsnhAY9KrGWgTDb3cxa1NIbdY2eaWlDXINC15Qk98="; buildInputs = [ elfutils From 4faf76b3dc18e62cc850f1ca2d2c7358bd8b1fc3 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Mon, 18 Mar 2024 05:57:31 +0100 Subject: [PATCH 36/54] nethack: disable parallel building --- pkgs/games/nethack/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/games/nethack/default.nix b/pkgs/games/nethack/default.nix index 524d58e0d6d8..e45862b3025b 100644 --- a/pkgs/games/nethack/default.nix +++ b/pkgs/games/nethack/default.nix @@ -100,7 +100,8 @@ in stdenv.mkDerivation rec { popd ''; - enableParallelBuilding = true; + # https://github.com/NixOS/nixpkgs/issues/294751 + enableParallelBuilding = false; preFixup = lib.optionalString qtMode '' wrapQtApp "$out/games/nethack" From cf14778933ba5314562343e60e5e52906af42fd9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 18 Mar 2024 04:58:38 +0000 Subject: [PATCH 37/54] python311Packages.pyunifiprotect: 5.0.1 -> 5.0.2 --- pkgs/development/python-modules/pyunifiprotect/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyunifiprotect/default.nix b/pkgs/development/python-modules/pyunifiprotect/default.nix index 74be4eeeeb06..a87fc210464d 100644 --- a/pkgs/development/python-modules/pyunifiprotect/default.nix +++ b/pkgs/development/python-modules/pyunifiprotect/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pname = "pyunifiprotect"; - version = "5.0.1"; + version = "5.0.2"; pyproject = true; disabled = pythonOlder "3.9"; @@ -41,7 +41,7 @@ buildPythonPackage rec { owner = "briis"; repo = "pyunifiprotect"; rev = "refs/tags/v${version}"; - hash = "sha256-19Ne8Jk0O1DjFVr286wpn9gdheNXOHHrIE9EgQNNB4w="; + hash = "sha256-bZjfpatw4lcOgMCqung/DMfRijxwtuIht6QusIYaCQ0="; }; env.SETUPTOOLS_SCM_PRETEND_VERSION = version; From ae26228100aa5490671da85f4db2ab7938df8fc8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 18 Mar 2024 07:09:33 +0100 Subject: [PATCH 38/54] pngcrush: patch build after libpng update --- pkgs/tools/graphics/pngcrush/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/graphics/pngcrush/default.nix b/pkgs/tools/graphics/pngcrush/default.nix index 8ce9965eae25..2863881b9302 100644 --- a/pkgs/tools/graphics/pngcrush/default.nix +++ b/pkgs/tools/graphics/pngcrush/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, libpng }: +{ lib, stdenv, fetchurl, fetchpatch2, libpng }: stdenv.mkDerivation rec { pname = "pngcrush"; @@ -9,6 +9,13 @@ stdenv.mkDerivation rec { sha256 = "0l43c59d6v9l0g07z3q3ywhb8xb3vz74llv3mna0izk9bj6aqkiv"; }; + patches = [ + (fetchpatch2 { + url = "https://salsa.debian.org/debian/pngcrush/-/raw/b4856b56fbc28252103cc14d156baddd564ca880/debian/patches/ignore_PNG_IGNORE_ADLER32.patch"; + hash = "sha256-pFON/NUJiXMe9GETptgNltWa0izlby6P/fLsG1abz3g="; + }) + ]; + makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" "LD=${stdenv.cc.targetPrefix}cc" ]; # gcc and/or clang compat configurePhase = '' From c2803312ac295220e687c7aed943662e1353e761 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 18 Mar 2024 06:52:53 +0000 Subject: [PATCH 39/54] bearer: 1.42.0 -> 1.43.0 --- pkgs/development/tools/bearer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/bearer/default.nix b/pkgs/development/tools/bearer/default.nix index 9834644edc6c..dde5aefb80d9 100644 --- a/pkgs/development/tools/bearer/default.nix +++ b/pkgs/development/tools/bearer/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "bearer"; - version = "1.42.0"; + version = "1.43.0"; src = fetchFromGitHub { owner = "bearer"; repo = "bearer"; rev = "refs/tags/v${version}"; - hash = "sha256-AcfOlTKhCntYauz3MxHBycvXBFVgnY7rBJPUwfEZUcA="; + hash = "sha256-oOQdFbctIwCvpccUipX+5dBvkUxlRiQE9ju/UCqSku0="; }; vendorHash = "sha256-g0AnL6r3dUfCIAytTknAD5aCPBsohDUMNfMAYKBebi4="; From c207b31e56a3fd6159f2b061689ad36f619154a8 Mon Sep 17 00:00:00 2001 From: Salar Rahmanian Date: Sun, 17 Mar 2024 21:26:57 -0700 Subject: [PATCH 40/54] plausible: remove softinio as maintainer --- pkgs/servers/web-apps/plausible/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/web-apps/plausible/default.nix b/pkgs/servers/web-apps/plausible/default.nix index e933877a53ab..bac0758984c5 100644 --- a/pkgs/servers/web-apps/plausible/default.nix +++ b/pkgs/servers/web-apps/plausible/default.nix @@ -88,7 +88,7 @@ beamPackages.mixRelease { homepage = "https://plausible.io/"; changelog = "https://github.com/plausible/analytics/blob/${src.rev}/CHANGELOG.md"; description = " Simple, open-source, lightweight (< 1 KB) and privacy-friendly web analytics alternative to Google Analytics"; - maintainers = with maintainers; [ softinio ]; + maintainers = with maintainers; [ ]; platforms = platforms.unix; }; } From d44346ce872fb149aa62bd473d38a5118820ffb4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 18 Mar 2024 06:55:59 +0000 Subject: [PATCH 41/54] python312Packages.types-docutils: 0.20.0.20240315 -> 0.20.0.20240317 --- pkgs/development/python-modules/types-docutils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-docutils/default.nix b/pkgs/development/python-modules/types-docutils/default.nix index 94e2ef266047..e8ebd39a07db 100644 --- a/pkgs/development/python-modules/types-docutils/default.nix +++ b/pkgs/development/python-modules/types-docutils/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "types-docutils"; - version = "0.20.0.20240315"; + version = "0.20.0.20240317"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-VAOK6SqOG8r2IHCWdsP3HqwuNYau0xbmCAvG3X/Us5Y="; + hash = "sha256-I2V6qw3lhjTREZFLZ3sYVYZ/Fs2anqEQJU4jtIZT4ag="; }; nativeBuildInputs = [ From d2ec304a6e2238ec411024babeed4b8c17090664 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 18 Mar 2024 07:07:11 +0000 Subject: [PATCH 42/54] python311Packages.apkinspector: 1.2.1 -> 1.2.2 --- pkgs/development/python-modules/apkinspector/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/apkinspector/default.nix b/pkgs/development/python-modules/apkinspector/default.nix index 6daf9868a4a4..651f8252275a 100644 --- a/pkgs/development/python-modules/apkinspector/default.nix +++ b/pkgs/development/python-modules/apkinspector/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "apkinspector"; - version = "1.2.1"; + version = "1.2.2"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-bB/WeCRnYOdfg4bm9Nloa2QMxr2IJW8IZd+svUno4N0="; + hash = "sha256-6n5WCQ6V63kbWT6b7t9PEFbrJpxEg1WOE9XV70tHnGA="; }; nativeBuildInputs = [ From 4ba08064854c88785a8bf01add9f2ae94da0262b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 18 Mar 2024 08:46:34 +0100 Subject: [PATCH 43/54] checkov: 3.2.38 -> 3.2.39 Diff: https://github.com/bridgecrewio/checkov/compare/refs/tags/3.2.38...3.2.39 Changelog: https://github.com/bridgecrewio/checkov/releases/tag/3.2.39 --- pkgs/development/tools/analysis/checkov/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index da64693ce776..0eeb59102c5b 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "checkov"; - version = "3.2.38"; + version = "3.2.39"; pyproject = true; src = fetchFromGitHub { owner = "bridgecrewio"; repo = "checkov"; rev = "refs/tags/${version}"; - hash = "sha256-AilJpggqi0c9KL/jY9XTGBNu21W1uo2INBWheBfkSLA="; + hash = "sha256-WjCTJKk5n0TPZHu56+PnMNj3tNYjDFSt+dMzbaApwXk="; }; patches = [ From 6fe3d788c8b7328a9db3fc2463024f66249e1a70 Mon Sep 17 00:00:00 2001 From: Raito Bezarius Date: Mon, 18 Mar 2024 00:51:32 -0700 Subject: [PATCH 44/54] linux/common-config: set idle timeout to 10s for sound cards As per https://docs.kernel.org/sound/designs/powersave.html We update our defaults for better power saving on laptops which does not perform powertop --auto-tune, TLP or manual tweaking, e.g. power-profiles-daemon. --- pkgs/os-specific/linux/kernel/common-config.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index cc9e7484c331..e19f33c7c6af 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -397,6 +397,11 @@ let sound = { SND_DYNAMIC_MINORS = yes; SND_AC97_POWER_SAVE = yes; # AC97 Power-Saving Mode + # 10s for the idle timeout, Fedora does 1, Arch does 10. + # The kernel says we should do 10. + # Read: https://docs.kernel.org/sound/designs/powersave.html + SND_AC97_POWER_SAVE_DEFAULT = freeform "10"; + SND_HDA_POWER_SAVE_DEFAULT = freeform "10"; SND_HDA_INPUT_BEEP = yes; # Support digital beep via input layer SND_HDA_RECONFIG = yes; # Support reconfiguration of jack functions # Support configuring jack functions via fw mechanism at boot From 46444fe9ff9bf5e95a7ff46f6e2917fb85b675a0 Mon Sep 17 00:00:00 2001 From: Yannick Markus Date: Mon, 11 Mar 2024 13:21:46 +0100 Subject: [PATCH 45/54] bookstack: 24.02 -> 24.02.2 --- pkgs/servers/web-apps/bookstack/default.nix | 4 +- .../web-apps/bookstack/php-packages.nix | 180 +++++++++--------- 2 files changed, 92 insertions(+), 92 deletions(-) diff --git a/pkgs/servers/web-apps/bookstack/default.nix b/pkgs/servers/web-apps/bookstack/default.nix index c59b6dae131e..227d4185baf8 100644 --- a/pkgs/servers/web-apps/bookstack/default.nix +++ b/pkgs/servers/web-apps/bookstack/default.nix @@ -16,13 +16,13 @@ let in package.override rec { pname = "bookstack"; - version = "24.02"; + version = "24.02.2"; src = fetchFromGitHub { owner = "bookstackapp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-F1CNutWFtFaRXsT8InyMww7OR40TXnzVGA/6t0eLBIw="; + sha256 = "1b4166vd3ribs69ad5ljp71im0fh0n0m5c5l04i3l44a5bw25b2h"; }; meta = with lib; { diff --git a/pkgs/servers/web-apps/bookstack/php-packages.nix b/pkgs/servers/web-apps/bookstack/php-packages.nix index 2709f22c3d1d..7c343011726c 100644 --- a/pkgs/servers/web-apps/bookstack/php-packages.nix +++ b/pkgs/servers/web-apps/bookstack/php-packages.nix @@ -15,10 +15,10 @@ let "aws/aws-sdk-php" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "aws-aws-sdk-php-2e34d45e970c77775e4c298e08732d64b647c41c"; + name = "aws-aws-sdk-php-957ccef631684d612d01ced2fa3b0506f2ec78c3"; src = fetchurl { - url = "https://api.github.com/repos/aws/aws-sdk-php/zipball/2e34d45e970c77775e4c298e08732d64b647c41c"; - sha256 = "1h08lxna8sjq90lrxj60w2cyf9iynvyw4b8r9nl1bxsdmbmgl27s"; + url = "https://api.github.com/repos/aws/aws-sdk-php/zipball/957ccef631684d612d01ced2fa3b0506f2ec78c3"; + sha256 = "1chckiccr061c063wwf502d545wji4p5g6ak6z6dl36jjkrip7v4"; }; }; }; @@ -105,20 +105,20 @@ let "doctrine/dbal" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "doctrine-dbal-0ac3c270590e54910715e9a1a044cc368df282b2"; + name = "doctrine-dbal-a19a1d05ca211f41089dffcc387733a6875196cb"; src = fetchurl { - url = "https://api.github.com/repos/doctrine/dbal/zipball/0ac3c270590e54910715e9a1a044cc368df282b2"; - sha256 = "1qf6nhrrn7hdxqvym9l3mxj1sb0fmx2h1s3yi4mjkkb4ri5hcmm8"; + url = "https://api.github.com/repos/doctrine/dbal/zipball/a19a1d05ca211f41089dffcc387733a6875196cb"; + sha256 = "11lcmw8pmgfp7wmn4miainyl2c060s4igq4g94azxl1v5bqaypis"; }; }; }; "doctrine/deprecations" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "doctrine-deprecations-4f2d4f2836e7ec4e7a8625e75c6aa916004db931"; + name = "doctrine-deprecations-dfbaa3c2d2e9a9df1118213f3b8b0c597bb99fab"; src = fetchurl { - url = "https://api.github.com/repos/doctrine/deprecations/zipball/4f2d4f2836e7ec4e7a8625e75c6aa916004db931"; - sha256 = "1kxy6s4v9prkfvsnggm10kk0yyqsyd2vk238zhvv3c9il300h8sk"; + url = "https://api.github.com/repos/doctrine/deprecations/zipball/dfbaa3c2d2e9a9df1118213f3b8b0c597bb99fab"; + sha256 = "1qydhnf94wgjlrgzydjcz31rr5f87pg3vlkkd0gynggw1ycgkkcg"; }; }; }; @@ -135,20 +135,20 @@ let "doctrine/inflector" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "doctrine-inflector-f9301a5b2fb1216b2b08f02ba04dc45423db6bff"; + name = "doctrine-inflector-5817d0659c5b50c9b950feb9af7b9668e2c436bc"; src = fetchurl { - url = "https://api.github.com/repos/doctrine/inflector/zipball/f9301a5b2fb1216b2b08f02ba04dc45423db6bff"; - sha256 = "1kdq3sbwrzwprxr36cdw9m1zlwn15c0nz6i7mw0sq9mhnd2sgbrb"; + url = "https://api.github.com/repos/doctrine/inflector/zipball/5817d0659c5b50c9b950feb9af7b9668e2c436bc"; + sha256 = "0yj0f6w0v35d0xdhy4bf7hsjrkjjxsglc879rdciybsk6vz70g96"; }; }; }; "doctrine/lexer" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "doctrine-lexer-39ab8fcf5a51ce4b85ca97c7a7d033eb12831124"; + name = "doctrine-lexer-861c870e8b75f7c8f69c146c7f89cc1c0f1b49b6"; src = fetchurl { - url = "https://api.github.com/repos/doctrine/lexer/zipball/39ab8fcf5a51ce4b85ca97c7a7d033eb12831124"; - sha256 = "19kak8fh8sf5bpmcn7a90sqikgx30mk2bmjf0jbzcvlbnsjyggah"; + url = "https://api.github.com/repos/doctrine/lexer/zipball/861c870e8b75f7c8f69c146c7f89cc1c0f1b49b6"; + sha256 = "0q25i1d6nqkrj4yc35my6b51kn2nksddhddm13vkc7ilkkn20pg7"; }; }; }; @@ -285,30 +285,30 @@ let "laravel/socialite" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "laravel-socialite-4f6a8af6f3f7c18da03d19842dd0514315501c10"; + name = "laravel-socialite-7dae1b072573809f32ab6dcf4aebb57c8b3e8acf"; src = fetchurl { - url = "https://api.github.com/repos/laravel/socialite/zipball/4f6a8af6f3f7c18da03d19842dd0514315501c10"; - sha256 = "0329mzryfg198mgjb9k3ay5699mi4gz3i6dmaaxglar7gp0mlpvh"; + url = "https://api.github.com/repos/laravel/socialite/zipball/7dae1b072573809f32ab6dcf4aebb57c8b3e8acf"; + sha256 = "1jd65mk5hww4iq6xkky1dkmz8c06czlb466s4svg4vf1xhb9dxqj"; }; }; }; "laravel/tinker" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "laravel-tinker-b936d415b252b499e8c3b1f795cd4fc20f57e1f3"; + name = "laravel-tinker-502e0fe3f0415d06d5db1f83a472f0f3b754bafe"; src = fetchurl { - url = "https://api.github.com/repos/laravel/tinker/zipball/b936d415b252b499e8c3b1f795cd4fc20f57e1f3"; - sha256 = "1vggdik2nby6a9avwgylgihhwyglm0mdwm703bwv7ilwx0dsx1i7"; + url = "https://api.github.com/repos/laravel/tinker/zipball/502e0fe3f0415d06d5db1f83a472f0f3b754bafe"; + sha256 = "13l5lm6xz9qad3nmld8sjr4bznh82z8s4kr8kkd8d8a1ai6jd0aq"; }; }; }; "league/commonmark" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "league-commonmark-3669d6d5f7a47a93c08ddff335e6d945481a1dd5"; + name = "league-commonmark-91c24291965bd6d7c46c46a12ba7492f83b1cadf"; src = fetchurl { - url = "https://api.github.com/repos/thephpleague/commonmark/zipball/3669d6d5f7a47a93c08ddff335e6d945481a1dd5"; - sha256 = "1rbaydy1n1c1schskbabzd4nx57nvwpnzqapsfxjm6kyihca1nr3"; + url = "https://api.github.com/repos/thephpleague/commonmark/zipball/91c24291965bd6d7c46c46a12ba7492f83b1cadf"; + sha256 = "1i7yqcp4hdzz1k6qga96jwp9qpw7dxlfr5miw48zyym60ndk9n02"; }; }; }; @@ -325,30 +325,30 @@ let "league/flysystem" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "league-flysystem-d4ad81e2b67396e33dc9d7e54ec74ccf73151dcc"; + name = "league-flysystem-b25a361508c407563b34fac6f64a8a17a8819675"; src = fetchurl { - url = "https://api.github.com/repos/thephpleague/flysystem/zipball/d4ad81e2b67396e33dc9d7e54ec74ccf73151dcc"; - sha256 = "1xfgcslv66jid10yjjzp1chwv579xgaymlzkxiwfk5mh77fdfryi"; + url = "https://api.github.com/repos/thephpleague/flysystem/zipball/b25a361508c407563b34fac6f64a8a17a8819675"; + sha256 = "07fd3nqvs9wnl7wwlii3aaalpdldgf6agk2l1ihl3w253qyg8ynn"; }; }; }; "league/flysystem-aws-s3-v3" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "league-flysystem-aws-s3-v3-9808919ee5d819730d9582d4e1673e8d195c38d8"; + name = "league-flysystem-aws-s3-v3-809474e37b7fb1d1f8bcc0f8a98bc1cae99aa513"; src = fetchurl { - url = "https://api.github.com/repos/thephpleague/flysystem-aws-s3-v3/zipball/9808919ee5d819730d9582d4e1673e8d195c38d8"; - sha256 = "1339ix4nqkk54bfnms18fz853s9ngsgjvkjdln1ff045m7dm4svi"; + url = "https://api.github.com/repos/thephpleague/flysystem-aws-s3-v3/zipball/809474e37b7fb1d1f8bcc0f8a98bc1cae99aa513"; + sha256 = "0iv1n4y6w4pa2051wxvnkcap08jb86qgfx1hb6w8z5rngg67nz4d"; }; }; }; "league/flysystem-local" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "league-flysystem-local-5cf046ba5f059460e86a997c504dd781a39a109b"; + name = "league-flysystem-local-b884d2bf9b53bb4804a56d2df4902bb51e253f00"; src = fetchurl { - url = "https://api.github.com/repos/thephpleague/flysystem-local/zipball/5cf046ba5f059460e86a997c504dd781a39a109b"; - sha256 = "0yr12z32plvpz70y8ravb9w80y583wkpsl1d0xhnglcka24aysdr"; + url = "https://api.github.com/repos/thephpleague/flysystem-local/zipball/b884d2bf9b53bb4804a56d2df4902bb51e253f00"; + sha256 = "1ggpc08rdaqk2wxkvklfi6l7nqzd6ch2dgf9icr1shfiv09l0mp6"; }; }; }; @@ -365,10 +365,10 @@ let "league/mime-type-detection" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "league-mime-type-detection-b6a5854368533df0295c5761a0253656a2e52d9e"; + name = "league-mime-type-detection-ce0f4d1e8a6f4eb0ddff33f57c69c50fd09f4301"; src = fetchurl { - url = "https://api.github.com/repos/thephpleague/mime-type-detection/zipball/b6a5854368533df0295c5761a0253656a2e52d9e"; - sha256 = "0bsqha9c0pyb5l78iiv1klrpqmhki6nh9x73pgnmh7sphh6ilygj"; + url = "https://api.github.com/repos/thephpleague/mime-type-detection/zipball/ce0f4d1e8a6f4eb0ddff33f57c69c50fd09f4301"; + sha256 = "1yvjnqb6wv6kxfs21qw31yqcb653dz2xw9g646y2g9via33fxvpd"; }; }; }; @@ -425,10 +425,10 @@ let "nesbot/carbon" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "nesbot-carbon-2b3b3db0a2d0556a177392ff1a3bf5608fa09f78"; + name = "nesbot-carbon-0c6fd108360c562f6e4fd1dedb8233b423e91c83"; src = fetchurl { - url = "https://api.github.com/repos/briannesbitt/Carbon/zipball/2b3b3db0a2d0556a177392ff1a3bf5608fa09f78"; - sha256 = "1wf1kc2v6n68x04kf5dqf96ihkly4yb77bj09isp3yadsnhqy69d"; + url = "https://api.github.com/repos/briannesbitt/Carbon/zipball/0c6fd108360c562f6e4fd1dedb8233b423e91c83"; + sha256 = "1qwdzf2jgppj2r8jpxxd1q08aycyvj17azy2ixlw4cnmwhcqzgnh"; }; }; }; @@ -445,20 +445,20 @@ let "nette/utils" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "nette-utils-a9d127dd6a203ce6d255b2e2db49759f7506e015"; + name = "nette-utils-d3ad0aa3b9f934602cb3e3902ebccf10be34d218"; src = fetchurl { - url = "https://api.github.com/repos/nette/utils/zipball/a9d127dd6a203ce6d255b2e2db49759f7506e015"; - sha256 = "0py2072z0rmpzf1ylk7rf2k040lv3asnk2icf97qm384cjw9dzrp"; + url = "https://api.github.com/repos/nette/utils/zipball/d3ad0aa3b9f934602cb3e3902ebccf10be34d218"; + sha256 = "11df93i9xkwkfq33hqf2x562a36sibzpc6rkbblz2r10mna6qw6q"; }; }; }; "nikic/php-parser" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "nikic-php-parser-1bcbb2179f97633e98bbbc87044ee2611c7d7999"; + name = "nikic-php-parser-2218c2252c874a4624ab2f613d86ac32d227bc69"; src = fetchurl { - url = "https://api.github.com/repos/nikic/PHP-Parser/zipball/1bcbb2179f97633e98bbbc87044ee2611c7d7999"; - sha256 = "1all9j7b5cr87jjs2lam2s11kvygi9jkkc7fks43f9jf1sp2ybji"; + url = "https://api.github.com/repos/nikic/PHP-Parser/zipball/2218c2252c874a4624ab2f613d86ac32d227bc69"; + sha256 = "1dkil9kcp1abwa4nhpmy8my6srj70994mjh7wnhyw8yy084nf11z"; }; }; }; @@ -505,20 +505,20 @@ let "phenx/php-font-lib" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "phenx-php-font-lib-dd448ad1ce34c63d09baccd05415e361300c35b4"; + name = "phenx-php-font-lib-a1681e9793040740a405ac5b189275059e2a9863"; src = fetchurl { - url = "https://api.github.com/repos/dompdf/php-font-lib/zipball/dd448ad1ce34c63d09baccd05415e361300c35b4"; - sha256 = "0l20inbvipjdg9fdd32v8b7agjyvcs0rpqswcylld64vbm2sf3il"; + url = "https://api.github.com/repos/dompdf/php-font-lib/zipball/a1681e9793040740a405ac5b189275059e2a9863"; + sha256 = "0xb28w943pg0xb5mmm2jd74vr14k2lwh40azpfv0p4ghfg16v3jp"; }; }; }; "phenx/php-svg-lib" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "phenx-php-svg-lib-8a8a1ebcf6aea861ef30197999f096f7bd4b4456"; + name = "phenx-php-svg-lib-732faa9fb4309221e2bd9b2fda5de44f947133aa"; src = fetchurl { - url = "https://api.github.com/repos/dompdf/php-svg-lib/zipball/8a8a1ebcf6aea861ef30197999f096f7bd4b4456"; - sha256 = "14iq5594y19dl5sr1f0zqvpg6fkv4hifb9y5i97phhplyprfdh7g"; + url = "https://api.github.com/repos/dompdf/php-svg-lib/zipball/732faa9fb4309221e2bd9b2fda5de44f947133aa"; + sha256 = "0hjf562cm8mvb36c2s63bh5104j6m5c27lwd4pgj3lwmq6mpzns6"; }; }; }; @@ -535,10 +535,10 @@ let "phpseclib/phpseclib" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "phpseclib-phpseclib-56c79f16a6ae17e42089c06a2144467acc35348a"; + name = "phpseclib-phpseclib-c2fb5136162d4be18fdd4da9980696f3aee96d7b"; src = fetchurl { - url = "https://api.github.com/repos/phpseclib/phpseclib/zipball/56c79f16a6ae17e42089c06a2144467acc35348a"; - sha256 = "0xmv35m6fsw7rfaxs82ky0wgj3gsnp7qw0sjgkig2cw10anfs0gq"; + url = "https://api.github.com/repos/phpseclib/phpseclib/zipball/c2fb5136162d4be18fdd4da9980696f3aee96d7b"; + sha256 = "1n13c34w27vkrjz87vq7dxzz1xi0vj7xzj5slibdm1wfpvbsbg2m"; }; }; }; @@ -655,10 +655,10 @@ let "psy/psysh" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "psy-psysh-128fa1b608be651999ed9789c95e6e2a31b5802b"; + name = "psy-psysh-750bf031a48fd07c673dbe3f11f72362ea306d0d"; src = fetchurl { - url = "https://api.github.com/repos/bobthecow/psysh/zipball/128fa1b608be651999ed9789c95e6e2a31b5802b"; - sha256 = "0lrmqw53kzgdldxiy2aj0dawdzz5cbsxqz9p47ca3c0ggnszlk1p"; + url = "https://api.github.com/repos/bobthecow/psysh/zipball/750bf031a48fd07c673dbe3f11f72362ea306d0d"; + sha256 = "0kcs6g31v6k760dwapdbx34vqliispf8dhwrjjgrv34ysfbwrgvc"; }; }; }; @@ -705,10 +705,10 @@ let "sabberworm/php-css-parser" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "sabberworm-php-css-parser-e41d2140031d533348b2192a83f02d8dd8a71d30"; + name = "sabberworm-php-css-parser-4a3d572b0f8b28bb6fd016ae8bbfc445facef152"; src = fetchurl { - url = "https://api.github.com/repos/sabberworm/PHP-CSS-Parser/zipball/e41d2140031d533348b2192a83f02d8dd8a71d30"; - sha256 = "0slqh0ra9cwk1pm4q7bqhndynir0yxypzrxb2vrfzfkmnh0rm02c"; + url = "https://api.github.com/repos/MyIntervals/PHP-CSS-Parser/zipball/4a3d572b0f8b28bb6fd016ae8bbfc445facef152"; + sha256 = "1gs3q8j70ccwa2s3icf936xxik8h3qi5plkpvw4ygzkb9vkcicdv"; }; }; }; @@ -735,10 +735,10 @@ let "socialiteproviders/manager" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "socialiteproviders-manager-df5e45b53d918ec3d689f014d98a6c838b98ed96"; + name = "socialiteproviders-manager-a67f194f0f4c4c7616c549afc697b78df9658d44"; src = fetchurl { - url = "https://api.github.com/repos/SocialiteProviders/Manager/zipball/df5e45b53d918ec3d689f014d98a6c838b98ed96"; - sha256 = "0hzgj5p3cdi4mxrnq3c20yyjr4c1hnqnz8d2440s308a4wahz33z"; + url = "https://api.github.com/repos/SocialiteProviders/Manager/zipball/a67f194f0f4c4c7616c549afc697b78df9658d44"; + sha256 = "0r5c6q7dm02hnk574br5mrm1z8amrxjxcbf4n94l02vq9din2c0m"; }; }; }; @@ -895,90 +895,90 @@ let "symfony/polyfill-ctype" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-polyfill-ctype-ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb"; + name = "symfony-polyfill-ctype-ef4d7e442ca910c4764bce785146269b30cb5fc4"; src = fetchurl { - url = "https://api.github.com/repos/symfony/polyfill-ctype/zipball/ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb"; - sha256 = "0ynkrpl3hb448dhab1injwwzfx68l75yn9zgc7lgqwbx60dvhqm3"; + url = "https://api.github.com/repos/symfony/polyfill-ctype/zipball/ef4d7e442ca910c4764bce785146269b30cb5fc4"; + sha256 = "16wr6dp9yr4wks11d1qjyzpc343ri2nr7q7fmrnp3jhmp949rppy"; }; }; }; "symfony/polyfill-intl-grapheme" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-polyfill-intl-grapheme-875e90aeea2777b6f135677f618529449334a612"; + name = "symfony-polyfill-intl-grapheme-32a9da87d7b3245e09ac426c83d334ae9f06f80f"; src = fetchurl { - url = "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/875e90aeea2777b6f135677f618529449334a612"; - sha256 = "19j8qcbp525q7i61c2lhj6z2diysz45q06d990fvjby15cn0id0i"; + url = "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/32a9da87d7b3245e09ac426c83d334ae9f06f80f"; + sha256 = "03wk7yxavld4jnvavy7m2d3xxn5h4938wypgwjkblgx8n7s93jiq"; }; }; }; "symfony/polyfill-intl-idn" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-polyfill-intl-idn-ecaafce9f77234a6a449d29e49267ba10499116d"; + name = "symfony-polyfill-intl-idn-a287ed7475f85bf6f61890146edbc932c0fff919"; src = fetchurl { - url = "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/ecaafce9f77234a6a449d29e49267ba10499116d"; - sha256 = "0f42w4975rakhysnmhsyw6n3rjg6rjg7b7x8gs1n0qfdb6wc8m3q"; + url = "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/a287ed7475f85bf6f61890146edbc932c0fff919"; + sha256 = "14x9hv01fn5dmpkm7480lgzhz4lqdi3w1hlkh3sjpb6ic87k0wc1"; }; }; }; "symfony/polyfill-intl-normalizer" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-polyfill-intl-normalizer-8c4ad05dd0120b6a53c1ca374dca2ad0a1c4ed92"; + name = "symfony-polyfill-intl-normalizer-bc45c394692b948b4d383a08d7753968bed9a83d"; src = fetchurl { - url = "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/8c4ad05dd0120b6a53c1ca374dca2ad0a1c4ed92"; - sha256 = "0msah2ii2174xh47v5x9vq1b1xn38yyx03sr3pa2rq3a849wi7nh"; + url = "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/bc45c394692b948b4d383a08d7753968bed9a83d"; + sha256 = "1zq1kklvjl4zj2v6yjzg7rv6ibvhxfymgi2xb0m5cw9r6i63rinw"; }; }; }; "symfony/polyfill-mbstring" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-polyfill-mbstring-42292d99c55abe617799667f454222c54c60e229"; + name = "symfony-polyfill-mbstring-9773676c8a1bb1f8d4340a62efe641cf76eda7ec"; src = fetchurl { - url = "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/42292d99c55abe617799667f454222c54c60e229"; - sha256 = "1m3l12y0lid3i0zy3m1jrk0z3zy8wpa7nij85zk2h5vbf924jnwa"; + url = "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9773676c8a1bb1f8d4340a62efe641cf76eda7ec"; + sha256 = "1jpa4wwjfdkkhdpisviy1p4fhik00cldj5msipwl0izkia1d2qgf"; }; }; }; "symfony/polyfill-php72" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-polyfill-php72-70f4aebd92afca2f865444d30a4d2151c13c3179"; + name = "symfony-polyfill-php72-861391a8da9a04cbad2d232ddd9e4893220d6e25"; src = fetchurl { - url = "https://api.github.com/repos/symfony/polyfill-php72/zipball/70f4aebd92afca2f865444d30a4d2151c13c3179"; - sha256 = "10j5ipx16p6rybkpawqscpr2wcnby4270rbdj1qchr598wkvi0kb"; + url = "https://api.github.com/repos/symfony/polyfill-php72/zipball/861391a8da9a04cbad2d232ddd9e4893220d6e25"; + sha256 = "0b4nw7x6c7jjn9bvkpqjnpszx647lncyswpk2iz57c1xl5dqywvh"; }; }; }; "symfony/polyfill-php80" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-polyfill-php80-6caa57379c4aec19c0a12a38b59b26487dcfe4b5"; + name = "symfony-polyfill-php80-87b68208d5c1188808dd7839ee1e6c8ec3b02f1b"; src = fetchurl { - url = "https://api.github.com/repos/symfony/polyfill-php80/zipball/6caa57379c4aec19c0a12a38b59b26487dcfe4b5"; - sha256 = "05yfindyip9lbfr5apxkz6m0mlljrc9z6qylpxr6k5nkivlrcn9x"; + url = "https://api.github.com/repos/symfony/polyfill-php80/zipball/87b68208d5c1188808dd7839ee1e6c8ec3b02f1b"; + sha256 = "1pn6dzj8b3h8851w3y6mj5qrwklwky5w71v4m455553qlga5cfr7"; }; }; }; "symfony/polyfill-php81" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-polyfill-php81-7581cd600fa9fd681b797d00b02f068e2f13263b"; + name = "symfony-polyfill-php81-c565ad1e63f30e7477fc40738343c62b40bc672d"; src = fetchurl { - url = "https://api.github.com/repos/symfony/polyfill-php81/zipball/7581cd600fa9fd681b797d00b02f068e2f13263b"; - sha256 = "0ngi5nhnbj4yycnf6yw628vmr7h6dhxxh7jawyp6gq7bzs94g2dy"; + url = "https://api.github.com/repos/symfony/polyfill-php81/zipball/c565ad1e63f30e7477fc40738343c62b40bc672d"; + sha256 = "0xy6jjnqvc6v1s7wvdm1yplblpbh43ilis93vjrlv7hc7i6ygfzg"; }; }; }; "symfony/polyfill-uuid" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-polyfill-uuid-9c44518a5aff8da565c8a55dbe85d2769e6f630e"; + name = "symfony-polyfill-uuid-3abdd21b0ceaa3000ee950097bc3cf9efc137853"; src = fetchurl { - url = "https://api.github.com/repos/symfony/polyfill-uuid/zipball/9c44518a5aff8da565c8a55dbe85d2769e6f630e"; - sha256 = "0w6mphwcz3n1qz0dc6nld5xqb179dvfcwys6r4nj4gjv5nm2nji0"; + url = "https://api.github.com/repos/symfony/polyfill-uuid/zipball/3abdd21b0ceaa3000ee950097bc3cf9efc137853"; + sha256 = "15g5ng1bcca4nqxjrcjabc1v679zl6xwm1wwfngvww1hvrbgd98d"; }; }; }; From bb40e8c7218ab5b8cd3a2a80606b26bcfe126e4b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 18 Mar 2024 05:10:21 +0000 Subject: [PATCH 46/54] ft2-clone: 1.77.1 -> 1.78 --- pkgs/applications/audio/ft2-clone/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/ft2-clone/default.nix b/pkgs/applications/audio/ft2-clone/default.nix index 88e7864e10cb..5d11cdff03e8 100644 --- a/pkgs/applications/audio/ft2-clone/default.nix +++ b/pkgs/applications/audio/ft2-clone/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "ft2-clone"; - version = "1.77.1"; + version = "1.78"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "ft2-clone"; rev = "v${version}"; - hash = "sha256-+DxJFCjXZmgaaK1+tF5LEmdBoKwl9Fz3ZNO35Ye7UGw="; + hash = "sha256-tGIjhh6F4ePKpMiBPjnpiUfqy8BSvzyeosVZMecCwxM="; }; nativeBuildInputs = [ cmake ]; From 7b9b395e9b582f2ab236b8fba5d994b6d6ada491 Mon Sep 17 00:00:00 2001 From: Jon Seager Date: Thu, 14 Mar 2024 07:53:47 +0000 Subject: [PATCH 47/54] scrutiny: 0.7.3 -> 0.8.0 --- pkgs/by-name/sc/scrutiny/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sc/scrutiny/package.nix b/pkgs/by-name/sc/scrutiny/package.nix index 0abe624af53d..26c22a61fe71 100644 --- a/pkgs/by-name/sc/scrutiny/package.nix +++ b/pkgs/by-name/sc/scrutiny/package.nix @@ -6,13 +6,13 @@ }: let pname = "scrutiny"; - version = "0.7.3"; + version = "0.8.0"; src = fetchFromGitHub { owner = "AnalogJ"; repo = "scrutiny"; rev = "refs/tags/v${version}"; - hash = "sha256-S7GW8z6EWB+5vntKew0+EDVqhun+Ae2//15dSIlfoSs="; + hash = "sha256-ysjE2nn1WwhEiFIvJ5cRCJQf9mECTgiGUyenwf3mKTA="; }; frontend = buildNpmPackage { From ea47f5e75ce821c7b4386c36b05a8abbbb27af49 Mon Sep 17 00:00:00 2001 From: Jon Seager Date: Mon, 18 Mar 2024 08:33:00 +0000 Subject: [PATCH 48/54] scrutiny: add nix-update-script --- pkgs/by-name/sc/scrutiny/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/sc/scrutiny/package.nix b/pkgs/by-name/sc/scrutiny/package.nix index 26c22a61fe71..34712b96e431 100644 --- a/pkgs/by-name/sc/scrutiny/package.nix +++ b/pkgs/by-name/sc/scrutiny/package.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , nixosTests , lib +, nix-update-script }: let pname = "scrutiny"; @@ -35,6 +36,8 @@ let cp -r dist/* $out runHook postInstall ''; + + passthru.updatescript = nix-update-script { }; }; in buildGoModule rec { @@ -56,6 +59,7 @@ buildGoModule rec { ''; passthru.tests.scrutiny = nixosTests.scrutiny; + passthru.updatescript = nix-update-script { }; meta = { description = "Hard Drive S.M.A.R.T Monitoring, Historical Trends & Real World Failure Thresholds."; From f8999bd43b46f087482acb944b772613f1cee4cb Mon Sep 17 00:00:00 2001 From: Jon Seager Date: Mon, 18 Mar 2024 08:33:55 +0000 Subject: [PATCH 49/54] scrutiny-collector: add nix-update-script --- pkgs/by-name/sc/scrutiny-collector/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/sc/scrutiny-collector/package.nix b/pkgs/by-name/sc/scrutiny-collector/package.nix index bebf43638dc3..984a52b21405 100644 --- a/pkgs/by-name/sc/scrutiny-collector/package.nix +++ b/pkgs/by-name/sc/scrutiny-collector/package.nix @@ -4,6 +4,7 @@ , smartmontools , nixosTests , lib +, nix-update-script }: let version = "0.8.0"; @@ -41,6 +42,7 @@ buildGoModule rec { ''; passthru.tests.scrutiny-collector = nixosTests.scrutiny; + passthru.updateScript = nix-update-script { }; meta = { description = "Hard disk metrics collector for Scrutiny."; From 2dbd317f56128ddc550ca337c7c6977d4bbec887 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 16 Mar 2024 02:44:29 +0000 Subject: [PATCH 50/54] vengi-tools: 0.0.28 -> 0.0.29 Co-authored-by: Francesco Gazzetta --- pkgs/applications/graphics/vengi-tools/default.nix | 4 ++-- .../graphics/vengi-tools/test-voxconvert-all-formats.nix | 2 +- .../graphics/vengi-tools/test-voxconvert-roundtrip.nix | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/graphics/vengi-tools/default.nix b/pkgs/applications/graphics/vengi-tools/default.nix index 771ae49e220d..1c3bf8b6ede3 100644 --- a/pkgs/applications/graphics/vengi-tools/default.nix +++ b/pkgs/applications/graphics/vengi-tools/default.nix @@ -29,13 +29,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "vengi-tools"; - version = "0.0.28"; + version = "0.0.29"; src = fetchFromGitHub { owner = "mgerhardy"; repo = "vengi"; rev = "v${finalAttrs.version}"; - hash = "sha256-UjSm/J/y7MUg3Exmw0P56+bcjiLxXdGS2brocdzgJ+c="; + hash = "sha256-VGgmJPNLEsD1y6e6CRw1Wipmy9MKAQkydyHNNjPyvhQ="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/vengi-tools/test-voxconvert-all-formats.nix b/pkgs/applications/graphics/vengi-tools/test-voxconvert-all-formats.nix index fc99ceb07144..c3e6e47adfba 100644 --- a/pkgs/applications/graphics/vengi-tools/test-voxconvert-all-formats.nix +++ b/pkgs/applications/graphics/vengi-tools/test-voxconvert-all-formats.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { mkdir $out for format in vox qef qbt qb vxm vxr binvox gox cub vxl csv; do echo Testing $format export - ${vengi-tools}/bin/vengi-voxconvert --input ${vengi-tools.src}/data/voxedit/chr_knight.qb --output $out/chr_knight.$format + ${vengi-tools}/bin/vengi-voxconvert --input ${vengi-tools.src}/data/tests/chr_knight.qb --output $out/chr_knight.$format done ''; } diff --git a/pkgs/applications/graphics/vengi-tools/test-voxconvert-roundtrip.nix b/pkgs/applications/graphics/vengi-tools/test-voxconvert-roundtrip.nix index a6fbb65fedfd..a683bff7a10b 100644 --- a/pkgs/applications/graphics/vengi-tools/test-voxconvert-roundtrip.nix +++ b/pkgs/applications/graphics/vengi-tools/test-voxconvert-roundtrip.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { name = "vengi-tools-test-voxconvert-roundtrip"; meta.timeout = 10; buildCommand = '' - ${vengi-tools}/bin/vengi-voxconvert --input ${vengi-tools.src}/data/voxedit/chr_knight.qb --output chr_knight.vox + ${vengi-tools}/bin/vengi-voxconvert --input ${vengi-tools.src}/data/tests/chr_knight.qb --output chr_knight.vox ${vengi-tools}/bin/vengi-voxconvert --input chr_knight.vox --output chr_knight.qb ${vengi-tools}/bin/vengi-voxconvert --input chr_knight.qb --output chr_knight1.vox diff chr_knight.vox chr_knight1.vox From 8fec083b833146eba481d7f4175f8d386e5b056a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 18 Mar 2024 09:49:26 +0000 Subject: [PATCH 51/54] tenki: 1.4.0 -> 1.5.0 --- pkgs/by-name/te/tenki/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/te/tenki/package.nix b/pkgs/by-name/te/tenki/package.nix index e00d27eca21c..35ee53a41376 100644 --- a/pkgs/by-name/te/tenki/package.nix +++ b/pkgs/by-name/te/tenki/package.nix @@ -4,16 +4,16 @@ }: rustPlatform.buildRustPackage rec { pname = "tenki"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "ckaznable"; repo = "tenki"; rev = "v${version}"; - hash = "sha256-64yNMO+Tm8APF2NnygQuub4z7kCxxf+T1urgA4Qs104="; + hash = "sha256-X/GnOgxwBhkrdhUmEhyxdgk5ElayMOAmtDxR2cqRJc8="; }; - cargoHash = "sha256-R6Bfk3kW8721Q++dSY4u7AbUukBT0PODfFXsXuugWdk="; + cargoHash = "sha256-rmMUVZwNouUvFFPgZfbR4sgtig5zx1WC3bxnfPPT3yQ="; meta = with lib; { description = "tty-clock with weather effect"; From e5b3215afdc02a676590789eacd50a5a118e4d03 Mon Sep 17 00:00:00 2001 From: Blake Smith Date: Thu, 14 Mar 2024 23:55:07 -0500 Subject: [PATCH 52/54] gotosocial: skip more flakey tests golang 1.21.8 introduced some minor test suite breakages in gotosocial. Skip these tests for now. See: https://github.com/superseriousbusiness/gotosocial/pull/2760 --- pkgs/servers/gotosocial/default.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/gotosocial/default.nix b/pkgs/servers/gotosocial/default.nix index 0692fc1bff35..58e916d625f8 100644 --- a/pkgs/servers/gotosocial/default.nix +++ b/pkgs/servers/gotosocial/default.nix @@ -43,8 +43,18 @@ buildGoModule rec { # tests are working only on x86_64-linux doCheck = stdenv.isLinux && stdenv.isx86_64; - # flaky test - checkFlags = [ "-skip=^TestPage/minID,_maxID_and_limit_set$" ]; + checkFlags = + let + # flaky / broken tests + skippedTests = [ + # See: https://github.com/superseriousbusiness/gotosocial/issues/2651 + "TestPage/minID,_maxID_and_limit_set" + # See: https://github.com/superseriousbusiness/gotosocial/pull/2760. Stop skipping + # this test when fixed for go 1.21.8 and above + "TestValidationTestSuite/TestValidateEmail" + ]; + in + [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ]; passthru.tests.gotosocial = nixosTests.gotosocial; From cb382fec42f9c094747b3db04df9cd1e4e0442d0 Mon Sep 17 00:00:00 2001 From: Sebastien Bariteau Date: Mon, 11 Mar 2024 10:50:28 -0400 Subject: [PATCH 53/54] chromium-codecs-ffmpeg-extra 111306 -> 114023 --- .../networking/browsers/vivaldi/ffmpeg-codecs.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix b/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix index 5e49e35313ea..778914763d19 100644 --- a/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix +++ b/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix @@ -4,11 +4,11 @@ # downloads at https://vivaldi.com/download/ stdenv.mkDerivation rec { pname = "chromium-codecs-ffmpeg-extra"; - version = "111306"; + version = "114023"; src = fetchurl { - url = "https://api.snapcraft.io/api/v1/snaps/download/XXzVIXswXKHqlUATPqGCj2w2l7BxosS8_34.snap"; - sha256 = "sha256-Dna9yFgP7JeQLAeZWvSZ+eSMX2yQbX2/+mX0QC22lYY="; + url = "https://api.snapcraft.io/api/v1/snaps/download/XXzVIXswXKHqlUATPqGCj2w2l7BxosS8_37.snap"; + hash = "sha256-l1eHTAJvpkWof7Yj7M5uaa3YdLWw9F+/QvIUAfBx3ow="; }; buildInputs = [ squashfsTools ]; From 5cd749fa56c2ee496bc71f35524ff4629d899981 Mon Sep 17 00:00:00 2001 From: TheMaxMur Date: Mon, 18 Mar 2024 13:51:08 +0300 Subject: [PATCH 54/54] vscode-extensions.13xforever.language-x86-64-assembly: add alias --- pkgs/applications/editors/vscode/extensions/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index ccf82dcba1b6..6c24e43f634b 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -4687,6 +4687,7 @@ let }; aliases = super: { + _13xforever = super."13xforever"; _1Password = super."1Password"; _2gua = super."2gua"; _4ops = super."4ops";