Unverified Commit 1bb28556 authored by github-actions[bot]'s avatar github-actions[bot] Committed by GitHub
Browse files

Merge master into staging-next

parents f6a4c6f9 e7eb1f79

nixos/doc/manual/release-notes/rl-2311.section.md

+1 −1
Original line number Diff line number Diff line
@@ -155,7 +155,7 @@ 


- The Cinnamon module now enables XDG desktop integration by default. If you are experiencing collisions related to xdg-desktop-portal-gtk you can safely remove `xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ];` from your NixOS configuration.



- GNOME, Pantheon, Cinnamon module no longer forces Qt applications to use Adwaita style since it was buggy and is no longer maintained upstream. If you still want it, you can add the following options to your configuration but it will probably be eventually removed:

- GNOME, Pantheon, Cinnamon module no longer forces Qt applications to use Adwaita style since it was buggy and is no longer maintained upstream (specifically, Cinnamon now defaults to the gtk2 style instead, following the default in Linux Mint). If you still want it, you can add the following options to your configuration but it will probably be eventually removed:



  ```nix

  qt = {

nixos/modules/services/x11/desktop-managers/cinnamon.nix

+7 −0
Original line number Diff line number Diff line
@@ -212,6 +212,13 @@ in 
      programs.bash.vteIntegration = mkDefault true;

      programs.zsh.vteIntegration = mkDefault true;



      # Qt application style

      qt = {

        enable = mkDefault true;

        style = mkDefault "gtk2";

        platformTheme = mkDefault "gtk2";

      };



      # Default Fonts

      fonts.packages = with pkgs; [

        source-code-pro # Default monospace font in 3.32

pkgs/applications/editors/vim/plugins/generated.nix

+17 −5
Original line number Diff line number Diff line
@@ -2997,12 +2997,12 @@ final: prev: 


  dressing-nvim = buildVimPluginFrom2Nix {

    pname = "dressing.nvim";

    version = "2023-08-13";

    version = "2023-08-19";

    src = fetchFromGitHub {

      owner = "stevearc";

      repo = "dressing.nvim";

      rev = "6bde51adabba06f7fd4a469885a85f36d78a5f52";

      sha256 = "00djz2ppikh911ldndcaygb95a7l48s7wmq7a9p9vr4vzwhxab5l";

      rev = "ee571505f3566f84fd252e76c4ce6df6eaf2fb94";

      sha256 = "0xahisrz7yz0838ijvg2s6wbskdb443fal72yxjr2h5z1dvzxswq";

    };

    meta.homepage = "https://github.com/stevearc/dressing.nvim/";

  };
@@ -4557,6 +4557,18 @@ final: prev: 
    meta.homepage = "https://github.com/nanotech/jellybeans.vim/";

  };



  jinja-vim = buildVimPluginFrom2Nix {

    pname = "jinja.vim";

    version = "2020-06-18";

    src = fetchFromGitHub {

      owner = "HiPhish";

      repo = "jinja.vim";

      rev = "51b8a2a504416c4959127c82eac26f14f3508975";

      sha256 = "15ax7v6crdzra4sqqmjpvl9q1p9dmsksrs4j68zqqrj6kka0zkgn";

    };

    meta.homepage = "https://github.com/HiPhish/jinja.vim/";

  };



  jq-vim = buildVimPluginFrom2Nix {

    pname = "jq.vim";

    version = "2022-11-26";
@@ -5931,8 +5943,8 @@ final: prev: 
    src = fetchFromGitHub {

      owner = "NeogitOrg";

      repo = "neogit";

      rev = "cdea52c881ea4944b46f09b5c4705a51dc5cf390";

      sha256 = "06hi06pkr0bww1nsrx22llhgfllmbykshwb2k8y2wbl03fjqyixz";

      rev = "7cba95de79476d28c19e8ee34b303ad60fdef59f";

      sha256 = "18jixqv9mcvc873gs39g6fd84s0lpyglqk25gy00siznyjl2mcis";

    };

    meta.homepage = "https://github.com/NeogitOrg/neogit/";

  };

pkgs/applications/editors/vim/plugins/vim-plugin-names

+1 −0
Original line number Diff line number Diff line
@@ -381,6 +381,7 @@ https://github.com/vim-scripts/jdaddy.vim/,, 
https://github.com/davidhalter/jedi-vim/,,

https://github.com/metalelf0/jellybeans-nvim/,,

https://github.com/nanotech/jellybeans.vim/,,

https://github.com/HiPhish/jinja.vim/,HEAD,

https://github.com/vito-c/jq.vim/,,

https://github.com/neoclide/jsonc.vim/,,

https://github.com/JuliaEditorSupport/julia-vim/,,

pkgs/applications/misc/girara/default.nix

+13 −15
Original line number Diff line number Diff line 
{ lib

, stdenv

, fetchurl

, fetchpatch2

, fetchFromGitLab

, meson

, ninja

, pkg-config
@@ -14,28 +13,23 @@ 
, libiconv

, json-glib

, libintl

, zathura

}:



stdenv.mkDerivation rec {

  pname = "girara";

  version = "0.3.9";

  version = "0.4.0";



  outputs = [ "out" "dev" ];



  src = fetchurl {

    url = "https://git.pwmt.org/pwmt/${pname}/-/archive/${version}/${pname}-${version}.tar.gz";

    hash = "sha256-DoqYykR/N17BHQ90GoLvAYluQ3odWPwUGRTacN6BiWU=";

  src = fetchFromGitLab {

    domain = "git.pwmt.org";

    owner = "pwmt";

    repo = "girara";

    rev = version;

    sha256 = "sha256-dzWdiFGJ45JcH+wNwq2P3NZeWwHXAvXR1eJC85mYy7M=";

  };



  patches = [

    # Fix memory management bug revealed by GLib 2.76.

    # https://git.pwmt.org/pwmt/girara/-/issues/17

    (fetchpatch2 {

      url = "https://git.pwmt.org/pwmt/girara/-/commit/6926cc1234853ccf3010a1e2625aafcf462ed60e.patch";

      hash = "sha256-uayT6ikXtaBPxhZFyskShug3Tbvy2a9qimLRwdiAsic=";

    })

  ];



  nativeBuildInputs = [

    meson

    ninja
@@ -75,6 +69,10 @@ stdenv.mkDerivation rec { 
      meson test --print-errorlogs

  '';



  passthru.tests = {

    inherit zathura;

  };



  meta = with lib; {

    homepage = "https://git.pwmt.org/pwmt/girara";

    description = "User interface library";