nixos: adjust to 20.09 changes

Most notably the php5 expression needed to be reworked.
This commit is contained in:
steveej 2020-10-18 20:14:11 +02:00
parent 89c9f9e606
commit 405ca2ade4
4 changed files with 47 additions and 24 deletions

View file

@ -1,12 +1,5 @@
{ pkgs }:
let
# one application requires php5
nixpkgsWithPhp5 = pkgs.fetchFromGitHub {
owner = "nixos";
repo = "nixpkgs-channels";
rev = "846d8f8305192dcc3a63139102698b4ac6b9ef9f";
sha256 = "1qifgc1q2i4g0ivpfjnxp4jl2cc82gfjws08dsllgw7q7kw4b4rb";
};
in rec {
nixpkgs-master = import <nixpkgs-master> {};
@ -31,7 +24,7 @@ in rec {
extraMeta.branch = "5.4";
} // (args.argsOverride or {}));
linux_sgx = pkgs.callPackage linux_sgx_pkg {};
in
in
pkgs.recurseIntoAttrs (pkgs.linuxPackagesFor linux_sgx);
linuxPackages_sgx_latest = linuxPackages_sgx_540rc3;
@ -47,11 +40,32 @@ in rec {
enableStatic = true;
};
php56 = (pkgs.callPackages
"${nixpkgsWithPhp5}/pkgs/development/interpreters/php/default.nix" {
php5 = let
nixpkgsWithPhp5 = pkgs.fetchFromGitHub {
owner = "nixos";
repo = "nixpkgs-channels";
rev = "pkgs";
sha256 = "1qifgc1q2i4g0ivpfjnxp4jl2cc82gfjws08dsllgw7q7kw4b4rb";
};
php5 = (pkgs.callPackage "${nixpkgsWithPhp5}/pkgs/development/interpreters/php/default.nix" {
config = (pkgs.lib.attrsets.recursiveUpdate
pkgs.config
{
php = {
imap = false;
openssl = false;
curl = false;
ldap = false;
mcrypt = false;
};
}
);
stdenv = pkgs.llvmPackages_6.stdenv; #broken
icu = pkgs.icu60;
})
.php56.overrideAttrs(drv: rec {
}).php56;
in
php5
.overrideAttrs(attrs: rec {
# See https://secure.php.net/ChangeLog-5.php
version = "5.6.40";
name = "php-${version}";
@ -61,6 +75,11 @@ in rec {
url = "http://www.php.net/distributions/php-${version}.tar.bz2";
inherit sha256;
};
configureFlags = attrs.configureFlags ++ [
"--without-fpm-systemd"
];
});
duplicacy = pkgs.callPackage ../pkgs/duplicacy {};