lol

nitter: 0-unstable-2024-02-26 -> 0-unstable-2025-02-25; nixos/nitter: rename guestAccounts to sessionsFile (#393028)

authored by

Arne Keller and committed by
GitHub
ee6d7cb2 83c600de

+25 -19
+2
nixos/doc/manual/release-notes/rl-2505.section.md
··· 490 490 491 491 - `nodePackages.ganache` has been removed, as the package has been deprecated by upstream. 492 492 493 + - `services.nitter.guestAccounts` has been renamed to `services.nitter.sessionsFile`, for consistency with upstream. The file format is unchanged. 494 + 493 495 - `virtualisation.azure.agent` option provided by `azure-agent.nix` is replaced by `services.waagent`, and will be removed in a future release. 494 496 495 497 - `matomo` now defaults to version 5 (previously available as `matomo_5`). Version 4 has been removed as it reached EOL on December 19, 2024.
+12 -8
nixos/modules/services/misc/nitter.nix
··· 64 64 "nitter" 65 65 "replaceInstagram" 66 66 ] "Nitter no longer supports this option as Bibliogram has been discontinued.") 67 + (lib.mkRenamedOptionModule 68 + [ "services" "nitter" "guestAccounts" ] 69 + [ "services" "nitter" "sessionsFile" ] 70 + ) 67 71 ]; 68 72 69 73 options = { ··· 322 326 ''; 323 327 }; 324 328 325 - guestAccounts = lib.mkOption { 329 + sessionsFile = lib.mkOption { 326 330 type = lib.types.path; 327 - default = "/var/lib/nitter/guest_accounts.jsonl"; 331 + default = "/var/lib/nitter/sessions.jsonl"; 328 332 description = '' 329 - Path to the guest accounts file. 333 + Path to the session tokens file. 330 334 331 - This file contains a list of guest accounts that can be used to 335 + This file contains a list of session tokens that can be used to 332 336 access the instance without logging in. The file is in JSONL format, 333 337 where each line is a JSON object with the following fields: 334 338 335 339 {"oauth_token":"some_token","oauth_token_secret":"some_secret_key"} 336 340 337 - See <https://github.com/zedeus/nitter/wiki/Guest-Account-Branch-Deployment> 338 - for more information on guest accounts and how to generate them. 341 + See <https://github.com/zedeus/nitter/wiki/Creating-session-tokens> 342 + for more information on session tokens and how to generate them. 339 343 ''; 340 344 }; 341 345 ··· 369 373 after = [ "network-online.target" ]; 370 374 serviceConfig = { 371 375 DynamicUser = true; 372 - LoadCredential = "guestAccountsFile:${cfg.guestAccounts}"; 376 + LoadCredential = "sessionsFile:${cfg.sessionsFile}"; 373 377 StateDirectory = "nitter"; 374 378 Environment = [ 375 379 "NITTER_CONF_FILE=/var/lib/nitter/nitter.conf" 376 - "NITTER_ACCOUNTS_FILE=%d/guestAccountsFile" 380 + "NITTER_SESSIONS_FILE=%d/sessionsFile" 377 381 ]; 378 382 # Some parts of Nitter expect `public` folder in working directory, 379 383 # see https://github.com/zedeus/nitter/issues/414
+2 -2
nixos/tests/nitter.nix
··· 8 8 # These credentials are from the nitter wiki and are expired. We must provide 9 9 # credentials in the correct format, otherwise nitter fails to start. They 10 10 # must not be valid, as unauthorized errors are handled gracefully. 11 - guestAccountFile = pkgs.writeText "guest_accounts.jsonl" '' 11 + sessionsFile = pkgs.writeText "sessions.jsonl" '' 12 12 {"oauth_token":"1719213587296620928-BsXY2RIJEw7fjxoNwbBemgjJhueK0m","oauth_token_secret":"N0WB0xhL4ng6WTN44aZO82SUJjz7ssI3hHez2CUhTiYqy"} 13 13 ''; 14 14 in ··· 22 22 # Test CAP_NET_BIND_SERVICE 23 23 server.port = 80; 24 24 # Provide dummy guest accounts 25 - guestAccounts = guestAccountFile; 25 + inherit sessionsFile; 26 26 }; 27 27 }; 28 28
+5 -5
pkgs/by-name/ni/nitter/lock.json
··· 16 16 "packages": [ 17 17 "dotenv" 18 18 ], 19 - "path": "/nix/store/9hxi0hvds11agbmpaha8zp1bgzf7vypv-source", 20 - "ref": "2.0.1", 21 - "rev": "48315332fe79ffce87c81b9d0bec992ba19b6966", 22 - "sha256": "08y8xvpiqk75v0hxhgbhxfbxz7l95vavh1lv8kxkid8rb9p92zr4", 19 + "path": "/nix/store/jkf2p6sp0506crd1awpq2x98m527v4mb-source", 20 + "ref": "2.0.2", 21 + "rev": "19bb965ef04f57128f4f4ea2e690ff9f7d6a81b1", 22 + "sha256": "0dk0ixgpxmaz2kf12a3fvzdaknn38qnwgdhp7yag0m5fbhhz2kjc", 23 23 "srcDir": "src", 24 - "url": "https://github.com/euantorano/dotenv.nim/archive/48315332fe79ffce87c81b9d0bec992ba19b6966.tar.gz" 24 + "url": "https://github.com/euantorano/dotenv.nim/archive/19bb965ef04f57128f4f4ea2e690ff9f7d6a81b1.tar.gz" 25 25 }, 26 26 { 27 27 "method": "fetchzip",
+4 -4
pkgs/by-name/ni/nitter/package.nix
··· 10 10 buildNimPackage ( 11 11 finalAttrs: prevAttrs: { 12 12 pname = "nitter"; 13 - version = "0-unstable-2024-02-26"; 13 + version = "0-unstable-2025-02-25"; 14 14 15 15 src = fetchFromGitHub { 16 16 owner = "zedeus"; 17 17 repo = "nitter"; 18 - rev = "c6edec04901d0a37799499ed4c6921db640fb5a4"; 19 - hash = "sha256-N3d63nyVzUTa2+UemA1REFfVsw6iOVU8xUlYraR55m4="; 18 + rev = "41fa47bfbf3917e9b3ac4f7b49c89a75a7a2bd44"; 19 + hash = "sha256-cmYlmzCJl1405TuYExGw3AOmjdY0r7ObmmLCAom+Fyw="; 20 20 }; 21 21 22 22 lockFile = ./lock.json; ··· 41 41 42 42 passthru = { 43 43 tests = { inherit (nixosTests) nitter; }; 44 - updateScript = unstableGitUpdater { branch = "guest_accounts"; }; 44 + updateScript = unstableGitUpdater { }; 45 45 }; 46 46 47 47 meta = with lib; {