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: b2d463f0e3ff
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
compare: 0d0660fde3bb
Choose a head ref
  • 7 commits
  • 5 files changed
  • 4 contributors

Commits on Oct 3, 2020

  1. Copy the full SHA
    960c3fc View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    8c9449e View commit details
    Browse the repository at this point in the history
  3. Copy the full SHA
    760c6ec View commit details
    Browse the repository at this point in the history

Commits on Oct 4, 2020

  1. nixos/nextcloud: fix nginx-config for Nextcloud 19 and older

    It seems as I misconfigured `nginx` for certain cases such as the
    `ldap`-plugin[1] in 42f6244. This patch
    fixes the `nginx`-config to match the upstream recommendations[2].
    
    Also added a comment to the module to remind myself to ensure that
    `nginx` will work with both v19 and v20 as soon as the latter is
    released and can be packaged in `nixpkgs`.
    
    Co-authored-by: nivadis <nivadis@users.noreply.github.com>
    
    [1] nextcloud/server#16194 (comment)
    [2] https://docs.nextcloud.com/server/19/admin_manual/installation/nginx.html
    
    (cherry picked from commit 8d8871c)
    Ma27 committed Oct 4, 2020
    Copy the full SHA
    adc7650 View commit details
    Browse the repository at this point in the history
  2. python.pkgs.fontforge: disable with Python 2

    Since the latest update, fontforge no longer supports building with Python 2. Let's prevent failing builds.
    
    (cherry picked from commit ce55b09)
    jtojnar authored and erictapen committed Oct 4, 2020
    Copy the full SHA
    f8d4aa5 View commit details
    Browse the repository at this point in the history
  3. monoid: 2016-07-21 -> 2018-06-03

    Also applied a patch, so we can build with python3Packages.fontforge, as
    fontforge doesn't have python2 bindings anymore.
    erictapen committed Oct 4, 2020
    Copy the full SHA
    d6f46d2 View commit details
    Browse the repository at this point in the history
  4. Merge pull request #99558 from erictapen/20.03-python2-fontforge

    [20.03] python.pkgs.fontforge: disable with Python 2
    erictapen committed Oct 4, 2020
    Copy the full SHA
    0d0660f View commit details
    Browse the repository at this point in the history