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: 9fc37e24dd59
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: e8278f584f50
Choose a head ref
  • 7 commits
  • 5 files changed
  • 5 contributors

Commits on Sep 27, 2017

  1. libnfs: fix broken meta.license attribute 

    A license called "bsd" does not exist. Ping @peterhoeg.

(cherry picked from commit 4398872)
    @peti @globin
    peti authored and globin committed Sep 27, 2017
    Configuration menu
    Copy the full SHA
    930759d View commit details
    Browse the repository at this point in the history

  2. libnfs: fix eval 

    (cherry picked from commit c0235ef)
    @globin
    globin committed Sep 27, 2017
    Configuration menu
    Copy the full SHA
    e6e7c0f View commit details
    Browse the repository at this point in the history

  3. emby: 3.2.30.0 -> 3.2.32.0 

    (cherry picked from commit 71cc543)
    @fadenb @globin
    fadenb authored and globin committed Sep 27, 2017
    Configuration menu
    Copy the full SHA
    dc4c56a View commit details
    Browse the repository at this point in the history

  4. nix-daemon: Bump the default number of build users 

    While it's annoying to pollute the user database with a lot of nixbld*
users, 10 users is really too low for many modern systems.

(cherry picked from commit 79d547b)
    @edolstra @globin
    edolstra authored and globin committed Sep 27, 2017
    Configuration menu
    Copy the full SHA
    861987c View commit details
    Browse the repository at this point in the history

  5. metasploit: use makeWrapper instead 

    (cherry picked from commit b775b2c)
    @Mic92 @globin
    Mic92 authored and globin committed Sep 27, 2017
    Configuration menu
    Copy the full SHA
    b7ebe55 View commit details
    Browse the repository at this point in the history

  6. nixos/tinc: do not add Device= by default 

    tinc can figure this out based on DeviceType.
I also got `/dev/net/tun FD in bad state` after a particular upgrade.

(cherry picked from commit ad8cb09)
    @Mic92 @globin
    Mic92 authored and globin committed Sep 27, 2017
    Configuration menu
    Copy the full SHA
    3615636 View commit details
    Browse the repository at this point in the history

  7. nixos/tinc: remove useless script argument 

    ExecStart is sufficient and more transparent to the user.

(cherry picked from commit 75ba415)
    @Mic92 @globin
    Mic92 authored and globin committed Sep 27, 2017
    Configuration menu
    Copy the full SHA
    e8278f5 View commit details
    Browse the repository at this point in the history