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

Merge master into staging-nixos

parents aad530e4 52f6dbc2

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

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


- `pulsar` has finally migrated from electron v12 to v30, backup `~/.pulsar` before upgrading. See [Pulsar on Electron 30: what it means for you](https://blog.pulsar-edit.dev/posts/20251202-savetheclocktower-pulsar-on-electron-30/).



- `mactracker` has been updated to major version 8, which now [requires macOS 11 Big Sur or later](https://mactracker.ca/releasenotes-mac.html#:~:text=System%20requirements%20updated%20to%20macOS%2011%20Big%20Sur%20and%20later). The previous version supported Mac OS X 10.6.8 or later.



- `bartender` has been updated to major version 6. This removes support for MacOS Sonoma (and adds support for Tahoe). For more information, see [the release notes](https://www.macbartender.com/Bartender6/release_notes/) or [the Bartender 6 support page](https://www.macbartender.com/Bartender6/support/).



- `lima` has been updated from `1.x` to `2.x`. This major update includes several breaking changes, such as `/tmp/lima` no longer being mounted by default.

maintainers/maintainer-list.nix

+6 −0
Original line number Diff line number Diff line
@@ -14476,6 +14476,12 @@ 
    githubId = 913109;

    name = "Emil Fresk";

  };

  korkutkardes7 = {

    email = "korkutkardes7@hotmail.com";

    github = "KorkutKardes7";

    githubId = 148012191;

    name = "Korkut Kardeşseven";

  };

  kornholi = {

    email = "kornholijo@gmail.com";

    github = "kornholi";

nixos/modules/services/monitoring/grafana.nix

+1 −1
Original line number Diff line number Diff line
@@ -2091,7 +2091,7 @@ in 
        set -o errexit -o pipefail -o nounset -o errtrace

        shopt -s inherit_errexit



        exec ${cfg.package}/bin/grafana server -homepath ${cfg.dataDir} -config ${configFile}

        exec ${lib.getExe cfg.package} server -homepath ${cfg.dataDir} -config ${configFile}

      '';

      serviceConfig = {

        WorkingDirectory = cfg.dataDir;

pkgs/applications/editors/emacs/make-emacs.nix

+0 −3
Original line number Diff line number Diff line
@@ -244,13 +244,10 @@ stdenv.mkDerivation (finalAttrs: { 
  nativeBuildInputs = [

    makeWrapper

    pkg-config

  ]

  ++ lib.optionals (variant == "macport") [

    texinfo

  ]

  ++ lib.optionals srcRepo [

    autoreconfHook

    texinfo

  ]

  ++ lib.optionals (withPgtk || withX && (withGTK3 || withXwidgets)) [ wrapGAppsHook3 ];

pkgs/applications/editors/emacs/sources.nix

+20 −3
Original line number Diff line number Diff line
@@ -121,9 +121,16 @@ in 
        name = "inhibit-lexical-cookie-warning-67916.patch";

        path = ./inhibit-lexical-cookie-warning-67916-30.patch;

      })

      # tree-sitter 0.26 compatibility fix, from FreeBSD

      # https://cgit.freebsd.org/ports/plain/editors/emacs/files/patch-src_treesit.c

      ./tree-sitter-0.26.patch

      (fetchpatch {

        # tree-sitter 0.26 compatibility fix, see https://bugs.gentoo.org/970856

        url = "https://gitweb.gentoo.org/proj/emacs-patches.git/plain/emacs/30.2/01_all_treesit-0.26.patch?id=d0f47979806d9be5a190fdb4ffa1bde439b2d616";

        hash = "sha256-3pWeRxjAhr3ntBR3xDhoDUZDjU6xICU23NUpb/Vl6R4=";

      })

      (fetchpatch {

        # tree-sitter 0.26 compatibility fix, see https://bugs.gentoo.org/971731

        url = "https://gitweb.gentoo.org/proj/emacs-patches.git/plain/emacs/30.2/02_all_ts-query-pred.patch?id=86190bf195b3e17108372d8ad89eb57037180dd2";

        hash = "sha256-0GPyfKLSaB09a8hamrSf6lx4Qk8Big4AKMOivkN1wEM=";

      })

    ];

  });
@@ -139,6 +146,16 @@ in 
        url = "https://cgit.git.savannah.gnu.org/cgit/emacs.git/patch/?id=8f535370b9efbc91673b20c6987a5cae4f6dc562";

        hash = "sha256-ny44eIi8DUa9pQhVGzhGz4H6FXU4+ki86SITLXhkwpw=";

      })

      (fetchpatch {

        # tree-sitter 0.26 compatibility fix, see https://bugs.gentoo.org/970856

        url = "https://gitweb.gentoo.org/proj/emacs-patches.git/plain/emacs/30.2/01_all_treesit-0.26.patch?id=d0f47979806d9be5a190fdb4ffa1bde439b2d616";

        hash = "sha256-3pWeRxjAhr3ntBR3xDhoDUZDjU6xICU23NUpb/Vl6R4=";

      })

      (fetchpatch {

        # tree-sitter 0.26 compatibility fix, see https://bugs.gentoo.org/971731

        url = "https://gitweb.gentoo.org/proj/emacs-patches.git/plain/emacs/30.2/02_all_ts-query-pred.patch?id=86190bf195b3e17108372d8ad89eb57037180dd2";

        hash = "sha256-0GPyfKLSaB09a8hamrSf6lx4Qk8Big4AKMOivkN1wEM=";

      })

    ];

  });

}