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: 69699d620278
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: 2a9e034690a2
Choose a head ref
  • 8 commits
  • 4 files changed
  • 6 contributors

Commits on Jul 5, 2019

  1. php73: 7.3.6 -> 7.3.7 

    Changelog: https://www.php.net/ChangeLog-7.php#7.3.7
    @etu
    etu committed Jul 5, 2019
    Copy the full SHA
    c2ac19f View commit details

  2. php72: 7.2.19 -> 7.2.20 

    Changelog: https://www.php.net/ChangeLog-7.php#7.2.20
    @etu
    etu committed Jul 5, 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
    bd1b55d View commit details

  3. brave: Add libpulseaudio 

    Fixes #63966
    @gloaming
    gloaming committed Jul 5, 2019
    Copy the full SHA
    fdfc29d View commit details

  4. Merge pull request #64326 from etu/php-upgrades 

    php: 7.2.19 -> 7.2.20, 7.3.6 -> 7.3.7
    @aanderse
    aanderse authored Jul 5, 2019
    Copy the full SHA
    2720a1c View commit details

Commits on Jul 6, 2019

  1. nixos/restya-board: Fix phpfpm.pools option

    Tyler Slabinski committed Jul 6, 2019
    Copy the full SHA
    120cf90 View commit details

  2. cozy: fix runtime error 

    Workaround #56943

Fixes #57029
    @worldofpeace
    worldofpeace committed Jul 6, 2019
    Copy the full SHA
    c210b8b View commit details

  3. Merge pull request #63339 from Slabity/master 

    Fix restya-board's phpfpm.pools option
    @infinisil
    infinisil authored Jul 6, 2019
    Copy the full SHA
    944e21c View commit details

  4. Merge pull request #64331 from gloaming/brave-pulseaudio 

    brave: Add libpulseaudio
    @worldofpeace
    worldofpeace authored Jul 6, 2019
    Copy the full SHA
    2a9e034 View commit details
2 changes: 1 addition & 1 deletion nixos/modules/services/web-apps/restya-board.nix
View file
Original file line number Diff line number Diff line change
@@ -178,7 +178,7 @@ in

config = mkIf cfg.enable {

services.phpfpm.poolConfigs = {
services.phpfpm.pools = {
"${poolName}" = {
listen = phpfpmSocketName;
phpOptions = ''
5 changes: 5 additions & 0 deletions pkgs/applications/audio/cozy-audiobooks/default.nix
View file
Original file line number Diff line number Diff line change
@@ -22,6 +22,11 @@ python3Packages.buildPythonApplication rec {
pname = "cozy";
version = "0.6.7";

# Temporary fix
# See https://github.com/NixOS/nixpkgs/issues/57029
# and https://github.com/NixOS/nixpkgs/issues/56943
strictDeps = false;

src = fetchFromGitHub {
owner = "geigi";
repo = pname;
2 changes: 2 additions & 0 deletions pkgs/applications/networking/browsers/brave/default.nix
View file
Original file line number Diff line number Diff line change
@@ -16,6 +16,7 @@
, gnome3
, gsettings-desktop-schemas
, gtk3
, libpulseaudio
, libuuid
, libX11
, libXcomposite
@@ -55,6 +56,7 @@ rpath = lib.makeLibraryPath [
glib
gnome2.GConf
gtk3
libpulseaudio
libX11
libXScrnSaver
libXcomposite
8 changes: 4 additions & 4 deletions pkgs/development/interpreters/php/default.nix
View file
Original file line number Diff line number Diff line change
@@ -254,16 +254,16 @@ let

in {
php72 = generic {
version = "7.2.19";
sha256 = "16d0j0d4563bcrxlw5yysldscxpgyp917hmc4m4ys1zyfprv3l7b";
version = "7.2.20";
sha256 = "116a1m0xjn2yi8d5kwzjk335q4brgl7xplcji2p87i2l9vjjkf4z";

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

php73 = generic {
version = "7.3.6";
sha256 = "0xvgdxmhk0hsx8gh3ircm2s7pf59gm8i9a73204mr0sl05qchnhy";
version = "7.3.7";
sha256 = "065z2q6imjxlbh6w1r7565ygqhigfbzcz70iaic74hj626kqyq63";

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