diff options
author | Jörg Thalheim <joerg@thalheim.io> | 2017-06-14 09:19:51 +0100 |
---|---|---|
committer | Jörg Thalheim <joerg@thalheim.io> | 2017-06-14 09:23:56 +0100 |
commit | 537944ea77d100a56345df449d9a05622f5b949d (patch) | |
tree | 126acb1fcb0c5f3634db54b3149b2abcd05fe012 /pkgs/applications/networking | |
parent | cc0ce6b7a61976c9ea517d12daf62505365c0b8a (diff) | |
download | nixlib-537944ea77d100a56345df449d9a05622f5b949d.tar nixlib-537944ea77d100a56345df449d9a05622f5b949d.tar.gz nixlib-537944ea77d100a56345df449d9a05622f5b949d.tar.bz2 nixlib-537944ea77d100a56345df449d9a05622f5b949d.tar.lz nixlib-537944ea77d100a56345df449d9a05622f5b949d.tar.xz nixlib-537944ea77d100a56345df449d9a05622f5b949d.tar.zst nixlib-537944ea77d100a56345df449d9a05622f5b949d.zip |
gajim: 0.16.7 -> 0.16.8
Diffstat (limited to 'pkgs/applications/networking')
-rw-r--r-- | pkgs/applications/networking/instant-messengers/gajim/default.nix | 9 | ||||
-rw-r--r-- | pkgs/applications/networking/instant-messengers/gajim/fix-tests.patch | 13 |
2 files changed, 18 insertions, 4 deletions
diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix index 1228804f5b95..a21a82848e03 100644 --- a/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -25,13 +25,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "gajim-${version}"; - version = "0.16.7"; + version = "0.16.8"; src = fetchurl { name = "${name}.tar.bz2"; url = "https://dev.gajim.org/gajim/gajim/repository/archive.tar.bz2?" + "ref=${name}"; - sha256 = "18srrsswq09i54gcqqy0ylmrix1rrq43f0b8sz1lijr39h3ayw3j"; + sha256 = "009cpzqh4zy7hc9pq3r5m4lgagwawhjab13rjzavb0n9ggijcscb"; }; patches = let @@ -42,11 +42,12 @@ stdenv.mkDerivation rec { # sha256 = "<replace-with-sha256>"; #}; }; - in mapAttrsToList (name: { rev, sha256 }: fetchurl { + in (mapAttrsToList (name: { rev, sha256 }: fetchurl { name = "gajim-${name}.patch"; url = "https://dev.gajim.org/gajim/gajim/commit/${rev}.diff"; inherit sha256; - }) cherries; + }) cherries) + ++ [./fix-tests.patch]; # https://dev.gajim.org/gajim/gajim/issues/8660 postPatch = '' sed -i -e '0,/^[^#]/ { diff --git a/pkgs/applications/networking/instant-messengers/gajim/fix-tests.patch b/pkgs/applications/networking/instant-messengers/gajim/fix-tests.patch new file mode 100644 index 000000000000..cb866bb2d739 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/gajim/fix-tests.patch @@ -0,0 +1,13 @@ +diff --git a/src/common/gajim.py b/src/common/gajim.py +index 4a5d884b6..95d401b67 100644 +--- a/src/common/gajim.py ++++ b/src/common/gajim.py +@@ -415,7 +415,7 @@ def get_jid_from_account(account_name, full=False): + jid = name + '@' + hostname + if full: + resource = connections[account_name].server_resource +- jid += '/' + resource ++ jid += '/' + str(resource) + return jid + + def get_our_jids(): |