commit c5f0d725df54b4b811dcb26e9fccd97ef49d12f8 · pyrox.dev/nixpkgs

maintainers/scripts/luarocks-packages.csv

···

       20
       20
        
       gitsigns.nvim,https://github.com/lewis6991/gitsigns.nvim.git,,,,5.1,

     

       21
       21
        
       http,,,,0.3-0,,vcunat

     

       22
       22
        
       inspect,,,,,,

     

       23
       23
       +
       jsregexp,,,,,,

     

       23
       24
        
       ldbus,,,http://luarocks.org/dev,,,

     

       24
       25
        
       ldoc,https://github.com/stevedonovan/LDoc.git,,,,,

     

       25
       26
        
       lgi,,,,,,

+10

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

···

       538
       538
        
             </listitem>

     

       539
       539
        
             <listitem>

     

       540
       540
        
               <para>

     

       541
       541
       +
                 <literal>teleport</literal> has been upgraded to major version

     

       542
       542
       +
                 10. Please see upstream

     

       543
       543
       +
                 <link xlink:href="https://goteleport.com/docs/ver/10.0/management/operations/upgrading/">upgrade

     

       544
       544
       +
                 instructions</link> and

     

       545
       545
       +
                 <link xlink:href="https://goteleport.com/docs/ver/10.0/changelog/#1000">release

     

       546
       546
       +
                 notes</link>.

     

       547
       547
       +
               </para>

     

       548
       548
       +
             </listitem>

     

       549
       549
       +
             <listitem>

     

       550
       550
       +
               <para>

     

       541
       551
        
                 lemmy module option

     

       542
       552
        
                 <literal>services.lemmy.settings.database.createLocally</literal>

     

       543
       553
        
                 moved to

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

···

       180
       180
        
       

     

       181
       181
        
       - dd-agent package removed along with the `services.dd-agent` module, due to the project being deprecated in favor of `datadog-agent`,  which is available via the `services.datadog-agent` module.

     

       182
       182
        
       

     

       183
       183
       +
       - `teleport` has been upgraded to major version 10. Please see upstream [upgrade instructions](https://goteleport.com/docs/ver/10.0/management/operations/upgrading/) and [release notes](https://goteleport.com/docs/ver/10.0/changelog/#1000).

     

       184
       184
       +
       

     

       183
       185
        
       - lemmy module option `services.lemmy.settings.database.createLocally`

     

       184
       186
        
         moved to `services.lemmy.database.createLocally`.

     

       185
       187

+5 -3

nixos/modules/security/acme/default.nix

···

       190
       190
        
           );

     

       191
       191
        
           renewOpts = escapeShellArgs (

     

       192
       192
        
             commonOpts

     

       193
       193
       -
             ++ [ "renew" ]

     

       193
       193
       +
             ++ [ "renew" "--no-random-sleep" ]

     

       194
       194
        
             ++ optionals data.ocspMustStaple [ "--must-staple" ]

     

       195
       195
        
             ++ data.extraLegoRenewFlags

     

       196
       196
        
           );

     
···

       223
       223
        
               # have many certificates, the renewals are distributed over

     

       224
       224
        
               # the course of the day to avoid rate limits.

     

       225
       225
        
               AccuracySec = "${toString (_24hSecs / numCerts)}s";

     

       226
       226
       -
       

     

       227
       226
        
               # Skew randomly within the day, per https://letsencrypt.org/docs/integration-guide/.

     

       228
       227
        
               RandomizedDelaySec = "24h";

     

       228
       228
       +
               FixedRandomDelay = true;

     

       229
       229
        
             };

     

       230
       230
        
           };

     

       231
       231
        
       

     
···

       325
       325
        
               '');

     

       326
       326
        
             } // optionalAttrs (data.listenHTTP != null && toInt (elemAt (splitString ":" data.listenHTTP) 1) < 1024) {

     

       327
       327
        
               CapabilityBoundingSet = [ "CAP_NET_BIND_SERVICE" ];

     

       328
       328
       +
               AmbientCapabilities = [ "CAP_NET_BIND_SERVICE" ];

     

       328
       329
        
             };

     

       329
       330
        
       

     

       330
       331
        
             # Working directory will be /tmp

     
···

       376
       377
        
       

     

       377
       378
        
               # Check if we can renew.

     

       378
       379
        
               # We can only renew if the list of domains has not changed.

     

       379
       379
       -
               if cmp -s domainhash.txt certificates/domainhash.txt && [ -e 'certificates/${keyName}.key' -a -e 'certificates/${keyName}.crt' -a -n "$(ls -1 accounts)" ]; then

     

       380
       380
       +
               # We also need an account key. Avoids #190493

     

       381
       381
       +
               if cmp -s domainhash.txt certificates/domainhash.txt && [ -e 'certificates/${keyName}.key' -a -e 'certificates/${keyName}.crt' -a -n "$(find accounts -name '${data.email}.key')" ]; then

     

       380
       382
        
       

     

       381
       383
        
                 # Even if a cert is not expired, it may be revoked by the CA.

     

       382
       384
        
                 # Try to renew, and silently fail if the cert is not expired.

+4 -5

nixos/modules/services/networking/firefox-syncserver.nix

···

       19
       19
        
             fxa_email_domain = "api.accounts.firefox.com";

     

       20
       20
        
             fxa_oauth_server_url = "https://oauth.accounts.firefox.com/v1";

     

       21
       21
        
             run_migrations = true;

     

       22
       22
       +
             # if JWK caching is not enabled the token server must verify tokens

     

       23
       23
       +
             # using the fxa api, on a thread pool with a static size.

     

       24
       24
       +
             additional_blocking_threads_for_fxa_requests = 10;

     

       22
       25
        
           } // lib.optionalAttrs cfg.singleNode.enable {

     

       23
       26
        
             # Single-node mode is likely to be used on small instances with little

     

       24
       27
        
             # capacity. The default value (0.1) can only ever release capacity when

     
···

       309
       312
        
               enableACME = cfg.singleNode.enableTLS;

     

       310
       313
        
               forceSSL = cfg.singleNode.enableTLS;

     

       311
       314
        
               locations."/" = {

     

       312
       312
       -
                 proxyPass = "http://localhost:${toString cfg.settings.port}";

     

       313
       313
       -
                 # source mentions that this header should be set

     

       314
       314
       -
                 extraConfig = ''

     

       315
       315
       -
                   add_header X-Content-Type-Options nosniff;

     

       316
       316
       -
                 '';

     

       315
       315
       +
                 proxyPass = "http://127.0.0.1:${toString cfg.settings.port}";

     

       317
       316
        
               };

     

       318
       317
        
             };

     

       319
       318
        
           };

+59 -1

nixos/tests/acme.nix

···

       41
       41
        
           inherit documentRoot;

     

       42
       42
        
         };

     

       43
       43
        
       

     

       44
       44
       +
         simpleConfig = {

     

       45
       45
       +
           security.acme = {

     

       46
       46
       +
             certs."http.example.test" = {

     

       47
       47
       +
               listenHTTP = ":80";

     

       48
       48
       +
             };

     

       49
       49
       +
           };

     

       50
       50
       +
       

     

       51
       51
       +
           networking.firewall.allowedTCPPorts = [ 80 ];

     

       52
       52
       +
         };

     

       53
       53
       +
       

     

       44
       54
        
         # Base specialisation config for testing general ACME features

     

       45
       55
        
         webserverBasicConfig = {

     

       46
       56
        
           services.nginx.enable = true;

     
···

       173
       183
        
             services.nginx.logError = "stderr info";

     

       174
       184
        
       

     

       175
       185
        
             specialisation = {

     

       186
       186
       +
               # Tests HTTP-01 verification using Lego's built-in web server

     

       187
       187
       +
               http01lego.configuration = simpleConfig;

     

       188
       188
       +
       

     

       189
       189
       +
               renew.configuration = lib.mkMerge [

     

       190
       190
       +
                 simpleConfig

     

       191
       191
       +
                 {

     

       192
       192
       +
                   # Pebble provides 5 year long certs,

     

       193
       193
       +
                   # needs to be higher than that to test renewal

     

       194
       194
       +
                   security.acme.certs."http.example.test".validMinDays = 9999;

     

       195
       195
       +
                 }

     

       196
       196
       +
               ];

     

       197
       197
       +
       

     

       198
       198
       +
               # Tests that account creds can be safely changed.

     

       199
       199
       +
               accountchange.configuration = lib.mkMerge [

     

       200
       200
       +
                 simpleConfig

     

       201
       201
       +
                 {

     

       202
       202
       +
                   security.acme.certs."http.example.test".email = "admin@example.test";

     

       203
       203
       +
                 }

     

       204
       204
       +
               ];

     

       205
       205
       +
       

     

       176
       206
        
               # First derivation used to test general ACME features

     

       177
       207
        
               general.configuration = { ... }: let

     

       178
       208
        
                 caDomain = nodes.acme.test-support.acme.caDomain;

     
···

       446
       476
        
       

     

       447
       477
        
             download_ca_certs(client)

     

       448
       478
        
       

     

       449
       449
       -
             # Perform general tests first

     

       479
       479
       +
             # Perform http-01 w/ lego test first

     

       480
       480
       +
             with subtest("Can request certificate with Lego's built in web server"):

     

       481
       481
       +
                 switch_to(webserver, "http01lego")

     

       482
       482
       +
                 webserver.wait_for_unit("acme-finished-http.example.test.target")

     

       483
       483
       +
                 check_fullchain(webserver, "http.example.test")

     

       484
       484
       +
                 check_issuer(webserver, "http.example.test", "pebble")

     

       485
       485
       +
       

     

       486
       486
       +
             # Perform renewal test

     

       487
       487
       +
             with subtest("Can renew certificates when they expire"):

     

       488
       488
       +
                 hash = webserver.succeed("sha256sum /var/lib/acme/http.example.test/cert.pem")

     

       489
       489
       +
                 switch_to(webserver, "renew")

     

       490
       490
       +
                 webserver.wait_for_unit("acme-finished-http.example.test.target")

     

       491
       491
       +
                 check_fullchain(webserver, "http.example.test")

     

       492
       492
       +
                 check_issuer(webserver, "http.example.test", "pebble")

     

       493
       493
       +
                 hash_after = webserver.succeed("sha256sum /var/lib/acme/http.example.test/cert.pem")

     

       494
       494
       +
                 assert hash != hash_after

     

       495
       495
       +
       

     

       496
       496
       +
             # Perform account change test

     

       497
       497
       +
             with subtest("Handles email change correctly"):

     

       498
       498
       +
                 hash = webserver.succeed("sha256sum /var/lib/acme/http.example.test/cert.pem")

     

       499
       499
       +
                 switch_to(webserver, "accountchange")

     

       500
       500
       +
                 webserver.wait_for_unit("acme-finished-http.example.test.target")

     

       501
       501
       +
                 check_fullchain(webserver, "http.example.test")

     

       502
       502
       +
                 check_issuer(webserver, "http.example.test", "pebble")

     

       503
       503
       +
                 hash_after = webserver.succeed("sha256sum /var/lib/acme/http.example.test/cert.pem")

     

       504
       504
       +
                 # Has to do a full run to register account, which creates new certs.

     

       505
       505
       +
                 assert hash != hash_after

     

       506
       506
       +
       

     

       507
       507
       +
             # Perform general tests

     

       450
       508
        
             switch_to(webserver, "general")

     

       451
       509
        
       

     

       452
       510
        
             with subtest("Can request certificate with HTTP-01 challenge"):

+3 -3

pkgs/applications/blockchains/erigon.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "erigon";

     

       5
       5
       -
         version = "2022.09.03";

     

       5
       5
       +
         version = "2022.10.01";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "ledgerwatch";

     

       9
       9
        
           repo = pname;

     

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

     

       11
       11
       -
           sha256 = "sha256-dilsoJw7VPA7SerpAOhYUviE2zt2qMBmSLWaPm0ux2Y=";

     

       11
       11
       +
           sha256 = "sha256-FuOVI59vfhm5q92hnfgarh3zpLXSDRmZQJuERHf4I7A=";

     

       12
       12
        
           fetchSubmodules = true;

     

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
       -
         vendorSha256 = "sha256-W8hEMfn2qW/3+V6x/RH1azj49V26fyQ+1y2re3tXsTk=";

     

       15
       15
       +
         vendorSha256 = "sha256-zdm11bGkCcwnz+8dve2pdcpg6pDgLe4UG3Ob/mbqhko=";

     

       16
       16
        
         proxyVendor = true;

     

       17
       17
        
       

     

       18
       18
        
         # Build errors in mdbx when format hardening is enabled:

+2 -2

pkgs/applications/blockchains/fulcrum/default.nix

···

       11
       11
        
       

     

       12
       12
        
       stdenv.mkDerivation rec {

     

       13
       13
        
         pname = "fulcrum";

     

       14
       14
       -
         version = "1.8.1";

     

       14
       14
       +
         version = "1.8.2";

     

       15
       15
        
       

     

       16
       16
        
         src = fetchFromGitHub {

     

       17
       17
        
           owner = "cculianu";

     

       18
       18
        
           repo = "Fulcrum";

     

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

     

       20
       20
       -
           sha256 = "sha256-GaXXqIHuMTGn8iLymAhL8i0HzXmaO6RxtvIzgWw6QI0=";

     

       20
       20
       +
           sha256 = "sha256-sX9GeY+c/mcsAWApQ0E5LwoXZgWUC4w7YY8/PEzMhl8=";

     

       21
       21
        
         };

     

       22
       22
        
       

     

       23
       23
        
         nativeBuildInputs = [ pkg-config qmake ];

+6 -6

pkgs/applications/editors/android-studio/default.nix

···

       10
       10
        
           inherit tiling_wm;

     

       11
       11
        
         };

     

       12
       12
        
         stableVersion = {

     

       13
       13
       -
           version = "2021.2.1.15"; # "Android Studio Chipmunk (2021.2.1)"

     

       14
       14
       -
           sha256Hash = "ABjg38DdKSFwBRb3osRDN3xVd4jaf7CkUkPstDAHRb4=";

     

       13
       13
       +
           version = "2021.3.1.16"; # "Android Studio Dolphin (2021.3.1)"

     

       14
       14
       +
           sha256Hash = "GnJbWFeG9DuUQzbK9wM2BEbj9LXm4jQFf/Eh5Q75HZo=";

     

       15
       15
        
         };

     

       16
       16
        
         betaVersion = {

     

       17
       17
       -
           version = "2021.3.1.14"; # "Android Studio Dolphin (2021.3.1) Beta 5"

     

       18
       18
       -
           sha256Hash = "k1Qt54u45rwHsQNz9TVqnFB65kBKtfFZ3OknpfutKPI=";

     

       17
       17
       +
           version = "2022.1.1.11"; # "Android Studio Electic Eel (2022.1.1) Beta 1"

     

       18
       18
       +
           sha256Hash = "YQ20VQME9bQ2vOI7RWfA00npewOL3D6y1dGgNnJXnHc=";

     

       19
       19
        
         };

     

       20
       20
        
         latestVersion = { # canary & dev

     

       21
       21
       -
           version = "2022.1.1.8"; # "Android Studio Electric Eel (2022.1.1) Canary 8"

     

       22
       22
       -
           sha256Hash = "0bZXx4YpMztLAnwuBaSaNT3GJNfYnqCDanwR+Q7qyUc=";

     

       21
       21
       +
           version = "2022.2.1.2"; # "Android Studio Flamingo (2022.2.1) Canary 2"

     

       22
       22
       +
           sha256Hash = "hlHlgyl9If2LH4aExpElx0rqmWeoFX+qx4w6RRb5e8U=";

     

       23
       23
        
         };

     

       24
       24
        
       in {

     

       25
       25
        
         # Attributes are named by their corresponding release channels

+1 -17

pkgs/applications/editors/vscode/extensions/default.nix

···

       1409
       1409
        
               };

     

       1410
       1410
        
             };

     

       1411
       1411
        
       

     

       1412
       1412
       -
             jakebecker.elixir-ls = buildVscodeMarketplaceExtension {

     

       1413
       1413
       -
               mktplcRef = {

     

       1414
       1414
       -
                 name = "elixir-ls";

     

       1415
       1415
       -
                 publisher = "JakeBecker";

     

       1416
       1416
       -
                 version = "0.11.0";

     

       1417
       1417
       -
                 sha256 = "sha256-okvwyD0m2r8ar85VtuBUNMUZGGrCfJ4DB9v7aSX5PjM=";

     

       1418
       1418
       -
               };

     

       1419
       1419
       -
               meta = with lib; {

     

       1420
       1420
       -
                 changelog = "https://marketplace.visualstudio.com/items/JakeBecker.elixir-ls/changelog";

     

       1421
       1421
       -
                 description = "Elixir support with debugger, autocomplete, and more. Powered by ElixirLS.";

     

       1422
       1422
       -
                 downloadPage = "https://marketplace.visualstudio.com/items?itemName=JakeBecker.elixir-ls";

     

       1423
       1423
       -
                 homepage = "https://github.com/elixir-lsp/elixir-ls";

     

       1424
       1424
       -
                 license = licenses.mit;

     

       1425
       1425
       -
                 maintainers = with maintainers; [ datafoo ];

     

       1426
       1426
       -
               };

     

       1427
       1427
       -
             };

     

       1428
       1428
       -
       

     

       1429
       1412
        
             james-yu.latex-workshop = buildVscodeMarketplaceExtension {

     

       1430
       1413
        
               mktplcRef = {

     

       1431
       1414
        
                 name = "latex-workshop";

     
···

       2805
       2788
        
       

     

       2806
       2789
        
         aliases = self: super: {

     

       2807
       2790
        
           # aliases

     

       2791
       2791
       +
           jakebecker.elixir-ls = super.elixir-lsp.vscode-elixir-ls;

     

       2808
       2792
        
           ms-vscode = lib.recursiveUpdate super.ms-vscode { inherit (super.golang) go; };

     

       2809
       2793
        
         };

     

       2810
       2794

+2 -2

pkgs/applications/graphics/hydrus/default.nix

···

       10
       10
        
       

     

       11
       11
        
       python3Packages.buildPythonPackage rec {

     

       12
       12
        
         pname = "hydrus";

     

       13
       13
       -
         version = "500";

     

       13
       13
       +
         version = "501";

     

       14
       14
        
         format = "other";

     

       15
       15
        
       

     

       16
       16
        
         src = fetchFromGitHub {

     

       17
       17
        
           owner = "hydrusnetwork";

     

       18
       18
        
           repo = "hydrus";

     

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

     

       20
       20
       -
           sha256 = "sha256-gsOto37++++ucpDC0ri3HhROp7v6qlHENjFvsbuyM6k=";

     

       20
       20
       +
           sha256 = "sha256-dmQD3CAAAhE6IOfT38PHUIlHdDFdk6HZ6ZEZmKw7+WM=";

     

       21
       21
        
         };

     

       22
       22
        
       

     

       23
       23
        
         nativeBuildInputs = [

+11 -2

pkgs/applications/networking/cluster/kubectl-doctor/default.nix

···

       1
       1
       -
       { lib, buildGoModule, fetchFromGitHub }:

     

       1
       1
       +
       { lib, buildGoModule, fetchFromGitHub, fetchpatch }:

     

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "kubectl-doctor";

     
···

       11
       11
        
           sha256 = "sha256-yp5OfSDxIASiCgISUVNxfe3dsLukgIoHARVPALIaQfY=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         vendorSha256 = "sha256-pdg65q7iMkcpFvSVUTa07m5URLQNNEfWQ4mdGu4suBM=";

     

       14
       14
       +
         patches = [

     

       15
       15
       +
           (fetchpatch {

     

       16
       16
       +
             # https://github.com/emirozer/kubectl-doctor/pull/21

     

       17
       17
       +
             name = "go-1.19-client-go-0.25.patch";

     

       18
       18
       +
             url = "https://github.com/emirozer/kubectl-doctor/commit/a987ef58063e305409034af280d688a11682dbb9.patch";

     

       19
       19
       +
             sha256 = "sha256-NQd/WxUfYwBDowhnoUWaOV8k7msiOhff3Bjux+a9R9E=";

     

       20
       20
       +
           })

     

       21
       21
       +
         ];

     

       22
       22
       +
       

     

       23
       23
       +
         vendorSha256 = "sha256-qhffg/s1RZFNW0nHLbJ89yqLzdC72ARXdbSfMLJK2pQ=";

     

       15
       24
        
       

     

       16
       25
        
         postInstall = ''

     

       17
       26
        
           mv $out/bin/{cmd,kubectl-doctor}

+3 -3

pkgs/applications/networking/cluster/nomad/1.2.nix

···

       4
       4
        
       

     

       5
       5
        
       callPackage ./generic.nix {

     

       6
       6
        
         inherit buildGoModule;

     

       7
       7
       -
         version = "1.2.12";

     

       8
       8
       -
         sha256 = "sha256-PdMo96/foN7rSNvMOQ16N3advy+h0GX7LYtfl23xRfs=";

     

       9
       9
       -
         vendorSha256 = "sha256-fmqhaM3yK2ThiD+qwQTr+d5FqhZWzkwcGTSPdXNNFTU=";

     

       7
       7
       +
         version = "1.2.13";

     

       8
       8
       +
         sha256 = "sha256-yDcvN6cKG1BlBq1ygYB58bS1YRHWqJgLXRlqI7lrW1A=";

     

       9
       9
       +
         vendorSha256 = "sha256-dPErDlJ4oNpER3Ij4yrN77V8sZvDUuXY7dM39u9xT4I=";

     

       10
       10
        
       }

+3 -3

pkgs/applications/networking/cluster/nomad/1.3.nix

···

       4
       4
        
       

     

       5
       5
        
       callPackage ./generic.nix {

     

       6
       6
        
         inherit buildGoModule;

     

       7
       7
       -
         version = "1.3.5";

     

       8
       8
       -
         sha256 = "sha256-WKS7EfZxysy/oyq1fa8rKvmfgHRiB7adSVhALZNFYgo=";

     

       9
       9
       -
         vendorSha256 = "sha256-byc6wAxpqhxlN3kyHyFQeBS9/oIjHeoz6ldYskizgaI=";

     

       7
       7
       +
         version = "1.3.6";

     

       8
       8
       +
         sha256 = "sha256-E1+QFaakAsqeXxAfY80ExWVIud7Q/q2TaUVsmADjsgo=";

     

       9
       9
       +
         vendorSha256 = "sha256-kgTRjPr7GsoBeE/s9wrmUWE5jv1ZmszfVDsVaRbdx14=";

     

       10
       10
        
       }

+10

pkgs/applications/networking/cluster/nomad/1.4.nix

···

       1
       1
       +
       { callPackage

     

       2
       2
       +
       , buildGoModule

     

       3
       3
       +
       }:

     

       4
       4
       +
       

     

       5
       5
       +
       callPackage ./generic.nix {

     

       6
       6
       +
         inherit buildGoModule;

     

       7
       7
       +
         version = "1.4.0";

     

       8
       8
       +
         sha256 = "sha256-iAAnXhJdfgBsuBsuIkFQB4AbTplX3HJuf5HfUGAUEeM=";

     

       9
       9
       +
         vendorSha256 = "sha256-kfT2UGC8Wl7CM9lOU75UqKc0/O1okGCoGDpmQntakbU=";

     

       10
       10
       +
       }

+3 -3

pkgs/data/misc/v2ray-geoip/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "v2ray-geoip";

     

       5
       5
       -
         version = "202209290111";

     

       5
       5
       +
         version = "202210060105";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "v2fly";

     

       9
       9
        
           repo = "geoip";

     

       10
       10
       -
           rev = "1aa11a6dd94b708175a81b12037486459fa090a8";

     

       11
       11
       -
           sha256 = "sha256-CVze/QyoBKZmd+U8bfjxr+u8W95W+fs9+mAdPgyIpg4=";

     

       10
       10
       +
           rev = "0bb2420d643555aa19b21f3c06b517a7c14826b6";

     

       11
       11
       +
           sha256 = "sha256-5vr7iO2vny9yalJblBVgNwupEQ9w3LZXM+VKb4xSVD0=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         installPhase = ''

+96 -62

pkgs/development/lua-modules/generated-packages.nix

···

       153
       153
        
       }) {};

     

       154
       154
        
       

     

       155
       155
        
       busted = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast

     

       156
       156
       -
       , fetchgit, penlight, luafilesystem, dkjson, lua_cliargs, lua, say, mediator_lua, luasystem, lua-term, luassert

     

       156
       156
       +
       , fetchgit, say, luassert, lua_cliargs, luasystem, luafilesystem, lua, mediator_lua, penlight, lua-term, dkjson

     

       157
       157
        
       }:

     

       158
       158
        
       buildLuarocksPackage {

     

       159
       159
        
         pname = "busted";

     
···

       176
       176
        
        '') ["date" "path"]) ;

     

       177
       177
        
       

     

       178
       178
        
         disabled = with lua; (luaOlder "5.1");

     

       179
       179
       -
         propagatedBuildInputs = [ penlight luafilesystem dkjson lua_cliargs lua say mediator_lua luasystem lua-term luassert ];

     

       179
       179
       +
         propagatedBuildInputs = [ say luassert lua_cliargs luasystem luafilesystem lua mediator_lua penlight lua-term dkjson ];

     

       180
       180
        
       

     

       181
       181
        
         meta = {

     

       182
       182
        
           homepage = "https://lunarmodules.github.io/busted/";

     
···

       186
       186
        
       }) {};

     

       187
       187
        
       

     

       188
       188
        
       cassowary = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast

     

       189
       189
       -
       , fetchgit, penlight, lua

     

       189
       189
       +
       , fetchgit, lua, penlight

     

       190
       190
        
       }:

     

       191
       191
        
       buildLuarocksPackage {

     

       192
       192
        
         pname = "cassowary";

     
···

       209
       209
        
        '') ["date" "path"]) ;

     

       210
       210
        
       

     

       211
       211
        
         disabled = with lua; (luaOlder "5.1");

     

       212
       212
       -
         propagatedBuildInputs = [ penlight lua ];

     

       212
       212
       +
         propagatedBuildInputs = [ lua penlight ];

     

       213
       213
        
       

     

       214
       214
        
         meta = {

     

       215
       215
        
           homepage = "https://github.com/sile-typesetter/cassowary.lua";

     
···

       399
       399
        
       }) {};

     

       400
       400
        
       

     

       401
       401
        
       digestif = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast

     

       402
       402
       -
       , fetchgit, lpeg, lua

     

       402
       402
       +
       , fetchgit, lua, lpeg

     

       403
       403
        
       }:

     

       404
       404
        
       buildLuarocksPackage {

     

       405
       405
        
         pname = "digestif";

     
···

       419
       419
        
        '') ["date" "path"]) ;

     

       420
       420
        
       

     

       421
       421
        
         disabled = with lua; (luaOlder "5.3");

     

       422
       422
       -
         propagatedBuildInputs = [ lpeg lua ];

     

       422
       422
       +
         propagatedBuildInputs = [ lua lpeg ];

     

       423
       423
        
       

     

       424
       424
        
         meta = {

     

       425
       425
        
           homepage = "https://github.com/astoff/digestif/";

     
···

       504
       504
        
       }) {};

     

       505
       505
        
       

     

       506
       506
        
       fluent = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast

     

       507
       507
       -
       , fetchgit, penlight, cldr, luaepnf, lua

     

       507
       507
       +
       , fetchgit, luaepnf, penlight, cldr, lua

     

       508
       508
        
       }:

     

       509
       509
        
       buildLuarocksPackage {

     

       510
       510
        
         pname = "fluent";

     
···

       527
       527
        
        '') ["date" "path"]) ;

     

       528
       528
        
       

     

       529
       529
        
         disabled = with lua; (luaOlder "5.1");

     

       530
       530
       -
         propagatedBuildInputs = [ penlight cldr luaepnf lua ];

     

       530
       530
       +
         propagatedBuildInputs = [ luaepnf penlight cldr lua ];

     

       531
       531
        
       

     

       532
       532
        
         meta = {

     

       533
       533
        
           homepage = "https://github.com/alerque/fluent-lua";

     
···

       546
       546
        
       

     

       547
       547
        
         src = fetchgit ( removeAttrs (builtins.fromJSON ''{

     

       548
       548
        
         "url": "https://github.com/lewis6991/gitsigns.nvim",

     

       549
       549
       -
         "rev": "d7e0bcbe45bd9d5d106a7b2e11dc15917d272c7a",

     

       550
       550
       -
         "date": "2022-09-01T14:06:41+01:00",

     

       551
       551
       -
         "path": "/nix/store/3i20afjhjknqk3wggbrk3kwcbnnjqqxd-gitsigns.nvim",

     

       552
       552
       -
         "sha256": "1h4gxyamynwygxpqfib2a7sd1xbi6sh8ixg85j6qiaqqpahr0a4k",

     

       549
       549
       +
         "rev": "f98c85e7c3d65a51f45863a34feb4849c82f240f",

     

       550
       550
       +
         "date": "2022-09-19T00:23:17+01:00",

     

       551
       551
       +
         "path": "/nix/store/7gx7accssqrpn18g9325a8d4wx48467b-gitsigns.nvim",

     

       552
       552
       +
         "sha256": "0ljzja43jdkv77nh4253x3gwk2hjx968yk7b5ag4y1mvyp1540qn",

     

       553
       553
        
         "fetchLFS": false,

     

       554
       554
        
         "fetchSubmodules": true,

     

       555
       555
        
         "deepClone": false,

     
···

       568
       568
        
       }) {};

     

       569
       569
        
       

     

       570
       570
        
       http = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast

     

       571
       571
       -
       , fetchzip, basexx, lpeg_patterns, compat53, bit32, fifo, lua, binaryheap, cqueues, lpeg, luaossl

     

       571
       571
       +
       , fetchzip, compat53, lpeg, cqueues, luaossl, bit32, lua, binaryheap, basexx, lpeg_patterns, fifo

     

       572
       572
        
       }:

     

       573
       573
        
       buildLuarocksPackage {

     

       574
       574
        
         pname = "http";

     
···

       583
       583
        
         };

     

       584
       584
        
       

     

       585
       585
        
         disabled = with lua; (luaOlder "5.1");

     

       586
       586
       -
         propagatedBuildInputs = [ basexx lpeg_patterns compat53 bit32 fifo lua binaryheap cqueues lpeg luaossl ];

     

       586
       586
       +
         propagatedBuildInputs = [ compat53 lpeg cqueues luaossl bit32 lua binaryheap basexx lpeg_patterns fifo ];

     

       587
       587
        
       

     

       588
       588
        
         meta = {

     

       589
       589
        
           homepage = "https://github.com/daurnimator/lua-http";

     
···

       618
       618
        
         };

     

       619
       619
        
       }) {};

     

       620
       620
        
       

     

       621
       621
       +
       jsregexp = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast

     

       622
       622
       +
       , fetchgit, lua

     

       623
       623
       +
       }:

     

       624
       624
       +
       buildLuarocksPackage {

     

       625
       625
       +
         pname = "jsregexp";

     

       626
       626
       +
         version = "0.0.5-1";

     

       627
       627
       +
         knownRockspec = (fetchurl {

     

       628
       628
       +
           url    = "mirror://luarocks/jsregexp-0.0.5-1.rockspec";

     

       629
       629
       +
           sha256 = "03zln61vxrgml71chrqdz8id076610rb0n9f2yah2nvjfpqpla68";

     

       630
       630
       +
         }).outPath;

     

       631
       631
       +
         src = fetchgit ( removeAttrs (builtins.fromJSON ''{

     

       632
       632
       +
         "url": "https://github.com/kmarius/jsregexp.git",

     

       633
       633
       +
         "rev": "dd65498ae2c29b882d6c02c0a30577b08d660b94",

     

       634
       634
       +
         "date": "2022-08-16T21:04:46+02:00",

     

       635
       635
       +
         "path": "/nix/store/6kalvlazs50gna9k4ah0wg2avlah6nmr-jsregexp",

     

       636
       636
       +
         "sha256": "01hxql0z3yyzd17r3kyjx2kx0ng7zjc8dp2h2gqmpmjb9ssd4sf1",

     

       637
       637
       +
         "fetchLFS": false,

     

       638
       638
       +
         "fetchSubmodules": true,

     

       639
       639
       +
         "deepClone": false,

     

       640
       640
       +
         "leaveDotGit": false

     

       641
       641
       +
       }

     

       642
       642
       +
        '') ["date" "path"]) ;

     

       643
       643
       +
       

     

       644
       644
       +
         disabled = with lua; (luaOlder "5.1");

     

       645
       645
       +
         propagatedBuildInputs = [ lua ];

     

       646
       646
       +
       

     

       647
       647
       +
         meta = {

     

       648
       648
       +
           homepage = "https://github.com/kmarius/jsregexp";

     

       649
       649
       +
           description = "javascript (ECMA19) regular expressions for lua";

     

       650
       650
       +
           license.fullName = "MIT";

     

       651
       651
       +
         };

     

       652
       652
       +
       }) {};

     

       653
       653
       +
       

     

       621
       654
        
       ldbus = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast

     

       622
       655
        
       , fetchgit, lua

     

       623
       656
        
       }:

     
···

       873
       906
        
       }) {};

     

       874
       907
        
       

     

       875
       908
        
       lpeg_patterns = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast

     

       876
       876
       -
       , fetchzip, lua, lpeg

     

       909
       909
       +
       , fetchzip, lpeg, lua

     

       877
       910
        
       }:

     

       878
       911
        
       buildLuarocksPackage {

     

       879
       912
        
         pname = "lpeg_patterns";

     
···

       887
       920
        
           sha256 = "1s3c179a64r45ffkawv9dnxw4mzwkzj00nr9z2gs5haajgpjivw6";

     

       888
       921
        
         };

     

       889
       922
        
       

     

       890
       890
       -
         propagatedBuildInputs = [ lua lpeg ];

     

       923
       923
       +
         propagatedBuildInputs = [ lpeg lua ];

     

       891
       924
        
       

     

       892
       925
        
         meta = {

     

       893
       926
        
           homepage = "https://github.com/daurnimator/lpeg_patterns/archive/v0.5.zip";

     
···

       1138
       1171
        
       }) {};

     

       1139
       1172
        
       

     

       1140
       1173
        
       lua-lsp = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast

     

       1141
       1141
       -
       , fetchgit, lua, inspect, lpeglabel, dkjson

     

       1174
       1174
       +
       , fetchgit, dkjson, inspect, lpeglabel, lua

     

       1142
       1175
        
       }:

     

       1143
       1176
        
       buildLuarocksPackage {

     

       1144
       1177
        
         pname = "lua-lsp";

     
···

       1161
       1194
        
        '') ["date" "path"]) ;

     

       1162
       1195
        
       

     

       1163
       1196
        
         disabled = with lua; (luaOlder "5.1") || (luaAtLeast "5.4");

     

       1164
       1164
       -
         propagatedBuildInputs = [ lua inspect lpeglabel dkjson ];

     

       1197
       1197
       +
         propagatedBuildInputs = [ dkjson inspect lpeglabel lua ];

     

       1165
       1198
        
       

     

       1166
       1199
        
         meta = {

     

       1167
       1200
        
           homepage = "https://github.com/Alloyed/lua-lsp";

     
···

       1296
       1329
        
       }) {};

     

       1297
       1330
        
       

     

       1298
       1331
        
       lua-resty-openidc = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast

     

       1299
       1299
       -
       , fetchgit, lua-resty-http, lua-resty-jwt, lua-resty-session, lua

     

       1332
       1332
       +
       , fetchgit, lua-resty-http, lua, lua-resty-session, lua-resty-jwt

     

       1300
       1333
        
       }:

     

       1301
       1334
        
       buildLuarocksPackage {

     

       1302
       1335
        
         pname = "lua-resty-openidc";

     
···

       1319
       1352
        
        '') ["date" "path"]) ;

     

       1320
       1353
        
       

     

       1321
       1354
        
         disabled = with lua; (luaOlder "5.1");

     

       1322
       1322
       -
         propagatedBuildInputs = [ lua-resty-http lua-resty-jwt lua-resty-session lua ];

     

       1355
       1355
       +
         propagatedBuildInputs = [ lua-resty-http lua lua-resty-session lua-resty-jwt ];

     

       1323
       1356
        
       

     

       1324
       1357
        
         meta = {

     

       1325
       1358
        
           homepage = "https://github.com/zmartzone/lua-resty-openidc";

     
···

       1598
       1631
        
       }) {};

     

       1599
       1632
        
       

     

       1600
       1633
        
       luacheck = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast

     

       1601
       1601
       -
       , fetchgit, lua, luafilesystem, argparse

     

       1634
       1634
       +
       , fetchgit, lua, argparse, luafilesystem

     

       1602
       1635
        
       }:

     

       1603
       1636
        
       buildLuarocksPackage {

     

       1604
       1637
        
         pname = "luacheck";

     
···

       1621
       1654
        
        '') ["date" "path"]) ;

     

       1622
       1655
        
       

     

       1623
       1656
        
         disabled = with lua; (luaOlder "5.1");

     

       1624
       1624
       -
         propagatedBuildInputs = [ lua luafilesystem argparse ];

     

       1657
       1657
       +
         propagatedBuildInputs = [ lua argparse luafilesystem ];

     

       1625
       1658
        
       

     

       1626
       1659
        
         meta = {

     

       1627
       1660
        
           homepage = "https://github.com/lunarmodules/luacheck";

     
···

       1697
       1730
        
       }) {};

     

       1698
       1731
        
       

     

       1699
       1732
        
       luadbi-mysql = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast

     

       1700
       1700
       -
       , fetchgit, lua, luadbi

     

       1733
       1733
       +
       , fetchgit, luadbi, lua

     

       1701
       1734
        
       }:

     

       1702
       1735
        
       buildLuarocksPackage {

     

       1703
       1736
        
         pname = "luadbi-mysql";

     
···

       1720
       1753
        
        '') ["date" "path"]) ;

     

       1721
       1754
        
       

     

       1722
       1755
        
         disabled = with lua; (luaOlder "5.1") || (luaAtLeast "5.4");

     

       1723
       1723
       -
         propagatedBuildInputs = [ lua luadbi ];

     

       1756
       1756
       +
         propagatedBuildInputs = [ luadbi lua ];

     

       1724
       1757
        
       

     

       1725
       1758
        
         meta = {

     

       1726
       1759
        
           homepage = "https://github.com/mwild1/luadbi";

     
···

       1730
       1763
        
       }) {};

     

       1731
       1764
        
       

     

       1732
       1765
        
       luadbi-postgresql = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast

     

       1733
       1733
       -
       , fetchgit, luadbi, lua

     

       1766
       1766
       +
       , fetchgit, lua, luadbi

     

       1734
       1767
        
       }:

     

       1735
       1768
        
       buildLuarocksPackage {

     

       1736
       1769
        
         pname = "luadbi-postgresql";

     
···

       1753
       1786
        
        '') ["date" "path"]) ;

     

       1754
       1787
        
       

     

       1755
       1788
        
         disabled = with lua; (luaOlder "5.1") || (luaAtLeast "5.4");

     

       1756
       1756
       -
         propagatedBuildInputs = [ luadbi lua ];

     

       1789
       1789
       +
         propagatedBuildInputs = [ lua luadbi ];

     

       1757
       1790
        
       

     

       1758
       1791
        
         meta = {

     

       1759
       1792
        
           homepage = "https://github.com/mwild1/luadbi";

     
···

       1796
       1829
        
       }) {};

     

       1797
       1830
        
       

     

       1798
       1831
        
       luaepnf = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast

     

       1799
       1799
       -
       , fetchgit, lua, lpeg

     

       1832
       1832
       +
       , fetchgit, lpeg, lua

     

       1800
       1833
        
       }:

     

       1801
       1834
        
       buildLuarocksPackage {

     

       1802
       1835
        
         pname = "luaepnf";

     
···

       1819
       1852
        
        '') ["date" "path"]) ;

     

       1820
       1853
        
       

     

       1821
       1854
        
         disabled = with lua; (luaOlder "5.1") || (luaAtLeast "5.5");

     

       1822
       1822
       -
         propagatedBuildInputs = [ lua lpeg ];

     

       1855
       1855
       +
         propagatedBuildInputs = [ lpeg lua ];

     

       1823
       1856
        
       

     

       1824
       1857
        
         meta = {

     

       1825
       1858
        
           homepage = "http://siffiejoe.github.io/lua-luaepnf/";

     
···

       1959
       1992
        
       }:

     

       1960
       1993
        
       buildLuarocksPackage {

     

       1961
       1994
        
         pname = "lualogging";

     

       1962
       1962
       -
         version = "1.6.0-2";

     

       1995
       1995
       +
         version = "1.7.0-1";

     

       1963
       1996
        
         knownRockspec = (fetchurl {

     

       1964
       1964
       -
           url    = "mirror://luarocks/lualogging-1.6.0-2.rockspec";

     

       1965
       1965
       -
           sha256 = "1235sfss0gmcw744rnhzfffhd1z732g2b2vsbpbz9kcvvhznmamb";

     

       1997
       1997
       +
           url    = "mirror://luarocks/lualogging-1.7.0-1.rockspec";

     

       1998
       1998
       +
           sha256 = "1h6zrhp3jvx4257gkskg8b6kd7pm6pd9wzhqb20vllyhj5vfb53h";

     

       1966
       1999
        
         }).outPath;

     

       1967
       2000
        
         src = fetchgit ( removeAttrs (builtins.fromJSON ''{

     

       1968
       2001
        
         "url": "https://github.com/lunarmodules/lualogging.git",

     

       1969
       1969
       -
         "rev": "0bc4415de03ff1a99c92c02a5bed14a45b078079",

     

       1970
       1970
       -
         "date": "2021-11-09T20:20:42+01:00",

     

       1971
       1971
       -
         "path": "/nix/store/p3cyhqjw12bj7s6y4hndzqdkdfwq3958-lualogging",

     

       1972
       1972
       -
         "sha256": "18664k4kfi4zq9n0217j57h42li6ws8s3f6d4yj0rcqsl19fxa7c",

     

       2002
       2002
       +
         "rev": "540df4424165b622d7c408b1f9d2d3420a5206e8",

     

       2003
       2003
       +
         "date": "2022-09-21T22:50:18+02:00",

     

       2004
       2004
       +
         "path": "/nix/store/69jb23b1gv0pcb20jwan342zzp0zjw1f-lualogging",

     

       2005
       2005
       +
         "sha256": "1rwbf593qx67cbk45vm155d7ws1y0xgxmwca508l8clq7d6rv3x0",

     

       1973
       2006
        
         "fetchLFS": false,

     

       1974
       2007
        
         "fetchSubmodules": true,

     

       1975
       2008
        
         "deepClone": false,

     
···

       2339
       2372
        
       

     

       2340
       2373
        
         src = fetchgit ( removeAttrs (builtins.fromJSON ''{

     

       2341
       2374
        
         "url": "https://github.com/rktjmp/lush.nvim",

     

       2342
       2342
       -
         "rev": "6b9f399245de7bea8dac2c3bf91096ffdedfcbb7",

     

       2343
       2343
       -
         "date": "2022-08-10T01:43:55+10:00",

     

       2344
       2344
       -
         "path": "/nix/store/ljfhbz8s6pjnngbixk3m6ivpb7nx1gv0-lush.nvim",

     

       2345
       2345
       -
         "sha256": "0rb77rwmbm438bmbjfk5hwrrcn5sihsa1413bdpc27rw3rrn8v8z",

     

       2375
       2375
       +
         "rev": "fabf012e243bc58c4785ab4c44f05e94b34c431a",

     

       2376
       2376
       +
         "date": "2022-09-14T20:24:03+10:00",

     

       2377
       2377
       +
         "path": "/nix/store/z7nnsj480w2v8i3w0idy0z49yysvsa90-lush.nvim",

     

       2378
       2378
       +
         "sha256": "0bxxdlbay4r48xng1djljbgb93ls3xa83nb79gzvagfaiwgf6pn8",

     

       2346
       2379
        
         "fetchLFS": false,

     

       2347
       2380
        
         "fetchSubmodules": true,

     

       2348
       2381
        
         "deepClone": false,

     
···

       2498
       2531
        
       }) {};

     

       2499
       2532
        
       

     

       2500
       2533
        
       moonscript = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast

     

       2501
       2501
       -
       , fetchgit, lua, luafilesystem, lpeg, argparse

     

       2534
       2534
       +
       , fetchgit, argparse, lua, lpeg, luafilesystem

     

       2502
       2535
        
       }:

     

       2503
       2536
        
       buildLuarocksPackage {

     

       2504
       2537
        
         pname = "moonscript";

     
···

       2518
       2551
        
        '') ["date" "path"]) ;

     

       2519
       2552
        
       

     

       2520
       2553
        
         disabled = with lua; (luaOlder "5.1");

     

       2521
       2521
       -
         propagatedBuildInputs = [ lua luafilesystem lpeg argparse ];

     

       2554
       2554
       +
         propagatedBuildInputs = [ argparse lua lpeg luafilesystem ];

     

       2522
       2555
        
       

     

       2523
       2556
        
         meta = {

     

       2524
       2557
        
           homepage = "http://moonscript.org";

     
···

       2551
       2584
        
       }) {};

     

       2552
       2585
        
       

     

       2553
       2586
        
       nvim-client = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast

     

       2554
       2554
       -
       , fetchurl, coxpcall, luv, mpack, lua

     

       2587
       2587
       +
       , fetchurl, luv, coxpcall, mpack, lua

     

       2555
       2588
        
       }:

     

       2556
       2589
        
       buildLuarocksPackage {

     

       2557
       2590
        
         pname = "nvim-client";

     
···

       2563
       2596
        
         };

     

       2564
       2597
        
       

     

       2565
       2598
        
         disabled = with lua; (luaOlder "5.1");

     

       2566
       2566
       -
         propagatedBuildInputs = [ coxpcall luv mpack lua ];

     

       2599
       2599
       +
         propagatedBuildInputs = [ luv coxpcall mpack lua ];

     

       2567
       2600
        
       

     

       2568
       2601
        
         meta = {

     

       2569
       2602
        
           homepage = "https://github.com/neovim/lua-client";

     
···

       2598
       2631
        
       }) {};

     

       2599
       2632
        
       

     

       2600
       2633
        
       penlight = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast

     

       2601
       2601
       -
       , fetchgit, luafilesystem, lua

     

       2634
       2634
       +
       , fetchgit, lua, luafilesystem

     

       2602
       2635
        
       , busted}:

     

       2603
       2636
        
       buildLuarocksPackage {

     

       2604
       2637
        
         pname = "penlight";

     
···

       2618
       2651
        
        '') ["date" "path"]) ;

     

       2619
       2652
        
       

     

       2620
       2653
        
         disabled = with lua; (luaOlder "5.1");

     

       2621
       2621
       -
         propagatedBuildInputs = [ luafilesystem lua ];

     

       2654
       2654
       +
         propagatedBuildInputs = [ lua luafilesystem ];

     

       2622
       2655
        
         checkInputs = [ busted ];

     

       2623
       2656
        
       

     

       2624
       2657
        
         meta = {

     
···

       2630
       2663
        
       }) {};

     

       2631
       2664
        
       

     

       2632
       2665
        
       plenary-nvim = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast

     

       2633
       2633
       -
       , fetchgit, lua, luassert

     

       2666
       2666
       +
       , fetchgit, luassert, lua

     

       2634
       2667
        
       }:

     

       2635
       2668
        
       buildLuarocksPackage {

     

       2636
       2669
        
         pname = "plenary.nvim";

     
···

       2638
       2671
        
       

     

       2639
       2672
        
         src = fetchgit ( removeAttrs (builtins.fromJSON ''{

     

       2640
       2673
        
         "url": "https://github.com/nvim-lua/plenary.nvim",

     

       2641
       2641
       -
         "rev": "4b66054e75356ac0b909bbfee9c682e703f535c2",

     

       2642
       2642
       -
         "date": "2022-09-03T11:21:04+02:00",

     

       2643
       2643
       -
         "path": "/nix/store/gaphh0qlf40ryk2000plscvzcbzg0kz5-plenary.nvim",

     

       2644
       2644
       -
         "sha256": "1yl5m7is35bk30swr5m1pcl2i0wf8gjcnas6bpahlxqa4x0yr1x8",

     

       2674
       2674
       +
         "rev": "4b7e52044bbb84242158d977a50c4cbcd85070c7",

     

       2675
       2675
       +
         "date": "2022-10-01T09:05:53+02:00",

     

       2676
       2676
       +
         "path": "/nix/store/hkj69cqq4qg3d98irg8wszgl7i1bg6lv-plenary.nvim",

     

       2677
       2677
       +
         "sha256": "11815h0h2mf5ym282ghk7xav90635r88qbgaflpgbyk2banl31wl",

     

       2645
       2678
        
         "fetchLFS": false,

     

       2646
       2679
        
         "fetchSubmodules": true,

     

       2647
       2680
        
         "deepClone": false,

     
···

       2650
       2683
        
        '') ["date" "path"]) ;

     

       2651
       2684
        
       

     

       2652
       2685
        
         disabled = with lua; (luaOlder "5.1") || (luaAtLeast "5.4");

     

       2653
       2653
       -
         propagatedBuildInputs = [ lua luassert ];

     

       2686
       2686
       +
         propagatedBuildInputs = [ luassert lua ];

     

       2654
       2687
        
       

     

       2655
       2688
        
         meta = {

     

       2656
       2689
        
           homepage = "http://github.com/nvim-lua/plenary.nvim";

     
···

       2691
       2724
        
       }) {};

     

       2692
       2725
        
       

     

       2693
       2726
        
       readline = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast

     

       2694
       2694
       -
       , fetchurl, luaposix, lua

     

       2727
       2727
       +
       , fetchurl, lua, luaposix

     

       2695
       2728
        
       }:

     

       2696
       2729
        
       buildLuarocksPackage {

     

       2697
       2730
        
         pname = "readline";

     

       2698
       2698
       -
         version = "3.1-0";

     

       2731
       2731
       +
         version = "3.2-0";

     

       2699
       2732
        
         knownRockspec = (fetchurl {

     

       2700
       2700
       -
           url    = "mirror://luarocks/readline-3.1-0.rockspec";

     

       2701
       2701
       -
           sha256 = "0bl5hsplnlg8fx3v83sz48y2p1rlxfig3iycnk1pn3xi724kscnc";

     

       2733
       2733
       +
           url    = "mirror://luarocks/readline-3.2-0.rockspec";

     

       2734
       2734
       +
           sha256 = "1r0sgisxm4xd1r6i053iibxh30j7j3rcj4wwkd8rzkj8nln20z24";

     

       2702
       2735
        
         }).outPath;

     

       2703
       2736
        
         src = fetchurl {

     

       2704
       2704
       -
           url    = "http://www.pjb.com.au/comp/lua/readline-3.1.tar.gz";

     

       2705
       2705
       -
           sha256 = "0i02jsywj9mb4lwiyp742xgz53i9z5xzpx34lh54hcd6q3xkcrw2";

     

       2737
       2737
       +
           url    = "http://www.pjb.com.au/comp/lua/readline-3.2.tar.gz";

     

       2738
       2738
       +
           sha256 = "1mk9algpsvyqwhnq7jlw4cgmfzj30l7n2r6ak4qxgdxgc39f48k4";

     

       2706
       2739
        
         };

     

       2707
       2740
        
       

     

       2708
       2741
        
         disabled = with lua; (luaOlder "5.1") || (luaAtLeast "5.5");

     

       2709
       2709
       -
         propagatedBuildInputs = [ luaposix lua ];

     

       2742
       2742
       +
         propagatedBuildInputs = [ lua luaposix ];

     

       2710
       2743
        
       

     

       2711
       2744
        
         meta = {

     

       2712
       2745
        
           homepage = "http://pjb.com.au/comp/lua/readline.html";

     
···

       2736
       2769
        
         meta = {

     

       2737
       2770
        
           homepage = "https://github.com/rest-nvim/rest.nvim";

     

       2738
       2771
        
           description = "A fast Neovim http client written in Lua";

     

       2772
       2772
       +
           maintainers = with lib.maintainers; [ teto ];

     

       2739
       2773
        
           license.fullName = "MIT";

     

       2740
       2774
        
         };

     

       2741
       2775
        
       }) {};

     
···

       2869
       2903
        
       }) {};

     

       2870
       2904
        
       

     

       2871
       2905
        
       std-normalize = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast

     

       2872
       2872
       -
       , fetchgit, lua, std-_debug

     

       2906
       2906
       +
       , fetchgit, std-_debug, lua

     

       2873
       2907
        
       }:

     

       2874
       2908
        
       buildLuarocksPackage {

     

       2875
       2909
        
         pname = "std.normalize";

     
···

       2889
       2923
        
        '') ["date" "path"]) ;

     

       2890
       2924
        
       

     

       2891
       2925
        
         disabled = with lua; (luaOlder "5.1") || (luaAtLeast "5.5");

     

       2892
       2892
       -
         propagatedBuildInputs = [ lua std-_debug ];

     

       2926
       2926
       +
         propagatedBuildInputs = [ std-_debug lua ];

     

       2893
       2927
        
       

     

       2894
       2928
        
         meta = {

     

       2895
       2929
        
           homepage = "https://lua-stdlib.github.io/normalize";

     
···

       2925
       2959
        
       }) {};

     

       2926
       2960
        
       

     

       2927
       2961
        
       tl = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast

     

       2928
       2928
       -
       , fetchgit, compat53, luafilesystem, argparse

     

       2962
       2962
       +
       , fetchgit, argparse, luafilesystem, compat53

     

       2929
       2963
        
       , dkjson}:

     

       2930
       2964
        
       buildLuarocksPackage {

     

       2931
       2965
        
         pname = "tl";

     
···

       2947
       2981
        
       }

     

       2948
       2982
        
        '') ["date" "path"]) ;

     

       2949
       2983
        
       

     

       2950
       2950
       -
         propagatedBuildInputs = [ compat53 luafilesystem argparse ];

     

       2984
       2984
       +
         propagatedBuildInputs = [ argparse luafilesystem compat53 ];

     

       2951
       2985
        
         checkInputs = [ dkjson ];

     

       2952
       2986
        
       

     

       2953
       2987
        
         meta = {

+2 -2

pkgs/development/python-modules/detect-secrets/default.nix

···

       15
       15
        
       

     

       16
       16
        
       buildPythonPackage rec {

     

       17
       17
        
         pname = "detect-secrets";

     

       18
       18
       -
         version = "1.3.0";

     

       18
       18
       +
         version = "1.4.0";

     

       19
       19
        
         format = "setuptools";

     

       20
       20
        
       

     

       21
       21
        
         disabled = pythonOlder "3.7";

     
···

       24
       24
        
           owner = "Yelp";

     

       25
       25
        
           repo = pname;

     

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

     

       27
       27
       -
           hash = "sha256-Dl/2HgCacDko/ug9nGA9X+LyOkuDot11H28lxrgkwdE=";

     

       27
       27
       +
           hash = "sha256-6EmL6XPySqcA3EA+FFkfw7Dkxl5LvyBorIw0hesV5eU=";

     

       28
       28
        
           leaveDotGit = true;

     

       29
       29
        
         };

     

       30
       30

+2 -2

pkgs/development/python-modules/slack-sdk/default.nix

···

       21
       21
        
       

     

       22
       22
        
       buildPythonPackage rec {

     

       23
       23
        
         pname = "slack-sdk";

     

       24
       24
       -
         version = "3.18.5";

     

       24
       24
       +
         version = "3.19.1";

     

       25
       25
        
         format = "setuptools";

     

       26
       26
        
       

     

       27
       27
        
         disabled = pythonOlder "3.6";

     
···

       30
       30
        
           owner = "slackapi";

     

       31
       31
        
           repo = "python-slack-sdk";

     

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

     

       33
       33
       -
           sha256 = "sha256-b778qmf0LkSAo8/eho1zoC0kc4byexqCG3R/fRBlr6M=";

     

       33
       33
       +
           sha256 = "sha256-DYDyWlNl/3SjSiA0kyMfz4/t42Oxh7VX43ZDL94eFzo=";

     

       34
       34
        
         };

     

       35
       35
        
       

     

       36
       36
        
         propagatedBuildInputs = [

+4 -4

pkgs/development/python-modules/slither-analyzer/default.nix

···

       13
       13
        
       

     

       14
       14
        
       buildPythonPackage rec {

     

       15
       15
        
         pname = "slither-analyzer";

     

       16
       16
       -
         version = "0.8.3";

     

       16
       16
       +
         version = "0.9.0";

     

       17
       17
        
         format = "setuptools";

     

       18
       18
        
       

     

       19
       19
       -
         disabled = pythonOlder "3.7";

     

       19
       19
       +
         disabled = pythonOlder "3.8";

     

       20
       20
        
       

     

       21
       21
        
         src = fetchFromGitHub {

     

       22
       22
        
           owner = "crytic";

     

       23
       23
        
           repo = "slither";

     

       24
       24
       -
           rev = version;

     

       25
       25
       -
           sha256 = "sha256-Kh5owlkRB9hDlfIRiS+aNFe4YtZj38CLeE3Fe+R7diM=";

     

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

     

       25
       25
       +
           hash = "sha256-Td7WBPpc+ZYlFroZNzvUqQZJag0lbkCgj8TVOPrAAPY=";

     

       26
       26
        
         };

     

       27
       27
        
       

     

       28
       28
        
         nativeBuildInputs = [

+2 -2

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

···

       14
       14
        
       

     

       15
       15
        
       buildPythonPackage rec {

     

       16
       16
        
         pname = "twilio";

     

       17
       17
       -
         version = "7.14.1";

     

       17
       17
       +
         version = "7.14.2";

     

       18
       18
        
         format = "setuptools";

     

       19
       19
        
       

     

       20
       20
        
         disabled = pythonOlder "3.6";

     
···

       23
       23
        
           owner = "twilio";

     

       24
       24
        
           repo = "twilio-python";

     

       25
       25
        
           rev = "refs/tags/${version}";

     

       26
       26
       -
           hash = "sha256-VKAeM1a1TMXrewJ+j+Outyp7vxh9xovqjJ+GneYa6eg=";

     

       26
       26
       +
           hash = "sha256-lamP7ltKLizwPGX1063bZ90M89oPmXVSogi3HNksvHE=";

     

       27
       27
        
         };

     

       28
       28
        
       

     

       29
       29
        
         propagatedBuildInputs = [

+2 -2

pkgs/development/python-modules/types-pytz/default.nix

···

       5
       5
        
       

     

       6
       6
        
       buildPythonPackage rec {

     

       7
       7
        
         pname = "types-pytz";

     

       8
       8
       -
         version = "2022.2.1.0";

     

       8
       8
       +
         version = "2022.4.0.0";

     

       9
       9
        
         format = "setuptools";

     

       10
       10
        
       

     

       11
       11
        
         src = fetchPypi {

     

       12
       12
        
           inherit pname version;

     

       13
       13
       -
           sha256 = "sha256-R8+xnFK591iWRAVB2zkv0xKjWyecYwelMdtxFS6mPis=";

     

       13
       13
       +
           sha256 = "sha256-F9ZuSxboDOrgeHcm86IiiN99P5/evrCR3GS5LA5OoJ0=";

     

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
        
         # Modules doesn't have tests

+2 -2

pkgs/development/python-modules/weconnect-mqtt/default.nix

···

       10
       10
        
       

     

       11
       11
        
       buildPythonPackage rec {

     

       12
       12
        
         pname = "weconnect-mqtt";

     

       13
       13
       -
         version = "0.40.1";

     

       13
       13
       +
         version = "0.40.2";

     

       14
       14
        
         format = "setuptools";

     

       15
       15
        
       

     

       16
       16
        
         disabled = pythonOlder "3.7";

     
···

       19
       19
        
           owner = "tillsteinbach";

     

       20
       20
        
           repo = "WeConnect-mqtt";

     

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

     

       22
       22
       -
           hash = "sha256-WnaVE9WEJmdlxsPUZcEmeCf4DK1GCyd2yQmBiQZ7NkI=";

     

       22
       22
       +
           hash = "sha256-TRBS51ZlE4TbDAQdQyODUNDVfIuKZtrf38iBPIGyRhI=";

     

       23
       23
        
         };

     

       24
       24
        
       

     

       25
       25
        
         propagatedBuildInputs = [

+2 -2

pkgs/development/tools/bashate/default.nix

···

       12
       12
        
       

     

       13
       13
        
       buildPythonApplication rec {

     

       14
       14
        
         pname = "bashate";

     

       15
       15
       -
         version = "2.1.0";

     

       15
       15
       +
         version = "2.1.1";

     

       16
       16
        
         disabled = pythonOlder "3.5";

     

       17
       17
        
       

     

       18
       18
        
         src = fetchPypi {

     

       19
       19
        
           inherit pname version;

     

       20
       20
       -
           sha256 = "a0df143639715dc2fb6cf9aa6907e4a372d6f0a43afeffc55c5fb3ecfe3523c8";

     

       20
       20
       +
           sha256 = "sha256-S6tul3+DBacgU1+Pk/H7QsUh/LxKbCs9PXZx9C8iH0w=";

     

       21
       21
        
         };

     

       22
       22
        
       

     

       23
       23
        
         propagatedBuildInputs = [

+14 -4

pkgs/development/tools/wp4nix/default.nix

···

       1
       1
       -
       { lib, buildGoModule, fetchFromGitLab, nix, subversion }:

     

       1
       1
       +
       { lib

     

       2
       2
       +
       , buildGoModule

     

       3
       3
       +
       , fetchFromGitLab

     

       4
       4
       +
       , nix

     

       5
       5
       +
       , subversion

     

       6
       6
       +
       , makeWrapper

     

       7
       7
       +
       }:

     

       2
       8
        
       

     

       3
       9
        
       buildGoModule rec {

     

       4
       10
        
         pname = "wp4nix";

     
···

       14
       20
        
       

     

       15
       21
        
         vendorSha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo=";

     

       16
       22
        
       

     

       17
       17
       -
         postPatch = ''

     

       18
       18
       -
           substituteInPlace main.go --replace nix-hash ${nix}/bin/nix-hash

     

       19
       19
       -
           substituteInPlace svn.go --replace '"svn"' '"${subversion}/bin/svn"'

     

       23
       23
       +
         nativeBuildInputs = [

     

       24
       24
       +
           makeWrapper

     

       25
       25
       +
         ];

     

       26
       26
       +
       

     

       27
       27
       +
         postInstall = ''

     

       28
       28
       +
           wrapProgram $out/bin/wp4nix \

     

       29
       29
       +
             --prefix PATH : ${lib.makeBinPath [ nix subversion ]}

     

       20
       30
        
         '';

     

       21
       31
        
       

     

       22
       32
        
         meta = with lib; {

+10

pkgs/servers/dict/dictd-db.nix

···

       56
       56
        
           url = "mirror://sourceforge/freedict/eng-fra.tar.gz";

     

       57
       57
        
           sha256 = "0fi6rrnbqnhc6lq8d0nmn30zdqkibrah0mxfg27hsn9z7alwbj3m";

     

       58
       58
        
         }) "eng-fra" "en_UK";

     

       59
       59
       +
         jpn2eng = makeDictdDB (fetchurl {

     

       60
       60
       +
           url = let version = "0.1";

     

       61
       61
       +
                 in "mirror://sourceforge/freedict/jpn-eng/${version}/freedict-jpn-eng-${version}.dictd.tar.xz";

     

       62
       62
       +
           sha256 = "sha256-juJBoEq7EztLZzOomc7uoZhXVaQPKoUvIxxPLB0xByc=";

     

       63
       63
       +
         }) "jpn-eng" "jpn-eng" "ja_JP";

     

       64
       64
       +
         eng2jpn = makeDictdDB (fetchurl {

     

       65
       65
       +
           url = let version = "2022.04.06";

     

       66
       66
       +
                 in "https://download.freedict.org/dictionaries/eng-jpn/${version}/freedict-eng-jpn-${version}.dictd.tar.xz";

     

       67
       67
       +
           sha256 = "sha256-kfRT2kgbV3XKarCr4mqDRT5A1jR8M8APky5M5MFYatE=";

     

       68
       68
       +
         }) "eng-jpn" "eng-jpn" "en_UK";

     

       59
       69
        
         mueller_eng2rus_pkg = makeDictdDB (fetchurl {

     

       60
       70
        
           url = "mirror://sourceforge/mueller-dict/mueller-dict-3.1.tar.gz";

     

       61
       71
        
           sha256 = "04r5xxznvmcb8hkxqbjgfh2gxvbdd87jnhqn5gmgvxxw53zpwfmq";

+3 -3

pkgs/servers/klipper/default.nix

···

       7
       7
        
       

     

       8
       8
        
       stdenv.mkDerivation rec {

     

       9
       9
        
         pname = "klipper";

     

       10
       10
       -
         version = "unstable-2022-09-16";

     

       10
       10
       +
         version = "unstable-2022-10-06";

     

       11
       11
        
       

     

       12
       12
        
         src = fetchFromGitHub {

     

       13
       13
        
           owner = "KevinOConnor";

     

       14
       14
        
           repo = "klipper";

     

       15
       15
       -
           rev = "7527e57e5a778d069aaa05b01e03869c63a1a712";

     

       16
       16
       -
           sha256 = "sha256-k3tvV7uCdmPN4SvZixvPmOqt5jTN9tz0W6SUXN5g3Ss=";

     

       15
       15
       +
           rev = "7290c14531211d027b430f36db5645ce496be900";

     

       16
       16
       +
           sha256 = "sha256-+BSsk2G6g4IJsbG6pggYb9vcaezqNUXEAXXAcMMhAfw=";

     

       17
       17
        
         };

     

       18
       18
        
       

     

       19
       19
        
         sourceRoot = "source/klippy";

+4 -4

pkgs/servers/nextcloud/default.nix

···

       48
       48
        
         '';

     

       49
       49
        
       

     

       50
       50
        
         nextcloud23 = generic {

     

       51
       51
       -
           version = "23.0.9";

     

       52
       52
       -
           sha256 = "sha256-Ysxapp8IpRcRBC3CRM4yxoGYCuedAVURT3FhDD4jNBY=";

     

       51
       51
       +
           version = "23.0.10";

     

       52
       52
       +
           sha256 = "c68cff7f40b1e73e8d173f068e7d9c02d37e3f94a6a36a556a49c3ff5def4267";

     

       53
       53
        
         };

     

       54
       54
        
       

     

       55
       55
        
         nextcloud24 = generic {

     

       56
       56
       -
           version = "24.0.5";

     

       57
       57
       -
           sha256 = "sha256-sieIN3zLk5Hn+eztP2mpI2Zprqqy4OpSUKc+318e8CY=";

     

       56
       56
       +
           version = "24.0.6";

     

       57
       57
       +
           sha256 = "b26dff9980a47e7e722805fdbbf87e07f59a3817b03ecc32698e028e9baf0301";

     

       58
       58
        
         };

     

       59
       59
        
       

     

       60
       60
        
         # tip: get the sha with:

+3 -3

pkgs/servers/syncstorage-rs/default.nix

···

       21
       21
        
       

     

       22
       22
        
       rustPlatform.buildRustPackage rec {

     

       23
       23
        
         pname = "syncstorage-rs";

     

       24
       24
       -
         version = "0.12.0";

     

       24
       24
       +
         version = "0.12.3";

     

       25
       25
        
       

     

       26
       26
        
         src = fetchFromGitHub {

     

       27
       27
        
           owner = "mozilla-services";

     

       28
       28
        
           repo = pname;

     

       29
       29
        
           rev = version;

     

       30
       30
       -
           hash = "sha256-VfIpjpBS7LXe32fxIFp7xmbm40VwxUdHIEm5PnMpd4s=";

     

       30
       30
       +
           hash = "sha256-al3SgpJPg8dfdghV1dl00wShrKSJFegRVTilaOi0RHQ=";

     

       31
       31
        
         };

     

       32
       32
        
       

     

       33
       33
        
         nativeBuildInputs = [

     
···

       47
       47
        
             --prefix PATH : ${lib.makeBinPath [ pyFxADeps ]}

     

       48
       48
        
         '';

     

       49
       49
        
       

     

       50
       50
       -
         cargoSha256 = "sha256-JXxArKA/2SIYJvjNA1yZHR9xDKt3N2U7HVMP/6M3BxE=";

     

       50
       50
       +
         cargoSha256 = "sha256-+9Yi+oKctFiTR8cXN6ajtwKEC0kkOP3+kPfUPSYsx5A=";

     

       51
       51
        
       

     

       52
       52
        
         buildFeatures = [ "grpcio/openssl" ];

     

       53
       53

+27 -46

pkgs/servers/teleport/default.nix

···

       5
       5
        
       , makeWrapper

     

       6
       6
        
       , symlinkJoin

     

       7
       7
        
       , CoreFoundation

     

       8
       8
       +
       , libfido2

     

       8
       9
        
       , openssl

     

       9
       10
        
       , pkg-config

     

       10
       11
        
       , protobuf

     
···

       14
       15
        
       , nixosTests

     

       15
       16
        
       

     

       16
       17
        
       , withRdpClient ? true

     

       17
       17
       -
       , withRoleTester ? true

     

       18
       18
        
       }:

     

       19
       19
        
       let

     

       20
       20
        
         # This repo has a private submodule "e" which fetchgit cannot handle without failing.

     
···

       22
       22
        
           owner = "gravitational";

     

       23
       23
        
           repo = "teleport";

     

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

     

       25
       25
       -
           sha256 = "sha256-KQfdeMuZ9LJHhEJLMl58Yb0+gxgDT7VcVnK1JxjVZaI=";

     

       25
       25
       +
           hash = "sha256-F5v3/eKPLhSxW7FImTbE+QMtfn8w5WVTrxMWhgNr3YA=";

     

       26
       26
        
         };

     

       27
       27
       -
         version = "9.1.2";

     

       27
       27
       +
         version = "10.3.1";

     

       28
       28
        
       

     

       29
       29
        
         rdpClient = rustPlatform.buildRustPackage rec {

     

       30
       30
       -
           name = "teleport-rdpclient";

     

       31
       31
       -
           cargoSha256 = "sha256-Jz7bB/f4HRxBhSevmfELSrIm+IXUVlADIgp2qWQd5PY=";

     

       30
       30
       +
           pname = "teleport-rdpclient";

     

       31
       31
       +
           cargoHash = "sha256-Xmabjoq1NXxXemeR06Gg8R/HwdSE+rsxxX645pQ3SuI=";

     

       32
       32
        
           inherit version src;

     

       33
       33
        
       

     

       34
       34
        
           buildAndTestSubdir = "lib/srv/desktop/rdp/rdpclient";

     
···

       44
       44
        
           OPENSSL_NO_VENDOR = "1";

     

       45
       45
        
       

     

       46
       46
        
           postInstall = ''

     

       47
       47
       -
             cp -r target $out

     

       48
       48
       -
           '';

     

       49
       49
       -
         };

     

       50
       50
       -
       

     

       51
       51
       -
         roleTester = rustPlatform.buildRustPackage {

     

       52
       52
       -
           name = "teleport-roletester";

     

       53
       53
       -
           inherit version src;

     

       54
       54
       -
       

     

       55
       55
       -
           cargoSha256 = "sha256-gCm4ETbXy6tGJQVSzUkoAWUmKD3poYgkw133LtziASI=";

     

       56
       56
       -
           buildAndTestSubdir = "lib/datalog/roletester";

     

       57
       57
       -
       

     

       58
       58
       -
           PROTOC = "${protobuf}/bin/protoc";

     

       59
       59
       -
           PROTOC_INCLUDE = "${protobuf}/include";

     

       60
       60
       -
       

     

       61
       61
       -
           postInstall = ''

     

       62
       62
       -
             cp -r target $out

     

       47
       47
       +
             mkdir -p $out/include

     

       48
       48
       +
             cp ${buildAndTestSubdir}/librdprs.h $out/include/

     

       63
       49
        
           '';

     

       64
       50
        
         };

     

       65
       51
        
       

     

       66
       52
        
         webassets = fetchFromGitHub {

     

       67
       53
        
           owner = "gravitational";

     

       68
       54
        
           repo = "webassets";

     

       69
       69
       -
           rev = "67e608db77300d8a6cb17709be67f12c1d3271c3";

     

       70
       70
       -
           sha256 = "sha256-o4qjXGaNi5XDSUQrUuU+G77EdRnvJ1WUPWrryZU1CUE=";

     

       55
       55
       +
           # Submodule rev from https://github.com/gravitational/teleport/tree/v10.3.1

     

       56
       56
       +
           rev = "6710dcd0dc19ad101bac3259c463ef940f2ab1f3";

     

       57
       57
       +
           hash = "sha256-A13FSpgJODmhugAwy4kqiDw4Rihr//DhQX/bjwaeo2A=";

     

       71
       58
        
         };

     

       72
       59
        
       in

     

       73
       60
        
       buildGoModule rec {

     

       74
       61
        
         pname = "teleport";

     

       75
       62
        
       

     

       76
       63
        
         inherit src version;

     

       77
       77
       -
         vendorSha256 = "sha256-UMgWM7KHag99JR4i4mwVHa6yd9aHQ6Dy+pmUijNL4Ew=";

     

       64
       64
       +
         vendorHash = "sha256-2Zrd3CbZvxns9lNVtwaaor1mi97IhPc+MRJhj3rU760=";

     

       78
       65
        
       

     

       79
       66
        
         subPackages = [ "tool/tbot" "tool/tctl" "tool/teleport" "tool/tsh" ];

     

       80
       80
       -
         tags = [ "webassets_embed" ]

     

       81
       81
       -
           ++ lib.optional withRdpClient "desktop_access_rdp"

     

       82
       82
       -
           ++ lib.optional withRoleTester "roletester";

     

       67
       67
       +
         tags = [ "libfido2" "webassets_embed" ]

     

       68
       68
       +
           ++ lib.optional withRdpClient "desktop_access_rdp";

     

       83
       69
        
       

     

       84
       84
       -
         buildInputs = [ openssl ]

     

       70
       70
       +
         buildInputs = [ openssl libfido2 ]

     

       85
       71
        
           ++ lib.optionals (stdenv.isDarwin && withRdpClient) [ CoreFoundation Security ];

     

       86
       86
       -
         nativeBuildInputs = [ makeWrapper ];

     

       72
       72
       +
         nativeBuildInputs = [ makeWrapper pkg-config ];

     

       87
       73
        
       

     

       88
       74
        
         patches = [

     

       89
       75
        
           # https://github.com/NixOS/nixpkgs/issues/120738

     
···

       97
       83
        
         # Reduce closure size for client machines

     

       98
       84
        
         outputs = [ "out" "client" ];

     

       99
       85
        
       

     

       100
       100
       -
         preBuild =

     

       101
       101
       -
           let rustDeps = symlinkJoin {

     

       102
       102
       -
             name = "teleport-rust-deps";

     

       103
       103
       -
             paths = lib.optional withRdpClient rdpClient

     

       104
       104
       -
               ++ lib.optional withRoleTester roleTester;

     

       105
       105
       -
           };

     

       106
       106
       -
           in

     

       107
       107
       -
           ''

     

       108
       108
       -
             mkdir -p build

     

       109
       109
       -
             echo "making webassets"

     

       110
       110
       -
             cp -r ${webassets}/* webassets/

     

       111
       111
       -
             make lib/web/build/webassets

     

       112
       112
       -
       

     

       113
       113
       -
             cp -r ${rustDeps}/. .

     

       114
       114
       -
           '';

     

       86
       86
       +
         preBuild = ''

     

       87
       87
       +
           mkdir -p build

     

       88
       88
       +
           echo "making webassets"

     

       89
       89
       +
           cp -r ${webassets}/* webassets/

     

       90
       90
       +
           make -j$NIX_BUILD_CORES lib/web/build/webassets

     

       91
       91
       +
         '' + lib.optionalString withRdpClient ''

     

       92
       92
       +
           ln -s ${rdpClient}/lib/* lib/

     

       93
       93
       +
           ln -s ${rdpClient}/include/* lib/srv/desktop/rdp/rdpclient/

     

       94
       94
       +
         '';

     

       115
       95
        
       

     

       116
       96
        
         # Multiple tests fail in the build sandbox

     

       117
       97
        
         # due to trying to spawn nixbld's shell (/noshell), etc.

     

       118
       98
        
         doCheck = false;

     

       119
       99
        
       

     

       120
       100
        
         postInstall = ''

     

       121
       121
       -
           install -Dm755 -t $client/bin $out/bin/tsh

     

       101
       101
       +
           mkdir -p $client/bin

     

       102
       102
       +
           mv {$out,$client}/bin/tsh

     

       122
       103
        
           # make xdg-open overrideable at runtime

     

       123
       104
        
           wrapProgram $client/bin/tsh --suffix PATH : ${lib.makeBinPath [ xdg-utils ]}

     

       124
       124
       -
           wrapProgram $out/bin/tsh --suffix PATH : ${lib.makeBinPath [ xdg-utils ]}

     

       105
       105
       +
           ln -s {$client,$out}/bin/tsh

     

       125
       106
        
         '';

     

       126
       107
        
       

     

       127
       108
        
         doInstallCheck = true;

+14 -9

pkgs/servers/teleport/rdpclient.patch

···

       1
       1
        
       diff --git a/lib/srv/desktop/rdp/rdpclient/client.go b/lib/srv/desktop/rdp/rdpclient/client.go

     

       2
       2
       -
       index d191c768f..71117a30d 100644

     

       2
       2
       +
       index 4357d7aa1..7e21a0076 100644

     

       3
       3
        
       --- a/lib/srv/desktop/rdp/rdpclient/client.go

     

       4
       4
        
       +++ b/lib/srv/desktop/rdp/rdpclient/client.go

     

       5
       5
       -
       @@ -56,10 +56,10 @@ package rdpclient

     

       6
       6
       -
        #cgo linux,amd64 LDFLAGS: -L${SRCDIR}/../../../../../target/x86_64-unknown-linux-gnu/release

     

       7
       7
       -
        #cgo linux,arm LDFLAGS: -L${SRCDIR}/../../../../../target/arm-unknown-linux-gnueabihf/release

     

       8
       8
       -
        #cgo linux,arm64 LDFLAGS: -L${SRCDIR}/../../../../../target/aarch64-unknown-linux-gnu/release

     

       5
       5
       +
       @@ -52,14 +52,9 @@ package rdpclient

     

       6
       6
       +
        

     

       7
       7
       +
        /*

     

       8
       8
       +
        // Flags to include the static Rust library.

     

       9
       9
       +
       -#cgo linux,386 LDFLAGS: -L${SRCDIR}/../../../../../target/i686-unknown-linux-gnu/release

     

       10
       10
       +
       -#cgo linux,amd64 LDFLAGS: -L${SRCDIR}/../../../../../target/x86_64-unknown-linux-gnu/release

     

       11
       11
       +
       -#cgo linux,arm LDFLAGS: -L${SRCDIR}/../../../../../target/arm-unknown-linux-gnueabihf/release

     

       12
       12
       +
       -#cgo linux,arm64 LDFLAGS: -L${SRCDIR}/../../../../../target/aarch64-unknown-linux-gnu/release

     

       9
       13
        
       -#cgo linux LDFLAGS: -l:librdp_client.a -lpthread -ldl -lm

     

       10
       10
       -
       +#cgo linux LDFLAGS: -l:librdp_client.a -lpthread -ldl -lm -lssl -lcrypto

     

       11
       11
       -
        #cgo darwin,amd64 LDFLAGS: -L${SRCDIR}/../../../../../target/x86_64-apple-darwin/release

     

       12
       12
       -
        #cgo darwin,arm64 LDFLAGS: -L${SRCDIR}/../../../../../target/aarch64-apple-darwin/release

     

       14
       14
       +
       -#cgo darwin,amd64 LDFLAGS: -L${SRCDIR}/../../../../../target/x86_64-apple-darwin/release

     

       15
       15
       +
       -#cgo darwin,arm64 LDFLAGS: -L${SRCDIR}/../../../../../target/aarch64-apple-darwin/release

     

       13
       16
        
       -#cgo darwin LDFLAGS: -framework CoreFoundation -framework Security -lrdp_client -lpthread -ldl -lm

     

       14
       14
       -
       +#cgo darwin LDFLAGS: -framework CoreFoundation -framework Security -lrdp_client -lpthread -ldl -lm -lssl -lcrypto

     

       17
       17
       +
       +#cgo LDFLAGS: -L${SRCDIR}/../../../../../lib -lpthread -ldl -lm -lssl -lcrypto

     

       18
       18
       +
       +#cgo linux LDFLAGS: -l:librdp_client.a

     

       19
       19
       +
       +#cgo darwin LDFLAGS: -framework CoreFoundation -framework Security -lrdp_client

     

       15
       20
        
        #include <librdprs.h>

     

       16
       21
        
        */

     

       17
       22
        
        import "C"

+46

pkgs/servers/web-apps/wordpress/packages/README.md

···

       1
       1
       +
       = Adding plugin, theme or language =

     

       2
       2
       +
       

     

       3
       3
       +
       To extend the wordpressPackages set, add a new line to the corresponding json

     

       4
       4
       +
       file with the codename of the package:

     

       5
       5
       +
       

     

       6
       6
       +
       - `wordpress-languages.json` for language packs

     

       7
       7
       +
       - `wordpress-themes.json` for themes

     

       8
       8
       +
       - `wordpress-plugins.json` for plugins

     

       9
       9
       +
       

     

       10
       10
       +
       The codename is the last part in the url of the plugin or theme page, for

     

       11
       11
       +
       example `cookie-notice` in in the url

     

       12
       12
       +
       `https://wordpress.org/plugins/cookie-notice/` or `twentytwenty` in

     

       13
       13
       +
       `https://wordpress.org/themes/twentytwenty/`.

     

       14
       14
       +
       

     

       15
       15
       +
       In case of language packages, the name consists of country and language codes.

     

       16
       16
       +
       For example `de_DE` for country code `de` (Germany) and language `DE` (German).

     

       17
       17
       +
       For available translations and language codes see [upstream translation repository](https://translate.wordpress.org).

     

       18
       18
       +
       

     

       19
       19
       +
       To regenerate the nixpkgs wordpressPackages set, run:

     

       20
       20
       +
       

     

       21
       21
       +
       ``` 

     

       22
       22
       +
       ./generate.sh

     

       23
       23
       +
       ``` 

     

       24
       24
       +
       

     

       25
       25
       +
       After that you can commit and submit the changes.

     

       26
       26
       +
       

     

       27
       27
       +
       = Usage with the Wordpress module =

     

       28
       28
       +
       

     

       29
       29
       +
       The plugins will be available in the namespace `wordpressPackages.plugins`.

     

       30
       30
       +
       Using it together with the Wordpress module could look like this:

     

       31
       31
       +
       

     

       32
       32
       +
       ``` 

     

       33
       33
       +
       services.wordpress = {

     

       34
       34
       +
         sites."blog.${config.networking.domain}" = {

     

       35
       35
       +
           plugins = with pkgs.wordpressPackages.plugins; [

     

       36
       36
       +
             anti-spam-bee

     

       37
       37
       +
             code-syntax-block

     

       38
       38
       +
             cookie-notice

     

       39
       39
       +
             lightbox-with-photoswipe

     

       40
       40
       +
             wp-gdpr-compliance

     

       41
       41
       +
           ];

     

       42
       42
       +
         };

     

       43
       43
       +
       };

     

       44
       44
       +
       ```

     

       45
       45
       +
       

     

       46
       46
       +
       The same scheme applies to `themes` and `languages`.

+85

pkgs/servers/web-apps/wordpress/packages/default.nix

···

       1
       1
       +
       # Source: https://git.helsinki.tools/helsinki-systems/wp4nix/-/blob/master/default.nix

     

       2
       2
       +
       # Licensed under: MIT

     

       3
       3
       +
       # Slightly modified

     

       4
       4
       +
       

     

       5
       5
       +
       { lib, newScope, plugins, themes, languages }:

     

       6
       6
       +
       

     

       7
       7
       +
       let packages = self:

     

       8
       8
       +
         let

     

       9
       9
       +
           generatedJson = {

     

       10
       10
       +
             inherit plugins themes languages;

     

       11
       11
       +
           };

     

       12
       12
       +
       

     

       13
       13
       +
         in {

     

       14
       14
       +
           # Create a generic WordPress package. Most arguments are just passed

     

       15
       15
       +
           # to `mkDerivation`. The version is automatically filtered for weird characters.

     

       16
       16
       +
           mkWordpressDerivation = self.callPackage ({ stdenvNoCC, lib, filterWPString, gettext, wp-cli }:

     

       17
       17
       +
             { type, pname, version, ... }@args:

     

       18
       18
       +
               assert lib.any (x: x == type) [ "plugin" "theme" "language" ];

     

       19
       19
       +
               stdenvNoCC.mkDerivation ({

     

       20
       20
       +
                 pname = "wordpress-${type}-${pname}";

     

       21
       21
       +
                 version = filterWPString version;

     

       22
       22
       +
       

     

       23
       23
       +
                 dontConfigure = true;

     

       24
       24
       +
                 dontBuild = true;

     

       25
       25
       +
       

     

       26
       26
       +
                 installPhase = ''

     

       27
       27
       +
                   runHook preInstall

     

       28
       28
       +
                   cp -R ./. $out

     

       29
       29
       +
                   runHook postInstall

     

       30
       30
       +
                 '';

     

       31
       31
       +
       

     

       32
       32
       +
                 passthru = {

     

       33
       33
       +
                   wpName = pname;

     

       34
       34
       +
                 } // (args.passthru or {});

     

       35
       35
       +
               } // lib.optionalAttrs (type == "language") {

     

       36
       36
       +
                 nativeBuildInputs = [ gettext wp-cli ];

     

       37
       37
       +
                 dontBuild = false;

     

       38
       38
       +
                 buildPhase = ''

     

       39
       39
       +
                   runHook preBuild

     

       40
       40
       +
       

     

       41
       41
       +
                   find -name '*.po' -print0 | while IFS= read -d "" -r po; do

     

       42
       42
       +
                     msgfmt -o $(basename "$po" .po).mo "$po"

     

       43
       43
       +
                   done

     

       44
       44
       +
                   wp i18n make-json .

     

       45
       45
       +
                   rm *.po

     

       46
       46
       +
       

     

       47
       47
       +
                   runHook postBuild

     

       48
       48
       +
                 '';

     

       49
       49
       +
               } // removeAttrs args [ "type" "pname" "version" "passthru" ])) {};

     

       50
       50
       +
       

     

       51
       51
       +
           # Create a derivation from the official wordpress.org packages.

     

       52
       52
       +
           # This takes the type, the pname and the data generated from the go tool.

     

       53
       53
       +
           mkOfficialWordpressDerivation = self.callPackage ({ mkWordpressDerivation, fetchWordpress }:

     

       54
       54
       +
             { type, pname, data }:

     

       55
       55
       +
             mkWordpressDerivation {

     

       56
       56
       +
               inherit type pname;

     

       57
       57
       +
               version = data.version;

     

       58
       58
       +
       

     

       59
       59
       +
               src = fetchWordpress type data;

     

       60
       60
       +
             }) {};

     

       61
       61
       +
       

     

       62
       62
       +
           # Filter out all characters that might occur in a version string but that that are not allowed

     

       63
       63
       +
           # in store paths.

     

       64
       64
       +
           filterWPString = builtins.replaceStrings [ " " "," "/" "&" ";" ''"'' "'" "$" ":" "(" ")" "[" "]" "{" "}" "|" "*" "\t" ] [ "_" "." "." "" "" "" "" "" "" "" "" "" "" "" "" "-" "" "" ];

     

       65
       65
       +
       

     

       66
       66
       +
           # Fetch a package from the official wordpress.org SVN.

     

       67
       67
       +
           # The data supplied is the data straight from the go tool.

     

       68
       68
       +
           fetchWordpress = self.callPackage ({ fetchsvn }: type: data: fetchsvn {

     

       69
       69
       +
             inherit (data) rev sha256;

     

       70
       70
       +
             url = if type == "plugin" || type == "theme" then

     

       71
       71
       +
               "https://" + type + "s.svn.wordpress.org/" + data.path

     

       72
       72
       +
             else if type == "language" then

     

       73
       73
       +
               "https://i18n.svn.wordpress.org/core/" + data.version + "/" + data.path

     

       74
       74
       +
             else if type == "pluginLanguage" then

     

       75
       75
       +
               "https://i18n.svn.wordpress.org/plugins/" + data.path

     

       76
       76
       +
             else if type == "themeLanguage" then

     

       77
       77
       +
               "https://i18n.svn.wordpress.org/themes/" + data.path

     

       78
       78
       +
             else

     

       79
       79
       +
               throw "fetchWordpress: invalid package type ${type}";

     

       80
       80
       +
           }) {};

     

       81
       81
       +
       

     

       82
       82
       +
         } // lib.mapAttrs (type: pkgs: lib.makeExtensible (_: lib.mapAttrs (pname: data: self.mkOfficialWordpressDerivation { type = lib.removeSuffix "s" type; inherit pname data; }) pkgs)) generatedJson;

     

       83
       83
       +
       

     

       84
       84
       +
       # This creates an extensible scope.

     

       85
       85
       +
       in (lib.makeExtensible (_: (lib.makeScope newScope packages))).extend (selfWP: superWP: {})

+26

pkgs/servers/web-apps/wordpress/packages/generate.sh

···

       1
       1
       +
       #!/usr/bin/env nix-shell

     

       2
       2
       +
       #! nix-shell -I nixpkgs=../../../../.. -i bash -p wp4nix

     

       3
       3
       +
       

     

       4
       4
       +
       set -e

     

       5
       5
       +
       set -u

     

       6
       6
       +
       set -o pipefail

     

       7
       7
       +
       set -x

     

       8
       8
       +
       

     

       9
       9
       +
       NIX_VERSION=$(nix --version|cut -d ' ' -f 3|cut -c -3)

     

       10
       10
       +
       if [[ "$NIX_VERSION" > 2.3 ]]; then

     

       11
       11
       +
         nixFlags="--option experimental-features nix-command eval --raw --impure --expr"

     

       12
       12
       +
       else

     

       13
       13
       +
         nixFlags="eval --raw"

     

       14
       14
       +
       fi

     

       15
       15
       +
       

     

       16
       16
       +
       export WP_VERSION=$(nix $nixFlags '(import <nixpkgs> {}).wordpress.version')

     

       17
       17
       +
       

     

       18
       18
       +
       PLUGINS=`cat wordpress-plugins.json | jq -r '.[]' | sed -z 's/\n/,/g;s/,$/\n/'`

     

       19
       19
       +
       THEMES=`cat wordpress-themes.json | jq -r '.[]' | sed -z 's/\n/,/g;s/,$/\n/'`

     

       20
       20
       +
       LANGUAGES=`cat wordpress-languages.json | jq -r '.[]' | sed -z 's/\n/,/g;s/,$/\n/'`

     

       21
       21
       +
       

     

       22
       22
       +
       wp4nix -p $PLUGINS -pl en

     

       23
       23
       +
       wp4nix -t $THEMES -tl en

     

       24
       24
       +
       wp4nix -l $LANGUAGES

     

       25
       25
       +
       

     

       26
       26
       +
       rm *.log themeLanguages.json pluginLanguages.json

+14

pkgs/servers/web-apps/wordpress/packages/languages.json

···

       1
       1
       +
       {

     

       2
       2
       +
         "de_DE": {

     

       3
       3
       +
           "path": "de_DE",

     

       4
       4
       +
           "rev": "932483",

     

       5
       5
       +
           "sha256": "1n4rf1bkr8xr6yqxd7c6s4ha3ll819fbfiqln57is9knfpdd6fnq",

     

       6
       6
       +
           "version": "5.8"

     

       7
       7
       +
         },

     

       8
       8
       +
         "fr_FR": {

     

       9
       9
       +
           "path": "fr_FR",

     

       10
       10
       +
           "rev": "932480",

     

       11
       11
       +
           "sha256": "0lmbalcvwfc6331vdazmhr2lp3w418rsp78mrj1rs7a44y8f1igj",

     

       12
       12
       +
           "version": "5.8"

     

       13
       13
       +
         }

     

       14
       14
       +
       }

+122

pkgs/servers/web-apps/wordpress/packages/plugins.json

···

       1
       1
       +
       {

     

       2
       2
       +
         "add-widget-after-content": {

     

       3
       3
       +
           "path": "add-widget-after-content/tags/2.4.4",

     

       4
       4
       +
           "rev": "2671853",

     

       5
       5
       +
           "sha256": "0snrkd783f1qxry01858l3r0ll9381xhsig7wlmrvi1zm5jf2drc",

     

       6
       6
       +
           "version": "2.4.4"

     

       7
       7
       +
         },

     

       8
       8
       +
         "antispam-bee": {

     

       9
       9
       +
           "path": "antispam-bee/tags/2.11.1",

     

       10
       10
       +
           "rev": "2748316",

     

       11
       11
       +
           "sha256": "1hjq1yazvypc84lwcjq7za1n3s7vcxd9mc50adpinkwjjph1cgxn",

     

       12
       12
       +
           "version": "2.11.1"

     

       13
       13
       +
         },

     

       14
       14
       +
         "async-javascript": {

     

       15
       15
       +
           "path": "async-javascript/tags/2.21.08.31",

     

       16
       16
       +
           "rev": "2760769",

     

       17
       17
       +
           "sha256": "1yf3pj0nn4gyl0a2wfvznpwb7y0glxg19rgny3bh38k4pj9mli49",

     

       18
       18
       +
           "version": "2.21.08.31"

     

       19
       19
       +
         },

     

       20
       20
       +
         "breeze": {

     

       21
       21
       +
           "path": "breeze/tags/2.0.9",

     

       22
       22
       +
           "rev": "2786857",

     

       23
       23
       +
           "sha256": "0nn3kalwb50kyd563jiixc134hiygkbzs8zkxgsbgmsi511vfzkz",

     

       24
       24
       +
           "version": "2.0.9"

     

       25
       25
       +
         },

     

       26
       26
       +
         "co-authors-plus": {

     

       27
       27
       +
           "path": "co-authors-plus/tags/3.5.2",

     

       28
       28
       +
           "rev": "2735979",

     

       29
       29
       +
           "sha256": "0ph3iskixi2j6bsnlpd4x8wixzm2hbdzchnyfz9mxzzys93qb41k",

     

       30
       30
       +
           "version": "3.5.2"

     

       31
       31
       +
         },

     

       32
       32
       +
         "code-syntax-block": {

     

       33
       33
       +
           "path": "code-syntax-block/tags/3.1.1",

     

       34
       34
       +
           "rev": "2747615",

     

       35
       35
       +
           "sha256": "0dqdsl7f3ihshvly6cqd5l4cbimx5skmips514wvifspwggwmmjm",

     

       36
       36
       +
           "version": "3.1.1"

     

       37
       37
       +
         },

     

       38
       38
       +
         "cookie-notice": {

     

       39
       39
       +
           "path": "cookie-notice/tags/2.4.1",

     

       40
       40
       +
           "rev": "2790369",

     

       41
       41
       +
           "sha256": "1a1qnmi81z8c30d6zgcd5xqd08cxkq71g2hzb6xcbdv04036nf77",

     

       42
       42
       +
           "version": "2.4.1"

     

       43
       43
       +
         },

     

       44
       44
       +
         "disable-xml-rpc": {

     

       45
       45
       +
           "path": "disable-xml-rpc/tags/1.0.1",

     

       46
       46
       +
           "rev": "2561901",

     

       47
       47
       +
           "sha256": "04x5dj79bx5avx8db991nlhrpd3qv3maniqmzwnyd8ab2zblzx83",

     

       48
       48
       +
           "version": "1.0.1"

     

       49
       49
       +
         },

     

       50
       50
       +
         "jetpack": {

     

       51
       51
       +
           "path": "jetpack/tags/11.4",

     

       52
       52
       +
           "rev": "2794223",

     

       53
       53
       +
           "sha256": "123kfn6wn23sz7zv8yk8rszrxwnjgjfrm0cqpwmrs3h1plfqv7kg",

     

       54
       54
       +
           "version": "11.4"

     

       55
       55
       +
         },

     

       56
       56
       +
         "jetpack-lite": {

     

       57
       57
       +
           "path": "jetpack-lite/tags/3.0.3",

     

       58
       58
       +
           "rev": "1895157",

     

       59
       59
       +
           "sha256": "04wq8cnhzgzrhm5pjwicsnavc46n6wdmb6xf8gz4wwl1di2hl471",

     

       60
       60
       +
           "version": "3.0.3"

     

       61
       61
       +
         },

     

       62
       62
       +
         "lightbox-photoswipe": {

     

       63
       63
       +
           "path": "lightbox-photoswipe/tags/5.0.16",

     

       64
       64
       +
           "rev": "2790158",

     

       65
       65
       +
           "sha256": "1pd83v7nz2l002z1y27h97gmhcdcbvsfi8x7llrg9vzijrx0vf18",

     

       66
       66
       +
           "version": "5.0.16"

     

       67
       67
       +
         },

     

       68
       68
       +
         "mailpoet": {

     

       69
       69
       +
           "path": "mailpoet/tags/3.100.1",

     

       70
       70
       +
           "rev": "2795092",

     

       71
       71
       +
           "sha256": "0wgzmicf6mmkmkwsxxaz2d8sylvq6v0a98nbc2yswd11l4igc8ld",

     

       72
       72
       +
           "version": "3.100.1"

     

       73
       73
       +
         },

     

       74
       74
       +
         "opengraph": {

     

       75
       75
       +
           "path": "opengraph/tags/1.11.0",

     

       76
       76
       +
           "rev": "2730257",

     

       77
       77
       +
           "sha256": "133mzlccbdpppps1aq83n2az4xzikak61k4rdzg9aax23l5ggss6",

     

       78
       78
       +
           "version": "1.11.0"

     

       79
       79
       +
         },

     

       80
       80
       +
         "simple-login-captcha": {

     

       81
       81
       +
           "path": "simple-login-captcha/tags/1.3.3",

     

       82
       82
       +
           "rev": "2729196",

     

       83
       83
       +
           "sha256": "1wy9cbibbngjarc8c9qn4bil3qc8i0h2kz0k364zcsnfpwi8jk3c",

     

       84
       84
       +
           "version": "1.3.3"

     

       85
       85
       +
         },

     

       86
       86
       +
         "webp-converter-for-media": {

     

       87
       87
       +
           "path": "webp-converter-for-media/tags/5.2.4",

     

       88
       88
       +
           "rev": "2791011",

     

       89
       89
       +
           "sha256": "18y0yrngywz0zlxd67cn16nvzypb395rhsfavfyl6pq0ygymcxnm",

     

       90
       90
       +
           "version": "5.2.4"

     

       91
       91
       +
         },

     

       92
       92
       +
         "wp-change-email-sender": {

     

       93
       93
       +
           "path": "wp-change-email-sender/trunk",

     

       94
       94
       +
           "rev": "2655179",

     

       95
       95
       +
           "sha256": "0dv5604mn4ly2zm6mwqf5y8vp9cfiw70v66bimvgbahxz4i2w23q",

     

       96
       96
       +
           "version": "1.0"

     

       97
       97
       +
         },

     

       98
       98
       +
         "wp-gdpr-compliance": {

     

       99
       99
       +
           "path": "wp-gdpr-compliance/tags/2.0.20",

     

       100
       100
       +
           "rev": "2793947",

     

       101
       101
       +
           "sha256": "1vvwmi03hjyqw566m75m8lxbhnl3y4h461531a26xwsbmjgbmf9a",

     

       102
       102
       +
           "version": "2.0.20"

     

       103
       103
       +
         },

     

       104
       104
       +
         "wp-mail-smtp": {

     

       105
       105
       +
           "path": "wp-mail-smtp/tags/3.6.1",

     

       106
       106
       +
           "rev": "2795051",

     

       107
       107
       +
           "sha256": "14ry7302c4h7d7lrasiql9jiy3x54ylim3y7j5b633g5lyzadynl",

     

       108
       108
       +
           "version": "3.6.1"

     

       109
       109
       +
         },

     

       110
       110
       +
         "wp-statistics": {

     

       111
       111
       +
           "path": "wp-statistics/tags/13.2.6",

     

       112
       112
       +
           "rev": "2781181",

     

       113
       113
       +
           "sha256": "0vzlhlnna2dx4kyi24rqhbrx5n5zsw51hqgsaslfiyyir64dkzgz",

     

       114
       114
       +
           "version": "13.2.6"

     

       115
       115
       +
         },

     

       116
       116
       +
         "wp-user-avatars": {

     

       117
       117
       +
           "path": "wp-user-avatars/trunk",

     

       118
       118
       +
           "rev": "2540784",

     

       119
       119
       +
           "sha256": "1g21nl6xs9zyq0ainjwa06wl90975l8f9rj0fa20zkmw17w2mdgl",

     

       120
       120
       +
           "version": "1.4.1"

     

       121
       121
       +
         }

     

       122
       122
       +
       }

+14

pkgs/servers/web-apps/wordpress/packages/themes.json

···

       1
       1
       +
       {

     

       2
       2
       +
         "twentytwentyone": {

     

       3
       3
       +
           "path": "twentytwentyone/1.6",

     

       4
       4
       +
           "rev": "168450",

     

       5
       5
       +
           "sha256": "0wfqdyd59hifnncjv59ywjak050gaggsvjx7r01agh44nzkr84fs",

     

       6
       6
       +
           "version": "1.6"

     

       7
       7
       +
         },

     

       8
       8
       +
         "twentytwentytwo": {

     

       9
       9
       +
           "path": "twentytwentytwo/1.2",

     

       10
       10
       +
           "rev": "168451",

     

       11
       11
       +
           "sha256": "0ry7h5bd9h97q38jmsgymm05dfml0ycdhqn7iskpdlc1nnrjrk04",

     

       12
       12
       +
           "version": "1.2"

     

       13
       13
       +
         }

     

       14
       14
       +
       }

pkgs/servers/web-apps/wordpress/packages/wordpress-languages.json

+22

pkgs/servers/web-apps/wordpress/packages/wordpress-plugins.json

···

       1
       1
       +
       [

     

       2
       2
       +
         "add-widget-after-content"

     

       3
       3
       +
       , "antispam-bee"

     

       4
       4
       +
       , "async-javascript"

     

       5
       5
       +
       , "breeze"

     

       6
       6
       +
       , "code-syntax-block"

     

       7
       7
       +
       , "cookie-notice"

     

       8
       8
       +
       , "co-authors-plus"

     

       9
       9
       +
       , "disable-xml-rpc"

     

       10
       10
       +
       , "jetpack"

     

       11
       11
       +
       , "jetpack-lite"

     

       12
       12
       +
       , "lightbox-photoswipe"

     

       13
       13
       +
       , "mailpoet"

     

       14
       14
       +
       , "opengraph"

     

       15
       15
       +
       , "simple-login-captcha"

     

       16
       16
       +
       , "webp-converter-for-media"

     

       17
       17
       +
       , "wp-mail-smtp"

     

       18
       18
       +
       , "wp-gdpr-compliance"

     

       19
       19
       +
       , "wp-statistics"

     

       20
       20
       +
       , "wp-user-avatars"

     

       21
       21
       +
       , "wp-change-email-sender"

     

       22
       22
       +
       ]

pkgs/servers/web-apps/wordpress/packages/wordpress-themes.json

···

       1
       1
       +
       [

     

       2
       2
       +
         "twentytwentytwo"

     

       3
       3
       +
       , "twentytwentyone"

     

       4
       4
       +
       ]

+28 -4

pkgs/tools/admin/wander/default.nix

···

       1
       1
       -
       { buildGoModule, fetchFromGitHub, lib }:

     

       1
       1
       +
       { wander, buildGoModule, fetchFromGitHub, fetchpatch, installShellFiles, lib, testers }:

     

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "wander";

     

       5
       5
       -
         version = "0.7.0";

     

       5
       5
       +
         version = "0.8.0";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "robinovitch61";

     

       9
       9
        
           repo = pname;

     

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

     

       11
       11
       -
           sha256 = "sha256-aQqJDUDYHoUZ6ixnY3lmFOx29QpRRke5XHFIpsA+Bnw=";

     

       11
       11
       +
           sha256 = "sha256-G/TrfnmEyomdUCN5nUS9v5iqeUzgZzMLUZnfroQLZuk=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         vendorSha256 = "sha256-T+URnRLumXFz48go9TN0Wha99T03OWGfDK7cQ+zKeRI=";

     

       14
       14
       +
         vendorSha256 = "sha256-iTaZ5/0UrLJ3JE3FwQpvjKKrhqklG4n1WFTJhWfj/rI=";

     

       15
       15
       +
       

     

       16
       16
       +
         patches = [

     

       17
       17
       +
           (fetchpatch {

     

       18
       18
       +
             url = "https://github.com/robinovitch61/wander/commit/b3d3249541de005404a41c17a15218a4f73f68e5.patch";

     

       19
       19
       +
             sha256 = "sha256-z8bdSFcAqnwEu0gupxW/L1o/asyxbvTYIdtLZNmQpz8=";

     

       20
       20
       +
           })

     

       21
       21
       +
         ];

     

       22
       22
       +
       

     

       23
       23
       +
         ldflags = [ "-X github.com/robinovitch61/wander/cmd.Version=v${version}" ];

     

       24
       24
       +
       

     

       25
       25
       +
         nativeBuildInputs = [ installShellFiles ];

     

       26
       26
       +
       

     

       27
       27
       +
         postInstall = ''

     

       28
       28
       +
           installShellCompletion --cmd wander \

     

       29
       29
       +
             --fish <($out/bin/wander completion fish) \

     

       30
       30
       +
             --bash <($out/bin/wander completion bash) \

     

       31
       31
       +
             --zsh <($out/bin/wander completion zsh)

     

       32
       32
       +
         '';

     

       33
       33
       +
       

     

       34
       34
       +
         passthru.tests.version = testers.testVersion {

     

       35
       35
       +
           package = wander;

     

       36
       36
       +
           command = "wander --version";

     

       37
       37
       +
           version = "v${version}";

     

       38
       38
       +
         };

     

       15
       39
        
       

     

       16
       40
        
         meta = with lib; {

     

       17
       41
        
           description = "Terminal app/TUI for HashiCorp Nomad";

+2 -2

pkgs/tools/networking/dhcp/default.nix

···

       9
       9
        
       

     

       10
       10
        
       stdenv.mkDerivation rec {

     

       11
       11
        
         pname = "dhcp";

     

       12
       12
       -
         version = "4.4.3";

     

       12
       12
       +
         version = "4.4.3-P1";

     

       13
       13
        
       

     

       14
       14
        
         src = fetchurl {

     

       15
       15
        
           url = "https://ftp.isc.org/isc/dhcp/${version}/${pname}-${version}.tar.gz";

     

       16
       16
       -
           sha256 = "sha256-Dj7GtMKgXsAUiHS82ZmmbQVRg3jXdCH2B/sLydATWBg=";

     

       16
       16
       +
           sha256 = "sha256-CsQWu1WZfKhjIXT9EHN/1hzbjbonUhYKM1d1vCHcc8c=";

     

       17
       17
        
         };

     

       18
       18
        
       

     

       19
       19
        
         patches =

+1 -1

pkgs/tools/networking/mosh/default.nix

···

       1
       1
        
       { lib, stdenv, fetchurl, fetchpatch, zlib, protobuf, ncurses, pkg-config

     

       2
       2
        
       , makeWrapper, perl, openssl, autoreconfHook, openssh, bash-completion

     

       3
       3
       -
       , withUtempter ? stdenv.isLinux, libutempter }:

     

       3
       3
       +
       , withUtempter ? stdenv.isLinux && !stdenv.hostPlatform.isMusl, libutempter }:

     

       4
       4
        
       

     

       5
       5
        
       stdenv.mkDerivation rec {

     

       6
       6
        
         pname = "mosh";

+10 -4

pkgs/top-level/all-packages.nix

···

       9408
       9408
        
         nomad_1_3 = callPackage ../applications/networking/cluster/nomad/1.3.nix {

     

       9409
       9409
        
           buildGoModule = buildGo119Module;

     

       9410
       9410
        
         };

     

       9411
       9411
       +
         nomad_1_4 = callPackage ../applications/networking/cluster/nomad/1.4.nix {

     

       9412
       9412
       +
           buildGoModule = buildGo119Module;

     

       9413
       9413
       +
         };

     

       9411
       9414
        
       

     

       9412
       9415
        
         nomad-autoscaler = callPackage ../applications/networking/cluster/nomad-autoscaler { };

     

       9413
       9416
        
       

     
···

       29340
       29343
        
       

     

       29341
       29344
        
         kuttl = callPackage ../applications/networking/cluster/kuttl { };

     

       29342
       29345
        
       

     

       29343
       29343
       -
         kubectl-doctor = callPackage ../applications/networking/cluster/kubectl-doctor {

     

       29344
       29344
       -
           # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild

     

       29345
       29345
       -
           buildGoModule = buildGo117Module;

     

       29346
       29346
       -
         };

     

       29346
       29346
       +
         kubectl-doctor = callPackage ../applications/networking/cluster/kubectl-doctor { };

     

       29347
       29347
        
       

     

       29348
       29348
        
         kubectl-example = callPackage ../applications/networking/cluster/kubectl-example { };

     

       29349
       29349
        
       

     
···

       36913
       36913
        
         wmutils-opt = callPackage ../tools/X11/wmutils-opt { };

     

       36914
       36914
        
       

     

       36915
       36915
        
         wordpress = callPackage ../servers/web-apps/wordpress { };

     

       36916
       36916
       +
       

     

       36917
       36917
       +
         wordpressPackages = ( callPackage ../servers/web-apps/wordpress/packages {

     

       36918
       36918
       +
           plugins = lib.importJSON ../servers/web-apps/wordpress/packages/plugins.json;

     

       36919
       36919
       +
           themes = lib.importJSON ../servers/web-apps/wordpress/packages/themes.json;

     

       36920
       36920
       +
           languages = lib.importJSON ../servers/web-apps/wordpress/packages/languages.json;

     

       36921
       36921
       +
         });

     

       36916
       36922
        
       

     

       36917
       36923
        
         wprecon = callPackage ../tools/security/wprecon { };

     

       36918
       36924

+2 -2

pkgs/top-level/perl-packages.nix

···

       22612
       22612
        
       

     

       22613
       22613
        
         SysVirt = buildPerlModule rec {

     

       22614
       22614
        
           pname = "Sys-Virt";

     

       22615
       22615
       -
           version = "8.5.0";

     

       22615
       22615
       +
           version = "8.8.0";

     

       22616
       22616
        
           src = fetchFromGitLab {

     

       22617
       22617
        
             owner = "libvirt";

     

       22618
       22618
        
             repo = "libvirt-perl";

     

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

     

       22620
       22620
       -
             hash = "sha256-VuM4rPrG15vXnF5e1MBSGB76zLI+8nkSiJmwWg8aJgE=";

     

       22620
       22620
       +
             hash = "sha256-8maLIW4hBbMbq+rnwEfaHsUgpppaU5K4aQTwTgUjdcI=";

     

       22621
       22621
        
           };

     

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

     

       22623
       22623
        
           buildInputs = [ pkgs.libvirt CPANChanges TestPod TestPodCoverage XMLXPath ];