Unverified Commit 93d7e03c authored by Jonas Heinrich's avatar Jonas Heinrich Committed by GitHub
Browse files

Merge pull request #211291 from NixOS/revert-211204-gajim-1.6.1 

Revert "pythonPackages.nbxmpp: 4.0.0 → 4.0.1; gajim: 1.6.0 → 1.6.1"
parents 8cace1e6 4d49da62

pkgs/applications/networking/instant-messengers/gajim/default.nix

+4 −4
Original line number Diff line number Diff line
@@ -22,11 +22,11 @@ 


python3.pkgs.buildPythonApplication rec {

  pname = "gajim";

  version = "1.6.1";

  version = "1.6.0";



  src = fetchurl {

    url = "https://gajim.org/downloads/${lib.versions.majorMinor version}/gajim-${version}.tar.gz";

    hash = "sha256-3D87Ou/842WqbaUiJV1hRZFVkZzQ12GXCpRc8F3rKPQ=";

    hash = "sha256-gHRB3thDH+CKRXTgrD37e2zf0rVDIVl4Zhxf5lsLjyc=";

  };



  buildInputs = [
@@ -61,8 +61,8 @@ python3.pkgs.buildPythonApplication rec { 
  checkPhase = ''

    xvfb-run dbus-run-session \

      --config-file=${dbus}/share/dbus-1/session.conf \

      ${python3.interpreter} -m unittest discover -s test/gui -v

    ${python3.interpreter} -m unittest discover -s test/common -v

      ${python3.interpreter} -m unittest discover -s test/gtk -v

    ${python3.interpreter} -m unittest discover -s test/no_gui -v

  '';



  # necessary for wrapGAppsHook

pkgs/development/python-modules/nbxmpp/default.nix

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


buildPythonPackage rec {

  pname = "nbxmpp";

  version = "4.0.1";

  version = "4.0.0";



  disabled = pythonOlder "3.10";
@@ -22,7 +22,7 @@ buildPythonPackage rec { 
    owner = "gajim";

    repo = "python-nbxmpp";

    rev = version;

    hash = "sha256-PL+qNxeNubGSLqSci4uhRWtOIqs10p+A1VPfTwCLu84=";

    hash = "sha256-6PYJGlNOZMwHMXwf05IWekJ+haMfg+ooH5On+aYOWSI=";

  };



  nativeBuildInputs = [