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: 090bf6c7c863
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 23bd9e7e3eb8
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Jun 5, 2019

  1. weechatScripts.wee-slack: 2.2.0 -> 2.3.0

    @oxzi
    oxzi committed Jun 5, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    ondrejmirtes Ondřej Mirtes
    GPG key ID: CF1A108D0E7AE720
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    1420e7d View commit details

Commits on Jun 7, 2019

  1. Merge pull request #62738 from geistesk/wee-slack-2.3 

    weechatScripts.wee-slack: 2.2.0 -> 2.3.0
    @Ma27
    Ma27 authored Jun 7, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    ondrejmirtes Ondřej Mirtes
    GPG key ID: CF1A108D0E7AE720
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    23bd9e7 View commit details
4 changes: 2 additions & 2 deletions pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,13 +2,13 @@

stdenv.mkDerivation rec {
name = "wee-slack-${version}";
version = "2.2.0";
version = "2.3.0";

src = fetchFromGitHub {
repo = "wee-slack";
owner = "wee-slack";
rev = "v${version}";
sha256 = "1iy70q630cgs7fvk2151fq9519dwxrlqq862sbrwypzr6na6yqpg";
sha256 = "0544j6vqbvb2xshq7ma2a3apx2vvpgfg3jh5prg265wnh4991nsw";
};

patches = [
12 changes: 6 additions & 6 deletions pkgs/applications/networking/irc/weechat/scripts/wee-slack/libpath.patch
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
diff --git a/wee_slack.py b/wee_slack.py
index c5c7bc6..23fef2f 100644
index dbe6446..d1b7546 100644
--- a/wee_slack.py
+++ b/wee_slack.py
@@ -25,6 +25,8 @@ try:
except:
from StringIO import StringIO
@@ -25,6 +25,8 @@ import random
import socket
import string

+sys.path.append('@env@')
+
from websocket import create_connection, WebSocketConnectionClosedException
from websocket import ABNF, create_connection, WebSocketConnectionClosedException

# hack to make tests possible.. better way?
try: