Skip to content
This repository has been archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
base: 299814b385d2
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
compare: 617607e0437f
Choose a head ref
  • 14 commits
  • 12 files changed
  • 8 contributors

Commits on Oct 6, 2018

  1. miniupnpd: wrap iptables scripts to use correct PATH

    (cherry picked from commit 2039327)
    bobvanderlinden authored and samueldr committed Oct 6, 2018
    Configuration menu
    Copy the full SHA
    9dc6bdc View commit details
    Browse the repository at this point in the history
  2. nixos: miniupnpd: use iptables scripts

    (cherry picked from commit d3eff01)
    bobvanderlinden authored and samueldr committed Oct 6, 2018
    Configuration menu
    Copy the full SHA
    4342bdd View commit details
    Browse the repository at this point in the history
  3. tests: upnp: init test for upnp using miniupnpd / miniupnpc

    (cherry picked from commit 32c63c6)
    bobvanderlinden authored and samueldr committed Oct 6, 2018
    Configuration menu
    Copy the full SHA
    3ab4c76 View commit details
    Browse the repository at this point in the history
  4. tests: bittorrent: improve stability

    This attempts to improve stability of the test by using existing
    services for miniupnpd and transmission.
    
    It also uses explicit addresses for the network interfaces so that the
    external IP addresses are valid internet addresses (thus fixing
    validation problems from upnpc).
    
    Also disable eth0 from being used to transfer torrents over without that
    being the intention.
    
    (cherry picked from commit 276ffc5)
    bobvanderlinden authored and samueldr committed Oct 6, 2018
    Configuration menu
    Copy the full SHA
    b453212 View commit details
    Browse the repository at this point in the history
  5. tests: bittorrent: add bobvanderlinden as maintainer

    (cherry picked from commit 5fbc521)
    bobvanderlinden authored and samueldr committed Oct 6, 2018
    Configuration menu
    Copy the full SHA
    fc8769d View commit details
    Browse the repository at this point in the history
  6. Merge pull request #47956 from samueldr/18.09/backport-46443

    [backport] Miniupnpd and bittorrent improvements (#46443)
    samueldr committed Oct 6, 2018
    Configuration menu
    Copy the full SHA
    f4bb9c4 View commit details
    Browse the repository at this point in the history

Commits on Oct 7, 2018

  1. nano: 3.0 -> 3.1

    (cherry picked from commit 65eb3e3)
    Backport of #47991
    samueldr authored and srhb committed Oct 7, 2018
    Configuration menu
    Copy the full SHA
    be47bab View commit details
    Browse the repository at this point in the history
  2. gdal: Add libxml2 to build

    (cherry picked from commit 4af38a2)
    Backport of #47972
    Hodapp87 authored and srhb committed Oct 7, 2018
    Configuration menu
    Copy the full SHA
    090f5e0 View commit details
    Browse the repository at this point in the history
  3. nixos/prometheus-snmp-exporter: fix command line argument format

    (cherry picked from commit c477d66)
    thefloweringash authored and Mic92 committed Oct 7, 2018
    Configuration menu
    Copy the full SHA
    2b3b607 View commit details
    Browse the repository at this point in the history
  4. borgbackup: patch bug that allowed for exceeding quotas

    See also borgbackup/borg#4093 for this.
    
    (cherry picked from commit 0cfc923)
    erictapen authored and Mic92 committed Oct 7, 2018
    Configuration menu
    Copy the full SHA
    45c83d9 View commit details
    Browse the repository at this point in the history
  5. cool-retro-term: Fix link to home page

    (cherry picked from commit 82b2b91)
    alexherbo2 authored and Mic92 committed Oct 7, 2018
    Configuration menu
    Copy the full SHA
    5cc7571 View commit details
    Browse the repository at this point in the history
  6. backport tor-browser-bundle-bin minor update

    tor-browser-bundle-bin: 8.0.1 -> 8.0.2
    
    Update to latest version due to security updates and 8.0.1 not being
    available on the mirrors anymore.
    
    Release notes: https://blog.torproject.org/new-release-tor-browser-802
    
    (cherry picked from commit 248ed35)
    
    reason: The binary dist-file of tor-browser-bundle-bin-8.0.2 is gone
    from the mirrors, making the derivation for v8.0.1 fail.
    This is just a minor version bump.
    andir authored and schmittlauch committed Oct 7, 2018
    Configuration menu
    Copy the full SHA
    34eb9f7 View commit details
    Browse the repository at this point in the history
  7. Merge pull request #48014 from schmittlauch/backport-tbb-bin-8.0.2

    backport tor-browser-bundle-bin minor update
    andir committed Oct 7, 2018
    Configuration menu
    Copy the full SHA
    76e4d16 View commit details
    Browse the repository at this point in the history
  8. charybdis service: bin/charybdis-ircd -> bin/charybdis

    (cherry picked from commit 99c8dc4)
    Lassulus authored and Mic92 committed Oct 7, 2018
    Configuration menu
    Copy the full SHA
    617607e View commit details
    Browse the repository at this point in the history