Commit Graph

77 Commits

Author SHA1 Message Date
Frederik Rietdijk
e5381cdece Merge master into staging-next 2019-01-06 09:36:23 +01:00
Michael Raskin
3b152247ea weechatScripts.weechat-matrix-bridge: 2018-05-29 -> 2018-11-19 (HTTP/2 support fix) 2019-01-05 13:21:30 +01:00
volth
fed7914539
Merge branch 'staging' into make-perl-pathd 2018-12-18 17:13:27 +00:00
volth
bb9557eb7c lib.makePerlPath -> perlPackages.makePerlPath 2018-12-15 03:50:31 +00:00
Maximilian Bosch
05882c0a74 weechatScripts.weechat-autosort: init at unstable-2018-01-11 (#51729)
Helpful weechat script to automatically keep buffers sorted.

Can be activated like this:

``` nix
weechat.override {
  configure = { ... }: {
    scripts = [
      weechatScripts.weechat-autosort
    ];
  };
}
```
2018-12-08 16:45:18 +00:00
Alyssa Ross
6dc9347712
weechat: fix bad merge
Identified in 8887e1f697 (r239097413).

9504292b1e accidentally reverted all the
changes that had been made to the weechat wrapper since
8887e1f697.

I removed the wrapper, then wrote it again, but this time taking the
code from the latest version of weechat before the bad merge.
2018-12-05 15:21:19 +00:00
Linus Heckemann
9504292b1e Merge remote-tracking branch 'origin/master' into weechat-unwrapped 2018-12-05 12:12:42 +01:00
Franz Pletz
31bd0df53d
weechatScripts.wee-slack: 2.1.1 => 2.2.0 2018-11-16 00:45:07 +01:00
Maximilian Bosch
5d9add49a2
weechat: remove obsolete aggregate-commands patch
This was the rebased version of a patch which landed in WeeChat 2.3
which is now used on nixpkgs master (see 2702772d2d).
2018-11-08 15:47:38 +01:00
Alyssa Ross
2702772d2d
weechat: 2.2 -> 2.3
Fixes https://github.com/NixOS/nixpkgs/issues/48798.
2018-10-25 11:44:22 +00:00
Alyssa Ross
e20e1e5c2c weechat: add perl.withPackages (#48815)
Allows for adding Perl libraries in the same way as for Python. Doesn't
really need to be a function, since there's only one perlPackages in
nixpkgs, but I went for consistency with the python plugin.
2018-10-23 12:23:47 +02:00
adisbladis
230fd49738
weechat: Add version and meta to buildEnv package
Currently the output from `nix search` and similar tools are lacking
important meta data
2018-09-22 19:46:21 +08:00
Maximilian Bosch
61a9463498 weechatScripts.weechat-matrix-bridge: don't export `olm.lua' as script (#46582)
Loading olm.lua as weechat script with `/script load olm.lua' causes
errors like this:

```
/nix/store/43jbh7yxh8j4gjfzbvpd9clncah5dip1-weechat-matrix-bridge-2018-05-29/lib/ffi.so: undefined symbol: lua_tointeger
```

As `olm.lua' is loaded by `matrix.lua' it doesn't need to be included
manually by the weechat configuration.
2018-09-12 23:56:03 +02:00
Maximilian Bosch
e2b4644f9c
weechat: fix quoting for ${} syntax
In my previous PR I missed that ${sec.foobar} (syntax to retrieve
secrets in a weechat runtime) breaks the shell evaluation.

Furthermore `;` shall be used rather than `\n` to concat scripts and the
init config.
2018-09-07 18:41:04 +02:00
Maximilian Bosch
f5becfb5b0
weechatScripts.wee-slack: init at 2.1.1 2018-09-07 13:45:13 +02:00
Maximilian Bosch
a8efe61412
weechat: 2.1 -> 2.2; improve package configuration
This aims to make the `weechat` package even more configurable. It
allows to specify scripts and commands using the `configure` function
inside a `weechat.override` expression.

The package can be configured like this:

```
with import <nixpkgs> { };
weechat.override {
  plugins = { availablePlugins, ... }: {
    plugins = builtins.attrValues availablePlugins;

    init = ''
      /set foo bar
      /server add freenode chat.freenode.org
    '';

    scripts = [ "/path/to/script.py" ];
  };
}
```

All commands are passed to `weechat --run-command "/set foo bar;/server ..."`.

The `plugins' attribute is not necessarily required anymore, if it's
sufficient to add `init' commands, the `plugins' will be
`builtins.attrValues availablePlugins' by default.

Additionally the result contains `weechat` and `weechat-headless`
(introduced in WeeChat 2.1) now.
2018-09-07 13:10:43 +02:00
Alyssa Ross
8887e1f697
weechat: seperate weechat-unwrapped from wrapper
If I have a patch I want to apply to weechat, I can't do that with
overrideAttrs like I can with almost every other package, because that
only applies to the wrapper derivation. For other wrapped packages, one
can usually call the wrapper with any version of the derivation, but the
weechat derivation didn't expose a wrapper creation function.

Taking inspiration from other packages, particularly Firefox, I
extracted the wrapper into its own function, made the default weechat
derivation use that, and added weechat-unwrapped.

Now I can add my custom patch like this:

    (wrapWeechat
      (weechat-unwrapped.overrideAttrs (oldAttrs: {
        patches = [
          (fetchpatch {
            url = "55767f5f11.patch?full_index=1";
            sha256 = "1pkcdsby57diqds1y5hhl0fr4i8j0zax32jb0gqd36siki3lza3d";
          })
        ];
      }))
      { configure =
        { availablePlugins, ... }:
        {
          plugins = with availablePlugins; [
            (python.withPackages (packages: with packages; [ potr websocket_client ]))
          ];
        };
      })

There is a small backward incompatibility here: previously, it was
possible to get an unwrapped weechat like this:

    weechat.override { configure = null; }

This didn't seem too important to keep around since it was also possible
to get an unwrapped weechat in a much more obvious way:

    weechat.unwrapped

I could probably make it so that the first way still worked, if that
behavior turns out to really have been important.
2018-07-25 17:49:00 +01:00
Jörg Thalheim
218298b30f
Merge branch 'master' into unused5 2018-07-21 15:41:22 +01:00
volth
52f53c69ce pkgs/*: remove unreferenced function arguments 2018-07-21 02:48:04 +00:00
volth
6d2857a311 [bot] treewide: remove unused 'inherit' in let blocks 2018-07-20 19:38:19 +00:00
Pascal Wittmann
aa10b3127f
weechat: set name to include version
see issue #43717
2018-07-19 21:43:11 +02:00
obadz
71f1f9b8ff weechat: fix binary name
(was renamed to `weechat-2.1` in af9d10a as discussed in
7cd7e4ce26 (commitcomment-29325227))
2018-06-12 23:58:38 +01:00
Ryan Mulligan
af9d10a91b treewide: fix derivation names 2018-05-28 05:59:57 -07:00
Michael Raskin
7cd7e4ce26 weechat: 2.0 -> 2.1 2018-04-28 22:42:38 +02:00
Léo Gaspard
fe21790989 weechat: forward metadata to wrapper 2018-04-04 14:58:56 +02:00
Léo Gaspard
51d9192cdd weechat: point description to documentation 2018-04-04 14:58:54 +02:00
Fahad Sadah
e2eb563497 weechat: 1.9.1 -> 2.0 2017-12-18 01:33:36 +00:00
Linus Heckemann
566a16b742 weechat: default to enabling all plugins
Plain weechat is still accessible as `weechat.unwrapped`
or `weechat.override {configure = null;}`.

Also update documentation to reflect this change.
2017-11-29 15:30:56 +00:00
Linus Heckemann
05f96bf376 weechat: split plugins into separate outputs
Also add a wrapper generator that allows adding the plugins back
conveniently and corresponding documentation in the package notes
section of the nixpkgs manual.
2017-11-03 10:25:22 +00:00
Franz Pletz
15189140dd
weechat: 1.9 -> 1.9.1 for CVE-2017-14727
https://lists.nongnu.org/archive/html/weechat-security/2017-09/msg00000.html
2017-09-28 13:01:49 +02:00
Tuomas Tynkkynen
1ff422aa23 treewide: Add man & info outputs where necessary (instead of doc)
Because man & info pages won't be going to $doc after the next commit.
Scripted change for the files having one-package-per-file.
2017-08-11 21:32:54 +03:00
Aristid Breitkreuz
a2b2c1e4bd weechat: fix build (hack?) 2017-07-30 20:22:17 +02:00
Franz Pletz
ed515c8080
weechat: 1.8 -> 1.9 2017-06-25 14:03:18 +02:00
lassulus
d88faa261d weechat: 1.7.1 -> 1.8 2017-05-13 14:56:59 +01:00
lassulus
839b3ce5fe weechat: 1.7 -> 1.7.1 2017-04-23 13:51:34 +02:00
Franz Pletz
c2257506ae
weechat: 1.6 -> 1.7 2017-01-30 04:13:16 +01:00
Adam Evans
5da42092fa weechat: Fixed Darwin build issues
Build was failing with res_9_init missing on OS X. Resolved with a little help from
https://github.com/Homebrew/homebrew-core/pull/4427.
2016-10-23 00:32:17 +11:00
Profpatsch
6717213ca4 weechat: generate manpages 2016-10-14 23:30:38 +02:00
Moritz Ulrich
38dbb8008d weechat: Work around darwin linking issue 2016-10-03 23:45:16 +02:00
Moritz Ulrich
7cc3de8742 weechat: 1.5 -> 1.6 2016-10-03 16:55:17 +02:00
Andrew R. M
f999e9edf8 weechat: help weechat find nix's python on darwin 2016-09-08 05:54:04 -04:00
obadz
80dbdba6dd weechat: add python & perl to PATH so that extensions can run 2016-08-19 13:48:35 +01:00
Louis Taylor
393bde55f9 weechat: 1.4 -> 1.5 2016-05-05 18:52:35 +01:00
Aneesh Agrawal
17aefb1460 weechat: make language plugins optional, fixes #13092
They're still enabled by default, but now can be disabled.

Python has not been made optional due to the additional complexity of:
  - python2 vs python3
  - pync support on Darwin
Making Python support optional should be revisited at another time.
2016-02-19 22:56:29 +01:00
Louis Taylor
fb30e5fccd weechat: 1.3 -> 1.4 2016-01-21 07:20:39 +00:00
William A. Kennington III
64cd711f5c Merge branch 'master.upstream' into staging.upstream 2015-08-21 15:17:26 -07:00
Jude Taylor
9941e181e9 weechat: help weechat find libiconv on darwin 2015-08-21 14:02:39 -07:00
Moritz Ulrich
9346230743 weechat: 1.2 -> 1.3 2015-08-21 15:43:52 +02:00
Eelco Dolstra
55932c1bec Don't statically depend on cacert for certificates
This reverts commit cd52c04456 and
others.

Managing certificates (including revoking certificates and adding
custom certificates) becomes extremely painful if every package in the
system potentially depends on a different copy of cacert. Also, it
makes updating cacert rather expensive.
2015-07-31 01:34:58 +02:00
Jude Taylor
c0e1f2e34f darwin purity: weechat 2015-06-25 16:35:18 -07:00