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

Merge master into staging-next

parents 8e7fcd2d 719302e0

.git-blame-ignore-revs

+14 −0
Original line number Diff line number Diff line
@@ -121,3 +121,17 @@ c759efa5e7f825913f9a69ef20f025f50f56dc4d 


# python3Packages: format with nixfmt

59b1aef59071cae6e87859dc65de973d2cc595c0



# treewide description changes (#317959)

bf995e3641950f4183c1dd9010349263dfa0123b

755b915a158c9d588f08e9b08da9f7f3422070cc

f8c4a98e8e138e21353a2c33b90db3359f539b37



# vscode-extensions.*: format with nixfmt (RFC 166)

7bf9febfa6271012b1ef86647a3a06f06875fdcf



# remove uses of mdDoc (#303841)

1a24330f792c8625746d07d842290e6fd95ae6f9

acd0e3898feb321cb9a71a0fd376f1157d0f4553

1b28414d2886c57343864326dbb745a634d3e37d

6afb255d976f85f3359e4929abd6f5149c323a02

.github/CODEOWNERS

+3 −0
Original line number Diff line number Diff line
@@ -108,6 +108,9 @@ nixos/modules/installer/tools/nix-fallback-paths.nix @raitobezarius 
# NixOS QEMU virtualisation

/nixos/virtualisation/qemu-vm.nix           @raitobezarius



# ACME

/nixos/modules/security/acme                @arianvp @flokli @aanderse # no merge permission: @m1cr0man @emilazy



# Systemd

/nixos/modules/system/boot/systemd.nix      @NixOS/systemd

/nixos/modules/system/boot/systemd          @NixOS/systemd

nixos/modules/config/stevenblack.nix

+32 −17
Original line number Diff line number Diff line 
{ config, lib, pkgs, ... }:



{

  config,

  lib,

  pkgs,

  ...

}:

let

  inherit (lib) optionals mkOption mkEnableOption types mkIf elem concatStringsSep maintainers;

  cfg = config.networking.stevenblack;

  inherit (lib)

    getOutput

    maintainers

    mkEnableOption

    mkIf

    mkOption

    mkPackageOption

    types

    ;



  # needs to be in a specific order

  activatedHosts = with cfg; [ ]

    ++ optionals (elem "fakenews" block) [ "fakenews" ]

    ++ optionals (elem "gambling" block) [ "gambling" ]

    ++ optionals (elem "porn" block) [ "porn" ]

    ++ optionals (elem "social" block) [ "social" ];



  hostsPath = "${pkgs.stevenblack-blocklist}/alternates/" + concatStringsSep "-" activatedHosts + "/hosts";

  cfg = config.networking.stevenblack;

in

{

  options.networking.stevenblack = {

    enable = mkEnableOption "the stevenblack hosts file blocklist";



    package = mkPackageOption pkgs "stevenblack-blocklist" { };



    block = mkOption {

      type = types.listOf (types.enum [ "fakenews" "gambling" "porn" "social" ]);

      type = types.listOf (

        types.enum [

          "fakenews"

          "gambling"

          "porn"

          "social"

        ]

      );

      default = [ ];

      description = "Additional blocklist extensions.";

    };

  };



  config = mkIf cfg.enable {

    networking.hostFiles = [ ]

      ++ optionals (activatedHosts != [ ]) [ hostsPath ]

      ++ optionals (activatedHosts == [ ]) [ "${pkgs.stevenblack-blocklist}/hosts" ];

    networking.hostFiles = map (x: "${getOutput x cfg.package}/hosts") ([ "ads" ] ++ cfg.block);

  };



  meta.maintainers = [ maintainers.moni maintainers.artturin ];

  meta.maintainers = with maintainers; [

    moni

    artturin

    frontear

  ];

}

pkgs/applications/editors/rstudio/default.nix

+14 −24
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ 


let

  pname = "RStudio";

  version = "2024.04.1+748";

  version = "2024.04.2+764";

  RSTUDIO_VERSION_MAJOR = lib.versions.major version;

  RSTUDIO_VERSION_MINOR = lib.versions.minor version;

  RSTUDIO_VERSION_PATCH = lib.versions.patch version;
@@ -50,7 +50,7 @@ let 
    owner = "rstudio";

    repo = "rstudio";

    rev = "v" + version;

    hash = "sha256-fzxbhN9NdM0E2rxezj2BMEZ8obUbX0Zw8haDNmfAkWs=";

    hash = "sha256-j258eW1MYQrB6kkpjyolXdNuwQ3zSWv9so4q0QLsZuw=";

  };



  mathJaxSrc = fetchurl {
@@ -134,39 +134,29 @@ in 
      ./pandoc-nix-path.patch

      ./use-system-quarto.patch

      ./ignore-etc-os-release.patch



      (fetchpatch {

        name = "use-system-yaml-patch";

        url = "https://github.com/rstudio/rstudio/commit/04de8ca8b83dcc7fee9fd65e6ef58c372489d5ef.patch";

        hash = "sha256-FHSSOPsw6AAYBj/fgNT6idyxvRj3SG+fbla0UDjug1Y=";

      })



    ];



    postPatch = ''

      substituteInPlace src/cpp/core/r_util/REnvironmentPosix.cpp --replace '@R@' ${R}



      substituteInPlace src/cpp/CMakeLists.txt \

        --replace 'SOCI_LIBRARY_DIR "/usr/lib"' 'SOCI_LIBRARY_DIR "${soci}/lib"'

      substituteInPlace src/cpp/core/r_util/REnvironmentPosix.cpp --replace-fail '@R@' ${R}



      substituteInPlace src/gwt/build.xml \

        --replace '@node@' ${nodejs} \

        --replace './lib/quarto' ${quartoSrc}

        --replace-fail '@node@' ${nodejs} \

        --replace-fail './lib/quarto' ${quartoSrc}



      substituteInPlace src/cpp/conf/rsession-dev.conf \

        --replace '@node@' ${nodejs}

        --replace-fail '@node@' ${nodejs}



      substituteInPlace src/cpp/core/libclang/LibClang.cpp \

        --replace '@libclang@' ${llvmPackages.libclang.lib} \

        --replace '@libclang.so@' ${llvmPackages.libclang.lib}/lib/libclang.so

        --replace-fail '@libclang@' ${llvmPackages.libclang.lib} \

        --replace-fail '@libclang.so@' ${llvmPackages.libclang.lib}/lib/libclang.so



      substituteInPlace src/cpp/session/CMakeLists.txt \

        --replace '@pandoc@' ${pandoc} \

        --replace '@quarto@' ${quarto}

        --replace-fail '@pandoc@' ${pandoc} \

        --replace-fail '@quarto@' ${quarto}



      substituteInPlace src/cpp/session/include/session/SessionConstants.hpp \

        --replace '@pandoc@' ${pandoc}/bin \

        --replace '@quarto@' ${quarto}

        --replace-fail '@pandoc@' ${pandoc}/bin \

        --replace-fail '@quarto@' ${quarto}

    '';



    hunspellDictionaries = with lib; filter isDerivation (unique (attrValues hunspellDicts));
@@ -189,10 +179,10 @@ in 


      unzip -q ${mathJaxSrc} -d dependencies/mathjax-27



     # As of Chocolate Cosmos, node 18.19.1 is used for runtime

     # As of Chocolate Cosmos, node 18.20.3 is used for runtime

     # 18.18.2 is still used for build

     # see https://github.com/rstudio/rstudio/commit/facb5cf1ab38fe77813aaf36590804e4f865d780

     mkdir -p dependencies/common/node/18.19.1

     mkdir -p dependencies/common/node/18.20.3



      mkdir -p dependencies/pandoc/${pandoc.version}

      cp ${pandoc}/bin/pandoc dependencies/pandoc/${pandoc.version}/pandoc

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

+12 −0
Original line number Diff line number Diff line
@@ -17167,6 +17167,18 @@ final: prev: 
    meta.homepage = "https://github.com/HerringtonDarkholme/yats.vim/";

  };













  yazi-nvim = buildVimPlugin {













    pname = "yazi.nvim";













    version = "2024-06-29";













    src = fetchFromGitHub {













      owner = "mikavilpas";













      repo = "yazi.nvim";













      rev = "05849f390175f2ba8fd277b224d4fd9e35455895";













      sha256 = "zj+lmxsOEW+YaCk5hb7u454gACUmqYPA/IeW6av4D7k=";













    };













    meta.homepage = "https://github.com/DreamMaoMao/yazi.nvim";













  };



























  yescapsquit-vim = buildVimPlugin {















    pname = "yescapsquit.vim";















    version = "2022-08-31";