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

Merge staging-next into staging

parents 6ab9a857 bb7e0374

nixos/modules/programs/steam.nix

+2 −1
Original line number Diff line number Diff line
@@ -84,6 +84,7 @@ in { 


    gamescopeSession = mkOption {

      description = mdDoc "Run a GameScope driven Steam session from your display-manager";

      default = {};

      type = types.submodule {

        options = {

          enable = mkEnableOption (mdDoc "GameScope Session");
@@ -135,7 +136,7 @@ in { 
    environment.systemPackages = [

      cfg.package

      cfg.package.run

    ];

    ] ++ lib.optional cfg.gamescopeSession.enable steam-gamescope;



    networking.firewall = lib.mkMerge [

      (mkIf cfg.remotePlay.openFirewall {

pkgs/applications/audio/open-stage-control/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -2,13 +2,13 @@ 


buildNpmPackage rec {

  pname = "open-stage-control";

  version = "1.23.0";

  version = "1.24.2";



  src = fetchFromGitHub {

    owner = "jean-emmanuel";

    repo = "open-stage-control";

    rev = "v${version}";

    hash = "sha256-5QMBJw6H9TmyoSMkG5rniq1BdVYuEtQsQF1GGBkxqMI=";

    hash = "sha256-mM81u1irVfFFJUddOXKcs46tcGwVAcir+daKdkxFLsE=";

  };



  # Remove some Electron stuff from package.json

pkgs/applications/audio/reaper/default.nix

+3 −3
Original line number Diff line number Diff line
@@ -25,13 +25,13 @@ let 
in

stdenv.mkDerivation rec {

  pname = "reaper";

  version = "6.77";

  version = "6.79";



  src = fetchurl {

    url = url_for_platform version stdenv.hostPlatform.qemuArch;

    hash = {

      x86_64-linux = "sha256-1HQtmhcLV/yhrANy1wLM1ju3t9o/lnU1OaYxqe20UFc=";

      aarch64-linux = "sha256-17lBwadEDINoXd0yF/hCVFRGoWq6AuFUf4o+uPR6q60=";

      x86_64-linux = "sha256-Bpsc09y5R/zyVXiDAqRF6n09qKOrBTLjk84z+noeko0=";

      aarch64-linux = "sha256-jbyXXeVtFmt7xoIWd4YKFu4AUM6W9LzeIiGoGyaO2lU=";

    }.${stdenv.hostPlatform.system};

  };

pkgs/applications/audio/tidal-hifi/default.nix

+2 −10
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ 
, gdk-pixbuf

, glib

, gtk3

, imagemagick

, libappindicator-gtk3

, libdbusmenu

, libdrm
@@ -37,11 +36,11 @@ 


stdenv.mkDerivation rec {

  pname = "tidal-hifi";

  version = "5.0.0";

  version = "5.1.0";



  src = fetchurl {

    url = "https://github.com/Mastermindzh/tidal-hifi/releases/download/${version}/tidal-hifi_${version}_amd64.deb";

    sha256 = "sha256-6NyHDH16bLs+bgSbjZYm2LEzp1WkJ1nO3sdkO78/VqE=";

    sha256 = "sha256-IaSgul2L0L343TVT3ujgBoMt6tITwjJaBNOVJPCBDtI=";

  };



  nativeBuildInputs = [ autoPatchelfHook dpkg makeWrapper ];
@@ -61,7 +60,6 @@ stdenv.mkDerivation rec { 
    gdk-pixbuf

    glib

    gtk3

    imagemagick

    pango

    systemd

    mesa # for libgbm
@@ -110,12 +108,6 @@ stdenv.mkDerivation rec { 
      "''${gappsWrapperArgs[@]}"

    substituteInPlace $out/share/applications/tidal-hifi.desktop \

      --replace "/opt/tidal-hifi/tidal-hifi" "tidal-hifi"



    for size in 48 64 128 256 512; do

      mkdir -p $out/share/icons/hicolor/''${size}x''${size}/apps/

      convert $out/share/icons/hicolor/0x0/apps/tidal-hifi.png \

        -resize ''${size}x''${size} $out/share/icons/hicolor/''${size}x''${size}/apps/icon.png

    done

  '';



  meta = with lib; {

pkgs/applications/editors/cudatext/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -38,13 +38,13 @@ let 
in

stdenv.mkDerivation rec {

  pname = "cudatext";

  version = "1.191.5";

  version = "1.192.0";



  src = fetchFromGitHub {

    owner = "Alexey-T";

    repo = "CudaText";

    rev = version;

    hash = "sha256-jGIdDgSDgKXI9DHEmu2FRXjoFsvmxUbK5xoajLjX7zQ=";

    hash = "sha256-uRw4IeTJz5K3EPgEAtvtG938LT0doHh49/y02XlMhzE=";

  };



  postPatch = ''