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: 68c599acd587
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: 009c50976b5b
Choose a head ref
  • 7 commits
  • 4 files changed
  • 5 contributors

Commits on Jul 10, 2020

  1. wallabag: apply patches to add missing migrations in initial setup 

    Fixes: wallabag/wallabag#3662
(cherry picked from commit b07693e)
    @mweinelt
    mweinelt committed Jul 10, 2020
    Copy the full SHA
    15bc9d2 View commit details

  2. Merge pull request #92820 from mweinelt/20.03/wallabag 

    [20.03] wallabag: apply patches to add missing migrations in initial setup
    @maralorn
    maralorn authored Jul 10, 2020
    Copy the full SHA
    41f0bae View commit details

Commits on Jul 11, 2020

  1. php72: 7.2.31 -> 7.2.32 

    Changelog: https://www.php.net/ChangeLog-7.php#7.2.32
(cherry picked from commit 86ed3bf)
    @etu @Ma27
    etu authored and Ma27 committed Jul 11, 2020

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    2dc7ead View commit details

  2. php73: 7.3.19 -> 7.3.20 

    Changelog: https://www.php.net/ChangeLog-7.php#7.3.20
(cherry picked from commit ef4f6db)
    @etu @Ma27
    etu authored and Ma27 committed Jul 11, 2020
    Copy the full SHA
    7c89d08 View commit details

  3. php74: 7.4.7 -> 7.4.8 

    Changelog: https://www.php.net/ChangeLog-7.php#7.4.8
(cherry picked from commit 49316cc)
    @etu @Ma27
    etu authored and Ma27 committed Jul 11, 2020
    Copy the full SHA
    b2459a1 View commit details

  4. matrix-synapse: 1.15.2 -> 1.16.1 

    https://github.com/matrix-org/synapse/releases/tag/v1.16.0
https://github.com/matrix-org/synapse/releases/tag/v1.16.1
(cherry picked from commit 9deee36)
    @Ma27
    Ma27 committed Jul 11, 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
    5ca87e2 View commit details

  5. PerconaToolkit: use shortenPerlShebang (#91921) 

    (cherry picked from commit ae16459)
    @framp @veprbl
    framp authored and veprbl committed Jul 11, 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
    009c509 View commit details
12 changes: 6 additions & 6 deletions pkgs/development/interpreters/php/default.nix
View file
Original file line number Diff line number Diff line change
@@ -263,23 +263,23 @@ let

in {
php72 = generic {
version = "7.2.31";
sha256 = "0057x1s43f9jidmrl8daka6wpxclxc1b1pm5cjbz616p8nbmb9qv";
version = "7.2.32";
sha256 = "19wqbpvsd6c6iaad00h0m0xnx4r8fj56pwfhki2cw5xdfi10lp3i";

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

php73 = generic {
version = "7.3.19";
sha256 = "199l1lr7ima92icic7b1bqlb036md78m305lc3v6zd4zw8qix70d";
version = "7.3.20";
sha256 = "1pl9bjwvdva2yx4sh465z9cr4bnr8mvv008w71sy1kqsj6a7ivf6";

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

php74 = generic {
version = "7.4.7";
sha256 = "0ynq4fz54jpzh9nxvbgn3vrdad2clbac0989ai0yrj2ryc0hs3l0";
version = "7.4.8";
sha256 = "0ql01sfg8l7y2bfwmnjxnfw9irpibnz57ssck24b00y00nkd6j3a";
};
}
6 changes: 5 additions & 1 deletion pkgs/development/perl-modules/Percona-Toolkit/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ lib, fetchFromGitHub, buildPerlPackage, DBDmysql, DBI, IOSocketSSL, TermReadKey }:
{ lib, fetchFromGitHub, buildPerlPackage, DBDmysql, DBI, IOSocketSSL, TermReadKey, shortenPerlShebang }:

buildPerlPackage {
pname = "Percona-Toolkit";
@@ -10,7 +10,11 @@ buildPerlPackage {
sha256 = "0xk4h4dzl80kf97lbx0nznx9ajrb6kkg7k3iwca3rj6f3rqggv9y";
};
outputs = [ "out" ];
nativeBuildInputs = [ shortenPerlShebang ];
buildInputs = [ DBDmysql DBI IOSocketSSL TermReadKey ];
postInstall = ''
shortenPerlShebang $(grep -l "/bin/env perl" $out/bin/*)
'';
meta = {
description = ''Collection of advanced command-line tools to perform a variety of MySQL and system tasks.'';
homepage = http://www.percona.com/software/percona-toolkit;
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.15.2";
version = "1.16.1";

src = fetchPypi {
inherit pname version;
sha256 = "1qsrpzq6i2zakpi9sa5sjnjd4bk92n7zgkpcmpaa4sd9ya1wqifb";
sha256 = "0kkja67h5ky94q5zj3790zx0nw5r8qksndvdg6gk6h0s1xb74iqa";
};

patches = [
10 changes: 9 additions & 1 deletion pkgs/servers/web-apps/wallabag/default.nix
View file
Original file line number Diff line number Diff line change
@@ -13,7 +13,15 @@ stdenv.mkDerivation rec {

outputs = [ "out" ];

patches = [ ./wallabag-data.patch ]; # exposes $WALLABAG_DATA
patches = [
./wallabag-data.patch # exposes $WALLABAG_DATA
(fetchurl {
# Fixes "Uncaught RuntimeException: Setting "piwik_enabled" couldn't be found."; https://github.com/wallabag/wallabag/issues/3662
# Remove >= 2.4.0
url = "https://github.com/wallabag/wallabag/pull/3868.patch";
sha256 = "0pfxsv8ncaxkjkybim3v3iswmfv1vbjlzmvj50nn9blvjwc9gxjg";
})
];

dontBuild = true;