Unverified Commit 8d9ae4e0 authored by nixpkgs-ci[bot]'s avatar nixpkgs-ci[bot] Committed by GitHub
Browse files

Merge master into staging-next

parents 5c9b757f 7fc35dd1

doc/release-notes/rl-2605.section.md

+2 −0
Original line number Diff line number Diff line
@@ -11,6 +11,8 @@ 


- `spoof` has been removed, as there are many issues upstream with it working on modern OS versions, and it appears to be unmaintained.



- All Log4Shell vulnerability scanners were removed, as they were all unmaintained upstream and are no longer relevant given that the vulnerability has been fixed upstream for several years.



## Other Notable Changes {#sec-nixpkgs-release-26.05-notable-changes}



<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->

pkgs/by-name/ca/cabinpkg/package.nix

+2 −2
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
  onetbb,

  libgit2,

  curl,

  fmt,

  fmt_11,

  nlohmann_json,

  pkg-config,

}:
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec { 


  buildInputs = [

    libgit2

    fmt

    fmt_11

    onetbb

    nlohmann_json

    curl

pkgs/by-name/cr/cryptomator/package.nix

+3 −3
Original line number Diff line number Diff line
@@ -17,18 +17,18 @@ let 
in

maven.buildMavenPackage rec {

  pname = "cryptomator";

  version = "1.17.1";

  version = "1.18.0";



  src = fetchFromGitHub {

    owner = "cryptomator";

    repo = "cryptomator";

    tag = version;

    hash = "sha256-2iWeF2su55yQjiFe8nyqTgqNDZuj2+JpzAx5tQJE1Z0=";

    hash = "sha256-UWe9iBgb6eBasHnqfBtOFnZlLF1XCIF0y+ebphYQkQw=";

  };



  mvnJdk = jdk;

  mvnParameters = "-Dmaven.test.skip=true -Plinux";

  mvnHash = "sha256-lbyNCuZOYIoznOV+DHuhNFk9ALNQbMMXBrF7y246ktE=";

  mvnHash = "sha256-dOpvojr6gVtDFE52eghOVZWGspRLQrTDotOMkVGaG9k=";



  preBuild = ''

    VERSION=${version}

pkgs/by-name/ed/edopro/package.nix

+11 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
  lib,

  stdenv,

  fetchFromGitHub,

  fetchpatch,

  fetchzip,

  makeWrapper,

  premake5,
@@ -216,6 +217,16 @@ let 
      sqlite

    ];



    patches = [

      # fmt::localtime was deprecated and removed

      # Remove when version > 41.0.2

      (fetchpatch {

        name = "0001-edopro-No-longer-depend-on-fmt-for-localtime.patch";

        url = "https://github.com/edo9300/edopro/commit/c40951ba09f8a8b88d1d4b9b15ca9338da01522c.patch";

        hash = "sha256-wiZRCwSTp9/G97a+zaYjJgmDrc57/5bSBSYur1dcTfA=";

      })

    ];



    # nixpkgs' gcc stack currently appears to not support LTO

    # Override where bundled ocgcore get looked up in, so we can supply ours

    # (can't use --prebuilt-core or let it build a core on its own without making core updates impossible)

pkgs/by-name/ki/kimai/package.nix

+3 −3
Original line number Diff line number Diff line
@@ -7,13 +7,13 @@ 


php.buildComposerProject2 (finalAttrs: {

  pname = "kimai";

  version = "2.40.0";

  version = "2.42.0";



  src = fetchFromGitHub {

    owner = "kimai";

    repo = "kimai";

    tag = finalAttrs.version;

    hash = "sha256-/962VDi/50PMfSjMtJtlR9uIbJSzkF7kSQiRzb6o+SI=";

    hash = "sha256-5CPNUneOHbKxI/7/ARRt2hDKGmpvtmJwBAWdblCNmCQ=";

  };



  php = php.buildEnv {
@@ -38,7 +38,7 @@ php.buildComposerProject2 (finalAttrs: { 
    '';

  };



  vendorHash = "sha256-I4v4WkPGLc8vBPjCiYzPxcLn4rH3HWtQXSqwGVKXeGg=";

  vendorHash = "sha256-z0bSqSCSPF61x+zCbIVxRJ4SsxWaqL5yrK6+E8cxgiI=";



  composerNoPlugins = false;