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

Commits on Oct 25, 2019

  1. nixos/nextcloud: update config for "urgent security issue" 

    https://nextcloud.com/blog/urgent-security-issue-in-nginx-php-fpm/
(cherry picked from commit f6c45bf)
    @dtzWill @Ma27
    dtzWill authored and Ma27 committed Oct 25, 2019
    Copy the full SHA
    3afeb36 View commit details

  2. php: 7.2.23 -> 7.2.24, 7.3.10 -> 7.3.11 

    (cherry picked from commit a480006)
    @aanderse @etu
    aanderse authored and etu committed Oct 25, 2019
    Copy the full SHA
    f42d440 View commit details

  3. epsxe: fix link with openssl 

    * epsxe: fix link with openssl

Epsxe is hardcoded to build with openssl-1.0 (using libcrypto.so.1.0.0),
but current nixpkgs contains openssl-1.1, which provides
libcrypto.so.1.1.

This patchs just uses the previous version of the library.

* epsxe: use autoPatchelfHook instead of manual rpath overriding

This simplifies the file AND generates failures at build time if a
needed dynamic library is not found during build time.

Backport of #71920

(cherry picked from commit 4a2475c)
    @guibou @c0bw3b
    guibou authored and c0bw3b committed Oct 25, 2019
    Copy the full SHA
    81b32ec View commit details

  4. Merge pull request #71995 from etu/php-updates-release-1909 

    [19.09] php: 7.2.23 -> 7.2.24, 7.3.10 -> 7.3.11
    @globin
    globin authored Oct 25, 2019
    Copy the full SHA
    ef1598a View commit details
Showing with 9 additions and 12 deletions.
  1. +2 −1 nixos/modules/services/web-apps/nextcloud.nix
  2. +4 −4 pkgs/development/interpreters/php/default.nix
  3. +3 −7 pkgs/misc/emulators/epsxe/default.nix
3 changes: 2 additions & 1 deletion nixos/modules/services/web-apps/nextcloud.nix
View file
Original file line number Diff line number Diff line change
@@ -467,7 +467,7 @@ in {
};
"/" = {
priority = 200;
extraConfig = "rewrite ^ /index.php$request_uri;";
extraConfig = "rewrite ^ /index.php;";
};
"~ ^/store-apps" = {
priority = 201;
@@ -494,6 +494,7 @@ in {
extraConfig = ''
include ${config.services.nginx.package}/conf/fastcgi.conf;
fastcgi_split_path_info ^(.+\.php)(\\/.*)$;
try_files $fastcgi_script_name =404;
fastcgi_param PATH_INFO $fastcgi_path_info;
fastcgi_param HTTPS ${if cfg.https then "on" else "off"};
fastcgi_param modHeadersAvailable true;
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.23";
sha256 = "03a3snx8wdn2pwfy8qdk035da9g3qdnpgqvpz4qfgmr97mjg6ym1";
version = "7.2.24";
sha256 = "00znhjcn6k4mbxz6jqlqf6bzr4cqdf8pnbmxkg6bns1hnr6r6yd0";

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

php73 = generic {
version = "7.3.10";
sha256 = "0j2lqiw8miv9aqg55z2dvfg3mwm5vyqx6ggmfbw013zvq1qxhvah";
version = "7.3.11";
sha256 = "1rxm256vhnvyabfwmyv51sqrkjlid1g8lczcy4skc2f72d5zzlcj";

# https://bugs.php.net/bug.php?id=76826
extraPatches = optional stdenv.isDarwin ./php73-darwin-isfinite.patch;
10 changes: 3 additions & 7 deletions pkgs/misc/emulators/epsxe/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, alsaLib, curl, gdk-pixbuf, glib, gtk3, libGLU_combined,
libX11, openssl, ncurses5, SDL, SDL_ttf, unzip, zlib, wrapGAppsHook }:
libX11, openssl_1_0_2, ncurses5, SDL, SDL_ttf, unzip, zlib, wrapGAppsHook, autoPatchelfHook }:

with stdenv.lib;

@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
else "1677lclam557kp8jwvchdrk27zfj50fqx2q9i3bcx26d9k61q3kl";
};

nativeBuildInputs = [ unzip wrapGAppsHook ];
nativeBuildInputs = [ unzip wrapGAppsHook autoPatchelfHook ];
sourceRoot = ".";

buildInputs = [
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
gtk3
libX11
libGLU_combined
openssl
openssl_1_0_2
ncurses5
SDL
SDL_ttf
@@ -40,10 +40,6 @@ stdenv.mkDerivation rec {

installPhase = ''
install -D ${if stdenv.is64bit then "epsxe_x64" else "ePSXe"} $out/bin/epsxe
patchelf \
--set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) \
--set-rpath ${makeLibraryPath buildInputs} \
$out/bin/epsxe
'';

meta = {