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

Commits on Oct 1, 2020

  1. Merge pull request #99270 from NeQuissimus/linux_5_4_69 

    linux: 5.4.68 -> 5.4.69
(cherry picked from commit de6f754)
    @NeQuissimus
    NeQuissimus committed Oct 1, 2020
    Copy the full SHA
    b8a2127 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #99269 from NeQuissimus/linux_4_4_238 

    linux: 4.4.237 -> 4.4.238
(cherry picked from commit ea11b55)
    @NeQuissimus
    NeQuissimus committed Oct 1, 2020
    Copy the full SHA
    6c822ca View commit details
    Browse the repository at this point in the history

  3. Merge pull request #99267 from NeQuissimus/linux_4_19_149 

    linux: 4.19.148 -> 4.19.149
(cherry picked from commit b2a80be)
    @NeQuissimus
    NeQuissimus committed Oct 1, 2020
    Copy the full SHA
    6126295 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #99266 from NeQuissimus/linux_4_14_200 

    linux: 4.14.199 -> 4.14.200
(cherry picked from commit 2f177a2)
    @NeQuissimus
    NeQuissimus committed Oct 1, 2020
    Copy the full SHA
    e6810a0 View commit details
    Browse the repository at this point in the history

  5. element-desktop: 1.7.7 -> 1.7.8 

    (cherry picked from commit 0bf368d)
    @Ma27
    Tristan Helmich (omniIT) authored and Ma27 committed Oct 1, 2020
    Copy the full SHA
    151e1aa View commit details
    Browse the repository at this point in the history

  6. element-web: 1.7.7 -> 1.7.8 

    (cherry picked from commit f10049c)
    @Ma27
    Tristan Helmich (omniIT) authored and Ma27 committed Oct 1, 2020
    Copy the full SHA
    b7b36a2 View commit details
    Browse the repository at this point in the history

Commits on Oct 2, 2020

  1. linux: 4.9.237 -> 4.9.238

    @NeQuissimus
    NeQuissimus committed Oct 2, 2020
    Copy the full SHA
    b2d463f View commit details
    Browse the repository at this point in the history

Commits on Oct 3, 2020

  1. php74: 7.4.8 -> 7.4.11 

    https://www.php.net/ChangeLog-7.php#7.4.9
https://www.php.net/ChangeLog-7.php#7.4.10
https://www.php.net/ChangeLog-7.php#7.4.11
(cherry picked from commit a792db6)
(cherry picked from commit 07c6f1f)
    @etu @Ma27
    etu authored and Ma27 committed Oct 3, 2020
    Copy the full SHA
    960c3fc View commit details
    Browse the repository at this point in the history

  2. php73: 7.3.20 -> 7.3.23 

     - https://www.php.net/ChangeLog-7.php#7.3.21
 - https://www.php.net/ChangeLog-7.php#7.3.22
 - https://www.php.net/ChangeLog-7.php#7.3.23

(cherry picked from commit e04af50)
(cherry picked from commit beea522)
    @etu @Ma27
    etu authored and Ma27 committed Oct 3, 2020
    Copy the full SHA
    8c9449e View commit details
    Browse the repository at this point in the history

  3. matrix-synapse: 1.19.3 -> 1.20.1 

    https://github.com/matrix-org/synapse/releases/tag/v1.20.0
https://github.com/matrix-org/synapse/releases/tag/v1.20.1
(cherry picked from commit 631d92d)
    @Ma27
    Ma27 committed Oct 3, 2020
    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
    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 @erictapen
    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
    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
    erictapen committed Oct 4, 2020
    Copy the full SHA
    0d0660f View commit details
    Browse the repository at this point in the history