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: 196f64d6756b
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 41625dcab64e
Choose a head ref
  • 5 commits
  • 6 files changed
  • 2 contributors

Commits on Mar 12, 2017

  1. nodePackages: support github:owner/repo scheme for package deps 

    JS devs found a new way to be annoying - adjust code accordingly.

Have also put this change in PR svanderburg/node2nix#40
    @rvl @Mic92
    rvl authored and Mic92 committed Mar 12, 2017
    Copy the full SHA
    453529b View commit details
    Browse the repository at this point in the history

  2. pump.io: 1.0.0 -> 3.0.0 

    The package stopped building for some unknown reason (npm could no
longer fetch a module).

This is one of the build failures listed in #23253.

    http://hydra.nixos.org/build/49551309
    http://hydra.nixos.org/build/49548753

Easiest fix is to upgrade to latest stable version and regenerate
packages with node2nix.

The databank-memcached dependency needed to be dropped due to
dependency failures.
    @rvl @Mic92
    rvl authored and Mic92 committed Mar 12, 2017
    Copy the full SHA
    252e58a View commit details
    Browse the repository at this point in the history

  3. pumpio service: adjust upload directory config for 3.0.0 

    These changes are backwards compatible.
    @rvl @Mic92
    rvl authored and Mic92 committed Mar 12, 2017
    Copy the full SHA
    f1a1490 View commit details
    Browse the repository at this point in the history

  4. pumpio service: don't keep secrets in nix store 

    Added extra config options to allow reading passwords from file rather
than the world-readable nix store.

The full config.json file is created at service startup.

Relevant to #18881
    @rvl @Mic92
    rvl authored and Mic92 committed Mar 12, 2017
    Copy the full SHA
    f488b18 View commit details
    Browse the repository at this point in the history

  5. pump.io: fix tests 

    fixes #23568
    @Mic92
    Mic92 committed Mar 12, 2017
    Copy the full SHA
    41625dc View commit details
    Browse the repository at this point in the history