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

Merge master into staging-nixos

parents aa42f7ad 0a344e2c

maintainers/maintainer-list.nix

+1 −1
Original line number Diff line number Diff line
@@ -21538,7 +21538,7 @@ 
    email = "raven6107@gmail.com";

    github = "r4v3n6101";

    githubId = 30029970;

    keys = [ { fingerprint = "FA05 8A29 B45E 06C0 8FE9  4907 05D2 BE42 F3EC D7CC"; } ];

    keys = [ { fingerprint = "66AE 3F93 364C 6AB8 18F9  F35D 8D1E 0726 2DFD BD00"; } ];

  };

  raboof = {

    email = "arnout@bzzt.net";

nixos/modules/programs/wayland/niri.nix

+15 −1
Original line number Diff line number Diff line
@@ -12,12 +12,22 @@ in 
    enable = lib.mkEnableOption "Niri, a scrollable-tiling Wayland compositor";



    package = lib.mkPackageOption pkgs "niri" { };



    useNautilus = lib.mkEnableOption "Nautilus as file-chooser for xdg-desktop-portal-gnome" // {

      default = true;

    };

  };



  config = lib.mkIf cfg.enable (

    lib.mkMerge [

      {

        environment.systemPackages = [ cfg.package ];

        environment.systemPackages = [

          cfg.package

        ]

        # Required for xdg-desktop-portal-gnome's FileChooser to work properly

        ++ lib.optionals cfg.useNautilus [

          pkgs.nautilus

        ];



        services = {

          displayManager.sessionPackages = [ cfg.package ];
@@ -34,6 +44,10 @@ in 


          configPackages = [ cfg.package ];



          config.niri = lib.mkIf (!cfg.useNautilus) {

            "org.freedesktop.impl.portal.FileChooser" = lib.mkDefault "gtk";

          };



          # Recommended by upstream, required for screencast support

          # https://github.com/YaLTeR/niri/wiki/Important-Software#portals

          extraPortals = [ pkgs.xdg-desktop-portal-gnome ];

pkgs/applications/audio/reaper/default.nix

+4 −4
Original line number Diff line number Diff line
@@ -38,17 +38,17 @@ let 
in

stdenv.mkDerivation rec {

  pname = "reaper";

  version = "7.47";

  version = "7.54";



  src = fetchurl {

    url = url_for_platform version stdenv.hostPlatform.qemuArch;

    hash =

      if stdenv.hostPlatform.isDarwin then

        "sha256-exVal9bXNNRaAVTz+c+cugs9TZ8GB8yyCA6jkeW8ipQ="

        "sha256-1C7FfFULm7ZYdKHU/x5BcoiISRoySvFDqRjJZ+OiqLc="

      else

        {

          x86_64-linux = "sha256-sbkUEGecqw5Fbl5Ev8pwlE5nMxNz8bf90d641S3cT8Y=";

          aarch64-linux = "sha256-8VNmIUa4c/cGVlegx9joD6tX1cTDBWnM2GklCINsJa0=";

          x86_64-linux = "sha256-DOhWauKjIv5cah+6yO/ZkHQ6X0qcyxxWD6B2xH/zm4c=";

          aarch64-linux = "sha256-TD6kHAzNBSDQxmT23VJwCUcfblp4DffOaKhKVPSAg6w=";

        }

        .${stdenv.hostPlatform.system};

  };

pkgs/applications/editors/vscode/extensions/sourcegraph.amp/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension { 
  mktplcRef = {

    publisher = "sourcegraph";

    name = "amp";

    version = "0.0.1763727068";

    hash = "sha256-rbL0i6JS/I59NiOlkt6v3GVea4vLyzN7BMFYkbDpWho=";

    version = "0.0.1763851087";

    hash = "sha256-x579QIkkFBAa1w6e6mtmx2sHQ3ypDcDWWVge6kCq9wU=";

  };



  meta = {

pkgs/applications/networking/cluster/terraform-providers/providers.json

+2 −2
Original line number Diff line number Diff line
@@ -1048,11 +1048,11 @@ 
    "vendorHash": null

  },

  "oracle_oci": {

    "hash": "sha256-1qYfGPM+Vh7r5UZY0cGjKWM/mxk8kF8S9K2NacrOWB8=",

    "hash": "sha256-PZ83SwGSgkQ8v+Hy56e8zipgbIR7Q/2rY27/5Zzwuok=",

    "homepage": "https://registry.terraform.io/providers/oracle/oci",

    "owner": "oracle",

    "repo": "terraform-provider-oci",

    "rev": "v7.26.1",

    "rev": "v7.27.0",

    "spdx": "MPL-2.0",

    "vendorHash": null

  },