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: b2c86f46d955
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 3e1401f06bff
Choose a head ref
  • 3 commits
  • 3 files changed
  • 2 contributors

Commits on Jul 25, 2018

  1. 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 = "https://github.com/weechat/weechat/commit/55767f5f116db3cb56cf85f52aa80feff45b6abf.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.
    alyssais committed Jul 25, 2018
    Copy the full SHA
    8887e1f View commit details
    Browse the repository at this point in the history

Commits on Dec 5, 2018

  1. Copy the full SHA
    9504292 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #44102 from alyssais/weechat-unwrapped

    weechat: seperate weechat-unwrapped from wrapper
    lheckemann committed Dec 5, 2018
    Copy the full SHA
    3e1401f View commit details
    Browse the repository at this point in the history