cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

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

Browse source 
Revert "Revert "pythonPackages.nbxmpp: 4.0.0 → 4.0.1; gajim: 1.6.0 → 1.6.1""
This commit is contained in:
Nick Cao 2023-01-20 14:37:59 +08:00 committed by GitHub
commit 5e24d8dc63
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkgs/applications/networking/instant-messengers/gajim/default.nix
View file

@ -22,11 +22,11 @@
python3.pkgs.buildPythonApplication rec {
pname = "gajim";
version = "1.6.0";
version = "1.6.1";
src = fetchurl {
url = "https://gajim.org/downloads/${lib.versions.majorMinor version}/gajim-${version}.tar.gz";
hash = "sha256-gHRB3thDH+CKRXTgrD37e2zf0rVDIVl4Zhxf5lsLjyc=";
hash = "sha256-3D87Ou/842WqbaUiJV1hRZFVkZzQ12GXCpRc8F3rKPQ=";
};
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/gtk -v
${python3.interpreter} -m unittest discover -s test/no_gui -v
${python3.interpreter} -m unittest discover -s test/gui -v
${python3.interpreter} -m unittest discover -s test/common -v
'';
# necessary for wrapGAppsHook

4
pkgs/development/python-modules/nbxmpp/default.nix
View file

@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "nbxmpp";
version = "4.0.0";
version = "4.0.1";
disabled = pythonOlder "3.10";
@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "gajim";
repo = "python-nbxmpp";
rev = version;
hash = "sha256-6PYJGlNOZMwHMXwf05IWekJ+haMfg+ooH5On+aYOWSI=";
hash = "sha256-PL+qNxeNubGSLqSci4uhRWtOIqs10p+A1VPfTwCLu84=";
};
nativeBuildInputs = [