diff options
author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2020-08-08 21:40:31 +0200 |
---|---|---|
committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2020-08-16 00:21:02 +0200 |
commit | 2053ddac783c931053676ebc2b02bc8b82d89399 (patch) | |
tree | 2f5a9533bc41a482533993f00c9fd3ca4d2b108b /pkgs/status_engine | |
parent | 69e6151c0c324f920eccb34568ed7ff523592589 (diff) | |
download | Nix-2053ddac783c931053676ebc2b02bc8b82d89399.tar.gz Nix-2053ddac783c931053676ebc2b02bc8b82d89399.tar.zst Nix-2053ddac783c931053676ebc2b02bc8b82d89399.zip |
Upgrade nixos-unstable
Diffstat (limited to 'pkgs/status_engine')
-rw-r--r-- | pkgs/status_engine/worker.nix | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/pkgs/status_engine/worker.nix b/pkgs/status_engine/worker.nix index 6c14449..1232303 100644 --- a/pkgs/status_engine/worker.nix +++ b/pkgs/status_engine/worker.nix | |||
@@ -1,7 +1,6 @@ | |||
1 | { stdenv, mylibs, composerEnv, fetchurl, gearmand, callPackage, php73, php73base, config_file ? "/var/lib/status_engine/ui.yml" }: | 1 | { stdenv, mylibs, composerEnv, fetchurl, gearmand, callPackage, php73, config_file ? "/var/lib/status_engine/ui.yml" }: |
2 | let | 2 | let |
3 | # FIXME: present in php73.buildPecl in latest nixpkgs-unstable | 3 | gearman = php73.buildPecl rec { |
4 | gearman = (callPackage <nixpkgs/pkgs/build-support/build-pecl.nix> { php = php73base; }) rec { | ||
5 | version = "2.0.6"; | 4 | version = "2.0.6"; |
6 | pname = "gearman"; | 5 | pname = "gearman"; |
7 | src = fetchurl { | 6 | src = fetchurl { |
@@ -13,7 +12,7 @@ let | |||
13 | }; | 12 | }; |
14 | in | 13 | in |
15 | (composerEnv.override { | 14 | (composerEnv.override { |
16 | php = php73.withExtensions(e: php73.enabledExtensions ++ (with php73.extensions; [gearman redis mbstring bcmath json iconv])); | 15 | php = php73.withExtensions({ enabled, all }: enabled ++ (with all; [gearman redis mbstring bcmath json iconv])); |
17 | }).buildPackage (mylibs.fetchedGithub ./worker.json // | 16 | }).buildPackage (mylibs.fetchedGithub ./worker.json // |
18 | import ./worker_php_packages.nix { inherit composerEnv fetchurl; } // rec { | 17 | import ./worker_php_packages.nix { inherit composerEnv fetchurl; } // rec { |
19 | postInstall = '' | 18 | postInstall = '' |