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

Merge master into staging-nixos

parents aec5b156 7763c7ce

ci/eval/compare/default.nix

+1 −6
Original line number Diff line number Diff line
@@ -188,12 +188,7 @@ let 
            kernel: rebuilds: lib.nameValuePair "10.rebuild-${kernel}-stdenv" (lib.elem "stdenv" rebuilds)

          ) rebuildsByKernel

          // {

            "10.rebuild-nixos-tests" =

              lib.elem "nixosTests.simple" (extractPackageNames diffAttrs.rebuilds)

              &&

                # Only set this label when no other label with indication for staging has been set.

                # This avoids confusion whether to target staging or batch this with kernel updates.

                lib.last (lib.sort lib.lessThan (lib.attrValues rebuildCountByKernel)) <= 500;

            "10.rebuild-nixos-tests" = lib.elem "nixosTests.simple" (extractPackageNames diffAttrs.rebuilds);

          };

      }

    );

pkgs/applications/emulators/libretro/cores/gambatte.nix

+3 −3
Original line number Diff line number Diff line
@@ -5,13 +5,13 @@ 
}:

mkLibretroCore {

  core = "gambatte";

  version = "0-unstable-2026-04-11";

  version = "0-unstable-2026-04-24";



  src = fetchFromGitHub {

    owner = "libretro";

    repo = "gambatte-libretro";

    rev = "ac3d17d07a1119df5eb124494dfa90e47ae2e5ff";

    hash = "sha256-5240slUbHUYb6Xp65xPvvCopdciyGK+Z8mdk7i0ALIQ=";

    rev = "5ba6bd1ad745e04b7069d0eb2b44091364fc997a";

    hash = "sha256-A9OQx0eXVgrGcmpMTtTe97rHCjrV3Ksi/ooLefsysbQ=";

  };



  meta = {

pkgs/applications/emulators/libretro/cores/vba-next.nix

+3 −3
Original line number Diff line number Diff line
@@ -5,13 +5,13 @@ 
}:

mkLibretroCore {

  core = "vba-next";

  version = "0-unstable-2024-10-21";

  version = "0-unstable-2026-04-20";



  src = fetchFromGitHub {

    owner = "libretro";

    repo = "vba-next";

    rev = "d0ec7f3e209a91b903bb9d2c2397fef2bb3cca32";

    hash = "sha256-g3Eb1bMGjt+H7awUlMCtKVu223+UvyQ2VBh8aQG1yo8=";

    rev = "82119ba97ee57c738a2eb1dc3a45cd2122ad2232";

    hash = "sha256-On2O4WBVLmuj5FJZyaYUtgCEl1mEZffqAvGZpKz+Or8=";

  };



  meta = {

pkgs/by-name/ab/abaddon/package.nix

+2 −2
Original line number Diff line number Diff line
@@ -23,13 +23,13 @@ 


stdenv.mkDerivation rec {

  pname = "abaddon";

  version = "0.2.2";

  version = "0.2.4";



  src = fetchFromGitHub {

    owner = "uowuo";

    repo = "abaddon";

    tag = "v${version}";

    hash = "sha256-48lR1rIWMwLaTv+nIdqmQ3mHOayrC1P5OQuUb+URYh0=";

    hash = "sha256-fSNXMbyYmUOA4x911/an02fhhhWe6a4xlLVb2DIqIOE=";

    fetchSubmodules = true;

  };

pkgs/by-name/c2/c2patool/package.nix

+3 −3
Original line number Diff line number Diff line
@@ -10,16 +10,16 @@ 


rustPlatform.buildRustPackage (finalAttrs: {

  pname = "c2patool";

  version = "0.26.37";

  version = "0.26.50";



  src = fetchFromGitHub {

    owner = "contentauth";

    repo = "c2pa-rs";

    tag = "c2patool-v${finalAttrs.version}";

    hash = "sha256-bxiYY55r1Vg8ljoGlUBi5WgAU8GtcEsX030uzfMsals=";

    hash = "sha256-4I+q+6gz+xNz+lhxyC14hZ8yyYG4qzT8TtkLxl8Y71g=";

  };



  cargoHash = "sha256-AJr4auizFqumMaQzFd5G1keSIRJ3fWX7ftGHDTkPmX0=";

  cargoHash = "sha256-Fp+EuxrPx817wjzzq8+f6vBzBe5vyhkXGRsaEqTa/Jo=";



  # use the non-vendored openssl

  env.OPENSSL_NO_VENDOR = 1;