Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 9756e6bc747f
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 31bd0df53d85
Choose a head ref
  • 1 commit
  • 3 files changed
  • 1 contributor

Commits on Nov 15, 2018

  1. weechatScripts.wee-slack: 2.1.1 => 2.2.0

    @fpletz
    fpletz committed Nov 15, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    31bd0df View commit details
4 changes: 3 additions & 1 deletion pkgs/applications/networking/irc/weechat/scripts/default.nix
View file
Original file line number Diff line number Diff line change
@@ -9,5 +9,7 @@
inherit (luaPackages) cjson;
};

wee-slack = callPackage ./wee-slack { };
wee-slack = callPackage ./wee-slack {
inherit pythonPackages;
};
}
16 changes: 13 additions & 3 deletions pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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 = ''
13 changes: 13 additions & 0 deletions pkgs/applications/networking/irc/weechat/scripts/wee-slack/libpath.patch
View file
Original file line number Diff line number Diff line change
@@ -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?