diff options
44 files changed, 694 insertions, 332 deletions
diff --git a/flake.nix b/flake.nix index fa00bffcdf92..f16bc7d05fce 100644 --- a/flake.nix +++ b/flake.nix @@ -9,7 +9,8 @@ nixpkgs = self; }; - lib = import ./lib; + libVersionInfoOverlay = import ./lib/flake-version-info.nix self; + lib = (import ./lib).extend libVersionInfoOverlay; forAllSystems = lib.genAttrs lib.systems.flakeExposed; in @@ -20,13 +21,7 @@ nixosSystem = args: import ./nixos/lib/eval-config.nix ( - args // { - modules = args.modules ++ [{ - system.nixos.versionSuffix = - ".${final.substring 0 8 (self.lastModifiedDate or self.lastModified or "19700101")}.${self.shortRev or "dirty"}"; - system.nixos.revision = final.mkIf (self ? rev) self.rev; - }]; - } // lib.optionalAttrs (! args?system) { + args // { inherit (self) lib; } // lib.optionalAttrs (! args?system) { # Allow system to be set modularly in nixpkgs.system. # We set it to null, to remove the "legacy" entrypoint's # non-hermetic default. @@ -53,7 +48,11 @@ # attribute it displays `omitted` instead of evaluating all packages, # which keeps `nix flake show` on Nixpkgs reasonably fast, though less # information rich. - legacyPackages = forAllSystems (system: import ./. { inherit system; }); + legacyPackages = forAllSystems (system: + (import ./. { inherit system; }).extend (final: prev: { + lib = prev.lib.extend libVersionInfoOverlay; + }) + ); nixosModules = { notDetected = ./nixos/modules/installer/scan/not-detected.nix; diff --git a/lib/attrsets.nix b/lib/attrsets.nix index 3d4366ce1814..9b4a8684f9b7 100644 --- a/lib/attrsets.nix +++ b/lib/attrsets.nix @@ -51,12 +51,19 @@ rec { /* Return if an attribute from nested attribute set exists. + **Laws**: + 1. ```nix + hasAttrByPath [] x == true + ``` + Example: x = { a = { b = 3; }; } hasAttrByPath ["a" "b"] x => true hasAttrByPath ["z" "z"] x => false + hasAttrByPath [] (throw "no need") + => true Type: hasAttrByPath :: [String] -> AttrSet -> Bool @@ -80,6 +87,71 @@ rec { in hasAttrByPath' 0 e; + /* + Return the longest prefix of an attribute path that refers to an existing attribute in a nesting of attribute sets. + + Can be used after [`mapAttrsRecursiveCond`](#function-library-lib.attrsets.mapAttrsRecursiveCond) to apply a condition, + although this will evaluate the predicate function on sibling attributes as well. + + Note that the empty attribute path is valid for all values, so this function only throws an exception if any of its inputs does. + + **Laws**: + 1. ```nix + attrsets.longestValidPathPrefix [] x == [] + ``` + + 2. ```nix + hasAttrByPath (attrsets.longestValidPathPrefix p x) x == true + ``` + + Example: + x = { a = { b = 3; }; } + attrsets.longestValidPathPrefix ["a" "b" "c"] x + => ["a" "b"] + attrsets.longestValidPathPrefix ["a"] x + => ["a"] + attrsets.longestValidPathPrefix ["z" "z"] x + => [] + attrsets.longestValidPathPrefix ["z" "z"] (throw "no need") + => [] + + Type: + attrsets.longestValidPathPrefix :: [String] -> Value -> [String] + */ + longestValidPathPrefix = + # A list of strings representing the longest possible path that may be returned. + attrPath: + # The nested attribute set to check. + v: + let + lenAttrPath = length attrPath; + getPrefixForSetAtIndex = + # The nested attribute set to check, if it is an attribute set, which + # is not a given. + remainingSet: + # The index of the attribute we're about to check, as well as + # the length of the prefix we've already checked. + remainingPathIndex: + + if remainingPathIndex == lenAttrPath then + # All previously checked attributes exist, and no attr names left, + # so we return the whole path. + attrPath + else + let + attr = elemAt attrPath remainingPathIndex; + in + if remainingSet ? ${attr} then + getPrefixForSetAtIndex + remainingSet.${attr} # advance from the set to the attribute value + (remainingPathIndex + 1) # advance the path + else + # The attribute doesn't exist, so we return the prefix up to the + # previously checked length. + take remainingPathIndex attrPath; + in + getPrefixForSetAtIndex v 0; + /* Create a new attribute set with `value` set at the nested attribute location specified in `attrPath`. Example: diff --git a/lib/flake-version-info.nix b/lib/flake-version-info.nix new file mode 100644 index 000000000000..de15be94bee8 --- /dev/null +++ b/lib/flake-version-info.nix @@ -0,0 +1,20 @@ +# This function produces a lib overlay to be used by the nixpkgs +# & nixpkgs/lib flakes to provide meaningful values for +# `lib.trivial.version` et al.. +# +# Internal and subject to change, don't use this anywhere else! +# Instead, consider using a public interface, such as this flake here +# in this directory, `lib/`, or use the nixpkgs flake, which applies +# this logic for you in its `lib` output attribute. + +self: # from the flake + +finalLib: prevLib: # lib overlay + +{ + trivial = prevLib.trivial // { + versionSuffix = + ".${finalLib.substring 0 8 (self.lastModifiedDate or "19700101")}.${self.shortRev or "dirty"}"; + revisionWithDefault = default: self.rev or default; + }; +} diff --git a/lib/flake.nix b/lib/flake.nix index 0b5e54d547c5..ca09ed5f4a42 100644 --- a/lib/flake.nix +++ b/lib/flake.nix @@ -1,5 +1,10 @@ { description = "Library of low-level helper functions for nix expressions."; - outputs = { self }: { lib = import ./.; }; + outputs = { self }: + let + lib0 = import ./.; + in { + lib = lib0.extend (import ./flake-version-info.nix self); + }; } diff --git a/lib/tests/misc.nix b/lib/tests/misc.nix index 608af656d02c..2884e880e13a 100644 --- a/lib/tests/misc.nix +++ b/lib/tests/misc.nix @@ -697,6 +697,51 @@ runTests { expected = false; }; + testHasAttrByPathNonStrict = { + expr = hasAttrByPath [] (throw "do not use"); + expected = true; + }; + + testLongestValidPathPrefix_empty_empty = { + expr = attrsets.longestValidPathPrefix [ ] { }; + expected = [ ]; + }; + + testLongestValidPathPrefix_empty_nonStrict = { + expr = attrsets.longestValidPathPrefix [ ] (throw "do not use"); + expected = [ ]; + }; + + testLongestValidPathPrefix_zero = { + expr = attrsets.longestValidPathPrefix [ "a" (throw "do not use") ] { d = null; }; + expected = [ ]; + }; + + testLongestValidPathPrefix_zero_b = { + expr = attrsets.longestValidPathPrefix [ "z" "z" ] "remarkably harmonious"; + expected = [ ]; + }; + + testLongestValidPathPrefix_one = { + expr = attrsets.longestValidPathPrefix [ "a" "b" "c" ] { a = null; }; + expected = [ "a" ]; + }; + + testLongestValidPathPrefix_two = { + expr = attrsets.longestValidPathPrefix [ "a" "b" "c" ] { a.b = null; }; + expected = [ "a" "b" ]; + }; + + testLongestValidPathPrefix_three = { + expr = attrsets.longestValidPathPrefix [ "a" "b" "c" ] { a.b.c = null; }; + expected = [ "a" "b" "c" ]; + }; + + testLongestValidPathPrefix_three_extra = { + expr = attrsets.longestValidPathPrefix [ "a" "b" "c" ] { a.b.c.d = throw "nope"; }; + expected = [ "a" "b" "c" ]; + }; + testFindFirstIndexExample1 = { expr = lists.findFirstIndex (x: x > 3) (abort "index found, so a default must not be evaluated") [ 1 6 4 ]; expected = 1; diff --git a/lib/trivial.nix b/lib/trivial.nix index caff77190fde..b3fb54a7add4 100644 --- a/lib/trivial.nix +++ b/lib/trivial.nix @@ -1,6 +1,18 @@ { lib }: -rec { +let + inherit (lib.trivial) + isFunction + isInt + functionArgs + pathExists + release + setFunctionArgs + toBaseDigits + version + versionSuffix + warn; +in { ## Simple (higher order) functions @@ -439,7 +451,7 @@ rec { */ functionArgs = f: if f ? __functor - then f.__functionArgs or (lib.functionArgs (f.__functor f)) + then f.__functionArgs or (functionArgs (f.__functor f)) else builtins.functionArgs f; /* Check whether something is a function or something diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 9885c9cfcf99..4209b5058790 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -290,6 +290,7 @@ with lib.maintainers; { members = [ theuni dpausp + frlan leona ]; scope = "Team for Flying Circus employees who collectively maintain packages."; diff --git a/nixos/modules/security/acme/default.md b/nixos/modules/security/acme/default.md index 31548ad181a7..51ee0428d84e 100644 --- a/nixos/modules/security/acme/default.md +++ b/nixos/modules/security/acme/default.md @@ -45,7 +45,7 @@ placeholder certificates in place of the real ACME certs. The placeholder certs are overwritten when the ACME certs arrive. For `foo.example.com` the config would look like this: -``` +```nix security.acme.acceptTerms = true; security.acme.defaults.email = "admin+acme@example.com"; services.nginx = { @@ -88,7 +88,7 @@ This example uses a vhost called `certs.example.com`, with the intent that you will generate certs for all your vhosts and redirect everyone to HTTPS. -``` +```nix security.acme.acceptTerms = true; security.acme.defaults.email = "admin+acme@example.com"; @@ -136,7 +136,7 @@ services.httpd = { Now you need to configure ACME to generate a certificate. -``` +```nix security.acme.certs."foo.example.com" = { webroot = "/var/lib/acme/.challenges"; email = "foo@example.com"; @@ -167,7 +167,7 @@ see the [lego docs](https://go-acme.github.io/lego/dns/) for provider/server specific configuration values. For the sake of these docs, we will provide a fully self-hosted example using bind. -``` +```nix services.bind = { enable = true; extraConfig = '' @@ -199,7 +199,7 @@ The {file}`dnskeys.conf` and {file}`certs.secret` must be kept secure and thus you should not keep their contents in your Nix config. Instead, generate them one time with a systemd service: -``` +```nix systemd.services.dns-rfc2136-conf = { requiredBy = ["acme-example.com.service" "bind.service"]; before = ["acme-example.com.service" "bind.service"]; @@ -250,7 +250,7 @@ first, however instead of setting the options for one certificate you will set them as defaults (e.g. [](#opt-security.acme.defaults.dnsProvider)). -``` +```nix # Configure ACME appropriately security.acme.acceptTerms = true; security.acme.defaults.email = "admin+acme@example.com"; @@ -287,7 +287,7 @@ There is no way to change the user the ACME module uses (it will always be Below is an example configuration for OpenSMTPD, but this pattern can be applied to any service. -``` +```nix # Configure ACME however you like (DNS or HTTP validation), adding # the following configuration for the relevant certificate. # Note: You cannot use `systemctl reload` here as that would mean @@ -340,7 +340,7 @@ to be regenerated. In this scenario lego will produce the error `JWS verificatio The solution is to simply delete the associated accounts file and re-run the affected service(s). -``` +```shell # Find the accounts folder for the certificate systemctl cat acme-example.com.service | grep -Po 'accounts/[^:]*' export accountdir="$(!!)" diff --git a/nixos/modules/services/networking/avahi-daemon.nix b/nixos/modules/services/networking/avahi-daemon.nix index 4bf5badfa1f4..89b30996e8fa 100644 --- a/nixos/modules/services/networking/avahi-daemon.nix +++ b/nixos/modules/services/networking/avahi-daemon.nix @@ -272,7 +272,7 @@ in users.groups.avahi = { }; - system.nssModules = optional cfg.nssmdns pkgs.nssmdns; + system.nssModules = optional (cfg.nssmdns4 || cfg.nssmdns6) pkgs.nssmdns; system.nssDatabases.hosts = let mdnsMinimal = if (cfg.nssmdns4 && cfg.nssmdns6) then "mdns_minimal" diff --git a/nixos/tests/avahi.nix b/nixos/tests/avahi.nix index c53a95903291..d8f4d13340fb 100644 --- a/nixos/tests/avahi.nix +++ b/nixos/tests/avahi.nix @@ -16,7 +16,7 @@ import ./make-test-python.nix { cfg = { ... }: { services.avahi = { enable = true; - nssmdns = true; + nssmdns4 = true; publish.addresses = true; publish.domain = true; publish.enable = true; diff --git a/nixos/tests/guix/publish.nix b/nixos/tests/guix/publish.nix index 6dbe8f99ebd6..a15e00b0fa98 100644 --- a/nixos/tests/guix/publish.nix +++ b/nixos/tests/guix/publish.nix @@ -16,7 +16,7 @@ in { # substitute server which requires Avahi. services.avahi = { enable = true; - nssmdns = true; + nssmdns4 = true; publish = { enable = true; userServices = true; diff --git a/pkgs/applications/misc/keylight-controller-mschneider82/default.nix b/pkgs/applications/misc/keylight-controller-mschneider82/default.nix index e90299baa567..9d70e59202e8 100644 --- a/pkgs/applications/misc/keylight-controller-mschneider82/default.nix +++ b/pkgs/applications/misc/keylight-controller-mschneider82/default.nix @@ -37,7 +37,7 @@ buildGoModule rec { longDescription = '' Requires having: * Elgato's Keylight paired to local wifi network. - * Service avahi with nssmdns enabled. + * Service avahi with nssmdns4 enabled. ''; license = licenses.mit; homepage = "https://github.com/mschneider82/keylight-control"; diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index c01f260406d4..085f8e5d895b 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -1,17 +1,6 @@ -{ callPackage, stdenv }: builtins.mapAttrs (pname: attrs: callPackage ./generic.nix (attrs // { inherit pname; })) { - signal-desktop = rec { - dir = "Signal"; - version = "6.40.0"; - version-aarch64 = "6.40.0"; - url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - url-aarch64 = "https://github.com/0mniteck/Signal-Desktop-Mobian/raw/${version-aarch64}/builds/release/signal-desktop_${version-aarch64}_arm64.deb"; - hash = "sha256-vyXHlycPSyEyv938IKzGM6pdERHHerx2CLY/U+WMrH4="; - hash-aarch64 = "sha256-3Pi0c+CGcJR1M4ll51m+B5PmGIcIjjlc0qa9b8rkMeU="; - }; - signal-desktop-beta = rec { - dir = "Signal Beta"; - version = "6.40.0-beta.2"; - hash = "sha256-pfedkxbZ25DFgz+/N7ZEb9LwKrHuoMM+Zi+Tc21QPsg="; - url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop-beta/signal-desktop-beta_${version}_amd64.deb"; - }; +{ hostPlatform, callPackage }: { + signal-desktop = if hostPlatform.system == "aarch64-linux" + then callPackage ./signal-desktop-aarch64.nix { } + else callPackage ./signal-desktop.nix { }; + signal-desktop-beta = ./signal-desktop-beta.nix; } diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix index c3e14775cb16..68c5552b251c 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix @@ -1,12 +1,4 @@ -{ pname -, dir -, version -, version-aarch64 ? "" -, hash -, hash-aarch64 ? "" -, url -, url-aarch64 ? "" -, stdenv +{ stdenv , lib , fetchurl , autoPatchelfHook @@ -55,13 +47,18 @@ , wayland }: +{ pname +, dir +, version +, hash +, url +}: + let inherit (stdenv) targetPlatform; ARCH = if targetPlatform.isAarch64 then "arm64" else "x64"; - final-version = if targetPlatform.isAarch64 then version-aarch64 else version; in stdenv.mkDerivation rec { - inherit pname; - version = final-version; + inherit pname version; # Please backport all updates to the stable channel. # All releases have a limited lifetime and "expire" 90 days after the release. @@ -72,8 +69,7 @@ in stdenv.mkDerivation rec { # few additional steps and might not be the best idea.) src = fetchurl { - url = if targetPlatform.isAarch64 then url-aarch64 else url; - hash = if targetPlatform.isAarch64 then hash-aarch64 else hash; + inherit url hash; }; nativeBuildInputs = [ @@ -177,8 +173,11 @@ in stdenv.mkDerivation rec { patchelf --add-needed ${libpulseaudio}/lib/libpulse.so "$out/lib/${dir}/resources/app.asar.unpacked/node_modules/@signalapp/ringrtc/build/linux/libringrtc-${ARCH}.node" ''; - # Tests if the application launches and waits for "Link your phone to Signal Desktop": - passthru.tests.application-launch = nixosTests.signal-desktop; + passthru = { + # Tests if the application launches and waits for "Link your phone to Signal Desktop": + tests.application-launch = nixosTests.signal-desktop; + updateScript.command = [ ./update.sh ]; + }; meta = { description = "Private, simple, and secure messenger"; @@ -187,11 +186,11 @@ in stdenv.mkDerivation rec { "Signal Android" or "Signal iOS" app. ''; homepage = "https://signal.org/"; - changelog = "https://github.com/signalapp/Signal-Desktop/releases/tag/v${final-version}"; + changelog = "https://github.com/signalapp/Signal-Desktop/releases/tag/v${version}"; license = lib.licenses.agpl3Only; maintainers = with lib.maintainers; [ mic92 equirosa urandom bkchr ]; mainProgram = pname; - platforms = if builtins.stringLength version-aarch64 > 0 then [ "x86_64-linux" "aarch64-linux" ] else [ "x86_64-linux" ]; + platforms = [ "x86_64-linux" "aarch64-linux" ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; }; } diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-aarch64.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-aarch64.nix new file mode 100644 index 000000000000..d69571928af8 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-aarch64.nix @@ -0,0 +1,8 @@ +{ callPackage }: +callPackage ./generic.nix { } rec { + pname = "signal-desktop"; + dir = "Signal"; + version = "6.40.0"; + url = "https://github.com/0mniteck/Signal-Desktop-Mobian/raw/${version}/builds/release/signal-desktop_${version}_arm64.deb"; + hash = "sha256-3Pi0c+CGcJR1M4ll51m+B5PmGIcIjjlc0qa9b8rkMeU="; +} diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-beta.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-beta.nix new file mode 100644 index 000000000000..9b99f67e156a --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-beta.nix @@ -0,0 +1,8 @@ +{ callPackage }: +callPackage ./generic.nix {} rec { + pname = "signal-desktop-beta"; + dir = "Signal Beta"; + version = "6.40.0-beta.2"; + url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop-beta/signal-desktop-beta_${version}_amd64.deb"; + hash = "sha256-pfedkxbZ25DFgz+/N7ZEb9LwKrHuoMM+Zi+Tc21QPsg="; +} diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix new file mode 100644 index 000000000000..bfae729772f4 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix @@ -0,0 +1,8 @@ +{ callPackage }: +callPackage ./generic.nix {} rec { + pname = "signal-desktop"; + dir = "Signal"; + version = "6.40.0"; + url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop/signal-desktop_${version}_amd64.deb"; + hash = "sha256-vyXHlycPSyEyv938IKzGM6pdERHHerx2CLY/U+WMrH4="; +} diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/update.sh b/pkgs/applications/networking/instant-messengers/signal-desktop/update.sh new file mode 100755 index 000000000000..fb52881bc750 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/update.sh @@ -0,0 +1,39 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p bash nix-update curl coreutils + +set -ex + +SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" &>/dev/null && pwd)" + +curl_github() { + curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} "$@" +} + +case "$UPDATE_NIX_ATTR_PATH" in +signal-desktop) + latestTag=$(curl_github https://api.github.com/repos/signalapp/Signal-Desktop/releases/latest | jq -r ".tag_name") + latestVersion="$(expr "$latestTag" : 'v\(.*\)')" + latestVersionAarch64=$(curl_github "https://api.github.com/repos/0mniteck/Signal-Desktop-Mobian/releases/latest" | jq -r ".tag_name") + + echo "Updating signal-desktop for x86_64-linux" + nix-update --version "$latestVersion" \ + --system x86_64-linux \ + --override-filename "$SCRIPT_DIR/signal-desktop.nix" + signal-desktop + + echo "Updating signal-desktop for aarch64-linux" + nix-update --version "$latestVersionAarch64" \ + --system aarch64-linux \ + --override-filename "$SCRIPT_DIR/signal-desktop-aarch64.nix" \ + signal-desktop + ;; +signal-desktop-beta) + latestTagBeta=$(curl_github https://api.github.com/repos/signalapp/Signal-Desktop/releases | jq -r ".[0].tag_name") + latestVersionBeta="$(expr "$latestTagBeta" : 'v\(.*\)')" + echo "Updating signal-desktop-beta for x86_64-linux" + nix-update --version "$latestVersionBeta" --system x86_64-linux --override-filename "$SCRIPT_DIR/signal-desktop-beta.nix" signal-desktop-beta + ;; +*) + echo "Unknown attr path $UPDATE_NIX_ATTR_PATH" + ;; +esac diff --git a/pkgs/applications/window-managers/leftwm/default.nix b/pkgs/applications/window-managers/leftwm/default.nix index bbf1cefacd4c..ea2a41413a08 100644 --- a/pkgs/applications/window-managers/leftwm/default.nix +++ b/pkgs/applications/window-managers/leftwm/default.nix @@ -41,5 +41,6 @@ rustPlatform.buildRustPackage rec { platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ yanganto ]; changelog = "https://github.com/leftwm/leftwm/blob/${version}/CHANGELOG.md"; + mainProgram = "leftwm"; }; } diff --git a/pkgs/by-name/fr/frankenphp/package.nix b/pkgs/by-name/fr/frankenphp/package.nix index b5d2e74a0746..cfeb35882191 100644 --- a/pkgs/by-name/fr/frankenphp/package.nix +++ b/pkgs/by-name/fr/frankenphp/package.nix @@ -7,6 +7,7 @@ , frankenphp , darwin , pkg-config +, makeBinaryWrapper , runCommand , writeText }: @@ -41,7 +42,7 @@ in buildGoModule rec { vendorHash = "sha256-Lgj/pFtSQIgjrycajJ1zNY3ytvArmuk0E3IjsAzsNdM="; buildInputs = [ phpUnwrapped ] ++ phpUnwrapped.buildInputs; - nativeBuildInputs = lib.optionals stdenv.isDarwin [ pkg-config darwin.cctools darwin.autoSignDarwinBinariesHook ]; + nativeBuildInputs = [ makeBinaryWrapper ] ++ lib.optionals stdenv.isDarwin [ pkg-config darwin.cctools darwin.autoSignDarwinBinariesHook ]; subPackages = [ "frankenphp" ]; @@ -63,10 +64,13 @@ in buildGoModule rec { # replace hard-code homebrew path substituteInPlace ../frankenphp.go \ --replace "-L/opt/homebrew/opt/libiconv/lib" "-L${darwin.libiconv}/lib" + ''; - # remove when https://github.com/dunglas/frankenphp/pull/331 is merged and released - substituteInPlace ../frankenphp.go \ - --replace "darwin pkg-config: libxml-2.0 sqlite3" "darwin pkg-config: libxml-2.0" + preFixup = '' + mkdir -p $out/lib + ln -s "${phpEmbedWithZts}/lib/php.ini" "$out/lib/php.ini" + + wrapProgram $out/bin/frankenphp --set-default PHP_INI_SCAN_DIR $out/lib ''; doCheck = false; diff --git a/pkgs/tools/misc/nix-direnv/default.nix b/pkgs/by-name/ni/nix-direnv/package.nix index d4e461bb77e1..dfc7a56dd272 100644 --- a/pkgs/tools/misc/nix-direnv/default.nix +++ b/pkgs/by-name/ni/nix-direnv/package.nix @@ -5,13 +5,13 @@ }: stdenv.mkDerivation (finalAttrs:{ pname = "nix-direnv"; - version = "2.5.1"; + version = "3.0.0"; src = fetchFromGitHub { owner = "nix-community"; repo = "nix-direnv"; rev = finalAttrs.version; - hash = "sha256-rMQ+Nb6WqXm66g2TpF8E0Io9WBR0ve06MW8I759gl2M="; + hash = "sha256-UmCNAejZwss5a/YDP4HrbQaLHc5BypQDUkQrh/QoEhg="; }; # Substitute instead of wrapping because the resulting file is diff --git a/pkgs/by-name/vi/vinegar/package.nix b/pkgs/by-name/vi/vinegar/package.nix index 6fe0035dab6b..9b2aae176a2e 100644 --- a/pkgs/by-name/vi/vinegar/package.nix +++ b/pkgs/by-name/vi/vinegar/package.nix @@ -1,7 +1,7 @@ { lib , buildGoModule , fetchFromGitHub -, wine +, wine-staging , makeBinaryWrapper , pkg-config , libGL @@ -11,19 +11,19 @@ buildGoModule rec { pname = "vinegar"; - version = "1.5.8"; + version = "1.5.9"; src = fetchFromGitHub { owner = "vinegarhq"; repo = "vinegar"; rev = "v${version}"; - hash = "sha256-1KDcc9Hms1hQgpvf/49zFJ85kDUsieNcoOTYaZWV+S0="; + hash = "sha256-cLzQnNmQYyAIdTGygk/CNU/mxGgcgoFTg5G/0DNwpz4="; }; - vendorHash = "sha256-UJLwSOJ4vZt3kquKllm5OMfFheZtAG5gLSA20313PpA="; + vendorHash = "sha256-DZI4APnrldnwOmLZ9ucFBGQDxzPXTIi44eLu74WrSBI="; nativeBuildInputs = [ pkg-config makeBinaryWrapper ]; - buildInputs = [ libGL libxkbcommon xorg.libX11 xorg.libXcursor xorg.libXfixes wine ]; + buildInputs = [ libGL libxkbcommon xorg.libX11 xorg.libXcursor xorg.libXfixes wine-staging ]; buildPhase = '' runHook preBuild @@ -39,7 +39,7 @@ buildGoModule rec { postInstall = '' wrapProgram $out/bin/vinegar \ - --prefix PATH : ${lib.makeBinPath [ wine ]} + --prefix PATH : ${lib.makeBinPath [ wine-staging ]} ''; meta = with lib; { diff --git a/pkgs/development/interpreters/clojure/default.nix b/pkgs/development/interpreters/clojure/default.nix index bc7ef5769986..630b5f5193fb 100644 --- a/pkgs/development/interpreters/clojure/default.nix +++ b/pkgs/development/interpreters/clojure/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "clojure"; - version = "1.11.1.1413"; + version = "1.11.1.1429"; src = fetchurl { # https://github.com/clojure/brew-install/releases url = "https://github.com/clojure/brew-install/releases/download/${finalAttrs.version}/clojure-tools-${finalAttrs.version}.tar.gz"; - hash = "sha256-k8Olo63KUcWFgGNBmr9myD2/JOoV4f2S95v35mI4H+A="; + hash = "sha256-ov3s1qPGHfPGAPtgwAqPG+hU6R5nGMA7ucg8QVpquC4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/spglib/default.nix b/pkgs/development/libraries/spglib/default.nix index 73de0a287cba..724a9f52d509 100644 --- a/pkgs/development/libraries/spglib/default.nix +++ b/pkgs/development/libraries/spglib/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "spglib"; - version = "2.1.0"; # N.B: if you change this, please update: pythonPackages.spglib + version = "2.2.0"; # N.B: if you change this, please update: pythonPackages.spglib src = fetchFromGitHub { owner = "spglib"; repo = "spglib"; rev = "v${version}"; - hash = "sha256-EL3jkzyurc8fnzk9kAdTaEtLfLlLtmaVDFwChfCDOrQ="; + hash = "sha256-VaTW7n7DTeYBr/PrxPhfzfx/gLxzJikw5aL1tEbMtbs="; }; nativeBuildInputs = [ cmake gfortran gtest ]; diff --git a/pkgs/development/ocaml-modules/conduit/async.nix b/pkgs/development/ocaml-modules/conduit/async.nix index 249635d14bb8..5aaf16c46de5 100644 --- a/pkgs/development/ocaml-modules/conduit/async.nix +++ b/pkgs/development/ocaml-modules/conduit/async.nix @@ -9,8 +9,6 @@ buildDunePackage { src ; - duneVersion = "3"; - buildInputs = [ ppx_sexp_conv ppx_here ]; propagatedBuildInputs = [ diff --git a/pkgs/development/ocaml-modules/conduit/default.nix b/pkgs/development/ocaml-modules/conduit/default.nix index ada502aaf0cb..7a7ee238f10b 100644 --- a/pkgs/development/ocaml-modules/conduit/default.nix +++ b/pkgs/development/ocaml-modules/conduit/default.nix @@ -5,14 +5,13 @@ buildDunePackage rec { pname = "conduit"; - version = "6.2.0"; + version = "6.2.1"; minimalOCamlVersion = "4.08"; - duneVersion = "3"; src = fetchurl { url = "https://github.com/mirage/ocaml-conduit/releases/download/v${version}/conduit-${version}.tbz"; - sha256 = "sha256-PtRAsO3aGyEt12K9skgx85TcoFmF3RtKxPlFgdFFI5Q="; + hash = "sha256-WdXntiQ3vkibC3nOEf+QrATvOcaD5M78qFh6/cL1W7s="; }; propagatedBuildInputs = [ astring ipaddr ipaddr-sexp sexplib uri ppx_sexp_conv ]; diff --git a/pkgs/development/ocaml-modules/conduit/lwt-unix.nix b/pkgs/development/ocaml-modules/conduit/lwt-unix.nix index cb86ea5f4f06..81a77f356aff 100644 --- a/pkgs/development/ocaml-modules/conduit/lwt-unix.nix +++ b/pkgs/development/ocaml-modules/conduit/lwt-unix.nix @@ -6,7 +6,6 @@ buildDunePackage { pname = "conduit-lwt-unix"; inherit (conduit-lwt) version src; - duneVersion = "3"; buildInputs = [ ppx_sexp_conv ]; diff --git a/pkgs/development/ocaml-modules/conduit/lwt.nix b/pkgs/development/ocaml-modules/conduit/lwt.nix index 2ec6f556916d..641d57db10e3 100644 --- a/pkgs/development/ocaml-modules/conduit/lwt.nix +++ b/pkgs/development/ocaml-modules/conduit/lwt.nix @@ -3,7 +3,6 @@ buildDunePackage { pname = "conduit-lwt"; inherit (conduit) version src; - duneVersion = "3"; buildInputs = [ ppx_sexp_conv ]; diff --git a/pkgs/development/ocaml-modules/conduit/mirage.nix b/pkgs/development/ocaml-modules/conduit/mirage.nix index 04025666c3d9..79174261b9eb 100644 --- a/pkgs/development/ocaml-modules/conduit/mirage.nix +++ b/pkgs/development/ocaml-modules/conduit/mirage.nix @@ -1,5 +1,4 @@ { buildDunePackage, conduit-lwt -, fetchpatch , ppx_sexp_conv, sexplib, uri, cstruct, mirage-flow , mirage-flow-combinators, mirage-random, mirage-time, mirage-clock , dns-client-mirage, vchan, xenstore, tls, tls-mirage, ipaddr, ipaddr-sexp @@ -11,12 +10,6 @@ buildDunePackage { inherit (conduit-lwt) version src; - # Compatibility with tls ≥ 0.17 - patches = fetchpatch { - url = "https://github.com/mirage/ocaml-conduit/commit/403b4cec528dae71aded311215868a35c11dad7e.patch"; - hash = "sha256-R/iuLf2PSrx8mLKLueMA3+zr9sB8dX/3evjUbfQECBk="; - }; - nativeBuildInputs = [ ppx_sexp_conv ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/avidtools/default.nix b/pkgs/development/python-modules/avidtools/default.nix new file mode 100644 index 000000000000..acb2ea9c9998 --- /dev/null +++ b/pkgs/development/python-modules/avidtools/default.nix @@ -0,0 +1,50 @@ +{ lib +, buildPythonPackage +, datetime +, fetchPypi +, nvdlib +, pydantic +, pythonOlder +, setuptools +, typing +, typing-extensions +}: + +buildPythonPackage rec { + pname = "avidtools"; + version = "0.1.1.2"; + pyproject = true; + + disabled = pythonOlder "3.9"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-t+ohPjOBwY8i+g7VC30ehEu6SFIsn1SwGR/ICkV9blg="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + datetime + nvdlib + pydantic + typing + typing-extensions + ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "avidtools" + ]; + + meta = with lib; { + description = "Developer tools for AVID"; + homepage = "https://github.com/avidml/avidtools"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/dulwich/default.nix b/pkgs/development/python-modules/dulwich/default.nix index 2e1c93f89c04..3dfb70f88832 100644 --- a/pkgs/development/python-modules/dulwich/default.nix +++ b/pkgs/development/python-modules/dulwich/default.nix @@ -17,7 +17,7 @@ }: buildPythonPackage rec { - version = "0.21.6"; + version = "0.21.7"; pname = "dulwich"; format = "setuptools"; @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-MPvofotR84E8Ex4oQchtAHQ00WC9FttYa0DUfzHdBbA="; + hash = "sha256-qenGaDPOpYDDrBKSfkuXEZhddq/KmNqXFAXUFN5g6Wg="; }; LC_ALL = "en_US.UTF-8"; diff --git a/pkgs/development/python-modules/google-ai-generativelanguage/default.nix b/pkgs/development/python-modules/google-ai-generativelanguage/default.nix index ebadff454005..48e3a8995474 100644 --- a/pkgs/development/python-modules/google-ai-generativelanguage/default.nix +++ b/pkgs/development/python-modules/google-ai-generativelanguage/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "google-ai-generativelanguage"; - version = "0.3.4"; + version = "0.3.5"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-cnX9lGmtOrd5CdioC9bAVeHiMXjEsV6Z67ARSnV03P8="; + hash = "sha256-Tjjolkeczslpf3A7on5XF71muy/DkCg6V0uuS35KriA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/nvdlib/default.nix b/pkgs/development/python-modules/nvdlib/default.nix new file mode 100644 index 000000000000..e79b8c0513cd --- /dev/null +++ b/pkgs/development/python-modules/nvdlib/default.nix @@ -0,0 +1,49 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +, requests +, responses +, setuptools +}: + +buildPythonPackage rec { + pname = "nvdlib"; + version = "0.7.6"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "Vehemont"; + repo = "nvdlib"; + rev = "refs/tags/v${version}"; + hash = "sha256-p2xx+QC0P30FR+nMiFW/PoINbcTM49ufADW9B9u2WxI="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + requests + ]; + + nativeCheckInputs = [ + pytestCheckHook + responses + ]; + + pythonImportsCheck = [ + "nvdlib" + ]; + + meta = with lib; { + description = "Module to interact with the National Vulnerability CVE/CPE API"; + homepage = "https://github.com/Vehemont/nvdlib/"; + changelog = "https://github.com/vehemont/nvdlib/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/youtokentome/default.nix b/pkgs/development/python-modules/youtokentome/default.nix new file mode 100644 index 000000000000..2adb7480f906 --- /dev/null +++ b/pkgs/development/python-modules/youtokentome/default.nix @@ -0,0 +1,47 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +, click +, cython +, pytestCheckHook +, pythonOlder +, tabulate +}: + +buildPythonPackage rec { + pname = "youtokentome"; + version = "1.0.6"; + pyproject = true; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "VKCOM"; + repo = "YouTokenToMe"; + rev = "refs/tags/v${version}"; + hash = "sha256-IFZS4jSi4yMzI7VbOPHI3KFZu5tjPjfQDPY7e1qbKAM="; + }; + + nativeBuildInputs = [ + cython + setuptools + ]; + + propagatedBuildInputs = [ + click + tabulate + ]; + + pythonImportsCheck = [ + "youtokentome" + ]; + + meta = with lib; { + description = "Unsupervised text tokenizer"; + homepage = "https://github.com/VKCOM/YouTokenToMe"; + changelog = "https://github.com/VKCOM/YouTokenToMe/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/misc/drivers/epson-escpr/default.nix b/pkgs/misc/drivers/epson-escpr/default.nix index 40e6c7b3b18b..7300749235fd 100644 --- a/pkgs/misc/drivers/epson-escpr/default.nix +++ b/pkgs/misc/drivers/epson-escpr/default.nix @@ -42,7 +42,7 @@ in stdenv.mkDerivation { hostname resolvable: services.avahi = { enable = true; - nssmdns = true; + nssmdns4 = true; };''; license = licenses.gpl3Plus; maintainers = with maintainers; [ artuuge ]; diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 72d6c1197e63..b4a20dd48723 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -1,15 +1,15 @@ { "testing": { - "version": "6.7-rc4", - "hash": "sha256:1igynlm5pv62brfkyjh6w8lzvmmy8c3g8phrn5wgdyy8svc48r8h" + "version": "6.7-rc5", + "hash": "sha256:125zdj2sxcwkfvm2ckjk3mbwfll8950bn7kr38s5pvlx2a10zv04" }, "6.5": { "version": "6.5.13", "hash": "sha256:1dfbbydmayfj9npx3z0g38p574pmcx3qgs49dv0npigl48wd9yvq" }, "6.1": { - "version": "6.1.66", - "hash": "sha256:030sxwzqlf9jg57j1hvd46ffkc9yfplbk3b81faycfa2dk6n57j1" + "version": "6.1.67", + "hash": "sha256:11cjqll3b7iq3mblwyzjrd5ph8avgk23f4mw4shm8j6ai5rdndvm" }, "5.15": { "version": "5.15.142", @@ -32,7 +32,7 @@ "hash": "sha256:1f4q0acbp917myjmgiy4haxp78yak5h1rj5g937r6mkykwb6nb14" }, "6.6": { - "version": "6.6.5", - "hash": "sha256:17miac3h4kvj4yyf042qsmpsivpq243db5v0ay6233d6aic7k4kw" + "version": "6.6.6", + "hash": "sha256:1j14n8b012pv3r7i9p762jyabzn2nv1ranxyw5lk3c9lg68hmxzb" } } diff --git a/pkgs/tools/security/metasploit/Gemfile b/pkgs/tools/security/metasploit/Gemfile index b16aa8a0ddb3..6e3c08b9910e 100644 --- a/pkgs/tools/security/metasploit/Gemfile +++ b/pkgs/tools/security/metasploit/Gemfile @@ -1,4 +1,4 @@ # frozen_string_literal: true source "https://rubygems.org" -gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.3.45" +gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.3.46" diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock index bdef38c32aad..83abed7e7435 100644 --- a/pkgs/tools/security/metasploit/Gemfile.lock +++ b/pkgs/tools/security/metasploit/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/rapid7/metasploit-framework - revision: dd2f4b923912fc2ffc84d4a1d5e3bbccd5a8efc1 - ref: refs/tags/6.3.45 + revision: f05bef8a949ac002f2a17308a55b7afa84ca5882 + ref: refs/tags/6.3.46 specs: - metasploit-framework (6.3.45) + metasploit-framework (6.3.46) actionpack (~> 7.0.0) activerecord (~> 7.0.0) activesupport (~> 7.0.0) @@ -105,66 +105,67 @@ GEM remote: https://rubygems.org/ specs: Ascii85 (1.1.0) - actionpack (7.0.7.2) - actionview (= 7.0.7.2) - activesupport (= 7.0.7.2) + actionpack (7.0.8) + actionview (= 7.0.8) + activesupport (= 7.0.8) rack (~> 2.0, >= 2.2.4) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actionview (7.0.7.2) - activesupport (= 7.0.7.2) + actionview (7.0.8) + activesupport (= 7.0.8) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activemodel (7.0.7.2) - activesupport (= 7.0.7.2) - activerecord (7.0.7.2) - activemodel (= 7.0.7.2) - activesupport (= 7.0.7.2) - activesupport (7.0.7.2) + activemodel (7.0.8) + activesupport (= 7.0.8) + activerecord (7.0.8) + activemodel (= 7.0.8) + activesupport (= 7.0.8) + activesupport (7.0.8) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) - addressable (2.8.5) + addressable (2.8.6) public_suffix (>= 2.0.2, < 6.0) afm (0.2.2) arel-helpers (2.14.0) activerecord (>= 3.1.0, < 8) - aws-eventstream (1.2.0) - aws-partitions (1.811.0) - aws-sdk-core (3.181.0) - aws-eventstream (~> 1, >= 1.0.2) + aws-eventstream (1.3.0) + aws-partitions (1.864.0) + aws-sdk-core (3.190.0) + aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.651.0) - aws-sigv4 (~> 1.5) + aws-sigv4 (~> 1.8) jmespath (~> 1, >= 1.6.1) - aws-sdk-ec2 (1.402.0) - aws-sdk-core (~> 3, >= 3.177.0) + aws-sdk-ec2 (1.430.0) + aws-sdk-core (~> 3, >= 3.188.0) aws-sigv4 (~> 1.1) - aws-sdk-ec2instanceconnect (1.32.0) - aws-sdk-core (~> 3, >= 3.177.0) + aws-sdk-ec2instanceconnect (1.36.0) + aws-sdk-core (~> 3, >= 3.188.0) aws-sigv4 (~> 1.1) - aws-sdk-iam (1.86.0) - aws-sdk-core (~> 3, >= 3.177.0) + aws-sdk-iam (1.92.0) + aws-sdk-core (~> 3, >= 3.188.0) aws-sigv4 (~> 1.1) - aws-sdk-kms (1.71.0) - aws-sdk-core (~> 3, >= 3.177.0) + aws-sdk-kms (1.74.0) + aws-sdk-core (~> 3, >= 3.188.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.134.0) - aws-sdk-core (~> 3, >= 3.181.0) + aws-sdk-s3 (1.141.0) + aws-sdk-core (~> 3, >= 3.189.0) aws-sdk-kms (~> 1) - aws-sigv4 (~> 1.6) - aws-sdk-ssm (1.156.0) - aws-sdk-core (~> 3, >= 3.177.0) + aws-sigv4 (~> 1.8) + aws-sdk-ssm (1.162.0) + aws-sdk-core (~> 3, >= 3.188.0) aws-sigv4 (~> 1.1) - aws-sigv4 (1.6.0) + aws-sigv4 (1.8.0) aws-eventstream (~> 1, >= 1.0.2) - bcrypt (3.1.19) + base64 (0.2.0) + bcrypt (3.1.20) bcrypt_pbkdf (1.1.0) bindata (2.4.15) - bootsnap (1.16.0) + bootsnap (1.17.0) msgpack (~> 1.2) bson (4.15.0) builder (3.2.4) @@ -173,11 +174,10 @@ GEM cookiejar (0.3.3) crass (1.0.6) daemons (1.4.1) - date (3.3.3) + date (3.3.4) dnsruby (1.70.0) simpleidn (~> 0.2.1) - domain_name (0.5.20190701) - unf (>= 0.0.5, < 1.0.0) + domain_name (0.6.20231109) ed25519 (1.3.0) em-http-request (1.1.7) addressable (>= 2.3.4) @@ -189,9 +189,10 @@ GEM eventmachine (>= 1.0.0.beta.4) erubi (1.12.0) eventmachine (1.2.7) - faker (3.2.1) + faker (3.2.2) i18n (>= 1.8.11, < 2) - faraday (2.7.10) + faraday (2.7.12) + base64 faraday-net_http (>= 2.0, < 3.1) ruby2_keywords (>= 0.0.4) faraday-net_http (3.0.2) @@ -200,7 +201,7 @@ GEM faye-websocket (0.11.3) eventmachine (>= 0.12.0) websocket-driver (>= 0.5.1) - ffi (1.15.5) + ffi (1.16.3) filesize (0.2.0) gssapi (1.3.1) ffi (>= 1.0.1) @@ -224,21 +225,21 @@ GEM jmespath (1.6.2) jsobfu (0.4.2) rkelly-remix - json (2.6.3) + json (2.7.1) little-plugger (1.1.4) logging (2.3.1) little-plugger (~> 1.1) multi_json (~> 1.14) - loofah (2.21.3) + loofah (2.22.0) crass (~> 1.0.2) nokogiri (>= 1.12.0) metasm (1.0.5) - metasploit-concern (5.0.1) + metasploit-concern (5.0.2) activemodel (~> 7.0) activesupport (~> 7.0) railties (~> 7.0) zeitwerk - metasploit-credential (6.0.5) + metasploit-credential (6.0.6) metasploit-concern metasploit-model metasploit_data_models (>= 5.0.0) @@ -248,12 +249,12 @@ GEM rex-socket rubyntlm rubyzip - metasploit-model (5.0.1) + metasploit-model (5.0.2) activemodel (~> 7.0) activesupport (~> 7.0) railties (~> 7.0) metasploit-payloads (2.0.159) - metasploit_data_models (6.0.2) + metasploit_data_models (6.0.3) activerecord (~> 7.0) activesupport (~> 7.0) arel-helpers @@ -265,26 +266,26 @@ GEM webrick metasploit_payloads-mettle (1.0.26) method_source (1.0.0) - mini_portile2 (2.8.4) - minitest (5.19.0) + mini_portile2 (2.8.5) + minitest (5.20.0) mqtt (0.6.0) msgpack (1.6.1) multi_json (1.15.0) mustermann (3.0.0) ruby2_keywords (~> 0.0.1) nessus_rest (0.1.6) - net-imap (0.3.7) + net-imap (0.4.7) date net-protocol net-ldap (0.18.0) - net-protocol (0.2.1) + net-protocol (0.2.2) timeout - net-smtp (0.3.3) + net-smtp (0.4.0) net-protocol net-ssh (7.2.0) network_interface (0.0.4) nexpose (7.3.0) - nio4r (2.5.9) + nio4r (2.7.0) nokogiri (1.14.5) mini_portile2 (~> 2.8.0) racc (~> 1.4) @@ -305,11 +306,11 @@ GEM hashery (~> 2.0) ruby-rc4 ttfunk - pg (1.5.3) - public_suffix (5.0.3) - puma (6.3.1) + pg (1.5.4) + public_suffix (5.0.4) + puma (6.4.0) nio4r (~> 2.0) - racc (1.7.1) + racc (1.7.3) rack (2.2.8) rack-protection (3.1.0) rack (~> 2.2, >= 2.2.4) @@ -322,77 +323,77 @@ GEM rails-html-sanitizer (1.6.0) loofah (~> 2.21) nokogiri (~> 1.14) - railties (7.0.7.2) - actionpack (= 7.0.7.2) - activesupport (= 7.0.7.2) + railties (7.0.8) + actionpack (= 7.0.8) + activesupport (= 7.0.8) method_source rake (>= 12.2) thor (~> 1.0) zeitwerk (~> 2.5) - rake (13.0.6) + rake (13.1.0) rasn1 (0.12.1) strptime (~> 0.2.5) rb-readline (0.5.5) recog (3.1.2) nokogiri redcarpet (3.6.0) - reline (0.3.8) + reline (0.4.1) io-console (~> 0.5) - rex-arch (0.1.14) + rex-arch (0.1.15) rex-text - rex-bin_tools (0.1.8) + rex-bin_tools (0.1.9) metasm rex-arch rex-core rex-struct2 rex-text rex-core (0.1.31) - rex-encoder (0.1.6) + rex-encoder (0.1.7) metasm rex-arch rex-text - rex-exploitation (0.1.38) + rex-exploitation (0.1.39) jsobfu metasm rex-arch rex-encoder rex-text rexml - rex-java (0.1.6) - rex-mime (0.1.7) + rex-java (0.1.7) + rex-mime (0.1.8) rex-text - rex-nop (0.1.2) + rex-nop (0.1.3) rex-arch - rex-ole (0.1.7) + rex-ole (0.1.8) rex-text - rex-powershell (0.1.98) + rex-powershell (0.1.99) rex-random_identifier rex-text ruby-rc4 - rex-random_identifier (0.1.10) + rex-random_identifier (0.1.11) rex-text - rex-registry (0.1.4) - rex-rop_builder (0.1.4) + rex-registry (0.1.5) + rex-rop_builder (0.1.5) metasm rex-core rex-text - rex-socket (0.1.52) + rex-socket (0.1.55) rex-core - rex-sslscan (0.1.9) + rex-sslscan (0.1.10) rex-core rex-socket rex-text - rex-struct2 (0.1.3) - rex-text (0.2.52) - rex-zip (0.1.4) + rex-struct2 (0.1.4) + rex-text (0.2.55) + rex-zip (0.1.5) rex-text rexml (3.2.6) rkelly-remix (0.0.7) ruby-macho (4.0.0) - ruby-mysql (4.0.0) + ruby-mysql (4.1.0) ruby-rc4 (0.1.5) ruby2_keywords (0.0.5) - ruby_smb (3.2.5) + ruby_smb (3.2.8) bindata openssl-ccm openssl-cmac @@ -410,7 +411,7 @@ GEM rack (~> 2.2, >= 2.2.4) rack-protection (= 3.1.0) tilt (~> 2.0) - sqlite3 (1.6.3) + sqlite3 (1.6.9) mini_portile2 (~> 2.8.0) sshkey (3.0.0) strptime (0.2.5) @@ -419,9 +420,9 @@ GEM daemons (~> 1.0, >= 1.0.9) eventmachine (~> 1.0, >= 1.0.4) rack (>= 1, < 3) - thor (1.2.2) - tilt (2.2.0) - timeout (0.4.0) + thor (1.3.0) + tilt (2.3.0) + timeout (0.4.1) ttfunk (1.7.0) tzinfo (2.0.6) concurrent-ruby (~> 1.0) @@ -429,7 +430,7 @@ GEM tzinfo (>= 1.0.0) unf (0.1.4) unf_ext - unf_ext (0.0.8.2) + unf_ext (0.0.9.1) unix-crypt (1.3.1) warden (1.2.9) rack (>= 2.0.9) @@ -453,7 +454,7 @@ GEM activesupport (>= 4.2, < 8.0) xmlrpc (0.3.3) webrick - zeitwerk (2.6.11) + zeitwerk (2.6.12) PLATFORMS ruby @@ -462,4 +463,4 @@ DEPENDENCIES metasploit-framework! BUNDLED WITH - 2.4.22 + 2.4.13 diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix index 842fc64b6440..6ba303d15983 100644 --- a/pkgs/tools/security/metasploit/default.nix +++ b/pkgs/tools/security/metasploit/default.nix @@ -15,13 +15,13 @@ let }; in stdenv.mkDerivation rec { pname = "metasploit-framework"; - version = "6.3.45"; + version = "6.3.46"; src = fetchFromGitHub { owner = "rapid7"; repo = "metasploit-framework"; rev = "refs/tags/${version}"; - hash = "sha256-vDTbuvMkudwV3rCEEwE62emXNSMgXR1XHyVB3sDN56Y="; + hash = "sha256-aKQfy4PRl+aOamvlutFX16c3b4qGcVLfOtA+l2bhAOo="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/tools/security/metasploit/gemset.nix index d6d0ced8a5d1..ebaf66de9b60 100644 --- a/pkgs/tools/security/metasploit/gemset.nix +++ b/pkgs/tools/security/metasploit/gemset.nix @@ -4,60 +4,60 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qamc5ly521wk9i1658h9jv7avmyyp92kffa1da2fn5zk0wgyhf4"; + sha256 = "1l319p0gipfgq8bp8dvbv97qqb72rad9zcqn5snhgv20cmpqr69b"; type = "gem"; }; - version = "7.0.7.2"; + version = "7.0.8"; }; actionview = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "151zxb61bb6q7g0sn34qz79k8bg02vmb8mmnsn0fr15lxw92dfhm"; + sha256 = "0xnpdwj1d8m6c2d90jp9cs50ggiz0jj02ls2h9lg68k4k8mnjbd2"; type = "gem"; }; - version = "7.0.7.2"; + version = "7.0.8"; }; activemodel = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1crjq1dznlbsrwd5yijxraz1591xmg4vdcwwnmrw4nh6hrwq5fj5"; + sha256 = "004w8zaz2g3y6lnrsvlcmljll0m3ndqpgwf0wfscgq6iysibiglm"; type = "gem"; }; - version = "7.0.7.2"; + version = "7.0.8"; }; activerecord = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "03vrssdqaqm41w27s21r37skdfxa41midvjy37i2zh3rnbnq8ps2"; + sha256 = "04wavps80q3pvhvfbmi4gs102y1p6mxbg8xylzvib35b6m92adpj"; type = "gem"; }; - version = "7.0.7.2"; + version = "7.0.8"; }; activesupport = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vlzcnyqlbchaq85phmdv73ydlc18xpvxy1cbsk191cwd29i7q32"; + sha256 = "188kbwkn1lbhz40ala8ykp20jzqphgc68g3d8flin8cqa2xid0s5"; type = "gem"; }; - version = "7.0.7.2"; + version = "7.0.8"; }; addressable = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05r1fwy487klqkya7vzia8hnklcxy4vr92m9dmni3prfwk6zpw33"; + sha256 = "0irbdwkkjwzajq1ip6ba46q49sxnrl2cw7ddkdhsfhb6aprnm3vr"; type = "gem"; }; - version = "2.8.5"; + version = "2.8.6"; }; afm = { groups = ["default"]; @@ -94,110 +94,120 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pyis1nvnbjxk12a43xvgj2gv0mvp4cnkc1gzw0v1018r61399gz"; + sha256 = "0gvdg4yx4p9av2glmp7vsxhs0n8fj1ga9kq2xdb8f95j7b04qhzi"; type = "gem"; }; - version = "1.2.0"; + version = "1.3.0"; }; aws-partitions = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0082fsywglghvam55i4jz7cj2vyd8hb8b7658cr9yqlwna9j1sp3"; + sha256 = "16n1d0bh3zy925y4f8flrnkfir2smsj0j31zslfaz6vf6cvi9qjs"; type = "gem"; }; - version = "1.811.0"; + version = "1.864.0"; }; aws-sdk-core = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xjw9cf6ldbw50xi5ric8d63r8kybpsvaqxh2v6n7374hfady73i"; + sha256 = "19nglxz49nlzgsvnivb3bdm17vxjn1ng2br8659xv48nzjrmyid3"; type = "gem"; }; - version = "3.181.0"; + version = "3.190.0"; }; aws-sdk-ec2 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1kl5b8m0ad2dxj2r0f5wkphfwhnpq820jbzrdmxyh20kivckv33c"; + sha256 = "1zyazx97nskgl9xzspg2q1rji02p2jv789v8qd1qz6hknz0z6r5f"; type = "gem"; }; - version = "1.402.0"; + version = "1.430.0"; }; aws-sdk-ec2instanceconnect = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1jbvh6v2kbybk1qjzhzrl82d7advh6hf3va9zyaxlrcijkz6jjg4"; + sha256 = "1iifrmdls17a3hniq43iyj9q4mr8iy0danqmy65xbh05bnqq2ca9"; type = "gem"; }; - version = "1.32.0"; + version = "1.36.0"; }; aws-sdk-iam = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02bp18pi29zncznkzkjzlg5j1cl99q41xvw0z5qx9q55mcwaj7i8"; + sha256 = "0whclpcvbdy7gzvqpk8734nxjfxs3362k197xl1wnrpixklkacyz"; type = "gem"; }; - version = "1.86.0"; + version = "1.92.0"; }; aws-sdk-kms = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zr5w2cjd895abyn7y5gifhq37bxcinssvdx2l1qmlkllbdxbwq0"; + sha256 = "1isrj19kzy9sb7a76a1c2n5x0d9lg1h2n7fp7cn13xjis0hpnlxj"; type = "gem"; }; - version = "1.71.0"; + version = "1.74.0"; }; aws-sdk-s3 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fbz259as60xnf563z9byp8blq5fsc81h92h3wicai4bmz45w4r5"; + sha256 = "0bnhpmi0iiaj88rqc5lhhnp2gyrk4fs8xz51lj36wwzng94qinya"; type = "gem"; }; - version = "1.134.0"; + version = "1.141.0"; }; aws-sdk-ssm = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "178nnrlpz5ihx5615i1mml7ymg2pklvfxxakhhwcjbys52cz6jsk"; + sha256 = "0xz10344dwm4pj8qnl19bnh99arxp7cd9mn2alslrnw7y2gipzz1"; type = "gem"; }; - version = "1.156.0"; + version = "1.162.0"; }; aws-sigv4 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0z889c4c1w7wsjm3szg64ay5j51kjl4pdf94nlr1yks2rlanm7na"; + sha256 = "1g3w27wzjy4si6kp49w10as6ml6g6zl3xrfqs5ikpfciidv9kpc4"; type = "gem"; }; - version = "1.6.0"; + version = "1.8.0"; + }; + base64 = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "01qml0yilb9basf7is2614skjp8384h2pycfx86cr8023arfj98g"; + type = "gem"; + }; + version = "0.2.0"; }; bcrypt = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "14crcsmcsyiskr9xzgzcfz2dr74zg1jvavrrxpf5vnn9q75fakz9"; + sha256 = "16a0g2q40biv93i1hch3gw8rbmhp77qnnifj1k0a6m7dng3zh444"; type = "gem"; }; - version = "3.1.19"; + version = "3.1.20"; }; bcrypt_pbkdf = { groups = ["default"]; @@ -224,10 +234,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vcg52gwl64xhhal6kwk1pc01y1klzdlnv1awyk89kb91z010x7q"; + sha256 = "0iqkzby0fdgi786m873nm0ckmc847wy9a4ydinb29m7hd3fs83kb"; type = "gem"; }; - version = "1.16.0"; + version = "1.17.0"; }; bson = { groups = ["default"]; @@ -304,10 +314,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "03skfikihpx37rc27vr3hwrb057gxnmdzxhmzd4bf4jpkl0r55w1"; + sha256 = "149jknsq999gnhy865n33fkk22s0r447k76x9pmcnnwldfv2q7wp"; type = "gem"; }; - version = "3.3.3"; + version = "3.3.4"; }; dnsruby = { groups = ["default"]; @@ -324,10 +334,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lcqjsmixjp52bnlgzh4lg9ppsk52x9hpwdjd53k8jnbah2602h0"; + sha256 = "1gpciaifmxql8h01ci12qq08dnqrdlzkkz6fmia9v9yc3r9a29si"; type = "gem"; }; - version = "0.5.20190701"; + version = "0.6.20231109"; }; ed25519 = { groups = ["default"]; @@ -384,20 +394,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ysiqlvyy1351bzx7h92r93a35s32l8giyf9bac6sgr142sh3cnn"; + sha256 = "1ic47k6f0q6xl9g2yxa3x60gfbwx98wnx75qnbhhgk0zc7a5ijhy"; type = "gem"; }; - version = "3.2.1"; + version = "3.2.2"; }; faraday = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "187clqhp9mv5mnqmjlfdp57svhsg1bggz84ak8v333j9skrnrgh9"; + sha256 = "19w1lzipnxs6vy3y0pw1mf956f768ppzgfrnlpwgrpnjjv9xqf7d"; type = "gem"; }; - version = "2.7.10"; + version = "2.7.12"; }; faraday-net_http = { groups = ["default"]; @@ -434,10 +444,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1862ydmclzy1a0cjbvm8dz7847d9rch495ib0zb64y84d3xd4bkg"; + sha256 = "1yvii03hcgqj30maavddqamqy50h7y6xcn2wcyq72wn823zl4ckd"; type = "gem"; }; - version = "1.15.5"; + version = "1.16.3"; }; filesize = { groups = ["default"]; @@ -584,10 +594,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0nalhin1gda4v8ybk6lq8f407cgfrj6qzn234yra4ipkmlbfmal6"; + sha256 = "0r9jmjhg2ly3l736flk7r2al47b5c8cayh0gqkq0yhjqzc9a6zhq"; type = "gem"; }; - version = "2.6.3"; + version = "2.7.1"; }; little-plugger = { groups = ["default"]; @@ -614,10 +624,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1p744kjpb5zk2ihklbykzii77alycjc04vpnm2ch2f3cp65imlj3"; + sha256 = "1zkjqf37v2d7s11176cb35cl83wls5gm3adnfkn2zcc61h3nxmqh"; type = "gem"; }; - version = "2.21.3"; + version = "2.22.0"; }; metasm = { groups = ["default"]; @@ -634,42 +644,42 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12qhihgrhlxcr8pss42blf9jx6sdwp85kg0790n6lf6knz9yi7yc"; + sha256 = "1w06rcr3fa4lq4dhq49b5wh6pd3lj6daf3mq3wmx5zzi4gv0mlic"; type = "gem"; }; - version = "5.0.1"; + version = "5.0.2"; }; metasploit-credential = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0pdfrbw8442aspvf4h691p542sgm6rj2xfl3bfc6rplmz82j1ay5"; + sha256 = "1nmh37pss5bsxjasl52pi9jxnzv75wacpnhrif5cprg6jxwn8dzl"; type = "gem"; }; - version = "6.0.5"; + version = "6.0.6"; }; metasploit-framework = { groups = ["default"]; platforms = []; source = { fetchSubmodules = false; - rev = "dd2f4b923912fc2ffc84d4a1d5e3bbccd5a8efc1"; - sha256 = "19p7rp0dwh953xbisp904csrgsfr780i715hvqaxrf94yfxdnd5w"; + rev = "f05bef8a949ac002f2a17308a55b7afa84ca5882"; + sha256 = "1sh0w5k9fgnh7bgm4wc6i9pkg9ypaz8vmrbbda7fd5yihg5iz938"; type = "git"; url = "https://github.com/rapid7/metasploit-framework"; }; - version = "6.3.45"; + version = "6.3.46"; }; metasploit-model = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01i35h3wl7qly2kx20f5r1x00grmfd5vnarjvi3qjjyy380qw793"; + sha256 = "0vn50jnvdanmqbjm9xmp0i4xwzc9g3c6g2c4b59i2bz47kwp1pi7"; type = "gem"; }; - version = "5.0.1"; + version = "5.0.2"; }; metasploit-payloads = { groups = ["default"]; @@ -686,10 +696,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07k32bv9qnxg9vcq29p0r6qcfrhwby3aydpir3z8a7h8iz17lz9i"; + sha256 = "1h22d30aviskjg1jm7a65jy5ynjpw92wg8hzv5mknhlbsv4dhzkm"; type = "gem"; }; - version = "6.0.2"; + version = "6.0.3"; }; metasploit_payloads-mettle = { groups = ["default"]; @@ -716,20 +726,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02mj8mpd6ck5gpcnsimx5brzggw5h5mmmpq2djdypfq16wcw82qq"; + sha256 = "1kl9c3kdchjabrihdqfmcplk3lq4cw1rr9f378y6q22qwy5dndvs"; type = "gem"; }; - version = "2.8.4"; + version = "2.8.5"; }; minitest = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jnpsbb2dbcs95p4is4431l2pw1l5pn7dfg3vkgb4ga464j0c5l6"; + sha256 = "0bkmfi9mb49m0fkdhl2g38i3xxa02d411gg0m8x0gvbwfmmg5ym3"; type = "gem"; }; - version = "5.19.0"; + version = "5.20.0"; }; mqtt = { groups = ["default"]; @@ -786,10 +796,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lf7wqg7czhaj51qsnmn28j7jmcxhkh3m28rl1cjrqsgjxhwj7r3"; + sha256 = "0541lfqaz46h8s3fks11vsd1iqzmgjjw3c0jp9agg92zblwj0axs"; type = "gem"; }; - version = "0.3.7"; + version = "0.4.7"; }; net-ldap = { groups = ["default"]; @@ -806,20 +816,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0dxckrlw4q1lcn3qg4mimmjazmg9bma5gllv72f8js3p36fb3b91"; + sha256 = "1a32l4x73hz200cm587bc29q8q9az278syw3x6fkc9d1lv5y0wxa"; type = "gem"; }; - version = "0.2.1"; + version = "0.2.2"; }; net-smtp = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1c6md06hm5bf6rv53sk54dl2vg038pg8kglwv3rayx0vk2mdql9x"; + sha256 = "1rx3758w0bmbr21s2nsc6llflsrnp50fwdnly3ixra4v53gbhzid"; type = "gem"; }; - version = "0.3.3"; + version = "0.4.0"; }; net-ssh = { groups = ["default"]; @@ -856,10 +866,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0w9978zwjf1qhy3amkivab0f9syz6a7k0xgydjidaf7xc831d78f"; + sha256 = "0xkjz56qc7hl7zy7i7bhiyw5pl85wwjsa4p70rj6s958xj2sd1lm"; type = "gem"; }; - version = "2.5.9"; + version = "2.7.0"; }; nokogiri = { dependencies = ["mini_portile2" "racc"]; @@ -967,40 +977,40 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zcvxmfa8hxkhpp59fhxyxy1arp70f11zi1jh9c7bsdfspifb7kb"; + sha256 = "0pfj771p5a29yyyw58qacks464sl86d5m3jxjl5rlqqw2m3v5xq4"; type = "gem"; }; - version = "1.5.3"; + version = "1.5.4"; }; public_suffix = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0n9j7mczl15r3kwqrah09cxj8hxdfawiqxa60kga2bmxl9flfz9k"; + sha256 = "1bni4qjrsh2q49pnmmd6if4iv3ak36bd2cckrs6npl111n769k9m"; type = "gem"; }; - version = "5.0.3"; + version = "5.0.4"; }; puma = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1x4dwx2shx0p7lsms97r85r7ji7zv57bjy3i1kmcpxc8bxvrr67c"; + sha256 = "1y8jcw80zcxvdq0id329lzmp5pzx7hpac227d7sgjkblc89s3pfm"; type = "gem"; }; - version = "6.3.1"; + version = "6.4.0"; }; racc = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "11v3l46mwnlzlc371wr3x6yylpgafgwdf0q7hc7c1lzx6r414r5g"; + sha256 = "01b9662zd2x9bp4rdjfid07h09zxj7kvn7f5fghbqhzc625ap1dp"; type = "gem"; }; - version = "1.7.1"; + version = "1.7.3"; }; rack = { groups = ["default"]; @@ -1057,20 +1067,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01pdn9sn7kawwrvrbr3vz44j287xbka8mm7nrv9cl510y8gzxi2x"; + sha256 = "0sfc16zrcn4jgf5xczb08n6prhmqqgg9f0b4mn73zlzg6cwmqchj"; type = "gem"; }; - version = "7.0.7.2"; + version = "7.0.8"; }; rake = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15whn7p9nrkxangbs9hh75q585yfn66lv0v2mhj6q6dl6x8bzr2w"; + sha256 = "1ilr853hawi09626axx0mps4rkkmxcs54mapz9jnqvpnlwd3wsmy"; type = "gem"; }; - version = "13.0.6"; + version = "13.1.0"; }; rasn1 = { groups = ["default"]; @@ -1117,30 +1127,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lv1nv7z63n4qmsm3h5h273m7daxngkcq8ynkk9j8lmn7jji98lb"; + sha256 = "1hi6zfj6zqzxcbamhjm9w9cswv62f76l8gsdfcnmhpw35cyxphh8"; type = "gem"; }; - version = "0.3.8"; + version = "0.4.1"; }; rex-arch = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gi9641869pg30ij7ba3r2z89flvdqsma4spbpww6c8ph62iy4bp"; + sha256 = "1gxjhiqdbh4ix76rqhaghzy1vsz22gcdfdwj9lqnfifibk7wabpa"; type = "gem"; }; - version = "0.1.14"; + version = "0.1.15"; }; rex-bin_tools = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0p5r2h0zaixdjhp9k0jq0vgsvbhifx2jh3p9pr2w80qda1hkgqgj"; + sha256 = "0hdkjv9g04d9k6mq1j9fxg9l6ifzym5i204majhzb9hqkfgslw5p"; type = "gem"; }; - version = "0.1.8"; + version = "0.1.9"; }; rex-core = { groups = ["default"]; @@ -1157,150 +1167,150 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15c2yqrvn3hxf6gn4cqrz2l65rdh68gbk2a7lwdq43nchfjnsnvg"; + sha256 = "1rlpxmw4amqf04vn14my6aim5iya0wh5gpi1hrvnqq9xnhkpk2qs"; type = "gem"; }; - version = "0.1.6"; + version = "0.1.7"; }; rex-exploitation = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1afz3qvdmaav542klxz2jwwgrayhw1lyrivmpfv5jk2c613cky3n"; + sha256 = "1pdr7zz9hm7bihq6055jjzdrklp7qn1m50ddr63ilr32wlgldjvh"; type = "gem"; }; - version = "0.1.38"; + version = "0.1.39"; }; rex-java = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0g8xdj7ij4y51wgh6l29al6i107bqn6pwql6za7ahms75m8s9dys"; + sha256 = "1ynqlq1xqnw9asqnkszbjds972xm98fz92yq5ywrxz7p3x66ybbp"; type = "gem"; }; - version = "0.1.6"; + version = "0.1.7"; }; rex-mime = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00qpd5i8naw601q6aij652gw8x6my5d5drf63lq9fridjrqj0nja"; + sha256 = "0gi2xidygk6j7zwml6225d221bc3s7n2if5g1v1w45ksl19499b3"; type = "gem"; }; - version = "0.1.7"; + version = "0.1.8"; }; rex-nop = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0yjlmgmaaa65lkd6jrm71g8yfn8xy91jl07nd1v90xp9jrzrrl92"; + sha256 = "1vavmdzv5aw20izhrbf2f180dwvrraw8i9bh4yz5gsapjizcqrhy"; type = "gem"; }; - version = "0.1.2"; + version = "0.1.3"; }; rex-ole = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rlsy1a4lig7iqvb4zn60fpf125v8k4bjrjzakks74prjb2qmqnp"; + sha256 = "0vbiqg120gqd0kfa7kw2jg4jy4y2favsm6kqvysxfjfwp6vfycl6"; type = "gem"; }; - version = "0.1.7"; + version = "0.1.8"; }; rex-powershell = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09bsf88faglr04ag71cplyhhmy7drp1cqs2dqq77m7q8w1ibk8rj"; + sha256 = "0kvzw1fnj05cwbczajclwnpv60zky48hjc5svckapfgx8c5mi69f"; type = "gem"; }; - version = "0.1.98"; + version = "0.1.99"; }; rex-random_identifier = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "11gdz9n44jlhq1w5swq63705gliwjc7jg7avgprgw2j4sscnypjp"; + sha256 = "1qxc05f0xvradyp50vz8s1h9lzgh9c31nz8yq7r22bph03v71f0c"; type = "gem"; }; - version = "0.1.10"; + version = "0.1.11"; }; rex-registry = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09b6jhcih4srrh0j52v49vbffqz8ngki6qpmq9b2wdabqnw63d1v"; + sha256 = "1sbcs0lkl8b57d5xdlfffrpwxpvvwfcfbgzqc9p7xgmqb1xl2s62"; type = "gem"; }; - version = "0.1.4"; + version = "0.1.5"; }; rex-rop_builder = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ssynxq3kc86v3xnc6jx8pg5zh13q61wl2klqbi9hzn2n8lhdgvj"; + sha256 = "1gbc9sssyzbq1s2nk0ajc9y0x4v10cp4za4f4gbssrjw4d3zf9dl"; type = "gem"; }; - version = "0.1.4"; + version = "0.1.5"; }; rex-socket = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0b8pymg7c6yjb2jc73sky917rdq2kmn9cwxlhm7703yc3y1fyj2x"; + sha256 = "0qs8fq14ivhnhssq966ikxdis864gw80pfbxllbs35v0njw46nj3"; type = "gem"; }; - version = "0.1.52"; + version = "0.1.55"; }; rex-sslscan = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lgwadsmdwdkv9irxlvrc2x0wh1c1r1b9254blpc797ksh5qm4l1"; + sha256 = "0plcz9jwpg1yw206ljky3mk6dk31j24jdmcpnky5k9m2npsp0jlf"; type = "gem"; }; - version = "0.1.9"; + version = "0.1.10"; }; rex-struct2 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hp8yv55j995dl587hismwa7ydyprs03c75gia6rwp7v5bhshy4n"; + sha256 = "1p6afmicm1adlngp196604rrgb1nsly10y8nphva5h5vncismscz"; type = "gem"; }; - version = "0.1.3"; + version = "0.1.4"; }; rex-text = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xibdr82pr0p4h7jixf4r56y70rqzda5287bv3mw43r9vwsi949f"; + sha256 = "1finkvvmxa654mldx1vqpnl9w1xvjp0s7lyb7qjymlphvbj3mi40"; type = "gem"; }; - version = "0.2.52"; + version = "0.2.55"; }; rex-zip = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0azm4g4dm9k6vrav769vn0gffrv7pgxknlj4dr9yav632920cvqj"; + sha256 = "15jjb3ldndi9p5x7pb3dllkrm4cy3p7dccy4rxz0vh5m4vlqbhsd"; type = "gem"; }; - version = "0.1.4"; + version = "0.1.5"; }; rexml = { groups = ["default"]; @@ -1337,10 +1347,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1sh12qscqrc1ihgy7734r4vrg9kzd9lifwsfk4n1r5i4gv5q0jd2"; + sha256 = "1g6wcnzqsbqg2q1lfbhlz4z9rq306az2xx8kk8dnr60dziy1a5b5"; type = "gem"; }; - version = "4.0.0"; + version = "4.1.0"; }; ruby-rc4 = { groups = ["default"]; @@ -1367,10 +1377,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "075ib787qp2g0ghx0pww76ff843l09y5d5h1x63zbnxzm3q3v4dz"; + sha256 = "199szf6px6lxpxbig57xsy6phg7jka0w3psyhmfrp3gdcv7f851w"; type = "gem"; }; - version = "3.2.5"; + version = "3.2.8"; }; rubyntlm = { groups = ["default"]; @@ -1423,15 +1433,14 @@ version = "3.1.0"; }; sqlite3 = { - dependencies = ["mini_portile2"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0h95kr5529qv786mfk8r2jjdsdi6v7v3k3dpz69mrcc9i0vpdd37"; + sha256 = "08irz5llz31im8pmkk5k0kw433jyyji1qa98xkdmpphncdjr38am"; type = "gem"; }; - version = "1.6.3"; + version = "1.6.9"; }; sshkey = { groups = ["default"]; @@ -1478,30 +1487,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0k7j2wn14h1pl4smibasw0bp66kg626drxb59z7rzflch99cd4rg"; + sha256 = "1hx77jxkrwi66yvs10wfxqa8s25ds25ywgrrf66acm9nbfg7zp0s"; type = "gem"; }; - version = "1.2.2"; + version = "1.3.0"; }; tilt = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bmjgbv8158klwp2r3klxjwaj93nh1sbl4xvj9wsha0ic478avz7"; + sha256 = "0p3l7v619hwfi781l3r7ypyv1l8hivp09r18kmkn6g11c4yr1pc2"; type = "gem"; }; - version = "2.2.0"; + version = "2.3.0"; }; timeout = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1d9cvm0f4zdpwa795v3zv4973y5zk59j7s1x3yn90jjrhcz1yvfd"; + sha256 = "16mvvsmx90023wrhf8dxc1lpqh0m8alk65shb7xcya6a9gflw7vg"; type = "gem"; }; - version = "0.4.0"; + version = "0.4.1"; }; ttfunk = { groups = ["default"]; @@ -1548,10 +1557,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yj2nz2l101vr1x9w2k83a0fag1xgnmjwp8w8rw4ik2rwcz65fch"; + sha256 = "1sf6bxvf6x8gihv6j63iakixmdddgls58cpxpg32chckb2l18qcj"; type = "gem"; }; - version = "0.0.8.2"; + version = "0.0.9.1"; }; unix-crypt = { groups = ["default"]; @@ -1658,9 +1667,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mwdd445w63khz13hpv17m2br5xngyjl3jdj08xizjbm78i2zrxd"; + sha256 = "1gir0if4nryl1jhwi28669gjwhxb7gzrm1fcc8xzsch3bnbi47jn"; type = "gem"; }; - version = "2.6.11"; + version = "2.6.12"; }; } diff --git a/pkgs/tools/security/metasploit/update.sh b/pkgs/tools/security/metasploit/update.sh index ba41b78c0e8d..45f820d7870a 100755 --- a/pkgs/tools/security/metasploit/update.sh +++ b/pkgs/tools/security/metasploit/update.sh @@ -13,5 +13,8 @@ bundler install bundix sed -i '/[ ]*dependencies =/d' gemset.nix +# Hacks +sed -i 's/nokogiri = {/nokogiri = {\n dependencies = ["mini_portile2" "racc"];/g' gemset.nix + cd "../../../../" nix-update metasploit --version "$latest" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4f3ef401937f..14775a8a9fc4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6117,8 +6117,6 @@ with pkgs; nfstrace = callPackage ../tools/networking/nfstrace { }; - nix-direnv = callPackage ../tools/misc/nix-direnv { }; - nixel = callPackage ../tools/nix/nixel { }; nix-output-monitor = callPackage ../tools/nix/nix-output-monitor { }; @@ -31603,7 +31601,7 @@ with pkgs; fluxus = callPackage ../applications/graphics/fluxus { stdenv = gcc10StdenvCompat; }; - flwrap = callPackage ../applications/radio/flwrap { stdenv = gcc10StdenvCompat; }; + flwrap = callPackage ../applications/radio/flwrap { }; fluidsynth = callPackage ../applications/audio/fluidsynth { inherit (darwin.apple_sdk.frameworks) AppKit AudioUnit CoreAudio CoreMIDI CoreServices; diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index d418686925d8..c424226f76b9 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -476,6 +476,7 @@ lib.makeScope pkgs.newScope (self: with self; { lib.optional (!stdenv.isDarwin && lib.meta.availableOn stdenv.hostPlatform valgrind) valgrind.dev; + configureFlags = lib.optional php.ztsSupport "--disable-opcache-jit"; zendExtension = true; postPatch = lib.optionalString stdenv.isDarwin '' # Tests are flaky on darwin diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7c8d4d8301c0..19ea0e6cdab5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -955,6 +955,8 @@ self: super: with self; { avea = callPackage ../development/python-modules/avea { }; + avidtools = callPackage ../development/python-modules/avidtools { }; + avion = callPackage ../development/python-modules/avion { }; avro3k = callPackage ../development/python-modules/avro3k { }; @@ -8424,6 +8426,8 @@ self: super: with self; { nvchecker = callPackage ../development/python-modules/nvchecker { }; + nvdlib = callPackage ../development/python-modules/nvdlib { }; + nvidia-ml-py = callPackage ../development/python-modules/nvidia-ml-py { }; nsz = callPackage ../development/python-modules/nsz { }; @@ -16205,6 +16209,8 @@ self: super: with self; { youseedee = callPackage ../development/python-modules/youseedee { }; + youtokentome = callPackage ../development/python-modules/youtokentome { }; + youtube-dl = callPackage ../tools/misc/youtube-dl { }; youtube-dl-light = callPackage ../tools/misc/youtube-dl { |