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

Merge master into staging-next

parents 2a6bef46 d63fe42e

nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares.nix

+0 −2
Original line number Diff line number Diff line
@@ -14,8 +14,6 @@ in 
    calamares-nixos

    calamares-nixos-autostart

    calamares-nixos-extensions

    # Needed for calamares QML module packagechooserq

    libsForQt5.full

    # Get list of locales

    glibcLocales

  ];

nixos/modules/services/desktops/gnome/at-spi2-core.nix

+4 −1
Original line number Diff line number Diff line
@@ -51,7 +51,10 @@ with lib; 
    })



    (mkIf (!config.services.gnome.at-spi2-core.enable) {

      environment.variables.NO_AT_BRIDGE = "1";

      environment.variables = {

        NO_AT_BRIDGE = "1";

        GTK_A11Y = "none";

      };

    })

  ];

}

nixos/tests/deluge.nix

+3 −1
Original line number Diff line number Diff line
@@ -54,8 +54,10 @@ import ./make-test-python.nix ({ pkgs, ...} : { 
    declarative.wait_for_unit("deluged")

    declarative.wait_for_unit("delugeweb")

    declarative.wait_until_succeeds("curl --fail http://declarative:3142")



    # deluge-console always exits with 1. https://dev.deluge-torrent.org/ticket/3291

    declarative.succeed(

        "deluge-console 'connect 127.0.0.1:58846 andrew password; help' | grep -q 'rm.*Remove a torrent'"

        "(deluge-console 'connect 127.0.0.1:58846 andrew password; help' || true) | grep -q 'rm.*Remove a torrent'"

    )

  '';

})

pkgs/applications/audio/polyphone/default.nix

+4 −4
Original line number Diff line number Diff line 
{ stdenv, lib, mkDerivation, fetchFromGitHub, qmake, pkg-config, alsa-lib, libjack2, portaudio, libogg, flac, libvorbis, rtmidi, qtsvg }:

{ stdenv, lib, mkDerivation, fetchFromGitHub, qmake, pkg-config, alsa-lib, libjack2, portaudio, libogg, flac, libvorbis, rtmidi, qtsvg, qttools }:



mkDerivation rec {

  version = "2.2.0";

  version = "2.3.0";

  pname = "polyphone";



  src = fetchFromGitHub {

    owner = "davy7125";

    repo = "polyphone";

    rev = version;

    sha256 = "0w5pidzhpwpggjn5la384fvjzkvprvrnidb06068whci11kgpbp7";

    sha256 = "09habv51pw71wrb39shqi80i2w39dx5a39klzswsald5j9sia0ir";

  };



  buildInputs = [
@@ -22,7 +22,7 @@ mkDerivation rec { 
    qtsvg

  ];



  nativeBuildInputs = [ qmake pkg-config ];

  nativeBuildInputs = [ qmake qttools pkg-config ];



  preConfigure = ''

    cd ./sources/

pkgs/applications/blockchains/ergo/default.nix

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


stdenv.mkDerivation rec {

  pname = "ergo";

  version = "4.0.104";

  version = "5.0.3";



  src = fetchurl {

    url = "https://github.com/ergoplatform/ergo/releases/download/v${version}/ergo-${version}.jar";

    sha256 = "sha256-h6OVeDifYIKyIkwbN/pmJWge4/YGL6cnQQ/sI14LsHQ=";

    sha256 = "sha256-IDAss4qX39qPyOsPpVg5zU6zq/QV/RTnbHTGVl9UmOA=";

  };



  nativeBuildInputs = [ makeWrapper ];