commit 03db8f9dcb9e0e42608ac92edd301a22383ea4fc · pyrox.dev/nixpkgs

+11

maintainers/maintainer-list.nix

···

       3639
       3639
        
           githubId = 200617;

     

       3640
       3640
        
           name = "Ben Sima";

     

       3641
       3641
        
         };

     

       3642
       3642
       +
         bstanderline = {

     

       3643
       3643
       +
           name = "bstanderline";

     

       3644
       3644
       +
           github = "bstanderline";

     

       3645
       3645
       +
           githubId = 153822813;

     

       3646
       3646
       +
         };

     

       3642
       3647
        
         btlvr = {

     

       3643
       3648
        
           email = "btlvr@protonmail.com";

     

       3644
       3649
        
           github = "btlvr";

     
···

       17377
       17382
        
           github = "novaviper";

     

       17378
       17383
        
           githubId = 7191115;

     

       17379
       17384
        
           name = "Nova Leary";

     

       17385
       17385
       +
         };

     

       17386
       17386
       +
         novmar = {

     

       17387
       17387
       +
           email = "novotny@marnov.cz";

     

       17388
       17388
       +
           github = "novmar";

     

       17389
       17389
       +
           githubId = 26750149;

     

       17390
       17390
       +
           name = "Marcel Novotny";

     

       17380
       17391
        
         };

     

       17381
       17392
        
         novoxd = {

     

       17382
       17393
        
           email = "radnovox@gmail.com";

+1

maintainers/team-list.nix

···

       597
       597
        
         jitsi = {

     

       598
       598
        
           members = [

     

       599
       599
        
             cleeyv

     

       600
       600
       +
             novmar

     

       600
       601
        
             ryantm

     

       601
       602
        
             lassulus

     

       602
       603
        
             yayayayaka

+5 -4

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

···

       13
       13
        
       

     

       14
       14
        
         user = cfg.user;

     

       15
       15
        
         group = cfg.group;

     

       16
       16
       +
         php = lib.getExe pkgs.php82;

     

       16
       17
        
       

     

       17
       18
        
         # shell script for local administration

     

       18
       19
        
         artisan = pkgs.writeScriptBin "agorakit" ''

     
···

       25
       26
        
               exec "$@"

     

       26
       27
        
             fi

     

       27
       28
        
           }

     

       28
       28
       -
           sudo ${lib.getExe pkgs.php} artisan "$@"

     

       29
       29
       +
           sudo ${php} artisan "$@"

     

       29
       30
        
         '';

     

       30
       31
        
       

     

       31
       32
        
         tlsEnabled = cfg.nginx.addSSL || cfg.nginx.forceSSL || cfg.nginx.onlySSL || cfg.nginx.enableACME;

     
···

       447
       448
        
                 fi

     

       448
       449
        
       

     

       449
       450
        
                 # migrate & seed db

     

       450
       450
       -
                 ${pkgs.php}/bin/php artisan key:generate --force

     

       451
       451
       -
                 ${pkgs.php}/bin/php artisan migrate --force

     

       452
       452
       -
                 ${pkgs.php}/bin/php artisan config:cache

     

       451
       451
       +
                 ${php} artisan key:generate --force

     

       452
       452
       +
                 ${php} artisan migrate --force

     

       453
       453
       +
                 ${php} artisan config:cache

     

       453
       454
        
               '';

     

       454
       455
        
           };

     

       455
       456

+5 -2

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

···

       4
       4
        
         cfg = config.services.calibre-web;

     

       5
       5
        
         dataDir = if lib.hasPrefix "/" cfg.dataDir then cfg.dataDir else "/var/lib/${cfg.dataDir}";

     

       6
       6
        
       

     

       7
       7
       -
         inherit (lib) concatStringsSep mkEnableOption mkIf mkOption optional optionalString types;

     

       7
       7
       +
         inherit (lib) concatStringsSep mkEnableOption mkIf mkOption optional optionals optionalString types;

     

       8
       8
        
       in

     

       9
       9
        
       {

     

       10
       10
        
         options = {

     
···

       129
       129
        
                 "config_reverse_proxy_login_header_name = '${cfg.options.reverseProxyAuth.header}'"

     

       130
       130
        
               ]

     

       131
       131
        
               ++ optional (cfg.options.calibreLibrary != null) "config_calibre_dir = '${cfg.options.calibreLibrary}'"

     

       132
       132
       -
               ++ optional cfg.options.enableBookConversion "config_converterpath = '${pkgs.calibre}/bin/ebook-convert'"

     

       132
       132
       +
               ++ optionals cfg.options.enableBookConversion [

     

       133
       133
       +
                 "config_converterpath = '${pkgs.calibre}/bin/ebook-convert'"

     

       134
       134
       +
                 "config_binariesdir = '${pkgs.calibre}/bin/'"

     

       135
       135
       +
               ]

     

       133
       136
        
               ++ optional cfg.options.enableKepubify "config_kepubifypath = '${pkgs.kepubify}/bin/kepubify'"

     

       134
       137
        
             );

     

       135
       138
        
           in

+11 -7

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

···

       312
       312
        
             systemd.services."phpfpm-dolibarr".after = mkIf cfg.database.createLocally [ "mysql.service" ];

     

       313
       313
        
             services.phpfpm.pools.dolibarr = {

     

       314
       314
        
               inherit (cfg) user group;

     

       315
       315
       -
               phpPackage = pkgs.php.buildEnv {

     

       315
       315
       +
               phpPackage = pkgs.php83.buildEnv {

     

       316
       316
        
                 extensions = { enabled, all }: enabled ++ [ all.calendar ];

     

       317
       317
        
                 # recommended by dolibarr web application

     

       318
       318
        
                 extraConfig = ''

     
···

       339
       339
        
               description = "dolibarr configuration file management via NixOS";

     

       340
       340
        
               wantedBy = [ "multi-user.target" ];

     

       341
       341
        
       

     

       342
       342
       -
               script = ''

     

       343
       343
       -
                 # extract the 'main instance unique id' secret that the dolibarr installer generated for us, store it in a file for use by our own NixOS generated configuration file

     

       344
       344
       -
                 ${pkgs.php}/bin/php -r "include '${cfg.stateDir}/conf.php'; file_put_contents('${cfg.stateDir}/dolibarr_main_instance_unique_id', \$dolibarr_main_instance_unique_id);"

     

       342
       342
       +
               script =

     

       343
       343
       +
                 let

     

       344
       344
       +
                   php = lib.getExe config.services.phpfpm.pools.dolibarr.phpPackage;

     

       345
       345
       +
                 in

     

       346
       346
       +
                 ''

     

       347
       347
       +
                   # extract the 'main instance unique id' secret that the dolibarr installer generated for us, store it in a file for use by our own NixOS generated configuration file

     

       348
       348
       +
                   ${php} -r "include '${cfg.stateDir}/conf.php'; file_put_contents('${cfg.stateDir}/dolibarr_main_instance_unique_id', \$dolibarr_main_instance_unique_id);"

     

       345
       349
        
       

     

       346
       346
       -
                 # replace configuration file generated by installer with the NixOS generated configuration file

     

       347
       347
       -
                 install -m 440 ${mkConfigFile "conf.php" cfg.settings} '${cfg.stateDir}/conf.php'

     

       348
       348
       -
               '';

     

       350
       350
       +
                   # replace configuration file generated by installer with the NixOS generated configuration file

     

       351
       351
       +
                   install -m 440 ${mkConfigFile "conf.php" cfg.settings} '${cfg.stateDir}/conf.php'

     

       352
       352
       +
                 '';

     

       349
       353
        
       

     

       350
       354
        
               serviceConfig = {

     

       351
       355
        
                 Type = "oneshot";

+1 -1

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

···

       192
       192
        
                   )

     

       193
       193
        
                 );

     

       194
       194
        
               };

     

       195
       195
       -
               phpPackage = pkgs.php.withExtensions ({ enabled, all }: [ all.imagick ] ++ enabled);

     

       195
       195
       +
               phpPackage = pkgs.php83.withExtensions ({ enabled, all }: [ all.imagick ] ++ enabled);

     

       196
       196
        
               phpOptions = ''

     

       197
       197
        
                 date.timezone = "${cfg.timezone}"

     

       198
       198
        
               '';

+6 -5

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

···

       15
       15
        
         user = cfg.user;

     

       16
       16
        
         group = cfg.group;

     

       17
       17
        
       

     

       18
       18
       +
         php = lib.getExe pkgs.php83;

     

       19
       19
       +
       

     

       18
       20
        
         # shell script for local administration

     

       19
       21
        
         artisan = pkgs.writeScriptBin "monica" ''

     

       20
       22
        
           #! ${pkgs.runtimeShell}

     
···

       26
       28
        
               exec "$@"

     

       27
       29
        
             fi

     

       28
       30
        
           }

     

       29
       29
       -
           sudo ${pkgs.php}/bin/php artisan "$@"

     

       31
       31
       +
           sudo ${php} artisan "$@"

     

       30
       32
        
         '';

     

       31
       33
        
       

     

       32
       34
        
         tlsEnabled = cfg.nginx.addSSL || cfg.nginx.forceSSL || cfg.nginx.onlySSL || cfg.nginx.enableACME;

     
···

       419
       421
        
               fi

     

       420
       422
        
       

     

       421
       423
        
               # migrate & seed db

     

       422
       422
       -
               ${pkgs.php}/bin/php artisan key:generate --force

     

       423
       423
       -
               ${pkgs.php}/bin/php artisan setup:production -v --force

     

       424
       424
       +
               ${php} artisan key:generate --force

     

       425
       425
       +
               ${php} artisan setup:production -v --force

     

       424
       426
        
             '';

     

       425
       427
        
           };

     

       426
       428
        
       

     
···

       432
       434
        
               Type = "oneshot";

     

       433
       435
        
               User = user;

     

       434
       436
        
               WorkingDirectory = "${monica}";

     

       435
       435
       -
               ExecStart = "${pkgs.php}/bin/php ${monica}/artisan schedule:run -v";

     

       437
       437
       +
               ExecStart = "${php} ${monica}/artisan schedule:run -v";

     

       436
       438
        
             };

     

       437
       439
        
           };

     

       438
       440
        
       

     
···

       465
       467
        
           };

     

       466
       468
        
         };

     

       467
       469
        
       }

     

       468
       468
       -

+11 -4

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

···

       130
       130
        
                 --quiet \

     

       131
       131
        
                 ${command}

     

       132
       132
        
             elif [[ "$USER" != nextcloud ]]; then

     

       133
       133
       -
               exec /run/wrappers/bin/sudo \

     

       134
       134
       -
                 --preserve-env=CREDENTIALS_DIRECTORY \

     

       135
       135
       -
                 --user=nextcloud \

     

       136
       136
       -
                 ${command}

     

       133
       133
       +
               if [[ -x /run/wrappers/bin/sudo ]]; then

     

       134
       134
       +
                 exec /run/wrappers/bin/sudo \

     

       135
       135
       +
                   --preserve-env=CREDENTIALS_DIRECTORY \

     

       136
       136
       +
                   --user=nextcloud \

     

       137
       137
       +
                   ${command}

     

       138
       138
       +
               else

     

       139
       139
       +
                 exec ${lib.getExe' pkgs.util-linux "runuser"} \

     

       140
       140
       +
                   --whitelist-environment=CREDENTIALS_DIRECTORY \

     

       141
       141
       +
                   --user=nextcloud \

     

       142
       142
       +
                   ${command}

     

       143
       143
       +
               fi

     

       137
       144
        
             else

     

       138
       145
        
               exec ${command}

     

       139
       146
        
             fi

+1 -1

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

···

       211
       211
        
                         $throttleMaxSpeed = 327625*1024;

     

       212
       212
        
       

     

       213
       213
        
                         $pathToExternals = array(

     

       214
       214
       -
                           "php" 	=> "${pkgs.php}/bin/php",			// Something like /usr/bin/php. If empty, will be found in PATH.

     

       214
       214
       +
                           "php" 	=> "${pkgs.php82}/bin/php",			// Something like /usr/bin/php. If empty, will be found in PATH.

     

       215
       215
        
                           "curl"	=> "${pkgs.curl}/bin/curl",			// Something like /usr/bin/curl. If empty, will be found in PATH.

     

       216
       216
        
                           "gzip"	=> "${pkgs.gzip}/bin/gzip",			// Something like /usr/bin/gzip. If empty, will be found in PATH.

     

       217
       217
        
                           "id"	=> "${pkgs.coreutils}/bin/id",			// Something like /usr/bin/id. If empty, will be found in PATH.

+14 -14

nixos/tests/all-tests.nix

···

       342
       342
        
         documentation = pkgs.callPackage ../modules/misc/documentation/test.nix { inherit nixosLib; };

     

       343
       343
        
         doh-proxy-rust = handleTest ./doh-proxy-rust.nix {};

     

       344
       344
        
         dokuwiki = runTest ./dokuwiki.nix;

     

       345
       345
       -
         dolibarr = handleTest ./dolibarr.nix {};

     

       345
       345
       +
         dolibarr = runTest ./dolibarr.nix;

     

       346
       346
        
         domination = handleTest ./domination.nix {};

     

       347
       347
        
         dovecot = handleTest ./dovecot.nix {};

     

       348
       348
        
         drawterm = discoverTests (import ./drawterm.nix);

     
···

       557
       557
        
         hub = handleTest ./git/hub.nix {};

     

       558
       558
        
         hydra = handleTest ./hydra {};

     

       559
       559
        
         i3wm = handleTest ./i3wm.nix {};

     

       560
       560
       -
         icingaweb2 = handleTest ./icingaweb2.nix {};

     

       560
       560
       +
         icingaweb2 = runTest ./icingaweb2.nix;

     

       561
       561
        
         ifm = handleTest ./ifm.nix {};

     

       562
       562
        
         iftop = handleTest ./iftop.nix {};

     

       563
       563
        
         immich = handleTest ./web-apps/immich.nix {};

     
···

       725
       725
        
         mollysocket = handleTest ./mollysocket.nix { };

     

       726
       726
        
         monado = handleTest ./monado.nix {};

     

       727
       727
        
         monetdb = handleTest ./monetdb.nix {};

     

       728
       728
       -
         monica = handleTest ./web-apps/monica.nix {};

     

       728
       728
       +
         monica = runTest ./web-apps/monica.nix;

     

       729
       729
        
         mongodb = runTest ./mongodb.nix;

     

       730
       730
        
         mongodb-ce = runTest ({ config, ... }: {

     

       731
       731
        
           imports = [ ./mongodb.nix ];

     
···

       797
       797
        
         nfs3 = handleTest ./nfs { version = 3; };

     

       798
       798
        
         nfs4 = handleTest ./nfs { version = 4; };

     

       799
       799
        
         nghttpx = handleTest ./nghttpx.nix {};

     

       800
       800
       -
         nginx = handleTest ./nginx.nix {};

     

       801
       801
       -
         nginx-auth = handleTest ./nginx-auth.nix {};

     

       802
       802
       -
         nginx-etag = handleTest ./nginx-etag.nix {};

     

       803
       803
       -
         nginx-etag-compression = handleTest ./nginx-etag-compression.nix {};

     

       804
       804
       -
         nginx-globalredirect = handleTest ./nginx-globalredirect.nix {};

     

       800
       800
       +
         nginx = runTest ./nginx.nix;

     

       801
       801
       +
         nginx-auth = runTest ./nginx-auth.nix;

     

       802
       802
       +
         nginx-etag = runTest ./nginx-etag.nix;

     

       803
       803
       +
         nginx-etag-compression = runTest ./nginx-etag-compression.nix;

     

       804
       804
       +
         nginx-globalredirect = runTest ./nginx-globalredirect.nix;

     

       805
       805
        
         nginx-http3 = handleTest ./nginx-http3.nix {};

     

       806
       806
       -
         nginx-mime = handleTest ./nginx-mime.nix {};

     

       807
       807
       -
         nginx-modsecurity = handleTest ./nginx-modsecurity.nix {};

     

       808
       808
       -
         nginx-moreheaders = handleTest ./nginx-moreheaders.nix {};

     

       806
       806
       +
         nginx-mime = runTest ./nginx-mime.nix;

     

       807
       807
       +
         nginx-modsecurity = runTest ./nginx-modsecurity.nix;

     

       808
       808
       +
         nginx-moreheaders = runTest ./nginx-moreheaders.nix;

     

       809
       809
        
         nginx-njs = handleTest ./nginx-njs.nix {};

     

       810
       810
        
         nginx-proxyprotocol = handleTest ./nginx-proxyprotocol {};

     

       811
       811
        
         nginx-pubhtml = handleTest ./nginx-pubhtml.nix {};

     
···

       1258
       1258
        
         umurmur = handleTest ./umurmur.nix {};

     

       1259
       1259
        
         unbound = handleTest ./unbound.nix {};

     

       1260
       1260
        
         unifi = handleTest ./unifi.nix {};

     

       1261
       1261
       -
         unit-php = handleTest ./web-servers/unit-php.nix {};

     

       1261
       1261
       +
         unit-php = runTest ./web-servers/unit-php.nix;

     

       1262
       1262
        
         unit-perl = handleTest ./web-servers/unit-perl.nix {};

     

       1263
       1263
        
         upnp.iptables = handleTest ./upnp.nix { useNftables = false; };

     

       1264
       1264
        
         upnp.nftables = handleTest ./upnp.nix { useNftables = true; };

     
···

       1307
       1307
        
         weblate = handleTest ./web-apps/weblate.nix {};

     

       1308
       1308
        
         whisparr = handleTest ./whisparr.nix {};

     

       1309
       1309
        
         whoogle-search = handleTest ./whoogle-search.nix {};

     

       1310
       1310
       -
         wiki-js = handleTest ./wiki-js.nix {};

     

       1310
       1310
       +
         wiki-js = runTest ./wiki-js.nix;

     

       1311
       1311
        
         wine = handleTest ./wine.nix {};

     

       1312
       1312
        
         wireguard = handleTest ./wireguard {};

     

       1313
       1313
        
         wg-access-server = handleTest ./wg-access-server.nix {};

     
···

       1315
       1315
        
         wmderland = handleTest ./wmderland.nix {};

     

       1316
       1316
        
         workout-tracker = handleTest ./workout-tracker.nix {};

     

       1317
       1317
        
         wpa_supplicant = import ./wpa_supplicant.nix { inherit pkgs runTest; };

     

       1318
       1318
       -
         wordpress = handleTest ./wordpress.nix {};

     

       1318
       1318
       +
         wordpress = runTest ./wordpress.nix;

     

       1319
       1319
        
         wrappers = handleTest ./wrappers.nix {};

     

       1320
       1320
        
         writefreely = handleTest ./web-apps/writefreely.nix {};

     

       1321
       1321
        
         wstunnel = runTest ./wstunnel.nix;

+54 -56

nixos/tests/dolibarr.nix

···

       1
       1
       -
       import ./make-test-python.nix (

     

       2
       2
       -
         { pkgs, lib, ... }:

     

       3
       3
       -
         {

     

       4
       4
       -
           name = "dolibarr";

     

       5
       5
       -
           meta.maintainers = [ ];

     

       1
       1
       +
       { ... }:

     

       2
       2
       +
       {

     

       3
       3
       +
         name = "dolibarr";

     

       4
       4
       +
         meta.maintainers = [ ];

     

       6
       5
        
       

     

       7
       7
       -
           nodes.machine =

     

       8
       8
       -
             { ... }:

     

       9
       9
       -
             {

     

       10
       10
       -
               services.dolibarr = {

     

       11
       11
       -
                 enable = true;

     

       12
       12
       -
                 domain = "localhost";

     

       13
       13
       -
                 nginx = {

     

       14
       14
       -
                   forceSSL = false;

     

       15
       15
       -
                   enableACME = false;

     

       16
       16
       -
                 };

     

       6
       6
       +
         nodes.machine =

     

       7
       7
       +
           { ... }:

     

       8
       8
       +
           {

     

       9
       9
       +
             services.dolibarr = {

     

       10
       10
       +
               enable = true;

     

       11
       11
       +
               domain = "localhost";

     

       12
       12
       +
               nginx = {

     

       13
       13
       +
                 forceSSL = false;

     

       14
       14
       +
                 enableACME = false;

     

       17
       15
        
               };

     

       18
       18
       -
       

     

       19
       19
       -
               networking.firewall.allowedTCPPorts = [ 80 ];

     

       20
       16
        
             };

     

       21
       17
        
       

     

       22
       22
       -
           testScript = ''

     

       23
       23
       -
             from html.parser import HTMLParser

     

       24
       24
       -
             start_all()

     

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

     

       19
       19
       +
           };

     

       25
       20
        
       

     

       26
       26
       -
             csrf_token = None

     

       27
       27
       -
             class TokenParser(HTMLParser):

     

       28
       28
       -
               def handle_starttag(self, tag, attrs):

     

       29
       29
       -
                 attrs = dict(attrs) # attrs is an assoc list originally

     

       30
       30
       -
                 if tag == 'input' and attrs.get('name') == 'token':

     

       31
       31
       -
                     csrf_token = attrs.get('value')

     

       32
       32
       -
                     print(f'[+] Caught CSRF token: {csrf_token}')

     

       33
       33
       -
               def handle_endtag(self, tag): pass

     

       34
       34
       -
               def handle_data(self, data): pass

     

       21
       21
       +
         testScript = ''

     

       22
       22
       +
           from html.parser import HTMLParser

     

       23
       23
       +
           start_all()

     

       35
       24
        
       

     

       36
       36
       -
             machine.wait_for_unit("phpfpm-dolibarr.service")

     

       37
       37
       -
             machine.wait_for_unit("nginx.service")

     

       38
       38
       -
             machine.wait_for_open_port(80)

     

       39
       39
       -
             # Sanity checks on URLs.

     

       40
       40
       -
             # machine.succeed("curl -fL http://localhost/index.php")

     

       41
       41
       -
             # machine.succeed("curl -fL http://localhost/")

     

       42
       42
       -
             # Perform installation.

     

       43
       43
       -
             machine.succeed('curl -fL -X POST http://localhost/install/check.php -F selectlang=auto')

     

       44
       44
       -
             machine.succeed('curl -fL -X POST http://localhost/install/fileconf.php -F selectlang=auto')

     

       45
       45
       -
             # First time is to write the configuration file correctly.

     

       46
       46
       -
             machine.succeed('curl -fL -X POST http://localhost/install/step1.php -F "testpost=ok" -F "action=set" -F "selectlang=auto"')

     

       47
       47
       -
             # Now, we have a proper conf.php in $stateDir.

     

       48
       48
       -
             assert 'nixos' in machine.succeed("cat /var/lib/dolibarr/conf.php")

     

       49
       49
       -
             machine.succeed('curl -fL -X POST http://localhost/install/step2.php --data "testpost=ok&action=set&dolibarr_main_db_character_set=utf8&dolibarr_main_db_collation=utf8_unicode_ci&selectlang=auto"')

     

       50
       50
       -
             machine.succeed('curl -fL -X POST http://localhost/install/step4.php --data "testpost=ok&action=set&selectlang=auto"')

     

       51
       51
       -
             machine.succeed('curl -fL -X POST http://localhost/install/step5.php --data "testpost=ok&action=set&login=root&pass=hunter2&pass_verif=hunter2&selectlang=auto"')

     

       52
       52
       -
             # Now, we have installed the machine, let's verify we still have the right configuration.

     

       53
       53
       -
             assert 'nixos' in machine.succeed("cat /var/lib/dolibarr/conf.php")

     

       54
       54
       -
             # We do not want any redirect now as we have installed the machine.

     

       55
       55
       -
             machine.succeed('curl -f -X GET http://localhost')

     

       56
       56
       -
             # Test authentication to the webservice.

     

       57
       57
       -
             parser = TokenParser()

     

       58
       58
       -
             parser.feed(machine.succeed('curl -f -X GET http://localhost/index.php?mainmenu=login&username=root'))

     

       59
       59
       -
             machine.succeed(f'curl -f -X POST http://localhost/index.php?mainmenu=login&token={csrf_token}&username=root&password=hunter2')

     

       60
       60
       -
           '';

     

       61
       61
       -
         }

     

       62
       62
       -
       )

     

       25
       25
       +
           csrf_token = None

     

       26
       26
       +
           class TokenParser(HTMLParser):

     

       27
       27
       +
             def handle_starttag(self, tag, attrs):

     

       28
       28
       +
               attrs = dict(attrs) # attrs is an assoc list originally

     

       29
       29
       +
               if tag == 'input' and attrs.get('name') == 'token':

     

       30
       30
       +
                   csrf_token = attrs.get('value')

     

       31
       31
       +
                   print(f'[+] Caught CSRF token: {csrf_token}')

     

       32
       32
       +
             def handle_endtag(self, tag): pass

     

       33
       33
       +
             def handle_data(self, data): pass

     

       34
       34
       +
       

     

       35
       35
       +
           machine.wait_for_unit("phpfpm-dolibarr.service")

     

       36
       36
       +
           machine.wait_for_unit("nginx.service")

     

       37
       37
       +
           machine.wait_for_open_port(80)

     

       38
       38
       +
           # Sanity checks on URLs.

     

       39
       39
       +
           # machine.succeed("curl -fL http://localhost/index.php")

     

       40
       40
       +
           # machine.succeed("curl -fL http://localhost/")

     

       41
       41
       +
           # Perform installation.

     

       42
       42
       +
           machine.succeed('curl -fL -X POST http://localhost/install/check.php -F selectlang=auto')

     

       43
       43
       +
           machine.succeed('curl -fL -X POST http://localhost/install/fileconf.php -F selectlang=auto')

     

       44
       44
       +
           # First time is to write the configuration file correctly.

     

       45
       45
       +
           machine.succeed('curl -fL -X POST http://localhost/install/step1.php -F "testpost=ok" -F "action=set" -F "selectlang=auto"')

     

       46
       46
       +
           # Now, we have a proper conf.php in $stateDir.

     

       47
       47
       +
           assert 'nixos' in machine.succeed("cat /var/lib/dolibarr/conf.php")

     

       48
       48
       +
           machine.succeed('curl -fL -X POST http://localhost/install/step2.php --data "testpost=ok&action=set&dolibarr_main_db_character_set=utf8&dolibarr_main_db_collation=utf8_unicode_ci&selectlang=auto"')

     

       49
       49
       +
           machine.succeed('curl -fL -X POST http://localhost/install/step4.php --data "testpost=ok&action=set&selectlang=auto"')

     

       50
       50
       +
           machine.succeed('curl -fL -X POST http://localhost/install/step5.php --data "testpost=ok&action=set&login=root&pass=hunter2&pass_verif=hunter2&selectlang=auto"')

     

       51
       51
       +
           # Now, we have installed the machine, let's verify we still have the right configuration.

     

       52
       52
       +
           assert 'nixos' in machine.succeed("cat /var/lib/dolibarr/conf.php")

     

       53
       53
       +
           # We do not want any redirect now as we have installed the machine.

     

       54
       54
       +
           machine.succeed('curl -f -X GET http://localhost')

     

       55
       55
       +
           # Test authentication to the webservice.

     

       56
       56
       +
           parser = TokenParser()

     

       57
       57
       +
           parser.feed(machine.succeed('curl -f -X GET http://localhost/index.php?mainmenu=login&username=root'))

     

       58
       58
       +
           machine.succeed(f'curl -f -X POST http://localhost/index.php?mainmenu=login&token={csrf_token}&username=root&password=hunter2')

     

       59
       59
       +
         '';

     

       60
       60
       +
       }

+58 -60

nixos/tests/icingaweb2.nix

···

       1
       1
       -
       import ./make-test-python.nix (

     

       2
       2
       -
         { pkgs, ... }:

     

       3
       3
       -
         {

     

       4
       4
       -
           name = "icingaweb2";

     

       5
       5
       -
           meta = {

     

       6
       6
       -
             maintainers = pkgs.lib.teams.helsinki-systems.members;

     

       7
       7
       -
           };

     

       1
       1
       +
       { pkgs, ... }:

     

       2
       2
       +
       {

     

       3
       3
       +
         name = "icingaweb2";

     

       4
       4
       +
         meta = {

     

       5
       5
       +
           maintainers = pkgs.lib.teams.helsinki-systems.members;

     

       6
       6
       +
         };

     

       8
       7
        
       

     

       9
       9
       -
           nodes = {

     

       10
       10
       -
             icingaweb2 =

     

       11
       11
       -
               { config, pkgs, ... }:

     

       12
       12
       -
               {

     

       13
       13
       -
                 services.icingaweb2 = {

     

       14
       14
       -
                   enable = true;

     

       8
       8
       +
         nodes = {

     

       9
       9
       +
           icingaweb2 =

     

       10
       10
       +
             { config, pkgs, ... }:

     

       11
       11
       +
             {

     

       12
       12
       +
               services.icingaweb2 = {

     

       13
       13
       +
                 enable = true;

     

       15
       14
        
       

     

       16
       16
       -
                   modulePackages = with pkgs.icingaweb2Modules; {

     

       17
       17
       -
                     particles = theme-particles;

     

       18
       18
       -
                     spring = theme-spring;

     

       19
       19
       -
                   };

     

       15
       15
       +
                 modulePackages = with pkgs.icingaweb2Modules; {

     

       16
       16
       +
                   particles = theme-particles;

     

       17
       17
       +
                   spring = theme-spring;

     

       18
       18
       +
                 };

     

       20
       19
        
       

     

       21
       21
       -
                   modules = {

     

       22
       22
       -
                     doc.enable = true;

     

       23
       23
       -
                     migrate.enable = true;

     

       24
       24
       -
                     setup.enable = true;

     

       25
       25
       -
                     test.enable = true;

     

       26
       26
       -
                     translation.enable = true;

     

       27
       27
       -
                   };

     

       20
       20
       +
                 modules = {

     

       21
       21
       +
                   doc.enable = true;

     

       22
       22
       +
                   migrate.enable = true;

     

       23
       23
       +
                   setup.enable = true;

     

       24
       24
       +
                   test.enable = true;

     

       25
       25
       +
                   translation.enable = true;

     

       26
       26
       +
                 };

     

       28
       27
        
       

     

       29
       29
       -
                   generalConfig = {

     

       30
       30
       -
                     global = {

     

       31
       31
       -
                       module_path = "${pkgs.icingaweb2}/modules";

     

       32
       32
       -
                     };

     

       28
       28
       +
                 generalConfig = {

     

       29
       29
       +
                   global = {

     

       30
       30
       +
                     module_path = "${pkgs.icingaweb2}/modules";

     

       33
       31
        
                   };

     

       32
       32
       +
                 };

     

       34
       33
        
       

     

       35
       35
       -
                   authentications = {

     

       36
       36
       -
                     icingaweb = {

     

       37
       37
       -
                       backend = "external";

     

       38
       38
       -
                     };

     

       34
       34
       +
                 authentications = {

     

       35
       35
       +
                   icingaweb = {

     

       36
       36
       +
                     backend = "external";

     

       39
       37
        
                   };

     

       38
       38
       +
                 };

     

       40
       39
        
       

     

       41
       41
       -
                   groupBackends = {

     

       42
       42
       -
                     icingaweb = {

     

       43
       43
       -
                       backend = "db";

     

       44
       44
       -
                       resource = "icingaweb_db";

     

       45
       45
       -
                     };

     

       40
       40
       +
                 groupBackends = {

     

       41
       41
       +
                   icingaweb = {

     

       42
       42
       +
                     backend = "db";

     

       43
       43
       +
                     resource = "icingaweb_db";

     

       46
       44
        
                   };

     

       45
       45
       +
                 };

     

       47
       46
        
       

     

       48
       48
       -
                   resources = {

     

       49
       49
       -
                     # Not used, so no DB server needed

     

       50
       50
       -
                     icingaweb_db = {

     

       51
       51
       -
                       type = "db";

     

       52
       52
       -
                       db = "mysql";

     

       53
       53
       -
                       host = "localhost";

     

       54
       54
       -
                       username = "icingaweb2";

     

       55
       55
       -
                       password = "icingaweb2";

     

       56
       56
       -
                       dbname = "icingaweb2";

     

       57
       57
       -
                     };

     

       47
       47
       +
                 resources = {

     

       48
       48
       +
                   # Not used, so no DB server needed

     

       49
       49
       +
                   icingaweb_db = {

     

       50
       50
       +
                     type = "db";

     

       51
       51
       +
                     db = "mysql";

     

       52
       52
       +
                     host = "localhost";

     

       53
       53
       +
                     username = "icingaweb2";

     

       54
       54
       +
                     password = "icingaweb2";

     

       55
       55
       +
                     dbname = "icingaweb2";

     

       58
       56
        
                   };

     

       57
       57
       +
                 };

     

       59
       58
        
       

     

       60
       60
       -
                   roles = {

     

       61
       61
       -
                     Administrators = {

     

       62
       62
       -
                       users = "*";

     

       63
       63
       -
                       permissions = "*";

     

       64
       64
       -
                     };

     

       59
       59
       +
                 roles = {

     

       60
       60
       +
                   Administrators = {

     

       61
       61
       +
                     users = "*";

     

       62
       62
       +
                     permissions = "*";

     

       65
       63
        
                   };

     

       66
       64
        
                 };

     

       67
       65
        
               };

     

       68
       68
       -
           };

     

       66
       66
       +
             };

     

       67
       67
       +
         };

     

       69
       68
        
       

     

       70
       70
       -
           testScript = ''

     

       71
       71
       -
             start_all()

     

       72
       72
       -
             icingaweb2.wait_for_unit("multi-user.target")

     

       73
       73
       -
             icingaweb2.succeed("curl -sSf http://icingaweb2/authentication/login")

     

       74
       74
       -
           '';

     

       75
       75
       -
         }

     

       76
       76
       -
       )

     

       69
       69
       +
         testScript = ''

     

       70
       70
       +
           start_all()

     

       71
       71
       +
           icingaweb2.wait_for_unit("multi-user.target")

     

       72
       72
       +
           icingaweb2.succeed("curl -sSf http://icingaweb2/authentication/login")

     

       73
       73
       +
         '';

     

       74
       74
       +
       }

+44 -46

nixos/tests/nginx-auth.nix

···

       1
       1
       -
       import ./make-test-python.nix (

     

       2
       2
       -
         { pkgs, ... }:

     

       3
       3
       -
         {

     

       4
       4
       -
           name = "nginx-auth";

     

       1
       1
       +
       { pkgs, ... }:

     

       2
       2
       +
       {

     

       3
       3
       +
         name = "nginx-auth";

     

       5
       4
        
       

     

       6
       6
       -
           nodes = {

     

       7
       7
       -
             webserver =

     

       8
       8
       -
               { pkgs, lib, ... }:

     

       9
       9
       -
               {

     

       10
       10
       -
                 services.nginx =

     

       11
       11
       -
                   let

     

       12
       12
       -
                     root = pkgs.runCommand "testdir" { } ''

     

       13
       13
       -
                       mkdir "$out"

     

       14
       14
       -
                       echo hello world > "$out/index.html"

     

       15
       15
       -
                     '';

     

       16
       16
       -
                   in

     

       17
       17
       -
                   {

     

       18
       18
       -
                     enable = true;

     

       5
       5
       +
         nodes = {

     

       6
       6
       +
           webserver =

     

       7
       7
       +
             { pkgs, lib, ... }:

     

       8
       8
       +
             {

     

       9
       9
       +
               services.nginx =

     

       10
       10
       +
                 let

     

       11
       11
       +
                   root = pkgs.runCommand "testdir" { } ''

     

       12
       12
       +
                     mkdir "$out"

     

       13
       13
       +
                     echo hello world > "$out/index.html"

     

       14
       14
       +
                   '';

     

       15
       15
       +
                 in

     

       16
       16
       +
                 {

     

       17
       17
       +
                   enable = true;

     

       19
       18
        
       

     

       20
       20
       -
                     virtualHosts.lockedroot = {

     

       21
       21
       -
                       inherit root;

     

       22
       22
       -
                       basicAuth.alice = "pwofa";

     

       23
       23
       -
                     };

     

       19
       19
       +
                   virtualHosts.lockedroot = {

     

       20
       20
       +
                     inherit root;

     

       21
       21
       +
                     basicAuth.alice = "pwofa";

     

       22
       22
       +
                   };

     

       24
       23
        
       

     

       25
       25
       -
                     virtualHosts.lockedsubdir = {

     

       26
       26
       -
                       inherit root;

     

       27
       27
       -
                       locations."/sublocation/" = {

     

       28
       28
       -
                         alias = "${root}/";

     

       29
       29
       -
                         basicAuth.bob = "pwofb";

     

       30
       30
       -
                       };

     

       24
       24
       +
                   virtualHosts.lockedsubdir = {

     

       25
       25
       +
                     inherit root;

     

       26
       26
       +
                     locations."/sublocation/" = {

     

       27
       27
       +
                       alias = "${root}/";

     

       28
       28
       +
                       basicAuth.bob = "pwofb";

     

       31
       29
        
                     };

     

       32
       30
        
                   };

     

       33
       33
       -
               };

     

       34
       34
       -
           };

     

       31
       31
       +
                 };

     

       32
       32
       +
             };

     

       33
       33
       +
         };

     

       35
       34
        
       

     

       36
       36
       -
           testScript = ''

     

       37
       37
       -
             webserver.wait_for_unit("nginx")

     

       38
       38
       -
             webserver.wait_for_open_port(80)

     

       35
       35
       +
         testScript = ''

     

       36
       36
       +
           webserver.wait_for_unit("nginx")

     

       37
       37
       +
           webserver.wait_for_open_port(80)

     

       39
       38
        
       

     

       40
       40
       -
             webserver.fail("curl --fail --resolve lockedroot:80:127.0.0.1 http://lockedroot")

     

       41
       41
       -
             webserver.succeed(

     

       42
       42
       -
                 "curl --fail --resolve lockedroot:80:127.0.0.1 http://alice:pwofa@lockedroot"

     

       43
       43
       -
             )

     

       39
       39
       +
           webserver.fail("curl --fail --resolve lockedroot:80:127.0.0.1 http://lockedroot")

     

       40
       40
       +
           webserver.succeed(

     

       41
       41
       +
               "curl --fail --resolve lockedroot:80:127.0.0.1 http://alice:pwofa@lockedroot"

     

       42
       42
       +
           )

     

       44
       43
        
       

     

       45
       45
       -
             webserver.succeed("curl --fail --resolve lockedsubdir:80:127.0.0.1 http://lockedsubdir")

     

       46
       46
       -
             webserver.fail(

     

       47
       47
       -
                 "curl --fail --resolve lockedsubdir:80:127.0.0.1 http://lockedsubdir/sublocation/index.html"

     

       48
       48
       -
             )

     

       49
       49
       -
             webserver.succeed(

     

       50
       50
       -
                 "curl --fail --resolve lockedsubdir:80:127.0.0.1 http://bob:pwofb@lockedsubdir/sublocation/index.html"

     

       51
       51
       -
             )

     

       52
       52
       -
           '';

     

       53
       53
       -
         }

     

       54
       54
       -
       )

     

       44
       44
       +
           webserver.succeed("curl --fail --resolve lockedsubdir:80:127.0.0.1 http://lockedsubdir")

     

       45
       45
       +
           webserver.fail(

     

       46
       46
       +
               "curl --fail --resolve lockedsubdir:80:127.0.0.1 http://lockedsubdir/sublocation/index.html"

     

       47
       47
       +
           )

     

       48
       48
       +
           webserver.succeed(

     

       49
       49
       +
               "curl --fail --resolve lockedsubdir:80:127.0.0.1 http://bob:pwofb@lockedsubdir/sublocation/index.html"

     

       50
       50
       +
           )

     

       51
       51
       +
         '';

     

       52
       52
       +
       }

+2 -1

nixos/tests/nginx-etag-compression.nix

···

       1
       1
       -
       import ./make-test-python.nix {

     

       1
       1
       +
       { ... }:

     

       2
       2
       +
       {

     

       2
       3
        
         name = "nginx-etag-compression";

     

       3
       4
        
       

     

       4
       5
        
         nodes.machine =

+3 -2

nixos/tests/nginx-etag.nix

···

       1
       1
       -
       import ./make-test-python.nix {

     

       1
       1
       +
       { ... }:

     

       2
       2
       +
       {

     

       2
       3
        
         name = "nginx-etag";

     

       3
       4
        
       

     

       4
       5
        
         nodes = {

     
···

       85
       86
        
         testScript =

     

       86
       87
        
           { nodes, ... }:

     

       87
       88
        
           let

     

       88
       88
       -
             inherit (nodes.server.config.system.build) toplevel;

     

       89
       89
       +
             inherit (nodes.server.system.build) toplevel;

     

       89
       90
        
             newSystem = "${toplevel}/specialisation/pass-checks";

     

       90
       91
        
           in

     

       91
       92
        
           ''

+22 -24

nixos/tests/nginx-globalredirect.nix

···

       1
       1
       -
       import ./make-test-python.nix (

     

       2
       2
       -
         { pkgs, ... }:

     

       3
       3
       -
         {

     

       4
       4
       -
           name = "nginx-globalredirect";

     

       1
       1
       +
       { ... }:

     

       2
       2
       +
       {

     

       3
       3
       +
         name = "nginx-globalredirect";

     

       5
       4
        
       

     

       6
       6
       -
           nodes = {

     

       7
       7
       -
             webserver =

     

       8
       8
       -
               { pkgs, lib, ... }:

     

       9
       9
       -
               {

     

       10
       10
       -
                 services.nginx = {

     

       11
       11
       -
                   enable = true;

     

       12
       12
       -
                   virtualHosts.localhost = {

     

       13
       13
       -
                     globalRedirect = "other.example.com";

     

       14
       14
       -
                     # Add an exception

     

       15
       15
       -
                     locations."/noredirect".return = "200 'foo'";

     

       16
       16
       -
                   };

     

       5
       5
       +
         nodes = {

     

       6
       6
       +
           webserver =

     

       7
       7
       +
             { pkgs, lib, ... }:

     

       8
       8
       +
             {

     

       9
       9
       +
               services.nginx = {

     

       10
       10
       +
                 enable = true;

     

       11
       11
       +
                 virtualHosts.localhost = {

     

       12
       12
       +
                   globalRedirect = "other.example.com";

     

       13
       13
       +
                   # Add an exception

     

       14
       14
       +
                   locations."/noredirect".return = "200 'foo'";

     

       17
       15
        
                 };

     

       18
       16
        
               };

     

       19
       19
       -
           };

     

       17
       17
       +
             };

     

       18
       18
       +
         };

     

       20
       19
        
       

     

       21
       21
       -
           testScript = ''

     

       22
       22
       -
             webserver.wait_for_unit("nginx")

     

       23
       23
       -
             webserver.wait_for_open_port(80)

     

       20
       20
       +
         testScript = ''

     

       21
       21
       +
           webserver.wait_for_unit("nginx")

     

       22
       22
       +
           webserver.wait_for_open_port(80)

     

       24
       23
        
       

     

       25
       25
       -
             webserver.succeed("curl --fail -si http://localhost/alf | grep '^Location:.*/alf'")

     

       26
       26
       -
             webserver.fail("curl --fail -si http://localhost/noredirect | grep '^Location:'")

     

       27
       27
       -
           '';

     

       28
       28
       -
         }

     

       29
       29
       -
       )

     

       24
       24
       +
           webserver.succeed("curl --fail -si http://localhost/alf | grep '^Location:.*/alf'")

     

       25
       25
       +
           webserver.fail("curl --fail -si http://localhost/noredirect | grep '^Location:'")

     

       26
       26
       +
         '';

     

       27
       27
       +
       }

+21 -23

nixos/tests/nginx-mime.nix

···

       1
       1
       -
       import ./make-test-python.nix (

     

       2
       2
       -
         { lib, pkgs, ... }:

     

       3
       3
       -
         {

     

       4
       4
       -
           name = "nginx-mime";

     

       5
       5
       -
           meta.maintainers = with pkgs.lib.maintainers; [ izorkin ];

     

       1
       1
       +
       { lib, pkgs, ... }:

     

       2
       2
       +
       {

     

       3
       3
       +
         name = "nginx-mime";

     

       4
       4
       +
         meta.maintainers = with pkgs.lib.maintainers; [ izorkin ];

     

       6
       5
        
       

     

       7
       7
       -
           nodes = {

     

       8
       8
       -
             server =

     

       9
       9
       -
               { pkgs, ... }:

     

       10
       10
       -
               {

     

       11
       11
       -
                 services.nginx = {

     

       12
       12
       -
                   enable = true;

     

       13
       13
       -
                   virtualHosts."localhost" = { };

     

       14
       14
       -
                 };

     

       6
       6
       +
         nodes = {

     

       7
       7
       +
           server =

     

       8
       8
       +
             { pkgs, ... }:

     

       9
       9
       +
             {

     

       10
       10
       +
               services.nginx = {

     

       11
       11
       +
                 enable = true;

     

       12
       12
       +
                 virtualHosts."localhost" = { };

     

       15
       13
        
               };

     

       16
       16
       -
           };

     

       14
       14
       +
             };

     

       15
       15
       +
         };

     

       17
       16
        
       

     

       18
       18
       -
           testScript = ''

     

       19
       19
       -
             server.start()

     

       20
       20
       -
             server.wait_for_unit("nginx")

     

       21
       21
       -
             # Check optimal size of types_hash

     

       22
       22
       -
             server.fail("journalctl --unit nginx --grep 'could not build optimal types_hash'")

     

       23
       23
       -
             server.shutdown()

     

       24
       24
       -
           '';

     

       25
       25
       -
         }

     

       26
       26
       -
       )

     

       17
       17
       +
         testScript = ''

     

       18
       18
       +
           server.start()

     

       19
       19
       +
           server.wait_for_unit("nginx")

     

       20
       20
       +
           # Check optimal size of types_hash

     

       21
       21
       +
           server.fail("journalctl --unit nginx --grep 'could not build optimal types_hash'")

     

       22
       22
       +
           server.shutdown()

     

       23
       23
       +
         '';

     

       24
       24
       +
       }

+45 -47

nixos/tests/nginx-modsecurity.nix

···

       1
       1
       -
       import ./make-test-python.nix (

     

       2
       2
       -
         { pkgs, lib, ... }:

     

       3
       3
       -
         {

     

       4
       4
       -
           name = "nginx-modsecurity";

     

       1
       1
       +
       { ... }:

     

       2
       2
       +
       {

     

       3
       3
       +
         name = "nginx-modsecurity";

     

       5
       4
        
       

     

       6
       6
       -
           nodes.machine =

     

       7
       7
       -
             {

     

       8
       8
       -
               config,

     

       9
       9
       -
               lib,

     

       10
       10
       -
               pkgs,

     

       11
       11
       -
               ...

     

       12
       12
       -
             }:

     

       13
       13
       -
             {

     

       14
       14
       -
               services.nginx = {

     

       15
       15
       -
                 enable = true;

     

       16
       16
       -
                 additionalModules = [ pkgs.nginxModules.modsecurity ];

     

       17
       17
       -
                 virtualHosts.localhost =

     

       18
       18
       -
                   let

     

       19
       19
       -
                     modsecurity_conf = pkgs.writeText "modsecurity.conf" ''

     

       20
       20
       -
                       SecRuleEngine On

     

       21
       21
       -
                       SecDefaultAction "phase:1,log,auditlog,deny,status:403"

     

       22
       22
       -
                       SecDefaultAction "phase:2,log,auditlog,deny,status:403"

     

       23
       23
       -
                       SecRule REQUEST_METHOD   "HEAD"        "id:100, phase:1, block"

     

       24
       24
       -
                       SecRule REQUEST_FILENAME "secret.html" "id:101, phase:2, block"

     

       25
       25
       -
                     '';

     

       26
       26
       -
                     testroot = pkgs.runCommand "testroot" { } ''

     

       27
       27
       -
                       mkdir -p $out

     

       28
       28
       -
                       echo "<html><body>Hello World!</body></html>" > $out/index.html

     

       29
       29
       -
                       echo "s3cret" > $out/secret.html

     

       30
       30
       -
                     '';

     

       31
       31
       -
                   in

     

       32
       32
       -
                   {

     

       33
       33
       -
                     root = testroot;

     

       34
       34
       -
                     extraConfig = ''

     

       35
       35
       -
                       modsecurity on;

     

       36
       36
       -
                       modsecurity_rules_file ${modsecurity_conf};

     

       37
       37
       -
                     '';

     

       38
       38
       -
                   };

     

       39
       39
       -
               };

     

       5
       5
       +
         nodes.machine =

     

       6
       6
       +
           {

     

       7
       7
       +
             config,

     

       8
       8
       +
             lib,

     

       9
       9
       +
             pkgs,

     

       10
       10
       +
             ...

     

       11
       11
       +
           }:

     

       12
       12
       +
           {

     

       13
       13
       +
             services.nginx = {

     

       14
       14
       +
               enable = true;

     

       15
       15
       +
               additionalModules = [ pkgs.nginxModules.modsecurity ];

     

       16
       16
       +
               virtualHosts.localhost =

     

       17
       17
       +
                 let

     

       18
       18
       +
                   modsecurity_conf = pkgs.writeText "modsecurity.conf" ''

     

       19
       19
       +
                     SecRuleEngine On

     

       20
       20
       +
                     SecDefaultAction "phase:1,log,auditlog,deny,status:403"

     

       21
       21
       +
                     SecDefaultAction "phase:2,log,auditlog,deny,status:403"

     

       22
       22
       +
                     SecRule REQUEST_METHOD   "HEAD"        "id:100, phase:1, block"

     

       23
       23
       +
                     SecRule REQUEST_FILENAME "secret.html" "id:101, phase:2, block"

     

       24
       24
       +
                   '';

     

       25
       25
       +
                   testroot = pkgs.runCommand "testroot" { } ''

     

       26
       26
       +
                     mkdir -p $out

     

       27
       27
       +
                     echo "<html><body>Hello World!</body></html>" > $out/index.html

     

       28
       28
       +
                     echo "s3cret" > $out/secret.html

     

       29
       29
       +
                   '';

     

       30
       30
       +
                 in

     

       31
       31
       +
                 {

     

       32
       32
       +
                   root = testroot;

     

       33
       33
       +
                   extraConfig = ''

     

       34
       34
       +
                     modsecurity on;

     

       35
       35
       +
                     modsecurity_rules_file ${modsecurity_conf};

     

       36
       36
       +
                   '';

     

       37
       37
       +
                 };

     

       40
       38
        
             };

     

       41
       41
       -
           testScript = ''

     

       42
       42
       -
             machine.wait_for_unit("nginx")

     

       39
       39
       +
           };

     

       40
       40
       +
         testScript = ''

     

       41
       41
       +
           machine.wait_for_unit("nginx")

     

       43
       42
        
       

     

       44
       44
       -
             response = machine.wait_until_succeeds("curl -fvvv -s http://127.0.0.1/")

     

       45
       45
       -
             assert "Hello World!" in response

     

       43
       43
       +
           response = machine.wait_until_succeeds("curl -fvvv -s http://127.0.0.1/")

     

       44
       44
       +
           assert "Hello World!" in response

     

       46
       45
        
       

     

       47
       47
       -
             machine.fail("curl -fvvv -X HEAD -s http://127.0.0.1/")

     

       48
       48
       -
             machine.fail("curl -fvvv -s http://127.0.0.1/secret.html")

     

       49
       49
       -
           '';

     

       50
       50
       -
         }

     

       51
       51
       -
       )

     

       46
       46
       +
           machine.fail("curl -fvvv -X HEAD -s http://127.0.0.1/")

     

       47
       47
       +
           machine.fail("curl -fvvv -s http://127.0.0.1/secret.html")

     

       48
       48
       +
         '';

     

       49
       49
       +
       }

+2 -1

nixos/tests/nginx-moreheaders.nix

···

       1
       1
       -
       import ./make-test-python.nix {

     

       1
       1
       +
       { ... }:

     

       2
       2
       +
       {

     

       2
       3
        
         name = "nginx-more-headers";

     

       3
       4
        
       

     

       4
       5
        
         nodes = {

+119 -103

nixos/tests/nginx.nix

···

       4
       4
        
       #   2. whether the ETag header is properly generated whenever we're serving

     

       5
       5
        
       #      files in Nix store paths

     

       6
       6
        
       #   3. nginx doesn't restart on configuration changes (only reloads)

     

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

     

       7
       7
       +
       { pkgs, ... }:

     

       8
       8
       +
       {

     

       8
       9
        
         name = "nginx";

     

       9
       10
        
         meta = with pkgs.lib.maintainers; {

     

       10
       10
       -
           maintainers = [ mbbx6spp danbst ];

     

       11
       11
       +
           maintainers = [

     

       12
       12
       +
             mbbx6spp

     

       13
       13
       +
             danbst

     

       14
       14
       +
           ];

     

       11
       15
        
         };

     

       12
       16
        
       

     

       13
       17
        
         nodes = {

     

       14
       14
       -
           webserver = { pkgs, lib, ... }: {

     

       15
       15
       -
             services.nginx.enable = true;

     

       16
       16
       -
             services.nginx.commonHttpConfig = ''

     

       17
       17
       -
               log_format ceeformat '@cee: {"status":"$status",'

     

       18
       18
       -
                 '"request_time":$request_time,'

     

       19
       19
       -
                 '"upstream_response_time":$upstream_response_time,'

     

       20
       20
       -
                 '"pipe":"$pipe","bytes_sent":$bytes_sent,'

     

       21
       21
       -
                 '"connection":"$connection",'

     

       22
       22
       -
                 '"remote_addr":"$remote_addr",'

     

       23
       23
       -
                 '"host":"$host",'

     

       24
       24
       -
                 '"timestamp":"$time_iso8601",'

     

       25
       25
       -
                 '"request":"$request",'

     

       26
       26
       -
                 '"http_referer":"$http_referer",'

     

       27
       27
       -
                 '"upstream_addr":"$upstream_addr"}';

     

       28
       28
       -
             '';

     

       29
       29
       -
             services.nginx.virtualHosts."0.my.test" = {

     

       30
       30
       -
               extraConfig = ''

     

       31
       31
       -
                 access_log syslog:server=unix:/dev/log,facility=user,tag=mytag,severity=info ceeformat;

     

       32
       32
       -
                 location /favicon.ico { allow all; access_log off; log_not_found off; }

     

       18
       18
       +
           webserver =

     

       19
       19
       +
             { pkgs, lib, ... }:

     

       20
       20
       +
             {

     

       21
       21
       +
               services.nginx.enable = true;

     

       22
       22
       +
               services.nginx.commonHttpConfig = ''

     

       23
       23
       +
                 log_format ceeformat '@cee: {"status":"$status",'

     

       24
       24
       +
                   '"request_time":$request_time,'

     

       25
       25
       +
                   '"upstream_response_time":$upstream_response_time,'

     

       26
       26
       +
                   '"pipe":"$pipe","bytes_sent":$bytes_sent,'

     

       27
       27
       +
                   '"connection":"$connection",'

     

       28
       28
       +
                   '"remote_addr":"$remote_addr",'

     

       29
       29
       +
                   '"host":"$host",'

     

       30
       30
       +
                   '"timestamp":"$time_iso8601",'

     

       31
       31
       +
                   '"request":"$request",'

     

       32
       32
       +
                   '"http_referer":"$http_referer",'

     

       33
       33
       +
                   '"upstream_addr":"$upstream_addr"}';

     

       33
       34
        
               '';

     

       34
       34
       -
             };

     

       35
       35
       +
               services.nginx.virtualHosts."0.my.test" = {

     

       36
       36
       +
                 extraConfig = ''

     

       37
       37
       +
                   access_log syslog:server=unix:/dev/log,facility=user,tag=mytag,severity=info ceeformat;

     

       38
       38
       +
                   location /favicon.ico { allow all; access_log off; log_not_found off; }

     

       39
       39
       +
                 '';

     

       40
       40
       +
               };

     

       35
       41
        
       

     

       36
       36
       -
             services.nginx.virtualHosts.localhost = {

     

       37
       37
       -
               root = pkgs.runCommand "testdir" {} ''

     

       38
       38
       -
                 mkdir "$out"

     

       39
       39
       -
                 echo hello world > "$out/index.html"

     

       40
       40
       -
               '';

     

       41
       41
       -
             };

     

       42
       42
       +
               services.nginx.virtualHosts.localhost = {

     

       43
       43
       +
                 root = pkgs.runCommand "testdir" { } ''

     

       44
       44
       +
                   mkdir "$out"

     

       45
       45
       +
                   echo hello world > "$out/index.html"

     

       46
       46
       +
                 '';

     

       47
       47
       +
               };

     

       42
       48
        
       

     

       43
       43
       -
             services.nginx.enableReload = true;

     

       49
       49
       +
               services.nginx.enableReload = true;

     

       44
       50
        
       

     

       45
       45
       -
             specialisation.etagSystem.configuration = {

     

       46
       46
       -
               services.nginx.virtualHosts.localhost = {

     

       47
       47
       -
                 root = lib.mkForce (pkgs.runCommand "testdir2" {} ''

     

       48
       48
       -
                   mkdir "$out"

     

       49
       49
       -
                   echo content changed > "$out/index.html"

     

       50
       50
       -
                 '');

     

       51
       51
       +
               specialisation.etagSystem.configuration = {

     

       52
       52
       +
                 services.nginx.virtualHosts.localhost = {

     

       53
       53
       +
                   root = lib.mkForce (

     

       54
       54
       +
                     pkgs.runCommand "testdir2" { } ''

     

       55
       55
       +
                       mkdir "$out"

     

       56
       56
       +
                       echo content changed > "$out/index.html"

     

       57
       57
       +
                     ''

     

       58
       58
       +
                   );

     

       59
       59
       +
                 };

     

       51
       60
        
               };

     

       52
       52
       -
             };

     

       53
       61
        
       

     

       54
       54
       -
             specialisation.justReloadSystem.configuration = {

     

       55
       55
       -
               services.nginx.virtualHosts."1.my.test".listen = [ { addr = "127.0.0.1"; port = 8080; }];

     

       56
       56
       -
             };

     

       62
       62
       +
               specialisation.justReloadSystem.configuration = {

     

       63
       63
       +
                 services.nginx.virtualHosts."1.my.test".listen = [

     

       64
       64
       +
                   {

     

       65
       65
       +
                     addr = "127.0.0.1";

     

       66
       66
       +
                     port = 8080;

     

       67
       67
       +
                   }

     

       68
       68
       +
                 ];

     

       69
       69
       +
               };

     

       57
       70
        
       

     

       58
       58
       -
             specialisation.reloadRestartSystem.configuration = {

     

       59
       59
       -
               services.nginx.package = pkgs.nginxMainline;

     

       60
       60
       -
             };

     

       71
       71
       +
               specialisation.reloadRestartSystem.configuration = {

     

       72
       72
       +
                 services.nginx.package = pkgs.nginxMainline;

     

       73
       73
       +
               };

     

       61
       74
        
       

     

       62
       62
       -
             specialisation.reloadWithErrorsSystem.configuration = {

     

       63
       63
       -
               services.nginx.package = pkgs.nginxMainline;

     

       64
       64
       -
               services.nginx.virtualHosts."!@$$(#*%".locations."~@#*$*!)".proxyPass = ";;;";

     

       75
       75
       +
               specialisation.reloadWithErrorsSystem.configuration = {

     

       76
       76
       +
                 services.nginx.package = pkgs.nginxMainline;

     

       77
       77
       +
                 services.nginx.virtualHosts."!@$$(#*%".locations."~@#*$*!)".proxyPass = ";;;";

     

       78
       78
       +
               };

     

       65
       79
        
             };

     

       66
       66
       -
           };

     

       67
       80
        
         };

     

       68
       81
        
       

     

       69
       69
       -
         testScript = { nodes, ... }: let

     

       70
       70
       -
           etagSystem = "${nodes.webserver.system.build.toplevel}/specialisation/etagSystem";

     

       71
       71
       -
           justReloadSystem = "${nodes.webserver.system.build.toplevel}/specialisation/justReloadSystem";

     

       72
       72
       -
           reloadRestartSystem = "${nodes.webserver.system.build.toplevel}/specialisation/reloadRestartSystem";

     

       73
       73
       -
           reloadWithErrorsSystem = "${nodes.webserver.system.build.toplevel}/specialisation/reloadWithErrorsSystem";

     

       74
       74
       -
         in ''

     

       75
       75
       -
           url = "http://localhost/index.html"

     

       82
       82
       +
         testScript =

     

       83
       83
       +
           { nodes, ... }:

     

       84
       84
       +
           let

     

       85
       85
       +
             etagSystem = "${nodes.webserver.system.build.toplevel}/specialisation/etagSystem";

     

       86
       86
       +
             justReloadSystem = "${nodes.webserver.system.build.toplevel}/specialisation/justReloadSystem";

     

       87
       87
       +
             reloadRestartSystem = "${nodes.webserver.system.build.toplevel}/specialisation/reloadRestartSystem";

     

       88
       88
       +
             reloadWithErrorsSystem = "${nodes.webserver.system.build.toplevel}/specialisation/reloadWithErrorsSystem";

     

       89
       89
       +
           in

     

       90
       90
       +
           ''

     

       91
       91
       +
             url = "http://localhost/index.html"

     

       76
       92
        
       

     

       77
       93
        
       

     

       78
       78
       -
           def check_etag():

     

       79
       79
       -
               etag = webserver.succeed(

     

       80
       80
       -
                   f'curl -v {url} 2>&1 | sed -n -e "s/^< etag: *//ip"'

     

       81
       81
       -
               ).rstrip()

     

       82
       82
       -
               http_code = webserver.succeed(

     

       83
       83
       -
                   f"curl -w '%{{http_code}}' --head --fail -H 'If-None-Match: {etag}' {url}"

     

       84
       84
       -
               )

     

       85
       85
       -
               assert http_code.split("\n")[-1] == "304"

     

       94
       94
       +
             def check_etag():

     

       95
       95
       +
                 etag = webserver.succeed(

     

       96
       96
       +
                     f'curl -v {url} 2>&1 | sed -n -e "s/^< etag: *//ip"'

     

       97
       97
       +
                 ).rstrip()

     

       98
       98
       +
                 http_code = webserver.succeed(

     

       99
       99
       +
                     f"curl -w '%{{http_code}}' --head --fail -H 'If-None-Match: {etag}' {url}"

     

       100
       100
       +
                 )

     

       101
       101
       +
                 assert http_code.split("\n")[-1] == "304"

     

       86
       102
        
       

     

       87
       87
       -
               return etag

     

       103
       103
       +
                 return etag

     

       88
       104
        
       

     

       89
       105
        
       

     

       90
       90
       -
           def wait_for_nginx_on_port(port):

     

       91
       91
       -
               webserver.wait_for_unit("nginx")

     

       92
       92
       -
               webserver.wait_for_open_port(port)

     

       106
       106
       +
             def wait_for_nginx_on_port(port):

     

       107
       107
       +
                 webserver.wait_for_unit("nginx")

     

       108
       108
       +
                 webserver.wait_for_open_port(port)

     

       93
       109
        
       

     

       94
       110
        
       

     

       95
       95
       -
           # nginx can be ready before multi-user.target, in which case switching to

     

       96
       96
       -
           # a different configuration might not realize it needs to restart nginx.

     

       97
       97
       -
           webserver.wait_for_unit("multi-user.target")

     

       111
       111
       +
             # nginx can be ready before multi-user.target, in which case switching to

     

       112
       112
       +
             # a different configuration might not realize it needs to restart nginx.

     

       113
       113
       +
             webserver.wait_for_unit("multi-user.target")

     

       98
       114
        
       

     

       99
       99
       -
           wait_for_nginx_on_port(80)

     

       115
       115
       +
             wait_for_nginx_on_port(80)

     

       100
       116
        
       

     

       101
       101
       -
           with subtest("check ETag if serving Nix store paths"):

     

       102
       102
       -
               old_etag = check_etag()

     

       103
       103
       -
               webserver.succeed(

     

       104
       104
       -
                   "${etagSystem}/bin/switch-to-configuration test >&2"

     

       105
       105
       -
               )

     

       106
       106
       -
               wait_for_nginx_on_port(80)

     

       107
       107
       -
               new_etag = check_etag()

     

       108
       108
       -
               assert old_etag != new_etag

     

       117
       117
       +
             with subtest("check ETag if serving Nix store paths"):

     

       118
       118
       +
                 old_etag = check_etag()

     

       119
       119
       +
                 webserver.succeed(

     

       120
       120
       +
                     "${etagSystem}/bin/switch-to-configuration test >&2"

     

       121
       121
       +
                 )

     

       122
       122
       +
                 wait_for_nginx_on_port(80)

     

       123
       123
       +
                 new_etag = check_etag()

     

       124
       124
       +
                 assert old_etag != new_etag

     

       109
       125
        
       

     

       110
       110
       -
           with subtest("config is reloaded on nixos-rebuild switch"):

     

       111
       111
       -
               webserver.succeed(

     

       112
       112
       -
                   "${justReloadSystem}/bin/switch-to-configuration test >&2"

     

       113
       113
       -
               )

     

       114
       114
       -
               wait_for_nginx_on_port(8080)

     

       115
       115
       -
               webserver.fail("journalctl -u nginx | grep -q -i stopped")

     

       116
       116
       -
               webserver.succeed("journalctl -u nginx | grep -q -i reloaded")

     

       126
       126
       +
             with subtest("config is reloaded on nixos-rebuild switch"):

     

       127
       127
       +
                 webserver.succeed(

     

       128
       128
       +
                     "${justReloadSystem}/bin/switch-to-configuration test >&2"

     

       129
       129
       +
                 )

     

       130
       130
       +
                 wait_for_nginx_on_port(8080)

     

       131
       131
       +
                 webserver.fail("journalctl -u nginx | grep -q -i stopped")

     

       132
       132
       +
                 webserver.succeed("journalctl -u nginx | grep -q -i reloaded")

     

       117
       133
        
       

     

       118
       118
       -
           with subtest("restart when nginx package changes"):

     

       119
       119
       -
               webserver.succeed(

     

       120
       120
       -
                   "${reloadRestartSystem}/bin/switch-to-configuration test >&2"

     

       121
       121
       -
               )

     

       122
       122
       -
               wait_for_nginx_on_port(80)

     

       123
       123
       -
               webserver.succeed("journalctl -u nginx | grep -q -i stopped")

     

       134
       134
       +
             with subtest("restart when nginx package changes"):

     

       135
       135
       +
                 webserver.succeed(

     

       136
       136
       +
                     "${reloadRestartSystem}/bin/switch-to-configuration test >&2"

     

       137
       137
       +
                 )

     

       138
       138
       +
                 wait_for_nginx_on_port(80)

     

       139
       139
       +
                 webserver.succeed("journalctl -u nginx | grep -q -i stopped")

     

       124
       140
        
       

     

       125
       125
       -
           with subtest("nixos-rebuild --switch should fail when there are configuration errors"):

     

       126
       126
       -
               webserver.fail(

     

       127
       127
       -
                   "${reloadWithErrorsSystem}/bin/switch-to-configuration test >&2"

     

       128
       128
       -
               )

     

       129
       129
       -
               webserver.succeed("[[ $(systemctl is-failed nginx-config-reload) == failed ]]")

     

       130
       130
       -
               webserver.succeed("[[ $(systemctl is-failed nginx) == active ]]")

     

       131
       131
       -
               # just to make sure operation is idempotent. During development I had a situation

     

       132
       132
       -
               # when first time it shows error, but stops showing it on subsequent rebuilds

     

       133
       133
       -
               webserver.fail(

     

       134
       134
       -
                   "${reloadWithErrorsSystem}/bin/switch-to-configuration test >&2"

     

       135
       135
       -
               )

     

       136
       136
       -
         '';

     

       137
       137
       -
       })

     

       141
       141
       +
             with subtest("nixos-rebuild --switch should fail when there are configuration errors"):

     

       142
       142
       +
                 webserver.fail(

     

       143
       143
       +
                     "${reloadWithErrorsSystem}/bin/switch-to-configuration test >&2"

     

       144
       144
       +
                 )

     

       145
       145
       +
                 webserver.succeed("[[ $(systemctl is-failed nginx-config-reload) == failed ]]")

     

       146
       146
       +
                 webserver.succeed("[[ $(systemctl is-failed nginx) == active ]]")

     

       147
       147
       +
                 # just to make sure operation is idempotent. During development I had a situation

     

       148
       148
       +
                 # when first time it shows error, but stops showing it on subsequent rebuilds

     

       149
       149
       +
                 webserver.fail(

     

       150
       150
       +
                     "${reloadWithErrorsSystem}/bin/switch-to-configuration test >&2"

     

       151
       151
       +
                 )

     

       152
       152
       +
           '';

     

       153
       153
       +
       }

+31 -33

nixos/tests/web-apps/monica.nix

···

       1
       1
       -
       import ../make-test-python.nix (

     

       2
       2
       -
         { pkgs, ... }:

     

       3
       3
       -
         let

     

       4
       4
       -
           cert = pkgs.runCommand "selfSignedCerts" { nativeBuildInputs = [ pkgs.openssl ]; } ''

     

       5
       5
       -
             openssl req -x509 -newkey rsa:4096 -keyout key.pem -out cert.pem -nodes -subj '/CN=localhost' -days 36500

     

       6
       6
       -
             mkdir -p $out

     

       7
       7
       -
             cp key.pem cert.pem $out

     

       8
       8
       -
           '';

     

       9
       9
       -
         in

     

       10
       10
       -
         {

     

       11
       11
       -
           name = "monica";

     

       1
       1
       +
       { pkgs, ... }:

     

       2
       2
       +
       let

     

       3
       3
       +
         cert = pkgs.runCommand "selfSignedCerts" { nativeBuildInputs = [ pkgs.openssl ]; } ''

     

       4
       4
       +
           openssl req -x509 -newkey rsa:4096 -keyout key.pem -out cert.pem -nodes -subj '/CN=localhost' -days 36500

     

       5
       5
       +
           mkdir -p $out

     

       6
       6
       +
           cp key.pem cert.pem $out

     

       7
       7
       +
         '';

     

       8
       8
       +
       in

     

       9
       9
       +
       {

     

       10
       10
       +
         name = "monica";

     

       12
       11
        
       

     

       13
       13
       -
           nodes = {

     

       14
       14
       -
             machine =

     

       15
       15
       -
               { pkgs, ... }:

     

       16
       16
       -
               {

     

       17
       17
       -
                 services.monica = {

     

       18
       18
       -
                   enable = true;

     

       19
       19
       -
                   hostname = "localhost";

     

       20
       20
       -
                   appKeyFile = "${pkgs.writeText "keyfile" "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"}";

     

       21
       21
       -
                   nginx = {

     

       22
       22
       -
                     forceSSL = true;

     

       23
       23
       -
                     sslCertificate = "${cert}/cert.pem";

     

       24
       24
       -
                     sslCertificateKey = "${cert}/key.pem";

     

       25
       25
       -
                   };

     

       12
       12
       +
         nodes = {

     

       13
       13
       +
           machine =

     

       14
       14
       +
             { pkgs, ... }:

     

       15
       15
       +
             {

     

       16
       16
       +
               services.monica = {

     

       17
       17
       +
                 enable = true;

     

       18
       18
       +
                 hostname = "localhost";

     

       19
       19
       +
                 appKeyFile = "${pkgs.writeText "keyfile" "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"}";

     

       20
       20
       +
                 nginx = {

     

       21
       21
       +
                   forceSSL = true;

     

       22
       22
       +
                   sslCertificate = "${cert}/cert.pem";

     

       23
       23
       +
                   sslCertificateKey = "${cert}/key.pem";

     

       26
       24
        
                 };

     

       27
       25
        
               };

     

       28
       28
       -
           };

     

       26
       26
       +
             };

     

       27
       27
       +
         };

     

       29
       28
        
       

     

       30
       30
       -
           testScript = ''

     

       31
       31
       -
             start_all()

     

       32
       32
       -
             machine.wait_for_unit("monica-setup.service")

     

       33
       33
       -
             machine.wait_for_open_port(443)

     

       34
       34
       -
             machine.succeed("curl -k --fail https://localhost", timeout=10)

     

       35
       35
       -
           '';

     

       36
       36
       -
         }

     

       37
       37
       -
       )

     

       29
       29
       +
         testScript = ''

     

       30
       30
       +
           start_all()

     

       31
       31
       +
           machine.wait_for_unit("monica-setup.service")

     

       32
       32
       +
           machine.wait_for_open_port(443)

     

       33
       33
       +
           machine.succeed("curl -k --fail https://localhost", timeout=10)

     

       34
       34
       +
         '';

     

       35
       35
       +
       }

+50 -52

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

···

       1
       1
       -
       import ../make-test-python.nix (

     

       2
       2
       -
         { pkgs, ... }:

     

       3
       3
       -
         let

     

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

     

       1
       1
       +
       { pkgs, ... }:

     

       2
       2
       +
       let

     

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

     

       5
       4
        
       

     

       6
       6
       -
         in

     

       7
       7
       -
         {

     

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

     

       9
       9
       -
           meta.maintainers = with pkgs.lib.maintainers; [ izorkin ];

     

       5
       5
       +
       in

     

       6
       6
       +
       {

     

       7
       7
       +
         name = "unit-php-test";

     

       8
       8
       +
         meta.maintainers = with pkgs.lib.maintainers; [ izorkin ];

     

       10
       9
        
       

     

       11
       11
       -
           nodes.machine =

     

       12
       12
       -
             {

     

       13
       13
       -
               config,

     

       14
       14
       -
               lib,

     

       15
       15
       -
               pkgs,

     

       16
       16
       -
               ...

     

       17
       17
       -
             }:

     

       18
       18
       -
             {

     

       19
       19
       -
               services.unit = {

     

       20
       20
       -
                 enable = true;

     

       21
       21
       -
                 config = pkgs.lib.strings.toJSON {

     

       22
       22
       -
                   listeners."*:9081".application = "php_81";

     

       23
       23
       -
                   applications.php_81 = {

     

       24
       24
       -
                     type = "php 8.1";

     

       25
       25
       -
                     processes = 1;

     

       26
       26
       -
                     user = "testuser";

     

       27
       27
       -
                     group = "testgroup";

     

       28
       28
       -
                     root = "${testdir}/www";

     

       29
       29
       -
                     index = "info.php";

     

       30
       30
       -
                     options.file = "${pkgs.unit.usedPhp81}/lib/php.ini";

     

       31
       31
       -
                   };

     

       32
       32
       -
                 };

     

       33
       33
       -
               };

     

       34
       34
       -
               users = {

     

       35
       35
       -
                 users.testuser = {

     

       36
       36
       -
                   isSystemUser = true;

     

       37
       37
       -
                   uid = 1080;

     

       10
       10
       +
         nodes.machine =

     

       11
       11
       +
           {

     

       12
       12
       +
             config,

     

       13
       13
       +
             lib,

     

       14
       14
       +
             pkgs,

     

       15
       15
       +
             ...

     

       16
       16
       +
           }:

     

       17
       17
       +
           {

     

       18
       18
       +
             services.unit = {

     

       19
       19
       +
               enable = true;

     

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

     

       21
       21
       +
                 listeners."*:9081".application = "php_81";

     

       22
       22
       +
                 applications.php_81 = {

     

       23
       23
       +
                   type = "php 8.1";

     

       24
       24
       +
                   processes = 1;

     

       25
       25
       +
                   user = "testuser";

     

       38
       26
        
                   group = "testgroup";

     

       39
       39
       -
                 };

     

       40
       40
       -
                 groups.testgroup = {

     

       41
       41
       -
                   gid = 1080;

     

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

     

       28
       28
       +
                   index = "info.php";

     

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

     

       42
       30
        
                 };

     

       43
       31
        
               };

     

       44
       32
        
             };

     

       45
       45
       -
           testScript = ''

     

       46
       46
       -
             machine.start()

     

       33
       33
       +
             users = {

     

       34
       34
       +
               users.testuser = {

     

       35
       35
       +
                 isSystemUser = true;

     

       36
       36
       +
                 uid = 1080;

     

       37
       37
       +
                 group = "testgroup";

     

       38
       38
       +
               };

     

       39
       39
       +
               groups.testgroup = {

     

       40
       40
       +
                 gid = 1080;

     

       41
       41
       +
               };

     

       42
       42
       +
             };

     

       43
       43
       +
           };

     

       44
       44
       +
         testScript = ''

     

       45
       45
       +
           machine.start()

     

       47
       46
        
       

     

       48
       48
       -
             machine.wait_for_unit("unit.service")

     

       49
       49
       -
             machine.wait_for_open_port(9081)

     

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

     

       48
       48
       +
           machine.wait_for_open_port(9081)

     

       50
       49
        
       

     

       51
       51
       -
             # Check so we get an evaluated PHP back

     

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

     

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

     

       50
       50
       +
           # Check so we get an evaluated PHP back

     

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

     

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

     

       54
       53
        
       

     

       55
       55
       -
             # Check so we have database and some other extensions loaded

     

       56
       56
       -
             for ext in ["json", "opcache", "pdo_mysql", "pdo_pgsql", "pdo_sqlite"]:

     

       57
       57
       -
                 assert ext in response, f"Missing {ext} extension"

     

       54
       54
       +
           # Check so we have database and some other extensions loaded

     

       55
       55
       +
           for ext in ["json", "opcache", "pdo_mysql", "pdo_pgsql", "pdo_sqlite"]:

     

       56
       56
       +
               assert ext in response, f"Missing {ext} extension"

     

       58
       57
        
       

     

       59
       59
       -
             machine.shutdown()

     

       60
       60
       -
           '';

     

       61
       61
       -
         }

     

       62
       62
       -
       )

     

       58
       58
       +
           machine.shutdown()

     

       59
       59
       +
         '';

     

       60
       60
       +
       }

+149 -151

nixos/tests/wiki-js.nix

···

       1
       1
       -
       import ./make-test-python.nix (

     

       2
       2
       -
         { pkgs, lib, ... }:

     

       3
       3
       -
         {

     

       4
       4
       -
           name = "wiki-js";

     

       5
       5
       -
           meta = with pkgs.lib.maintainers; {

     

       6
       6
       -
             maintainers = [ ma27 ];

     

       7
       7
       -
           };

     

       1
       1
       +
       { pkgs, ... }:

     

       2
       2
       +
       {

     

       3
       3
       +
         name = "wiki-js";

     

       4
       4
       +
         meta = with pkgs.lib.maintainers; {

     

       5
       5
       +
           maintainers = [ ma27 ];

     

       6
       6
       +
         };

     

       8
       7
        
       

     

       9
       9
       -
           nodes.machine =

     

       10
       10
       -
             { pkgs, ... }:

     

       11
       11
       -
             {

     

       12
       12
       -
               virtualisation.memorySize = 2047;

     

       13
       13
       -
               services.wiki-js = {

     

       14
       14
       -
                 enable = true;

     

       15
       15
       -
                 settings.db.host = "/run/postgresql";

     

       16
       16
       -
                 settings.db.user = "wiki-js";

     

       17
       17
       -
                 settings.db.db = "wiki-js";

     

       18
       18
       -
                 settings.logLevel = "debug";

     

       19
       19
       -
               };

     

       20
       20
       -
               services.postgresql = {

     

       21
       21
       -
                 enable = true;

     

       22
       22
       -
                 ensureDatabases = [ "wiki-js" ];

     

       23
       23
       -
                 ensureUsers = [

     

       24
       24
       -
                   {

     

       25
       25
       -
                     name = "wiki-js";

     

       26
       26
       -
                     ensureDBOwnership = true;

     

       27
       27
       -
                   }

     

       28
       28
       -
                 ];

     

       29
       29
       -
               };

     

       30
       30
       -
               systemd.services.wiki-js = {

     

       31
       31
       -
                 requires = [ "postgresql.service" ];

     

       32
       32
       -
                 after = [ "postgresql.service" ];

     

       33
       33
       -
               };

     

       34
       34
       -
               environment.systemPackages = with pkgs; [ jq ];

     

       8
       8
       +
         nodes.machine =

     

       9
       9
       +
           { pkgs, ... }:

     

       10
       10
       +
           {

     

       11
       11
       +
             virtualisation.memorySize = 2047;

     

       12
       12
       +
             services.wiki-js = {

     

       13
       13
       +
               enable = true;

     

       14
       14
       +
               settings.db.host = "/run/postgresql";

     

       15
       15
       +
               settings.db.user = "wiki-js";

     

       16
       16
       +
               settings.db.db = "wiki-js";

     

       17
       17
       +
               settings.logLevel = "debug";

     

       35
       18
        
             };

     

       36
       36
       -
       

     

       37
       37
       -
           testScript =

     

       38
       38
       -
             let

     

       39
       39
       -
               payloads.finalize = pkgs.writeText "finalize.json" (

     

       40
       40
       -
                 builtins.toJSON {

     

       41
       41
       -
                   adminEmail = "webmaster@example.com";

     

       42
       42
       -
                   adminPassword = "notapassword";

     

       43
       43
       -
                   adminPasswordConfirm = "notapassword";

     

       44
       44
       -
                   siteUrl = "http://localhost:3000";

     

       45
       45
       -
                   telemetry = false;

     

       19
       19
       +
             services.postgresql = {

     

       20
       20
       +
               enable = true;

     

       21
       21
       +
               ensureDatabases = [ "wiki-js" ];

     

       22
       22
       +
               ensureUsers = [

     

       23
       23
       +
                 {

     

       24
       24
       +
                   name = "wiki-js";

     

       25
       25
       +
                   ensureDBOwnership = true;

     

       46
       26
        
                 }

     

       47
       47
       -
               );

     

       48
       48
       -
               payloads.login = pkgs.writeText "login.json" (

     

       49
       49
       -
                 builtins.toJSON [

     

       50
       50
       -
                   {

     

       51
       51
       -
                     operationName = null;

     

       52
       52
       -
                     extensions = { };

     

       53
       53
       -
                     query = ''

     

       54
       54
       -
                       mutation ($username: String!, $password: String!, $strategy: String!) {

     

       55
       55
       -
                         authentication {

     

       56
       56
       -
                           login(username: $username, password: $password, strategy: $strategy) {

     

       57
       57
       -
                             responseResult {

     

       58
       58
       -
                               succeeded

     

       59
       59
       -
                               errorCode

     

       60
       60
       -
                               slug

     

       61
       61
       -
                               message

     

       62
       62
       -
                               __typename

     

       63
       63
       -
                             }

     

       64
       64
       -
                             jwt

     

       65
       65
       -
                             mustChangePwd

     

       66
       66
       -
                             mustProvideTFA

     

       67
       67
       -
                             mustSetupTFA

     

       68
       68
       -
                             continuationToken

     

       69
       69
       -
                             redirect

     

       70
       70
       -
                             tfaQRImage

     

       27
       27
       +
               ];

     

       28
       28
       +
             };

     

       29
       29
       +
             systemd.services.wiki-js = {

     

       30
       30
       +
               requires = [ "postgresql.service" ];

     

       31
       31
       +
               after = [ "postgresql.service" ];

     

       32
       32
       +
             };

     

       33
       33
       +
             environment.systemPackages = with pkgs; [ jq ];

     

       34
       34
       +
           };

     

       35
       35
       +
       

     

       36
       36
       +
         testScript =

     

       37
       37
       +
           let

     

       38
       38
       +
             payloads.finalize = pkgs.writeText "finalize.json" (

     

       39
       39
       +
               builtins.toJSON {

     

       40
       40
       +
                 adminEmail = "webmaster@example.com";

     

       41
       41
       +
                 adminPassword = "notapassword";

     

       42
       42
       +
                 adminPasswordConfirm = "notapassword";

     

       43
       43
       +
                 siteUrl = "http://localhost:3000";

     

       44
       44
       +
                 telemetry = false;

     

       45
       45
       +
               }

     

       46
       46
       +
             );

     

       47
       47
       +
             payloads.login = pkgs.writeText "login.json" (

     

       48
       48
       +
               builtins.toJSON [

     

       49
       49
       +
                 {

     

       50
       50
       +
                   operationName = null;

     

       51
       51
       +
                   extensions = { };

     

       52
       52
       +
                   query = ''

     

       53
       53
       +
                     mutation ($username: String!, $password: String!, $strategy: String!) {

     

       54
       54
       +
                       authentication {

     

       55
       55
       +
                         login(username: $username, password: $password, strategy: $strategy) {

     

       56
       56
       +
                           responseResult {

     

       57
       57
       +
                             succeeded

     

       58
       58
       +
                             errorCode

     

       59
       59
       +
                             slug

     

       60
       60
       +
                             message

     

       71
       61
        
                             __typename

     

       72
       62
        
                           }

     

       63
       63
       +
                           jwt

     

       64
       64
       +
                           mustChangePwd

     

       65
       65
       +
                           mustProvideTFA

     

       66
       66
       +
                           mustSetupTFA

     

       67
       67
       +
                           continuationToken

     

       68
       68
       +
                           redirect

     

       69
       69
       +
                           tfaQRImage

     

       73
       70
        
                           __typename

     

       74
       71
        
                         }

     

       72
       72
       +
                         __typename

     

       75
       73
        
                       }

     

       76
       76
       -
                     '';

     

       77
       77
       -
                     variables = {

     

       78
       78
       -
                       password = "notapassword";

     

       79
       79
       -
                       strategy = "local";

     

       80
       80
       -
                       username = "webmaster@example.com";

     

       81
       81
       -
                     };

     

       82
       82
       -
                   }

     

       83
       83
       -
                 ]

     

       84
       84
       -
               );

     

       85
       85
       -
               payloads.content = pkgs.writeText "content.json" (

     

       86
       86
       -
                 builtins.toJSON [

     

       87
       87
       -
                   {

     

       88
       88
       -
                     extensions = { };

     

       89
       89
       -
                     operationName = null;

     

       90
       90
       -
                     query = ''

     

       91
       91
       -
                       mutation ($content: String!, $description: String!, $editor: String!, $isPrivate: Boolean!, $isPublished: Boolean!, $locale: String!, $path: String!, $publishEndDate: Date, $publishStartDate: Date, $scriptCss: String, $scriptJs: String, $tags: [String]!, $title: String!) {

     

       92
       92
       -
                         pages {

     

       93
       93
       -
                           create(content: $content, description: $description, editor: $editor, isPrivate: $isPrivate, isPublished: $isPublished, locale: $locale, path: $path, publishEndDate: $publishEndDate, publishStartDate: $publishStartDate, scriptCss: $scriptCss, scriptJs: $scriptJs, tags: $tags, title: $title) {

     

       94
       94
       -
                             responseResult {

     

       95
       95
       -
                               succeeded

     

       96
       96
       -
                               errorCode

     

       97
       97
       -
                               slug

     

       98
       98
       -
                               message

     

       99
       99
       -
                               __typename

     

       100
       100
       -
                             }

     

       101
       101
       -
                             page {

     

       102
       102
       -
                               id

     

       103
       103
       -
                               updatedAt

     

       104
       104
       -
                               __typename

     

       105
       105
       -
                             }

     

       74
       74
       +
                     }

     

       75
       75
       +
                   '';

     

       76
       76
       +
                   variables = {

     

       77
       77
       +
                     password = "notapassword";

     

       78
       78
       +
                     strategy = "local";

     

       79
       79
       +
                     username = "webmaster@example.com";

     

       80
       80
       +
                   };

     

       81
       81
       +
                 }

     

       82
       82
       +
               ]

     

       83
       83
       +
             );

     

       84
       84
       +
             payloads.content = pkgs.writeText "content.json" (

     

       85
       85
       +
               builtins.toJSON [

     

       86
       86
       +
                 {

     

       87
       87
       +
                   extensions = { };

     

       88
       88
       +
                   operationName = null;

     

       89
       89
       +
                   query = ''

     

       90
       90
       +
                     mutation ($content: String!, $description: String!, $editor: String!, $isPrivate: Boolean!, $isPublished: Boolean!, $locale: String!, $path: String!, $publishEndDate: Date, $publishStartDate: Date, $scriptCss: String, $scriptJs: String, $tags: [String]!, $title: String!) {

     

       91
       91
       +
                       pages {

     

       92
       92
       +
                         create(content: $content, description: $description, editor: $editor, isPrivate: $isPrivate, isPublished: $isPublished, locale: $locale, path: $path, publishEndDate: $publishEndDate, publishStartDate: $publishStartDate, scriptCss: $scriptCss, scriptJs: $scriptJs, tags: $tags, title: $title) {

     

       93
       93
       +
                           responseResult {

     

       94
       94
       +
                             succeeded

     

       95
       95
       +
                             errorCode

     

       96
       96
       +
                             slug

     

       97
       97
       +
                             message

     

       98
       98
       +
                             __typename

     

       99
       99
       +
                           }

     

       100
       100
       +
                           page {

     

       101
       101
       +
                             id

     

       102
       102
       +
                             updatedAt

     

       106
       103
        
                             __typename

     

       107
       104
        
                           }

     

       108
       105
        
                           __typename

     

       109
       106
        
                         }

     

       107
       107
       +
                         __typename

     

       110
       108
        
                       }

     

       111
       111
       -
                     '';

     

       112
       112
       -
                     variables = {

     

       113
       113
       -
                       content = "# Header\n\nHello world!";

     

       114
       114
       -
                       description = "";

     

       115
       115
       -
                       editor = "markdown";

     

       116
       116
       -
                       isPrivate = false;

     

       117
       117
       -
                       isPublished = true;

     

       118
       118
       -
                       locale = "en";

     

       119
       119
       -
                       path = "home";

     

       120
       120
       -
                       publishEndDate = "";

     

       121
       121
       -
                       publishStartDate = "";

     

       122
       122
       -
                       scriptCss = "";

     

       123
       123
       -
                       scriptJs = "";

     

       124
       124
       -
                       tags = [ ];

     

       125
       125
       -
                       title = "Hello world";

     

       126
       126
       -
                     };

     

       127
       127
       -
                   }

     

       128
       128
       -
                 ]

     

       129
       129
       -
               );

     

       130
       130
       -
             in

     

       131
       131
       -
             ''

     

       132
       132
       -
               machine.start()

     

       133
       133
       -
               machine.wait_for_unit("multi-user.target")

     

       134
       134
       -
               machine.wait_for_open_port(3000)

     

       109
       109
       +
                     }

     

       110
       110
       +
                   '';

     

       111
       111
       +
                   variables = {

     

       112
       112
       +
                     content = "# Header\n\nHello world!";

     

       113
       113
       +
                     description = "";

     

       114
       114
       +
                     editor = "markdown";

     

       115
       115
       +
                     isPrivate = false;

     

       116
       116
       +
                     isPublished = true;

     

       117
       117
       +
                     locale = "en";

     

       118
       118
       +
                     path = "home";

     

       119
       119
       +
                     publishEndDate = "";

     

       120
       120
       +
                     publishStartDate = "";

     

       121
       121
       +
                     scriptCss = "";

     

       122
       122
       +
                     scriptJs = "";

     

       123
       123
       +
                     tags = [ ];

     

       124
       124
       +
                     title = "Hello world";

     

       125
       125
       +
                   };

     

       126
       126
       +
                 }

     

       127
       127
       +
               ]

     

       128
       128
       +
             );

     

       129
       129
       +
           in

     

       130
       130
       +
           ''

     

       131
       131
       +
             machine.start()

     

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

     

       133
       133
       +
             machine.wait_for_open_port(3000)

     

       135
       134
        
       

     

       136
       136
       -
               machine.succeed("curl -sSf localhost:3000")

     

       135
       135
       +
             machine.succeed("curl -sSf localhost:3000")

     

       137
       136
        
       

     

       138
       138
       -
               with subtest("Setup"):

     

       139
       139
       -
                   result = machine.succeed(

     

       140
       140
       -
                       "curl -sSf localhost:3000/finalize -X POST -d "

     

       141
       141
       -
                       + "@${payloads.finalize} -H 'Content-Type: application/json' "

     

       142
       142
       -
                       + "| jq .ok | xargs echo"

     

       143
       143
       -
                   )

     

       144
       144
       -
                   assert result.strip() == "true", f"Expected true, got {result}"

     

       137
       137
       +
             with subtest("Setup"):

     

       138
       138
       +
                 result = machine.succeed(

     

       139
       139
       +
                     "curl -sSf localhost:3000/finalize -X POST -d "

     

       140
       140
       +
                     + "@${payloads.finalize} -H 'Content-Type: application/json' "

     

       141
       141
       +
                     + "| jq .ok | xargs echo"

     

       142
       142
       +
                 )

     

       143
       143
       +
                 assert result.strip() == "true", f"Expected true, got {result}"

     

       145
       144
        
       

     

       146
       146
       -
                   # During the setup the service gets restarted, so we use this

     

       147
       147
       -
                   # to check if the setup is done.

     

       148
       148
       -
                   machine.wait_until_fails("curl -sSf localhost:3000")

     

       149
       149
       -
                   machine.wait_until_succeeds("curl -sSf localhost:3000")

     

       145
       145
       +
                 # During the setup the service gets restarted, so we use this

     

       146
       146
       +
                 # to check if the setup is done.

     

       147
       147
       +
                 machine.wait_until_fails("curl -sSf localhost:3000")

     

       148
       148
       +
                 machine.wait_until_succeeds("curl -sSf localhost:3000")

     

       150
       149
        
       

     

       151
       151
       -
               with subtest("Base functionality"):

     

       152
       152
       -
                   auth = machine.succeed(

     

       153
       153
       -
                       "curl -sSf localhost:3000/graphql -X POST "

     

       154
       154
       -
                       + "-d @${payloads.login} -H 'Content-Type: application/json' "

     

       155
       155
       -
                       + "| jq '.[0].data.authentication.login.jwt' | xargs echo"

     

       156
       156
       -
                   ).strip()

     

       150
       150
       +
             with subtest("Base functionality"):

     

       151
       151
       +
                 auth = machine.succeed(

     

       152
       152
       +
                     "curl -sSf localhost:3000/graphql -X POST "

     

       153
       153
       +
                     + "-d @${payloads.login} -H 'Content-Type: application/json' "

     

       154
       154
       +
                     + "| jq '.[0].data.authentication.login.jwt' | xargs echo"

     

       155
       155
       +
                 ).strip()

     

       157
       156
        
       

     

       158
       158
       -
                   assert auth

     

       157
       157
       +
                 assert auth

     

       159
       158
        
       

     

       160
       160
       -
                   create = machine.succeed(

     

       161
       161
       -
                       "curl -sSf localhost:3000/graphql -X POST "

     

       162
       162
       -
                       + "-d @${payloads.content} -H 'Content-Type: application/json' "

     

       163
       163
       -
                       + f"-H 'Authorization: Bearer {auth}' "

     

       164
       164
       -
                       + "| jq '.[0].data.pages.create.responseResult.succeeded'|xargs echo"

     

       165
       165
       -
                   )

     

       166
       166
       -
                   assert create.strip() == "true", f"Expected true, got {create}"

     

       159
       159
       +
                 create = machine.succeed(

     

       160
       160
       +
                     "curl -sSf localhost:3000/graphql -X POST "

     

       161
       161
       +
                     + "-d @${payloads.content} -H 'Content-Type: application/json' "

     

       162
       162
       +
                     + f"-H 'Authorization: Bearer {auth}' "

     

       163
       163
       +
                     + "| jq '.[0].data.pages.create.responseResult.succeeded'|xargs echo"

     

       164
       164
       +
                 )

     

       165
       165
       +
                 assert create.strip() == "true", f"Expected true, got {create}"

     

       167
       166
        
       

     

       168
       168
       -
               machine.shutdown()

     

       169
       169
       -
             '';

     

       170
       170
       -
         }

     

       171
       171
       -
       )

     

       167
       167
       +
             machine.shutdown()

     

       168
       168
       +
           '';

     

       169
       169
       +
       }

+102 -104

nixos/tests/wordpress.nix

···

       1
       1
       -
       import ./make-test-python.nix (

     

       2
       2
       -
         { lib, pkgs, ... }:

     

       1
       1
       +
       { lib, config, ... }:

     

       3
       2
        
       

     

       4
       4
       -
         rec {

     

       5
       5
       -
           name = "wordpress";

     

       6
       6
       -
           meta = with pkgs.lib.maintainers; {

     

       7
       7
       -
             maintainers = [

     

       8
       8
       -
               flokli

     

       9
       9
       -
               grahamc # under duress!

     

       10
       10
       -
               mmilata

     

       11
       11
       -
             ];

     

       12
       12
       -
           };

     

       3
       3
       +
       rec {

     

       4
       4
       +
         name = "wordpress";

     

       5
       5
       +
         meta = with lib.maintainers; {

     

       6
       6
       +
           maintainers = [

     

       7
       7
       +
             flokli

     

       8
       8
       +
             grahamc # under duress!

     

       9
       9
       +
             mmilata

     

       10
       10
       +
           ];

     

       11
       11
       +
         };

     

       13
       12
        
       

     

       14
       14
       -
           nodes =

     

       15
       15
       -
             lib.foldl

     

       16
       16
       -
               (

     

       17
       17
       -
                 a: version:

     

       18
       18
       -
                 let

     

       19
       19
       -
                   package = pkgs."wordpress_${version}";

     

       20
       20
       -
                 in

     

       21
       21
       -
                 a

     

       22
       22
       -
                 // {

     

       23
       23
       -
                   "wp${version}_httpd" = _: {

     

       24
       24
       -
                     services.httpd.adminAddr = "webmaster@site.local";

     

       25
       25
       -
                     services.httpd.logPerVirtualHost = true;

     

       13
       13
       +
         nodes =

     

       14
       14
       +
           lib.foldl

     

       15
       15
       +
             (

     

       16
       16
       +
               a: version:

     

       17
       17
       +
               let

     

       18
       18
       +
                 package = config.node.pkgs."wordpress_${version}";

     

       19
       19
       +
               in

     

       20
       20
       +
               a

     

       21
       21
       +
               // {

     

       22
       22
       +
                 "wp${version}_httpd" = _: {

     

       23
       23
       +
                   services.httpd.adminAddr = "webmaster@site.local";

     

       24
       24
       +
                   services.httpd.logPerVirtualHost = true;

     

       26
       25
        
       

     

       27
       27
       -
                     services.wordpress.webserver = "httpd";

     

       28
       28
       -
                     services.wordpress.sites = {

     

       29
       29
       -
                       "site1.local" = {

     

       30
       30
       -
                         database.tablePrefix = "site1_";

     

       31
       31
       -
                         inherit package;

     

       32
       32
       -
                       };

     

       33
       33
       -
                       "site2.local" = {

     

       34
       34
       -
                         database.tablePrefix = "site2_";

     

       35
       35
       -
                         inherit package;

     

       36
       36
       -
                       };

     

       26
       26
       +
                   services.wordpress.webserver = "httpd";

     

       27
       27
       +
                   services.wordpress.sites = {

     

       28
       28
       +
                     "site1.local" = {

     

       29
       29
       +
                       database.tablePrefix = "site1_";

     

       30
       30
       +
                       inherit package;

     

       31
       31
       +
                     };

     

       32
       32
       +
                     "site2.local" = {

     

       33
       33
       +
                       database.tablePrefix = "site2_";

     

       34
       34
       +
                       inherit package;

     

       37
       35
        
                     };

     

       38
       38
       -
       

     

       39
       39
       -
                     networking.firewall.allowedTCPPorts = [ 80 ];

     

       40
       40
       -
                     networking.hosts."127.0.0.1" = [

     

       41
       41
       -
                       "site1.local"

     

       42
       42
       -
                       "site2.local"

     

       43
       43
       -
                     ];

     

       44
       36
        
                   };

     

       45
       37
        
       

     

       46
       46
       -
                   "wp${version}_nginx" = _: {

     

       47
       47
       -
                     services.wordpress.webserver = "nginx";

     

       48
       48
       -
                     services.wordpress.sites = {

     

       49
       49
       -
                       "site1.local" = {

     

       50
       50
       -
                         database.tablePrefix = "site1_";

     

       51
       51
       -
                         inherit package;

     

       52
       52
       -
                       };

     

       53
       53
       -
                       "site2.local" = {

     

       54
       54
       -
                         database.tablePrefix = "site2_";

     

       55
       55
       -
                         inherit package;

     

       56
       56
       -
                       };

     

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

     

       39
       39
       +
                   networking.hosts."127.0.0.1" = [

     

       40
       40
       +
                     "site1.local"

     

       41
       41
       +
                     "site2.local"

     

       42
       42
       +
                   ];

     

       43
       43
       +
                 };

     

       44
       44
       +
       

     

       45
       45
       +
                 "wp${version}_nginx" = _: {

     

       46
       46
       +
                   services.wordpress.webserver = "nginx";

     

       47
       47
       +
                   services.wordpress.sites = {

     

       48
       48
       +
                     "site1.local" = {

     

       49
       49
       +
                       database.tablePrefix = "site1_";

     

       50
       50
       +
                       inherit package;

     

       57
       51
        
                     };

     

       58
       58
       -
       

     

       59
       59
       -
                     networking.firewall.allowedTCPPorts = [ 80 ];

     

       60
       60
       -
                     networking.hosts."127.0.0.1" = [

     

       61
       61
       -
                       "site1.local"

     

       62
       62
       -
                       "site2.local"

     

       63
       63
       -
                     ];

     

       52
       52
       +
                     "site2.local" = {

     

       53
       53
       +
                       database.tablePrefix = "site2_";

     

       54
       54
       +
                       inherit package;

     

       55
       55
       +
                     };

     

       64
       56
        
                   };

     

       65
       57
        
       

     

       66
       66
       -
                   "wp${version}_caddy" = _: {

     

       67
       67
       -
                     services.wordpress.webserver = "caddy";

     

       68
       68
       -
                     services.wordpress.sites = {

     

       69
       69
       -
                       "site1.local" = {

     

       70
       70
       -
                         database.tablePrefix = "site1_";

     

       71
       71
       -
                         inherit package;

     

       72
       72
       -
                       };

     

       73
       73
       -
                       "site2.local" = {

     

       74
       74
       -
                         database.tablePrefix = "site2_";

     

       75
       75
       -
                         inherit package;

     

       76
       76
       -
                       };

     

       77
       77
       -
                     };

     

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

     

       59
       59
       +
                   networking.hosts."127.0.0.1" = [

     

       60
       60
       +
                     "site1.local"

     

       61
       61
       +
                     "site2.local"

     

       62
       62
       +
                   ];

     

       63
       63
       +
                 };

     

       78
       64
        
       

     

       79
       79
       -
                     networking.firewall.allowedTCPPorts = [ 80 ];

     

       80
       80
       -
                     networking.hosts."127.0.0.1" = [

     

       81
       81
       -
                       "site1.local"

     

       82
       82
       -
                       "site2.local"

     

       83
       83
       -
                     ];

     

       65
       65
       +
                 "wp${version}_caddy" = _: {

     

       66
       66
       +
                   services.wordpress.webserver = "caddy";

     

       67
       67
       +
                   services.wordpress.sites = {

     

       68
       68
       +
                     "site1.local" = {

     

       69
       69
       +
                       database.tablePrefix = "site1_";

     

       70
       70
       +
                       inherit package;

     

       71
       71
       +
                     };

     

       72
       72
       +
                     "site2.local" = {

     

       73
       73
       +
                       database.tablePrefix = "site2_";

     

       74
       74
       +
                       inherit package;

     

       75
       75
       +
                     };

     

       84
       76
        
                   };

     

       85
       85
       -
                 }

     

       86
       86
       -
               )

     

       87
       87
       -
               { }

     

       88
       88
       -
               [

     

       89
       89
       -
                 "6_7"

     

       90
       90
       -
               ];

     

       77
       77
       +
       

     

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

     

       79
       79
       +
                   networking.hosts."127.0.0.1" = [

     

       80
       80
       +
                     "site1.local"

     

       81
       81
       +
                     "site2.local"

     

       82
       82
       +
                   ];

     

       83
       83
       +
                 };

     

       84
       84
       +
               }

     

       85
       85
       +
             )

     

       86
       86
       +
             { }

     

       87
       87
       +
             [

     

       88
       88
       +
               "6_7"

     

       89
       89
       +
             ];

     

       91
       90
        
       

     

       92
       92
       -
           testScript = ''

     

       93
       93
       -
             import re

     

       91
       91
       +
         testScript = ''

     

       92
       92
       +
           import re

     

       94
       93
        
       

     

       95
       95
       -
             start_all()

     

       94
       94
       +
           start_all()

     

       96
       95
        
       

     

       97
       97
       -
             ${lib.concatStrings (

     

       98
       98
       -
               lib.mapAttrsToList (name: value: ''

     

       99
       99
       -
                 ${name}.wait_for_unit("${(value null).services.wordpress.webserver}")

     

       100
       100
       -
               '') nodes

     

       101
       101
       -
             )}

     

       96
       96
       +
           ${lib.concatStrings (

     

       97
       97
       +
             lib.mapAttrsToList (name: value: ''

     

       98
       98
       +
               ${name}.wait_for_unit("${(value null).services.wordpress.webserver}")

     

       99
       99
       +
             '') nodes

     

       100
       100
       +
           )}

     

       102
       101
        
       

     

       103
       103
       -
             site_names = ["site1.local", "site2.local"]

     

       102
       102
       +
           site_names = ["site1.local", "site2.local"]

     

       104
       103
        
       

     

       105
       105
       -
             for machine in (${lib.concatStringsSep ", " (builtins.attrNames nodes)}):

     

       106
       106
       -
                 for site_name in site_names:

     

       107
       107
       -
                     machine.wait_for_unit(f"phpfpm-wordpress-{site_name}")

     

       104
       104
       +
           for machine in (${lib.concatStringsSep ", " (builtins.attrNames nodes)}):

     

       105
       105
       +
               for site_name in site_names:

     

       106
       106
       +
                   machine.wait_for_unit(f"phpfpm-wordpress-{site_name}")

     

       108
       107
        
       

     

       109
       109
       -
                     with subtest("website returns welcome screen"):

     

       110
       110
       -
                         assert "Welcome to the famous" in machine.succeed(f"curl -L {site_name}")

     

       108
       108
       +
                   with subtest("website returns welcome screen"):

     

       109
       109
       +
                       assert "Welcome to the famous" in machine.succeed(f"curl -L {site_name}")

     

       111
       110
        
       

     

       112
       112
       -
                     with subtest("wordpress-init went through"):

     

       113
       113
       -
                         info = machine.get_unit_info(f"wordpress-init-{site_name}")

     

       114
       114
       -
                         assert info["Result"] == "success"

     

       111
       111
       +
                   with subtest("wordpress-init went through"):

     

       112
       112
       +
                       info = machine.get_unit_info(f"wordpress-init-{site_name}")

     

       113
       113
       +
                       assert info["Result"] == "success"

     

       115
       114
        
       

     

       116
       116
       -
                     with subtest("secret keys are set"):

     

       117
       117
       -
                         pattern = re.compile(r"^define.*NONCE_SALT.{64,};$", re.MULTILINE)

     

       118
       118
       -
                         assert pattern.search(

     

       119
       119
       -
                             machine.succeed(f"cat /var/lib/wordpress/{site_name}/secret-keys.php")

     

       120
       120
       -
                         )

     

       121
       121
       -
           '';

     

       122
       122
       -
         }

     

       123
       123
       -
       )

     

       115
       115
       +
                   with subtest("secret keys are set"):

     

       116
       116
       +
                       pattern = re.compile(r"^define.*NONCE_SALT.{64,};$", re.MULTILINE)

     

       117
       117
       +
                       assert pattern.search(

     

       118
       118
       +
                           machine.succeed(f"cat /var/lib/wordpress/{site_name}/secret-keys.php")

     

       119
       119
       +
                       )

     

       120
       120
       +
         '';

     

       121
       121
       +
       }

+2 -2

pkgs/applications/networking/firehol/default.nix

···

       23
       23
        
       

     

       24
       24
        
       stdenv.mkDerivation rec {

     

       25
       25
        
         pname = "firehol";

     

       26
       26
       -
         version = "3.1.7";

     

       26
       26
       +
         version = "3.1.8";

     

       27
       27
        
       

     

       28
       28
        
         src = fetchFromGitHub {

     

       29
       29
        
           owner = "firehol";

     

       30
       30
        
           repo = "firehol";

     

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

     

       32
       32
       -
           sha256 = "sha256-gq7l7QoUsK+j5DUn84kD9hlUTC4hz3ds3gNJc1tRygs=";

     

       32
       32
       +
           sha256 = "sha256-6O3AoQs7Qzcin8VXQgJfCVsNOI74H6fE1DgqdY+e4bA=";

     

       33
       33
        
         };

     

       34
       34
        
       

     

       35
       35
        
         patches = [

+29 -26

pkgs/applications/science/chemistry/siesta/default.nix

···

       8
       8
        
         useMpi ? false,

     

       9
       9
        
         mpi,

     

       10
       10
        
         fetchFromGitLab,

     

       11
       11
       +
         cmake,

     

       12
       12
       +
         pkg-config,

     

       13
       13
       +
         readline,

     

       14
       14
       +
         ninja,

     

       15
       15
       +
         elpa,

     

       11
       16
        
       }:

     

       12
       17
        
       

     

       13
       13
       -
       stdenv.mkDerivation rec {

     

       14
       14
       -
         version = "4.1.5";

     

       18
       18
       +
       stdenv.mkDerivation (finalAttrs: {

     

       15
       19
        
         pname = "siesta";

     

       20
       20
       +
         version = "5.2.2";

     

       16
       21
        
       

     

       17
       22
        
         src = fetchFromGitLab {

     

       18
       23
        
           owner = "siesta-project";

     

       19
       24
        
           repo = "siesta";

     

       20
       20
       -
           rev = "v${version}";

     

       21
       21
       -
           sha256 = "0lz8rfl5xwdj17zn7a30ipi7cgjwqki21a7wg9rdg7iwx27bpnmg";

     

       25
       25
       +
           tag = finalAttrs.version;

     

       26
       26
       +
           hash = "sha256-pud8RlJAT+0TwyPRsbf5D/8FfLjZvPYPf84Xb7UH6os=";

     

       27
       27
       +
           fetchSubmodules = true;

     

       22
       28
        
         };

     

       23
       29
        
       

     

       24
       24
       -
         postPatch = ''

     

       25
       25
       -
           substituteInPlace Src/siesta_init.F --replace '/bin/rm' 'rm'

     

       26
       26
       -
         '';

     

       27
       27
       -
       

     

       28
       30
        
         passthru = {

     

       29
       31
        
           inherit mpi;

     

       30
       32
        
         };

     

       31
       33
        
       

     

       32
       32
       -
         nativeBuildInputs = [ gfortran ];

     

       34
       34
       +
         nativeBuildInputs = [

     

       35
       35
       +
           ninja

     

       36
       36
       +
           gfortran

     

       37
       37
       +
           cmake

     

       38
       38
       +
           pkg-config

     

       39
       39
       +
         ];

     

       33
       40
        
       

     

       34
       41
        
         buildInputs =

     

       35
       42
        
           [

     

       36
       43
        
             blas

     

       37
       44
        
             lapack

     

       45
       45
       +
             readline

     

       46
       46
       +
             elpa

     

       38
       47
        
           ]

     

       39
       48
        
           ++ lib.optionals useMpi [

     

       40
       49
        
             mpi

     

       41
       50
        
             scalapack

     

       42
       51
        
           ];

     

       43
       52
        
       

     

       44
       44
       -
         enableParallelBuilding = false; # Started making trouble with gcc-11

     

       53
       53
       +
         NIX_LDFLAGS = "-lm";

     

       45
       54
        
       

     

       46
       46
       -
         # Must do manually because siesta does not do the regular

     

       47
       47
       -
         # ./configure; make; make install

     

       48
       48
       -
         configurePhase = ''

     

       49
       49
       -
           cd Obj

     

       50
       50
       -
           sh ../Src/obj_setup.sh

     

       51
       51
       -
           cp gfortran.make arch.make

     

       52
       52
       -
         '';

     

       55
       55
       +
         cmakeFlags = [

     

       56
       56
       +
           "-DCMAKE_INSTALL_INCLUDEDIR=include"

     

       57
       57
       +
           "-DCMAKE_INSTALL_LIBDIR=lib"

     

       58
       58
       +
         ];

     

       59
       59
       +
       

     

       60
       60
       +
         enableParallelBuilding = false; # Started making trouble with gcc-11

     

       53
       61
        
       

     

       54
       62
        
         preBuild =

     

       55
       63
        
           ''

     
···

       76
       84
        
               ''

     

       77
       85
        
           );

     

       78
       86
        
       

     

       79
       79
       -
         installPhase = ''

     

       80
       80
       -
           mkdir -p $out/bin

     

       81
       81
       -
           cp -a siesta $out/bin

     

       82
       82
       -
         '';

     

       83
       83
       -
       

     

       84
       84
       -
         meta = with lib; {

     

       87
       87
       +
         meta = {

     

       85
       88
        
           description = "First-principles materials simulation code using DFT";

     

       86
       89
        
           mainProgram = "siesta";

     

       87
       90
        
           longDescription = ''

     
···

       98
       101
        
             and all-electron methods.

     

       99
       102
        
           '';

     

       100
       103
        
           homepage = "https://siesta-project.org/siesta/";

     

       101
       101
       -
           license = licenses.gpl2;

     

       104
       104
       +
           license = lib.licenses.gpl2;

     

       102
       105
        
           platforms = [ "x86_64-linux" ];

     

       103
       103
       -
           maintainers = [ maintainers.costrouc ];

     

       106
       106
       +
           maintainers = [ lib.maintainers.costrouc ];

     

       104
       107
        
         };

     

       105
       105
       -
       }

     

       108
       108
       +
       })

-80

pkgs/applications/science/programming/fdr/default.nix

···

       1
       1
       -
       {

     

       2
       2
       -
         lib,

     

       3
       3
       -
         stdenv,

     

       4
       4
       -
         fetchurl,

     

       5
       5
       -
         qtbase,

     

       6
       6
       -
         qtx11extras,

     

       7
       7
       -
         ncurses5,

     

       8
       8
       -
         xorg,

     

       9
       9
       -
         zlib,

     

       10
       10
       -
         python27Packages,

     

       11
       11
       -
       }:

     

       12
       12
       -
       stdenv.mkDerivation {

     

       13
       13
       -
         pname = "fdr";

     

       14
       14
       -
         version = "4.2.7";

     

       15
       15
       -
         src = fetchurl {

     

       16
       16
       -
           url = "https://dl.cocotec.io/fdr/fdr-3814-linux-x86_64.tar.gz";

     

       17
       17
       -
           sha256 = "0cajz1gz4slq9nfhm8dqdgxl0kc950838n0lrf8jw4vl54gv6chh";

     

       18
       18
       -
         };

     

       19
       19
       -
       

     

       20
       20
       -
         libPath = lib.makeLibraryPath [

     

       21
       21
       -
           stdenv.cc.cc

     

       22
       22
       -
           python27Packages.python

     

       23
       23
       -
           qtbase

     

       24
       24
       -
           qtx11extras

     

       25
       25
       -
           ncurses5

     

       26
       26
       -
           xorg.libX11

     

       27
       27
       -
           xorg.libXft

     

       28
       28
       -
           zlib

     

       29
       29
       -
         ];

     

       30
       30
       -
       

     

       31
       31
       -
         dontConfigure = true;

     

       32
       32
       -
         installPhase = ''

     

       33
       33
       -
           mkdir -p "$out"

     

       34
       34
       -
       

     

       35
       35
       -
           # shipped Qt is buggy

     

       36
       36
       -
           rm lib/libQt*

     

       37
       37
       -
           rm -r lib/qt_plugins

     

       38
       38
       -
       

     

       39
       39
       -
           cp -r * "$out"

     

       40
       40
       -
           ln -s ${ncurses5.out}/lib/libtinfo.so.5 $out/lib/libtinfo.so.5

     

       41
       41
       -
           ln -s ${qtbase.bin}/${qtbase.qtPluginPrefix} $out/lib/qt_plugins

     

       42
       42
       -
           ln -s ${zlib.out}/lib/libz.so.1 $out/lib/libz.so.1

     

       43
       43
       -
       

     

       44
       44
       -
           for b in fdr4 _fdr4 refines _refines cspmprofiler cspmexplorerprof

     

       45
       45
       -
           do

     

       46
       46
       -
             patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \

     

       47
       47
       -
               --set-rpath "$libPath:$out/lib" \

     

       48
       48
       -
               "$out/bin/$b"

     

       49
       49
       -
           done

     

       50
       50
       -
       

     

       51
       51
       -
           for l in corei7/librefines.so \

     

       52
       52
       -
             libcspm_process_compiler.so \

     

       53
       53
       -
             libcsp_operators.so \

     

       54
       54
       -
             _fdr.so \

     

       55
       55
       -
             libfdr.so \

     

       56
       56
       -
             libfdr_java.so \

     

       57
       57
       -
             libprocess_compiler.so \

     

       58
       58
       -
             librefines_gui.so \

     

       59
       59
       -
             librefines_licensing.so  \

     

       60
       60
       -
             libboost_date_time.so.1.60.0 \

     

       61
       61
       -
             libboost_filesystem.so.1.60.0 \

     

       62
       62
       -
             libboost_iostreams.so.1.60.0 \

     

       63
       63
       -
             libboost_program_options.so.1.60.0 \

     

       64
       64
       -
             libboost_serialization.so.1.60.0 \

     

       65
       65
       -
             libboost_system.so.1.60.0

     

       66
       66
       -
           do

     

       67
       67
       -
             patchelf --set-rpath "$libPath:$out/lib" \

     

       68
       68
       -
               "$out/lib/$l"

     

       69
       69
       -
           done

     

       70
       70
       -
         '';

     

       71
       71
       -
       

     

       72
       72
       -
         meta = with lib; {

     

       73
       73
       -
           homepage = "https://cocotec.io/fdr/";

     

       74
       74
       -
           description = "CSP refinement checker";

     

       75
       75
       -
           license = licenses.unfreeRedistributable;

     

       76
       76
       -
           sourceProvenance = with sourceTypes; [ binaryNativeCode ];

     

       77
       77
       -
           platforms = platforms.linux;

     

       78
       78
       -
           maintainers = with maintainers; [ nickhu ];

     

       79
       79
       -
         };

     

       80
       80
       -
       }

+2 -2

pkgs/applications/video/bino3d/default.nix

···

       14
       14
        
       

     

       15
       15
        
       stdenv.mkDerivation (finalAttrs: {

     

       16
       16
        
         pname = "bino";

     

       17
       17
       -
         version = "2.4";

     

       17
       17
       +
         version = "2.5";

     

       18
       18
        
       

     

       19
       19
        
         src = fetchgit {

     

       20
       20
        
           url = "https://git.marlam.de/git/bino.git";

     

       21
       21
        
           rev = "bino-${finalAttrs.version}";

     

       22
       22
       -
           hash = "sha256-h7sS+5he8dKl9ipdM1Vs1WC6U+Pi/QMVSdTbT9E59lU=";

     

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

     

       23
       23
        
         };

     

       24
       24
        
       

     

       25
       25
        
         nativeBuildInputs = [

+2 -2

pkgs/applications/video/obs-studio/plugins/obs-tuna/default.nix

···

       14
       14
        
       

     

       15
       15
        
       stdenv.mkDerivation (finalAttrs: {

     

       16
       16
        
         pname = "obs-tuna";

     

       17
       17
       -
         version = "1.9.9";

     

       17
       17
       +
         version = "1.9.10";

     

       18
       18
        
       

     

       19
       19
        
         nativeBuildInputs = [

     

       20
       20
        
           cmake

     
···

       33
       33
        
           owner = "univrsal";

     

       34
       34
        
           repo = "tuna";

     

       35
       35
        
           rev = "v${finalAttrs.version}";

     

       36
       36
       -
           hash = "sha256-qwOAidnCGZSwTahgbyf1K0KgoDvYpqDAQXM3l1lfZXg=";

     

       36
       36
       +
           hash = "sha256-Y4ny8XJIk4KtmRTWdO6tHevT4Ivr1TqkNMNhua499sY=";

     

       37
       37
        
           fetchSubmodules = true;

     

       38
       38
        
         };

     

       39
       39

+2 -2

pkgs/by-name/ag/agorakit/package.nix

···

       1
       1
        
       {

     

       2
       2
        
         lib,

     

       3
       3
        
         fetchFromGitHub,

     

       4
       4
       -
         php,

     

       4
       4
       +
         php82,

     

       5
       5
        
         dataDir ? "/var/lib/agorakit",

     

       6
       6
        
       }:

     

       7
       7
        
       

     

       8
       8
       -
       php.buildComposerProject2 (finalAttrs: {

     

       8
       8
       +
       php82.buildComposerProject2 (finalAttrs: {

     

       9
       9
        
         pname = "agorakit";

     

       10
       10
        
         version = "1.9.3";

     

       11
       11

+2 -2

pkgs/by-name/an/android-udev-rules/package.nix

···

       10
       10
        
       

     

       11
       11
        
       stdenv.mkDerivation rec {

     

       12
       12
        
         pname = "android-udev-rules";

     

       13
       13
       -
         version = "20241109";

     

       13
       13
       +
         version = "20250314";

     

       14
       14
        
       

     

       15
       15
        
         src = fetchFromGitHub {

     

       16
       16
        
           owner = "M0Rf30";

     

       17
       17
        
           repo = "android-udev-rules";

     

       18
       18
        
           rev = version;

     

       19
       19
       -
           hash = "sha256-WHAm9hDpXsn+Isrc5nNgw7G5DKBJb7X0ILx6lG5Y7YQ=";

     

       19
       19
       +
           hash = "sha256-QADyZ3FHVuxX/PfsRt2ijwJRCksQb1Hz5lSgYJlyb1Q=";

     

       20
       20
        
         };

     

       21
       21
        
       

     

       22
       22
        
         installPhase = ''

+2 -2

pkgs/by-name/aw/aws-sam-cli/package.nix

···

       11
       11
        
       

     

       12
       12
        
       python3.pkgs.buildPythonApplication rec {

     

       13
       13
        
         pname = "aws-sam-cli";

     

       14
       14
       -
         version = "1.134.0";

     

       14
       14
       +
         version = "1.135.0";

     

       15
       15
        
         pyproject = true;

     

       16
       16
        
       

     

       17
       17
        
         src = fetchFromGitHub {

     

       18
       18
        
           owner = "aws";

     

       19
       19
        
           repo = "aws-sam-cli";

     

       20
       20
        
           tag = "v${version}";

     

       21
       21
       -
           hash = "sha256-CuXJHKHFE1HOs3fQPofWPJI1/+mtkXBGEmO7bIQD5lA=";

     

       21
       21
       +
           hash = "sha256-ccYpEznuU6d7gDyrDiuUmvdCJutXI7SAH2PH9Vdq8Fs=";

     

       22
       22
        
         };

     

       23
       23
        
       

     

       24
       24
        
         build-system = with python3.pkgs; [ setuptools ];

+4 -4

pkgs/by-name/az/azure-cli/extensions-manual.nix

···

       16
       16
        
       {

     

       17
       17
        
         application-insights = mkAzExtension rec {

     

       18
       18
        
           pname = "application-insights";

     

       19
       19
       -
           version = "1.2.2";

     

       19
       19
       +
           version = "1.2.3";

     

       20
       20
        
           url = "https://azcliprod.blob.core.windows.net/cli-extensions/application_insights-${version}-py2.py3-none-any.whl";

     

       21
       21
       -
           hash = "sha256-ijmPj8jG+s+855jly3m5wEz5myS8pxU/Scf7lRP2VvI=";

     

       21
       21
       +
           hash = "sha256-yUHCMtBDZmNuE1TP4AcIUhAT+IpbHnR0DYBH7EbZBZk=";

     

       22
       22
        
           description = "Support for managing Application Insights components and querying metrics, events, and logs from such components";

     

       23
       23
        
           propagatedBuildInputs = with python3Packages; [ isodate ];

     

       24
       24
        
           meta.maintainers = with lib.maintainers; [ andreasvoss ];

     
···

       140
       140
        
       

     

       141
       141
        
         vm-repair = mkAzExtension rec {

     

       142
       142
        
           pname = "vm-repair";

     

       143
       143
       -
           version = "2.0.3";

     

       143
       143
       +
           version = "2.1.1";

     

       144
       144
        
           url = "https://azcliprod.blob.core.windows.net/cli-extensions/vm_repair-${version}-py2.py3-none-any.whl";

     

       145
       145
       -
           hash = "sha256-ynbq8XyoC6LR7N/x6Ztl74Gu4otTN+QiWLmvy7OfGA0=";

     

       145
       145
       +
           hash = "sha256-3Pgwppp4IssNYhJ+USQNwMEp91XdZDwNlnNWzVWrHFM=";

     

       146
       146
        
           description = "Support for repairing Azure Virtual Machines";

     

       147
       147
        
           propagatedBuildInputs = with python3Packages; [ opencensus ];

     

       148
       148
        
           meta.maintainers = with lib.maintainers; [ ];

+2 -2

pkgs/by-name/cc/ccid/package.nix

···

       15
       15
        
       

     

       16
       16
        
       stdenv.mkDerivation rec {

     

       17
       17
        
         pname = "ccid";

     

       18
       18
       -
         version = "1.6.1";

     

       18
       18
       +
         version = "1.6.2";

     

       19
       19
        
       

     

       20
       20
        
         src = fetchurl {

     

       21
       21
        
           url = "https://ccid.apdu.fr/files/${pname}-${version}.tar.xz";

     

       22
       22
       -
           hash = "sha256-LsqPsH6P58DTna6sp7l81zxA7Ztyc4okrT3L38kY4eo=";

     

       22
       22
       +
           hash = "sha256-QZWEEJUBV+Yi+dkcnnjHtwjbdOIvcRkMWB0k0gVk1Ek=";

     

       23
       23
        
         };

     

       24
       24
        
       

     

       25
       25
        
         postPatch = ''

+7 -7

pkgs/by-name/cl/clash-verge-rev/package.nix

···

       14
       14
        
       }:

     

       15
       15
        
       let

     

       16
       16
        
         pname = "clash-verge-rev";

     

       17
       17
       -
         version = "2.1.2";

     

       17
       17
       +
         version = "2.2.2";

     

       18
       18
        
       

     

       19
       19
        
         src = fetchFromGitHub {

     

       20
       20
        
           owner = "clash-verge-rev";

     

       21
       21
        
           repo = "clash-verge-rev";

     

       22
       22
        
           tag = "v${version}";

     

       23
       23
       -
           hash = "sha256-rsl3hBywToemthNrG80Mv+JagA4g4S7HukOaRpMKJi8=";

     

       23
       23
       +
           hash = "sha256-CiVwFSCbCxFm8naogpL73gUp8HNHwcIiygSVon4WNZk=";

     

       24
       24
        
         };

     

       25
       25
        
       

     

       26
       26
        
         src-service = fetchFromGitHub {

     

       27
       27
        
           owner = "clash-verge-rev";

     

       28
       28
        
           repo = "clash-verge-service";

     

       29
       29
       -
           rev = "bfd7d597b13d49cf49b64676c2719f1ed9599d22"; # no meaningful tags in this repo. The only way is updating manully every time.

     

       30
       30
       -
           hash = "sha256-LdM0VIVsDPGnHEGwbRFh4/ACTdpVyDnu6dYLLvVbwpc=";

     

       29
       29
       +
           rev = "ffcccc6095e052534980230f9e0ca97db2675062"; # no meaningful tags in this repo. The only way is updating manully every time.

     

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

     

       31
       31
        
         };

     

       32
       32
        
       

     

       33
       33
       -
         service-cargo-hash = "sha256-mJEk4OAEcuTk5NCzPcWwSlvysqR/9s8p9OGiXWBZvdg=";

     

       34
       34
       -
         npm-hash = "sha256-1OT9Iv9AF4svaOnWNQfOUdo8EUkG0+PU+y8nprc6YjU=";

     

       35
       35
       -
         vendor-hash = "sha256-myvFXaS+QdBRHPpcLEmhg1wgheWb4uXv+QXQf5HA51M=";

     

       33
       33
       +
         service-cargo-hash = "sha256-lMOQznPlkHIMSm5nOLuGP9qJXt3CXnd+q8nCu+Xbbt8=";

     

       34
       34
       +
         npm-hash = "sha256-v9+1NjXo/1ogmep+4IP+9qoUR1GJz87VGeOoMzQ1Rfw=";

     

       35
       35
       +
         vendor-hash = "sha256-nU3bIxD5zggTScNGH3HmnnXUGkLMwnQbIBVI1DmIpFs=";

     

       36
       36
        
       

     

       37
       37
        
         service = callPackage ./service.nix {

     

       38
       38
        
           inherit

+14

pkgs/by-name/cl/clash-verge-rev/unwrapped.nix

···

       4
       4
        
         src,

     

       5
       5
        
         libayatana-appindicator,

     

       6
       6
        
         vendor-hash,

     

       7
       7
       +
         fetchpatch,

     

       7
       8
        
         glib,

     

       8
       9
        
         webui,

     

       9
       10
        
         pkg-config,

     
···

       29
       30
        
           OPENSSL_NO_VENDOR = 1;

     

       30
       31
        
         };

     

       31
       32
        
       

     

       33
       33
       +
         patches = [

     

       34
       34
       +
           (fetchpatch {

     

       35
       35
       +
             name = "fix-service-mode-mihomo-check.patch";

     

       36
       36
       +
             url = "https://github.com/clash-verge-rev/clash-verge-rev/commit/16d4f9fe7ee95b7312a10bf216c818c3e144dea7.patch";

     

       37
       37
       +
             hash = "sha256-FQHm1jjo0W1IokMDJGWVMVV9DWItG1prX+TIysL12DA=";

     

       38
       38
       +
           })

     

       39
       39
       +
         ];

     

       40
       40
       +
       

     

       41
       41
       +
         prePatch = ''

     

       42
       42
       +
           cd ..

     

       43
       43
       +
         '';

     

       44
       44
       +
       

     

       32
       45
        
         postPatch = ''

     

       46
       46
       +
           cd src-tauri

     

       33
       47
        
           substituteInPlace $cargoDepsCopy/libappindicator-sys-*/src/lib.rs \

     

       34
       48
        
             --replace-fail "libayatana-appindicator3.so.1" "${libayatana-appindicator}/lib/libayatana-appindicator3.so.1"

     

       35
       49

+3 -3

pkgs/by-name/ei/eigenmath/package.nix

···

       8
       8
        
       

     

       9
       9
        
       stdenv.mkDerivation rec {

     

       10
       10
        
         pname = "eigenmath";

     

       11
       11
       -
         version = "337-unstable-2025-03-16";

     

       11
       11
       +
         version = "338-unstable-2025-03-27";

     

       12
       12
        
       

     

       13
       13
        
         src = fetchFromGitHub {

     

       14
       14
        
           owner = "georgeweigt";

     

       15
       15
        
           repo = pname;

     

       16
       16
       -
           rev = "622740aa22d11d08016d0ac962aa920f5e38f223";

     

       17
       17
       -
           hash = "sha256-sFiCYvp+SC8CnkMfoUXpAPFySd5nxiqLRVGiWsZ4FcY=";

     

       16
       16
       +
           rev = "2e4f6f099e7a9984e3d34430f63bc0606f364dd9";

     

       17
       17
       +
           hash = "sha256-Bp7+0ykgUqELF3KE678pkGneZCDcIfqlZo2g12Nb+Qc=";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
        
         checkPhase =

+2 -2

pkgs/by-name/el/elasticsearch-curator/package.nix

···

       9
       9
        
       

     

       10
       10
        
       python3.pkgs.buildPythonApplication rec {

     

       11
       11
        
         pname = "elasticsearch-curator";

     

       12
       12
       -
         version = "8.0.18";

     

       12
       12
       +
         version = "8.0.20";

     

       13
       13
        
         pyproject = true;

     

       14
       14
        
       

     

       15
       15
        
         src = fetchFromGitHub {

     

       16
       16
        
           owner = "elastic";

     

       17
       17
        
           repo = "curator";

     

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

     

       19
       19
       -
           hash = "sha256-J0RHCWr0l1Vm/rcmcH3w0E0U+S9AvM0XMO89rnG38mY=";

     

       19
       19
       +
           hash = "sha256-oeQ36CvR/v0Mvo+aGL+dYHTgEsq9TesZoBMdoePmgnI=";

     

       20
       20
        
         };

     

       21
       21
        
       

     

       22
       22
        
         pythonRelaxDeps = [ "es-client" ];

+3 -3

pkgs/by-name/ex/exportarr/package.nix

···

       7
       7
        
       

     

       8
       8
        
       buildGoModule rec {

     

       9
       9
        
         pname = "exportarr";

     

       10
       10
       -
         version = "2.0.1";

     

       10
       10
       +
         version = "2.1.0";

     

       11
       11
        
       

     

       12
       12
        
         src = fetchFromGitHub {

     

       13
       13
        
           owner = "onedr0p";

     

       14
       14
        
           repo = "exportarr";

     

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

     

       16
       16
       -
           hash = "sha256-A6G1b9hTGp35ZHsDaMAZdH0LkkEyXCWoV6e5Bo3UqI4=";

     

       16
       16
       +
           hash = "sha256-iNcdD2zigBZ2phtCkHRV0GZPrEjopV0K+vin1Zkb3Oo=";

     

       17
       17
        
         };

     

       18
       18
        
       

     

       19
       19
       -
         vendorHash = "sha256-8MrS/BMSjyWbBM8jVQYDsvLLaolgbP22Vp2PRX33Kfw=";

     

       19
       19
       +
         vendorHash = "sha256-F5WOSsjeOzMaj4Yze11OnqpgL1l87wpgl3OQEGya//M=";

     

       20
       20
        
       

     

       21
       21
        
         subPackages = [ "cmd/exportarr" ];

     

       22
       22

+3 -3

pkgs/by-name/fl/fluidd/package.nix

···

       8
       8
        
       

     

       9
       9
        
       buildNpmPackage rec {

     

       10
       10
        
         pname = "fluidd";

     

       11
       11
       -
         version = "1.32.4";

     

       11
       11
       +
         version = "1.33.0";

     

       12
       12
        
       

     

       13
       13
        
         src = fetchFromGitHub {

     

       14
       14
        
           owner = "fluidd-core";

     

       15
       15
        
           repo = "fluidd";

     

       16
       16
        
           tag = "v${version}";

     

       17
       17
       -
           hash = "sha256-5siU1BunQ1tcF8pg0trKkynJXmLdCS1rFo7J0WX8V30=";

     

       17
       17
       +
           hash = "sha256-z1qb3n+BlvQhw6fKvfZ6s/uSdWbXAJ8xqvQRdLPnD+M=";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
        
         patches = [

     
···

       23
       23
        
           })

     

       24
       24
        
         ];

     

       25
       25
        
       

     

       26
       26
       -
         npmDepsHash = "sha256-+MfqmMZ2fiijr4X2S2TQfo25mVGpnZtZYOxCfPH4gFY=";

     

       26
       26
       +
         npmDepsHash = "sha256-RpnZLJzxMmwo/XsXOWshw8xCpXG6GuhsaTb4rnXt/D0=";

     

       27
       27
        
       

     

       28
       28
        
         installPhase = ''

     

       29
       29
        
           mkdir -p $out/share/fluidd

+3 -3

pkgs/by-name/fl/flutter_rust_bridge_codegen/package.nix

···

       6
       6
        
       }:

     

       7
       7
        
       rustPlatform.buildRustPackage rec {

     

       8
       8
        
         pname = "flutter_rust_bridge_codegen";

     

       9
       9
       -
         version = "2.8.0";

     

       9
       9
       +
         version = "2.9.0";

     

       10
       10
        
       

     

       11
       11
        
         src = fetchFromGitHub {

     

       12
       12
        
           owner = "fzyzcjy";

     

       13
       13
        
           repo = "flutter_rust_bridge";

     

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

     

       15
       15
       -
           hash = "sha256-amjfreJq/GC/Xou39i2IIIGI1ukpiWRx3bddxVQB6dk=";

     

       15
       15
       +
           hash = "sha256-pvKCiv7hUgetTXXp+NCs04Qo9xWaLUE2T1yHENhTGl4=";

     

       16
       16
        
           fetchSubmodules = true;

     

       17
       17
        
         };

     

       18
       18
        
       

     

       19
       19
        
         useFetchCargoVendor = true;

     

       20
       20
       -
         cargoHash = "sha256-zRiyLFDRqhi6TUt/UfWvgJ2hqWdUz8jxUCvN5RDp1Bk=";

     

       20
       20
       +
         cargoHash = "sha256-efMA8VJaQlqClAmjJ3zIYLUfnuj62vEIBKsz0l3CWxA=";

     

       21
       21
        
         cargoBuildFlags = "--package flutter_rust_bridge_codegen";

     

       22
       22
        
         cargoTestFlags = "--package flutter_rust_bridge_codegen";

     

       23
       23

+3 -3

pkgs/by-name/fr/freetube/package.nix

···

       20
       20
        
       in

     

       21
       21
        
       stdenvNoCC.mkDerivation (finalAttrs: {

     

       22
       22
        
         pname = "freetube";

     

       23
       23
       -
         version = "0.23.2";

     

       23
       23
       +
         version = "0.23.3";

     

       24
       24
        
       

     

       25
       25
        
         src = fetchFromGitHub {

     

       26
       26
        
           owner = "FreeTubeApp";

     

       27
       27
        
           repo = "FreeTube";

     

       28
       28
        
           tag = "v${finalAttrs.version}-beta";

     

       29
       29
       -
           hash = "sha256-P0ENx8PDWbqfiBEsWv11R3Q/FE+rAFhhk49VyQgXIz4=";

     

       29
       29
       +
           hash = "sha256-EpcYNUtGbEFvetroo1zAyfKxW70vD1Lk0aJKWcaV39I=";

     

       30
       30
        
         };

     

       31
       31
        
       

     

       32
       32
        
         # Darwin requires writable Electron dist

     
···

       49
       49
        
       

     

       50
       50
        
         yarnOfflineCache = fetchYarnDeps {

     

       51
       51
        
           yarnLock = "${finalAttrs.src}/yarn.lock";

     

       52
       52
       -
           hash = "sha256-U6H4TMKR+khs5fQtMtIBnHpAzJvHcvMeSD1XUqaov/M=";

     

       52
       52
       +
           hash = "sha256-xiJGzvmfrvvB6/rdwALOxhWSWAZ31cbySYygtG8+QpQ=";

     

       53
       53
        
         };

     

       54
       54
        
       

     

       55
       55
        
         nativeBuildInputs = [

+2 -2

pkgs/by-name/ga/gallery-dl/package.nix

···

       8
       8
        
       

     

       9
       9
        
       let

     

       10
       10
        
         pname = "gallery-dl";

     

       11
       11
       -
         version = "1.29.2";

     

       11
       11
       +
         version = "1.29.3";

     

       12
       12
        
       in

     

       13
       13
        
       python3Packages.buildPythonApplication {

     

       14
       14
        
         inherit pname version;

     
···

       18
       18
        
           owner = "mikf";

     

       19
       19
        
           repo = "gallery-dl";

     

       20
       20
        
           tag = "v${version}";

     

       21
       21
       -
           hash = "sha256-vr+qvztNtFMnDzi0GGX10eZCj5EqXj03OnIXudvrumU=";

     

       21
       21
       +
           hash = "sha256-LzMiJxMl6IWtUloWxBAMLvkhnTQpHkz/gjWl5gW2sZ0=";

     

       22
       22
        
         };

     

       23
       23
        
       

     

       24
       24
        
         build-system = [ python3Packages.setuptools ];

+3 -3

pkgs/by-name/ip/ipxe/package.nix

···

       48
       48
        
       

     

       49
       49
        
       stdenv.mkDerivation (finalAttrs: {

     

       50
       50
        
         pname = "ipxe";

     

       51
       51
       -
         version = "1.21.1-unstable-2025-02-28";

     

       51
       51
       +
         version = "1.21.1-unstable-2025-03-27";

     

       52
       52
        
       

     

       53
       53
        
         nativeBuildInputs = [

     

       54
       54
        
           mtools

     
···

       65
       65
        
         src = fetchFromGitHub {

     

       66
       66
        
           owner = "ipxe";

     

       67
       67
        
           repo = "ipxe";

     

       68
       68
       -
           rev = "be3a78eaf804a2c437aa055d5c1e2f4a1310a0c1";

     

       69
       69
       -
           hash = "sha256-W1nLhFc3OttPbDyf8e7OM+kHQajamvNJ550YdTwlOHA=";

     

       68
       68
       +
           rev = "09fbebc084bddcb5bc7277f1644154ab35e6a334";

     

       69
       69
       +
           hash = "sha256-7F7SYSvSiY23xZbiJdzjiSDMnfeB4gWNodlHVgm9MyE=";

     

       70
       70
        
         };

     

       71
       71
        
       

     

       72
       72
        
         # Calling syslinux on a FAT image isn't going to work on Aarch64.

+3 -3

pkgs/by-name/ku/kubelogin/package.nix

···

       10
       10
        
       

     

       11
       11
        
       buildGoModule rec {

     

       12
       12
        
         pname = "kubelogin";

     

       13
       13
       -
         version = "0.1.9";

     

       13
       13
       +
         version = "0.2.7";

     

       14
       14
        
       

     

       15
       15
        
         src = fetchFromGitHub {

     

       16
       16
        
           owner = "Azure";

     

       17
       17
        
           repo = pname;

     

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

     

       19
       19
       -
           sha256 = "sha256-u9Fj2YkHVbFHpxrrxdYrRBvbGsLvxQQlsPHf4++L0g0=";

     

       19
       19
       +
           sha256 = "sha256-upToPltob3P8EwDUbl9F3COGCxnz6NZNrZ/wxv5pBQU=";

     

       20
       20
        
         };

     

       21
       21
        
       

     

       22
       22
       -
         vendorHash = "sha256-HYUI0x4fCA8nhIHPguGCJ+F36fxb7m97bgyigwiXWd8=";

     

       22
       22
       +
         vendorHash = "sha256-d4zXjMr34DUXHNBe8jGhlQ/gdsaR2hGWxZEfUKXvKCQ=";

     

       23
       23
        
       

     

       24
       24
        
         ldflags = [

     

       25
       25
        
           "-X main.gitTag=v${version}"

+2 -2

pkgs/by-name/li/libppd/package.nix

···

       13
       13
        
       

     

       14
       14
        
       stdenv.mkDerivation rec {

     

       15
       15
        
         pname = "libppd";

     

       16
       16
       -
         version = "2.1.0";

     

       16
       16
       +
         version = "2.1.1";

     

       17
       17
        
       

     

       18
       18
        
         src = fetchFromGitHub {

     

       19
       19
        
           owner = "OpenPrinting";

     

       20
       20
        
           repo = "libppd";

     

       21
       21
        
           rev = version;

     

       22
       22
       -
           hash = "sha256-vT4h3dnMu4yHNk0ExGZjuChdu0kAcxsla7vJupZpLaY=";

     

       22
       22
       +
           hash = "sha256-8ofCv+tKgBk9GoGD4lmBPB/S4ABZ6cWGOk/KqDsEzNk=";

     

       23
       23
        
         };

     

       24
       24
        
       

     

       25
       25
        
         nativeBuildInputs = [

+2 -2

pkgs/by-name/lu/luau/package.nix

···

       9
       9
        
       

     

       10
       10
        
       stdenv.mkDerivation rec {

     

       11
       11
        
         pname = "luau";

     

       12
       12
       -
         version = "0.664";

     

       12
       12
       +
         version = "0.666";

     

       13
       13
        
       

     

       14
       14
        
         src = fetchFromGitHub {

     

       15
       15
        
           owner = "luau-lang";

     

       16
       16
        
           repo = "luau";

     

       17
       17
        
           rev = version;

     

       18
       18
       -
           hash = "sha256-VmeUO7zkBG0NojzpnfR+eVzoRhNpJh+7HwEunL/Ylqw=";

     

       18
       18
       +
           hash = "sha256-++4PwlCxNq31T0UQUHcvrUnY/ADdnQCtekGiGTPRmv0=";

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
        
         nativeBuildInputs = [ cmake ];

+9 -7

pkgs/by-name/ma/mandown/package.nix

···

       2
       2
        
         lib,

     

       3
       3
        
         rustPlatform,

     

       4
       4
        
         fetchCrate,

     

       5
       5
       +
         nix-update-script,

     

       5
       6
        
       }:

     

       6
       6
       -
       

     

       7
       7
       -
       rustPlatform.buildRustPackage rec {

     

       7
       7
       +
       rustPlatform.buildRustPackage (finalAttrs: {

     

       8
       8
        
         pname = "mandown";

     

       9
       9
        
         version = "1.1.0";

     

       10
       10
        
       

     

       11
       11
        
         src = fetchCrate {

     

       12
       12
       -
           inherit pname version;

     

       12
       12
       +
           inherit (finalAttrs) pname version;

     

       13
       13
        
           hash = "sha256-a+1tm9YlBuroTtgCL0nTjASaPiJHif89pRH0CWw7RjM=";

     

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
        
         useFetchCargoVendor = true;

     

       17
       17
        
         cargoHash = "sha256-ZyjoAvsqUyHgfEsG3+CvJatmBt0AJ2ga6HRJ8Y7her0=";

     

       18
       18
        
       

     

       19
       19
       -
         meta = with lib; {

     

       19
       19
       +
         passthru.updateScript = nix-update-script { };

     

       20
       20
       +
       

     

       21
       21
       +
         meta = {

     

       20
       22
        
           description = "Markdown to groff (man page) converter";

     

       21
       23
        
           homepage = "https://gitlab.com/kornelski/mandown";

     

       22
       22
       -
           license = with licenses; [

     

       24
       24
       +
           license = with lib.licenses; [

     

       23
       25
        
             asl20 # or

     

       24
       26
        
             mit

     

       25
       27
        
           ];

     

       26
       26
       -
           maintainers = [ ];

     

       28
       28
       +
           maintainers = [ lib.maintainers.awwpotato ];

     

       27
       29
        
           mainProgram = "mandown";

     

       28
       30
        
         };

     

       29
       29
       -
       }

     

       31
       31
       +
       })

+3 -3

pkgs/by-name/me/metacubexd/package.nix

···

       8
       8
        
       }:

     

       9
       9
        
       stdenv.mkDerivation (finalAttrs: {

     

       10
       10
        
         pname = "metacubexd";

     

       11
       11
       -
         version = "1.176.2";

     

       11
       11
       +
         version = "1.186.1";

     

       12
       12
        
       

     

       13
       13
        
         src = fetchFromGitHub {

     

       14
       14
        
           owner = "MetaCubeX";

     

       15
       15
        
           repo = "metacubexd";

     

       16
       16
        
           rev = "v${finalAttrs.version}";

     

       17
       17
       -
           hash = "sha256-pvVtTN3hMwQJEV1a83Hb7KDnzEPSoxDCxIgAIvFrm88=";

     

       17
       17
       +
           hash = "sha256-AcqtDdEdtkxwm99CQzLGtDE9PSdRHJIO2gAUextqtSs=";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
        
         nativeBuildInputs = [

     
···

       24
       24
        
       

     

       25
       25
        
         pnpmDeps = pnpm_9.fetchDeps {

     

       26
       26
        
           inherit (finalAttrs) pname version src;

     

       27
       27
       -
           hash = "sha256-xDcqGvM8J6miDwiwNQODnPVq63flitva6/nPLYa9cgY=";

     

       27
       27
       +
           hash = "sha256-PmVMNSYOffo8ExNIoTkDllRXF+Kau/6QBNkYQn1DKXE=";

     

       28
       28
        
         };

     

       29
       29
        
       

     

       30
       30
        
         buildPhase = ''

+9 -9

pkgs/by-name/mi/mirrord/manifest.json

···

       1
       1
        
       {

     

       2
       2
       -
         "version": "3.134.2",

     

       2
       2
       +
         "version": "3.136.0",

     

       3
       3
        
         "assets": {

     

       4
       4
        
           "x86_64-linux": {

     

       5
       5
       -
             "url": "https://github.com/metalbear-co/mirrord/releases/download/3.134.2/mirrord_linux_x86_64",

     

       6
       6
       -
             "hash": "sha256-RrHB4/FLcIK1C0U0d6Vs2UxNTKCmcZT1ubBhqL1+rCQ="

     

       5
       5
       +
             "url": "https://github.com/metalbear-co/mirrord/releases/download/3.136.0/mirrord_linux_x86_64",

     

       6
       6
       +
             "hash": "sha256-MV6S23Ly0g2FPAhp2+RIMSC8D+s6NakVbMqLSwEr/2o="

     

       7
       7
        
           },

     

       8
       8
        
           "aarch64-linux": {

     

       9
       9
       -
             "url": "https://github.com/metalbear-co/mirrord/releases/download/3.134.2/mirrord_linux_aarch64",

     

       10
       10
       -
             "hash": "sha256-pohyE3VHFvkJ1YR1VkDrkrbqS4V10feFPNFfSpGZ2Ro="

     

       9
       9
       +
             "url": "https://github.com/metalbear-co/mirrord/releases/download/3.136.0/mirrord_linux_aarch64",

     

       10
       10
       +
             "hash": "sha256-zwistetfQCucaQ3yE1XHNChDhVCnSUq2ttl4XMnAQJU="

     

       11
       11
        
           },

     

       12
       12
        
           "aarch64-darwin": {

     

       13
       13
       -
             "url": "https://github.com/metalbear-co/mirrord/releases/download/3.134.2/mirrord_mac_universal",

     

       14
       14
       -
             "hash": "sha256-BFCQ/QrzMGhB0y422by9L7/nmLv4mDzxMkhtQGSQBwg="

     

       13
       13
       +
             "url": "https://github.com/metalbear-co/mirrord/releases/download/3.136.0/mirrord_mac_universal",

     

       14
       14
       +
             "hash": "sha256-eSHJvtbCBxegYUjfplyBND2kinEqr5LlXJs9mm2U9wI="

     

       15
       15
        
           },

     

       16
       16
        
           "x86_64-darwin": {

     

       17
       17
       -
             "url": "https://github.com/metalbear-co/mirrord/releases/download/3.134.2/mirrord_mac_universal",

     

       18
       18
       -
             "hash": "sha256-BFCQ/QrzMGhB0y422by9L7/nmLv4mDzxMkhtQGSQBwg="

     

       17
       17
       +
             "url": "https://github.com/metalbear-co/mirrord/releases/download/3.136.0/mirrord_mac_universal",

     

       18
       18
       +
             "hash": "sha256-eSHJvtbCBxegYUjfplyBND2kinEqr5LlXJs9mm2U9wI="

     

       19
       19
        
           }

     

       20
       20
        
         }

     

       21
       21
        
       }

+3 -3

pkgs/by-name/my/myks/package.nix

···

       9
       9
        
       

     

       10
       10
        
       buildGoModule rec {

     

       11
       11
        
         pname = "myks";

     

       12
       12
       -
         version = "4.6.0";

     

       12
       12
       +
         version = "4.6.1";

     

       13
       13
        
       

     

       14
       14
        
         src = fetchFromGitHub {

     

       15
       15
        
           owner = "mykso";

     

       16
       16
        
           repo = "myks";

     

       17
       17
        
           tag = "v${version}";

     

       18
       18
       -
           hash = "sha256-qtBE0kNNhCQ4o3NY/ylhA/AKCoIpCMXlWReONV1klm0=";

     

       18
       18
       +
           hash = "sha256-xHWiE0SCv5LbObAa4Ha/U1uTFe9z11nhpB/eMj5qYoA=";

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
       -
         vendorHash = "sha256-U4mHGkbl5nygQfakIRmyS5z85bulO7+MjKhbQmv9ZB8=";

     

       21
       21
       +
         vendorHash = "sha256-tgshaSrh5o28uiSMF7sv4AP57xYkaHq6B8sQTrnteqQ=";

     

       22
       22
        
       

     

       23
       23
        
         subPackages = ".";

     

       24
       24

+2 -2

pkgs/by-name/ne/networkmanager_dmenu/package.nix

···

       14
       14
        
       in

     

       15
       15
        
       stdenv.mkDerivation rec {

     

       16
       16
        
         pname = "networkmanager_dmenu";

     

       17
       17
       -
         version = "2.5.0";

     

       17
       17
       +
         version = "2.6.0";

     

       18
       18
        
       

     

       19
       19
        
         src = fetchFromGitHub {

     

       20
       20
        
           owner = "firecat53";

     

       21
       21
        
           repo = "networkmanager-dmenu";

     

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

     

       23
       23
       -
           sha256 = "sha256-aw6TwRtlb9x/JOuJqPZTZB2+srlnteEOmYiOPS1tAbM=";

     

       23
       23
       +
           sha256 = "sha256-Iy8Bi6aXtNXFfuQmRhLo50cs7pMx1l+OIv019Dqj6ow=";

     

       24
       24
        
         };

     

       25
       25
        
       

     

       26
       26
        
         nativeBuildInputs = [ gobject-introspection ];

+2 -2

pkgs/by-name/on/onedrive/package.nix

···

       18
       18
        
       

     

       19
       19
        
       stdenv.mkDerivation (finalAttrs: {

     

       20
       20
        
         pname = "onedrive";

     

       21
       21
       -
         version = "2.5.4";

     

       21
       21
       +
         version = "2.5.5";

     

       22
       22
        
       

     

       23
       23
        
         src = fetchFromGitHub {

     

       24
       24
        
           owner = "abraunegg";

     

       25
       25
        
           repo = "onedrive";

     

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

     

       27
       27
       -
           hash = "sha256-KJ+6Yo5tod36yMihBamdzCGzVOTItN9OgUd05pAyTxc=";

     

       27
       27
       +
           hash = "sha256-SoTkphmxWVAeSfqO7Vqm8bdPAP1hK57zFNR6N5elEOM=";

     

       28
       28
        
         };

     

       29
       29
        
       

     

       30
       30
        
         outputs = [

+26 -21

pkgs/by-name/or/orca-slicer/package.nix

···

       145
       145
        
       

     

       146
       146
        
         NLOPT = nlopt;

     

       147
       147
        
       

     

       148
       148
       -
         NIX_CFLAGS_COMPILE = toString [

     

       149
       149
       -
           "-Wno-ignored-attributes"

     

       150
       150
       -
           "-I${opencv.out}/include/opencv4"

     

       151
       151
       -
           "-Wno-error=template-id-cdtor"

     

       152
       152
       -
           "-Wno-error=incompatible-pointer-types"

     

       153
       153
       -
           "-Wno-template-id-cdtor"

     

       154
       154
       -
           "-Wno-uninitialized"

     

       155
       155
       -
           "-Wno-unused-result"

     

       156
       156
       -
           "-Wno-deprecated-declarations"

     

       157
       157
       -
           "-Wno-use-after-free"

     

       158
       158
       -
           "-Wno-format-overflow"

     

       159
       159
       -
           "-Wno-stringop-overflow"

     

       160
       160
       -
           "-DBOOST_ALLOW_DEPRECATED_HEADERS"

     

       161
       161
       -
           "-DBOOST_MATH_DISABLE_STD_FPCLASSIFY"

     

       162
       162
       -
           "-DBOOST_MATH_NO_LONG_DOUBLE_MATH_FUNCTIONS"

     

       163
       163
       -
           "-DBOOST_MATH_DISABLE_FLOAT128"

     

       164
       164
       -
           "-DBOOST_MATH_NO_QUAD_SUPPORT"

     

       165
       165
       -
           "-DBOOST_MATH_MAX_FLOAT128_DIGITS=0"

     

       166
       166
       -
           "-DBOOST_CSTDFLOAT_NO_LIBQUADMATH_SUPPORT"

     

       167
       167
       -
           "-DBOOST_MATH_DISABLE_FLOAT128_BUILTIN_FPCLASSIFY"

     

       168
       168
       -
         ];

     

       148
       148
       +
         NIX_CFLAGS_COMPILE = toString (

     

       149
       149
       +
           [

     

       150
       150
       +
             "-Wno-ignored-attributes"

     

       151
       151
       +
             "-I${opencv.out}/include/opencv4"

     

       152
       152
       +
             "-Wno-error=incompatible-pointer-types"

     

       153
       153
       +
             "-Wno-template-id-cdtor"

     

       154
       154
       +
             "-Wno-uninitialized"

     

       155
       155
       +
             "-Wno-unused-result"

     

       156
       156
       +
             "-Wno-deprecated-declarations"

     

       157
       157
       +
             "-Wno-use-after-free"

     

       158
       158
       +
             "-Wno-format-overflow"

     

       159
       159
       +
             "-Wno-stringop-overflow"

     

       160
       160
       +
             "-DBOOST_ALLOW_DEPRECATED_HEADERS"

     

       161
       161
       +
             "-DBOOST_MATH_DISABLE_STD_FPCLASSIFY"

     

       162
       162
       +
             "-DBOOST_MATH_NO_LONG_DOUBLE_MATH_FUNCTIONS"

     

       163
       163
       +
             "-DBOOST_MATH_DISABLE_FLOAT128"

     

       164
       164
       +
             "-DBOOST_MATH_NO_QUAD_SUPPORT"

     

       165
       165
       +
             "-DBOOST_MATH_MAX_FLOAT128_DIGITS=0"

     

       166
       166
       +
             "-DBOOST_CSTDFLOAT_NO_LIBQUADMATH_SUPPORT"

     

       167
       167
       +
             "-DBOOST_MATH_DISABLE_FLOAT128_BUILTIN_FPCLASSIFY"

     

       168
       168
       +
           ]

     

       169
       169
       +
           # Making it compatible with GCC 14+, see https://github.com/SoftFever/OrcaSlicer/pull/7710

     

       170
       170
       +
           ++ lib.optionals (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "14") [

     

       171
       171
       +
             "-Wno-error=template-id-cdtor"

     

       172
       172
       +
           ]

     

       173
       173
       +
         );

     

       169
       174
        
       

     

       170
       175
        
         NIX_LDFLAGS = toString [

     

       171
       176
        
           (lib.optionalString withSystemd "-ludev")

+1 -1

pkgs/by-name/os/osquery/update.py

···

       9
       9
        
       REPO = 'osquery'

     

       10
       10
        
       OPENSSL_VERSION_PAT = re.compile(r'^set\(OPENSSL_VERSION "(.*)"\)')

     

       11
       11
        
       OPENSSL_SHA256_PAT = re.compile(r'^set\(OPENSSL_ARCHIVE_SHA256 "(.*)"\)')

     

       12
       12
       -
       INFO_PATH = 'pkgs/tools/system/osquery/info.json'

     

       12
       12
       +
       INFO_PATH = 'pkgs/by-name/os/osquery/info.json'

     

       13
       13
        
       

     

       14
       14
        
       

     

       15
       15
        
       def download_str(url):

+3 -3

pkgs/by-name/os/osv-scanner/package.nix

···

       8
       8
        
       

     

       9
       9
        
       buildGoModule rec {

     

       10
       10
        
         pname = "osv-scanner";

     

       11
       11
       -
         version = "1.9.2";

     

       11
       11
       +
         version = "2.0.0";

     

       12
       12
        
       

     

       13
       13
        
         src = fetchFromGitHub {

     

       14
       14
        
           owner = "google";

     

       15
       15
        
           repo = "osv-scanner";

     

       16
       16
        
           tag = "v${version}";

     

       17
       17
       -
           hash = "sha256-Db5AgFvyrUOlW+1rcw8jPUzTBwQcFelLk5Rqk9HsbCo=";

     

       17
       17
       +
           hash = "sha256-iYbCCGZDTUbyW1XvQIpLZEtuzwUhTBAf3EfAwRX9qYU=";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
       -
         vendorHash = "sha256-4e+aEOo/hu2lC0c1sT8XJXdjrlcsqmPjpgvvdakHnmc=";

     

       20
       20
       +
         vendorHash = "sha256-saD4RehZrKSC5V3A5r5prlq+080BFbhEp1Jo1rCbSHI=";

     

       21
       21
        
       

     

       22
       22
        
         subPackages = [

     

       23
       23
        
           "cmd/osv-scanner"

+4 -2

pkgs/by-name/pa/passt/package.nix

···

       5
       5
        
       , getconf

     

       6
       6
        
       , gitUpdater

     

       7
       7
        
       , testers

     

       8
       8
       +
       , unixtools

     

       8
       9
        
       }:

     

       9
       10
        
       

     

       10
       11
        
       stdenv.mkDerivation (finalAttrs: {

     

       11
       12
        
         pname = "passt";

     

       12
       12
       -
         version = "2024_12_11.09478d5";

     

       13
       13
       +
         version = "2025_03_20.32f6212";

     

       13
       14
        
       

     

       14
       15
        
         src = fetchurl {

     

       15
       16
        
           url = "https://passt.top/passt/snapshot/passt-${finalAttrs.version}.tar.gz";

     

       16
       16
       -
           hash = "sha256-IE0BMM24lrl5NHeQGkAZZVwmAsvkhDN64pARdEiOM6s=";

     

       17
       17
       +
           hash = "sha256-TRtFwBUUOnRwcLtB3vwU5nG/ufi9D36waXW5Yuboowk=";

     

       17
       18
        
         };

     

       18
       19
        
       

     

       19
       20
        
         postPatch = ''

     
···

       30
       31
        
         passthru = {

     

       31
       32
        
           tests.version = testers.testVersion {

     

       32
       33
        
             package = finalAttrs.finalPackage;

     

       34
       34
       +
             command = "${unixtools.script}/bin/script -c 'passt --version'";

     

       33
       35
        
           };

     

       34
       36
        
       

     

       35
       37
        
           updateScript = gitUpdater {

+1 -1

pkgs/by-name/ph/photoprism/backend.nix

···

       33
       33
        
           substituteInPlace internal/commands/passwd.go --replace '/bin/stty' "${coreutils}/bin/stty"

     

       34
       34
        
         '';

     

       35
       35
        
       

     

       36
       36
       -
         vendorHash = "sha256-6xE1j/Vh9ltE6TpBkvjK4rzLyXv8OJzy84vf9Iqw3yU=";

     

       36
       36
       +
         vendorHash = "sha256-eHdnTpcVBSvGR9ZiK6A32jfjik8VClDTkv92bD8EIgA=";

     

       37
       37
        
       

     

       38
       38
        
         subPackages = [ "cmd/photoprism" ];

     

       39
       39

+1 -1

pkgs/by-name/ph/photoprism/frontend.nix

···

       13
       13
        
           cd frontend

     

       14
       14
        
         '';

     

       15
       15
        
       

     

       16
       16
       -
         npmDepsHash = "sha256-y2Mj0sJP2urTDrsVPReVFi7G9fLjuKz76vDPLvkaMFA=";

     

       16
       16
       +
         npmDepsHash = "sha256-3cytU/QaPSsGu/984AEh3YsdV4H5cjf/br3NSc5Zd1M=";

     

       17
       17
        
       

     

       18
       18
        
         installPhase = ''

     

       19
       19
        
           runHook preInstall

+2 -2

pkgs/by-name/ph/photoprism/package.nix

···

       17
       17
        
       }:

     

       18
       18
        
       

     

       19
       19
        
       let

     

       20
       20
       -
         version = "240711-2197af848";

     

       20
       20
       +
         version = "250321-57590c48b";

     

       21
       21
        
         pname = "photoprism";

     

       22
       22
        
       

     

       23
       23
        
         src = fetchFromGitHub {

     

       24
       24
        
           owner = pname;

     

       25
       25
        
           repo = pname;

     

       26
       26
        
           rev = version;

     

       27
       27
       -
           hash = "sha256-ihDv5c5RUjDbFcAHJjzp/8qCwKfA+rlFXPziaYarzs8=";

     

       27
       27
       +
           hash = "sha256-tJA1Q8kcX4UYDCV+rmHyd5gfEU8WkoaqNfx1/0Iy3l8=";

     

       28
       28
        
         };

     

       29
       29
        
       

     

       30
       30
        
         libtensorflow = callPackage ./libtensorflow.nix { };

+2 -2

pkgs/by-name/sb/sby/package.nix

···

       19
       19
        
       

     

       20
       20
        
       stdenv.mkDerivation rec {

     

       21
       21
        
         pname = "sby";

     

       22
       22
       -
         version = "0.50";

     

       22
       22
       +
         version = "0.51";

     

       23
       23
        
       

     

       24
       24
        
         src = fetchFromGitHub {

     

       25
       25
        
           owner = "YosysHQ";

     

       26
       26
        
           repo = "sby";

     

       27
       27
        
           tag = "v${version}";

     

       28
       28
       -
           hash = "sha256-srLziLdTjKd8NC5YBbAR1iD1EcJAL3HUp6O7Z2drdsI=";

     

       28
       28
       +
           hash = "sha256-U9aIZ+D5BhAPWuyQgAvwO6Bu8na2KnYLVPoDHi18jj4=";

     

       29
       29
        
         };

     

       30
       30
        
       

     

       31
       31
        
         nativeCheckInputs = [

+4 -4

pkgs/by-name/se/servo/package.nix

···

       62
       62
        
       

     

       63
       63
        
       rustPlatform.buildRustPackage {

     

       64
       64
        
         pname = "servo";

     

       65
       65
       -
         version = "0-unstable-2025-03-18";

     

       65
       65
       +
         version = "0-unstable-2025-03-29";

     

       66
       66
        
       

     

       67
       67
        
         src = fetchFromGitHub {

     

       68
       68
        
           owner = "servo";

     

       69
       69
        
           repo = "servo";

     

       70
       70
       -
           rev = "8d39d7706aee50971e848a5e31fc6bfd7ef552c1";

     

       71
       71
       -
           hash = "sha256-PdkES7tvECVoJWa78t/K4ab+brqCLHY47c+TnDNQ3Ps=";

     

       70
       70
       +
           rev = "5d1c64dba9cf3e65f770370eb17f00ad4114edce";

     

       71
       71
       +
           hash = "sha256-0DuS2WfgWgnxh5qDc/XNL28XxXKnYPQW7F2m4OlANck=";

     

       72
       72
        
           # Breaks reproducibility depending on whether the picked commit

     

       73
       73
        
           # has other ref-names or not, which may change over time, i.e. with

     

       74
       74
        
           # "ref-names: HEAD -> main" as long this commit is the branch HEAD

     
···

       79
       79
        
         };

     

       80
       80
        
       

     

       81
       81
        
         useFetchCargoVendor = true;

     

       82
       82
       -
         cargoHash = "sha256-mxbRqJ+ex9k1h6wOgjPHWfG8RA0vVRBAqsHtwSRI12Y=";

     

       82
       82
       +
         cargoHash = "sha256-m6lsXHf7SIgbIt8RyhUkJpd1/nJQMSNRS9uTJ6th9ng=";

     

       83
       83
        
       

     

       84
       84
        
         # set `HOME` to a temp dir for write access

     

       85
       85
        
         # Fix invalid option errors during linking (https://github.com/mozilla/nixpkgs-mozilla/commit/c72ff151a3e25f14182569679ed4cd22ef352328)

+5 -3

pkgs/by-name/sn/snakefmt/package.nix

···

       8
       8
        
       

     

       9
       9
        
       python3.pkgs.buildPythonApplication rec {

     

       10
       10
        
         pname = "snakefmt";

     

       11
       11
       -
         version = "0.10.2";

     

       11
       11
       +
         version = "0.11.0";

     

       12
       12
        
         pyproject = true;

     

       13
       13
        
       

     

       14
       14
       -
         disabled = python3.pythonOlder "3.8.1";

     

       14
       14
       +
         disabled = python3.pythonOlder "3.11";

     

       15
       15
        
       

     

       16
       16
        
         src = fetchPypi {

     

       17
       17
        
           inherit pname version;

     

       18
       18
       -
           hash = "sha256-QoalkDtm2n5SdjxegYTaTtyVETt1j0RIUogE+1T5t1o=";

     

       18
       18
       +
           hash = "sha256-r8O5LhA8/agP/35381f2zB2rdCJy7nY0K6NC8w5yHzA=";

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
        
         build-system = [ python3.pkgs.poetry-core ];

     
···

       26
       26
        
           importlib-metadata

     

       27
       27
        
           toml

     

       28
       28
        
         ];

     

       29
       29
       +
       

     

       30
       30
       +
         pythonRelaxDeps = [ "black" ];

     

       29
       31
        
       

     

       30
       32
        
         pythonImportsCheck = [ "snakefmt" ];

     

       31
       33

+3 -3

pkgs/by-name/st/steel/package.nix

···

       20
       20
        
       }:

     

       21
       21
        
       rustPlatform.buildRustPackage {

     

       22
       22
        
         pname = "steel";

     

       23
       23
       -
         version = "0.6.0-unstable-2025-03-17";

     

       23
       23
       +
         version = "0.6.0-unstable-2025-03-28";

     

       24
       24
        
       

     

       25
       25
        
         src = fetchFromGitHub {

     

       26
       26
        
           owner = "mattwparas";

     

       27
       27
        
           repo = "steel";

     

       28
       28
       -
           rev = "8482d947369230b3af45e8775b78dad2379f7a1a";

     

       29
       29
       -
           hash = "sha256-/2j8olMZngr5tKmM0JfxM8oi+CYn05LY5406syq7jak=";

     

       28
       28
       +
           rev = "2f0fba8b16a3fbab083cedcf09974514b3a29d25";

     

       29
       29
       +
           hash = "sha256-i/bmZFoC3fRocO1KeCPGB9K/0yEAcKlLh56N+r1V7CI=";

     

       30
       30
        
         };

     

       31
       31
        
       

     

       32
       32
        
         useFetchCargoVendor = true;

+2 -2

pkgs/by-name/ts/tsid/package.nix

···

       15
       15
        
       

     

       16
       16
        
       stdenv.mkDerivation (finalAttrs: {

     

       17
       17
        
         pname = "tsid";

     

       18
       18
       -
         version = "1.7.1";

     

       18
       18
       +
         version = "1.8.0";

     

       19
       19
        
       

     

       20
       20
        
         src = fetchFromGitHub {

     

       21
       21
        
           owner = "stack-of-tasks";

     

       22
       22
        
           repo = "tsid";

     

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

     

       24
       24
       -
           hash = "sha256-id6OCOX01o41Z5kqzwvjYa5uoQZtzhRaFBuOBhbLcTA=";

     

       24
       24
       +
           hash = "sha256-SS6JhU4fuZtTzv/EY31ixwwLOzmO/dN3H5HEMh/URTA=";

     

       25
       25
        
         };

     

       26
       26
        
       

     

       27
       27
        
         cmakeFlags = [

+3 -3

pkgs/by-name/we/weaviate/package.nix

···

       6
       6
        
       

     

       7
       7
        
       buildGoModule rec {

     

       8
       8
        
         pname = "weaviate";

     

       9
       9
       -
         version = "1.29.0";

     

       9
       9
       +
         version = "1.29.1";

     

       10
       10
        
       

     

       11
       11
        
         src = fetchFromGitHub {

     

       12
       12
        
           owner = "weaviate";

     

       13
       13
        
           repo = "weaviate";

     

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

     

       15
       15
       -
           hash = "sha256-tyztq4oXN9tPVSqQme8IG3dcba7ytblVW98jU6Nao5M=";

     

       15
       15
       +
           hash = "sha256-Akg0iY5M3X6ztKxhNEkhi03VnbNpNW7/Vcbv2KB6X54=";

     

       16
       16
        
         };

     

       17
       17
        
       

     

       18
       18
       -
         vendorHash = "sha256-WfqYmqEjgZwQgFKW97oIEaBXTKqOOFKviuYTRyqVQP0=";

     

       18
       18
       +
         vendorHash = "sha256-U2ean49ESKmcQ3fTtd6y9MwfWPr6tolvgioyKbQsBmU=";

     

       19
       19
        
       

     

       20
       20
        
         subPackages = [ "cmd/weaviate-server" ];

     

       21
       21

+3 -3

pkgs/by-name/we/web-ext/package.nix

···

       8
       8
        
       

     

       9
       9
        
       buildNpmPackage rec {

     

       10
       10
        
         pname = "web-ext";

     

       11
       11
       -
         version = "8.4.0";

     

       11
       11
       +
         version = "8.5.0";

     

       12
       12
        
       

     

       13
       13
        
         src = fetchFromGitHub {

     

       14
       14
        
           owner = "mozilla";

     

       15
       15
        
           repo = "web-ext";

     

       16
       16
        
           rev = version;

     

       17
       17
       -
           hash = "sha256-zPOXl/7v/yP1ggqSKruGli/FC8Vf7i4J3LZey4WC/Lc=";

     

       17
       17
       +
           hash = "sha256-RT/K/fYMys1RAvnusAMuHtfZ7gndYf3FPuHBYCklBpw=";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
       -
         npmDepsHash = "sha256-tU/NTeMjUyw1ftXLTP3HpLQqfzTNVwgY3oKvuIZXPxw=";

     

       20
       20
       +
         npmDepsHash = "sha256-O8DmeT0wRNpuPU1K6kH97D9+mxOxCchAUrvOVPq4VPc=";

     

       21
       21
        
       

     

       22
       22
        
         npmBuildFlags = [ "--production" ];

     

       23
       23

+3 -3

pkgs/by-name/zw/zwave-js-server/package.nix

···

       6
       6
        
       

     

       7
       7
        
       buildNpmPackage rec {

     

       8
       8
        
         pname = "zwave-js-server";

     

       9
       9
       -
         version = "1.40.3";

     

       9
       9
       +
         version = "3.0.0";

     

       10
       10
        
       

     

       11
       11
        
         src = fetchFromGitHub {

     

       12
       12
        
           owner = "zwave-js";

     

       13
       13
        
           repo = "zwave-js-server";

     

       14
       14
        
           rev = version;

     

       15
       15
       -
           hash = "sha256-fk9UBtdbU9ZVoqCXXeeGpaiGhU9/pcR87NP1S86axSM=";

     

       15
       15
       +
           hash = "sha256-vY/afOza0ewOqlhbp6uMf/mw9nvQLN0lEFmHekxpJVA=";

     

       16
       16
        
         };

     

       17
       17
        
       

     

       18
       18
       -
         npmDepsHash = "sha256-iSrgrgepUZzlBvwMe6lmFUW4i6DVx1Bq4I4UBph/oNA=";

     

       18
       18
       +
         npmDepsHash = "sha256-HgXFFA1aa25vRpw4ujj6aeIX75soDYv3TaM5bQOfEv4=";

     

       19
       19
        
       

     

       20
       20
        
         # For some reason the zwave-js dependency is in devDependencies

     

       21
       21
        
         npmFlags = [ "--include=dev" ];

+2 -2

pkgs/development/beam-modules/elixir-ls/default.nix

···

       11
       11
        
       

     

       12
       12
        
       let

     

       13
       13
        
         pname = "elixir-ls";

     

       14
       14
       -
         version = "0.27.1";

     

       14
       14
       +
         version = "0.27.2";

     

       15
       15
        
         src = fetchFromGitHub {

     

       16
       16
        
           owner = "elixir-lsp";

     

       17
       17
        
           repo = "elixir-ls";

     

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

     

       19
       19
       -
           hash = "sha256-YSu9uN0n8x1833iqvskk/47JnoXJ2Y8RCRmA12YYgDc=";

     

       19
       19
       +
           hash = "sha256-y1QT+wRFc+++OVFJwEheqcDIwaKHlyjbhEjhLJ2rYaI=";

     

       20
       20
        
         };

     

       21
       21
        
       in

     

       22
       22
        
       mixRelease {

-1

pkgs/development/compilers/elm/packages/node/node-composition.nix

···

       13
       13
        
           inherit (pkgs)

     

       14
       14
        
             stdenv

     

       15
       15
        
             lib

     

       16
       16
       -
             python2

     

       17
       16
        
             runCommand

     

       18
       17
        
             writeTextFile

     

       19
       18
        
             writeShellScript

+2 -2

pkgs/development/libraries/libwpe/fdo.nix

···

       17
       17
        
       

     

       18
       18
        
       stdenv.mkDerivation rec {

     

       19
       19
        
         pname = "wpebackend-fdo";

     

       20
       20
       -
         version = "1.14.3";

     

       20
       20
       +
         version = "1.16.0";

     

       21
       21
        
       

     

       22
       22
        
         src = fetchurl {

     

       23
       23
        
           url = "https://wpewebkit.org/releases/wpebackend-fdo-${version}.tar.xz";

     

       24
       24
       -
           sha256 = "sha256-EBIYQllahQKR2z6C89sLmYTfB5Ai04bOQsK4UIFZ3Gw=";

     

       24
       24
       +
           sha256 = "sha256-vt3zISMtW9CBBsF528YA+M6I6zYgtKWaYykGO3j2RjU=";

     

       25
       25
        
         };

     

       26
       26
        
       

     

       27
       27
        
         depsBuildBuild = [

-1

pkgs/development/node-packages/composition.nix

···

       13
       13
        
           inherit (pkgs)

     

       14
       14
        
             stdenv

     

       15
       15
        
             lib

     

       16
       16
       -
             python2

     

       17
       16
        
             runCommand

     

       18
       17
        
             writeTextFile

     

       19
       18
        
             writeShellScript

+2 -2

pkgs/development/node-packages/node-env.nix

···

       1
       1
        
       # This file originates from node2nix

     

       2
       2
        
       

     

       3
       3
       -
       {lib, stdenv, nodejs, python2, pkgs, libtool, runCommand, writeTextFile, writeShellScript}:

     

       3
       3
       +
       {lib, stdenv, nodejs, pkgs, libtool, runCommand, writeTextFile, writeShellScript}:

     

       4
       4
        
       

     

       5
       5
        
       let

     

       6
       6
       -
         python = if nodejs ? python then nodejs.python else python2;

     

       6
       6
       +
         inherit (nodejs) python;

     

       7
       7
        
       

     

       8
       8
        
         # Create a tar wrapper that filters all the 'Ignoring unknown extended header keyword' noise

     

       9
       9
        
         tarWrapper = runCommand "tarWrapper" {} ''

+4 -7

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

···

       39
       39
        
       

     

       40
       40
        
       buildPythonPackage rec {

     

       41
       41
        
         pname = "coiled";

     

       42
       42
       -
         version = "1.86.0";

     

       42
       42
       +
         version = "1.90.2";

     

       43
       43
        
         pyproject = true;

     

       44
       44
        
       

     

       45
       45
        
         src = fetchPypi {

     

       46
       46
        
           inherit pname version;

     

       47
       47
       -
           hash = "sha256-umwAG7+ykCWLqgyQzWdrYUuslyWWP1/uKlsSci50qR4=";

     

       47
       47
       +
           hash = "sha256-5u33FbSB86jR9KIAhR24J0wSz9kRCaOJ0ituEzULHH8=";

     

       48
       48
        
         };

     

       49
       49
        
       

     

       50
       50
        
         build-system = [

     
···

       79
       79
        
           wheel

     

       80
       80
        
         ];

     

       81
       81
        
       

     

       82
       82
       -
         pythonImportsCheck = [

     

       83
       83
       -
           "coiled"

     

       84
       84
       -
         ];

     

       82
       82
       +
         pythonImportsCheck = [ "coiled" ];

     

       85
       83
        
       

     

       86
       84
        
         nativeCheckInputs = [

     

       87
       85
        
           versionCheckHook

     

       88
       86
        
         ];

     

       89
       89
       -
       

     

       90
       90
       -
         versionCheckProgramArg = [ "--version" ];

     

       87
       87
       +
         versionCheckProgramArg = "--version";

     

       91
       88
        
       

     

       92
       89
        
         meta = {

     

       93
       90
        
           description = "Python client for coiled.io dask clusters";

-28

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

···

       1
       1
       -
       {

     

       2
       2
       -
         lib,

     

       3
       3
       -
         buildPythonPackage,

     

       4
       4
       -
         fetchPypi,

     

       5
       5
       -
         isPy27,

     

       6
       6
       -
         oauth2,

     

       7
       7
       -
       }:

     

       8
       8
       -
       

     

       9
       9
       -
       buildPythonPackage rec {

     

       10
       10
       -
         pname = "evernote";

     

       11
       11
       -
         version = "1.25.3";

     

       12
       12
       -
         format = "setuptools";

     

       13
       13
       -
         disabled = !isPy27; # some dependencies do not work with py3

     

       14
       14
       -
       

     

       15
       15
       -
         src = fetchPypi {

     

       16
       16
       -
           inherit pname version;

     

       17
       17
       -
           sha256 = "796847e0b7517e729041c5187fa1665c3f6fc0491cb4d71fb95a62c4f22e64eb";

     

       18
       18
       -
         };

     

       19
       19
       -
       

     

       20
       20
       -
         propagatedBuildInputs = [ oauth2 ];

     

       21
       21
       -
       

     

       22
       22
       -
         meta = with lib; {

     

       23
       23
       -
           description = "Evernote SDK for Python";

     

       24
       24
       -
           homepage = "https://dev.evernote.com";

     

       25
       25
       -
           license = licenses.asl20;

     

       26
       26
       -
           maintainers = with maintainers; [ hbunke ];

     

       27
       27
       -
         };

     

       28
       28
       -
       }

-48

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

···

       1
       1
       -
       {

     

       2
       2
       -
         lib,

     

       3
       3
       -
         buildPythonPackage,

     

       4
       4
       -
         fetchFromGitHub,

     

       5
       5
       -
         isPy27,

     

       6
       6
       -
         thrift,

     

       7
       7
       -
         beautifulsoup4,

     

       8
       8
       -
         markdown2,

     

       9
       9
       -
         sqlalchemy,

     

       10
       10
       -
         html2text,

     

       11
       11
       -
         evernote,

     

       12
       12
       -
       }:

     

       13
       13
       -
       

     

       14
       14
       -
       buildPythonPackage {

     

       15
       15
       -
         version = "2015-05-11";

     

       16
       16
       -
         format = "setuptools";

     

       17
       17
       -
         pname = "geeknote";

     

       18
       18
       -
         disabled = !isPy27;

     

       19
       19
       -
       

     

       20
       20
       -
         src = fetchFromGitHub {

     

       21
       21
       -
           owner = "VitaliyRodnenko";

     

       22
       22
       -
           repo = "geeknote";

     

       23
       23
       -
           rev = "8489a87d044e164edb321ba9acca8d4631de3dca";

     

       24
       24
       -
           sha256 = "0l16v4xnyqnsf84b1pma0jmdyxvmfwcv3sm8slrv3zv7zpmcm3lf";

     

       25
       25
       -
         };

     

       26
       26
       -
       

     

       27
       27
       -
         /*

     

       28
       28
       -
           build with tests fails with "Can not create application dirictory :

     

       29
       29
       -
           /homeless-shelter/.geeknotebuilder".

     

       30
       30
       -
         */

     

       31
       31
       -
         doCheck = false;

     

       32
       32
       -
       

     

       33
       33
       -
         propagatedBuildInputs = [

     

       34
       34
       -
           thrift

     

       35
       35
       -
           beautifulsoup4

     

       36
       36
       -
           markdown2

     

       37
       37
       -
           sqlalchemy

     

       38
       38
       -
           html2text

     

       39
       39
       -
           evernote

     

       40
       40
       -
         ];

     

       41
       41
       -
       

     

       42
       42
       -
         meta = with lib; {

     

       43
       43
       -
           description = "Work with Evernote from command line";

     

       44
       44
       -
           homepage = "http://www.geeknote.me";

     

       45
       45
       -
           license = licenses.gpl1Only;

     

       46
       46
       -
           maintainers = with maintainers; [ hbunke ];

     

       47
       47
       -
         };

     

       48
       48
       -
       }

+2 -2

pkgs/development/python-modules/google-cloud-speech/default.nix

···

       14
       14
        
       

     

       15
       15
        
       buildPythonPackage rec {

     

       16
       16
        
         pname = "google-cloud-speech";

     

       17
       17
       -
         version = "2.31.0";

     

       17
       17
       +
         version = "2.31.1";

     

       18
       18
        
         pyproject = true;

     

       19
       19
        
       

     

       20
       20
        
         disabled = pythonOlder "3.7";

     
···

       22
       22
        
         src = fetchPypi {

     

       23
       23
        
           pname = "google_cloud_speech";

     

       24
       24
        
           inherit version;

     

       25
       25
       -
           hash = "sha256-15mMJqlF9Ykzxg4tOAPtBZPrQWusnUOBwDBZ0QJy7wM=";

     

       25
       25
       +
           hash = "sha256-/fDTUMBke1ZpRUAr2K7vK3r9pnq7UgbrTbTtQfkjtA8=";

     

       26
       26
        
         };

     

       27
       27
        
       

     

       28
       28
        
         build-system = [ setuptools ];

-27

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

···

       1
       1
       -
       {

     

       2
       2
       -
         lib,

     

       3
       3
       -
         buildPythonPackage,

     

       4
       4
       -
         fetchPypi,

     

       5
       5
       -
         pillow,

     

       6
       6
       -
         isPy27,

     

       7
       7
       -
       }:

     

       8
       8
       -
       

     

       9
       9
       -
       buildPythonPackage rec {

     

       10
       10
       -
         pname = "modestmaps";

     

       11
       11
       -
         version = "1.4.7";

     

       12
       12
       -
         disabled = !isPy27;

     

       13
       13
       -
       

     

       14
       14
       -
         src = fetchPypi {

     

       15
       15
       -
           pname = "ModestMaps";

     

       16
       16
       -
           inherit version;

     

       17
       17
       -
           sha256 = "698442a170f02923f8ea55f18526b56c17178162e44304f896a8a5fd65ab4457";

     

       18
       18
       -
         };

     

       19
       19
       -
       

     

       20
       20
       -
         propagatedBuildInputs = [ pillow ];

     

       21
       21
       -
       

     

       22
       22
       -
         meta = with lib; {

     

       23
       23
       -
           description = "Library for building interactive maps";

     

       24
       24
       -
           homepage = "http://modestmaps.com";

     

       25
       25
       -
           license = licenses.bsd3;

     

       26
       26
       -
         };

     

       27
       27
       -
       }

+2 -2

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

···

       41
       41
        
       

     

       42
       42
        
       buildPythonPackage rec {

     

       43
       43
        
         pname = "nipype";

     

       44
       44
       -
         version = "1.9.2";

     

       44
       44
       +
         version = "1.10.0";

     

       45
       45
        
         disabled = pythonOlder "3.7";

     

       46
       46
        
         format = "setuptools";

     

       47
       47
        
       

     

       48
       48
        
         src = fetchPypi {

     

       49
       49
        
           inherit pname version;

     

       50
       50
       -
           hash = "sha256-pQO9QbZY8ITRBCUv1yjvdfGhmYAm/quYsWOZiWVOA0M=";

     

       50
       50
       +
           hash = "sha256-GeXWzvpwmXGY94vGZe9NPTy1MyW1uYpy5Rrvra9rPg4=";

     

       51
       51
        
         };

     

       52
       52
        
       

     

       53
       53
        
         postPatch = ''

-25

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

···

       1
       1
       -
       {

     

       2
       2
       -
         lib,

     

       3
       3
       -
         buildPythonPackage,

     

       4
       4
       -
         fetchPypi,

     

       5
       5
       -
         isPy27,

     

       6
       6
       -
       }:

     

       7
       7
       -
       

     

       8
       8
       -
       buildPythonPackage rec {

     

       9
       9
       -
         pname = "pychart";

     

       10
       10
       -
         version = "1.39";

     

       11
       11
       -
         format = "setuptools";

     

       12
       12
       -
       

     

       13
       13
       -
         disabled = !isPy27;

     

       14
       14
       -
       

     

       15
       15
       -
         src = fetchPypi {

     

       16
       16
       -
           inherit pname version;

     

       17
       17
       -
           sha256 = "882650928776a7ca72e67054a9e0ac98f78645f279c0cfb5910db28f03f07c2e";

     

       18
       18
       -
         };

     

       19
       19
       -
       

     

       20
       20
       -
         meta = with lib; {

     

       21
       21
       -
           description = "Library for creating high quality encapsulated Postscript, PDF, PNG, or SVG charts";

     

       22
       22
       -
           homepage = "https://pypi.python.org/pypi/PyChart";

     

       23
       23
       -
           license = licenses.gpl2;

     

       24
       24
       -
         };

     

       25
       25
       -
       }

+3 -3

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

···

       12
       12
        
       

     

       13
       13
        
       buildPythonPackage rec {

     

       14
       14
        
         pname = "pygnmi";

     

       15
       15
       -
         version = "0.8.14";

     

       15
       15
       +
         version = "0.8.15";

     

       16
       16
        
         format = "setuptools";

     

       17
       17
        
       

     

       18
       18
        
         disabled = pythonOlder "3.7";

     
···

       21
       21
        
           owner = "akarneliuk";

     

       22
       22
        
           repo = "pygnmi";

     

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

     

       24
       24
       -
           sha256 = "sha256-ncp/OwELy/QOvGhLUZW2qTQZsckWI4CGrlEAZ20RtQI=";

     

       24
       24
       +
           sha256 = "sha256-2QPUyPGTtXlO6A05mmb/jofRidXfKq0xvH7lv1f9OQk=";

     

       25
       25
        
         };

     

       26
       26
        
       

     

       27
       27
        
         propagatedBuildInputs = [

     
···

       43
       43
        
           description = "Pure Python gNMI client to manage network functions and collect telemetry";

     

       44
       44
        
           mainProgram = "pygnmicli";

     

       45
       45
        
           homepage = "https://github.com/akarneliuk/pygnmi";

     

       46
       46
       -
           changelog = "https://github.com/akarneliuk/pygnmi/releases/tag/v${version}";

     

       46
       46
       +
           changelog = "https://github.com/akarneliuk/pygnmi/releases/tag/${src.tag}";

     

       47
       47
        
           license = licenses.bsd3;

     

       48
       48
        
           maintainers = [ ];

     

       49
       49
        
         };

-30

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

···

       1
       1
       -
       {

     

       2
       2
       -
         lib,

     

       3
       3
       -
         buildPythonPackage,

     

       4
       4
       -
         fetchPypi,

     

       5
       5
       -
         isPy27,

     

       6
       6
       -
       }:

     

       7
       7
       -
       

     

       8
       8
       -
       buildPythonPackage rec {

     

       9
       9
       -
         pname = "python-wifi";

     

       10
       10
       -
         version = "0.6.1";

     

       11
       11
       -
         format = "setuptools";

     

       12
       12
       -
         disabled = !isPy27;

     

       13
       13
       -
       

     

       14
       14
       -
         src = fetchPypi {

     

       15
       15
       -
           inherit pname version;

     

       16
       16
       -
           extension = "tar.bz2";

     

       17
       17
       -
           sha256 = "149c3dznb63d82143cz5hqdim0mqjysz6p3yk0zv271vq3xnmzvv";

     

       18
       18
       -
         };

     

       19
       19
       -
       

     

       20
       20
       -
         meta = with lib; {

     

       21
       21
       -
           description = "Read & write wireless card capabilities using the Linux Wireless Extensions";

     

       22
       22
       -
           homepage = "http://pythonwifi.tuxfamily.org/";

     

       23
       23
       -
           # From the README: "pythonwifi is licensed under LGPLv2+, however, the

     

       24
       24
       -
           # examples (e.g. iwconfig.py and iwlist.py) are licensed under GPLv2+."

     

       25
       25
       -
           license = with licenses; [

     

       26
       26
       -
             lgpl2Plus

     

       27
       27
       -
             gpl2Plus

     

       28
       28
       -
           ];

     

       29
       29
       -
         };

     

       30
       30
       -
       }

+2 -2

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

···

       28
       28
        
       

     

       29
       29
        
       buildPythonPackage rec {

     

       30
       30
        
         pname = "streamlit";

     

       31
       31
       -
         version = "1.42.2";

     

       31
       31
       +
         version = "1.43.2";

     

       32
       32
        
         pyproject = true;

     

       33
       33
        
       

     

       34
       34
        
         disabled = pythonOlder "3.9";

     

       35
       35
        
       

     

       36
       36
        
         src = fetchPypi {

     

       37
       37
        
           inherit pname version;

     

       38
       38
       -
           hash = "sha256-YgJtvctIJ5CTP2WLCW191Y+nDaicHwb7w2WLkdzU2rI=";

     

       38
       38
       +
           hash = "sha256-86+ir2N9ABVMakxWDS/eJW19yMwfMqU88gVwwJZ4Qbw=";

     

       39
       39
        
         };

     

       40
       40
        
       

     

       41
       41
        
         build-system = [

-40

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

···

       1
       1
       -
       {

     

       2
       2
       -
         lib,

     

       3
       3
       -
         buildPythonPackage,

     

       4
       4
       -
         fetchPypi,

     

       5
       5
       -
         modestmaps,

     

       6
       6
       -
         pillow,

     

       7
       7
       -
         pycairo,

     

       8
       8
       -
         python-mapnik,

     

       9
       9
       -
         simplejson,

     

       10
       10
       -
         werkzeug,

     

       11
       11
       -
         isPy27,

     

       12
       12
       -
       }:

     

       13
       13
       -
       

     

       14
       14
       -
       buildPythonPackage rec {

     

       15
       15
       -
         pname = "tilestache";

     

       16
       16
       -
         version = "1.51.14";

     

       17
       17
       -
         format = "setuptools";

     

       18
       18
       -
         disabled = !isPy27;

     

       19
       19
       -
       

     

       20
       20
       -
         src = fetchPypi {

     

       21
       21
       -
           pname = "TileStache";

     

       22
       22
       -
           inherit version;

     

       23
       23
       -
           sha256 = "1qjrabl6qr7i6yj6v647ck92abcyklb0vmb6h6kj7x8v2cj5xbvk";

     

       24
       24
       -
         };

     

       25
       25
       -
       

     

       26
       26
       -
         propagatedBuildInputs = [

     

       27
       27
       -
           modestmaps

     

       28
       28
       -
           pillow

     

       29
       29
       -
           pycairo

     

       30
       30
       -
           python-mapnik

     

       31
       31
       -
           simplejson

     

       32
       32
       -
           werkzeug

     

       33
       33
       -
         ];

     

       34
       34
       -
       

     

       35
       35
       -
         meta = with lib; {

     

       36
       36
       -
           description = "Tile server for rendered geographic data";

     

       37
       37
       -
           homepage = "http://tilestache.org";

     

       38
       38
       -
           license = licenses.bsd3;

     

       39
       39
       -
         };

     

       40
       40
       -
       }

+1 -1

pkgs/misc/base16-builder/node-packages.nix

···

       6
       6
        
       

     

       7
       7
        
       let

     

       8
       8
        
         nodeEnv = import ../../development/node-packages/node-env.nix {

     

       9
       9
       -
           inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript;

     

       9
       9
       +
           inherit (pkgs) stdenv lib runCommand writeTextFile writeShellScript;

     

       10
       10
        
           inherit pkgs nodejs;

     

       11
       11
        
           libtool = if pkgs.stdenv.hostPlatform.isDarwin then pkgs.cctools or pkgs.darwin.cctools else null;

     

       12
       12
        
         };

+2 -2

pkgs/servers/http/couchdb/3.nix

···

       11
       11
        
       

     

       12
       12
        
       stdenv.mkDerivation rec {

     

       13
       13
        
         pname = "couchdb";

     

       14
       14
       -
         version = "3.4.2";

     

       14
       14
       +
         version = "3.4.3";

     

       15
       15
        
       

     

       16
       16
        
         src = fetchurl {

     

       17
       17
        
           url = "mirror://apache/couchdb/source/${version}/apache-${pname}-${version}.tar.gz";

     

       18
       18
       -
           hash = "sha256-0n/yoTNWAAKWqYq4hMrz0XWSfPIXJ5Y/+Q+rOnR1RM8=";

     

       18
       18
       +
           hash = "sha256-A1dRG2/tcOPmT051ql18wgAMsPJk7zAXArGBZCf3LyA=";

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
        
         postPatch = ''

+8 -5

pkgs/servers/http/nginx/modules.nix

···

       1
       1
        
       { lib

     

       2
       2
        
       , config

     

       3
       3
       +
       , nixosTests

     

       3
       4
        
       , fetchFromGitHub

     

       4
       5
        
       , fetchFromGitLab

     

       5
       6
        
       , fetchhg

     
···

       509
       510
        
           src = fetchFromGitHub {

     

       510
       511
        
             owner = "nginx";

     

       511
       512
        
             repo = "njs";

     

       512
       512
       -
             rev = "0.8.7";

     

       513
       513
       -
             hash = "sha256-VEXzP+cN5hnDeniccwY7GIi4x460rnWO/o7ja3DyRCc=";

     

       513
       513
       +
             rev = "0.8.9";

     

       514
       514
       +
             hash = "sha256-TalS9EJP+vB1o3BKaTvXXnudjKhNOcob3kDAyeKej3c=";

     

       514
       515
        
           };

     

       515
       516
        
       

     

       516
       517
        
           # njs module sources have to be writable during nginx build, so we copy them

     
···

       520
       521
        
             mkdir -p "$(dirname "$NJS_SOURCE_DIR")"

     

       521
       522
        
             cp --recursive "${src}" "$NJS_SOURCE_DIR"

     

       522
       523
        
             chmod -R u+rwX,go+rX "$NJS_SOURCE_DIR"

     

       523
       523
       -
             export configureFlags="''${configureFlags/"${src}"/"$NJS_SOURCE_DIR/nginx"}"

     

       524
       524
       +
             export configureFlags="''${configureFlags/"${src}"/"$NJS_SOURCE_DIR/nginx"} --with-ld-opt='-lz'"

     

       524
       525
        
             unset NJS_SOURCE_DIR

     

       525
       526
        
           '';

     

       526
       527
        
       

     

       527
       527
       -
           inputs = [ which ];

     

       528
       528
       +
           inputs = [ which zlib ];

     

       529
       529
       +
       

     

       530
       530
       +
           passthru.tests = nixosTests.nginx-njs;

     

       528
       531
        
       

     

       529
       532
        
           meta = with lib; {

     

       530
       533
        
             description = "Subset of the JavaScript language that allows extending nginx functionality";

     

       531
       534
        
             homepage = "https://nginx.org/en/docs/njs/";

     

       532
       535
        
             license = with licenses; [ bsd2 ];

     

       533
       533
       -
             maintainers = [ ];

     

       536
       536
       +
             maintainers = with maintainers; [ jvanbruegge ];

     

       534
       537
        
           };

     

       535
       538
        
         };

     

       536
       539

+2 -2

pkgs/servers/icingaweb2/default.nix

···

       3
       3
        
         lib,

     

       4
       4
        
         fetchFromGitHub,

     

       5
       5
        
         makeWrapper,

     

       6
       6
       -
         php,

     

       6
       6
       +
         php83,

     

       7
       7
        
         nixosTests,

     

       8
       8
        
       }:

     

       9
       9
        
       

     
···

       25
       25
        
           cp -ra application bin etc library modules public $out

     

       26
       26
        
           cp -ra doc $out/share

     

       27
       27
        
       

     

       28
       28
       -
           wrapProgram $out/bin/icingacli --prefix PATH : "${lib.makeBinPath [ php ]}"

     

       28
       28
       +
           wrapProgram $out/bin/icingacli --prefix PATH : "${lib.makeBinPath [ php83 ]}"

     

       29
       29
        
         '';

     

       30
       30
        
       

     

       31
       31
        
         passthru.tests = { inherit (nixosTests) icingaweb2; };

+3 -3

pkgs/servers/monitoring/prometheus/pihole-exporter.nix

···

       6
       6
        
       

     

       7
       7
        
       buildGoModule rec {

     

       8
       8
        
         pname = "pihole-exporter";

     

       9
       9
       -
         version = "1.0.0";

     

       9
       9
       +
         version = "1.0.1";

     

       10
       10
        
       

     

       11
       11
        
         src = fetchFromGitHub {

     

       12
       12
        
           owner = "eko";

     

       13
       13
        
           repo = pname;

     

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

     

       15
       15
       -
           sha256 = "sha256-Sum27hjs0Jvi1UWGeQcR8z9zmZ/I40uBFpKeHgHfFrA=";

     

       15
       15
       +
           sha256 = "sha256-7gomafTMK8rk+QFw3Vm8KUgNFqiUDILeTwNFa7vdgAw=";

     

       16
       16
        
         };

     

       17
       17
        
       

     

       18
       18
       -
         vendorHash = "sha256-7f/upTF3/w40wWGdcw0h3kOPlo8ZeyRna6FapnF2X0s=";

     

       18
       18
       +
         vendorHash = "sha256-GB/wVB97aV+CV9Xtv0EofQQR+qOmtwrBFBogU+2S+Po=";

     

       19
       19
        
       

     

       20
       20
        
         meta = with lib; {

     

       21
       21
        
           description = "Prometheus exporter for PI-Hole's Raspberry PI ad blocker";

+1

pkgs/servers/monitoring/zabbix/agent.nix

···

       48
       48
        
             license =

     

       49
       49
        
               if (lib.versions.major version >= "7") then lib.licenses.agpl3Only else lib.licenses.gpl2Plus;

     

       50
       50
        
             maintainers = with lib.maintainers; [

     

       51
       51
       +
               bstanderline

     

       51
       52
        
               mmahut

     

       52
       53
        
               psyanticy

     

       53
       54
        
             ];

+4 -1

pkgs/servers/monitoring/zabbix/agent2.nix

···

       83
       83
        
             homepage = "https://www.zabbix.com/";

     

       84
       84
        
             license =

     

       85
       85
        
               if (lib.versions.major version >= "7") then lib.licenses.agpl3Only else lib.licenses.gpl2Plus;

     

       86
       86
       -
             maintainers = with lib.maintainers; [ aanderse ];

     

       86
       86
       +
             maintainers = with lib.maintainers; [

     

       87
       87
       +
               aanderse

     

       88
       88
       +
               bstanderline

     

       89
       89
       +
             ];

     

       87
       90
        
             platforms = lib.platforms.unix;

     

       88
       91
        
           };

     

       89
       92
        
         }

+4 -1

pkgs/servers/monitoring/zabbix/proxy.nix

···

       120
       120
        
             homepage = "https://www.zabbix.com/";

     

       121
       121
        
             license =

     

       122
       122
        
               if (lib.versions.major version >= "7") then lib.licenses.agpl3Only else lib.licenses.gpl2Plus;

     

       123
       123
       -
             maintainers = with lib.maintainers; [ mmahut ];

     

       123
       123
       +
             maintainers = with lib.maintainers; [

     

       124
       124
       +
               bstanderline

     

       125
       125
       +
               mmahut

     

       126
       126
       +
             ];

     

       124
       127
        
             platforms = lib.platforms.linux;

     

       125
       128
        
           };

     

       126
       129
        
         }

+1

pkgs/servers/monitoring/zabbix/server.nix

···

       126
       126
        
             license =

     

       127
       127
        
               if (lib.versions.major version >= "7") then lib.licenses.agpl3Only else lib.licenses.gpl2Plus;

     

       128
       128
        
             maintainers = with lib.maintainers; [

     

       129
       129
       +
               bstanderline

     

       129
       130
        
               mmahut

     

       130
       131
        
               psyanticy

     

       131
       132
        
             ];

+2 -2

pkgs/servers/monitoring/zabbix/versions.nix

···

       1
       1
        
       generic: {

     

       2
       2
        
         v70 = generic {

     

       3
       3
       -
           version = "7.0.10";

     

       4
       4
       -
           hash = "sha256-7tY+06QNva7EgTnBVu1SbbYLUIXbSlzJWpG08ISyGUg=";

     

       3
       3
       +
           version = "7.0.11";

     

       4
       4
       +
           hash = "sha256-r9VNy3bRuFvJAL+ZQEbKjCAS3+AvetnWAwFjLxFVuGU=";

     

       5
       5
        
           vendorHash = null;

     

       6
       6
        
         };

     

       7
       7
        
         v64 = generic {

+4 -1

pkgs/servers/monitoring/zabbix/web.nix

···

       33
       33
        
             homepage = "https://www.zabbix.com/";

     

       34
       34
        
             license =

     

       35
       35
        
               if (lib.versions.major version >= "7") then lib.licenses.agpl3Only else lib.licenses.gpl2Plus;

     

       36
       36
       -
             maintainers = with lib.maintainers; [ mmahut ];

     

       36
       36
       +
             maintainers = with lib.maintainers; [

     

       37
       37
       +
               bstanderline

     

       38
       38
       +
               mmahut

     

       39
       39
       +
             ];

     

       37
       40
        
             platforms = lib.platforms.linux;

     

       38
       41
        
           };

     

       39
       42
        
         }

-1

pkgs/servers/mx-puppet-discord/node-composition.nix

···

       13
       13
        
           inherit (pkgs)

     

       14
       14
        
             stdenv

     

       15
       15
        
             lib

     

       16
       16
       -
             python2

     

       17
       16
        
             runCommand

     

       18
       17
        
             writeTextFile

     

       19
       18
        
             writeShellScript

-1

pkgs/servers/web-apps/ethercalc/node-packages.nix

···

       13
       13
        
           inherit (pkgs)

     

       14
       14
        
             stdenv

     

       15
       15
        
             lib

     

       16
       16
       -
             python2

     

       17
       16
        
             runCommand

     

       18
       17
        
             writeTextFile

     

       19
       18
        
             writeShellScript

-1

pkgs/tools/security/onlykey/onlykey.nix

···

       13
       13
        
           inherit (pkgs)

     

       14
       14
        
             stdenv

     

       15
       15
        
             lib

     

       16
       16
       -
             python2

     

       17
       16
        
             runCommand

     

       18
       17
        
             writeTextFile

     

       19
       18
        
             writeShellScript

+1

pkgs/top-level/aliases.nix

···

       471
       471
        
         fastnlo = throw "'fastnlo' has been renamed to/replaced by 'fastnlo-toolkit'"; # Converted to throw 2024-10-17

     

       472
       472
        
         fastnlo_toolkit = fastnlo-toolkit; # Added 2024-01-03

     

       473
       473
        
         fcitx5-catppuccin = catppuccin-fcitx5; # Added 2024-06-19

     

       474
       474
       +
         fdr = throw "fdr has been removed, as it cannot be built from source and depends on Python 2.x"; # Added 2025-03-19

     

       474
       475
        
         inherit (luaPackages) fennel; # Added 2022-09-24

     

       475
       476
        
         ferdi = throw "'ferdi' has been removed, upstream does not exist anymore and the package is insecure"; # Added 2024-08-22

     

       476
       477
        
         fetchFromGithub = throw "You meant fetchFromGitHub, with a capital H"; # preserve

-2

pkgs/top-level/all-packages.nix

···

       12914
       12914
        
         evolution = callPackage ../applications/networking/mailreaders/evolution/evolution { };

     

       12915
       12915
        
         evolutionWithPlugins = callPackage ../applications/networking/mailreaders/evolution/evolution/wrapper.nix { plugins = [ evolution evolution-ews ]; };

     

       12916
       12916
        
       

     

       12917
       12917
       -
         fdr = libsForQt5.callPackage ../applications/science/programming/fdr { };

     

       12918
       12918
       -
       

     

       12919
       12917
        
         fetchmail = callPackage ../applications/misc/fetchmail { };

     

       12920
       12918
        
         fetchmail_7 = callPackage ../applications/misc/fetchmail/v7.nix { };

     

       12921
       12919

+6

pkgs/top-level/python-aliases.nix

···

       210
       210
        
         et_xmlfile = et-xmlfile; # added 2023-10-16

     

       211
       211
        
         etebase-server = throw "pkgs.python3.etebase-server has been removed, use pkgs.etebase-server"; # added 2024-07-16

     

       212
       212
        
         ev3dev2 = python-ev3dev2; # added 2023-06-19

     

       213
       213
       +
         evernote = throw "evernote is intended for use with Python 2.X";

     

       213
       214
        
         eyeD3 = eyed3; # added 2024-01-03

     

       214
       215
        
         Fabric = fabric; # addedd 2023-02-19

     

       215
       216
        
         face_recognition = face-recognition; # added 2022-10-15

     
···

       264
       265
        
         gbulb = throw "gbulb has been removed as it is unmaintained and no longer compatible with PyGObject 3.50."; # added 2024-10-14

     

       265
       266
        
         gcs-oauth2-boto-plugin = throw "gcs-oauth2-boto-plugin was removed as it depends on the removed boto package"; # Added 2024-09-22

     

       266
       267
        
         gdtoolkit = throw "gdtoolkit has been promoted to a top-level attribute name: `pkgs.gdtoolkit`"; # added 2023-02-15

     

       268
       268
       +
         geeknote = throw "geeknote depends on the Python2-only library evernote"; # Added 2025-03-22

     

       267
       269
        
         GeoIP = geoip; # added 2023-02-19

     

       268
       270
        
         gigalixir = throw "gigalixir has been promoted to a top-level attribute name: `pkgs.gigalixir`"; # Added 2022-10-02

     

       269
       271
        
         gitdb2 = throw "gitdb2 has been deprecated, use gitdb instead."; # added 2020-03-14

     
···

       390
       392
        
         mitmproxy-wireguard = throw "mitmproxy-wireguard has been removed because it was replaced by upstream with mitmproxy-rs"; # added 2023-11-06

     

       391
       393
        
         mkdocs-awesome-pages-plugin = mkdocs-awesome-nav; # added 2025-03-10

     

       392
       394
        
         mkdocs-minify = mkdocs-minify-plugin; # added 2023-11-28

     

       395
       395
       +
         modestmaps = throw "modestmaps is unmaintained and was never enabled for anything except Python27"; # Added 2025-03-23

     

       393
       396
        
         mox = throw "mox was removed because it is unmaintained"; # added 2023-02-21

     

       394
       397
        
         mox3 = throw "mox3 was removed because it is unmaintained"; # added 2024-08-30

     

       395
       398
        
         mrkd = throw "mrkd has been promoted to a top-level attribute name: `pkgs.mrkd`"; # added 2023-08-01

     
···

       491
       494
        
         pyalmond = throw "pyalmond has been removed, since its API endpoints have been shutdown"; # added 2023-02-02

     

       492
       495
        
         pyblake2 = throw "pyblake2 is deprecated in favor of hashlib"; # added 2023-04-23

     

       493
       496
        
         pyblock = throw "pyblock has been removed, since it is abandoned and broken"; # added 2023-06-20

     

       497
       497
       +
         pychart = throw "pychart does not support Python3"; # added 2025-03-23

     

       494
       498
        
         pycontracts = throw "pycontracts has been removed, since upstream is no longer active and it is broken on modern Python versions."; # added 2024-08-09

     

       495
       499
        
         pydns = py3dns; # added 2024-10-25

     

       496
       500
        
         pydrive = throw "pydrive is broken and deprecated and has been replaced with pydrive2."; # added 2022-06-01

     
···

       594
       598
        
         python-Levenshtein = levenshtein;

     

       595
       599
        
         python-pushover = throw "python-pushover has been removed, since it is unmaintained and is broken"; # added 2023-07-03

     

       596
       600
        
         python-subunit = subunit; # added 2021-09-10

     

       601
       601
       +
         python-wifi = throw "python-wifi does not support Python3";

     

       597
       602
        
         pytest_xdist = pytest-xdist; # added 2021-01-04

     

       598
       603
        
         python_simple_hipchat = python-simple-hipchat; # added 2021-07-21

     

       599
       604
        
         pytoml = throw "pytoml has been removed because it is unmaintained and is superseded by toml"; # Added 2023-04-11

     
···

       711
       716
        
         tensorflow-estimator_2 = tensorflow-estimator; # added 2021-11-25

     

       712
       717
        
         tensorflow-tensorboard = tensorboard; # added 2022-03-06

     

       713
       718
        
         tensorflow-tensorboard_2 = tensorflow-tensorboard; # added 2021-11-25

     

       719
       719
       +
         tilestache = throw "tilestache is unmaintained and Python3 compatibility is unknown"; # Added 2025-03-23

     

       714
       720
        
         Theano = theano; # added 2023-02-19

     

       715
       721
        
         TheanoWithCuda = theanoWithCuda; # added 2023-02-19

     

       716
       722
        
         TheanoWithoutCuda = theanoWithoutCuda; # added 2023-02-19

-12

pkgs/top-level/python-packages.nix

···

       4530
       4530
        
       

     

       4531
       4531
        
         events = callPackage ../development/python-modules/events { };

     

       4532
       4532
        
       

     

       4533
       4533
       -
         evernote = callPackage ../development/python-modules/evernote { };

     

       4534
       4534
       -
       

     

       4535
       4533
        
         evohome-async = callPackage ../development/python-modules/evohome-async { };

     

       4536
       4534
        
       

     

       4537
       4535
        
         evolutionhttp = callPackage ../development/python-modules/evolutionhttp { };

     
···

       5344
       5342
        
             python3 = python;

     

       5345
       5343
        
           }

     

       5346
       5344
        
         );

     

       5347
       5347
       -
       

     

       5348
       5348
       -
         geeknote = callPackage ../development/python-modules/geeknote { };

     

       5349
       5345
        
       

     

       5350
       5346
        
         gehomesdk = callPackage ../development/python-modules/gehomesdk { };

     

       5351
       5347
        
       

     
···

       8894
       8890
        
         moderngl = callPackage ../development/python-modules/moderngl { };

     

       8895
       8891
        
       

     

       8896
       8892
        
         moderngl-window = callPackage ../development/python-modules/moderngl-window { };

     

       8897
       8897
       -
       

     

       8898
       8898
       -
         modestmaps = callPackage ../development/python-modules/modestmaps { };

     

       8899
       8893
        
       

     

       8900
       8894
        
         mohawk = callPackage ../development/python-modules/mohawk { };

     

       8901
       8895
        
       

     
···

       11843
       11837
        
       

     

       11844
       11838
        
         pychannels = callPackage ../development/python-modules/pychannels { };

     

       11845
       11839
        
       

     

       11846
       11846
       -
         pychart = callPackage ../development/python-modules/pychart { };

     

       11847
       11847
       -
       

     

       11848
       11840
        
         pychm = callPackage ../development/python-modules/pychm { };

     

       11849
       11841
        
       

     

       11850
       11842
        
         pychromecast = callPackage ../development/python-modules/pychromecast { };

     
···

       14115
       14107
        
         python-watcherclient = callPackage ../development/python-modules/python-watcherclient { };

     

       14116
       14108
        
       

     

       14117
       14109
        
         python-whois = callPackage ../development/python-modules/python-whois { };

     

       14118
       14118
       -
       

     

       14119
       14119
       -
         python-wifi = callPackage ../development/python-modules/python-wifi { };

     

       14120
       14110
        
       

     

       14121
       14111
        
         python-wink = callPackage ../development/python-modules/python-wink { };

     

       14122
       14112
        
       

     
···

       17112
       17102
        
         tilequant = callPackage ../development/python-modules/tilequant { };

     

       17113
       17103
        
       

     

       17114
       17104
        
         tiler = callPackage ../development/python-modules/tiler { };

     

       17115
       17115
       -
       

     

       17116
       17116
       -
         tilestache = callPackage ../development/python-modules/tilestache { };

     

       17117
       17105
        
       

     

       17118
       17106
        
         tilt-ble = callPackage ../development/python-modules/tilt-ble { };

     

       17119
       17107