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: 80345b551aef
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: a83862ef101f
Choose a head ref
  • 6 commits
  • 7 files changed
  • 3 contributors

Commits on Mar 13, 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

(cherry picked from commit 453529b)
    @rvl @globin
    rvl authored and globin committed Mar 13, 2017
    Configuration menu
    Copy the full SHA
    321481b 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.

(cherry picked from commit 252e58a)
    @rvl @globin
    rvl authored and globin committed Mar 13, 2017
    Configuration menu
    Copy the full SHA
    6866170 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.

(cherry picked from commit f1a1490)
    @rvl @globin
    rvl authored and globin committed Mar 13, 2017
    Configuration menu
    Copy the full SHA
    bb8dd2f 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

(cherry picked from commit f488b18)
    @rvl @globin
    rvl authored and globin committed Mar 13, 2017
    Configuration menu
    Copy the full SHA
    b5009c2 View commit details
    Browse the repository at this point in the history

  5. pump.io: fix tests 

    fixes #23568

(cherry picked from commit 41625dc)
    @Mic92 @globin
    Mic92 authored and globin committed Mar 13, 2017
    Configuration menu
    Copy the full SHA
    f7cbccb View commit details
    Browse the repository at this point in the history

  6. tinycc: 0.9.27pre-20170220 -> 20170225 

    Contains a fix for x86-64 asm gen and unified cross-compilation.

(cherry picked from commit 3c37edb)
    @joachifm @globin
    joachifm authored and globin committed Mar 13, 2017
    Configuration menu
    Copy the full SHA
    a83862e View commit details
    Browse the repository at this point in the history