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: d19cb7521d06
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: 7aa31178e3ff
Choose a head ref
  • 6 commits
  • 2 files changed
  • 4 contributors

Commits on Sep 6, 2019

  1. signal-desktop: 1.27.1 -> 1.27.2 

    (cherry picked from commit 042b63d)
Reason: Avoid an expired (unusable) release in the stable release
(Signal-Desktop releases expire after a few months).
    @primeos
    primeos committed Sep 6, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    mweinelt Martin Weinelt
    GPG key ID: BD4AA0528F63F17E
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    06ba45c View commit details

Commits on Sep 7, 2019

  1. php73: 7.3.8 -> 7.3.9 (security) 

    https://www.php.net/archive/2019.php#2019-08-29-1

https://www.php.net/ChangeLog-7.php#7.3.9
(cherry picked from commit 00039ef)
    @dtzWill @etu
    dtzWill authored and etu committed Sep 7, 2019

    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
    759a408 View commit details

  2. php72: 7.2.21 -> 7.2.22 

    Changelog: https://www.php.net/ChangeLog-7.php#7.2.22
(cherry picked from commit 125d068)
    @etu
    etu committed Sep 7, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    Ma27 Maximilian Bosch
    GPG key ID: 091DBF4D1FC46B8E
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    03dcb3d View commit details

  3. php71: 7.1.30 -> 7.1.32 

    Changelog: https://www.php.net/ChangeLog-7.php#7.1.31
Changelog: https://www.php.net/ChangeLog-7.php#7.1.32
    @etu
    etu committed Sep 7, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    Ma27 Maximilian Bosch
    GPG key ID: 091DBF4D1FC46B8E
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    b10acd3 View commit details

  4. Merge pull request #68232 from primeos/signal-desktop-backport 

    [19.03] signal-desktop: 1.26.2 -> 1.27.1 (backport)
    @primeos
    primeos authored Sep 7, 2019
    Copy the full SHA
    92650cb View commit details

  5. Merge pull request #68262 from etu/1903-php-updates 

    [19.03] php: 7.1.30 -> 7.1.32, 7.2.21 -> 7.2.22, 7.3.8 -> 7.3.9
    @globin
    globin authored Sep 7, 2019
    Copy the full SHA
    7aa3117 View commit details
Showing with 8 additions and 8 deletions.
  1. +2 −2 pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
  2. +6 −6 pkgs/development/interpreters/php/default.nix
4 changes: 2 additions & 2 deletions pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
View file
Original file line number Diff line number Diff line change
@@ -58,11 +58,11 @@ let

in stdenv.mkDerivation rec {
name = "signal-desktop-${version}";
version = "1.27.1";
version = "1.27.2";

src = fetchurl {
url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
sha256 = "16fg60c5r7zcjs8ya6jk33l5kz8m21y9a1si3i0a2dvyaclz4a3q";
sha256 = "08qh7867bc6z6mdbdilqdacx67n0kaxl3m4m97k0jxhd093a8xfz";
};

phases = [ "unpackPhase" "installPhase" ];
12 changes: 6 additions & 6 deletions pkgs/development/interpreters/php/default.nix
View file
Original file line number Diff line number Diff line change
@@ -248,24 +248,24 @@ let

in {
php71 = generic {
version = "7.1.30";
sha256 = "1czcf5qwk727sdzx5n4wvsxvl50jx6d5x8ws1dqx46fa9xvm0j36";
version = "7.1.32";
sha256 = "0ymbkj8117pakcs40rkkrsrvcc2rn9nrd7ilcdzw2nn7vnns3iyp";

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

php72 = generic {
version = "7.2.21";
sha256 = "1vqldc2namfblwyv87fgpfffkjpzawfpcp48f40nfdl3pshq6c9l";
version = "7.2.22";
sha256 = "12phn0rrd5r1j6xlz83h7v6gszmj4lb5gwj927psbbc6nn1rh2n1";

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

php73 = generic {
version = "7.3.8";
sha256 = "1xbndimrfamf97m3vln842g9w1ikq071gjfkk15ai7sx2wqccrnm";
version = "7.3.9";
sha256 = "1i33v50rbqrfwjwch1d46mbpwbxrg1xfycs9mjl7xsy9m04rg753";

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