commit 7d97d9ebd1992cad1a91d6988198dcc9d9ecb21c · pyrox.dev/nixpkgs

+2

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

···

       39
       39
        
       

     

       40
       40
        
       - `k9s` was updated to v0.29. There have been breaking changes in the config file format, check out the [changelog](https://github.com/derailed/k9s/releases/tag/v0.29.0) for details.

     

       41
       41
        
       

     

       42
       42
       +
       - `nitter` requires a `guest_accounts.jsonl` to be provided as a path or loaded into the default location at `/var/lib/nitter/guest_accounts.jsonl`. See [Guest Account Branch Deployment](https://github.com/zedeus/nitter/wiki/Guest-Account-Branch-Deployment) for details.

     

       43
       43
       +
       

     

       42
       44
        
       - Invidious has changed its default database username from `kemal` to `invidious`. Setups involving an externally provisioned database (i.e. `services.invidious.database.createLocally == false`) should adjust their configuration accordingly. The old `kemal` user will not be removed automatically even when the database is provisioned automatically.(https://github.com/NixOS/nixpkgs/pull/265857)

     

       43
       45
        
       

     

       44
       46
        
       - `mkosi` was updated to v19. Parts of the user interface have changed. Consult the

+22 -1

nixos/modules/services/misc/nitter.nix

···

       304
       304
        
               '';

     

       305
       305
        
             };

     

       306
       306
        
       

     

       307
       307
       +
             guestAccounts = mkOption {

     

       308
       308
       +
               type = types.path;

     

       309
       309
       +
               default = "/var/lib/nitter/guest_accounts.jsonl";

     

       310
       310
       +
               description = lib.mdDoc ''

     

       311
       311
       +
                 Path to the guest accounts file.

     

       312
       312
       +
       

     

       313
       313
       +
                 This file contains a list of guest accounts that can be used to

     

       314
       314
       +
                 access the instance without logging in. The file is in JSONL format,

     

       315
       315
       +
                 where each line is a JSON object with the following fields:

     

       316
       316
       +
       

     

       317
       317
       +
                 {"oauth_token":"some_token","oauth_token_secret":"some_secret_key"}

     

       318
       318
       +
       

     

       319
       319
       +
                 See https://github.com/zedeus/nitter/wiki/Guest-Account-Branch-Deployment

     

       320
       320
       +
                 for more information on guest accounts and how to generate them.

     

       321
       321
       +
               '';

     

       322
       322
       +
             };

     

       323
       323
       +
       

     

       307
       324
        
             redisCreateLocally = mkOption {

     

       308
       325
        
               type = types.bool;

     

       309
       326
        
               default = true;

     
···

       333
       350
        
               after = [ "network-online.target" ];

     

       334
       351
        
               serviceConfig = {

     

       335
       352
        
                 DynamicUser = true;

     

       353
       353
       +
                 LoadCredential="guestAccountsFile:${cfg.guestAccounts}";

     

       336
       354
        
                 StateDirectory = "nitter";

     

       337
       337
       -
                 Environment = [ "NITTER_CONF_FILE=/var/lib/nitter/nitter.conf" ];

     

       355
       355
       +
                 Environment = [

     

       356
       356
       +
                   "NITTER_CONF_FILE=/var/lib/nitter/nitter.conf"

     

       357
       357
       +
                   "NITTER_ACCOUNTS_FILE=%d/guestAccountsFile"

     

       358
       358
       +
                 ];

     

       338
       359
        
                 # Some parts of Nitter expect `public` folder in working directory,

     

       339
       360
        
                 # see https://github.com/zedeus/nitter/issues/414

     

       340
       361
        
                 WorkingDirectory = "${cfg.package}/share/nitter";

+18 -3

nixos/tests/nitter.nix

···

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

     

       2
       2
        
       

     

       3
       3
       +
       let

     

       4
       4
       +
         # In a real deployment this should naturally not common from the nix store

     

       5
       5
       +
         # and be seeded via agenix or as a non-nix managed file.

     

       6
       6
       +
         #

     

       7
       7
       +
         # These credentials are from the nitter wiki and are expired. We must provide

     

       8
       8
       +
         # credentials in the correct format, otherwise nitter fails to start. They

     

       9
       9
       +
         # must not be valid, as unauthorized errors are handled gracefully.

     

       10
       10
       +
         guestAccountFile = pkgs.writeText "guest_accounts.jsonl" ''

     

       11
       11
       +
           {"oauth_token":"1719213587296620928-BsXY2RIJEw7fjxoNwbBemgjJhueK0m","oauth_token_secret":"N0WB0xhL4ng6WTN44aZO82SUJjz7ssI3hHez2CUhTiYqy"}

     

       12
       12
       +
         '';

     

       13
       13
       +
       in

     

       3
       14
        
       {

     

       4
       15
        
         name = "nitter";

     

       5
       16
        
         meta.maintainers = with pkgs.lib.maintainers; [ erdnaxe ];

     

       6
       17
        
       

     

       7
       18
        
         nodes.machine = {

     

       8
       8
       -
           services.nitter.enable = true;

     

       9
       9
       -
           # Test CAP_NET_BIND_SERVICE

     

       10
       10
       -
           services.nitter.server.port = 80;

     

       19
       19
       +
           services.nitter = {

     

       20
       20
       +
             enable = true;

     

       21
       21
       +
             # Test CAP_NET_BIND_SERVICE

     

       22
       22
       +
             server.port = 80;

     

       23
       23
       +
             # Provide dummy guest accounts

     

       24
       24
       +
             guestAccounts = guestAccountFile;

     

       25
       25
       +
           };

     

       11
       26
        
         };

     

       12
       27
        
       

     

       13
       28
        
         testScript = ''

+31 -8

pkgs/by-name/ni/nitter/lock.json

···

       62
       62
        
             "packages": [

     

       63
       63
        
               "jsony"

     

       64
       64
        
             ],

     

       65
       65
       -
             "path": "/nix/store/bzcq8q439rdsqhhihikzv3rsx4l4ybdm-source",

     

       66
       66
       -
             "rev": "ea811be",

     

       67
       67
       -
             "sha256": "1720iqsxjhqmhw1zhhs7d2ncdz25r8fqadls1p1iry1wfikjlnba",

     

       65
       65
       +
             "path": "/nix/store/l84av0wdc0s4r4alsvkaxcxhpd6j4bzg-source",

     

       66
       66
       +
             "rev": "1de1f08",

     

       67
       67
       +
             "sha256": "0rj205cs3v6g80h8ys9flbdq4wyd1csmkwdxv0lz21972zcsrcfh",

     

       68
       68
        
             "srcDir": "src",

     

       69
       69
       -
             "url": "https://github.com/treeform/jsony/archive/ea811be.tar.gz"

     

       69
       69
       +
             "url": "https://github.com/treeform/jsony/archive/1de1f08.tar.gz"

     

       70
       70
        
           },

     

       71
       71
        
           {

     

       72
       72
        
             "method": "fetchzip",

     
···

       95
       95
        
             "packages": [

     

       96
       96
        
               "nimcrypto"

     

       97
       97
        
             ],

     

       98
       98
       -
             "path": "/nix/store/dnj20qh97ylf57nka9wbxs735wbw7yxv-source",

     

       99
       99
       -
             "rev": "4014ef9",

     

       100
       100
       -
             "sha256": "1kgqr2lqaffglc1fgbanwcvhkqcbbd20d5b6w4lf0nksfl9c357a",

     

       98
       98
       +
             "path": "/nix/store/zyr8zwh7vaiycn1s4r8cxwc71f2k5l0h-source",

     

       99
       99
       +
             "rev": "a079df9",

     

       100
       100
       +
             "sha256": "1dmdmgb6b9m5f8dyxk781nnd61dsk3hdxqks7idk9ncnpj9fng65",

     

       101
       101
        
             "srcDir": "",

     

       102
       102
       -
             "url": "https://github.com/cheatfate/nimcrypto/archive/4014ef9.tar.gz"

     

       102
       102
       +
             "url": "https://github.com/cheatfate/nimcrypto/archive/a079df9.tar.gz"

     

       103
       103
       +
           },

     

       104
       104
       +
           {

     

       105
       105
       +
             "method": "fetchzip",

     

       106
       106
       +
             "packages": [

     

       107
       107
       +
               "oauth"

     

       108
       108
       +
             ],

     

       109
       109
       +
             "path": "/nix/store/bwmrrzs6xpwizmww35461x3lqpgd0942-source",

     

       110
       110
       +
             "rev": "b8c163b",

     

       111
       111
       +
             "sha256": "0k5slyzjngbdr6g0b0dykhqmaf8r8n2klbkg2gpid4ckm8hg62v5",

     

       112
       112
       +
             "srcDir": "src",

     

       113
       113
       +
             "url": "https://github.com/CORDEA/oauth/archive/b8c163b.tar.gz"

     

       103
       114
        
           },

     

       104
       115
        
           {

     

       105
       116
        
             "method": "fetchzip",

     
···

       155
       166
        
             "sha256": "19d78787k97l5cis81800hxa9qjr0yzjshlzdp727gh6pn8kc8fj",

     

       156
       167
        
             "srcDir": "src",

     

       157
       168
        
             "url": "https://github.com/dom96/sass/archive/7dfdd03.tar.gz"

     

       169
       169
       +
           },

     

       170
       170
       +
           {

     

       171
       171
       +
             "method": "fetchzip",

     

       172
       172
       +
             "packages": [

     

       173
       173
       +
               "sha1"

     

       174
       174
       +
             ],

     

       175
       175
       +
             "path": "/nix/store/a6a0ycxsaxpqks42aq9wicj8ars7z7ai-source",

     

       176
       176
       +
             "ref": "master",

     

       177
       177
       +
             "rev": "92ccc5800bb0ac4865b275a2ce3c1544e98b48bc",

     

       178
       178
       +
             "sha256": "00zvvd8ssy22srg74xzapknmgmi82v534npjdrk5805shswfhqdm",

     

       179
       179
       +
             "srcDir": "",

     

       180
       180
       +
             "url": "https://github.com/onionhammer/sha1/archive/92ccc5800bb0ac4865b275a2ce3c1544e98b48bc.tar.gz"

     

       158
       181
        
           },

     

       159
       182
        
           {

     

       160
       183
        
             "method": "fetchzip",

+3 -3

pkgs/by-name/ni/nitter/package.nix

···

       8
       8
        
       

     

       9
       9
        
       buildNimPackage (finalAttrs: prevAttrs: {

     

       10
       10
        
         pname = "nitter";

     

       11
       11
       -
         version = "unstable-2023-10-31";

     

       11
       11
       +
         version = "unstable-2023-12-03";

     

       12
       12
        
       

     

       13
       13
        
         src = fetchFromGitHub {

     

       14
       14
        
           owner = "zedeus";

     

       15
       15
        
           repo = "nitter";

     

       16
       16
       -
           rev = "b62d73dbd373f08af07c7a79efcd790d3bc1a49c";

     

       17
       17
       -
           hash = "sha256-yCD7FbqWZMY0fyFf9Q3Ka06nw5Ha7jYLpmPONAhEVIM=";

     

       16
       16
       +
           rev = "583c858cdf3486451ed6a0627640844f27009dbe";

     

       17
       17
       +
           hash = "sha256-3E6nfmOFhQ2bjwGMWdTmZ38Fg/SE36s6fxYDXwSJaTw=";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
        
         lockFile = ./lock.json;