commit c06baac6ff94e853527092fc0c692ade2de512ba · pyrox.dev/nixpkgs

+5 -1

maintainers/maintainer-list.nix

···

       8784
       8784
        
           }];

     

       8785
       8785
        
         };

     

       8786
       8786
        
         roosemberth = {

     

       8787
       8787
       -
           email = "roosembert.palacios+nixpkgs@gmail.com";

     

       8787
       8787
       +
           email = "roosembert.palacios+nixpkgs@posteo.ch";

     

       8788
       8788
        
           github = "roosemberth";

     

       8789
       8789
        
           githubId = 3621083;

     

       8790
       8790
        
           name = "Roosembert (Roosemberth) Palacios";

     

       8791
       8791
       +
           keys = [{

     

       8792
       8792
       +
             longkeyid = "rsa2048/0xCAAAECE5C2242BB7";

     

       8793
       8793
       +
             fingerprint = "78D9 1871 D059 663B 6117  7532 CAAA ECE5 C224 2BB7";

     

       8794
       8794
       +
           }];

     

       8791
       8795
        
         };

     

       8792
       8796
        
         rople380 = {

     

       8793
       8797
        
           name = "rople380";

+13 -2

nixos/doc/manual/from_md/release-notes/rl-2111.section.xml

···

       14
       14
        
         </itemizedlist>

     

       15
       15
        
         <section xml:id="highlights">

     

       16
       16
        
           <title>Highlights</title>

     

       17
       17
       -
           <para>

     

       18
       18
       -
           </para>

     

       17
       17
       +
           <itemizedlist spacing="compact">

     

       18
       18
       +
             <listitem>

     

       19
       19
       +
               <para>

     

       20
       20
       +
                 PHP now defaults to PHP 8.0, updated from 7.4.

     

       21
       21
       +
               </para>

     

       22
       22
       +
             </listitem>

     

       23
       23
       +
           </itemizedlist>

     

       19
       24
        
         </section>

     

       20
       25
        
         <section xml:id="new-services">

     

       21
       26
        
           <title>New Services</title>

     
···

       43
       48
        
                 <literal>services.geoip-updater</literal> was broken and has

     

       44
       49
        
                 been replaced by

     

       45
       50
        
                 <link xlink:href="options.html#opt-services.geoipupdate.enable">services.geoipupdate</link>.

     

       51
       51
       +
               </para>

     

       52
       52
       +
             </listitem>

     

       53
       53
       +
             <listitem>

     

       54
       54
       +
               <para>

     

       55
       55
       +
                 PHP 7.3 is no longer supported due to upstream not supporting

     

       56
       56
       +
                 this version for the entire lifecycle of the 21.11 release.

     

       46
       57
        
               </para>

     

       47
       58
        
             </listitem>

     

       48
       59
        
           </itemizedlist>

nixos/doc/manual/release-notes/rl-2111.section.md

···

       6
       6
        
       

     

       7
       7
        
       ## Highlights

     

       8
       8
        
       

     

       9
       9
       +
       * PHP now defaults to PHP 8.0, updated from 7.4.

     

       10
       10
       +
       

     

       9
       11
        
       ## New Services

     

       10
       12
        
       

     

       11
       13
        
       * [geoipupdate](https://github.com/maxmind/geoipupdate), a GeoIP

     
···

       18
       20
        
       

     

       19
       21
        
       * `services.geoip-updater` was broken and has been replaced by

     

       20
       22
        
         [services.geoipupdate](options.html#opt-services.geoipupdate.enable).

     

       23
       23
       +
       

     

       24
       24
       +
       * PHP 7.3 is no longer supported due to upstream not supporting this

     

       25
       25
       +
         version for the entire lifecycle of the 21.11 release.

     

       21
       26
        
       

     

       22
       27
        
       ## Other Notable Changes

+16 -1

nixos/modules/services/monitoring/prometheus/exporters/dovecot.nix

···

       35
       35
        
               {

     

       36
       36
        
                 <xref linkend="opt-services.prometheus.exporters.dovecot.enable" /> = true;

     

       37
       37
        
                 <xref linkend="opt-services.prometheus.exporters.dovecot.socketPath" /> = "/var/run/dovecot2/old-stats";

     

       38
       38
       +
                 <xref linkend="opt-services.dovecot2.mailPlugins.globally.enable" /> = [ "old_stats" ];

     

       38
       39
        
                 <xref linkend="opt-services.dovecot2.extraConfig" /> = '''

     

       39
       39
       -
                   mail_plugins = $mail_plugins old_stats

     

       40
       40
        
                   service old-stats {

     

       41
       41
        
                     unix_listener old-stats {

     

       42
       42
        
                       user = dovecot-exporter

     

       43
       43
        
                       group = dovecot-exporter

     

       44
       44
       +
                       mode = 0660

     

       44
       45
        
                     }

     

       46
       46
       +
                     fifo_listener old-stats-mail {

     

       47
       47
       +
                       mode = 0660

     

       48
       48
       +
                       user = dovecot

     

       49
       49
       +
                       group = dovecot

     

       50
       50
       +
                     }

     

       51
       51
       +
                     fifo_listener old-stats-user {

     

       52
       52
       +
                       mode = 0660

     

       53
       53
       +
                       user = dovecot

     

       54
       54
       +
                       group = dovecot

     

       55
       55
       +
                     }

     

       56
       56
       +
                   }

     

       57
       57
       +
                   plugin {

     

       58
       58
       +
                     old_stats_refresh = 30 secs

     

       59
       59
       +
                     old_stats_track_cmds = yes

     

       45
       60
        
                   }

     

       46
       61
        
                 ''';

     

       47
       62
        
               }

+18

nixos/modules/services/monitoring/prometheus/exporters/mail.nix

···

       112
       112
        
             '';

     

       113
       113
        
             description = ''

     

       114
       114
        
               List of servers that should be probed.

     

       115
       115
       +
       

     

       116
       116
       +
               <emphasis>Note:</emphasis> if your mailserver has <citerefentry>

     

       117
       117
       +
               <refentrytitle>rspamd</refentrytitle><manvolnum>8</manvolnum></citerefentry> configured,

     

       118
       118
       +
               it can happen that emails from this exporter are marked as spam.

     

       119
       119
       +
       

     

       120
       120
       +
               It's possible to work around the issue with a config like this:

     

       121
       121
       +
               <programlisting>

     

       122
       122
       +
               {

     

       123
       123
       +
                 <link linkend="opt-services.rspamd.locals._name_.text">services.rspamd.locals."multimap.conf".text</link> = '''

     

       124
       124
       +
                   ALLOWLIST_PROMETHEUS {

     

       125
       125
       +
                     filter = "email:domain:tld";

     

       126
       126
       +
                     type = "from";

     

       127
       127
       +
                     map = "''${pkgs.writeText "allowmap" "domain.tld"}";

     

       128
       128
       +
                     score = -100.0;

     

       129
       129
       +
                   }

     

       130
       130
       +
                 ''';

     

       131
       131
       +
               }

     

       132
       132
       +
               </programlisting>

     

       115
       133
        
             '';

     

       116
       134
        
           };

     

       117
       135
        
         };

+17 -19

nixos/modules/services/monitoring/prometheus/exporters/rspamd.nix

···

       5
       5
        
       let

     

       6
       6
        
         cfg = config.services.prometheus.exporters.rspamd;

     

       7
       7
        
       

     

       8
       8
       -
         prettyJSON = conf:

     

       9
       9
       -
           pkgs.runCommand "rspamd-exporter-config.yml" { } ''

     

       10
       10
       -
             echo '${builtins.toJSON conf}' | ${pkgs.buildPackages.jq}/bin/jq '.' > $out

     

       11
       11
       -
           '';

     

       8
       8
       +
         mkFile = conf:

     

       9
       9
       +
           pkgs.writeText "rspamd-exporter-config.yml" (builtins.toJSON conf);

     

       12
       10
        
       

     

       13
       11
        
         generateConfig = extraLabels: {

     

       14
       12
        
           metrics = (map (path: {

     

       15
       15
       -
             name = "rspamd_${replaceStrings [ "." " " ] [ "_" "_" ] path}";

     

       13
       13
       +
             name = "rspamd_${replaceStrings [ "[" "." " " "]" "\\" "'" ] [ "_" "_" "_" "" "" "" ] path}";

     

       16
       14
        
             path = "{ .${path} }";

     

       17
       15
        
             labels = extraLabels;

     

       18
       16
        
           }) [

     

       19
       19
       -
             "actions.'add header'"

     

       20
       20
       -
             "actions.'no action'"

     

       21
       21
       -
             "actions.'rewrite subject'"

     

       22
       22
       -
             "actions.'soft reject'"

     

       17
       17
       +
             "actions['add\\ header']"

     

       18
       18
       +
             "actions['no\\ action']"

     

       19
       19
       +
             "actions['rewrite\\ subject']"

     

       20
       20
       +
             "actions['soft\\ reject']"

     

       23
       21
        
             "actions.greylist"

     

       24
       22
        
             "actions.reject"

     

       25
       23
        
             "bytes_allocated"

     
···

       40
       38
        
           ]) ++ [{

     

       41
       39
        
             name = "rspamd_statfiles";

     

       42
       40
        
             type = "object";

     

       43
       43
       -
             path = "$.statfiles[*]";

     

       41
       41
       +
             path = "{.statfiles[*]}";

     

       44
       42
        
             labels = recursiveUpdate {

     

       45
       45
       -
               symbol = "$.symbol";

     

       46
       46
       -
               type = "$.type";

     

       43
       43
       +
               symbol = "{.symbol}";

     

       44
       44
       +
               type = "{.type}";

     

       47
       45
        
             } extraLabels;

     

       48
       46
        
             values = {

     

       49
       49
       -
               revision = "$.revision";

     

       50
       50
       -
               size = "$.size";

     

       51
       51
       -
               total = "$.total";

     

       52
       52
       -
               used = "$.used";

     

       53
       53
       -
               languages = "$.languages";

     

       54
       54
       -
               users = "$.users";

     

       47
       47
       +
               revision = "{.revision}";

     

       48
       48
       +
               size = "{.size}";

     

       49
       49
       +
               total = "{.total}";

     

       50
       50
       +
               used = "{.used}";

     

       51
       51
       +
               languages = "{.languages}";

     

       52
       52
       +
               users = "{.users}";

     

       55
       53
        
             };

     

       56
       54
        
           }];

     

       57
       55
        
         };

     
···

       76
       74
        
         };

     

       77
       75
        
         serviceOpts.serviceConfig.ExecStart = ''

     

       78
       76
        
           ${pkgs.prometheus-json-exporter}/bin/json_exporter \

     

       79
       79
       -
             --config.file ${prettyJSON (generateConfig cfg.extraLabels)} \

     

       77
       77
       +
             --config.file ${mkFile (generateConfig cfg.extraLabels)} \

     

       80
       78
        
             --web.listen-address "${cfg.listenAddress}:${toString cfg.port}" \

     

       81
       79
        
             ${concatStringsSep " \\\n  " cfg.extraFlags}

     

       82
       80
        
         '';

-1

nixos/tests/all-tests.nix

···

       326
       326
        
         pgjwt = handleTest ./pgjwt.nix {};

     

       327
       327
        
         pgmanage = handleTest ./pgmanage.nix {};

     

       328
       328
        
         php = handleTest ./php {};

     

       329
       329
       -
         php73 = handleTest ./php { php = pkgs.php73; };

     

       330
       329
        
         php74 = handleTest ./php { php = pkgs.php74; };

     

       331
       330
        
         php80 = handleTest ./php { php = pkgs.php80; };

     

       332
       331
        
         pinnwand = handleTest ./pinnwand.nix {};

+18 -28

nixos/tests/web-servers/unit-php.nix

···

       1
       1
        
       import ../make-test-python.nix ({pkgs, ...}:

     

       2
       2
       -
        let

     

       3
       3
       -
           testdir = pkgs.writeTextDir "www/info.php" "<?php phpinfo();";

     

       2
       2
       +
       let

     

       3
       3
       +
         testdir = pkgs.writeTextDir "www/info.php" "<?php phpinfo();";

     

       4
       4
        
       

     

       5
       5
        
       in {

     

       6
       6
        
         name = "unit-php-test";

     
···

       9
       9
        
         machine = { config, lib, pkgs, ... }: {

     

       10
       10
        
           services.unit = {

     

       11
       11
        
             enable = true;

     

       12
       12
       -
             config = ''

     

       13
       13
       -
               {

     

       14
       14
       -
                 "listeners": {

     

       15
       15
       -
                   "*:9074": {

     

       16
       16
       -
                     "application": "php_74"

     

       17
       17
       -
                   }

     

       18
       18
       -
                 },

     

       19
       19
       -
                 "applications": {

     

       20
       20
       -
                   "php_74": {

     

       21
       21
       -
                     "type": "php 7.4",

     

       22
       22
       -
                     "processes": 1,

     

       23
       23
       -
                     "user": "testuser",

     

       24
       24
       -
                     "group": "testgroup",

     

       25
       25
       -
                     "root": "${testdir}/www",

     

       26
       26
       -
                     "index": "info.php",

     

       27
       27
       -
                     "options": {

     

       28
       28
       -
                       "file": "${pkgs.unit.usedPhp74}/lib/php.ini"

     

       29
       29
       -
                     }

     

       30
       30
       -
                   }

     

       31
       31
       -
                 }

     

       32
       32
       -
               }

     

       33
       33
       -
             '';

     

       12
       12
       +
             config = pkgs.lib.strings.toJSON {

     

       13
       13
       +
               listeners."*:9080".application = "php_80";

     

       14
       14
       +
               applications.php_80 = {

     

       15
       15
       +
                 type = "php 8.0";

     

       16
       16
       +
                 processes = 1;

     

       17
       17
       +
                 user = "testuser";

     

       18
       18
       +
                 group = "testgroup";

     

       19
       19
       +
                 root = "${testdir}/www";

     

       20
       20
       +
                 index = "info.php";

     

       21
       21
       +
                 options.file = "${pkgs.unit.usedPhp80}/lib/php.ini";

     

       22
       22
       +
               };

     

       23
       23
       +
             };

     

       34
       24
        
           };

     

       35
       25
        
           users = {

     

       36
       26
        
             users.testuser = {

     

       37
       27
        
               isSystemUser = true;

     

       38
       38
       -
               uid = 1074;

     

       28
       28
       +
               uid = 1080;

     

       39
       29
        
               group = "testgroup";

     

       40
       30
        
             };

     

       41
       31
        
             groups.testgroup = {

     

       42
       42
       -
               gid= 1074;

     

       32
       32
       +
               gid = 1080;

     

       43
       33
        
             };

     

       44
       34
        
           };

     

       45
       35
        
         };

     
···

       47
       37
        
           machine.wait_for_unit("unit.service")

     

       48
       38
        
       

     

       49
       39
        
           # Check so we get an evaluated PHP back

     

       50
       50
       -
           response = machine.succeed("curl -f -vvv -s http://127.0.0.1:9074/")

     

       51
       51
       -
           assert "PHP Version ${pkgs.unit.usedPhp74.version}" in response, "PHP version not detected"

     

       40
       40
       +
           response = machine.succeed("curl -f -vvv -s http://127.0.0.1:9080/")

     

       41
       41
       +
           assert "PHP Version ${pkgs.unit.usedPhp80.version}" in response, "PHP version not detected"

     

       52
       42
        
       

     

       53
       43
        
           # Check so we have database and some other extensions loaded

     

       54
       44
        
           for ext in ["json", "opcache", "pdo_mysql", "pdo_pgsql", "pdo_sqlite"]:

+3 -3

pkgs/applications/audio/plexamp/default.nix

···

       2
       2
        
       

     

       3
       3
        
       let

     

       4
       4
        
         pname = "plexamp";

     

       5
       5
       -
         version = "3.4.6";

     

       5
       5
       +
         version = "3.4.7";

     

       6
       6
        
         name = "${pname}-${version}";

     

       7
       7
        
       

     

       8
       8
        
         src = fetchurl {

     

       9
       9
        
           url = "https://plexamp.plex.tv/plexamp.plex.tv/desktop/Plexamp-${version}.AppImage";

     

       10
       10
        
           name="${pname}-${version}.AppImage";

     

       11
       11
       -
           sha512 = "M2iLJxpufycxnUfdn9f85l47W8HCsi/K0SPVsxyyaeKloV3g6yTyOg1luMwHBLDeXEKwR9jtuvPlIMNyBCFm8w==";

     

       11
       11
       +
           sha512 = "+jmx4X9KiK1Tv2Cjb/445MY9G2b7pLdKxFtBFMaQwRhqTItA33MfHqKBwmytmbEhxhy0LDTU2woJvEMPQCmnvg==";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         appimageContents = appimageTools.extractType2 {

     
···

       34
       34
        
         meta = with lib; {

     

       35
       35
        
           description = "A beautiful Plex music player for audiophiles, curators, and hipsters";

     

       36
       36
        
           homepage = "https://plexamp.com/";

     

       37
       37
       -
           changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/28";

     

       37
       37
       +
           changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/29";

     

       38
       38
        
           license = licenses.unfree;

     

       39
       39
        
           maintainers = with maintainers; [ killercup synthetica ];

     

       40
       40
        
           platforms = [ "x86_64-linux" ];

-1

pkgs/applications/misc/rss-bridge-cli/default.nix

pkgs/applications/networking/cluster/terraform-providers/providers.json

···

       607
       607
        
           "sha256": "1nq7k8qa7rv8xyryjigwpwcwvj1sw85c4j46rkfdv70b6js25jz3",

     

       608
       608
        
           "version": "0.3.0"

     

       609
       609
        
         },

     

       610
       610
       +
         "metal": {

     

       611
       611
       +
           "owner": "equinix",

     

       612
       612
       +
           "repo": "terraform-provider-metal",

     

       613
       613
       +
           "rev": "v2.1.0",

     

       614
       614
       +
           "sha256": "06i3rj6ig8hxbncdpa8b11v8pr3zhi90ppmf77jjin1114ikd172",

     

       615
       615
       +
           "version": "2.1.0"

     

       616
       616
       +
         },

     

       610
       617
        
         "metalcloud": {

     

       611
       618
        
           "owner": "terraform-providers",

     

       612
       619
        
           "repo": "terraform-provider-metalcloud",

+2 -2

pkgs/applications/networking/cluster/terragrunt/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "terragrunt";

     

       5
       5
       -
         version = "0.29.4";

     

       5
       5
       +
         version = "0.29.8";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "gruntwork-io";

     

       9
       9
        
           repo = pname;

     

       10
       10
        
           rev = "v${version}";

     

       11
       11
       -
           sha256 = "sha256-/LWzUVZAr4zw8mekcHybNuqe0wv4ZU8UcE0oGxq6jqY=";

     

       11
       11
       +
           sha256 = "sha256-zHfY1pl9r9N1Jx9TzbOFYt2VR9hvHWcdFhPc36Q3apE=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         vendorSha256 = "sha256-qlSCQtiGHmlk3DyETMoQbbSYhuUSZTsvAnBKuDJI8x8=";

+6 -3

pkgs/applications/networking/cluster/waypoint/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "waypoint";

     

       5
       5
       -
         version = "0.3.2";

     

       5
       5
       +
         version = "0.4.0";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "hashicorp";

     

       9
       9
        
           repo = pname;

     

       10
       10
        
           rev = "v${version}";

     

       11
       11
       -
           sha256 = "sha256-57DHImPYVFK+MXWGeArvc5fwHmqa3zodLytfDoAxglo=";

     

       11
       11
       +
           sha256 = "sha256-yeD7XtcB/2ph6cCnOcv0yFQqvAMPDLXMrUWWkgmBUaA=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         deleteVendor = true;

     

       15
       15
       -
         vendorSha256 = "sha256-HxrY35SqfUbT6VCCXkLUjAsxgtMzpOeoicAGLwD2OyA=";

     

       15
       15
       +
         vendorSha256 = "sha256-xZGYPh3Yp3g22GraYfMESVpp7j5fOZASUEvN4YaDd1g=";

     

       16
       16
        
       

     

       17
       17
        
         nativeBuildInputs = [ go-bindata installShellFiles ];

     

       18
       18
        
       

     
···

       30
       30
        
       

     

       31
       31
        
           local INSTALL="$out/bin/waypoint"

     

       32
       32
        
           install -D waypoint $out/bin/waypoint

     

       33
       33
       +
       

     

       34
       34
       +
           # waypoint's completion install command alters your <something>rc files

     

       35
       35
       +
           # below is the equivalent of what it injects

     

       33
       36
        
       

     

       34
       37
        
           # Write to a file as it doesn't like EOF within <()

     

       35
       38
        
           cat > waypoint.fish <<EOF

+3 -3

pkgs/applications/science/math/geogebra/default.nix

···

       1
       1
        
       { lib, stdenv, fetchurl, jre, makeDesktopItem, makeWrapper, unzip, language ? "en_US" }:

     

       2
       2
        
       let

     

       3
       3
        
         pname = "geogebra";

     

       4
       4
       -
         version = "5-0-620-0";

     

       4
       4
       +
         version = "5-0-644-0";

     

       5
       5
        
       

     

       6
       6
        
         srcIcon = fetchurl {

     

       7
       7
        
           url = "http://static.geogebra.org/images/geogebra-logo.svg";

     
···

       41
       41
        
           src = fetchurl {

     

       42
       42
        
             urls = [

     

       43
       43
        
               "https://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${version}.tar.bz2"

     

       44
       44
       -
               "http://web.archive.org/web/20210101213140/https://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${version}.tar.bz2"

     

       44
       44
       +
               "https://web.archive.org/web/20210604132513/https://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${version}.tar.bz2"

     

       45
       45
        
             ];

     

       46
       46
       -
             sha256 = "0v4r76b91cj0pns78gh3d432g2jlq2pz37lslg3fnnpvlfh25s9j";

     

       46
       46
       +
             sha256 = "dd992654175812d8770d94f063fc1430a743e8e0efcae03f51bf9a3a073c2522";

     

       47
       47
        
           };

     

       48
       48
        
       

     

       49
       49
        
           nativeBuildInputs = [ makeWrapper ];

+3 -3

pkgs/applications/science/math/geogebra/geogebra6.nix

···

       1
       1
        
       { lib, stdenv, unzip, fetchurl, electron_6, makeWrapper, geogebra }:

     

       2
       2
        
       let

     

       3
       3
        
         pname = "geogebra";

     

       4
       4
       -
         version = "6-0-631-0";

     

       4
       4
       +
         version = "6-0-644-0";

     

       5
       5
        
       

     

       6
       6
        
         srcIcon = geogebra.srcIcon;

     

       7
       7
        
         desktopItem = geogebra.desktopItem;

     
···

       18
       18
        
           src = fetchurl {

     

       19
       19
        
             urls = [

     

       20
       20
        
               "https://download.geogebra.org/installers/6.0/GeoGebra-Linux64-Portable-${version}.zip"

     

       21
       21
       -
               "https://web.archive.org/web/20210406083122/https://download.geogebra.org/installers/6.0/GeoGebra-Linux64-Portable-${version}.zip"

     

       21
       21
       +
               "https://web.archive.org/web/20210604132845/https://download.geogebra.org/installers/6.0/GeoGebra-Linux64-Portable-${version}.zip"

     

       22
       22
        
             ];

     

       23
       23
       -
             sha256 = "1k4jxcvxxjxfrdghs4a29zpp4yid2vh1mfgp8xxr3qlzxnqv92ha";

     

       23
       23
       +
             sha256 = "bbe9e1a35abacfd560c0b7aa1ab975853e6adac08608bb70cd80261179e3f922";

     

       24
       24
        
           };

     

       25
       25
        
       

     

       26
       26
        
           dontConfigure = true;

+10 -6

pkgs/applications/video/lightworks/default.nix

···

       1
       1
        
       { lib, stdenv, fetchurl, dpkg, makeWrapper, buildFHSUserEnv

     

       2
       2
        
       , gtk3, gdk-pixbuf, cairo, libjpeg_original, glib, pango, libGLU

     

       3
       3
       -
       , nvidia_cg_toolkit, zlib, openssl, portaudio

     

       3
       3
       +
       , libGL, nvidia_cg_toolkit, zlib, openssl, libuuid , alsaLib, udev

     

       4
       4
        
       }:

     

       5
       5
        
       let

     

       6
       6
        
         fullPath = lib.makeLibraryPath [

     
···

       11
       11
        
           libjpeg_original

     

       12
       12
        
           glib

     

       13
       13
        
           pango

     

       14
       14
       +
           libGL

     

       14
       15
        
           libGLU

     

       15
       16
        
           nvidia_cg_toolkit

     

       16
       17
        
           zlib

     

       17
       18
        
           openssl

     

       18
       18
       -
           portaudio

     

       19
       19
       +
           libuuid

     

       20
       20
       +
           alsaLib

     

       21
       21
       +
           udev

     

       19
       22
        
         ];

     

       20
       23
        
       

     

       21
       24
        
         lightworks = stdenv.mkDerivation rec {

     

       22
       22
       -
           version = "14.0.0";

     

       25
       25
       +
           version = "2021.2.1";

     

       26
       26
       +
           rev = "128456";

     

       23
       27
        
           pname = "lightworks";

     

       24
       28
        
       

     

       25
       29
        
           src =

     

       26
       30
        
             if stdenv.hostPlatform.system == "x86_64-linux" then

     

       27
       31
        
               fetchurl {

     

       28
       28
       -
                 url = "http://downloads.lwks.com/v14/lwks-14.0.0-amd64.deb";

     

       29
       29
       -
                 sha256 = "66eb9f9678d979db76199f1c99a71df0ddc017bb47dfda976b508849ab305033";

     

       32
       32
       +
                 url = "https://cdn.lwks.com/releases/${version}/lightworks_${lib.versions.majorMinor version}_r${rev}.deb";

     

       33
       33
       +
                 sha256 = "sha256-GkTg43IUF1NgEm/wT9CZw68Dw/R2BYBU/F4bsCxQowQ=";

     

       30
       34
        
               }

     

       31
       35
        
             else throw "${pname}-${version} is not supported on ${stdenv.hostPlatform.system}";

     

       32
       36
        
       

     
···

       82
       86
        
           description = "Professional Non-Linear Video Editor";

     

       83
       87
        
           homepage = "https://www.lwks.com/";

     

       84
       88
        
           license = lib.licenses.unfree;

     

       85
       85
       -
           maintainers = [ lib.maintainers.antonxy ];

     

       89
       89
       +
           maintainers = with lib.maintainers; [ antonxy vojta001 ];

     

       86
       90
        
           platforms = [ "x86_64-linux" ];

     

       87
       91
        
         };

     

       88
       92
        
       }

-20

pkgs/development/interpreters/php/7.3.nix

···

       1
       1
       -
       { callPackage, lib, stdenv, nixosTests, ... }@_args:

     

       2
       2
       -
       

     

       3
       3
       -
       let

     

       4
       4
       -
         generic = (import ./generic.nix) _args;

     

       5
       5
       -
       

     

       6
       6
       -
         base = callPackage generic (_args // {

     

       7
       7
       -
           version = "7.3.28";

     

       8
       8
       -
           sha256 = "0r4r8famg3a8x6ch24y1370nsphkxg4k9zq5x8v88f4l8mj6wqwg";

     

       9
       9
       -
       

     

       10
       10
       -
           # https://bugs.php.net/bug.php?id=76826

     

       11
       11
       -
           extraPatches = lib.optional stdenv.isDarwin ./php73-darwin-isfinite.patch;

     

       12
       12
       -
         });

     

       13
       13
       -
       

     

       14
       14
       -
       in base.withExtensions ({ all, ... }: with all; ([

     

       15
       15
       -
         bcmath calendar curl ctype dom exif fileinfo filter ftp gd

     

       16
       16
       -
         gettext gmp hash iconv intl json ldap mbstring mysqli mysqlnd

     

       17
       17
       -
         opcache openssl pcntl pdo pdo_mysql pdo_odbc pdo_pgsql pdo_sqlite

     

       18
       18
       -
         pgsql posix readline session simplexml sockets soap sodium sqlite3

     

       19
       19
       -
         tokenizer xmlreader xmlwriter zip zlib

     

       20
       20
       -
       ] ++ lib.optionals (!stdenv.isDarwin) [ imap ]))

+7 -9

pkgs/development/interpreters/php/generic.nix

···

       7
       7
        
         generic =

     

       8
       8
        
           { callPackage, lib, stdenv, nixosTests, fetchurl, makeWrapper

     

       9
       9
        
           , symlinkJoin, writeText, autoconf, automake, bison, flex, libtool

     

       10
       10
       -
           , pkg-config, re2c, apacheHttpd, libargon2, libxml2, pcre, pcre2

     

       10
       10
       +
           , pkg-config, re2c, apacheHttpd, libargon2, libxml2, pcre2

     

       11
       11
        
           , systemd, system-sendmail, valgrind, xcbuild

     

       12
       12
        
       

     

       13
       13
        
           , version

     
···

       103
       103
        
                       ${extraConfig}

     

       104
       104
        
                     '';

     

       105
       105
        
       

     

       106
       106
       -
                     phpWithExtensions = symlinkJoin rec {

     

       106
       106
       +
                     phpWithExtensions = symlinkJoin {

     

       107
       107
        
                       name = "php-with-extensions-${version}";

     

       108
       108
        
                       inherit (php) version;

     

       109
       109
        
                       nativeBuildInputs = [ makeWrapper ];

     
···

       142
       142
        
       

     

       143
       143
        
               mkWithExtensions = prevArgs: prevExtensionFunctions: extensions:

     

       144
       144
        
                 mkBuildEnv prevArgs prevExtensionFunctions { inherit extensions; };

     

       145
       145
       -
       

     

       146
       146
       -
               pcre' = if (lib.versionAtLeast version "7.3") then pcre2 else pcre;

     

       147
       145
        
             in

     

       148
       146
        
               stdenv.mkDerivation {

     

       149
       147
        
                 pname = "php";

     
···

       157
       155
        
       

     

       158
       156
        
                 buildInputs =

     

       159
       157
        
                   # PCRE extension

     

       160
       160
       -
                   [ pcre' ]

     

       158
       158
       +
                   [ pcre2 ]

     

       161
       159
        
       

     

       162
       160
        
                   # Enable sapis

     

       163
       161
        
                   ++ lib.optional pearSupport [ libxml2.dev ]

     
···

       176
       174
        
                   [ "--disable-all" ]

     

       177
       175
        
       

     

       178
       176
        
                   # PCRE

     

       179
       179
       -
                   ++ lib.optionals (lib.versionAtLeast version "7.4") [ "--with-external-pcre=${pcre'.dev}" ]

     

       180
       180
       -
                   ++ lib.optionals (lib.versions.majorMinor version == "7.3") [ "--with-pcre-regex=${pcre'.dev}" ]

     

       181
       181
       -
                   ++ lib.optionals (lib.versionOlder version "7.3") [ "--with-pcre-regex=${pcre'.dev}" ]

     

       182
       182
       -
                   ++ [ "PCRE_LIBDIR=${pcre'}" ]

     

       177
       177
       +
                   ++ lib.optionals (lib.versionAtLeast version "7.4") [ "--with-external-pcre=${pcre2.dev}" ]

     

       178
       178
       +
                   ++ lib.optionals (lib.versions.majorMinor version == "7.3") [ "--with-pcre-regex=${pcre2.dev}" ]

     

       179
       179
       +
                   ++ lib.optionals (lib.versionOlder version "7.3") [ "--with-pcre-regex=${pcre2.dev}" ]

     

       180
       180
       +
                   ++ [ "PCRE_LIBDIR=${pcre2}" ]

     

       183
       181
        
       

     

       184
       182
        
       

     

       185
       183
        
                   # Enable sapis

-60

pkgs/development/interpreters/php/php73-darwin-isfinite.patch

···

       1
       1
       -
       diff -ru a/configure.ac b/configure.ac

     

       2
       2
       -
       --- a/configure.ac      2018-12-04 19:12:20.000000000 +0300

     

       3
       3
       -
       +++ b/configure.ac      2018-12-10 12:30:37.798917520 +0300

     

       4
       4
       -
       @@ -68,7 +68,7 @@

     

       5
       5
       -
        #include <math.h>

     

       6
       6
       -
       

     

       7
       7
       -
        #ifndef zend_isnan

     

       8
       8
       -
       -#if HAVE_DECL_ISNAN && (!defined(__cplusplus) || __cplusplus < 201103L)

     

       9
       9
       -
       +#if HAVE_DECL_ISNAN && (defined(__APPLE__) || defined(__APPLE_CC__) || !defined(__cplusplus) || __cplusplus < 201103L)

     

       10
       10
       -
        #define zend_isnan(a) isnan(a)

     

       11
       11
       -
        #elif defined(HAVE_FPCLASS)

     

       12
       12
       -
        #define zend_isnan(a) ((fpclass(a) == FP_SNAN) || (fpclass(a) == FP_QNAN))

     

       13
       13
       -
       @@ -77,7 +77,7 @@

     

       14
       14
       -
        #endif

     

       15
       15
       -
        #endif

     

       16
       16
       -
       

     

       17
       17
       -
       -#if HAVE_DECL_ISINF && (!defined(__cplusplus) || __cplusplus < 201103L)

     

       18
       18
       -
       +#if HAVE_DECL_ISINF && (defined(__APPLE__) || defined(__APPLE_CC__) || !defined(__cplusplus) || __cplusplus < 201103L)

     

       19
       19
       -
        #define zend_isinf(a) isinf(a)

     

       20
       20
       -
        #elif defined(INFINITY)

     

       21
       21
       -
        /* Might not work, but is required by ISO C99 */

     

       22
       22
       -
       @@ -88,7 +88,7 @@

     

       23
       23
       -
        #define zend_isinf(a) 0

     

       24
       24
       -
        #endif

     

       25
       25
       -
       

     

       26
       26
       -
       -#if HAVE_DECL_ISFINITE && (!defined(__cplusplus) || __cplusplus < 201103L)

     

       27
       27
       -
       +#if HAVE_DECL_ISFINITE && (defined(__APPLE__) || defined(__APPLE_CC__) || !defined(__cplusplus) || __cplusplus < 201103L)

     

       28
       28
       -
        #define zend_finite(a) isfinite(a)

     

       29
       29
       -
        #elif defined(HAVE_FINITE)

     

       30
       30
       -
        #define zend_finite(a) finite(a)

     

       31
       31
       -
       diff -ru a/Zend/configure.ac b/Zend/configure.ac

     

       32
       32
       -
       --- a/Zend/configure.ac 2018-12-04 19:12:30.000000000 +0300

     

       33
       33
       -
       +++ b/Zend/configure.ac 2018-12-10 12:28:50.350929699 +0300

     

       34
       34
       -
       @@ -59,7 +59,7 @@

     

       35
       35
       -
        #include <math.h>

     

       36
       36
       -
       

     

       37
       37
       -
        #ifndef zend_isnan

     

       38
       38
       -
       -#if HAVE_DECL_ISNAN && (!defined(__cplusplus) || __cplusplus < 201103L)

     

       39
       39
       -
       +#if HAVE_DECL_ISNAN && (defined(__APPLE__) || defined(__APPLE_CC__) || !defined(__cplusplus) || __cplusplus < 201103L)

     

       40
       40
       -
        #define zend_isnan(a) isnan(a)

     

       41
       41
       -
        #elif defined(HAVE_FPCLASS)

     

       42
       42
       -
        #define zend_isnan(a) ((fpclass(a) == FP_SNAN) || (fpclass(a) == FP_QNAN))

     

       43
       43
       -
       @@ -68,7 +68,7 @@

     

       44
       44
       -
        #endif

     

       45
       45
       -
        #endif

     

       46
       46
       -
       

     

       47
       47
       -
       -#if HAVE_DECL_ISINF && (!defined(__cplusplus) || __cplusplus < 201103L)

     

       48
       48
       -
       +#if HAVE_DECL_ISINF && (defined(__APPLE__) || defined(__APPLE_CC__) || !defined(__cplusplus) || __cplusplus < 201103L)

     

       49
       49
       -
        #define zend_isinf(a) isinf(a)

     

       50
       50
       -
        #elif defined(INFINITY)

     

       51
       51
       -
        /* Might not work, but is required by ISO C99 */

     

       52
       52
       -
       @@ -79,7 +79,7 @@

     

       53
       53
       -
        #define zend_isinf(a) 0

     

       54
       54
       -
        #endif

     

       55
       55
       -
       

     

       56
       56
       -
       -#if HAVE_DECL_ISFINITE && (!defined(__cplusplus) || __cplusplus < 201103L)

     

       57
       57
       -
       +#if HAVE_DECL_ISFINITE && (defined(__APPLE__) || defined(__APPLE_CC__) || !defined(__cplusplus) || __cplusplus < 201103L)

     

       58
       58
       -
        #define zend_finite(a) isfinite(a)

     

       59
       59
       -
        #elif defined(HAVE_FINITE)

     

       60
       60
       -
        #define zend_finite(a) finite(a)

+2 -2

pkgs/development/php-packages/apcu/default.nix

···

       1
       1
       -
       { buildPecl, lib, pcre' }:

     

       1
       1
       +
       { buildPecl, lib, pcre2 }:

     

       2
       2
        
       

     

       3
       3
        
       buildPecl {

     

       4
       4
        
         pname = "apcu";

     
···

       6
       6
        
         version = "5.1.20";

     

       7
       7
        
         sha256 = "sha256-uZ1A+v7Ab00TL87lPnUm3b/B0EHqbgThc4nfrSj5w5A=";

     

       8
       8
        
       

     

       9
       9
       -
         buildInputs = [ pcre' ];

     

       9
       9
       +
         buildInputs = [ pcre2 ];

     

       10
       10
        
         doCheck = true;

     

       11
       11
        
         checkTarget = "test";

     

       12
       12
        
         checkFlagsArray = [ "REPORT_EXIT_STATUS=1" "NO_INTERACTION=1" ];

+2 -2

pkgs/development/php-packages/apcu_bc/default.nix

···

       1
       1
       -
       { buildPecl, lib, pcre', php }:

     

       1
       1
       +
       { buildPecl, lib, pcre2, php }:

     

       2
       2
        
       

     

       3
       3
        
       buildPecl {

     

       4
       4
        
         pname = "apcu_bc";

     
···

       8
       8
        
       

     

       9
       9
        
         peclDeps = [ php.extensions.apcu ];

     

       10
       10
        
       

     

       11
       11
       -
         buildInputs = [ pcre' ];

     

       11
       11
       +
         buildInputs = [ pcre2 ];

     

       12
       12
        
       

     

       13
       13
        
         postInstall = ''

     

       14
       14
        
           mv $out/lib/php/extensions/apc.so $out/lib/php/extensions/apcu_bc.so

-34

pkgs/development/php-packages/composer/1.x.nix

···

       1
       1
       -
       { mkDerivation, fetchurl, makeWrapper, unzip, lib, php }:

     

       2
       2
       -
       let

     

       3
       3
       -
         pname = "composer";

     

       4
       4
       -
         version = "1.10.22";

     

       5
       5
       -
       in

     

       6
       6
       -
       mkDerivation {

     

       7
       7
       -
         inherit pname version;

     

       8
       8
       -
       

     

       9
       9
       -
         src = fetchurl {

     

       10
       10
       -
           url = "https://getcomposer.org/download/${version}/composer.phar";

     

       11
       11
       -
           sha256 = "00073smi1jja00d4bqfs6p4fqs38mki2ziy7b1kwsmiv5lcsw9v1";

     

       12
       12
       -
         };

     

       13
       13
       -
       

     

       14
       14
       -
         dontUnpack = true;

     

       15
       15
       -
       

     

       16
       16
       -
         nativeBuildInputs = [ makeWrapper ];

     

       17
       17
       -
       

     

       18
       18
       -
         installPhase = ''

     

       19
       19
       -
           runHook preInstall

     

       20
       20
       -
           mkdir -p $out/bin

     

       21
       21
       -
           install -D $src $out/libexec/composer/composer.phar

     

       22
       22
       -
           makeWrapper ${php}/bin/php $out/bin/composer \

     

       23
       23
       -
             --add-flags "$out/libexec/composer/composer.phar" \

     

       24
       24
       -
             --prefix PATH : ${lib.makeBinPath [ unzip ]}

     

       25
       25
       -
           runHook postInstall

     

       26
       26
       -
         '';

     

       27
       27
       -
       

     

       28
       28
       -
         meta = with lib; {

     

       29
       29
       -
           description = "Dependency Manager for PHP";

     

       30
       30
       -
           license = licenses.mit;

     

       31
       31
       -
           homepage = "https://getcomposer.org/";

     

       32
       32
       -
           maintainers = with maintainers; [ offline ] ++ teams.php.members;

     

       33
       33
       -
         };

     

       34
       34
       -
       }

+1 -1

pkgs/development/php-packages/couchbase/default.nix

···

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
        
         configureFlags = [ "--with-couchbase" ];

     

       17
       17
       -
         broken = lib.versionAtLeast php.version "8.0";

     

       18
       17
        
       

     

       19
       18
        
         buildInputs = [ libcouchbase zlib ];

     

       20
       19
        
         internalDeps = lib.optionals (lib.versionOlder php.version "8.0") [ php.extensions.json ];

     
···

       45
       44
        
           '')

     

       46
       45
        
         ];

     

       47
       46
        
       

     

       47
       47
       +
         meta.broken = lib.versionAtLeast php.version "8.0";

     

       48
       48
        
         meta.maintainers = lib.teams.php.members;

     

       49
       49
        
       }

+2 -2

pkgs/development/php-packages/imagick/default.nix

···

       1
       1
       -
       { buildPecl, fetchpatch, lib, imagemagick, pkg-config, pcre' }:

     

       1
       1
       +
       { buildPecl, fetchpatch, lib, imagemagick, pkg-config, pcre2 }:

     

       2
       2
        
       

     

       3
       3
        
       buildPecl {

     

       4
       4
        
         pname = "imagick";

     
···

       21
       21
        
       

     

       22
       22
        
         configureFlags = [ "--with-imagick=${imagemagick.dev}" ];

     

       23
       23
        
         nativeBuildInputs = [ pkg-config ];

     

       24
       24
       -
         buildInputs = [ pcre' ];

     

       24
       24
       +
         buildInputs = [ pcre2 ];

     

       25
       25
        
       

     

       26
       26
        
         meta.maintainers = lib.teams.php.members;

     

       27
       27
        
       }

+2 -2

pkgs/development/php-packages/mongodb/default.nix

···

       1
       1
       -
       { stdenv, buildPecl, lib, pcre', pkg-config, cyrus_sasl, icu64

     

       1
       1
       +
       { stdenv, buildPecl, lib, pcre2, pkg-config, cyrus_sasl, icu64

     

       2
       2
        
       , openssl, snappy, zlib, darwin }:

     

       3
       3
        
       

     

       4
       4
        
       buildPecl {

     
···

       14
       14
        
           openssl

     

       15
       15
        
           snappy

     

       16
       16
        
           zlib

     

       17
       17
       -
           pcre'

     

       17
       17
       +
           pcre2

     

       18
       18
        
         ] ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security;

     

       19
       19
        
       

     

       20
       20
        
         meta.maintainers = lib.teams.php.members;

+2 -2

pkgs/development/php-packages/pcov/default.nix

···

       1
       1
       -
       { buildPecl, lib, pcre' }:

     

       1
       1
       +
       { buildPecl, lib, pcre2 }:

     

       2
       2
        
       

     

       3
       3
        
       buildPecl {

     

       4
       4
        
         pname = "pcov";

     
···

       6
       6
        
         version = "1.0.8";

     

       7
       7
        
         sha256 = "sha256-6rbniyxLIHPW/e+eWZN1qS8F1rOB7ld1N8JKUS1geRQ=";

     

       8
       8
        
       

     

       9
       9
       -
         buildInputs = [ pcre' ];

     

       9
       9
       +
         buildInputs = [ pcre2 ];

     

       10
       10
        
       

     

       11
       11
        
         meta.maintainers = lib.teams.php.members;

     

       12
       12
        
       }

+2 -1

pkgs/development/php-packages/php_excel/default.nix

···

       1
       1
       -
       { buildPecl, fetchurl, lib, libxl }:

     

       1
       1
       +
       { buildPecl, fetchurl, lib, libxl, php }:

     

       2
       2
        
       let

     

       3
       3
        
         pname = "php_excel";

     

       4
       4
        
         phpVersion = "php7";

     
···

       20
       20
        
           "--with-libxl-libdir=${libxl}/lib"

     

       21
       21
        
         ];

     

       22
       22
        
       

     

       23
       23
       +
         meta.broken = lib.versionAtLeast php.version "8.0";

     

       23
       24
        
         meta.maintainers = lib.teams.php.members;

     

       24
       25
        
       }

+5 -14

pkgs/development/php-packages/pinba/default.nix

···

       1
       1
        
       { buildPecl, lib, fetchFromGitHub, php }:

     

       2
       2
       -
       let

     

       3
       3
       -
         pname = "pinba";

     

       4
       2
        
       

     

       5
       5
       -
         isPhp73 = lib.versionAtLeast php.version "7.3";

     

       6
       6
       -
       

     

       7
       7
       -
         version = if isPhp73 then "1.1.2-dev" else "1.1.1";

     

       3
       3
       +
       buildPecl {

     

       4
       4
       +
         pname = "pinba";

     

       5
       5
       +
         version = "1.1.2-dev";

     

       8
       6
        
       

     

       9
       9
       -
         src = fetchFromGitHub ({

     

       7
       7
       +
         src = fetchFromGitHub {

     

       10
       8
        
           owner = "tony2001";

     

       11
       9
        
           repo = "pinba_extension";

     

       12
       12
       -
         } // (if (isPhp73) then {

     

       13
       10
        
           rev = "edbc313f1b4fb8407bf7d5acf63fbb0359c7fb2e";

     

       14
       11
        
           sha256 = "02sljqm6griw8ccqavl23f7w1hp2zflcv24lpf00k6pyrn9cwx80";

     

       15
       15
       -
         } else {

     

       16
       16
       -
           rev = "RELEASE_1_1_1";

     

       17
       17
       -
           sha256 = "1kdp7vav0y315695vhm3xifgsh6h6y6pny70xw3iai461n58khj5";

     

       18
       18
       -
         }));

     

       19
       19
       -
       in

     

       20
       20
       -
       buildPecl {

     

       21
       21
       -
         inherit pname version src;

     

       12
       12
       +
         };

     

       22
       13
        
       

     

       23
       14
        
         meta = with lib; {

     

       24
       15
        
           description = "PHP extension for Pinba";

+2 -2

pkgs/development/php-packages/protobuf/default.nix

···

       1
       1
       -
       { buildPecl, lib, pcre', fetchpatch }:

     

       1
       1
       +
       { buildPecl, lib, pcre2, fetchpatch }:

     

       2
       2
        
       

     

       3
       3
        
       buildPecl {

     

       4
       4
        
         pname = "protobuf";

     
···

       6
       6
        
         version = "3.14.0";

     

       7
       7
        
         sha256 = "1ldc4s28hq61cfg8l4c06pgicj0ng7k37f28a0dnnbs7xkr7cibd";

     

       8
       8
        
       

     

       9
       9
       -
         buildInputs = [ pcre' ];

     

       9
       9
       +
         buildInputs = [ pcre2 ];

     

       10
       10
        
       

     

       11
       11
        
         patches = [

     

       12
       12
        
           # TODO: remove with next update

-28

pkgs/development/php-packages/pthreads/default.nix

···

       1
       1
       -
       { buildPecl, lib, fetchFromGitHub, php, pcre' }:

     

       2
       2
       -
       let

     

       3
       3
       -
         pname = "pthreads";

     

       4
       4
       -
       

     

       5
       5
       -
         isPhp73 = lib.versionAtLeast php.version "7.3";

     

       6
       6
       -
         isPhp74 = lib.versionAtLeast php.version "7.4";

     

       7
       7
       -
       

     

       8
       8
       -
         version = if isPhp73 then "3.2.0-dev" else "3.2.0";

     

       9
       9
       -
       

     

       10
       10
       -
         src = fetchFromGitHub ({

     

       11
       11
       -
           owner = "krakjoe";

     

       12
       12
       -
           repo = "pthreads";

     

       13
       13
       -
         } // (if (isPhp73) then {

     

       14
       14
       -
           rev = "4d1c2483ceb459ea4284db4eb06646d5715e7154";

     

       15
       15
       -
           sha256 = "07kdxypy0bgggrfav2h1ccbv67lllbvpa3s3zsaqci0gq4fyi830";

     

       16
       16
       -
         } else {

     

       17
       17
       -
           rev = "v3.2.0";

     

       18
       18
       -
           sha256 = "17hypm75d4w7lvz96jb7s0s87018yzmmap0l125d5fd7abnhzfvv";

     

       19
       19
       -
         }));

     

       20
       20
       -
       in

     

       21
       21
       -
       buildPecl {

     

       22
       22
       -
         inherit pname version src;

     

       23
       23
       -
       

     

       24
       24
       -
         buildInputs = [ pcre'.dev ];

     

       25
       25
       -
       

     

       26
       26
       -
         meta.broken = isPhp74;

     

       27
       27
       -
         meta.maintainers = lib.teams.php.members;

     

       28
       28
       -
       }

+2 -2

pkgs/development/php-packages/rdkafka/default.nix

···

       1
       1
       -
       { buildPecl, lib, rdkafka, pcre' }:

     

       1
       1
       +
       { buildPecl, lib, rdkafka, pcre2 }:

     

       2
       2
        
       

     

       3
       3
        
       buildPecl {

     

       4
       4
        
         pname = "rdkafka";

     
···

       6
       6
        
         version = "5.0.0";

     

       7
       7
        
         sha256 = "sha256-Qy+6rkPczhdxFbDhcuzmUTLMPUXYZ0HaheDBhkh4FXs=";

     

       8
       8
        
       

     

       9
       9
       -
         buildInputs = [ rdkafka pcre' ];

     

       9
       9
       +
         buildInputs = [ rdkafka pcre2 ];

     

       10
       10
        
       

     

       11
       11
        
         postPhpize = ''

     

       12
       12
        
           substituteInPlace configure \

+2 -2

pkgs/development/php-packages/snuffleupagus/default.nix

···

       2
       2
        
       , lib

     

       3
       3
        
       , php

     

       4
       4
        
       , fetchFromGitHub

     

       5
       5
       -
       , pcre'

     

       5
       5
       +
       , pcre2

     

       6
       6
        
       , fetchpatch

     

       7
       7
        
       }:

     

       8
       8
        
       

     
···

       17
       17
        
         };

     

       18
       18
        
       

     

       19
       19
        
         buildInputs = [

     

       20
       20
       -
           pcre'

     

       20
       20
       +
           pcre2

     

       21
       21
        
         ];

     

       22
       22
        
       

     

       23
       23
        
         internalDeps = with php.extensions; [

+2 -2

pkgs/development/php-packages/swoole/default.nix

···

       1
       1
       -
       { lib, buildPecl, php, valgrind, pcre' }:

     

       1
       1
       +
       { lib, buildPecl, php, valgrind, pcre2 }:

     

       2
       2
        
       

     

       3
       3
        
       buildPecl {

     

       4
       4
        
         pname = "swoole";

     
···

       6
       6
        
         version = "4.6.4";

     

       7
       7
        
         sha256 = "0hgndnn27q7fbsb0nw6bfdg0kyy5di9vrmf7g53jc6lsnf73ha31";

     

       8
       8
        
       

     

       9
       9
       -
         buildInputs = [ valgrind pcre' ];

     

       9
       9
       +
         buildInputs = [ valgrind pcre2 ];

     

       10
       10
        
         internalDeps = lib.optionals (lib.versionOlder php.version "7.4") [ php.extensions.hash ];

     

       11
       11
        
       

     

       12
       12
        
         doCheck = true;

+20 -16

pkgs/development/python-modules/notify-py/default.nix

···

       1
       1
       -
       { lib, buildPythonPackage, fetchPypi, isPy3k, alsaUtils, libnotify, which, loguru, pytest }:

     

       1
       1
       +
       { lib, stdenv, buildPythonPackage, fetchFromGitHub, isPy3k, coreutils, alsaUtils

     

       2
       2
       +
       , libnotify, which, jeepney, loguru, pytestCheckHook }:

     

       2
       3
        
       

     

       3
       4
        
       buildPythonPackage rec {

     

       4
       4
       -
         pname = "notify_py";

     

       5
       5
       -
         version = "0.3.1";

     

       5
       5
       +
         pname = "notify-py";

     

       6
       6
       +
         version = "0.3.3";

     

       6
       7
        
       

     

       7
       8
        
         disabled = !isPy3k;

     

       8
       9
        
       

     

       9
       9
       -
         src = fetchPypi {

     

       10
       10
       -
           inherit pname version;

     

       11
       11
       -
           sha256 = "5ba696d18ffe1d7070f3d0a5b4923fee4d6c863de6843af105bec0ce9915ebad";

     

       10
       10
       +
         src = fetchFromGitHub {

     

       11
       11
       +
           owner = "ms7m";

     

       12
       12
       +
           repo = pname;

     

       13
       13
       +
           rev = "v${version}";

     

       14
       14
       +
           sha256 = "1n35adwsyhz304n4ifnsz6qzkymwhyqc8sg8d76qv5psv2xsnzlf";

     

       12
       15
        
         };

     

       13
       16
        
       

     

       14
       14
       -
         postPatch = ''

     

       15
       15
       -
          substituteInPlace setup.py \

     

       16
       16
       -
            --replace "loguru==0.4.1" "loguru~=0.5.0"

     

       17
       17
       -
         '';

     

       17
       17
       +
         propagatedNativeBuildInputs = [ which ]

     

       18
       18
       +
           ++ lib.optionals stdenv.isLinux [ alsaUtils libnotify ];

     

       19
       19
       +
         propagatedBuildInputs = [ loguru ]

     

       20
       20
       +
           ++ lib.optionals stdenv.isLinux [ jeepney ];

     

       18
       21
        
       

     

       19
       19
       -
         propagatedBuildInputs = [ alsaUtils libnotify loguru which ];

     

       20
       20
       -
       

     

       21
       21
       -
         checkInputs = [ alsaUtils libnotify pytest which ];

     

       22
       22
       +
         checkInputs = [ coreutils pytestCheckHook ];

     

       22
       23
        
       

     

       23
       23
       -
         checkPhase = ''

     

       24
       24
       -
           pytest

     

       24
       24
       +
         # Tests search for "afplay" binary which is built in to MacOS and not available in nixpkgs

     

       25
       25
       +
         preCheck = ''

     

       26
       26
       +
           mkdir $TMP/bin

     

       27
       27
       +
           ln -s ${coreutils}/bin/true $TMP/bin/afplay

     

       28
       28
       +
           export PATH="$TMP/bin:$PATH"

     

       25
       29
        
         '';

     

       26
       30
        
       

     

       27
       31
        
         pythonImportsCheck = [ "notifypy" ];

     

       28
       32
        
       

     

       29
       33
        
         meta = with lib; {

     

       30
       30
       -
           description = " Python Module for sending cross-platform desktop notifications on Windows, macOS, and Linux.";

     

       34
       34
       +
           description = "Python Module for sending cross-platform desktop notifications on Windows, macOS, and Linux.";

     

       31
       35
        
           homepage = "https://github.com/ms7m/notify-py/";

     

       32
       36
        
           license = licenses.mit;

     

       33
       37
        
           maintainers = with maintainers; [ austinbutler ];

+17 -30

pkgs/development/python-modules/toggl-cli/default.nix

···

       1
       1
       -
       { lib, buildPythonPackage, fetchPypi, pythonAtLeast, pythonOlder

     

       2
       2
       -
       , click

     

       3
       3
       -
       , click-completion

     

       4
       4
       -
       , factory_boy

     

       5
       5
       -
       , faker

     

       6
       6
       -
       , inquirer

     

       7
       7
       -
       , notify-py

     

       8
       8
       -
       , pbr

     

       9
       9
       -
       , pendulum

     

       10
       10
       -
       , ptable

     

       11
       11
       -
       , pytest

     

       12
       12
       -
       , pytestcov

     

       13
       13
       -
       , pytest-mock

     

       14
       14
       -
       , requests

     

       15
       15
       -
       , twine

     

       16
       16
       -
       , validate-email

     

       17
       17
       -
       }:

     

       18
       18
       -
       

     

       1
       1
       +
       { lib, buildPythonPackage, fetchPypi, pythonAtLeast, pythonOlder, click

     

       2
       2
       +
       , click-completion, factory_boy, faker, inquirer, notify-py, pbr, pendulum

     

       3
       3
       +
       , ptable, pytestCheckHook, pytestcov, pytest-mock, requests, twine

     

       4
       4
       +
       , validate-email }:

     

       19
       5
        
       

     

       20
       6
        
       buildPythonPackage rec {

     

       21
       7
        
         pname = "toggl-cli";

     

       22
       22
       -
         version = "2.4.1";

     

       8
       8
       +
         version = "2.4.2";

     

       23
       9
        
         disabled = pythonOlder "3.5";

     

       24
       10
        
       

     

       25
       11
        
         src = fetchPypi {

     

       26
       12
        
           pname = "togglCli";

     

       27
       13
        
           inherit version;

     

       28
       28
       -
           sha256 = "19lry8adcznzmzbvghyid3yl4j05db6931bw38af5vrkkyzyf62i";

     

       14
       14
       +
           sha256 = "1wgh231r16jyvaj1ch1pajvl9szflb4srs505pfdwdlqvz7rzww8";

     

       29
       15
        
         };

     

       30
       16
        
       

     

       31
       17
        
         postPatch = ''

     

       32
       32
       -
          substituteInPlace requirements.txt \

     

       33
       33
       -
            --replace "inquirer==2.6.3" "inquirer>=2.6.3" \

     

       34
       34
       -
            --replace "notify-py==0.2.2" "notify-py>=0.2.2"

     

       18
       18
       +
           substituteInPlace requirements.txt \

     

       19
       19
       +
             --replace "notify-py==0.3.1" "notify-py>=0.3.1"

     

       35
       20
        
         '';

     

       36
       21
        
       

     

       37
       22
        
         nativeBuildInputs = [ pbr twine ];

     

       38
       38
       -
         checkInputs = [ pbr pytest pytestcov pytest-mock faker factory_boy ];

     

       23
       23
       +
         checkInputs = [ pbr pytestCheckHook pytestcov pytest-mock faker factory_boy ];

     

       39
       24
        
       

     

       40
       25
        
         preCheck = ''

     

       41
       26
        
           export TOGGL_API_TOKEN=your_api_token

     

       42
       27
        
           export TOGGL_PASSWORD=toggl_password

     

       43
       28
        
           export TOGGL_USERNAME=user@example.com

     

       44
       44
       -
           '';

     

       29
       29
       +
         '';

     

       45
       30
        
       

     

       46
       46
       -
         checkPhase = ''

     

       47
       47
       -
          runHook preCheck

     

       48
       48
       -
          pytest -k "not premium and not TestDateTimeType and not TestDateTimeField" tests/unit --maxfail=20

     

       49
       49
       -
          runHook postCheck

     

       50
       50
       -
         '';

     

       31
       31
       +
         disabledTests = [

     

       32
       32
       +
           "integration"

     

       33
       33
       +
           "premium"

     

       34
       34
       +
           "test_parsing"

     

       35
       35
       +
           "test_type_check"

     

       36
       36
       +
           "test_now"

     

       37
       37
       +
         ];

     

       51
       38
        
       

     

       52
       39
        
         propagatedBuildInputs = [

     

       53
       40
        
           click

+4 -4

pkgs/development/tools/analysis/flow/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "flow";

     

       5
       5
       -
         version = "0.150.1";

     

       5
       5
       +
         version = "0.152.0";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner  = "facebook";

     

       9
       9
        
           repo   = "flow";

     

       10
       10
        
           rev    = "refs/tags/v${version}";

     

       11
       11
       -
           sha256 = "sha256-waQdS0HJVW2WFQFklmZJC0jr09JrDP5Fl7SxVS0dsgU=";

     

       11
       11
       +
           sha256 = "1af9z6xah3rk99pv984nikkpq8jzl5r0fccb1gdhmi7y5a6y6g1m";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         installPhase = ''

     
···

       16
       16
        
           install -Dm644 resources/shell/bash-completion $out/share/bash-completion/completions/flow

     

       17
       17
        
         '';

     

       18
       18
        
       

     

       19
       19
       -
         buildInputs = (with ocamlPackages; [ ocaml findlib ocamlbuild ocaml-migrate-parsetree dtoa core_kernel sedlex_2 ocaml_lwt lwt_log lwt_ppx ppx_deriving ppx_gen_rec ppx_tools_versioned visitors wtf8 ])

     

       19
       19
       +
         buildInputs = (with ocamlPackages; [ ocaml findlib ocamlbuild ocaml-migrate-parsetree-2-1 dtoa core_kernel sedlex_2 ocaml_lwt lwt_log lwt_ppx ppx_deriving ppx_gen_rec ppx_tools_versioned visitors wtf8 ])

     

       20
       20
        
           ++ lib.optionals stdenv.isDarwin [ CoreServices ];

     

       21
       21
        
       

     

       22
       22
        
         meta = with lib; {

     

       23
       23
        
           description = "A static type checker for JavaScript";

     

       24
       24
        
           homepage = "https://flow.org/";

     

       25
       25
       -
           changelog = "https://github.com/facebook/flow/releases/tag/v${version}";

     

       25
       25
       +
           changelog = "https://github.com/facebook/flow/raw/v${version}/Changelog.md";

     

       26
       26
        
           license = licenses.mit;

     

       27
       27
        
           platforms = ocamlPackages.ocaml.meta.platforms;

     

       28
       28
        
           maintainers = with maintainers; [ marsam puffnfresh ];

+2 -2

pkgs/development/tools/misc/drush/default.nix

···

       1
       1
       -
       { lib, stdenv, fetchurl, php73, which, makeWrapper, bash, coreutils, ncurses }:

     

       1
       1
       +
       { lib, stdenv, fetchurl, php, which, makeWrapper, bash, coreutils, ncurses }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         name = "drush-6.1.0";

     
···

       32
       32
        
           mkdir -p "$out"

     

       33
       33
        
           cp -r . "$out/src"

     

       34
       34
        
           mkdir "$out/bin"

     

       35
       35
       -
           wrapProgram "$out/src/drush" --prefix PATH : "${lib.makeBinPath [ which php73 bash coreutils ncurses ]}"

     

       35
       35
       +
           wrapProgram "$out/src/drush" --prefix PATH : "${lib.makeBinPath [ which php bash coreutils ncurses ]}"

     

       36
       36
        
           ln -s "$out/src/drush" "$out/bin/drush"

     

       37
       37
        
         '';

     

       38
       38
        
       }

+4 -3

pkgs/development/tools/open-policy-agent/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "open-policy-agent";

     

       5
       5
       -
         version = "0.28.0";

     

       5
       5
       +
         version = "0.29.4";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "open-policy-agent";

     

       9
       9
        
           repo = "opa";

     

       10
       10
        
           rev = "v${version}";

     

       11
       11
       -
           sha256 = "sha256-khXcpV4bPfFwoQ4LrHFohhlTHOIDClZuE3qg+MYk36k=";

     

       11
       11
       +
           sha256 = "sha256-AjNr+t30ftF92+cEfvt8iHBDVD/SO52ojJRLAkYF9l4=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         vendorSha256 = null;

     
···

       28
       28
        
         '';

     

       29
       29
        
       

     

       30
       30
        
         meta = with lib; {

     

       31
       31
       +
           homepage = "https://www.openpolicyagent.org";

     

       32
       32
       +
           changelog = "https://github.com/open-policy-agent/opa/blob/v${version}/CHANGELOG.md";

     

       31
       33
        
           description = "General-purpose policy engine";

     

       32
       34
        
           longDescription = ''

     

       33
       35
        
             The Open Policy Agent (OPA, pronounced "oh-pa") is an open source, general-purpose policy engine that unifies

     
···

       35
       37
        
             as code and simple APIs to offload policy decision-making from your software. You can use OPA to enforce policies

     

       36
       38
        
             in microservices, Kubernetes, CI/CD pipelines, API gateways, and more.

     

       37
       39
        
           '';

     

       38
       38
       -
           homepage = "https://www.openpolicyagent.org";

     

       39
       40
        
           license = licenses.asl20;

     

       40
       41
        
           maintainers = with maintainers; [ lewo jk ];

     

       41
       42
        
         };

+2 -2

pkgs/games/osu-lazer/default.nix

···

       16
       16
        
       

     

       17
       17
        
       in stdenv.mkDerivation rec {

     

       18
       18
        
         pname = "osu-lazer";

     

       19
       19
       -
         version = "2021.515.0";

     

       19
       19
       +
         version = "2021.602.0";

     

       20
       20
        
       

     

       21
       21
        
         src = fetchFromGitHub {

     

       22
       22
        
           owner = "ppy";

     

       23
       23
        
           repo = "osu";

     

       24
       24
        
           rev = version;

     

       25
       25
       -
           sha256 = "c2+Ybb9wMb9FSTxprJPLKGEv2q6y0jcMA4kEN2r7yyA=";

     

       25
       25
       +
           sha256 = "t9Byn3eAAkxnBQBfdvz2CGGXu8d3JzTnSz7I68Ntp3A=";

     

       26
       26
        
         };

     

       27
       27
        
       

     

       28
       28
        
         patches = [ ./bypass-tamper-detection.patch ];

+145 -120

pkgs/games/osu-lazer/deps.nix

···

       25
       25
        
           sha256 = "1zkndglmz0s8rblfhnqcvv90rkq2i7lf4bc380g7z8h1avf2ikll";

     

       26
       26
        
         })

     

       27
       27
        
         (fetchNuGet {

     

       28
       28
       +
           name = "HtmlAgilityPack";

     

       29
       29
       +
           version = "1.11.33";

     

       30
       30
       +
           sha256 = "08valqp6hzdfy532kv70fgzhizyc3xs9y0sw0rsr3z2h7pk1vp6n";

     

       31
       31
       +
         })

     

       32
       32
       +
         (fetchNuGet {

     

       28
       33
        
           name = "Humanizer";

     

       29
       29
       -
           version = "2.8.26";

     

       30
       30
       -
           sha256 = "11kddzyzqpq9gkz0hmrblq494nh86va6wxx6z89xi6w1f4vj15ak";

     

       34
       34
       +
           version = "2.10.1";

     

       35
       35
       +
           sha256 = "0bcs3vp028dq7hs0dxvqynichgbnhzwdx61phwl8yvls15hav05c";

     

       31
       36
        
         })

     

       32
       37
        
         (fetchNuGet {

     

       33
       38
        
           name = "Humanizer.Core";

     

       34
       34
       -
           version = "2.2.0";

     

       35
       35
       -
           sha256 = "08mzg65y9d3zvq16rsmpapcdan71ggq2mpks6k777h3wlm2sh3p5";

     

       39
       39
       +
           version = "2.10.1";

     

       40
       40
       +
           sha256 = "1vn52y8pkg8ny7sz83nag4cwmna61jscs2n68bx7x4xkgialzhzy";

     

       36
       41
        
         })

     

       37
       42
        
         (fetchNuGet {

     

       38
       43
        
           name = "Humanizer.Core";

     

       39
       39
       -
           version = "2.8.26";

     

       40
       40
       -
           sha256 = "1v8xd12yms4qq1md4vh6faxicmqrvahqdd7sdkyzrphab9v44nsm";

     

       44
       44
       +
           version = "2.2.0";

     

       45
       45
       +
           sha256 = "08mzg65y9d3zvq16rsmpapcdan71ggq2mpks6k777h3wlm2sh3p5";

     

       41
       46
        
         })

     

       42
       47
        
         (fetchNuGet {

     

       43
       48
        
           name = "Humanizer.Core.af";

     

       44
       44
       -
           version = "2.8.26";

     

       45
       45
       -
           sha256 = "0znrq4frlkq1qi20301hlzxa6mdc275fa1i1a1i8ldgk9cjq94k9";

     

       49
       49
       +
           version = "2.10.1";

     

       50
       50
       +
           sha256 = "0a7x11kprn650kk3qzhsncyfxazwanqwmrizkxbzyc29y46bmsr3";

     

       46
       51
        
         })

     

       47
       52
        
         (fetchNuGet {

     

       48
       53
        
           name = "Humanizer.Core.ar";

     

       49
       49
       -
           version = "2.8.26";

     

       50
       50
       -
           sha256 = "1hi7mln48p1nmxlgdq725s4cvla9nlkvbmrsql1rfjjlsy8hn6n7";

     

       54
       54
       +
           version = "2.10.1";

     

       55
       55
       +
           sha256 = "0k40zj3jpscv0k780x5p8cc45ivd8pla1hqz8416qgywg9kc6b7z";

     

       51
       56
        
         })

     

       52
       57
        
         (fetchNuGet {

     

       53
       58
        
           name = "Humanizer.Core.az";

     

       54
       54
       -
           version = "2.8.26";

     

       55
       55
       -
           sha256 = "0av7ycrqwvmikqia3z3qkp9967zilrhayny17zkm0d0mnjq62vs6";

     

       59
       59
       +
           version = "2.10.1";

     

       60
       60
       +
           sha256 = "1djhspqlxj6qys915bd8is1hfy87ykrpxpjwlwsw2gvrrc74p16c";

     

       56
       61
        
         })

     

       57
       62
        
         (fetchNuGet {

     

       58
       63
        
           name = "Humanizer.Core.bg";

     

       59
       59
       -
           version = "2.8.26";

     

       60
       60
       -
           sha256 = "13j6zk2cmk7a119azxlpjhfwykrzk0vkf5a799fb2fzkvhnj4hkg";

     

       64
       64
       +
           version = "2.10.1";

     

       65
       65
       +
           sha256 = "1z89a9sc3ny2bm2h3g8cnb6c77q2yhh4wmi18yj98y6irdmimn16";

     

       61
       66
        
         })

     

       62
       67
        
         (fetchNuGet {

     

       63
       68
        
           name = "Humanizer.Core.bn-BD";

     

       64
       64
       -
           version = "2.8.26";

     

       65
       65
       -
           sha256 = "0h619sksggfi7dnaycz6bj9aiqdgn0d8dpgjgdl73crw52lr70p9";

     

       69
       69
       +
           version = "2.10.1";

     

       70
       70
       +
           sha256 = "17cwk09h3fkjl76z0w3ihj3448h8lchf3l9l10zrjisjf918mxp8";

     

       66
       71
        
         })

     

       67
       72
        
         (fetchNuGet {

     

       68
       73
        
           name = "Humanizer.Core.cs";

     

       69
       69
       -
           version = "2.8.26";

     

       70
       70
       -
           sha256 = "11bh3k15388bi5wizaihnwqk7wb4n7q636fqjllwdhjggqrsc3f6";

     

       74
       74
       +
           version = "2.10.1";

     

       75
       75
       +
           sha256 = "0403f5mbyzyjw8jm988rbw2xim353rd4lc0pnkdcn7qlhcrm3gbj";

     

       71
       76
        
         })

     

       72
       77
        
         (fetchNuGet {

     

       73
       78
        
           name = "Humanizer.Core.da";

     

       74
       74
       -
           version = "2.8.26";

     

       75
       75
       -
           sha256 = "09b3x3bw3cgby9qvaccnqz2y6d8gl3497dh7q0dk1iznsxbk4x4m";

     

       79
       79
       +
           version = "2.10.1";

     

       80
       80
       +
           sha256 = "0am71dkxyzh40vqb7aa9k6p8whh4fwdrrwwjar9vc3c49wnw7nky";

     

       76
       81
        
         })

     

       77
       82
        
         (fetchNuGet {

     

       78
       83
        
           name = "Humanizer.Core.de";

     

       79
       79
       -
           version = "2.8.26";

     

       80
       80
       -
           sha256 = "1pyp2a9my20wlwjjzv563kshl9fpjb2kd4cw41l4wvsz1bsq3l22";

     

       84
       84
       +
           version = "2.10.1";

     

       85
       85
       +
           sha256 = "027iydimqnx5r7lw0661zyz41kd4nh6sxx75dmh9lcgawz8h8agy";

     

       81
       86
        
         })

     

       82
       87
        
         (fetchNuGet {

     

       83
       88
        
           name = "Humanizer.Core.el";

     

       84
       84
       -
           version = "2.8.26";

     

       85
       85
       -
           sha256 = "0v3sdcxca4dam1y5yjh9n6v711ys0zdv38hr4kij35s6277ls6lb";

     

       89
       89
       +
           version = "2.10.1";

     

       90
       90
       +
           sha256 = "1k3g4ffv51da0p12xg7mw21zm6hdvz28x1vaqpspyb156042vxqq";

     

       86
       91
        
         })

     

       87
       92
        
         (fetchNuGet {

     

       88
       93
        
           name = "Humanizer.Core.es";

     

       89
       89
       -
           version = "2.8.26";

     

       90
       90
       -
           sha256 = "0wh9qvqf80cngwsz2jnrsjpmaax4xa2xp8bbk5xs480kp071z37q";

     

       94
       94
       +
           version = "2.10.1";

     

       95
       95
       +
           sha256 = "0rv3b39hwc1spb0r036sjcn8hkl9bfaka1p8bdh7zsnq21674pqb";

     

       91
       96
        
         })

     

       92
       97
        
         (fetchNuGet {

     

       93
       98
        
           name = "Humanizer.Core.fa";

     

       94
       94
       -
           version = "2.8.26";

     

       95
       95
       -
           sha256 = "00v56ddjfv6sr6w5246gn5z0padwswvnngp8mdl7gjfg5ycmbkl1";

     

       99
       99
       +
           version = "2.10.1";

     

       100
       100
       +
           sha256 = "0v3ccydbf9cpv54lk65fqaiq1lfzz6cnxq0wyaa5014axwh9h8nn";

     

       96
       101
        
         })

     

       97
       102
        
         (fetchNuGet {

     

       98
       103
        
           name = "Humanizer.Core.fi-FI";

     

       99
       99
       -
           version = "2.8.26";

     

       100
       100
       -
           sha256 = "1pgs0j5ri50a6vhljplhrlc8jj1hrd9ggxkj60d9v5kk9xibzzyd";

     

       104
       104
       +
           version = "2.10.1";

     

       105
       105
       +
           sha256 = "0gvm0g24ccrk6081sz2ligbskn5rv2i0bfarndhf5k12zwvx0y67";

     

       101
       106
        
         })

     

       102
       107
        
         (fetchNuGet {

     

       103
       108
        
           name = "Humanizer.Core.fr";

     

       104
       104
       -
           version = "2.8.26";

     

       105
       105
       -
           sha256 = "0kkhgy3yn8vfqlx3dhb9m3cazkgfxarknam4macng9y17l7wj83m";

     

       109
       109
       +
           version = "2.10.1";

     

       110
       110
       +
           sha256 = "1307byhrygg45vrba5h30gmr94zp8spxqy75xi482y5va6vxv778";

     

       106
       111
        
         })

     

       107
       112
        
         (fetchNuGet {

     

       108
       113
        
           name = "Humanizer.Core.fr-BE";

     

       109
       109
       -
           version = "2.8.26";

     

       110
       110
       -
           sha256 = "13spcx07hph366qk073pz63s56nadaac7l4mr4a66gbpqd3814kb";

     

       114
       114
       +
           version = "2.10.1";

     

       115
       115
       +
           sha256 = "11mdqwz3nx3a9rval2y9vhxyrfzas2rasbilljky3k893anrpr36";

     

       111
       116
        
         })

     

       112
       117
        
         (fetchNuGet {

     

       113
       118
        
           name = "Humanizer.Core.he";

     

       114
       114
       -
           version = "2.8.26";

     

       115
       115
       -
           sha256 = "1ccn82aj3rhrhsa3kvkrmjw0p687icxlfja8ngbh7sby4cszx9bk";

     

       119
       119
       +
           version = "2.10.1";

     

       120
       120
       +
           sha256 = "1rvzgh6hky9gl55625a7pjd8n9rai4vxl05qbjg3icg86a27ia9b";

     

       116
       121
        
         })

     

       117
       122
        
         (fetchNuGet {

     

       118
       123
        
           name = "Humanizer.Core.hr";

     

       119
       119
       -
           version = "2.8.26";

     

       120
       120
       -
           sha256 = "12ii79bhai3kv7zr3k9k9dh569r6p3m4l4gj25cln2isr4wdi5r9";

     

       124
       124
       +
           version = "2.10.1";

     

       125
       125
       +
           sha256 = "1adm2k7ydgbdhvy1wpilhclg3xvcbvcynh4g3qhl1zk7kpicwzy1";

     

       121
       126
        
         })

     

       122
       127
        
         (fetchNuGet {

     

       123
       128
        
           name = "Humanizer.Core.hu";

     

       124
       124
       -
           version = "2.8.26";

     

       125
       125
       -
           sha256 = "0cibbdxiqhwrjmxlr805mg3l9v0fl2ydx4m50608rkysjq6vxx7y";

     

       129
       129
       +
           version = "2.10.1";

     

       130
       130
       +
           sha256 = "19kznch1wm6pyy4dbinp0zn991s84ak4x9hpq9sjhd60azrc9vr9";

     

       126
       131
        
         })

     

       127
       132
        
         (fetchNuGet {

     

       128
       133
        
           name = "Humanizer.Core.hy";

     

       129
       129
       -
           version = "2.8.26";

     

       130
       130
       -
           sha256 = "15aikm04f74abm4ak8rvnnkrlcz155gibn1y81pbgsyn7yrh84v3";

     

       134
       134
       +
           version = "2.10.1";

     

       135
       135
       +
           sha256 = "047427rspi90rbhzmzanfqkn6rzcgvnnhbn7h923kg07d4lky6l7";

     

       131
       136
        
         })

     

       132
       137
        
         (fetchNuGet {

     

       133
       138
        
           name = "Humanizer.Core.id";

     

       134
       134
       -
           version = "2.8.26";

     

       135
       135
       -
           sha256 = "1i9gpzdfhmbvrqg858kqz5461sp3sh60g16dmcmyi1ik0qlspijn";

     

       139
       139
       +
           version = "2.10.1";

     

       140
       140
       +
           sha256 = "0r3spq1in5y7dxkp3yk5695csair5w0jrc0xjlicqadgfk9j809f";

     

       136
       141
        
         })

     

       137
       142
        
         (fetchNuGet {

     

       138
       143
        
           name = "Humanizer.Core.it";

     

       139
       139
       -
           version = "2.8.26";

     

       140
       140
       -
           sha256 = "01j7qskmqcxsakbx3bkxcjyzrh6nxi2v6kfzsfb0vf980qqq331l";

     

       144
       144
       +
           version = "2.10.1";

     

       145
       145
       +
           sha256 = "1191qns3gpbq45phhaz9vy5bj0cdmznn3c2zgl4pn323knhgjfxf";

     

       141
       146
        
         })

     

       142
       147
        
         (fetchNuGet {

     

       143
       148
        
           name = "Humanizer.Core.ja";

     

       144
       144
       -
           version = "2.8.26";

     

       145
       145
       -
           sha256 = "07d19ns4a4pa2k4vdc1af7wj10gaflq1ny4mx6y574afkdi8v6d5";

     

       149
       149
       +
           version = "2.10.1";

     

       150
       150
       +
           sha256 = "0a0gf2vkgnqyxa3fxzs7pq6almpzv6a53bi7yhn9w4ki1jqjjv6v";

     

       151
       151
       +
         })

     

       152
       152
       +
         (fetchNuGet {

     

       153
       153
       +
           name = "Humanizer.Core.ko-KR";

     

       154
       154
       +
           version = "2.10.1";

     

       155
       155
       +
           sha256 = "0x9x7134f8ikbvvalahrb3q080w2zxd9dx0k32gd10axcvqpgxq3";

     

       156
       156
       +
         })

     

       157
       157
       +
         (fetchNuGet {

     

       158
       158
       +
           name = "Humanizer.Core.ku";

     

       159
       159
       +
           version = "2.10.1";

     

       160
       160
       +
           sha256 = "0ry4fjfvwp13p1qq8hjykg60ga0vxirdl7l7czj56lwj29ll8zqa";

     

       146
       161
        
         })

     

       147
       162
        
         (fetchNuGet {

     

       148
       163
        
           name = "Humanizer.Core.lv";

     

       149
       149
       -
           version = "2.8.26";

     

       150
       150
       -
           sha256 = "1pm64sj65nmngyfa3hjcw67icfmlzr232hmgpnw7306sb7dxmnfv";

     

       164
       164
       +
           version = "2.10.1";

     

       165
       165
       +
           sha256 = "1v08ds9r2k7vx5b2rw9swc3gxfj7mb9r2as0sqg5n2wy04w9ki5j";

     

       151
       166
        
         })

     

       152
       167
        
         (fetchNuGet {

     

       153
       168
        
           name = "Humanizer.Core.ms-MY";

     

       154
       154
       -
           version = "2.8.26";

     

       155
       155
       -
           sha256 = "1yx4cc023kc4k14abk2ycmjy6y2xaknaz4zria7xsadf0fabd1jc";

     

       169
       169
       +
           version = "2.10.1";

     

       170
       170
       +
           sha256 = "0cfb7wmffbwdv8w7j082mc3z59cj3hh6rnnii55wfrbziv1ci5yz";

     

       156
       171
        
         })

     

       157
       172
        
         (fetchNuGet {

     

       158
       173
        
           name = "Humanizer.Core.mt";

     

       159
       159
       -
           version = "2.8.26";

     

       160
       160
       -
           sha256 = "0iai35pzka9g6c3sgswki06fk6gdnq8kc88wyb4pcciivazz31px";

     

       174
       174
       +
           version = "2.10.1";

     

       175
       175
       +
           sha256 = "1pn00dmn1k3jp0s23rfzv8sj7fdbmy0i45ls0agvy1wxxjyg7cn9";

     

       161
       176
        
         })

     

       162
       177
        
         (fetchNuGet {

     

       163
       178
        
           name = "Humanizer.Core.nb";

     

       164
       164
       -
           version = "2.8.26";

     

       165
       165
       -
           sha256 = "0xprhiyjyq6mpha2lrav59n1f48508ddvm9nmdk5sm5k26ff3l90";

     

       179
       179
       +
           version = "2.10.1";

     

       180
       180
       +
           sha256 = "122b1wk8acnc7sm8bs3ww9kl6z8sw0ym7y1ar9wyiw9aw36a94f3";

     

       166
       181
        
         })

     

       167
       182
        
         (fetchNuGet {

     

       168
       183
        
           name = "Humanizer.Core.nb-NO";

     

       169
       169
       -
           version = "2.8.26";

     

       170
       170
       -
           sha256 = "160c98wfh7d2xlvlra4x5rdj4klgcjwcy3gkb4ipg655byn2m1j2";

     

       184
       184
       +
           version = "2.10.1";

     

       185
       185
       +
           sha256 = "0mry95z4ch5bdl71k88wsswmcdxsckhp3d578l9fwy8kgj7dg597";

     

       171
       186
        
         })

     

       172
       187
        
         (fetchNuGet {

     

       173
       188
        
           name = "Humanizer.Core.nl";

     

       174
       174
       -
           version = "2.8.26";

     

       175
       175
       -
           sha256 = "067pqm4i1mk83fqqr0bvzrchrvxwdnff18z3djgagclh1i4xqlvk";

     

       189
       189
       +
           version = "2.10.1";

     

       190
       190
       +
           sha256 = "03cm6vfsi5rgnc456b07vc7h3rfn3qjxfykq8f6cq61z1xgh9i53";

     

       176
       191
        
         })

     

       177
       192
        
         (fetchNuGet {

     

       178
       193
        
           name = "Humanizer.Core.pl";

     

       179
       179
       -
           version = "2.8.26";

     

       180
       180
       -
           sha256 = "1r1bbqb990war1hiag5f88yxw0k9jiid1ihb4s5bc1lzs3vfsb6x";

     

       194
       194
       +
           version = "2.10.1";

     

       195
       195
       +
           sha256 = "1gsrfp8d3ay5kra95sk0sy8vcak0ncxmddpwh9vw2sdhlj453bzx";

     

       181
       196
        
         })

     

       182
       197
        
         (fetchNuGet {

     

       183
       198
        
           name = "Humanizer.Core.pt";

     

       184
       184
       -
           version = "2.8.26";

     

       185
       185
       -
           sha256 = "1bik0vjjdzw51yl11ng9gsi3ihz50ibwh1gdhh2vd13jxjzb512p";

     

       199
       199
       +
           version = "2.10.1";

     

       200
       200
       +
           sha256 = "1z9asjsng8njvi8vr5ryklwdrfmgkjk2knd8q3hkf0k1zj4bkhsf";

     

       186
       201
        
         })

     

       187
       202
        
         (fetchNuGet {

     

       188
       203
        
           name = "Humanizer.Core.ro";

     

       189
       189
       -
           version = "2.8.26";

     

       190
       190
       -
           sha256 = "12f2hry6x1p1mgx6g4kpig2jpybx52ibghvhdhjbbfhy32gv8dr0";

     

       204
       204
       +
           version = "2.10.1";

     

       205
       205
       +
           sha256 = "0r8b1yl5dby56x6q0vgkzdnb08q3ar9kvnqz7pxfld9zh03k0snp";

     

       191
       206
        
         })

     

       192
       207
        
         (fetchNuGet {

     

       193
       208
        
           name = "Humanizer.Core.ru";

     

       194
       194
       -
           version = "2.8.26";

     

       195
       195
       -
           sha256 = "1hri12kwymzvdqcr66l8yiqiw3pmf9fk492z10yqljm576kyshgg";

     

       209
       209
       +
           version = "2.10.1";

     

       210
       210
       +
           sha256 = "1nqgscy7wqfbpld3bb6g1hwy2zdl88as1kxcflfiyysmnysavviz";

     

       196
       211
        
         })

     

       197
       212
        
         (fetchNuGet {

     

       198
       213
        
           name = "Humanizer.Core.sk";

     

       199
       199
       -
           version = "2.8.26";

     

       200
       200
       -
           sha256 = "07jfgk67axw97b85dn4bwpjwf3swd74j9hdd870qps12xfp98i9j";

     

       214
       214
       +
           version = "2.10.1";

     

       215
       215
       +
           sha256 = "0wk4a7g87s26da57a4srwnmhm9d2x68afn961lkd2anz8wixr97x";

     

       201
       216
        
         })

     

       202
       217
        
         (fetchNuGet {

     

       203
       218
        
           name = "Humanizer.Core.sl";

     

       204
       204
       -
           version = "2.8.26";

     

       205
       205
       -
           sha256 = "060xbzwb7p9ypbqfklih2zal2rh6h55gq4hv3i6alvlbd3vsx29n";

     

       219
       219
       +
           version = "2.10.1";

     

       220
       220
       +
           sha256 = "1vsjl6nbk2mxlvkk0zi0igzmfxfhr3jmnnx8ljwpz8a501svksxl";

     

       206
       221
        
         })

     

       207
       222
        
         (fetchNuGet {

     

       208
       223
        
           name = "Humanizer.Core.sr";

     

       209
       209
       -
           version = "2.8.26";

     

       210
       210
       -
           sha256 = "0i2c24qmqnhp85b088qlbagxd48hcl0v1ly4m7hfbvx5s7fg8riv";

     

       224
       224
       +
           version = "2.10.1";

     

       225
       225
       +
           sha256 = "03n64v7hl9awvq06y94wc0czqqf5nrw0d0k7xyx0l3lgw02jpgy2";

     

       211
       226
        
         })

     

       212
       227
        
         (fetchNuGet {

     

       213
       228
        
           name = "Humanizer.Core.sr-Latn";

     

       214
       214
       -
           version = "2.8.26";

     

       215
       215
       -
           sha256 = "1911a69sqssh9f007vmxbgyj4ym2ym4423xvw6cmbfhjcrhkfpbi";

     

       229
       229
       +
           version = "2.10.1";

     

       230
       230
       +
           sha256 = "0yw5k8g4672kcaia82aq36asjkjlkssi8lkkjn35hn9spq5734lc";

     

       216
       231
        
         })

     

       217
       232
        
         (fetchNuGet {

     

       218
       233
        
           name = "Humanizer.Core.sv";

     

       219
       219
       -
           version = "2.8.26";

     

       220
       220
       -
           sha256 = "056h8n9i18yl78f9ppzn2kkrz2cs46aqv0j5y8xq360zarggh0nm";

     

       234
       234
       +
           version = "2.10.1";

     

       235
       235
       +
           sha256 = "1n0631ka9cdikjyw9kr3vqwgd33g83chdabra50hnwcrykkigy4f";

     

       236
       236
       +
         })

     

       237
       237
       +
         (fetchNuGet {

     

       238
       238
       +
           name = "Humanizer.Core.th-TH";

     

       239
       239
       +
           version = "2.10.1";

     

       240
       240
       +
           sha256 = "0s1v0sap22xzqis95wmg66vriaavf6fgk8hcpm3as185dn37gxwn";

     

       221
       241
        
         })

     

       222
       242
        
         (fetchNuGet {

     

       223
       243
        
           name = "Humanizer.Core.tr";

     

       224
       224
       -
           version = "2.8.26";

     

       225
       225
       -
           sha256 = "0dk8ga3fpxifxxkz0n68654h65cvrx00hy7q00m5vgvmcp70gxxn";

     

       244
       244
       +
           version = "2.10.1";

     

       245
       245
       +
           sha256 = "063qr62a8cqa82xc3calv37x6d5v29wdssmrq9b7pas60vd5n7yd";

     

       226
       246
        
         })

     

       227
       247
        
         (fetchNuGet {

     

       228
       248
        
           name = "Humanizer.Core.uk";

     

       229
       229
       -
           version = "2.8.26";

     

       230
       230
       -
           sha256 = "0bnj5xqlcqp4n8i04ra78dax4854zbf2jsygvb4lpiayyyaj2bxw";

     

       249
       249
       +
           version = "2.10.1";

     

       250
       250
       +
           sha256 = "0n0zh9z19fwbb0dbpdld6jzydmwv7zj0nf2x0vpilrhcdhd4icfm";

     

       231
       251
        
         })

     

       232
       252
        
         (fetchNuGet {

     

       233
       253
        
           name = "Humanizer.Core.uz-Cyrl-UZ";

     

       234
       234
       -
           version = "2.8.26";

     

       235
       235
       -
           sha256 = "1bbf6mxas6brjw7rjljq5saz6v3ic6zbvm1b3c1jbk0hc0qkd7c8";

     

       254
       254
       +
           version = "2.10.1";

     

       255
       255
       +
           sha256 = "1q6z6c4hkxi5kq13k5qm6i6dx2namkdsysb09jvkvj2vl54gj074";

     

       236
       256
        
         })

     

       237
       257
        
         (fetchNuGet {

     

       238
       258
        
           name = "Humanizer.Core.uz-Latn-UZ";

     

       239
       239
       -
           version = "2.8.26";

     

       240
       240
       -
           sha256 = "1bfgfihpynax30g9kq8kra7c4jxps2ccxsxrs9gls47xbs35cw2f";

     

       259
       259
       +
           version = "2.10.1";

     

       260
       260
       +
           sha256 = "1758m8b2kv1k5r26al9x4vhss1f7b7yhk971b41zqapw7z66sgmx";

     

       241
       261
        
         })

     

       242
       262
        
         (fetchNuGet {

     

       243
       263
        
           name = "Humanizer.Core.vi";

     

       244
       244
       -
           version = "2.8.26";

     

       245
       245
       -
           sha256 = "1vm765nvkp6wyfwlcgppimjrk04lkg8lscch3n1i1i5hlqxrs9ch";

     

       264
       264
       +
           version = "2.10.1";

     

       265
       265
       +
           sha256 = "1z45zd7gpx20zaaxrv9ac6v0ig0s3d80nxdiig2pm1zrlx01ps33";

     

       246
       266
        
         })

     

       247
       267
        
         (fetchNuGet {

     

       248
       268
        
           name = "Humanizer.Core.zh-CN";

     

       249
       249
       -
           version = "2.8.26";

     

       250
       250
       -
           sha256 = "1qyl12rdh4iv1k1qcivcmxxnh8y93ainf22pmch8vvw9yjhs1y7s";

     

       269
       269
       +
           version = "2.10.1";

     

       270
       270
       +
           sha256 = "02pdpzzwk4wnj1bvzl059ndh67i5yx5ab8ayq5qkrg2hfkid9nn5";

     

       251
       271
        
         })

     

       252
       272
        
         (fetchNuGet {

     

       253
       273
        
           name = "Humanizer.Core.zh-Hans";

     

       254
       254
       -
           version = "2.8.26";

     

       255
       255
       -
           sha256 = "1gqv3dyk236wlp5wb7kd4qnyrmp3cy36ycykl7zr91s25cdls5vy";

     

       274
       274
       +
           version = "2.10.1";

     

       275
       275
       +
           sha256 = "1pm73sl5s1axzmwks68kdyskyv183z5yy020bhzcf0rwbrv3s2qi";

     

       256
       276
        
         })

     

       257
       277
        
         (fetchNuGet {

     

       258
       278
        
           name = "Humanizer.Core.zh-Hant";

     

       259
       259
       -
           version = "2.8.26";

     

       260
       260
       -
           sha256 = "1rhzbiqbx04l3kvzjklix90fxyc6vvmmw0p564ajdiximivs0pbh";

     

       279
       279
       +
           version = "2.10.1";

     

       280
       280
       +
           sha256 = "0fxyl2m05qgmnycdsbzv2dyzixq4jqnvvx7al87d6v5rvkrzwgik";

     

       261
       281
        
         })

     

       262
       282
        
         (fetchNuGet {

     

       263
       283
        
           name = "JetBrains.Annotations";

     
···

       301
       321
        
         })

     

       302
       322
        
         (fetchNuGet {

     

       303
       323
        
           name = "Microsoft.AspNetCore.Connections.Abstractions";

     

       304
       304
       -
           version = "5.0.5";

     

       305
       305
       -
           sha256 = "0qi4q54v7qiyc7xjbby88vmg1zcnb39sg8g1s7h0dnvapa436jv5";

     

       324
       324
       +
           version = "5.0.6";

     

       325
       325
       +
           sha256 = "1ggvdz6sq668w8nv99qg9pi2i3vx0vihfybjbyyywjgjppq93y8l";

     

       306
       326
        
         })

     

       307
       327
        
         (fetchNuGet {

     

       308
       328
        
           name = "Microsoft.AspNetCore.Http.Connections.Client";

     

       309
       309
       -
           version = "5.0.5";

     

       310
       310
       -
           sha256 = "1lpsjv6475p2vdvwv9wwmpzxc0r9bfya15nc5xqiv8m9z8d4sxlh";

     

       329
       329
       +
           version = "5.0.6";

     

       330
       330
       +
           sha256 = "16xzbs1mvbgzblzmzxznr4fpkwk9lz318rnscj7498k1dmk972s4";

     

       311
       331
        
         })

     

       312
       332
        
         (fetchNuGet {

     

       313
       333
        
           name = "Microsoft.AspNetCore.Http.Connections.Common";

     

       314
       314
       -
           version = "5.0.5";

     

       315
       315
       -
           sha256 = "1knfn9d1wsczaic3vlnracmj5frpaxwx15x7j06kgi2kl6j2hbc7";

     

       334
       334
       +
           version = "5.0.6";

     

       335
       335
       +
           sha256 = "1zqvmcb1zc704zf246byhf3sm1isixrdr4hlrqpss7zwd89vznv3";

     

       316
       336
        
         })

     

       317
       337
        
         (fetchNuGet {

     

       318
       338
        
           name = "Microsoft.AspNetCore.Http.Features";

     

       319
       319
       -
           version = "5.0.5";

     

       320
       320
       -
           sha256 = "011xdkqna8q0r2h9i1f646rkfjbl9qbaq56a487zagp8plwxvaxl";

     

       339
       339
       +
           version = "5.0.6";

     

       340
       340
       +
           sha256 = "18y9np24ybhzgv5lmaaah98l9s53c07lawld4y3nnngy4a2l8byq";

     

       321
       341
        
         })

     

       322
       342
        
         (fetchNuGet {

     

       323
       343
        
           name = "Microsoft.AspNetCore.SignalR.Client";

     

       324
       324
       -
           version = "5.0.5";

     

       325
       325
       -
           sha256 = "0r16n5c4im7gkfrhx2miiz9w58j0z87wjysbi4rsdav94hmkvgj4";

     

       344
       344
       +
           version = "5.0.6";

     

       345
       345
       +
           sha256 = "0vyqd11b02vfh1xbkq01z4nsj73rqnjpms1xm461x2p1yajs3792";

     

       326
       346
        
         })

     

       327
       347
        
         (fetchNuGet {

     

       328
       348
        
           name = "Microsoft.AspNetCore.SignalR.Client.Core";

     

       329
       329
       -
           version = "5.0.5";

     

       330
       330
       -
           sha256 = "11phwns2sn44vfd3vn6c0lh3aiiysfpav7rmv4cmjkxp3jmpay8r";

     

       349
       349
       +
           version = "5.0.6";

     

       350
       350
       +
           sha256 = "0q2fcz6g1jqiwqy05va26wf6mn7vjd915igaiqgmhqzjc2rgif88";

     

       331
       351
        
         })

     

       332
       352
        
         (fetchNuGet {

     

       333
       353
        
           name = "Microsoft.AspNetCore.SignalR.Common";

     

       334
       334
       -
           version = "5.0.5";

     

       335
       335
       -
           sha256 = "0am84ckim30djh4inv7mqph50axik79dwbfyrzlnaxcd3jr73c8c";

     

       354
       354
       +
           version = "5.0.6";

     

       355
       355
       +
           sha256 = "1apa35dffb29w9fj79ypdyvwkz37v04bbsl51hxrx1pa66jj4ymx";

     

       336
       356
        
         })

     

       337
       357
        
         (fetchNuGet {

     

       338
       358
        
           name = "Microsoft.AspNetCore.SignalR.Protocols.Json";

     

       339
       339
       -
           version = "5.0.5";

     

       340
       340
       -
           sha256 = "1z8d2dsgj9bh9a2xcz5xlrw4iijgmrm1midkdqni9b4nypbyraf6";

     

       359
       359
       +
           version = "5.0.6";

     

       360
       360
       +
           sha256 = "1yr94d8yry7i22a2zvcan7rr9lwbx298lz7k6wsgscj1isg5nrr7";

     

       341
       361
        
         })

     

       342
       362
        
         (fetchNuGet {

     

       343
       363
        
           name = "Microsoft.AspNetCore.SignalR.Protocols.MessagePack";

     

       344
       344
       -
           version = "5.0.5";

     

       345
       345
       -
           sha256 = "0p52j1mrihvm4y4yp2rnimp4vdypn0hbba0p79vp617jj17vs45l";

     

       364
       364
       +
           version = "5.0.6";

     

       365
       365
       +
           sha256 = "1asz4kaa0c42z8lgsh6ywn0399v1w8axvhxjbb6m39w9xq596rdr";

     

       346
       366
        
         })

     

       347
       367
        
         (fetchNuGet {

     

       348
       368
        
           name = "Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson";

     

       349
       349
       -
           version = "5.0.5";

     

       350
       350
       -
           sha256 = "0jllzr9sba5m9ccdslr4dysmxzrfzy9zvianmqhmj4is6dg2krfs";

     

       369
       369
       +
           version = "5.0.6";

     

       370
       370
       +
           sha256 = "1l5bl8zqw9wnincd7yxghik0k3yzip02zz26bah7mwyqaf4nhbma";

     

       351
       371
        
         })

     

       352
       372
        
         (fetchNuGet {

     

       353
       373
        
           name = "Microsoft.Bcl.AsyncInterfaces";

     
···

       730
       750
        
           sha256 = "17dxsvcz9g8kzydk5xlfz9kfxl62x9wi20609rh76wjd881bg1br";

     

       731
       751
        
         })

     

       732
       752
        
         (fetchNuGet {

     

       753
       753
       +
           name = "ppy.LocalisationAnalyser";

     

       754
       754
       +
           version = "2021.525.0";

     

       755
       755
       +
           sha256 = "1h8p8d1xk03904fifhi77zrjkh4sknp4mxjqd3nbpfyikd8f7c8p";

     

       756
       756
       +
         })

     

       757
       757
       +
         (fetchNuGet {

     

       733
       758
        
           name = "ppy.osu.Framework";

     

       734
       734
       -
           version = "2021.513.0";

     

       735
       735
       -
           sha256 = "17cqmgfd40jbdkm5rq9wl1rcvv870yqryc29k4c8bdsvxxf4arv2";

     

       759
       759
       +
           version = "2021.601.0";

     

       760
       760
       +
           sha256 = "0y17s60r4q0c05gm67fmp700zwb7k74xdi45hprblyxsplnbkmi0";

     

       736
       761
        
         })

     

       737
       762
        
         (fetchNuGet {

     

       738
       763
        
           name = "ppy.osu.Framework.NativeLibs";

     
···

       741
       766
        
         })

     

       742
       767
        
         (fetchNuGet {

     

       743
       768
        
           name = "ppy.osu.Game.Resources";

     

       744
       744
       -
           version = "2021.422.0";

     

       745
       745
       -
           sha256 = "1zw0197k6wmmjqjh022q3302mrwn59msx06y66378pahmhrr0sjc";

     

       769
       769
       +
           version = "2021.525.0";

     

       770
       770
       +
           sha256 = "15ksxv5fasfzdkmwikjbn17c1d4rssjfm2vp71b7m834ghm6pnbd";

     

       746
       771
        
         })

     

       747
       772
        
         (fetchNuGet {

     

       748
       773
        
           name = "ppy.osuTK.NS20";

     
···

       866
       891
        
         })

     

       867
       892
        
         (fetchNuGet {

     

       868
       893
        
           name = "Sentry";

     

       869
       869
       -
           version = "3.3.4";

     

       870
       870
       -
           sha256 = "188rlyg6xfmgk6ypyg1mmbvm8d64q3wfjn3h0ays73b9wlypk8x6";

     

       894
       894
       +
           version = "3.4.0";

     

       895
       895
       +
           sha256 = "0yivi1gmay29831parvsy4x9kzbv04754l0lgzv0v0p4l8m1gy6s";

     

       871
       896
        
         })

     

       872
       897
        
         (fetchNuGet {

     

       873
       898
        
           name = "SharpCompress";

+6 -6

pkgs/servers/http/unit/default.nix

···

       2
       2
        
       , pcre2

     

       3
       3
        
       , withPython2 ? false, python2

     

       4
       4
        
       , withPython3 ? true, python3, ncurses

     

       5
       5
       -
       , withPHP73 ? false, php73

     

       6
       6
       -
       , withPHP74 ? true, php74

     

       5
       5
       +
       , withPHP74 ? false, php74

     

       6
       6
       +
       , withPHP80 ? true, php80

     

       7
       7
        
       , withPerl530 ? false, perl530

     

       8
       8
        
       , withPerl532 ? true, perl532

     

       9
       9
        
       , withPerldevel ? false, perldevel

     
···

       26
       26
        
           fpmSupport = false;

     

       27
       27
        
         };

     

       28
       28
        
       

     

       29
       29
       -
         php73-unit = php73.override phpConfig;

     

       30
       29
        
         php74-unit = php74.override phpConfig;

     

       30
       30
       +
         php80-unit = php80.override phpConfig;

     

       31
       31
        
       

     

       32
       32
        
       in stdenv.mkDerivation rec {

     

       33
       33
        
         version = "1.24.0";

     
···

       45
       45
        
         buildInputs = [ pcre2.dev ]

     

       46
       46
        
           ++ optional withPython2 python2

     

       47
       47
        
           ++ optionals withPython3 [ python3 ncurses ]

     

       48
       48
       -
           ++ optional withPHP73 php73-unit

     

       49
       48
        
           ++ optional withPHP74 php74-unit

     

       49
       49
       +
           ++ optional withPHP80 php80-unit

     

       50
       50
        
           ++ optional withPerl530 perl530

     

       51
       51
        
           ++ optional withPerl532 perl532

     

       52
       52
        
           ++ optional withPerldevel perldevel

     
···

       64
       64
        
           ++ optional withDebug   "--debug";

     

       65
       65
        
       

     

       66
       66
        
         # Optionally add the PHP derivations used so they can be addressed in the configs

     

       67
       67
       -
         usedPhp73 = optionals withPHP73 php73-unit;

     

       68
       67
        
         usedPhp74 = optionals withPHP74 php74-unit;

     

       68
       68
       +
         usedPhp80 = optionals withPHP80 php80-unit;

     

       69
       69
        
       

     

       70
       70
        
         postConfigure = ''

     

       71
       71
        
           ${optionalString withPython2    "./configure python --module=python2  --config=python2-config  --lib-path=${python2}/lib"}

     

       72
       72
        
           ${optionalString withPython3    "./configure python --module=python3  --config=python3-config  --lib-path=${python3}/lib"}

     

       73
       73
       -
           ${optionalString withPHP73      "./configure php    --module=php73    --config=${php73-unit.unwrapped.dev}/bin/php-config --lib-path=${php73-unit}/lib"}

     

       74
       73
        
           ${optionalString withPHP74      "./configure php    --module=php74    --config=${php74-unit.unwrapped.dev}/bin/php-config --lib-path=${php74-unit}/lib"}

     

       74
       74
       +
           ${optionalString withPHP80      "./configure php    --module=php80    --config=${php80-unit.unwrapped.dev}/bin/php-config --lib-path=${php80-unit}/lib"}

     

       75
       75
        
           ${optionalString withPerl530    "./configure perl   --module=perl530  --perl=${perl530}/bin/perl"}

     

       76
       76
        
           ${optionalString withPerl532    "./configure perl   --module=perl532  --perl=${perl532}/bin/perl"}

     

       77
       77
        
           ${optionalString withPerldevel  "./configure perl   --module=perldev  --perl=${perldevel}/bin/perl"}

+2 -2

pkgs/tools/misc/diffoscope/default.nix

···

       16
       16
        
       in

     

       17
       17
        
       python3Packages.buildPythonApplication rec {

     

       18
       18
        
         pname = "diffoscope";

     

       19
       19
       -
         version = "176";

     

       19
       19
       +
         version = "177";

     

       20
       20
        
       

     

       21
       21
        
         src = fetchurl {

     

       22
       22
        
           url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2";

     

       23
       23
       -
           sha256 = "sha256-Hr3GNgpvKCLs+HA8QLOewh5nz9npZr5MZ65wRrat7l0=";

     

       23
       23
       +
           sha256 = "sha256-yTOaDhAKtMhQYxolALnuc7FuXoMUOhjmsabtS1FeW/Q=";

     

       24
       24
        
         };

     

       25
       25
        
       

     

       26
       26
        
         outputs = [ "out" "man" ];

+7 -2

pkgs/top-level/aliases.nix

···

       528
       528
        
         pgp-tools = signing-party; # added 2017-03-26

     

       529
       529
        
         pg_tmp = ephemeralpg; # added 2018-01-16

     

       530
       530
        
       

     

       531
       531
       +
         # Obsolete PHP version aliases

     

       532
       532
       +
         php73 = throw "php73 has been dropped due to the lack of maintanence from upstream for future releases."; # added 2021-06-03

     

       533
       533
       +
         php73Packages = php73; # added 2021-06-03

     

       534
       534
       +
         php73Extensions = php73; # added 2021-06-03

     

       535
       535
       +
       

     

       531
       536
        
         php-embed = throw ''

     

       532
       537
        
           php*-embed has been dropped, you can build something similar

     

       533
       538
        
           with the following snippet:

     
···

       541
       546
        
           similar with the following snippet:

     

       542
       547
        
           (php74.override { embedSupport = true; apxs2Support = false; }).packages

     

       543
       548
        
         ''; # added 2020-04-01

     

       544
       544
       -
         php74Packages-embed = phpPackages-embed;

     

       545
       549
        
         php73Packages-embed = phpPackages-embed;

     

       550
       550
       +
         php74Packages-embed = phpPackages-embed;

     

       546
       551
        
       

     

       547
       552
        
         php-unit = throw ''

     

       548
       553
        
           php*-unit has been dropped, you can build something similar with

     
···

       571
       576
        
             fpmSupport = false;

     

       572
       577
        
           }).packages

     

       573
       578
        
         ''; # added 2020-04-01

     

       574
       574
       -
         php74Packages-unit = phpPackages-unit;

     

       575
       579
        
         php73Packages-unit = phpPackages-unit;

     

       580
       580
       +
         php74Packages-unit = phpPackages-unit;

     

       576
       581
        
       

     

       577
       582
        
         pidgin-with-plugins = pidgin; # added 2016-06

     

       578
       583
        
         pidginlatex = pidgin-latex; # added 2018-01-08

+5 -14

pkgs/top-level/all-packages.nix

···

       1091
       1091
        
         }) arangodb_3_3 arangodb_3_4 arangodb_3_5;

     

       1092
       1092
        
         arangodb = arangodb_3_4;

     

       1093
       1093
        
       

     

       1094
       1094
       -
         arcanist = callPackage ../development/tools/misc/arcanist {};

     

       1094
       1094
       +
         arcanist = callPackage ../development/tools/misc/arcanist { php = php74; };

     

       1095
       1095
        
       

     

       1096
       1096
        
         arduino = arduino-core.override { withGui = true; };

     

       1097
       1097
        
       

     
···

       12292
       12292
        
         # PHP interpreters, packages and extensions.

     

       12293
       12293
        
         #

     

       12294
       12294
        
         # Set default PHP interpreter, extensions and packages

     

       12295
       12295
       -
         php = php74;

     

       12295
       12295
       +
         php = php80;

     

       12296
       12296
        
         phpExtensions = php.extensions;

     

       12297
       12297
        
         phpPackages = php.packages;

     

       12298
       12298
        
       

     
···

       12310
       12310
        
         php74Extensions = recurseIntoAttrs php74.extensions;

     

       12311
       12311
        
         php74Packages = recurseIntoAttrs php74.packages;

     

       12312
       12312
        
       

     

       12313
       12313
       -
         # Import PHP73 interpreter, extensions and packages

     

       12314
       12314
       -
         php73 = callPackage ../development/interpreters/php/7.3.nix {

     

       12315
       12315
       -
           stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv;

     

       12316
       12316
       -
         };

     

       12317
       12317
       -
         php73Extensions = recurseIntoAttrs php73.extensions;

     

       12318
       12318
       -
         php73Packages = recurseIntoAttrs php73.packages;

     

       12319
       12319
       -
       

     

       12320
       12313
        
       

     

       12321
       12314
        
         picoc = callPackage ../development/interpreters/picoc {};

     

       12322
       12315
        
       

     
···

       19070
       19063
        
       

     

       19071
       19064
        
         dspam = callPackage ../servers/mail/dspam { };

     

       19072
       19065
        
       

     

       19073
       19073
       -
         engelsystem = callPackage ../servers/web-apps/engelsystem { };

     

       19066
       19066
       +
         engelsystem = callPackage ../servers/web-apps/engelsystem { php = php74; };

     

       19074
       19067
        
       

     

       19075
       19068
        
         envoy = callPackage ../servers/http/envoy { };

     

       19076
       19069
        
       

     
···

       24899
       24892
        
       

     

       24900
       24893
        
         liferea = callPackage ../applications/networking/newsreaders/liferea { };

     

       24901
       24894
        
       

     

       24902
       24902
       -
         lightworks = callPackage ../applications/video/lightworks {

     

       24903
       24903
       -
           portaudio = portaudio2014;

     

       24904
       24904
       -
         };

     

       24895
       24895
       +
         lightworks = callPackage ../applications/video/lightworks { };

     

       24905
       24896
        
       

     

       24906
       24897
        
         lingot = callPackage ../applications/audio/lingot { };

     

       24907
       24898
        
       

     
···

       24953
       24944
        
       

     

       24954
       24945
        
         lrzsz = callPackage ../tools/misc/lrzsz { };

     

       24955
       24946
        
       

     

       24956
       24956
       -
         lsp-plugins = callPackage ../applications/audio/lsp-plugins { };

     

       24947
       24947
       +
         lsp-plugins = callPackage ../applications/audio/lsp-plugins { php = php74; };

     

       24957
       24948
        
       

     

       24958
       24949
        
         luminanceHDR = libsForQt5.callPackage ../applications/graphics/luminance-hdr { };

     

       24959
       24950

+9 -71

pkgs/top-level/php-packages.nix

···

       1
       1
        
       { stdenv, lib, pkgs, fetchgit, phpPackage, autoconf, pkg-config, re2c

     

       2
       2
        
       , gettext, bzip2, curl, libxml2, openssl, gmp, icu64, oniguruma, libsodium

     

       3
       3
       -
       , html-tidy, libzip, zlib, pcre, pcre2, libxslt, aspell, openldap, cyrus_sasl

     

       3
       3
       +
       , html-tidy, libzip, zlib, pcre2, libxslt, aspell, openldap, cyrus_sasl

     

       4
       4
        
       , uwimap, pam, libiconv, enchant1, libXpm, gd, libwebp, libjpeg, libpng

     

       5
       5
        
       , freetype, libffi, freetds, postgresql, sqlite, net-snmp, unixODBC, libedit

     

       6
       6
        
       , readline, rsync, fetchpatch, valgrind

     
···

       19
       19
        
           pname = "php-${pname}";

     

       20
       20
        
         });

     

       21
       21
        
       

     

       22
       22
       -
         pcre' = if (lib.versionAtLeast php.version "7.3") then pcre2 else pcre;

     

       23
       23
       -
       

     

       24
       22
        
         php = phpPackage;

     

       25
       23
        
       

     

       26
       24
        
         # This is a set of interactive tools based on PHP.

     
···

       28
       26
        
           box = callPackage ../development/php-packages/box { };

     

       29
       27
        
       

     

       30
       28
        
           composer = callPackage ../development/php-packages/composer { };

     

       31
       31
       -
       

     

       32
       32
       -
           composer1 = callPackage ../development/php-packages/composer/1.x.nix { };

     

       33
       29
        
       

     

       34
       30
        
           deployer = callPackage ../development/php-packages/deployer { };

     

       35
       31
        
       

     
···

       92
       88
        
       

     

       93
       89
        
           pcov = callPackage ../development/php-packages/pcov { };

     

       94
       90
        
       

     

       95
       95
       -
           pcs = buildPecl {

     

       96
       96
       -
             version = "1.3.3";

     

       97
       97
       -
             pname = "pcs";

     

       98
       98
       -
       

     

       99
       99
       -
             sha256 = "0d4p1gpl8gkzdiv860qzxfz250ryf0wmjgyc8qcaaqgkdyh5jy5p";

     

       100
       100
       -
       

     

       101
       101
       -
             internalDeps = [ php.extensions.tokenizer ];

     

       102
       102
       -
       

     

       103
       103
       -
             meta.maintainers = lib.teams.php.members;

     

       104
       104
       -
             meta.broken = lib.versionAtLeast php.version "7.3"; # Runtime failure on 7.3, build error on 7.4

     

       105
       105
       -
           };

     

       106
       106
       -
       

     

       107
       91
        
           pdo_oci = buildPecl rec {

     

       108
       92
        
             inherit (php.unwrapped) src version;

     

       109
       93
        
       

     
···

       129
       113
        
           pinba = callPackage ../development/php-packages/pinba { };

     

       130
       114
        
       

     

       131
       115
        
           protobuf = callPackage ../development/php-packages/protobuf { };

     

       132
       132
       -
       

     

       133
       133
       -
           pthreads = callPackage ../development/php-packages/pthreads { };

     

       134
       116
        
       

     

       135
       117
        
           rdkafka = callPackage ../development/php-packages/rdkafka { };

     

       136
       118
        
       

     
···

       144
       126
        
       

     

       145
       127
        
           swoole = callPackage ../development/php-packages/swoole { };

     

       146
       128
        
       

     

       147
       147
       -
           v8 = buildPecl {

     

       148
       148
       -
             version = "0.2.2";

     

       149
       149
       -
             pname = "v8";

     

       150
       150
       -
       

     

       151
       151
       -
             sha256 = "103nys7zkpi1hifqp9miyl0m1mn07xqshw3sapyz365nb35g5q71";

     

       152
       152
       -
       

     

       153
       153
       -
             buildInputs = [ pkgs.v8 ];

     

       154
       154
       -
             configureFlags = [ "--with-v8=${pkgs.v8}" ];

     

       155
       155
       -
       

     

       156
       156
       -
             meta.maintainers = lib.teams.php.members;

     

       157
       157
       -
             meta.broken = true;

     

       158
       158
       -
           };

     

       159
       159
       -
       

     

       160
       160
       -
           v8js = buildPecl {

     

       161
       161
       -
             version = "2.1.0";

     

       162
       162
       -
             pname = "v8js";

     

       163
       163
       -
       

     

       164
       164
       -
             sha256 = "0g63dyhhicngbgqg34wl91nm3556vzdgkq19gy52gvmqj47rj6rg";

     

       165
       165
       -
       

     

       166
       166
       -
             buildInputs = [ pkgs.v8 ];

     

       167
       167
       -
             configureFlags = [ "--with-v8js=${pkgs.v8}" ];

     

       168
       168
       -
       

     

       169
       169
       -
             meta.maintainers = lib.teams.php.members;

     

       170
       170
       -
             meta.broken = true;

     

       171
       171
       -
           };

     

       172
       172
       -
       

     

       173
       129
        
           xdebug = callPackage ../development/php-packages/xdebug { };

     

       174
       130
        
       

     

       175
       131
        
           yaml = callPackage ../development/php-packages/yaml { };

     

       176
       176
       -
       

     

       177
       177
       -
           zmq = buildPecl {

     

       178
       178
       -
             version = "1.1.3";

     

       179
       179
       -
             pname = "zmq";

     

       180
       180
       -
       

     

       181
       181
       -
             sha256 = "1kj487vllqj9720vlhfsmv32hs2dy2agp6176mav6ldx31c3g4n4";

     

       182
       182
       -
       

     

       183
       183
       -
             configureFlags = [

     

       184
       184
       -
               "--with-zmq=${pkgs.zeromq}"

     

       185
       185
       -
             ];

     

       186
       186
       -
       

     

       187
       187
       -
             nativeBuildInputs = [ pkgs.pkg-config ];

     

       188
       188
       -
       

     

       189
       189
       -
             meta.maintainers = lib.teams.php.members;

     

       190
       190
       -
             meta.broken = lib.versionAtLeast php.version "7.3";

     

       191
       191
       -
           };

     

       192
       132
        
         } // (let

     

       193
       133
        
           # Function to build a single php extension based on the php version.

     

       194
       134
        
           #

     
···

       297
       237
        
               doCheck = false; }

     

       298
       238
        
             { name = "exif"; doCheck = false; }

     

       299
       239
        
             { name = "ffi"; buildInputs = [ libffi ]; enable = lib.versionAtLeast php.version "7.4"; }

     

       300
       300
       -
             { name = "fileinfo"; buildInputs = [ pcre' ]; }

     

       301
       301
       -
             { name = "filter"; buildInputs = [ pcre' ]; }

     

       240
       240
       +
             { name = "fileinfo"; buildInputs = [ pcre2 ]; }

     

       241
       241
       +
             { name = "filter"; buildInputs = [ pcre2 ]; }

     

       302
       242
        
             { name = "ftp"; buildInputs = [ openssl ]; }

     

       303
       243
        
             { name = "gd";

     

       304
       244
        
               buildInputs = [ zlib gd ];

     
···

       350
       290
        
               ];

     

       351
       291
        
               doCheck = false; }

     

       352
       292
        
             { name = "imap";

     

       353
       353
       -
               buildInputs = [ uwimap openssl pam pcre' ];

     

       293
       293
       +
               buildInputs = [ uwimap openssl pam pcre2 ];

     

       354
       294
        
               configureFlags = [ "--with-imap=${uwimap}" "--with-imap-ssl" ];

     

       355
       295
        
               # uwimap doesn't build on darwin.

     

       356
       296
        
               enable = (!stdenv.isDarwin); }

     

       357
       357
       -
             # interbase (7.3, 7.2)

     

       358
       297
        
             { name = "intl";

     

       359
       298
        
               buildInputs = [ icu64 ];

     

       360
       299
        
               patches = lib.optionals (lib.versionOlder php.version "7.4") [

     
···

       377
       316
        
               ];

     

       378
       317
        
               doCheck = false; }

     

       379
       318
        
             { name = "mbstring"; buildInputs = [ oniguruma ] ++ lib.optionals (lib.versionAtLeast php.version "8.0") [

     

       380
       380
       -
                 pcre'

     

       319
       319
       +
                 pcre2

     

       381
       320
        
               ]; doCheck = false; }

     

       382
       321
        
             { name = "mysqli";

     

       383
       322
        
               internalDeps = [ php.extensions.mysqlnd ];

     
···

       425
       364
        
             # oci8 (7.4, 7.3, 7.2)

     

       426
       365
        
             # odbc (7.4, 7.3, 7.2)

     

       427
       366
        
             { name = "opcache";

     

       428
       428
       -
               buildInputs = [ pcre' ] ++ lib.optionals (!stdenv.isDarwin && lib.versionAtLeast php.version "8.0") [

     

       367
       367
       +
               buildInputs = [ pcre2 ] ++ lib.optionals (!stdenv.isDarwin && lib.versionAtLeast php.version "8.0") [

     

       429
       368
        
                 valgrind.dev

     

       430
       369
        
               ];

     

       431
       370
        
               patches = lib.optionals (lib.versionOlder php.version "7.4") [

     
···

       480
       419
        
               configureFlags = [ "--with-pdo-sqlite=${sqlite.dev}" ];

     

       481
       420
        
               doCheck = false; }

     

       482
       421
        
             { name = "pgsql";

     

       483
       483
       -
               buildInputs = [ pcre' ];

     

       422
       422
       +
               buildInputs = [ pcre2 ];

     

       484
       423
        
               configureFlags = [ "--with-pgsql=${postgresql}" ];

     

       485
       424
        
               doCheck = false; }

     

       486
       425
        
             { name = "posix"; doCheck = false; }

     
···

       493
       432
        
               '';

     

       494
       433
        
               doCheck = false;

     

       495
       434
        
             }

     

       496
       496
       -
             # recode (7.3, 7.2)

     

       497
       435
        
             { name = "session"; doCheck = !(lib.versionAtLeast php.version "8.0"); }

     

       498
       436
        
             { name = "shmop"; }

     

       499
       437
        
             { name = "simplexml";

     

       500
       500
       -
               buildInputs = [ libxml2 pcre' ];

     

       438
       438
       +
               buildInputs = [ libxml2 pcre2 ];

     

       501
       439
        
               configureFlags = [ "--enable-simplexml" ]

     

       502
       440
        
                 # Required to build on darwin.

     

       503
       441
        
                 ++ lib.optionals (lib.versionOlder php.version "7.4") [ "--with-libxml-dir=${libxml2.dev}" ]; }

     
···

       558
       496
        
               configureFlags = [ "--with-xsl=${libxslt.dev}" ]; }

     

       559
       497
        
             { name = "zend_test"; }

     

       560
       498
        
             { name = "zip";

     

       561
       561
       -
               buildInputs = [ libzip pcre' ];

     

       499
       499
       +
               buildInputs = [ libzip pcre2 ];

     

       562
       500
        
               configureFlags = [ "--with-zip" ]

     

       563
       501
        
                 ++ lib.optionals (lib.versionOlder php.version "7.4") [ "--with-zlib-dir=${zlib.dev}" ]

     

       564
       502
        
                 ++ lib.optionals (lib.versionOlder php.version "7.3") [ "--with-libzip" ];