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
base: 7c7f9623dc63
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 317ce1b622f4
Choose a head ref
  • 8 commits
  • 14 files changed
  • 4 contributors

Commits on Sep 23, 2018

  1. weechat: add NixOS module

    (cherry picked from commit b549877)
    lukateras authored and vcunat committed Sep 23, 2018
    Copy the full SHA
    b4f299e View commit details
    Browse the repository at this point in the history
  2. 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.
    
    (cherry picked from commit a8efe61)
    Ma27 authored and vcunat committed Sep 23, 2018
    Copy the full SHA
    27c2215 View commit details
    Browse the repository at this point in the history
  3. nixos/weechat: cleanup module, add module documentation

    This adds several improvements the previously introduced
    `services.weechat` module:
    
    * Dropped `services.weechat.init` as the initialization script can now
      be done on package-level since 2af41719bc using the `configure`
      function.
    
    * Added `sessionName` option to explicitly configure a name for the
      `screen` session (by default: weechat-screen).
    
    * Added `binary` option to configure the binary name (e.g.
      `weechat-headless`).
    
    * Added docs regarding `screen` session and `weechat.service`.
    
    (cherry picked from commit 18d4191)
    Ma27 authored and vcunat committed Sep 23, 2018
    Copy the full SHA
    d74a291 View commit details
    Browse the repository at this point in the history
  4. weechatScripts.wee-slack: init at 2.1.1

    (cherry picked from commit f5becfb)
    Ma27 authored and vcunat committed Sep 23, 2018
    Copy the full SHA
    79b38a9 View commit details
    Browse the repository at this point in the history
  5. 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.
    
    (cherry picked from commit e2b4644)
    Ma27 authored and vcunat committed Sep 23, 2018
    Copy the full SHA
    9ceff9e View commit details
    Browse the repository at this point in the history
  6. 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.
    
    (cherry picked from commit 61a9463)
    Ma27 authored and vcunat committed Sep 23, 2018
    Copy the full SHA
    a1c48b9 View commit details
    Browse the repository at this point in the history
  7. weechat: Add version and meta to buildEnv package

    Currently the output from `nix search` and similar tools are lacking
    important meta data
    
    (cherry picked from commit 230fd49)
    adisbladis authored and vcunat committed Sep 23, 2018
    Copy the full SHA
    e44b6cd View commit details
    Browse the repository at this point in the history
  8. Merge: nixos/weechat backports

    Close #46861 - it's exactly the same commits, just with -x annotations.
    vcunat committed Sep 23, 2018
    Copy the full SHA
    317ce1b View commit details
    Browse the repository at this point in the history