diff --git a/nixos/modules/services/display-managers/cosmic-greeter.nix b/nixos/modules/services/display-managers/cosmic-greeter.nix index 53fd3ace5f31..8886a4766e4e 100644 --- a/nixos/modules/services/display-managers/cosmic-greeter.nix +++ b/nixos/modules/services/display-managers/cosmic-greeter.nix @@ -24,6 +24,11 @@ in }; config = lib.mkIf cfg.enable { + environment.systemPackages = [ + pkgs.cosmic-comp + cfg.package + ]; + services.greetd = { enable = true; settings = { @@ -50,14 +55,22 @@ in }; }; + systemd.tmpfiles.settings.cosmic-greeter."/run/cosmic-greeter".d = { + group = "cosmic-greeter"; + mode = "0755"; + user = "cosmic-greeter"; + }; + # The greeter user is hardcoded in `cosmic-greeter` users.groups.cosmic-greeter = { }; users.users.cosmic-greeter = { description = "COSMIC login greeter user"; isSystemUser = true; home = "/var/lib/cosmic-greeter"; + homeMode = "0750"; createHome = true; group = "cosmic-greeter"; + extraGroups = [ "video" ]; }; # Required for authentication security.pam.services.cosmic-greeter = { }; diff --git a/nixos/modules/services/web-apps/lasuite-meet.nix b/nixos/modules/services/web-apps/lasuite-meet.nix index c1f1007c2886..32fe78e29647 100644 --- a/nixos/modules/services/web-apps/lasuite-meet.nix +++ b/nixos/modules/services/web-apps/lasuite-meet.nix @@ -187,7 +187,7 @@ in settings = mkOption { type = types.submodule { - freeformType = types.attrsOf ( + freeformType = types.lazyAttrsOf ( types.nullOr ( types.oneOf [ types.str diff --git a/pkgs/applications/editors/emacs/make-emacs.nix b/pkgs/applications/editors/emacs/make-emacs.nix index 8a4ed7645b1c..bace8a010ee1 100644 --- a/pkgs/applications/editors/emacs/make-emacs.nix +++ b/pkgs/applications/editors/emacs/make-emacs.nix @@ -79,7 +79,7 @@ withGTK3 ? withPgtk && !noGui, withGlibNetworking ? withPgtk || withGTK3 || (withX && withXwidgets), withGpm ? stdenv.hostPlatform.isLinux, - # https://github.com/emacs-mirror/emacs/blob/master/etc/NEWS.27#L140-L142 + # https://github.com/emacs-mirror/emacs/blob/emacs-27.2/etc/NEWS#L118-L120 withImageMagick ? false, # Emacs 30+ has native JSON support withJansson ? lib.versionOlder version "30", diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 668439c1fa8b..bbcfb770a430 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -3758,6 +3758,8 @@ let }; }; + prince781.vala = callPackage ./prince781.vala { }; + prisma.prisma = buildVscodeMarketplaceExtension { mktplcRef = { name = "prisma"; diff --git a/pkgs/applications/editors/vscode/extensions/prince781.vala/default.nix b/pkgs/applications/editors/vscode/extensions/prince781.vala/default.nix new file mode 100644 index 000000000000..f59d515ff568 --- /dev/null +++ b/pkgs/applications/editors/vscode/extensions/prince781.vala/default.nix @@ -0,0 +1,26 @@ +{ + lib, + vala-language-server, + vscode-utils, +}: + +vscode-utils.buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vala"; + publisher = "prince781"; + version = "1.1.0"; + hash = "sha256-LJJDKhwzbGznyiXeB8SYir3LOM7/quYhGae1m4X/s3M="; + }; + + nativeBuildInputs = [ + vala-language-server + ]; + + meta = { + changelog = "https://marketplace.visualstudio.com/items/prince781.vala/changelog"; + description = "Syntax highlighting and language support for the Vala / Genie languages"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=prince781.vala"; + homepage = "https://github.com/vala-lang/vala-vscode#readme"; + license = lib.licenses.mit; + }; +} diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index 33233d472357..0197aa8e1c30 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -73,6 +73,9 @@ python3.pkgs.buildPythonApplication rec { lib.optionals enableQt [ pyqt6 ]; + disabledTestPaths = lib.optionals (!enableQt) [ + "tests/test_qml_types.py" + ]; postPatch = if enableQt then diff --git a/pkgs/applications/networking/browsers/chromium/info.json b/pkgs/applications/networking/browsers/chromium/info.json index 75ffb191aa66..e3625b7fdca0 100644 --- a/pkgs/applications/networking/browsers/chromium/info.json +++ b/pkgs/applications/networking/browsers/chromium/info.json @@ -1,10 +1,10 @@ { "chromium": { - "version": "141.0.7390.65", + "version": "141.0.7390.76", "chromedriver": { - "version": "141.0.7390.66", - "hash_darwin": "sha256-0LLARLPwlZ3KB5xCq4Yx5S6vtnhVddJ62IdgEy0vp7o=", - "hash_darwin_aarch64": "sha256-rLW5FOMNyFEn1Du2VN2sGfWri2erjN7SENa01vA2Vp8=" + "version": "141.0.7390.77", + "hash_darwin": "sha256-lLzkO+PkVPZsnD00Ag/NSmpe7DbYPxHEQgsgqpvFijs=", + "hash_darwin_aarch64": "sha256-py6zFm8HhmijU6Z3SP8FO6w/DIIMVyP51jOPpqme0YE=" }, "deps": { "depot_tools": { @@ -21,8 +21,8 @@ "DEPS": { "src": { "url": "https://chromium.googlesource.com/chromium/src.git", - "rev": "b2ec783d2b51a396804a4e3e33f6586be09a4e2d", - "hash": "sha256-9jZ7411NThelyL0R5yoLXB0lOkydOI3v6K5ORhjqfF4=", + "rev": "d6fcfbb51aac4df61d06692d4a62fd8b9aaf3c3a", + "hash": "sha256-PefndHEz3LALHSCsw6tuNiobQVzsTrseUmf4lqnpNpM=", "recompress": true }, "src/third_party/clang-format/script": { diff --git a/pkgs/by-name/av/avalonia/deps.json b/pkgs/by-name/av/avalonia/deps.json index 901ad6a16a61..a4594c6e3f8f 100644 --- a/pkgs/by-name/av/avalonia/deps.json +++ b/pkgs/by-name/av/avalonia/deps.json @@ -289,11 +289,6 @@ "version": "16.9.0", "hash": "sha256-/LclaFA/8uKIWg0Diw2kD/k0o5y2tKFA/HzzrAFQ+b4=" }, - { - "pname": "Microsoft.Build.Tasks.Git", - "version": "1.1.1", - "hash": "sha256-PHxHmsCty8Si5dCUQSizeHkJrHa9+j2nRsg6Sz+5Za0=" - }, { "pname": "Microsoft.Build.Traversal", "version": "4.1.0", @@ -785,16 +780,6 @@ "version": "3.3.18", "hash": "sha256-zisaNDp0uHprZmhTokn/Gsr0bBzkiC3gcEls0jGJ0ho=" }, - { - "pname": "Microsoft.SourceLink.Common", - "version": "1.1.1", - "hash": "sha256-b4FaNFneDVDbvJVX1iNyhhLTrnxUfnmyypeJr47GbXY=" - }, - { - "pname": "Microsoft.SourceLink.GitHub", - "version": "1.1.1", - "hash": "sha256-3hc9ym5ReONp00ruCKio/Ka1gYXo/jDlUHtfK1wZPiU=" - }, { "pname": "Microsoft.TestPlatform.ObjectModel", "version": "17.10.0", diff --git a/pkgs/by-name/av/avalonia/npm-deps.nix b/pkgs/by-name/av/avalonia/npm-deps.nix index c7380c7fc911..c6a3e3c95635 100644 --- a/pkgs/by-name/av/avalonia/npm-deps.nix +++ b/pkgs/by-name/av/avalonia/npm-deps.nix @@ -9,6 +9,6 @@ } { path = "src/Browser/Avalonia.Browser/webapp"; - hash = "sha256-aHF2enlIpeBi3a7rN0nBI24eztxC4nZC+g+4sRc12b4="; + hash = "sha256-ublhqSpTJUgb6XKdHBnjPpgw7GXs57jlWSJNgqbdR78="; } ] diff --git a/pkgs/by-name/av/avalonia/package.nix b/pkgs/by-name/av/avalonia/package.nix index 93918899894f..bf3cdef4efb5 100644 --- a/pkgs/by-name/av/avalonia/package.nix +++ b/pkgs/by-name/av/avalonia/package.nix @@ -46,14 +46,14 @@ stdenvNoCC.mkDerivation ( } rec { pname = "Avalonia"; - version = "11.3.6"; + version = "11.3.7"; src = fetchFromGitHub { owner = "AvaloniaUI"; repo = "Avalonia"; tag = version; fetchSubmodules = true; - hash = "sha256-ulGaYlhWxSWKLMh6Hy6gzFuDl4rmF3NDlcAL12YYtAg="; + hash = "sha256-ZzMb8GGdEQsn4me3AewRJsBxGJ6M/dZ+mlQOYY3xaKs="; }; patches = [ diff --git a/pkgs/by-name/cc/ccls/package.nix b/pkgs/by-name/cc/ccls/package.nix index 5e40d5fc0f40..2ee8eb19e5f9 100644 --- a/pkgs/by-name/cc/ccls/package.nix +++ b/pkgs/by-name/cc/ccls/package.nix @@ -3,7 +3,7 @@ stdenv, fetchFromGitHub, cmake, - llvmPackages, + llvmPackages_19, rapidjson, runtimeShell, }: @@ -21,9 +21,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake - llvmPackages.llvm.dev + llvmPackages_19.llvm.dev ]; - buildInputs = with llvmPackages; [ + buildInputs = with llvmPackages_19; [ libclang llvm rapidjson @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { cmakeFlagsArray+=(-DCMAKE_CXX_FLAGS="-fvisibility=hidden -fno-rtti") ''; - clang = llvmPackages.clang; + clang = llvmPackages_19.clang; shell = runtimeShell; postFixup = '' diff --git a/pkgs/by-name/ch/chromaprint/package.nix b/pkgs/by-name/ch/chromaprint/package.nix index d0c7fe4bbef4..89674dc9f6a0 100644 --- a/pkgs/by-name/ch/chromaprint/package.nix +++ b/pkgs/by-name/ch/chromaprint/package.nix @@ -53,6 +53,10 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ (lib.cmakeBool "BUILD_EXAMPLES" withExamples) (lib.cmakeBool "BUILD_TOOLS" withTools) + ] + ++ lib.optionals (!finalAttrs.finalPackage.doCheck) [ + # special-cased to avoid a mass-rebuild: remove from `lib.optionals` as part of next update + (lib.cmakeBool "BUILD_TESTS" finalAttrs.finalPackage.doCheck) ]; passthru = { diff --git a/pkgs/by-name/co/cosmic-greeter/package.nix b/pkgs/by-name/co/cosmic-greeter/package.nix index a66a3ac5a144..77ef71a8dace 100644 --- a/pkgs/by-name/co/cosmic-greeter/package.nix +++ b/pkgs/by-name/co/cosmic-greeter/package.nix @@ -14,6 +14,7 @@ xkeyboard_config, nix-update-script, nixosTests, + orca, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -47,6 +48,7 @@ rustPlatform.buildRustPackage (finalAttrs: { libinput linux-pam udev + orca ]; dontUseJustBuild = true; @@ -63,10 +65,12 @@ rustPlatform.buildRustPackage (finalAttrs: { postPatch = '' substituteInPlace src/greeter.rs --replace-fail '/usr/bin/env' '${lib.getExe' coreutils "env"}' + substituteInPlace src/greeter.rs --replace-fail '/usr/bin/orca' '${lib.getExe orca}' ''; preFixup = '' libcosmicAppWrapperArgs+=( + --prefix PATH : ${lib.makeBinPath [ cosmic-randr ]} --set-default X11_BASE_RULES_XML ${xkeyboard_config}/share/X11/xkb/rules/base.xml --set-default X11_BASE_EXTRA_RULES_XML ${xkeyboard_config}/share/X11/xkb/rules/extra.xml ) diff --git a/pkgs/by-name/de/dependabot-cli/package.nix b/pkgs/by-name/de/dependabot-cli/package.nix index f148ba5dacef..9e4f43601691 100644 --- a/pkgs/by-name/de/dependabot-cli/package.nix +++ b/pkgs/by-name/de/dependabot-cli/package.nix @@ -12,20 +12,20 @@ }: let pname = "dependabot-cli"; - version = "1.74.0"; + version = "1.76.0"; # `tag` is what `dependabot` uses to find the relevant docker images. tag = "nixpkgs-dependabot-cli-${version}"; # Get these hashes from # nix run nixpkgs#nix-prefetch-docker -- --image-name ghcr.io/github/dependabot-update-job-proxy/dependabot-update-job-proxy --image-tag latest --final-image-name dependabot-update-job-proxy --final-image-tag ${tag} - updateJobProxy.imageDigest = "sha256:05539969894efd6f5d04c9c633f330cc61a3024106b19361d6684850258e4f0f"; - updateJobProxy.hash = "sha256-qhHkL1HmCz0o3JIBAevWnTkidtoH92wE2GyzYTFhVyY="; + updateJobProxy.imageDigest = "sha256:42b2a171891f4667d9a443cbfdc5f10a58e5b5d7f1b9eae6c12ec9815bec72fd"; + updateJobProxy.hash = "sha256-+GcGyip8cgVBZeji6Zn3oN8Mc3xZvASohbPVNUbHOgA="; # Get these hashes from # nix run nixpkgs#nix-prefetch-docker -- --image-name ghcr.io/dependabot/dependabot-updater-github-actions --image-tag latest --final-image-name dependabot-updater-github-actions --final-image-tag ${tag} - updaterGitHubActions.imageDigest = "sha256:7424e2a837d3bee8c49ddabf8d0152e9d5e87eac6cf67edb684f5e9f7895cff3"; - updaterGitHubActions.hash = "sha256-75qJjwYEkpKP1Gs87odBsiLXTZhQ0KvaOpBB+YFZkJY="; + updaterGitHubActions.imageDigest = "sha256:d26d4ce071684b63d935c550552ae0d129f845254cb1e2f8635f15c62f43319e"; + updaterGitHubActions.hash = "sha256-21E8q1+cwYlD8FL5njGhpsGRd/YkGQNS/y0howQFp6g="; in buildGoModule { inherit pname version; @@ -34,10 +34,10 @@ buildGoModule { owner = "dependabot"; repo = "cli"; rev = "v${version}"; - hash = "sha256-h1qnyH9M37kWFeET31KFKNn+RnnE7FRcaKADDDtxSdw="; + hash = "sha256-fSb2zzddwGJ1r9NhPEhE1WCndyoBK4VLOP3CmQUcjy0="; }; - vendorHash = "sha256-Tq+mHd/5LkBkqEXvZ98SRTdA6IsCdUPril+AmPQZfdI="; + vendorHash = "sha256-xdouoPEPPhHcXNWxMdcdxVQsgRlFXBXjyZQ7CcROA4U="; ldflags = [ "-s" diff --git a/pkgs/by-name/ed/ed-odyssey-materials-helper/deps.json b/pkgs/by-name/ed/ed-odyssey-materials-helper/deps.json index bcffd1a9c494..125341926c7d 100644 --- a/pkgs/by-name/ed/ed-odyssey-materials-helper/deps.json +++ b/pkgs/by-name/ed/ed-odyssey-materials-helper/deps.json @@ -505,10 +505,10 @@ "module": "sha256-2jn02k/u133+ELmAnVyysvO0Ra6nG2nhUjKkJpiThzs=", "pom": "sha256-chJrr7gKEse1WFJNCRkj5pYSODxHQay34Aw1ybBUazQ=" }, - "io/sentry#sentry/8.20.0": { - "jar": "sha256-G5KZBtERVbA9gwY1XrEGlWL2elwljF0R0h0vnT1GMbQ=", - "module": "sha256-b0XfKu8KxMoppcQye5sR6eCsVc1Neh3t52K5PtrLFe4=", - "pom": "sha256-Qtrqy+K+8NqVqkWbSLhZ+7nYfbYMswEgWCmRP4VJwkA=" + "io/sentry#sentry/8.22.0": { + "jar": "sha256-7QJzzosBRsvyeZkmkyqLWXiAlUkABQcC646p8eM6GOE=", + "module": "sha256-5ZOJtyrsJgmO9B7sNS7xLKh945o/o3sWdyKisjW5Zr8=", + "pom": "sha256-9wniVOh/5PhDESS1X9IEwhgiBqrl5PVCFINpVIr9HBE=" }, "jakarta/json/bind#jakarta.json.bind-api/2.0.0": { "jar": "sha256-peYGtYiLQStIkHrWiLNN/k4wroGJxvJ8wEkbjzwDYoc=", diff --git a/pkgs/by-name/ed/ed-odyssey-materials-helper/package.nix b/pkgs/by-name/ed/ed-odyssey-materials-helper/package.nix index e9aa6d571cf9..38b9eade1aec 100644 --- a/pkgs/by-name/ed/ed-odyssey-materials-helper/package.nix +++ b/pkgs/by-name/ed/ed-odyssey-materials-helper/package.nix @@ -21,13 +21,13 @@ let in stdenv.mkDerivation rec { pname = "ed-odyssey-materials-helper"; - version = "3.0.6"; + version = "3.0.7"; src = fetchFromGitHub { owner = "jixxed"; repo = "ed-odyssey-materials-helper"; tag = version; - hash = "sha256-4VxaQF1kmBo/9M0psr7jvshy1XhS02zUSMSuWvyEcoo="; + hash = "sha256-TcRj+TZ4shY1UAE7TseRXZZJZtL8aaD79pBL9LeoMJA="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/fo/foxglove-studio/package.nix b/pkgs/by-name/fo/foxglove-studio/package.nix new file mode 100644 index 000000000000..f3b8479644af --- /dev/null +++ b/pkgs/by-name/fo/foxglove-studio/package.nix @@ -0,0 +1,94 @@ +{ + stdenv, + lib, + fetchurl, + dpkg, + autoPatchelfHook, + makeDesktopItem, + makeWrapper, + copyDesktopItems, + alsa-lib, + at-spi2-core, + gtk3, + libGL, + libappindicator, + libdrm, + libgbm, + libnotify, + libxcb, + nss, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "foxglove-studio"; + version = "2.37.0"; + + src = fetchurl { + url = "https://get.foxglove.dev/desktop/v${finalAttrs.version}/foxglove-studio-${finalAttrs.version}-linux-amd64.deb"; + hash = "sha256-XY+RclsP8uQS5aKe1FopdItAjbQ9uWQ8uVD9pb9n42U="; + }; + + nativeBuildInputs = [ + autoPatchelfHook + copyDesktopItems + dpkg + makeWrapper + ]; + + buildInputs = [ + alsa-lib + at-spi2-core + gtk3 + libGL + libappindicator + libdrm + libgbm + libnotify + libxcb + nss + ]; + + installPhase = '' + runHook preInstall + mkdir -p $out/{bin,opt,share} + + cp -r opt/Foxglove $out/opt/ + cp -r usr/share/icons $out/share/ + cp -r usr/share/mime $out/share/ + + ln -s "$out/opt/Foxglove/foxglove-studio" $out/bin/foxglove-studio + + runHook postInstall + ''; + + preFixup = ''patchelf --add-needed libGL.so.1 --add-needed libEGL.so.1 $out/opt/Foxglove/foxglove-studio''; + + passthru.updateScript = ./update.sh; + + desktopItems = [ + (makeDesktopItem { + name = "foxglove-studio"; + desktopName = "Foxglove Studio"; + comment = "Integrated robotics visualization and debugging"; + exec = "foxglove-studio %U"; + icon = "foxglove-studio"; + categories = [ "Development" ]; + mimeTypes = [ + "application/octet-stream" + "application/zip" + "x-scheme-handler/foxglove" + ]; + }) + ]; + + meta = { + changelog = "https://docs.foxglove.dev/changelog/foxglove/v${finalAttrs.version}"; + description = "Visualization and observability platform for robotics"; + downloadPage = "https://foxglove.dev/download"; + homepage = "https://foxglove.dev/"; + license = lib.licenses.unfree; + maintainers = with lib.maintainers; [ sascha8a ]; + platforms = [ "x86_64-linux" ]; + hydraPlatforms = [ ]; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + }; +}) diff --git a/pkgs/by-name/fo/foxglove-studio/update.sh b/pkgs/by-name/fo/foxglove-studio/update.sh new file mode 100755 index 000000000000..d95bb4f04964 --- /dev/null +++ b/pkgs/by-name/fo/foxglove-studio/update.sh @@ -0,0 +1,17 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl common-updater-scripts + +set -eu -o pipefail + +changelog_url="https://docs.foxglove.dev/changelog/tags/foxglove" + +# Extract the latest version from the changelog page +version=$( + curl -s "$changelog_url" \ + | grep 'Downloads: ' \ + | grep 'writepage to writepages - (fetchpatch { - url = "https://gerrit.openafs.org/changes/16437/revisions/fd33425820589ed52dc712df63ea8d4b5944de87/patch"; - decode = "base64 -d"; - hash = "sha256-B011gge+vzGeUxkGOkKoK/jZn16pvGGc8DpAzzbjV+8="; + url = "https://github.com/openafs/openafs/commit/691e90fa1c58d9afb2e26fe6b9022329364ac048.patch"; + hash = "sha256-r+dbeJsf7DQ6E0szm5PjpYKz4Ity2tcSxgub0aG9UsU="; }) # Linux: Use __readahead_folio (fetchpatch { - url = "https://gerrit.openafs.org/changes/16438/revisions/8a2cbf0ba08097de4b8ab0c57fe2fddf83739b9b/patch"; - decode = "base64 -d"; - hash = "sha256-MDb7vOekq/lwBgELMq+VfuvAXiHQmd0vp04ToqIm3lI="; + url = "https://github.com/openafs/openafs/commit/c226a7073270f6f8669581dd31ce787905cc0ded.patch"; + hash = "sha256-OXA0iF7uITUZr5fymXF62XiZhaz3WHZqcvkg2hVTuTI="; }) # Linux: Rename page->index to page->__folio_index (fetchpatch { - url = "https://gerrit.openafs.org/changes/16439/revisions/9a5596a25618f153be7ae7eb17f29f3b7752d863/patch"; + url = "https://github.com/openafs/openafs/commit/3e57d358defc12eb573331b2ca9940abedf93f4f.patch"; + hash = "sha256-J8d6u+7H1HW3xi1nQCEfLJihyLIaJVMvbxFAT++jdX8="; + }) + # linux: convert aops->writepage to writepages + (fetchpatch { + url = "https://github.com/openafs/openafs/commit/a31b416054f7e5de2188ecfb1e59fe7223921197.patch"; + hash = "sha256-RSXganheuV8GW0/KuwQyIwac4cBMgiNWc5u5oCfr5Wc="; + }) + # Linux: Use struct kiocb * for aops write_begin/end + (fetchpatch { + url = "https://gerrit.openafs.org/changes/16558/revisions/78c5beffaca71b226667ce558baf7be225093870/patch"; decode = "base64 -d"; - hash = "sha256-OYlMcmnIkoC841E0ONNWtSCUKokyxOmd0d+AWcXwbAI="; + hash = "sha256-Y6xPjNM0J1DpJ62stnEaB+mJsa9kq89TGMxZkIk9334="; }) ]; diff --git a/pkgs/tools/security/aflplusplus/default.nix b/pkgs/tools/security/aflplusplus/default.nix index 456cc84efbaa..55cd35e0949e 100644 --- a/pkgs/tools/security/aflplusplus/default.nix +++ b/pkgs/tools/security/aflplusplus/default.nix @@ -37,13 +37,13 @@ let libtokencap = callPackage ./libtokencap.nix { inherit aflplusplus; }; aflplusplus = stdenvNoCC.mkDerivation rec { pname = "aflplusplus"; - version = "4.32c"; + version = "4.34c"; src = fetchFromGitHub { owner = "AFLplusplus"; repo = "AFLplusplus"; tag = "v${version}"; - hash = "sha256-Fhf7dHyHd8IGXq7t1y9TwN9VN8SckLRkgfGGMvmqIqk="; + hash = "sha256-ymHt746cuZ+jyWs0vB3R1qNgpgAu6pUVXp9/g9Km9JI="; }; enableParallelBuilding = true; @@ -81,7 +81,8 @@ let --replace-fail "CLANG_BIN" '"${clang}/bin/clang"' \ --replace-fail '"gcc"' '"${gcc}/bin/gcc"' \ --replace-fail '"g++"' '"${gcc}/bin/g++"' \ - --replace-fail 'getenv("AFL_PATH")' "(getenv(\"AFL_PATH\") ? getenv(\"AFL_PATH\") : \"$out/lib/afl\")" + --replace-fail 'getenv("AFL_PATH")' "(getenv(\"AFL_PATH\") ? getenv(\"AFL_PATH\") : \"$out/lib/afl\")" \ + --replace-fail '#ifndef "${clang}/bin/clang"' '#ifndef CLANG_BIN' substituteInPlace src/afl-ld-lto.c \ --replace-fail 'LLVM_BINDIR' '"/nixpkgs-patched-does-not-exist"' diff --git a/pkgs/tools/security/aflplusplus/qemu.nix b/pkgs/tools/security/aflplusplus/qemu.nix index 515738fa163d..cc9d54e37a8c 100644 --- a/pkgs/tools/security/aflplusplus/qemu.nix +++ b/pkgs/tools/security/aflplusplus/qemu.nix @@ -25,10 +25,8 @@ stdenv.mkDerivation { src = fetchFromGitHub { owner = "AFLplusplus"; repo = "qemuafl"; - # Use a fixed qemuafl version instead of the one in https://github.com/AFLplusplus/AFLplusplus/blob/v4.31c/qemu_mode/QEMUAFL_VERSION. - # See: https://github.com/AFLplusplus/AFLplusplus/issues/2296. - rev = "ef1cd9a8cb1522c918faab42805216f9a4054dda"; - hash = "sha256-tbKDnDoBtFhvtE9nbi9XuHPuFuGezUFngnw4pJyKFgY="; + rev = "0732e079ed3716ef0b81e708cd9dcd372238a07f"; + hash = "sha256-YoMHnJuyOdGcFVrY0I0Oja0qKNKdAa25RByVB5ui2do="; fetchSubmodules = true; };