commit da1f279ece6a5ac3fa01c9cc14c57207778f476c · pyrox.dev/nixpkgs

+1 -1

nixos/lib/systemd-lib.nix

···

       66
       66
        
             "Systemd ${group} field `${name}' must be a valid MAC address.";

     

       67
       67
        
       

     

       68
       68
        
         assertNetdevMacAddress = name: group: attr:

     

       69
       69
       -
           optional (attr ? ${name} && (! isMacAddress attr.${name} || attr.${name} != "none"))

     

       69
       69
       +
           optional (attr ? ${name} && (! isMacAddress attr.${name} && attr.${name} != "none"))

     

       70
       70
        
             "Systemd ${group} field `${name}` must be a valid MAC address or the special value `none`.";

     

       71
       71
        
       

     

       72
       72

+43 -18

nixos/modules/services/web-apps/freshrss.nix

···

       7
       7
        
         poolName = "freshrss";

     

       8
       8
        
       in

     

       9
       9
        
       {

     

       10
       10
       -
         meta.maintainers = with maintainers; [ etu stunkymonkey ];

     

       10
       10
       +
         meta.maintainers = with maintainers; [ etu stunkymonkey mattchrist ];

     

       11
       11
        
       

     

       12
       12
        
         options.services.freshrss = {

     

       13
       13
        
           enable = mkEnableOption (mdDoc "FreshRSS feed reader");

     
···

       27
       27
        
           };

     

       28
       28
        
       

     

       29
       29
        
           passwordFile = mkOption {

     

       30
       30
       -
             type = types.path;

     

       30
       30
       +
             type = types.nullOr types.path;

     

       31
       31
       +
             default = null;

     

       31
       32
        
             description = mdDoc "Password for the defaultUser for FreshRSS.";

     

       32
       33
        
             example = "/run/secrets/freshrss";

     

       33
       34
        
           };

     
···

       120
       121
        
           user = mkOption {

     

       121
       122
        
             type = types.str;

     

       122
       123
        
             default = "freshrss";

     

       123
       123
       -
             description = lib.mdDoc "User under which Freshrss runs.";

     

       124
       124
       +
             description = lib.mdDoc "User under which FreshRSS runs.";

     

       125
       125
       +
           };

     

       126
       126
       +
       

     

       127
       127
       +
           authType = mkOption {

     

       128
       128
       +
             type = types.enum [ "form" "http_auth" "none" ];

     

       129
       129
       +
             default = "form";

     

       130
       130
       +
             description = mdDoc "Authentication type for FreshRSS.";

     

       124
       131
        
           };

     

       125
       132
        
         };

     

       126
       133
        
       

     
···

       160
       167
        
             };

     

       161
       168
        
           in

     

       162
       169
        
           mkIf cfg.enable {

     

       170
       170
       +
             assertions = mkIf (cfg.authType == "form") [

     

       171
       171
       +
               {

     

       172
       172
       +
                 assertion = cfg.passwordFile != null;

     

       173
       173
       +
                 message = ''

     

       174
       174
       +
                   `passwordFile` must be supplied when using "form" authentication!

     

       175
       175
       +
                 '';

     

       176
       176
       +
               }

     

       177
       177
       +
             ];

     

       163
       178
        
             # Set up a Nginx virtual host.

     

       164
       179
        
             services.nginx = mkIf (cfg.virtualHost != null) {

     

       165
       180
        
               enable = true;

     
···

       227
       242
        
                 settingsFlags = concatStringsSep " \\\n    "

     

       228
       243
        
                   (mapAttrsToList (k: v: "${k} ${toString v}") {

     

       229
       244
        
                     "--default_user" = ''"${cfg.defaultUser}"'';

     

       230
       230
       -
                     "--auth_type" = ''"form"'';

     

       245
       245
       +
                     "--auth_type" = ''"${cfg.authType}"'';

     

       231
       246
        
                     "--base_url" = ''"${cfg.baseUrl}"'';

     

       232
       247
        
                     "--language" = ''"${cfg.language}"'';

     

       233
       248
        
                     "--db-type" = ''"${cfg.database.type}"'';

     
···

       255
       270
        
                   FRESHRSS_DATA_PATH = cfg.dataDir;

     

       256
       271
        
                 };

     

       257
       272
        
       

     

       258
       258
       -
                 script = ''

     

       259
       259
       -
                   # do installation or reconfigure

     

       260
       260
       -
                   if test -f ${cfg.dataDir}/config.php; then

     

       261
       261
       -
                     # reconfigure with settings

     

       262
       262
       -
                     ./cli/reconfigure.php ${settingsFlags}

     

       263
       263
       -
                     ./cli/update-user.php --user ${cfg.defaultUser} --password "$(cat ${cfg.passwordFile})"

     

       264
       264
       -
                   else

     

       265
       265
       -
                     # check correct folders in data folder

     

       266
       266
       -
                     ./cli/prepare.php

     

       267
       267
       -
                     # install with settings

     

       268
       268
       -
                     ./cli/do-install.php ${settingsFlags}

     

       269
       269
       -
                     ./cli/create-user.php --user ${cfg.defaultUser} --password "$(cat ${cfg.passwordFile})"

     

       270
       270
       -
                   fi

     

       271
       271
       -
                 '';

     

       273
       273
       +
                 script =

     

       274
       274
       +
                   let

     

       275
       275
       +
                     userScriptArgs = ''--user ${cfg.defaultUser} --password "$(cat ${cfg.passwordFile})"'';

     

       276
       276
       +
                     updateUserScript = optionalString (cfg.authType == "form") ''

     

       277
       277
       +
                       ./cli/update-user.php ${userScriptArgs}

     

       278
       278
       +
                     '';

     

       279
       279
       +
                     createUserScript = optionalString (cfg.authType == "form") ''

     

       280
       280
       +
                       ./cli/create-user.php ${userScriptArgs}

     

       281
       281
       +
                     '';

     

       282
       282
       +
                   in

     

       283
       283
       +
                   ''

     

       284
       284
       +
                     # do installation or reconfigure

     

       285
       285
       +
                     if test -f ${cfg.dataDir}/config.php; then

     

       286
       286
       +
                       # reconfigure with settings

     

       287
       287
       +
                       ./cli/reconfigure.php ${settingsFlags}

     

       288
       288
       +
                       ${updateUserScript}

     

       289
       289
       +
                     else

     

       290
       290
       +
                       # check correct folders in data folder

     

       291
       291
       +
                       ./cli/prepare.php

     

       292
       292
       +
                       # install with settings

     

       293
       293
       +
                       ./cli/do-install.php ${settingsFlags}

     

       294
       294
       +
                       ${createUserScript}

     

       295
       295
       +
                     fi

     

       296
       296
       +
                   '';

     

       272
       297
        
               };

     

       273
       298
        
       

     

       274
       299
        
             systemd.services.freshrss-updater = {

+20

nixos/tests/freshrss-http-auth.nix

···

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

     

       2
       2
       +
         name = "freshrss";

     

       3
       3
       +
         meta.maintainers = with lib.maintainers; [ mattchrist ];

     

       4
       4
       +
       

     

       5
       5
       +
         nodes.machine = { pkgs, ... }: {

     

       6
       6
       +
           services.freshrss = {

     

       7
       7
       +
             enable = true;

     

       8
       8
       +
             baseUrl = "http://localhost";

     

       9
       9
       +
             dataDir = "/srv/freshrss";

     

       10
       10
       +
             authType = "http_auth";

     

       11
       11
       +
           };

     

       12
       12
       +
         };

     

       13
       13
       +
       

     

       14
       14
       +
         testScript = ''

     

       15
       15
       +
           machine.wait_for_unit("multi-user.target")

     

       16
       16
       +
           machine.wait_for_open_port(80)

     

       17
       17
       +
           response = machine.succeed("curl -vvv -s -H 'Host: freshrss' -H 'Remote-User: testuser' http://127.0.0.1:80/i/")

     

       18
       18
       +
           assert 'Account: testuser' in response, "http_auth method didn't work."

     

       19
       19
       +
         '';

     

       20
       20
       +
       })

+2 -2

pkgs/applications/misc/hugo/default.nix

···

       10
       10
        
       

     

       11
       11
        
       buildGoModule rec {

     

       12
       12
        
         pname = "hugo";

     

       13
       13
       -
         version = "0.115.3";

     

       13
       13
       +
         version = "0.115.4";

     

       14
       14
        
       

     

       15
       15
        
         src = fetchFromGitHub {

     

       16
       16
        
           owner = "gohugoio";

     

       17
       17
        
           repo = pname;

     

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

     

       19
       19
       -
           hash = "sha256-MzGOBR++mnQd4CvBpPCibeimt05gsa3aHNK6FphBFGU=";

     

       19
       19
       +
           hash = "sha256-//WWdU6vKgc+X4R3/GClABbsAp+ZBnG3xsVh4YozPFg=";

     

       20
       20
        
         };

     

       21
       21
        
       

     

       22
       22
        
         vendorHash = "sha256-BmMrdPr3sQI0Pw32iIIVmWy2qLlR7SHyKu7+PLplxkE=";

+18 -18

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

···

       655
       655
        
           "vendorHash": "sha256-9AmfvoEf7E6lAblPIWizElng5GQJG/hQ5o6Mo3AN+EA="

     

       656
       656
        
         },

     

       657
       657
        
         "launchdarkly": {

     

       658
       658
       -
           "hash": "sha256-d0Gtofv4Ly2D+ensPEjLhSjN+OGnAa6W2tb4+jqNGlc=",

     

       658
       658
       +
           "hash": "sha256-RNLWcABBoTDY541og/euj4CLhK6t58wck9rpdedwRJM=",

     

       659
       659
        
           "homepage": "https://registry.terraform.io/providers/launchdarkly/launchdarkly",

     

       660
       660
        
           "owner": "launchdarkly",

     

       661
       661
        
           "repo": "terraform-provider-launchdarkly",

     

       662
       662
       -
           "rev": "v2.13.1",

     

       662
       662
       +
           "rev": "v2.13.2",

     

       663
       663
        
           "spdx": "MPL-2.0",

     

       664
       664
        
           "vendorHash": "sha256-jggXSnERsraNqkQKFpUtlglSOi02n4eAp4graJ6K+ZA="

     

       665
       665
        
         },

     
···

       673
       673
        
           "vendorHash": "sha256-4jAJf2FC83NdH4t1l7EA26yQ0pqteWmTIyrZDJdi7fg="

     

       674
       674
        
         },

     

       675
       675
        
         "linode": {

     

       676
       676
       -
           "hash": "sha256-dX6sG8htSZgs/OSfH09gfx4ng3Sj0uAdzQFMrVwibPk=",

     

       676
       676
       +
           "hash": "sha256-4lcEiX/Prx1fpD1HOo8B4YSvxo9yo7zWu07DVZ6NTmw=",

     

       677
       677
        
           "homepage": "https://registry.terraform.io/providers/linode/linode",

     

       678
       678
        
           "owner": "linode",

     

       679
       679
        
           "repo": "terraform-provider-linode",

     

       680
       680
       -
           "rev": "v2.5.1",

     

       680
       680
       +
           "rev": "v2.5.2",

     

       681
       681
        
           "spdx": "MPL-2.0",

     

       682
       682
       -
           "vendorHash": "sha256-n9ZZsTNE4E3T3SjF3+JjElDq5PVaD9o2Q2ATexRS/q0="

     

       682
       682
       +
           "vendorHash": "sha256-ggKPeTPIFrnfoREB4yr5Wr2dwc5y7Gq0fBtUsbnoCL0="

     

       683
       683
        
         },

     

       684
       684
        
         "linuxbox": {

     

       685
       685
        
           "hash": "sha256-MzasMVtXO7ZeZ+qEx2Z+7881fOIA0SFzSvXVHeEROtg=",

     
···

       745
       745
        
           "vendorHash": "sha256-4OVNcAG+/JhVQX4eW5jUkrJeIPPZatq3SvQERdRPtl0="

     

       746
       746
        
         },

     

       747
       747
        
         "mongodbatlas": {

     

       748
       748
       -
           "hash": "sha256-vhzidHQzWrLQ2fGZ0A7aGKwvrqWi6GJ3JCdoCX/dZkc=",

     

       748
       748
       +
           "hash": "sha256-lNWGGDGr0dp+4S1mnRnLl0n//5GtOqqSH4mWQxvzXEQ=",

     

       749
       749
        
           "homepage": "https://registry.terraform.io/providers/mongodb/mongodbatlas",

     

       750
       750
        
           "owner": "mongodb",

     

       751
       751
        
           "repo": "terraform-provider-mongodbatlas",

     

       752
       752
       -
           "rev": "v1.10.1",

     

       752
       752
       +
           "rev": "v1.10.2",

     

       753
       753
        
           "spdx": "MPL-2.0",

     

       754
       754
       -
           "vendorHash": "sha256-7wrN2BoFY0I9dV52x9LJ43PgUSOVnhJULm1EY+LEZOI="

     

       754
       754
       +
           "vendorHash": "sha256-o8VrabFScEQyjfk4BLJGxq7LgZMWaQZ2cNAph37Grzo="

     

       755
       755
        
         },

     

       756
       756
        
         "namecheap": {

     

       757
       757
        
           "hash": "sha256-cms8YUL+SjTeYyIOQibksi8ZHEBYq2JlgTEpOO1uMZE=",

     
···

       818
       818
        
           "vendorHash": "sha256-LRIfxQGwG988HE5fftGl6JmBG7tTknvmgpm4Fu1NbWI="

     

       819
       819
        
         },

     

       820
       820
        
         "oci": {

     

       821
       821
       -
           "hash": "sha256-NyNQht7mWG4+IbyhCPSJnLTIFm7KeBpEfua5oR6ovC0=",

     

       821
       821
       +
           "hash": "sha256-kGz6lginz3cZOYcfh21pBe+wAQ1slbsIz02sc1fNJ0E=",

     

       822
       822
        
           "homepage": "https://registry.terraform.io/providers/oracle/oci",

     

       823
       823
        
           "owner": "oracle",

     

       824
       824
        
           "repo": "terraform-provider-oci",

     

       825
       825
       -
           "rev": "v5.4.0",

     

       825
       825
       +
           "rev": "v5.5.0",

     

       826
       826
        
           "spdx": "MPL-2.0",

     

       827
       827
        
           "vendorHash": null

     

       828
       828
        
         },

     
···

       971
       971
        
           "vendorHash": null

     

       972
       972
        
         },

     

       973
       973
        
         "scaleway": {

     

       974
       974
       -
           "hash": "sha256-AA9ctS5YQ36mvxfXSU77rfOWL5UXynVN+TUjpjBR40I=",

     

       974
       974
       +
           "hash": "sha256-W1s4SCxpPsZH31KOExoGX1h5y8twaJQ6qKPiRXUkTZk=",

     

       975
       975
        
           "homepage": "https://registry.terraform.io/providers/scaleway/scaleway",

     

       976
       976
        
           "owner": "scaleway",

     

       977
       977
        
           "repo": "terraform-provider-scaleway",

     

       978
       978
       -
           "rev": "v2.24.0",

     

       978
       978
       +
           "rev": "v2.25.0",

     

       979
       979
        
           "spdx": "MPL-2.0",

     

       980
       980
       -
           "vendorHash": "sha256-g/hNdUharGRTOIJZMk8lRAwO9PdMAbwJYTNcxTpfaV0="

     

       980
       980
       +
           "vendorHash": "sha256-wwm0edsOwsuCiURFI2Y2Jue0FD+4pAzyDxqSVJYkQYE="

     

       981
       981
        
         },

     

       982
       982
        
         "secret": {

     

       983
       983
        
           "hash": "sha256-MmAnA/4SAPqLY/gYcJSTnEttQTsDd2kEdkQjQj6Bb+A=",

     
···

       1052
       1052
        
           "vendorHash": "sha256-NO1r/EWLgH1Gogru+qPeZ4sW7FuDENxzNnpLSKstnE8="

     

       1053
       1053
        
         },

     

       1054
       1054
        
         "spotinst": {

     

       1055
       1055
       -
           "hash": "sha256-fnWSDapAJXnNG1DHribLcRpMgGHke5EhmuQQjaj6sWE=",

     

       1055
       1055
       +
           "hash": "sha256-gScCKmDH8uavJass9Fg9pa6u/ZZfkHEhfBHlyyv3svE=",

     

       1056
       1056
        
           "homepage": "https://registry.terraform.io/providers/spotinst/spotinst",

     

       1057
       1057
        
           "owner": "spotinst",

     

       1058
       1058
        
           "repo": "terraform-provider-spotinst",

     

       1059
       1059
       -
           "rev": "v1.126.0",

     

       1059
       1059
       +
           "rev": "v1.127.0",

     

       1060
       1060
        
           "spdx": "MPL-2.0",

     

       1061
       1061
       -
           "vendorHash": "sha256-2SUCMdZRkAU97HFKEAKe5ryB+NB55aR/5k5K3p/digI="

     

       1061
       1061
       +
           "vendorHash": "sha256-0rWVOVRndC/Y0gSfJoqd65rvBqUnNQb47S6RiBw7q+4="

     

       1062
       1062
        
         },

     

       1063
       1063
        
         "stackpath": {

     

       1064
       1064
        
           "hash": "sha256-7KQUddq+M35WYyAIAL8sxBjAaXFcsczBRO1R5HURUZg=",

     
···

       1106
       1106
        
           "vendorHash": "sha256-GNSKSlaFBj2P+z40U+0uwPSOuQBy+9vOVFfPe8p0A24="

     

       1107
       1107
        
         },

     

       1108
       1108
        
         "tencentcloud": {

     

       1109
       1109
       -
           "hash": "sha256-53s1j5Xw7ZERz35lGzv9pHiAzcUX2dn5A74vFqv94Cg=",

     

       1109
       1109
       +
           "hash": "sha256-WogC3T8KWOtgCczk7J589OIHN0gPCbll0NgchJ0WQAQ=",

     

       1110
       1110
        
           "homepage": "https://registry.terraform.io/providers/tencentcloudstack/tencentcloud",

     

       1111
       1111
        
           "owner": "tencentcloudstack",

     

       1112
       1112
        
           "repo": "terraform-provider-tencentcloud",

     

       1113
       1113
       -
           "rev": "v1.81.14",

     

       1113
       1113
       +
           "rev": "v1.81.15",

     

       1114
       1114
        
           "spdx": "MPL-2.0",

     

       1115
       1115
        
           "vendorHash": null

     

       1116
       1116
        
         },

+30

pkgs/applications/networking/p2p/jesec-rtorrent/avoid-stack-overflow-for-lockfile-buf.patch

···

       1
       1
       +
       From dd4a96073d4a60ca8fff55be6ea6b17018de96a8 Mon Sep 17 00:00:00 2001

     

       2
       2
       +
       From: Varun Madiath <git@madiathv.com>

     

       3
       3
       +
       Date: Wed, 19 Jul 2023 15:30:57 -0400

     

       4
       4
       +
       Subject: [PATCH] utils: lockfile: avoid stack overflow for lockfile buffer

     

       5
       5
       +
       

     

       6
       6
       +
       Original patch by @cyphar was submitted to rakshasa/rtorrent at

     

       7
       7
       +
       https://github.com/rakshasa/rtorrent/pull/1169.

     

       8
       8
       +
       

     

       9
       9
       +
       Observed the segfault on nixos-unstable.

     

       10
       10
       +
       ---

     

       11
       11
       +
        src/utils/lockfile.cc | 3 ++-

     

       12
       12
       +
        1 file changed, 2 insertions(+), 1 deletion(-)

     

       13
       13
       +
       

     

       14
       14
       +
       diff --git a/src/utils/lockfile.cc b/src/utils/lockfile.cc

     

       15
       15
       +
       index 76e4b8f..441f5c8 100644

     

       16
       16
       +
       --- a/src/utils/lockfile.cc

     

       17
       17
       +
       +++ b/src/utils/lockfile.cc

     

       18
       18
       +
       @@ -75,7 +75,8 @@ Lockfile::try_lock() {

     

       19
       19
       +
          int  pos = ::gethostname(buf, 255);

     

       20
       20
       +
        

     

       21
       21
       +
          if (pos == 0) {

     

       22
       22
       +
       -    ::snprintf(buf + std::strlen(buf), 255, ":+%i\n", ::getpid());

     

       23
       23
       +
       +    ssize_t len = std::strlen(buf);

     

       24
       24
       +
       +    ::snprintf(buf + len, 255 - len, ":+%i\n", ::getpid());

     

       25
       25
       +
            ssize_t __attribute__((unused)) result = ::write(fd, buf, std::strlen(buf));

     

       26
       26
       +
          }

     

       27
       27
       +
        

     

       28
       28
       +
       -- 

     

       29
       29
       +
       2.41.0

     

       30
       30
       +

pkgs/applications/networking/p2p/jesec-rtorrent/default.nix

···

       21
       21
        
           hash = "sha256-i7c1jSawHshj1kaXl8tdpelIKU24okeg9K5/+ht6t2k=";

     

       22
       22
        
         };

     

       23
       23
        
       

     

       24
       24
       +
         patches = [

     

       25
       25
       +
           ./avoid-stack-overflow-for-lockfile-buf.patch

     

       26
       26
       +
         ];

     

       27
       27
       +
       

     

       24
       28
        
         passthru = {

     

       25
       29
        
           inherit libtorrent;

     

       26
       30
        
         };

+54

pkgs/applications/networking/pyload-ng/default.nix

···

       1
       1
       +
       { lib, fetchPypi, python3 }:

     

       2
       2
       +
       

     

       3
       3
       +
       python3.pkgs.buildPythonApplication rec {

     

       4
       4
       +
         version = "0.5.0b3.dev72";

     

       5
       5
       +
         pname = "pyload-ng";

     

       6
       6
       +
         format = "pyproject";

     

       7
       7
       +
       

     

       8
       8
       +
         src = fetchPypi {

     

       9
       9
       +
           inherit pname version;

     

       10
       10
       +
           hash = "sha256-pcbJc23Fylh/JoWRmbZmC8xUzUqh2ej6gT+B2w8DHFQ=";

     

       11
       11
       +
         };

     

       12
       12
       +
       

     

       13
       13
       +
         postPatch = ''

     

       14
       14
       +
           # relax version bounds

     

       15
       15
       +
           sed -i 's/\([A-z0-9]*\)~=.*$/\1/' setup.cfg

     

       16
       16
       +
           # not sure what Flask-Session2 is but flask-session works just fine

     

       17
       17
       +
           sed -i '/Flask-Session2/d' setup.cfg

     

       18
       18
       +
         '';

     

       19
       19
       +
       

     

       20
       20
       +
         propagatedBuildInputs = with python3.pkgs; [

     

       21
       21
       +
           bitmath

     

       22
       22
       +
           certifi

     

       23
       23
       +
           cheroot

     

       24
       24
       +
           cryptography

     

       25
       25
       +
           filetype

     

       26
       26
       +
           flask

     

       27
       27
       +
           flask-babel

     

       28
       28
       +
           flask-caching

     

       29
       29
       +
           flask-compress

     

       30
       30
       +
           flask-session

     

       31
       31
       +
           flask-themes2

     

       32
       32
       +
           js2py

     

       33
       33
       +
           pycurl

     

       34
       34
       +
           semver

     

       35
       35
       +
           setuptools

     

       36
       36
       +
         ];

     

       37
       37
       +
       

     

       38
       38
       +
         passthru.optional-dependencies = {

     

       39
       39
       +
           plugins = with python3.pkgs; [

     

       40
       40
       +
             beautifulsoup4 # for some plugins

     

       41
       41
       +
             colorlog # colorful console logging

     

       42
       42
       +
             pillow # for some CAPTCHA plugin

     

       43
       43
       +
             send2trash # send some files to trash instead of deleting them

     

       44
       44
       +
             slixmpp # XMPP plugin

     

       45
       45
       +
           ];

     

       46
       46
       +
         };

     

       47
       47
       +
       

     

       48
       48
       +
         meta = with lib; {

     

       49
       49
       +
           description = "Free and open-source download manager with support for 1-click-hosting sites";

     

       50
       50
       +
           homepage = "https://github.com/pyload/pyload";

     

       51
       51
       +
           license = licenses.agpl3Plus;

     

       52
       52
       +
           maintainers = with maintainers; [ ruby0b ];

     

       53
       53
       +
         };

     

       54
       54
       +
       }

+4 -2

pkgs/applications/terminal-emulators/blackbox-terminal/default.nix

···

       27
       27
        
       in

     

       28
       28
        
       stdenv.mkDerivation rec {

     

       29
       29
        
         pname = "blackbox";

     

       30
       30
       -
         version = "0.13.2";

     

       30
       30
       +
         version = "0.14.0";

     

       31
       31
        
       

     

       32
       32
        
         src = fetchFromGitLab {

     

       33
       33
        
           domain = "gitlab.gnome.org";

     

       34
       34
        
           owner = "raggesilver";

     

       35
       35
        
           repo = "blackbox";

     

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

     

       37
       37
       -
           hash = "sha256-qz1805HLG/Yexilw0YCkTzed1wqonUtJ+QrbMyhKHh8=";

     

       37
       37
       +
           hash = "sha256-ebwh9WTooJuvYFIygDBn9lYC7+lx9P1HskvKU8EX9jw=";

     

       38
       38
        
         };

     

       39
       39
        
       

     

       40
       40
        
         postPatch = ''

     
···

       63
       63
        
           librsvg

     

       64
       64
        
           libgee

     

       65
       65
        
         ];

     

       66
       66
       +
       

     

       67
       67
       +
         mesonFlags = [ "-Dblackbox_is_flatpak=false" ];

     

       66
       68
        
       

     

       67
       69
        
         meta = with lib; {

     

       68
       70
        
           description = "Beautiful GTK 4 terminal";

+4 -4

pkgs/applications/terminal-emulators/blackbox-terminal/marble.nix

···

       13
       13
        
       

     

       14
       14
        
       stdenv.mkDerivation {

     

       15
       15
        
         pname = "marble";

     

       16
       16
       -
         version = "unstable-2022-04-20";

     

       16
       16
       +
         version = "unstable-2023-05-11";

     

       17
       17
        
       

     

       18
       18
        
         src = fetchFromGitLab {

     

       19
       19
        
           domain = "gitlab.gnome.org";

     

       20
       20
        
           owner = "raggesilver";

     

       21
       21
        
           repo = "marble";

     

       22
       22
       -
           # Latest commit from the 'wip/gtk4' branch

     

       23
       23
       -
           rev = "6dcc6fefa35f0151b0549c01bd774750fe6bdef8";

     

       24
       24
       -
           sha256 = "sha256-0VJ9nyjWOOdLBm3ufleS/xcAS5YsSedJ2NtBjyM3uaY=";

     

       22
       22
       +
           # the same used on flatpak

     

       23
       23
       +
           rev = "f240b2ec7d5cdacb8fdcc553703420dc5101ffdb";

     

       24
       24
       +
           sha256 = "sha256-obtz7zOyEZPgi/NNjtLr6aFm/1UVTzjTdJpN3JQfpUs=";

     

       25
       25
        
         };

     

       26
       26
        
       

     

       27
       27
        
         nativeBuildInputs = [

+23 -6

pkgs/applications/terminal-emulators/cool-retro-term/default.nix

···

       1
       1
       -
       { lib, stdenv, fetchFromGitHub, mkDerivation, qtbase, qtquick1, qmltermwidget

     

       2
       2
       -
       , qtquickcontrols, qtgraphicaleffects, qmake, nixosTests }:

     

       1
       1
       +
       { lib

     

       2
       2
       +
       , stdenv

     

       3
       3
       +
       , fetchFromGitHub

     

       4
       4
       +
       , mkDerivation

     

       5
       5
       +
       , qtbase

     

       6
       6
       +
       , qtquick1

     

       7
       7
       +
       , qmltermwidget

     

       8
       8
       +
       , qtquickcontrols2

     

       9
       9
       +
       , qtgraphicaleffects

     

       10
       10
       +
       , qmake

     

       11
       11
       +
       , nixosTests

     

       12
       12
       +
       }:

     

       3
       13
        
       

     

       4
       14
        
       mkDerivation rec {

     

       5
       5
       -
         version = "1.1.1";

     

       15
       15
       +
         version = "1.2.0";

     

       6
       16
        
         pname = "cool-retro-term";

     

       7
       17
        
       

     

       8
       18
        
         src = fetchFromGitHub {

     

       9
       19
        
           owner = "Swordfish90";

     

       10
       20
        
           repo = "cool-retro-term";

     

       11
       11
       -
           rev = version;

     

       12
       12
       -
           sha256 = "0mird4k88ml6y61hky2jynrjmnxl849fvhsr5jfdlnv0i7r5vwi5";

     

       21
       21
       +
           rev = "refs/tags/${version}";

     

       22
       22
       +
           hash = "sha256-PewHLVmo+RTBHIQ/y2FBkgXsIvujYd7u56JdFC10B4c=";

     

       13
       23
        
         };

     

       14
       24
        
       

     

       15
       25
        
         patchPhase = ''

     

       16
       26
        
           sed -i -e '/qmltermwidget/d' cool-retro-term.pro

     

       17
       27
        
         '';

     

       18
       28
        
       

     

       19
       19
       -
         buildInputs = [ qtbase qtquick1 qmltermwidget qtquickcontrols qtgraphicaleffects ];

     

       29
       29
       +
         buildInputs = [

     

       30
       30
       +
           qtbase

     

       31
       31
       +
           qtquick1

     

       32
       32
       +
           qmltermwidget

     

       33
       33
       +
           qtquickcontrols2

     

       34
       34
       +
           qtgraphicaleffects

     

       35
       35
       +
         ];

     

       36
       36
       +
       

     

       20
       37
        
         nativeBuildInputs = [ qmake ];

     

       21
       38
        
       

     

       22
       39
        
         installFlags = [ "INSTALL_ROOT=$(out)" ];

+31

pkgs/applications/version-management/git-backdate/default.nix

···

       1
       1
       +
       { lib, stdenv, fetchFromGitHub, git, python3 }:

     

       2
       2
       +
       

     

       3
       3
       +
       stdenv.mkDerivation rec {

     

       4
       4
       +
         pname = "git-backdate";

     

       5
       5
       +
         version = "2023-07-19";

     

       6
       6
       +
       

     

       7
       7
       +
         src = fetchFromGitHub {

     

       8
       8
       +
           owner = "rixx";

     

       9
       9
       +
           repo = pname;

     

       10
       10
       +
           rev = "8ba5a0eba04e5559be2e4b1b6e02e62b64ca4dd8";

     

       11
       11
       +
           sha256 = "sha256-91cEGQ0FtoiHEZHQ93jPFHF2vLoeQuBidykePFHtrsY=";

     

       12
       12
       +
         };

     

       13
       13
       +
       

     

       14
       14
       +
         buildInputs = [

     

       15
       15
       +
           python3

     

       16
       16
       +
         ];

     

       17
       17
       +
       

     

       18
       18
       +
         installPhase = ''

     

       19
       19
       +
           runHook preInstall

     

       20
       20
       +
           install -Dm555 git-backdate -t $out/bin

     

       21
       21
       +
           runHook postInstall

     

       22
       22
       +
         '';

     

       23
       23
       +
       

     

       24
       24
       +
         meta = with lib; {

     

       25
       25
       +
           description = "Backdate a commit or range of commit to a date or range of dates";

     

       26
       26
       +
           homepage = "https://github.com/rixx/git-backdate";

     

       27
       27
       +
           license = licenses.wtfpl;

     

       28
       28
       +
           maintainers = with maintainers; [ matthiasbeyer ];

     

       29
       29
       +
         };

     

       30
       30
       +
       }

     

       31
       31
       +

+2 -2

pkgs/applications/virtualization/runc/default.nix

···

       15
       15
        
       

     

       16
       16
        
       buildGoModule rec {

     

       17
       17
        
         pname = "runc";

     

       18
       18
       -
         version = "1.1.7";

     

       18
       18
       +
         version = "1.1.8";

     

       19
       19
        
       

     

       20
       20
        
         src = fetchFromGitHub {

     

       21
       21
        
           owner = "opencontainers";

     

       22
       22
        
           repo = "runc";

     

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

     

       24
       24
       -
           hash = "sha256-reSC9j9ESjRigItBRytef78XBjmMGsqu0o9qcN2AstU=";

     

       24
       24
       +
           hash = "sha256-rDJYEc64KW4Qa3Eg2oUjJqIKrg6THb5hxQFFbvb9Zp4=";

     

       25
       25
        
         };

     

       26
       26
        
       

     

       27
       27
        
         vendorHash = null;

+10 -3

pkgs/build-support/fetchsvn/default.nix

···

       2
       2
        
       , subversion, glibcLocales, sshSupport ? true, openssh ? null

     

       3
       3
        
       }:

     

       4
       4
        
       

     

       5
       5
       -
       { url, rev ? "HEAD", md5 ? "", sha256 ? ""

     

       5
       5
       +
       { url, rev ? "HEAD", md5 ? "", sha256 ? "", hash ? ""

     

       6
       6
        
       , ignoreExternals ? false, ignoreKeywords ? false, name ? null

     

       7
       7
        
       , preferLocalBuild ? true

     

       8
       8
        
       }:

     
···

       34
       34
        
       

     

       35
       35
        
       if md5 != "" then

     

       36
       36
        
         throw "fetchsvn does not support md5 anymore, please use sha256"

     

       37
       37
       +
       else if hash != "" && sha256 != "" then

     

       38
       38
       +
         throw "Only one of sha256 or hash can be set"

     

       37
       39
        
       else

     

       38
       40
        
       stdenvNoCC.mkDerivation {

     

       39
       41
        
         name = name_;

     
···

       43
       45
        
       

     

       44
       46
        
         SVN_SSH = if sshSupport then "${buildPackages.openssh}/bin/ssh" else null;

     

       45
       47
        
       

     

       46
       46
       -
         outputHashAlgo = "sha256";

     

       48
       48
       +
         outputHashAlgo = if hash != "" then null else "sha256";

     

       47
       49
        
         outputHashMode = "recursive";

     

       48
       48
       -
         outputHash = sha256;

     

       50
       50
       +
         outputHash = if hash != "" then

     

       51
       51
       +
           hash

     

       52
       52
       +
         else if sha256 != "" then

     

       53
       53
       +
           sha256

     

       54
       54
       +
         else

     

       55
       55
       +
           lib.fakeSha256;

     

       49
       56
        
       

     

       50
       57
        
         inherit url rev ignoreExternals ignoreKeywords;

     

       51
       58

+1 -1

pkgs/development/libraries/qt-6/fetch.sh

···

       1
       1
       -
       WGET_ARGS=( https://download.qt.io/official_releases/qt/6.5/6.5.1/submodules/ -A '*.tar.xz' )

     

       1
       1
       +
       WGET_ARGS=( https://download.qt.io/official_releases/qt/6.5/6.5.2/submodules/ -A '*.tar.xz' )

+161 -153

pkgs/development/libraries/qt-6/srcs.nix

···

       1
       1
        
       # DO NOT EDIT! This file is generated automatically.

     

       2
       2
       -
       # Command: ./maintainers/scripts/fetch-kde-qt.sh pkgs/development/libraries/qt-6/

     

       2
       2
       +
       # Command: ./maintainers/scripts/fetch-kde-qt.sh pkgs/development/libraries/qt-6

     

       3
       3
        
       { fetchurl, mirror }:

     

       4
       4
        
       

     

       5
       5
        
       {

     

       6
       6
        
         qt3d = {

     

       7
       7
       -
           version = "6.5.1";

     

       7
       7
       +
           version = "6.5.2";

     

       8
       8
        
           src = fetchurl {

     

       9
       9
       -
             url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qt3d-everywhere-src-6.5.1.tar.xz";

     

       10
       10
       -
             sha256 = "16v875hv58f1cnb76c8pd63v44fncfdrv29b008bamxs23lf2m3y";

     

       11
       11
       -
             name = "qt3d-everywhere-src-6.5.1.tar.xz";

     

       9
       9
       +
             url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qt3d-everywhere-src-6.5.2.tar.xz";

     

       10
       10
       +
             sha256 = "047rwawrlm7n0vifxmsqvs3w3j5c16x8qkpx8xazq6xd47dn9w11";

     

       11
       11
       +
             name = "qt3d-everywhere-src-6.5.2.tar.xz";

     

       12
       12
       +
           };

     

       13
       13
       +
         };

     

       14
       14
       +
         qt5 = {

     

       15
       15
       +
           version = "6.5.2";

     

       16
       16
       +
           src = fetchurl {

     

       17
       17
       +
             url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qt5-everywhere-src-6.5.2.tar.xz";

     

       18
       18
       +
             sha256 = "15da8xd213fg2yfna3zvvr5mnhdfdai0i4m1paqfxr10sl81p515";

     

       19
       19
       +
             name = "qt5-everywhere-src-6.5.2.tar.xz";

     

       12
       20
        
           };

     

       13
       21
        
         };

     

       14
       22
        
         qt5compat = {

     

       15
       15
       -
           version = "6.5.1";

     

       23
       23
       +
           version = "6.5.2";

     

       16
       24
        
           src = fetchurl {

     

       17
       17
       -
             url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qt5compat-everywhere-src-6.5.1.tar.xz";

     

       18
       18
       -
             sha256 = "10zvah04mnyg5apkwq015kxs03y467naicxy8ljfzazgbwljp6df";

     

       19
       19
       -
             name = "qt5compat-everywhere-src-6.5.1.tar.xz";

     

       25
       25
       +
             url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qt5compat-everywhere-src-6.5.2.tar.xz";

     

       26
       26
       +
             sha256 = "1i4izabbmf1dayzlj1miz7hsm4cy0qb7i72pwyl2fp05w8pf9axr";

     

       27
       27
       +
             name = "qt5compat-everywhere-src-6.5.2.tar.xz";

     

       20
       28
        
           };

     

       21
       29
        
         };

     

       22
       30
        
         qtactiveqt = {

     

       23
       23
       -
           version = "6.5.1";

     

       31
       31
       +
           version = "6.5.2";

     

       24
       32
        
           src = fetchurl {

     

       25
       25
       -
             url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtactiveqt-everywhere-src-6.5.1.tar.xz";

     

       26
       26
       -
             sha256 = "0yii7ihvzncwqhrb1635my5arr6lymr2d3wnwpcn42b7l6krsk6d";

     

       27
       27
       -
             name = "qtactiveqt-everywhere-src-6.5.1.tar.xz";

     

       33
       33
       +
             url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtactiveqt-everywhere-src-6.5.2.tar.xz";

     

       34
       34
       +
             sha256 = "04zhbwhnjlc561bs2f4y82mzlf18byy6g5gh37yq9r3gfz54002x";

     

       35
       35
       +
             name = "qtactiveqt-everywhere-src-6.5.2.tar.xz";

     

       28
       36
        
           };

     

       29
       37
        
         };

     

       30
       38
        
         qtbase = {

     

       31
       31
       -
           version = "6.5.1";

     

       39
       39
       +
           version = "6.5.2";

     

       32
       40
        
           src = fetchurl {

     

       33
       33
       -
             url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtbase-everywhere-src-6.5.1.tar.xz";

     

       34
       34
       -
             sha256 = "1vdzxrcfhn6ym7p8jzr3xxx1r4r435fx461lwfgii8838cgzlmnv";

     

       35
       35
       -
             name = "qtbase-everywhere-src-6.5.1.tar.xz";

     

       41
       41
       +
             url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtbase-everywhere-src-6.5.2.tar.xz";

     

       42
       42
       +
             sha256 = "0s8jwzdcv97dfy8n3jjm8zzvllv380l73mwdva7rs2nqnhlwgd1x";

     

       43
       43
       +
             name = "qtbase-everywhere-src-6.5.2.tar.xz";

     

       36
       44
        
           };

     

       37
       45
        
         };

     

       38
       46
        
         qtcharts = {

     

       39
       39
       -
           version = "6.5.1";

     

       47
       47
       +
           version = "6.5.2";

     

       40
       48
        
           src = fetchurl {

     

       41
       41
       -
             url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtcharts-everywhere-src-6.5.1.tar.xz";

     

       42
       42
       -
             sha256 = "0xfgj970ip0fn2gxrsilg1gvq4w2849vs6gysn0qhnz7qw7m0nxi";

     

       43
       43
       -
             name = "qtcharts-everywhere-src-6.5.1.tar.xz";

     

       49
       49
       +
             url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtcharts-everywhere-src-6.5.2.tar.xz";

     

       50
       50
       +
             sha256 = "0bddlrwda5bh5bdwdx86ixdpm3zg5nygzb754y5nkjlw06zgfnkp";

     

       51
       51
       +
             name = "qtcharts-everywhere-src-6.5.2.tar.xz";

     

       44
       52
        
           };

     

       45
       53
        
         };

     

       46
       54
        
         qtconnectivity = {

     

       47
       47
       -
           version = "6.5.1";

     

       55
       55
       +
           version = "6.5.2";

     

       48
       56
        
           src = fetchurl {

     

       49
       49
       -
             url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtconnectivity-everywhere-src-6.5.1.tar.xz";

     

       50
       50
       -
             sha256 = "0yl2i4qdmvdzspnr0jpf031gd2cndkx4hppy5sdjppy4g2dlrmrg";

     

       51
       51
       -
             name = "qtconnectivity-everywhere-src-6.5.1.tar.xz";

     

       57
       57
       +
             url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtconnectivity-everywhere-src-6.5.2.tar.xz";

     

       58
       58
       +
             sha256 = "16fwbz9pr6pi19119mp6w0crq9nsb35fw8cgpfpkq99d6li4jbnv";

     

       59
       59
       +
             name = "qtconnectivity-everywhere-src-6.5.2.tar.xz";

     

       52
       60
        
           };

     

       53
       61
        
         };

     

       54
       62
        
         qtdatavis3d = {

     

       55
       55
       -
           version = "6.5.1";

     

       63
       63
       +
           version = "6.5.2";

     

       56
       64
        
           src = fetchurl {

     

       57
       57
       -
             url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtdatavis3d-everywhere-src-6.5.1.tar.xz";

     

       58
       58
       -
             sha256 = "0cx3bmbwg0y99495zp1gafs4bfn75dbf6r6dfgy1ii9i66y2lcsj";

     

       59
       59
       -
             name = "qtdatavis3d-everywhere-src-6.5.1.tar.xz";

     

       65
       65
       +
             url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtdatavis3d-everywhere-src-6.5.2.tar.xz";

     

       66
       66
       +
             sha256 = "1s8wlpc4nibnxaghkxmaxda5dkkn64jw6qgmzw39vi5vvhc3khb8";

     

       67
       67
       +
             name = "qtdatavis3d-everywhere-src-6.5.2.tar.xz";

     

       60
       68
        
           };

     

       61
       69
        
         };

     

       62
       70
        
         qtdeclarative = {

     

       63
       63
       -
           version = "6.5.1";

     

       71
       71
       +
           version = "6.5.2";

     

       64
       72
        
           src = fetchurl {

     

       65
       65
       -
             url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtdeclarative-everywhere-src-6.5.1.tar.xz";

     

       66
       66
       -
             sha256 = "0yff5nbcspl3w3231wvgvac38q0lskxx1l2wm1lx2raac7wlh490";

     

       67
       67
       -
             name = "qtdeclarative-everywhere-src-6.5.1.tar.xz";

     

       73
       73
       +
             url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtdeclarative-everywhere-src-6.5.2.tar.xz";

     

       74
       74
       +
             sha256 = "06c7xfqn2a5s2m8j1bcvx3pyjqg1rgqkjvp49737gb4z9vjiz8gk";

     

       75
       75
       +
             name = "qtdeclarative-everywhere-src-6.5.2.tar.xz";

     

       68
       76
        
           };

     

       69
       77
        
         };

     

       70
       78
        
         qtdoc = {

     

       71
       71
       -
           version = "6.5.1";

     

       79
       79
       +
           version = "6.5.2";

     

       72
       80
        
           src = fetchurl {

     

       73
       73
       -
             url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtdoc-everywhere-src-6.5.1.tar.xz";

     

       74
       74
       -
             sha256 = "0c9ckm7rcp3vi7qipzqyqpar2f5l426s8vgdz71q1ccx432a0kj1";

     

       75
       75
       -
             name = "qtdoc-everywhere-src-6.5.1.tar.xz";

     

       81
       81
       +
             url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtdoc-everywhere-src-6.5.2.tar.xz";

     

       82
       82
       +
             sha256 = "0cydg39f4cpv965pr97qn3spm5fzlxvhamifjfdsrzgskc5nm0v3";

     

       83
       83
       +
             name = "qtdoc-everywhere-src-6.5.2.tar.xz";

     

       76
       84
        
           };

     

       77
       85
        
         };

     

       78
       86
        
         qtgrpc = {

     

       79
       79
       -
           version = "6.5.1";

     

       87
       87
       +
           version = "6.5.2";

     

       80
       88
        
           src = fetchurl {

     

       81
       81
       -
             url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtgrpc-everywhere-src-6.5.1.tar.xz";

     

       82
       82
       -
             sha256 = "1r27m7c1ab1gk2hzi4d9mpvk1kc5zypx6d6q9wa7kv26d4d2vgls";

     

       83
       83
       -
             name = "qtgrpc-everywhere-src-6.5.1.tar.xz";

     

       89
       89
       +
             url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtgrpc-everywhere-src-6.5.2.tar.xz";

     

       90
       90
       +
             sha256 = "016jw2ny7paky54pk4pa499273919s8ag2ksx361ir6d0ydrdcks";

     

       91
       91
       +
             name = "qtgrpc-everywhere-src-6.5.2.tar.xz";

     

       84
       92
        
           };

     

       85
       93
        
         };

     

       86
       94
        
         qthttpserver = {

     

       87
       87
       -
           version = "6.5.1";

     

       95
       95
       +
           version = "6.5.2";

     

       88
       96
        
           src = fetchurl {

     

       89
       89
       -
             url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qthttpserver-everywhere-src-6.5.1.tar.xz";

     

       90
       90
       -
             sha256 = "0z7wrvfln7mr7n1i1pijx36c6wi66dm91mdir5f8gqk15i84zpj7";

     

       91
       91
       -
             name = "qthttpserver-everywhere-src-6.5.1.tar.xz";

     

       97
       97
       +
             url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qthttpserver-everywhere-src-6.5.2.tar.xz";

     

       98
       98
       +
             sha256 = "1b6w0999n5vw5xb93m0rc896l6ci3jld657y8645rl3q29fjpypq";

     

       99
       99
       +
             name = "qthttpserver-everywhere-src-6.5.2.tar.xz";

     

       92
       100
        
           };

     

       93
       101
        
         };

     

       94
       102
        
         qtimageformats = {

     

       95
       95
       -
           version = "6.5.1";

     

       103
       103
       +
           version = "6.5.2";

     

       96
       104
        
           src = fetchurl {

     

       97
       97
       -
             url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtimageformats-everywhere-src-6.5.1.tar.xz";

     

       98
       98
       -
             sha256 = "1daxijk9mb2gb65pxjdqw4r5vjs3vi20d4lixq6mh0xdk717yzw9";

     

       99
       99
       -
             name = "qtimageformats-everywhere-src-6.5.1.tar.xz";

     

       105
       105
       +
             url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtimageformats-everywhere-src-6.5.2.tar.xz";

     

       106
       106
       +
             sha256 = "0hv7mkn72126rkhy5gmjmbvzy7v17mkk3q2pkmzy99f64j4w1q5a";

     

       107
       107
       +
             name = "qtimageformats-everywhere-src-6.5.2.tar.xz";

     

       100
       108
        
           };

     

       101
       109
        
         };

     

       102
       110
        
         qtlanguageserver = {

     

       103
       103
       -
           version = "6.5.1";

     

       111
       111
       +
           version = "6.5.2";

     

       104
       112
        
           src = fetchurl {

     

       105
       105
       -
             url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtlanguageserver-everywhere-src-6.5.1.tar.xz";

     

       106
       106
       -
             sha256 = "1j9bhd4k30ana08nppqqll6v5nxr9dzxqxsh12i2cihjr9mcr9lr";

     

       107
       107
       -
             name = "qtlanguageserver-everywhere-src-6.5.1.tar.xz";

     

       113
       113
       +
             url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtlanguageserver-everywhere-src-6.5.2.tar.xz";

     

       114
       114
       +
             sha256 = "196iicwpqca2ydpca41qs6aqxxq8ycknw6lm2v00h1w3m86frdbk";

     

       115
       115
       +
             name = "qtlanguageserver-everywhere-src-6.5.2.tar.xz";

     

       108
       116
        
           };

     

       109
       117
        
         };

     

       110
       118
        
         qtlocation = {

     

       111
       111
       -
           version = "6.5.1";

     

       119
       119
       +
           version = "6.5.2";

     

       112
       120
        
           src = fetchurl {

     

       113
       113
       -
             url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtlocation-everywhere-src-6.5.1.tar.xz";

     

       114
       114
       -
             sha256 = "1x0j6r0gll469aq75viyyyw1gfl180rcyq0h83z35664jzx1i2mn";

     

       115
       115
       -
             name = "qtlocation-everywhere-src-6.5.1.tar.xz";

     

       121
       121
       +
             url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtlocation-everywhere-src-6.5.2.tar.xz";

     

       122
       122
       +
             sha256 = "1yvdv1gqj7dij7v4cq9rlnqfb77c0v9b7n56jccvy5v6q9j7s7c9";

     

       123
       123
       +
             name = "qtlocation-everywhere-src-6.5.2.tar.xz";

     

       116
       124
        
           };

     

       117
       125
        
         };

     

       118
       126
        
         qtlottie = {

     

       119
       119
       -
           version = "6.5.1";

     

       127
       127
       +
           version = "6.5.2";

     

       120
       128
        
           src = fetchurl {

     

       121
       121
       -
             url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtlottie-everywhere-src-6.5.1.tar.xz";

     

       122
       122
       -
             sha256 = "10bbq952iv3f2v42nqirld0qy363g03zdq6hlh1lfcbmgc8gif0h";

     

       123
       123
       -
             name = "qtlottie-everywhere-src-6.5.1.tar.xz";

     

       129
       129
       +
             url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtlottie-everywhere-src-6.5.2.tar.xz";

     

       130
       130
       +
             sha256 = "16z8fhaa40ig0cggb689zf8j3cid6fk6pmh91b8342ymy1fdqfh0";

     

       131
       131
       +
             name = "qtlottie-everywhere-src-6.5.2.tar.xz";

     

       124
       132
        
           };

     

       125
       133
        
         };

     

       126
       134
        
         qtmultimedia = {

     

       127
       127
       -
           version = "6.5.1";

     

       135
       135
       +
           version = "6.5.2";

     

       128
       136
        
           src = fetchurl {

     

       129
       129
       -
             url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtmultimedia-everywhere-src-6.5.1.tar.xz";

     

       130
       130
       -
             sha256 = "1k71chjdh66yv13li38ig507wpsr7cn87nqkvcfxmkf8w5hca7qb";

     

       131
       131
       -
             name = "qtmultimedia-everywhere-src-6.5.1.tar.xz";

     

       137
       137
       +
             url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtmultimedia-everywhere-src-6.5.2.tar.xz";

     

       138
       138
       +
             sha256 = "0xc9k4mlncscxqbp8q46yjd89k4jb8j0ggbi5ad874lycym013wl";

     

       139
       139
       +
             name = "qtmultimedia-everywhere-src-6.5.2.tar.xz";

     

       132
       140
        
           };

     

       133
       141
        
         };

     

       134
       142
        
         qtnetworkauth = {

     

       135
       135
       -
           version = "6.5.1";

     

       143
       143
       +
           version = "6.5.2";

     

       136
       144
        
           src = fetchurl {

     

       137
       137
       -
             url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtnetworkauth-everywhere-src-6.5.1.tar.xz";

     

       138
       138
       -
             sha256 = "18viv41qazcbix9l21g5vz1r6zp6mxnbl2c2j3ip1yln7rmbac57";

     

       139
       139
       -
             name = "qtnetworkauth-everywhere-src-6.5.1.tar.xz";

     

       145
       145
       +
             url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtnetworkauth-everywhere-src-6.5.2.tar.xz";

     

       146
       146
       +
             sha256 = "0g18kh3zhcfi9ni8cqbbjdc1l6jf99ijv5shcl42jk6219b4pk2f";

     

       147
       147
       +
             name = "qtnetworkauth-everywhere-src-6.5.2.tar.xz";

     

       140
       148
        
           };

     

       141
       149
        
         };

     

       142
       150
        
         qtpositioning = {

     

       143
       143
       -
           version = "6.5.1";

     

       151
       151
       +
           version = "6.5.2";

     

       144
       152
        
           src = fetchurl {

     

       145
       145
       -
             url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtpositioning-everywhere-src-6.5.1.tar.xz";

     

       146
       146
       -
             sha256 = "08m41rx1yd28dr53pfrdfvgkmnszqyax88jhqczcb048w50gjg05";

     

       147
       147
       -
             name = "qtpositioning-everywhere-src-6.5.1.tar.xz";

     

       153
       153
       +
             url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtpositioning-everywhere-src-6.5.2.tar.xz";

     

       154
       154
       +
             sha256 = "1yhlfs8izc054qv1krf5qv6zzjlvmz013h74fwamn74dfh1kyjbh";

     

       155
       155
       +
             name = "qtpositioning-everywhere-src-6.5.2.tar.xz";

     

       148
       156
        
           };

     

       149
       157
        
         };

     

       150
       158
        
         qtquick3d = {

     

       151
       151
       -
           version = "6.5.1";

     

       159
       159
       +
           version = "6.5.2";

     

       152
       160
        
           src = fetchurl {

     

       153
       153
       -
             url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtquick3d-everywhere-src-6.5.1.tar.xz";

     

       154
       154
       -
             sha256 = "07ncn3gl3yvdq8ly3rn7693lzq0slghmw9ljq119s4bbsnk2ddji";

     

       155
       155
       -
             name = "qtquick3d-everywhere-src-6.5.1.tar.xz";

     

       161
       161
       +
             url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtquick3d-everywhere-src-6.5.2.tar.xz";

     

       162
       162
       +
             sha256 = "1nh0vg2m1lf8m40bxbwsam5pwdzjammhal69k2pb5s0rjifs7q3m";

     

       163
       163
       +
             name = "qtquick3d-everywhere-src-6.5.2.tar.xz";

     

       156
       164
        
           };

     

       157
       165
        
         };

     

       158
       166
        
         qtquick3dphysics = {

     

       159
       159
       -
           version = "6.5.1";

     

       167
       167
       +
           version = "6.5.2";

     

       160
       168
        
           src = fetchurl {

     

       161
       161
       -
             url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtquick3dphysics-everywhere-src-6.5.1.tar.xz";

     

       162
       162
       -
             sha256 = "1j0kfqdwx8x7bagw8qjkywsd2fzih2yp36vza2hil56m35s8ibcl";

     

       163
       163
       -
             name = "qtquick3dphysics-everywhere-src-6.5.1.tar.xz";

     

       169
       169
       +
             url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtquick3dphysics-everywhere-src-6.5.2.tar.xz";

     

       170
       170
       +
             sha256 = "0dri8v0pmvc1h1cdhdchvd4xi5f62c1wrk0jd01lh95i6sc1403m";

     

       171
       171
       +
             name = "qtquick3dphysics-everywhere-src-6.5.2.tar.xz";

     

       164
       172
        
           };

     

       165
       173
        
         };

     

       166
       174
        
         qtquickeffectmaker = {

     

       167
       167
       -
           version = "6.5.1";

     

       175
       175
       +
           version = "6.5.2";

     

       168
       176
        
           src = fetchurl {

     

       169
       169
       -
             url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtquickeffectmaker-everywhere-src-6.5.1.tar.xz";

     

       170
       170
       -
             sha256 = "18lhvf9mlprmg0jba9biciscns12zvwr5jj81kkvv0mv8h3yrg2i";

     

       171
       171
       -
             name = "qtquickeffectmaker-everywhere-src-6.5.1.tar.xz";

     

       177
       177
       +
             url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtquickeffectmaker-everywhere-src-6.5.2.tar.xz";

     

       178
       178
       +
             sha256 = "1gvcszqj6khqisxkpwi67xad0247hpq5zcz4v2vhbgkxq8kwfiym";

     

       179
       179
       +
             name = "qtquickeffectmaker-everywhere-src-6.5.2.tar.xz";

     

       172
       180
        
           };

     

       173
       181
        
         };

     

       174
       182
        
         qtquicktimeline = {

     

       175
       175
       -
           version = "6.5.1";

     

       183
       183
       +
           version = "6.5.2";

     

       176
       184
        
           src = fetchurl {

     

       177
       177
       -
             url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtquicktimeline-everywhere-src-6.5.1.tar.xz";

     

       178
       178
       -
             sha256 = "0lfm997p5x5nn4zlz2p1djd3757b0m00347xkfy9n6y5fsidny8h";

     

       179
       179
       -
             name = "qtquicktimeline-everywhere-src-6.5.1.tar.xz";

     

       185
       185
       +
             url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtquicktimeline-everywhere-src-6.5.2.tar.xz";

     

       186
       186
       +
             sha256 = "1fhmy01nqcr9q1193m9fkhbvqd9208kaigprqxkjjm61bn8awif9";

     

       187
       187
       +
             name = "qtquicktimeline-everywhere-src-6.5.2.tar.xz";

     

       180
       188
        
           };

     

       181
       189
        
         };

     

       182
       190
        
         qtremoteobjects = {

     

       183
       183
       -
           version = "6.5.1";

     

       191
       191
       +
           version = "6.5.2";

     

       184
       192
        
           src = fetchurl {

     

       185
       185
       -
             url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtremoteobjects-everywhere-src-6.5.1.tar.xz";

     

       186
       186
       -
             sha256 = "16v2qzn5lf5bxrdff4fr624x5n262qvhinrk0vfmcdvrb2plgkvq";

     

       187
       187
       -
             name = "qtremoteobjects-everywhere-src-6.5.1.tar.xz";

     

       193
       193
       +
             url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtremoteobjects-everywhere-src-6.5.2.tar.xz";

     

       194
       194
       +
             sha256 = "0k29sk02n54vj1w6vh6xycsjpyfqlijc13fnxh1q7wpgg4gizx60";

     

       195
       195
       +
             name = "qtremoteobjects-everywhere-src-6.5.2.tar.xz";

     

       188
       196
        
           };

     

       189
       197
        
         };

     

       190
       198
        
         qtscxml = {

     

       191
       191
       -
           version = "6.5.1";

     

       199
       199
       +
           version = "6.5.2";

     

       192
       200
        
           src = fetchurl {

     

       193
       193
       -
             url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtscxml-everywhere-src-6.5.1.tar.xz";

     

       194
       194
       -
             sha256 = "0xr4005b640r1h7nbfmgjban9mihxgm4sfqizw30xhsjpg4a6ghw";

     

       195
       195
       -
             name = "qtscxml-everywhere-src-6.5.1.tar.xz";

     

       201
       201
       +
             url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtscxml-everywhere-src-6.5.2.tar.xz";

     

       202
       202
       +
             sha256 = "1jxx9p7zi40r990ky991xd43mv6i8hdpnj2fhl7sf4q9fpng4c58";

     

       203
       203
       +
             name = "qtscxml-everywhere-src-6.5.2.tar.xz";

     

       196
       204
        
           };

     

       197
       205
        
         };

     

       198
       206
        
         qtsensors = {

     

       199
       199
       -
           version = "6.5.1";

     

       207
       207
       +
           version = "6.5.2";

     

       200
       208
        
           src = fetchurl {

     

       201
       201
       -
             url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtsensors-everywhere-src-6.5.1.tar.xz";

     

       202
       202
       -
             sha256 = "19dbci4487anpkm85n1yly1mm5zx1f5dgx08v5ar5462f61wlnn9";

     

       203
       203
       -
             name = "qtsensors-everywhere-src-6.5.1.tar.xz";

     

       209
       209
       +
             url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtsensors-everywhere-src-6.5.2.tar.xz";

     

       210
       210
       +
             sha256 = "19iamfl4znqbfflnnpis6qk3cqri7kzbg0nsgf42lc5lzdybs1j0";

     

       211
       211
       +
             name = "qtsensors-everywhere-src-6.5.2.tar.xz";

     

       204
       212
        
           };

     

       205
       213
        
         };

     

       206
       214
        
         qtserialbus = {

     

       207
       207
       -
           version = "6.5.1";

     

       215
       215
       +
           version = "6.5.2";

     

       208
       216
        
           src = fetchurl {

     

       209
       209
       -
             url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtserialbus-everywhere-src-6.5.1.tar.xz";

     

       210
       210
       -
             sha256 = "0zqmbqnaf8ln6kdf5nc9k4q618d7jd4dmc2gsmgcf2mz55w9dzyv";

     

       211
       211
       -
             name = "qtserialbus-everywhere-src-6.5.1.tar.xz";

     

       217
       217
       +
             url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtserialbus-everywhere-src-6.5.2.tar.xz";

     

       218
       218
       +
             sha256 = "1zndnw1zx5x9daidcm0jq7jcr06ihw0nf6iksrx591f1rl3n6hph";

     

       219
       219
       +
             name = "qtserialbus-everywhere-src-6.5.2.tar.xz";

     

       212
       220
        
           };

     

       213
       221
        
         };

     

       214
       222
        
         qtserialport = {

     

       215
       215
       -
           version = "6.5.1";

     

       223
       223
       +
           version = "6.5.2";

     

       216
       224
        
           src = fetchurl {

     

       217
       217
       -
             url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtserialport-everywhere-src-6.5.1.tar.xz";

     

       218
       218
       -
             sha256 = "19ijnjy5bqv7g74q2ax4pvmggphpccckszxilj0vkqnl8q34smf3";

     

       219
       219
       -
             name = "qtserialport-everywhere-src-6.5.1.tar.xz";

     

       225
       225
       +
             url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtserialport-everywhere-src-6.5.2.tar.xz";

     

       226
       226
       +
             sha256 = "17nc5kmha6fy3vzkxfr2gxyzdsahs1x66d5lhcqk0szak8b58g06";

     

       227
       227
       +
             name = "qtserialport-everywhere-src-6.5.2.tar.xz";

     

       220
       228
        
           };

     

       221
       229
        
         };

     

       222
       230
        
         qtshadertools = {

     

       223
       223
       -
           version = "6.5.1";

     

       231
       231
       +
           version = "6.5.2";

     

       224
       232
        
           src = fetchurl {

     

       225
       225
       -
             url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtshadertools-everywhere-src-6.5.1.tar.xz";

     

       226
       226
       -
             sha256 = "0ljhysyiwxawws0481hyk1xbycc21jg6gq5fsn8yyi2rhdhng075";

     

       227
       227
       -
             name = "qtshadertools-everywhere-src-6.5.1.tar.xz";

     

       233
       233
       +
             url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtshadertools-everywhere-src-6.5.2.tar.xz";

     

       234
       234
       +
             sha256 = "0g8aziqhds2fkx11y4p2akmyn2p1qqf2fjxv72f9pibnhpdv0gya";

     

       235
       235
       +
             name = "qtshadertools-everywhere-src-6.5.2.tar.xz";

     

       228
       236
        
           };

     

       229
       237
        
         };

     

       230
       238
        
         qtspeech = {

     

       231
       231
       -
           version = "6.5.1";

     

       239
       239
       +
           version = "6.5.2";

     

       232
       240
        
           src = fetchurl {

     

       233
       233
       -
             url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtspeech-everywhere-src-6.5.1.tar.xz";

     

       234
       234
       -
             sha256 = "1djp6ijjvl94zajbvgz80xnzd2fpkq8fnnpxnq9jg5jny6jhn4k7";

     

       235
       235
       -
             name = "qtspeech-everywhere-src-6.5.1.tar.xz";

     

       241
       241
       +
             url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtspeech-everywhere-src-6.5.2.tar.xz";

     

       242
       242
       +
             sha256 = "1cnlc9x0wswzl7j2imi4kvs9zavs4z1mhzzfpwr6d9zlfql9rzw8";

     

       243
       243
       +
             name = "qtspeech-everywhere-src-6.5.2.tar.xz";

     

       236
       244
        
           };

     

       237
       245
        
         };

     

       238
       246
        
         qtsvg = {

     

       239
       239
       -
           version = "6.5.1";

     

       247
       247
       +
           version = "6.5.2";

     

       240
       248
        
           src = fetchurl {

     

       241
       241
       -
             url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtsvg-everywhere-src-6.5.1.tar.xz";

     

       242
       242
       -
             sha256 = "1vq8jvz13hp9nj9r77f0nx7nq3pciy4sk1j6d2dzbw243m4jk3fm";

     

       243
       243
       -
             name = "qtsvg-everywhere-src-6.5.1.tar.xz";

     

       249
       249
       +
             url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtsvg-everywhere-src-6.5.2.tar.xz";

     

       250
       250
       +
             sha256 = "18v337lfk8krg0hff5jx6fi7gn6x3djn03x3psrhlbmgjc8crd28";

     

       251
       251
       +
             name = "qtsvg-everywhere-src-6.5.2.tar.xz";

     

       244
       252
        
           };

     

       245
       253
        
         };

     

       246
       254
        
         qttools = {

     

       247
       247
       -
           version = "6.5.1";

     

       255
       255
       +
           version = "6.5.2";

     

       248
       256
        
           src = fetchurl {

     

       249
       249
       -
             url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qttools-everywhere-src-6.5.1.tar.xz";

     

       250
       250
       -
             sha256 = "0a93xg65z19bldwhc77x87khjwkx3hs01z1gjdznza5jhjgdyi2p";

     

       251
       251
       -
             name = "qttools-everywhere-src-6.5.1.tar.xz";

     

       257
       257
       +
             url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qttools-everywhere-src-6.5.2.tar.xz";

     

       258
       258
       +
             sha256 = "0ha3v488vnm4pgdpyjgf859sak0z2fwmbgcyivcd93qxflign7sm";

     

       259
       259
       +
             name = "qttools-everywhere-src-6.5.2.tar.xz";

     

       252
       260
        
           };

     

       253
       261
        
         };

     

       254
       262
        
         qttranslations = {

     

       255
       255
       -
           version = "6.5.1";

     

       263
       263
       +
           version = "6.5.2";

     

       256
       264
        
           src = fetchurl {

     

       257
       257
       -
             url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qttranslations-everywhere-src-6.5.1.tar.xz";

     

       258
       258
       -
             sha256 = "16ylh1hf7r4g8s0h6wgkngwy1p75qnq6byz1q14wwzk3q8s2qzjj";

     

       259
       259
       -
             name = "qttranslations-everywhere-src-6.5.1.tar.xz";

     

       265
       265
       +
             url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qttranslations-everywhere-src-6.5.2.tar.xz";

     

       266
       266
       +
             sha256 = "1sxy2ljn5ajvn4yjb8fx86l56viyvqh5r9hf5x67azkmgrilaz1k";

     

       267
       267
       +
             name = "qttranslations-everywhere-src-6.5.2.tar.xz";

     

       260
       268
        
           };

     

       261
       269
        
         };

     

       262
       270
        
         qtvirtualkeyboard = {

     

       263
       263
       -
           version = "6.5.1";

     

       271
       271
       +
           version = "6.5.2";

     

       264
       272
        
           src = fetchurl {

     

       265
       265
       -
             url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtvirtualkeyboard-everywhere-src-6.5.1.tar.xz";

     

       266
       266
       -
             sha256 = "1h9whvpdy37vazl095qqvsl8d2b298v2i25fsvr04x9ns3b47cl9";

     

       267
       267
       -
             name = "qtvirtualkeyboard-everywhere-src-6.5.1.tar.xz";

     

       273
       273
       +
             url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtvirtualkeyboard-everywhere-src-6.5.2.tar.xz";

     

       274
       274
       +
             sha256 = "0sb2c901ma30dcbf4yhznw0pad09iz55alvkzyw2d992gqwf0w05";

     

       275
       275
       +
             name = "qtvirtualkeyboard-everywhere-src-6.5.2.tar.xz";

     

       268
       276
        
           };

     

       269
       277
        
         };

     

       270
       278
        
         qtwayland = {

     

       271
       271
       -
           version = "6.5.1";

     

       279
       279
       +
           version = "6.5.2";

     

       272
       280
        
           src = fetchurl {

     

       273
       273
       -
             url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtwayland-everywhere-src-6.5.1.tar.xz";

     

       274
       274
       -
             sha256 = "0kcp1adgszcrwv89f2m3rp2ldbrbnb7prkr8065w5j9ik2hiw7vw";

     

       275
       275
       -
             name = "qtwayland-everywhere-src-6.5.1.tar.xz";

     

       281
       281
       +
             url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtwayland-everywhere-src-6.5.2.tar.xz";

     

       282
       282
       +
             sha256 = "16iwar19sgjvxgmbr6hmd3hsxp6ahdjwl1lra2wapl3zzf3bw81h";

     

       283
       283
       +
             name = "qtwayland-everywhere-src-6.5.2.tar.xz";

     

       276
       284
        
           };

     

       277
       285
        
         };

     

       278
       286
        
         qtwebchannel = {

     

       279
       279
       -
           version = "6.5.1";

     

       287
       287
       +
           version = "6.5.2";

     

       280
       288
        
           src = fetchurl {

     

       281
       281
       -
             url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtwebchannel-everywhere-src-6.5.1.tar.xz";

     

       282
       282
       -
             sha256 = "0jpc231gmgy540x9im8ld1fjmxqjaw1c40r6d2g5gxrpwxkl6drb";

     

       283
       283
       -
             name = "qtwebchannel-everywhere-src-6.5.1.tar.xz";

     

       289
       289
       +
             url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtwebchannel-everywhere-src-6.5.2.tar.xz";

     

       290
       290
       +
             sha256 = "0qwfnwva7v5f2g5is17yy66mnmc9c1yf9aagaw5qanskdvxdk261";

     

       291
       291
       +
             name = "qtwebchannel-everywhere-src-6.5.2.tar.xz";

     

       284
       292
        
           };

     

       285
       293
        
         };

     

       286
       294
        
         qtwebengine = {

     

       287
       287
       -
           version = "6.5.1";

     

       295
       295
       +
           version = "6.5.2";

     

       288
       296
        
           src = fetchurl {

     

       289
       289
       -
             url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtwebengine-everywhere-src-6.5.1.tar.xz";

     

       290
       290
       -
             sha256 = "0clcxkybgn5ny22rbdckxczqsf5gc3f55q7r02l5q7q6biqbs61g";

     

       291
       291
       -
             name = "qtwebengine-everywhere-src-6.5.1.tar.xz";

     

       297
       297
       +
             url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtwebengine-everywhere-src-6.5.2.tar.xz";

     

       298
       298
       +
             sha256 = "17qxf3asyxq6kcqqvml170n7rnzih3nr4srp9r5v80pmas5l7jg7";

     

       299
       299
       +
             name = "qtwebengine-everywhere-src-6.5.2.tar.xz";

     

       292
       300
        
           };

     

       293
       301
        
         };

     

       294
       302
        
         qtwebsockets = {

     

       295
       295
       -
           version = "6.5.1";

     

       303
       303
       +
           version = "6.5.2";

     

       296
       304
        
           src = fetchurl {

     

       297
       297
       -
             url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtwebsockets-everywhere-src-6.5.1.tar.xz";

     

       298
       298
       -
             sha256 = "06fsc42x571af78rlx8ah7i9nqc9qnzqvd1mmrx12xd6a2r6d3vb";

     

       299
       299
       -
             name = "qtwebsockets-everywhere-src-6.5.1.tar.xz";

     

       305
       305
       +
             url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtwebsockets-everywhere-src-6.5.2.tar.xz";

     

       306
       306
       +
             sha256 = "0xjwifxj2ssshys6f6kjr6ri2vq1wfshxky6mcscjm7vvyqdfjr0";

     

       307
       307
       +
             name = "qtwebsockets-everywhere-src-6.5.2.tar.xz";

     

       300
       308
        
           };

     

       301
       309
        
         };

     

       302
       310
        
         qtwebview = {

     

       303
       303
       -
           version = "6.5.1";

     

       311
       311
       +
           version = "6.5.2";

     

       304
       312
        
           src = fetchurl {

     

       305
       305
       -
             url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtwebview-everywhere-src-6.5.1.tar.xz";

     

       306
       306
       -
             sha256 = "0r1six7k9nz1n64c8ff1j24x2dfrr931aiwygpsf36bim27bdbvb";

     

       307
       307
       -
             name = "qtwebview-everywhere-src-6.5.1.tar.xz";

     

       313
       313
       +
             url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtwebview-everywhere-src-6.5.2.tar.xz";

     

       314
       314
       +
             sha256 = "0cgn1px8zk2khmswi9zawi9cnx9p26y4lb3a0kr4kfklm1rf00jr";

     

       315
       315
       +
             name = "qtwebview-everywhere-src-6.5.2.tar.xz";

     

       308
       316
        
           };

     

       309
       317
        
         };

     

       310
       318
        
       }

+2 -13

pkgs/development/ocaml-modules/bisect_ppx/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildDunePackage rec {

     

       4
       4
        
         pname = "bisect_ppx";

     

       5
       5
       -
         version = "2.8.2";

     

       5
       5
       +
         version = "2.8.3";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "aantron";

     

       9
       9
        
           repo = "bisect_ppx";

     

       10
       10
        
           rev = version;

     

       11
       11
       -
           hash = "sha256-Uc5ZYL6tORcCCvCe9UmOnBF68FqWpQ4bc48fTQwnfis=";

     

       11
       11
       +
           hash = "sha256-3qXobZLPivFDtls/3WNqDuAgWgO+tslJV47kjQPoi6o=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         patches = [

     

       15
       15
       -
           # Ppxlib >= 0.28.0 compatibility

     

       16
       16
       -
           # remove when a new version is released

     

       17
       17
       -
           (fetchpatch {

     

       18
       18
       -
             name = "${pname}-${version}-ppxlib-0.28-compatibility.patch";

     

       19
       19
       -
             url = "https://github.com/anmonteiro/bisect_ppx/commit/cc442a08e3a2e0e18deb48f3a696076ac0986728.patch";

     

       20
       20
       -
             sha256 = "sha256-pPHhmtd81eWhQd4X0gfZNPYT75+EkurwivP7acfJbNc=";

     

       21
       21
       -
           })

     

       22
       22
       -
         ];

     

       23
       23
       -
       

     

       24
       14
        
         minimalOCamlVersion = "4.11";

     

       25
       25
       -
         duneVersion = "3";

     

       26
       15
        
       

     

       27
       16
        
         buildInputs = [

     

       28
       17
        
           cmdliner

+25

pkgs/development/python-modules/flask-themes2/default.nix

···

       1
       1
       +
       { lib, fetchPypi, buildPythonPackage, flask, pythonOlder, pytestCheckHook }:

     

       2
       2
       +
       

     

       3
       3
       +
       buildPythonPackage rec {

     

       4
       4
       +
         pname = "flask-themes2";

     

       5
       5
       +
         version = "1.0.0";

     

       6
       6
       +
         format = "setuptools";

     

       7
       7
       +
       

     

       8
       8
       +
         disabled = pythonOlder "3.8";

     

       9
       9
       +
       

     

       10
       10
       +
         src = fetchPypi {

     

       11
       11
       +
           pname = "Flask-Themes2";

     

       12
       12
       +
           inherit version;

     

       13
       13
       +
           hash = "sha256-0U0cSdBddb9+IG3CU6zUPlxaJhQlxOV6OLgxnNDChy8=";

     

       14
       14
       +
         };

     

       15
       15
       +
       

     

       16
       16
       +
         nativeCheckInputs = [ pytestCheckHook ];

     

       17
       17
       +
         propagatedBuildInputs = [ flask ];

     

       18
       18
       +
       

     

       19
       19
       +
         meta = with lib; {

     

       20
       20
       +
           description = "Easily theme your Flask app";

     

       21
       21
       +
           homepage = "https://github.com/sysr-q/flask-themes2";

     

       22
       22
       +
           license = licenses.mit;

     

       23
       23
       +
           maintainers = with maintainers; [ ruby0b ];

     

       24
       24
       +
         };

     

       25
       25
       +
       }

+2 -2

pkgs/development/python-modules/islpy/default.nix

···

       10
       10
        
       

     

       11
       11
        
       buildPythonPackage rec {

     

       12
       12
        
         pname = "islpy";

     

       13
       13
       -
         version = "2023.1";

     

       13
       13
       +
         version = "2023.1.2";

     

       14
       14
        
         disabled = pythonOlder "3.6";

     

       15
       15
        
       

     

       16
       16
        
         src = fetchPypi {

     

       17
       17
        
           inherit pname version;

     

       18
       18
       -
           sha256 = "sha256-QLkpCBF95OBOzPrBXmlzyhFMfq1bs2+S/8Z5n4oMekg=";

     

       18
       18
       +
           sha256 = "sha256-NsNI1N9ZuNYWr1i3dl7hSaTP3jdsTYsIpoF98vrZG9Y=";

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
        
         postConfigure = ''

+31

pkgs/development/python-modules/jsonable/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , buildPythonPackage

     

       3
       3
       +
       , fetchFromGitHub

     

       4
       4
       +
       , pytestCheckHook

     

       5
       5
       +
       , nose

     

       6
       6
       +
       }:

     

       7
       7
       +
       

     

       8
       8
       +
       buildPythonPackage rec {

     

       9
       9
       +
         pname = "jsonable";

     

       10
       10
       +
         version = "0.3.1";

     

       11
       11
       +
       

     

       12
       12
       +
         src = fetchFromGitHub {

     

       13
       13
       +
           owner = "halfak";

     

       14
       14
       +
           repo = "python-jsonable";

     

       15
       15
       +
           rev = "refs/tags/${version}";

     

       16
       16
       +
           hash = "sha256-3FIzG2djSZOPDdoYeKqs3obQjgHrFtyp0sdBwZakkHA=";

     

       17
       17
       +
         };

     

       18
       18
       +
       

     

       19
       19
       +
         nativeCheckInputs = [ pytestCheckHook ];

     

       20
       20
       +
       

     

       21
       21
       +
         checkInputs = [ nose ];

     

       22
       22
       +
       

     

       23
       23
       +
         pythonImportsCheck = [ "jsonable" ];

     

       24
       24
       +
       

     

       25
       25
       +
         meta = with lib; {

     

       26
       26
       +
           description = "Provides an abstract base class and utilities for defining trivially JSONable python objects";

     

       27
       27
       +
           homepage = "https://github.com/halfak/python-jsonable";

     

       28
       28
       +
           license = licenses.mit;

     

       29
       29
       +
           maintainers = with maintainers; [ GaetanLepage ];

     

       30
       30
       +
         };

     

       31
       31
       +
       }

+41

pkgs/development/python-modules/mwcli/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , buildPythonPackage

     

       3
       3
       +
       , fetchPypi

     

       4
       4
       +
       , pythonRelaxDepsHook

     

       5
       5
       +
       , docopt

     

       6
       6
       +
       , para

     

       7
       7
       +
       }:

     

       8
       8
       +
       

     

       9
       9
       +
       buildPythonPackage rec {

     

       10
       10
       +
         pname = "mwcli";

     

       11
       11
       +
         version = "0.0.3";

     

       12
       12
       +
       

     

       13
       13
       +
         src = fetchPypi {

     

       14
       14
       +
           inherit pname version;

     

       15
       15
       +
           hash = "sha256-ADMb0P8WtXIcnGJ02R4l/TVfRewHc8ig45JurAWHGaA=";

     

       16
       16
       +
         };

     

       17
       17
       +
       

     

       18
       18
       +
         # Prevent circular dependency

     

       19
       19
       +
         pythonRemoveDeps = [

     

       20
       20
       +
           "mwxml"

     

       21
       21
       +
         ];

     

       22
       22
       +
       

     

       23
       23
       +
         nativeBuildInputs = [

     

       24
       24
       +
           pythonRelaxDepsHook

     

       25
       25
       +
         ];

     

       26
       26
       +
       

     

       27
       27
       +
         propagatedBuildInputs = [

     

       28
       28
       +
           docopt

     

       29
       29
       +
           para

     

       30
       30
       +
         ];

     

       31
       31
       +
       

     

       32
       32
       +
         # Tests require mwxml which itself depends on this package (circular dependency)

     

       33
       33
       +
         doCheck = false;

     

       34
       34
       +
       

     

       35
       35
       +
         meta = with lib; {

     

       36
       36
       +
           description = "A set of helper functions and classes for mediawiki-utilities command-line utilities";

     

       37
       37
       +
           homepage = "https://github.com/mediawiki-utilities/python-mwcli";

     

       38
       38
       +
           license = licenses.mit;

     

       39
       39
       +
           maintainers = with maintainers; [ GaetanLepage ];

     

       40
       40
       +
         };

     

       41
       41
       +
       }

+37

pkgs/development/python-modules/mwtypes/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , buildPythonPackage

     

       3
       3
       +
       , fetchPypi

     

       4
       4
       +
       , jsonable

     

       5
       5
       +
       , pytestCheckHook

     

       6
       6
       +
       , nose

     

       7
       7
       +
       }:

     

       8
       8
       +
       

     

       9
       9
       +
       buildPythonPackage rec {

     

       10
       10
       +
         pname = "mwtypes";

     

       11
       11
       +
         version = "0.3.2";

     

       12
       12
       +
       

     

       13
       13
       +
         src = fetchPypi {

     

       14
       14
       +
           inherit pname version;

     

       15
       15
       +
           hash = "sha256-3BF2xZZWKcEj6FmzGa5hUdTjhVMemngWBMDUyjQ045k=";

     

       16
       16
       +
         };

     

       17
       17
       +
       

     

       18
       18
       +
         propagatedBuildInputs = [ jsonable ];

     

       19
       19
       +
       

     

       20
       20
       +
         nativeCheckInputs = [ pytestCheckHook ];

     

       21
       21
       +
       

     

       22
       22
       +
         checkInputs = [ nose ];

     

       23
       23
       +
       

     

       24
       24
       +
         disabledTests = [

     

       25
       25
       +
           "test_normalize_path_bad_extension"

     

       26
       26
       +
           "test_open_file"

     

       27
       27
       +
         ];

     

       28
       28
       +
       

     

       29
       29
       +
         pythonImportsCheck = [ "mwtypes" ];

     

       30
       30
       +
       

     

       31
       31
       +
         meta = with lib; {

     

       32
       32
       +
           description = "A set of classes for working with MediaWiki data types.";

     

       33
       33
       +
           homepage = "https://github.com/mediawiki-utilities/python-mwtypes";

     

       34
       34
       +
           license = licenses.mit;

     

       35
       35
       +
           maintainers = with maintainers; [ GaetanLepage ];

     

       36
       36
       +
         };

     

       37
       37
       +
       }

+42

pkgs/development/python-modules/mwxml/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , buildPythonPackage

     

       3
       3
       +
       , fetchPypi

     

       4
       4
       +
       , jsonschema

     

       5
       5
       +
       , mwcli

     

       6
       6
       +
       , mwtypes

     

       7
       7
       +
       , pytestCheckHook

     

       8
       8
       +
       , nose

     

       9
       9
       +
       }:

     

       10
       10
       +
       

     

       11
       11
       +
       buildPythonPackage rec {

     

       12
       12
       +
         pname = "mwxml";

     

       13
       13
       +
         version = "0.3.3";

     

       14
       14
       +
       

     

       15
       15
       +
         src = fetchPypi {

     

       16
       16
       +
           inherit pname version;

     

       17
       17
       +
           hash = "sha256-CEjfDPLik3GPVUMRrPRxW9Z59jn05Sy+R9ggZYnbHTE=";

     

       18
       18
       +
         };

     

       19
       19
       +
       

     

       20
       20
       +
         propagatedBuildInputs = [

     

       21
       21
       +
           jsonschema

     

       22
       22
       +
           mwcli

     

       23
       23
       +
           mwtypes

     

       24
       24
       +
         ];

     

       25
       25
       +
       

     

       26
       26
       +
         nativeCheckInputs = [ pytestCheckHook ];

     

       27
       27
       +
       

     

       28
       28
       +
         checkInputs = [ nose ];

     

       29
       29
       +
       

     

       30
       30
       +
         disabledTests = [

     

       31
       31
       +
           "test_page_with_discussion"

     

       32
       32
       +
         ];

     

       33
       33
       +
       

     

       34
       34
       +
         pythonImportsCheck = [ "mwxml" ];

     

       35
       35
       +
       

     

       36
       36
       +
         meta = with lib; {

     

       37
       37
       +
           description = "A set of utilities for processing MediaWiki XML dump data";

     

       38
       38
       +
           homepage = "https://github.com/mediawiki-utilities/python-mwxml";

     

       39
       39
       +
           license = licenses.mit;

     

       40
       40
       +
           maintainers = with maintainers; [ GaetanLepage ];

     

       41
       41
       +
         };

     

       42
       42
       +
       }

+29

pkgs/development/python-modules/para/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , buildPythonPackage

     

       3
       3
       +
       , fetchPypi

     

       4
       4
       +
       , pytestCheckHook

     

       5
       5
       +
       , nose

     

       6
       6
       +
       }:

     

       7
       7
       +
       

     

       8
       8
       +
       buildPythonPackage rec {

     

       9
       9
       +
         pname = "para";

     

       10
       10
       +
         version = "0.0.8";

     

       11
       11
       +
       

     

       12
       12
       +
         src = fetchPypi {

     

       13
       13
       +
           inherit pname version;

     

       14
       14
       +
           hash = "sha256-RsMjKunY6p2IbP0IzdESiSICvthkX0C2JVWXukz+8hc=";

     

       15
       15
       +
         };

     

       16
       16
       +
       

     

       17
       17
       +
         nativeCheckInputs = [ pytestCheckHook ];

     

       18
       18
       +
       

     

       19
       19
       +
         checkInputs = [ nose ];

     

       20
       20
       +
       

     

       21
       21
       +
         pythonImportsCheck = [ "para" ];

     

       22
       22
       +
       

     

       23
       23
       +
         meta = with lib; {

     

       24
       24
       +
           description = "A set utilities that ake advantage of python's 'multiprocessing' module to distribute CPU-intensive tasks";

     

       25
       25
       +
           homepage = "https://pypi.org/project/para";

     

       26
       26
       +
           license = licenses.mit;

     

       27
       27
       +
           maintainers = with maintainers; [ GaetanLepage ];

     

       28
       28
       +
         };

     

       29
       29
       +
       }

+7 -2

pkgs/development/python-modules/tensorflow-datasets/default.nix

···

       1
       1
        
       { apache-beam

     

       2
       2
       +
       , array-record

     

       2
       3
        
       , attrs

     

       3
       4
        
       , beautifulsoup4

     

       4
       5
        
       , buildPythonPackage

     
···

       19
       20
        
       , lxml

     

       20
       21
        
       , matplotlib

     

       21
       22
        
       , mwparserfromhell

     

       23
       23
       +
       , mwxml

     

       22
       24
        
       , networkx

     

       23
       25
        
       , nltk

     

       24
       26
        
       , numpy

     
···

       46
       48
        
       

     

       47
       49
        
       buildPythonPackage rec {

     

       48
       50
        
         pname = "tensorflow-datasets";

     

       49
       49
       -
         version = "4.8.2";

     

       51
       51
       +
         version = "4.9.2";

     

       50
       52
        
       

     

       51
       53
        
         src = fetchFromGitHub {

     

       52
       54
        
           owner = "tensorflow";

     

       53
       55
        
           repo = "datasets";

     

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

     

       55
       55
       -
           hash = "sha256-FYFk53WKNQTSrnGGiA6cn9LffbMJkZtjlGuOF52Og7c=";

     

       57
       57
       +
           hash = "sha256-FKquhuk5hVBH9Im2RrIwgmosgqkoJHj0ESR2BmAOlbI=";

     

       56
       58
        
         };

     

       57
       59
        
       

     

       58
       60
        
         patches = [

     
···

       61
       63
        
         ];

     

       62
       64
        
       

     

       63
       65
        
         propagatedBuildInputs = [

     

       66
       66
       +
           array-record

     

       64
       67
        
           attrs

     

       65
       68
        
           dill

     

       66
       69
        
           dm-tree

     
···

       95
       98
        
           lxml

     

       96
       99
        
           matplotlib

     

       97
       100
        
           mwparserfromhell

     

       101
       101
       +
           mwxml

     

       98
       102
        
           networkx

     

       99
       103
        
           nltk

     

       100
       104
        
           opencv4

     
···

       120
       124
        
           "tensorflow_datasets/core/registered_test.py"

     

       121
       125
        
           "tensorflow_datasets/core/utils/gcs_utils_test.py"

     

       122
       126
        
           "tensorflow_datasets/import_without_tf_test.py"

     

       127
       127
       +
           "tensorflow_datasets/proto/build_tf_proto_test.py"

     

       123
       128
        
           "tensorflow_datasets/scripts/cli/build_test.py"

     

       124
       129
        
       

     

       125
       130
        
           # Requires `pretty_midi` which is not packaged in `nixpkgs`.

pkgs/os-specific/linux/kernel/common-config.nix

···

       170
       170
        
             NET                = yes;

     

       171
       171
        
             IP_ADVANCED_ROUTER = yes;

     

       172
       172
        
             IP_PNP             = no;

     

       173
       173
       +
             IP_ROUTE_MULTIPATH = yes;

     

       173
       174
        
             IP_VS_PROTO_TCP    = yes;

     

       174
       175
        
             IP_VS_PROTO_UDP    = yes;

     

       175
       176
        
             IP_VS_PROTO_ESP    = yes;

+1 -1

pkgs/servers/web-apps/freshrss/default.nix

···

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
        
         passthru.tests = {

     

       21
       21
       -
           inherit (nixosTests) freshrss-sqlite freshrss-pgsql;

     

       21
       21
       +
           inherit (nixosTests) freshrss-sqlite freshrss-pgsql freshrss-http-auth;

     

       22
       22
        
         };

     

       23
       23
        
       

     

       24
       24
        
         buildInputs = [ php ];

+19 -6

pkgs/servers/web-apps/searxng/default.nix

···

       5
       5
        
       

     

       6
       6
        
       python3.pkgs.buildPythonApplication rec {

     

       7
       7
        
         pname = "searxng";

     

       8
       8
       -
         version = "unstable-2023-06-26";

     

       8
       8
       +
         version = "unstable-2023-07-19";

     

       9
       9
        
       

     

       10
       10
        
         src = fetchFromGitHub {

     

       11
       11
        
           owner = pname;

     

       12
       12
        
           repo = pname;

     

       13
       13
       -
           rev = "da7c30291dcf53cc5b3d98f9aada5615cd1593a9";

     

       14
       14
       -
           sha256 = "sha256-kbNw/YgcBZNkmn2nmsnEnc9Y8MJg3zGFdW1x9GIo+dM=";

     

       13
       13
       +
           rev = "a446dea1bb492eac417de9a900fae7cdf94aeec0";

     

       14
       14
       +
           sha256 = "sha256-iZDaKCkDlp3O3IixWdXVykNRIxas+irG0dWAOU4wycI=";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
        
         postPatch = ''

     

       18
       18
        
           sed -i 's/==.*$//' requirements.txt

     

       19
       19
        
         '';

     

       20
       20
        
       

     

       21
       21
       -
         preBuild = ''

     

       22
       22
       -
           export SEARX_DEBUG="true";

     

       23
       23
       -
         '';

     

       21
       21
       +
         preBuild =

     

       22
       22
       +
           let

     

       23
       23
       +
             versionString = lib.concatStringsSep "." (builtins.tail (lib.splitString "-" version));

     

       24
       24
       +
             commitAbbrev = builtins.substring 0 8 src.rev;

     

       25
       25
       +
           in

     

       26
       26
       +
           ''

     

       27
       27
       +
             export SEARX_DEBUG="true";

     

       28
       28
       +
       

     

       29
       29
       +
             cat > searx/version_frozen.py <<EOF

     

       30
       30
       +
             VERSION_STRING="${versionString}+${commitAbbrev}"

     

       31
       31
       +
             VERSION_TAG="${versionString}+${commitAbbrev}"

     

       32
       32
       +
             DOCKER_TAG="${versionString}-${commitAbbrev}"

     

       33
       33
       +
             GIT_URL="https://github.com/searxng/searxng"

     

       34
       34
       +
             GIT_BRANCH="master"

     

       35
       35
       +
             EOF

     

       36
       36
       +
           '';

     

       24
       37
        
       

     

       25
       38
        
         propagatedBuildInputs = with python3.pkgs; [

     

       26
       39
        
           babel

+23

pkgs/tools/misc/ictree/default.nix

···

       1
       1
       +
       { stdenv, lib, fetchFromGitHub }:

     

       2
       2
       +
       

     

       3
       3
       +
       stdenv.mkDerivation rec {

     

       4
       4
       +
         pname = "ictree";

     

       5
       5
       +
         version = "1.0.1";

     

       6
       6
       +
       

     

       7
       7
       +
         src = fetchFromGitHub {

     

       8
       8
       +
           owner = "NikitaIvanovV";

     

       9
       9
       +
           repo = pname;

     

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

     

       11
       11
       +
           hash = "sha256-77Wo6jN8VUGTXBuGL0a9kvSIixdyEQoxqqNsHq9jcWw=";

     

       12
       12
       +
           fetchSubmodules = true;

     

       13
       13
       +
         };

     

       14
       14
       +
       

     

       15
       15
       +
         makeFlags = [ "PREFIX=$(out)" ];

     

       16
       16
       +
       

     

       17
       17
       +
         meta = with lib; {

     

       18
       18
       +
           description = "Like tree but interactive";

     

       19
       19
       +
           homepage = "https://github.com/NikitaIvanovV/ictree";

     

       20
       20
       +
           platforms = platforms.unix;

     

       21
       21
       +
           maintainers = with maintainers; [ foo-dogsquared ];

     

       22
       22
       +
         };

     

       23
       23
       +
       }

+2 -7

pkgs/tools/system/netdata/default.nix

···

       17
       17
        
       

     

       18
       18
        
       stdenv.mkDerivation rec {

     

       19
       19
        
         # Don't forget to update go.d.plugin.nix as well

     

       20
       20
       -
         version = "1.40.1";

     

       20
       20
       +
         version = "1.41.0";

     

       21
       21
        
         pname = "netdata";

     

       22
       22
        
       

     

       23
       23
        
         src = fetchFromGitHub {

     

       24
       24
        
           owner = "netdata";

     

       25
       25
        
           repo = "netdata";

     

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

     

       27
       27
       -
           sha256 = "sha256-4bYCsEeB0kEYtVFVXymFv7ELUo9RXoKbPjOlDKav8Rg=";

     

       27
       27
       +
           sha256 = "sha256-MZQ1ZTghH4bN7kCMqbyQlAGSgE70sYJxjiamTTH/6ds=";

     

       28
       28
        
           fetchSubmodules = true;

     

       29
       29
        
         };

     

       30
       30
        
       

     
···

       49
       49
        
           # required to prevent plugins from relying on /etc

     

       50
       50
        
           # and /var

     

       51
       51
        
           ./no-files-in-etc-and-var.patch

     

       52
       52
       -
           # The current IPC location is unsafe as it writes

     

       53
       53
       -
           # a fixed path in /tmp, which is world-writable.

     

       54
       54
       -
           # Therefore we put it into `/run/netdata`, which is owned

     

       55
       55
       -
           # by netdata only.

     

       56
       56
       -
           ./ipc-socket-in-run.patch

     

       57
       52
        
       

     

       58
       53
        
           # Avoid build-only inputs in closure leaked by configure command:

     

       59
       54
        
           #   https://github.com/NixOS/nixpkgs/issues/175693#issuecomment-1143344162

+7 -9

pkgs/tools/system/netdata/no-files-in-etc-and-var.patch

···

       1
       1
        
       diff --git a/collectors/Makefile.am b/collectors/Makefile.am

     

       2
       2
       -
       index 24e4c3f09..b3c354943 100644

     

       2
       2
       +
       index 2aec3dd3e..27385ec28 100644

     

       3
       3
        
       --- a/collectors/Makefile.am

     

       4
       4
        
       +++ b/collectors/Makefile.am

     

       5
       5
       -
       @@ -30,7 +30,7 @@ usercustompluginsconfigdir=$(configdir)/custom-plugins.d

     

       5
       5
       +
       @@ -31,7 +31,7 @@ usercustompluginsconfigdir=$(configdir)/custom-plugins.d

     

       6
       6
        
        usergoconfigdir=$(configdir)/go.d

     

       7
       7
        
        

     

       8
       8
        
        # Explicitly install directories to avoid permission issues due to umask

     
···

       62
       62
        
       +no-install-exec-local:

     

       63
       63
        
        	$(INSTALL) -d $(DESTDIR)$(userstatsdconfigdir)

     

       64
       64
        
       diff --git a/health/Makefile.am b/health/Makefile.am

     

       65
       65
       -
       index ea1b6e961..071fdd564 100644

     

       65
       65
       +
       index 20e000860..add0137b3 100644

     

       66
       66
        
       --- a/health/Makefile.am

     

       67
       67
        
       +++ b/health/Makefile.am

     

       68
       68
        
       @@ -19,7 +19,7 @@ dist_userhealthconfig_DATA = \

     
···

       75
       75
        
        

     

       76
       76
        
        healthconfigdir=$(libconfigdir)/health.d

     

       77
       77
        
       diff --git a/system/Makefile.am b/system/Makefile.am

     

       78
       78
       -
       index 13466639d..e7cc7acea 100644

     

       78
       78
       +
       index 54e9278c8..e7cc7acea 100644

     

       79
       79
        
       --- a/system/Makefile.am

     

       80
       80
        
       +++ b/system/Makefile.am

     

       81
       81
       -
       @@ -21,11 +21,9 @@ include $(top_srcdir)/build/subst.inc

     

       81
       81
       +
       @@ -21,12 +21,9 @@ include $(top_srcdir)/build/subst.inc

     

       82
       82
        
        SUFFIXES = .in

     

       83
       83
        
        

     

       84
       84
        
        dist_config_SCRIPTS = \

     
···

       87
       87
        
        

     

       88
       88
        
        dist_config_DATA = \

     

       89
       89
        
       -    .install-type \

     

       90
       90
       +
       -    netdata-updater.conf \

     

       90
       91
        
            $(NULL)

     

       91
       92
        
        

     

       92
       93
        
        libconfigvnodesdir=$(libconfigdir)/vnodes

     

       93
       93
       -
       @@ -45,7 +43,7 @@ libsysrunitdir=$(libsysdir)/runit

     

       94
       94
       +
       @@ -46,7 +43,7 @@ libsysrunitdir=$(libsysdir)/runit

     

       94
       95
        
        libsyssystemddir=$(libsysdir)/systemd

     

       95
       96
        
        

     

       96
       97
        
        # Explicitly install directories to avoid permission issues due to umask

     
···

       112
       113
        
        	$(INSTALL) -d $(DESTDIR)$(usersslconfigdir)

     

       113
       114
        
        

     

       114
       115
        
        dist_noinst_DATA = \

     

       115
       115
       -
       -- 

     

       116
       116
       -
       2.40.1

     

       117
       117
       -

+9 -9

pkgs/tools/system/netdata/skip-CONFIGURE_COMMAND.patch

···

       1
       1
        
       Shrink closure size by avoiding paths embedded from configure call.

     

       2
       2
        
       

     

       3
       3
        
       https://github.com/NixOS/nixpkgs/issues/175693

     

       4
       4
       +
       diff --git a/daemon/buildinfo.c b/daemon/buildinfo.c

     

       5
       5
       +
       index 56cde84fc..011e7579d 100644

     

       4
       6
        
       --- a/daemon/buildinfo.c

     

       5
       7
        
       +++ b/daemon/buildinfo.c

     

       6
       6
       -
       @@ -247,7 +247,9 @@ void print_build_info(void) {

     

       7
       7
       -
            char *prebuilt_distro = NULL;

     

       8
       8
       -
            get_install_type(&install_type, &prebuilt_arch, &prebuilt_distro);

     

       8
       8
       +
       @@ -1040,7 +1040,7 @@ static void build_info_set_status(BUILD_INFO_SLOT slot, bool status) {

     

       9
       9
        
        

     

       10
       10
       -
       -    printf("Configure options: %s\n", CONFIGURE_COMMAND);

     

       11
       11
       -
       +    // To minimize closure size do not persist configure options

     

       12
       12
       -
       +    // with build-time inputs.

     

       13
       13
       -
       +    printf("Configure options: REMOVED\n");

     

       10
       10
       +
        __attribute__((constructor)) void initialize_build_info(void) {

     

       11
       11
       +
            build_info_set_value(BIB_PACKAGING_NETDATA_VERSION, program_version);

     

       12
       12
       +
       -    build_info_set_value(BIB_PACKAGING_CONFIGURE_OPTIONS, CONFIGURE_COMMAND);

     

       13
       13
       +
       +    build_info_set_value(BIB_PACKAGING_CONFIGURE_OPTIONS, "REMOVED FOR CLOSURE SIZE REASONS");

     

       14
       14
        
        

     

       15
       15
       -
            if (install_type == NULL) {

     

       16
       16
       -
                printf("Install type: unknown\n");

     

       15
       15
       +
        #ifdef COMPILED_FOR_LINUX

     

       16
       16
       +
            build_info_set_status(BIB_FEATURE_BUILT_FOR, true);

+1 -1

pkgs/top-level/aliases.nix

···

       1426
       1426
        
         pybitmessage = throw "pybitmessage was removed from nixpkgs as it is stuck on python2"; # Added 2022-01-01

     

       1427
       1427
        
         pyext = throw "pyext was removed because it does not support python 3.11, is upstream unmaintained and was unused"; # Added 2022-11-21

     

       1428
       1428
        
         pygmentex = texlive.bin.pygmentex; # Added 2019-12-15

     

       1429
       1429
       -
         pyload = throw "pyload has been removed from nixpkgs, as it was unmaintained"; # Added 2021-03-21

     

       1429
       1429
       +
         pyload = throw "pyload has been removed from nixpkgs. Use pyload-ng instead."; # Added 2021-03-21

     

       1430
       1430
        
         pynagsystemd = throw "pynagsystemd was removed as it was unmaintained and incompatible with recent systemd versions. Instead use its fork check_systemd"; # Added 2020-10-24

     

       1431
       1431
        
         pyo3-pack = maturin;

     

       1432
       1432
        
         pypi2nix = throw "pypi2nix has been removed due to being unmaintained";

pkgs/top-level/all-packages.nix

···

       2069
       2069
        
       

     

       2070
       2070
        
         git-archive-all = python3.pkgs.callPackage ../applications/version-management/git-archive-all { };

     

       2071
       2071
        
       

     

       2072
       2072
       +
         git-backdate = callPackage ../applications/version-management/git-backdate { };

     

       2073
       2073
       +
       

     

       2072
       2074
        
         git-backup = callPackage ../applications/version-management/git-backup {

     

       2073
       2075
        
           inherit (darwin.apple_sdk.frameworks) Security;

     

       2074
       2076
        
         };

     
···

       5450
       5452
        
         hyx = callPackage ../tools/text/hyx { };

     

       5451
       5453
        
       

     

       5452
       5454
        
         icdiff = callPackage ../tools/text/icdiff { };

     

       5455
       5455
       +
       

     

       5456
       5456
       +
         ictree = callPackage ../tools/misc/ictree { };

     

       5453
       5457
        
       

     

       5454
       5458
        
         inchi = callPackage ../development/libraries/inchi { };

     

       5455
       5459
        
       

     
···

       34326
       34330
        
         pure-maps = libsForQt5.callPackage ../applications/misc/pure-maps { };

     

       34327
       34331
        
       

     

       34328
       34332
        
         pwdsafety = callPackage ../tools/security/pwdsafety { };

     

       34333
       34333
       +
       

     

       34334
       34334
       +
         pyload-ng = callPackage ../applications/networking/pyload-ng {};

     

       34329
       34335
        
       

     

       34330
       34336
        
         pyrosimple = callPackage ../applications/networking/p2p/pyrosimple { };

     

       34331
       34337

+12

pkgs/top-level/python-packages.nix

···

       3838
       3838
        
       

     

       3839
       3839
        
         flask-testing = callPackage ../development/python-modules/flask-testing { };

     

       3840
       3840
        
       

     

       3841
       3841
       +
         flask-themes2 = callPackage ../development/python-modules/flask-themes2 { };

     

       3842
       3842
       +
       

     

       3841
       3843
        
         flask-versioned = callPackage ../development/python-modules/flask-versioned { };

     

       3842
       3844
        
       

     

       3843
       3845
        
         flask-wtf = callPackage ../development/python-modules/flask-wtf { };

     
···

       5379
       5381
        
       

     

       5380
       5382
        
         json-stream-rs-tokenizer = callPackage ../development/python-modules/json-stream-rs-tokenizer { };

     

       5381
       5383
        
       

     

       5384
       5384
       +
         jsonable = callPackage ../development/python-modules/jsonable { };

     

       5385
       5385
       +
       

     

       5382
       5386
        
         jsonnet = buildPythonPackage { inherit (pkgs.jsonnet) name src; };

     

       5383
       5387
        
       

     

       5384
       5388
        
         jsonpatch = callPackage ../development/python-modules/jsonpatch { };

     
···

       6719
       6723
        
         mutf8 = callPackage ../development/python-modules/mutf8 { };

     

       6720
       6724
        
       

     

       6721
       6725
        
         mujson = callPackage ../development/python-modules/mujson { };

     

       6726
       6726
       +
       

     

       6727
       6727
       +
         mwcli = callPackage ../development/python-modules/mwcli { };

     

       6722
       6728
        
       

     

       6723
       6729
        
         mwclient = callPackage ../development/python-modules/mwclient { };

     

       6724
       6730
        
       

     
···

       6728
       6734
        
       

     

       6729
       6735
        
         mwparserfromhell = callPackage ../development/python-modules/mwparserfromhell { };

     

       6730
       6736
        
       

     

       6737
       6737
       +
         mwtypes = callPackage ../development/python-modules/mwtypes { };

     

       6738
       6738
       +
       

     

       6739
       6739
       +
         mwxml = callPackage ../development/python-modules/mwxml { };

     

       6740
       6740
       +
       

     

       6731
       6741
        
         mxnet = callPackage ../development/python-modules/mxnet { };

     

       6732
       6742
        
       

     

       6733
       6743
        
         myfitnesspal = callPackage ../development/python-modules/myfitnesspal { };

     
···

       7536
       7546
        
         papis = callPackage ../development/python-modules/papis { };

     

       7537
       7547
        
       

     

       7538
       7548
        
         papis-python-rofi = callPackage ../development/python-modules/papis-python-rofi { };

     

       7549
       7549
       +
       

     

       7550
       7550
       +
         para = callPackage ../development/python-modules/para { };

     

       7539
       7551
        
       

     

       7540
       7552
        
         param = callPackage ../development/python-modules/param { };

     

       7541
       7553