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

Merge master into staging-next

parents 4fa29a85 956f9313

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

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


- `buildPythonPackage` and `buildPythonApplication` now default to `nix-update-script` as their default `updateScript`. This should improve automated updates, since nix-update is better maintained than the in-tree update script and has more robust fetcher support.



- `plasma6`: Fixed the `ksycoca` cache not being re-built when `$XDG_CACHE_HOME` is set to something that isn't `$HOME/.cache`.



## Nixpkgs Library {#sec-nixpkgs-release-25.11-lib}



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

maintainers/maintainer-list.nix

+6 −0
Original line number Diff line number Diff line
@@ -14431,6 +14431,12 @@ 
    githubId = 4701504;

    name = "James Robinson";

  };

  leha44581 = {

    email = "leha55481@gmail.com";

    github = "Leha44581";

    githubId = 70238465;

    name = "Leha";

  };

  leifhelm = {

    email = "jakob.leifhelm@gmail.com";

    github = "leifhelm";

nixos/modules/services/desktop-managers/plasma6.nix

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ let 


  activationScript = ''

    # will be rebuilt automatically

    rm -fv "$HOME/.cache/ksycoca"*

    rm -fv "''${XDG_CACHE_HOME:-$HOME/.cache}/ksycoca"*

  '';

in

{

pkgs/applications/emulators/wine/sources.nix

+5 −5
Original line number Diff line number Diff line
@@ -133,9 +133,9 @@ rec { 


  unstable = fetchurl rec {

    # NOTE: Don't forget to change the hash for staging as well.

    version = "10.15";

    version = "10.17";

    url = "https://dl.winehq.org/wine/source/10.x/wine-${version}.tar.xz";

    hash = "sha256-MH4hI3xui96iZvlG0x8J7SexlX35oDUW2Ccf0T4cJh0=";

    hash = "sha256-u/jn3jLOqf4wU2HUr4XjBJIlTEvwIDnuJtrHpmcBtOY=";



    patches = [

      # Also look for root certificates at $NIX_SSL_CERT_FILE
@@ -145,7 +145,7 @@ rec { 
    # see https://gitlab.winehq.org/wine/wine-staging

    staging = fetchFromGitLab {

      inherit version;

      hash = "sha256-VzHM4Qm0XDP7suCT5dmJgoDJmZ1DLg6qqOUVQzNc0g4=";

      hash = "sha256-fTEzj3o7A9H9jIh3yhw8SCfNsnVeJ6pyL3jERqhVbr8=";

      domain = "gitlab.winehq.org";

      owner = "wine";

      repo = "wine-staging";
@@ -168,9 +168,9 @@ rec { 


    ## see http://wiki.winehq.org/Mono

    mono = fetchurl rec {

      version = "10.2.0";

      version = "10.3.0";

      url = "https://dl.winehq.org/wine/wine-mono/${version}/wine-mono-${version}-x86.msi";

      hash = "sha256-Th7T8C6S0FMTPQPd++/PbbSk3CMamu0zZ7FxF6iIR9g=";

      hash = "sha256-zs5cYxgAlN/98B0PvjYqS2BuUoC5jN/RuFaM35tXL5g=";

    };



    updateScript = writeShellScript "update-wine-unstable" ''

pkgs/applications/misc/zathura/core/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -32,11 +32,11 @@ 


stdenv.mkDerivation (finalAttrs: {

  pname = "zathura";

  version = "0.5.12";

  version = "0.5.13";



  src = fetchurl {

    url = "https://pwmt.org/projects/zathura/download/zathura-${finalAttrs.version}.tar.xz";

    hash = "sha256-6Ehw+/lrdmuCJKPzps58z6Nu+jtpGcyKL792XqTf5HY=";

    hash = "sha256-YwIXO81G+JflIJyIOltRrR2rSUbC84YcujdKO4DY88E=";

  };



  outputs = [