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

Merge master into staging-next

parents ac6f169e 7d4c6daf

maintainers/maintainer-list.nix

+0 −6
Original line number Diff line number Diff line
@@ -25614,12 +25614,6 @@ 
    name = "teutat3s";

    keys = [ { fingerprint = "81A1 1C61 F413 8C84 9139  A4FA 18DA E600 A6BB E705"; } ];

  };

  tex = {

    email = "milan.svoboda@centrum.cz";

    github = "tex";

    githubId = 27386;

    name = "Milan Svoboda";

  };

  textshell = {

    email = "textshell@uchuujin.de";

    github = "textshell";

nixos/modules/services/web-servers/apache-httpd/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -229,7 +229,7 @@ let 
                    RewriteEngine on

                    RewriteCond %{REQUEST_URI} !^/.well-known/acme-challenge [NC]

                    RewriteCond %{HTTPS} off

                    RewriteRule (.*) https://%{HTTP_HOST}%{REQUEST_URI}

                    RewriteRule (.*) https://%{HTTP_HOST}%{REQUEST_URI} [L,R=301]

                </IfModule>

              ''

            else

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

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

mkLibretroCore {

  core = "nestopia";

  version = "0-unstable-2025-08-14";

  version = "0-unstable-2025-10-15";



  src = fetchFromGitHub {

    owner = "libretro";

    repo = "nestopia";

    rev = "51ad831fcd9f10a02dcb0cbf398c2cd1b028765e";

    hash = "sha256-4TMJfD9KUBo5qJNOdnSEq2oEftL8Fpak6tHOP+tuG2U=";

    rev = "3ac52e67c4a7fa696ee37e48bbcec93611277288";

    hash = "sha256-TDv+HTOtNEmel1lZlnlAGMVM8nEYdHLH7Rw6WBviGGw=";

  };



  makefile = "Makefile";

pkgs/applications/networking/cluster/terraform/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -194,8 +194,8 @@ rec { 
  mkTerraform = attrs: pluggable (generic attrs);



  terraform_1 = mkTerraform {

    version = "1.13.3";

    hash = "sha256-8C6OxeTjitDMi3J2KIfI6Q+w4FASS6zxjZHfSo7eZko=";

    version = "1.13.4";

    hash = "sha256-i+oXt5Olu0OC6rshQJUsjdEVQLeEoIt+Zrmbs3k3mWU=";

    vendorHash = "sha256-UcsB5cTae55meJ945fvgowch4EBdaTET2+t5KWvpPQ8=";

    patches = [ ./provider-path-0_15.patch ];

    passthru = {

pkgs/applications/virtualization/docker/default.nix

+3 −3
Original line number Diff line number Diff line
@@ -409,14 +409,14 @@ in 


  docker_28 =

    let

      version = "28.4.0";

      version = "28.5.1";

    in

    callPackage dockerGen {

      inherit version;

      cliRev = "v${version}";

      cliHash = "sha256-SgePAc+GvjZgymu7VA2whwIFEYAfMVUz9G0ppxeOi7M=";

      cliHash = "sha256-iT5FLzX8Pg07V0Uo+07gy3ChP/WgLTPs/vtxnFVmCG8=";

      mobyRev = "v${version}";

      mobyHash = "sha256-hiuwdemnjhi/622xGcevG4rTC7C+DyUijE585a9APSM=";

      mobyHash = "sha256-IlkEK4UeQjZsojbahzLy/rP3WqJUWXG9nthmBSEj10M=";

      runcRev = "v1.3.0";

      runcHash = "sha256-oXoDio3l23Z6UyAhb9oDMo1O4TLBbFyLh9sRWXnfLVY=";

      containerdRev = "v1.7.28";