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: 2b292fedbff6
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: 5965316f7488
Choose a head ref
  • 8 commits
  • 2 files changed
  • 3 contributors

Commits on Apr 28, 2018

  1. php70: 7.0.28 -> 7.0.29 

    Changelog: http://www.php.net/ChangeLog-7.php#7.0.29
(cherry picked from commit a56b5d6)
    @etu @Mic92
    etu authored and Mic92 committed Apr 28, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    Mic92 Jörg Thalheim
    GPG key ID: CA4106B8D7CC79FA
    Verified
    Learn about vigilant mode
    Copy the full SHA
    d68f32e View commit details

  2. php71: 7.1.15 -> 7.1.16 

    Changelog: http://www.php.net/ChangeLog-7.php#7.1.16
(cherry picked from commit 9b59a91)
    @etu @Mic92
    etu authored and Mic92 committed Apr 28, 2018
    Copy the full SHA
    ca82aa9 View commit details

  3. php56: 5.6.34 -> 5.6.35 

    Changelog: http://www.php.net/ChangeLog-5.php#5.6.35
(cherry picked from commit 1300081)
    @etu @Mic92
    etu authored and Mic92 committed Apr 28, 2018
    Copy the full SHA
    0ec977f View commit details

  4. php56: 5.6.35 -> 5.6.36 

    Changelog: http://www.php.net/ChangeLog-5.php#5.6.36
(cherry picked from commit 51190e4)
    @etu @Mic92
    etu authored and Mic92 committed Apr 28, 2018
    Copy the full SHA
    85b7bd0 View commit details

  5. php70: 7.0.29 -> 7.0.30 

    Changelog: http://www.php.net/ChangeLog-7.php#7.0.30
(cherry picked from commit bd547f6)
    @etu @Mic92
    etu authored and Mic92 committed Apr 28, 2018
    Copy the full SHA
    21b39d0 View commit details

  6. php71: 7.1.16 -> 7.1.17 

    Changelog: http://www.php.net/ChangeLog-7.php#7.1.17
(cherry picked from commit 707f7ca)
    @etu @Mic92
    etu authored and Mic92 committed Apr 28, 2018
    Copy the full SHA
    3175676 View commit details

  7. php: 7.2.4 -> 7.2.5 

    Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/php/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/zlkvhv6z2l08gawl8w2vnc7pb3v6p815-php-7.2.5/bin/phar.phar help’ got 0 exit code
- ran ‘/nix/store/zlkvhv6z2l08gawl8w2vnc7pb3v6p815-php-7.2.5/bin/phar help’ got 0 exit code
- ran ‘/nix/store/zlkvhv6z2l08gawl8w2vnc7pb3v6p815-php-7.2.5/bin/php -h’ got 0 exit code
- ran ‘/nix/store/zlkvhv6z2l08gawl8w2vnc7pb3v6p815-php-7.2.5/bin/php --help’ got 0 exit code
- ran ‘/nix/store/zlkvhv6z2l08gawl8w2vnc7pb3v6p815-php-7.2.5/bin/phpdbg help’ got 0 exit code
- ran ‘/nix/store/zlkvhv6z2l08gawl8w2vnc7pb3v6p815-php-7.2.5/bin/php-cgi -h’ got 0 exit code
- ran ‘/nix/store/zlkvhv6z2l08gawl8w2vnc7pb3v6p815-php-7.2.5/bin/php-cgi --help’ got 0 exit code
- ran ‘/nix/store/zlkvhv6z2l08gawl8w2vnc7pb3v6p815-php-7.2.5/bin/pear -h’ got 0 exit code
- ran ‘/nix/store/zlkvhv6z2l08gawl8w2vnc7pb3v6p815-php-7.2.5/bin/pear --help’ got 0 exit code
- ran ‘/nix/store/zlkvhv6z2l08gawl8w2vnc7pb3v6p815-php-7.2.5/bin/pear help’ got 0 exit code
- ran ‘/nix/store/zlkvhv6z2l08gawl8w2vnc7pb3v6p815-php-7.2.5/bin/peardev -h’ got 0 exit code
- ran ‘/nix/store/zlkvhv6z2l08gawl8w2vnc7pb3v6p815-php-7.2.5/bin/peardev --help’ got 0 exit code
- ran ‘/nix/store/zlkvhv6z2l08gawl8w2vnc7pb3v6p815-php-7.2.5/bin/peardev help’ got 0 exit code
- ran ‘/nix/store/zlkvhv6z2l08gawl8w2vnc7pb3v6p815-php-7.2.5/bin/pecl -h’ got 0 exit code
- ran ‘/nix/store/zlkvhv6z2l08gawl8w2vnc7pb3v6p815-php-7.2.5/bin/pecl --help’ got 0 exit code
- ran ‘/nix/store/zlkvhv6z2l08gawl8w2vnc7pb3v6p815-php-7.2.5/bin/pecl help’ got 0 exit code
- ran ‘/nix/store/zlkvhv6z2l08gawl8w2vnc7pb3v6p815-php-7.2.5/bin/php-fpm -h’ got 0 exit code
- ran ‘/nix/store/zlkvhv6z2l08gawl8w2vnc7pb3v6p815-php-7.2.5/bin/php-fpm --help’ got 0 exit code
- found 7.2.5 with grep in /nix/store/zlkvhv6z2l08gawl8w2vnc7pb3v6p815-php-7.2.5
- directory tree listing: https://gist.github.com/c9aa24f676de9bcd4cc434c086932362

(cherry picked from commit 1ec8160)
    @Mic92
    R. RyanTM authored and Mic92 committed Apr 28, 2018
    Copy the full SHA
    a67a7e4 View commit details

  8. nixos/tests/chromium: Wait 10s after new window 

    This is a very very very ugly workaround and it's because Chromium seems
to eat keystroke for a few seconds after a new window is created.

I haven't found a better solution yet, so let's at least unbreak the
test until we come up with a better way.

Thanks to @vcunat for bringing this to my attention and also doing the
initial bisect.

The change that brought up this problem was 2b29e40,
which updated Chromium from version 65.0.3325.181 to version
66.0.3359.117. Unfortunately the upstream changelog[1] is way too large
to actually guess what the breaking change is.

[1]: https://chromium.googlesource.com/chromium/src/+log/65.0.3325.181..66.0.3359.117?pretty=fuller&n=10000

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @bendlas, @vcunat
(cherry picked from commit 1b1b76f)
    @aszlig @vcunat
    aszlig authored and vcunat committed Apr 28, 2018
    Copy the full SHA
    5965316 View commit details
Showing with 13 additions and 8 deletions.
  1. +5 −0 nixos/tests/chromium.nix
  2. +8 −8 pkgs/development/interpreters/php/default.nix
5 changes: 5 additions & 0 deletions nixos/tests/chromium.nix
View file
Original file line number Diff line number Diff line change
@@ -94,6 +94,11 @@ mapAttrs (channel: chromiumPkg: makeTest rec {
''}");
if ($status == 0) {
$ret = 1;
# XXX: Somehow Chromium is not accepting keystrokes for a few
# seconds after a new window has appeared, so let's wait a while.
$machine->sleep(10);
last;
}
$machine->sleep(1);
16 changes: 8 additions & 8 deletions pkgs/development/interpreters/php/default.nix
View file
Original file line number Diff line number Diff line change
@@ -338,22 +338,22 @@ let

in {
php56 = generic {
version = "5.6.34";
sha256 = "1kgjgkabhrm8ksmh6j3m59vm85n401mcn7inh03hnjzfijflk7z1";
version = "5.6.36";
sha256 = "0ahp9vk33dpsqgld0gg4npff67v0l39hs3wk5dm6h3lablzhwsk2";
};

php70 = generic {
version = "7.0.28";
sha256 = "0zrw0saqlfv60f3nmff7288wqfhdsfiqns4ys3ii0drzc6s92m5f";
version = "7.0.30";
sha256 = "0l0bhnlgxmfl7mrdykmxfl53simxsksdcnbg5ymqz6r31i03hgr1";
};

php71 = generic {
version = "7.1.15";
sha256 = "1gfw3ab9pvv034l9xk7ry23xsdz9vcwksrvmzkjmsj79713sa5z1";
version = "7.1.17";
sha256 = "1kyvg1dvn2zddlc7apl8c74wlwz45rxx10fr1s4z6l1cannf6971";
};

php72 = generic {
version = "7.2.4";
sha256 = "1wvy8jdd1l5hmdqgw7lq2ynkim3mxfsx8q7vp4il1jadfq6qlr8i";
version = "7.2.5";
sha256 = "0cb0g64mzkir81js27vjwqr8vh043f62ynqvds5n4ygsivx0x0pk";
};
}