swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-21 12:59:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #114258 from Mic92/wee-slack

Browse source 
weechatScripts.wee-slack: 2.6.0 -> 2.7.0
This commit is contained in:
Sandro 2021-02-25 09:13:39 +01:00 committed by GitHub
parent fdd69470ef c3ea33e72b
commit ab5f8a4746
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 38 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
pkgs/applications/networking/irc/weechat/scripts/wee-slack/0001-hardcode-json-file-path.patch Normal file
View file

@ -0,0 +1,35 @@
From 5dd2593369645b11a9dc03e1930617d2f5dbd039 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 11 Nov 2020 11:48:49 +0100
Subject: [PATCH] hardcode json file path
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Jörg Thalheim <joerg@thalheim.io>
---
wee_slack.py | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/wee_slack.py b/wee_slack.py
index a3d779c..5942289 100644
--- a/wee_slack.py
+++ b/wee_slack.py
@@ -5136,13 +5136,7 @@ def create_slack_debug_buffer():
def load_emoji():
try:
- weechat_dir = w.info_get('weechat_dir', '')
- weechat_sharedir = w.info_get('weechat_sharedir', '')
- local_weemoji, global_weemoji = ('{}/weemoji.json'.format(path)
- for path in (weechat_dir, weechat_sharedir))
- path = (global_weemoji if os.path.exists(global_weemoji) and
- not os.path.exists(local_weemoji) else local_weemoji)
- with open(path, 'r') as ef:
+ with open('@out@/share/wee-slack/weemoji.json', 'r') as ef:
emojis = json.loads(ef.read())
if 'emoji' in emojis:
print_error('The weemoji.json file is in an old format. Please update it.')
--
2.29.0

6
pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix
View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "wee-slack";
version = "2.6.0";
version = "2.7.0";
src = fetchFromGitHub {
repo = "wee-slack";
owner = "wee-slack";
rev = "v${version}";
sha256 = "0s4qd1z40c1bczkvc840jwjmzbv7nyj06xqs1si9v54qmkh4gaq4";
sha256 = "sha256-6Z/H15bKe0PKpNe9PCgc5mLOii3CILCAVon7EgzIkx8=";
};
patches = [
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
paths = with python3Packages; [ websocket_client six ];
}}/${python3Packages.python.sitePackages}";
})
./hardcode-json-file-path.patch
./0001-hardcode-json-file-path.patch
];
postPatch = ''

12
pkgs/applications/networking/irc/weechat/scripts/wee-slack/hardcode-json-file-path.patch
View file

@ -1,12 +0,0 @@
--- a/wee_slack.py
+++ b/wee_slack.py
@@ -4560,8 +4560,7 @@
def load_emoji():
try:
- DIR = w.info_get('weechat_dir', '')
- with open('{}/weemoji.json'.format(DIR), 'r') as ef:
+ with open('@out@/share/wee-slack/weemoji.json', 'r') as ef:
emojis = json.loads(ef.read())
if 'emoji' in emojis:
print_error('The weemoji.json file is in an old format. Please update it.')