Merge pull request #83339 from bdesham/wee-slack-2.5.0
weechatScripts.wee-slack: 2.4.0 -> 2.5.0
This commit is contained in:
commit
c7fc0ed352
@ -2,13 +2,13 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "wee-slack";
|
pname = "wee-slack";
|
||||||
version = "2.4.0";
|
version = "2.5.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
repo = "wee-slack";
|
repo = "wee-slack";
|
||||||
owner = "wee-slack";
|
owner = "wee-slack";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "0h425ln5vv76zv41dccapyfbl8qmmflbpwmrd26knqyj8k24zfpr";
|
sha256 = "0sxgi5fg8qvzqmxy7sdma6v0wj93xwh21av10n8nxvdskacw5dxz";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
@ -19,13 +19,19 @@ stdenv.mkDerivation rec {
|
|||||||
paths = with python3Packages; [ websocket_client six ];
|
paths = with python3Packages; [ websocket_client six ];
|
||||||
}}/${python3Packages.python.sitePackages}";
|
}}/${python3Packages.python.sitePackages}";
|
||||||
})
|
})
|
||||||
|
./hardcode-json-file-path.patch
|
||||||
];
|
];
|
||||||
|
|
||||||
|
postPatch = ''
|
||||||
|
substituteInPlace wee_slack.py --subst-var out
|
||||||
|
'';
|
||||||
|
|
||||||
passthru.scripts = [ "wee_slack.py" ];
|
passthru.scripts = [ "wee_slack.py" ];
|
||||||
|
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
mkdir -p $out/share
|
mkdir -p $out/share
|
||||||
cp wee_slack.py $out/share/wee_slack.py
|
cp wee_slack.py $out/share/wee_slack.py
|
||||||
|
install -D -m 0444 weemoji.json $out/share/wee-slack/weemoji.json
|
||||||
'';
|
'';
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
meta = with stdenv.lib; {
|
||||||
|
@ -0,0 +1,12 @@
|
|||||||
|
--- 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.')
|
Loading…
x
Reference in New Issue
Block a user