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: 66aa2c57076a
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 55f9cf238e0f
Choose a head ref
  • 17 commits
  • 20 files changed
  • 12 contributors

Commits on Oct 25, 2017

  1. marp: 0.0.10 -> 0.0.11 

    (cherry picked from commit a15cb74)
    @pbogdan @fpletz
    pbogdan authored and fpletz committed Oct 25, 2017
    Copy the full SHA
    f901cdc View commit details
    Browse the repository at this point in the history

  2. dnsmasq nixos: make sure it always runs 

    By default we only restart if the dnsmasq daemon fails but we introduce an
option to always keep it running.

(cherry picked from commit 0034f9e)
    @peterhoeg @fpletz
    peterhoeg authored and fpletz committed Oct 25, 2017
    Copy the full SHA
    863beeb View commit details
    Browse the repository at this point in the history

  3. apache-httpd: 2.4.28 -> 2.4.29 

    (cherry picked from commit 5a07d16)
    @eflanagan0 @fpletz
    eflanagan0 authored and fpletz committed Oct 25, 2017
    Copy the full SHA
    eff04a3 View commit details
    Browse the repository at this point in the history

  4. msmtp: compiles with keyring support by default (#30584) 

    * msmtp: compiles with keyring support by default

As it is recommended by msmtp http://msmtp.sourceforge.net/doc/msmtp.html#Authentication

(cherry picked from commit cd4df56)
    @fpletz
    Matthieu Coudron authored and fpletz committed Oct 25, 2017
    Copy the full SHA
    bf0b2af View commit details
    Browse the repository at this point in the history

  5. jenkins: 2.85 -> 2.86 

    (cherry picked from commit 2c39cb9)
    @earldouglas @fpletz
    earldouglas authored and fpletz committed Oct 25, 2017
    Copy the full SHA
    ddd5cb8 View commit details
    Browse the repository at this point in the history

  6. libx86: Supports only x86 

    In theory it builds for 32-bit ARM but the result probably doesn't
work in a meaningful manner...

(cherry picked from commit acf1ae0)
    @dezgeg @fpletz
    dezgeg authored and fpletz committed Oct 25, 2017
    Copy the full SHA
    fc21233 View commit details
    Browse the repository at this point in the history

  7. read-edid: Only depend on libx86 on x86 

    (cherry picked from commit 681c800)
    @dezgeg @fpletz
    dezgeg authored and fpletz committed Oct 25, 2017
    Copy the full SHA
    1fa906b View commit details
    Browse the repository at this point in the history

  8. firefox-devedition-bin: 57.0b4 -> 57.0b6 

    (cherry picked from commit 3192244)
    @adisbladis @fpletz
    adisbladis authored and fpletz committed Oct 25, 2017
    Copy the full SHA
    fb71dcc View commit details
    Browse the repository at this point in the history

  9. firefox-beta-bin: 57.0b5 -> 57.0b6 

    (cherry picked from commit 4267402)
    @adisbladis @fpletz
    adisbladis authored and fpletz committed Oct 25, 2017
    Copy the full SHA
    f1873a4 View commit details
    Browse the repository at this point in the history

  10. firefox-beta-bin: 57.0b6 -> 57.0b10 

    (cherry picked from commit 1e56016)
    @adisbladis @fpletz
    adisbladis authored and fpletz committed Oct 25, 2017
    Copy the full SHA
    93a8161 View commit details
    Browse the repository at this point in the history

  11. nodejs: 6.11.1 -> 6.11.4 

    (cherry picked from commit e4f5477)
    @fpletz
    Fatih Altinok authored and fpletz committed Oct 25, 2017
    Copy the full SHA
    a30bf65 View commit details
    Browse the repository at this point in the history

  12. deja-dup: 36.1 -> 36.3 

    Motivation for change: Latest version which includes some bug fixes.

(cherry picked from commit c2709fe)
    @joncojonathan @fpletz
    joncojonathan authored and fpletz committed Oct 25, 2017
    Copy the full SHA
    3c44362 View commit details
    Browse the repository at this point in the history

  13. geoclue2: fix typo 

    (cherry picked from commit d96b0ac)
    @michaelpj @fpletz
    michaelpj authored and fpletz committed Oct 25, 2017
    Copy the full SHA
    7ebcb64 View commit details
    Browse the repository at this point in the history

  14. tor-browser-bundle-bin: 7.0.6 -> 7.0.7 

    (cherry picked from commit eba0885)
    @joachifm @fpletz
    joachifm authored and fpletz committed Oct 25, 2017
    Copy the full SHA
    3309b1c View commit details
    Browse the repository at this point in the history

  15. tor-browser-bundle-bin: support installing extensions 

    Closes #30443

(cherry picked from commit a09d626)
    @joachifm @fpletz
    joachifm authored and fpletz committed Oct 25, 2017
    Copy the full SHA
    9f4d4a7 View commit details
    Browse the repository at this point in the history

  16. make my maintainer handle match my github username 

    (cherry picked from commit 1ba197f)
    @jyp @fpletz
    jyp authored and fpletz committed Oct 25, 2017
    Copy the full SHA
    ec9b06e View commit details
    Browse the repository at this point in the history

  17. Added joncojonathan to maintainers 

    Motivation for change: I'm working on things more, so figured it was wise.

(cherry picked from commit 2f540c3)
    @joncojonathan @fpletz
    joncojonathan authored and fpletz committed Oct 25, 2017
    Copy the full SHA
    55f9cf2 View commit details
    Browse the repository at this point in the history