diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2018-11-16 00:29:48 +0100 |
|---|---|---|
| committer | Franz Pletz <fpletz@fnordicwalking.de> | 2018-11-16 00:45:07 +0100 |
| commit | 31bd0df53d8539f9b02f39f9ce11d25b8f0dbdae (patch) | |
| tree | f756d053c1ba42eb54532e462da35adf8e8ef468 | |
| parent | 9756e6bc747f9c8a68948fd75a3e8d0233da8193 (diff) | |
| download | nixpkgs-31bd0df53d8539f9b02f39f9ce11d25b8f0dbdae.tar nixpkgs-31bd0df53d8539f9b02f39f9ce11d25b8f0dbdae.tar.gz nixpkgs-31bd0df53d8539f9b02f39f9ce11d25b8f0dbdae.tar.bz2 nixpkgs-31bd0df53d8539f9b02f39f9ce11d25b8f0dbdae.tar.lz nixpkgs-31bd0df53d8539f9b02f39f9ce11d25b8f0dbdae.tar.xz nixpkgs-31bd0df53d8539f9b02f39f9ce11d25b8f0dbdae.tar.zst nixpkgs-31bd0df53d8539f9b02f39f9ce11d25b8f0dbdae.zip | |
weechatScripts.wee-slack: 2.1.1 => 2.2.0
3 files changed, 29 insertions, 4 deletions
diff --git a/pkgs/applications/networking/irc/weechat/scripts/default.nix b/pkgs/applications/networking/irc/weechat/scripts/default.nix index 21038a2fa96..6324e8ec88c 100644 --- a/pkgs/applications/networking/irc/weechat/scripts/default.nix +++ b/pkgs/applications/networking/irc/weechat/scripts/default.nix @@ -9,5 +9,7 @@ inherit (luaPackages) cjson; }; - wee-slack = callPackage ./wee-slack { }; + wee-slack = callPackage ./wee-slack { + inherit pythonPackages; + }; } diff --git a/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix b/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix index 1b6e5215744..280e447cd0a 100644 --- a/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix +++ b/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix @@ -1,16 +1,26 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, substituteAll, buildEnv, fetchFromGitHub, pythonPackages }: stdenv.mkDerivation rec { name = "wee-slack-${version}"; - version = "2.1.1"; + version = "2.2.0"; src = fetchFromGitHub { repo = "wee-slack"; owner = "wee-slack"; rev = "v${version}"; - sha256 = "05caackz645aw6kljmiihiy7xz9jld8b9blwpmh0cnaihavgj1wc"; + sha256 = "1iy70q630cgs7fvk2151fq9519dwxrlqq862sbrwypzr6na6yqpg"; }; + patches = [ + (substituteAll { + src = ./libpath.patch; + env = "${buildEnv { + name = "wee-slack-env"; + paths = with pythonPackages; [ websocket_client six ]; + }}/${pythonPackages.python.sitePackages}"; + }) + ]; + passthru.scripts = [ "wee_slack.py" ]; installPhase = '' diff --git a/pkgs/applications/networking/irc/weechat/scripts/wee-slack/libpath.patch b/pkgs/applications/networking/irc/weechat/scripts/wee-slack/libpath.patch new file mode 100644 index 00000000000..8887e075f13 --- /dev/null +++ b/pkgs/applications/networking/irc/weechat/scripts/wee-slack/libpath.patch @@ -0,0 +1,13 @@ +diff --git a/wee_slack.py b/wee_slack.py +index c5c7bc6..23fef2f 100644 +--- a/wee_slack.py ++++ b/wee_slack.py +@@ -25,6 +25,8 @@ try: + except: + from StringIO import StringIO + ++sys.path.append('@env@') ++ + from websocket import create_connection, WebSocketConnectionClosedException + + # hack to make tests possible.. better way? |