jolheiser/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #83339 from bdesham/wee-slack-2.5.0

Browse Source 
weechatScripts.wee-slack: 2.4.0 -> 2.5.0
This commit is contained in:
Jörg Thalheim 2020-03-26 07:22:40 +00:00 committed by GitHub
commit c7fc0ed352
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "wee-slack";
version = "2.4.0";
version = "2.5.0";
src = fetchFromGitHub {
repo = "wee-slack";
owner = "wee-slack";
rev = "v${version}";
sha256 = "0h425ln5vv76zv41dccapyfbl8qmmflbpwmrd26knqyj8k24zfpr";
sha256 = "0sxgi5fg8qvzqmxy7sdma6v0wj93xwh21av10n8nxvdskacw5dxz";
};
patches = [
@ -19,13 +19,19 @@ stdenv.mkDerivation rec {
paths = with python3Packages; [ websocket_client six ];
}}/${python3Packages.python.sitePackages}";
})
./hardcode-json-file-path.patch
];
postPatch = ''
substituteInPlace wee_slack.py --subst-var out
'';
passthru.scripts = [ "wee_slack.py" ];
installPhase = ''
mkdir -p $out/share
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; {

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

@ -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.')