Skip to content
This repository was 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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: b2d463f0e3ff
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 0d0660fde3bb
Choose a head ref
  • 7 commits
  • 5 files changed
  • 4 contributors

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

  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

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    8c9449e View commit details

  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

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

  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

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    marsam Mario Rodas
    GPG key ID: 4C4BEFD7B18DC5E8
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    f8d4aa5 View commit details

  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

  4. Merge pull request #99558 from erictapen/20.03-python2-fontforge 

    [20.03] python.pkgs.fontforge: disable with Python 2
    @erictapen
    erictapen authored Oct 4, 2020
    Copy the full SHA
    0d0660f View commit details
4 changes: 2 additions & 2 deletions nixos/modules/services/web-apps/nextcloud.nix
View file
Original file line number Diff line number Diff line change
@@ -528,7 +528,7 @@ in {
};
"/" = {
priority = 900;
extraConfig = "try_files $uri $uri/ /index.php$request_uri;";
extraConfig = "rewrite ^ /index.php;";
};
"~ ^/store-apps" = {
priority = 201;
@@ -552,7 +552,7 @@ in {
"~ ^/(?:\\.|autotest|occ|issue|indie|db_|console)".extraConfig = ''
return 404;
'';
"~ \\.php(?:$|/)" = {
"~ ^\\/(?:index|remote|public|cron|core\\/ajax\\/update|status|ocs\\/v[12]|updater\\/.+|oc[ms]-provider\\/.+|.+\\/richdocumentscode\\/proxy)\\.php(?:$|\\/)" = {
priority = 500;
extraConfig = ''
include ${config.services.nginx.package}/conf/fastcgi.conf;
18 changes: 12 additions & 6 deletions pkgs/data/fonts/monoid/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,19 +1,25 @@
{ stdenv, fetchFromGitHub, python2 }:
# Python 3 support requires https://github.com/larsenwork/monoid/pull/233 to be merged
{ stdenv, fetchFromGitHub, fetchpatch, python3 }:

stdenv.mkDerivation {
pname = "monoid";
version = "2016-07-21";
version = "2018-06-03";

src = fetchFromGitHub {
owner = "larsenwork";
repo = "monoid";
rev = "e9d77ec18c337dc78ceae787a673328615f0b120";
sha256 = "07h5q6cn6jjpmxp9vyag1bxx481waz344sr2kfs7d37bba8yjydj";
rev = "a331c7c5f402c449f623e0d0895bd2fd8dc30ccf";
sha256 = "sha256-RV6lxv5CjywTMcuPMj6rdjLKrap7zLJ7niaNeF//U1Y=";
};

patches = [
(fetchpatch {
url = "https://github.com/larsenwork/monoid/pull/233/commits/f84f2ed61301ee84dadd16351314394f22ebed2f.patch";
sha256 = "sha256-CxfFHlR7TB64pvrfzVfUDkPwuRO2UdGOhXwW98c+oQU=";
})
];

nativeBuildInputs = [
(python2.withPackages (pp: with pp; [
(python3.withPackages (pp: with pp; [
fontforge
]))
];
8 changes: 4 additions & 4 deletions pkgs/development/interpreters/php/default.nix
View file
Original file line number Diff line number Diff line change
@@ -271,15 +271,15 @@ in {
};

php73 = generic {
version = "7.3.20";
sha256 = "1pl9bjwvdva2yx4sh465z9cr4bnr8mvv008w71sy1kqsj6a7ivf6";
version = "7.3.23";
sha256 = "0k600imsxm3r3qdv20ryqhvfmnkmjhvm2hcnqr180l058snncrpx";

# https://bugs.php.net/bug.php?id=76826
extraPatches = optional stdenv.isDarwin ./php73-darwin-isfinite.patch;
};

php74 = generic {
version = "7.4.8";
sha256 = "0ql01sfg8l7y2bfwmnjxnfw9irpibnz57ssck24b00y00nkd6j3a";
version = "7.4.11";
sha256 = "1idq2sk3x6msy8l2g42jv3y87h1fgb1aybxw7wpjkliv4iaz422l";
};
}
4 changes: 2 additions & 2 deletions pkgs/servers/matrix-synapse/default.nix
View file
Original file line number Diff line number Diff line change
@@ -23,11 +23,11 @@ let

in buildPythonApplication rec {
pname = "matrix-synapse";
version = "1.19.3";
version = "1.20.1";

src = fetchPypi {
inherit pname version;
sha256 = "1r63gw9a4n2sd3520zadpn05zxfk45nqrgwxp3zky5nkyrh4qbys";
sha256 = "1sf36vwvy2f9jy6dldq6gqfmh60384i5j64s7yc131b4dp0n7lcw";
};

patches = [
8 changes: 2 additions & 6 deletions pkgs/top-level/python-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -3605,14 +3605,10 @@ in {

folium = callPackage ../development/python-modules/folium { };

fontforge = (toPythonModule (pkgs.fontforge.override {
fontforge = disabledIf (!isPy3k) (toPythonModule (pkgs.fontforge.override {
withPython = true;
inherit python;
})).overrideAttrs (old: {
meta = old.meta // {
broken = isPy38;
};
});
}));

fonttools = callPackage ../development/python-modules/fonttools { };