diff --git a/.github/workflows/check-nix-format.yml b/.github/workflows/check-nix-format.yml index 6003c9a0b841..131803213cb5 100644 --- a/.github/workflows/check-nix-format.yml +++ b/.github/workflows/check-nix-format.yml @@ -39,6 +39,9 @@ jobs: pkgs/development/cuda-modules pkgs/test/cuda pkgs/top-level/cuda-packages.nix + NIX_FMT_PATHS_MAINTAINERS: | + maintainers/maintainer-list.nix + maintainers/team-list.nix NIX_FMT_PATHS_K3S: | nixos/modules/services/cluster/k3s nixos/tests/k3s diff --git a/flake.nix b/flake.nix index 8df05dc91263..b22cf56a9b5f 100644 --- a/flake.nix +++ b/flake.nix @@ -46,7 +46,8 @@ checks = forAllSystems (system: { tarball = jobs.${system}.tarball; - } // lib.optionalAttrs (self.legacyPackages.${system}.stdenv.isLinux) { + # Exclude power64 due to "libressl is not available on the requested hostPlatform" with hostPlatform being power64 + } // lib.optionalAttrs (self.legacyPackages.${system}.stdenv.isLinux && !self.legacyPackages.${system}.targetPlatform.isPower64) { # Test that ensures that the nixosSystem function can accept a lib argument # Note: prefer not to extend or modify `lib`, especially if you want to share reusable modules # alternatives include: `import` a file, or put a custom library in an option or in `_module.args.` diff --git a/lib/systems/default.nix b/lib/systems/default.nix index d37ff720edce..0981122388bb 100644 --- a/lib/systems/default.nix +++ b/lib/systems/default.nix @@ -81,7 +81,7 @@ let && final.parsed.kernel == platform.parsed.kernel; isCompatible = _: throw "2022-05-23: isCompatible has been removed in favor of canExecute, refer to the 22.11 changelog for details"; # Derived meta-data - useLLVM = final.isFreeBSD; + useLLVM = final.isFreeBSD || final.isOpenBSD; libc = /**/ if final.isDarwin then "libSystem" diff --git a/lib/systems/flake-systems.nix b/lib/systems/flake-systems.nix index b1988c6a4fbb..a68580ff1407 100644 --- a/lib/systems/flake-systems.nix +++ b/lib/systems/flake-systems.nix @@ -16,12 +16,12 @@ "armv6l-linux" "armv7l-linux" "i686-linux" - "mipsel-linux" + # "mipsel-linux" is excluded because it is not bootstrapped # Other platforms with sufficient support in stdenv which is not formally # mandated by their platform tier. "aarch64-darwin" - "armv5tel-linux" + # "armv5tel-linux" is excluded because it is not bootstrapped "powerpc64le-linux" "riscv64-linux" diff --git a/lib/systems/platforms.nix b/lib/systems/platforms.nix index d2e8f77bec03..403ffc028f0b 100644 --- a/lib/systems/platforms.nix +++ b/lib/systems/platforms.nix @@ -535,11 +535,9 @@ rec { name = "riscv-multiplatform"; target = "Image"; autoModules = true; + preferBuiltin = true; baseConfig = "defconfig"; DTB = true; - extraConfig = '' - SERIAL_OF_PLATFORM y - ''; }; }; diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 98f1da0ed024..434758515514 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1,67 +1,68 @@ -/* List of NixOS maintainers. - ```nix - handle = { - # Required - name = "Your name"; +/* + List of NixOS maintainers. + ```nix + handle = { + # Required + name = "Your name"; - # Optional, but at least one of email, matrix or githubId must be given - email = "address@example.org"; - matrix = "@user:example.org"; - github = "GithubUsername"; - githubId = your-github-id; + # Optional, but at least one of email, matrix or githubId must be given + email = "address@example.org"; + matrix = "@user:example.org"; + github = "GithubUsername"; + githubId = your-github-id; - keys = [{ - fingerprint = "AAAA BBBB CCCC DDDD EEEE FFFF 0000 1111 2222 3333"; - }]; - }; - ``` + keys = [{ + fingerprint = "AAAA BBBB CCCC DDDD EEEE FFFF 0000 1111 2222 3333"; + }]; + }; + ``` - where + where - - `handle` is the handle you are going to use in nixpkgs expressions, - - `name` is a name that people would know and recognize you by, - - `email` is your maintainer email address, - - `matrix` is your Matrix user ID, - - `github` is your GitHub handle (as it appears in the URL of your profile page, `https://github.com/`), - - `githubId` is your GitHub user ID, which can be found at `https://api.github.com/users/`, - - `keys` is a list of your PGP/GPG key fingerprints. + - `handle` is the handle you are going to use in nixpkgs expressions, + - `name` is a name that people would know and recognize you by, + - `email` is your maintainer email address, + - `matrix` is your Matrix user ID, + - `github` is your GitHub handle (as it appears in the URL of your profile page, `https://github.com/`), + - `githubId` is your GitHub user ID, which can be found at `https://api.github.com/users/`, + - `keys` is a list of your PGP/GPG key fingerprints. - Specifying a GitHub account ensures that you automatically: - - get invited to the @NixOS/nixpkgs-maintainers team ; - - once you are part of the @NixOS org, OfBorg will request you review - pull requests that modify a package for which you are a maintainer. + Specifying a GitHub account ensures that you automatically: + - get invited to the @NixOS/nixpkgs-maintainers team ; + - once you are part of the @NixOS org, OfBorg will request you review + pull requests that modify a package for which you are a maintainer. - `handle == github` is strongly preferred whenever `github` is an acceptable attribute name and is short and convenient. + `handle == github` is strongly preferred whenever `github` is an acceptable attribute name and is short and convenient. - If `github` begins with a numeral, `handle` should be prefixed with an underscore. - ```nix - _1example = { - github = "1example"; - }; - ``` + If `github` begins with a numeral, `handle` should be prefixed with an underscore. + ```nix + _1example = { + github = "1example"; + }; + ``` - Add PGP/GPG keys only if you actually use them to sign commits and/or mail. + Add PGP/GPG keys only if you actually use them to sign commits and/or mail. - To get the required PGP/GPG values for a key run - ```shell - gpg --fingerprint | head -n 2 - ``` + To get the required PGP/GPG values for a key run + ```shell + gpg --fingerprint | head -n 2 + ``` - !!! Note that PGP/GPG values stored here are for informational purposes only, don't use this file as a source of truth. + !!! Note that PGP/GPG values stored here are for informational purposes only, don't use this file as a source of truth. - More fields may be added in the future, however, in order to comply with GDPR this file should stay as minimal as possible. + More fields may be added in the future, however, in order to comply with GDPR this file should stay as minimal as possible. - When editing this file: - * keep the list alphabetically sorted, check with: - nix-instantiate --eval maintainers/scripts/check-maintainers-sorted.nix - * test the validity of the format with: - nix-build lib/tests/maintainers.nix + When editing this file: + * keep the list alphabetically sorted, check with: + nix-instantiate --eval maintainers/scripts/check-maintainers-sorted.nix + * test the validity of the format with: + nix-build lib/tests/maintainers.nix - See `./scripts/check-maintainer-github-handles.sh` for an example on how to work with this data. + See `./scripts/check-maintainer-github-handles.sh` for an example on how to work with this data. - When adding a new maintainer, be aware of the current commit conventions - documented at [CONTRIBUTING.md](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#commit-conventions) - file located in the root of the Nixpkgs repo. + When adding a new maintainer, be aware of the current commit conventions + documented at [CONTRIBUTING.md](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#commit-conventions) + file located in the root of the Nixpkgs repo. */ { _0b11stan = { @@ -94,9 +95,7 @@ name = "Joachim Ernst"; github = "0x4A6F"; githubId = 9675338; - keys = [{ - fingerprint = "F466 A548 AD3F C1F1 8C88 4576 8702 7528 B006 D66D"; - }]; + keys = [ { fingerprint = "F466 A548 AD3F C1F1 8C88 4576 8702 7528 B006 D66D"; } ]; }; _0xB10C = { email = "nixpkgs@b10c.me"; @@ -109,9 +108,7 @@ name = "Bela Stoyan"; github = "0xbe7a"; githubId = 6232980; - keys = [{ - fingerprint = "2536 9E86 1AA5 9EB7 4C47 B138 6510 870A 77F4 9A99"; - }]; + keys = [ { fingerprint = "2536 9E86 1AA5 9EB7 4C47 B138 6510 870A 77F4 9A99"; } ]; }; _0xC45 = { email = "jason@0xc45.com"; @@ -203,9 +200,7 @@ github = "4825764518"; githubId = 100122841; name = "Kenzie"; - keys = [{ - fingerprint = "D292 365E 3C46 A5AA 75EE B30B 78DB 7EDE 3540 794B"; - }]; + keys = [ { fingerprint = "D292 365E 3C46 A5AA 75EE B30B 78DB 7EDE 3540 794B"; } ]; }; _48cf = { name = "czapek"; @@ -218,9 +213,7 @@ github = "6543"; githubId = 24977596; name = "6543"; - keys = [{ - fingerprint = "8722 B61D 7234 1082 553B 201C B8BE 6D61 0E61 C862"; - }]; + keys = [ { fingerprint = "8722 B61D 7234 1082 553B 201C B8BE 6D61 0E61 C862"; } ]; }; _6AA4FD = { email = "f6442954@gmail.com"; @@ -252,9 +245,7 @@ github = "999eagle"; githubId = 1221984; name = "Sophie Tauchert"; - keys = [{ - fingerprint = "7B59 F09E 0FE5 BC34 F032 1FB4 5270 1DE5 F5F5 1125"; - }]; + keys = [ { fingerprint = "7B59 F09E 0FE5 BC34 F032 1FB4 5270 1DE5 F5F5 1125"; } ]; }; _9glenda = { email = "plan9git@proton.me"; @@ -262,9 +253,7 @@ github = "9glenda"; githubId = 69043370; name = "9glenda"; - keys = [{ - fingerprint = "DBF4 E6D0 90B8 BEA4 4BFE 1F1C 3442 4321 39B5 0691"; - }]; + keys = [ { fingerprint = "DBF4 E6D0 90B8 BEA4 4BFE 1F1C 3442 4321 39B5 0691"; } ]; }; _9R = { email = "nix@9-r.net"; @@ -364,9 +353,7 @@ github = "wahjava"; githubId = 2255192; name = "Ashish SHUKLA"; - keys = [{ - fingerprint = "F682 CDCC 39DC 0FEA E116 20B6 C746 CFA9 E74F A4B0"; - }]; + keys = [ { fingerprint = "F682 CDCC 39DC 0FEA E116 20B6 C746 CFA9 E74F A4B0"; } ]; }; abbradar = { email = "ab@fmap.me"; @@ -464,9 +451,7 @@ github = "acuteenvy"; githubId = 126529524; name = "Lena"; - keys = [{ - fingerprint = "CE85 54F7 B9BC AC0D D648 5661 AB5F C04C 3C94 443F"; - }]; + keys = [ { fingerprint = "CE85 54F7 B9BC AC0D D648 5661 AB5F C04C 3C94 443F"; } ]; }; adam248 = { email = "adamjbutler091@gmail.com"; @@ -573,18 +558,14 @@ github = "adtya"; githubId = 22346805; name = "Adithya Nair"; - keys = [{ - fingerprint = "51E4 F5AB 1B82 BE45 B422 9CC2 43A5 E25A A5A2 7849"; - }]; + keys = [ { fingerprint = "51E4 F5AB 1B82 BE45 B422 9CC2 43A5 E25A A5A2 7849"; } ]; }; aduh95 = { email = "duhamelantoine1995@gmail.com"; github = "aduh95"; githubId = 14309773; name = "Antoine du Hamel"; - keys = [{ - fingerprint = "C0D6 2484 39F1 D560 4AAF FB40 21D9 00FF DB23 3756"; - }]; + keys = [ { fingerprint = "C0D6 2484 39F1 D560 4AAF FB40 21D9 00FF DB23 3756"; } ]; }; aerialx = { email = "aaron+nixos@aaronlindsay.com"; @@ -694,9 +675,7 @@ matrix = "@aikoo7:matrix.org"; github = "aikooo7"; githubId = 79667753; - keys = [{ - fingerprint = "B0D7 2955 235F 6AB5 ACFA 1619 8C7F F5BB 1ADE F191"; - }]; + keys = [ { fingerprint = "B0D7 2955 235F 6AB5 ACFA 1619 8C7F F5BB 1ADE F191"; } ]; }; aimpizza = { email = "rickomo.us@gmail.com"; @@ -812,9 +791,7 @@ email = "alessandro.barenghi@tuta.io"; github = "akkesm"; githubId = 56970006; - keys = [{ - fingerprint = "50E2 669C AB38 2F4A 5F72 1667 0D6B FC01 D45E DADD"; - }]; + keys = [ { fingerprint = "50E2 669C AB38 2F4A 5F72 1667 0D6B FC01 D45E DADD"; } ]; }; akru = { email = "mail@akru.me"; @@ -844,9 +821,7 @@ github = "al3xtjames"; githubId = 5672538; name = "Alex James"; - keys = [{ - fingerprint = "F354 FFAB EA89 A49D 33ED 2590 4729 B829 AC5F CC72"; - }]; + keys = [ { fingerprint = "F354 FFAB EA89 A49D 33ED 2590 4729 B829 AC5F CC72"; } ]; }; alanpearce = { email = "alan@alanpearce.eu"; @@ -939,10 +914,10 @@ name = "Alexandre Esteves"; }; alex-fu27 = { - email = "alex.fu27@gmail.com"; - github = "alex-fu27"; - githubId = 49982580; - name = "Alexander Fuchs"; + email = "alex.fu27@gmail.com"; + github = "alex-fu27"; + githubId = 49982580; + name = "Alexander Fuchs"; }; alexnortung = { name = "alexnortung"; @@ -960,9 +935,7 @@ email = "ashpilkin@gmail.com"; github = "alexshpilkin"; githubId = 1010468; - keys = [{ - fingerprint = "B595 D74D 6615 C010 469F 5A13 73E9 AA11 4B3A 894B"; - }]; + keys = [ { fingerprint = "B595 D74D 6615 C010 469F 5A13 73E9 AA11 4B3A 894B"; } ]; matrix = "@alexshpilkin:matrix.org"; name = "Alexander Shpilkin"; }; @@ -1044,21 +1017,17 @@ matrix = "@aloisw:kde.org"; github = "alois31"; githubId = 36605164; - keys = [{ - fingerprint = "CA97 A822 FF24 25D4 74AF 3E4B E0F5 9EA5 E521 6914"; - }]; + keys = [ { fingerprint = "CA97 A822 FF24 25D4 74AF 3E4B E0F5 9EA5 E521 6914"; } ]; }; Alper-Celik = { email = "alper@alper-celik.dev"; name = "Alper Çelik"; github = "Alper-Celik"; githubId = 110625473; - keys = [{ - fingerprint = "6B69 19DD CEE0 FAF3 5C9F 2984 FA90 C0AB 738A B873"; - } - { - fingerprint = "DF68 C500 4024 23CC F9C5 E6CA 3D17 C832 4696 FE70"; - }]; + keys = [ + { fingerprint = "6B69 19DD CEE0 FAF3 5C9F 2984 FA90 C0AB 738A B873"; } + { fingerprint = "DF68 C500 4024 23CC F9C5 E6CA 3D17 C832 4696 FE70"; } + ]; }; alternateved = { email = "alternateved@pm.me"; @@ -1071,9 +1040,7 @@ email = "aluisio@aasg.name"; github = "AluisioASG"; githubId = 1904165; - keys = [{ - fingerprint = "7FDB 17B3 C29B 5BA6 E5A9 8BB2 9FAA 63E0 9750 6D9D"; - }]; + keys = [ { fingerprint = "7FDB 17B3 C29B 5BA6 E5A9 8BB2 9FAA 63E0 9750 6D9D"; } ]; }; alunduil = { email = "alunduil@gmail.com"; @@ -1086,9 +1053,7 @@ github = "illfygli"; githubId = 42881386; name = "Alva"; - keys = [{ - fingerprint = "B422 CFB1 C9EF 73F7 E1E2 698D F53E 3233 42F7 A6D3A"; - }]; + keys = [ { fingerprint = "B422 CFB1 C9EF 73F7 E1E2 698D F53E 3233 42F7 A6D3A"; } ]; }; alxsimon = { email = "alexis.simon@normalesup.org"; @@ -1101,9 +1066,7 @@ github = "alyaeanyx"; githubId = 74795488; name = "alyaeanyx"; - keys = [{ - fingerprint = "1F73 8879 5E5A 3DFC E2B3 FA32 87D1 AADC D25B 8DEE"; - }]; + keys = [ { fingerprint = "1F73 8879 5E5A 3DFC E2B3 FA32 87D1 AADC D25B 8DEE"; } ]; }; aman9das = { email = "amandas62640@gmail.com"; @@ -1165,9 +1128,7 @@ email = "matilde@diffyq.xyz"; github = "matilde-ametrine"; githubId = 90799677; - keys = [{ - fingerprint = "7931 EB4E 4712 D7BE 04F8 6D34 07EE 1FFC A58A 11C5"; - }]; + keys = [ { fingerprint = "7931 EB4E 4712 D7BE 04F8 6D34 07EE 1FFC A58A 11C5"; } ]; }; amfl = { email = "amfl@none.none"; @@ -1204,9 +1165,7 @@ github = "amyipdev"; githubId = 46307646; name = "Amy Parker"; - keys = [{ - fingerprint = "7786 034B D521 49F5 1B0A 2A14 B112 2F04 E962 DDC5"; - }]; + keys = [ { fingerprint = "7786 034B D521 49F5 1B0A 2A14 B112 2F04 E962 DDC5"; } ]; }; amz-x = { email = "mail@amz-x.com"; @@ -1219,9 +1178,7 @@ github = "0x61nas"; githubId = 44965145; name = "Anas Elgarhy"; - keys = [{ - fingerprint = "E10B D192 9231 08C7 3C35 7EC3 83E0 3DC6 F383 4086"; - }]; + keys = [ { fingerprint = "E10B D192 9231 08C7 3C35 7EC3 83E0 3DC6 F383 4086"; } ]; }; AnatolyPopov = { email = "aipopov@live.ru"; @@ -1361,18 +1318,14 @@ matrix = "@angryant:envs.net"; github = "AngryAnt"; githubId = 102513; - keys = [{ - fingerprint = "B7B7 582E 564E 789B FCB8 71AB 0C6D FE2F B234 534A"; - }]; + keys = [ { fingerprint = "B7B7 582E 564E 789B FCB8 71AB 0C6D FE2F B234 534A"; } ]; }; anhdle14 = { name = "Le Anh Duc"; email = "anhdle14@icloud.com"; github = "anhdle14"; githubId = 9645992; - keys = [{ - fingerprint = "AA4B 8EC3 F971 D350 482E 4E20 0299 AFF9 ECBB 5169"; - }]; + keys = [ { fingerprint = "AA4B 8EC3 F971 D350 482E 4E20 0299 AFF9 ECBB 5169"; } ]; }; anhduy = { email = "vo@anhduy.io"; @@ -1385,9 +1338,7 @@ email = "i@anillc.cn"; github = "Anillc"; githubId = 23411248; - keys = [{ - fingerprint = "6141 1E4F FE10 CE7B 2E14 CD76 0BE8 A88F 47B2 145C"; - }]; + keys = [ { fingerprint = "6141 1E4F FE10 CE7B 2E14 CD76 0BE8 A88F 47B2 145C"; } ]; }; anirrudh = { email = "anik597@gmail.com"; @@ -1457,9 +1408,7 @@ githubId = 48802534; name = "Anselm Schüler"; matrix = "@schuelermine:matrix.org"; - keys = [{ - fingerprint = "CDBF ECA8 36FE E340 1CEB 58FF BA34 EE1A BA3A 0955"; - }]; + keys = [ { fingerprint = "CDBF ECA8 36FE E340 1CEB 58FF BA34 EE1A BA3A 0955"; } ]; }; anthonyroussel = { email = "anthony@roussel.dev"; @@ -1467,9 +1416,7 @@ githubId = 220084; name = "Anthony Roussel"; matrix = "@anthonyrsl:matrix.org"; - keys = [{ - fingerprint = "472D 368A F107 F443 F3A5 C712 9DC4 987B 1A55 E75E"; - }]; + keys = [ { fingerprint = "472D 368A F107 F443 F3A5 C712 9DC4 987B 1A55 E75E"; } ]; }; antoinerg = { email = "roygobeil.antoine@gmail.com"; @@ -1494,9 +1441,7 @@ github = "antonmosich"; githubId = 27223336; name = "Anton Mosich"; - keys = [ { - fingerprint = "F401 287C 324F 0A1C B321 657B 9B96 97B8 FB18 7D14"; - } ]; + keys = [ { fingerprint = "F401 287C 324F 0A1C B321 657B 9B96 97B8 FB18 7D14"; } ]; }; antono = { email = "self@antono.info"; @@ -1552,9 +1497,7 @@ github = "aplund"; githubId = 1369436; name = "Austin Lund"; - keys = [{ - fingerprint = "7083 E268 4BFD 845F 2B84 9E74 B695 8918 ED23 32CE"; - }]; + keys = [ { fingerprint = "7083 E268 4BFD 845F 2B84 9E74 B695 8918 ED23 32CE"; } ]; }; applejag = { email = "applejag.luminance905@passmail.com"; @@ -1562,12 +1505,8 @@ githubId = 2477952; name = "Kalle Fagerberg"; keys = [ - { - fingerprint = "F68E 6DB3 79FB 1FF0 7C72 6479 9874 DEDD 3592 5ED0"; - } - { - fingerprint = "8DDB 3994 0A34 4FE5 4F3B 3E77 F161 001D EE78 1051"; - } + { fingerprint = "F68E 6DB3 79FB 1FF0 7C72 6479 9874 DEDD 3592 5ED0"; } + { fingerprint = "8DDB 3994 0A34 4FE5 4F3B 3E77 F161 001D EE78 1051"; } ]; }; applePrincess = { @@ -1575,9 +1514,7 @@ github = "applePrincess"; githubId = 17154507; name = "Lein Matsumaru"; - keys = [{ - fingerprint = "BF8B F725 DA30 E53E 7F11 4ED8 AAA5 0652 F047 9205"; - }]; + keys = [ { fingerprint = "BF8B F725 DA30 E53E 7F11 4ED8 AAA5 0652 F047 9205"; } ]; }; appsforartists = { github = "appsforartists"; @@ -1762,9 +1699,7 @@ github = "artemist"; githubId = 1226638; name = "Artemis Tosini"; - keys = [{ - fingerprint = "3D2B B230 F9FA F0C5 1832 46DD 4FDC 96F1 61E7 BA8A"; - }]; + keys = [ { fingerprint = "3D2B B230 F9FA F0C5 1832 46DD 4FDC 96F1 61E7 BA8A"; } ]; }; arthsmn = { name = "Arthur Cerqueira"; @@ -1827,9 +1762,7 @@ email = "ascii@moth.contact"; github = "asciimoth"; githubId = 91414737; - keys = [{ - fingerprint = "C5C8 4658 CCFD 7E8E 71DE E933 AF3A E54F C3A3 5C9F"; - }]; + keys = [ { fingerprint = "C5C8 4658 CCFD 7E8E 71DE E933 AF3A E54F C3A3 5C9F"; } ]; }; ashalkhakov = { email = "artyom.shalkhakov@gmail.com"; @@ -1873,9 +1806,7 @@ github = "ashuramaruzxc"; githubId = 72100551; name = "Mariia Holovata"; - keys = [{ - fingerprint = "409D 201E 9450 8732 A49E D0FC 6BDA F874 0068 08DF"; - }]; + keys = [ { fingerprint = "409D 201E 9450 8732 A49E D0FC 6BDA F874 0068 08DF"; } ]; }; asininemonkey = { email = "nixpkgs@asininemonkey.com"; @@ -1900,9 +1831,7 @@ github = "aspulse"; githubId = 84216737; name = "AsPulse / あすぱる"; - keys = [{ - fingerprint = "C919 E69E A7C0 E147 9E0F C26E 1EDA D0C6 70BD 062D"; - }]; + keys = [ { fingerprint = "C919 E69E A7C0 E147 9E0F C26E 1EDA D0C6 70BD 062D"; } ]; }; assistant = { email = "assistant.moetron@gmail.com"; @@ -1928,9 +1857,7 @@ github = "astrobeastie"; githubId = 26362368; name = "Vincent Fischer"; - keys = [{ - fingerprint = "BF47 81E1 F304 1ADF 18CE C401 DE16 C7D1 536D A72F"; - }]; + keys = [ { fingerprint = "BF47 81E1 F304 1ADF 18CE C401 DE16 C7D1 536D A72F"; } ]; }; astronaut0212 = { email = "goatastronaut0212@proton.me"; @@ -1955,9 +1882,7 @@ github = "aszlig"; githubId = 192147; name = "aszlig"; - keys = [{ - fingerprint = "DD52 6BC7 767D BA28 16C0 95E5 6840 89CE 67EB B691"; - }]; + keys = [ { fingerprint = "DD52 6BC7 767D BA28 16C0 95E5 6840 89CE 67EB B691"; } ]; }; atalii = { email = "taliauster@gmail.com"; @@ -1971,9 +1896,7 @@ github = "AtaraxiaSjel"; githubId = 5314145; name = "Dmitriy"; - keys = [{ - fingerprint = "922D A6E7 58A0 FE4C FAB4 E4B2 FD26 6B81 0DF4 8DF2"; - }]; + keys = [ { fingerprint = "922D A6E7 58A0 FE4C FAB4 E4B2 FD26 6B81 0DF4 8DF2"; } ]; }; atemu = { name = "Atemu"; @@ -2010,11 +1933,7 @@ email = "m.abdolirad@gmail.com"; github = "atkrad"; githubId = 351364; - keys = [ - { - fingerprint = "0380 F2F8 DF7A BA1A E7DB D84A 1935 1496 62CA FDB8"; - } - ]; + keys = [ { fingerprint = "0380 F2F8 DF7A BA1A E7DB D84A 1935 1496 62CA FDB8"; } ]; }; atnnn = { email = "etienne@atnnn.com"; @@ -2075,9 +1994,7 @@ email = "sven@autumnal.de"; github = "sevenautumns"; githubId = 20627275; - keys = [{ - fingerprint = "6A2E 7FDD 1037 11A8 B996 E28E B051 064E 2FCA B71B"; - }]; + keys = [ { fingerprint = "6A2E 7FDD 1037 11A8 B996 E28E B051 064E 2FCA B71B"; } ]; }; avakhrenev = { email = "avakhrenev@gmail.com"; @@ -2126,18 +2043,14 @@ github = "aviallon"; githubId = 7479436; name = "Antoine Viallon"; - keys = [{ - fingerprint = "4AC4 A28D 7208 FC6F 2B51 5EA9 D126 B13A B555 E16F"; - }]; + keys = [ { fingerprint = "4AC4 A28D 7208 FC6F 2B51 5EA9 D126 B13A B555 E16F"; } ]; }; avitex = { email = "theavitex@gmail.com"; github = "avitex"; githubId = 5110816; name = "avitex"; - keys = [{ - fingerprint = "271E 136C 178E 06FA EA4E B854 8B36 6C44 3CAB E942"; - }]; + keys = [ { fingerprint = "271E 136C 178E 06FA EA4E B854 8B36 6C44 3CAB E942"; } ]; }; avnik = { email = "avn@avnik.info"; @@ -2174,9 +2087,7 @@ matrix = "@azahi:azahi.cc"; github = "azahi"; githubId = 22211000; - keys = [{ - fingerprint = "2688 0377 C31D 9E81 9BDF 83A8 C8C6 BDDB 3847 F72B"; - }]; + keys = [ { fingerprint = "2688 0377 C31D 9E81 9BDF 83A8 C8C6 BDDB 3847 F72B"; } ]; }; azazak123 = { email = "azazaka2002@gmail.com"; @@ -2202,18 +2113,14 @@ github = "B4dM4n"; githubId = 448169; name = "Fabian Möller"; - keys = [{ - fingerprint = "6309 E212 29D4 DA30 AF24 BDED 754B 5C09 63C4 2C50"; - }]; + keys = [ { fingerprint = "6309 E212 29D4 DA30 AF24 BDED 754B 5C09 63C4 2C50"; } ]; }; babbaj = { name = "babbaj"; email = "babbaj45@gmail.com"; github = "babbaj"; githubId = 12820770; - keys = [{ - fingerprint = "6FBC A462 4EAF C69C A7C4 98C1 F044 3098 48A0 7CAC"; - }]; + keys = [ { fingerprint = "6FBC A462 4EAF C69C A7C4 98C1 F044 3098 48A0 7CAC"; } ]; }; babeuh = { name = "Raphael Le Goaller"; @@ -2240,9 +2147,7 @@ matrix = "@badele:matrix.org"; github = "badele"; githubId = 2806307; - keys = [{ - fingerprint = "00F4 21C4 C537 7BA3 9820 E13F 6B95 E13D E469 CC5D"; - }]; + keys = [ { fingerprint = "00F4 21C4 C537 7BA3 9820 E13F 6B95 E13D E469 CC5D"; } ]; }; badmutex = { email = "github@badi.sh"; @@ -2321,9 +2226,7 @@ github = "wandersoncferreira"; githubId = 17708295; name = "Wanderson Ferreira"; - keys = [{ - fingerprint = "A3E1 C409 B705 50B3 BF41 492B 5684 0A61 4DBE 37AE"; - }]; + keys = [ { fingerprint = "A3E1 C409 B705 50B3 BF41 492B 5684 0A61 4DBE 37AE"; } ]; }; bastaynav = { name = "Ivan Bastrakov"; @@ -2331,9 +2234,7 @@ matrix = "@bastaynav:matrix.org"; github = "bastaynav"; githubId = 6987136; - keys = [{ - fingerprint = "2C6D 37D4 6AA1 DCDA BE8D F346 43E2 CF4C 01B9 4940"; - }]; + keys = [ { fingerprint = "2C6D 37D4 6AA1 DCDA BE8D F346 43E2 CF4C 01B9 4940"; } ]; }; basvandijk = { email = "v.dijk.bas@gmail.com"; @@ -2365,9 +2266,7 @@ matrix = "@baukexyz:matrix.org"; github = "Bauke"; githubId = 19501722; - keys = [{ - fingerprint = "C593 27B5 9D0F 2622 23F6 1D03 C1C0 F299 52BC F558"; - }]; + keys = [ { fingerprint = "C593 27B5 9D0F 2622 23F6 1D03 C1C0 F299 52BC F558"; } ]; }; bb010g = { email = "me@bb010g.com"; @@ -2393,10 +2292,12 @@ github = "bbenne10"; githubId = 687376; name = "Bryan Bennett"; - keys = [{ - # compare with https://keybase.io/bbenne10 - fingerprint = "41EA 00B4 00F9 6970 1CB2 D3AF EF90 E3E9 8B8F 5C0B"; - }]; + keys = [ + { + # compare with https://keybase.io/bbenne10 + fingerprint = "41EA 00B4 00F9 6970 1CB2 D3AF EF90 E3E9 8B8F 5C0B"; + } + ]; }; bbenno = { email = "nix@bbenno.com"; @@ -2494,18 +2395,14 @@ email = "b.broich@posteo.de"; github = "BenediktBroich"; githubId = 32903896; - keys = [{ - fingerprint = "CB5C 7B3C 3E6F 2A59 A583 A90A 8A60 0376 7BE9 5976"; - }]; + keys = [ { fingerprint = "CB5C 7B3C 3E6F 2A59 A583 A90A 8A60 0376 7BE9 5976"; } ]; }; benesim = { name = "Benjamin Isbarn"; email = "benjamin.isbarn@gmail.com"; github = "BeneSim"; githubId = 29384538; - keys = [{ - fingerprint = "D35E C9CE E631 638F F1D8 B401 6F0E 410D C3EE D02"; - }]; + keys = [ { fingerprint = "D35E C9CE E631 638F F1D8 B401 6F0E 410D C3EE D02"; } ]; }; benhiemer = { name = "Benedikt Hiemer"; @@ -2518,9 +2415,7 @@ email = "benjaminedwardwebb@gmail.com"; github = "benjaminedwardwebb"; githubId = 7118777; - keys = [{ - fingerprint = "E9A3 7864 2165 28CE 507C CA82 72EA BF75 C331 CD25"; - }]; + keys = [ { fingerprint = "E9A3 7864 2165 28CE 507C CA82 72EA BF75 C331 CD25"; } ]; }; Benjamin-L = { name = "Benjamin Lee"; @@ -2528,9 +2423,7 @@ matrix = "@benjamin:computer.surgery"; github = "Benjamin-L"; githubId = 6504174; - keys = [{ - fingerprint = "9D84 09A0 44FC 1EEB AE2D FA30 FB96 24E2 885D 55A4"; - }]; + keys = [ { fingerprint = "9D84 09A0 44FC 1EEB AE2D FA30 FB96 24E2 885D 55A4"; } ]; }; benkuhn = { email = "ben@ben-kuhn.com"; @@ -2543,9 +2436,7 @@ github = "benlemasurier"; githubId = 47993; name = "Ben LeMasurier"; - keys = [{ - fingerprint = "0FD4 7407 EFD4 8FD8 8BF5 87B3 248D 430A E8E7 4189"; - }]; + keys = [ { fingerprint = "0FD4 7407 EFD4 8FD8 8BF5 87B3 248D 430A E8E7 4189"; } ]; }; benley = { email = "benley@gmail.com"; @@ -2595,9 +2486,7 @@ email = "nicolas@normie.dev"; github = "berbiche"; githubId = 20448408; - keys = [{ - fingerprint = "D446 E58D 87A0 31C7 EC15 88D7 B461 2924 45C6 E696"; - }]; + keys = [ { fingerprint = "D446 E58D 87A0 31C7 EC15 88D7 B461 2924 45C6 E696"; } ]; }; berce = { email = "bert.moens@gmail.com"; @@ -2634,9 +2523,7 @@ email = "berto.f@protonmail.com"; github = "bertof"; githubId = 9915675; - keys = [{ - fingerprint = "17C5 1EF9 C0FE 2EB2 FE56 BB53 FE98 AE5E C52B 1056"; - }]; + keys = [ { fingerprint = "17C5 1EF9 C0FE 2EB2 FE56 BB53 FE98 AE5E C52B 1056"; } ]; }; betaboon = { email = "betaboon@0x80.ninja"; @@ -2711,10 +2598,10 @@ name = "Alexey Lebedeff"; }; binarycat = { - email = "binarycat@envs.net"; - github = "lolbinarycat"; - githubId = 19915050; - name = "binarycat"; + email = "binarycat@envs.net"; + github = "lolbinarycat"; + githubId = 19915050; + name = "binarycat"; }; binsky = { email = "timo@binsky.org"; @@ -2757,9 +2644,7 @@ email = "blankparticle@gmail.com"; github = "BlankParticle"; githubId = 130567419; - keys = [{ - fingerprint = "1757 64C3 7065 AA8D 614D 41C9 0ACE 126D 7B35 9261"; - }]; + keys = [ { fingerprint = "1757 64C3 7065 AA8D 614D 41C9 0ACE 126D 7B35 9261"; } ]; }; blanky0230 = { email = "blanky0230@gmail.com"; @@ -2871,9 +2756,7 @@ matrix = "@booklearner:matrix.org"; github = "booklearner"; githubId = 103979114; - keys = [{ - fingerprint = "17C7 95D4 871C 2F87 83C8 053D 0C61 C4E5 907F 76C8"; - }]; + keys = [ { fingerprint = "17C7 95D4 871C 2F87 83C8 053D 0C61 C4E5 907F 76C8"; } ]; }; booniepepper = { name = "J.R. Hill"; @@ -2923,9 +2806,7 @@ github = "Br1ght0ne"; githubId = 12615679; name = "Oleksii Filonenko"; - keys = [{ - fingerprint = "F549 3B7F 9372 5578 FDD3 D0B8 A1BC 8428 323E CFE8"; - }]; + keys = [ { fingerprint = "F549 3B7F 9372 5578 FDD3 D0B8 A1BC 8428 323E CFE8"; } ]; }; br337 = { email = "brian.porumb@proton.me"; @@ -3016,9 +2897,7 @@ github = "brhoades"; githubId = 4763746; name = "Billy Rhoades"; - keys = [{ - fingerprint = "BF4FCB85C69989B4ED95BF938AE74787A4B7C07E"; - }]; + keys = [ { fingerprint = "BF4FCB85C69989B4ED95BF938AE74787A4B7C07E"; } ]; }; b-rodrigues = { email = "bruno@brodrigues.co"; @@ -3133,7 +3012,7 @@ githubId = 8891115; name = "Brian Choy"; }; - ByteSudoer = { + ByteSudoer = { email = "bytesudoer@gmail.com"; github = "bytesudoer"; githubId = 88513682; @@ -3182,12 +3061,8 @@ name = "Vladimir Serov"; keys = [ # compare with https://keybase.io/cab404 - { - fingerprint = "1BB96810926F4E715DEF567E6BA7C26C3FDF7BB3"; - } - { - fingerprint = "1EBC648C64D6045463013B3EB7EFFC271D55DB8A"; - } + { fingerprint = "1BB96810926F4E715DEF567E6BA7C26C3FDF7BB3"; } + { fingerprint = "1EBC648C64D6045463013B3EB7EFFC271D55DB8A"; } ]; }; CactiChameleon9 = { @@ -3209,12 +3084,8 @@ github = "cafkafk"; githubId = 89321978; keys = [ - { - fingerprint = "7B9E E848 D074 AE03 7A0C 651A 8ED4 DEF7 375A 30C8"; - } - { - fingerprint = "208A 2A66 8A2F CDE7 B5D3 8F64 CDDC 792F 6552 51ED"; - } + { fingerprint = "7B9E E848 D074 AE03 7A0C 651A 8ED4 DEF7 375A 30C8"; } + { fingerprint = "208A 2A66 8A2F CDE7 B5D3 8F64 CDDC 792F 6552 51ED"; } ]; }; CaitlinDavitt = { @@ -3272,9 +3143,7 @@ github = "cameronraysmith"; githubId = 420942; name = "Cameron Smith"; - keys = [{ - fingerprint = "3F14 C258 856E 88AE E0F9 661E FF04 3B36 8811 DD1C"; - }]; + keys = [ { fingerprint = "3F14 C258 856E 88AE E0F9 661E FF04 3B36 8811 DD1C"; } ]; }; camillemndn = { email = "camillemondon@free.fr"; @@ -3327,9 +3196,7 @@ email = "kiran@ostrolenk.co.uk"; github = "CardboardTurkey"; githubId = 34030186; - keys = [{ - fingerprint = "8BC7 74E4 A2EC 7507 3B61 A647 0BBB 1C8B 1C36 39EE"; - }]; + keys = [ { fingerprint = "8BC7 74E4 A2EC 7507 3B61 A647 0BBB 1C8B 1C36 39EE"; } ]; }; carloscraveiro = { email = "carlos.craveiro@usp.br"; @@ -3452,9 +3319,7 @@ github = "cburstedde"; githubId = 109908; name = "Carsten Burstedde"; - keys = [{ - fingerprint = "1127 A432 6524 BF02 737B 544E 0704 CD9E 550A 6BCD"; - }]; + keys = [ { fingerprint = "1127 A432 6524 BF02 737B 544E 0704 CD9E 550A 6BCD"; } ]; }; ccellado = { email = "annplague@gmail.com"; @@ -3519,12 +3384,8 @@ githubId = 2054509; name = "Constantine Evans"; keys = [ - { - fingerprint = "32B1 6EE7 DBA5 16DE 526E 4C5A B67D B1D2 0A93 A9F9"; - } - { - fingerprint = "669C 1D24 5A87 DB34 6BE4 3216 1A1D 58B8 6AE2 AABD"; - } + { fingerprint = "32B1 6EE7 DBA5 16DE 526E 4C5A B67D B1D2 0A93 A9F9"; } + { fingerprint = "669C 1D24 5A87 DB34 6BE4 3216 1A1D 58B8 6AE2 AABD"; } ]; }; Ch1keen = { @@ -3562,9 +3423,7 @@ github = "LostAttractor"; githubId = 46527539; name = "ChaosAttractor"; - keys = [{ - fingerprint = "A137 4415 DB7C 6439 10EA 5BF1 0FEE 4E47 5940 E125"; - }]; + keys = [ { fingerprint = "A137 4415 DB7C 6439 10EA 5BF1 0FEE 4E47 5940 E125"; } ]; }; charlesbaynham = { email = "charlesbaynham@gmail.com"; @@ -3582,9 +3441,7 @@ email = "chayleaf-nix@pavluk.org"; github = "chayleaf"; githubId = 9590981; - keys = [{ - fingerprint = "4314 3701 154D 9E5F 7051 7ECF 7817 1AD4 6227 E68E"; - }]; + keys = [ { fingerprint = "4314 3701 154D 9E5F 7051 7ECF 7817 1AD4 6227 E68E"; } ]; matrix = "@chayleaf:matrix.pavluk.org"; name = "Anna Pavlyuk"; }; @@ -3618,9 +3475,7 @@ githubId = 20300586; matrix = "@sammy:cherrykitten.dev"; name = "CherryKitten"; - keys = [{ - fingerprint = "264C FA1A 194C 585D F822 F673 C01A 7CBB A617 BD5F"; - }]; + keys = [ { fingerprint = "264C FA1A 194C 585D F822 F673 C01A 7CBB A617 BD5F"; } ]; }; chessai = { email = "chessai1996@gmail.com"; @@ -3638,9 +3493,7 @@ name = "Diego Rodriguez"; github = "Chili-Man"; githubId = 631802; - keys = [{ - fingerprint = "099E 3F97 FA08 3D47 8C75 EBEC E0EB AD78 F019 0BD9"; - }]; + keys = [ { fingerprint = "099E 3F97 FA08 3D47 8C75 EBEC E0EB AD78 F019 0BD9"; } ]; }; chiroptical = { email = "chiroptical@gmail.com"; @@ -3749,9 +3602,7 @@ github = "christoph-heiss"; githubId = 7571069; name = "Christoph Heiss"; - keys = [{ - fingerprint = "9C56 1D64 30B2 8D6B DCBC 9CEB 73D5 E7FD EE3D E49A"; - }]; + keys = [ { fingerprint = "9C56 1D64 30B2 8D6B DCBC 9CEB 73D5 E7FD EE3D E49A"; } ]; }; chrpinedo = { github = "chrpinedo"; @@ -3769,9 +3620,7 @@ email = "nixos@chuang.cz"; github = "chuangzhu"; githubId = 31200881; - keys = [{ - fingerprint = "5D03 A5E6 0754 A3E3 CA57 5037 E838 CED8 1CFF D3F9"; - }]; + keys = [ { fingerprint = "5D03 A5E6 0754 A3E3 CA57 5037 E838 CED8 1CFF D3F9"; } ]; }; chvp = { email = "nixpkgs@cvpetegem.be"; @@ -3791,9 +3640,7 @@ email = "cig0.github@gmail.com"; github = "cig0"; githubId = 394089; - keys = [{ - fingerprint = "1828 B459 DB9A 7EE2 03F4 7E6E AFBE ACC5 5D93 84A0"; - }]; + keys = [ { fingerprint = "1828 B459 DB9A 7EE2 03F4 7E6E AFBE ACC5 5D93 84A0"; } ]; }; cigrainger = { name = "Christopher Grainger"; @@ -3824,9 +3671,7 @@ github = "VertexA115"; githubId = 5567402; name = "Alex Zero"; - keys = [{ - fingerprint = "A0AA 4646 B8F6 9D45 4553 5A88 A515 50ED B450 302C"; - }]; + keys = [ { fingerprint = "A0AA 4646 B8F6 9D45 4553 5A88 A515 50ED B450 302C"; } ]; }; cizra = { email = "todurov+nix@gmail.com"; @@ -3862,9 +3707,7 @@ email = "nixpkgs-0efe364@ckie.dev"; github = "ckiee"; githubId = 25263210; - keys = [{ - fingerprint = "539F 0655 4D35 38A5 429A E253 13E7 9449 C052 5215"; - }]; + keys = [ { fingerprint = "539F 0655 4D35 38A5 429A E253 13E7 9449 C052 5215"; } ]; name = "ckie"; matrix = "@ckie:ckie.dev"; }; @@ -3885,9 +3728,7 @@ github = "clebs"; githubId = 1059661; name = "Borja Clemente"; - keys = [{ - fingerprint = "C4E1 58BD FD33 3C77 B6C7 178E 2539 757E F64C 60DD"; - }]; + keys = [ { fingerprint = "C4E1 58BD FD33 3C77 B6C7 178E 2539 757E F64C 60DD"; } ]; }; cleeyv = { email = "cleeyv@riseup.net"; @@ -3938,9 +3779,7 @@ github = "cmars"; githubId = 23741; name = "Casey Marshall"; - keys = [{ - fingerprint = "6B78 7E5F B493 FA4F D009 5D10 6DEC 2758 ACD5 A973"; - }]; + keys = [ { fingerprint = "6B78 7E5F B493 FA4F D009 5D10 6DEC 2758 ACD5 A973"; } ]; }; cmcdragonkai = { email = "roger.qiu@matrix.ai"; @@ -3977,9 +3816,7 @@ github = "Coca162"; githubId = 62479942; name = "Coca"; - keys = [{ - fingerprint = "99CB 86FF 62BB 7DA4 8903 B16D 0328 2DF8 8179 AB19"; - }]; + keys = [ { fingerprint = "99CB 86FF 62BB 7DA4 8903 B16D 0328 2DF8 8179 AB19"; } ]; }; coconnor = { email = "coreyoconnor@gmail.com"; @@ -3992,20 +3829,16 @@ github = "code-asher"; githubId = 45609798; name = "Asher"; - keys = [{ - fingerprint = "6E3A FA6D 915C C2A4 D26F C53E 7BB4 BA9C 783D 2BBC"; - }]; + keys = [ { fingerprint = "6E3A FA6D 915C C2A4 D26F C53E 7BB4 BA9C 783D 2BBC"; } ]; }; codebam = { - name = "Sean Behan"; - email = "codebam@riseup.net"; - matrix = "@codebam:fedora.im"; - github = "codebam"; - githubId = 6035884; - keys = [{ - fingerprint = "42CD E212 593C F2FD C723 48A8 0F6D 5021 A87F 92BA"; - }]; - }; + name = "Sean Behan"; + email = "codebam@riseup.net"; + matrix = "@codebam:fedora.im"; + github = "codebam"; + githubId = 6035884; + keys = [ { fingerprint = "42CD E212 593C F2FD C723 48A8 0F6D 5021 A87F 92BA"; } ]; + }; codec = { email = "codec@fnord.cx"; github = "codec"; @@ -4023,9 +3856,7 @@ name = "Guy Boldon"; github = "codifryed"; githubId = 27779510; - keys = [{ - fingerprint = "FDF5 EF67 8CC1 FE22 1845 6A22 CF7B BB5B C756 1BD3"; - }]; + keys = [ { fingerprint = "FDF5 EF67 8CC1 FE22 1845 6A22 CF7B BB5B C756 1BD3"; } ]; }; codsl = { email = "codsl@riseup.net"; @@ -4051,9 +3882,7 @@ matrix = "@cofob:matrix.org"; github = "cofob"; githubId = 49928332; - keys = [{ - fingerprint = "5F3D 9D3D ECE0 8651 DE14 D29F ACAD 4265 E193 794D"; - }]; + keys = [ { fingerprint = "5F3D 9D3D ECE0 8651 DE14 D29F ACAD 4265 E193 794D"; } ]; }; Cogitri = { email = "oss@cogitri.dev"; @@ -4087,9 +3916,7 @@ matrix = "@cole-h:matrix.org"; github = "cole-h"; githubId = 28582702; - keys = [{ - fingerprint = "68B8 0D57 B2E5 4AC3 EC1F 49B0 B37E 0F23 7101 6A4C"; - }]; + keys = [ { fingerprint = "68B8 0D57 B2E5 4AC3 EC1F 49B0 B37E 0F23 7101 6A4C"; } ]; }; colemickens = { email = "cole.mickens@gmail.com"; @@ -4192,12 +4019,8 @@ matrix = "@corbansolo:matrix.org"; name = "Corban Raun"; keys = [ - { - fingerprint = "6607 0B24 8CE5 64ED 22CE 0950 A697 A56F 1F15 1189"; - } - { - fingerprint = "D8CB 816A B678 A4E6 1EC7 5325 230F 4AC1 53F9 0F29"; - } + { fingerprint = "6607 0B24 8CE5 64ED 22CE 0950 A697 A56F 1F15 1189"; } + { fingerprint = "D8CB 816A B678 A4E6 1EC7 5325 230F 4AC1 53F9 0F29"; } ]; }; corngood = { @@ -4246,9 +4069,7 @@ github = "cpu"; githubId = 292650; name = "Daniel McCarney"; - keys = [{ - fingerprint = "8026 D24A A966 BF9C D3CD CB3C 08FB 2BFC 470E 75B4"; - }]; + keys = [ { fingerprint = "8026 D24A A966 BF9C D3CD CB3C 08FB 2BFC 470E 75B4"; } ]; }; Crafter = { email = "crafter@crafter.rocks"; @@ -4303,9 +4124,7 @@ name = "Jan Möller"; github = "Croissong"; githubId = 4162215; - keys = [{ - fingerprint = "CE97 9DEE 904C 26AA 3716 78C2 96A4 38F9 EE72 572F"; - }]; + keys = [ { fingerprint = "CE97 9DEE 904C 26AA 3716 78C2 96A4 38F9 EE72 572F"; } ]; }; crschnick = { email = "crschnick@xpipe.io"; @@ -4319,18 +4138,14 @@ github = "CRTified"; githubId = 2440581; name = "Carl Richard Theodor Schneider"; - keys = [{ - fingerprint = "2017 E152 BB81 5C16 955C E612 45BC C1E2 709B 1788"; - }]; + keys = [ { fingerprint = "2017 E152 BB81 5C16 955C E612 45BC C1E2 709B 1788"; } ]; }; Cryolitia = { name = "Beiyan Cryolitia"; email = "Cryolitia@gmail.com"; github = "Cryolitia"; githubId = 23723294; - keys = [{ - fingerprint = "1C3C 6547 538D 7152 310C 0EEA 84DD 0C01 30A5 4DF7"; - }]; + keys = [ { fingerprint = "1C3C 6547 538D 7152 310C 0EEA 84DD 0C01 30A5 4DF7"; } ]; }; cryptix = { email = "cryptix@riseup.net"; @@ -4372,9 +4187,7 @@ github = "cust0dian"; githubId = 119854490; name = "Serg Nesterov"; - keys = [{ - fingerprint = "6E7D BA30 DB5D BA60 693C 3BE3 1512 F6EB 84AE CC8C"; - }]; + keys = [ { fingerprint = "6E7D BA30 DB5D BA60 693C 3BE3 1512 F6EB 84AE CC8C"; } ]; }; cwoac = { email = "oliver@codersoffortune.net"; @@ -4395,26 +4208,20 @@ github = "CyberShadow"; githubId = 160894; - keys = [{ - fingerprint = "BBED 1B08 8CED 7F95 8917 FBE8 5004 F0FA D051 576D"; - }]; + keys = [ { fingerprint = "BBED 1B08 8CED 7F95 8917 FBE8 5004 F0FA D051 576D"; } ]; }; cynerd = { name = "Karel Kočí"; email = "cynerd@email.cz"; github = "Cynerd"; githubId = 3811900; - keys = [{ - fingerprint = "2B1F 70F9 5F1B 48DA 2265 A7FA A6BC 8B8C EB31 659B"; - }]; + keys = [ { fingerprint = "2B1F 70F9 5F1B 48DA 2265 A7FA A6BC 8B8C EB31 659B"; } ]; }; cyntheticfox = { email = "cyntheticfox@gh0st.sh"; github = "cyntheticfox"; githubId = 17628961; - keys = [{ - fingerprint = "73C1 C5DF 51E7 BB92 85E9 A262 5960 278C E235 F821"; - }]; + keys = [ { fingerprint = "73C1 C5DF 51E7 BB92 85E9 A262 5960 278C E235 F821"; } ]; matrix = "@houstdav000:gh0st.ems.host"; name = "Cynthia Fox"; }; @@ -4430,12 +4237,8 @@ githubId = 2217136; name = "Ștefan D. Mihăilă"; keys = [ - { - fingerprint = "CBC9 C7CC 51F0 4A61 3901 C723 6E68 A39B F16A 3ECB"; - } - { - fingerprint = "7EAB 1447 5BBA 7DDE 7092 7276 6220 AD78 4622 0A52"; - } + { fingerprint = "CBC9 C7CC 51F0 4A61 3901 C723 6E68 A39B F16A 3ECB"; } + { fingerprint = "7EAB 1447 5BBA 7DDE 7092 7276 6220 AD78 4622 0A52"; } ]; }; cyplo = { @@ -4462,9 +4265,7 @@ email = "dadada@dadada.li"; github = "dadada"; githubId = 7216772; - keys = [{ - fingerprint = "D68C 8469 5C08 7E0F 733A 28D0 EEB8 D1CE 62C4 DFEA"; - }]; + keys = [ { fingerprint = "D68C 8469 5C08 7E0F 733A 28D0 EEB8 D1CE 62C4 DFEA"; } ]; }; dalance = { email = "dalance@gmail.com"; @@ -4483,9 +4284,7 @@ github = "DAlperin"; githubId = 16063713; name = "Dov Alperin"; - keys = [{ - fingerprint = "4EED 5096 B925 86FA 1101 6673 7F2C 07B9 1B52 BB61"; - }]; + keys = [ { fingerprint = "4EED 5096 B925 86FA 1101 6673 7F2C 07B9 1B52 BB61"; } ]; }; DamienCassou = { email = "damien@cassou.me"; @@ -4510,9 +4309,7 @@ email = "djc@djc.id.au"; github = "danc86"; githubId = 398575; - keys = [{ - fingerprint = "1C56 01F1 D70A B56F EABB 6BC0 26B5 AA2F DAF2 F30A"; - }]; + keys = [ { fingerprint = "1C56 01F1 D70A B56F EABB 6BC0 26B5 AA2F DAF2 F30A"; } ]; }; dancek = { email = "hannu.hartikainen@gmail.com"; @@ -4593,9 +4390,7 @@ matrix = "@danth:danth.me"; github = "danth"; githubId = 28959268; - keys = [{ - fingerprint = "4779 D1D5 3C97 2EAE 34A5 ED3D D8AF C4BF 0567 0F9D"; - }]; + keys = [ { fingerprint = "4779 D1D5 3C97 2EAE 34A5 ED3D D8AF C4BF 0567 0F9D"; } ]; }; dan-theriault = { email = "nix@theriault.codes"; @@ -4633,9 +4428,7 @@ email = "dasisdormax@mailbox.org"; github = "dasisdormax"; githubId = 3714905; - keys = [{ - fingerprint = "E59B A198 61B0 A9ED C1FA 3FB2 02BA 0D44 80CA 6C44"; - }]; + keys = [ { fingerprint = "E59B A198 61B0 A9ED C1FA 3FB2 02BA 0D44 80CA 6C44"; } ]; name = "Maximilian Wende"; }; das_j = { @@ -4662,12 +4455,8 @@ githubId = 28595242; name = "DataHearth"; keys = [ - { - fingerprint = "A129 2547 0298 BFEE 7EE0 92B3 946E 2D0C 410C 7B3D"; - } - { - fingerprint = "FFC4 92C1 5320 B05D 0F8D 7D58 ABF6 737C 6339 6D35"; - } + { fingerprint = "A129 2547 0298 BFEE 7EE0 92B3 946E 2D0C 410C 7B3D"; } + { fingerprint = "FFC4 92C1 5320 B05D 0F8D 7D58 ABF6 737C 6339 6D35"; } ]; }; davegallant = { @@ -4718,9 +4507,7 @@ github = "david-r-cox"; githubId = 4259949; name = "David Cox"; - keys = [{ - fingerprint = "0056 A3F6 9918 1E0D 8FF0 BCDE 65BB 07FA A4D9 4634"; - }]; + keys = [ { fingerprint = "0056 A3F6 9918 1E0D 8FF0 BCDE 65BB 07FA A4D9 4634"; } ]; }; davidrusu = { email = "davidrusu.me@gmail.com"; @@ -4739,9 +4526,7 @@ github = "davidtwco"; githubId = 1295100; name = "David Wood"; - keys = [{ - fingerprint = "5B08 313C 6853 E5BF FA91 A817 0176 0B4F 9F53 F154"; - }]; + keys = [ { fingerprint = "5B08 313C 6853 E5BF FA91 A817 0176 0B4F 9F53 F154"; } ]; }; davisrichard437 = { email = "davisrichard437@gmail.com"; @@ -4808,9 +4593,7 @@ github = "dbirks"; githubId = 7545665; name = "David Birks"; - keys = [{ - fingerprint = "B26F 9AD8 DA20 3392 EF87 C61A BB99 9F83 D9A1 9A36"; - }]; + keys = [ { fingerprint = "B26F 9AD8 DA20 3392 EF87 C61A BB99 9F83 D9A1 9A36"; } ]; }; dblsaiko = { email = "me@dblsaiko.net"; @@ -4829,9 +4612,7 @@ github = "dbrgn"; githubId = 105168; name = "Danilo B."; - keys = [{ - fingerprint = "20EE 002D 778A E197 EF7D 0D2C B993 FF98 A90C 9AB1"; - }]; + keys = [ { fingerprint = "20EE 002D 778A E197 EF7D 0D2C B993 FF98 A90C 9AB1"; } ]; }; dbrock = { email = "daniel@brockman.se"; @@ -4868,9 +4649,7 @@ email = "dearrude@tfwno.gf"; github = "DearRude"; githubId = 30749142; - keys = [{ - fingerprint = "4E35 F2E5 2132 D654 E815 A672 DB2C BC24 2868 6000"; - }]; + keys = [ { fingerprint = "4E35 F2E5 2132 D654 E815 A672 DB2C BC24 2868 6000"; } ]; }; declan = { name = "Declan Rixon"; @@ -4883,9 +4662,7 @@ github = "deejayem"; githubId = 2564003; name = "David Morgan"; - keys = [{ - fingerprint = "9B43 6B14 77A8 79C2 6CDB 6604 C171 2510 02C2 00F2"; - }]; + keys = [ { fingerprint = "9B43 6B14 77A8 79C2 6CDB 6604 C171 2510 02C2 00F2"; } ]; }; deemp = { email = "deempleton@gmail.com"; @@ -4910,9 +4687,7 @@ matrix = "@defelo:matrix.defelo.de"; github = "Defelo"; githubId = 41747605; - keys = [{ - fingerprint = "6130 3BBA D7D1 BF74 EFA4 4E3B E7FE 2087 E438 0E64"; - }]; + keys = [ { fingerprint = "6130 3BBA D7D1 BF74 EFA4 4E3B E7FE 2087 E438 0E64"; } ]; }; deifactor = { name = "Ash Zahlen"; @@ -5154,9 +4929,7 @@ github = "d-goldin"; githubId = 43349662; name = "Dima"; - keys = [{ - fingerprint = "1C4E F4FE 7F8E D8B7 1E88 CCDF BAB1 D15F B7B4 D4CE"; - }]; + keys = [ { fingerprint = "1C4E F4FE 7F8E D8B7 1E88 CCDF BAB1 D15F B7B4 D4CE"; } ]; }; dgollings = { email = "daniel.gollings+nixpkgs@gmail.com"; @@ -5240,9 +5013,7 @@ matrix = "@dtc:diogotc.com"; github = "diogotcorreia"; githubId = 7467891; - keys = [{ - fingerprint = "111F 91B7 5F61 99D8 985B 4C70 12CF 31FD FF17 2B77"; - }]; + keys = [ { fingerprint = "111F 91B7 5F61 99D8 985B 4C70 12CF 31FD FF17 2B77"; } ]; }; diogox = { name = "Diogo Xavier"; @@ -5284,18 +5055,14 @@ email = "hello@ditsuke.com"; github = "ditsuke"; githubId = 72784348; - keys = [{ - fingerprint = "8FD2 153F 4889 541A 54F1 E09E 71B6 C31C 8A5A 9D21"; - }]; + keys = [ { fingerprint = "8FD2 153F 4889 541A 54F1 E09E 71B6 C31C 8A5A 9D21"; } ]; }; dixslyf = { name = "Dixon Sean Low Yan Feng"; email = "dixonseanlow@protonmail.com"; github = "dixslyf"; githubId = 56017218; - keys = [{ - fingerprint = "E6F4 BFB4 8DE3 893F 68FC A15F FF5F 4B30 A41B BAC8"; - }]; + keys = [ { fingerprint = "E6F4 BFB4 8DE3 893F 68FC A15F FF5F 4B30 A41B BAC8"; } ]; }; djacu = { email = "daniel.n.baker@gmail.com"; @@ -5409,9 +5176,7 @@ email = "silkmoth@protonmail.com"; github = "asciimoth"; githubId = 91414737; - keys = [{ - fingerprint = "7D6B AE0A A98A FDE9 3396 E721 F87E 15B8 3AA7 3087"; - }]; + keys = [ { fingerprint = "7D6B AE0A A98A FDE9 3396 E721 F87E 15B8 3AA7 3087"; } ]; }; dominikh = { email = "dominik@honnef.co"; @@ -5423,17 +5188,13 @@ github = "donovanglover"; githubId = 2374245; name = "Donovan Glover"; - keys = [{ - fingerprint = "EE7D 158E F9E7 660E 0C33 86B2 8FC5 F7D9 0A5D 8F4D"; - }]; + keys = [ { fingerprint = "EE7D 158E F9E7 660E 0C33 86B2 8FC5 F7D9 0A5D 8F4D"; } ]; }; donteatoreo = { name = "DontEatOreo"; github = "DontEatOreo"; githubId = 57304299; - keys = [{ - fingerprint = "33CD 5C0A 673C C54D 661E 5E4C 0DB5 361B EEE5 30AB"; - }]; + keys = [ { fingerprint = "33CD 5C0A 673C C54D 661E 5E4C 0DB5 361B EEE5 30AB"; } ]; }; doriath = { email = "tomasz.zurkowski@gmail.com"; @@ -5465,9 +5226,7 @@ github = "dottedmag"; githubId = 16120; name = "Misha Gusarov"; - keys = [{ - fingerprint = "A8DF 1326 9E5D 9A38 E57C FAC2 9D20 F650 3E33 8888"; - }]; + keys = [ { fingerprint = "A8DF 1326 9E5D 9A38 E57C FAC2 9D20 F650 3E33 8888"; } ]; }; dpaetzel = { email = "david.paetzel@posteo.de"; @@ -5480,9 +5239,7 @@ github = "dpausp"; githubId = 1965950; name = "Tobias Stenzel"; - keys = [{ - fingerprint = "4749 0887 CF3B 85A1 6355 C671 78C7 DD40 DF23 FB16"; - }]; + keys = [ { fingerprint = "4749 0887 CF3B 85A1 6355 C671 78C7 DD40 DF23 FB16"; } ]; }; dpc = { email = "dpc@dpc.pw"; @@ -5490,9 +5247,7 @@ githubId = 9209; matrix = "@dpc:matrix.org"; name = "Dawid Ciężarkiewicz"; - keys = [{ - fingerprint = "0402 11D2 0830 2D71 5792 8197 86BB 1D5B 5575 7D38"; - }]; + keys = [ { fingerprint = "0402 11D2 0830 2D71 5792 8197 86BB 1D5B 5575 7D38"; } ]; }; DPDmancul = { name = "Davide Peressoni"; @@ -5518,9 +5273,7 @@ github = "dr460nf1r3"; githubId = 12834713; name = "Nico Jensch"; - keys = [{ - fingerprint = "D245 D484 F357 8CB1 7FD6 DA6B 67DB 29BF F3C9 6757"; - }]; + keys = [ { fingerprint = "D245 D484 F357 8CB1 7FD6 DA6B 67DB 29BF F3C9 6757"; } ]; }; dragonginger = { email = "dragonginger10@gmail.com"; @@ -5562,9 +5315,7 @@ github = "drperceptron"; githubId = 92106371; name = "Dr Perceptron"; - keys = [{ - fingerprint = "7E38 89D9 B1A8 B381 C8DE A15F 95EB 6DFF 26D1 CEB0"; - }]; + keys = [ { fingerprint = "7E38 89D9 B1A8 B381 C8DE A15F 95EB 6DFF 26D1 CEB0"; } ]; }; DrSensor = { name = "Fahmi Akbar Wildana"; @@ -5579,9 +5330,7 @@ matrix = "@drupol:matrix.org"; github = "drupol"; githubId = 252042; - keys = [{ - fingerprint = "85F3 72DF 4AF3 EF13 ED34 72A3 0AAF 2901 E804 0715"; - }]; + keys = [ { fingerprint = "85F3 72DF 4AF3 EF13 ED34 72A3 0AAF 2901 E804 0715"; } ]; }; dsalaza4 = { email = "podany270895@gmail.com"; @@ -5594,9 +5343,7 @@ email = "dominik.schrempf@gmail.com"; github = "dschrempf"; githubId = 5596239; - keys = [{ - fingerprint = "62BC E2BD 49DF ECC7 35C7 E153 875F 2BCF 163F 1B29"; - }]; + keys = [ { fingerprint = "62BC E2BD 49DF ECC7 35C7 E153 875F 2BCF 163F 1B29"; } ]; }; dsferruzza = { email = "david.sferruzza@gmail.com"; @@ -5610,9 +5357,7 @@ matrix = "@dani0854:matrix.org"; github = "dani0854"; githubId = 32674935; - keys = [{ - fingerprint = "E033 FE26 0E62 224B B35C 75C9 DE8B 9CED 0696 C600"; - }]; + keys = [ { fingerprint = "E033 FE26 0E62 224B B35C 75C9 DE8B 9CED 0696 C600"; } ]; }; dsymbol = { name = "dsymbol"; @@ -5624,9 +5369,7 @@ github = "dtzWill"; githubId = 817330; name = "Will Dietz"; - keys = [{ - fingerprint = "389A 78CB CD88 5E0C 4701 DEB9 FD42 C7D0 D414 94C8"; - }]; + keys = [ { fingerprint = "389A 78CB CD88 5E0C 4701 DEB9 FD42 C7D0 D414 94C8"; } ]; }; dudymas = { email = "jeremy.white@cloudposse.com"; @@ -5645,9 +5388,7 @@ github = "jollheef"; githubId = 1749762; name = "Mikhail Klementev"; - keys = [{ - fingerprint = "5DD7 C6F6 0630 F08E DAE7 4711 1525 585D 1B43 C62A"; - }]; + keys = [ { fingerprint = "5DD7 C6F6 0630 F08E DAE7 4711 1525 585D 1B43 C62A"; } ]; }; dunxen = { email = "git@dunxen.dev"; @@ -5655,9 +5396,7 @@ github = "dunxen"; githubId = 3072149; name = "Duncan Dean"; - keys = [{ - fingerprint = "9484 44FC E03B 05BA 5AB0 591E C37B 1C1D 44C7 86EE"; - }]; + keys = [ { fingerprint = "9484 44FC E03B 05BA 5AB0 591E C37B 1C1D 44C7 86EE"; } ]; }; dvn0 = { email = "git@dvn.me"; @@ -5720,9 +5459,7 @@ github = "e1mo"; githubId = 61651268; name = "Moritz Fromm"; - keys = [{ - fingerprint = "67BE E563 43B6 420D 550E DF2A 6D61 7FD0 A85B AADA"; - }]; + keys = [ { fingerprint = "67BE E563 43B6 420D 550E DF2A 6D61 7FD0 A85B AADA"; } ]; }; eadwu = { email = "edmund.wu@protonmail.com"; @@ -5759,9 +5496,7 @@ github = "ebbertd"; githubId = 20522234; name = "Daniel Ebbert"; - keys = [{ - fingerprint = "E765 FCA3 D9BF 7FDB 856E AD73 47BC 1559 27CB B9C7"; - }]; + keys = [ { fingerprint = "E765 FCA3 D9BF 7FDB 856E AD73 47BC 1559 27CB B9C7"; } ]; }; ebzzry = { email = "ebzzry@ebzzry.io"; @@ -5804,9 +5539,7 @@ github = "eddsteel"; githubId = 206872; name = "Edd Steel"; - keys = [{ - fingerprint = "1BE8 48D7 6C7C 4C51 349D DDCC 3362 0159 D403 85A0"; - }]; + keys = [ { fingerprint = "1BE8 48D7 6C7C 4C51 349D DDCC 3362 0159 D403 85A0"; } ]; }; edef = { email = "edef@edef.eu"; @@ -5843,9 +5576,7 @@ email = "ericdrex@gmail.com"; github = "edrex"; githubId = 14615; - keys = [{ - fingerprint = "AC47 2CCC 9867 4644 A9CF EB28 1C5C 1ED0 9F66 6824"; - }]; + keys = [ { fingerprint = "AC47 2CCC 9867 4644 A9CF EB28 1C5C 1ED0 9F66 6824"; } ]; matrix = "@edrex:matrix.org"; name = "Eric Drechsel"; }; @@ -5920,7 +5651,7 @@ name = "Edvin Källström"; githubId = 84442052; }; - ekimber = { + ekimber = { email = "ekimber@protonmail.com"; github = "ekimber"; name = "Edward Kimber"; @@ -6011,9 +5742,7 @@ email = "fedi.jamoussi@protonmail.ch"; github = "eljamm"; githubId = 83901271; - keys = [{ - fingerprint = "FF59 E027 4EE2 E792 512B BDC8 7630 FDF7 C8FB 1F3F"; - }]; + keys = [ { fingerprint = "FF59 E027 4EE2 E792 512B BDC8 7630 FDF7 C8FB 1F3F"; } ]; }; elkowar = { email = "thereal.elkowar@gmail.com"; @@ -6198,9 +5927,7 @@ email = "eownerdead@disroot.org"; github = "eownerdead"; githubId = 141208772; - keys = [{ - fingerprint = "4715 17D6 2495 A273 4DDB 5661 009E 5630 5CA5 4D63"; - }]; + keys = [ { fingerprint = "4715 17D6 2495 A273 4DDB 5661 009E 5630 5CA5 4D63"; } ]; }; eperuffo = { email = "info@emanueleperuffo.com"; @@ -6231,18 +5958,14 @@ github = "ercao"; githubId = 51725284; name = "ercao"; - keys = [{ - fingerprint = "F3B0 36F7 B0CB 0964 3C12 D3C7 FFAB D125 7ECF 0889"; - }]; + keys = [ { fingerprint = "F3B0 36F7 B0CB 0964 3C12 D3C7 FFAB D125 7ECF 0889"; } ]; }; erdnaxe = { email = "erdnaxe@crans.org"; github = "erdnaxe"; githubId = 2663216; name = "Alexandre Iooss"; - keys = [{ - fingerprint = "2D37 1AD2 7E2B BC77 97E1 B759 6C79 278F 3FCD CC02"; - }]; + keys = [ { fingerprint = "2D37 1AD2 7E2B BC77 97E1 B759 6C79 278F 3FCD CC02"; } ]; }; ereslibre = { email = "ereslibre@ereslibre.es"; @@ -6288,9 +6011,7 @@ github = "erictapen"; githubId = 11532355; name = "Kerstin Humm"; - keys = [{ - fingerprint = "F178 B4B4 6165 6D1B 7C15 B55D 4029 3358 C7B9 326B"; - }]; + keys = [ { fingerprint = "F178 B4B4 6165 6D1B 7C15 B55D 4029 3358 C7B9 326B"; } ]; }; ericthemagician = { email = "eric@ericyen.com"; @@ -6368,9 +6089,7 @@ github = "ethancedwards8"; githubId = 60861925; name = "Ethan Carter Edwards"; - keys = [{ - fingerprint = "0E69 0F46 3457 D812 3387 C978 F93D DAFA 26EF 2458"; - }]; + keys = [ { fingerprint = "0E69 0F46 3457 D812 3387 C978 F93D DAFA 26EF 2458"; } ]; }; ethercrow = { email = "ethercrow@gmail.com"; @@ -6409,9 +6128,7 @@ github = "etu"; githubId = 461970; name = "Elis Hirwing"; - keys = [{ - fingerprint = "67FE 98F2 8C44 CF22 1828 E12F D57E FA62 5C9A 925F"; - }]; + keys = [ { fingerprint = "67FE 98F2 8C44 CF22 1828 E12F D57E FA62 5C9A 925F"; } ]; }; euank = { email = "euank-nixpkg@euank.com"; @@ -6431,9 +6148,7 @@ matrix = "@evalexpr:matrix.org"; github = "evalexpr"; githubId = 23485511; - keys = [{ - fingerprint = "8129 5B85 9C5A F703 C2F4 1E29 2D1D 402E 1776 3DD6"; - }]; + keys = [ { fingerprint = "8129 5B85 9C5A F703 C2F4 1E29 2D1D 402E 1776 3DD6"; } ]; }; evan-goode = { email = "mail@evangoo.de"; @@ -6483,9 +6198,7 @@ github = "evilbulgarian"; githubId = 1960413; name = "Vladi Gergov"; - keys = [{ - fingerprint = "50D5 67C5 D693 15A2 76F5 5634 3758 5F3C A9EC BFA4"; - }]; + keys = [ { fingerprint = "50D5 67C5 D693 15A2 76F5 5634 3758 5F3C A9EC BFA4"; } ]; }; evilmav = { email = "elenskiy.ilya@gmail.com"; @@ -6542,9 +6255,7 @@ github = "expipiplus1"; githubId = 857308; name = "Ellie Hermaszewska"; - keys = [{ - fingerprint = "FC1D 3E4F CBCA 80DF E870 6397 C811 6E3A 0C1C A76A"; - }]; + keys = [ { fingerprint = "FC1D 3E4F CBCA 80DF E870 6397 C811 6E3A 0C1C A76A"; } ]; }; exploitoverload = { email = "nix@exploitoverload.com"; @@ -6589,9 +6300,7 @@ name = "Fabian Affolter"; github = "fabaff"; githubId = 116184; - keys = [{ - fingerprint = "2F6C 930F D3C4 7E38 6AFA 4EB4 E23C D2DD 36A4 397F"; - }]; + keys = [ { fingerprint = "2F6C 930F D3C4 7E38 6AFA 4EB4 E23C D2DD 36A4 397F"; } ]; }; fabiangd = { email = "fabian.g.droege@gmail.com"; @@ -6604,9 +6313,7 @@ github = "fabianhauser"; githubId = 368799; name = "Fabian Hauser"; - keys = [{ - fingerprint = "50B7 11F4 3DFD 2018 DCE6 E8D0 8A52 A140 BEBF 7D2C"; - }]; + keys = [ { fingerprint = "50B7 11F4 3DFD 2018 DCE6 E8D0 8A52 A140 BEBF 7D2C"; } ]; }; fabianhjr = { email = "fabianhjr@protonmail.com"; @@ -6637,9 +6344,7 @@ github = "fangpenlin"; githubId = 201615; name = "Fang-Pen Lin"; - keys = [{ - fingerprint = "7130 3454 A7CD 0F0A 941A F9A3 2A26 9964 AD29 2131"; - }]; + keys = [ { fingerprint = "7130 3454 A7CD 0F0A 941A F9A3 2A26 9964 AD29 2131"; } ]; }; farcaller = { name = "Vladimir Pouzanov"; @@ -6726,16 +6431,14 @@ matrix = "@nico:felbinger.eu"; github = "felbinger"; githubId = 26925347; - keys = [{ - fingerprint = "0797 D238 9769 CA1E 57B7 2ED9 2BA7 8116 87C9 0DE4"; - }]; + keys = [ { fingerprint = "0797 D238 9769 CA1E 57B7 2ED9 2BA7 8116 87C9 0DE4"; } ]; }; felipeqq2 = { name = "Felipe Silva"; email = "nixpkgs@felipeqq2.rocks"; github = "felipeqq2"; githubId = 71830138; - keys = [{ fingerprint = "7391 BF2D A2C3 B2C9 BE25 ACA9 C7A7 4616 F302 5DF4"; }]; + keys = [ { fingerprint = "7391 BF2D A2C3 B2C9 BE25 ACA9 C7A7 4616 F302 5DF4"; } ]; matrix = "@felipeqq2:pub.solar"; }; felixalbrigtsen = { @@ -6768,9 +6471,7 @@ # historical fingerprint = "6AB3 7A28 5420 9A41 82D9 0068 910A CB9F 6BD2 6F58"; } - { - fingerprint = "7E08 6842 0934 AA1D 6821 1F2A 671E 39E6 744C 807D"; - } + { fingerprint = "7E08 6842 0934 AA1D 6821 1F2A 671E 39E6 744C 807D"; } ]; }; fernsehmuell = { @@ -6853,9 +6554,7 @@ github = "Flakebi"; githubId = 6499211; name = "Sebastian Neubauer"; - keys = [{ - fingerprint = "2F93 661D AC17 EA98 A104 F780 ECC7 55EE 583C 1672"; - }]; + keys = [ { fingerprint = "2F93 661D AC17 EA98 A104 F780 ECC7 55EE 583C 1672"; } ]; }; flandweber = { email = "finn@landweber.xyz"; @@ -6955,9 +6654,7 @@ githubId = 34962634; matrix = "@foodogsquared:matrix.org"; name = "Gabriel Arazas"; - keys = [{ - fingerprint = "DDD7 D0BD 602E 564B AA04 FC35 1431 0D91 4115 2B92"; - }]; + keys = [ { fingerprint = "DDD7 D0BD 602E 564B AA04 FC35 1431 0D91 4115 2B92"; } ]; }; fooker = { email = "fooker@lab.sh"; @@ -6970,9 +6667,7 @@ github = "foolnotion"; githubId = 844222; name = "Bogdan Burlacu"; - keys = [{ - fingerprint = "B722 6464 838F 8BDB 2BEA C8C8 5B0E FDDF BA81 6105"; - }]; + keys = [ { fingerprint = "B722 6464 838F 8BDB 2BEA C8C8 5B0E FDDF BA81 6105"; } ]; }; Forden = { email = "forden@zuku.tech"; @@ -6997,9 +6692,7 @@ github = "fpletz"; githubId = 114159; name = "Franz Pletz"; - keys = [{ - fingerprint = "8A39 615D CE78 AF08 2E23 F303 846F DED7 7926 17B4"; - }]; + keys = [ { fingerprint = "8A39 615D CE78 AF08 2E23 F303 846F DED7 7926 17B4"; } ]; }; fps = { email = "mista.tapas@gmx.net"; @@ -7088,12 +6781,6 @@ githubId = 2129135; name = "Frederik Rietdijk"; }; - friedelino = { - email = "friede.mann@posteo.de"; - github = "friedelino"; - githubId = 46672819; - name = "Frido Friedemann"; - }; friedow = { email = "christian@friedow.com"; github = "friedow"; @@ -7117,9 +6804,7 @@ githubId = 10263813; name = "Dominic Shelton"; matrix = "@frogamic:beeper.com"; - keys = [{ - fingerprint = "779A 7CA8 D51C C53A 9C51 43F7 AAE0 70F0 67EC 00A5"; - }]; + keys = [ { fingerprint = "779A 7CA8 D51C C53A 9C51 43F7 AAE0 70F0 67EC 00A5"; } ]; }; frontsideair = { email = "photonia@gmail.com"; @@ -7144,9 +6829,7 @@ email = "luiz@lferraz.com"; github = "Fryuni"; githubId = 11063910; - keys = [{ - fingerprint = "2109 4B0E 560B 031E F539 62C8 2B56 8731 DB24 47EC"; - }]; + keys = [ { fingerprint = "2109 4B0E 560B 031E F539 62C8 2B56 8731 DB24 47EC"; } ]; }; fsagbuya = { email = "fa@m-labs.ph"; @@ -7202,9 +6885,7 @@ github = "funkeleinhorn"; githubId = 103313934; name = "Funkeleinhorn"; - keys = [{ - fingerprint = "689D 1C81 DA0D 1EB2 F029 D24E C7BE A25A 0A33 5A72"; - }]; + keys = [ { fingerprint = "689D 1C81 DA0D 1EB2 F029 D24E C7BE A25A 0A33 5A72"; } ]; }; fusion809 = { email = "brentonhorne77@gmail.com"; @@ -7240,9 +6921,7 @@ github = "fx-chun"; githubId = 40049608; name = "Faye Chun"; - keys = [{ - fingerprint = "ACB8 DB1F E88D A908 6332 BDB1 5A71 B010 2FD7 3FC0"; - }]; + keys = [ { fingerprint = "ACB8 DB1F E88D A908 6332 BDB1 5A71 B010 2FD7 3FC0"; } ]; }; fxfactorial = { email = "edgar.factorial@gmail.com"; @@ -7286,18 +6965,14 @@ github = "gabyx"; githubId = 647437; name = "Gabriel Nützi"; - keys = [{ - fingerprint = "90AE CCB9 7AD3 4CE4 3AED 9402 E969 172A B075 7EB8"; - }]; + keys = [ { fingerprint = "90AE CCB9 7AD3 4CE4 3AED 9402 E969 172A B075 7EB8"; } ]; }; gador = { email = "florian.brandes@posteo.de"; github = "gador"; githubId = 1883533; name = "Florian Brandes"; - keys = [{ - fingerprint = "0200 3EF8 8D2B CF2D 8F00 FFDC BBB3 E40E 5379 7FD9"; - }]; + keys = [ { fingerprint = "0200 3EF8 8D2B CF2D 8F00 FFDC BBB3 E40E 5379 7FD9"; } ]; }; gaelreyrol = { email = "me@gaelreyrol.dev"; @@ -7305,9 +6980,7 @@ name = "Gaël Reyrol"; github = "gaelreyrol"; githubId = 498465; - keys = [{ - fingerprint = "3492 D8FA ACFF 4C5F A56E 50B7 DFB9 B69A 2C42 7F61"; - }]; + keys = [ { fingerprint = "3492 D8FA ACFF 4C5F A56E 50B7 DFB9 B69A 2C42 7F61"; } ]; }; GaetanLepage = { email = "gaetan@glepage.com"; @@ -7327,9 +7000,7 @@ name = "The Galaxy"; github = "ga1aksy"; githubId = 148551648; - keys = [{ - fingerprint = "48CA 3873 9E9F CA8E 76A0 835A E3DE CF85 4212 E1EA"; - }]; + keys = [ { fingerprint = "48CA 3873 9E9F CA8E 76A0 835A E3DE CF85 4212 E1EA"; } ]; }; gal_bolle = { email = "florent.becker@ens-lyon.org"; @@ -7449,18 +7120,14 @@ email = "genericnerdyusername@proton.me"; github = "GenericNerdyUsername"; githubId = 111183546; - keys = [{ - fingerprint = "58CE D4BE 6B10 149E DA80 A990 2F48 6356 A4CB 30F3"; - }]; + keys = [ { fingerprint = "58CE D4BE 6B10 149E DA80 A990 2F48 6356 A4CB 30F3"; } ]; }; genofire = { name = "genofire"; email = "geno+dev@fireorbit.de"; github = "genofire"; githubId = 6905586; - keys = [{ - fingerprint = "386E D1BF 848A BB4A 6B4A 3C45 FC83 907C 125B C2BC"; - }]; + keys = [ { fingerprint = "386E D1BF 848A BB4A 6B4A 3C45 FC83 907C 125B C2BC"; } ]; }; geoffreyfrogeye = { name = "Geoffrey Frogeye"; @@ -7468,18 +7135,14 @@ matrix = "@geoffrey:frogeye.fr"; github = "GeoffreyFrogeye"; githubId = 1685403; - keys = [{ - fingerprint = "4FBA 930D 314A 0321 5E2C DB0A 8312 C8CA C1BA C289"; - }]; + keys = [ { fingerprint = "4FBA 930D 314A 0321 5E2C DB0A 8312 C8CA C1BA C289"; } ]; }; georgesalkhouri = { name = "Georges Alkhouri"; email = "incense.stitch_0w@icloud.com"; github = "GeorgesAlkhouri"; githubId = 6077574; - keys = [{ - fingerprint = "1608 9E8D 7C59 54F2 6A7A 7BD0 8BD2 09DC C54F D339"; - }]; + keys = [ { fingerprint = "1608 9E8D 7C59 54F2 6A7A 7BD0 8BD2 09DC C54F D339"; } ]; }; georgewhewell = { email = "georgerw@gmail.com"; @@ -7492,9 +7155,7 @@ github = "georgyo"; githubId = 19374; name = "George Shammas"; - keys = [{ - fingerprint = "D0CF 440A A703 E0F9 73CB A078 82BB 70D5 41AE 2DB4"; - }]; + keys = [ { fingerprint = "D0CF 440A A703 E0F9 73CB A078 82BB 70D5 41AE 2DB4"; } ]; }; gepbird = { email = "gutyina.gergo.2@gmail.com"; @@ -7579,9 +7240,7 @@ github = "ghthor"; githubId = 160298; name = "Will Owens"; - keys = [{ - fingerprint = "8E98 BB01 BFF8 AEA4 E303 FC4C 8074 09C9 2CE2 3033"; - }]; + keys = [ { fingerprint = "8E98 BB01 BFF8 AEA4 E303 FC4C 8074 09C9 2CE2 3033"; } ]; }; ghuntley = { email = "ghuntley@ghuntley.com"; @@ -7600,9 +7259,7 @@ github = "gigglesquid"; githubId = 3685154; name = "Jack connors"; - keys = [{ - fingerprint = "21DF 8034 B212 EDFF 9F19 9C19 F65B 7583 7ABF D019"; - }]; + keys = [ { fingerprint = "21DF 8034 B212 EDFF 9F19 9C19 F65B 7583 7ABF D019"; } ]; }; gila = { email = "jeffry.molanus@gmail.com"; @@ -7686,9 +7343,7 @@ email = "root@gws.fyi"; github = "glittershark"; githubId = 1481027; - keys = [{ - fingerprint = "0F11 A989 879E 8BBB FDC1 E236 44EF 5B5E 861C 09A7"; - }]; + keys = [ { fingerprint = "0F11 A989 879E 8BBB FDC1 E236 44EF 5B5E 861C 09A7"; } ]; }; gloaming = { email = "ch9871@gmail.com"; @@ -7735,9 +7390,7 @@ github = "Gobidev"; githubId = 50576978; name = "Adrian Groh"; - keys = [{ - fingerprint = "62BD BF30 83E9 7076 9665 B60B 3AA3 153E 98B0 D771"; - }]; + keys = [ { fingerprint = "62BD BF30 83E9 7076 9665 B60B 3AA3 153E 98B0 D771"; } ]; }; goertzenator = { email = "daniel.goertzen@gmail.com"; @@ -7756,9 +7409,7 @@ github = "GoldsteinE"; githubId = 12019211; name = "Maximilian Siling"; - keys = [{ - fingerprint = "0BAF 2D87 CB43 746F 6237 2D78 DE60 31AB A0BB 269A"; - }]; + keys = [ { fingerprint = "0BAF 2D87 CB43 746F 6237 2D78 DE60 31AB A0BB 269A"; } ]; }; Golo300 = { email = "lanzingertm@gmail.com"; @@ -7789,27 +7440,21 @@ email = "gauvain@govanify.com"; github = "GovanifY"; githubId = 6375438; - keys = [{ - fingerprint = "5214 2D39 A7CE F8FA 872B CA7F DE62 E1E2 A614 5556"; - }]; + keys = [ { fingerprint = "5214 2D39 A7CE F8FA 872B CA7F DE62 E1E2 A614 5556"; } ]; }; gp2112 = { email = "me@guip.dev"; github = "gp2112"; githubId = 26512375; name = "Guilherme Paixão"; - keys = [{ - fingerprint = "4382 7E28 86E5 C34F 38D5 7753 8C81 4D62 5FBD 99D1"; - }]; + keys = [ { fingerprint = "4382 7E28 86E5 C34F 38D5 7753 8C81 4D62 5FBD 99D1"; } ]; }; gpanders = { name = "Gregory Anders"; email = "greg@gpanders.com"; github = "gpanders"; githubId = 8965202; - keys = [{ - fingerprint = "B9D5 0EDF E95E ECD0 C135 00A9 56E9 3C2F B6B0 8BDB"; - }]; + keys = [ { fingerprint = "B9D5 0EDF E95E ECD0 C135 00A9 56E9 3C2F B6B0 8BDB"; } ]; }; gpl = { email = "nixos-6c64ce18-bbbc-414f-8dcb-f9b6b47fe2bc@isopleth.org"; @@ -7870,17 +7515,14 @@ github = "GRBurst"; githubId = 4647221; name = "GRBurst"; - keys = [{ - fingerprint = "7FC7 98AB 390E 1646 ED4D 8F1F 797F 6238 68CD 00C2"; - }]; + keys = [ { fingerprint = "7FC7 98AB 390E 1646 ED4D 8F1F 797F 6238 68CD 00C2"; } ]; }; greaka = { email = "git@greaka.de"; github = "greaka"; githubId = 2805834; name = "Greaka"; - keys = - [{ fingerprint = "6275 FB5C C9AC 9D85 FF9E 44C5 EE92 A5CD C367 118C"; }]; + keys = [ { fingerprint = "6275 FB5C C9AC 9D85 FF9E 44C5 EE92 A5CD C367 118C"; } ]; }; greg = { email = "greg.hellings@gmail.com"; @@ -8039,9 +7681,7 @@ matrix = "@h7x4:nani.wtf"; github = "h7x4"; githubId = 14929991; - keys = [{ - fingerprint = "F7D3 7890 228A 9074 40E1 FD48 46B9 228E 814A 2AAC"; - }]; + keys = [ { fingerprint = "F7D3 7890 228A 9074 40E1 FD48 46B9 228E 814A 2AAC"; } ]; }; hacker1024 = { name = "hacker1024"; @@ -8102,9 +7742,7 @@ github = "HaoZeke"; githubId = 4336207; name = "Rohit Goswami"; - keys = [{ - fingerprint = "74B1 F67D 8E43 A94A 7554 0768 9CCC E364 02CB 49A6"; - }]; + keys = [ { fingerprint = "74B1 F67D 8E43 A94A 7554 0768 9CCC E364 02CB 49A6"; } ]; }; happyalu = { email = "alok@parlikar.com"; @@ -8130,9 +7768,7 @@ github = "hardselius"; githubId = 1422583; name = "Martin Hardselius"; - keys = [{ - fingerprint = "3F35 E4CA CBF4 2DE1 2E90 53E5 03A6 E6F7 8693 6619"; - }]; + keys = [ { fingerprint = "3F35 E4CA CBF4 2DE1 2E90 53E5 03A6 E6F7 8693 6619"; } ]; }; harrisonthorne = { email = "harrisonthorne@proton.me"; @@ -8200,9 +7836,7 @@ email = "hdhog@hdhog.ru"; github = "hdhog"; githubId = 386666; - keys = [{ - fingerprint = "A25F 6321 AAB4 4151 4085 9924 952E ACB7 6703 BA63"; - }]; + keys = [ { fingerprint = "A25F 6321 AAB4 4151 4085 9924 952E ACB7 6703 BA63"; } ]; }; hectorj = { email = "hector.jusforgues+nixos@gmail.com"; @@ -8344,9 +7978,7 @@ github = "heyimnova"; githubId = 115728866; name = "Nova Witterick"; - keys = [{ - fingerprint = "4304 6B43 8D83 078E 3DF7 10D6 DEB0 E15C 6D2A 5A7C"; - }]; + keys = [ { fingerprint = "4304 6B43 8D83 078E 3DF7 10D6 DEB0 E15C 6D2A 5A7C"; } ]; }; hh = { email = "hh@m-labs.hk"; @@ -8391,9 +8023,7 @@ github = "vale981"; githubId = 4025991; name = "Valentin Boettcher"; - keys = [{ - fingerprint = "45A9 9917 578C D629 9F5F B5B4 C22D 4DE4 D7B3 2D19"; - }]; + keys = [ { fingerprint = "45A9 9917 578C D629 9F5F B5B4 C22D 4DE4 D7B3 2D19"; } ]; }; hitsmaxft = { name = "Bhe Hongtyu"; @@ -8412,9 +8042,7 @@ name = "Henrik Jonsson"; github = "hkjn"; githubId = 287215; - keys = [{ - fingerprint = "D618 7A03 A40A 3D56 62F5 4B46 03EF BF83 9A5F DC15"; - }]; + keys = [ { fingerprint = "D618 7A03 A40A 3D56 62F5 4B46 03EF BF83 9A5F DC15"; } ]; }; hleboulanger = { email = "hleboulanger@protonmail.com"; @@ -8439,9 +8067,7 @@ email = "hello@haseebmajid.dev"; github = "hmajid2301"; githubId = 998807; - keys = [{ - fingerprint = "A236 785D 59F1 9076 1E9C E8EC 7828 3DB3 D233 E1F9"; - }]; + keys = [ { fingerprint = "A236 785D 59F1 9076 1E9C E8EC 7828 3DB3 D233 E1F9"; } ]; }; hmenke = { name = "Henri Menke"; @@ -8449,9 +8075,7 @@ matrix = "@hmenke:matrix.org"; github = "hmenke"; githubId = 1903556; - keys = [{ - fingerprint = "F1C5 760E 45B9 9A44 72E9 6BFB D65C 9AFB 4C22 4DA3"; - }]; + keys = [ { fingerprint = "F1C5 760E 45B9 9A44 72E9 6BFB D65C 9AFB 4C22 4DA3"; } ]; }; hodapp = { email = "hodapp87@gmail.com"; @@ -8495,9 +8119,7 @@ matrix = "@honnip:matrix.org"; github = "honnip"; githubId = 108175486; - keys = [{ - fingerprint = "E4DD 51F7 FA3F DCF1 BAF6 A72C 576E 43EF 8482 E415"; - }]; + keys = [ { fingerprint = "E4DD 51F7 FA3F DCF1 BAF6 A72C 576E 43EF 8482 E415"; } ]; }; hoppla20 = { email = "privat@vincentcui.de"; @@ -8560,9 +8182,7 @@ matrix = "@huantian:huantian.dev"; github = "huantianad"; githubId = 20760920; - keys = [{ - fingerprint = "731A 7A05 AD8B 3AE5 956A C227 4A03 18E0 4E55 5DE5"; - }]; + keys = [ { fingerprint = "731A 7A05 AD8B 3AE5 956A C227 4A03 18E0 4E55 5DE5"; } ]; }; hubble = { name = "Hubble the Wolverine"; @@ -8594,9 +8214,7 @@ github = "HugoReeves"; githubId = 20039091; name = "Hugo Reeves"; - keys = [{ - fingerprint = "78C2 E81C 828A 420B 269A EBC1 49FA 39F8 A7F7 35F9"; - }]; + keys = [ { fingerprint = "78C2 E81C 828A 420B 269A EBC1 49FA 39F8 A7F7 35F9"; } ]; }; hulr = { github = "hulr"; @@ -8610,7 +8228,7 @@ name = "Akshat Agarwal"; }; hummeltech = { - email = "hummeltech2024@gmail.com"; + email = "hummeltech@sherpaguru.com"; github = "hummeltech"; githubId = 6109326; name = "David Hummel"; @@ -8620,9 +8238,7 @@ github = "Huy-Ngo"; name = "Ngô Ngọc Đức Huy"; githubId = 19296926; - keys = [{ - fingerprint = "DF12 23B1 A9FD C5BE 3DA5 B6F7 904A F1C7 CDF6 95C3"; - }]; + keys = [ { fingerprint = "DF12 23B1 A9FD C5BE 3DA5 B6F7 904A F1C7 CDF6 95C3"; } ]; }; hypersw = { email = "baltic@hypersw.net"; @@ -8641,9 +8257,7 @@ email = "bryan@hyshka.com"; github = "hyshka"; githubId = 2090758; - keys = [{ - fingerprint = "24F4 1925 28C4 8797 E539 F247 DB2D 93D1 BFAA A6EA"; - }]; + keys = [ { fingerprint = "24F4 1925 28C4 8797 E539 F247 DB2D 93D1 BFAA A6EA"; } ]; }; hyzual = { email = "hyzual@gmail.com"; @@ -8667,9 +8281,7 @@ github = "iagocq"; githubId = 18238046; name = "Iago Manoel Brito"; - keys = [{ - fingerprint = "DF90 9D58 BEE4 E73A 1B8C 5AF3 35D3 9F9A 9A1B C8DA"; - }]; + keys = [ { fingerprint = "DF90 9D58 BEE4 E73A 1B8C 5AF3 35D3 9F9A 9A1B C8DA"; } ]; }; iammrinal0 = { email = "nixpkgs@mrinalpurohit.in"; @@ -8707,9 +8319,7 @@ github = "ibizaman"; githubId = 1044950; name = "Pierre Penninckx"; - keys = [{ - fingerprint = "A01F 10C6 7176 B2AE 2A34 1A56 D4C5 C37E 6031 A3FE"; - }]; + keys = [ { fingerprint = "A01F 10C6 7176 B2AE 2A34 1A56 D4C5 C37E 6031 A3FE"; } ]; }; iblech = { email = "iblech@speicherleck.de"; @@ -8907,9 +8517,7 @@ github = "impl"; githubId = 41129; name = "Noah Fontes"; - keys = [{ - fingerprint = "F5B2 BE1B 9AAD 98FE 2916 5597 3665 FFF7 9D38 7BAA"; - }]; + keys = [ { fingerprint = "F5B2 BE1B 9AAD 98FE 2916 5597 3665 FFF7 9D38 7BAA"; } ]; }; imrying = { email = "philiprying@gmail.com"; @@ -8953,9 +8561,7 @@ github = "infinisil"; githubId = 20525370; name = "Silvan Mosberger"; - keys = [{ - fingerprint = "6C2B 55D4 4E04 8266 6B7D DA1A 422E 9EDA E015 7170"; - }]; + keys = [ { fingerprint = "6C2B 55D4 4E04 8266 6B7D DA1A 422E 9EDA E015 7170"; } ]; }; infinitivewitch = { name = "Infinitive Witch"; @@ -8963,9 +8569,7 @@ matrix = "@infinitivewitch:fedora.im"; github = "infinitivewitch"; githubId = 128256833; - keys = [{ - fingerprint = "CF3D F4AD C7BD 1FDB A88B E4B3 CA2D 43DA 939D 94FB"; - }]; + keys = [ { fingerprint = "CF3D F4AD C7BD 1FDB A88B E4B3 CA2D 43DA 939D 94FB"; } ]; }; ingenieroariel = { email = "ariel@nunez.co"; @@ -8978,9 +8582,7 @@ github = "Intuinewin"; githubId = 13691729; name = "Antoine Labarussias"; - keys = [{ - fingerprint = "5CB5 9AA0 D180 1997 2FB3 E0EC 943A 1DE9 372E BE4E"; - }]; + keys = [ { fingerprint = "5CB5 9AA0 D180 1997 2FB3 E0EC 943A 1DE9 372E BE4E"; } ]; }; invokes-su = { email = "nixpkgs-commits@deshaw.com"; @@ -9017,9 +8619,7 @@ matrix = "@irenes:matrix.org"; github = "IreneKnapp"; githubId = 157678; - keys = [{ - fingerprint = "E864 BDFA AB55 36FD C905 5195 DBF2 52AF FB26 19FD"; - }]; + keys = [ { fingerprint = "E864 BDFA AB55 36FD C905 5195 DBF2 52AF FB26 19FD"; } ]; }; ironicbadger = { email = "alexktz@gmail.com"; @@ -9050,9 +8650,7 @@ email = "isgy@teiyg.com"; github = "tgys"; githubId = 13622947; - keys = [{ - fingerprint = "1412 816B A9FA F62F D051 1975 D3E1 B013 B463 1293"; - }]; + keys = [ { fingerprint = "1412 816B A9FA F62F D051 1975 D3E1 B013 B463 1293"; } ]; }; ius = { email = "j.de.gram@gmail.com"; @@ -9084,17 +8682,13 @@ github = "ivanbrennan"; githubId = 1672874; name = "Ivan Brennan"; - keys = [{ - fingerprint = "7311 2700 AB4F 4CDF C68C F6A5 79C3 C47D C652 EA54"; - }]; + keys = [ { fingerprint = "7311 2700 AB4F 4CDF C68C F6A5 79C3 C47D C652 EA54"; } ]; }; ivankovnatsky = { github = "ivankovnatsky"; githubId = 75213; name = "Ivan Kovnatsky"; - keys = [{ - fingerprint = "6BD3 7248 30BD 941E 9180 C1A3 3A33 FA4C 82ED 674F"; - }]; + keys = [ { fingerprint = "6BD3 7248 30BD 941E 9180 C1A3 3A33 FA4C 82ED 674F"; } ]; }; ivanmoreau = { email = "Iván Molina Rebolledo"; @@ -9197,9 +8791,7 @@ email = "contact@ja1den.me"; github = "ja1den"; githubId = 49811314; - keys = [{ - fingerprint = "CC36 4CF4 32DD 443F 27FC 033C 3475 AA20 D72F 6A93"; - }]; + keys = [ { fingerprint = "CC36 4CF4 32DD 443F 27FC 033C 3475 AA20 D72F 6A93"; } ]; }; jab = { name = "Joshua Bronson"; @@ -9255,9 +8847,7 @@ matrix = "@jakehamilton:matrix.org"; github = "jakehamilton"; githubId = 7005773; - keys = [{ - fingerprint = "B982 0250 1720 D540 6A18 2DA8 188E 4945 E85B 2D21"; - }]; + keys = [ { fingerprint = "B982 0250 1720 D540 6A18 2DA8 188E 4945 E85B 2D21"; } ]; }; jakeisnt = { name = "Jacob Chvatal"; @@ -9453,9 +9043,7 @@ github = "jcouyang"; githubId = 1235045; name = "Jichao Ouyang"; - keys = [{ - fingerprint = "A506 C38D 5CC8 47D0 DF01 134A DA8B 833B 5260 4E63"; - }]; + keys = [ { fingerprint = "A506 C38D 5CC8 47D0 DF01 134A DA8B 833B 5260 4E63"; } ]; }; jcs090218 = { email = "jcs090218@gmail.com"; @@ -9491,9 +9079,7 @@ email = "jdanek@redhat.com"; github = "jirkadanek"; githubId = 17877663; - keys = [{ - fingerprint = "D4A6 F051 AD58 2E7C BCED 5439 6927 5CAD F15D 872E"; - }]; + keys = [ { fingerprint = "D4A6 F051 AD58 2E7C BCED 5439 6927 5CAD F15D 872E"; } ]; name = "Jiri Daněk"; }; jdbaldry = { @@ -9634,9 +9220,7 @@ github = "jfchevrette"; githubId = 3001; name = "Jean-Francois Chevrette"; - keys = [{ - fingerprint = "B612 96A9 498E EECD D5E9 C0F0 67A0 5858 0129 0DC6"; - }]; + keys = [ { fingerprint = "B612 96A9 498E EECD D5E9 C0F0 67A0 5858 0129 0DC6"; } ]; }; jflanglois = { email = "yourstruly@julienlanglois.me"; @@ -9649,9 +9233,7 @@ email = "jeremyfleischman@gmail.com"; github = "jfly"; githubId = 277474; - keys = [{ - fingerprint = "F1F1 3395 8E8E 9CC4 D9FC 9647 1931 9CD8 416A 642B"; - }]; + keys = [ { fingerprint = "F1F1 3395 8E8E 9CC4 D9FC 9647 1931 9CD8 416A 642B"; } ]; }; jfroche = { name = "Jean-François Roche"; @@ -9659,9 +9241,7 @@ matrix = "@jfroche:matrix.pyxel.cloud"; github = "jfroche"; githubId = 207369; - keys = [{ - fingerprint = "7EB1 C02A B62B B464 6D7C E4AE D1D0 9DE1 69EA 19A0"; - }]; + keys = [ { fingerprint = "7EB1 C02A B62B B464 6D7C E4AE D1D0 9DE1 69EA 19A0"; } ]; }; jfvillablanca = { email = "jmfv.dev@gmail.com"; @@ -9784,9 +9364,7 @@ github = "jlamur"; githubId = 7054317; name = "Jules Lamur"; - keys = [{ - fingerprint = "B768 6CD7 451A 650D 9C54 4204 6710 CF0C 1CBD 7762"; - }]; + keys = [ { fingerprint = "B768 6CD7 451A 650D 9C54 4204 6710 CF0C 1CBD 7762"; } ]; }; jlbribeiro = { email = "nix@jlbribeiro.com"; @@ -9849,13 +9427,9 @@ name = "João Figueira"; keys = [ # GitHub signing key - { - fingerprint = "EC08 7AA3 DEAD A972 F015 6371 DC7A E56A E98E 02D7"; - } + { fingerprint = "EC08 7AA3 DEAD A972 F015 6371 DC7A E56A E98E 02D7"; } # Email encryption - { - fingerprint = "816D 23F5 E672 EC58 7674 4A73 197F 9A63 2D13 9E30"; - } + { fingerprint = "816D 23F5 E672 EC58 7674 4A73 197F 9A63 2D13 9E30"; } ]; }; jmettes = { @@ -9922,9 +9496,7 @@ github = "JoaquinTrinanes"; name = "Joaquín Triñanes"; githubId = 1385934; - keys = [{ - fingerprint = "3A13 5C15 E1D5 850D 2F90 AB25 6E14 46DD 451C 6BAF"; - }]; + keys = [ { fingerprint = "3A13 5C15 E1D5 850D 2F90 AB25 6E14 46DD 451C 6BAF"; } ]; }; jobojeha = { email = "jobojeha@jeppener.de"; @@ -10017,10 +9589,10 @@ name = "John Children"; }; johnjohnstone = { - email = "jjohnstone@riseup.net"; - github = "johnjohnstone"; - githubId = 3208498; - name = "John Johnstone"; + email = "jjohnstone@riseup.net"; + github = "johnjohnstone"; + githubId = 3208498; + name = "John Johnstone"; }; johnmh = { email = "johnmh@openblox.org"; @@ -10082,9 +9654,7 @@ matrix = "@jojosch:jswc.de"; github = "jojosch"; githubId = 327488; - keys = [{ - fingerprint = "7249 70E6 A661 D84E 8B47 678A 0590 93B1 A278 BCD0"; - }]; + keys = [ { fingerprint = "7249 70E6 A661 D84E 8B47 678A 0590 93B1 A278 BCD0"; } ]; }; jokatzke = { email = "jokatzke@fastmail.com"; @@ -10096,10 +9666,12 @@ email = "ioannis.koutras@gmail.com"; github = "jokogr"; githubId = 1252547; - keys = [{ - # compare with https://keybase.io/joko - fingerprint = "B154 A8F9 0610 DB45 0CA8 CF39 85EA E7D9 DF56 C5CA"; - }]; + keys = [ + { + # compare with https://keybase.io/joko + fingerprint = "B154 A8F9 0610 DB45 0CA8 CF39 85EA E7D9 DF56 C5CA"; + } + ]; name = "Ioannis Koutras"; }; jonaenz = { @@ -10108,9 +9680,7 @@ matrix = "@jona:matrix.jonaenz.de"; github = "JonaEnz"; githubId = 57130301; - keys = [{ - fingerprint = "1CC5 B67C EB9A 13A5 EDF6 F10E 0B4A 3662 FC58 9202"; - }]; + keys = [ { fingerprint = "1CC5 B67C EB9A 13A5 EDF6 F10E 0B4A 3662 FC58 9202"; } ]; }; jonafato = { email = "jon@jonafato.com"; @@ -10360,9 +9930,7 @@ name = "Julien Coolen"; github = "jtcoolen"; githubId = 54635632; - keys = [{ - fingerprint = "4C68 56EE DFDA 20FB 77E8 9169 1964 2151 C218 F6F5"; - }]; + keys = [ { fingerprint = "4C68 56EE DFDA 20FB 77E8 9169 1964 2151 C218 F6F5"; } ]; }; jtobin = { email = "jared@jtobin.io"; @@ -10389,9 +9957,7 @@ github = "jcmuller"; matrix = "@jcmuller@beeper.com"; name = "Juan C. Müller"; - keys = [{ - fingerprint = "D78D 25D8 A1B8 2596 267F 35B8 F44E A51A 28F9 B4A7"; - }]; + keys = [ { fingerprint = "D78D 25D8 A1B8 2596 267F 35B8 F44E A51A 28F9 B4A7"; } ]; }; juaningan = { email = "juaningan@gmail.com"; @@ -10502,9 +10068,7 @@ github = "jvanbruegge"; githubId = 1529052; name = "Jan van Brügge"; - keys = [{ - fingerprint = "3513 5CE5 77AD 711F 3825 9A99 3665 72BE 7D6C 78A2"; - }]; + keys = [ { fingerprint = "3513 5CE5 77AD 711F 3825 9A99 3665 72BE 7D6C 78A2"; } ]; }; jwatt = { email = "jwatt@broken.watch"; @@ -10572,18 +10136,14 @@ github = "kachick"; githubId = 1180335; name = "Kenichi Kamiya"; - keys = [{ - fingerprint = "9121 5D87 20CA B405 C63F 24D2 EF6E 574D 040A E2A5"; - }]; + keys = [ { fingerprint = "9121 5D87 20CA B405 C63F 24D2 EF6E 574D 040A E2A5"; } ]; }; kaction = { name = "Dmitry Bogatov"; email = "KAction@disroot.org"; github = "KAction"; githubId = 44864956; - keys = [{ - fingerprint = "3F87 0A7C A7B4 3731 2F13 6083 749F D4DF A2E9 4236"; - }]; + keys = [ { fingerprint = "3F87 0A7C A7B4 3731 2F13 6083 749F D4DF A2E9 4236"; } ]; }; kaiha = { email = "kai.harries@gmail.com"; @@ -10621,9 +10181,7 @@ email = "kamadorueda@gmail.com"; github = "kamadorueda"; githubId = 47480384; - keys = [{ - fingerprint = "2BE3 BAFD 793E A349 ED1F F00F 04D0 CEAF 916A 9A40"; - }]; + keys = [ { fingerprint = "2BE3 BAFD 793E A349 ED1F F00F 04D0 CEAF 916A 9A40"; } ]; }; kamilchm = { email = "kamil.chm@gmail.com"; @@ -10636,9 +10194,7 @@ email = "me@kamillaova.dev"; github = "Kamillaova"; githubId = 54859825; - keys = [{ - fingerprint = "B2D0 AA53 8DBE 60B0 0811 3FC0 2D52 5F67 791E 5834"; - }]; + keys = [ { fingerprint = "B2D0 AA53 8DBE 60B0 0811 3FC0 2D52 5F67 791E 5834"; } ]; }; kampfschlaefer = { email = "arnold@arnoldarts.de"; @@ -10752,9 +10308,7 @@ github = "kennyballou"; githubId = 2186188; name = "Kenny Ballou"; - keys = [{ - fingerprint = "932F 3E8E 1C0F 4A98 95D7 B8B8 B0CA A28A 0295 8308"; - }]; + keys = [ { fingerprint = "932F 3E8E 1C0F 4A98 95D7 B8B8 B0CA A28A 0295 8308"; } ]; }; kenran = { email = "johannes.maier@mailbox.org"; @@ -10792,9 +10346,7 @@ github = "kevincox"; githubId = 494012; name = "Kevin Cox"; - keys = [{ - fingerprint = "B66B 891D D83B 0E67 7D84 FC30 9BB9 2CC1 552E 99AA"; - }]; + keys = [ { fingerprint = "B66B 891D D83B 0E67 7D84 FC30 9BB9 2CC1 552E 99AA"; } ]; }; kevingriffin = { email = "me@kevin.jp"; @@ -10826,9 +10378,7 @@ github = "kgtkr"; githubId = 17868838; name = "kgtkr"; - keys = [{ - fingerprint = "B30D BE93 81E0 3D5D F301 88C8 1F6E B951 9F57 3241"; - }]; + keys = [ { fingerprint = "B30D BE93 81E0 3D5D F301 88C8 1F6E B951 9F57 3241"; } ]; }; khaneliman = { email = "khaneliman12@gmail.com"; @@ -10859,9 +10409,7 @@ github = "khrj"; githubId = 44947946; name = "Khushraj Rathod"; - keys = [{ - fingerprint = "1988 3FD8 EA2E B4EC 0A93 1E22 B77B 2A40 E770 2F19"; - }]; + keys = [ { fingerprint = "1988 3FD8 EA2E B4EC 0A93 1E22 B77B 2A40 E770 2F19"; } ]; }; KibaFox = { email = "kiba.fox@foxypossibilities.com"; @@ -11018,18 +10566,14 @@ github = "kittywitch"; githubId = 67870215; name = "Kat Inskip"; - keys = [{ - fingerprint = "9CC6 44B5 69CD A59B C874 C4C9 E8DD E3ED 1C90 F3A0"; - }]; + keys = [ { fingerprint = "9CC6 44B5 69CD A59B C874 C4C9 E8DD E3ED 1C90 F3A0"; } ]; }; kiwi = { email = "envy1988@gmail.com"; github = "Kiwi"; githubId = 35715; name = "Robert Djubek"; - keys = [{ - fingerprint = "8992 44FC D291 5CA2 0A97 802C 156C 88A5 B0A0 4B2A"; - }]; + keys = [ { fingerprint = "8992 44FC D291 5CA2 0A97 802C 156C 88A5 B0A0 4B2A"; } ]; }; kjeremy = { email = "kjeremy@gmail.com"; @@ -11061,9 +10605,7 @@ name = "Finn Behrens"; github = "Kloenk"; githubId = 12898828; - keys = [{ - fingerprint = "6881 5A95 D715 D429 659B 48A4 B924 45CF C954 6F9D"; - }]; + keys = [ { fingerprint = "6881 5A95 D715 D429 659B 48A4 B924 45CF C954 6F9D"; } ]; }; kmcopper = { email = "kmcopper@danwin1210.me"; @@ -11331,9 +10873,7 @@ github = "kugland"; githubId = 1173932; name = "André Kugland"; - keys = [{ - fingerprint = "6A62 5E60 E3FF FCAE B3AA 50DC 1DA9 3817 80CD D833"; - }]; + keys = [ { fingerprint = "6A62 5E60 E3FF FCAE B3AA 50DC 1DA9 3817 80CD D833"; } ]; }; kupac = { github = "Kupac"; @@ -11376,9 +10916,7 @@ matrix = "@kwaa:matrix.org"; github = "kwaa"; githubId = 50108258; - keys = [{ - fingerprint = "ABCB A12F 1A8E 3CCC F10B 5109 4444 7777 3333 4444"; - }]; + keys = [ { fingerprint = "ABCB A12F 1A8E 3CCC F10B 5109 4444 7777 3333 4444"; } ]; }; kwohlfahrt = { email = "kai.wohlfahrt@gmail.com"; @@ -11403,9 +10941,7 @@ github = "KyleOndy"; githubId = 1640900; name = "Kyle Ondy"; - keys = [{ - fingerprint = "3C79 9D26 057B 64E6 D907 B0AC DB0E 3C33 491F 91C9"; - }]; + keys = [ { fingerprint = "3C79 9D26 057B 64E6 D907 B0AC DB0E 3C33 491F 91C9"; } ]; }; kylesferrazza = { name = "Kyle Sferrazza"; @@ -11414,9 +10950,7 @@ github = "kylesferrazza"; githubId = 6677292; - keys = [{ - fingerprint = "5A9A 1C9B 2369 8049 3B48 CF5B 81A1 5409 4816 2372"; - }]; + keys = [ { fingerprint = "5A9A 1C9B 2369 8049 3B48 CF5B 81A1 5409 4816 2372"; } ]; }; l0b0 = { email = "victor@engmark.name"; @@ -11441,9 +10975,7 @@ email = "iam@lach.pw"; github = "CertainLach"; githubId = 6235312; - keys = [{ - fingerprint = "323C 95B5 DBF7 2D74 8570 C0B7 40B5 D694 8143 175F"; - }]; + keys = [ { fingerprint = "323C 95B5 DBF7 2D74 8570 C0B7 40B5 D694 8143 175F"; } ]; name = "Yaroslav Bolyukin"; }; lachrymal = { @@ -11456,14 +10988,12 @@ email = "joseph@lafreniere.xyz"; github = "lafrenierejm"; githubId = 11155300; - keys = [{ - fingerprint = "0375 DD9A EDD1 68A3 ADA3 9EBA EE23 6AA0 141E FCA3"; - }]; + keys = [ { fingerprint = "0375 DD9A EDD1 68A3 ADA3 9EBA EE23 6AA0 141E FCA3"; } ]; name = "Joseph LaFreniere"; }; lagoja = { github = "Lagoja"; - githubId =750845; + githubId = 750845; name = "John Lago"; }; laikq = { @@ -11507,9 +11037,7 @@ matrix = "@Las:matrix.org"; github = "L-as"; githubId = 22075344; - keys = [{ - fingerprint = "A093 EA17 F450 D4D1 60A0 1194 AC45 8A7D 1087 D025"; - }]; + keys = [ { fingerprint = "A093 EA17 F450 D4D1 60A0 1194 AC45 8A7D 1087 D025"; } ]; name = "Las Safin"; }; lasandell = { @@ -11615,18 +11143,14 @@ name = "Lucius Hu"; github = "lebensterben"; githubId = 1222865; - keys = [{ - fingerprint = "80C6 77F2 ED0B E732 3835 A8D3 7E47 4E82 E29B 5A7A"; - }]; + keys = [ { fingerprint = "80C6 77F2 ED0B E732 3835 A8D3 7E47 4E82 E29B 5A7A"; } ]; }; lecoqjacob = { name = "Jacob LeCoq"; email = "lecoqjacob@gmail.com"; githubId = 9278174; github = "lecoqjacob"; - keys = [{ - fingerprint = "C505 1E8B 06AC 1776 6875 1B60 93AF DAD0 10B3 CB8D"; - }]; + keys = [ { fingerprint = "C505 1E8B 06AC 1776 6875 1B60 93AF DAD0 10B3 CB8D"; } ]; }; ledif = { email = "refuse@gmail.com"; @@ -11656,9 +11180,7 @@ github = "leifhelm"; githubId = 31693262; name = "Jakob Leifhelm"; - keys = [{ - fingerprint = "4A82 F68D AC07 9FFD 8BF0 89C4 6817 AA02 3810 0822"; - }]; + keys = [ { fingerprint = "4A82 F68D AC07 9FFD 8BF0 89C4 6817 AA02 3810 0822"; } ]; }; leixb = { email = "abone9999+nixpkgs@gmail.com"; @@ -11666,9 +11188,7 @@ github = "Leixb"; githubId = 17183803; name = "Aleix Boné"; - keys = [{ - fingerprint = "63D3 F436 EDE8 7E1F 1292 24AF FC03 5BB2 BB28 E15D"; - }]; + keys = [ { fingerprint = "63D3 F436 EDE8 7E1F 1292 24AF FC03 5BB2 BB28 E15D"; } ]; }; lejonet = { email = "daniel@kuehn.se"; @@ -11683,11 +11203,9 @@ name = "Leonardo Eugênio"; }; leo248 = { - github ="leo248"; + github = "leo248"; githubId = 95365184; - keys = [{ - fingerprint = "81E3 418D C1A2 9687 2C4D 96DC BB1A 818F F295 26D2"; - }]; + keys = [ { fingerprint = "81E3 418D C1A2 9687 2C4D 96DC BB1A 818F F295 26D2"; } ]; name = "leo248"; }; leo60228 = { @@ -11696,9 +11214,7 @@ github = "leo60228"; githubId = 8355305; name = "leo60228"; - keys = [{ - fingerprint = "5BE4 98D5 1C24 2CCD C21A 4604 AC6F 4BA0 78E6 7833"; - }]; + keys = [ { fingerprint = "5BE4 98D5 1C24 2CCD C21A 4604 AC6F 4BA0 78E6 7833"; } ]; }; leona = { email = "nix@leona.is"; @@ -11721,9 +11237,7 @@ leonm1 = { github = "leonm1"; githubId = 32306579; - keys = [{ - fingerprint = "C12D F14B DC9D 64E1 44C3 4D8A 755C DA4E 5923 416A"; - }]; + keys = [ { fingerprint = "C12D F14B DC9D 64E1 44C3 4D8A 755C DA4E 5923 416A"; } ]; matrix = "@mattleon:matrix.org"; name = "Matt Leon"; }; @@ -11763,9 +11277,7 @@ email = "lexugeyky@outlook.com"; github = "LEXUGE"; githubId = 13804737; - keys = [{ - fingerprint = "7FE2 113A A08B 695A C8B8 DDE6 AE53 B4C2 E58E DD45"; - }]; + keys = [ { fingerprint = "7FE2 113A A08B 695A C8B8 DDE6 AE53 B4C2 E58E DD45"; } ]; }; lf- = { email = "nix-maint@lfcode.ca"; @@ -11802,9 +11314,7 @@ github = "Liassica"; githubId = 115422798; name = "Liassica"; - keys = [{ - fingerprint = "83BE 3033 6164 B971 FA82 7036 0D34 0E59 4980 7BDD"; - }]; + keys = [ { fingerprint = "83BE 3033 6164 B971 FA82 7036 0D34 0E59 4980 7BDD"; } ]; }; liberatys = { email = "liberatys@hey.com"; @@ -11863,9 +11373,7 @@ github = "liketechnik"; githubId = 24209689; - keys = [{ - fingerprint = "92D8 A09D 03DD B774 AABD 53B9 E136 2F07 D750 DB5C"; - }]; + keys = [ { fingerprint = "92D8 A09D 03DD B774 AABD 53B9 E136 2F07 D750 DB5C"; } ]; }; lilacious = { email = "yuchenhe126@gmail.com"; @@ -11910,9 +11418,7 @@ matrix = "@me:linj.tech"; github = "jian-lin"; githubId = 75130626; - keys = [{ - fingerprint = "80EE AAD8 43F9 3097 24B5 3D7E 27E9 7B91 E63A 7FF8"; - }]; + keys = [ { fingerprint = "80EE AAD8 43F9 3097 24B5 3D7E 27E9 7B91 E63A 7FF8"; } ]; }; link2xt = { email = "link2xt@testrun.org"; @@ -11963,9 +11469,7 @@ github = "livnev"; githubId = 3964494; name = "Lev Livnev"; - keys = [{ - fingerprint = "74F5 E5CC 19D3 B5CB 608F 6124 68FF 81E6 A785 0F49"; - }]; + keys = [ { fingerprint = "74F5 E5CC 19D3 B5CB 608F 6124 68FF 81E6 A785 0F49"; } ]; }; liyangau = { email = "d@aufomm.com"; @@ -12009,9 +11513,7 @@ github = "lockejan"; githubId = 25434434; name = "Jan Schmitt"; - keys = [{ - fingerprint = "1763 9903 2D7C 5B82 5D5A 0EAD A2BC 3C6F 1435 1991"; - }]; + keys = [ { fingerprint = "1763 9903 2D7C 5B82 5D5A 0EAD A2BC 3C6F 1435 1991"; } ]; }; locochoco = { email = "contact@locochoco.dev"; @@ -12044,9 +11546,7 @@ github = "legendofmiracles"; githubId = 30902201; name = "legendofmiracles"; - keys = [{ - fingerprint = "CC50 F82C 985D 2679 0703 AF15 19B0 82B3 DEFE 5451"; - }]; + keys = [ { fingerprint = "CC50 F82C 985D 2679 0703 AF15 19B0 82B3 DEFE 5451"; } ]; }; longer = { email = "michal@mieszczak.com.pl"; @@ -12107,9 +11607,7 @@ email = "loveisgrief@tuta.io"; github = "LoveIsGrief"; githubId = 2829538; - keys = [{ - fingerprint = "9847 4F48 18C6 4E0A F0C5 3529 E96D 1EDF A053 45EB"; - }]; + keys = [ { fingerprint = "9847 4F48 18C6 4E0A F0C5 3529 E96D 1EDF A053 45EB"; } ]; }; lovek323 = { email = "jason@oconal.id.au"; @@ -12123,9 +11621,7 @@ github = "lovesegfault"; githubId = 7243783; name = "Bernardo Meurer"; - keys = [{ - fingerprint = "F193 7596 57D5 6DA4 CCD4 786B F4C0 D53B 8D14 C246"; - }]; + keys = [ { fingerprint = "F193 7596 57D5 6DA4 CCD4 786B F4C0 D53B 8D14 C246"; } ]; }; lowfatcomputing = { email = "andreas.wagner@lowfatcomputing.org"; @@ -12138,8 +11634,7 @@ github = "loispostula"; githubId = 1423612; name = "Loïs Postula"; - keys = - [{ fingerprint = "0B4A E7C7 D3B7 53F5 3B3D 774C 3819 3C6A 09C3 9ED1"; }]; + keys = [ { fingerprint = "0B4A E7C7 D3B7 53F5 3B3D 774C 3819 3C6A 09C3 9ED1"; } ]; }; lrewega = { email = "lrewega@c32.ca"; @@ -12178,9 +11673,7 @@ githubId = 153414530; matrix = "@ltstf1re:converser.eu"; name = "Little Starfire"; - keys = [{ - fingerprint = "FE6C C3C9 2ACF 4367 2B56 5B22 8603 2ACC 051A 873D"; - }]; + keys = [ { fingerprint = "FE6C C3C9 2ACF 4367 2B56 5B22 8603 2ACC 051A 873D"; } ]; }; lu15w1r7h = { email = "lwirth2000@gmail.com"; @@ -12211,9 +11704,7 @@ github = "lucas-deangelis"; githubId = 55180995; name = "Lucas De Angelis"; - keys = [{ - fingerprint = "3C8B D3AD 93BB 1F36 B8FF 30BD 8627 E5ED F74B 5BF4"; - }]; + keys = [ { fingerprint = "3C8B D3AD 93BB 1F36 B8FF 30BD 8627 E5ED F74B 5BF4"; } ]; }; lucasew = { email = "lucas59356@gmail.com"; @@ -12256,9 +11747,7 @@ github = "ludovicopiero"; githubId = 44255157; name = "Ludovico Piero"; - keys = [{ - fingerprint = "72CA 4F61 46C6 0DAB 6193 4D35 3911 DD27 6CFE 779C"; - }]; + keys = [ { fingerprint = "72CA 4F61 46C6 0DAB 6193 4D35 3911 DD27 6CFE 779C"; } ]; }; lufia = { email = "lufia@lufia.org"; @@ -12271,9 +11760,7 @@ email = "luflosi@luflosi.de"; github = "Luflosi"; githubId = 15217907; - keys = [{ - fingerprint = "66D1 3048 2B5F 2069 81A6 6B83 6F98 7CCF 224D 20B9"; - }]; + keys = [ { fingerprint = "66D1 3048 2B5F 2069 81A6 6B83 6F98 7CCF 224D 20B9"; } ]; }; luftmensch-luftmensch = { email = "valentinobocchetti59@gmail.com"; @@ -12292,9 +11779,7 @@ github = "propet"; githubId = 8515861; name = "Luis D. Aranda Sánchez"; - keys = [{ - fingerprint = "AB7C 81F4 9E07 CC64 F3E7 BC25 DCAC C6F4 AAFC C04E"; - }]; + keys = [ { fingerprint = "AB7C 81F4 9E07 CC64 F3E7 BC25 DCAC C6F4 AAFC C04E"; } ]; }; luisnquin = { email = "lpaandres2020@gmail.com"; @@ -12321,9 +11806,7 @@ name = "Luiz Ribeiro"; github = "luizribeiro"; githubId = 112069; - keys = [{ - fingerprint = "97A0 AE5E 03F3 499B 7D7A 65C6 76A4 1432 37EF 5817"; - }]; + keys = [ { fingerprint = "97A0 AE5E 03F3 499B 7D7A 65C6 76A4 1432 37EF 5817"; } ]; }; lukas-heiligenbrunner = { email = "lukas.heiligenbrunner@gmail.com"; @@ -12392,10 +11875,12 @@ github = "lunik1"; githubId = 13547699; name = "Corin Hoad"; - keys = [{ - # fingerprint = "BA3A 5886 AE6D 526E 20B4 57D6 6A37 DF94 8318 8492"; # old key, superseded - fingerprint = "6E69 6A19 4BD8 BFAE 7362 ACDB 6437 4619 95CA 7F16"; - }]; + keys = [ + { + # fingerprint = "BA3A 5886 AE6D 526E 20B4 57D6 6A37 DF94 8318 8492"; # old key, superseded + fingerprint = "6E69 6A19 4BD8 BFAE 7362 ACDB 6437 4619 95CA 7F16"; + } + ]; }; LunNova = { email = "nixpkgs-maintainer@lunnova.dev"; @@ -12495,18 +11980,14 @@ email = "max@haland.org"; github = "mabster314"; githubId = 5741741; - keys = [{ - fingerprint = "71EF 8F1F 0C24 8B4D 5CDC 1B47 74B3 D790 77EE 37A8"; - }]; + keys = [ { fingerprint = "71EF 8F1F 0C24 8B4D 5CDC 1B47 74B3 D790 77EE 37A8"; } ]; }; macalinao = { email = "me@ianm.com"; name = "Ian Macalinao"; github = "macalinao"; githubId = 401263; - keys = [{ - fingerprint = "1147 43F1 E707 6F3E 6F4B 2C96 B9A8 B592 F126 F8E8"; - }]; + keys = [ { fingerprint = "1147 43F1 E707 6F3E 6F4B 2C96 B9A8 B592 F126 F8E8"; } ]; }; mac-chaffee = { name = "Mac Chaffee"; @@ -12538,9 +12019,7 @@ github = "m-rey"; githubId = 42996147; name = "Mæve"; - keys = [{ - fingerprint = "96C9 D086 CC9D 7BD7 EF24 80E2 9168 796A 1CC3 AEA2"; - }]; + keys = [ { fingerprint = "96C9 D086 CC9D 7BD7 EF24 80E2 9168 796A 1CC3 AEA2"; } ]; }; mafo = { email = "Marc.Fontaine@gmx.de"; @@ -12618,9 +12097,7 @@ github = "makuru-dd"; githubId = 58048293; name = "Makuru"; - keys = [{ - fingerprint = "5B22 7123 362F DEF1 8F79 BF2B 4792 3A0F EEB5 51C7"; - }]; + keys = [ { fingerprint = "5B22 7123 362F DEF1 8F79 BF2B 4792 3A0F EEB5 51C7"; } ]; }; malbarbo = { email = "malbarbo@gmail.com"; @@ -12838,9 +12315,7 @@ github = "marzipankaiser"; githubId = 2551444; name = "Marcial Gaißert"; - keys = [{ - fingerprint = "B573 5118 0375 A872 FBBF 7770 B629 036B E399 EEE9"; - }]; + keys = [ { fingerprint = "B573 5118 0375 A872 FBBF 7770 B629 036B E399 EEE9"; } ]; }; masaeedu = { email = "masaeedu@gmail.com"; @@ -12955,9 +12430,7 @@ github = "matthewpi"; githubId = 26559841; name = "Matthew Penner"; - keys = [{ - fingerprint = "5118 F1CC B7B0 6C17 4DD1 5267 3131 1906 AD4C F6D6"; - }]; + keys = [ { fingerprint = "5118 F1CC B7B0 6C17 4DD1 5267 3131 1906 AD4C F6D6"; } ]; }; matthiasbenaets = { email = "matthias.benaets@gmail.com"; @@ -12983,9 +12456,7 @@ name = "Matthieu Barthel"; github = "MatthieuBarthel"; githubId = 435534; - keys = [{ - fingerprint = "80EB 0F2B 484A BB80 7BEF 4145 BA23 F10E AADC 2E26"; - }]; + keys = [ { fingerprint = "80EB 0F2B 484A BB80 7BEF 4145 BA23 F10E AADC 2E26"; } ]; }; matthuszagh = { email = "huszaghmatt@gmail.com"; @@ -13017,9 +12488,7 @@ githubId = 5046562; matrix = "@mattsturg:matrix.org"; name = "Matt Sturgeon"; - keys = [{ - fingerprint = "7082 22EA 1808 E39A 83AC 8B18 4F91 844C ED1A 8299"; - }]; + keys = [ { fingerprint = "7082 22EA 1808 E39A 83AC 8B18 4F91 844C ED1A 8299"; } ]; }; matusf = { email = "matus.ferech@gmail.com"; @@ -13044,9 +12513,7 @@ github = "mawis"; githubId = 2042030; name = "Matthias Wimmer"; - keys = [{ - fingerprint = "CAEC A12D CE23 37A6 6DFD 17B0 7AC7 631D 70D6 C898"; - }]; + keys = [ { fingerprint = "CAEC A12D CE23 37A6 6DFD 17B0 7AC7 631D 70D6 C898"; } ]; }; max-amb = { email = "max_a@e.email"; @@ -13059,9 +12526,7 @@ github = "maxbrunet"; githubId = 32458727; name = "Maxime Brunet"; - keys = [{ - fingerprint = "E9A2 EE26 EAC6 B3ED 6C10 61F3 4379 62FF 87EC FE2B"; - }]; + keys = [ { fingerprint = "E9A2 EE26 EAC6 B3ED 6C10 61F3 4379 62FF 87EC FE2B"; } ]; }; maxdamantus = { email = "maxdamantus@gmail.com"; @@ -13098,9 +12563,7 @@ github = "max-niederman"; githubId = 19580458; name = "Max Niederman"; - keys = [{ - fingerprint = "1DE4 424D BF77 1192 5DC4 CF5E 9AED 8814 81D8 444E"; - }]; + keys = [ { fingerprint = "1DE4 424D BF77 1192 5DC4 CF5E 9AED 8814 81D8 444E"; } ]; }; maxstrid = { email = "mxwhenderson@gmail.com"; @@ -13208,9 +12671,7 @@ github = "mccurdyc"; githubId = 5546264; name = "Colton J. McCurdy"; - keys = [{ - fingerprint = "D709 03C8 0BE9 ACDC 14F0 3BFB 77BF E531 397E DE94"; - }]; + keys = [ { fingerprint = "D709 03C8 0BE9 ACDC 14F0 3BFB 77BF E531 397E DE94"; } ]; }; mcmtroffaes = { email = "matthias.troffaes@gmail.com"; @@ -13258,9 +12719,7 @@ github = "mdlayher"; githubId = 1926905; name = "Matt Layher"; - keys = [{ - fingerprint = "D709 03C8 0BE9 ACDC 14F0 3BFB 77BF E531 397E DE94"; - }]; + keys = [ { fingerprint = "D709 03C8 0BE9 ACDC 14F0 3BFB 77BF E531 397E DE94"; } ]; }; mdorman = { email = "mdorman@jaunder.io"; @@ -13358,9 +12817,7 @@ github = "melvyn2"; githubId = 9157412; name = "melvyn"; - keys = [{ - fingerprint = "232B 9F00 2153 CA86 849C 9224 25A2 B728 0CE3 AFF6"; - }]; + keys = [ { fingerprint = "232B 9F00 2153 CA86 849C 9224 25A2 B728 0CE3 AFF6"; } ]; }; mephistophiles = { email = "mussitantesmortem@gmail.com"; @@ -13449,9 +12906,7 @@ github = "miangraham"; githubId = 704580; name = "M. Ian Graham"; - keys = [{ - fingerprint = "8CE3 2906 516F C4D8 D373 308A E189 648A 55F5 9A9F"; - }]; + keys = [ { fingerprint = "8CE3 2906 516F C4D8 D373 308A E189 648A 55F5 9A9F"; } ]; }; mib = { name = "mib"; @@ -13459,9 +12914,7 @@ matrix = "@mib:kanp.ai"; github = "mibmo"; githubId = 87388017; - keys = [{ - fingerprint = "AB0D C647 B2F7 86EB 045C 7EFE CF6E 67DE D6DC 1E3F"; - }]; + keys = [ { fingerprint = "AB0D C647 B2F7 86EB 045C 7EFE CF6E 67DE D6DC 1E3F"; } ]; }; mic92 = { email = "joerg@thalheim.io"; @@ -13469,10 +12922,12 @@ github = "Mic92"; githubId = 96200; name = "Jörg Thalheim"; - keys = [{ - # compare with https://keybase.io/Mic92 - fingerprint = "3DEE 1C55 6E1C 3DC5 54F5 875A 003F 2096 411B 5F92"; - }]; + keys = [ + { + # compare with https://keybase.io/Mic92 + fingerprint = "3DEE 1C55 6E1C 3DC5 54F5 875A 003F 2096 411B 5F92"; + } + ]; }; michaeladler = { email = "therisen06@gmail.com"; @@ -13521,9 +12976,7 @@ name = "Michael Pacheco"; github = "MichaelPachec0"; githubId = 48970112; - keys = [{ - fingerprint = "8D12 991F 5558 C501 70B2 779C 7811 46B0 B5F9 5F64"; - }]; + keys = [ { fingerprint = "8D12 991F 5558 C501 70B2 779C 7811 46B0 B5F9 5F64"; } ]; }; michaelpj = { email = "me@michaelpj.com"; @@ -13573,9 +13026,7 @@ github = "midchildan"; githubId = 7343721; name = "midchildan"; - keys = [{ - fingerprint = "FEF0 AE2D 5449 3482 5F06 40AA 186A 1EDA C5C6 3F83"; - }]; + keys = [ { fingerprint = "FEF0 AE2D 5449 3482 5F06 40AA 186A 1EDA C5C6 3F83"; } ]; }; mig4ng = { email = "mig4ng@gmail.com"; @@ -13636,9 +13087,7 @@ github = "mikroskeem"; githubId = 3490861; name = "Mark Vainomaa"; - keys = [{ - fingerprint = "DB43 2895 CF68 F0CE D4B7 EF60 DA01 5B05 B5A1 1B22"; - }]; + keys = [ { fingerprint = "DB43 2895 CF68 F0CE D4B7 EF60 DA01 5B05 B5A1 1B22"; } ]; }; milahu = { email = "milahu@gmail.com"; @@ -13705,9 +13154,7 @@ github = "minijackson"; githubId = 1200507; name = "Rémi Nicole"; - keys = [{ - fingerprint = "3196 83D3 9A1B 4DE1 3DC2 51FD FEA8 88C9 F5D6 4F62"; - }]; + keys = [ { fingerprint = "3196 83D3 9A1B 4DE1 3DC2 51FD FEA8 88C9 F5D6 4F62"; } ]; }; minion3665 = { name = "Skyler Grey"; @@ -13715,9 +13162,7 @@ matrix = "@minion3665:matrix.org"; github = "Minion3665"; githubId = 34243578; - keys = [{ - fingerprint = "D520 AC8D 7C96 9212 5B2B BD3A 1AFD 1025 6B3C 714D"; - }]; + keys = [ { fingerprint = "D520 AC8D 7C96 9212 5B2B BD3A 1AFD 1025 6B3C 714D"; } ]; }; minizilla = { email = "m.billyzaelani@gmail.com"; @@ -13755,9 +13200,7 @@ github = "mirrorwitch"; githubId = 146672255; name = "mirrorwitch"; - keys = [{ - fingerprint = "C3E7 F8C4 9CBC 9320 D360 B117 8516 D0FA 7D8F 58FC"; - }]; + keys = [ { fingerprint = "C3E7 F8C4 9CBC 9320 D360 B117 8516 D0FA 7D8F 58FC"; } ]; }; Misaka13514 = { name = "Misaka13514"; @@ -13765,8 +13208,7 @@ matrix = "@misaka13514:matrix.org"; github = "Misaka13514"; githubId = 54669781; - keys = - [{ fingerprint = "293B 93D8 A471 059F 85D7 16A6 5BA9 2099 D9BE 2DAA"; }]; + keys = [ { fingerprint = "293B 93D8 A471 059F 85D7 16A6 5BA9 2099 D9BE 2DAA"; } ]; }; mislavzanic = { email = "mislavzanic3@gmail.com"; @@ -13780,9 +13222,7 @@ githubId = 5727578; matrix = "@misterio:matrix.org"; name = "Gabriel Fontes"; - keys = [{ - fingerprint = "7088 C742 1873 E0DB 97FF 17C2 245C AB70 B4C2 25E9"; - }]; + keys = [ { fingerprint = "7088 C742 1873 E0DB 97FF 17C2 245C AB70 B4C2 25E9"; } ]; }; mistydemeo = { email = "misty@axo.dev"; @@ -13844,9 +13284,7 @@ github = "mkf"; githubId = 7753506; name = "Michał Krzysztof Feiler"; - keys = [{ - fingerprint = "1E36 9940 CC7E 01C4 CFE8 F20A E35C 2D7C 2C6A C724"; - }]; + keys = [ { fingerprint = "1E36 9940 CC7E 01C4 CFE8 F20A E35C 2D7C 2C6A C724"; } ]; }; mkg = { email = "mkg@vt.edu"; @@ -13860,9 +13298,7 @@ github = "mkg20001"; githubId = 7735145; name = "Maciej Krüger"; - keys = [{ - fingerprint = "E90C BA34 55B3 6236 740C 038F 0D94 8CE1 9CF4 9C5F"; - }]; + keys = [ { fingerprint = "E90C BA34 55B3 6236 740C 038F 0D94 8CE1 9CF4 9C5F"; } ]; }; mksafavi = { name = "MK Safavi"; @@ -13875,9 +13311,7 @@ github = "mktip"; githubId = 45905717; name = "Mohammad Issa"; - keys = [{ - fingerprint = "64BE BF11 96C3 DD7A 443E 8314 1DC0 82FA DE5B A863"; - }]; + keys = [ { fingerprint = "64BE BF11 96C3 DD7A 443E 8314 1DC0 82FA DE5B A863"; } ]; }; mlaradji = { name = "Mohamed Laradji"; @@ -13979,18 +13413,14 @@ matrix = "@moritz.hedtke:matrix.org"; github = "mohe2015"; githubId = 13287984; - keys = [{ - fingerprint = "1248 D3E1 1D11 4A85 75C9 8934 6794 D45A 488C 2EDE"; - }]; + keys = [ { fingerprint = "1248 D3E1 1D11 4A85 75C9 8934 6794 D45A 488C 2EDE"; } ]; }; momeemt = { name = "Mutsuha Asada"; email = "me@momee.mt"; github = "momeemt"; githubId = 43488453; - keys = [{ - fingerprint = "D94F EA9F 5B08 F6A1 7B8F EB8B ACB5 4F0C BC6A A7C6"; - }]; + keys = [ { fingerprint = "D94F EA9F 5B08 F6A1 7B8F EB8B ACB5 4F0C BC6A A7C6"; } ]; }; monaaraj = { name = "Mon Aaraj"; @@ -14023,9 +13453,7 @@ email = "chris@cdom.io"; github = "montchr"; githubId = 1757914; - keys = [{ - fingerprint = "6460 4147 C434 F65E C306 A21F 135E EDD0 F719 34F3"; - }]; + keys = [ { fingerprint = "6460 4147 C434 F65E C306 A21F 135E EDD0 F719 34F3"; } ]; }; moody = { email = "moody@posixcafe.org"; @@ -14050,9 +13478,7 @@ github = "Moredread"; githubId = 100848; name = "André-Patrick Bubel"; - keys = [{ - fingerprint = "4412 38AD CAD3 228D 876C 5455 118C E7C4 24B4 5728"; - }]; + keys = [ { fingerprint = "4412 38AD CAD3 228D 876C 5455 118C E7C4 24B4 5728"; } ]; }; moretea = { email = "maarten@moretea.nl"; @@ -14082,9 +13508,7 @@ email = "motiejus@jakstys.lt"; github = "motiejus"; githubId = 107720; - keys = [{ - fingerprint = "5F6B 7A8A 92A2 60A4 3704 9BEB 6F13 3A0C 1C28 48D7"; - }]; + keys = [ { fingerprint = "5F6B 7A8A 92A2 60A4 3704 9BEB 6F13 3A0C 1C28 48D7"; } ]; matrix = "@motiejus:jakstys.lt"; name = "Motiejus Jakštys"; }; @@ -14171,9 +13595,7 @@ name = "Egor Martynov"; github = "mrtnvgr"; githubId = 48406064; - keys = [{ - fingerprint = "6FAD DB43 D5A5 FE52 6835 0943 5B33 79E9 81EF 48B1"; - }]; + keys = [ { fingerprint = "6FAD DB43 D5A5 FE52 6835 0943 5B33 79E9 81EF 48B1"; } ]; }; mrVanDalo = { email = "contact@ingolf-wagner.de"; @@ -14187,9 +13609,7 @@ name = "Moritz Sanft"; github = "msanft"; githubId = 58110325; - keys = [{ - fingerprint = "3CAC 1D21 3D97 88FF 149A E116 BB8B 30F5 A024 C31C"; - }]; + keys = [ { fingerprint = "3CAC 1D21 3D97 88FF 149A E116 BB8B 30F5 A024 C31C"; } ]; }; mschristiansen = { email = "mikkel@rheosystems.com"; @@ -14323,9 +13743,7 @@ github = "Munksgaard"; githubId = 230613; matrix = "@philip:matrix.munksgaard.me"; - keys = [{ - fingerprint = "5658 4D09 71AF E45F CC29 6BD7 4CE6 2A90 EFC0 B9B2"; - }]; + keys = [ { fingerprint = "5658 4D09 71AF E45F CC29 6BD7 4CE6 2A90 EFC0 B9B2"; } ]; }; mupdt = { email = "nix@pdtpartners.com"; @@ -14345,9 +13763,7 @@ matrix = "@maxime:visonneau.fr"; github = "mvisonneau"; githubId = 1761583; - keys = [{ - fingerprint = "EC63 0CEA E8BC 5EE5 5C58 F2E3 150D 6F0A E919 8D24"; - }]; + keys = [ { fingerprint = "EC63 0CEA E8BC 5EE5 5C58 F2E3 150D 6F0A E919 8D24"; } ]; }; mvnetbiz = { email = "mvnetbiz@gmail.com"; @@ -14420,17 +13836,13 @@ github = "n3oney"; githubId = 30625554; matrix = "@neoney:matrix.org"; - keys = [{ - fingerprint = "9E6A 25F2 C1F2 9D76 ED00 1932 1261 173A 01E1 0298"; - }]; + keys = [ { fingerprint = "9E6A 25F2 C1F2 9D76 ED00 1932 1261 173A 01E1 0298"; } ]; }; n8henrie = { name = "Nathan Henrie"; github = "n8henrie"; githubId = 1234956; - "keys" = [{ - "fingerprint" = "F21A 6194 C9DB 9899 CD09 E24E 434B 2C14 B8C3 3422"; - }]; + "keys" = [ { "fingerprint" = "F21A 6194 C9DB 9899 CD09 E24E 434B 2C14 B8C3 3422"; } ]; }; nadir-ishiguro = { github = "nadir-ishiguro"; @@ -14454,9 +13866,7 @@ github = "nagy"; githubId = 692274; name = "Daniel Nagy"; - keys = [{ - fingerprint = "F6AE 2C60 9196 A1BC ECD8 7108 1B8E 8DCB 576F B671"; - }]; + keys = [ { fingerprint = "F6AE 2C60 9196 A1BC ECD8 7108 1B8E 8DCB 576F B671"; } ]; }; nalbyuites = { email = "ashijit007@gmail.com"; @@ -14464,6 +13874,12 @@ githubId = 1009523; name = "Ashijit Pramanik"; }; + Name = { + name = "Name"; + email = "lasagna@garfunkles.space"; + github = "namescode"; + githubId = 86119896; + }; name-snrl = { github = "name-snrl"; githubId = 72071763; @@ -14496,9 +13912,7 @@ github = "nasirhm"; githubId = 35005234; name = "Nasir Hussain"; - keys = [{ - fingerprint = "7A10 AB8E 0BEC 566B 090C 9BE3 D812 6E55 9CE7 C35D"; - }]; + keys = [ { fingerprint = "7A10 AB8E 0BEC 566B 090C 9BE3 D812 6E55 9CE7 C35D"; } ]; }; nat-418 = { github = "nat-418"; @@ -14533,9 +13947,7 @@ github = "natsukium"; githubId = 25083790; name = "Tomoya Otabi"; - keys = [{ - fingerprint = "3D14 6004 004C F882 D519 6CD4 9EA4 5A31 DB99 4C53"; - }]; + keys = [ { fingerprint = "3D14 6004 004C F882 D519 6CD4 9EA4 5A31 DB99 4C53"; } ]; }; natto1784 = { email = "natto@weirdnatto.in"; @@ -14549,9 +13961,7 @@ matrix = "@naxdy:naxdy.org"; github = "Naxdy"; githubId = 4532582; - keys = [{ - fingerprint = "BDEA AB07 909D B96F 4106 85F1 CC15 0758 46BC E91B"; - }]; + keys = [ { fingerprint = "BDEA AB07 909D B96F 4106 85F1 CC15 0758 46BC E91B"; } ]; }; nayala = { name = "Nia"; @@ -14563,9 +13973,7 @@ matrix = "@nazarewk:matrix.org"; github = "nazarewk"; githubId = 3494992; - keys = [{ - fingerprint = "4BFF 0614 03A2 47F0 AA0B 4BC4 916D 8B67 2418 92AE"; - }]; + keys = [ { fingerprint = "4BFF 0614 03A2 47F0 AA0B 4BC4 916D 8B67 2418 92AE"; } ]; }; nbr = { github = "nbr"; @@ -14591,9 +13999,7 @@ github = "ncfavier"; githubId = 4323933; name = "Naïm Favier"; - keys = [{ - fingerprint = "F3EB 4BBB 4E71 99BC 299C D4E9 95AF CE82 1190 8325"; - }]; + keys = [ { fingerprint = "F3EB 4BBB 4E71 99BC 299C D4E9 95AF CE82 1190 8325"; } ]; }; nckx = { email = "github@tobias.gr"; @@ -14704,9 +14110,7 @@ email = "me@netali.de"; github = "NetaliDev"; githubId = 15304894; - keys = [{ - fingerprint = "F729 2594 6F58 0B05 8FB3 F271 9C55 E636 426B 40A9"; - }]; + keys = [ { fingerprint = "F729 2594 6F58 0B05 8FB3 F271 9C55 E636 426B 40A9"; } ]; }; netcrns = { email = "jason.wing@gmx.de"; @@ -14720,9 +14124,7 @@ matrix = "@netfox:catgirl.cloud"; github = "0xnetfox"; githubId = 97521402; - keys = [{ - fingerprint = "E8E9 43D7 EB83 DB77 E41C D87F 9C77 CB70 F2E6 3EF7"; - }]; + keys = [ { fingerprint = "E8E9 43D7 EB83 DB77 E41C D87F 9C77 CB70 F2E6 3EF7"; } ]; }; netixx = { email = "dev.espinetfrancois@gmail.com"; @@ -14748,9 +14150,7 @@ matrix = "@networkexception:chat.upi.li"; github = "networkException"; githubId = 42888162; - keys = [{ - fingerprint = "A0B9 48C5 A263 55C2 035F 8567 FBB7 2A94 52D9 1A72"; - }]; + keys = [ { fingerprint = "A0B9 48C5 A263 55C2 035F 8567 FBB7 2A94 52D9 1A72"; } ]; }; neverbehave = { email = "i@never.pet"; @@ -14812,9 +14212,7 @@ github = "nicbk"; githubId = 77309427; name = "Nicolás Kennedy"; - keys = [{ - fingerprint = "7BC1 77D9 C222 B1DC FB2F 0484 C061 089E FEBF 7A35"; - }]; + keys = [ { fingerprint = "7BC1 77D9 C222 B1DC FB2F 0484 C061 089E FEBF 7A35"; } ]; }; nicegamer7 = { name = "Kermina Awad"; @@ -14856,18 +14254,14 @@ github = "nicolas-goudry"; githubId = 8753998; name = "Nicolas Goudry"; - keys = [{ - fingerprint = "21B6 A59A 4E89 0B1B 83E3 0CDB 01C8 8C03 5450 9AA9"; - }]; + keys = [ { fingerprint = "21B6 A59A 4E89 0B1B 83E3 0CDB 01C8 8C03 5450 9AA9"; } ]; }; nicoo = { email = "nicoo@debian.org"; github = "nbraud"; githubId = 1155801; name = "nicoo"; - keys = [{ - fingerprint = "E44E 9EA5 4B8E 256A FB73 49D3 EC9D 3708 72BC 7A8C"; - }]; + keys = [ { fingerprint = "E44E 9EA5 4B8E 256A FB73 49D3 EC9D 3708 72BC 7A8C"; } ]; }; nidabdella = { name = "Mohamed Nidabdella"; @@ -14880,9 +14274,7 @@ github = "meithecatte"; githubId = 23580910; name = "Jakub Kądziołka"; - keys = [{ - fingerprint = "E576 BFB2 CF6E B13D F571 33B9 E315 A758 4613 1564"; - }]; + keys = [ { fingerprint = "E576 BFB2 CF6E B13D F571 33B9 E315 A758 4613 1564"; } ]; }; nielsegberts = { email = "nix@nielsegberts.nl"; @@ -14945,9 +14337,7 @@ github = "nim65s"; githubId = 131929; name = "Guilhem Saurel"; - keys = [{ - fingerprint = "9B1A 7906 5D2F 2B80 6C8A 5A1C 7D2A CDAF 4653 CF28"; - }]; + keys = [ { fingerprint = "9B1A 7906 5D2F 2B80 6C8A 5A1C 7D2A CDAF 4653 CF28"; } ]; }; ninjafb = { email = "oscar@oronberg.com"; @@ -14988,9 +14378,7 @@ github = "nixbitcoin"; githubId = 45737139; name = "nixbitcoindev"; - keys = [{ - fingerprint = "577A 3452 7F3E 2A85 E80F E164 DD11 F9AD 5308 B3BA"; - }]; + keys = [ { fingerprint = "577A 3452 7F3E 2A85 E80F E164 DD11 F9AD 5308 B3BA"; } ]; }; nixinator = { email = "33lockdown33@protonmail.com"; @@ -15021,9 +14409,7 @@ email = "n@nk.je"; github = "NKJe"; githubId = 1102306; - keys = [{ - fingerprint = "B956 C6A4 22AF 86A0 8F77 A8CA DE3B ADFE CD31 A89D"; - }]; + keys = [ { fingerprint = "B956 C6A4 22AF 86A0 8F77 A8CA DE3B ADFE CD31 A89D"; } ]; }; nkpvk = { email = "niko.pavlinek@gmail.com"; @@ -15134,9 +14520,7 @@ email = "bandali@gnu.org"; github = "bandali0"; githubId = 1254858; - keys = [{ - fingerprint = "BE62 7373 8E61 6D6D 1B3A 08E8 A21A 0202 4881 6103"; - }]; + keys = [ { fingerprint = "BE62 7373 8E61 6D6D 1B3A 08E8 A21A 0202 4881 6103"; } ]; }; not-my-segfault = { email = "michal@tar.black"; @@ -15324,9 +14708,7 @@ githubId = 7851175; name = "nzbr"; matrix = "@nzbr:nzbr.de"; - keys = [{ - fingerprint = "BF3A 3EE6 3144 2C5F C9FB 39A7 6C78 B50B 97A4 2F8A"; - }]; + keys = [ { fingerprint = "BF3A 3EE6 3144 2C5F C9FB 39A7 6C78 B50B 97A4 2F8A"; } ]; }; nzhang-zh = { email = "n.zhang.hp.au@gmail.com"; @@ -15364,9 +14746,13 @@ github = "obfusk"; githubId = 1260687; name = "FC Stegerman"; - keys = [{ - fingerprint = "D5E4 A51D F8D2 55B9 FAC6 A9BB 2F96 07F0 9B36 0F2D"; - }]; + keys = [ { fingerprint = "D5E4 A51D F8D2 55B9 FAC6 A9BB 2F96 07F0 9B36 0F2D"; } ]; + }; + obreitwi = { + email = "oliver@breitwieser.eu"; + github = "obreitwi"; + githubId = 123140; + name = "Oliver Breitwieser"; }; obsidian-systems-maintenance = { name = "Obsidian Systems Maintenance"; @@ -15379,9 +14765,7 @@ github = "ocfox"; githubId = 47410251; name = "ocfox"; - keys = [{ - fingerprint = "939E F8A5 CED8 7F50 5BB5 B2D0 24BC 2738 5F70 234F"; - }]; + keys = [ { fingerprint = "939E F8A5 CED8 7F50 5BB5 B2D0 24BC 2738 5F70 234F"; } ]; }; octodi = { name = "octodi"; @@ -15395,9 +14779,7 @@ github = "oddlama"; githubId = 31919558; name = "oddlama"; - keys = [{ - fingerprint = "680A A614 E988 DE3E 84E0 DEFA 503F 6C06 8410 4B0A"; - }]; + keys = [ { fingerprint = "680A A614 E988 DE3E 84E0 DEFA 503F 6C06 8410 4B0A"; } ]; }; odi = { email = "oliver.dunkl@gmail.com"; @@ -15503,9 +14885,7 @@ email = "dev@onemoresuza.mailer.me"; github = "onemoresuza"; githubId = 106456302; - keys = [{ - fingerprint = "484F D3B8 BAD7 BF5D 8B68 2AEA A2ED 1159 935E 4D7E"; - }]; + keys = [ { fingerprint = "484F D3B8 BAD7 BF5D 8B68 2AEA A2ED 1159 935E 4D7E"; } ]; }; onixie = { email = "onixie@gmail.com"; @@ -15554,9 +14934,7 @@ email = "oliverwilkes2006@icloud.com"; github = "ooliver1"; githubId = 34910574; - keys = [{ - fingerprint = "D055 8A23 3947 B7A0 F966 B07F 0B41 0348 9833 7273"; - }]; + keys = [ { fingerprint = "D055 8A23 3947 B7A0 F966 B07F 0B41 0348 9833 7273"; } ]; }; opeik = { email = "sandro@stikic.com"; @@ -15587,9 +14965,7 @@ github = "orhun"; githubId = 24392180; name = "Orhun Parmaksız"; - keys = [{ - fingerprint = "165E 0FF7 C48C 226E 1EC3 63A7 F834 2482 4B3E 4B90"; - }]; + keys = [ { fingerprint = "165E 0FF7 C48C 226E 1EC3 63A7 F834 2482 4B3E 4B90"; } ]; }; orichter = { email = "richter-oliver@gmx.net"; @@ -15644,9 +15020,7 @@ github = "ostrolucky"; githubId = 496233; name = "Gabriel Ostrolucký"; - keys = [{ - fingerprint = "6611 22A7 B778 6E4A E99A 9D6E C79A D015 19EF B134"; - }]; + keys = [ { fingerprint = "6611 22A7 B778 6E4A E99A 9D6E C79A D015 19EF B134"; } ]; }; otavio = { email = "otavio.salvador@ossystems.com.br"; @@ -15677,36 +15051,28 @@ github = "oxalica"; githubId = 14816024; name = "oxalica"; - keys = [{ - fingerprint = "F90F FD6D 585C 2BA1 F13D E8A9 7571 654C F88E 31C2"; - }]; + keys = [ { fingerprint = "F90F FD6D 585C 2BA1 F13D E8A9 7571 654C F88E 31C2"; } ]; }; oxapentane = { email = "blame@oxapentane.com"; github = "oxapentane"; githubId = 1297357; name = "Grigory Shipunov"; - keys = [{ - fingerprint = "DD09 98E6 CDF2 9453 7FC6 04F9 91FA 5E5B F9AA 901C"; - }]; + keys = [ { fingerprint = "DD09 98E6 CDF2 9453 7FC6 04F9 91FA 5E5B F9AA 901C"; } ]; }; oxij = { email = "oxij@oxij.org"; github = "oxij"; githubId = 391919; name = "Jan Malakhovski"; - keys = [{ - fingerprint = "514B B966 B46E 3565 0508 86E8 0E6C A66E 5C55 7AA8"; - }]; + keys = [ { fingerprint = "514B B966 B46E 3565 0508 86E8 0E6C A66E 5C55 7AA8"; } ]; }; oxzi = { email = "post@0x21.biz"; github = "oxzi"; githubId = 8402811; name = "Alvar Penning"; - keys = [{ - fingerprint = "EB14 4E67 E57D 27E2 B5A4 CD8C F32A 4563 7FA2 5E31"; - }]; + keys = [ { fingerprint = "EB14 4E67 E57D 27E2 B5A4 CD8C F32A 4563 7FA2 5E31"; } ]; }; oyren = { email = "m.scheuren@oyra.eu"; @@ -15883,9 +15249,7 @@ github = "PatrickDaG"; githubId = 58092422; name = "Patrick"; - keys = [{ - fingerprint = "5E4C 3D74 80C2 35FE 2F0B D23F 7DD6 A72E C899 617D"; - }]; + keys = [ { fingerprint = "5E4C 3D74 80C2 35FE 2F0B D23F 7DD6 A72E C899 617D"; } ]; }; patricksjackson = { email = "patrick@jackson.dev"; @@ -15898,9 +15262,7 @@ github = "Patryk27"; githubId = 3395477; name = "Patryk Wychowaniec"; - keys = [{ - fingerprint = "196A BFEC 6A1D D1EC 7594 F8D1 F625 47D0 75E0 9767"; - }]; + keys = [ { fingerprint = "196A BFEC 6A1D D1EC 7594 F8D1 F625 47D0 75E0 9767"; } ]; }; patryk4815 = { email = "patryk.sondej@gmail.com"; @@ -15961,9 +15323,7 @@ github = "pbek"; githubId = 1798101; name = "Patrizio Bekerle"; - keys = [{ - fingerprint = "E005 48D5 D6AC 812C AAD2 AFFA 9C42 B05E 5913 60DC"; - }]; + keys = [ { fingerprint = "E005 48D5 D6AC 812C AAD2 AFFA 9C42 B05E 5913 60DC"; } ]; }; pbeucher = { email = "pierre@crafteo.io"; @@ -16109,9 +15469,7 @@ github = "peterwilli"; githubId = 1212814; name = "Peter Willemsen"; - keys = [{ - fingerprint = "A37F D403 88E2 D026 B9F6 9617 5C9D D4BF B96A 28F0"; - }]; + keys = [ { fingerprint = "A37F D403 88E2 D026 B9F6 9617 5C9D D4BF B96A 28F0"; } ]; }; peti = { email = "simons@cryp.to"; @@ -16144,9 +15502,7 @@ matrix = "@phaer:matrix.org"; github = "phaer"; githubId = 101753; - keys = [{ - fingerprint = "5D69 CF04 B7BC 2BC1 A567 9267 00BC F29B 3208 0700"; - }]; + keys = [ { fingerprint = "5D69 CF04 B7BC 2BC1 A567 9267 00BC F29B 3208 0700"; } ]; }; phdcybersec = { name = "Léo Lavaur"; @@ -16154,9 +15510,7 @@ github = "phdcybersec"; githubId = 82591009; - keys = [{ - fingerprint = "7756 E88F 3C6A 47A5 C5F0 CDFB AB54 6777 F93E 20BF"; - }]; + keys = [ { fingerprint = "7756 E88F 3C6A 47A5 C5F0 CDFB AB54 6777 F93E 20BF"; } ]; }; phdyellow = { name = "Phil Dyer"; @@ -16170,9 +15524,7 @@ github = "phfroidmont"; githubId = 8150907; - keys = [{ - fingerprint = "3AC6 F170 F011 33CE 393B CD94 BE94 8AFD 7E78 73BE"; - }]; + keys = [ { fingerprint = "3AC6 F170 F011 33CE 393B CD94 BE94 8AFD 7E78 73BE"; } ]; }; phijor = { name = "Philipp Joram"; @@ -16191,9 +15543,7 @@ matrix = "@phil8o:matrix.org"; github = "philclifford"; githubId = 8797027; - keys = [{ - fingerprint = "FC15 E59F 0CFA 9329 101B 71D9 92F7 A790 E9BA F1F7"; - }]; + keys = [ { fingerprint = "FC15 E59F 0CFA 9329 101B 71D9 92F7 A790 E9BA F1F7"; } ]; name = "Phil Clifford"; }; phile314 = { @@ -16329,9 +15679,7 @@ github = "pingiun"; githubId = 1576660; name = "Jelle Besseling"; - keys = [{ - fingerprint = "A3A3 65AE 16ED A7A0 C29C 88F1 9712 452E 8BE3 372E"; - }]; + keys = [ { fingerprint = "A3A3 65AE 16ED A7A0 C29C 88F1 9712 452E 8BE3 372E"; } ]; }; pinkcreeper100 = { email = "benmoreosm@gmail.com"; @@ -16344,9 +15692,13 @@ github = "pinpox"; githubId = 1719781; name = "Pablo Ovelleiro Corral"; - keys = [{ - fingerprint = "D03B 218C AE77 1F77 D7F9 20D9 823A 6154 4264 08D3"; - }]; + keys = [ { fingerprint = "D03B 218C AE77 1F77 D7F9 20D9 823A 6154 4264 08D3"; } ]; + }; + piotrkwiecinski = { + email = "piokwiecinski+nixpkgs@gmail.com"; + github = "piotrkwiecinski"; + githubId = 2151333; + name = "Piotr Kwiecinski"; }; piperswe = { email = "contact@piperswe.me"; @@ -16426,9 +15778,7 @@ email = "labadens.pierre+nixpkgs@gmail.com"; github = "plabadens"; githubId = 4303706; - keys = [{ - fingerprint = "B00F E582 FD3F 0732 EA48 3937 F558 14E4 D687 4375"; - }]; + keys = [ { fingerprint = "B00F E582 FD3F 0732 EA48 3937 F558 14E4 D687 4375"; } ]; }; plchldr = { email = "mail@oddco.de"; @@ -16484,9 +15834,7 @@ github = "pmenke-de"; githubId = 898922; name = "Philipp Menke"; - keys = [{ - fingerprint = "ED54 5EFD 64B6 B5AA EC61 8C16 EB7F 2D4C CBE2 3B69"; - }]; + keys = [ { fingerprint = "ED54 5EFD 64B6 B5AA EC61 8C16 EB7F 2D4C CBE2 3B69"; } ]; }; pmeunier = { email = "pierre-etienne.meunier@inria.fr"; @@ -16506,9 +15854,7 @@ name = "Philip White"; github = "philipmw"; githubId = 1379645; - keys = [{ - fingerprint = "9AB0 6C94 C3D1 F9D0 B9D9 A832 BC54 6FB3 B16C 8B0B"; - }]; + keys = [ { fingerprint = "9AB0 6C94 C3D1 F9D0 B9D9 A832 BC54 6FB3 B16C 8B0B"; } ]; }; pmy = { email = "pmy@xqzp.net"; @@ -16545,9 +15891,7 @@ github = "pnotequalnp"; githubId = 46154511; name = "Kevin Mullins"; - keys = [{ - fingerprint = "2CD2 B030 BD22 32EF DF5A 008A 3618 20A4 5DB4 1E9A"; - }]; + keys = [ { fingerprint = "2CD2 B030 BD22 32EF DF5A 008A 3618 20A4 5DB4 1E9A"; } ]; }; podocarp = { email = "xdjiaxd@gmail.com"; @@ -16631,9 +15975,7 @@ github = "poscat0x04"; githubId = 53291983; name = "Poscat Tarski"; - keys = [{ - fingerprint = "48AD DE10 F27B AFB4 7BB0 CCAF 2D25 95A0 0D08 ACE0"; - }]; + keys = [ { fingerprint = "48AD DE10 F27B AFB4 7BB0 CCAF 2D25 95A0 0D08 ACE0"; } ]; }; posch = { email = "tp@fonz.de"; @@ -16675,9 +16017,7 @@ github = "pradyuman"; githubId = 9904569; name = "Pradyuman Vig"; - keys = [{ - fingerprint = "240B 57DE 4271 2480 7CE3 EAC8 4F74 D536 1C4C A31E"; - }]; + keys = [ { fingerprint = "240B 57DE 4271 2480 7CE3 EAC8 4F74 D536 1C4C A31E"; } ]; }; preisschild = { email = "florian@florianstroeger.com"; @@ -16691,9 +16031,7 @@ matrix = "@presto8:matrix.org"; github = "presto8"; githubId = 246631; - keys = [{ - fingerprint = "3E46 7EF1 54AA A1D0 C7DF A694 E45C B17F 1940 CA52"; - }]; + keys = [ { fingerprint = "3E46 7EF1 54AA A1D0 C7DF A694 E45C B17F 1940 CA52"; } ]; }; priegger = { email = "philipp@riegger.name"; @@ -16730,9 +16068,7 @@ matrix = "@princemachiavelli:matrix.org"; github = "Princemachiavelli"; githubId = 2730968; - keys = [{ - fingerprint = "DD54 130B ABEC B65C 1F6B 2A38 8312 4F97 A318 EA18"; - }]; + keys = [ { fingerprint = "DD54 130B ABEC B65C 1F6B 2A38 8312 4F97 A318 EA18"; } ]; }; p-rintz = { email = "nix@rintz.net"; @@ -16812,9 +16148,7 @@ github = "prrlvr"; githubId = 33699501; name = "Pierre-Olivier Rey"; - keys = [{ - fingerprint = "40A0 78FD 297B 0AC1 E6D8 A119 4D38 49D9 9555 1307"; - }]; + keys = [ { fingerprint = "40A0 78FD 297B 0AC1 E6D8 A119 4D38 49D9 9555 1307"; } ]; }; prtzl = { email = "matej.blagsic@protonmail.com"; @@ -16827,9 +16161,7 @@ github = "prusnak"; githubId = 42201; name = "Pavol Rusnak"; - keys = [{ - fingerprint = "86E6 792F C27B FD47 8860 C110 91F3 B339 B9A0 2A3D"; - }]; + keys = [ { fingerprint = "86E6 792F C27B FD47 8860 C110 91F3 B339 B9A0 2A3D"; } ]; }; psanford = { email = "psanford@sanford.io"; @@ -16843,9 +16175,7 @@ githubId = 37886; name = "Philipp Schmitt"; matrix = "@pschmitt:one.ems.host"; - keys = [{ - fingerprint = "9FBF 2ABF FB37 F7F3 F502 44E5 DC43 9C47 EACB 17F9"; - }]; + keys = [ { fingerprint = "9FBF 2ABF FB37 F7F3 F502 44E5 DC43 9C47 EACB 17F9"; } ]; }; pshirshov = { email = "pshirshov@eml.cc"; @@ -16962,9 +16292,7 @@ matrix = "@pyrox:pyrox.dev"; github = "pyrox0"; githubId = 35778371; - keys = [{ - fingerprint = "4CA9 72FB ADC8 1416 0F10 3138 FE1D 8A7D 620C 611F"; - }]; + keys = [ { fingerprint = "4CA9 72FB ADC8 1416 0F10 3138 FE1D 8A7D 620C 611F"; } ]; }; pyxels = { email = "pyxels.dev@gmail.com"; @@ -16984,9 +16312,7 @@ github = "qbit"; githubId = 68368; matrix = "@qbit:tapenet.org"; - keys = [{ - fingerprint = "3586 3350 BFEA C101 DB1A 4AF0 1F81 112D 62A9 ADCE"; - }]; + keys = [ { fingerprint = "3586 3350 BFEA C101 DB1A 4AF0 1F81 112D 62A9 ADCE"; } ]; }; qdlmcfresh = { name = "Philipp Urlbauer"; @@ -17054,9 +16380,7 @@ github = "quentinmit"; githubId = 115761; name = "Quentin Smith"; - keys = [{ - fingerprint = "1C71 A066 5400 AACD 142E B1A0 04EE 05A8 FCEF B697"; - }]; + keys = [ { fingerprint = "1C71 A066 5400 AACD 142E B1A0 04EE 05A8 FCEF B697"; } ]; }; quentini = { email = "quentini@airmail.cc"; @@ -17094,9 +16418,7 @@ githubId = 2768870; name = "Alyssa Ross"; matrix = "@qyliss:fairydust.space"; - keys = [{ - fingerprint = "7573 56D7 79BB B888 773E 415E 736C CDF9 EF51 BD97"; - }]; + keys = [ { fingerprint = "7573 56D7 79BB B888 773E 415E 736C CDF9 EF51 BD97"; } ]; }; qyriad = { email = "qyriad@qyriad.me"; @@ -17134,9 +16456,7 @@ email = "pr9@tuta.io"; github = "rafa-dot-el"; githubId = 104688305; - keys = [{ - fingerprint = "5F0B 3EAC F1F9 8155 0946 CDF5 469E 3255 A40D 2AD6"; - }]; + keys = [ { fingerprint = "5F0B 3EAC F1F9 8155 0946 CDF5 469E 3255 A40D 2AD6"; } ]; }; rafaelgg = { email = "rafael.garcia.gallego@gmail.com"; @@ -17186,9 +16506,7 @@ github = "rake5k"; githubId = 13007345; name = "Christian Harke"; - keys = [{ - fingerprint = "4EBB 30F1 E89A 541A A7F2 52BE 830A 9728 6309 66F4"; - }]; + keys = [ { fingerprint = "4EBB 30F1 E89A 541A A7F2 52BE 830A 9728 6309 66F4"; } ]; }; rakesh4g = { email = "rakeshgupta4u@gmail.com"; @@ -17214,9 +16532,7 @@ email = "nix@caseylink.com"; github = "Ramblurr"; githubId = 14830; - keys = [{ - fingerprint = "978C 4D08 058B A26E B97C B518 2078 2DBC ACFA ACDA"; - }]; + keys = [ { fingerprint = "978C 4D08 058B A26E B97C B518 2078 2DBC ACFA ACDA"; } ]; }; ramkromberg = { email = "ramkromberg@mail.com"; @@ -17292,9 +16608,7 @@ githubId = 98173832; name = "Balthazar Patiachvili"; matrix = "@ratcornu:skweel.skaven.org"; - keys = [{ - fingerprint = "1B91 F087 3D06 1319 D3D0 7F91 FA47 BDA2 6048 9ADA"; - }]; + keys = [ { fingerprint = "1B91 F087 3D06 1319 D3D0 7F91 FA47 BDA2 6048 9ADA"; } ]; }; ratsclub = { email = "victor@freire.dev.br"; @@ -17354,9 +16668,7 @@ name = "Rocky Breslow"; github = "rbreslow"; githubId = 1774125; - keys = [{ - fingerprint = "B5B7 BCA0 EE6F F31E 263A 69E3 A0D3 2ACC A38B 88ED"; - }]; + keys = [ { fingerprint = "B5B7 BCA0 EE6F F31E 263A 69E3 A0D3 2ACC A38B 88ED"; } ]; }; rbrewer = { email = "rwb123@gmail.com"; @@ -17375,9 +16687,7 @@ github = "rconybea"; githubId = 8570969; name = "Roland Conybeare"; - keys = [{ - fingerprint = "bw5Cr/4ul1C2UvxopphbZbFI1i5PCSnOmPID7mJ/Ogo"; - }]; + keys = [ { fingerprint = "bw5Cr/4ul1C2UvxopphbZbFI1i5PCSnOmPID7mJ/Ogo"; } ]; }; rdnetto = { email = "rdnetto@gmail.com"; @@ -17399,9 +16709,7 @@ githubId = 7413633; keys = [ # compare with https://keybase.io/reckenrode - { - fingerprint = "01D7 5486 3A6D 64EA AC77 0D26 FBF1 9A98 2CCE 0048"; - } + { fingerprint = "01D7 5486 3A6D 64EA AC77 0D26 FBF1 9A98 2CCE 0048"; } ]; }; redbaron = { @@ -17416,6 +16724,12 @@ githubId = 1922770; name = "Tim Engler"; }; + redhawk = { + email = "redhawk76767676@gmail.com"; + github = "Redhawk18"; + githubId = 77415970; + name = "Redhawk"; + }; redvers = { email = "red@infect.me"; github = "redvers"; @@ -17517,9 +16831,7 @@ name = "Tassilo Tanneberger"; github = "tanneberger"; githubId = 32239737; - keys = [{ - fingerprint = "91EB E870 1639 1323 642A 6803 B966 009D 57E6 9CC6"; - }]; + keys = [ { fingerprint = "91EB E870 1639 1323 642A 6803 B966 009D 57E6 9CC6"; } ]; }; rewine = { email = "lhongxu@outlook.com"; @@ -17544,9 +16856,7 @@ email = "nixpkgs@rgbcu.be"; github = "RGBCube"; githubId = 78925721; - keys = [{ - fingerprint = "jPaU3Vpm/GN0tUuDg72n2+bd9dDMWe4bnKM325eP7eI"; - }]; + keys = [ { fingerprint = "jPaU3Vpm/GN0tUuDg72n2+bd9dDMWe4bnKM325eP7eI"; } ]; }; rgnns = { email = "jglievano@gmail.com"; @@ -17699,12 +17009,8 @@ github = "rissson"; githubId = 18313093; keys = [ - { - fingerprint = "8A0E 6A7C 08AB B9DE 67DE 2A13 F6FD 87B1 5C26 3EC9"; - } - { - fingerprint = "C0A7 A9BB 115B C857 4D75 EA99 BBB7 A680 1DF1 E03F"; - } + { fingerprint = "8A0E 6A7C 08AB B9DE 67DE 2A13 F6FD 87B1 5C26 3EC9"; } + { fingerprint = "C0A7 A9BB 115B C857 4D75 EA99 BBB7 A680 1DF1 E03F"; } ]; }; rixed = { @@ -17768,9 +17074,7 @@ github = "rnhmjoj"; githubId = 2817565; name = "Michele Guerini Rocco"; - keys = [{ - fingerprint = "92B2 904F D293 C94D C4C9 3E6B BFBA F4C9 75F7 6450"; - }]; + keys = [ { fingerprint = "92B2 904F D293 C94D C4C9 3E6B BFBA F4C9 75F7 6450"; } ]; }; roastiek = { email = "r.dee.b.b@gmail.com"; @@ -17910,9 +17214,7 @@ github = "Rookeur"; githubId = 57438432; name = "Adrien Langou"; - keys = [{ - fingerprint = "3B8F FC41 0094 2CB4 5A2A 7DF2 5A44 DA8F 9071 91B0"; - }]; + keys = [ { fingerprint = "3B8F FC41 0094 2CB4 5A2A 7DF2 5A44 DA8F 9071 91B0"; } ]; }; roosemberth = { email = "roosembert.palacios+nixpkgs@posteo.ch"; @@ -17920,17 +17222,13 @@ github = "roosemberth"; githubId = 3621083; name = "Roosembert (Roosemberth) Palacios"; - keys = [{ - fingerprint = "78D9 1871 D059 663B 6117 7532 CAAA ECE5 C224 2BB7"; - }]; + keys = [ { fingerprint = "78D9 1871 D059 663B 6117 7532 CAAA ECE5 C224 2BB7"; } ]; }; rople380 = { name = "rople380"; github = "rople380"; githubId = 55679162; - keys = [{ - fingerprint = "1401 1B63 393D 16C1 AA9C C521 8526 B757 4A53 6236"; - }]; + keys = [ { fingerprint = "1401 1B63 393D 16C1 AA9C C521 8526 B757 4A53 6236"; } ]; }; rosehobgoblin = { name = "J. L. Bowden"; @@ -17955,9 +17253,7 @@ matrix = "@rosscomputerguy:matrix.org"; github = "RossComputerGuy"; githubId = 19699320; - keys = [{ - fingerprint = "FD5D F7A8 85BB 378A 0157 5356 B09C 4220 3566 9AF8"; - }]; + keys = [ { fingerprint = "FD5D F7A8 85BB 378A 0157 5356 B09C 4220 3566 9AF8"; } ]; }; rostan-t = { name = "Rostan Tabet"; @@ -18023,9 +17319,7 @@ github = "rrbutani"; githubId = 7833358; matrix = "@rbutani:matrix.org"; - keys = [{ - fingerprint = "7DCA 5615 8AB2 621F 2F32 9FF4 1C7C E491 479F A273"; - }]; + keys = [ { fingerprint = "7DCA 5615 8AB2 621F 2F32 9FF4 1C7C E491 479F A273"; } ]; name = "Rahul Butani"; }; rski = { @@ -18121,9 +17415,7 @@ email = "hi@grass.show"; github = "running-grass"; githubId = 17241154; - keys = [{ - fingerprint = "5156 0FAB FF32 83EC BC8C EA13 9344 3660 9397 0138"; - }]; + keys = [ { fingerprint = "5156 0FAB FF32 83EC BC8C EA13 9344 3660 9397 0138"; } ]; }; rushmorem = { email = "rushmore@webenchanter.com"; @@ -18208,9 +17500,7 @@ github = "ryane"; githubId = 7346; name = "Ryan Eschinger"; - keys = [{ - fingerprint = "E4F4 1EAB BF0F C785 06D8 62EF EF68 CF41 D42A 593D"; - }]; + keys = [ { fingerprint = "E4F4 1EAB BF0F C785 06D8 62EF EF68 CF41 D42A 593D"; } ]; }; ryangibb = { email = "ryan@freumh.org"; @@ -18253,9 +17543,7 @@ github = "rycee"; githubId = 798147; name = "Robert Helgesson"; - keys = [{ - fingerprint = "36CA CF52 D098 CC0E 78FB 0CB1 3573 356C 25C4 24D4"; - }]; + keys = [ { fingerprint = "36CA CF52 D098 CC0E 78FB 0CB1 3573 356C 25C4 24D4"; } ]; }; ryneeverett = { email = "ryneeverett@gmail.com"; @@ -18274,17 +17562,13 @@ github = "rastertail"; githubId = 8082305; name = "Maxwell Beck"; - keys = [{ - fingerprint = "D260 79E3 C2BC 2E43 905B D057 BB3E FA30 3760 A0DB"; - }]; + keys = [ { fingerprint = "D260 79E3 C2BC 2E43 905B D057 BB3E FA30 3760 A0DB"; } ]; }; ryze = { name = "Ryze"; github = "ryze312"; githubId = 50497128; - keys = [{ - fingerprint = "73D5 BFF5 0AD7 F3C1 AF1A AC24 9B29 6C5C EAEA AAC1"; - }]; + keys = [ { fingerprint = "73D5 BFF5 0AD7 F3C1 AF1A AC24 9B29 6C5C EAEA AAC1"; } ]; }; rzetterberg = { email = "richard.zetterberg@gmail.com"; @@ -18305,9 +17589,7 @@ matrix = "@mark.sagikazar:matrix.org"; github = "sagikazarmark"; githubId = 1226384; - keys = [{ - fingerprint = "E628 C811 6FB8 1657 F706 4EA4 F251 ADDC 9D04 1C7E"; - }]; + keys = [ { fingerprint = "E628 C811 6FB8 1657 F706 4EA4 F251 ADDC 9D04 1C7E"; } ]; }; sailord = { name = "Sailord"; @@ -18368,9 +17650,7 @@ github = "samlich"; githubId = 1349989; name = "samlich"; - keys = [{ - fingerprint = "AE8C 0836 FDF6 3FFC 9580 C588 B156 8953 B193 9F1C"; - }]; + keys = [ { fingerprint = "AE8C 0836 FDF6 3FFC 9580 C588 B156 8953 B193 9F1C"; } ]; }; samlukeyes123 = { email = "samlukeyes123@gmail.com"; @@ -18402,18 +17682,14 @@ email = "samuele.facenda@gmail.com"; github = "SamueleFacenda"; githubId = 92163673; - keys = [{ - fingerprint = "3BA5 A3DB 3239 E2AC 1F3B 68A0 0DB8 3F58 B259 6271"; - }]; + keys = [ { fingerprint = "3BA5 A3DB 3239 E2AC 1F3B 68A0 0DB8 3F58 B259 6271"; } ]; }; samuel-martineau = { name = "Samuel Martineau"; email = "samuel@smartineau.me"; github = "Samuel-Martineau"; githubId = 44237969; - keys = [{ - fingerprint = "79A1 CC17 67C7 32B6 A8A2 BF4F 71E0 8761 642D ACD2"; - }]; + keys = [ { fingerprint = "79A1 CC17 67C7 32B6 A8A2 BF4F 71E0 8761 642D ACD2"; } ]; }; samuelrivas = { email = "samuelrivas@gmail.com"; @@ -18438,9 +17714,7 @@ email = "samyak201@gmail.com"; github = "Samyak2"; githubId = 34161949; - keys = [{ - fingerprint = "155C F413 0129 C058 9A5F 5524 3658 73F2 F0C6 153B"; - }]; + keys = [ { fingerprint = "155C F413 0129 C058 9A5F 5524 3658 73F2 F0C6 153B"; } ]; }; sander = { email = "s.vanderburg@tudelft.nl"; @@ -18477,9 +17751,7 @@ github = "sascha8a"; githubId = 6937965; name = "Alexander Lampalzer"; - keys = [{ - fingerprint = "0350 3136 E22C C561 30E3 A4AE 2087 9CCA CD5C D670"; - }]; + keys = [ { fingerprint = "0350 3136 E22C C561 30E3 A4AE 2087 9CCA CD5C D670"; } ]; }; saschagrunert = { email = "mail@saschagrunert.de"; @@ -18597,9 +17869,7 @@ name = "Jamie Quigley"; github = "Sciencentistguy"; githubId = 4983935; - keys = [{ - fingerprint = "30BB FF3F AB0B BB3E 0435 F83C 8E8F F66E 2AE8 D970"; - }]; + keys = [ { fingerprint = "30BB FF3F AB0B BB3E 0435 F83C 8E8F F66E 2AE8 D970"; } ]; }; scm2342 = { name = "Sven Mattsen"; @@ -18644,9 +17914,7 @@ matrix = "@Scrumplex:duckhub.io"; github = "Scrumplex"; githubId = 11587657; - keys = [{ - fingerprint = "E173 237A C782 296D 98F5 ADAC E13D FD4B 4712 7951"; - }]; + keys = [ { fingerprint = "E173 237A C782 296D 98F5 ADAC E13D FD4B 4712 7951"; } ]; }; sdht0 = { email = "nixpkgs@sdht.in"; @@ -18696,20 +17964,14 @@ github = "seberm"; githubId = 212597; name = "Otto Sabart"; - keys = [{ - fingerprint = "0AF6 4C3B 1F12 14B3 8C8C 5786 1FA2 DBE6 7438 7CC3"; - }]; + keys = [ { fingerprint = "0AF6 4C3B 1F12 14B3 8C8C 5786 1FA2 DBE6 7438 7CC3"; } ]; }; sebrut = { email = "kontakt@sebastian-rutofski.de"; github = "sebrut"; githubId = 3962409; name = "Sebastian Rutofski"; - keys = [ - { - fingerprint = "F1D4 8061 2830 3AF6 42DC 3867 C37F 3374 2A95 C547"; - } - ]; + keys = [ { fingerprint = "F1D4 8061 2830 3AF6 42DC 3867 C37F 3374 2A95 C547"; } ]; }; sebtm = { email = "mail@sebastian-sellmeier.de"; @@ -18723,9 +17985,7 @@ matrix = "@sef:exotic.sh"; github = "sefidel"; githubId = 71049646; - keys = [{ - fingerprint = "8BDF DFB5 6842 2393 82A0 441B 9238 BC70 9E05 516A"; - }]; + keys = [ { fingerprint = "8BDF DFB5 6842 2393 82A0 441B 9238 BC70 9E05 516A"; } ]; }; sei40kr = { name = "Seong Yong-ju"; @@ -18787,9 +18047,7 @@ email = "sephi@fhtagn.top"; github = "sephii"; githubId = 754333; - keys = [{ - fingerprint = "2A9D 8E76 5EE2 237D 7B6B A2A5 4228 AB9E C061 2ADA"; - }]; + keys = [ { fingerprint = "2A9D 8E76 5EE2 237D 7B6B A2A5 4228 AB9E C061 2ADA"; } ]; }; sepi = { email = "raffael@mancini.lu"; @@ -18804,15 +18062,13 @@ name = "Sebastian Jordan"; }; septem9er = { - name = "Septem9er"; - email = "develop@septem9er.de"; - matrix = "@septem9er:fairydust.space"; - github = "septem9er"; - githubId = 33379902; - keys = [{ - fingerprint = "C408 07F9 8677 3D98 EFF3 0980 355A 9AFB FD8E AD33"; - }]; -}; + name = "Septem9er"; + email = "develop@septem9er.de"; + matrix = "@septem9er:fairydust.space"; + github = "septem9er"; + githubId = 33379902; + keys = [ { fingerprint = "C408 07F9 8677 3D98 EFF3 0980 355A 9AFB FD8E AD33"; } ]; + }; seqizz = { email = "seqizz@gmail.com"; github = "seqizz"; @@ -18847,9 +18103,7 @@ github = "servalcatty"; githubId = 51969817; name = "Serval"; - keys = [{ - fingerprint = "A317 37B3 693C 921B 480C C629 4A2A AAA3 82F8 294C"; - }]; + keys = [ { fingerprint = "A317 37B3 693C 921B 480C C629 4A2A AAA3 82F8 294C"; } ]; }; sestrella = { email = "sestrella.me@gmail.com"; @@ -18862,9 +18116,7 @@ email = "sable@seyleri.us"; github = "seylerius"; githubId = 1145981; - keys = [{ - fingerprint = "7246 B6E1 ABB9 9A48 4395 FD11 DC26 B921 A9E9 DBDE"; - }]; + keys = [ { fingerprint = "7246 B6E1 ABB9 9A48 4395 FD11 DC26 B921 A9E9 DBDE"; } ]; }; sfrijters = { email = "sfrijters@gmail.com"; @@ -18963,9 +18215,7 @@ github = "shayne"; githubId = 79330; name = "Shayne Sweeney"; - keys = [{ - fingerprint = "AFCB 29A0 F12E F367 9575 DABE 69DA 13E8 6BF4 03B0"; - }]; + keys = [ { fingerprint = "AFCB 29A0 F12E F367 9575 DABE 69DA 13E8 6BF4 03B0"; } ]; }; shazow = { email = "andrey.petrov@shazow.net"; @@ -19014,9 +18264,7 @@ name = "Shiryel"; github = "shiryel"; githubId = 35617139; - keys = [{ - fingerprint = "AB63 4CD9 3322 BD42 6231 F764 C404 1EA6 B326 33DE"; - }]; + keys = [ { fingerprint = "AB63 4CD9 3322 BD42 6231 F764 C404 1EA6 B326 33DE"; } ]; }; shivaraj-bh = { email = "sbh69840@gmail.com"; @@ -19071,9 +18319,7 @@ email = "shreerammodi10@gmail.com"; github = "shrimpram"; githubId = 67710369; - keys = [{ - fingerprint = "EA88 EA07 26E9 6CBF 6365 3966 163B 16EE 76ED 24CE"; - }]; + keys = [ { fingerprint = "EA88 EA07 26E9 6CBF 6365 3966 163B 16EE 76ED 24CE"; } ]; }; shyim = { email = "s.sayakci@gmail.com"; @@ -19141,9 +18387,7 @@ github = "sikmir"; githubId = 688044; name = "Nikolay Korotkiy"; - keys = [{ - fingerprint = "ADF4 C13D 0E36 1240 BD01 9B51 D1DE 6D7F 6936 63A5"; - }]; + keys = [ { fingerprint = "ADF4 C13D 0E36 1240 BD01 9B51 D1DE 6D7F 6936 63A5"; } ]; }; silky = { name = "Noon van der Silk"; @@ -19152,15 +18396,13 @@ githubId = 129525; }; sils = { - name = "Silas Schöffel"; - email = "sils@sils.li"; - matrix = "@sils:vhack.eu"; - github = "s1ls"; - githubId = 91412114; - keys = [{ - fingerprint = "C1DA A551 B422 7A6F 3FD9 6B3A 467B 7D12 9EA7 3AC9"; - }]; - }; + name = "Silas Schöffel"; + email = "sils@sils.li"; + matrix = "@sils:vhack.eu"; + github = "s1ls"; + githubId = 91412114; + keys = [ { fingerprint = "C1DA A551 B422 7A6F 3FD9 6B3A 467B 7D12 9EA7 3AC9"; } ]; + }; Silver-Golden = { name = "Brendan Golden"; email = "github+nixpkgs@brendan.ie"; @@ -19237,9 +18479,7 @@ github = "siriobalmelli"; githubId = 23038812; name = "Sirio Balmelli"; - keys = [{ - fingerprint = "B234 EFD4 2B42 FE81 EE4D 7627 F72C 4A88 7F9A 24CA"; - }]; + keys = [ { fingerprint = "B234 EFD4 2B42 FE81 EE4D 7627 F72C 4A88 7F9A 24CA"; } ]; }; sironheart = { email = "git@beisenherz.dev"; @@ -19343,30 +18583,24 @@ slotThe = { name = "Tony Zorman"; email = "tonyzorman@mailbox.org"; - github= "slotThe"; + github = "slotThe"; matrix = "@slot-:matrix.org"; githubId = 50166980; - keys = [{ - fingerprint = "4896 FB6C 9528 46C3 414C 2475 C927 DE8C 7DFD 57B8"; - }]; + keys = [ { fingerprint = "4896 FB6C 9528 46C3 414C 2475 C927 DE8C 7DFD 57B8"; } ]; }; slwst = { email = "email@slw.st"; github = "slwst"; githubId = 11047377; name = "slwst"; - keys = [{ - fingerprint = "6CEB 4A2F E6DC C345 1B2B 4733 AD52 C5FB 3EFE CC7A"; - }]; + keys = [ { fingerprint = "6CEB 4A2F E6DC C345 1B2B 4733 AD52 C5FB 3EFE CC7A"; } ]; }; smakarov = { email = "setser200018@gmail.com"; github = "SeTSeR"; githubId = 12733495; name = "Sergey Makarov"; - keys = [{ - fingerprint = "6F8A 18AE 4101 103F 3C54 24B9 6AA2 3A11 93B7 064B"; - }]; + keys = [ { fingerprint = "6F8A 18AE 4101 103F 3C54 24B9 6AA2 3A11 93B7 064B"; } ]; }; smancill = { email = "smancill@smancill.dev"; @@ -19379,9 +18613,7 @@ github = "smaret"; githubId = 95471; name = "Sébastien Maret"; - keys = [{ - fingerprint = "4242 834C D401 86EF 8281 4093 86E3 0E5A 0F5F C59C"; - }]; + keys = [ { fingerprint = "4242 834C D401 86EF 8281 4093 86E3 0E5A 0F5F C59C"; } ]; }; smasher164 = { email = "aindurti@gmail.com"; @@ -19407,9 +18639,7 @@ email = "mason.bourgeois@gmail.com"; github = "Smona"; githubId = 7091399; - keys = [{ - fingerprint = "897E 6BE3 0345 B43D CADD 05B7 290F CF08 1AED B3EC"; - }]; + keys = [ { fingerprint = "897E 6BE3 0345 B43D CADD 05B7 290F CF08 1AED B3EC"; } ]; }; smrehman = { name = "Syed Moiz Ur Rehman"; @@ -19458,9 +18688,7 @@ github = "snf1k"; githubId = 149651684; matrix = "@snowflake:mozilla.org"; - keys = [{ - fingerprint = "8223 7B6F 2FF4 8F16 B652 6CA3 934F 9E5F 9701 2C0B"; - }]; + keys = [ { fingerprint = "8223 7B6F 2FF4 8F16 B652 6CA3 934F 9E5F 9701 2C0B"; } ]; }; snpschaaf = { email = "philipe.schaaf@secunet.com"; @@ -19503,9 +18731,7 @@ name = "Soham S Gumaste"; github = "SohamG"; githubId = 7116239; - keys = [{ - fingerprint = "E067 520F 5EF2 C175 3F60 50C0 BA46 725F 6A26 7442"; - }]; + keys = [ { fingerprint = "E067 520F 5EF2 C175 3F60 50C0 BA46 725F 6A26 7442"; } ]; }; soispha = { name = "Soispha"; @@ -19513,9 +18739,7 @@ matrix = "@soispha:vhack.eu"; github = "soispha"; githubId = 132207423; - keys = [{ - fingerprint = "9606 FC74 9FCE 1636 0723 D4AD A5E9 4010 C3A6 42AD"; - }]; + keys = [ { fingerprint = "9606 FC74 9FCE 1636 0723 D4AD A5E9 4010 C3A6 42AD"; } ]; }; solson = { email = "scott@solson.me"; @@ -19562,9 +18786,7 @@ name = "Ruby Iris Juric"; github = "Sorixelle"; githubId = 38685302; - keys = [{ - fingerprint = "2D76 76C7 A28E 16FC 75C7 268D 1B55 6ED8 4B0E 303A"; - }]; + keys = [ { fingerprint = "2D76 76C7 A28E 16FC 75C7 268D 1B55 6ED8 4B0E 303A"; } ]; }; sorki = { email = "srk@48.io"; @@ -19596,9 +18818,7 @@ matrix = "@soywod:matrix.org"; github = "soywod"; githubId = 10437171; - keys = [{ - fingerprint = "75F0 AB7C FE01 D077 AEE6 CAFD 353E 4A18 EE0F AB72"; - }]; + keys = [ { fingerprint = "75F0 AB7C FE01 D077 AEE6 CAFD 353E 4A18 EE0F AB72"; } ]; }; spacefault = { github = "spacefault"; @@ -19659,9 +18879,7 @@ email = "bintangadiputrapratama@gmail.com"; github = "spitulax"; githubId = 96517350; - keys = [{ - fingerprint = "652F FAAD 5CB8 AF1D 3F96 9521 929E D6C4 0414 D3F5"; - }]; + keys = [ { fingerprint = "652F FAAD 5CB8 AF1D 3F96 9521 929E D6C4 0414 D3F5"; } ]; }; spk = { email = "laurent@spkdev.net"; @@ -19758,9 +18976,7 @@ email = "starcraft66@gmail.com"; github = "starcraft66"; githubId = 1858154; - keys = [{ - fingerprint = "8597 4506 EC69 5392 0443 0805 9D98 CDAC FF04 FD78"; - }]; + keys = [ { fingerprint = "8597 4506 EC69 5392 0443 0805 9D98 CDAC FF04 FD78"; } ]; }; stargate01 = { email = "christoph.honal@web.de"; @@ -19822,9 +19038,7 @@ matrix = "@steinybot:matrix.org"; github = "steinybot"; githubId = 4659562; - keys = [{ - fingerprint = "2709 1DEC CC42 4635 4299 569C 21DE 1CAE 5976 2A0F"; - }]; + keys = [ { fingerprint = "2709 1DEC CC42 4635 4299 569C 21DE 1CAE 5976 2A0F"; } ]; }; stelcodes = { email = "stel@stel.codes"; @@ -19837,9 +19051,7 @@ email = "ysun@hey.com"; github = "stepbrobd"; githubId = 81826728; - keys = [{ - fingerprint = "AC7C 52E6 BA2F E8DE 8F0F 5D78 D973 170F 9B86 DB70"; - }]; + keys = [ { fingerprint = "AC7C 52E6 BA2F E8DE 8F0F 5D78 D973 170F 9B86 DB70"; } ]; }; stephank = { email = "nix@stephank.nl"; @@ -19853,9 +19065,7 @@ email = "stephen.huan@cgdct.moe"; github = "stephen-huan"; githubId = 20411956; - keys = [{ - fingerprint = "EA6E 2794 8C7D BF5D 0DF0 85A1 0FBC 2E3B A99D D60E"; - }]; + keys = [ { fingerprint = "EA6E 2794 8C7D BF5D 0DF0 85A1 0FBC 2E3B A99D D60E"; } ]; }; stephenmw = { email = "stephen@q5comm.com"; @@ -19885,9 +19095,7 @@ email = "steven@steshaw.org"; github = "steshaw"; githubId = 45735; - keys = [{ - fingerprint = "0AFE 77F7 474D 1596 EE55 7A29 1D9A 17DF D23D CB91"; - }]; + keys = [ { fingerprint = "0AFE 77F7 474D 1596 EE55 7A29 1D9A 17DF D23D CB91"; } ]; }; stesie = { email = "stesie@brokenpipe.de"; @@ -19936,7 +19144,7 @@ github = "StillerHarpo"; githubId = 25526706; name = "Florian Engel"; - keys = [{ fingerprint = "4E2D9B26940E0DABF376B7AF76762421D45837DE"; }]; + keys = [ { fingerprint = "4E2D9B26940E0DABF376B7AF76762421D45837DE"; } ]; matrix = "@qe7ftcyrpg:matrix.org"; }; stites = { @@ -19999,9 +19207,7 @@ matrix = "@stv0ge:matrix.org"; github = "stv0g"; githubId = 285829; - keys = [{ - fingerprint = "09BE 3BAE 8D55 D4CD 8579 285A 9675 EAC3 4897 E6E2"; - }]; + keys = [ { fingerprint = "09BE 3BAE 8D55 D4CD 8579 285A 9675 EAC3 4897 E6E2"; } ]; }; SubhrajyotiSen = { email = "subhrajyoti12@gmail.com"; @@ -20228,9 +19434,7 @@ github = "t4ccer"; githubId = 64430288; name = "Tomasz Maciosowski"; - keys = [{ - fingerprint = "6866 981C 4992 4D64 D154 E1AC 19E5 A2D8 B1E4 3F19"; - }]; + keys = [ { fingerprint = "6866 981C 4992 4D64 D154 E1AC 19E5 A2D8 B1E4 3F19"; } ]; }; t4sm5n = { email = "t4sm5n@gmail.com"; @@ -20243,9 +19447,7 @@ github = "tadeokondrak"; githubId = 4098453; name = "Tadeo Kondrak"; - keys = [{ - fingerprint = "0F2B C0C7 E77C 5B42 AC5B 4C18 FBE6 07FC C495 16D3"; - }]; + keys = [ { fingerprint = "0F2B C0C7 E77C 5B42 AC5B 4C18 FBE6 07FC C495 16D3"; } ]; }; tadfisher = { email = "tadfisher@gmail.com"; @@ -20270,9 +19472,7 @@ github = "taikx4"; githubId = 94917129; name = "taikx4"; - keys = [{ - fingerprint = "6B02 8103 C4E5 F68C D77C 9E54 CCD5 2C7B 37BB 837E"; - }]; + keys = [ { fingerprint = "6B02 8103 C4E5 F68C D77C 9E54 CCD5 2C7B 37BB 837E"; } ]; }; tailhook = { email = "paul@colomiets.name"; @@ -20407,9 +19607,7 @@ email = "contact@tchekda.fr"; github = "Tchekda"; githubId = 23559888; - keys = [{ - fingerprint = "44CE A8DD 3B31 49CD 6246 9D8F D0A0 07ED A4EA DA0F"; - }]; + keys = [ { fingerprint = "44CE A8DD 3B31 49CD 6246 9D8F D0A0 07ED A4EA DA0F"; } ]; name = "David Tchekachev"; }; tcheronneau = { @@ -20429,12 +19627,6 @@ githubId = 2389333; name = "Andy Tockman"; }; - tcmal = { - email = "me@aria.rip"; - github = "tcmal"; - githubId = 4183876; - name = "Aria Shrimpton"; - }; teatwig = { email = "nix@teatwig.net"; name = "tea"; @@ -20476,7 +19668,7 @@ matrix = "@tejing:matrix.org"; github = "tejing1"; githubId = 5663576; - keys = [{ fingerprint = "6F0F D43B 80E5 583E 60FC 51DC 4936 D067 EB12 AB32"; }]; + keys = [ { fingerprint = "6F0F D43B 80E5 583E 60FC 51DC 4936 D067 EB12 AB32"; } ]; }; telotortium = { email = "rirelan@gmail.com"; @@ -20545,9 +19737,7 @@ github = "teutat3s"; githubId = 10206665; name = "teutat3s"; - keys = [{ - fingerprint = "81A1 1C61 F413 8C84 9139 A4FA 18DA E600 A6BB E705"; - }]; + keys = [ { fingerprint = "81A1 1C61 F413 8C84 9139 A4FA 18DA E600 A6BB E705"; } ]; }; tex = { email = "milan.svoboda@centrum.cz"; @@ -20609,18 +19799,14 @@ matrix = "@thbltp:matrix.org"; github = "thblt"; githubId = 2453136; - keys = [{ - fingerprint = "D2A2 F0A1 E7A8 5E6F B711 DEE5 63A4 4817 A52E AB7B"; - }]; + keys = [ { fingerprint = "D2A2 F0A1 E7A8 5E6F B711 DEE5 63A4 4817 A52E AB7B"; } ]; }; theaninova = { name = "Thea Schöbl"; email = "dev@theaninova.de"; github = "Theaninova"; githubId = 19289296; - keys = [{ - fingerprint = "6C9E EFC5 1AE0 0131 78DE B9C8 68FF FB1E C187 88CA"; - }]; + keys = [ { fingerprint = "6C9E EFC5 1AE0 0131 78DE B9C8 68FF FB1E C187 88CA"; } ]; }; the-argus = { email = "i.mcfarlane2002@gmail.com"; @@ -20671,9 +19857,7 @@ email = "anisimovkosta19@gmail.com"; github = "TheKostins"; githubId = 39405421; - keys = [{ - fingerprint = "B216 7B33 E248 097F D82A 991D C94D 589A 4D0D CDD2"; - }]; + keys = [ { fingerprint = "B216 7B33 E248 097F D82A 991D C94D 589A 4D0D CDD2"; } ]; }; thelegy = { email = "mail+nixos@0jb.de"; @@ -20704,9 +19888,7 @@ github = "therealr5"; githubId = 72568063; name = "Rouven Seifert"; - keys = [{ - fingerprint = "1169 87A8 DD3F 78FF 8601 BF4D B95E 8FE6 B11C 4D09"; - }]; + keys = [ { fingerprint = "1169 87A8 DD3F 78FF 8601 BF4D B95E 8FE6 B11C 4D09"; } ]; }; therishidesai = { email = "desai.rishi1@gmail.com"; @@ -20718,9 +19900,7 @@ email = "me@thesola.io"; github = "Thesola10"; githubId = 7287268; - keys = [{ - fingerprint = "1D05 13A6 1AC4 0D8D C6D6 5F2C 8924 5619 BEBB 95BA"; - }]; + keys = [ { fingerprint = "1D05 13A6 1AC4 0D8D C6D6 5F2C 8924 5619 BEBB 95BA"; } ]; name = "Karim Vergnes"; }; thetallestjj = { @@ -20838,9 +20018,7 @@ github = "Thunderbottom"; githubId = 11243138; name = "Chinmay D. Pai"; - keys = [{ - fingerprint = "7F3E EEAA EE66 93CC 8782 042A 7550 7BE2 56F4 0CED"; - }]; + keys = [ { fingerprint = "7F3E EEAA EE66 93CC 8782 042A 7550 7BE2 56F4 0CED"; } ]; }; thyol = { name = "thyol"; @@ -20952,18 +20130,14 @@ name = "Theodore Ni"; github = "tjni"; githubId = 3806110; - keys = [{ - fingerprint = "4384 B8E1 299F C028 1641 7B8F EC30 EFBE FA7E 84A4"; - }]; + keys = [ { fingerprint = "4384 B8E1 299F C028 1641 7B8F EC30 EFBE FA7E 84A4"; } ]; }; tkerber = { email = "tk@drwx.org"; github = "tkerber"; githubId = 5722198; name = "Thomas Kerber"; - keys = [{ - fingerprint = "556A 403F B0A2 D423 F656 3424 8489 B911 F9ED 617B"; - }]; + keys = [ { fingerprint = "556A 403F B0A2 D423 F656 3424 8489 B911 F9ED 617B"; } ]; }; tljuniper = { email = "tljuniper1@gmail.com"; @@ -21019,9 +20193,7 @@ github = "toastal"; githubId = 561087; name = "toastal"; - keys = [{ - fingerprint = "7944 74B7 D236 DAB9 C9EF E7F9 5CCE 6F14 66D4 7C9E"; - }]; + keys = [ { fingerprint = "7944 74B7 D236 DAB9 C9EF E7F9 5CCE 6F14 66D4 7C9E"; } ]; }; toasteruwu = { email = "Aki@ToasterUwU.com"; @@ -21064,9 +20236,7 @@ githubId = 62384384; matrix = "@tomasajt:matrix.org"; name = "TomaSajt"; - keys = [{ - fingerprint = "8CA9 8016 F44D B717 5B44 6032 F011 163C 0501 22A1"; - }]; + keys = [ { fingerprint = "8CA9 8016 F44D B717 5B44 6032 F011 163C 0501 22A1"; } ]; }; tomaskala = { email = "public+nixpkgs@tomaskala.com"; @@ -21103,9 +20273,7 @@ github = "tomodachi94"; githubId = 68489118; name = "Tomodachi94"; - keys = [{ - fingerprint = "B208 D6E5 B8ED F47D 5687 627B 2E27 5F21 C4D5 54A3"; - }]; + keys = [ { fingerprint = "B208 D6E5 B8ED F47D 5687 627B 2E27 5F21 C4D5 54A3"; } ]; }; tomsiewert = { email = "tom@siewert.io"; @@ -21325,9 +20493,7 @@ github = "tuxinaut"; githubId = 722482; name = "Denny Schäfer"; - keys = [{ - fingerprint = "C752 0E49 4D92 1740 D263 C467 B057 455D 1E56 7270"; - }]; + keys = [ { fingerprint = "C752 0E49 4D92 1740 D263 C467 B057 455D 1E56 7270"; } ]; }; tv = { email = "tv@krebsco.de"; @@ -21376,9 +20542,7 @@ email = "twhitehead@gmail.com"; github = "twhitehead"; githubId = 787843; - keys = [{ - fingerprint = "E631 8869 586F 99B4 F6E6 D785 5942 58F0 389D 2802"; - }]; + keys = [ { fingerprint = "E631 8869 586F 99B4 F6E6 D785 5942 58F0 389D 2802"; } ]; }; twitchy0 = { email = "code@nitinpassa.com"; @@ -21391,9 +20555,7 @@ email = "tom@bibbu.net"; github = "twz123"; githubId = 1215104; - keys = [{ - fingerprint = "B1FD 4E2A 84B2 2379 F4BF 2EF5 FE33 A228 2371 E831"; - }]; + keys = [ { fingerprint = "B1FD 4E2A 84B2 2379 F4BF 2EF5 FE33 A228 2371 E831"; } ]; }; tylerjl = { email = "tyler+nixpkgs@langlois.to"; @@ -21473,36 +20635,28 @@ matrix = "@unhidden0174:matrix.org"; github = "unclamped"; githubId = 104658278; - keys = [{ - fingerprint = "57A2 CC43 3068 CB62 89C1 F1DA 9137 BB2E 77AD DE7E"; - }]; + keys = [ { fingerprint = "57A2 CC43 3068 CB62 89C1 F1DA 9137 BB2E 77AD DE7E"; } ]; }; unclechu = { name = "Viacheslav Lotsmanov"; email = "lotsmanov89@gmail.com"; github = "unclechu"; githubId = 799353; - keys = [{ - fingerprint = "EE59 5E29 BB5B F2B3 5ED2 3F1C D276 FF74 6700 7335"; - }]; + keys = [ { fingerprint = "EE59 5E29 BB5B F2B3 5ED2 3F1C D276 FF74 6700 7335"; } ]; }; undefined-moe = { name = "undefined"; email = "i@undefined.moe"; github = "undefined-moe"; githubId = 29992205; - keys = [{ - fingerprint = "6684 4E7D D213 C75D 8828 6215 C714 A58B 6C1E 0F52"; - }]; + keys = [ { fingerprint = "6684 4E7D D213 C75D 8828 6215 C714 A58B 6C1E 0F52"; } ]; }; unhammer = { email = "unhammer@fsfe.org"; github = "unhammer"; githubId = 56868; name = "Kevin Brubeck Unhammer"; - keys = [{ - fingerprint = "50D4 8796 0B86 3F05 4B6A 12F9 7426 06DE 766A C60C"; - }]; + keys = [ { fingerprint = "50D4 8796 0B86 3F05 4B6A 12F9 7426 06DE 766A C60C"; } ]; }; uniquepointer = { email = "uniquepointer@mailbox.org"; @@ -21540,9 +20694,7 @@ matrix = "@urandom0:matrix.org"; github = "urandom2"; githubId = 2526260; - keys = [{ - fingerprint = "04A3 A2C6 0042 784A AEA7 D051 0447 A663 F7F3 E236"; - }]; + keys = [ { fingerprint = "04A3 A2C6 0042 784A AEA7 D051 0447 A663 F7F3 E236"; } ]; name = "Colin Arnott"; }; urbas = { @@ -21672,9 +20824,7 @@ github = "VergeDX"; githubId = 25173827; name = "Vanilla"; - keys = [{ - fingerprint = "2649 340C C909 F821 D251 6714 3750 028E D04F A42E"; - }]; + keys = [ { fingerprint = "2649 340C C909 F821 D251 6714 3750 028E D04F A42E"; } ]; }; vanschelven = { email = "klaas@vanschelven.com"; @@ -21731,9 +20881,7 @@ matrix = "@vcunat:matrix.org"; github = "vcunat"; githubId = 1785925; - keys = [{ - fingerprint = "B600 6460 B60A 80E7 8206 2449 E747 DF1F 9575 A3AA"; - }]; + keys = [ { fingerprint = "B600 6460 B60A 80E7 8206 2449 E747 DF1F 9575 A3AA"; } ]; }; vdemeester = { email = "vincent@sbr.pm"; @@ -21758,9 +20906,7 @@ email = "mail@vincent-haupert.de"; github = "veehaitch"; githubId = 15069839; - keys = [{ - fingerprint = "4D23 ECDF 880D CADF 5ECA 4458 874B D6F9 16FA A742"; - }]; + keys = [ { fingerprint = "4D23 ECDF 880D CADF 5ECA 4458 874B D6F9 16FA A742"; } ]; }; vel = { email = "llathasa@outlook.com"; @@ -21785,9 +20931,7 @@ email = "me@skye.vg"; github = "vgskye"; githubId = 116078858; - keys = [{ - fingerprint = "CDEA 7E04 69E3 0885 A754 4B05 0104 BC05 F41B 77B8"; - }]; + keys = [ { fingerprint = "CDEA 7E04 69E3 0885 A754 4B05 0104 BC05 F41B 77B8"; } ]; }; victormeriqui = { name = "Victor Meriqui"; @@ -21800,9 +20944,7 @@ github = "victormignot"; githubId = 58660971; name = "Victor Mignot"; - keys = [{ - fingerprint = "CA5D F91A D672 683A 1F65 BBC9 0317 096D 20E0 067B"; - }]; + keys = [ { fingerprint = "CA5D F91A D672 683A 1F65 BBC9 0317 096D 20E0 067B"; } ]; }; vidbina = { email = "vid@bina.me"; @@ -21833,9 +20975,7 @@ github = "vikanezrimaya"; githubId = 7953163; name = "Vika Shleina"; - keys = [{ - fingerprint = "5814 50EB 6E17 E715 7C63 E7F1 9879 8C3C 4D68 8D6D"; - }]; + keys = [ { fingerprint = "5814 50EB 6E17 E715 7C63 E7F1 9879 8C3C 4D68 8D6D"; } ]; }; viktornordling = { email = "antique_paler_0i@icloud.com"; @@ -21860,9 +21000,7 @@ github = "vincentbernat"; githubId = 631446; name = "Vincent Bernat"; - keys = [{ - fingerprint = "AEF2 3487 66F3 71C6 89A7 3600 95A4 2FE8 3535 25F9"; - }]; + keys = [ { fingerprint = "AEF2 3487 66F3 71C6 89A7 3600 95A4 2FE8 3535 25F9"; } ]; }; vinetos = { name = "vinetos"; @@ -21965,9 +21103,7 @@ github = "vncsb"; githubId = 19562240; name = "Vinicius Bernardino"; - keys = [{ - fingerprint = "F0D3 920C 722A 541F 0CCD 66E3 A7BA BA05 3D78 E7CA"; - }]; + keys = [ { fingerprint = "F0D3 920C 722A 541F 0CCD 66E3 A7BA BA05 3D78 E7CA"; } ]; }; voidless = { email = "julius.schmitt@yahoo.de"; @@ -22082,9 +21218,7 @@ email = "wackbyte@pm.me"; github = "wackbyte"; githubId = 29505620; - keys = [{ - fingerprint = "E595 7FE4 FEF6 714B 1AD3 1483 937F 2AE5 CCEF BF59"; - }]; + keys = [ { fingerprint = "E595 7FE4 FEF6 714B 1AD3 1483 937F 2AE5 CCEF BF59"; } ]; }; waelwindows = { email = "waelwindows9922@gmail.com"; @@ -22097,9 +21231,7 @@ email = "williamvphan@yahoo.fr"; github = "wahtique"; githubId = 55251330; - keys = [{ - fingerprint = "9262 E3A7 D129 C4DD A7C1 26CE 370D D9BE 9121 F0B3"; - }]; + keys = [ { fingerprint = "9262 E3A7 D129 C4DD A7C1 26CE 370D D9BE 9121 F0B3"; } ]; }; waiting-for-dev = { email = "marc@lamarciana.com"; @@ -22112,9 +21244,7 @@ email = "sheng@a64.work"; github = "wakira"; githubId = 2338339; - keys = [{ - fingerprint = "47F7 009E 3AE3 1DA7 988E 12E1 8C9B 0A8F C0C0 D862"; - }]; + keys = [ { fingerprint = "47F7 009E 3AE3 1DA7 988E 12E1 8C9B 0A8F C0C0 D862"; } ]; }; wamirez = { email = "wamirez@protonmail.com"; @@ -22165,9 +21295,7 @@ matrix = "@weathercold:matrix.org"; github = "Weathercold"; githubId = 49368953; - keys = [{ - fingerprint = "D20F C904 A145 8B28 53D8 FBA0 0422 0096 01E4 87FC"; - }]; + keys = [ { fingerprint = "D20F C904 A145 8B28 53D8 FBA0 0422 0096 01E4 87FC"; } ]; }; wegank = { name = "Weijia Wang"; @@ -22186,9 +21314,7 @@ github = "welteki"; githubId = 16267532; name = "Han Verstraete"; - keys = [{ - fingerprint = "2145 955E 3F5E 0C95 3458 41B5 11F7 BAEA 8567 43FF"; - }]; + keys = [ { fingerprint = "2145 955E 3F5E 0C95 3458 41B5 11F7 BAEA 8567 43FF"; } ]; }; wenngle = { name = "Zeke Stephens"; @@ -22219,9 +21345,7 @@ email = "wgn@wesnel.dev"; github = "wesnel"; githubId = 43357387; - keys = [{ - fingerprint = "F844 80B2 0CA9 D6CC C7F5 2479 A776 D2AD 099E 8BC0"; - }]; + keys = [ { fingerprint = "F844 80B2 0CA9 D6CC C7F5 2479 A776 D2AD 099E 8BC0"; } ]; }; wexder = { email = "wexder19@gmail.com"; @@ -22240,9 +21364,7 @@ github = "WhiteBlackGoose"; githubId = 31178401; name = "WhiteBlackGoose"; - keys = [{ - fingerprint = "640B EDDE 9734 310A BFA3 B257 52ED AE6A 3995 AFAB"; - }]; + keys = [ { fingerprint = "640B EDDE 9734 310A BFA3 B257 52ED AE6A 3995 AFAB"; } ]; }; whiteley = { email = "mattwhiteley@gmail.com"; @@ -22273,19 +21395,19 @@ email = "go.wigust@gmail.com"; github = "wigust"; githubId = 7709598; - keys = [{ - # primary: "C955 CC5D C048 7FB1 7966 40A9 199A F6A3 67E9 4ABB" - fingerprint = "7238 7123 8EAC EB63 4548 5857 167F 8EA5 001A FA9C"; - }]; + keys = [ + { + # primary: "C955 CC5D C048 7FB1 7966 40A9 199A F6A3 67E9 4ABB" + fingerprint = "7238 7123 8EAC EB63 4548 5857 167F 8EA5 001A FA9C"; + } + ]; }; wildsebastian = { name = "Sebastian Wild"; email = "sebastian@wild-siena.com"; github = "wildsebastian"; githubId = 1215623; - keys = [{ - fingerprint = "DA03 D6C6 3F58 E796 AD26 E99B 366A 2940 479A 06FC"; - }]; + keys = [ { fingerprint = "DA03 D6C6 3F58 E796 AD26 E99B 366A 2940 479A 06FC"; } ]; }; willbush = { email = "git@willbush.dev"; @@ -22293,9 +21415,7 @@ github = "willbush"; githubId = 2023546; name = "Will Bush"; - keys = [{ - fingerprint = "4441 422E 61E4 C8F3 EBFE 5E33 3823 864B 54B1 3BDA"; - }]; + keys = [ { fingerprint = "4441 422E 61E4 C8F3 EBFE 5E33 3823 864B 54B1 3BDA"; } ]; }; willcohen = { github = "willcohen"; @@ -22307,9 +21427,7 @@ github = "williamvds"; githubId = 26379999; name = "William Vigolo"; - keys = [{ - fingerprint = "9848 B216 BCBE 29BB 1C6A E0D5 7A4D F5A8 CDBD 49C7"; - }]; + keys = [ { fingerprint = "9848 B216 BCBE 29BB 1C6A E0D5 7A4D F5A8 CDBD 49C7"; } ]; }; willibutz = { email = "willibutz@posteo.de"; @@ -22363,9 +21481,7 @@ email = "jade@witchof.space"; github = "witchof0x20"; githubId = 36118348; - keys = [{ - fingerprint = "69C9 876B 5797 1B2E 11C5 7C39 80A1 F76F C9F9 54AE"; - }]; + keys = [ { fingerprint = "69C9 876B 5797 1B2E 11C5 7C39 80A1 F76F C9F9 54AE"; } ]; }; wizeman = { email = "rcorreia@wizy.org"; @@ -22438,9 +21554,7 @@ email = "walther@technowledgy.de"; github = "wolfgangwalther"; githubId = 9132420; - keys = [{ - fingerprint = "F943 A0BC 720C 5BEF 73CD E02D B398 93FA 5F65 CAE1"; - }]; + keys = [ { fingerprint = "F943 A0BC 720C 5BEF 73CD E02D B398 93FA 5F65 CAE1"; } ]; }; womfoo = { email = "kranium@gikos.net"; @@ -22483,9 +21597,7 @@ email = "Winston@Milli.ng"; github = "wrmilling"; githubId = 6162814; - keys = [{ - fingerprint = "21E1 6B8D 2EE8 7530 6A6C 9968 D830 77B9 9F8C 6643"; - }]; + keys = [ { fingerprint = "21E1 6B8D 2EE8 7530 6A6C 9968 D830 77B9 9F8C 6643"; } ]; }; wscott = { email = "wsc9tt@gmail.com"; @@ -22626,7 +21738,7 @@ xgwq = { name = "XGWQ"; email = "nixos.xgwq@xnee.net"; - keys = [{ fingerprint = "6489 9EF2 A256 5C04 7426 686C 8337 A748 74EB E129"; }]; + keys = [ { fingerprint = "6489 9EF2 A256 5C04 7426 686C 8337 A748 74EB E129"; } ]; matrix = "@xgwq:nerdberg.de"; github = "peterablehmann"; githubId = 36541313; @@ -22772,8 +21884,8 @@ github = "yavko"; githubId = 15178513; keys = [ - {fingerprint = "DC05 7015 ECD7 E68A 6426 EFD8 F07D 19A3 2407 F857";} - {fingerprint = "2874 581F F832 C9E9 AEC6 8D84 E57B F27C 8BB0 80B0";} + { fingerprint = "DC05 7015 ECD7 E68A 6426 EFD8 F07D 19A3 2407 F857"; } + { fingerprint = "2874 581F F832 C9E9 AEC6 8D84 E57B F27C 8BB0 80B0"; } ]; }; yayayayaka = { @@ -22794,14 +21906,12 @@ email = "ydlr@ydlr.io"; github = "ydlr"; githubId = 58453832; - keys = [{ - fingerprint = "FD0A C425 9EF5 4084 F99F 9B47 2ACC 9749 7C68 FAD4"; - }]; + keys = [ { fingerprint = "FD0A C425 9EF5 4084 F99F 9B47 2ACC 9749 7C68 FAD4"; } ]; }; YellowOnion = { name = "Daniel Hill"; email = "daniel@gluo.nz"; - github = "YellowOnion"; + github = "YellowOnion"; githubId = 364160; matrix = "@woobilicious:matrix.org"; }; @@ -22864,9 +21974,7 @@ name = "Yurii Matsiuk"; github = "ymatsiuk"; githubId = 24990891; - keys = [{ - fingerprint = "7BB8 84B5 74DA FDB1 E194 ED21 6130 2290 2986 01AA"; - }]; + keys = [ { fingerprint = "7BB8 84B5 74DA FDB1 E194 ED21 6130 2290 2986 01AA"; } ]; }; ymeister = { name = "Yuri Meister"; @@ -22958,9 +22066,7 @@ github = "Yumasi"; githubId = 24368641; name = "Guillaume Pagnoux"; - keys = [{ - fingerprint = "85F8 E850 F8F2 F823 F934 535B EC50 6589 9AEA AF4C"; - }]; + keys = [ { fingerprint = "85F8 E850 F8F2 F823 F934 535B EC50 6589 9AEA AF4C"; } ]; }; yunfachi = { email = "yunfachi@gmail.com"; @@ -22998,9 +22104,7 @@ github = "yusdacra"; githubId = 19897088; name = "Yusuf Bera Ertan"; - keys = [{ - fingerprint = "9270 66BD 8125 A45B 4AC4 0326 6180 7181 F60E FCB2"; - }]; + keys = [ { fingerprint = "9270 66BD 8125 A45B 4AC4 0326 6180 7181 F60E FCB2"; } ]; }; yuu = { email = "yuunix@grrlz.net"; @@ -23008,17 +22112,13 @@ github = "yuuyins"; githubId = 86538850; name = "Yuu Yin"; - keys = [{ - fingerprint = "9F19 3AE8 AA25 647F FC31 46B5 416F 303B 43C2 0AC3"; - }]; + keys = [ { fingerprint = "9F19 3AE8 AA25 647F FC31 46B5 416F 303B 43C2 0AC3"; } ]; }; yvan-sraka = { email = "yvan@sraka.xyz"; github = "yvan-sraka"; githubId = 705213; - keys = [{ - fingerprint = "FE9A 953C 97E4 54FE 6598 BFDD A4FB 3EAA 6F45 2379"; - }]; + keys = [ { fingerprint = "FE9A 953C 97E4 54FE 6598 BFDD A4FB 3EAA 6F45 2379"; } ]; matrix = "@/yvan:matrix.org"; name = "Yvan Sraka"; }; @@ -23045,9 +22145,7 @@ github = "yzx9"; githubId = 41458459; name = "Zexin Yuan"; - keys = [{ - fingerprint = "FE16 B281 90EF 6C3F F661 6441 C2DD 1916 FE47 1BE2"; - }]; + keys = [ { fingerprint = "FE16 B281 90EF 6C3F F661 6441 C2DD 1916 FE47 1BE2"; } ]; }; zachcoyle = { email = "zach.coyle@gmail.com"; @@ -23108,9 +22206,7 @@ email = "zane@zanevaniperen.com"; github = "vs49688"; githubId = 4423262; - keys = [{ - fingerprint = "61AE D40F 368B 6F26 9DAE 3892 6861 6B2D 8AC4 DCC5"; - }]; + keys = [ { fingerprint = "61AE D40F 368B 6F26 9DAE 3892 6861 6B2D 8AC4 DCC5"; } ]; }; zaninime = { email = "francesco@zanini.me"; @@ -23148,9 +22244,7 @@ email = "zacc@ztdp.ca"; github = "zedseven"; githubId = 25164338; - keys = [{ - fingerprint = "065A 0A98 FE61 E1C1 41B0 AFE7 64FA BC62 F457 2875"; - }]; + keys = [ { fingerprint = "065A 0A98 FE61 E1C1 41B0 AFE7 64FA BC62 F457 2875"; } ]; }; zelkourban = { name = "zelkourban"; @@ -23169,9 +22263,7 @@ email = "i@zenithal.me"; github = "ZenithalHourlyRate"; githubId = 19512674; - keys = [{ - fingerprint = "1127 F188 280A E312 3619 3329 87E1 7EEF 9B18 B6C9"; - }]; + keys = [ { fingerprint = "1127 F188 280A E312 3619 3329 87E1 7EEF 9B18 B6C9"; } ]; }; zeorin = { name = "Xandor Schiefer"; @@ -23179,18 +22271,14 @@ matrix = "@zeorin:matrix.org"; github = "zeorin"; githubId = 1187078; - keys = [{ - fingerprint = "863F 093A CF82 D2C8 6FD7 FB74 5E1C 0971 FE4F 665A"; - }]; + keys = [ { fingerprint = "863F 093A CF82 D2C8 6FD7 FB74 5E1C 0971 FE4F 665A"; } ]; }; zeratax = { email = "mail@zera.tax"; github = "zeratax"; githubId = 5024958; name = "Jona Abdinghoff"; - keys = [{ - fingerprint = "44F7 B797 9D3A 27B1 89E0 841E 8333 735E 784D F9D4"; - }]; + keys = [ { fingerprint = "44F7 B797 9D3A 27B1 89E0 841E 8333 735E 784D F9D4"; } ]; }; zeri = { name = "zeri"; @@ -23277,9 +22365,7 @@ githubId = 44469426; name = "Zoey de Souza Pessanha"; email = "zoey.spessanha@outlook.com"; - keys = [{ - fingerprint = "EAA1 51DB 472B 0122 109A CB17 1E1E 889C DBD6 A315"; - }]; + keys = [ { fingerprint = "EAA1 51DB 472B 0122 109A CB17 1E1E 889C DBD6 A315"; } ]; }; zohl = { email = "zohl@fmap.me"; @@ -23373,8 +22459,8 @@ zzzsy = { email = "me@zzzsy.top"; github = "zzzsyyy"; - githubId = 59917878; + githubId = 59917878; name = "Mathias Zhang"; }; } -/* Keep the list alphabetically sorted. */ +# Keep the list alphabetically sorted. diff --git a/maintainers/scripts/kde/collect-metadata.py b/maintainers/scripts/kde/collect-metadata.py index eaa619647136..3a7a3e95508e 100755 --- a/maintainers/scripts/kde/collect-metadata.py +++ b/maintainers/scripts/kde/collect-metadata.py @@ -27,8 +27,13 @@ import utils ), default=pathlib.Path(__file__).parent.parent.parent.parent ) -def main(repo_metadata: pathlib.Path, nixpkgs: pathlib.Path): - metadata = utils.KDERepoMetadata.from_repo_metadata_checkout(repo_metadata) +@click.option( + "--unstable", + default=False, + is_flag=True +) +def main(repo_metadata: pathlib.Path, nixpkgs: pathlib.Path, unstable: bool): + metadata = utils.KDERepoMetadata.from_repo_metadata_checkout(repo_metadata, unstable) out_dir = nixpkgs / "pkgs/kde/generated" metadata.write_json(out_dir) diff --git a/maintainers/scripts/kde/utils.py b/maintainers/scripts/kde/utils.py index b3a00093d703..14ca61df3554 100644 --- a/maintainers/scripts/kde/utils.py +++ b/maintainers/scripts/kde/utils.py @@ -104,7 +104,7 @@ class KDERepoMetadata: return project @classmethod - def from_repo_metadata_checkout(cls, repo_metadata: pathlib.Path): + def from_repo_metadata_checkout(cls, repo_metadata: pathlib.Path, unstable=False): projects = [ Project.from_yaml(metadata_file) for metadata_file in repo_metadata.glob("projects-invent/**/metadata.yaml") @@ -122,29 +122,32 @@ class KDERepoMetadata: dep_graph={}, ) - dep_specs = ["dependency-data-stable-kf6-qt6"] dep_graph = collections.defaultdict(set) - for spec in dep_specs: - spec_path = repo_metadata / "dependencies" / spec - for line in spec_path.open(): - line = line.strip() - if line.startswith("#"): - continue - if not line: - continue + if unstable: + spec_name = "dependency-data-kf6-qt6" + else: + spec_name = "dependency-data-stable-kf6-qt6" - dependent, dependency = line.split(": ") + spec_path = repo_metadata / "dependencies" / spec_name + for line in spec_path.open(): + line = line.strip() + if line.startswith("#"): + continue + if not line: + continue - dependent = self.try_lookup_package(dependent) - if dependent is None: - continue + dependent, dependency = line.split(": ") - dependency = self.try_lookup_package(dependency) - if dependency is None: - continue + dependent = self.try_lookup_package(dependent) + if dependent is None: + continue - dep_graph[dependent].add(dependency) + dependency = self.try_lookup_package(dependency) + if dependency is None: + continue + + dep_graph[dependent].add(dependency) self.dep_graph = dep_graph diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index a1ed29525bed..26ed7fd6ef51 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -1,4 +1,5 @@ -/* List of maintainer teams. +/* + List of maintainer teams. name = { # Required members = [ maintainer1 maintainer2 ]; @@ -25,10 +26,11 @@ * keep the list alphabetically sorted * test the validity of the format with: nix-build lib/tests/teams.nix - */ +*/ { lib }: -with lib.maintainers; { +with lib.maintainers; +{ acme = { members = [ aanderse @@ -67,9 +69,7 @@ with lib.maintainers; { minijackson yurrriq ]; - githubTeams = [ - "beam" - ]; + githubTeams = [ "beam" ]; scope = "Maintain BEAM-related packages and modules."; shortName = "BEAM"; enableFeatureFreezePing = true; @@ -95,9 +95,7 @@ with lib.maintainers; { }; budgie = { - members = [ - bobby285271 - ]; + members = [ bobby285271 ]; scope = "Maintain Budgie desktop environment"; shortName = "Budgie"; }; @@ -144,9 +142,7 @@ with lib.maintainers; { }; cloudposse = { - members = [ - dudymas - ]; + members = [ dudymas ]; scope = "Maintain atmos and applications made by the Cloud Posse team."; shortName = "CloudPosse"; enableFeatureFreezePing = true; @@ -178,12 +174,8 @@ with lib.maintainers; { }; darwin = { - members = [ - toonn - ]; - githubTeams = [ - "darwin-maintainers" - ]; + members = [ toonn ]; + githubTeams = [ "darwin-maintainers" ]; scope = "Maintain Darwin compatibility of packages and Darwin-only packages."; shortName = "Darwin"; enableFeatureFreezePing = true; @@ -213,9 +205,7 @@ with lib.maintainers; { }; deepin = { - members = [ - rewine - ]; + members = [ rewine ]; scope = "Maintain deepin desktop environment and related packages."; shortName = "DDE"; enableFeatureFreezePing = true; @@ -262,29 +252,21 @@ with lib.maintainers; { docs = { members = [ ]; - githubTeams = [ - "documentation-team" - ]; + githubTeams = [ "documentation-team" ]; scope = "Maintain nixpkgs/NixOS documentation and tools for building it."; shortName = "Docs"; enableFeatureFreezePing = true; }; emacs = { - members = [ - adisbladis - ]; + members = [ adisbladis ]; scope = "Maintain the Emacs editor and packages."; shortName = "Emacs"; }; enlightenment = { - members = [ - romildo - ]; - githubTeams = [ - "enlightenment" - ]; + members = [ romildo ]; + githubTeams = [ "enlightenment" ]; scope = "Maintain Enlightenment desktop environment and related packages."; shortName = "Enlightenment"; enableFeatureFreezePing = true; @@ -303,7 +285,12 @@ with lib.maintainers; { }; flutter = { - members = [ mkg20001 RossComputerGuy FlafyDev hacker1024 ]; + members = [ + mkg20001 + RossComputerGuy + FlafyDev + hacker1024 + ]; scope = "Maintain Flutter and Dart-related packages and build tools"; shortName = "flutter"; enableFeatureFreezePing = false; @@ -373,9 +360,7 @@ with lib.maintainers; { sikmir willcohen ]; - githubTeams = [ - "geospatial" - ]; + githubTeams = [ "geospatial" ]; scope = "Maintain geospatial packages."; shortName = "Geospatial"; enableFeatureFreezePing = true; @@ -400,9 +385,7 @@ with lib.maintainers; { qbit mfrw ]; - githubTeams = [ - "golang" - ]; + githubTeams = [ "golang" ]; scope = "Maintain Golang compilers."; shortName = "Go"; enableFeatureFreezePing = true; @@ -415,9 +398,7 @@ with lib.maintainers; { jtojnar dasj19 ]; - githubTeams = [ - "gnome" - ]; + githubTeams = [ "gnome" ]; scope = "Maintain GNOME desktop environment and platform."; shortName = "GNOME"; enableFeatureFreezePing = true; @@ -443,9 +424,7 @@ with lib.maintainers; { ncfavier sternenseemann ]; - githubTeams = [ - "haskell" - ]; + githubTeams = [ "haskell" ]; scope = "Maintain Haskell packages and infrastructure."; shortName = "Haskell"; enableFeatureFreezePing = true; @@ -472,9 +451,7 @@ with lib.maintainers; { }; infisical = { - members = [ - akhilmhdh - ]; + members = [ akhilmhdh ]; scope = "Maintain Infisical"; shortName = "Infisical"; }; @@ -568,9 +545,7 @@ with lib.maintainers; { uthar hraban ]; - githubTeams = [ - "lisp" - ]; + githubTeams = [ "lisp" ]; scope = "Maintain the Lisp ecosystem."; shortName = "lisp"; enableFeatureFreezePing = true; @@ -586,18 +561,14 @@ with lib.maintainers; { rrbutani sternenseemann ]; - githubTeams = [ - "llvm" - ]; + githubTeams = [ "llvm" ]; scope = "Maintain LLVM package sets and related packages"; shortName = "LLVM"; enableFeatureFreezePing = true; }; lomiri = { - members = [ - OPNA2608 - ]; + members = [ OPNA2608 ]; scope = "Maintain Lomiri desktop environment and related packages."; shortName = "Lomiri"; enableFeatureFreezePing = true; @@ -614,21 +585,15 @@ with lib.maintainers; { }; lua = { - githubTeams = [ - "lua" - ]; + githubTeams = [ "lua" ]; scope = "Maintain the lua ecosystem."; shortName = "lua"; enableFeatureFreezePing = true; }; lumina = { - members = [ - romildo - ]; - githubTeams = [ - "lumina" - ]; + members = [ romildo ]; + githubTeams = [ "lumina" ]; scope = "Maintain lumina desktop environment and related packages."; shortName = "Lumina"; enableFeatureFreezePing = true; @@ -647,12 +612,8 @@ with lib.maintainers; { }; lxqt = { - members = [ - romildo - ]; - githubTeams = [ - "lxqt" - ]; + members = [ romildo ]; + githubTeams = [ "lxqt" ]; scope = "Maintain LXQt desktop environment and related packages."; shortName = "LXQt"; enableFeatureFreezePing = true; @@ -717,9 +678,7 @@ with lib.maintainers; { }; mobile = { - members = [ - samueldr - ]; + members = [ samueldr ]; scope = "Maintain Mobile NixOS."; shortName = "Mobile"; }; @@ -766,21 +725,15 @@ with lib.maintainers; { }; ocaml = { - members = [ - alizter - ]; - githubTeams = [ - "ocaml" - ]; + members = [ alizter ]; + githubTeams = [ "ocaml" ]; scope = "Maintain the OCaml compiler and package set."; shortName = "OCaml"; enableFeatureFreezePing = true; }; openstack = { - members = [ - SuperSandro2000 - ]; + members = [ SuperSandro2000 ]; scope = "Maintain the ecosystem around OpenStack"; shortName = "OpenStack"; }; @@ -801,18 +754,14 @@ with lib.maintainers; { davidak bobby285271 ]; - githubTeams = [ - "pantheon" - ]; + githubTeams = [ "pantheon" ]; scope = "Maintain Pantheon desktop environment and platform."; shortName = "Pantheon"; enableFeatureFreezePing = true; }; perl = { - members = [ - sgo - ]; + members = [ sgo ]; scope = "Maintain the Perl interpreter and Perl packages."; shortName = "Perl"; enableFeatureFreezePing = true; @@ -826,9 +775,7 @@ with lib.maintainers; { patka talyz ]; - githubTeams = [ - "php" - ]; + githubTeams = [ "php" ]; scope = "Maintain PHP related packages and extensions."; shortName = "PHP"; enableFeatureFreezePing = true; @@ -839,17 +786,13 @@ with lib.maintainers; { saschagrunert vdemeester ]; - githubTeams = [ - "podman" - ]; + githubTeams = [ "podman" ]; scope = "Maintain Podman and CRI-O related packages and modules."; shortName = "Podman"; }; postgres = { - members = [ - thoughtpolice - ]; + members = [ thoughtpolice ]; scope = "Maintain the PostgreSQL package and plugins along with the NixOS module."; shortName = "PostgreSQL"; }; @@ -875,9 +818,7 @@ with lib.maintainers; { SuperSandro2000 ttuegel ]; - githubTeams = [ - "qt-kde" - ]; + githubTeams = [ "qt-kde" ]; scope = "Maintain the Qt framework, KDE application suite, Plasma desktop environment and related projects."; shortName = "Qt / KDE"; enableFeatureFreezePing = true; @@ -907,9 +848,7 @@ with lib.maintainers; { release = { members = [ ]; - githubTeams = [ - "nixos-release-managers" - ]; + githubTeams = [ "nixos-release-managers" ]; scope = "Manage the current nixpkgs/NixOS release."; shortName = "Release"; }; @@ -920,16 +859,13 @@ with lib.maintainers; { Flakebi mschwaig ]; - githubTeams = [ - "rocm-maintainers" - ]; + githubTeams = [ "rocm-maintainers" ]; scope = "Maintain ROCm and related packages."; shortName = "ROCm"; }; ruby = { - members = [ - ]; + members = [ ]; scope = "Maintain the Ruby interpreter and related packages."; shortName = "Ruby"; enableFeatureFreezePing = true; @@ -943,9 +879,7 @@ with lib.maintainers; { winter zowoq ]; - githubTeams = [ - "rust" - ]; + githubTeams = [ "rust" ]; scope = "Maintain the Rust compiler toolchain and nixpkgs integration."; shortName = "Rust"; enableFeatureFreezePing = true; @@ -976,9 +910,7 @@ with lib.maintainers; { serokell = { # Verify additions by approval of an already existing member of the team. - members = [ - balsoft - ]; + members = [ balsoft ]; scope = "Group registration for Serokell employees who collectively maintain packages."; shortName = "Serokell employees"; }; @@ -997,27 +929,21 @@ with lib.maintainers; { systemd = { members = [ ]; - githubTeams = [ - "systemd" - ]; + githubTeams = [ "systemd" ]; scope = "Maintain systemd for NixOS."; shortName = "systemd"; enableFeatureFreezePing = true; }; tests = { - members = [ - tfc - ]; + members = [ tfc ]; scope = "Maintain the NixOS VM test runner."; shortName = "NixOS tests"; enableFeatureFreezePing = true; }; tts = { - members = [ - mic92 - ]; + members = [ mic92 ]; scope = "coqui-ai TTS (formerly Mozilla TTS) and leaf packages"; shortName = "coqui-ai TTS"; }; diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index 889d39974932..ab02e6888f8d 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -15,6 +15,8 @@ - [Quickwit](https://quickwit.io), sub-second search & analytics engine on cloud storage. Available as [services.quickwit](options.html#opt-services.quickwit). +- [Flood](https://flood.js.org/), a beautiful WebUI for various torrent clients. Available as [services.flood](options.html#opt-services.flood). + - [Renovate](https://github.com/renovatebot/renovate), a dependency updating tool for various git forges and language ecosystems. Available as [services.renovate](#opt-services.renovate.enable). ## Backward Incompatibilities {#sec-release-24.11-incompatibilities} diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index b20e98a9f229..a008c3c5bdea 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1316,6 +1316,7 @@ ./services/system/zram-generator.nix ./services/torrent/deluge.nix ./services/torrent/flexget.nix + ./services/torrent/flood.nix ./services/torrent/magnetico.nix ./services/torrent/opentracker.nix ./services/torrent/peerflix.nix diff --git a/nixos/modules/services/databases/postgresql.md b/nixos/modules/services/databases/postgresql.md index 8a587832cd8c..e76f127335c7 100644 --- a/nixos/modules/services/databases/postgresql.md +++ b/nixos/modules/services/databases/postgresql.md @@ -244,6 +244,27 @@ The upgrade process is: $ ./delete_old_cluster.sh ``` +## Versioning and End-of-Life {#module-services-postgres-versioning} + +PostgreSQL's versioning policy is described [here](https://www.postgresql.org/support/versioning/). TLDR: + +- Each major version is supported for 5 years. +- Every three months there will be a new minor release, containing bug and security fixes. +- For criticial/security fixes there could be more minor releases inbetween. This happens *very* infrequently. +- After five years, a final minor version is released. This usually happens in early November. +- After that a version is considered end-of-life (EOL). +- Around February each year is the first time an EOL-release will not have received regular updates anymore. + +Technically, we'd not want to have EOL'ed packages in a stable NixOS release, which is to be supported until one month after the previous release. Thus, with NixOS' release schedule in May and November, the oldest PostgreSQL version in nixpkgs would have to be supported until December. It could be argued that a soon-to-be-EOL-ed version should thus be removed in May for the .05 release already. But since new security vulnerabilities are first disclosed in Februrary of the following year, we agreed on keeping the oldest PostgreSQL major version around one more cycle in [#310580](https://github.com/NixOS/nixpkgs/pull/310580#discussion_r1597284693). + +Thus: +- In September/October the new major version will be released and added to nixos-unstable. +- In November the last minor version for the oldest major will be released. +- Both the current stable .05 release and nixos-unstable should be updated to the latest minor. +- In November, before branch-off for the .11 release, the EOL-ed major will be removed from nixos-unstable. + +This leaves a small gap of a couple of weeks after the latest minor release and the end of our support window for the .05 release, in which there could be an emergency release to other major versions of PostgreSQL - but not the oldest major we have in that branch. In that case: If we can't trivially patch the issue, we will mark the package/version as insecure **immediately**. + ## Options {#module-services-postgres-options} A complete list of options for the PostgreSQL module may be found [here](#opt-services.postgresql.enable). diff --git a/nixos/modules/services/desktop-managers/plasma6.nix b/nixos/modules/services/desktop-managers/plasma6.nix index 5bae328accde..d4f961254f02 100644 --- a/nixos/modules/services/desktop-managers/plasma6.nix +++ b/nixos/modules/services/desktop-managers/plasma6.nix @@ -146,6 +146,7 @@ in { dolphin-plugins spectacle ffmpegthumbs + krdp ]; in requiredPackages diff --git a/nixos/modules/services/games/archisteamfarm.nix b/nixos/modules/services/games/archisteamfarm.nix index c9c41d6f4eb5..7062332db34a 100644 --- a/nixos/modules/services/games/archisteamfarm.nix +++ b/nixos/modules/services/games/archisteamfarm.nix @@ -196,7 +196,7 @@ in Group = "archisteamfarm"; WorkingDirectory = cfg.dataDir; Type = "simple"; - ExecStart = "${lib.getExe cfg.package} --no-restart --process-required --service --system-required --path ${cfg.dataDir}"; + ExecStart = "${lib.getExe cfg.package} --no-restart --service --system-required --path ${cfg.dataDir}"; Restart = "always"; # copied from the default systemd service at diff --git a/nixos/modules/services/mail/postsrsd.nix b/nixos/modules/services/mail/postsrsd.nix index 2ebc675ab10a..92f01dd4101e 100644 --- a/nixos/modules/services/mail/postsrsd.nix +++ b/nixos/modules/services/mail/postsrsd.nix @@ -120,14 +120,9 @@ in { if [ ! -e "${cfg.secretsFile}" ]; then echo "WARNING: secrets file not found, autogenerating!" DIR="$(dirname "${cfg.secretsFile}")" - if [ ! -d "$DIR" ]; then - mkdir -p -m750 "$DIR" - chown "${cfg.user}:${cfg.group}" "$DIR" - fi - dd if=/dev/random bs=18 count=1 | base64 > "${cfg.secretsFile}" - chmod 600 "${cfg.secretsFile}" + install -m 750 -o ${cfg.user} -g ${cfg.group} -d "$DIR" + install -m 600 -o ${cfg.user} -g ${cfg.group} <(dd if=/dev/random bs=18 count=1 | base64) "${cfg.secretsFile}" fi - chown "${cfg.user}:${cfg.group}" "${cfg.secretsFile}" ''; }; diff --git a/nixos/modules/services/search/qdrant.nix b/nixos/modules/services/search/qdrant.nix index f28178a5f175..41a4e9b41f6d 100644 --- a/nixos/modules/services/search/qdrant.nix +++ b/nixos/modules/services/search/qdrant.nix @@ -60,6 +60,7 @@ in { config = mkIf cfg.enable { services.qdrant.settings = { + service.static_content_dir = mkDefault pkgs.qdrant-web-ui; storage.storage_path = mkDefault "/var/lib/qdrant/storage"; storage.snapshots_path = mkDefault "/var/lib/qdrant/snapshots"; # The following default values are the same as in the default config, diff --git a/nixos/modules/services/security/oauth2-proxy-nginx.nix b/nixos/modules/services/security/oauth2-proxy-nginx.nix index 44bf56233e95..2dffeb993803 100644 --- a/nixos/modules/services/security/oauth2-proxy-nginx.nix +++ b/nixos/modules/services/security/oauth2-proxy-nginx.nix @@ -73,6 +73,7 @@ in virtualHosts.${cfg.domain}.locations."/oauth2/" = { proxyPass = cfg.proxy; extraConfig = '' + auth_request off; proxy_set_header X-Scheme $scheme; proxy_set_header X-Auth-Request-Redirect $scheme://$host$request_uri; ''; diff --git a/nixos/modules/services/torrent/flood.nix b/nixos/modules/services/torrent/flood.nix new file mode 100644 index 000000000000..213f4ef04648 --- /dev/null +++ b/nixos/modules/services/torrent/flood.nix @@ -0,0 +1,85 @@ +{ config, lib, pkgs, utils, ... }: + +let + cfg = config.services.flood; +in +{ + meta.maintainers = with lib.maintainers; [ thiagokokada ]; + + options.services.flood = { + enable = lib.mkEnableOption "flood"; + package = lib.mkPackageOption pkgs "flood" { }; + openFirewall = lib.mkEnableOption "" // { + description = "Whether to open the firewall for the port in {option}`services.flood.port`."; + }; + port = lib.mkOption { + type = lib.types.int; + description = "Port to bind webserver."; + default = 3000; + example = 3001; + }; + host = lib.mkOption { + type = lib.types.str; + description = "Host to bind webserver."; + default = "localhost"; + example = "::"; + }; + extraArgs = lib.mkOption { + type = with lib.types; listOf str; + description = "Extra arguments passed to `flood`."; + default = [ ]; + example = [ "--baseuri=/" ]; + }; + }; + + config = lib.mkIf cfg.enable { + systemd.services.flood = { + description = "A modern web UI for various torrent clients."; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + unitConfig = { + Documentation = "https://github.com/jesec/flood/wiki"; + }; + serviceConfig = { + Restart = "on-failure"; + RestartSec = "3s"; + ExecStart = utils.escapeSystemdExecArgs ([ + (lib.getExe cfg.package) + "--host" + cfg.host + "--port" + (toString cfg.port) + "--rundir=/var/lib/flood" + ] ++ cfg.extraArgs); + + CapabilityBoundingSet = [ "" ]; + DynamicUser = true; + LockPersonality = true; + NoNewPrivileges = true; + PrivateDevices = true; + PrivateTmp = true; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectProc = "invisible"; + ProtectSystem = "strict"; + RestrictAddressFamilies = [ "AF_UNIX" "AF_INET" "AF_INET6" ]; + RestrictNamespaces = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + StateDirectory = "flood"; + SystemCallArchitectures = "native"; + SystemCallFilter = [ "@system-service" "@pkey" "~@privileged" ]; + }; + }; + + networking.firewall.allowedTCPPorts = lib.mkIf cfg.openFirewall [ + cfg.port + ]; + }; +} + diff --git a/nixos/modules/services/web-apps/akkoma.nix b/nixos/modules/services/web-apps/akkoma.nix index 338e7c738338..8ba3c7eaa1e6 100644 --- a/nixos/modules/services/web-apps/akkoma.nix +++ b/nixos/modules/services/web-apps/akkoma.nix @@ -1136,6 +1136,6 @@ in { }; }; - meta.maintainers = with maintainers; [ mvs tcmal ]; + meta.maintainers = with maintainers; [ mvs ]; meta.doc = ./akkoma.md; } diff --git a/nixos/modules/services/web-apps/invoiceplane.nix b/nixos/modules/services/web-apps/invoiceplane.nix index c3dbb88619b3..9a9f180b2102 100644 --- a/nixos/modules/services/web-apps/invoiceplane.nix +++ b/nixos/modules/services/web-apps/invoiceplane.nix @@ -46,10 +46,10 @@ let version = src.version; src = pkgs.invoiceplane; - postPhase = '' + postPatch = '' # Patch index.php file to load additional config file substituteInPlace index.php \ - --replace "require('vendor/autoload.php');" "require('vendor/autoload.php'); \$dotenv = Dotenv\Dotenv::createImmutable(__DIR__, 'extraConfig.php'); \$dotenv->load();"; + --replace-fail "require('vendor/autoload.php');" "require('vendor/autoload.php'); \$dotenv = Dotenv\Dotenv::createImmutable(__DIR__, 'extraConfig.php'); \$dotenv->load();"; ''; installPhase = '' diff --git a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix index cee8663f0040..e73048dc2ecb 100644 --- a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix +++ b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix @@ -323,15 +323,15 @@ in { assertions = [ { assertion = (hasPrefix "/" efi.efiSysMountPoint); - message = "The ESP mount point '${efi.efiSysMountPoint}' must be an absolute path"; + message = "The ESP mount point '${toString efi.efiSysMountPoint}' must be an absolute path"; } { assertion = cfg.xbootldrMountPoint == null || (hasPrefix "/" cfg.xbootldrMountPoint); - message = "The XBOOTLDR mount point '${cfg.xbootldrMountPoint}' must be an absolute path"; + message = "The XBOOTLDR mount point '${toString cfg.xbootldrMountPoint}' must be an absolute path"; } { assertion = cfg.xbootldrMountPoint != efi.efiSysMountPoint; - message = "The XBOOTLDR mount point '${cfg.xbootldrMountPoint}' cannot be the same as the ESP mount point '${efi.efiSysMountPoint}'"; + message = "The XBOOTLDR mount point '${toString cfg.xbootldrMountPoint}' cannot be the same as the ESP mount point '${toString efi.efiSysMountPoint}'"; } { assertion = (config.boot.kernelPackages.kernel.features or { efiBootStub = true; }) ? efiBootStub; diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 746b29fd2725..708332a9317b 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -328,6 +328,7 @@ in { firewall-nftables = handleTest ./firewall.nix { nftables = true; }; fish = handleTest ./fish.nix {}; flannel = handleTestOn ["x86_64-linux"] ./flannel.nix {}; + flood = handleTest ./flood.nix {}; floorp = handleTest ./firefox.nix { firefoxPackage = pkgs.floorp; }; fluentd = handleTest ./fluentd.nix {}; fluidd = handleTest ./fluidd.nix {}; diff --git a/nixos/tests/flood.nix b/nixos/tests/flood.nix new file mode 100644 index 000000000000..075d37e62835 --- /dev/null +++ b/nixos/tests/flood.nix @@ -0,0 +1,27 @@ +import ./make-test-python.nix ({ pkgs, ... }: +let + port = 3001; +in +{ + name = "flood"; + meta = { + maintainers = with pkgs.lib.maintainers; [ thiagokokada ]; + }; + + nodes.machine = { pkgs, ... }: { + services.flood = { + inherit port; + enable = true; + openFirewall = true; + extraArgs = [ "--baseuri=/" ]; + }; + }; + + testScript = /* python */ '' + machine.start() + machine.wait_for_unit("flood.service") + machine.wait_for_open_port(${toString port}) + + machine.succeed("curl --fail http://localhost:${toString port}") + ''; +}) diff --git a/nixos/tests/nextcloud/basic.nix b/nixos/tests/nextcloud/basic.nix index 428fe0aa10db..2a32f2b4d199 100644 --- a/nixos/tests/nextcloud/basic.nix +++ b/nixos/tests/nextcloud/basic.nix @@ -1,27 +1,27 @@ -args@{ pkgs, nextcloudVersion ? 22, ... }: +{ name, pkgs, testBase, system,... }: -(import ../make-test-python.nix ({ pkgs, ...}: let - adminpass = "notproduction"; - adminuser = "root"; -in { - name = "nextcloud-basic"; +with import ../../lib/testing-python.nix { inherit system pkgs; }; +runTest ({ config, ... }: { + inherit name; meta = with pkgs.lib.maintainers; { - maintainers = [ globin eqyiel ]; + maintainers = [ globin eqyiel ma27 ]; }; - nodes = rec { + imports = [ testBase ]; + + nodes = { # The only thing the client needs to do is download a file. client = { ... }: { services.davfs2.enable = true; systemd.tmpfiles.settings.nextcloud = { "/tmp/davfs2-secrets"."f+" = { mode = "0600"; - argument = "http://nextcloud/remote.php/dav/files/${adminuser} ${adminuser} ${adminpass}"; + argument = "http://nextcloud/remote.php/dav/files/${config.adminuser} ${config.adminuser} ${config.adminpass}"; }; }; virtualisation.fileSystems = { "/mnt/dav" = { - device = "http://nextcloud/remote.php/dav/files/${adminuser}"; + device = "http://nextcloud/remote.php/dav/files/${config.adminuser}"; fsType = "davfs"; options = let davfs2Conf = (pkgs.writeText "davfs2.conf" "secrets /tmp/davfs2-secrets"); @@ -30,11 +30,7 @@ in { }; }; - nextcloud = { config, pkgs, ... }: let - cfg = config; - in { - networking.firewall.allowedTCPPorts = [ 80 ]; - + nextcloud = { config, pkgs, ... }: { systemd.tmpfiles.rules = [ "d /var/lib/nextcloud-data 0750 nextcloud nginx - -" ]; @@ -42,14 +38,7 @@ in { services.nextcloud = { enable = true; datadir = "/var/lib/nextcloud-data"; - hostName = "nextcloud"; - database.createLocally = true; - config = { - # Don't inherit adminuser since "root" is supposed to be the default - adminpassFile = "${pkgs.writeText "adminpass" adminpass}"; # Don't try this at home! - dbtableprefix = "nixos_"; - }; - package = pkgs.${"nextcloud" + (toString nextcloudVersion)}; + config.dbtableprefix = "nixos_"; autoUpdateApps = { enable = true; startAt = "20:00"; @@ -57,64 +46,31 @@ in { phpExtraExtensions = all: [ all.bz2 ]; }; - environment.systemPackages = [ cfg.services.nextcloud.occ ]; + specialisation.withoutMagick.configuration = { + services.nextcloud.enableImagemagick = false; + }; }; - - nextcloudWithoutMagick = args@{ config, pkgs, lib, ... }: - lib.mkMerge - [ (nextcloud args) - { services.nextcloud.enableImagemagick = false; } ]; }; - testScript = { nodes, ... }: let - withRcloneEnv = pkgs.writeScript "with-rclone-env" '' - #!${pkgs.runtimeShell} - export RCLONE_CONFIG_NEXTCLOUD_TYPE=webdav - export RCLONE_CONFIG_NEXTCLOUD_URL="http://nextcloud/remote.php/dav/files/${adminuser}" - export RCLONE_CONFIG_NEXTCLOUD_VENDOR="nextcloud" - export RCLONE_CONFIG_NEXTCLOUD_USER="${adminuser}" - export RCLONE_CONFIG_NEXTCLOUD_PASS="$(${pkgs.rclone}/bin/rclone obscure ${adminpass})" - "''${@}" - ''; - copySharedFile = pkgs.writeScript "copy-shared-file" '' - #!${pkgs.runtimeShell} - echo 'hi' | ${withRcloneEnv} ${pkgs.rclone}/bin/rclone rcat nextcloud:test-shared-file - ''; - - diffSharedFile = pkgs.writeScript "diff-shared-file" '' - #!${pkgs.runtimeShell} - diff <(echo 'hi') <(${pkgs.rclone}/bin/rclone cat nextcloud:test-shared-file) - ''; - + test-helpers.extraTests = { nodes, ... }: let findInClosure = what: drv: pkgs.runCommand "find-in-closure" { exportReferencesGraph = [ "graph" drv ]; inherit what; } '' test -e graph grep "$what" graph >$out || true ''; - nextcloudUsesImagick = findInClosure "imagick" nodes.nextcloud.system.build.vm; - nextcloudWithoutDoesntUseIt = findInClosure "imagick" nodes.nextcloudWithoutMagick.system.build.vm; + nexcloudWithImagick = findInClosure "imagick" nodes.nextcloud.system.build.vm; + nextcloudWithoutImagick = findInClosure "imagick" nodes.nextcloud.specialisation.withoutMagick.configuration.system.build.vm; in '' - assert open("${nextcloudUsesImagick}").read() != "" - assert open("${nextcloudWithoutDoesntUseIt}").read() == "" + with subtest("File is in proper nextcloud home"): + nextcloud.succeed("test -f ${nodes.nextcloud.services.nextcloud.datadir}/data/root/files/test-shared-file") - nextcloud.start() - client.start() - nextcloud.wait_for_unit("multi-user.target") - # This is just to ensure the nextcloud-occ program is working - nextcloud.succeed("nextcloud-occ status") - nextcloud.succeed("curl -sSf http://nextcloud/login") - # Ensure that no OpenSSL 1.1 is used. - nextcloud.succeed( - "${nodes.nextcloud.services.phpfpm.pools.nextcloud.phpPackage}/bin/php -i | grep 'OpenSSL Library Version' | awk -F'=>' '{ print $2 }' | awk '{ print $2 }' | grep -v 1.1" - ) - nextcloud.succeed( - "${withRcloneEnv} ${copySharedFile}" - ) - client.wait_for_unit("multi-user.target") - nextcloud.succeed("test -f /var/lib/nextcloud-data/data/root/files/test-shared-file") - client.succeed( - "${withRcloneEnv} ${diffSharedFile}" - ) - assert "hi" in client.succeed("cat /mnt/dav/test-shared-file") - nextcloud.succeed("grep -vE '^HBEGIN:oc_encryption_module' /var/lib/nextcloud-data/data/root/files/test-shared-file") + with subtest("Closure checks"): + assert open("${nexcloudWithImagick}").read() != "" + assert open("${nextcloudWithoutImagick}").read() == "" + + with subtest("Davfs2"): + assert "hi" in client.succeed("cat /mnt/dav/test-shared-file") + + with subtest("Ensure SSE is disabled by default"): + nextcloud.succeed("grep -vE '^HBEGIN:oc_encryption_module' /var/lib/nextcloud-data/data/root/files/test-shared-file") ''; -})) args +}) diff --git a/nixos/tests/nextcloud/default.nix b/nixos/tests/nextcloud/default.nix index d024adffd9f0..33aa227d2b03 100644 --- a/nixos/tests/nextcloud/default.nix +++ b/nixos/tests/nextcloud/default.nix @@ -5,21 +5,108 @@ with pkgs.lib; -foldl - (matrix: ver: matrix // { - "basic${toString ver}" = import ./basic.nix { inherit system pkgs; nextcloudVersion = ver; }; - "with-postgresql-and-redis${toString ver}" = import ./with-postgresql-and-redis.nix { - inherit system pkgs; - nextcloudVersion = ver; +let + baseModule = { config, ... }: { + imports = [ + { + options.test-helpers = { + rclone = mkOption { type = types.str; }; + upload-sample = mkOption { type = types.str; }; + check-sample = mkOption { type = types.str; }; + init = mkOption { type = types.str; default = ""; }; + extraTests = mkOption { type = types.either types.str (types.functionTo types.str); default = ""; }; + }; + options.adminuser = mkOption { type = types.str; }; + options.adminpass = mkOption { type = types.str; }; + } + ]; + + adminuser = "root"; + adminpass = "hunter2"; + + test-helpers.rclone = "${pkgs.writeShellScript "rclone" '' + set -euo pipefail + export PATH="${pkgs.rclone}/bin:$PATH" + export RCLONE_CONFIG_NEXTCLOUD_TYPE=webdav + export RCLONE_CONFIG_NEXTCLOUD_URL="http://nextcloud/remote.php/dav/files/${config.adminuser}" + export RCLONE_CONFIG_NEXTCLOUD_VENDOR="nextcloud" + export RCLONE_CONFIG_NEXTCLOUD_USER="${config.adminuser}" + export RCLONE_CONFIG_NEXTCLOUD_PASS="$(rclone obscure ${config.adminpass})" + exec "$@" + ''}"; + test-helpers.upload-sample = "${pkgs.writeShellScript "rclone-upload" '' + <<<'hi' rclone rcat nextcloud:test-shared-file + ''}"; + test-helpers.check-sample = "${pkgs.writeShellScript "check-sample" '' + set -e + diff <(echo 'hi') <(rclone cat nextcloud:test-shared-file) + ''}"; + + nodes = { + client = { ... }: {}; + nextcloud = { + networking.firewall.allowedTCPPorts = [ 80 ]; + services.nextcloud = { + enable = true; + hostName = "nextcloud"; + https = false; + database.createLocally = true; + config = { + adminpassFile = "${pkgs.writeText "adminpass" config.adminpass}"; # Don't try this at home! + }; + }; + }; }; - "with-mysql-and-memcached${toString ver}" = import ./with-mysql-and-memcached.nix { - inherit system pkgs; - nextcloudVersion = ver; - }; - "with-declarative-redis-and-secrets${toString ver}" = import ./with-declarative-redis-and-secrets.nix { - inherit system pkgs; - nextcloudVersion = ver; - }; - }) -{ } - [ 27 28 29 ] + + testScript = args@{ nodes, ... }: let + inherit (config) test-helpers; + in mkBefore '' + nextcloud.start() + client.start() + nextcloud.wait_for_unit("multi-user.target") + + ${test-helpers.init} + + with subtest("Ensure nextcloud-occ is working"): + nextcloud.succeed("nextcloud-occ status") + nextcloud.succeed("curl -sSf http://nextcloud/login") + + with subtest("Upload/Download test"): + nextcloud.succeed( + "${test-helpers.rclone} ${test-helpers.upload-sample}" + ) + client.wait_for_unit("multi-user.target") + client.succeed( + "${test-helpers.rclone} ${test-helpers.check-sample}" + ) + + ${if builtins.isFunction test-helpers.extraTests then test-helpers.extraTests args else test-helpers.extraTests} + ''; + }; + + genTests = version: + let + testBase.imports = [ + baseModule + { + nodes.nextcloud = { pkgs, ... }: { + services.nextcloud.package = pkgs.${"nextcloud${toString version}"}; + }; + } + ]; + + callNextcloudTest = path: + let + name = "${removeSuffix ".nix" (baseNameOf path)}${toString version}"; + in nameValuePair name (import path { + inherit system pkgs testBase; + name = "nextcloud-${name}"; + }); + in map callNextcloudTest [ + ./basic.nix + ./with-mysql-and-memcached.nix + ./with-postgresql-and-redis.nix + ./with-objectstore.nix + ]; +in +listToAttrs (concatMap genTests [ 27 28 29 ]) diff --git a/nixos/tests/nextcloud/with-mysql-and-memcached.nix b/nixos/tests/nextcloud/with-mysql-and-memcached.nix index 035a7fdcb0c8..07a3e56fae4a 100644 --- a/nixos/tests/nextcloud/with-mysql-and-memcached.nix +++ b/nixos/tests/nextcloud/with-mysql-and-memcached.nix @@ -1,79 +1,37 @@ -args@{ pkgs, nextcloudVersion ? 22, ... }: +{ pkgs, testBase, system, ... }: -(import ../make-test-python.nix ({ pkgs, ...}: let - adminpass = "hunter2"; - adminuser = "root"; -in { +with import ../../lib/testing-python.nix { inherit system pkgs; }; +runTest ({ config, ... }: { name = "nextcloud-with-mysql-and-memcached"; meta = with pkgs.lib.maintainers; { maintainers = [ eqyiel ]; }; + imports = [ testBase ]; + nodes = { - # The only thing the client needs to do is download a file. - client = { ... }: {}; - nextcloud = { config, pkgs, ... }: { - networking.firewall.allowedTCPPorts = [ 80 ]; - services.nextcloud = { - enable = true; - hostName = "nextcloud"; - https = true; - package = pkgs.${"nextcloud" + (toString nextcloudVersion)}; caching = { apcu = true; redis = false; memcached = true; }; - database.createLocally = true; - config = { - dbtype = "mysql"; - # Don't inherit adminuser since "root" is supposed to be the default - adminpassFile = "${pkgs.writeText "adminpass" adminpass}"; # Don't try this at home! - }; + config.dbtype = "mysql"; }; services.memcached.enable = true; }; }; - testScript = let + test-helpers.init = let configureMemcached = pkgs.writeScript "configure-memcached" '' - #!${pkgs.runtimeShell} nextcloud-occ config:system:set memcached_servers 0 0 --value 127.0.0.1 --type string nextcloud-occ config:system:set memcached_servers 0 1 --value 11211 --type integer nextcloud-occ config:system:set memcache.local --value '\OC\Memcache\APCu' --type string nextcloud-occ config:system:set memcache.distributed --value '\OC\Memcache\Memcached' --type string ''; - withRcloneEnv = pkgs.writeScript "with-rclone-env" '' - #!${pkgs.runtimeShell} - export RCLONE_CONFIG_NEXTCLOUD_TYPE=webdav - export RCLONE_CONFIG_NEXTCLOUD_URL="http://nextcloud/remote.php/dav/files/${adminuser}" - export RCLONE_CONFIG_NEXTCLOUD_VENDOR="nextcloud" - export RCLONE_CONFIG_NEXTCLOUD_USER="${adminuser}" - export RCLONE_CONFIG_NEXTCLOUD_PASS="$(${pkgs.rclone}/bin/rclone obscure ${adminpass})" - ''; - copySharedFile = pkgs.writeScript "copy-shared-file" '' - #!${pkgs.runtimeShell} - echo 'hi' | ${pkgs.rclone}/bin/rclone rcat nextcloud:test-shared-file - ''; - - diffSharedFile = pkgs.writeScript "diff-shared-file" '' - #!${pkgs.runtimeShell} - diff <(echo 'hi') <(${pkgs.rclone}/bin/rclone cat nextcloud:test-shared-file) - ''; in '' - start_all() - nextcloud.wait_for_unit("multi-user.target") nextcloud.succeed("${configureMemcached}") - nextcloud.succeed("curl -sSf http://nextcloud/login") - nextcloud.succeed( - "${withRcloneEnv} ${copySharedFile}" - ) - client.wait_for_unit("multi-user.target") - client.succeed( - "${withRcloneEnv} ${diffSharedFile}" - ) ''; -})) args +}) diff --git a/nixos/tests/nextcloud/with-objectstore.nix b/nixos/tests/nextcloud/with-objectstore.nix new file mode 100644 index 000000000000..fc26760b8bab --- /dev/null +++ b/nixos/tests/nextcloud/with-objectstore.nix @@ -0,0 +1,96 @@ +{ name, pkgs, testBase, system, ... }: + +with import ../../lib/testing-python.nix { inherit system pkgs; }; +runTest ({ config, lib, ... }: let + accessKey = "BKIKJAA5BMMU2RHO6IBB"; + secretKey = "V7f1CwQqAcwo80UEIJEjc5gVQUSSx5ohQ9GSrr12"; + + rootCredentialsFile = pkgs.writeText "minio-credentials-full" '' + MINIO_ROOT_USER=${accessKey} + MINIO_ROOT_PASSWORD=${secretKey} + ''; +in { + inherit name; + meta = with pkgs.lib.maintainers; { + maintainers = [ onny ma27 ]; + }; + + imports = [ testBase ]; + + nodes = { + nextcloud = { config, pkgs, ... }: { + networking.firewall.allowedTCPPorts = [ 9000 ]; + environment.systemPackages = [ pkgs.minio-client ]; + + services.nextcloud.config.objectstore.s3 = { + enable = true; + bucket = "nextcloud"; + autocreate = true; + key = accessKey; + secretFile = "${pkgs.writeText "secretKey" secretKey}"; + hostname = "nextcloud"; + useSsl = false; + port = 9000; + usePathStyle = true; + region = "us-east-1"; + }; + + services.minio = { + enable = true; + listenAddress = "0.0.0.0:9000"; + consoleAddress = "0.0.0.0:9001"; + inherit rootCredentialsFile; + }; + }; + }; + + test-helpers.init = '' + nextcloud.wait_for_open_port(9000) + ''; + + test-helpers.extraTests = { nodes, ... }: '' + with subtest("File is not on the filesystem"): + nextcloud.succeed("test ! -e ${nodes.nextcloud.services.nextcloud.home}/data/root/files/test-shared-file") + + with subtest("Check if file is in S3"): + nextcloud.succeed( + "mc config host add minio http://localhost:9000 ${accessKey} ${secretKey} --api s3v4" + ) + files = nextcloud.succeed('mc ls minio/nextcloud|sort').strip().split('\n') + + # Cannot assert an exact number here, nc27 writes more stuff initially into S3. + # For now let's assume it's always the most recently added file. + assert len(files) > 0, f""" + Expected to have at least one object in minio/nextcloud. But `mc ls` gave output: + + '{files}' + """ + + import re + ptrn = re.compile("^\[[A-Z0-9 :-]+\] +(?P
[A-Za-z0-9 :]+)$") + match = ptrn.match(files[-1].strip()) + assert match, "Cannot match mc client output!" + size, type_, file = tuple(match.group('details').split(' ')) + + assert size == "3B", f""" + Expected size of uploaded file to be 3 bytes, got {size} + """ + + assert type_ == 'STANDARD', f""" + Expected type of bucket entry to be a file, i.e. 'STANDARD'. Got {type_} + """ + + assert file.startswith('urn:oid'), """ + Expected filename to start with 'urn:oid', instead got '{file}. + """ + + with subtest("Test download from S3"): + client.succeed( + "env AWS_ACCESS_KEY_ID=${accessKey} AWS_SECRET_ACCESS_KEY=${secretKey} " + + f"${lib.getExe pkgs.awscli2} s3 cp s3://nextcloud/{file} test --endpoint-url http://nextcloud:9000 " + + "--region us-east-1" + ) + + client.succeed("test hi = $(cat test)") + ''; +}) diff --git a/nixos/tests/nextcloud/with-postgresql-and-redis.nix b/nixos/tests/nextcloud/with-postgresql-and-redis.nix index 06afc589403d..24c17f70932d 100644 --- a/nixos/tests/nextcloud/with-postgresql-and-redis.nix +++ b/nixos/tests/nextcloud/with-postgresql-and-redis.nix @@ -1,45 +1,30 @@ -args@{ pkgs, nextcloudVersion ? 22, ... }: +{ name, pkgs, testBase, system, ... }: -(import ../make-test-python.nix ({ pkgs, ...}: let - adminpass = "hunter2"; - adminuser = "custom-admin-username"; -in { - name = "nextcloud-with-postgresql-and-redis"; +with import ../../lib/testing-python.nix { inherit system pkgs; }; +runTest ({ config, ... }: { + inherit name; meta = with pkgs.lib.maintainers; { - maintainers = [ eqyiel ]; + maintainers = [ eqyiel ma27 ]; }; + imports = [ testBase ]; + nodes = { - # The only thing the client needs to do is download a file. - client = { ... }: {}; - nextcloud = { config, pkgs, lib, ... }: { - networking.firewall.allowedTCPPorts = [ 80 ]; - services.nextcloud = { - enable = true; - hostName = "nextcloud"; - package = pkgs.${"nextcloud" + (toString nextcloudVersion)}; caching = { apcu = false; redis = true; memcached = false; }; - database.createLocally = true; - config = { - dbtype = "pgsql"; - inherit adminuser; - adminpassFile = toString (pkgs.writeText "admin-pass-file" '' - ${adminpass} - ''); - }; + config.dbtype = "pgsql"; notify_push = { enable = true; logLevel = "debug"; }; extraAppsEnable = true; - extraApps = { - inherit (pkgs."nextcloud${lib.versions.major config.services.nextcloud.package.version}Packages".apps) notify_push notes; + extraApps = with config.services.nextcloud.package.packages.apps; { + inherit notify_push notes; }; settings.trusted_proxies = [ "::1" ]; }; @@ -49,50 +34,27 @@ in { }; }; - testScript = let + test-helpers.init = let configureRedis = pkgs.writeScript "configure-redis" '' - #!${pkgs.runtimeShell} nextcloud-occ config:system:set redis 'host' --value 'localhost' --type string nextcloud-occ config:system:set redis 'port' --value 6379 --type integer nextcloud-occ config:system:set memcache.local --value '\OC\Memcache\Redis' --type string nextcloud-occ config:system:set memcache.locking --value '\OC\Memcache\Redis' --type string ''; - withRcloneEnv = pkgs.writeScript "with-rclone-env" '' - #!${pkgs.runtimeShell} - export RCLONE_CONFIG_NEXTCLOUD_TYPE=webdav - export RCLONE_CONFIG_NEXTCLOUD_URL="http://nextcloud/remote.php/dav/files/${adminuser}" - export RCLONE_CONFIG_NEXTCLOUD_VENDOR="nextcloud" - export RCLONE_CONFIG_NEXTCLOUD_USER="${adminuser}" - export RCLONE_CONFIG_NEXTCLOUD_PASS="$(${pkgs.rclone}/bin/rclone obscure ${adminpass})" - "''${@}" - ''; - copySharedFile = pkgs.writeScript "copy-shared-file" '' - #!${pkgs.runtimeShell} - echo 'hi' | ${pkgs.rclone}/bin/rclone rcat nextcloud:test-shared-file - ''; - - diffSharedFile = pkgs.writeScript "diff-shared-file" '' - #!${pkgs.runtimeShell} - diff <(echo 'hi') <(${pkgs.rclone}/bin/rclone cat nextcloud:test-shared-file) - ''; in '' - start_all() - nextcloud.wait_for_unit("multi-user.target") nextcloud.succeed("${configureRedis}") - nextcloud.succeed("curl -sSf http://nextcloud/login") - nextcloud.succeed( - "${withRcloneEnv} ${copySharedFile}" - ) - client.wait_for_unit("multi-user.target") - client.execute("${pkgs.lib.getExe pkgs.nextcloud-notify_push.passthru.test_client} http://nextcloud ${adminuser} ${adminpass} >&2 &") - client.succeed( - "${withRcloneEnv} ${diffSharedFile}" - ) - nextcloud.wait_until_succeeds("journalctl -u nextcloud-notify_push | grep -q \"Sending ping to ${adminuser}\"") - - # redis cache should not be empty - nextcloud.fail('test "[]" = "$(redis-cli --json KEYS "*")"') - - nextcloud.fail("curl -f http://nextcloud/nix-apps/notes/lib/AppInfo/Application.php") ''; -})) args + + test-helpers.extraTests = '' + with subtest("notify-push"): + client.execute("${pkgs.lib.getExe pkgs.nextcloud-notify_push.passthru.test_client} http://nextcloud ${config.adminuser} ${config.adminpass} >&2 &") + nextcloud.wait_until_succeeds("journalctl -u nextcloud-notify_push | grep -q \"Sending ping to ${config.adminuser}\"") + + with subtest("Redis is used for caching"): + # redis cache should not be empty + nextcloud.fail('test "[]" = "$(redis-cli --json KEYS "*")"') + + with subtest("No code is returned when requesting PHP files (regression test)"): + nextcloud.fail("curl -f http://nextcloud/nix-apps/notes/lib/AppInfo/Application.php") + ''; +}) diff --git a/pkgs/applications/audio/plexamp/default.nix b/pkgs/applications/audio/plexamp/default.nix index 25d16a658a7d..ec79cbefabf0 100644 --- a/pkgs/applications/audio/plexamp/default.nix +++ b/pkgs/applications/audio/plexamp/default.nix @@ -2,24 +2,25 @@ let pname = "plexamp"; - version = "4.8.3"; + version = "4.10.1"; src = fetchurl { url = "https://plexamp.plex.tv/plexamp.plex.tv/desktop/Plexamp-${version}.AppImage"; - name="${pname}-${version}.AppImage"; - hash = "sha512-CrSXmRVatVSkMyB1QaNSL/tK60rQvT9JraRtYYLl0Fau3M1LJXK9yqvt77AjwIwIvi2Dm5SROG+c4rA1XtI4Yg=="; + name = "${pname}-${version}.AppImage"; + hash = "sha512-Y43W6aPnZEMnkBQwSHbT8PWjuhkfNxce79Y9cixEPnq4VybROHGb9s6ghV7kP81TSWkb9QruFhmXfuJRSkXxTw=="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; -in appimageTools.wrapType2 { +in +appimageTools.wrapType2 { inherit pname version src; extraInstallCommands = '' install -m 444 -D ${appimageContents}/plexamp.desktop $out/share/applications/plexamp.desktop - install -m 444 -D ${appimageContents}/plexamp.png \ - $out/share/icons/hicolor/512x512/apps/plexamp.png + install -m 444 -D ${appimageContents}/plexamp.svg \ + $out/share/icons/hicolor/scalable/apps/plexamp.svg substituteInPlace $out/share/applications/${pname}.desktop \ --replace 'Exec=AppRun' 'Exec=${pname}' ''; @@ -29,9 +30,9 @@ in appimageTools.wrapType2 { meta = with lib; { description = "Beautiful Plex music player for audiophiles, curators, and hipsters"; homepage = "https://plexamp.com/"; - changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/53"; + changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/73"; license = licenses.unfree; - maintainers = with maintainers; [ killercup synthetica ]; + maintainers = with maintainers; [ killercup redhawk synthetica ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/audio/plexamp/update-plexamp.sh b/pkgs/applications/audio/plexamp/update-plexamp.sh index b6b8def1e310..44ad9b925014 100755 --- a/pkgs/applications/audio/plexamp/update-plexamp.sh +++ b/pkgs/applications/audio/plexamp/update-plexamp.sh @@ -5,7 +5,7 @@ set -Eeuxo pipefail cleanup() { - rm -rf "$TMPDIR" + rm -rf "$TMPDIR" } trap cleanup EXIT @@ -42,9 +42,10 @@ if diff "$DEFAULT_NIX" "$WORKING_NIX"; then fi # update sha hash (convenietly provided) -sed -i "s@sha.* = .*;@sha512 = \"$SHA512\";@g" "$WORKING_NIX" +sed -i "s@hash.* = .*;@hash = \"sha512-$SHA512\";@g" "$WORKING_NIX" # update the changelog ("just" increment the number) +# manually check that the changelog corresponds to our Plexamp version CHANGELOG_URL=$(rg --only-matching 'changelog = "(.+)";' --replace '$1' $WORKING_NIX) CHANGELOG_NUMBER=$(rg --only-matching '.*/([0-9]+)' --replace '$1' <<< $CHANGELOG_URL) NEXT_CHANGELOG=$(($CHANGELOG_NUMBER + 1)) diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 67ef3f6dc8ff..2c8147cfce73 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -457,15 +457,17 @@ dependencies = with self; [ copilot-lua plenary-nvim ]; }; - copilot-vim = super.copilot-vim.overrideAttrs { + copilot-vim = super.copilot-vim.overrideAttrs (old: { postInstall = '' substituteInPlace $out/autoload/copilot/client.vim \ --replace " let node = get(g:, 'copilot_node_command', ''\'''\')" \ " let node = get(g:, 'copilot_node_command', '${nodejs}/bin/node')" ''; - meta.license = lib.licenses.unfree; - }; + meta = old.meta // { + license = lib.licenses.unfree; + }; + }); coq_nvim = super.coq_nvim.overrideAttrs { passthru.python3Dependencies = ps: diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 8a64d7ffe367..9d54a778b836 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -484,6 +484,23 @@ let }; }; + banacorn.agda-mode = buildVscodeMarketplaceExtension { + mktplcRef = { + publisher = "banacorn"; + name = "agda-mode"; + version = "0.4.7"; + hash = "sha256-gNa3n16lP3ooBRvGaugTua4IXcIzpMk7jBYMJDQsY00="; + }; + meta = { + changelog = "https://marketplace.visualstudio.com/items/banacorn.agda-mode/changelog"; + description = "agda-mode on VS Code"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=banacorn.agda-mode"; + homepage = "https://github.com/banacorn/agda-mode-vscode"; + maintainers = with lib.maintainers; [ Anillc ]; + license = lib.licenses.mit; + }; + }; + batisteo.vscode-django = buildVscodeMarketplaceExtension { mktplcRef = { publisher = "batisteo"; @@ -655,6 +672,23 @@ let }; }; + bierner.markdown-preview-github-styles = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "markdown-preview-github-styles"; + publisher = "bierner"; + version = "2.0.4"; + hash = "sha256-jJulxvjMNsqQqmsb5szQIAUuLWuHw824Caa0KArjUVw="; + }; + meta = { + changelog = "https://marketplace.visualstudio.com/items/bierner.markdown-preview-github-styles/changelog"; + description = "Changes VS Code's built-in markdown preview to match GitHub's styling"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=bierner.markdown-preview-github-styles"; + homepage = "https://github.com/mjbvz/vscode-github-markdown-preview-style"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.uncenter ]; + }; + }; + biomejs.biome = buildVscodeMarketplaceExtension { mktplcRef = { name = "biome"; @@ -680,10 +714,17 @@ let mktplcRef = { name = "vscode-fish"; publisher = "bmalehorn"; - version = "1.0.35"; - hash = "sha256-V51Qe6M1CMm9fLOSFEwqeZiC8tWCbVH0AzkLe7kR2vY="; + version = "1.0.38"; + hash = "sha256-QEifCTlzYMX+5H6+k2o1lsQrhW3vxVpn+KFg/3WVVFo="; + }; + meta = { + changelog = "https://marketplace.visualstudio.com/items/bmalehorn.vscode-fish/changelog"; + description = "Fish syntax highlighting and formatting for VS Code"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=bmalehorn.vscode-fish"; + homepage = "https://github.com/bmalehorn/vscode-fish"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.uncenter ]; }; - meta.license = lib.licenses.mit; }; bmewburn.vscode-intelephense-client = buildVscodeMarketplaceExtension { @@ -1698,6 +1739,23 @@ let }; }; + fabiospampinato.vscode-open-in-github = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-open-in-github"; + publisher = "fabiospampinato"; + version = "2.3.0"; + hash = "sha256-vrW6uZyeEJipGtfz7BEeeAwiwtBlfQLjC7jAP1v5GoE="; + }; + meta = { + changelog = "https://marketplace.visualstudio.com/items/fabiospampinato.vscode-open-in-github/changelog"; + description = "VS Code extension to open the current project or file in github.com"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=fabiospampinato.vscode-open-in-github"; + homepage = "https://github.com/fabiospampinato/vscode-open-in-github"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.uncenter ]; + }; + }; + file-icons.file-icons = buildVscodeMarketplaceExtension { meta = { changelog = "https://marketplace.visualstudio.com/items/file-icons.file-icons/changelog"; @@ -2667,6 +2725,23 @@ let }; }; + kravets.vscode-publint = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-publint"; + publisher = "Kravets"; + version = "0.0.1"; + hash = "sha256-6nG5Yqi8liumQ2K9ynV8mNXiXGaGo/cp4Cib1kqdp1c="; + }; + meta = { + changelog = "https://marketplace.visualstudio.com/items/Kravets.vscode-publint/changelog"; + description = "Lint packaging errors in VS Code with publint"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=Kravets.vscode-publint"; + homepage = "https://github.com/kravetsone/vscode-publint"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.uncenter ]; + }; + }; + kubukoz.nickel-syntax = buildVscodeMarketplaceExtension { mktplcRef = { name = "nickel-syntax"; @@ -2872,6 +2947,23 @@ let }; }; + mesonbuild.mesonbuild = buildVscodeMarketplaceExtension { + mktplcRef = { + publisher = "mesonbuild"; + name = "mesonbuild"; + version = "1.24.0"; + hash = "sha256-n7c2CUiTIej2Y/QMGWpv6anuCDjqpo2W+hJylfvvMVE="; + }; + meta = { + changelog = "https://marketplace.visualstudio.com/items/mesonbuild.mesonbuild/changelog"; + description = "Meson language support for Visual Studio Code"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=mesonbuild.mesonbuild"; + homepage = "https://github.com/mesonbuild/vscode-meson"; + maintainers = with lib.maintainers; [ Anillc ]; + license = lib.licenses.asl20; + }; + }; + mgt19937.typst-preview = callPackage ./mgt19937.typst-preview { }; mhutchie.git-graph = buildVscodeMarketplaceExtension { @@ -3364,6 +3456,23 @@ let }; }; + nefrob.vscode-just-syntax = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-just-syntax"; + publisher = "nefrob"; + version = "0.3.0"; + hash = "sha256-WBoqH9TNco9lyjOJfP54DynjmYZmPUY+YrZ1rQlC518="; + }; + meta = { + changelog = "https://marketplace.visualstudio.com/items/nefrob.vscode-just-syntax/changelog"; + description = "Justfile syntax support for Visual Studio Code"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=nefrob.vscode-just-syntax"; + homepage = "https://github.com/nefrob/vscode-just"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.uncenter ]; + }; + }; + njpwerner.autodocstring = buildVscodeMarketplaceExtension { mktplcRef = { name = "autodocstring"; @@ -5046,6 +5155,22 @@ let }; }; + zguolee.tabler-icons = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "tabler-icons"; + publisher = "zguolee"; + version = "0.3.4"; + hash = "sha256-0XvB9UXqKHbL/ejUfciSvFzZ3GacaQ7pq6hJqRaxq+8="; + }; + meta = { + description = "Tabler product icon theme for Visual Studio Code"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=zguolee.tabler-icons"; + homepage = "https://github.com/zguolee/vscode-tabler-icons"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.uncenter ]; + }; + }; + zhuangtongfa.material-theme = buildVscodeMarketplaceExtension { mktplcRef = { name = "material-theme"; diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index bf97add66906..3461744ec6eb 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -15,11 +15,11 @@ let archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "1zmgvadhsnsbmqb559kvf66i7h6iq7vw99m7vdxcfmdl6c1pwyvb"; - x86_64-darwin = "061h423vay3d28d2015llz7pwlqcrjy0lmw47xgy3iy6hfadrra2"; - aarch64-linux = "0n288h6369bazykp6jyapi6yz0k7nivql6wz68fgkagfdyxzl1yb"; - aarch64-darwin = "13k9hvbzj8xyfi29g0x4nz80gmjq3s693zi5fi4lbf4bj7jmcamq"; - armv7l-linux = "19p6k1rgy83vs76hksjx5d4v32jq31r6aw5kzcc8gsq114xj9c2a"; + x86_64-linux = "1r76ikfikagg9v278pgiqhnjsv7pqn0xi372y1l0wsashlxl7kb0"; + x86_64-darwin = "156604xzazmb54p0rdkv5wy9livg0xz2jviycdizablmvsxybs57"; + aarch64-linux = "0cp120pcjpgf9qvmks9f8l2caxqlvnqvmxa7fh9mf83zpkdmnsnl"; + aarch64-darwin = "1k06648jx64irshs0v4qy6xlkd9mk514xf21dlfhvic4aj89kcx9"; + armv7l-linux = "0jy8hkbxh1969kskggg2y86cphly9l9gs7y4plj90jmlvlzjjjxm"; }.${system} or throwSystem; sourceRoot = lib.optionalString (!stdenv.isDarwin) "."; @@ -29,7 +29,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.90.0.24158"; + version = "1.90.1.24165"; pname = "vscodium"; executableName = "codium"; diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index 6c5269fb53c8..249d3db28703 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -55,20 +55,20 @@ "src": { "owner": "libretro", "repo": "beetle-pce-libretro", - "rev": "0eb4b423452da40dbf4393e09d4126c3090a1210", - "hash": "sha256-PhhItDKvlvx3uBDx+xEUVr0sW2Y9HiTR/IvsnXVNAqo=" + "rev": "3d91a940b3a48254152a8789b79616ceefe4067f", + "hash": "sha256-6zXl49Rns6wCZmcEUWkWqYeSH6W1+qs6Sb998pQ/+Lo=" }, - "version": "unstable-2024-05-17" + "version": "unstable-2024-06-14" }, "beetle-pce-fast": { "fetcher": "fetchFromGitHub", "src": { "owner": "libretro", "repo": "beetle-pce-fast-libretro", - "rev": "414149d335ce2a3284db6cdffbb8ed2ce42dbe5f", - "hash": "sha256-sta71o4NJIPDZlQkAFLzx+XlHVA8MmUjuZ17MuCKhOY=" + "rev": "a653bbbdc5cf2bf960e614efdcf9446a9aa8cdf9", + "hash": "sha256-ty4Uluo8D8x+jB7fOqI/AgpTxdttzpbeARiICd3oh9c=" }, - "version": "unstable-2024-05-17" + "version": "unstable-2024-06-14" }, "beetle-pcfx": { "fetcher": "fetchFromGitHub", @@ -85,10 +85,10 @@ "src": { "owner": "libretro", "repo": "beetle-psx-libretro", - "rev": "b8e10a3039391db6e4fbdc96720d3428a2dbd039", - "hash": "sha256-F38lUBhe9JR3dPwkLqhAAlvLtAeas8bnPuiK6eOpUuU=" + "rev": "6e881f9939dd9b33fb5f5587745524a0828c9ef4", + "hash": "sha256-mFIqsybkpSF17HmrfReazYUqVLzuDGwCjzaV7BTLKJ8=" }, - "version": "unstable-2024-06-07" + "version": "unstable-2024-06-14" }, "beetle-saturn": { "fetcher": "fetchFromGitHub", @@ -115,10 +115,10 @@ "src": { "owner": "libretro", "repo": "beetle-supergrafx-libretro", - "rev": "e3f68c1311d4684a5a59d3d1662d5c4f32662c02", - "hash": "sha256-jTO2SDOefpB+cfahiPkReYID0pjP437h53hZElSLsdY=" + "rev": "29b2a6e12c13d623ad94dcb64e1cb341d93ff02d", + "hash": "sha256-sbpCG3QsSn8NOjWC0snvsd7jZYClSbKI79QUnigQwzc=" }, - "version": "unstable-2024-06-07" + "version": "unstable-2024-06-14" }, "beetle-vb": { "fetcher": "fetchFromGitHub", @@ -165,10 +165,10 @@ "src": { "owner": "libretro", "repo": "bsnes-libretro", - "rev": "44f6ce5dedb138ded8e59d71df18cae5b0655eba", - "hash": "sha256-7iB2VQ3f8YVOV3C+Rkviaj7USoZdO/riDnT9kCdzc8k=" + "rev": "9131a4c705e18f7b96e7dbfcfe70b158d10afed1", + "hash": "sha256-NotqQMBHV6E3LSXJHQ5FqIbq2OQbXx6xCbLYV9g12kQ=" }, - "version": "unstable-2024-05-31" + "version": "unstable-2024-06-16" }, "bsnes-hd": { "fetcher": "fetchFromGitHub", @@ -297,21 +297,21 @@ "src": { "owner": "libretro", "repo": "libretro-fceumm", - "rev": "bc9d865f9427384e40084cb090d94d72d4970e78", - "hash": "sha256-/g7gRNWDbW5LFZ+uBkIf5DMELas0/ilqbmUbvq8YSsE=" + "rev": "fe4a4f8a53cc7f91278f393710abb4f32c4e0a8f", + "hash": "sha256-/rZoARZf3SfN8E0o0qm34FYCYscqeEcLg3eYSXenK8s=" }, - "version": "unstable-2024-06-09" + "version": "unstable-2024-06-15" }, "flycast": { "fetcher": "fetchFromGitHub", "src": { "owner": "flyinghead", "repo": "flycast", - "rev": "4cd62781043cd9193c6c5ec04f6a8084375bed0d", - "hash": "sha256-EKK9PNFHWm1Jakq0E6fIqmcDiiiOSgHEbixB3X/H77g=", + "rev": "ca613db70d8897e06562fe089e3e9543b41526a0", + "hash": "sha256-wYKHC+EvLnq+PnL1/hNcrhDyCY+4kaiSjIUKJ9SGPHc=", "fetchSubmodules": true }, - "version": "unstable-2024-06-08" + "version": "unstable-2024-06-11" }, "fmsx": { "fetcher": "fetchFromGitHub", @@ -338,30 +338,30 @@ "src": { "owner": "libretro", "repo": "fuse-libretro", - "rev": "847dbbd6f787823ac9a5dfacdd68ab181063374e", - "hash": "sha256-jzS7SFALV/YjI77ST+IWHwUsuhT+Zr5w4t6C7O8yzFM=" + "rev": "9fc41a5f153e1f2fa2dbcfdd215c7ec97d98a29c", + "hash": "sha256-eEgPnSIpKC7s+4JoEHDGPlwYPa5Y8EpoxmNhyOIIcU8=" }, - "version": "unstable-2023-06-23" + "version": "unstable-2024-06-16" }, "gambatte": { "fetcher": "fetchFromGitHub", "src": { "owner": "libretro", "repo": "gambatte-libretro", - "rev": "e2031a4010463adcd00ce3f34acbbb6db2ad1266", - "hash": "sha256-yFj9ZkvDliaTO43l0fjg8FwD17MxjV4wszY7AVjTiNY=" + "rev": "863002046a812758da6064daaf579fef1cec19a3", + "hash": "sha256-7rkyMcaKDNOESNrmwYCKM71x3WM8eSN9LBX0xOQRhJ0=" }, - "version": "unstable-2024-06-07" + "version": "unstable-2024-06-14" }, "genesis-plus-gx": { "fetcher": "fetchFromGitHub", "src": { "owner": "libretro", "repo": "Genesis-Plus-GX", - "rev": "60955a01f601ef73c02b07581dd7d5aa3b6a4788", - "hash": "sha256-h0T6i1kiN58TagFo5XHzXMLaEwkGGTyuZpyS1QGNrb8=" + "rev": "4e54d585d540d461ecc412c91ca4a79e2338f3b6", + "hash": "sha256-7P6w6pXplOfpP7w+JztNd49FdKBPM8eQeSh93YAG0Y4=" }, - "version": "unstable-2024-06-07" + "version": "unstable-2024-06-14" }, "gpsp": { "fetcher": "fetchFromGitHub", @@ -408,11 +408,11 @@ "src": { "owner": "libretro", "repo": "mame", - "rev": "4ee35952a8fdb1332e970fa14c3e79c8c968050c", - "hash": "sha256-UIAMq8AIdLKX8SIF2V0+Vc6kHPJ0rmdx4BeqoSrCfFE=", + "rev": "db65a583bd2da39514a544c58362a6ac170179ac", + "hash": "sha256-FTsoLsx7IhyAw/pdaGAeNzysc7vZ3CcyXKWcBJ0pOb8=", "fetchSubmodules": true }, - "version": "unstable-2024-05-21" + "version": "unstable-2024-06-13" }, "mame2000": { "fetcher": "fetchFromGitHub", @@ -550,10 +550,10 @@ "src": { "owner": "libretro", "repo": "neocd_libretro", - "rev": "71ebe5044639b825e5bd1bd590fef3e918133b80", - "hash": "sha256-YVxt3bJ54DD91VHkeQyYdo/BEq//lnBKd9Y42Vby3qc=" + "rev": "c5a266254ffbaa2730d2814195f60e7be153fc86", + "hash": "sha256-MJhUYFNrtt2SSLun75OXKrT7nZzLBtyslqG9mziQuRk=" }, - "version": "unstable-2024-02-01" + "version": "unstable-2024-06-16" }, "nestopia": { "fetcher": "fetchFromGitHub", @@ -611,10 +611,10 @@ "src": { "owner": "libretro", "repo": "parallel-n64", - "rev": "1b57f9199b1f8a4510f7f89f14afa9cabf9b3bdd", - "hash": "sha256-L20RGav0FJfydOICCNhAMGxIuIvPABDtCs5tWzrh768=" + "rev": "330fa5efd306ad116c44faf6833a8108ed4144b0", + "hash": "sha256-pltPoWfXFh9OhWnQ+XMhHVZCo6BCGr6jCDhiL5T7LNM=" }, - "version": "unstable-2024-01-15" + "version": "unstable-2024-06-10" }, "pcsx2": { "fetcher": "fetchFromGitHub", @@ -631,43 +631,43 @@ "src": { "owner": "libretro", "repo": "pcsx_rearmed", - "rev": "1f8c6be323aa8fad329e38682158197e822d27c1", - "hash": "sha256-f1U7hmSywECmXwRi6vhAFjG971XsDXhsYzSAKMa2ZVY=" + "rev": "1cdeae2b66fc3ef486ec8016ed5fad437f1a4409", + "hash": "sha256-Zw5CWDeAy3pUV4qXFIfs6kFlEaYhNhl+6pu5fOx34j0=" }, - "version": "unstable-2024-05-30" + "version": "unstable-2024-06-17" }, "picodrive": { "fetcher": "fetchFromGitHub", "src": { "owner": "libretro", "repo": "picodrive", - "rev": "ad93670449a28825d4b2cebf2eeff72cf03377a9", - "hash": "sha256-AGupXJVUkOt7XjXE1s5Y3SzZjZBAujaAAsR0CgxfKe0=", + "rev": "535217f16bc2848ec70985c41e1d131709352641", + "hash": "sha256-K96eN3Erw1G+vQa8pag72hrtgf+tttoNIMXdgCGNy6k=", "fetchSubmodules": true }, - "version": "unstable-2024-03-26" + "version": "unstable-2024-06-15" }, "play": { "fetcher": "fetchFromGitHub", "src": { "owner": "jpd002", "repo": "Play-", - "rev": "2f3d8252a2ba398078538abfe8a633b667a858a4", - "hash": "sha256-Trr+xJWcWfQW5TnSTxqAsUK3HSMsoLaAkz7UIwp6L4c=", + "rev": "a5753e582963e8555985abdfe6b5692bac52d701", + "hash": "sha256-OabW7OYitDzMh2bbAokfM+HwMaLo2cY3/FB78/ouvrY=", "fetchSubmodules": true }, - "version": "unstable-2024-06-04" + "version": "unstable-2024-06-10" }, "ppsspp": { "fetcher": "fetchFromGitHub", "src": { "owner": "hrydgard", "repo": "ppsspp", - "rev": "5dec3ca2db10943dcdf5e483cc8c28e0524d1a43", - "hash": "sha256-B9/0uGpBrM+qndvO2BC9sQCNkSK3qR2fUtWx5Vx16xU=", + "rev": "cfcca0ed13ca86eb6e1ee7bb4161aabee6c2af06", + "hash": "sha256-K96Ajh/jXxILiKXBaTiNh6FwptPQQG39jGq45aQ7veY=", "fetchSubmodules": true }, - "version": "unstable-2024-06-09" + "version": "unstable-2024-06-16" }, "prboom": { "fetcher": "fetchFromGitHub", @@ -754,10 +754,10 @@ "src": { "owner": "snes9xgit", "repo": "snes9x", - "rev": "c7b77d4a763e8fa3ee2c4ef63b3974527056b7ad", - "hash": "sha256-a9IKbuSrlzrhrRrLRFAnhHWBhaYIf58oRFYjWSqbNTU=" + "rev": "a9e64edf73f36fb1a4ac616b11131f6380d8e968", + "hash": "sha256-3m2YTy1Y/ENhI4qmH3FQBZMEKNHsDJVZeOOLRrLj8lw=" }, - "version": "unstable-2024-06-07" + "version": "unstable-2024-06-13" }, "snes9x2002": { "fetcher": "fetchFromGitHub", @@ -794,10 +794,10 @@ "src": { "owner": "stella-emu", "repo": "stella", - "rev": "1c2dceab2b74980effb8d6497ea64fc3bd6b0be3", - "hash": "sha256-UeuSHHAZV798sSws32PhcBq9q2bGfX758mR+mIEnX+I=" + "rev": "b477cb56bc6fd8b6977dcee279f16de01348bdae", + "hash": "sha256-jGyEah9eBEvNB4HewL60yXZvpHseeScYrHsRtzUtjN8=" }, - "version": "unstable-2024-06-08" + "version": "unstable-2024-06-15" }, "stella2014": { "fetcher": "fetchFromGitHub", diff --git a/pkgs/applications/graphics/cloudcompare/default.nix b/pkgs/applications/graphics/cloudcompare/default.nix index f66189e0c75c..eac82182f61d 100644 --- a/pkgs/applications/graphics/cloudcompare/default.nix +++ b/pkgs/applications/graphics/cloudcompare/default.nix @@ -11,7 +11,7 @@ , flann , gdal , gmp -, LASzip +, laszip , mpfr , pdal , pcl @@ -48,7 +48,7 @@ mkDerivation rec { flann gdal gmp - LASzip + laszip mpfr pdal pcl diff --git a/pkgs/applications/misc/ArchiSteamFarm/default.nix b/pkgs/applications/misc/ArchiSteamFarm/default.nix index fc3335ca3a92..ce23bd8ee3f1 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/default.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/default.nix @@ -11,13 +11,13 @@ buildDotnetModule rec { pname = "ArchiSteamFarm"; # nixpkgs-update: no auto update - version = "6.0.1.24"; + version = "6.0.3.4"; src = fetchFromGitHub { owner = "JustArchiNET"; repo = "ArchiSteamFarm"; rev = version; - hash = "sha256-IgsiL5YUeOWQ/WIaTfs0Kmv2XFori8ntGZhrx7xeMkg="; + hash = "sha256-qYB94SJYCwcUrXdKtD+ZdiPRpwXg3rOHVmFWD+Y1ZXg="; }; dotnet-runtime = dotnetCorePackages.aspnetcore_8_0; @@ -26,15 +26,13 @@ buildDotnetModule rec { nugetDeps = ./deps.nix; projectFile = "ArchiSteamFarm.sln"; - executables = [ "ArchiSteamFarm" ]; + executable = "ArchiSteamFarm"; dotnetFlags = [ - "-p:PublishSingleFile=true" - "-p:PublishTrimmed=true" + "-p:UseAppHost=false" ]; dotnetInstallFlags = [ "--framework=net8.0" ]; - selfContainedBuild = true; runtimeDeps = [ libkrb5 zlib openssl ]; @@ -58,11 +56,17 @@ buildDotnetModule rec { dotnet publish $1 -p:ContinuousIntegrationBuild=true -p:Deterministic=true \ --output $out/lib/ArchiSteamFarm/plugins/$1 --configuration Release \ -p:UseAppHost=false - } + } - buildPlugin ArchiSteamFarm.OfficialPlugins.ItemsMatcher - buildPlugin ArchiSteamFarm.OfficialPlugins.MobileAuthenticator - buildPlugin ArchiSteamFarm.OfficialPlugins.SteamTokenDumper + buildPlugin ArchiSteamFarm.OfficialPlugins.ItemsMatcher + buildPlugin ArchiSteamFarm.OfficialPlugins.MobileAuthenticator + buildPlugin ArchiSteamFarm.OfficialPlugins.Monitoring + buildPlugin ArchiSteamFarm.OfficialPlugins.SteamTokenDumper + + chmod +x $out/lib/ArchiSteamFarm/ArchiSteamFarm.dll + wrapDotnetProgram $out/lib/ArchiSteamFarm/ArchiSteamFarm.dll $out/bin/ArchiSteamFarm + substituteInPlace $out/bin/ArchiSteamFarm \ + --replace-fail "exec " "exec dotnet " ''; passthru = { diff --git a/pkgs/applications/misc/ArchiSteamFarm/deps.nix b/pkgs/applications/misc/ArchiSteamFarm/deps.nix index cc47f6d75949..79ed6cdf624a 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/deps.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/deps.nix @@ -57,10 +57,14 @@ (fetchNuGet { pname = "Humanizer.Core.zh-Hans"; version = "2.14.1"; sha256 = "0zn99311zfn602phxyskfjq9vly0w5712z6fly8r4q0h94qa8c85"; }) (fetchNuGet { pname = "Humanizer.Core.zh-Hant"; version = "2.14.1"; sha256 = "0qxjnbdj645l5sd6y3100yyrq1jy5misswg6xcch06x8jv7zaw1p"; }) (fetchNuGet { pname = "JetBrains.Annotations"; version = "2023.3.0"; sha256 = "0vp4mpn6gfckn8grzjm1jxlbqiq2fglm2rk9wq787adw7rxs8k7w"; }) - (fetchNuGet { pname = "Markdig.Signed"; version = "0.36.2"; sha256 = "02d658sjxd853lmqhhh13yhycm9nlmghl3p3fdn6iwmwhkly9qvy"; }) - (fetchNuGet { pname = "Microsoft.ApplicationInsights"; version = "2.21.0"; sha256 = "1q034jbqkxb8lddkd0ijp0wp0ymnnf3bg2mjpay027zv7jswnc4x"; }) + (fetchNuGet { pname = "Markdig.Signed"; version = "0.37.0"; sha256 = "0pcysg74pvhqs13087dh5r90xnixklmnz7bwv02304927mkv5345"; }) + (fetchNuGet { pname = "Microsoft.ApplicationInsights"; version = "2.22.0"; sha256 = "0h5qkhmazlvwvjmxxj9pp2404rmvk55yf6npwcmlskv9mgfkli4r"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "8.0.0"; sha256 = "05y1xb5fw8lzvb4si77a5qwfwfz1855crqbphrwky6x9llivbhkx"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "8.0.0"; sha256 = "18zdbcb2bn7wy1dp14z5jyqiiwr9rkad1lcb158r5ikjfq1rg5iw"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "8.0.0"; sha256 = "1nbxzmj6cnccylxis67c54c0ik38ma4rwdvgg6sxd6r04219maqm"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "8.0.0"; sha256 = "1wqkbjd1ywv9w397l7rsb89mijc5n0hv7jq9h09xfz6wn9qsp152"; }) (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "6.0.0"; sha256 = "15gqy2m14fdlvy1g59207h5kisznm355kbw010gy19vh47z8gpz3"; }) - (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.8.0"; sha256 = "173wjadp3gan4x2jfjchngnc4ca4mb95h1sbb28jydfkfw0z1zvj"; }) + (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.10.0"; sha256 = "0s0v7jmrq85n356xv7zixvwa4z94fszjcr5vll8x4im1a2lp00f9"; }) (fetchNuGet { pname = "Microsoft.Extensions.ApiDescription.Server"; version = "6.0.5"; sha256 = "1pi2bm3cm0a7jzqzmfc2r7bpcdkmk3hhjfvb2c81j7wl7xdw3624"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "8.0.0"; sha256 = "080kab87qgq2kh0ijry5kfdiq9afyzb8s0k3jqi5zbbi540yq4zl"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "8.0.0"; sha256 = "1jlpa4ggl1gr5fs7fdcw04li3y3iy05w3klr9lrrlc7v8w76kq71"; }) @@ -76,54 +80,60 @@ (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "8.0.0"; sha256 = "0p50qn6zhinzyhq9sy5svnmqqwhw2jajs2pbjh9sah504wjvhscz"; }) (fetchNuGet { pname = "Microsoft.Extensions.Options.ConfigurationExtensions"; version = "8.0.0"; sha256 = "04nm8v5a3zp0ill7hjnwnja3s2676b4wffdri8hdk2341p7mp403"; }) (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "8.0.0"; sha256 = "0aldaz5aapngchgdr7dax9jw5wy7k7hmjgjpfgfv1wfif27jlkqm"; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.Abstractions"; version = "7.5.0"; sha256 = "0nigij1vz1biw1sl64mflx68fgm34lmnvq47z2n5p0qs534kvkhb"; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.JsonWebTokens"; version = "7.5.0"; sha256 = "025ixbv7jq294n8yw4y1bbd92iz08q4jqnnzqp0s8lgi49sk9dad"; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "7.5.0"; sha256 = "1qyyfxww980s7xzw048kc8iqzarzbaj11cb5lrsisv777ccipma5"; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "7.5.0"; sha256 = "0ns56pws3zlwjk8mjyfr02zl3nnhzka76wabfabplfci62bgi3h0"; }) - (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.8.0"; sha256 = "1syvl3g0hbrcgfi9rq6pld8s8hqqww4dflf1lxn59ccddyyx0gmv"; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Abstractions"; version = "7.6.0"; sha256 = "18g4j9n47387k4ym3kl2dzhhhs6fs5rq96757fc4lcdql2rpkmp0"; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.JsonWebTokens"; version = "7.6.0"; sha256 = "11znwbbg44hhz3ly6j6q81qz83yqf97jj5zhpldng5zq0h791srl"; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "7.6.0"; sha256 = "1slkzygcn4abpqip4rmi73h9096ihjkkaiwgmkaiba9pidn9lzlx"; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "7.6.0"; sha256 = "1blj1ayw9qpjpsnb4k95s03pdkin0032mxgznfaw1z1qhhiqdnsi"; }) + (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.10.0"; sha256 = "13g8fwl09li8fc71nk13dgkb7gahd4qhamyg2xby7am63nlchhdf"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "8.0.0"; sha256 = "0gwqmkmr7jy3sjh9gha82amlry41gp8nwswy2iqfw54f28db63n7"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "8.0.0"; sha256 = "042cjvnwrrjs3mw5q8q5kinh0cwkks33i3n1vyifaid2jbr3wlc0"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "8.0.0"; sha256 = "06ndp4wh1cap01dql3nixka4g56bf6ipmqys7xaxvg4xisf79x8d"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "8.0.0"; sha256 = "1kh5bnaf6h9mr4swcalrp304625frjiw6mlz1052rxwzsdq98a96"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; }) - (fetchNuGet { pname = "Microsoft.OpenApi"; version = "1.2.3"; sha256 = "07b19k89whj69j87afkz86gp9b3iybw8jqwvlgcn43m7fb2y99rr"; }) - (fetchNuGet { pname = "Microsoft.Testing.Extensions.Telemetry"; version = "1.0.2"; sha256 = "00psv2mvynd2bz8xnzvqvb32qr33glqxg4ni5j91b93k84yjy5ma"; }) - (fetchNuGet { pname = "Microsoft.Testing.Extensions.TrxReport.Abstractions"; version = "1.0.2"; sha256 = "09yn3hi9npgi8rs2vyfyzcl8vbfa1lqcl6lgpymw5d7lg0hc511w"; }) - (fetchNuGet { pname = "Microsoft.Testing.Extensions.VSTestBridge"; version = "1.0.2"; sha256 = "0c65fsc23xxw648xh83sjcmrn9hvs9q58l5lb36wflvaajbsjf2r"; }) - (fetchNuGet { pname = "Microsoft.Testing.Platform"; version = "1.0.2"; sha256 = "0bq46f4v2r4nzwly7g0dsakyc1lcql9nh85sp59d1fwzaknf1n94"; }) - (fetchNuGet { pname = "Microsoft.Testing.Platform.MSBuild"; version = "1.0.2"; sha256 = "1vjqrpqjx3z1irqgy0ckmkgyvrzqqqcikxs36q6gadyj643ra1c5"; }) + (fetchNuGet { pname = "Microsoft.OpenApi"; version = "1.6.14"; sha256 = "1wr8crmjg4gznm3jqgz9s9p285vrwb8a6baqc6gz3b58rn4m88km"; }) + (fetchNuGet { pname = "Microsoft.Testing.Extensions.Telemetry"; version = "1.2.1"; sha256 = "1a6hyd3szjjpjkbr0ncfria0x2qijv3lwr4drhxm15xamfy23azw"; }) + (fetchNuGet { pname = "Microsoft.Testing.Extensions.TrxReport.Abstractions"; version = "1.2.1"; sha256 = "19309m0b9cjy1642m99ipjvr6gxq6qb008bam3l10m1mz8m81j31"; }) + (fetchNuGet { pname = "Microsoft.Testing.Extensions.VSTestBridge"; version = "1.2.1"; sha256 = "1bly8375zng21yjbfdi08c14lgapngv06p1dlzbryimxicqzxixx"; }) + (fetchNuGet { pname = "Microsoft.Testing.Platform"; version = "1.2.1"; sha256 = "0zlbqmvdb1vxnvmxh6lk65mz57c7mz6dqb1s8in0cfww8kxg058k"; }) + (fetchNuGet { pname = "Microsoft.Testing.Platform.MSBuild"; version = "1.2.1"; sha256 = "07674xnhc84h36pvzswx6ibjy0bgfi2bxhqm1zyq9fidmim0ch07"; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.10.0"; sha256 = "07j69cw8r39533w4p39mnj00kahazz38760in3jfc45kmlcdb26x"; }) (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.5.0"; sha256 = "0qkjyf3ky6xpjg5is2sdsawm99ka7fzgid2bvpglwmmawqgm8gls"; }) - (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.8.0"; sha256 = "0b0i7lmkrcfvim8i3l93gwqvkhhhfzd53fqfnygdqvkg6np0cg7m"; }) - (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.8.0"; sha256 = "0f5jah93kjkvxwmhwb78lw11m9pkkq9fvf135hpymmmpxqbdh97q"; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.10.0"; sha256 = "1bl471s7fx9jycr0cc8rylwf34mrvlg9qn1an6l86nisavfcyb7v"; }) (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "5.0.0"; sha256 = "102hvhq2gmlcbq8y2cb7hdr2dnmjzfp2k3asr1ycwrfacwyaak7n"; }) - (fetchNuGet { pname = "MSTest"; version = "3.2.2"; sha256 = "19pkywdlmgccv2ri52gbpb3pgci1ymb2ba5qhyp9j19vks6gf6cj"; }) - (fetchNuGet { pname = "MSTest.Analyzers"; version = "3.2.2"; sha256 = "1ap7imbqxmz2namgli796pxj91gyn01k6xxnllldpwwbxpd0ijgd"; }) - (fetchNuGet { pname = "MSTest.TestAdapter"; version = "3.2.2"; sha256 = "14nrxg1cd3lzaxw7zz8z91168sgnsf1xxnrpdy7wkd6ggk22hi19"; }) - (fetchNuGet { pname = "MSTest.TestFramework"; version = "3.2.2"; sha256 = "0igdrjr300bqz5lnibf9vl8pkaky1l27f889gza3a9xs83mpd06p"; }) + (fetchNuGet { pname = "MSTest"; version = "3.4.3"; sha256 = "070avma2zdxdpn23a9chgz9n1kglxh8nbb1g2ggzk3xxi5sdjj0n"; }) + (fetchNuGet { pname = "MSTest.Analyzers"; version = "3.4.3"; sha256 = "14a6rzh4cvaf9bw63qlxw242fbmk4agyx9qgl19swpciqcaq7pxi"; }) + (fetchNuGet { pname = "MSTest.TestAdapter"; version = "3.4.3"; sha256 = "0hsslndnfyb6shgkmgy10f1c9p6b47ry20zr2l1msagmkrk49s5q"; }) + (fetchNuGet { pname = "MSTest.TestFramework"; version = "3.4.3"; sha256 = "0hviglzfv16dd3aczny455sy1k0rikzd5w34smfpjyxc0wqx6xvp"; }) (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; sha256 = "0fijg0w6iwap8gvzyjnndds0q4b8anwxxvik7y8vgq97dram4srb"; }) (fetchNuGet { pname = "Nito.AsyncEx.Coordination"; version = "5.1.2"; sha256 = "0sxvmqnv8a94k3pq1w3lh1vgjb8l62h1qamxcjl3pkq634h2fwrl"; }) (fetchNuGet { pname = "Nito.AsyncEx.Tasks"; version = "5.1.2"; sha256 = "11wp47kc69sjdxrbg5pgx0wlffqlp0x5kr54ggnz2v19kmjz362v"; }) (fetchNuGet { pname = "Nito.Collections.Deque"; version = "1.1.1"; sha256 = "152564q3s0n5swfv5p5rx0ghn2sm0g2xsnbd7gv8vb9yfklv7yg8"; }) (fetchNuGet { pname = "Nito.Disposables"; version = "2.2.1"; sha256 = "1hx5k8497j34kxxgh060bvij0vfnraw90dmm3h9bmamcdi8wp80l"; }) - (fetchNuGet { pname = "NLog"; version = "5.2.8"; sha256 = "1z3h20m5rjnizm1jbf5j0vpdc1f373rzzkg6478p1lxv5j385c12"; }) - (fetchNuGet { pname = "NLog.Extensions.Logging"; version = "5.3.8"; sha256 = "1qnz91099f51vk7f5g2ig0041maw5hcbyqllxvj5zj7zkp0qw9b8"; }) - (fetchNuGet { pname = "NLog.Web.AspNetCore"; version = "5.3.8"; sha256 = "05a6bzvdf63lbnn6sj3yfggxcgv96j91kdbcw0ac5hxl58df58r6"; }) + (fetchNuGet { pname = "NLog"; version = "5.3.2"; sha256 = "01qnzmwvc93yywhvy5g29fb8jnalfi82az7296nblyqjalhbzz3g"; }) + (fetchNuGet { pname = "NLog.Extensions.Logging"; version = "5.3.11"; sha256 = "0j276q0a14qk9nc3f03265jl5wp38bnm7dyyx0s4kxkyb3kx3z8c"; }) + (fetchNuGet { pname = "NLog.Web.AspNetCore"; version = "5.3.11"; sha256 = "17xvaj54liyk9zq0f80z1ai6wq4rgj6xy93znvsdcnldmin1icz9"; }) (fetchNuGet { pname = "NuGet.Frameworks"; version = "5.11.0"; sha256 = "0wv26gq39hfqw9md32amr5771s73f5zn1z9vs4y77cgynxr73s4z"; }) - (fetchNuGet { pname = "NuGet.Frameworks"; version = "6.5.0"; sha256 = "0s37d1p4md0k6d4cy6sq36f2dgkd9qfbzapxhkvi8awwh0vrynhj"; }) - (fetchNuGet { pname = "OpenTelemetry"; version = "1.8.0-rc.1"; sha256 = "0scpylqwqmp7lpmixci88v6zf7jzf3zrcbrhl30bd4p7r4alw2lp"; }) - (fetchNuGet { pname = "OpenTelemetry.Api"; version = "1.7.0"; sha256 = "099yivazj5078076xydssf38r71c5nk3n7hy0lr51p80gln1vdha"; }) - (fetchNuGet { pname = "OpenTelemetry.Api"; version = "1.8.0-rc.1"; sha256 = "0rnl9pkwbz2srkss3ay05jjrfkyzibxa6vx0hg7rzfpyjinhaycs"; }) - (fetchNuGet { pname = "OpenTelemetry.Api.ProviderBuilderExtensions"; version = "1.7.0"; sha256 = "1j7bxhpwpcrjr4am7s4mavjjpasikv4kp8glmxiw5x9zvc0x0ix7"; }) - (fetchNuGet { pname = "OpenTelemetry.Api.ProviderBuilderExtensions"; version = "1.8.0-rc.1"; sha256 = "18r7m4zjimkkwjqw8hd9xa85lnj1fy45xyd338fbpp9nm73j9r2g"; }) - (fetchNuGet { pname = "OpenTelemetry.Exporter.Prometheus.AspNetCore"; version = "1.8.0-rc.1"; sha256 = "0fiz7qpzn64by4dlc5r9ha2qrp1j9w9lm6c7bzpvshzwz8ifamv7"; }) - (fetchNuGet { pname = "OpenTelemetry.Extensions.Hosting"; version = "1.8.0-rc.1"; sha256 = "0p5sybp1b8fkccibhlmjlvdnhryscqh9f435c34bwp6vvllxf17z"; }) - (fetchNuGet { pname = "OpenTelemetry.Instrumentation.AspNetCore"; version = "1.7.1"; sha256 = "19r12csxwdrvl5yx88mv68rzj2cy43004pwldy6q89v42sr01kyi"; }) - (fetchNuGet { pname = "OpenTelemetry.Instrumentation.Http"; version = "1.7.1"; sha256 = "0mvrcz2mg3caf4lcwi1ai7i7ldb27p4y2qx9vckfjal203bps352"; }) - (fetchNuGet { pname = "OpenTelemetry.Instrumentation.Runtime"; version = "1.7.0"; sha256 = "0klyd24akymj2hpjlnzmz7x9kggj4amhaqx1zh9nxjvlmmy64gxy"; }) + (fetchNuGet { pname = "OpenTelemetry"; version = "1.7.0-rc.1"; sha256 = "0y16qp3xrypk48f27pfvccic47p9wpl4qx8mar4rf2b78ca21c9p"; }) + (fetchNuGet { pname = "OpenTelemetry"; version = "1.8.1"; sha256 = "1slyjdzbiv179sq91bq6bhbqw20jmk6j9x1g5fhvnqsymfqmnmq2"; }) + (fetchNuGet { pname = "OpenTelemetry.Api"; version = "1.7.0-rc.1"; sha256 = "1i09vjjrimg0bwraamsjdqx886apscwj72skds3ysvc9c7n0hpl2"; }) + (fetchNuGet { pname = "OpenTelemetry.Api"; version = "1.8.0"; sha256 = "0s402mz4gz1chlg29159awawpi6ms4ln5gdds01y38wx6cia6lb9"; }) + (fetchNuGet { pname = "OpenTelemetry.Api"; version = "1.8.1"; sha256 = "0c2dvnnnizn5g50js336lkgfxh6klcdb0h8pppf68v3liwlhxly5"; }) + (fetchNuGet { pname = "OpenTelemetry.Api.ProviderBuilderExtensions"; version = "1.7.0-rc.1"; sha256 = "1ayy2q9cg6482ahvz3cx7a3cikjrnmr5kr7yk9qnbbwy0wfmb6gw"; }) + (fetchNuGet { pname = "OpenTelemetry.Api.ProviderBuilderExtensions"; version = "1.8.0"; sha256 = "1vhl02w068ynhpak0pyjn2xmrnisl9m73lmsckwkncrhinplw7hz"; }) + (fetchNuGet { pname = "OpenTelemetry.Api.ProviderBuilderExtensions"; version = "1.8.1"; sha256 = "0lys1l0qsna2h82j2rbxi5fc8barrq43fs0lradr85r7sy3x91cg"; }) + (fetchNuGet { pname = "OpenTelemetry.Exporter.Prometheus.AspNetCore"; version = "1.7.0-rc.1"; sha256 = "1777nbj78yppmqmwvv0bsl4l0vp8lfc5fpsdmknf6wl354f0z1f8"; }) + (fetchNuGet { pname = "OpenTelemetry.Extensions.Hosting"; version = "1.8.1"; sha256 = "01vi9sqb2j25i6926c581w067nadf4q4hs0hkwjg8wpzhxz0n3xq"; }) + (fetchNuGet { pname = "OpenTelemetry.Instrumentation.AspNetCore"; version = "1.8.1"; sha256 = "0s5kxqjhmwm2p2sblmmsavvmknqb8yr0b07ngq8hk0w8b48kyc0h"; }) + (fetchNuGet { pname = "OpenTelemetry.Instrumentation.Http"; version = "1.8.1"; sha256 = "0p3mw08vi9ljf06239n8b1hfj0cqqb198qn89sf39mdjsy13ca95"; }) + (fetchNuGet { pname = "OpenTelemetry.Instrumentation.Runtime"; version = "1.8.1"; sha256 = "0j2i01378848nvib1krk948lp74x8ykgspka05g37a3s284p1nyd"; }) (fetchNuGet { pname = "protobuf-net"; version = "3.2.30"; sha256 = "08bjdn8dbqpzn5c9fw89y5766irwplgyzhyxcrjzpywkwpj75r4i"; }) (fetchNuGet { pname = "protobuf-net.Core"; version = "3.2.30"; sha256 = "01mgw4s0b2vxf55v6fa3n5l9jwk6bkl60aaqv7azl198wwslkjhq"; }) (fetchNuGet { pname = "SteamKit2"; version = "3.0.0-alpha.1"; sha256 = "01lrbkbpfqdkhba9hsfg9fqyh1sa9r2cp54r2wlb83zfr3f5q8l8"; }) - (fetchNuGet { pname = "Swashbuckle.AspNetCore"; version = "6.5.0"; sha256 = "0k61chpz5j59s1yax28vx0mppx20ff8vg8grwja112hfrzj1f45n"; }) - (fetchNuGet { pname = "Swashbuckle.AspNetCore.Annotations"; version = "6.5.0"; sha256 = "00n8s45xwbayj3p6x3awvs87vqvmzypny21nqc61m7a38d1asijv"; }) - (fetchNuGet { pname = "Swashbuckle.AspNetCore.Swagger"; version = "6.5.0"; sha256 = "1s6axf6fin8sss3bvzp0s039rxrx71vx4rl559miw12bz3lld8kc"; }) - (fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerGen"; version = "6.5.0"; sha256 = "0hq93gy5vyrigpdk9lhqwxglxwkbxa8ydllwcqs4bwfcsspzrs83"; }) - (fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerUI"; version = "6.5.0"; sha256 = "17hx7kc187higm0gk67dndng3n7932sn3fwyj48l45cvyr3025h7"; }) + (fetchNuGet { pname = "Swashbuckle.AspNetCore"; version = "6.6.2"; sha256 = "0lq774iggpvsmykbrplvv2a5z2ylsslv5wynmvpnlznd4lvgxb4h"; }) + (fetchNuGet { pname = "Swashbuckle.AspNetCore.Annotations"; version = "6.6.2"; sha256 = "1snz71ws87kr8pz4c3zcla51mqbly015ib6b0y20xvkj25qx7gl8"; }) + (fetchNuGet { pname = "Swashbuckle.AspNetCore.Swagger"; version = "6.6.2"; sha256 = "0j93y0krn5fzvji0k7g4cxi22b7j8n3brxw4698pjq2pqqf2d8qy"; }) + (fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerGen"; version = "6.6.2"; sha256 = "00lar7246mncidflm15xz5b9hpni9bf8wj37dc0l2sj3hhv9nvwj"; }) + (fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerUI"; version = "6.6.2"; sha256 = "0w0h2cs8n5avczzm5plzmkvkc6xn0pj425f4400fk21h8ysvhg8h"; }) (fetchNuGet { pname = "System.Collections.Immutable"; version = "1.7.1"; sha256 = "1nh4nlxfc7lbnbl86wwk1a3jwl6myz5j6hvgh5sp4krim9901hsq"; }) (fetchNuGet { pname = "System.Collections.Immutable"; version = "7.0.0"; sha256 = "1n9122cy6v3qhsisc9lzwa1m1j62b8pi2678nsmnlyvfpk0zdagm"; }) (fetchNuGet { pname = "System.Composition"; version = "8.0.0"; sha256 = "0y7rp5qwwvh430nr0r15zljw01gny8yvr0gg6w5cmsk3q7q7a3dc"; }) @@ -141,5 +151,4 @@ (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "8.0.0"; sha256 = "1ysjx3b5ips41s32zacf4vs7ig41906mxrsbmykdzi0hvdmjkgbx"; }) (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "5.0.0"; sha256 = "1mpk7xj76lxgz97a5yg93wi8lj0l8p157a5d50mmjy3gbz1904q8"; }) (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "8.0.0"; sha256 = "1lgdd78cik4qyvp2fggaa0kzxasw6kc9a6cjqw46siagrm0qnc3y"; }) - (fetchNuGet { pname = "zxcvbn-core"; version = "7.0.92"; sha256 = "1pbi0n3za8zsnkbvq19njy4h4hy12a6rv4rknf4a2m1kdhxb3cgx"; }) ] diff --git a/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix b/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix index 26c3cc5d2d7a..004aadbe781e 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix @@ -2,7 +2,7 @@ buildNpmPackage rec { pname = "asf-ui"; - version = "f70253c96e76fff5c5537c7be57a57de4e273eb8"; + version = "78188871dfce90fb04096e9fd0b6ce2411312dae"; src = fetchFromGitHub { owner = "JustArchiNET"; @@ -10,10 +10,10 @@ buildNpmPackage rec { # updated by the update script # this is always the commit that should be used with asf-ui from the latest asf version rev = version; - hash = "sha256-hw6M8O486vnWqdO4DqljOoGEevykpxhez3QL745VfIk="; + hash = "sha256-NBxN3pQFiDsRYp2Ro0WwWdGzKVjPTKx4/xWQrMNuv0M="; }; - npmDepsHash = "sha256-GpGVM9c5yaLHi77qpShm30/uObg1TdLFCIhmFvLEhaU="; + npmDepsHash = "sha256-9pLbSOMfKwkWtzmKNmeKNrgdtzh3riWWJlrbuoDRUrw="; installPhase = '' runHook preInstall diff --git a/pkgs/applications/misc/googleearth-pro/default.nix b/pkgs/applications/misc/googleearth-pro/default.nix index d00e45bdeb1e..4da7bd97ec2f 100644 --- a/pkgs/applications/misc/googleearth-pro/default.nix +++ b/pkgs/applications/misc/googleearth-pro/default.nix @@ -118,7 +118,7 @@ mkDerivation rec { homepage = "https://www.google.com/earth/"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; - maintainers = with maintainers; [ friedelino shamilton ]; + maintainers = with maintainers; [ shamilton ]; platforms = platforms.linux; knownVulnerabilities = [ "Includes vulnerable versions of bundled libraries: openssl, ffmpeg, gdal, and proj." ]; }; diff --git a/pkgs/applications/misc/tickrs/default.nix b/pkgs/applications/misc/tickrs/default.nix index a22f9da07359..29587be9bcde 100644 --- a/pkgs/applications/misc/tickrs/default.nix +++ b/pkgs/applications/misc/tickrs/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "tickrs"; - version = "0.14.9"; + version = "0.14.10"; src = fetchFromGitHub { owner = "tarkah"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-cN5GtU3bmsdJvfjVdWvWAshiU3Ged7L9pc8wid8GQwA="; + hash = "sha256-6iMThVLIkFoNa7Z0MuyhUNGCwFtCfmG7jHvDfrEZE2I="; }; - cargoHash = "sha256-ngDA085V3+2oBH13Fs+pJez2W2/i1pEKoWdqJ4/3Q0I="; + cargoHash = "sha256-gfBmoN91xUcjBafxBoLP41Fl8FuH2taAu3P6sgJPNWI="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/applications/misc/tuckr/default.nix b/pkgs/applications/misc/tuckr/default.nix index 6c9b527294b0..d660248deef8 100644 --- a/pkgs/applications/misc/tuckr/default.nix +++ b/pkgs/applications/misc/tuckr/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "tuckr"; - version = "0.8.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "RaphGL"; repo = "Tuckr"; rev = version; - hash = "sha256-S4mHNCyK7WGYRBckxQkwA3+eu7QhUyKkOZ/KqhMJf+s="; + hash = "sha256-oQSuR0Zt1T8YU3O2Dq/qHl4ysVDl+3EVvp9r2mD3hRA="; }; - cargoHash = "sha256-aUhiMJUKV+Da3WLUY9Jr3oDB8yqcUm0pP05yKaITjM0="; + cargoHash = "sha256-ESDfUZsoqwBurXuwNIRSqxoDWnA2VpDZ9Q9GGaV8B4Y="; doCheck = false; # test result: FAILED. 5 passed; 3 failed; diff --git a/pkgs/applications/networking/cluster/argo-rollouts/default.nix b/pkgs/applications/networking/cluster/argo-rollouts/default.nix index ade1527b6e42..60d3be84451d 100644 --- a/pkgs/applications/networking/cluster/argo-rollouts/default.nix +++ b/pkgs/applications/networking/cluster/argo-rollouts/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "argo-rollouts"; - version = "1.6.0"; + version = "1.7.0"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo-rollouts"; rev = "v${version}"; - sha256 = "sha256-WJ5vIfQQguwjInS5p+bUYorM90MUAbH8endV/nkgQ00="; + sha256 = "sha256-b1oaLVwom06XUCjMF3/O/SdLt2s0MFuF+et6+MO2jBQ="; }; - vendorHash = "sha256-vBSS1KMfloK5pvVc8nHE5B8PsVZTS/iA9GyrLaeR6ps="; + vendorHash = "sha256-38BLPNc6en70+UxlldmrwtRTMRLh/fCPL6FtuA2ODGM="; # Disable tests since some test fail because of missing test data doCheck = false; diff --git a/pkgs/applications/networking/cluster/argo/default.nix b/pkgs/applications/networking/cluster/argo/default.nix index e66bfb0a9a10..61bd14cdc45b 100644 --- a/pkgs/applications/networking/cluster/argo/default.nix +++ b/pkgs/applications/networking/cluster/argo/default.nix @@ -34,16 +34,16 @@ let in buildGoModule rec { pname = "argo"; - version = "3.5.7"; + version = "3.5.8"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo"; rev = "refs/tags/v${version}"; - hash = "sha256-OJkC+uqOuXA6NBpVxmQAFs+N99d4Zonh9dcZnuB26Ts="; + hash = "sha256-BYUP/Gu+N8KK9mfjRAXupXqrwfZMZlYPxxuZCmUDFfE="; }; - vendorHash = "sha256-O7Lv5RLcqB4JbdXHKXFWkg/dvids8QH619urpeACuN8="; + vendorHash = "sha256-pVOTeH6fq4Gqarjvi7w2wYJ3FSqV6yNZERmOmbVGxLM="; doCheck = false; diff --git a/pkgs/applications/networking/cluster/cni/default.nix b/pkgs/applications/networking/cluster/cni/default.nix index d5079b36886f..9ea1600bc06a 100644 --- a/pkgs/applications/networking/cluster/cni/default.nix +++ b/pkgs/applications/networking/cluster/cni/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "cni"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "containernetworking"; repo = pname; rev = "v${version}"; - hash = "sha256-32rmfBjPtc9w+B8PIb8sFOIlzZ7PnS6XSZRNLreMVl4="; + hash = "sha256-aS7THDTpfNQPw+70ZgFzvurpq/vMKE6xSxJ19ERbtOA="; }; - vendorHash = "sha256-JWaQacekMQGT710U5UgiIpmEYgyUCh1uks5eSV5nhWc="; + vendorHash = "sha256-5VsJ3Osm9w09t3x0dItC2iWwbPMf/IIBOSqUfcbQKK4="; subPackages = [ "./cnitool" diff --git a/pkgs/applications/networking/cluster/cni/plugins.nix b/pkgs/applications/networking/cluster/cni/plugins.nix index b0cd31e9de01..830ef080492b 100644 --- a/pkgs/applications/networking/cluster/cni/plugins.nix +++ b/pkgs/applications/networking/cluster/cni/plugins.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cni-plugins"; - version = "1.5.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "containernetworking"; repo = "plugins"; rev = "v${version}"; - hash = "sha256-gJp1w2H+hPSSu1Y4BY9Sa8lLnhpiZJu2Dz9OenYlQFo="; + hash = "sha256-Veuv7DwwnSUnz2p5gemqQB9pr05nLLQ6gG4JvqFbZ/U="; }; vendorHash = null; diff --git a/pkgs/applications/networking/cluster/kubefirst/default.nix b/pkgs/applications/networking/cluster/kubefirst/default.nix index 9bcc77663d5c..7183fb8885b2 100644 --- a/pkgs/applications/networking/cluster/kubefirst/default.nix +++ b/pkgs/applications/networking/cluster/kubefirst/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "kubefirst"; - version = "2.4.9"; + version = "2.4.10"; src = fetchFromGitHub { owner = "kubefirst"; repo = "kubefirst"; rev = "refs/tags/v${version}"; - hash = "sha256-BuGE+SVLklToKnH7pptfuHqwddncUQq523RZtfmtkLg="; + hash = "sha256-EgJ+ymddMsB37ygREwdF6qmGcgJKPz06//dwwa1pXd0="; }; - vendorHash = "sha256-ZcZl4knlyKAwTsiyZvlkN5e2ox30B5aNzutI/2UEE9U="; + vendorHash = "sha256-5UdKjxs0f8dHTzWvHpMbYSCcIqTU5aT5anNVk0O94tw="; ldflags = [ "-s" diff --git a/pkgs/applications/networking/cluster/kubeshark/default.nix b/pkgs/applications/networking/cluster/kubeshark/default.nix index 1d4c38bdff30..b888cecc927c 100644 --- a/pkgs/applications/networking/cluster/kubeshark/default.nix +++ b/pkgs/applications/networking/cluster/kubeshark/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kubeshark"; - version = "52.3.62"; + version = "52.3.68"; src = fetchFromGitHub { owner = "kubeshark"; repo = "kubeshark"; rev = "v${version}"; - hash = "sha256-mYFjs/6aO7tzopOZij9rNoOu2a/UUQqpDg16gCoeR8w="; + hash = "sha256-GDK+GR3MUYUgfY3cgaxWIYSE3uiEscp9DeeY36/zOYo="; }; vendorHash = "sha256-0WRmAqslZj63m+kCFKIBgoRX47ZyRuU7ZihmF6wmZy4="; diff --git a/pkgs/applications/networking/cluster/temporal/default.nix b/pkgs/applications/networking/cluster/temporal/default.nix index 3bef419324d0..3b23b750864c 100644 --- a/pkgs/applications/networking/cluster/temporal/default.nix +++ b/pkgs/applications/networking/cluster/temporal/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "temporal"; - version = "1.24.1"; + version = "1.24.2"; src = fetchFromGitHub { owner = "temporalio"; repo = "temporal"; rev = "v${version}"; - hash = "sha256-GEmlmVTxQPoKsb9RtS6RcHY/0iDZsj3jG/Les2VPMAc="; + hash = "sha256-hQkus8BZvtR2ObCJbtP2SZST9tRxuPjFwR+jKDYH8Bs="; }; vendorHash = "sha256-u9xQFTwVKEGRPhBwcBgexCQhlNO91yP4m4vchCdBt9E="; diff --git a/pkgs/applications/networking/cluster/tftui/default.nix b/pkgs/applications/networking/cluster/tftui/default.nix index 3bd2c2a13868..9af694c683fd 100644 --- a/pkgs/applications/networking/cluster/tftui/default.nix +++ b/pkgs/applications/networking/cluster/tftui/default.nix @@ -7,14 +7,14 @@ python3.pkgs.buildPythonApplication rec { pname = "tftui"; - version = "0.13.3"; + version = "0.13.5"; pyproject = true; src = fetchFromGitHub { owner = "idoavrah"; repo = "terraform-tui"; rev = "refs/tags/v${version}"; - hash = "sha256-ojmq5m2BRB2Jwvg4j4zc0/jtv4rg1OKJpQiUQoBn+s0="; + hash = "sha256-xOlPuPVwfVT7jfBJPqZ5FbOs80HE0k2ZqcA+Jcxh9p4="; }; pythonRelaxDeps = [ diff --git a/pkgs/applications/networking/instant-messengers/feishu/default.nix b/pkgs/applications/networking/instant-messengers/feishu/default.nix index 67d875ca7a94..d43320558b2a 100644 --- a/pkgs/applications/networking/instant-messengers/feishu/default.nix +++ b/pkgs/applications/networking/instant-messengers/feishu/default.nix @@ -176,10 +176,10 @@ stdenv.mkDerivation { # Wrap feishu and vulcan # Feishu is the main executable, vulcan is the builtin browser for executable in $out/opt/bytedance/feishu/{feishu,vulcan/vulcan}; do + # FIXME: Add back NIXOS_OZONE_WL support once upstream fixes the crash on native Wayland (see #318035) wrapProgram $executable \ --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \ --prefix LD_LIBRARY_PATH : ${rpath}:$out/opt/bytedance/feishu:${addOpenGLRunpath.driverLink}/share \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ ${lib.optionalString (commandLineArgs!="") "--add-flags ${lib.escapeShellArg commandLineArgs}"} done diff --git a/pkgs/applications/networking/p2p/flood/default.nix b/pkgs/applications/networking/p2p/flood/default.nix index 85ef8b2130bb..ada2a69e6947 100644 --- a/pkgs/applications/networking/p2p/flood/default.nix +++ b/pkgs/applications/networking/p2p/flood/default.nix @@ -1,6 +1,7 @@ { lib , buildNpmPackage , fetchFromGitHub +, nixosTests }: buildNpmPackage rec { @@ -16,6 +17,10 @@ buildNpmPackage rec { npmDepsHash = "sha256-md76I7W5QQvfbOmk5ODssMtJAVOj8nvaJ2PakEZ8WUA="; + passthru.tests = { + inherit (nixosTests) flood; + }; + meta = with lib; { description = "Modern web UI for various torrent clients with a Node.js backend and React frontend"; homepage = "https://flood.js.org"; diff --git a/pkgs/applications/networking/remote/citrix-workspace/sources.nix b/pkgs/applications/networking/remote/citrix-workspace/sources.nix index 00c1ff878b96..1b0826c4d2bd 100644 --- a/pkgs/applications/networking/remote/citrix-workspace/sources.nix +++ b/pkgs/applications/networking/remote/citrix-workspace/sources.nix @@ -44,6 +44,17 @@ let x86hash = ""; x64suffix = "65"; x86suffix = ""; + homepage = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-latest12.html"; + }; + + "24.05.0" = { + major = "24"; + minor = "5"; + patch = "0"; + x64hash = "sha256-pye2JOilSbp8PFCpVXFkrRW98E8klCqoisVSWjR38nE="; + x86hash = ""; + x64suffix = "76"; + x86suffix = ""; homepage = "https://www.citrix.com/downloads/workspace-app/linux/workspace-app-for-linux-latest.html"; }; }; diff --git a/pkgs/applications/office/ticktick/default.nix b/pkgs/applications/office/ticktick/default.nix index 746a46e2d4a1..2510d42b9a82 100644 --- a/pkgs/applications/office/ticktick/default.nix +++ b/pkgs/applications/office/ticktick/default.nix @@ -15,11 +15,11 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "ticktick"; - version = "2.0.10"; + version = "2.0.20"; src = fetchurl { url = "https://d2atcrkye2ik4e.cloudfront.net/download/linux/linux_deb_x64/${finalAttrs.pname}-${finalAttrs.version}-amd64.deb"; - hash = "sha256-wign7U1p4HX6/RwnMm2iVSNaYRhn8Ia6QQd5X6m3B0E="; + hash = "sha256-5w50QMSMmkpuhSOqv3LjrcQQDwaD7pIdKUo+8YUgvpk="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/science/biology/poretools/default.nix b/pkgs/applications/science/biology/poretools/default.nix deleted file mode 100644 index 27a1b7ed3841..000000000000 --- a/pkgs/applications/science/biology/poretools/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, python2Packages, fetchFromGitHub }: - -python2Packages.buildPythonPackage rec { - pname = "poretools"; - version = "unstable-2016-07-10"; - - src = fetchFromGitHub { - repo = pname; - owner = "arq5x"; - rev = "e426b1f09e86ac259a00c261c79df91510777407"; - sha256 = "0bglj833wxpp3cq430p1d3xp085ls221js2y90w7ir2x5ay8l7am"; - }; - - propagatedBuildInputs = [ python2Packages.h5py python2Packages.matplotlib python2Packages.seaborn python2Packages.pandas ]; - - meta = { - description = "Toolkit for working with nanopore sequencing data from Oxford Nanopore"; - license = lib.licenses.mit; - homepage = "https://poretools.readthedocs.io/en/latest/"; - maintainers = [ lib.maintainers.rybern ]; - broken = true; # Build error: h5py-3.9.0 not supported for interpreter python2.7 - }; -} diff --git a/pkgs/applications/science/chemistry/openmolcas/default.nix b/pkgs/applications/science/chemistry/openmolcas/default.nix index 8ad979473955..d500e78b2482 100644 --- a/pkgs/applications/science/chemistry/openmolcas/default.nix +++ b/pkgs/applications/science/chemistry/openmolcas/default.nix @@ -43,13 +43,13 @@ let in stdenv.mkDerivation rec { pname = "openmolcas"; - version = "24.02"; + version = "24.06"; src = fetchFromGitLab { owner = "Molcas"; repo = "OpenMolcas"; rev = "v${version}"; - hash = "sha256-4Ek0cnaRfLEbj1Nj31rRp9b2sois4rIFTcpOUq9h2mw="; + hash = "sha256-/y6vEvA1Zf+p7Z0WpcN4P5voLN8MmfbKz1FuthgVQp0="; }; patches = [ diff --git a/pkgs/applications/science/electronics/kicad/versions.nix b/pkgs/applications/science/electronics/kicad/versions.nix index 4c55703edccf..b3ddbd5b604f 100644 --- a/pkgs/applications/science/electronics/kicad/versions.nix +++ b/pkgs/applications/science/electronics/kicad/versions.nix @@ -3,23 +3,23 @@ { "kicad" = { kicadVersion = { - version = "8.0.2"; + version = "8.0.3"; src = { - rev = "55a4d4f5e2f54be6ccf74a8919d04684c9df4c50"; - sha256 = "069ycii9zvdxwxd73afd6bp975r1555yvifi9zdb77qyvn0d9nr9"; + rev = "8ba5ba46af8502ea7a7d2a9754363167c2742399"; + sha256 = "0hafvcjjwylgcpgyyasmb2q210k82wvcswvgjvwwh76bwshwcpwa"; }; }; libVersion = { - version = "8.0.2"; + version = "8.0.3"; libSources = { - symbols.rev = "099ac0c8ac402a685fde00b1369e34a116e29661"; - symbols.sha256 = "0w333f89yw2m0zlpkg0k6hfwlj10snm8laihdjnsb22asyz4pbhn"; - templates.rev = "2e2da58e02707d327d59d4101c401a82dc9a26f6"; - templates.sha256 = "073a6cyvzzy0vmkj3ip4ziq7b7pcizs70nm5acw838dxghjfyv3v"; - footprints.rev = "e8c30550cde4945cbe1bf30cccf0b3c1e2bda6c6"; - footprints.sha256 = "10j8qjljc1fv8k4zp3zn0da33g57hn6pgrgmbgp18dsa539xvxcz"; - packages3d.rev = "249f7947587529026e1676cd70c8d7493a8d8162"; - packages3d.sha256 = "04gvfb54jhnww2qwrxc27wpyrvmjasdc4xhr0ridl7dglh4qcp35"; + symbols.rev = "2bc103c46a8daacbba2cded8b9f095b330ba928d"; + symbols.sha256 = "1za0spq09bbj7xwfwr1abmwjnqfd3zx0crayaz7915ja0ifi75hd"; + templates.rev = "0f57b59d365d1f8b8fdd0745e10beb035e88ba37"; + templates.sha256 = "03idwrk3vj9h2az8j8lqpbdbnfxdbkzh4db68kq3644yj3cnlcza"; + footprints.rev = "539ffd8c0898ad8c8c51c2ab85ba56bfd77271c7"; + footprints.sha256 = "0ik4hjl5m65wnpaymg58zbvsfvchhyq5x3psvj6005mgv2hrican"; + packages3d.rev = "3172a1cc0931c1734efad68623374d5277f8ab60"; + packages3d.sha256 = "1yjlg7cxwhlzcdbxjqyqamr140sz8gvzi63k2401mhdbh88c9kii"; }; }; }; diff --git a/pkgs/applications/version-management/gitmux/default.nix b/pkgs/applications/version-management/gitmux/default.nix index cd5a214464ed..8bb5277dc4ec 100644 --- a/pkgs/applications/version-management/gitmux/default.nix +++ b/pkgs/applications/version-management/gitmux/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, buildGoModule, lib, testers, gitmux }: +{ fetchFromGitHub, buildGoModule, lib, testers, gitmux, git }: buildGoModule rec { pname = "gitmux"; @@ -13,9 +13,8 @@ buildGoModule rec { vendorHash = "sha256-PHY020MIuLlC1LqNGyBJRNd7J+SzoHbNMPAil7CKP/M="; - # GitHub source does contain a regression test for the module - # but it requires networking as it git clones a repo from github - doCheck = false; + nativeCheckInputs = [ git ]; + doCheck = true; ldflags = [ "-X main.version=${version}" ]; diff --git a/pkgs/applications/version-management/gource/default.nix b/pkgs/applications/version-management/gource/default.nix index c6e699ac1b51..60f11d5168b1 100644 --- a/pkgs/applications/version-management/gource/default.nix +++ b/pkgs/applications/version-management/gource/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "gource"; - version = "0.54"; + version = "0.55"; src = fetchurl { url = "https://github.com/acaudwell/Gource/releases/download/${pname}-${version}/${pname}-${version}.tar.gz"; - hash = "sha256-HcvO32XSz01p/gtjPlTCApJsCLgpvK0Lc+r54pzW+uU="; + hash = "sha256-yCOSEtKLB1CNnkd2GZdoAmgWKPwl6z4E9mcRdwE8AUI="; }; postPatch = '' diff --git a/pkgs/applications/video/jellyfin-media-player/default.nix b/pkgs/applications/video/jellyfin-media-player/default.nix index d3909c3799bc..fef1a9ae80f0 100644 --- a/pkgs/applications/video/jellyfin-media-player/default.nix +++ b/pkgs/applications/video/jellyfin-media-player/default.nix @@ -21,24 +21,21 @@ , qtwebchannel , qtwebengine , qtx11extras -, jellyfin-web , withDbus ? stdenv.isLinux }: mkDerivation rec { pname = "jellyfin-media-player"; - version = "1.10.1"; + version = "1.11.1"; src = fetchFromGitHub { owner = "jellyfin"; repo = "jellyfin-media-player"; rev = "v${version}"; - sha256 = "sha256-l1jNrEUrDCc4R1CZ0b0Omjka6wTryjWqnEJbfCSJ0ZE="; + sha256 = "sha256-Jsn4kWQzUaQI9MpbsLJr6JSJk9ZSnMEcrebQ2DYegSU="; }; patches = [ - # fix the location of the jellyfin-web path - ./fix-web-path.patch # disable update notifications since the end user can't simply download the release artifacts to update ./disable-update-notifications.patch ]; @@ -77,11 +74,6 @@ mkDerivation rec { "-DLINUX_X11POWER=ON" ]; - preConfigure = '' - # link the jellyfin-web files to be copied by cmake (see fix-web-path.patch) - ln -s ${jellyfin-web}/share/jellyfin-web . - ''; - postInstall = lib.optionalString stdenv.isDarwin '' mkdir -p $out/bin $out/Applications mv "$out/Jellyfin Media Player.app" $out/Applications diff --git a/pkgs/applications/video/jellyfin-media-player/fix-web-path.patch b/pkgs/applications/video/jellyfin-media-player/fix-web-path.patch deleted file mode 100644 index 250a5c069545..000000000000 --- a/pkgs/applications/video/jellyfin-media-player/fix-web-path.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 5abca9b..d09176b 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -107,10 +107,8 @@ endif() - set(RESOURCE_ROOT .) - if(APPLE) - set(RESOURCE_ROOT Resources) -- if(EXISTS ${CMAKE_CURRENT_BINARY_DIR}/../dist/) -- add_resources(TARGET ${MAIN_TARGET} SOURCES ${CMAKE_CURRENT_BINARY_DIR}/../dist/ DEST ${RESOURCE_ROOT}/web-client/desktop) -- endif() -- add_resources(TARGET ${MAIN_TARGET} SOURCES ${CMAKE_SOURCE_DIR}/native/ DEST ${RESOURCE_ROOT}/web-client/extension) -+ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/../../jellyfin-web/ DESTINATION ${RESOURCE_ROOT}/web-client/desktop) -+ install(DIRECTORY ${CMAKE_SOURCE_DIR}/native/ DESTINATION ${RESOURCE_ROOT}/web-client/extension) - endif() - - if(NOT APPLE) -@@ -123,9 +121,7 @@ if(NOT APPLE) - install(FILES ${loc}/qtwebengine_devtools_resources.pak DESTINATION resources) - endif() - endforeach() -- if(EXISTS ${CMAKE_CURRENT_BINARY_DIR}/../dist/) -- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/../dist/ DESTINATION ${INSTALL_RESOURCE_DIR}/web-client/desktop) -- endif() -+ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/../../jellyfin-web/ DESTINATION ${INSTALL_RESOURCE_DIR}/web-client/desktop) - install(DIRECTORY ${CMAKE_SOURCE_DIR}/native/ DESTINATION ${INSTALL_RESOURCE_DIR}/web-client/extension) - endif() - diff --git a/pkgs/applications/virtualization/tart/default.nix b/pkgs/applications/virtualization/tart/default.nix index 60a84cd30675..d0f2f3a0127e 100644 --- a/pkgs/applications/virtualization/tart/default.nix +++ b/pkgs/applications/virtualization/tart/default.nix @@ -10,11 +10,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "tart"; - version = "2.11.1"; + version = "2.12.0"; src = fetchurl { url = "https://github.com/cirruslabs/tart/releases/download/${finalAttrs.version}/tart-arm64.tar.gz"; - hash = "sha256-LOU7nCJChXgYq10AeZVAMa/QSUD4AKUSLLUKUBrk4UA="; + hash = "sha256-+33Z7M9Y8fWFfCBNJrXHljwoAn7p70+yvTmBwx1X68M="; }; sourceRoot = "."; diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix index 3cbc285076fe..c8bedb1e9569 100644 --- a/pkgs/applications/virtualization/virt-manager/default.nix +++ b/pkgs/applications/virtualization/virt-manager/default.nix @@ -28,6 +28,11 @@ python3.pkgs.buildPythonApplication rec { url = "https://github.com/virt-manager/virt-manager/commit/83fcc5b2e8f2cede84564387756fe8971de72188.patch"; hash = "sha256-yEk+md5EkwYpP27u3E+oTJ8thgtH2Uy1x3JIWPBhqeE="; }) + # fix crash with some cursor themes + (fetchpatch { + url = "https://github.com/virt-manager/virt-manager/commit/cc4a39ea94f42bc92765eb3bb56e2b7f9198be67.patch"; + hash = "sha256-dw6yrMaAOnTh8Z6xJQQKmYelOkOl6EBAOfJQU9vQ8Ws="; + }) ]; nativeBuildInputs = [ diff --git a/pkgs/by-name/as/ast-grep/package.nix b/pkgs/by-name/as/ast-grep/package.nix index c817a6125fc7..e5ffcc27b2ce 100644 --- a/pkgs/by-name/as/ast-grep/package.nix +++ b/pkgs/by-name/as/ast-grep/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "ast-grep"; - version = "0.22.6"; + version = "0.23.0"; src = fetchFromGitHub { owner = "ast-grep"; repo = "ast-grep"; rev = version; - hash = "sha256-QE8bTFlKlaxUeYJoaZyiuv/7zk+Pi3s64Er5YNTUh7I="; + hash = "sha256-QW3ZwALvfSTcvXuH/ploqUD1UJ5fGySIAc3N/TMlB4g="; }; - cargoHash = "sha256-tTEZUGC4RHjnAK+fMNkVqgsngBSdVAtoZ5ij3VbzKb4="; + cargoHash = "sha256-MUdHDP+1KQBXy2itOhW6pDuOTwIwXHy4oDfifDRdM94="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/au/audion/package.nix b/pkgs/by-name/au/audion/package.nix index 0f9b05c527ac..39db0f9d452f 100644 --- a/pkgs/by-name/au/audion/package.nix +++ b/pkgs/by-name/au/audion/package.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "audion"; - version = "0.2.0"; + version = "0.2.1"; src = fetchFromGitHub { owner = "audiusGmbH"; repo = "audion"; rev = "refs/tags/${version}"; - hash = "sha256-j8sQCeHpxrpzyY75DypWI9z+JBWq7aaaXPnZh7ksRjc="; + hash = "sha256-NtAzh7n5bJXMt73L+FJU3vuNoNgga3wYXdZ2TY8AjIA="; }; - cargoHash = "sha256-/x2gjLz73uPY+ouQOxLN2ViET+V/s9jgkgw97yzVj24="; + cargoHash = "sha256-0jPAidJu3f3exXkVCLowR1zHsZ3bctWu+O2mQmSwSpE="; meta = with lib; { description = "Ping the host continuously and write results to a file"; diff --git a/pkgs/by-name/au/autotools-language-server/package.nix b/pkgs/by-name/au/autotools-language-server/package.nix new file mode 100644 index 000000000000..1cb6f711bbc7 --- /dev/null +++ b/pkgs/by-name/au/autotools-language-server/package.nix @@ -0,0 +1,51 @@ +{ lib +, python3 +, fetchFromGitHub +, fetchpatch +}: + +python3.pkgs.buildPythonApplication rec { + pname = "autotools-language-server"; + version = "0.0.19"; + pyproject = true; + + src = fetchFromGitHub { + owner = "Freed-Wu"; + repo = "autotools-language-server"; + rev = "refs/tags/${version}"; + hash = "sha256-V0EOV1ZmeC+4svc2fqV6AIiL37dkrxUJAnjywMZcENw="; + }; + patches = [ + # Right before the release, upstream decided to replace the + # tree-sitter-languages dependency with tree-sitter-make, which is yanked + # from some reason. Hopefully upstream will fix this dependency a bit + # better in the next release. See also: + # https://github.com/Freed-Wu/autotools-language-server/commit/f149843becfcfd6b2bb4a98eb1f3984c01d5fd33#r142659163 + (fetchpatch { + url = "https://github.com/Freed-Wu/autotools-language-server/commit/f149843becfcfd6b2bb4a98eb1f3984c01d5fd33.patch"; + hash = "sha256-TrzHbfR6GYAEqDIFiCqSX2+Qv4JeFJ5faiKJhNYojf0="; + revert = true; + }) + ]; + + build-system = [ + python3.pkgs.setuptools-generate + python3.pkgs.setuptools-scm + ]; + + dependencies = with python3.pkgs; [ + tree-sitter-languages + lsp-tree-sitter + ]; + nativeCheckInputs = [ + python3.pkgs.pytestCheckHook + ]; + + meta = with lib; { + description = "Autotools language server, support configure.ac, Makefile.am, Makefile"; + homepage = "https://github.com/Freed-Wu/autotools-language-server"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ doronbehar ]; + mainProgram = "autotools-language-server"; + }; +} diff --git a/pkgs/by-name/ba/babeltrace/package.nix b/pkgs/by-name/ba/babeltrace/package.nix new file mode 100644 index 000000000000..2d995df59c91 --- /dev/null +++ b/pkgs/by-name/ba/babeltrace/package.nix @@ -0,0 +1,80 @@ +{ + lib, + stdenv, + fetchurl, + gitUpdater, + autoreconfHook, + pkg-config, + glib, + libuuid, + popt, + elfutils, + enablePython ? false, + pythonPackages ? null, + swig2, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "babeltrace"; + version = "1.5.11"; + + src = fetchurl { + url = "https://www.efficios.com/files/babeltrace/${finalAttrs.pname}-${finalAttrs.version}.tar.bz2"; + sha256 = "Z7Q6qu9clR+nrxpVfPcgGhH+iYdrfCK6CgPLwxbbWpw="; + }; + + nativeBuildInputs = + [ + # The pre-generated ./configure script uses an old autoconf version which + # breaks cross-compilation (replaces references to malloc with rpl_malloc). + # Re-generate with nixpkgs's autoconf. This requires glib to be present in + # nativeBuildInputs for its m4 macros to be present. + autoreconfHook + glib + pkg-config + ] + ++ lib.optionals enablePython [ + swig2 + pythonPackages.setuptools + ]; + buildInputs = [ + glib + libuuid + popt + elfutils + ]; + + configureFlags = + [ + # --enable-debug-info (default) requires the configure script to run host + # executables to determine the elfutils library version, which cannot be done + # while cross compiling. + (lib.enableFeature (stdenv.hostPlatform == stdenv.buildPlatform) "debug-info") + ] + ++ lib.optionals enablePython [ + # Using (lib.enableFeature enablePython "python-bindings") makes the + # configure script look for python dependencies even when + # enablePython==false. Adding the configure flag conditionally seems to + # solve this. + "--enable-python-bindings" + ]; + # + + passthru.updateScript = gitUpdater { + url = "https://git.efficios.com/babeltrace.git"; + rev-prefix = "v"; + # Versions 2.x are packaged independently as babeltrace2 + ignoredVersions = "^[^1]"; + }; + + meta = { + description = "Command-line tool and library to read and convert LTTng tracefiles"; + homepage = "https://www.efficios.com/babeltrace"; + license = lib.licenses.mit; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ + bjornfor + wentasah + ]; + }; +}) diff --git a/pkgs/by-name/ba/babeltrace2/package.nix b/pkgs/by-name/ba/babeltrace2/package.nix new file mode 100644 index 000000000000..ec9f15e679f8 --- /dev/null +++ b/pkgs/by-name/ba/babeltrace2/package.nix @@ -0,0 +1,101 @@ +{ + lib, + stdenv, + fetchFromGitHub, + fetchpatch, + autoreconfHook, + pkg-config, + glib, + elfutils, + bison, + flex, + asciidoc, + xmlto, + docbook_xml_dtd_45, + docbook_xsl, + enablePython ? false, + python ? null, + pythonPackages ? null, + swig, + ensureNewerSourcesForZipFilesHook, +}: + +stdenv.mkDerivation rec { + pname = "babeltrace2"; + version = "2.0.6"; + + src = fetchFromGitHub { + owner = "efficios"; + repo = "babeltrace"; + rev = "v${version}"; + hash = "sha256-L4YTqPxvWynUBnmAQnlJ2RNbEv9MhBxQOsqbWix8ZwU="; + }; + + patches = [ + # Patches needed for Python 3.12 + (fetchpatch { + # python: Use standalone 'sysconfig' module + url = "https://github.com/efficios/babeltrace/commit/452480eb6820df9973d50431a479ca547815ae08.patch"; + hash = "sha256-YgUKHJzdliNUsTY29E0xxcUjqVWn4EvxyTs0B+O+jrI="; + }) + (fetchpatch { + # python: replace distutils with setuptools + url = "https://github.com/efficios/babeltrace/commit/6ec97181a525a3cd64cedbcd0df905ed9e84ba03.patch"; + hash = "sha256-1hlEkPcRUpf2+iEXqHXcCDOaLTg+eaVcahqZlA8m5QY="; + }) + (fetchpatch { + # fix: python: monkey patch the proper sysconfig implementation + url = "https://github.com/efficios/babeltrace/commit/927263e4ea62877af7240cfdb1514ae949dbfc2e.patch"; + hash = "sha256-HNRQ7uw26FUKCQ/my6//OL2xsHdOGlQUq5zIKtg9OGw="; + }) + ]; + + outputs = [ + "out" + "man" + "dev" + ]; + + nativeBuildInputs = + [ + autoreconfHook + pkg-config + glib + bison + flex + asciidoc + xmlto + docbook_xml_dtd_45 + docbook_xsl + ] + ++ lib.optionals enablePython [ + swig + pythonPackages.setuptools + ensureNewerSourcesForZipFilesHook + ]; + + buildInputs = [ + glib + elfutils + ] ++ lib.optional enablePython python; + + configureFlags = [ + (lib.enableFeature enablePython "python-bindings") + (lib.enableFeature enablePython "python-plugins") + (lib.enableFeature (stdenv.hostPlatform == stdenv.buildPlatform) "debug-info") + ]; + + # For cross-compilation of Python bindings + makeFlags = [ "CFLAGS=-Wno-error=stringop-truncation -Wno-error=null-dereference" ]; + + enableParallelBuilding = true; + + meta = { + description = "Babeltrace /ˈbæbəltreɪs/ is an open-source trace manipulation toolkit"; + homepage = "https://babeltrace.org"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ wentasah ]; + mainProgram = "babeltrace2"; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/by-name/ca/catppuccin-whiskers/package.nix b/pkgs/by-name/ca/catppuccin-whiskers/package.nix new file mode 100644 index 000000000000..6ab0b4aaff79 --- /dev/null +++ b/pkgs/by-name/ca/catppuccin-whiskers/package.nix @@ -0,0 +1,23 @@ +{ lib, fetchFromGitHub, rustPlatform }: +let version = "2.4.0"; +in rustPlatform.buildRustPackage { + pname = "catppuccin-whiskers"; + inherit version; + + src = fetchFromGitHub { + owner = "catppuccin"; + repo = "whiskers"; + rev = "refs/tags/v${version}"; + hash = "sha256-rbPr5eSs99nS70J785SWO7tVBdiX/S7XUNHuo3aOQU4="; + }; + + cargoHash = "sha256-T7dreELSHfJizfbJEvvgkOmkMwlOETZVUdLwRFJOJEo="; + + meta = { + homepage = "https://github.com/catppuccin/whiskers"; + description = "A templating tool to simplify the creation of Catppuccin ports"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ Name ]; + mainProgram = "whiskers"; + }; +} diff --git a/pkgs/applications/emulators/cemu/cmakelists.patch b/pkgs/by-name/ce/cemu/0000-spirv-tools-opt-cmakelists.patch similarity index 100% rename from pkgs/applications/emulators/cemu/cmakelists.patch rename to pkgs/by-name/ce/cemu/0000-spirv-tools-opt-cmakelists.patch diff --git a/pkgs/applications/emulators/cemu/default.nix b/pkgs/by-name/ce/cemu/package.nix similarity index 55% rename from pkgs/applications/emulators/cemu/default.nix rename to pkgs/by-name/ce/cemu/package.nix index c5860d3b0b26..3a009ea0cb3b 100644 --- a/pkgs/applications/emulators/cemu/default.nix +++ b/pkgs/by-name/ce/cemu/package.nix @@ -1,34 +1,37 @@ -{ lib, stdenv, fetchFromGitHub -, addOpenGLRunpath -, wrapGAppsHook3 -, cmake -, glslang -, nasm -, pkg-config - -, SDL2 -, boost -, cubeb -, curl -, fmt_9 -, glm -, gtk3 -, hidapi -, imgui -, libpng -, libusb1 -, libzip -, libXrender -, pugixml -, rapidjson -, vulkan-headers -, wayland -, wxGTK32 -, zarchive -, gamemode -, vulkan-loader - -, nix-update-script +{ + lib, + SDL2, + addOpenGLRunpath, + boost, + cmake, + cubeb, + curl, + fetchFromGitHub, + fmt_9, + gamemode, + glm, + glslang, + gtk3, + hidapi, + imgui, + libXrender, + libpng, + libusb1, + libzip, + nasm, + ninja, + nix-update-script, + pkg-config, + pugixml, + rapidjson, + stdenv, + testers, + vulkan-headers, + vulkan-loader, + wayland, + wrapGAppsHook3, + wxGTK32, + zarchive, }: let @@ -43,31 +46,32 @@ let sha256 = "sha256-gf47uLeNiXQic43buB5ZnMqiotlUfIyAsP+3H7yJuFg="; }; }; - -in stdenv.mkDerivation rec { +in stdenv.mkDerivation (finalAttrs: { pname = "cemu"; - version = "2.0-85"; + version = "2.0-86"; src = fetchFromGitHub { owner = "cemu-project"; repo = "Cemu"; - rev = "v${version}"; - hash = "sha256-uMVbKJhdHLLKsJnj7YFIG+S5pm7rSZfBSWebhTP01Y8="; + rev = "v${finalAttrs.version}"; + hash = "sha256-AS5Qo4J0U1MeTYWl4jiJMi879bhBuioU1BikxGKtUrE="; }; patches = [ # glslangTargets want SPIRV-Tools-opt to be defined: # > The following imported targets are referenced, but are missing: # > SPIRV-Tools-opt - ./cmakelists.patch + ./0000-spirv-tools-opt-cmakelists.patch ]; nativeBuildInputs = [ + SDL2 addOpenGLRunpath wrapGAppsHook3 cmake glslang nasm + ninja pkg-config ]; @@ -94,24 +98,26 @@ in stdenv.mkDerivation rec { ]; cmakeFlags = [ - "-DCMAKE_C_FLAGS_RELEASE=-DNDEBUG" - "-DCMAKE_CXX_FLAGS_RELEASE=-DNDEBUG" - "-DENABLE_VCPKG=OFF" - "-DENABLE_FERAL_GAMEMODE=ON" + (lib.cmakeFeature "CMAKE_C_FLAGS_RELEASE" "-DNDEBUG") + (lib.cmakeFeature "CMAKE_CXX_FLAGS_RELEASE" "-DNDEBUG") + (lib.cmakeBool "ENABLE_VCPKG" false) + (lib.cmakeBool "ENABLE_FERAL_GAMEMODE" true) - # PORTABLE: - # "All data created and maintained by Cemu will be in the directory where the executable file is located" - "-DPORTABLE=OFF" + # PORTABLE: "All data created and maintained by Cemu will be in + # the directory where the executable file is located" + (lib.cmakeBool "PORTABLE" false) ]; - preConfigure = with lib; let - tag = last (splitString "-" version); + strictDeps = true; + + preConfigure = let + tag = lib.last (lib.splitString "-" finalAttrs.version); in '' rm -rf dependencies/imgui # cemu expects imgui source code, not just header files ln -s ${imgui'.src} dependencies/imgui - substituteInPlace src/Common/version.h --replace " (experimental)" "-${tag} (experimental)" - substituteInPlace dependencies/gamemode/lib/gamemode_client.h --replace "libgamemode.so.0" "${gamemode.lib}/lib/libgamemode.so.0" + substituteInPlace src/Common/version.h --replace-fail " (experimental)" "-${tag} (experimental)" + substituteInPlace dependencies/gamemode/lib/gamemode_client.h --replace-fail "libgamemode.so.0" "${gamemode.lib}/lib/libgamemode.so.0" ''; installPhase = '' @@ -138,14 +144,21 @@ in stdenv.mkDerivation rec { ) ''; - passthru.updateScript = nix-update-script { }; - - meta = with lib; { - description = "Cemu is a Wii U emulator"; - homepage = "https://cemu.info"; - license = licenses.mpl20; - platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ zhaofengli baduhai ]; - mainProgram = "cemu"; + passthru = { + updateScript = nix-update-script { }; + tests = { + version = testers.testVersion { + package = finalAttrs.finalPackage; + }; + }; }; -} + + meta = { + description = "Software to emulate Wii U games and applications on PC"; + homepage = "https://cemu.info"; + license = lib.licenses.mpl20; + mainProgram = "cemu"; + maintainers = with lib.maintainers; [ zhaofengli baduhai AndersonTorres ]; + platforms = [ "x86_64-linux" ]; + }; +}) diff --git a/pkgs/applications/audio/ChowCentaur/default.nix b/pkgs/by-name/ch/chow-centaur/package.nix similarity index 92% rename from pkgs/applications/audio/ChowCentaur/default.nix rename to pkgs/by-name/ch/chow-centaur/package.nix index 80f5768dc157..87c8bc35b1b9 100644 --- a/pkgs/applications/audio/ChowCentaur/default.nix +++ b/pkgs/by-name/ch/chow-centaur/package.nix @@ -2,14 +2,14 @@ , xcbutilcursor, xcbutilkeysyms, xcbutil, libXrandr, libXinerama, libXcursor , alsa-lib, libjack2, lv2, gcc-unwrapped }: -stdenv.mkDerivation rec { - pname = "ChowCentaur"; +stdenv.mkDerivation (finalAttrs: { + pname = "chow-centaur"; version = "1.4.0"; src = fetchFromGitHub { owner = "jatinchowdhury18"; repo = "KlonCentaur"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "0mrzlf4a6f25xd7z9xanpyq7ybb4al01dzpjsgi0jkmlmadyhc4h"; fetchSubmodules = true; }; @@ -50,4 +50,4 @@ stdenv.mkDerivation rec { platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ magnetophon ]; }; -} +}) diff --git a/pkgs/applications/audio/ChowKick/default.nix b/pkgs/by-name/ch/chow-kick/package.nix similarity index 83% rename from pkgs/applications/audio/ChowKick/default.nix rename to pkgs/by-name/ch/chow-kick/package.nix index 0eec7ea32d32..b9dec059d1f1 100644 --- a/pkgs/applications/audio/ChowKick/default.nix +++ b/pkgs/by-name/ch/chow-kick/package.nix @@ -35,14 +35,14 @@ , webkitgtk }: -stdenv.mkDerivation rec { - pname = "ChowKick"; +stdenv.mkDerivation (finalAttrs: { + pname = "chow-kick"; version = "1.1.1"; src = fetchFromGitHub { owner = "Chowdhury-DSP"; - repo = pname; - rev = "v${version}"; + repo = "ChowKick"; + rev = "v${finalAttrs.version}"; sha256 = "0amnp0p7ckbbr9dcbdnld1ryv46kvza2dj8m6hzmi7c1s4df8x5q"; fetchSubmodules = true; }; @@ -91,9 +91,9 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/lib/lv2 $out/lib/vst3 $out/bin - cp -r ChowKick_artefacts/Release/LV2//${pname}.lv2 $out/lib/lv2 - cp -r ChowKick_artefacts/Release/VST3/${pname}.vst3 $out/lib/vst3 - cp ChowKick_artefacts/Release/Standalone/${pname} $out/bin + cp -r ChowKick_artefacts/Release/LV2/ChowKick.lv2 $out/lib/lv2 + cp -r ChowKick_artefacts/Release/VST3/ChowKick.vst3 $out/lib/vst3 + cp ChowKick_artefacts/Release/Standalone/ChowKick $out/bin ''; meta = with lib; { @@ -104,4 +104,4 @@ stdenv.mkDerivation rec { platforms = platforms.linux; mainProgram = "ChowKick"; }; -} +}) diff --git a/pkgs/applications/audio/ChowPhaser/default.nix b/pkgs/by-name/ch/chow-phaser/package.nix similarity index 93% rename from pkgs/applications/audio/ChowPhaser/default.nix rename to pkgs/by-name/ch/chow-phaser/package.nix index a828a1e1d041..23cfe684d81f 100644 --- a/pkgs/applications/audio/ChowPhaser/default.nix +++ b/pkgs/by-name/ch/chow-phaser/package.nix @@ -4,14 +4,14 @@ , libsepol, libsysprof-capture, libthai, libxkbcommon, pcre, pkg-config , python3, sqlite, stdenv }: -stdenv.mkDerivation rec { - pname = "ChowPhaser"; +stdenv.mkDerivation (finalAttrs: { + pname = "chow-phaser"; version = "1.1.1"; src = fetchFromGitHub { owner = "jatinchowdhury18"; repo = "ChowPhaser"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; fetchSubmodules = true; sha256 = "sha256-9wo7ZFMruG3QNvlpILSvrFh/Sx6J1qnlWc8+aQyS4tQ="; }; @@ -70,7 +70,8 @@ stdenv.mkDerivation rec { homepage = "https://github.com/jatinchowdhury18/ChowPhaser"; description = "Phaser effect based loosely on the Schulte Compact Phasing 'A'"; license = with licenses; [ bsd3 ]; + mainProgram = "ChowPhaserStereo"; maintainers = with maintainers; [ magnetophon ]; platforms = platforms.linux; }; -} +}) diff --git a/pkgs/applications/audio/CHOWTapeModel/default.nix b/pkgs/by-name/ch/chow-tape-model/package.nix similarity index 94% rename from pkgs/applications/audio/CHOWTapeModel/default.nix rename to pkgs/by-name/ch/chow-tape-model/package.nix index 29c1b82d9d0e..44fc35073d36 100644 --- a/pkgs/applications/audio/CHOWTapeModel/default.nix +++ b/pkgs/by-name/ch/chow-tape-model/package.nix @@ -39,14 +39,14 @@ let # See here: https://forum.juce.com/t/build-fails-on-fedora-wrong-c-version/50902/2 stdenv = gcc11Stdenv; in -stdenv.mkDerivation rec { - pname = "CHOWTapeModel"; +stdenv.mkDerivation (finalAttrs: { + pname = "chow-tape-model"; version = "2.11.4"; src = fetchFromGitHub { owner = "jatinchowdhury18"; repo = "AnalogTapeModel"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-WriHi68Y6hAsrwE+74JtVlAKUR9lfTczj6UK9h2FOGM="; fetchSubmodules = true; }; @@ -99,7 +99,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/lib/lv2 $out/lib/vst3 $out/lib/clap $out/bin $out/share/doc/CHOWTapeModel/ - cd CHOWTapeModel_artefacts/${cmakeBuildType} + cd CHOWTapeModel_artefacts/${finalAttrs.cmakeBuildType} cp -r LV2/CHOWTapeModel.lv2 $out/lib/lv2 cp -r VST3/CHOWTapeModel.vst3 $out/lib/vst3 cp -r CLAP/CHOWTapeModel.clap $out/lib/clap @@ -129,4 +129,4 @@ stdenv.mkDerivation rec { broken = stdenv.isAarch64; # since 2021-12-27 on hydra (update to 2.10): https://hydra.nixos.org/build/162558991 mainProgram = "CHOWTapeModel"; }; -} +}) diff --git a/pkgs/by-name/co/consul/package.nix b/pkgs/by-name/co/consul/package.nix index edc3db672bd6..5dc8d88afe34 100644 --- a/pkgs/by-name/co/consul/package.nix +++ b/pkgs/by-name/co/consul/package.nix @@ -8,7 +8,7 @@ buildGoModule rec { pname = "consul"; - version = "1.18.2"; + version = "1.19.0"; # Note: Currently only release tags are supported, because they have the Consul UI # vendored. See @@ -22,7 +22,7 @@ buildGoModule rec { owner = "hashicorp"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-9feeWsCAZKip+AYUJTCcqFOTfxsUFMzTRqHjo/Pptho="; + hash = "sha256-GO2BfdozsAo1r4iSyQdAEG8Tm6OkJhSUrH3bZ9lWuO8="; }; # This corresponds to paths with package main - normally unneeded but consul @@ -32,7 +32,7 @@ buildGoModule rec { "connect/certgen" ]; - vendorHash = "sha256-bBc3qgPUOmR8c/sFyiskePKLKjHTQcWVTLY6esFIRTc="; + vendorHash = "sha256-h3eTCj/0FPiY/Dj4cMj9VqKBs28ArnTPjRIC3LT06j0="; doCheck = false; diff --git a/pkgs/by-name/cy/cyme/Cargo.lock b/pkgs/by-name/cy/cyme/Cargo.lock index fd35496ea48f..c645e23d1563 100644 --- a/pkgs/by-name/cy/cyme/Cargo.lock +++ b/pkgs/by-name/cy/cyme/Cargo.lock @@ -492,8 +492,9 @@ dependencies = [ [[package]] name = "libusb1-sys" -version = "0.6.4" -source = "git+https://github.com/a1ien/rusb.git#c38563efeb7733f0f8b5ac01703fd2ad1d84fea2" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da050ade7ac4ff1ba5379af847a10a10a8e284181e060105bf8d86960ce9ce0f" dependencies = [ "cc", "libc", @@ -697,8 +698,9 @@ checksum = "b833d8d034ea094b1ea68aa6d5c740e0d04bad9d16568d08ba6f76823a114316" [[package]] name = "rusb" -version = "0.9.3" -source = "git+https://github.com/a1ien/rusb.git#c38563efeb7733f0f8b5ac01703fd2ad1d84fea2" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab9f9ff05b63a786553a4c02943b74b34a988448671001e9a27e2f0565cc05a4" dependencies = [ "libc", "libusb1-sys", diff --git a/pkgs/by-name/cy/cyme/package.nix b/pkgs/by-name/cy/cyme/package.nix index 3b38028f2d11..5c854b55893f 100644 --- a/pkgs/by-name/cy/cyme/package.nix +++ b/pkgs/by-name/cy/cyme/package.nix @@ -14,20 +14,19 @@ rustPlatform.buildRustPackage rec { pname = "cyme"; - version = "1.6.0"; + version = "1.6.1"; src = fetchFromGitHub { owner = "tuna-f1sh"; repo = "cyme"; rev = "v${version}"; - hash = "sha256-97sxK2zhUKBS238F9mNk8a2VbTVpvbDlN1yDas4Fls4="; + hash = "sha256-HIOrdVChTfYX8AKqytWU+EudFDiqoVELb+yL3jsPQwM="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { "libudev-sys-0.1.4" = "sha256-7dUqPH8bQ/QSBIppxQbymwQ44Bvi1b6N2AMUylbyKK8="; - "libusb1-sys-0.6.4" = "sha256-Y3K3aEZnpLud/g4Tx+1HDEkNRKi5s4Fo0QSWya/L+L4="; }; }; diff --git a/pkgs/by-name/di/discord-gamesdk/package.nix b/pkgs/by-name/di/discord-gamesdk/package.nix index b2f9a08dc772..40756d68e1e5 100644 --- a/pkgs/by-name/di/discord-gamesdk/package.nix +++ b/pkgs/by-name/di/discord-gamesdk/package.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildInputs = [ (stdenv.cc.cc.libgcc or null) ]; - nativeBuildInputs = [ autoPatchelfHook ]; + nativeBuildInputs = lib.optional stdenv.isLinux autoPatchelfHook; installPhase = let diff --git a/pkgs/development/tools/eask/default.nix b/pkgs/by-name/ea/eask/package.nix similarity index 82% rename from pkgs/development/tools/eask/default.nix rename to pkgs/by-name/ea/eask/package.nix index 4c1e10d473a2..3f7fb419795b 100644 --- a/pkgs/development/tools/eask/default.nix +++ b/pkgs/by-name/ea/eask/package.nix @@ -1,6 +1,7 @@ -{ lib -, buildNpmPackage -, fetchFromGitHub +{ + lib, + buildNpmPackage, + fetchFromGitHub, }: buildNpmPackage rec { @@ -24,6 +25,9 @@ buildNpmPackage rec { homepage = "https://emacs-eask.github.io/"; license = lib.licenses.gpl3Plus; mainProgram = "eask"; - maintainers = with lib.maintainers; [ jcs090218 ]; + maintainers = with lib.maintainers; [ + jcs090218 + piotrkwiecinski + ]; }; } diff --git a/pkgs/by-name/es/escambo/package.nix b/pkgs/by-name/es/escambo/package.nix new file mode 100644 index 000000000000..24341716dd78 --- /dev/null +++ b/pkgs/by-name/es/escambo/package.nix @@ -0,0 +1,62 @@ +{ + lib, + python3Packages, + fetchFromGitHub, + meson, + ninja, + pkg-config, + gobject-introspection, + blueprint-compiler, + wrapGAppsHook4, + desktop-file-utils, + libadwaita, + gtksourceview5, +}: + +python3Packages.buildPythonApplication rec { + pname = "escambo"; + version = "0.1.2"; + pyproject = false; # built with meson + + src = fetchFromGitHub { + owner = "CleoMenezesJr"; + repo = "escambo"; + rev = version; + hash = "sha256-jMlix8nlCaVLZEhqzb6LRNrD3DUZMTIjqrRKo6nFbQA="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + gobject-introspection + blueprint-compiler + wrapGAppsHook4 + desktop-file-utils + ]; + + buildInputs = [ + libadwaita + gtksourceview5 + ]; + + dependencies = with python3Packages; [ + pygobject3 + requests + ]; + + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + + meta = { + description = "HTTP-based APIs test application for GNOME"; + homepage = "https://github.com/CleoMenezesJr/escambo"; + license = lib.licenses.gpl3Plus; + mainProgram = "escambo"; + maintainers = with lib.maintainers; [ aleksana ]; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/by-name/ff/fflogs/package.nix b/pkgs/by-name/ff/fflogs/package.nix index df8e216e34bb..73ec95ab3bf9 100644 --- a/pkgs/by-name/ff/fflogs/package.nix +++ b/pkgs/by-name/ff/fflogs/package.nix @@ -5,10 +5,10 @@ let pname = "fflogs"; - version = "8.5.12"; + version = "8.5.16"; src = fetchurl { url = "https://github.com/RPGLogs/Uploaders-fflogs/releases/download/v${version}/fflogs-v${version}.AppImage"; - hash = "sha256-mlqQm9o001+pSMfMbOwa+gKcIIC6SBg7Rott9+XkB2E="; + hash = "sha256-eUXri4aVMnZtXzCDL3NZTdCR7y0VD5kG4D9YfXQVuzo="; }; extracted = appimageTools.extractType2 { inherit pname version src; }; in diff --git a/pkgs/by-name/fi/files-cli/package.nix b/pkgs/by-name/fi/files-cli/package.nix index 089adefd8bba..3d78e105cecf 100644 --- a/pkgs/by-name/fi/files-cli/package.nix +++ b/pkgs/by-name/fi/files-cli/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "files-cli"; - version = "2.13.65"; + version = "2.13.72"; src = fetchFromGitHub { repo = "files-cli"; owner = "files-com"; rev = "v${version}"; - hash = "sha256-SUxITjWgUQcF7G6w5PZUpjvBH3tGhK/A1sOVg6SEfTU="; + hash = "sha256-u5hAUGGaMpUub4WL8CGEzbnfXPRouaGbb8SQ6ep3X3Q="; }; - vendorHash = "sha256-QVQi60j0XR1OApLG/WPq9aAP4P/2hYCbTLL/3sHAisw="; + vendorHash = "sha256-y4XZeugjqy6ydAq6KQ8iIgMgE6iHAEqzzi2A+N1LB3M="; ldflags = [ "-s" diff --git a/pkgs/by-name/fi/fira-mono/package.nix b/pkgs/by-name/fi/fira-mono/package.nix index 5d059dbf88e0..5925b665eb81 100644 --- a/pkgs/by-name/fi/fira-mono/package.nix +++ b/pkgs/by-name/fi/fira-mono/package.nix @@ -1,24 +1,27 @@ -{ lib, stdenvNoCC, fetchzip }: +{ lib +, stdenvNoCC +, fetchzip +}: stdenvNoCC.mkDerivation rec { pname = "fira-mono"; - version = "4.202"; + version = "3.2"; src = fetchzip { - url = "https://github.com/mozilla/Fira/archive/${version}.zip"; - hash = "sha256-HLReqgL0PXF5vOpwLN0GiRwnzkjGkEVEyOEV2Z4R0oQ="; + url = "https://bboxtype.com/downloads/Fira/Fira_Mono_${lib.replaceStrings ["."] ["_"] version}.zip"; + hash = "sha256-Ukc+K2sdSz+vUQFD8mmwJHZQ3N68oM4fk6YzGLwzAfQ="; }; installPhase = '' runHook preInstall - install -Dm644 otf/FiraMono*.otf -t $out/share/fonts/opentype + install -Dm644 Fonts/FiraMono_OTF*/*.otf -t $out/share/fonts/opentype runHook postInstall ''; meta = with lib; { - homepage = "https://mozilla.github.io/Fira/"; + homepage = "https://bboxtype.com/fira/"; description = "Monospace font for Firefox OS"; longDescription = '' Fira Mono is a monospace font designed by Erik Spiekermann, diff --git a/pkgs/by-name/fi/fira-sans/package.nix b/pkgs/by-name/fi/fira-sans/package.nix index c07cc15c97cc..0a2bc0e0f628 100644 --- a/pkgs/by-name/fi/fira-sans/package.nix +++ b/pkgs/by-name/fi/fira-sans/package.nix @@ -1,22 +1,28 @@ { lib , stdenvNoCC -, fira-mono +, fetchzip }: -stdenvNoCC.mkDerivation { +stdenvNoCC.mkDerivation rec { pname = "fira-sans"; - inherit (fira-mono) version src; + version = "4.301"; + + src = fetchzip { + url = "https://bboxtype.com/downloads/Fira/Download_Folder_FiraSans_${lib.replaceStrings ["."] [""] version}.zip"; + hash = "sha256-WBt3oqPK7ACqMhilYkyFx9Ek2ugwdCDFZN+8HLRnGRs"; + stripRoot = false; + }; installPhase = '' runHook preInstall - install --mode=-x -Dt $out/share/fonts/opentype otf/FiraSans*.otf + install --mode=-x -Dt $out/share/fonts/opentype Download_Folder_FiraSans*/Fonts/Fira_Sans_OTF*/*/*/*.otf runHook postInstall ''; meta = with lib; { - homepage = "https://mozilla.github.io/Fira/"; + homepage = "https://bboxtype.com/fira/"; description = "Sans-serif font for Firefox OS"; longDescription = '' Fira Sans is a sans-serif font designed by Erik Spiekermann, diff --git a/pkgs/by-name/fi/fira/package.nix b/pkgs/by-name/fi/fira/package.nix index 405189ba2e99..9d2869ac5357 100644 --- a/pkgs/by-name/fi/fira/package.nix +++ b/pkgs/by-name/fi/fira/package.nix @@ -6,7 +6,7 @@ symlinkJoin rec { pname = "fira"; - inherit (fira-mono) version; + inherit (fira-sans) version; name = "${pname}-${version}"; paths = [ @@ -16,7 +16,7 @@ symlinkJoin rec { meta = { description = "Fira font family including Fira Sans and Fira Mono"; - homepage = "https://mozilla.github.io/Fira/"; + homepage = "https://bboxtype.com/fira/"; license = lib.licenses.ofl; platforms = lib.platforms.all; }; diff --git a/pkgs/by-name/ge/geopard/package.nix b/pkgs/by-name/ge/geopard/package.nix index 6ec0127afbe6..4966ee60aa43 100644 --- a/pkgs/by-name/ge/geopard/package.nix +++ b/pkgs/by-name/ge/geopard/package.nix @@ -2,71 +2,55 @@ , cargo , rustc , fetchFromGitHub -, glib -, gtk4 , libadwaita , rustPlatform -, openssl , pkg-config , lib , wrapGAppsHook4 , meson , ninja -, gdk-pixbuf -, cmake , desktop-file-utils -, gettext , blueprint-compiler -, appstream-glib +, glib-networking }: stdenv.mkDerivation rec { pname = "geopard"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "ranfdev"; - repo = pname; - rev = version; - hash = "sha256-elHxtFEGkdhEPHxuJtcMYwWnvo6vDaHiOyN51EOzym0="; + repo = "geopard"; + rev = "v${version}"; + hash = "sha256-QHqhjoiKiwTBDMDhb7Agqe0/o2LyLDs2kl/HC4UfayY="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit pname version src; - hash = "sha256-80YujPjcmAxH1gITT4OJk8w4m8Z/pAYtBUpCPQOKe3E="; + hash = "sha256-AmGwsSRrZK+oSnkn9Xzmia/Kbkw19v0nb1kFJtymqOs="; }; nativeBuildInputs = [ - openssl - gettext - glib # for glib-compile-schemas meson ninja pkg-config wrapGAppsHook4 - cmake blueprint-compiler desktop-file-utils - appstream-glib - blueprint-compiler cargo rustc rustPlatform.cargoSetupHook ]; buildInputs = [ - desktop-file-utils - gdk-pixbuf - glib - gtk4 libadwaita - openssl + glib-networking ]; meta = with lib; { homepage = "https://github.com/ranfdev/Geopard"; description = "Colorful, adaptive gemini browser"; - maintainers = with maintainers; [ jfvillablanca ]; + maintainers = with maintainers; [ jfvillablanca aleksana ]; license = licenses.gpl3Plus; platforms = platforms.linux; mainProgram = "geopard"; diff --git a/pkgs/by-name/ge/getmail6/package.nix b/pkgs/by-name/ge/getmail6/package.nix index 08742f9ea040..d6e5c5dc23a1 100644 --- a/pkgs/by-name/ge/getmail6/package.nix +++ b/pkgs/by-name/ge/getmail6/package.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "getmail6"; - version = "6.19.00"; + version = "6.19.01"; pyproject = true; src = fetchFromGitHub { owner = "getmail6"; repo = "getmail6"; rev = "refs/tags/v${version}"; - hash = "sha256-cAho0fAvxUoxKrvS7XJaKYGEGgtA8Xl6dOEtVtUvK10="; + hash = "sha256-Q3FQmliWQ8BB/U4RWw1z5I721jw8LGRLPjI9eKELd0g="; }; build-system = with python3.pkgs; [ diff --git a/pkgs/by-name/gl/glock/package.nix b/pkgs/by-name/gl/glock/package.nix new file mode 100644 index 000000000000..c573d06af7d0 --- /dev/null +++ b/pkgs/by-name/gl/glock/package.nix @@ -0,0 +1,40 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, fetchpatch +}: + +buildGoModule { + pname = "glock"; + version = "0-unstable-2021-03-19"; + + src = fetchFromGitHub { + owner = "robfig"; + repo = "glock"; + rev = "0ac7e52a4c8a9a7039a72b3c6a10e8be59bc6599"; + hash = "sha256-EDaLk83u1gRcvEjrfBrLZBQZ5unyD9LQA2TccOawXII="; + }; + + patches = [ + # Migrate to Go modules + (fetchpatch { + url = "https://github.com/robfig/glock/commit/943afe5e26dd64ebad5ca17613ae3700c53fb25d.patch"; + hash = "sha256-nk+5uHlCv7Hxbo0Axvi15nJVzEcb++gOJpF3w06yQsk="; + }) + ]; + + vendorHash = "sha256-v3lfb+CXbTxzObDpubufD3Q1h6IhULcC/6spA6StfGw="; + + checkFlags = [ "-skip=^TestSave$" ]; + + meta = { + homepage = "https://github.com/robfig/glock"; + description = "Command-line tool to lock Go dependencies to specific revisions"; + mainProgram = "glock"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + luftmensch-luftmensch + rushmorem + ]; + }; +} diff --git a/pkgs/by-name/gm/gmic/package.nix b/pkgs/by-name/gm/gmic/package.nix index 143954e9cf49..1ed7224ac5d6 100644 --- a/pkgs/by-name/gm/gmic/package.nix +++ b/pkgs/by-name/gm/gmic/package.nix @@ -41,8 +41,8 @@ stdenv.mkDerivation (finalAttrs: { # Reference: src/Makefile, directive gmic_stdlib_community.h gmic_stdlib = fetchurl { name = "gmic_stdlib_community.h"; - url = "http://gmic.eu/gmic_stdlib_community${lib.replaceStrings ["."] [""] finalAttrs.version}.h"; - hash = "sha256-wq8yQ0pxEGH3sOmwmgQfRVluHAC4JBYgs2mto1PNLP4="; + url = "https://gmic.eu/gmic_stdlib_community${lib.replaceStrings ["."] [""] finalAttrs.version}.h"; + hash = "sha256-LoqK8ADwzPpxhy2GvaxVjGyYEHAbhspyoIXuBXCLRtQ="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/gm/gmid/package.nix b/pkgs/by-name/gm/gmid/package.nix index 6c73773b6e11..f6f9996b7383 100644 --- a/pkgs/by-name/gm/gmid/package.nix +++ b/pkgs/by-name/gm/gmid/package.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gmid"; - version = "2.0.4"; + version = "2.0.5"; src = fetchFromGitHub { owner = "omar-polo"; repo = pname; rev = version; - hash = "sha256-ioyQS5jjOICAWtZG8no+WUmLybEVLvum6TFFFdnMdfY="; + hash = "sha256-xuA5yLtRu9GDrSr7FBlAwEjCjFVRmnOuBM62AHOHDhc="; }; nativeBuildInputs = [ bison ]; diff --git a/pkgs/by-name/go/goofcord/package.nix b/pkgs/by-name/go/goofcord/package.nix index d4103a09a08e..57819ebfbc0f 100644 --- a/pkgs/by-name/go/goofcord/package.nix +++ b/pkgs/by-name/go/goofcord/package.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "goofcord"; - version = "1.4.2"; + version = "1.4.3"; src = let @@ -48,11 +48,11 @@ stdenv.mkDerivation (finalAttrs: { { x86_64-linux = fetchurl { url = "${base}/v${finalAttrs.version}/GoofCord-${finalAttrs.version}-linux-amd64.deb"; - hash = "sha256-fUP/se3hOhs+aAoew25YhRyxnodYPrgqN68RIg1A1Kw="; + hash = "sha256-XO/T5O6+hJ6QT8MCVorrdXPZZlrywa6u0UKPk9WIQBE="; }; aarch64-linux = fetchurl { url = "${base}/v${finalAttrs.version}/GoofCord-${finalAttrs.version}-linux-arm64.deb"; - hash = "sha256-hVpXmBSIgoON683f/sRtmpHwqxcO6IrFCCRPZjsUqjw="; + hash = "sha256-4mJ3kDQ+eh9LnyzxyNYvd2hMmgiJtBMXKup7ILlHk0Y="; }; } .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); diff --git a/pkgs/by-name/gr/graphite-cli/package.nix b/pkgs/by-name/gr/graphite-cli/package.nix index 147e6de68def..7e5b98ebab86 100644 --- a/pkgs/by-name/gr/graphite-cli/package.nix +++ b/pkgs/by-name/gr/graphite-cli/package.nix @@ -7,11 +7,11 @@ buildNpmPackage rec { pname = "graphite-cli"; - version = "1.3.6"; + version = "1.3.8"; src = fetchurl { url = "https://registry.npmjs.org/@withgraphite/graphite-cli/-/graphite-cli-${version}.tgz"; - hash = "sha256-rD/YWFRHzoM9Gsd9tnCF56RChckaeWGFphYgHa0UvUU="; + hash = "sha256-FJaDSg+scrmqYkCGCrb+yT8TtKT09xu6BS5AjTlfhzo="; }; npmDepsHash = "sha256-WyV0f5thWG7hg7Vm1UUIlcFCgP83HfXQFBUVHcQdjRo="; diff --git a/pkgs/by-name/ha/halo/package.nix b/pkgs/by-name/ha/halo/package.nix index b7e8f17419fe..e66027b8dc7f 100644 --- a/pkgs/by-name/ha/halo/package.nix +++ b/pkgs/by-name/ha/halo/package.nix @@ -7,10 +7,10 @@ }: stdenv.mkDerivation rec { pname = "halo"; - version = "2.16.2"; + version = "2.16.3"; src = fetchurl { url = "https://github.com/halo-dev/halo/releases/download/v${version}/${pname}-${version}.jar"; - hash = "sha256-bHMcJvM+ZBjiGUAZzjnEupWW9L8viE/Ix8IK2y4KDoA="; + hash = "sha256-sl2b9zKugnCEMHyvEqBWZPidoANth5gRfh34NAaqg7A="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ha/havn/package.nix b/pkgs/by-name/ha/havn/package.nix index d2f6819d3211..81f0f37190fe 100644 --- a/pkgs/by-name/ha/havn/package.nix +++ b/pkgs/by-name/ha/havn/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "havn"; - version = "0.1.11"; + version = "0.1.12"; src = fetchFromGitHub { owner = "mrjackwills"; repo = "havn"; rev = "refs/tags/v${version}"; - hash = "sha256-iotSSKId2y3Y7Dh8iSW1/y3xDbXHHPl6RQ3uA/+JdE8="; + hash = "sha256-BCg572435CdQMOldm3Ao4D+sDxbXUlDxMWmxa+aqTY0="; }; - cargoHash = "sha256-Tec1YeP1zwE8nurQOYxa9hzGBy3uxkjDUFlh0BppUTo="; + cargoHash = "sha256-JaAlWiaOUoXSV6O4wmU7zCR5h5olO2zkB5WEGk2/ZdE="; checkFlags = [ # Skip tests that require network access diff --git a/pkgs/applications/misc/HentaiAtHome/default.nix b/pkgs/by-name/he/hentai-at-home/package.nix similarity index 57% rename from pkgs/applications/misc/HentaiAtHome/default.nix rename to pkgs/by-name/he/hentai-at-home/package.nix index bca7697f758a..29809e10ab64 100644 --- a/pkgs/applications/misc/HentaiAtHome/default.nix +++ b/pkgs/by-name/he/hentai-at-home/package.nix @@ -1,28 +1,32 @@ -{ buildPackages -, fetchzip -, javaOpts ? "-XX:+UseZGC" -, jdk -, jre_headless -, lib -, makeWrapper -, stdenvNoCC -, +{ + lib, + stdenvNoCC, + fetchzip, + jdk, + makeWrapper, + buildPackages, + jre_headless, + javaOpts ? "-XX:+UseZGC", }: -stdenvNoCC.mkDerivation rec { - pname = "HentaiAtHome"; +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "hentai-at-home"; version = "1.6.3"; src = fetchzip { - url = "https://repo.e-hentai.org/hath/HentaiAtHome_${version}_src.zip"; + url = "https://repo.e-hentai.org/hath/HentaiAtHome_${finalAttrs.version}_src.zip"; hash = "sha512-kBB5mn9MwpkZ0z+Fl5ABs4YWBkXkMRcADYSAPkeifyhbYQQPOnijXKYZCkzE4UB3uQ1j6Kj6WnpO/4jquYEiOQ=="; stripRoot = false; }; - nativeBuildInputs = [ jdk makeWrapper ]; + nativeBuildInputs = [ + jdk + makeWrapper + ]; LANG = "en_US.UTF-8"; - LOCALE_ARCHIVE = lib.optionalString (stdenvNoCC.buildPlatform.libc == "glibc") - "${buildPackages.glibcLocales}/lib/locale/locale-archive"; + LOCALE_ARCHIVE = lib.optionalString ( + stdenvNoCC.buildPlatform.libc == "glibc" + ) "${buildPackages.glibcLocales}/lib/locale/locale-archive"; buildPhase = '' make all @@ -48,10 +52,10 @@ stdenvNoCC.mkDerivation rec { meta = with lib; { homepage = "https://ehwiki.org/wiki/Hentai@Home"; - description = - "Hentai@Home is an open-source P2P gallery distribution system which reduces the load on the E-Hentai Galleries"; + description = "Open-source P2P gallery distribution system which reduces the load on the E-Hentai Galleries"; license = licenses.gpl3; maintainers = with maintainers; [ terrorjack ]; mainProgram = "HentaiAtHome"; + platforms = jdk.meta.platforms; }; -} +}) diff --git a/pkgs/by-name/im/impala/package.nix b/pkgs/by-name/im/impala/package.nix index f9756c8f7c64..b322e6f0f366 100644 --- a/pkgs/by-name/im/impala/package.nix +++ b/pkgs/by-name/im/impala/package.nix @@ -5,16 +5,16 @@ }: rustPlatform.buildRustPackage rec { pname = "impala"; - version = "0.1.1"; + version = "0.2"; src = fetchFromGitHub { owner = "pythops"; repo = "impala"; rev = "v${version}"; - hash = "sha256-r/aWzSn/Dci69oS/yopG6Ro34U8hniHVanctyM7RvDw="; + hash = "sha256-7UMHkm3AtPqUILrsUnM0SbZT4Sq55dEElMN0KonjwtE="; }; - cargoHash = "sha256-IV1ftsRyM0CUlQMVmLip1FiqnouT5TsKASpF/KLARqY="; + cargoHash = "sha256-CtEirsSQAg2Fv44YoKKmSjQs85++QWFRcWoA4VrBbgU="; meta = { description = "TUI for managing wifi"; diff --git a/pkgs/by-name/ip/iplookup-gtk/package.nix b/pkgs/by-name/ip/iplookup-gtk/package.nix new file mode 100644 index 000000000000..3d2486fe5b98 --- /dev/null +++ b/pkgs/by-name/ip/iplookup-gtk/package.nix @@ -0,0 +1,58 @@ +{ + lib, + python3Packages, + fetchFromGitHub, + meson, + ninja, + pkg-config, + gobject-introspection, + wrapGAppsHook4, + desktop-file-utils, + libadwaita, +}: + +python3Packages.buildPythonPackage rec { + pname = "iplookup-gtk"; + version = "0.3.4"; + pyproject = false; # Built with meson + + src = fetchFromGitHub { + owner = "Bytezz"; + repo = "IPLookup-gtk"; + rev = "v${version}"; + hash = "sha256-NqFE6vRdLpnlCzGAUE4iOfLmTnUgX3CHtoXfsbT3zm4="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + gobject-introspection + wrapGAppsHook4 + desktop-file-utils + ]; + + buildInputs = [ + libadwaita + ]; + + dependencies = with python3Packages; [ + pygobject3 + ]; + + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + + meta = { + description = "Find info about an IP address"; + homepage = "https://github.com/Bytezz/IPLookup-gtk"; + changelog = "https://github.com/Bytezz/IPLookup-gtk/releases/tag/${src.rev}"; + license = lib.licenses.gpl3Plus; + mainProgram = "iplookup"; + maintainers = with lib.maintainers; [ aleksana ]; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/by-name/je/jellyfin/package.nix b/pkgs/by-name/je/jellyfin/package.nix index ecf1c6bda792..0360ff53e367 100644 --- a/pkgs/by-name/je/jellyfin/package.nix +++ b/pkgs/by-name/je/jellyfin/package.nix @@ -36,12 +36,10 @@ buildDotnetModule rec { dotnet-runtime = dotnetCorePackages.aspnetcore_8_0; dotnetBuildFlags = [ "--no-self-contained" ]; - preInstall = '' - makeWrapperArgs+=( - --add-flags "--ffmpeg ${jellyfin-ffmpeg}/bin/ffmpeg" - --add-flags "--webdir ${jellyfin-web}/share/jellyfin-web" - ) - ''; + makeWrapperArgs = [ + "--add-flags" "--ffmpeg=${jellyfin-ffmpeg}/bin/ffmpeg" + "--add-flags" "--webdir=${jellyfin-web}/share/jellyfin-web" + ]; passthru.tests = { smoke-test = nixosTests.jellyfin; diff --git a/pkgs/development/libraries/LASzip/default.nix b/pkgs/by-name/la/laszip/package.nix similarity index 97% rename from pkgs/development/libraries/LASzip/default.nix rename to pkgs/by-name/la/laszip/package.nix index ee6e74aa7bc2..65c2e6934a24 100644 --- a/pkgs/development/libraries/LASzip/default.nix +++ b/pkgs/by-name/la/laszip/package.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation (finalAttrs: { version = "3.4.3"; - pname = "LASzip"; + pname = "laszip"; src = fetchFromGitHub { owner = "LASzip"; diff --git a/pkgs/development/libraries/LASzip/LASzip2.nix b/pkgs/by-name/la/laszip_2/package.nix similarity index 84% rename from pkgs/development/libraries/LASzip/LASzip2.nix rename to pkgs/by-name/la/laszip_2/package.nix index 4f63dfe8059c..8af9cae261fe 100644 --- a/pkgs/development/libraries/LASzip/LASzip2.nix +++ b/pkgs/by-name/la/laszip_2/package.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub, cmake }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "2.2.0"; - pname = "LASzip"; + pname = "laszip"; src = fetchFromGitHub { owner = "LASzip"; repo = "LASzip"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-TXzse4oLjNX5R2xDR721iV+gW/rP5z3Zciv4OgxfeqA="; }; @@ -20,4 +20,4 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.michelk ]; platforms = platforms.unix; }; -} +}) diff --git a/pkgs/by-name/lc/lc0/package.nix b/pkgs/by-name/lc/lc0/package.nix index 4ccb1927534b..df4a59346f66 100644 --- a/pkgs/by-name/lc/lc0/package.nix +++ b/pkgs/by-name/lc/lc0/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "lc0"; - version = "0.30.0"; + version = "0.31.0"; src = fetchFromGitHub { owner = "LeelaChessZero"; repo = "lc0"; rev = "refs/tags/v${version}"; - hash = "sha256-Q85hXNSexHhk6W48tgJLk0Sf32xBipfg2P2SH1FF89Q="; + hash = "sha256-kHLO6xM1q/CQIBcGIFXVkvtGEx75sqA7atGYfvnJcso="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/li/liboqs/package.nix b/pkgs/by-name/li/liboqs/package.nix index f6d996bc1b1d..36d9d042ca4e 100644 --- a/pkgs/by-name/li/liboqs/package.nix +++ b/pkgs/by-name/li/liboqs/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "liboqs"; - version = "0.10.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "open-quantum-safe"; repo = "liboqs"; rev = finalAttrs.version; - hash = "sha256-BFDa5NUr02lFPcT4Hnb2rjGAi+2cXvh1SHLfqX/zLlI="; + hash = "sha256-zsSKFUs75K0Byxh3KVCZ8lIOf/vpbyMJXfk6fa2u+aE="; }; patches = [ diff --git a/pkgs/applications/audio/LibreArp/lv2.nix b/pkgs/by-name/li/librearp-lv2/package.nix similarity index 91% rename from pkgs/applications/audio/LibreArp/lv2.nix rename to pkgs/by-name/li/librearp-lv2/package.nix index b723683b7ec6..82c78aa76d7e 100644 --- a/pkgs/applications/audio/LibreArp/lv2.nix +++ b/pkgs/by-name/li/librearp-lv2/package.nix @@ -2,14 +2,14 @@ , xcbutilcursor, xcbutilkeysyms, xcbutil, libXrandr, libXinerama, libXcursor , alsa-lib, libjack2, lv2, gcc-unwrapped, curl}: -stdenv.mkDerivation rec { - pname = "LibreArp-lv2"; +stdenv.mkDerivation (finalAttrs: { + pname = "librearp-lv2"; version = "2.4"; src = fetchFromGitLab { owner = "LibreArp"; repo = "LibreArp"; - rev = "${version}-lv2"; + rev = "${finalAttrs.version}-lv2"; hash = "sha256-x+ZPiU/ZFzrXb8szMS9Ts4JEEyXYpM8CLZHT4lNJWY8="; fetchSubmodules = true; }; @@ -50,4 +50,4 @@ stdenv.mkDerivation rec { platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ magnetophon ]; }; -} +}) diff --git a/pkgs/applications/audio/LibreArp/default.nix b/pkgs/by-name/li/librearp/package.nix similarity index 88% rename from pkgs/applications/audio/LibreArp/default.nix rename to pkgs/by-name/li/librearp/package.nix index 0736745aaaf4..9bd1beac345d 100644 --- a/pkgs/applications/audio/LibreArp/default.nix +++ b/pkgs/by-name/li/librearp/package.nix @@ -2,14 +2,14 @@ , xcbutilcursor, xcbutilkeysyms, xcbutil, libXrandr, libXinerama, libXcursor , alsa-lib, libjack2, lv2, gcc-unwrapped, curl}: -stdenv.mkDerivation rec { - pname = "LibreArp"; +stdenv.mkDerivation (finalAttrs: { + pname = "librearp"; version = "2.4"; src = fetchFromGitLab { owner = "LibreArp"; repo = "LibreArp"; - rev = version; + rev = finalAttrs.version; hash = "sha256-jEpES68NuHhelUq/L46CxEeadk3LbuPZ72JaGDbw8fg="; fetchSubmodules = true; }; @@ -44,10 +44,10 @@ stdenv.mkDerivation rec { meta = with lib; { description = - "A pattern-based arpeggio generator plugin."; + "A pattern-based arpeggio generator plugin"; homepage = "https://librearp.gitlab.io/"; license = licenses.gpl3Plus; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ magnetophon ]; }; -} +}) diff --git a/pkgs/by-name/li/limine/package.nix b/pkgs/by-name/li/limine/package.nix index 269deb264bd4..f313ab80863f 100644 --- a/pkgs/by-name/li/limine/package.nix +++ b/pkgs/by-name/li/limine/package.nix @@ -12,7 +12,7 @@ }: let - version = "7.7.0"; + version = "7.7.2"; in # The output of the derivation is a tool to create bootable images using Limine # as bootloader for various platforms and corresponding binary and helper files. @@ -24,7 +24,7 @@ stdenv.mkDerivation { # Packaging that in Nix is very cumbersome. src = fetchurl { url = "https://github.com/limine-bootloader/limine/releases/download/v${version}/limine-${version}.tar.gz"; - sha256 = "sha256-GD66BuplRyIDCy6J9Lys8z7GDshaz50O1Lu//lO+nf0="; + sha256 = "sha256-t3ymsKn+pFW2xOn+BKJriqx2cMbCjtnGGgvCF82/8TE="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/lm/lmstudio/darwin.nix b/pkgs/by-name/lm/lmstudio/darwin.nix index 91c2ce3b4ca9..f08d2d1510b7 100644 --- a/pkgs/by-name/lm/lmstudio/darwin.nix +++ b/pkgs/by-name/lm/lmstudio/darwin.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://releases.lmstudio.ai/mac/arm64/${version}/latest/LM-Studio-${version}-arm64.dmg"; - hash = "sha256-wl3uyRtqY5w8NnESBKcP+CicIh8cCkKmrcVuiijzzTQ="; + hash = "sha256-byS0LNJQjs/+sf2anhTAdsXUWad9HujxmLx5uEfdlo8="; }; nativeBuildInputs = [ undmg ]; diff --git a/pkgs/by-name/lm/lmstudio/linux.nix b/pkgs/by-name/lm/lmstudio/linux.nix index fce43718b00a..abca76ac032a 100644 --- a/pkgs/by-name/lm/lmstudio/linux.nix +++ b/pkgs/by-name/lm/lmstudio/linux.nix @@ -7,8 +7,8 @@ }: let src = fetchurl { - url = "https://releases.lmstudio.ai/linux/${version}/beta/LM_Studio-${version}.AppImage"; - hash = "sha256-1ahPRRgcYfW9eD04yeF4ft+yLn9+nIPOV5Vkv7rMiT8="; + url = "https://releases.lmstudio.ai/linux/x86/${version}/beta/LM_Studio-${version}.AppImage"; + hash = "sha256-2a3ac+0m3C/YyPM0Waia+x2Q/lodfbyHNvlbB2AHT78="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; diff --git a/pkgs/by-name/lm/lmstudio/package.nix b/pkgs/by-name/lm/lmstudio/package.nix index 4b48cc01ee2a..962bd58a94f0 100644 --- a/pkgs/by-name/lm/lmstudio/package.nix +++ b/pkgs/by-name/lm/lmstudio/package.nix @@ -5,14 +5,14 @@ }: let pname = "lmstudio"; - version = "0.2.24"; + version = "0.2.25"; meta = { description = "LM Studio is an easy to use desktop app for experimenting with local and open-source Large Language Models (LLMs)"; homepage = "https://lmstudio.ai/"; license = lib.licenses.unfree; mainProgram = "lmstudio"; maintainers = with lib.maintainers; [ cig0 eeedean ]; - platforms = lib.platforms.linux ++ [ "aarch64-darwin" ]; + platforms = [ "x86_64-linux" "aarch64-darwin" ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; }; in diff --git a/pkgs/by-name/ma/marcel/package.nix b/pkgs/by-name/ma/marcel/package.nix index a86df180c1b5..d2468fcb6fab 100644 --- a/pkgs/by-name/ma/marcel/package.nix +++ b/pkgs/by-name/ma/marcel/package.nix @@ -6,14 +6,14 @@ python3Packages.buildPythonApplication rec { pname = "marcel"; - version = "0.28"; + version = "0.29.0"; pyproject = true; src = fetchFromGitHub { owner = "geophile"; repo = "marcel"; rev = "refs/tags/v${version}"; - hash = "sha256-aJq8FAW1/Vo2x3st+/cxAzo4jHYPBDx/2i/2h1GVnrs="; + hash = "sha256-hUI5dUqelmRuk65s67rJXrZoPDWAcnNVIHlzxAgRExs="; }; nativeBuildInputs = with python3Packages; [ diff --git a/pkgs/by-name/mu/multiplex/package.nix b/pkgs/by-name/mu/multiplex/package.nix new file mode 100644 index 000000000000..8486bf944124 --- /dev/null +++ b/pkgs/by-name/mu/multiplex/package.nix @@ -0,0 +1,67 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + pkg-config, + gobject-introspection, + wrapGAppsHook4, + libadwaita, +}: + +buildGoModule rec { + pname = "multiplex"; + version = "0.1.4"; + + src = fetchFromGitHub { + owner = "pojntfx"; + repo = "multiplex"; + rev = "v${version}"; + hash = "sha256-6xZ46LeFuJXwd7s63YKekUIdb8ytdLk+rp+tFox27zY="; + }; + + vendorHash = "sha256-S14dMAejoVTVn3rRdZyG+npM5kNehHwntJkeW3M7Stk="; + + nativeBuildInputs = [ + pkg-config + gobject-introspection + wrapGAppsHook4 + ]; + + buildInputs = [ libadwaita ]; + + # recursively generate all files requested by go:generate + preBuild = '' + go generate ./... + ''; + + postInstall = '' + install -Dm644 -t $out/share/applications com.pojtinger.felicitas.Multiplex.desktop + install -Dm644 -t $out/share/metainfo com.pojtinger.felicitas.Multiplex.metainfo.xml + # The provided pixmap icons appears to be a bit blurry so not installing them + install -Dm644 docs/icon.svg $out/share/icons/hicolor/scalable/apps/com.pojtinger.felicitas.Multiplex.svg + install -Dm644 docs/icon-symbolic.svg $out/share/icons/hicolor/symbolic/apps/com.pojtinger.felicitas.Multiplex-symbolic.svg + ''; + + meta = { + description = "Watch torrents with your friends"; + longDescription = '' + Multiplex is an app to watch torrents together, providing an experience similar + to Apple's SharePlay and Amazon's Prime Video Watch Party. + + It enables you to: + - Stream any file directly using a wide range of video and audio formats with + the mpv video player. + - Host online watch parties while preserving your privacy by synchronizing + video playback with friends without a central server using weron. + - Bypass internet restrictions by optionally separating the hTorrent HTTP to + BitTorrent gateway and user interface into two separate components. + ''; + homepage = "https://github.com/pojntfx/multiplex"; + license = with lib.licenses; [ + agpl3Plus + cc0 + ]; + mainProgram = "multiplex"; + maintainers = with lib.maintainers; [ aleksana ]; + }; +} diff --git a/pkgs/applications/editors/neovim/neovim-qt.nix b/pkgs/by-name/ne/neovim-qt-unwrapped/package.nix similarity index 80% rename from pkgs/applications/editors/neovim/neovim-qt.nix rename to pkgs/by-name/ne/neovim-qt-unwrapped/package.nix index 75067585653b..0cd07e2711bc 100644 --- a/pkgs/applications/editors/neovim/neovim-qt.nix +++ b/pkgs/by-name/ne/neovim-qt-unwrapped/package.nix @@ -1,6 +1,6 @@ -{ lib, mkDerivation, fetchFromGitHub, cmake, doxygen, msgpack, neovim, python3Packages, qtbase, qtsvg }: +{ stdenv, lib, libsForQt5, fetchFromGitHub, cmake, doxygen, msgpack, neovim, python3Packages }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "neovim-qt-unwrapped"; version = "0.2.18"; @@ -16,16 +16,16 @@ mkDerivation rec { "-DENABLE_TESTS=0" # tests fail because xcb platform plugin is not found ]; + nativeBuildInputs = [ cmake doxygen libsForQt5.wrapQtAppsHook ]; + buildInputs = [ neovim.unwrapped # only used to generate help tags at build time - qtbase - qtsvg + libsForQt5.qtbase + libsForQt5.qtsvg ] ++ (with python3Packages; [ jinja2 python msgpack ]); - nativeBuildInputs = [ cmake doxygen ]; - preCheck = '' # The GUI tests require a running X server, disable them sed -i ../test/CMakeLists.txt -e '/^add_xtest_gui/d' diff --git a/pkgs/applications/editors/neovim/qt.nix b/pkgs/by-name/ne/neovim-qt/package.nix similarity index 90% rename from pkgs/applications/editors/neovim/qt.nix rename to pkgs/by-name/ne/neovim-qt/package.nix index 728c364d4006..aa7b2607fb70 100644 --- a/pkgs/applications/editors/neovim/qt.nix +++ b/pkgs/by-name/ne/neovim-qt/package.nix @@ -1,9 +1,9 @@ -{ stdenv, makeWrapper, neovim, neovim-qt-unwrapped }: +{ stdenv, libsForQt5, makeWrapper, neovim, neovim-qt-unwrapped }: let unwrapped = neovim-qt-unwrapped; in -stdenv.mkDerivation { +libsForQt5.mkDerivation { pname = "neovim-qt"; version = unwrapped.version; buildCommand = if stdenv.isDarwin then '' diff --git a/pkgs/by-name/nh/nh/package.nix b/pkgs/by-name/nh/nh/package.nix index 209f700a376a..14c22003e64c 100644 --- a/pkgs/by-name/nh/nh/package.nix +++ b/pkgs/by-name/nh/nh/package.nix @@ -10,7 +10,7 @@ , nix-output-monitor }: let - version = "3.5.16"; + version = "3.5.17"; runtimeDeps = [ nvd nix-output-monitor ]; in rustPlatform.buildRustPackage { @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage { owner = "viperML"; repo = "nh"; rev = "refs/tags/v${version}"; - hash = "sha256-uAoD6tW1lSMt5X6hzouZ1qWzImmg4VAMy663BLcOALs="; + hash = "sha256-o4K6QHBjXrmcYkX9MIw9gZ+DHM3OaEVswswHRX9h8Is="; }; strictDeps = true; @@ -47,7 +47,7 @@ rustPlatform.buildRustPackage { --prefix PATH : ${lib.makeBinPath runtimeDeps} ''; - cargoHash = "sha256-610gS1T7i5rBEWeWzolRz/mUTGw5EJf1B68CWc4gkm4="; + cargoHash = "sha256-6Y5vpXEuHZXe9HKk6KomujlibzwtZJbtn6YgOqbmInk="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/nh/nhost-cli/package.nix b/pkgs/by-name/nh/nhost-cli/package.nix index bc8a14d9a496..d3a88416983d 100644 --- a/pkgs/by-name/nh/nhost-cli/package.nix +++ b/pkgs/by-name/nh/nhost-cli/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "nhost-cli"; - version = "1.18.2"; + version = "1.18.3"; src = fetchFromGitHub { owner = "nhost"; repo = "cli"; rev = "v${version}"; - hash = "sha256-WIkuYmNXpKLsHY6de6PDa56NFTkgpXt1aGouJrEiyUo="; + hash = "sha256-TYi0Cth4GWEIT9QRUC4z3Uwnh4EmywY+XCOM5oJP+4g="; }; vendorHash = null; diff --git a/pkgs/by-name/nw/nwg-drawer/package.nix b/pkgs/by-name/nw/nwg-drawer/package.nix index 647ca14b3c2b..000d86b4baf4 100644 --- a/pkgs/by-name/nw/nwg-drawer/package.nix +++ b/pkgs/by-name/nw/nwg-drawer/package.nix @@ -12,16 +12,16 @@ let pname = "nwg-drawer"; - version = "0.4.7"; + version = "0.4.8"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = "nwg-drawer"; rev = "v${version}"; - hash = "sha256-rBb2ArjllCBO2+9hx3f/c+uUQD1nCZzzfQGz1Wovy/0="; + hash = "sha256-ZfWl9DfU8h300WbvFNOCs7QGp11NB49ShPRxY5hpNFE="; }; - vendorHash = "sha256-L8gdJd5cPfQrcSXLxFx6BAVWOXC8HRuk5fFQ7MsKpIc="; + vendorHash = "sha256-J7r3YyfV5lRZbjKo7ZNHQrOqR1GNbUB7GxRMlXuuw/c="; in buildGoModule { inherit pname version src vendorHash; diff --git a/pkgs/by-name/or/orchard/package.nix b/pkgs/by-name/or/orchard/package.nix index f5996ccbbd16..37bcebe9e430 100644 --- a/pkgs/by-name/or/orchard/package.nix +++ b/pkgs/by-name/or/orchard/package.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "orchard"; - version = "0.18.0"; + version = "0.19.0"; src = fetchFromGitHub { owner = "cirruslabs"; repo = pname; rev = version; - hash = "sha256-rzfGECRa3IPt9LRX8Av7NabaIzaKfxzkOR85q9zl9sk="; + hash = "sha256-8E5U+2JTc0GYteoKqYn3JRrMx6ta1J+0GR3Jtn+NkYk="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -19,7 +19,7 @@ buildGoModule rec { ''; }; - vendorHash = "sha256-dVWCxEmqzJw9oN6mCwFVn81Mhq4XfBEM3iXHQn4NXko="; + vendorHash = "sha256-icV4MOVzPSCGhFTIixWA02Jcf/7qhQwG4sBx1kRoJks="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/pg/pgraphs/package.nix b/pkgs/by-name/pg/pgraphs/package.nix new file mode 100644 index 000000000000..0f9e5bc2dbf4 --- /dev/null +++ b/pkgs/by-name/pg/pgraphs/package.nix @@ -0,0 +1,29 @@ +{ + lib, + buildNpmPackage, + fetchFromGitHub, +}: + +buildNpmPackage rec { + pname = "pgraphs"; + version = "0.6.12"; + + src = fetchFromGitHub { + owner = "pg-format"; + repo = "pgraphs"; + rev = "refs/tags/v${version}"; + hash = "sha256-rhNXASSHgdL9knq9uPFhAGlh0ZAKo5TNh/2a4u6Mh1U="; + }; + + npmDepsHash = "sha256-S1pCmRaRuprqIjaylIsuHyguhgQC5vvp7pDq2KJgrHQ="; + dontNpmBuild = true; + + meta = { + description = "Property Graph Exchange Format (PG) converter"; + changelog = "https://github.com/pg-format/pgraphs/blob/v${version}/CHANGELOG.md"; + homepage = "https://github.com/pg-format/pgraphs"; + license = lib.licenses.mit; + mainProgram = "pgraphs"; + maintainers = with lib.maintainers; [ luftmensch-luftmensch ]; + }; +} diff --git a/pkgs/by-name/pm/pm2/package.nix b/pkgs/by-name/pm/pm2/package.nix index 12473ffc2196..20ad72df7853 100644 --- a/pkgs/by-name/pm/pm2/package.nix +++ b/pkgs/by-name/pm/pm2/package.nix @@ -5,16 +5,16 @@ buildNpmPackage rec { pname = "pm2"; - version = "5.4.0"; + version = "5.4.1"; src = fetchFromGitHub { owner = "Unitech"; repo = "pm2"; rev = "v${version}"; - hash = "sha256-hmciDjlmlIaqOWl9rYWQ6muq6LFzQb5tfpdzL0vV/ZM="; + hash = "sha256-LMBQ1+VyGjq76Qs5HtELSvEuml3XfzLBbvcuAFuJzw4="; }; - npmDepsHash = "sha256-je+GwPkUiGPWgKQgSPlx2OEWMbDKdwEM/idTjgINLHY="; + npmDepsHash = "sha256-hXP+rXXn0Ds81D2iLWVkgfFiFA3dDD5wrAoVivHaRHA="; dontNpmBuild = true; diff --git a/pkgs/by-name/qd/qdrant-web-ui/package.nix b/pkgs/by-name/qd/qdrant-web-ui/package.nix new file mode 100644 index 000000000000..333d9eed042d --- /dev/null +++ b/pkgs/by-name/qd/qdrant-web-ui/package.nix @@ -0,0 +1,35 @@ +{ + buildNpmPackage, + fetchFromGitHub, + lib, +}: +buildNpmPackage rec { + pname = "qdrant-web-ui"; + version = "0.1.28"; + + src = fetchFromGitHub { + owner = "qdrant"; + repo = "qdrant-web-ui"; + rev = "refs/tags/v${version}"; + hash = "sha256-jbr1PdoYcBxT7EOksLOPYNGz+GG5HVG406S+GRyWeiE="; + }; + + npmDepsHash = "sha256-8sk2QyunSrKE5/kjSoo0whdVbY9IXCF+n7ZIjP4Mgq8="; + + npmBuildScript = "build-qdrant"; + + installPhase = '' + runHook preInstall + cp -r dist $out + runHook postInstall + ''; + + meta = { + description = "Self-hosted web UI for Qdrant"; + homepage = "https://github.com/qdrant/qdrant-web-ui"; + changelog = "https://github.com/qdrant/qdrant-web-ui/releases/tag/v${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ xzfc ]; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/by-name/re/renode-unstable/package.nix b/pkgs/by-name/re/renode-unstable/package.nix index 9938de1d8d85..6fb753a1cbad 100644 --- a/pkgs/by-name/re/renode-unstable/package.nix +++ b/pkgs/by-name/re/renode-unstable/package.nix @@ -5,11 +5,11 @@ renode.overrideAttrs (finalAttrs: _: { pname = "renode-unstable"; - version = "1.15.0+20240609git09f623310"; + version = "1.15.1+20240615gitdd55f8ea4"; src = fetchurl { url = "https://builds.renode.io/renode-${finalAttrs.version}.linux-portable.tar.gz"; - hash = "sha256-jbPvMzGXdBXT92aPXBQzw74hXW9JJeTZQgXKvILMlo0="; + hash = "sha256-CxV92sGxRlITi0jhi/O0J/FwLGyJVS7niIzlO3s3pis="; }; passthru.updateScript = diff --git a/pkgs/by-name/ro/rofimoji/package.nix b/pkgs/by-name/ro/rofimoji/package.nix index f0c8339b9e35..610292c2105a 100644 --- a/pkgs/by-name/ro/rofimoji/package.nix +++ b/pkgs/by-name/ro/rofimoji/package.nix @@ -15,14 +15,14 @@ python3Packages.buildPythonApplication rec { pname = "rofimoji"; - version = "6.3.1"; + version = "6.3.2"; pyproject = true; src = fetchFromGitHub { owner = "fdw"; repo = "rofimoji"; rev = "refs/tags/${version}"; - hash = "sha256-gYLUUbT6OHMo2nzJ//Pa0vZ9WPcHs6YnAjTKNO07VNk="; + hash = "sha256-LJJWHn3UnrCJaowHHuYksD2MHqClLc2MmYYXQfUxTgQ="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/rp/rpcs3/package.nix b/pkgs/by-name/rp/rpcs3/package.nix index ef9b5965aff7..8a88b4b202f7 100644 --- a/pkgs/by-name/rp/rpcs3/package.nix +++ b/pkgs/by-name/rp/rpcs3/package.nix @@ -32,10 +32,10 @@ let # Keep these separate so the update script can regex them - rpcs3GitVersion = "16391-39e946630"; - rpcs3Version = "0.0.31-16391-39e946630"; - rpcs3Revision = "39e946630da8e23c4d2d2b763f63145eb9205e43"; - rpcs3Hash = "sha256-CIPUmcpBc6iRMzZJZ5vKty/Uh4TYiR65xXD4aKRPSKc="; + rpcs3GitVersion = "16614-5b973448b"; + rpcs3Version = "0.0.32-16614-5b973448b"; + rpcs3Revision = "5b973448bf75a239f34fd9c7698c8a02b04e2ea9"; + rpcs3Hash = "sha256-6rDHOK3KZkLaDcdG6dFlicWLFeuQUhCiRG1Y0grOvmA="; inherit (qt6Packages) qtbase qtmultimedia wrapQtAppsHook qtwayland; in diff --git a/pkgs/by-name/se/seclists/package.nix b/pkgs/by-name/se/seclists/package.nix index 1d41e6343ea7..7a149ca92a74 100644 --- a/pkgs/by-name/se/seclists/package.nix +++ b/pkgs/by-name/se/seclists/package.nix @@ -5,13 +5,13 @@ stdenvNoCC.mkDerivation { pname = "seclists"; - version = "2024.1"; + version = "2024.2"; src = fetchFromGitHub { owner = "danielmiessler"; repo = "SecLists"; - rev = "2024.1"; - hash = "sha256-0wK/8cJC9FSFrQUPhRy1/uwQONx2dR3U0XOdnMpxBuA="; + rev = "2024.2"; + hash = "sha256-qqXOLuZOj+mF7kXrdO62HZTrGsyepOSWr5v6j4WFGcc="; }; installPhase = '' diff --git a/pkgs/by-name/sl/slumber/package.nix b/pkgs/by-name/sl/slumber/package.nix index f2a871cdff90..b992ffe48c1f 100644 --- a/pkgs/by-name/sl/slumber/package.nix +++ b/pkgs/by-name/sl/slumber/package.nix @@ -7,16 +7,16 @@ }: rustPlatform.buildRustPackage rec { pname = "slumber"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "LucasPickering"; repo = "slumber"; rev = "v${version}"; - hash = "sha256-sUCOuQ35wfbrLgiPdzw5wmr8BgzDinZDKfBJ3O9JrzI="; + hash = "sha256-7JXkyRhoSjGYhse+2/v3Ndogar10K4N3ZUZNGpMiQ/A="; }; - cargoHash = "sha256-geTQ/56nuPW9fVtz+YEP3VaYPdWVm83hsGslKCtj0Vo="; + cargoHash = "sha256-wZcnaT8EjbdSX6Y/UNS7v9/hQ9ISxkyRwRqRotXPCWU="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.AppKit ]; diff --git a/pkgs/by-name/sr/srm-cuarzo/package.nix b/pkgs/by-name/sr/srm-cuarzo/package.nix index d8d3f4622a1e..af1468b42850 100644 --- a/pkgs/by-name/sr/srm-cuarzo/package.nix +++ b/pkgs/by-name/sr/srm-cuarzo/package.nix @@ -14,9 +14,9 @@ }: stdenv.mkDerivation (self: { pname = "srm-cuarzo"; - version = "0.5.6-2"; + version = "0.5.7-1"; rev = "v${self.version}"; - hash = "sha256-shYYmXTWa0cd0zTsdCDw536BkEtm6UdbUz/lQFURi90="; + hash = "sha256-TUYiReCWryNFfJ0lFBKNJiauil8ZwRSG8X9Bsdtwswc="; src = fetchFromGitHub { inherit (self) rev hash; diff --git a/pkgs/by-name/tp/tparse/package.nix b/pkgs/by-name/tp/tparse/package.nix new file mode 100644 index 000000000000..981f536a16c6 --- /dev/null +++ b/pkgs/by-name/tp/tparse/package.nix @@ -0,0 +1,29 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: +let + pname = "tparse"; + version = "0.13.3"; +in +buildGoModule { + inherit pname version; + + src = fetchFromGitHub { + owner = "mfridman"; + repo = pname; + rev = "v${version}"; + hash = "sha256-MTaxEWRNAXem/DIirrd53YEHA/A5S4wNX4osuMV3gtc="; + }; + + vendorHash = "sha256-j+1B2zWONjFEGoyesX0EW964kD33Jy3O1aB1WEwlESA="; + + meta = { + description = "CLI tool for summarizing go test output. Pipe friendly. CI/CD friendly"; + mainProgram = "tparse"; + homepage = "https://github.com/mfridman/tparse"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ obreitwi ]; + }; +} diff --git a/pkgs/by-name/vl/vlc/package.nix b/pkgs/by-name/vl/vlc/package.nix index eb6608d0664f..7c8b1e646985 100644 --- a/pkgs/by-name/vl/vlc/package.nix +++ b/pkgs/by-name/vl/vlc/package.nix @@ -5,6 +5,7 @@ , alsa-lib , autoreconfHook , avahi +, curl , dbus , faad2 , fetchpatch @@ -15,6 +16,7 @@ , freefont_ttf , freetype , fribidi +, genericUpdater , gnutls , libSM , libXext @@ -78,6 +80,7 @@ , wayland , wayland-protocols , wrapGAppsHook3 +, writeShellScript , xcbutilkeysyms , zlib @@ -289,6 +292,12 @@ stdenv.mkDerivation (finalAttrs: { remove-references-to -t "${libsForQt5.qtbase.dev}" $out/lib/vlc/plugins/gui/libqt_plugin.so ''; + passthru.updateScript = genericUpdater { + versionLister = writeShellScript "vlc-versionLister" '' + ${curl}/bin/curl -s https://get.videolan.org/vlc/ | sed -En 's/^.*href="([0-9]+(\.[0-9]+)+)\/".*$/\1/p' + ''; + }; + meta = { description = "Cross-platform media player and streaming server"; homepage = "https://www.videolan.org/vlc/"; diff --git a/pkgs/by-name/vs/vscode-js-debug/package.nix b/pkgs/by-name/vs/vscode-js-debug/package.nix index 613350da9b8d..542b5cbfc811 100644 --- a/pkgs/by-name/vs/vscode-js-debug/package.nix +++ b/pkgs/by-name/vs/vscode-js-debug/package.nix @@ -1,7 +1,7 @@ { lib , buildNpmPackage , fetchFromGitHub -, jq +, buildPackages , libsecret , pkg-config , nodePackages @@ -23,12 +23,12 @@ buildNpmPackage rec { npmDepsHash = "sha256-DfeaiqKadTnGzOObK01ctlavwqTMa0tqn59sLZMPvUM="; - nativeBuildInputs = [ pkg-config nodePackages.node-gyp jq ]; + nativeBuildInputs = [ pkg-config nodePackages.node-gyp ]; buildInputs = [ libsecret ]; postPatch = '' - jq ' + ${lib.getExe buildPackages.jq} ' .scripts.postinstall |= empty | # tries to install playwright, not necessary for build .scripts.build |= "gulp dapDebugServer" | # there is no build script defined .bin |= "./dist/src/dapDebugServer.js" # there is no bin output defined diff --git a/pkgs/by-name/wa/wait4x/package.nix b/pkgs/by-name/wa/wait4x/package.nix index 1255e772b056..a5b804e3c907 100644 --- a/pkgs/by-name/wa/wait4x/package.nix +++ b/pkgs/by-name/wa/wait4x/package.nix @@ -4,7 +4,7 @@ }: let pname = "wait4x"; - version = "2.14.0"; + version = "2.14.1"; in buildGoModule { inherit pname version; @@ -13,10 +13,10 @@ buildGoModule { owner = "atkrad"; repo = pname; rev = "v${version}"; - hash = "sha256-4lv6nYeyjjGGQksi2Ffx+Yu0OazNsJ0QEZG5BfuyrJ8="; + hash = "sha256-7dm1KERBYkASuRWlCbpbLuHVc4uCMPWbSwegjZ8LwVU="; }; - vendorHash = "sha256-D8s42YArp0IGi7I6qB9eQEh1ZQptSrKLLVIIdqk5Kq0="; + vendorHash = "sha256-CYE5wvBgNLYzCiibd9SWubIQ+22nffr4jpwgwSxhtGo="; # Tests make network access doCheck = false; diff --git a/pkgs/by-name/wa/warp-terminal/versions.json b/pkgs/by-name/wa/warp-terminal/versions.json index c853e7b7681b..ed1b85f3755a 100644 --- a/pkgs/by-name/wa/warp-terminal/versions.json +++ b/pkgs/by-name/wa/warp-terminal/versions.json @@ -1,10 +1,10 @@ { "darwin": { - "hash": "sha256-fUGCbOQXT22VGFpnmLxDLfEaNOk7hJq4BF1PU54swYg=", - "version": "0.2024.06.11.08.02.stable_01" + "hash": "sha256-ZfW4pTFmEEA/IRBfEMfnVDOxWm3SxGqUCec2nC6MADA=", + "version": "0.2024.06.11.08.02.stable_03" }, "linux": { - "hash": "sha256-5Ge6tNA4UnRfDhY7ki/3SIX3egkyWye9hHWEhObv/I8=", - "version": "0.2024.06.11.08.02.stable_01" + "hash": "sha256-xyE/Rc23+ael2oy0Hdq+kGzPYuq5+V8G3jAu3waA1Tk=", + "version": "0.2024.06.11.08.02.stable_03" } } diff --git a/pkgs/data/misc/v2ray-domain-list-community/default.nix b/pkgs/data/misc/v2ray-domain-list-community/default.nix index 8e18822299fd..d603364335f5 100644 --- a/pkgs/data/misc/v2ray-domain-list-community/default.nix +++ b/pkgs/data/misc/v2ray-domain-list-community/default.nix @@ -3,12 +3,12 @@ let generator = pkgsBuildBuild.buildGoModule rec { pname = "v2ray-domain-list-community"; - version = "20240508170917"; + version = "20240614093027"; src = fetchFromGitHub { owner = "v2fly"; repo = "domain-list-community"; rev = version; - hash = "sha256-fxiKd4bnEqUsqiBkU6EiMe8dd1uaopqU52CgclDFiuI="; + hash = "sha256-IWBih6SyS9rpf6qiQmQSXKsiQeVoBMO9PfB0ZT1FV9c="; }; vendorHash = "sha256-NLh14rXRci4hgDkBJVJDIDvobndB7KYRKAX7UjyqSsg="; meta = with lib; { diff --git a/pkgs/data/themes/colloid-gtk-theme/default.nix b/pkgs/data/themes/colloid-gtk-theme/default.nix index 10725058e1c2..978500ef6a21 100644 --- a/pkgs/data/themes/colloid-gtk-theme/default.nix +++ b/pkgs/data/themes/colloid-gtk-theme/default.nix @@ -18,17 +18,17 @@ in lib.checkListOfEnum "${pname}: theme variants" [ "default" "purple" "pink" "red" "orange" "yellow" "green" "teal" "grey" "all" ] themeVariants lib.checkListOfEnum "${pname}: color variants" [ "standard" "light" "dark" ] colorVariants lib.checkListOfEnum "${pname}: size variants" [ "standard" "compact" ] sizeVariants -lib.checkListOfEnum "${pname}: tweaks" [ "nord" "dracula" "gruvbox" "everforest" "all" "black" "rimless" "normal" "float" ] tweaks +lib.checkListOfEnum "${pname}: tweaks" [ "nord" "dracula" "gruvbox" "everforest" "catppuccin" "all" "black" "rimless" "normal" "float" ] tweaks stdenvNoCC.mkDerivation rec { inherit pname; - version = "2024-05-13"; + version = "2024-06-18"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - hash = "sha256-24U1iMByy+cFQuLUWYPBSuvJwYzwS0rCr7L6OWyMUz0="; + hash = "sha256-2saj/QfiYCxthGHauaSvRv9VVptlKbXoRTMYs3FWZsc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/compilers/flutter/engine/source.nix b/pkgs/development/compilers/flutter/engine/source.nix index 056cb47b5d5d..4b9b5aaa5adb 100644 --- a/pkgs/development/compilers/flutter/engine/source.nix +++ b/pkgs/development/compilers/flutter/engine/source.nix @@ -66,13 +66,13 @@ runCommand "flutter-engine-source-${version}-${targetPlatform.system}" cd $out export PATH=$PATH:$depot_tools - python3 $depot_tools/gclient.py sync --no-history --shallow --nohooks + python3 $depot_tools/gclient.py sync --no-history --shallow --nohooks >/dev/null find $out -name '.git' -exec dirname {} \; | xargs bash -c 'make_deterministic_repo $@' _ find $out -path '*/.git/*' ! -name 'HEAD' -prune -exec rm -rf {} \; find $out -name '.git' -exec mkdir {}/logs \; find $out -name '.git' -exec cp {}/HEAD {}/logs/HEAD \; - python3 src/build/linux/sysroot_scripts/install-sysroot.py --arch=${constants.arch} + python3 src/build/linux/sysroot_scripts/install-sysroot.py --arch=${constants.arch} >/dev/null rm -rf $out/.cipd $out/.gclient $out/.gclient_entries $out/.gclient_previous_custom_vars $out/.gclient_previous_sync_commits '' diff --git a/pkgs/development/compilers/jasmin-compiler/default.nix b/pkgs/development/compilers/jasmin-compiler/default.nix index 412e27478a51..3e5ff09a7090 100644 --- a/pkgs/development/compilers/jasmin-compiler/default.nix +++ b/pkgs/development/compilers/jasmin-compiler/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "jasmin-compiler"; - version = "2023.06.3"; + version = "2023.06.4"; src = fetchurl { url = "https://github.com/jasmin-lang/jasmin/releases/download/v${version}/jasmin-compiler-v${version}.tar.bz2"; - hash = "sha256-Fp3QMsBaPOA6L6kOgffoHaJAypJDt8JxT8EVDDpPAKs="; + hash = "sha256-b1lrVbXJQeg+7tI7JcR9JTuiel/b/mctU1caT/y/4SA="; }; sourceRoot = "jasmin-compiler-v${version}/compiler"; diff --git a/pkgs/development/compilers/odin/default.nix b/pkgs/development/compilers/odin/default.nix index 25d08ce06e68..d8a608508c55 100644 --- a/pkgs/development/compilers/odin/default.nix +++ b/pkgs/development/compilers/odin/default.nix @@ -1,6 +1,6 @@ { lib , fetchFromGitHub -, llvmPackages_13 +, llvmPackages , makeBinaryWrapper , libiconv , MacOSX-SDK @@ -9,7 +9,6 @@ }: let - llvmPackages = llvmPackages_13; inherit (llvmPackages) stdenv; in stdenv.mkDerivation rec { pname = "odin"; diff --git a/pkgs/development/compilers/unison/default.nix b/pkgs/development/compilers/unison/default.nix index fab12e06bcc6..587ca9d7f35e 100644 --- a/pkgs/development/compilers/unison/default.nix +++ b/pkgs/development/compilers/unison/default.nix @@ -13,17 +13,17 @@ stdenv.mkDerivation (finalAttrs: { pname = "unison-code-manager"; - version = "0.5.21"; + version = "0.5.22"; src = if stdenv.isDarwin then fetchurl { url = "https://github.com/unisonweb/unison/releases/download/release/${finalAttrs.version}/ucm-macos.tar.gz"; - hash = "sha256-AtLky8RevRRAZFAzGz4UqWhBP+Qm/kRu4fMTdx9KB+w="; + hash = "sha256-Exgi0eKk+ZngpnbfY/btHf+uiXcmummnWKfmCUESWgc="; } else fetchurl { url = "https://github.com/unisonweb/unison/releases/download/release/${finalAttrs.version}/ucm-linux.tar.gz"; - hash = "sha256-ninkfYB9dmOD6+LsQNDJW89FrwZn2GrZkLGbafMsrHg="; + hash = "sha256-EWfyqaFtGJJ5GE0mRTtNC9hHOzbqG9MsvRh5sFq5pRY="; }; # The tarball is just the prebuilt binary, in the archive root. diff --git a/pkgs/development/interpreters/elixir/1.17.nix b/pkgs/development/interpreters/elixir/1.17.nix index 2e79b6b0c7e3..32b09d76384e 100644 --- a/pkgs/development/interpreters/elixir/1.17.nix +++ b/pkgs/development/interpreters/elixir/1.17.nix @@ -1,8 +1,8 @@ { mkDerivation }: mkDerivation { - version = "1.17.0"; - sha256 = "sha256-RBylCfD+aCsvCqWUIvqXi3izNqqQoNfQNnQiZxz0Igg="; - # https://hexdocs.pm/elixir/1.17.0/compatibility-and-deprecations.html#compatibility-between-elixir-and-erlang-otp + version = "1.17.1"; + sha256 = "sha256-a7A+426uuo3bUjggkglY1lqHmSbZNpjPaFpQUXYtW9k="; + # https://hexdocs.pm/elixir/1.17.1/compatibility-and-deprecations.html#compatibility-between-elixir-and-erlang-otp minimumOTPVersion = "25"; escriptPath = "lib/elixir/scripts/generate_app.escript"; } diff --git a/pkgs/development/libraries/libLAS/default.nix b/pkgs/development/libraries/libLAS/default.nix index 195f77d19231..4b00de811573 100644 --- a/pkgs/development/libraries/libLAS/default.nix +++ b/pkgs/development/libraries/libLAS/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, boost, cmake, libgeotiff, libtiff, LASzip2, fixDarwinDylibNames }: +{ lib, stdenv, fetchurl, fetchpatch, boost, cmake, libgeotiff, libtiff, laszip_2, fixDarwinDylibNames }: stdenv.mkDerivation rec { pname = "libLAS"; @@ -35,13 +35,13 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ cmake ] ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; - buildInputs = [ boost libgeotiff libtiff LASzip2 ]; + buildInputs = [ boost libgeotiff libtiff laszip_2 ]; cmakeFlags = [ "-DWITH_LASZIP=ON" # libLAS is currently not compatible with LASzip 3, # see https://github.com/libLAS/libLAS/issues/144. - "-DLASZIP_INCLUDE_DIR=${LASzip2}/include" + "-DLASZIP_INCLUDE_DIR=${laszip_2}/include" "-DCMAKE_EXE_LINKER_FLAGS=-pthread" ]; diff --git a/pkgs/development/libraries/libdevil/0001-il_endian.h-Fix-endian-handling.patch b/pkgs/development/libraries/libdevil/0001-il_endian.h-Fix-endian-handling.patch new file mode 100644 index 000000000000..a1826354f88b --- /dev/null +++ b/pkgs/development/libraries/libdevil/0001-il_endian.h-Fix-endian-handling.patch @@ -0,0 +1,35 @@ +From 85ca659a59ae5be6fc0824b0684967ec94727e2a Mon Sep 17 00:00:00 2001 +From: toonn +Date: Wed, 12 Jun 2024 11:39:35 +0000 +Subject: [PATCH] il_endian.h: Fix endian handling + +Based on https://sourceforge.net/p/resil/tickets/8/, which has also been +incorporated in the MacPort for libdevil 1.7.8, +https://trac.macports.org/export/154482/trunk/dports/devel/libdevil/files/patch-src-IL-include-il_endian.h.diff, +but updated for the header included in release 1.8.0 of libdevil. +--- + src-IL/include/il_endian.h | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/src-IL/include/il_endian.h b/src-IL/include/il_endian.h +index c4e6d86..a3cd57f 100644 +--- a/src-IL/include/il_endian.h ++++ b/src-IL/include/il_endian.h +@@ -23,9 +23,13 @@ extern "C" { + #ifndef __BIG_ENDIAN__ + #define __BIG_ENDIAN__ 1 + #endif ++#else ++#ifndef __LITTLE_ENDIAN__ ++#define __LITTLE_ENDIAN__ 1 ++#endif + #endif + +-#if (defined(__BYTE_ORDER__) && __BYTE_ORDER__ == __BIG_ENDIAN__) \ ++#if (defined(__BYTE_ORDER__) && __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__) \ + || (defined(__BIG_ENDIAN__) && !defined(__LITTLE_ENDIAN__)) + #undef __LITTLE_ENDIAN__ + #define Short(s) iSwapShort(s) +-- +2.44.0 + diff --git a/pkgs/development/libraries/libdevil/default.nix b/pkgs/development/libraries/libdevil/default.nix index ea030e9c6359..63ca4877da65 100644 --- a/pkgs/development/libraries/libdevil/default.nix +++ b/pkgs/development/libraries/libdevil/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchurl +, cmake , libjpeg , libpng , libmng @@ -18,16 +19,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "libdevil"; - version = "1.7.8"; + version = "1.8.0"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://sourceforge/openil/DevIL-${finalAttrs.version}.tar.gz"; - sha256 = "1zd850nn7nvkkhasrv7kn17kzgslr5ry933v6db62s4lr0zzlbv8"; + hash = "sha256-AHWXPufdifBQeHPiWArHgzZFLSnTSgcTSyCPROL+twk="; }; - nativeBuildInputs = [ pkg-config ]; + sourceRoot = "DevIL/DevIL"; + + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ libjpeg libpng libmng lcms1 libtiff openexr ] ++ lib.optionals withXorg [ libX11 libGL ] @@ -38,29 +41,17 @@ stdenv.mkDerivation (finalAttrs: { CXXFLAGS = lib.optionalString stdenv.cc.isClang "-Wno-register"; preConfigure = '' - sed -i 's, -std=gnu99,,g' configure sed -i 's,malloc.h,stdlib.h,g' src-ILU/ilur/ilur.c - '' + lib.optionalString stdenv.cc.isClang '' - sed -i 's/libIL_la_CXXFLAGS = $(AM_CFLAGS)/libIL_la_CXXFLAGS =/g' lib/Makefile.in - ''; - - postConfigure = '' - sed -i '/RESTRICT_KEYWORD/d' include/IL/config.h ''; patches = [ - (fetchurl { - url = "https://sources.debian.org/data/main/d/devil/1.7.8-10/debian/patches/03_CVE-2009-3994.diff"; - sha256 = "0qkx2qfv02igbrmsn6z5a3lbrbwjfh3rb0c2sj54wy0j1f775hbc"; - }) - ./ftbfs-libpng15.patch - ./il_endian.h.patch + ./0001-il_endian.h-Fix-endian-handling.patch ]; enableParallelBuilding = true; postPatch = '' - for a in test/Makefile.in test/format_test/format_checks.sh.in ; do + for a in test/Makefile.am test/format_test/format_checks.sh.in ; do substituteInPlace $a \ --replace /bin/bash ${runtimeShell} done diff --git a/pkgs/development/libraries/libdevil/ftbfs-libpng15.patch b/pkgs/development/libraries/libdevil/ftbfs-libpng15.patch deleted file mode 100644 index 5fc53c2dc6a7..000000000000 --- a/pkgs/development/libraries/libdevil/ftbfs-libpng15.patch +++ /dev/null @@ -1,31 +0,0 @@ -Source: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=649554 ---- devil-1.7.8.orig/src-IL/src/il_icon.c -+++ devil-1.7.8/src-IL/src/il_icon.c -@@ -525,7 +525,11 @@ - - // Expand low-bit-depth grayscale images to 8 bits - if (ico_color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) { -+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4 -+ png_set_expand_gray_1_2_4_to_8(ico_png_ptr); -+#else - png_set_gray_1_2_4_to_8(ico_png_ptr); -+#endif - } - - // Expand RGB images with transparency to full alpha channels -only in patch2: -unchanged: ---- devil-1.7.8.orig/src-IL/src/il_png.c -+++ devil-1.7.8/src-IL/src/il_png.c -@@ -278,7 +278,11 @@ - - // Expand low-bit-depth grayscale images to 8 bits - if (png_color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) { -+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4 -+ png_set_expand_gray_1_2_4_to_8(png_ptr); -+#else - png_set_gray_1_2_4_to_8(png_ptr); -+#endif - } - - // Expand RGB images with transparency to full alpha channels diff --git a/pkgs/development/libraries/libdevil/il_endian.h.patch b/pkgs/development/libraries/libdevil/il_endian.h.patch deleted file mode 100644 index c220e6802fd9..000000000000 --- a/pkgs/development/libraries/libdevil/il_endian.h.patch +++ /dev/null @@ -1,27 +0,0 @@ -Source: http://sourceforge.net/p/resil/tickets/8/ ---- devil-1.7.8.orig/src-IL/include/il_endian.h.orig 2009-03-08 01:10:08.000000000 -0600 -+++ devil-1.7.8/src-IL/include/il_endian.h 2013-11-03 01:52:37.000000000 -0600 -@@ -19,9 +19,13 @@ - #ifndef __BIG_ENDIAN__ - #define __BIG_ENDIAN__ 1 - #endif -+#else -+ #ifndef __LITTLE_ENDIAN__ -+ #define __LITTLE_ENDIAN__ 1 -+ #endif - #endif - --#if (defined(__BYTE_ORDER__) && __BYTE_ORDER__ == __BIG_ENDIAN__) \ -+#if (defined(__BYTE_ORDER__) && __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__) \ - || (defined(__BIG_ENDIAN__) && !defined(__LITTLE_ENDIAN__)) - #undef __LITTLE_ENDIAN__ - #define Short(s) iSwapShort(s) -@@ -39,8 +43,6 @@ - #define BigDouble(d) - #else - #undef __BIG_ENDIAN__ -- #undef __LITTLE_ENDIAN__ // Not sure if it's defined by any compiler... -- #define __LITTLE_ENDIAN__ - #define Short(s) - #define UShort(s) - #define Int(i) diff --git a/pkgs/development/libraries/mapnik/datasource-ogr-test-should-fail.patch b/pkgs/development/libraries/mapnik/datasource-ogr-test-should-fail.patch deleted file mode 100644 index 1df64216d20b..000000000000 --- a/pkgs/development/libraries/mapnik/datasource-ogr-test-should-fail.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/test/unit/datasource/ogr.cpp b/test/unit/datasource/ogr.cpp -index 8441ecc55..8dabc67b0 100644 ---- a/test/unit/datasource/ogr.cpp -+++ b/test/unit/datasource/ogr.cpp -@@ -30,7 +30,7 @@ - #include - #include - --TEST_CASE("ogr") -+TEST_CASE("ogr", "[!shouldfail]") - { - const bool have_ogr_plugin = mapnik::datasource_cache::instance().plugin_registered("ogr"); - if (have_ogr_plugin) diff --git a/pkgs/development/libraries/mapnik/default.nix b/pkgs/development/libraries/mapnik/default.nix index 301b7946d2bc..0428dd585c66 100644 --- a/pkgs/development/libraries/mapnik/default.nix +++ b/pkgs/development/libraries/mapnik/default.nix @@ -22,17 +22,19 @@ , zlib , catch2 , postgresql +, protozero +, sparsehash }: stdenv.mkDerivation rec { pname = "mapnik"; - version = "unstable-2023-11-28"; + version = "4.0.0"; src = fetchFromGitHub { owner = "mapnik"; repo = "mapnik"; - rev = "2e1b32512b1f8b52331994f2a809d8a383c0c984"; - hash = "sha256-qGdUfu6gFWum/Id/W3ICeGZroMQ3Tz9PQf1tt+gaaXM="; + rev = "v${version}"; + hash = "sha256-CNFNGMJU3kzkRrOGsf8/uv5ebHPEQ0tkA+5OubRVEjs="; fetchSubmodules = true; }; @@ -40,6 +42,8 @@ stdenv.mkDerivation rec { substituteInPlace configure \ --replace '$PYTHON scons/scons.py' ${buildPackages.scons}/bin/scons rm -r scons + # Remove bundled 'sparsehash' directory in favor of 'sparsehash' package + rm -r deps/mapnik/sparsehash ''; # a distinct dev output makes python-mapnik fail @@ -57,11 +61,10 @@ stdenv.mkDerivation rec { src = ./catch2-src.patch; catch2_src = catch2.src; }) - # Disable broken test - # See discussion: https://github.com/mapnik/mapnik/issues/4329#issuecomment-1248778398 - ./datasource-ogr-test-should-fail.patch # Account for full paths when generating libmapnik.pc ./export-pkg-config-full-paths.patch + # Use 'sparsehash' package. + ./use-sparsehash-package.patch ]; nativeBuildInputs = [ cmake pkg-config ]; @@ -83,21 +86,31 @@ stdenv.mkDerivation rec { zlib libxml2 postgresql + protozero + sparsehash ]; cmakeFlags = [ - # Would require qt otherwise. - "-DBUILD_DEMO_VIEWER:BOOL=OFF" + # Save time by not building some development-related code. + (lib.cmakeBool "BUILD_BENCHMARK" false) + (lib.cmakeBool "BUILD_DEMO_CPP" false) + ## Would require QT otherwise. + (lib.cmakeBool "BUILD_DEMO_VIEWER" false) + # Use 'protozero' package. + (lib.cmakeBool "USE_EXTERNAL_MAPBOX_PROTOZERO" true) + # macOS builds fail when using memory mapped file cache. + (lib.cmakeBool "USE_MEMORY_MAPPED_FILE" (!stdenv.isDarwin)) ]; doCheck = true; # mapnik-config is currently not build with CMake. So we use the SCons for # this one. We can't add SCons to nativeBuildInputs though, as stdenv would - # then try to build everything with scons. + # then try to build everything with scons. C++17 is the minimum supported + # C++ version. preBuild = '' cd .. - ${buildPackages.scons}/bin/scons utils/mapnik-config + env CXX_STD=17 ${buildPackages.scons}/bin/scons utils/mapnik-config cd build ''; diff --git a/pkgs/development/libraries/mapnik/use-sparsehash-package.patch b/pkgs/development/libraries/mapnik/use-sparsehash-package.patch new file mode 100644 index 000000000000..3bb5d3e996cf --- /dev/null +++ b/pkgs/development/libraries/mapnik/use-sparsehash-package.patch @@ -0,0 +1,19 @@ +commit c1cea9e10ffec54d0f675478e541ee4a6e87f653 +Author: Tom Hughes +Date: Wed Jun 5 18:45:57 2013 +0100 + + Use system sparsehash + +diff --git a/include/mapnik/palette.hpp b/include/mapnik/palette.hpp +index 5f96272..44d06aa 100644 +--- a/include/mapnik/palette.hpp ++++ b/include/mapnik/palette.hpp +@@ -33,7 +33,7 @@ + #pragma GCC diagnostic push + #include + #ifdef USE_DENSE_HASH_MAP +-#include ++#include + using rgba_hash_table = google::dense_hash_map; + #else + #include diff --git a/pkgs/development/libraries/pdal/default.nix b/pkgs/development/libraries/pdal/default.nix index edaf281c65bc..c035460fafae 100644 --- a/pkgs/development/libraries/pdal/default.nix +++ b/pkgs/development/libraries/pdal/default.nix @@ -10,7 +10,7 @@ , curl , gdal , hdf5-cpp -, LASzip +, laszip , libe57format , libgeotiff , libtiff @@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: { curl gdal hdf5-cpp - LASzip + laszip libgeotiff libtiff libxml2 diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index 72eae199dd01..2c44bf7f7f83 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -2391,14 +2391,14 @@ buildLuarocksPackage { lz-n = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }: buildLuarocksPackage { pname = "lz.n"; - version = "1.2.2-1"; + version = "1.3.0-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/lz.n-1.2.2-1.rockspec"; - sha256 = "1vbb5q3rfk0wfx4pdv3xcxnmflrrny5gm21d8h1wj32m6kbc6ddi"; + url = "mirror://luarocks/lz.n-1.3.0-1.rockspec"; + sha256 = "03rbinqs0za9193v0l06csvxkcfd93ikks6pnvfs2p6f64abdic9"; }).outPath; src = fetchzip { - url = "https://github.com/nvim-neorocks/lz.n/archive/v1.2.2.zip"; - sha256 = "0im71h313vxijdkx9q5506lrhk1rqxvraqh89l7h4nr8xziscpv9"; + url = "https://github.com/nvim-neorocks/lz.n/archive/v1.3.0.zip"; + sha256 = "1hdayr06ni2zzjyciv0f36k82zlkmwnvl0imrlqxqr6hq9yqcwvx"; }; disabled = luaOlder "5.1"; diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index 60095997cade..34338bf96b84 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -530,6 +530,17 @@ in }; }); + lz-n = prev.lz-n.overrideAttrs(oa: { + doCheck = lua.luaversion == "5.1"; + nativeCheckInputs = [ final.nlua final.busted ]; + checkPhase = '' + runHook preCheck + export HOME=$(mktemp -d) + busted --lua=nlua + runHook postCheck + ''; + }); + neotest = prev.neotest.overrideAttrs(oa: { # A few tests fail for strange reasons on darwin doCheck = !stdenv.isDarwin; diff --git a/pkgs/development/ocaml-modules/apron/default.nix b/pkgs/development/ocaml-modules/apron/default.nix index 9450dd527cb8..fb93fd2f1875 100644 --- a/pkgs/development/ocaml-modules/apron/default.nix +++ b/pkgs/development/ocaml-modules/apron/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { configurePhase = '' runHook preConfigure - ./configure -prefix $out + ./configure -prefix $out ${lib.optionalString stdenv.isDarwin "--no-strip"} mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib/stublibs runHook postConfigure ''; diff --git a/pkgs/development/perl-modules/Tirex/default.nix b/pkgs/development/perl-modules/Tirex/default.nix index 655610e898f2..48e63bb5932c 100644 --- a/pkgs/development/perl-modules/Tirex/default.nix +++ b/pkgs/development/perl-modules/Tirex/default.nix @@ -7,6 +7,7 @@ , JSON , LWP , mapnik +, boost , nix-update-script }: @@ -22,11 +23,18 @@ buildPerlPackage rec { }; patches = [ + # Support Mapnik >= v4.0.0 (`mapnik/box2d.hpp` -> `mapnik/geometry/box2d.hpp`) # https://github.com/openstreetmap/tirex/pull/54 (fetchpatch { - url = "https://github.com/openstreetmap/tirex/commit/da0c5db926bc0939c53dd902a969b689ccf9edde.patch"; + url = "https://github.com/openstreetmap/tirex/commit/5f131231c9c12e88793afba471b150ca8af8d587.patch"; hash = "sha256-bnL1ZGy8ZNSZuCRbZn59qRVLg3TL0GjFYnhRKroeVO0="; }) + # Support Mapnik >= v4.0.0 (boost:filesystem no longer indirectly linked) + # https://github.com/openstreetmap/tirex/pull/59 + (fetchpatch { + url = "https://github.com/openstreetmap/tirex/commit/137903be9b7b35dde4c7010e65faa16bcf6ad476.patch"; + hash = "sha256-JDqwWVnzExPwLpzv4LbSmGYah956uko+Zdicahua9oQ="; + }) ]; buildInputs = [ @@ -35,6 +43,7 @@ buildPerlPackage rec { JSON LWP mapnik + boost ] ++ mapnik.buildInputs; installPhase = '' diff --git a/pkgs/development/python-modules/adafruit-platformdetect/default.nix b/pkgs/development/python-modules/adafruit-platformdetect/default.nix index cf941b68d402..81a48bcc6295 100644 --- a/pkgs/development/python-modules/adafruit-platformdetect/default.nix +++ b/pkgs/development/python-modules/adafruit-platformdetect/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "adafruit-platformdetect"; - version = "3.69.0"; + version = "3.70.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "adafruit_platformdetect"; inherit version; - hash = "sha256-J+4VSA+2xZCNoLrICNXpmIG8tU6cnOn4EjEnN1VFGYU="; + hash = "sha256-hbvTu3rVleM6OFQb70mq1OlJoe3xpfRJ7JA6djvMr7U="; }; build-system = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/bork/default.nix b/pkgs/development/python-modules/bork/default.nix index d3368634604d..b48ff6603f33 100644 --- a/pkgs/development/python-modules/bork/default.nix +++ b/pkgs/development/python-modules/bork/default.nix @@ -34,6 +34,7 @@ buildPythonPackage rec { ]; pythonRelaxDeps = [ + "build" "packaging" "readme-renderer" "twine" diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix index 2fe3dd417d7f..079dd1dd2ce8 100644 --- a/pkgs/development/python-modules/boto3-stubs/default.nix +++ b/pkgs/development/python-modules/boto3-stubs/default.nix @@ -366,7 +366,7 @@ buildPythonPackage rec { pname = "boto3-stubs"; - version = "1.34.127"; + version = "1.34.128"; pyproject = true; disabled = pythonOlder "3.7"; @@ -374,7 +374,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "boto3_stubs"; inherit version; - hash = "sha256-D1r5bttxHpNs8zDHket919cptFZJADyRUsvq7SvZCFo="; + hash = "sha256-9N/yCKnPAHl6bCsYR6so0LkxqGpBvwDI5PVbN/tmEaU="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/botocore-stubs/default.nix b/pkgs/development/python-modules/botocore-stubs/default.nix index e565c7b6d83d..dd41a6f1810c 100644 --- a/pkgs/development/python-modules/botocore-stubs/default.nix +++ b/pkgs/development/python-modules/botocore-stubs/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "botocore-stubs"; - version = "1.34.127"; + version = "1.34.128"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "botocore_stubs"; inherit version; - hash = "sha256-94VD/pPCFjRFgJDYXM5o7dDJlPh6YV/G6Rr00m6WcX8="; + hash = "sha256-AOWRCzr7dkIiCNerbD87LUEl4yA+Fb9HwP9fnjjwDBk="; }; nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/development/python-modules/casbin/default.nix b/pkgs/development/python-modules/casbin/default.nix index 0670369db9c5..28843f988775 100644 --- a/pkgs/development/python-modules/casbin/default.nix +++ b/pkgs/development/python-modules/casbin/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "casbin"; - version = "1.36.1"; + version = "1.36.2"; pyproject = true; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "casbin"; repo = "pycasbin"; rev = "refs/tags/v${version}"; - hash = "sha256-MeTOxDrk6pvJ1L9ZOKzWhXK8WXo0jWXGKEKR7y0ejbQ="; + hash = "sha256-RQYMQ1Zt+MJ3PyVGSTGo/Qi95M+NVGn7oC2gqXJdlEU="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/cloup/default.nix b/pkgs/development/python-modules/cloup/default.nix index 88ffe3d8b9fe..3d21118aca37 100644 --- a/pkgs/development/python-modules/cloup/default.nix +++ b/pkgs/development/python-modules/cloup/default.nix @@ -37,6 +37,6 @@ buildPythonPackage rec { Enriches Click with option groups, constraints, command aliases, help sections for subcommands, themes for --help and other stuff. ''; license = licenses.bsd3; - maintainers = with maintainers; [ friedelino ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/color-operations/default.nix b/pkgs/development/python-modules/color-operations/default.nix index e4189e06809a..e92bcfe70b70 100644 --- a/pkgs/development/python-modules/color-operations/default.nix +++ b/pkgs/development/python-modules/color-operations/default.nix @@ -1,35 +1,42 @@ { lib, buildPythonPackage, - fetchFromGitHub, - pytestCheckHook, pythonOlder, + fetchFromGitHub, - colormath, + # build-system cython, oldest-supported-numpy, setuptools, + + # dependencies + numpy, + + # checks + colormath, + pytestCheckHook, }: buildPythonPackage rec { pname = "color-operations"; - version = "0.1.3"; + version = "0.1.4"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "vincentsarago"; repo = "color-operations"; - rev = version; - hash = "sha256-KsrgilcNK2ufPKrhtGdf8mdlFzhsHB2jHN+WDlZqabc="; + rev = "refs/tags/${version}"; + hash = "sha256-qqOTmVYD3VfjeVJtYvDQw+cxjcTsmqTYQNL1qMX+fL4="; }; - nativeBuildInputs = [ + build-system = [ cython + oldest-supported-numpy setuptools ]; - propagatedBuildInputs = [ oldest-supported-numpy ]; + dependencies = [ numpy ]; nativeCheckInputs = [ colormath diff --git a/pkgs/development/python-modules/dash-bootstrap-components/default.nix b/pkgs/development/python-modules/dash-bootstrap-components/default.nix new file mode 100644 index 000000000000..9e6cfa1daaea --- /dev/null +++ b/pkgs/development/python-modules/dash-bootstrap-components/default.nix @@ -0,0 +1,41 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + dash, + setuptools, + pythonOlder, +}: + +buildPythonPackage rec { + pname = "dash-bootstrap-components"; + version = "1.6.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "facultyai"; + repo = "dash-bootstrap-components"; + rev = "refs/tags/${version}"; + hash = "sha256-6tx7rOB5FVj44NbTznyZd1Q0HOc8QdxiZOhja5kgpAE="; + }; + + build-system = [ setuptools ]; + + dependencies = [ dash ]; + + # Tests a additional requirements + doCheck = false; + + # Circular import + # pythonImportsCheck = [ "dash_bootstrap_components" ]; + + meta = with lib; { + description = "Bootstrap components for Plotly Dash"; + homepage = "https://github.com/facultyai/dash-bootstrap-components"; + changelog = "https://github.com/facultyai/dash-bootstrap-components/releases/tag/${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/dask-awkward/default.nix b/pkgs/development/python-modules/dask-awkward/default.nix index 4663d25cffcf..99bf5858bf68 100644 --- a/pkgs/development/python-modules/dask-awkward/default.nix +++ b/pkgs/development/python-modules/dask-awkward/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "dask-awkward"; - version = "2024.3.0"; + version = "2024.6.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -30,18 +30,18 @@ buildPythonPackage rec { owner = "dask-contrib"; repo = "dask-awkward"; rev = "refs/tags/${version}"; - hash = "sha256-Lkbp/XrDHOekMpT71pbxtuozgzU9iiGF2GJZ+tuV/yM="; + hash = "sha256-m/KvPo4IGn19sA5RcA/+OhLMCDBU+9BbMQtK3gHOoEc="; }; pythonRelaxDeps = [ "awkward" ]; - nativeBuildInputs = [ + build-system = [ hatch-vcs hatchling pythonRelaxDepsHook ]; - propagatedBuildInputs = [ + dependencies = [ awkward cachetools dask @@ -74,11 +74,11 @@ buildPythonPackage rec { __darwinAllowLocalNetworking = true; - meta = with lib; { + meta = { description = "Native Dask collection for awkward arrays, and the library to use it"; homepage = "https://github.com/dask-contrib/dask-awkward"; changelog = "https://github.com/dask-contrib/dask-awkward/releases/tag/${version}"; - license = licenses.bsd3; - maintainers = with maintainers; [ veprbl ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ veprbl ]; }; } diff --git a/pkgs/development/python-modules/dask-expr/default.nix b/pkgs/development/python-modules/dask-expr/default.nix index 872b88820c95..930581b563a6 100644 --- a/pkgs/development/python-modules/dask-expr/default.nix +++ b/pkgs/development/python-modules/dask-expr/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "dask-expr"; - version = "1.1.2"; + version = "1.1.3"; pyproject = true; disabled = pythonOlder "3.9"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "dask"; repo = "dask-expr"; rev = "refs/tags/v${version}"; - hash = "sha256-Gvib8fyogIiOllDp4SoVQkGcIPHMo9e9AfJWDaZ5sTU="; + hash = "sha256-20gVzmOnVWoPGrGcLp8nhAoiHWunaYZIXOxYho7ZhUs="; }; postPatch = '' diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix index 851bc43241dd..08ce62f9e701 100644 --- a/pkgs/development/python-modules/dask/default.nix +++ b/pkgs/development/python-modules/dask/default.nix @@ -41,7 +41,7 @@ let self = buildPythonPackage rec { pname = "dask"; - version = "2024.5.2"; + version = "2024.6.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -50,7 +50,7 @@ let owner = "dask"; repo = "dask"; rev = "refs/tags/${version}"; - hash = "sha256-8U+njWp1g+rmOEuUgh+qz1QyVCZ/gdEPky206cVp7fw="; + hash = "sha256-HtWxVWMk0G2OeBnZKLF5tuOohPbg20Ufl+VH/MX8vK0="; }; build-system = [ diff --git a/pkgs/development/python-modules/dataclasses-json/default.nix b/pkgs/development/python-modules/dataclasses-json/default.nix index 9c8c350185de..bb8a949bc8ae 100644 --- a/pkgs/development/python-modules/dataclasses-json/default.nix +++ b/pkgs/development/python-modules/dataclasses-json/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "dataclasses-json"; - version = "0.6.6"; + version = "0.6.7"; pyproject = true; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "lidatong"; repo = "dataclasses-json"; rev = "refs/tags/v${version}"; - hash = "sha256-JpZwRln7QC0SO/+8xFxc6xrC+ZBFSHVQ9NJscAO+Lf8="; + hash = "sha256-AH/T6pa/CHtQNox67fqqs/BBnUcmThvbnSHug2p33qM="; }; postPatch = '' diff --git a/pkgs/development/python-modules/distributed/default.nix b/pkgs/development/python-modules/distributed/default.nix index 3cad3562be1a..0d5da20cccfb 100644 --- a/pkgs/development/python-modules/distributed/default.nix +++ b/pkgs/development/python-modules/distributed/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "distributed"; - version = "2024.5.0"; + version = "2024.6.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "dask"; repo = "distributed"; rev = "refs/tags/${version}"; - hash = "sha256-9W5BpBQHw1ZXCOWiFPeIlMns/Yys1gtdwQ4Lhd7qjK8="; + hash = "sha256-8TShbpH+DB73G7D4pz8MHC/SPd3RaRttML0S4WaCE4k="; }; postPatch = '' @@ -76,11 +76,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "distributed" ]; - meta = with lib; { + meta = { description = "Distributed computation in Python"; homepage = "https://distributed.readthedocs.io/"; changelog = "https://github.com/dask/distributed/blob/${version}/docs/source/changelog.rst"; - license = licenses.bsd3; - maintainers = with maintainers; [ teh ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ teh ]; }; } diff --git a/pkgs/development/python-modules/etils/default.nix b/pkgs/development/python-modules/etils/default.nix index 834b2ae93be0..f1df16ed5933 100644 --- a/pkgs/development/python-modules/etils/default.nix +++ b/pkgs/development/python-modules/etils/default.nix @@ -29,14 +29,14 @@ buildPythonPackage rec { pname = "etils"; - version = "1.9.0"; + version = "1.9.2"; pyproject = true; disabled = pythonOlder "3.10"; src = fetchPypi { inherit pname version; - hash = "sha256-XQ+N2qjg5kDGhe16f+H8XIFiUz+hL7lF8J7MU5sLNmw="; + hash = "sha256-FdzTWsDAzCQEtGrAhGrzzE6Hb9PYDzb1eVHifoudY3k="; }; nativeBuildInputs = [ flit-core ]; diff --git a/pkgs/development/python-modules/execnet/default.nix b/pkgs/development/python-modules/execnet/default.nix index 5677c8002b3c..5c67eb044464 100644 --- a/pkgs/development/python-modules/execnet/default.nix +++ b/pkgs/development/python-modules/execnet/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "execnet"; version = "2.1.1"; - format = "pyproject"; + pyproject = true; src = fetchPypi { inherit pname version; @@ -31,7 +31,7 @@ buildPythonPackage rec { rm testing/test_multi.py ''; - nativeBuildInputs = [ + build-system = [ hatchling hatch-vcs ]; @@ -57,11 +57,11 @@ buildPythonPackage rec { __darwinAllowLocalNetworking = true; - meta = with lib; { - changelog = "https://github.com/pytest-dev/execnet/blob/v${version}/CHANGELOG.rst"; + meta = { description = "Distributed Python deployment and communication"; homepage = "https://execnet.readthedocs.io/"; - license = licenses.mit; - maintainers = with maintainers; [ ]; + changelog = "https://github.com/pytest-dev/execnet/blob/v${version}/CHANGELOG.rst"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ getchoo ]; }; } diff --git a/pkgs/development/python-modules/galois/default.nix b/pkgs/development/python-modules/galois/default.nix index aee28fb25159..331785dd9e20 100644 --- a/pkgs/development/python-modules/galois/default.nix +++ b/pkgs/development/python-modules/galois/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "galois"; - version = "0.3.8"; + version = "0.3.9"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "mhostetter"; repo = "galois"; rev = "refs/tags/v${version}"; - hash = "sha256-Nfr9gD2FLZ+KvHh1mcpReUWnzFr/NxpvperzZPoFeT4="; + hash = "sha256-vgOsFEocgBvYba9Aq4HDYsnK1w+iQm1QDTzln68Tqss="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/glcontext/default.nix b/pkgs/development/python-modules/glcontext/default.nix index db5530e3c5e8..4ad9fa306090 100644 --- a/pkgs/development/python-modules/glcontext/default.nix +++ b/pkgs/development/python-modules/glcontext/default.nix @@ -47,6 +47,6 @@ buildPythonPackage rec { description = "OpenGL implementation for ModernGL"; license = licenses.mit; platforms = platforms.linux; - maintainers = with maintainers; [ friedelino ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/holidays/default.nix b/pkgs/development/python-modules/holidays/default.nix index 4fa22965e5cb..50beaa7df266 100644 --- a/pkgs/development/python-modules/holidays/default.nix +++ b/pkgs/development/python-modules/holidays/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "holidays"; - version = "0.50"; + version = "0.51"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "vacanza"; repo = "python-holidays"; rev = "refs/tags/v${version}"; - hash = "sha256-C5DZzLfxTzo+s2HWvqWbtEUT0/CLKPQXyEUN4vgRmBA="; + hash = "sha256-0zLoxXgp4gby2pj96CJ2TOZBMmzuWKczotma7Q/3/ys="; }; build-system = [ diff --git a/pkgs/development/python-modules/humanfriendly/default.nix b/pkgs/development/python-modules/humanfriendly/default.nix index 766fb1339159..8c217e3ac228 100644 --- a/pkgs/development/python-modules/humanfriendly/default.nix +++ b/pkgs/development/python-modules/humanfriendly/default.nix @@ -2,18 +2,30 @@ lib, buildPythonPackage, fetchPypi, + fetchpatch2, + setuptools, }: buildPythonPackage rec { pname = "humanfriendly"; version = "10.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; sha256 = "6b0b831ce8f15f7300721aa49829fc4e83921a9a301cc7f606be6686a2288ddc"; }; + patches = [ + (fetchpatch2 { + # https://github.com/xolox/python-humanfriendly/pull/75 + url = "https://github.com/musicinmybrain/python-humanfriendly/commit/13d05b8057010121acd2a402a337ef4ee5834062.patch"; + hash = "sha256-m7cySiIx0gNhh6KKhT71DJFOtFu2Copk9ic2yaiCulk="; + }) + ]; + + build-system = [ setuptools ]; + # humanfriendly tests depends on coloredlogs which itself depends on # humanfriendly. This lead to infinite recursion when trying to # build this package so we have to disable the test suite :( diff --git a/pkgs/development/python-modules/incomfort-client/default.nix b/pkgs/development/python-modules/incomfort-client/default.nix index e208e47479be..86f59510ba26 100644 --- a/pkgs/development/python-modules/incomfort-client/default.nix +++ b/pkgs/development/python-modules/incomfort-client/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "incomfort-client"; - version = "0.6.1"; + version = "0.6.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "zxdavb"; repo = "incomfort-client"; rev = "refs/tags/v${version}"; - hash = "sha256-kdPue3IfF85O+0dgvX+dN6S4WoQmjxdCfwfv83SnO8E="; + hash = "sha256-2hTH0haG8ja0Hgomj7kbbHUij9w3jbhHeKeMCtsgeEE="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/isosurfaces/default.nix b/pkgs/development/python-modules/isosurfaces/default.nix index a7352c590bc1..7356db3a2744 100644 --- a/pkgs/development/python-modules/isosurfaces/default.nix +++ b/pkgs/development/python-modules/isosurfaces/default.nix @@ -33,6 +33,6 @@ buildPythonPackage rec { many far from the implicit surface. ''; license = licenses.mit; - maintainers = with maintainers; [ friedelino ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/jsonrpclib-pelix/default.nix b/pkgs/development/python-modules/jsonrpclib-pelix/default.nix index 0903e7a1f12a..5cf7fe1f5b80 100644 --- a/pkgs/development/python-modules/jsonrpclib-pelix/default.nix +++ b/pkgs/development/python-modules/jsonrpclib-pelix/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "jsonrpclib-pelix"; - version = "0.4.3.2"; + version = "0.4.3.3"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-6eCzPvqPog2BfdeN/Z5M2zlnyKXTy1p4O+HugcSonHw="; + hash = "sha256-xJT+cQCxE5sTEUacKLwy0cuS5P8fRRH7cdaAcgXcN3M="; }; doCheck = false; # test_suite="tests" in setup.py but no tests in pypi. diff --git a/pkgs/development/python-modules/jupyter-ui-poll/default.nix b/pkgs/development/python-modules/jupyter-ui-poll/default.nix index 0aafb336d677..4a3c69c55304 100644 --- a/pkgs/development/python-modules/jupyter-ui-poll/default.nix +++ b/pkgs/development/python-modules/jupyter-ui-poll/default.nix @@ -9,29 +9,30 @@ buildPythonPackage rec { pname = "jupyter-ui-poll"; - version = "0.2.2"; - format = "pyproject"; + version = "1.0.0"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "Kirill888"; repo = "jupyter-ui-poll"; rev = "refs/tags/v${version}"; - hash = "sha256-DWZFvzx0aNTmf1x8Rq19OT0PFRxdpKefWYFh8C116Fw"; + hash = "sha256-mlgLd6uFDSxRBj4+Eidea2CE7FuG6NzJLWGec4KPd9k="; }; - nativeBuildInputs = [ setuptools ]; - propagatedBuildInputs = [ ipython ]; + build-system = [ setuptools ]; + + dependencies = [ ipython ]; doCheck = false; # no tests in package :( pythonImportsCheck = [ "jupyter_ui_poll" ]; - meta = with lib; { + meta = { description = "Block jupyter cell execution while interacting with widgets"; homepage = "https://github.com/Kirill888/jupyter-ui-poll"; changelog = "https://github.com/Kirill888/jupyter-ui-poll/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ bcdarwin ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ bcdarwin ]; }; } diff --git a/pkgs/development/python-modules/laszip/default.nix b/pkgs/development/python-modules/laszip/default.nix index bd9a89ce2414..97c268d956ba 100644 --- a/pkgs/development/python-modules/laszip/default.nix +++ b/pkgs/development/python-modules/laszip/default.nix @@ -7,7 +7,7 @@ scikit-build-core, pybind11, cmake, - LASzip, + laszip, ninja, pythonOlder, }: @@ -48,7 +48,7 @@ buildPythonPackage rec { dontUseCmakeConfigure = true; - buildInputs = [ LASzip ]; + buildInputs = [ laszip ]; # There are no tests doCheck = false; diff --git a/pkgs/development/python-modules/lsp-tree-sitter/default.nix b/pkgs/development/python-modules/lsp-tree-sitter/default.nix new file mode 100644 index 000000000000..2dc859772759 --- /dev/null +++ b/pkgs/development/python-modules/lsp-tree-sitter/default.nix @@ -0,0 +1,55 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools-generate +, setuptools-scm +, colorama +, jinja2 +, jsonschema +, pygls +, tree-sitter0_21 +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "lsp-tree-sitter"; + version = "0.0.15"; + pyproject = true; + + src = fetchFromGitHub { + owner = "neomutt"; + repo = "lsp-tree-sitter"; + rev = version; + hash = "sha256-yzScgix3BtSCBzlDoE1kMYGtVzkup/+ZK9L1C7VA3do="; + }; + + build-system = [ + setuptools-generate + setuptools-scm + ]; + + dependencies = [ + colorama + jinja2 + jsonschema + pygls + # The build won't fail if we had used tree-sitter (version > 0.21), but + # this package is only a dependency of autotools-language-server which also + # depends on tree-sitter-languages which must use tree-sitter0_21 and not + # tree-sitter. Hence we avoid different tree-sitter versions dependency + # mismatch by defaulting here to this lower version. + tree-sitter0_21 + ]; + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "lsp_tree_sitter" ]; + + meta = with lib; { + description = "A library to create language servers"; + homepage = "https://github.com/neomutt/lsp-tree-sitter"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ doronbehar ]; + }; +} diff --git a/pkgs/development/python-modules/manim/default.nix b/pkgs/development/python-modules/manim/default.nix index d099cbb4b21e..69aee1f41c3d 100644 --- a/pkgs/development/python-modules/manim/default.nix +++ b/pkgs/development/python-modules/manim/default.nix @@ -273,6 +273,6 @@ buildPythonPackage rec { ''; homepage = "https://github.com/ManimCommunity/manim"; license = licenses.mit; - maintainers = with maintainers; [ friedelino ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/mapbox-earcut/default.nix b/pkgs/development/python-modules/mapbox-earcut/default.nix index 6169a4d9019e..b7fe03e24f8a 100644 --- a/pkgs/development/python-modules/mapbox-earcut/default.nix +++ b/pkgs/development/python-modules/mapbox-earcut/default.nix @@ -44,6 +44,6 @@ buildPythonPackage rec { library, which provides very fast and quite robust triangulation of 2D polygons. ''; - maintainers = with maintainers; [ friedelino ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/marimo/default.nix b/pkgs/development/python-modules/marimo/default.nix index 13bcdb06ccce..220affe7be67 100644 --- a/pkgs/development/python-modules/marimo/default.nix +++ b/pkgs/development/python-modules/marimo/default.nix @@ -23,14 +23,14 @@ buildPythonPackage rec { pname = "marimo"; - version = "0.6.17"; + version = "0.6.19"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-vK4pa7CnVQp78DhEFIkNLNS5y35x9YV2nV3d0JOBTIA="; + hash = "sha256-PQrqOqWhQ4sz2kSX8A4NWhLJegAkCBE7Im+u11KkmB0="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/msal/default.nix b/pkgs/development/python-modules/msal/default.nix index 40e2abe609e5..07b88859e2ed 100644 --- a/pkgs/development/python-modules/msal/default.nix +++ b/pkgs/development/python-modules/msal/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "msal"; - version = "1.28.0"; + version = "1.28.1"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-gLur40Vny3NO/S7BhpstmBlcknRVNp2Ad7PFQgiMXJ0="; + hash = "sha256-1yu/4tXC8lVfS8YgW+RFDd/RKXZhDdmhapqw8Fxotk0="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/niworkflows/default.nix b/pkgs/development/python-modules/niworkflows/default.nix index 28e6cffca08b..d6eb920d36d4 100644 --- a/pkgs/development/python-modules/niworkflows/default.nix +++ b/pkgs/development/python-modules/niworkflows/default.nix @@ -30,14 +30,14 @@ buildPythonPackage rec { pname = "niworkflows"; - version = "1.10.1"; + version = "1.10.2"; pyproject = true; src = fetchFromGitHub { owner = "nipreps"; repo = "niworkflows"; rev = "refs/tags/${version}"; - hash = "sha256-ZOn3KSaPAA8zTdyexrjF9Wkb5C5qA/5eSJahg2DcX20="; + hash = "sha256-29ZxLuKrvgCIOMMCUpi0HHhlNlgqUrUrSCiikwecmKw="; }; postPatch = '' diff --git a/pkgs/development/python-modules/nodeenv/default.nix b/pkgs/development/python-modules/nodeenv/default.nix index 82a33716b219..6ee3b9033f3d 100644 --- a/pkgs/development/python-modules/nodeenv/default.nix +++ b/pkgs/development/python-modules/nodeenv/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "nodeenv"; - version = "1.9.0"; + version = "1.9.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "ekalinin"; repo = "nodeenv"; rev = "refs/tags/${version}"; - hash = "sha256-85Zr4RbmNeW3JAdtvDblWaPTivWWUJKh+mJbtsGJVO4="; + hash = "sha256-nud8HSfx1ri0UZf25VPCy7swfaSM13u5+HzozK+ikeY="; }; build-system = [ diff --git a/pkgs/development/python-modules/notebook-shim/default.nix b/pkgs/development/python-modules/notebook-shim/default.nix index 470c9d91586d..11c17bd7516f 100644 --- a/pkgs/development/python-modules/notebook-shim/default.nix +++ b/pkgs/development/python-modules/notebook-shim/default.nix @@ -47,6 +47,6 @@ buildPythonPackage rec { ''; homepage = "https://github.com/jupyter/notebook_shim"; license = licenses.bsd3; - maintainers = with maintainers; [ friedelino ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/pipdeptree/default.nix b/pkgs/development/python-modules/pipdeptree/default.nix index e7494472a12d..741408518899 100644 --- a/pkgs/development/python-modules/pipdeptree/default.nix +++ b/pkgs/development/python-modules/pipdeptree/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pipdeptree"; - version = "2.22.0"; + version = "2.23.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "tox-dev"; repo = "pipdeptree"; rev = "refs/tags/${version}"; - hash = "sha256-Kvse8eSlhzIBJvvJ7KoV0FCf9muQHkFS4ozwWp0WLz0="; + hash = "sha256-Er47yUaRCtTYQOhttOMIaM2EFf0l5rMH5YV1kpMCDls="; }; build-system = [ diff --git a/pkgs/development/python-modules/polyswarm-api/default.nix b/pkgs/development/python-modules/polyswarm-api/default.nix index cde3bcc8ca34..64aa9d27933b 100644 --- a/pkgs/development/python-modules/polyswarm-api/default.nix +++ b/pkgs/development/python-modules/polyswarm-api/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "polyswarm-api"; - version = "3.6.0"; + version = "3.7.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "polyswarm"; repo = "polyswarm-api"; rev = "refs/tags/${version}"; - hash = "sha256-iY0I5z+aDLQekjgHT5v/ZprCkCgNPkyImmmaCQgnoYc="; + hash = "sha256-zEh8qus/+3mcAaY+SK6FLT6wB6UtGLKPoR1WVZdn9vM="; }; pythonRelaxDeps = [ "future" ]; diff --git a/pkgs/development/python-modules/puremagic/default.nix b/pkgs/development/python-modules/puremagic/default.nix index fc54dbdaa6ec..b3bcbbacec39 100644 --- a/pkgs/development/python-modules/puremagic/default.nix +++ b/pkgs/development/python-modules/puremagic/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "puremagic"; - version = "1.23"; + version = "1.24"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "cdgriffith"; repo = "puremagic"; rev = "refs/tags/${version}"; - hash = "sha256-DhOTx4Zpux2IiHkw/0nWwWfpnoqxrqqMJw4hrS4ZNGE="; + hash = "sha256-omVSSxMAQQm+Sy023xIGBYm55qrb1dbds1Jj9WCtNfw="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyrisco/default.nix b/pkgs/development/python-modules/pyrisco/default.nix index 129d5935fb35..f01ff7b0f2e4 100644 --- a/pkgs/development/python-modules/pyrisco/default.nix +++ b/pkgs/development/python-modules/pyrisco/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pyrisco"; - version = "0.6.2"; + version = "0.6.3"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "OnFreund"; repo = "pyrisco"; rev = "refs/tags/v${version}"; - hash = "sha256-sksM84BvBVfegYtRo1NNRbDvqNCr/V4K2Ol9X2Il8D0="; + hash = "sha256-E/KVQSoyJWJJ+UFtu3SzJDfXu2cj7A0puYgcUxrHKRo="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyserial-asyncio-fast/default.nix b/pkgs/development/python-modules/pyserial-asyncio-fast/default.nix index ad4421a5382b..882c761d191e 100644 --- a/pkgs/development/python-modules/pyserial-asyncio-fast/default.nix +++ b/pkgs/development/python-modules/pyserial-asyncio-fast/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "pyserial-asyncio-fast"; - version = "0.11"; + version = "0.12"; pyproject = true; src = fetchFromGitHub { owner = "bdraco"; repo = "pyserial-asyncio-fast"; rev = version; - hash = "sha256-B1CLk7ggI7l+DaMDlnMjl2tfh+evvaf1nxzBpmqMBZk="; + hash = "sha256-37dbJq+9Ex+/uiRR2esgOP15CjySA0MLvxnjiPDTF08="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pysigma/default.nix b/pkgs/development/python-modules/pysigma/default.nix index daeff84ea7f2..6fbb4b8b93ed 100644 --- a/pkgs/development/python-modules/pysigma/default.nix +++ b/pkgs/development/python-modules/pysigma/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pysigma"; - version = "0.11.6"; + version = "0.11.7"; pyproject = true; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "SigmaHQ"; repo = "pySigma"; rev = "refs/tags/v${version}"; - hash = "sha256-BPDwGwwstGEBN3FIteyFX05TC/vBhWDiZJJh56Uoclo="; + hash = "sha256-vc2f5qrPHSU/CUENj+MuD0rjsEj68JPnL39fuOOcRCU="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/python-mapnik/default.nix b/pkgs/development/python-modules/python-mapnik/default.nix index c93adc9f09db..d2d0ae00f08c 100644 --- a/pkgs/development/python-modules/python-mapnik/default.nix +++ b/pkgs/development/python-modules/python-mapnik/default.nix @@ -23,21 +23,20 @@ sqlite, nose, pytestCheckHook, - stdenv, + darwin, + sparsehash, }: buildPythonPackage rec { pname = "python-mapnik"; - version = "unstable-2023-02-23"; + version = "3.0.16-unstable-2024-02-22"; format = "setuptools"; src = fetchFromGitHub { owner = "mapnik"; repo = "python-mapnik"; - # Use proj6 branch in order to support Proj >= 6 (excluding commits after 2023-02-23) - # https://github.com/mapnik/python-mapnik/compare/master...proj6 - rev = "687b2c72a24c59d701d62e4458c380f8c54f0549"; - hash = "sha256-q3Snd3K/JndckwAVwSKU+kFK5E1uph78ty7mwVo/7Ik="; + rev = "5ab32f0209909cc98c26e1d86ce0c8ef29a9bf3d"; + hash = "sha256-OqijA1WcyBcyWO8gntqp+xNIaV1Jqa0n1eMDip2OCvY="; # Only needed for test data fetchSubmodules = true; }; @@ -49,8 +48,13 @@ buildPythonPackage rec { src = ./find-libmapnik.patch; libmapnik = "${mapnik}/lib"; }) + # Use `std::optional` rather than `boost::optional` + # https://github.com/mapnik/python-mapnik/commit/e9f88a95a03dc081826a69da67bbec3e4cccd5eb + ./python-mapnik_std_optional.patch ]; + stdenv = if python.stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else python.stdenv; + nativeBuildInputs = [ mapnik # for mapnik_config pkg-config @@ -70,6 +74,7 @@ buildPythonPackage rec { zlib libxml2 sqlite + sparsehash ]; propagatedBuildInputs = [ @@ -107,14 +112,19 @@ buildPythonPackage rec { # https://github.com/mapnik/python-mapnik/issues/255 disabledTests = [ "test_geometry_type" - "test_marker_ellipse_render1" - "test_marker_ellipse_render2" - "test_normalizing_definition" "test_passing_pycairo_context_pdf" "test_pdf_printing" - "test_visual_zoom_all_rendering2" - "test_wgs84_inverse_forward" - ] ++ lib.optionals stdenv.isDarwin [ "test_passing_pycairo_context_svg" ]; + "test_render_with_scale_factor" + ] ++ lib.optionals stdenv.isDarwin [ + "test_passing_pycairo_context_png" + "test_passing_pycairo_context_svg" + "test_pycairo_pdf_surface1" + "test_pycairo_pdf_surface2" + "test_pycairo_pdf_surface3" + "test_pycairo_svg_surface1" + "test_pycairo_svg_surface2" + "test_pycairo_svg_surface3" + ]; pythonImportsCheck = [ "mapnik" ]; diff --git a/pkgs/development/python-modules/python-mapnik/python-mapnik_std_optional.patch b/pkgs/development/python-modules/python-mapnik/python-mapnik_std_optional.patch new file mode 100644 index 000000000000..c285e77ca57b --- /dev/null +++ b/pkgs/development/python-modules/python-mapnik/python-mapnik_std_optional.patch @@ -0,0 +1,176 @@ +diff --git a/src/mapnik_image.cpp b/src/mapnik_image.cpp +index 9add692c9..488427b56 100644 +--- a/src/mapnik_image.cpp ++++ b/src/mapnik_image.cpp +@@ -230,7 +230,7 @@ unsigned get_type(mapnik::image_any & im) + + std::shared_ptr open_from_file(std::string const& filename) + { +- boost::optional type = type_from_filename(filename); ++ auto type = type_from_filename(filename); + if (type) + { + std::unique_ptr reader(get_image_reader(filename,*type)); +diff --git a/src/mapnik_layer.cpp b/src/mapnik_layer.cpp +index 4fc7ea579..fbd277a81 100644 +--- a/src/mapnik_layer.cpp ++++ b/src/mapnik_layer.cpp +@@ -95,7 +95,7 @@ struct layer_pickle_suite : boost::python::pickle_suite + + std::vector & (mapnik::layer::*_styles_)() = &mapnik::layer::styles; + +-void set_maximum_extent(mapnik::layer & l, boost::optional > const& box) ++void set_maximum_extent(mapnik::layer & l, std::optional > const& box) + { + if (box) + { +@@ -107,7 +107,7 @@ void set_maximum_extent(mapnik::layer & l, boost::optional + } + } + +-void set_buffer_size(mapnik::layer & l, boost::optional const& buffer_size) ++void set_buffer_size(mapnik::layer & l, std::optional const& buffer_size) + { + if (buffer_size) + { +@@ -121,7 +121,7 @@ void set_buffer_size(mapnik::layer & l, boost::optional const& buffer_size) + + PyObject * get_buffer_size(mapnik::layer & l) + { +- boost::optional buffer_size = l.buffer_size(); ++ std::optional buffer_size = l.buffer_size(); + if (buffer_size) + { + #if PY_VERSION_HEX >= 0x03000000 +diff --git a/src/mapnik_map.cpp b/src/mapnik_map.cpp +index 3587e5d8a..cfa523b03 100644 +--- a/src/mapnik_map.cpp ++++ b/src/mapnik_map.cpp +@@ -105,7 +105,7 @@ mapnik::featureset_ptr query_map_point(mapnik::Map const& m, int index, double x + return m.query_map_point(idx, x, y); + } + +-void set_maximum_extent(mapnik::Map & m, boost::optional > const& box) ++void set_maximum_extent(mapnik::Map & m, std::optional > const& box) + { + if (box) + { +diff --git a/src/python_optional.hpp b/src/python_optional.hpp +index d690b7c51..9d86c340e 100644 +--- a/src/python_optional.hpp ++++ b/src/python_optional.hpp +@@ -28,7 +28,7 @@ + #include + #pragma GCC diagnostic pop + +-// boost::optional to/from converter from John Wiegley ++// std::optional to/from converter from John Wiegley + + template + struct object_from_python +@@ -54,7 +54,7 @@ struct python_optional : public mapnik::util::noncopyable + { + struct optional_to_python + { +- static PyObject * convert(const boost::optional& value) ++ static PyObject * convert(const std::optional& value) + { + return (value ? boost::python::to_python_value()(*value) : + boost::python::detail::none()); +@@ -90,9 +90,9 @@ struct python_optional : public mapnik::util::noncopyable + data)->storage.bytes; + + if (data->convertible == source) // == None +- new (storage) boost::optional(); // A Boost uninitialized value ++ new (storage) std::optional(); // A Boost uninitialized value + else +- new (storage) boost::optional(*static_cast(data->convertible)); ++ new (storage) std::optional(*static_cast(data->convertible)); + + data->convertible = storage; + } +@@ -100,18 +100,18 @@ struct python_optional : public mapnik::util::noncopyable + + explicit python_optional() + { +- register_python_conversion, ++ register_python_conversion, + optional_to_python, optional_from_python>(); + } + }; + +-// to/from boost::optional ++// to/from std::optional + template <> + struct python_optional : public mapnik::util::noncopyable + { + struct optional_to_python + { +- static PyObject * convert(const boost::optional& value) ++ static PyObject * convert(const std::optional& value) + { + return (value ? PyFloat_FromDouble(*value) : + boost::python::detail::none()); +@@ -133,30 +133,30 @@ struct python_optional : public mapnik::util::noncopyable + boost::python::converter::rvalue_from_python_stage1_data * data) + { + using namespace boost::python::converter; +- void * const storage = ((rvalue_from_python_storage > *) ++ void * const storage = ((rvalue_from_python_storage > *) + data)->storage.bytes; + if (source == Py_None) // == None +- new (storage) boost::optional(); // A Boost uninitialized value ++ new (storage) std::optional(); // A Boost uninitialized value + else +- new (storage) boost::optional(PyFloat_AsDouble(source)); ++ new (storage) std::optional(PyFloat_AsDouble(source)); + data->convertible = storage; + } + }; + + explicit python_optional() + { +- register_python_conversion, ++ register_python_conversion, + optional_to_python, optional_from_python>(); + } + }; + +-// to/from boost::optional ++// to/from std::optional + template <> + struct python_optional : public mapnik::util::noncopyable + { + struct optional_to_python + { +- static PyObject * convert(const boost::optional& value) ++ static PyObject * convert(const std::optional& value) + { + if (value) + { +@@ -181,13 +181,13 @@ struct python_optional : public mapnik::util::noncopyable + boost::python::converter::rvalue_from_python_stage1_data * data) + { + using namespace boost::python::converter; +- void * const storage = ((rvalue_from_python_storage > *) ++ void * const storage = ((rvalue_from_python_storage > *) + data)->storage.bytes; + if (source == Py_None) // == None +- new (storage) boost::optional(); // A Boost uninitialized value ++ new (storage) std::optional(); // A Boost uninitialized value + else + { +- new (storage) boost::optional(source == Py_True ? true : false); ++ new (storage) std::optional(source == Py_True ? true : false); + } + data->convertible = storage; + } +@@ -195,7 +195,7 @@ struct python_optional : public mapnik::util::noncopyable + + explicit python_optional() + { +- register_python_conversion, ++ register_python_conversion, + optional_to_python, optional_from_python>(); + } + }; diff --git a/pkgs/development/python-modules/qcodes-contrib-drivers/default.nix b/pkgs/development/python-modules/qcodes-contrib-drivers/default.nix index 10ae5affa430..eb9d0e74021e 100644 --- a/pkgs/development/python-modules/qcodes-contrib-drivers/default.nix +++ b/pkgs/development/python-modules/qcodes-contrib-drivers/default.nix @@ -1,39 +1,44 @@ { lib, - fetchFromGitHub, - pythonOlder, buildPythonPackage, + pythonOlder, + fetchFromGitHub, setuptools, versioningit, + cffi, qcodes, packaging, + pandas, pytestCheckHook, pytest-mock, pyvisa-sim, + stdenv, }: buildPythonPackage rec { pname = "qcodes-contrib-drivers"; - version = "0.21.0"; + version = "0.22.0"; + pyproject = true; - disabled = pythonOlder "3.8"; - format = "pyproject"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "QCoDeS"; repo = "Qcodes_contrib_drivers"; rev = "refs/tags/v${version}"; - sha256 = "sha256-7WkG6Bq4J4PU4eWX52RaupQ8cNzE+sJ7s3PoXFRxG2w="; + sha256 = "sha256-/W5oC5iqYifMR3/s7aSQ2yTJNmkemkc0KVxIU0Es3zY="; }; - nativeBuildInputs = [ + build-system = [ setuptools versioningit ]; - propagatedBuildInputs = [ + dependencies = [ + cffi qcodes packaging + pandas ]; nativeCheckInputs = [ @@ -44,17 +49,20 @@ buildPythonPackage rec { pythonImportsCheck = [ "qcodes_contrib_drivers" ]; - # should be fixed starting with 0.19.0, remove at next release - disabledTestPaths = [ "qcodes_contrib_drivers/tests/test_Keysight_M3201A.py" ]; + disabledTests = lib.optionals (stdenv.hostPlatform.system == "x86_64-darwin") [ + # At index 13 diff: 'sour6:volt 0.29000000000000004' != 'sour6:volt 0.29' + "test_stability_diagram_external" + ]; postInstall = '' export HOME="$TMPDIR" ''; - meta = with lib; { + meta = { description = "User contributed drivers for QCoDeS"; homepage = "https://github.com/QCoDeS/Qcodes_contrib_drivers"; - license = licenses.mit; - maintainers = with maintainers; [ evilmav ]; + changelog = "https://github.com/QCoDeS/Qcodes_contrib_drivers/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ evilmav ]; }; } diff --git a/pkgs/development/python-modules/qcodes/default.nix b/pkgs/development/python-modules/qcodes/default.nix index a33da9b4bedd..ede69b5ebeb6 100644 --- a/pkgs/development/python-modules/qcodes/default.nix +++ b/pkgs/development/python-modules/qcodes/default.nix @@ -1,55 +1,69 @@ { lib, - broadbean, buildPythonPackage, + pythonOlder, + fetchFromGitHub, + + # build-system + setuptools, + versioningit, + wheel, + + # dependencies + broadbean, cf-xarray, dask, - deepdiff, - fetchFromGitHub, h5netcdf, h5py, - hypothesis, - importlib-metadata, ipykernel, ipython, ipywidgets, jsonschema, - lxml, matplotlib, numpy, - opencensus, - opencensus-ext-azure, opentelemetry-api, packaging, pandas, pillow, + pyarrow, + pyvisa, + ruamel-yaml, + tabulate, + tqdm, + typing-extensions, + uncertainties, + websockets, + wrapt, + xarray, + importlib-metadata, + + # optional-dependencies + jinja2, + nbsphinx, + pyvisa-sim, + scipy, + sphinx, + sphinx-issues, + sphinx-rtd-theme, + towncrier, + opencensus, + opencensus-ext-azure, + + # checks + deepdiff, + hypothesis, + lxml, pip, pytest-asyncio, pytest-mock, pytest-rerunfailures, pytest-xdist, pytestCheckHook, - pythonOlder, - pyvisa, - pyvisa-sim, - rsa, - ruamel-yaml, - setuptools, - sphinx, - tabulate, - tqdm, - typing-extensions, - uncertainties, - versioningit, - websockets, - wheel, - wrapt, - xarray, }: buildPythonPackage rec { pname = "qcodes"; - version = "0.44.1"; + version = "0.45.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -58,16 +72,16 @@ buildPythonPackage rec { owner = "microsoft"; repo = "Qcodes"; rev = "refs/tags/v${version}"; - hash = "sha256-AggAVq/yfJUZRwoQb29QoIbVIAdV3solKCjivqucLZk="; + hash = "sha256-H91CpvxGQW0X+m/jlqXMc1RdI9w62lt5jgYOxZ2iPQg="; }; - nativeBuildInputs = [ + build-system = [ setuptools versioningit wheel ]; - propagatedBuildInputs = [ + dependencies = [ broadbean cf-xarray dask @@ -79,14 +93,12 @@ buildPythonPackage rec { jsonschema matplotlib numpy - opencensus - opencensus-ext-azure opentelemetry-api packaging pandas pillow + pyarrow pyvisa - rsa ruamel-yaml tabulate tqdm @@ -97,6 +109,34 @@ buildPythonPackage rec { xarray ] ++ lib.optionals (pythonOlder "3.10") [ importlib-metadata ]; + optional-dependencies = { + docs = [ + # autodocsumm + jinja2 + nbsphinx + pyvisa-sim + # qcodes-loop + scipy + sphinx + # sphinx-favicon + sphinx-issues + # sphinx-jsonschema + sphinx-rtd-theme + # sphinxcontrib-towncrier + towncrier + ]; + loop = [ + # qcodes-loop + ]; + opencensus = [ + opencensus + opencensus-ext-azure + ]; + zurichinstruments = [ + # zhinst-qcodes + ]; + }; + nativeCheckInputs = [ deepdiff hypothesis @@ -160,12 +200,12 @@ buildPythonPackage rec { export HOME="$TMPDIR" ''; - meta = with lib; { + meta = { description = "Python-based data acquisition framework"; changelog = "https://github.com/QCoDeS/Qcodes/releases/tag/v${version}"; downloadPage = "https://github.com/QCoDeS/Qcodes"; homepage = "https://qcodes.github.io/Qcodes/"; - license = licenses.mit; - maintainers = with maintainers; [ evilmav ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ evilmav ]; }; } diff --git a/pkgs/development/python-modules/robotframework/default.nix b/pkgs/development/python-modules/robotframework/default.nix index ea323ac63455..b961d6ca0726 100644 --- a/pkgs/development/python-modules/robotframework/default.nix +++ b/pkgs/development/python-modules/robotframework/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "robotframework"; - version = "7.0"; + version = "7.0.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "robotframework"; repo = "robotframework"; rev = "refs/tags/v${version}"; - hash = "sha256-IyOm2MTHj2rOew/IkyGIfI4XZSFU88+Tx8KHKIRT2G4="; + hash = "sha256-pr7x40ja1DwMPffmXQ2W53g1wuD0p63f+6ATfXhqGvE="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/rpi-gpio2/default.nix b/pkgs/development/python-modules/rpi-gpio2/default.nix deleted file mode 100644 index f24f6a5f6fe9..000000000000 --- a/pkgs/development/python-modules/rpi-gpio2/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ - lib, - libgpiod, - buildPythonPackage, - fetchFromGitHub, -}: - -buildPythonPackage rec { - pname = "rpi-gpio2"; - version = "0.4.0"; - format = "setuptools"; - - # PyPi source does not work for some reason - src = fetchFromGitHub { - owner = "underground-software"; - repo = "RPi.GPIO2"; - rev = "refs/tags/v${version}"; - hash = "sha256-CNnej67yTh3C8n4cCA7NW97rlfIDrrlepRNDkv+BUeY="; - }; - - propagatedBuildInputs = [ libgpiod ]; - - # Disable checks because they need to run on the specific platform - doCheck = false; - - meta = with lib; { - homepage = "https://github.com/underground-software/RPi.GPIO2"; - description = '' - Compatibility layer between RPi.GPIO syntax and libgpiod semantics - ''; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ onny ]; - }; -} diff --git a/pkgs/development/python-modules/spsdk/default.nix b/pkgs/development/python-modules/spsdk/default.nix index fdc74f982c29..0e0d56aa027e 100644 --- a/pkgs/development/python-modules/spsdk/default.nix +++ b/pkgs/development/python-modules/spsdk/default.nix @@ -59,6 +59,7 @@ buildPythonPackage rec { "click" "cryptography" "platformdirs" + "requests" "typing-extensions" ]; diff --git a/pkgs/development/python-modules/srt/default.nix b/pkgs/development/python-modules/srt/default.nix index 4becb1ec968c..d4ae26479ca6 100644 --- a/pkgs/development/python-modules/srt/default.nix +++ b/pkgs/development/python-modules/srt/default.nix @@ -27,6 +27,6 @@ buildPythonPackage rec { homepage = "https://github.com/cdown/srt"; description = "Tiny but featureful Python library for parsing, modifying, and composing SRT files"; license = licenses.bsd3; - maintainers = with maintainers; [ friedelino ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix index f434bdc53ec6..698964e471fe 100644 --- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix +++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "tencentcloud-sdk-python"; - version = "3.0.1169"; + version = "3.0.1170"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "TencentCloud"; repo = "tencentcloud-sdk-python"; rev = "refs/tags/${version}"; - hash = "sha256-kxpkVmP9/WAHfiul/+9HZTC25yp0jDsF+vu6OMBCl5Q="; + hash = "sha256-O0bxsvQYJaKEkgdglWH8q4NddA1LFpAU05HHHf8yhVE="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/tensorly/default.nix b/pkgs/development/python-modules/tensorly/default.nix index 9e3ff72609cf..20bd49a8a9ba 100644 --- a/pkgs/development/python-modules/tensorly/default.nix +++ b/pkgs/development/python-modules/tensorly/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "tensorly"; - version = "0.8.1"; + version = "0.8.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-hwpdExW/ESOavFkL3old1Efo5WC+PYmcgJp5/oLelaA="; + hash = "sha256-kYKyLY2V6M53co+26ZTZP4U6bHkFebKI5Uhh1x1/N58="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/testfixtures/default.nix b/pkgs/development/python-modules/testfixtures/default.nix index 6d8252e3713a..e95952f94010 100644 --- a/pkgs/development/python-modules/testfixtures/default.nix +++ b/pkgs/development/python-modules/testfixtures/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "testfixtures"; - version = "8.2.0"; + version = "8.3.0"; pyproject = true; # DO NOT CONTACT upstream. # https://github.com/simplistix/ is only concerned with internal CI process. @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-70O2VxNMh+ijBE9LAqMq4uvd9Esrl7x5iaIBFkA5iO4="; + hash = "sha256-1MC4SvLyZ2EPkIAJtQ1vmDpOWK3iLGe6tnh7WkAtWcA="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/tree-sitter-html/Cargo.lock b/pkgs/development/python-modules/tree-sitter-html/Cargo.lock new file mode 100644 index 000000000000..e34eb1cd132d --- /dev/null +++ b/pkgs/development/python-modules/tree-sitter-html/Cargo.lock @@ -0,0 +1,71 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "aho-corasick" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" +dependencies = [ + "memchr", +] + +[[package]] +name = "cc" +version = "1.0.98" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41c270e7540d725e65ac7f1b212ac8ce349719624d7bcff99f8e2e488e8cf03f" + +[[package]] +name = "memchr" +version = "2.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" + +[[package]] +name = "regex" +version = "1.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" + +[[package]] +name = "tree-sitter" +version = "0.22.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df7cc499ceadd4dcdf7ec6d4cbc34ece92c3fa07821e287aedecd4416c516dca" +dependencies = [ + "cc", + "regex", +] + +[[package]] +name = "tree-sitter-html" +version = "0.20.3" +dependencies = [ + "cc", + "tree-sitter", +] diff --git a/pkgs/development/python-modules/tree-sitter-html/default.nix b/pkgs/development/python-modules/tree-sitter-html/default.nix new file mode 100644 index 000000000000..2085ef7bad57 --- /dev/null +++ b/pkgs/development/python-modules/tree-sitter-html/default.nix @@ -0,0 +1,56 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, cargo +, rustPlatform +, rustc +, setuptools +, wheel +, tree-sitter +}: + +buildPythonPackage rec { + pname = "tree-sitter-html"; + version = "0.20.3"; + pyproject = true; + + src = fetchFromGitHub { + owner = "tree-sitter"; + repo = "tree-sitter-html"; + rev = "v${version}"; + hash = "sha256-sHy3fVWemJod18HCQ8zBC/LpeCCPH0nzhI1wrkCg8nw="; + }; + + cargoDeps = rustPlatform.importCargoLock { + lockFile = ./Cargo.lock; + }; + + postPatch = '' + ln -s ${./Cargo.lock} Cargo.lock + ''; + + build-system = [ + cargo + rustPlatform.cargoSetupHook + rustc + setuptools + wheel + ]; + + passthru.optional-dependencies = { + core = [ + tree-sitter + ]; + }; + + # There are no tests + doCheck = false; + pythonImportsCheck = [ "tree_sitter_html" ]; + + meta = with lib; { + description = "HTML grammar for tree-sitter"; + homepage = "https://github.com/tree-sitter/tree-sitter-html"; + license = licenses.mit; + maintainers = with maintainers; [ doronbehar ]; + }; +} diff --git a/pkgs/development/python-modules/tree-sitter-javascript/Cargo.lock b/pkgs/development/python-modules/tree-sitter-javascript/Cargo.lock new file mode 100644 index 000000000000..2a6627a05115 --- /dev/null +++ b/pkgs/development/python-modules/tree-sitter-javascript/Cargo.lock @@ -0,0 +1,71 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "aho-corasick" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" +dependencies = [ + "memchr", +] + +[[package]] +name = "cc" +version = "1.0.98" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41c270e7540d725e65ac7f1b212ac8ce349719624d7bcff99f8e2e488e8cf03f" + +[[package]] +name = "memchr" +version = "2.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" + +[[package]] +name = "regex" +version = "1.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" + +[[package]] +name = "tree-sitter" +version = "0.22.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df7cc499ceadd4dcdf7ec6d4cbc34ece92c3fa07821e287aedecd4416c516dca" +dependencies = [ + "cc", + "regex", +] + +[[package]] +name = "tree-sitter-javascript" +version = "0.21.3" +dependencies = [ + "cc", + "tree-sitter", +] diff --git a/pkgs/development/python-modules/tree-sitter-javascript/default.nix b/pkgs/development/python-modules/tree-sitter-javascript/default.nix new file mode 100644 index 000000000000..50b115c4e7ef --- /dev/null +++ b/pkgs/development/python-modules/tree-sitter-javascript/default.nix @@ -0,0 +1,58 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, cargo +, rustPlatform +, rustc +, setuptools +, wheel +, tree-sitter +}: + +buildPythonPackage rec { + pname = "tree-sitter-javascript"; + version = "0.21.3"; + pyproject = true; + + src = fetchFromGitHub { + owner = "tree-sitter"; + repo = "tree-sitter-javascript"; + rev = "v${version}"; + hash = "sha256-jsdY9Pd9WqZuBYtk088mx1bRQadC6D2/tGGVY+ZZ0J4="; + }; + + cargoDeps = rustPlatform.importCargoLock { + # Upstream doesn't track a Cargo.lock file unfortunatly, but they barely + # have rust dependencies so it doesn't cost us too much. + lockFile = ./Cargo.lock; + }; + + postPatch = '' + ln -s ${./Cargo.lock} Cargo.lock + ''; + + build-system = [ + cargo + rustPlatform.cargoSetupHook + rustc + setuptools + wheel + ]; + + passthru.optional-dependencies = { + core = [ + tree-sitter + ]; + }; + + # There are no tests + doCheck = false; + pythonImportsCheck = [ "tree_sitter_javascript" ]; + + meta = with lib; { + description = "JavaScript and JSX grammar for tree-sitter"; + homepage = "https://github.com/tree-sitter/tree-sitter-javascript"; + license = licenses.mit; + maintainers = with maintainers; [ doronbehar ]; + }; +} diff --git a/pkgs/development/python-modules/tree-sitter-json/Cargo.lock b/pkgs/development/python-modules/tree-sitter-json/Cargo.lock new file mode 100644 index 000000000000..1b9b095b2637 --- /dev/null +++ b/pkgs/development/python-modules/tree-sitter-json/Cargo.lock @@ -0,0 +1,71 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "aho-corasick" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" +dependencies = [ + "memchr", +] + +[[package]] +name = "cc" +version = "1.0.98" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41c270e7540d725e65ac7f1b212ac8ce349719624d7bcff99f8e2e488e8cf03f" + +[[package]] +name = "memchr" +version = "2.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" + +[[package]] +name = "regex" +version = "1.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" + +[[package]] +name = "tree-sitter" +version = "0.22.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df7cc499ceadd4dcdf7ec6d4cbc34ece92c3fa07821e287aedecd4416c516dca" +dependencies = [ + "cc", + "regex", +] + +[[package]] +name = "tree-sitter-json" +version = "0.21.0" +dependencies = [ + "cc", + "tree-sitter", +] diff --git a/pkgs/development/python-modules/tree-sitter-json/default.nix b/pkgs/development/python-modules/tree-sitter-json/default.nix new file mode 100644 index 000000000000..acf574bef1d9 --- /dev/null +++ b/pkgs/development/python-modules/tree-sitter-json/default.nix @@ -0,0 +1,58 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, cargo +, rustPlatform +, rustc +, setuptools +, wheel +, tree-sitter +}: + +buildPythonPackage rec { + pname = "tree-sitter-json"; + version = "0.21.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "tree-sitter"; + repo = "tree-sitter-json"; + rev = "v${version}"; + hash = "sha256-waejAbS7MjrE7w03MPqvBRpEpqTcKc6RgKCVSYaDV1Y="; + }; + + cargoDeps = rustPlatform.importCargoLock { + # Upstream doesn't track a Cargo.lock file unfortunatly, but they barely + # have rust dependencies so it doesn't cost us too much. + lockFile = ./Cargo.lock; + }; + + postPatch = '' + ln -s ${./Cargo.lock} Cargo.lock + ''; + + build-system = [ + cargo + rustPlatform.cargoSetupHook + rustc + setuptools + wheel + ]; + + passthru.optional-dependencies = { + core = [ + tree-sitter + ]; + }; + + # There are no tests + doCheck = false; + pythonImportsCheck = [ "tree_sitter_json" ]; + + meta = with lib; { + description = "JSON grammar for tree-sitter"; + homepage = "https://github.com/tree-sitter/tree-sitter-json"; + license = licenses.mit; + maintainers = with maintainers; [ doronbehar ]; + }; +} diff --git a/pkgs/development/python-modules/tree-sitter-languages/default.nix b/pkgs/development/python-modules/tree-sitter-languages/default.nix new file mode 100644 index 000000000000..a118e4ffe0cc --- /dev/null +++ b/pkgs/development/python-modules/tree-sitter-languages/default.nix @@ -0,0 +1,68 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +, wheel +, cython +, tree-sitter0_21 +, pytestCheckHook +, python +}: + +buildPythonPackage rec { + pname = "tree-sitter-languages"; + version = "1.10.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "grantjenks"; + repo = "py-tree-sitter-languages"; + rev = "v${version}"; + hash = "sha256-wKU2c8QRBKFVFqg+DAeH5+cwm5jpDLmPZG3YBUsh/lM="; + # Use git, to also fetch tree-sitter repositories that upstream puts their + # hases in the repository as well, in repos.txt. + forceFetchGit = true; + postFetch = '' + cd $out + substitute build.py get-repos.py \ + --replace-fail "from tree_sitter import Language" "" \ + --replace-fail 'print(f"{sys.argv[0]}: Building", languages_filename)' "exit(0)" + ${python.pythonOnBuildForHost.interpreter} get-repos.py + rm -rf vendor/*/.git + ''; + }; + + build-system = [ + setuptools + wheel + cython + ]; + dependencies = [ + # https://github.com/grantjenks/py-tree-sitter-languages/issues/67 + tree-sitter0_21 + ]; + # Generate languages.so file (build won't fail without this, but tests will). + preBuild = '' + ${python.pythonOnBuildForHost.interpreter} build.py + ''; + nativeCheckInputs = [ + pytestCheckHook + ]; + # Without cd $out, tests fail to import the compiled cython extensions. + # Without copying the ./tests/ directory to $out, pytest won't detect the + # tests and run them. See also: + # https://github.com/NixOS/nixpkgs/issues/255262 + preCheck = '' + cp -r tests $out/${python.sitePackages}/tree_sitter_languages + cd $out + ''; + + pythonImportsCheck = [ "tree_sitter_languages" ]; + + meta = with lib; { + description = "Binary Python wheels for all tree sitter languages"; + homepage = "https://github.com/grantjenks/py-tree-sitter-languages"; + license = licenses.asl20; + maintainers = with maintainers; [ doronbehar ]; + }; +} diff --git a/pkgs/development/python-modules/tree-sitter-python/Cargo.lock b/pkgs/development/python-modules/tree-sitter-python/Cargo.lock new file mode 100644 index 000000000000..001baef04472 --- /dev/null +++ b/pkgs/development/python-modules/tree-sitter-python/Cargo.lock @@ -0,0 +1,71 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "aho-corasick" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" +dependencies = [ + "memchr", +] + +[[package]] +name = "cc" +version = "1.0.98" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41c270e7540d725e65ac7f1b212ac8ce349719624d7bcff99f8e2e488e8cf03f" + +[[package]] +name = "memchr" +version = "2.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" + +[[package]] +name = "regex" +version = "1.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" + +[[package]] +name = "tree-sitter" +version = "0.22.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df7cc499ceadd4dcdf7ec6d4cbc34ece92c3fa07821e287aedecd4416c516dca" +dependencies = [ + "cc", + "regex", +] + +[[package]] +name = "tree-sitter-python" +version = "0.21.0" +dependencies = [ + "cc", + "tree-sitter", +] diff --git a/pkgs/development/python-modules/tree-sitter-python/default.nix b/pkgs/development/python-modules/tree-sitter-python/default.nix new file mode 100644 index 000000000000..e42136f5c2ad --- /dev/null +++ b/pkgs/development/python-modules/tree-sitter-python/default.nix @@ -0,0 +1,58 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, cargo +, rustPlatform +, rustc +, setuptools +, wheel +, tree-sitter +}: + +buildPythonPackage rec { + pname = "tree-sitter-python"; + version = "0.21.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "tree-sitter"; + repo = "tree-sitter-python"; + rev = "v${version}"; + hash = "sha256-ZQ949GbgzZ/W667J+ekvQbs4bGnbDO+IWejivhxPZXM="; + }; + + cargoDeps = rustPlatform.importCargoLock { + # Upstream doesn't track a Cargo.lock file unfortunatly, but they barely + # have rust dependencies so it doesn't cost us too much. + lockFile = ./Cargo.lock; + }; + + postPatch = '' + ln -s ${./Cargo.lock} Cargo.lock + ''; + + build-system = [ + cargo + rustPlatform.cargoSetupHook + rustc + setuptools + wheel + ]; + + passthru.optional-dependencies = { + core = [ + tree-sitter + ]; + }; + + # There are no tests + doCheck = false; + pythonImportsCheck = [ "tree_sitter_python" ]; + + meta = with lib; { + description = "Python grammar for tree-sitter"; + homepage = "https://github.com/tree-sitter/tree-sitter-python"; + license = licenses.mit; + maintainers = with maintainers; [ doronbehar ]; + }; +} diff --git a/pkgs/development/python-modules/tree-sitter-rust/Cargo.lock b/pkgs/development/python-modules/tree-sitter-rust/Cargo.lock new file mode 100644 index 000000000000..406fa5fc19bb --- /dev/null +++ b/pkgs/development/python-modules/tree-sitter-rust/Cargo.lock @@ -0,0 +1,71 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "aho-corasick" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" +dependencies = [ + "memchr", +] + +[[package]] +name = "cc" +version = "1.0.98" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41c270e7540d725e65ac7f1b212ac8ce349719624d7bcff99f8e2e488e8cf03f" + +[[package]] +name = "memchr" +version = "2.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" + +[[package]] +name = "regex" +version = "1.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" + +[[package]] +name = "tree-sitter" +version = "0.22.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df7cc499ceadd4dcdf7ec6d4cbc34ece92c3fa07821e287aedecd4416c516dca" +dependencies = [ + "cc", + "regex", +] + +[[package]] +name = "tree-sitter-rust" +version = "0.21.2" +dependencies = [ + "cc", + "tree-sitter", +] diff --git a/pkgs/development/python-modules/tree-sitter-rust/default.nix b/pkgs/development/python-modules/tree-sitter-rust/default.nix new file mode 100644 index 000000000000..b2c85aa9c5c1 --- /dev/null +++ b/pkgs/development/python-modules/tree-sitter-rust/default.nix @@ -0,0 +1,59 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, cargo +, rustPlatform +, rustc +, setuptools +, wheel +, tree-sitter +}: + +buildPythonPackage rec { + pname = "tree-sitter-rust"; + version = "0.21.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "tree-sitter"; + repo = "tree-sitter-rust"; + rev = "v${version}"; + hash = "sha256-4CTh6fKSV8TuMHLAfEKWsAeCqeCM2uo6hVmF5KWhyPY="; + }; + + cargoDeps = rustPlatform.importCargoLock { + # Upstream doesn't track a Cargo.lock file unfortunatly, but they barely + # have rust dependencies so it doesn't cost us too much. + lockFile = ./Cargo.lock; + }; + + postPatch = '' + ln -s ${./Cargo.lock} Cargo.lock + ''; + + build-system = [ + cargo + rustPlatform.cargoSetupHook + rustc + setuptools + wheel + ]; + + + passthru.optional-dependencies = { + core = [ + tree-sitter + ]; + }; + + # There are no tests + doCheck = false; + pythonImportsCheck = [ "tree_sitter_rust" ]; + + meta = with lib; { + description = "Rust grammar for tree-sitter"; + homepage = "https://github.com/tree-sitter/tree-sitter-rust"; + license = licenses.mit; + maintainers = with maintainers; [ doronbehar ]; + }; +} diff --git a/pkgs/development/python-modules/tree-sitter/default.nix b/pkgs/development/python-modules/tree-sitter/default.nix index 91bbe16a52f4..fdaa03554433 100644 --- a/pkgs/development/python-modules/tree-sitter/default.nix +++ b/pkgs/development/python-modules/tree-sitter/default.nix @@ -2,15 +2,19 @@ lib, buildPythonPackage, fetchFromGitHub, - fetchpatch, pytestCheckHook, pythonOlder, setuptools, + tree-sitter-python, + tree-sitter-rust, + tree-sitter-html, + tree-sitter-javascript, + tree-sitter-json, }: buildPythonPackage rec { pname = "tree-sitter"; - version = "0.21.1"; + version = "0.22.3"; pyproject = true; disabled = pythonOlder "3.7"; @@ -19,26 +23,25 @@ buildPythonPackage rec { owner = "tree-sitter"; repo = "py-tree-sitter"; rev = "refs/tags/v${version}"; - hash = "sha256-U4ZdU0lxjZO/y0q20bG5CLKipnfpaxzV3AFR6fGS7m4="; + hash = "sha256-4lxE8oDFE0X7YAnB72PKIaHIqovWSM5QnFo0grPAtKU="; fetchSubmodules = true; }; - patches = [ - # Replace distutils with setuptools, https://github.com/tree-sitter/py-tree-sitter/pull/214 - (fetchpatch { - name = "replace-distutils.patch"; - url = "https://github.com/tree-sitter/py-tree-sitter/commit/80d3cae493c4a47e49cc1d2ebab0a8eaf7617825.patch"; - hash = "sha256-00coI8/COpYMiSflAECwh6yJCMJj/ucFEn18Npj2g+Q="; - }) + build-system = [ setuptools ]; + + nativeCheckInputs = [ + pytestCheckHook + tree-sitter-python + tree-sitter-rust + tree-sitter-html + tree-sitter-javascript + tree-sitter-json ]; - nativeBuildInputs = [ setuptools ]; - - nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ "tree_sitter" ]; preCheck = '' + # https://github.com/NixOS/nixpkgs/issues/255262#issuecomment-1721265871 rm -r tree_sitter ''; diff --git a/pkgs/development/python-modules/tree-sitter0_21/default.nix b/pkgs/development/python-modules/tree-sitter0_21/default.nix new file mode 100644 index 000000000000..665f7d6b56ce --- /dev/null +++ b/pkgs/development/python-modules/tree-sitter0_21/default.nix @@ -0,0 +1,44 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pytestCheckHook, + pythonOlder, + pythonAtLeast, + setuptools, +}: + +buildPythonPackage rec { + pname = "tree-sitter0_21"; + version = "0.21.3"; + pyproject = true; + + # https://github.com/tree-sitter/py-tree-sitter/issues/209 + disabled = pythonAtLeast "3.12" || pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "tree-sitter"; + repo = "py-tree-sitter"; + rev = "refs/tags/v${version}"; + hash = "sha256-HT1sRzDFpeelWCq1ZMeRmoUg0a3SBR7bZKxBqn4fb2g="; + fetchSubmodules = true; + }; + + build-system = [ setuptools ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "tree_sitter" ]; + + preCheck = '' + rm -r tree_sitter + ''; + + meta = with lib; { + description = "Python bindings to the Tree-sitter parsing library"; + homepage = "https://github.com/tree-sitter/py-tree-sitter"; + changelog = "https://github.com/tree-sitter/py-tree-sitter/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/vt-py/default.nix b/pkgs/development/python-modules/vt-py/default.nix index adaf1ed7feb7..c0d6fa22c952 100644 --- a/pkgs/development/python-modules/vt-py/default.nix +++ b/pkgs/development/python-modules/vt-py/default.nix @@ -3,6 +3,7 @@ aiohttp, buildPythonPackage, fetchFromGitHub, + flask, pytest-asyncio, pytest-httpserver, pytestCheckHook, @@ -13,7 +14,7 @@ buildPythonPackage rec { pname = "vt-py"; - version = "0.18.2"; + version = "0.18.3"; pyproject = true; disabled = pythonOlder "3.7"; @@ -22,7 +23,7 @@ buildPythonPackage rec { owner = "VirusTotal"; repo = "vt-py"; rev = "refs/tags/${version}"; - hash = "sha256-Uspd422JlBKlsD/K7NciYhYUb12wInN/Z7zTw7aYP28="; + hash = "sha256-Zu4lUniXfKaZ1SvX3YCzMLa76HgUWpmddV2N9buNS3o="; }; postPatch = '' @@ -39,6 +40,7 @@ buildPythonPackage rec { dependencies = [ aiohttp ]; nativeCheckInputs = [ + flask pytest-asyncio pytest-httpserver pytestCheckHook diff --git a/pkgs/development/python-modules/weconnect/default.nix b/pkgs/development/python-modules/weconnect/default.nix index e653d684d447..cba91268a5eb 100644 --- a/pkgs/development/python-modules/weconnect/default.nix +++ b/pkgs/development/python-modules/weconnect/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "weconnect"; - version = "0.60.2"; + version = "0.60.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "tillsteinbach"; repo = "WeConnect-python"; rev = "refs/tags/v${version}"; - hash = "sha256-VM4qCe+VMnfKXioUHTjOeBSniwpq44fvbN1k1jG6puk="; + hash = "sha256-eIGzcuSKzcpE6UPQKmv0kcFcIFizWOunfOJDHfcw7Yk="; }; postPatch = '' diff --git a/pkgs/development/python-modules/zha/default.nix b/pkgs/development/python-modules/zha/default.nix index e3d33af5d068..f8ba88bdf0c6 100644 --- a/pkgs/development/python-modules/zha/default.nix +++ b/pkgs/development/python-modules/zha/default.nix @@ -47,8 +47,10 @@ buildPythonPackage rec { pythonRelaxDeps = [ "bellows" + "pyserial-asyncio-fast" "universal-silabs-flasher" "zha-quirks" + "zigpy" ]; nativeBuildInputs = [ pythonRelaxDepsHook ]; diff --git a/pkgs/development/ruby-modules/bundled-common/default.nix b/pkgs/development/ruby-modules/bundled-common/default.nix index cd2f6f379efc..3bb95521132b 100644 --- a/pkgs/development/ruby-modules/bundled-common/default.nix +++ b/pkgs/development/ruby-modules/bundled-common/default.nix @@ -23,6 +23,7 @@ , nativeBuildInputs ? [] , buildInputs ? [] , extraConfigPaths ? [] +, passthru ? {} , ... }@args: @@ -182,7 +183,7 @@ let exit 1 ''; }; - }); + } // passthru); }; basicEnv = diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index 9f967bd59b00..614f78d54853 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "checkov"; - version = "3.2.137"; + version = "3.2.138"; pyproject = true; src = fetchFromGitHub { owner = "bridgecrewio"; repo = "checkov"; rev = "refs/tags/${version}"; - hash = "sha256-gI9x2QYrpludcIAmxSB1/Bhy/O+ZPt1EKI6FgNm85Yo="; + hash = "sha256-xgEVUZF6d/vmqaKVTxt0MtppqDBhPEzQcY37WVOR/EE="; }; patches = [ ./flake8-compat-5.x.patch ]; diff --git a/pkgs/development/tools/bearer/default.nix b/pkgs/development/tools/bearer/default.nix index 388e529bf290..30f7defdfe42 100644 --- a/pkgs/development/tools/bearer/default.nix +++ b/pkgs/development/tools/bearer/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "bearer"; - version = "1.43.7"; + version = "1.43.8"; src = fetchFromGitHub { owner = "bearer"; repo = "bearer"; rev = "refs/tags/v${version}"; - hash = "sha256-n48HpPAga3/CBKAzJOg5uc+y9gNvVtmlsme/nY5dSRo="; + hash = "sha256-rDmS13eDPYE/UmyCRsBi1wHOZerYf9QS/pOiPKVxwKA="; }; - vendorHash = "sha256-84YJ9CXnOu0JeCzF2Ip54PRz8uJ3j+nkIwEMD++Gabg="; + vendorHash = "sha256-7rTbLnFfdmRQgQfx2w/mO3Ac5ENEFm5XPzApKwlImkE="; subPackages = [ "cmd/bearer" ]; diff --git a/pkgs/development/tools/build-managers/moon/default.nix b/pkgs/development/tools/build-managers/moon/default.nix index 4923ea23da1c..5e6ad1c1e16f 100644 --- a/pkgs/development/tools/build-managers/moon/default.nix +++ b/pkgs/development/tools/build-managers/moon/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "moon"; - version = "1.25.1"; + version = "1.25.6"; src = fetchFromGitHub { owner = "moonrepo"; repo = pname; rev = "v${version}"; - hash = "sha256-LPQuP2OsR1TYnt7Qm8XRO0Ne7xliglJgQrMHNWnsYhM="; + hash = "sha256-DFBQryGbanytawHtD3ygSL9ypzM9hoxVoVB1H9ruPu4="; }; - cargoHash = "sha256-EWwUlKxsf0rZegxk1m11ZPIcfjwZKQ7C95l5UyGVFD0="; + cargoHash = "sha256-6Ipfz4649vf7qsavkif/zNbElMiZPEi/2ZXHbRcxRTw="; env = { RUSTFLAGS = "-C strip=symbols"; diff --git a/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix b/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix index d3cbb676757f..e50259bed236 100644 --- a/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix +++ b/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "cirrus-cli"; - version = "0.119.0"; + version = "0.119.1"; src = fetchFromGitHub { owner = "cirruslabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-BdCsm6ciQsfmrQOxOWPTfNbWXhnJzXBmHEUkPD/FobU="; + sha256 = "sha256-nEGeh0ZTYE4Ff0x+1G38KUFcUsr39kvM8QUfmHCFyK4="; }; vendorHash = "sha256-rL4bXt6VBG2b9nZ1M2FF6E8ODPT3UF4aRHSJqpVWyTw="; diff --git a/pkgs/development/tools/database/atlas/default.nix b/pkgs/development/tools/database/atlas/default.nix index 3f3b1f6a13f6..3901c068d098 100644 --- a/pkgs/development/tools/database/atlas/default.nix +++ b/pkgs/development/tools/database/atlas/default.nix @@ -2,19 +2,19 @@ buildGoModule rec { pname = "atlas"; - version = "0.23.0"; + version = "0.24.0"; src = fetchFromGitHub { owner = "ariga"; repo = "atlas"; rev = "v${version}"; - hash = "sha256-eMYr+U95+xym7PZ02OmZbDG7g/kxE1Nojp3mZM6mf9Q="; + hash = "sha256-kmsDTHnYSkCRdLXPzE5g2qzzb8EuGunrM9SDfaul8Xo="; }; modRoot = "cmd/atlas"; proxyVendor = true; - vendorHash = "sha256-rM2l7U/ZkL0NIGPPbmBQ+P6mzGxdX4aQeS8Hz6EFmQc="; + vendorHash = "sha256-z2+u6jPTP6MOs7PTF6UzPwhnofQOhRll0zrmsLrN+PQ="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/tools/fsautocomplete/default.nix b/pkgs/development/tools/fsautocomplete/default.nix index 27bc02ad9bdf..b4b381c369d8 100644 --- a/pkgs/development/tools/fsautocomplete/default.nix +++ b/pkgs/development/tools/fsautocomplete/default.nix @@ -2,13 +2,13 @@ buildDotnetModule rec { pname = "fsautocomplete"; - version = "0.73.1"; + version = "0.73.2"; src = fetchFromGitHub { owner = "fsharp"; repo = "FsAutoComplete"; rev = "v${version}"; - hash = "sha256-esvnbmifLFwzNUHTTwl6yEYPwFgWgKfaZGMQDJ+puus="; + hash = "sha256-iiV/Tw3gOteARrOEbLjPA/jGawoxJVBZg6GvF9p9HHA="; }; nugetDeps = ./deps.nix; diff --git a/pkgs/development/tools/fsautocomplete/deps.nix b/pkgs/development/tools/fsautocomplete/deps.nix index 68e3c8061084..8dea1747aa97 100644 --- a/pkgs/development/tools/fsautocomplete/deps.nix +++ b/pkgs/development/tools/fsautocomplete/deps.nix @@ -45,7 +45,7 @@ (fetchNuGet { pname = "ICSharpCode.Decompiler"; version = "7.2.1.6856"; sha256 = "19z68rgzl93lh1h8anbgzw119mhvcgr9nh5q2nxk6qihl2mx97ba"; }) (fetchNuGet { pname = "Ionide.Analyzers"; version = "0.11.0"; sha256 = "1wsx7gbr4macmim5z1iz9clgq9xfmg423snb589bvaiyg5k6ha00"; }) (fetchNuGet { pname = "Ionide.KeepAChangelog.Tasks"; version = "0.1.8"; sha256 = "066zla2rp1sal6by3h3sg6ibpkk52kbhn30bzk58l6ym7q1kqa6b"; }) - (fetchNuGet { pname = "Ionide.LanguageServerProtocol"; version = "0.4.23"; sha256 = "0jfsan2d7aj68xksn1xrdiww1fdz34n7k91r5y4a77jx6h4ngbxq"; }) + (fetchNuGet { pname = "Ionide.LanguageServerProtocol"; version = "0.6.0"; sha256 = "15wjmm91qdvhdpjjggqqsqgwlsi0wwsdzqarvdx9l1h2681hq9g0"; }) (fetchNuGet { pname = "Ionide.ProjInfo"; version = "0.65.0"; sha256 = "0aka78yaj7h3apbr9ia7rdikr2hhyizl1xakks90h47nax00kscz"; }) (fetchNuGet { pname = "Ionide.ProjInfo.FCS"; version = "0.65.0"; sha256 = "0kjrn6r6nwd5m5wlb8jpyzaicjcw64dg7w7vqndrwv7nw0wd4di0"; }) (fetchNuGet { pname = "Ionide.ProjInfo.ProjectSystem"; version = "0.65.0"; sha256 = "15080y3f0zqvdzi6ks9v6jhih5xsrgi08ji5zym88qvmp81g1m8q"; }) diff --git a/pkgs/development/tools/glock/default.nix b/pkgs/development/tools/glock/default.nix deleted file mode 100644 index bef0dbb6cab8..000000000000 --- a/pkgs/development/tools/glock/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, buildGoPackage, fetchFromGitHub }: - -buildGoPackage rec { - pname = "glock"; - version = "20160816-${lib.strings.substring 0 7 rev}"; - rev = "b8c84ff5ade15a6238ca61c20d3afc70d2e41276"; - - goPackagePath = "github.com/robfig/glock"; - - src = fetchFromGitHub { - inherit rev; - owner = "robfig"; - repo = "glock"; - sha256 = "10jwn3k71p340g8d43zjx7k1j534rcd7rss8pif09mpfrn9qndhh"; - }; - - goDeps = ./deps.nix; - - meta = with lib; { - homepage = "https://github.com/robfig/glock"; - description = "Command-line tool to lock Go dependencies to specific revisions"; - mainProgram = "glock"; - license = licenses.mit; - maintainers = [ maintainers.rushmorem ]; - }; -} diff --git a/pkgs/development/tools/glock/deps.nix b/pkgs/development/tools/glock/deps.nix deleted file mode 100644 index b7392d757cfc..000000000000 --- a/pkgs/development/tools/glock/deps.nix +++ /dev/null @@ -1,21 +0,0 @@ -# This file was generated by go2nix. -[ - { - goPackagePath = "github.com/agtorre/gocolorize"; - fetch = { - type = "git"; - url = "https://github.com/agtorre/gocolorize"; - rev = "f42b554bf7f006936130c9bb4f971afd2d87f671"; - sha256 = "1dj7s8bgw9qky344d0k9gz661c0m317a08a590184drw7m51hy9p"; - }; - } - { - goPackagePath = "golang.org/x/tools"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/tools"; - rev = "f1a397bba50dee815e8c73f3ec94ffc0e8df1a09"; - sha256 = "1wy8nn2vg70n98g80i1zrk49129phyfbzxbicj748bmf82rnaxzg"; - }; - } -] diff --git a/pkgs/development/tools/lv_img_conv/default.nix b/pkgs/development/tools/lv_img_conv/default.nix deleted file mode 100644 index e00b960c46b9..000000000000 --- a/pkgs/development/tools/lv_img_conv/default.nix +++ /dev/null @@ -1,64 +0,0 @@ -{ lib -, stdenv -, buildNpmPackage -, fetchFromGitHub -, pkg-config -, python3 -, pixman -, libpng -, libjpeg -, librsvg -, giflib -, cairo -, pango -, nodePackages -, makeWrapper -, CoreText -, nix-update-script -}: - -buildNpmPackage rec { - pname = "lv_img_conv"; - version = "0.4.0"; - - src = fetchFromGitHub { - owner = "lvgl"; - repo = pname; - rev = "refs/tags/v${version}"; - hash = "sha256-LB7NZKwrpvps1cKzRoARHL4S48gBHadvxwA6JMmm/ME="; - }; - - npmDepsHash = "sha256-uDF22wlL3BlMQ/+Wmtgyjp4CVN6sDnjqjEPB4SeQuPk="; - - nativeBuildInputs = [ - pkg-config - python3 - makeWrapper - ]; - - buildInputs = [ - pixman - libpng - libjpeg - librsvg - giflib - cairo - pango - ] ++ lib.optionals stdenv.isDarwin [ - CoreText - ]; - - postInstall = '' - makeWrapper ${nodePackages.ts-node}/bin/ts-node $out/bin/lv_img_conv --add-flags $out/lib/node_modules/lv_img_conv/lib/cli.ts - ''; - - passthru.updateScript = nix-update-script { }; - - meta = with lib; { - changelog = "https://github.com/lvgl/lv_img_conv/releases/tag/v${version}"; - description = "Image converter for LVGL"; - homepage = "https://github.com/lvgl/lv_img_conv"; - license = licenses.mit; - maintainers = with maintainers; [ stargate01 ]; - }; -} diff --git a/pkgs/development/tools/maizzle/default.nix b/pkgs/development/tools/maizzle/default.nix index f04536f76309..a33a845e7cd3 100644 --- a/pkgs/development/tools/maizzle/default.nix +++ b/pkgs/development/tools/maizzle/default.nix @@ -5,16 +5,16 @@ buildNpmPackage rec { pname = "maizzle"; - version = "1.5.8"; + version = "1.5.9"; src = fetchFromGitHub { owner = "maizzle"; repo = "cli"; rev = "v${version}"; - hash = "sha256-cSAYicgCgFpJO+2vBAqfl3od7B07DTXvkW38x6y5VgM="; + hash = "sha256-r3HWqfm/BdOfENi5cGdau7ockvNLxnWufWcQepI/RFM="; }; - npmDepsHash = "sha256-K9EQxqOjFzgTw/VXG2ZGF90yUzYTNl13Ssq9oiC+F7A="; + npmDepsHash = "sha256-WlqWOGwmSab+cJWPUFIBWuFwMK4lFQm80PoUfEIIIH8="; dontNpmBuild = true; diff --git a/pkgs/development/tools/misc/babeltrace/default.nix b/pkgs/development/tools/misc/babeltrace/default.nix deleted file mode 100644 index 014d926eea3d..000000000000 --- a/pkgs/development/tools/misc/babeltrace/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, glib, libuuid, popt, elfutils }: - -stdenv.mkDerivation rec { - pname = "babeltrace"; - version = "1.5.8"; - - src = fetchurl { - url = "https://www.efficios.com/files/babeltrace/${pname}-${version}.tar.bz2"; - sha256 = "1hkg3phnamxfrhwzmiiirbhdgckzfkqwhajl0lmr1wfps7j47wcz"; - }; - - # The pre-generated ./configure script uses an old autoconf version which - # breaks cross-compilation (replaces references to malloc with rpl_malloc). - # Re-generate with nixpkgs's autoconf. This requires glib to be present in - # nativeBuildInputs for its m4 macros to be present. - nativeBuildInputs = [ autoreconfHook glib pkg-config ]; - buildInputs = [ glib libuuid popt elfutils ]; - - # --enable-debug-info (default) requires the configure script to run host - # executables to determine the elfutils library version, which cannot be done - # while cross compiling. - configureFlags = lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "--disable-debug-info"; - - meta = with lib; { - description = "Command-line tool and library to read and convert LTTng tracefiles"; - homepage = "https://www.efficios.com/babeltrace"; - license = licenses.mit; - platforms = platforms.linux; - maintainers = [ maintainers.bjornfor ]; - }; - -} diff --git a/pkgs/development/tools/mongosh/package-lock.json b/pkgs/development/tools/mongosh/package-lock.json index 37d494d0c53e..b87274ea8330 100644 --- a/pkgs/development/tools/mongosh/package-lock.json +++ b/pkgs/development/tools/mongosh/package-lock.json @@ -1,15 +1,15 @@ { "name": "mongosh", - "version": "2.2.6", + "version": "2.2.9", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "mongosh", - "version": "2.2.6", + "version": "2.2.9", "license": "Apache-2.0", "dependencies": { - "@mongosh/cli-repl": "2.2.6" + "@mongosh/cli-repl": "2.2.9" }, "bin": { "mongosh": "bin/mongosh.js" @@ -30,126 +30,165 @@ "node": ">=6.0.0" } }, - "node_modules/@aws-crypto/ie11-detection": { - "version": "3.0.0", - "resolved": "https://registry.npmmirror.com/@aws-crypto/ie11-detection/-/ie11-detection-3.0.0.tgz", - "integrity": "sha512-341lBBkiY1DfDNKai/wXM3aujNBkXR7tq1URPQDL9wi3AUbI80NR74uF1TXHMm7po1AcnFk8iu2S2IeU/+/A+Q==", - "dependencies": { - "tslib": "^1.11.1" - } - }, - "node_modules/@aws-crypto/ie11-detection/node_modules/tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmmirror.com/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" - }, "node_modules/@aws-crypto/sha256-browser": { - "version": "3.0.0", - "resolved": "https://registry.npmmirror.com/@aws-crypto/sha256-browser/-/sha256-browser-3.0.0.tgz", - "integrity": "sha512-8VLmW2B+gjFbU5uMeqtQM6Nj0/F1bro80xQXCW6CQBWgosFWXTx77aeOF5CAIAmbOK64SdMBJdNr6J41yP5mvQ==", + "version": "5.2.0", + "resolved": "https://registry.npmmirror.com/@aws-crypto/sha256-browser/-/sha256-browser-5.2.0.tgz", + "integrity": "sha512-AXfN/lGotSQwu6HNcEsIASo7kWXZ5HYWvfOmSNKDsEqC4OashTp8alTmaz+F7TC2L083SFv5RdB+qU3Vs1kZqw==", "dependencies": { - "@aws-crypto/ie11-detection": "^3.0.0", - "@aws-crypto/sha256-js": "^3.0.0", - "@aws-crypto/supports-web-crypto": "^3.0.0", - "@aws-crypto/util": "^3.0.0", + "@aws-crypto/sha256-js": "^5.2.0", + "@aws-crypto/supports-web-crypto": "^5.2.0", + "@aws-crypto/util": "^5.2.0", "@aws-sdk/types": "^3.222.0", "@aws-sdk/util-locate-window": "^3.0.0", - "@aws-sdk/util-utf8-browser": "^3.0.0", - "tslib": "^1.11.1" + "@smithy/util-utf8": "^2.0.0", + "tslib": "^2.6.2" } }, - "node_modules/@aws-crypto/sha256-browser/node_modules/tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmmirror.com/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" + "node_modules/@aws-crypto/sha256-browser/node_modules/@smithy/is-array-buffer": { + "version": "2.2.0", + "resolved": "https://registry.npmmirror.com/@smithy/is-array-buffer/-/is-array-buffer-2.2.0.tgz", + "integrity": "sha512-GGP3O9QFD24uGeAXYUjwSTXARoqpZykHadOmA8G5vfJPK0/DC67qa//0qvqrJzL1xc8WQWX7/yc7fwudjPHPhA==", + "dependencies": { + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@aws-crypto/sha256-browser/node_modules/@smithy/util-buffer-from": { + "version": "2.2.0", + "resolved": "https://registry.npmmirror.com/@smithy/util-buffer-from/-/util-buffer-from-2.2.0.tgz", + "integrity": "sha512-IJdWBbTcMQ6DA0gdNhh/BwrLkDR+ADW5Kr1aZmd4k3DIF6ezMV4R2NIAmT08wQJ3yUK82thHWmC/TnK/wpMMIA==", + "dependencies": { + "@smithy/is-array-buffer": "^2.2.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@aws-crypto/sha256-browser/node_modules/@smithy/util-utf8": { + "version": "2.3.0", + "resolved": "https://registry.npmmirror.com/@smithy/util-utf8/-/util-utf8-2.3.0.tgz", + "integrity": "sha512-R8Rdn8Hy72KKcebgLiv8jQcQkXoLMOGGv5uI1/k0l+snqkOzQ1R0ChUBCxWMlBsFMekWjq0wRudIweFs7sKT5A==", + "dependencies": { + "@smithy/util-buffer-from": "^2.2.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=14.0.0" + } }, "node_modules/@aws-crypto/sha256-js": { - "version": "3.0.0", - "resolved": "https://registry.npmmirror.com/@aws-crypto/sha256-js/-/sha256-js-3.0.0.tgz", - "integrity": "sha512-PnNN7os0+yd1XvXAy23CFOmTbMaDxgxXtTKHybrJ39Y8kGzBATgBFibWJKH6BhytLI/Zyszs87xCOBNyBig6vQ==", + "version": "5.2.0", + "resolved": "https://registry.npmmirror.com/@aws-crypto/sha256-js/-/sha256-js-5.2.0.tgz", + "integrity": "sha512-FFQQyu7edu4ufvIZ+OadFpHHOt+eSTBaYaki44c+akjg7qZg9oOQeLlk77F6tSYqjDAFClrHJk9tMf0HdVyOvA==", "dependencies": { - "@aws-crypto/util": "^3.0.0", + "@aws-crypto/util": "^5.2.0", "@aws-sdk/types": "^3.222.0", - "tslib": "^1.11.1" + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=16.0.0" } }, - "node_modules/@aws-crypto/sha256-js/node_modules/tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmmirror.com/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" - }, "node_modules/@aws-crypto/supports-web-crypto": { - "version": "3.0.0", - "resolved": "https://registry.npmmirror.com/@aws-crypto/supports-web-crypto/-/supports-web-crypto-3.0.0.tgz", - "integrity": "sha512-06hBdMwUAb2WFTuGG73LSC0wfPu93xWwo5vL2et9eymgmu3Id5vFAHBbajVWiGhPO37qcsdCap/FqXvJGJWPIg==", + "version": "5.2.0", + "resolved": "https://registry.npmmirror.com/@aws-crypto/supports-web-crypto/-/supports-web-crypto-5.2.0.tgz", + "integrity": "sha512-iAvUotm021kM33eCdNfwIN//F77/IADDSs58i+MDaOqFrVjZo9bAal0NK7HurRuWLLpF1iLX7gbWrjHjeo+YFg==", "dependencies": { - "tslib": "^1.11.1" + "tslib": "^2.6.2" } }, - "node_modules/@aws-crypto/supports-web-crypto/node_modules/tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmmirror.com/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" - }, "node_modules/@aws-crypto/util": { - "version": "3.0.0", - "resolved": "https://registry.npmmirror.com/@aws-crypto/util/-/util-3.0.0.tgz", - "integrity": "sha512-2OJlpeJpCR48CC8r+uKVChzs9Iungj9wkZrl8Z041DWEWvyIHILYKCPNzJghKsivj+S3mLo6BVc7mBNzdxA46w==", + "version": "5.2.0", + "resolved": "https://registry.npmmirror.com/@aws-crypto/util/-/util-5.2.0.tgz", + "integrity": "sha512-4RkU9EsI6ZpBve5fseQlGNUWKMa1RLPQ1dnjnQoe07ldfIzcsGb5hC5W0Dm7u423KWzawlrpbjXBrXCEv9zazQ==", "dependencies": { "@aws-sdk/types": "^3.222.0", - "@aws-sdk/util-utf8-browser": "^3.0.0", - "tslib": "^1.11.1" + "@smithy/util-utf8": "^2.0.0", + "tslib": "^2.6.2" } }, - "node_modules/@aws-crypto/util/node_modules/tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmmirror.com/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" + "node_modules/@aws-crypto/util/node_modules/@smithy/is-array-buffer": { + "version": "2.2.0", + "resolved": "https://registry.npmmirror.com/@smithy/is-array-buffer/-/is-array-buffer-2.2.0.tgz", + "integrity": "sha512-GGP3O9QFD24uGeAXYUjwSTXARoqpZykHadOmA8G5vfJPK0/DC67qa//0qvqrJzL1xc8WQWX7/yc7fwudjPHPhA==", + "dependencies": { + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@aws-crypto/util/node_modules/@smithy/util-buffer-from": { + "version": "2.2.0", + "resolved": "https://registry.npmmirror.com/@smithy/util-buffer-from/-/util-buffer-from-2.2.0.tgz", + "integrity": "sha512-IJdWBbTcMQ6DA0gdNhh/BwrLkDR+ADW5Kr1aZmd4k3DIF6ezMV4R2NIAmT08wQJ3yUK82thHWmC/TnK/wpMMIA==", + "dependencies": { + "@smithy/is-array-buffer": "^2.2.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@aws-crypto/util/node_modules/@smithy/util-utf8": { + "version": "2.3.0", + "resolved": "https://registry.npmmirror.com/@smithy/util-utf8/-/util-utf8-2.3.0.tgz", + "integrity": "sha512-R8Rdn8Hy72KKcebgLiv8jQcQkXoLMOGGv5uI1/k0l+snqkOzQ1R0ChUBCxWMlBsFMekWjq0wRudIweFs7sKT5A==", + "dependencies": { + "@smithy/util-buffer-from": "^2.2.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=14.0.0" + } }, "node_modules/@aws-sdk/client-cognito-identity": { - "version": "3.577.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.577.0.tgz", - "integrity": "sha512-y1fHORHoufrzj2GcnY52g4ykemFpT0Hu9e9kYa6yR0weQ0WalcG7WcnMNasXMcjr9fDjNze7ZCTuWJSI+HwkTQ==", + "version": "3.598.0", + "resolved": "https://registry.npmmirror.com/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.598.0.tgz", + "integrity": "sha512-N/1lnkhkzk1Il8WEZBWR713/7sDEqBtl/1AS6dfgw6Zh7NWUYSwBkZx6xdN8KogDu4CFExRHhilNOgI1JMug3w==", "dependencies": { - "@aws-crypto/sha256-browser": "3.0.0", - "@aws-crypto/sha256-js": "3.0.0", - "@aws-sdk/client-sso-oidc": "3.577.0", - "@aws-sdk/client-sts": "3.577.0", - "@aws-sdk/core": "3.576.0", - "@aws-sdk/credential-provider-node": "3.577.0", - "@aws-sdk/middleware-host-header": "3.577.0", - "@aws-sdk/middleware-logger": "3.577.0", - "@aws-sdk/middleware-recursion-detection": "3.577.0", - "@aws-sdk/middleware-user-agent": "3.577.0", - "@aws-sdk/region-config-resolver": "3.577.0", - "@aws-sdk/types": "3.577.0", - "@aws-sdk/util-endpoints": "3.577.0", - "@aws-sdk/util-user-agent-browser": "3.577.0", - "@aws-sdk/util-user-agent-node": "3.577.0", - "@smithy/config-resolver": "^3.0.0", - "@smithy/core": "^2.0.0", - "@smithy/fetch-http-handler": "^3.0.0", - "@smithy/hash-node": "^3.0.0", - "@smithy/invalid-dependency": "^3.0.0", - "@smithy/middleware-content-length": "^3.0.0", - "@smithy/middleware-endpoint": "^3.0.0", - "@smithy/middleware-retry": "^3.0.0", - "@smithy/middleware-serde": "^3.0.0", - "@smithy/middleware-stack": "^3.0.0", - "@smithy/node-config-provider": "^3.0.0", - "@smithy/node-http-handler": "^3.0.0", - "@smithy/protocol-http": "^4.0.0", - "@smithy/smithy-client": "^3.0.0", - "@smithy/types": "^3.0.0", - "@smithy/url-parser": "^3.0.0", + "@aws-crypto/sha256-browser": "5.2.0", + "@aws-crypto/sha256-js": "5.2.0", + "@aws-sdk/client-sso-oidc": "3.598.0", + "@aws-sdk/client-sts": "3.598.0", + "@aws-sdk/core": "3.598.0", + "@aws-sdk/credential-provider-node": "3.598.0", + "@aws-sdk/middleware-host-header": "3.598.0", + "@aws-sdk/middleware-logger": "3.598.0", + "@aws-sdk/middleware-recursion-detection": "3.598.0", + "@aws-sdk/middleware-user-agent": "3.598.0", + "@aws-sdk/region-config-resolver": "3.598.0", + "@aws-sdk/types": "3.598.0", + "@aws-sdk/util-endpoints": "3.598.0", + "@aws-sdk/util-user-agent-browser": "3.598.0", + "@aws-sdk/util-user-agent-node": "3.598.0", + "@smithy/config-resolver": "^3.0.2", + "@smithy/core": "^2.2.1", + "@smithy/fetch-http-handler": "^3.0.2", + "@smithy/hash-node": "^3.0.1", + "@smithy/invalid-dependency": "^3.0.1", + "@smithy/middleware-content-length": "^3.0.1", + "@smithy/middleware-endpoint": "^3.0.2", + "@smithy/middleware-retry": "^3.0.4", + "@smithy/middleware-serde": "^3.0.1", + "@smithy/middleware-stack": "^3.0.1", + "@smithy/node-config-provider": "^3.1.1", + "@smithy/node-http-handler": "^3.0.1", + "@smithy/protocol-http": "^4.0.1", + "@smithy/smithy-client": "^3.1.2", + "@smithy/types": "^3.1.0", + "@smithy/url-parser": "^3.0.1", "@smithy/util-base64": "^3.0.0", "@smithy/util-body-length-browser": "^3.0.0", "@smithy/util-body-length-node": "^3.0.0", - "@smithy/util-defaults-mode-browser": "^3.0.0", - "@smithy/util-defaults-mode-node": "^3.0.0", - "@smithy/util-endpoints": "^2.0.0", - "@smithy/util-middleware": "^3.0.0", - "@smithy/util-retry": "^3.0.0", + "@smithy/util-defaults-mode-browser": "^3.0.4", + "@smithy/util-defaults-mode-node": "^3.0.4", + "@smithy/util-endpoints": "^2.0.2", + "@smithy/util-middleware": "^3.0.1", + "@smithy/util-retry": "^3.0.1", "@smithy/util-utf8": "^3.0.0", "tslib": "^2.6.2" }, @@ -158,46 +197,46 @@ } }, "node_modules/@aws-sdk/client-sso": { - "version": "3.577.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/client-sso/-/client-sso-3.577.0.tgz", - "integrity": "sha512-BwujdXrydlk6UEyPmewm5GqG4nkQ6OVyRhS/SyZP/6UKSFv2/sf391Cmz0hN0itUTH1rR4XeLln8XCOtarkrzg==", + "version": "3.598.0", + "resolved": "https://registry.npmmirror.com/@aws-sdk/client-sso/-/client-sso-3.598.0.tgz", + "integrity": "sha512-nOI5lqPYa+YZlrrzwAJywJSw3MKVjvu6Ge2fCqQUNYMfxFB0NAaDFnl0EPjXi+sEbtCuz/uWE77poHbqiZ+7Iw==", "dependencies": { - "@aws-crypto/sha256-browser": "3.0.0", - "@aws-crypto/sha256-js": "3.0.0", - "@aws-sdk/core": "3.576.0", - "@aws-sdk/middleware-host-header": "3.577.0", - "@aws-sdk/middleware-logger": "3.577.0", - "@aws-sdk/middleware-recursion-detection": "3.577.0", - "@aws-sdk/middleware-user-agent": "3.577.0", - "@aws-sdk/region-config-resolver": "3.577.0", - "@aws-sdk/types": "3.577.0", - "@aws-sdk/util-endpoints": "3.577.0", - "@aws-sdk/util-user-agent-browser": "3.577.0", - "@aws-sdk/util-user-agent-node": "3.577.0", - "@smithy/config-resolver": "^3.0.0", - "@smithy/core": "^2.0.0", - "@smithy/fetch-http-handler": "^3.0.0", - "@smithy/hash-node": "^3.0.0", - "@smithy/invalid-dependency": "^3.0.0", - "@smithy/middleware-content-length": "^3.0.0", - "@smithy/middleware-endpoint": "^3.0.0", - "@smithy/middleware-retry": "^3.0.0", - "@smithy/middleware-serde": "^3.0.0", - "@smithy/middleware-stack": "^3.0.0", - "@smithy/node-config-provider": "^3.0.0", - "@smithy/node-http-handler": "^3.0.0", - "@smithy/protocol-http": "^4.0.0", - "@smithy/smithy-client": "^3.0.0", - "@smithy/types": "^3.0.0", - "@smithy/url-parser": "^3.0.0", + "@aws-crypto/sha256-browser": "5.2.0", + "@aws-crypto/sha256-js": "5.2.0", + "@aws-sdk/core": "3.598.0", + "@aws-sdk/middleware-host-header": "3.598.0", + "@aws-sdk/middleware-logger": "3.598.0", + "@aws-sdk/middleware-recursion-detection": "3.598.0", + "@aws-sdk/middleware-user-agent": "3.598.0", + "@aws-sdk/region-config-resolver": "3.598.0", + "@aws-sdk/types": "3.598.0", + "@aws-sdk/util-endpoints": "3.598.0", + "@aws-sdk/util-user-agent-browser": "3.598.0", + "@aws-sdk/util-user-agent-node": "3.598.0", + "@smithy/config-resolver": "^3.0.2", + "@smithy/core": "^2.2.1", + "@smithy/fetch-http-handler": "^3.0.2", + "@smithy/hash-node": "^3.0.1", + "@smithy/invalid-dependency": "^3.0.1", + "@smithy/middleware-content-length": "^3.0.1", + "@smithy/middleware-endpoint": "^3.0.2", + "@smithy/middleware-retry": "^3.0.4", + "@smithy/middleware-serde": "^3.0.1", + "@smithy/middleware-stack": "^3.0.1", + "@smithy/node-config-provider": "^3.1.1", + "@smithy/node-http-handler": "^3.0.1", + "@smithy/protocol-http": "^4.0.1", + "@smithy/smithy-client": "^3.1.2", + "@smithy/types": "^3.1.0", + "@smithy/url-parser": "^3.0.1", "@smithy/util-base64": "^3.0.0", "@smithy/util-body-length-browser": "^3.0.0", "@smithy/util-body-length-node": "^3.0.0", - "@smithy/util-defaults-mode-browser": "^3.0.0", - "@smithy/util-defaults-mode-node": "^3.0.0", - "@smithy/util-endpoints": "^2.0.0", - "@smithy/util-middleware": "^3.0.0", - "@smithy/util-retry": "^3.0.0", + "@smithy/util-defaults-mode-browser": "^3.0.4", + "@smithy/util-defaults-mode-node": "^3.0.4", + "@smithy/util-endpoints": "^2.0.2", + "@smithy/util-middleware": "^3.0.1", + "@smithy/util-retry": "^3.0.1", "@smithy/util-utf8": "^3.0.0", "tslib": "^2.6.2" }, @@ -206,48 +245,48 @@ } }, "node_modules/@aws-sdk/client-sso-oidc": { - "version": "3.577.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.577.0.tgz", - "integrity": "sha512-njmKSPDWueWWYVFpFcZ2P3fI6/pdQVDa0FgCyYZhOnJLgEHZIcBBg1AsnkVWacBuLopp9XVt2m+7hO6ugY1/1g==", + "version": "3.598.0", + "resolved": "https://registry.npmmirror.com/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.598.0.tgz", + "integrity": "sha512-jfdH1pAO9Tt8Nkta/JJLoUnwl7jaRdxToQTJfUtE+o3+0JP5sA4LfC2rBkJSWcU5BdAA+kyOs5Lv776DlN04Vg==", "dependencies": { - "@aws-crypto/sha256-browser": "3.0.0", - "@aws-crypto/sha256-js": "3.0.0", - "@aws-sdk/client-sts": "3.577.0", - "@aws-sdk/core": "3.576.0", - "@aws-sdk/credential-provider-node": "3.577.0", - "@aws-sdk/middleware-host-header": "3.577.0", - "@aws-sdk/middleware-logger": "3.577.0", - "@aws-sdk/middleware-recursion-detection": "3.577.0", - "@aws-sdk/middleware-user-agent": "3.577.0", - "@aws-sdk/region-config-resolver": "3.577.0", - "@aws-sdk/types": "3.577.0", - "@aws-sdk/util-endpoints": "3.577.0", - "@aws-sdk/util-user-agent-browser": "3.577.0", - "@aws-sdk/util-user-agent-node": "3.577.0", - "@smithy/config-resolver": "^3.0.0", - "@smithy/core": "^2.0.0", - "@smithy/fetch-http-handler": "^3.0.0", - "@smithy/hash-node": "^3.0.0", - "@smithy/invalid-dependency": "^3.0.0", - "@smithy/middleware-content-length": "^3.0.0", - "@smithy/middleware-endpoint": "^3.0.0", - "@smithy/middleware-retry": "^3.0.0", - "@smithy/middleware-serde": "^3.0.0", - "@smithy/middleware-stack": "^3.0.0", - "@smithy/node-config-provider": "^3.0.0", - "@smithy/node-http-handler": "^3.0.0", - "@smithy/protocol-http": "^4.0.0", - "@smithy/smithy-client": "^3.0.0", - "@smithy/types": "^3.0.0", - "@smithy/url-parser": "^3.0.0", + "@aws-crypto/sha256-browser": "5.2.0", + "@aws-crypto/sha256-js": "5.2.0", + "@aws-sdk/client-sts": "3.598.0", + "@aws-sdk/core": "3.598.0", + "@aws-sdk/credential-provider-node": "3.598.0", + "@aws-sdk/middleware-host-header": "3.598.0", + "@aws-sdk/middleware-logger": "3.598.0", + "@aws-sdk/middleware-recursion-detection": "3.598.0", + "@aws-sdk/middleware-user-agent": "3.598.0", + "@aws-sdk/region-config-resolver": "3.598.0", + "@aws-sdk/types": "3.598.0", + "@aws-sdk/util-endpoints": "3.598.0", + "@aws-sdk/util-user-agent-browser": "3.598.0", + "@aws-sdk/util-user-agent-node": "3.598.0", + "@smithy/config-resolver": "^3.0.2", + "@smithy/core": "^2.2.1", + "@smithy/fetch-http-handler": "^3.0.2", + "@smithy/hash-node": "^3.0.1", + "@smithy/invalid-dependency": "^3.0.1", + "@smithy/middleware-content-length": "^3.0.1", + "@smithy/middleware-endpoint": "^3.0.2", + "@smithy/middleware-retry": "^3.0.4", + "@smithy/middleware-serde": "^3.0.1", + "@smithy/middleware-stack": "^3.0.1", + "@smithy/node-config-provider": "^3.1.1", + "@smithy/node-http-handler": "^3.0.1", + "@smithy/protocol-http": "^4.0.1", + "@smithy/smithy-client": "^3.1.2", + "@smithy/types": "^3.1.0", + "@smithy/url-parser": "^3.0.1", "@smithy/util-base64": "^3.0.0", "@smithy/util-body-length-browser": "^3.0.0", "@smithy/util-body-length-node": "^3.0.0", - "@smithy/util-defaults-mode-browser": "^3.0.0", - "@smithy/util-defaults-mode-node": "^3.0.0", - "@smithy/util-endpoints": "^2.0.0", - "@smithy/util-middleware": "^3.0.0", - "@smithy/util-retry": "^3.0.0", + "@smithy/util-defaults-mode-browser": "^3.0.4", + "@smithy/util-defaults-mode-node": "^3.0.4", + "@smithy/util-endpoints": "^2.0.2", + "@smithy/util-middleware": "^3.0.1", + "@smithy/util-retry": "^3.0.1", "@smithy/util-utf8": "^3.0.0", "tslib": "^2.6.2" }, @@ -256,48 +295,48 @@ } }, "node_modules/@aws-sdk/client-sts": { - "version": "3.577.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/client-sts/-/client-sts-3.577.0.tgz", - "integrity": "sha512-509Kklimva1XVlhGbpTpeX3kOP6ORpm44twJxDHpa9TURbmoaxj7veWlnLCbDorxDTrbsDghvYZshvcLsojVpg==", + "version": "3.598.0", + "resolved": "https://registry.npmmirror.com/@aws-sdk/client-sts/-/client-sts-3.598.0.tgz", + "integrity": "sha512-bXhz/cHL0iB9UH9IFtMaJJf4F8mV+HzncETCRFzZ9SyUMt5rP9j8A7VZknqGYSx/6mI8SsB1XJQkWSbhn6FiSQ==", "dependencies": { - "@aws-crypto/sha256-browser": "3.0.0", - "@aws-crypto/sha256-js": "3.0.0", - "@aws-sdk/client-sso-oidc": "3.577.0", - "@aws-sdk/core": "3.576.0", - "@aws-sdk/credential-provider-node": "3.577.0", - "@aws-sdk/middleware-host-header": "3.577.0", - "@aws-sdk/middleware-logger": "3.577.0", - "@aws-sdk/middleware-recursion-detection": "3.577.0", - "@aws-sdk/middleware-user-agent": "3.577.0", - "@aws-sdk/region-config-resolver": "3.577.0", - "@aws-sdk/types": "3.577.0", - "@aws-sdk/util-endpoints": "3.577.0", - "@aws-sdk/util-user-agent-browser": "3.577.0", - "@aws-sdk/util-user-agent-node": "3.577.0", - "@smithy/config-resolver": "^3.0.0", - "@smithy/core": "^2.0.0", - "@smithy/fetch-http-handler": "^3.0.0", - "@smithy/hash-node": "^3.0.0", - "@smithy/invalid-dependency": "^3.0.0", - "@smithy/middleware-content-length": "^3.0.0", - "@smithy/middleware-endpoint": "^3.0.0", - "@smithy/middleware-retry": "^3.0.0", - "@smithy/middleware-serde": "^3.0.0", - "@smithy/middleware-stack": "^3.0.0", - "@smithy/node-config-provider": "^3.0.0", - "@smithy/node-http-handler": "^3.0.0", - "@smithy/protocol-http": "^4.0.0", - "@smithy/smithy-client": "^3.0.0", - "@smithy/types": "^3.0.0", - "@smithy/url-parser": "^3.0.0", + "@aws-crypto/sha256-browser": "5.2.0", + "@aws-crypto/sha256-js": "5.2.0", + "@aws-sdk/client-sso-oidc": "3.598.0", + "@aws-sdk/core": "3.598.0", + "@aws-sdk/credential-provider-node": "3.598.0", + "@aws-sdk/middleware-host-header": "3.598.0", + "@aws-sdk/middleware-logger": "3.598.0", + "@aws-sdk/middleware-recursion-detection": "3.598.0", + "@aws-sdk/middleware-user-agent": "3.598.0", + "@aws-sdk/region-config-resolver": "3.598.0", + "@aws-sdk/types": "3.598.0", + "@aws-sdk/util-endpoints": "3.598.0", + "@aws-sdk/util-user-agent-browser": "3.598.0", + "@aws-sdk/util-user-agent-node": "3.598.0", + "@smithy/config-resolver": "^3.0.2", + "@smithy/core": "^2.2.1", + "@smithy/fetch-http-handler": "^3.0.2", + "@smithy/hash-node": "^3.0.1", + "@smithy/invalid-dependency": "^3.0.1", + "@smithy/middleware-content-length": "^3.0.1", + "@smithy/middleware-endpoint": "^3.0.2", + "@smithy/middleware-retry": "^3.0.4", + "@smithy/middleware-serde": "^3.0.1", + "@smithy/middleware-stack": "^3.0.1", + "@smithy/node-config-provider": "^3.1.1", + "@smithy/node-http-handler": "^3.0.1", + "@smithy/protocol-http": "^4.0.1", + "@smithy/smithy-client": "^3.1.2", + "@smithy/types": "^3.1.0", + "@smithy/url-parser": "^3.0.1", "@smithy/util-base64": "^3.0.0", "@smithy/util-body-length-browser": "^3.0.0", "@smithy/util-body-length-node": "^3.0.0", - "@smithy/util-defaults-mode-browser": "^3.0.0", - "@smithy/util-defaults-mode-node": "^3.0.0", - "@smithy/util-endpoints": "^2.0.0", - "@smithy/util-middleware": "^3.0.0", - "@smithy/util-retry": "^3.0.0", + "@smithy/util-defaults-mode-browser": "^3.0.4", + "@smithy/util-defaults-mode-node": "^3.0.4", + "@smithy/util-endpoints": "^2.0.2", + "@smithy/util-middleware": "^3.0.1", + "@smithy/util-retry": "^3.0.1", "@smithy/util-utf8": "^3.0.0", "tslib": "^2.6.2" }, @@ -306,15 +345,15 @@ } }, "node_modules/@aws-sdk/core": { - "version": "3.576.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/core/-/core-3.576.0.tgz", - "integrity": "sha512-KDvDlbeipSTIf+ffKtTg1m419TK7s9mZSWC8bvuZ9qx6/sjQFOXIKOVqyuli6DnfxGbvRcwoRuY99OcCH1N/0w==", + "version": "3.598.0", + "resolved": "https://registry.npmmirror.com/@aws-sdk/core/-/core-3.598.0.tgz", + "integrity": "sha512-HaSjt7puO5Cc7cOlrXFCW0rtA0BM9lvzjl56x0A20Pt+0wxXGeTOZZOkXQIepbrFkV2e/HYukuT9e99vXDm59g==", "dependencies": { - "@smithy/core": "^2.0.0", - "@smithy/protocol-http": "^4.0.0", - "@smithy/signature-v4": "^3.0.0", - "@smithy/smithy-client": "^3.0.0", - "@smithy/types": "^3.0.0", + "@smithy/core": "^2.2.1", + "@smithy/protocol-http": "^4.0.1", + "@smithy/signature-v4": "^3.1.0", + "@smithy/smithy-client": "^3.1.2", + "@smithy/types": "^3.1.0", "fast-xml-parser": "4.2.5", "tslib": "^2.6.2" }, @@ -323,14 +362,14 @@ } }, "node_modules/@aws-sdk/credential-provider-cognito-identity": { - "version": "3.577.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.577.0.tgz", - "integrity": "sha512-y5yo4RKQSIQEOGLMLziLh0MZ+CxLs2QmTRjh8PkL8ovy12FPyou9Ptr7hIDD5SnCsiItJful5qbmj9e2QSmozw==", + "version": "3.598.0", + "resolved": "https://registry.npmmirror.com/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.598.0.tgz", + "integrity": "sha512-u6oocRReswkA2mFlOwtCetgmEr9B+Yhle3K13x37rb1lQgq1wUuWUvHU7U9v26hUZIhfUpigV/Mgr/RQZB6+Yw==", "dependencies": { - "@aws-sdk/client-cognito-identity": "3.577.0", - "@aws-sdk/types": "3.577.0", - "@smithy/property-provider": "^3.0.0", - "@smithy/types": "^3.0.0", + "@aws-sdk/client-cognito-identity": "3.598.0", + "@aws-sdk/types": "3.598.0", + "@smithy/property-provider": "^3.1.1", + "@smithy/types": "^3.1.0", "tslib": "^2.6.2" }, "engines": { @@ -338,13 +377,13 @@ } }, "node_modules/@aws-sdk/credential-provider-env": { - "version": "3.577.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/credential-provider-env/-/credential-provider-env-3.577.0.tgz", - "integrity": "sha512-Jxu255j0gToMGEiqufP8ZtKI8HW90lOLjwJ3LrdlD/NLsAY0tOQf1fWc53u28hWmmNGMxmCrL2p66IOgMDhDUw==", + "version": "3.598.0", + "resolved": "https://registry.npmmirror.com/@aws-sdk/credential-provider-env/-/credential-provider-env-3.598.0.tgz", + "integrity": "sha512-vi1khgn7yXzLCcgSIzQrrtd2ilUM0dWodxj3PQ6BLfP0O+q1imO3hG1nq7DVyJtq7rFHs6+9N8G4mYvTkxby2w==", "dependencies": { - "@aws-sdk/types": "3.577.0", - "@smithy/property-provider": "^3.0.0", - "@smithy/types": "^3.0.0", + "@aws-sdk/types": "3.598.0", + "@smithy/property-provider": "^3.1.1", + "@smithy/types": "^3.1.0", "tslib": "^2.6.2" }, "engines": { @@ -352,18 +391,18 @@ } }, "node_modules/@aws-sdk/credential-provider-http": { - "version": "3.577.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/credential-provider-http/-/credential-provider-http-3.577.0.tgz", - "integrity": "sha512-n++yhCp67b9+ZRGEdY1jhamB5E/O+QsIDOPSuRmdaSGMCOd82oUEKPgIVEU1bkqxDsBxgiEWuvtfhK6sNiDS0A==", + "version": "3.598.0", + "resolved": "https://registry.npmmirror.com/@aws-sdk/credential-provider-http/-/credential-provider-http-3.598.0.tgz", + "integrity": "sha512-N7cIafi4HVlQvEgvZSo1G4T9qb/JMLGMdBsDCT5XkeJrF0aptQWzTFH0jIdZcLrMYvzPcuEyO3yCBe6cy/ba0g==", "dependencies": { - "@aws-sdk/types": "3.577.0", - "@smithy/fetch-http-handler": "^3.0.0", - "@smithy/node-http-handler": "^3.0.0", - "@smithy/property-provider": "^3.0.0", - "@smithy/protocol-http": "^4.0.0", - "@smithy/smithy-client": "^3.0.0", - "@smithy/types": "^3.0.0", - "@smithy/util-stream": "^3.0.0", + "@aws-sdk/types": "3.598.0", + "@smithy/fetch-http-handler": "^3.0.2", + "@smithy/node-http-handler": "^3.0.1", + "@smithy/property-provider": "^3.1.1", + "@smithy/protocol-http": "^4.0.1", + "@smithy/smithy-client": "^3.1.2", + "@smithy/types": "^3.1.0", + "@smithy/util-stream": "^3.0.2", "tslib": "^2.6.2" }, "engines": { @@ -371,44 +410,45 @@ } }, "node_modules/@aws-sdk/credential-provider-ini": { - "version": "3.577.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.577.0.tgz", - "integrity": "sha512-q7lHPtv6BjRvChUE3m0tIaEZKxPTaZ1B3lKxGYsFl3VLAu5N8yGCUKwuA1izf4ucT+LyKscVGqK6VDZx1ev3nw==", + "version": "3.598.0", + "resolved": "https://registry.npmmirror.com/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.598.0.tgz", + "integrity": "sha512-/ppcIVUbRwDIwJDoYfp90X3+AuJo2mvE52Y1t2VSrvUovYn6N4v95/vXj6LS8CNDhz2jvEJYmu+0cTMHdhI6eA==", "dependencies": { - "@aws-sdk/credential-provider-env": "3.577.0", - "@aws-sdk/credential-provider-process": "3.577.0", - "@aws-sdk/credential-provider-sso": "3.577.0", - "@aws-sdk/credential-provider-web-identity": "3.577.0", - "@aws-sdk/types": "3.577.0", - "@smithy/credential-provider-imds": "^3.0.0", - "@smithy/property-provider": "^3.0.0", - "@smithy/shared-ini-file-loader": "^3.0.0", - "@smithy/types": "^3.0.0", + "@aws-sdk/credential-provider-env": "3.598.0", + "@aws-sdk/credential-provider-http": "3.598.0", + "@aws-sdk/credential-provider-process": "3.598.0", + "@aws-sdk/credential-provider-sso": "3.598.0", + "@aws-sdk/credential-provider-web-identity": "3.598.0", + "@aws-sdk/types": "3.598.0", + "@smithy/credential-provider-imds": "^3.1.1", + "@smithy/property-provider": "^3.1.1", + "@smithy/shared-ini-file-loader": "^3.1.1", + "@smithy/types": "^3.1.0", "tslib": "^2.6.2" }, "engines": { "node": ">=16.0.0" }, "peerDependencies": { - "@aws-sdk/client-sts": "^3.577.0" + "@aws-sdk/client-sts": "^3.598.0" } }, "node_modules/@aws-sdk/credential-provider-node": { - "version": "3.577.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/credential-provider-node/-/credential-provider-node-3.577.0.tgz", - "integrity": "sha512-epZ1HOMsrXBNczc0HQpv0VMjqAEpc09DUA7Rg3gUJfn8umhML7A7bXnUyqPA+S54q397UYg1leQKdSn23OiwQQ==", + "version": "3.598.0", + "resolved": "https://registry.npmmirror.com/@aws-sdk/credential-provider-node/-/credential-provider-node-3.598.0.tgz", + "integrity": "sha512-sXTlqL5I/awlF9Dg2MQ17SfrEaABVnsj2mf4jF5qQrIRhfbvQOIYdEqdy8Rn1AWlJMz/N450SGzc0XJ5owxxqw==", "dependencies": { - "@aws-sdk/credential-provider-env": "3.577.0", - "@aws-sdk/credential-provider-http": "3.577.0", - "@aws-sdk/credential-provider-ini": "3.577.0", - "@aws-sdk/credential-provider-process": "3.577.0", - "@aws-sdk/credential-provider-sso": "3.577.0", - "@aws-sdk/credential-provider-web-identity": "3.577.0", - "@aws-sdk/types": "3.577.0", - "@smithy/credential-provider-imds": "^3.0.0", - "@smithy/property-provider": "^3.0.0", - "@smithy/shared-ini-file-loader": "^3.0.0", - "@smithy/types": "^3.0.0", + "@aws-sdk/credential-provider-env": "3.598.0", + "@aws-sdk/credential-provider-http": "3.598.0", + "@aws-sdk/credential-provider-ini": "3.598.0", + "@aws-sdk/credential-provider-process": "3.598.0", + "@aws-sdk/credential-provider-sso": "3.598.0", + "@aws-sdk/credential-provider-web-identity": "3.598.0", + "@aws-sdk/types": "3.598.0", + "@smithy/credential-provider-imds": "^3.1.1", + "@smithy/property-provider": "^3.1.1", + "@smithy/shared-ini-file-loader": "^3.1.1", + "@smithy/types": "^3.1.0", "tslib": "^2.6.2" }, "engines": { @@ -416,14 +456,14 @@ } }, "node_modules/@aws-sdk/credential-provider-process": { - "version": "3.577.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/credential-provider-process/-/credential-provider-process-3.577.0.tgz", - "integrity": "sha512-Gin6BWtOiXxIgITrJ3Nwc+Y2P1uVT6huYR4EcbA/DJUPWyO0n9y5UFLewPvVbLkRn15JeEqErBLUrHclkiOKtw==", + "version": "3.598.0", + "resolved": "https://registry.npmmirror.com/@aws-sdk/credential-provider-process/-/credential-provider-process-3.598.0.tgz", + "integrity": "sha512-rM707XbLW8huMk722AgjVyxu2tMZee++fNA8TJVNgs1Ma02Wx6bBrfIvlyK0rCcIRb0WdQYP6fe3Xhiu4e8IBA==", "dependencies": { - "@aws-sdk/types": "3.577.0", - "@smithy/property-provider": "^3.0.0", - "@smithy/shared-ini-file-loader": "^3.0.0", - "@smithy/types": "^3.0.0", + "@aws-sdk/types": "3.598.0", + "@smithy/property-provider": "^3.1.1", + "@smithy/shared-ini-file-loader": "^3.1.1", + "@smithy/types": "^3.1.0", "tslib": "^2.6.2" }, "engines": { @@ -431,16 +471,16 @@ } }, "node_modules/@aws-sdk/credential-provider-sso": { - "version": "3.577.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.577.0.tgz", - "integrity": "sha512-iVm5SQvS7EgZTJsRaqUOmDQpBQPPPat42SCbWFvFQOLrl8qewq8OP94hFS5w2mP62zngeYzqhJnDel79HXbxew==", + "version": "3.598.0", + "resolved": "https://registry.npmmirror.com/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.598.0.tgz", + "integrity": "sha512-5InwUmrAuqQdOOgxTccRayMMkSmekdLk6s+az9tmikq0QFAHUCtofI+/fllMXSR9iL6JbGYi1940+EUmS4pHJA==", "dependencies": { - "@aws-sdk/client-sso": "3.577.0", - "@aws-sdk/token-providers": "3.577.0", - "@aws-sdk/types": "3.577.0", - "@smithy/property-provider": "^3.0.0", - "@smithy/shared-ini-file-loader": "^3.0.0", - "@smithy/types": "^3.0.0", + "@aws-sdk/client-sso": "3.598.0", + "@aws-sdk/token-providers": "3.598.0", + "@aws-sdk/types": "3.598.0", + "@smithy/property-provider": "^3.1.1", + "@smithy/shared-ini-file-loader": "^3.1.1", + "@smithy/types": "^3.1.0", "tslib": "^2.6.2" }, "engines": { @@ -448,42 +488,42 @@ } }, "node_modules/@aws-sdk/credential-provider-web-identity": { - "version": "3.577.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.577.0.tgz", - "integrity": "sha512-ZGHGNRaCtJJmszb9UTnC7izNCtRUttdPlLdMkh41KPS32vfdrBDHs1JrpbZijItRj1xKuOXsiYSXLAaHGcLh8Q==", + "version": "3.598.0", + "resolved": "https://registry.npmmirror.com/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.598.0.tgz", + "integrity": "sha512-GV5GdiMbz5Tz9JO4NJtRoFXjW0GPEujA0j+5J/B723rTN+REHthJu48HdBKouHGhdzkDWkkh1bu52V02Wprw8w==", "dependencies": { - "@aws-sdk/types": "3.577.0", - "@smithy/property-provider": "^3.0.0", - "@smithy/types": "^3.0.0", + "@aws-sdk/types": "3.598.0", + "@smithy/property-provider": "^3.1.1", + "@smithy/types": "^3.1.0", "tslib": "^2.6.2" }, "engines": { "node": ">=16.0.0" }, "peerDependencies": { - "@aws-sdk/client-sts": "^3.577.0" + "@aws-sdk/client-sts": "^3.598.0" } }, "node_modules/@aws-sdk/credential-providers": { - "version": "3.577.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/credential-providers/-/credential-providers-3.577.0.tgz", - "integrity": "sha512-/fzdyyAetJxTPH8f2bh1UkcN48dScLb6LjBj9+wX2BHyKSZUal7+TqPTyme4f3pj1I1EeKhDIYKldR8YyMPIAg==", + "version": "3.598.0", + "resolved": "https://registry.npmmirror.com/@aws-sdk/credential-providers/-/credential-providers-3.598.0.tgz", + "integrity": "sha512-IFZwH3F2rA2WbpYFUxOeu/M3/9p4+oRbKVLDZlaaDtwwuZ9VHEbnkUm20zOgSXeVExa3qgYhJvg7H5JrqxP97A==", "dependencies": { - "@aws-sdk/client-cognito-identity": "3.577.0", - "@aws-sdk/client-sso": "3.577.0", - "@aws-sdk/client-sts": "3.577.0", - "@aws-sdk/credential-provider-cognito-identity": "3.577.0", - "@aws-sdk/credential-provider-env": "3.577.0", - "@aws-sdk/credential-provider-http": "3.577.0", - "@aws-sdk/credential-provider-ini": "3.577.0", - "@aws-sdk/credential-provider-node": "3.577.0", - "@aws-sdk/credential-provider-process": "3.577.0", - "@aws-sdk/credential-provider-sso": "3.577.0", - "@aws-sdk/credential-provider-web-identity": "3.577.0", - "@aws-sdk/types": "3.577.0", - "@smithy/credential-provider-imds": "^3.0.0", - "@smithy/property-provider": "^3.0.0", - "@smithy/types": "^3.0.0", + "@aws-sdk/client-cognito-identity": "3.598.0", + "@aws-sdk/client-sso": "3.598.0", + "@aws-sdk/client-sts": "3.598.0", + "@aws-sdk/credential-provider-cognito-identity": "3.598.0", + "@aws-sdk/credential-provider-env": "3.598.0", + "@aws-sdk/credential-provider-http": "3.598.0", + "@aws-sdk/credential-provider-ini": "3.598.0", + "@aws-sdk/credential-provider-node": "3.598.0", + "@aws-sdk/credential-provider-process": "3.598.0", + "@aws-sdk/credential-provider-sso": "3.598.0", + "@aws-sdk/credential-provider-web-identity": "3.598.0", + "@aws-sdk/types": "3.598.0", + "@smithy/credential-provider-imds": "^3.1.1", + "@smithy/property-provider": "^3.1.1", + "@smithy/types": "^3.1.0", "tslib": "^2.6.2" }, "engines": { @@ -491,13 +531,13 @@ } }, "node_modules/@aws-sdk/middleware-host-header": { - "version": "3.577.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/middleware-host-header/-/middleware-host-header-3.577.0.tgz", - "integrity": "sha512-9ca5MJz455CODIVXs0/sWmJm7t3QO4EUa1zf8pE8grLpzf0J94bz/skDWm37Pli13T3WaAQBHCTiH2gUVfCsWg==", + "version": "3.598.0", + "resolved": "https://registry.npmmirror.com/@aws-sdk/middleware-host-header/-/middleware-host-header-3.598.0.tgz", + "integrity": "sha512-WiaG059YBQwQraNejLIi0gMNkX7dfPZ8hDIhvMr5aVPRbaHH8AYF3iNSsXYCHvA2Cfa1O9haYXsuMF9flXnCmA==", "dependencies": { - "@aws-sdk/types": "3.577.0", - "@smithy/protocol-http": "^4.0.0", - "@smithy/types": "^3.0.0", + "@aws-sdk/types": "3.598.0", + "@smithy/protocol-http": "^4.0.1", + "@smithy/types": "^3.1.0", "tslib": "^2.6.2" }, "engines": { @@ -505,12 +545,12 @@ } }, "node_modules/@aws-sdk/middleware-logger": { - "version": "3.577.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/middleware-logger/-/middleware-logger-3.577.0.tgz", - "integrity": "sha512-aPFGpGjTZcJYk+24bg7jT4XdIp42mFXSuPt49lw5KygefLyJM/sB0bKKqPYYivW0rcuZ9brQ58eZUNthrzYAvg==", + "version": "3.598.0", + "resolved": "https://registry.npmmirror.com/@aws-sdk/middleware-logger/-/middleware-logger-3.598.0.tgz", + "integrity": "sha512-bxBjf/VYiu3zfu8SYM2S9dQQc3tz5uBAOcPz/Bt8DyyK3GgOpjhschH/2XuUErsoUO1gDJqZSdGOmuHGZQn00Q==", "dependencies": { - "@aws-sdk/types": "3.577.0", - "@smithy/types": "^3.0.0", + "@aws-sdk/types": "3.598.0", + "@smithy/types": "^3.1.0", "tslib": "^2.6.2" }, "engines": { @@ -518,13 +558,13 @@ } }, "node_modules/@aws-sdk/middleware-recursion-detection": { - "version": "3.577.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.577.0.tgz", - "integrity": "sha512-pn3ZVEd2iobKJlR3H+bDilHjgRnNrQ6HMmK9ZzZw89Ckn3Dcbv48xOv4RJvu0aU8SDLl/SNCxppKjeLDTPGBNA==", + "version": "3.598.0", + "resolved": "https://registry.npmmirror.com/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.598.0.tgz", + "integrity": "sha512-vjT9BeFY9FeN0f8hm2l6F53tI0N5bUq6RcDkQXKNabXBnQxKptJRad6oP2X5y3FoVfBLOuDkQgiC2940GIPxtQ==", "dependencies": { - "@aws-sdk/types": "3.577.0", - "@smithy/protocol-http": "^4.0.0", - "@smithy/types": "^3.0.0", + "@aws-sdk/types": "3.598.0", + "@smithy/protocol-http": "^4.0.1", + "@smithy/types": "^3.1.0", "tslib": "^2.6.2" }, "engines": { @@ -532,14 +572,14 @@ } }, "node_modules/@aws-sdk/middleware-user-agent": { - "version": "3.577.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.577.0.tgz", - "integrity": "sha512-P55HAXgwmiHHpFx5JEPvOnAbfhN7v6sWv9PBQs+z2tC7QiBcPS0cdJR6PfV7J1n4VPK52/OnrK3l9VxdQ7Ms0g==", + "version": "3.598.0", + "resolved": "https://registry.npmmirror.com/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.598.0.tgz", + "integrity": "sha512-4tjESlHG5B5MdjUaLK7tQs/miUtHbb6deauQx8ryqSBYOhfHVgb1ZnzvQR0bTrhpqUg0WlybSkDaZAICf9xctg==", "dependencies": { - "@aws-sdk/types": "3.577.0", - "@aws-sdk/util-endpoints": "3.577.0", - "@smithy/protocol-http": "^4.0.0", - "@smithy/types": "^3.0.0", + "@aws-sdk/types": "3.598.0", + "@aws-sdk/util-endpoints": "3.598.0", + "@smithy/protocol-http": "^4.0.1", + "@smithy/types": "^3.1.0", "tslib": "^2.6.2" }, "engines": { @@ -547,15 +587,15 @@ } }, "node_modules/@aws-sdk/region-config-resolver": { - "version": "3.577.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/region-config-resolver/-/region-config-resolver-3.577.0.tgz", - "integrity": "sha512-4ChCFACNwzqx/xjg3zgFcW8Ali6R9C95cFECKWT/7CUM1D0MGvkclSH2cLarmHCmJgU6onKkJroFtWp0kHhgyg==", + "version": "3.598.0", + "resolved": "https://registry.npmmirror.com/@aws-sdk/region-config-resolver/-/region-config-resolver-3.598.0.tgz", + "integrity": "sha512-oYXhmTokSav4ytmWleCr3rs/1nyvZW/S0tdi6X7u+dLNL5Jee+uMxWGzgOrWK6wrQOzucLVjS4E/wA11Kv2GTw==", "dependencies": { - "@aws-sdk/types": "3.577.0", - "@smithy/node-config-provider": "^3.0.0", - "@smithy/types": "^3.0.0", + "@aws-sdk/types": "3.598.0", + "@smithy/node-config-provider": "^3.1.1", + "@smithy/types": "^3.1.0", "@smithy/util-config-provider": "^3.0.0", - "@smithy/util-middleware": "^3.0.0", + "@smithy/util-middleware": "^3.0.1", "tslib": "^2.6.2" }, "engines": { @@ -563,29 +603,29 @@ } }, "node_modules/@aws-sdk/token-providers": { - "version": "3.577.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/token-providers/-/token-providers-3.577.0.tgz", - "integrity": "sha512-0CkIZpcC3DNQJQ1hDjm2bdSy/Xjs7Ny5YvSsacasGOkNfk+FdkiQy6N67bZX3Zbc9KIx+Nz4bu3iDeNSNplnnQ==", + "version": "3.598.0", + "resolved": "https://registry.npmmirror.com/@aws-sdk/token-providers/-/token-providers-3.598.0.tgz", + "integrity": "sha512-TKY1EVdHVBnZqpyxyTHdpZpa1tUpb6nxVeRNn1zWG8QB5MvH4ALLd/jR+gtmWDNQbIG4cVuBOZFVL8hIYicKTA==", "dependencies": { - "@aws-sdk/types": "3.577.0", - "@smithy/property-provider": "^3.0.0", - "@smithy/shared-ini-file-loader": "^3.0.0", - "@smithy/types": "^3.0.0", + "@aws-sdk/types": "3.598.0", + "@smithy/property-provider": "^3.1.1", + "@smithy/shared-ini-file-loader": "^3.1.1", + "@smithy/types": "^3.1.0", "tslib": "^2.6.2" }, "engines": { "node": ">=16.0.0" }, "peerDependencies": { - "@aws-sdk/client-sso-oidc": "^3.577.0" + "@aws-sdk/client-sso-oidc": "^3.598.0" } }, "node_modules/@aws-sdk/types": { - "version": "3.577.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/types/-/types-3.577.0.tgz", - "integrity": "sha512-FT2JZES3wBKN/alfmhlo+3ZOq/XJ0C7QOZcDNrpKjB0kqYoKjhVKZ/Hx6ArR0czkKfHzBBEs6y40ebIHx2nSmA==", + "version": "3.598.0", + "resolved": "https://registry.npmmirror.com/@aws-sdk/types/-/types-3.598.0.tgz", + "integrity": "sha512-742uRl6z7u0LFmZwDrFP6r1wlZcgVPw+/TilluDJmCAR8BgRw3IR+743kUXKBGd8QZDRW2n6v/PYsi/AWCDDMQ==", "dependencies": { - "@smithy/types": "^3.0.0", + "@smithy/types": "^3.1.0", "tslib": "^2.6.2" }, "engines": { @@ -593,13 +633,13 @@ } }, "node_modules/@aws-sdk/util-endpoints": { - "version": "3.577.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/util-endpoints/-/util-endpoints-3.577.0.tgz", - "integrity": "sha512-FjuUz1Kdy4Zly2q/c58tpdqHd6z7iOdU/caYzoc8jwgAHBDBbIJNQLCU9hXJnPV2M8pWxQDyIZsoVwtmvErPzw==", + "version": "3.598.0", + "resolved": "https://registry.npmmirror.com/@aws-sdk/util-endpoints/-/util-endpoints-3.598.0.tgz", + "integrity": "sha512-Qo9UoiVVZxcOEdiOMZg3xb1mzkTxrhd4qSlg5QQrfWPJVx/QOg+Iy0NtGxPtHtVZNHZxohYwDwV/tfsnDSE2gQ==", "dependencies": { - "@aws-sdk/types": "3.577.0", - "@smithy/types": "^3.0.0", - "@smithy/util-endpoints": "^2.0.0", + "@aws-sdk/types": "3.598.0", + "@smithy/types": "^3.1.0", + "@smithy/util-endpoints": "^2.0.2", "tslib": "^2.6.2" }, "engines": { @@ -618,24 +658,24 @@ } }, "node_modules/@aws-sdk/util-user-agent-browser": { - "version": "3.577.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.577.0.tgz", - "integrity": "sha512-zEAzHgR6HWpZOH7xFgeJLc6/CzMcx4nxeQolZxVZoB5pPaJd3CjyRhZN0xXeZB0XIRCWmb4yJBgyiugXLNMkLA==", + "version": "3.598.0", + "resolved": "https://registry.npmmirror.com/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.598.0.tgz", + "integrity": "sha512-36Sxo6F+ykElaL1mWzWjlg+1epMpSe8obwhCN1yGE7Js9ywy5U6k6l+A3q3YM9YRbm740sNxncbwLklMvuhTKw==", "dependencies": { - "@aws-sdk/types": "3.577.0", - "@smithy/types": "^3.0.0", + "@aws-sdk/types": "3.598.0", + "@smithy/types": "^3.1.0", "bowser": "^2.11.0", "tslib": "^2.6.2" } }, "node_modules/@aws-sdk/util-user-agent-node": { - "version": "3.577.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.577.0.tgz", - "integrity": "sha512-XqvtFjbSMtycZTWVwDe8DRWovuoMbA54nhUoZwVU6rW9OSD6NZWGR512BUGHFaWzW0Wg8++Dj10FrKTG2XtqfA==", + "version": "3.598.0", + "resolved": "https://registry.npmmirror.com/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.598.0.tgz", + "integrity": "sha512-oyWGcOlfTdzkC6SVplyr0AGh54IMrDxbhg5RxJ5P+V4BKfcDoDcZV9xenUk9NsOi9MuUjxMumb9UJGkDhM1m0A==", "dependencies": { - "@aws-sdk/types": "3.577.0", - "@smithy/node-config-provider": "^3.0.0", - "@smithy/types": "^3.0.0", + "@aws-sdk/types": "3.598.0", + "@smithy/node-config-provider": "^3.1.1", + "@smithy/types": "^3.1.0", "tslib": "^2.6.2" }, "engines": { @@ -650,20 +690,12 @@ } } }, - "node_modules/@aws-sdk/util-utf8-browser": { - "version": "3.259.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/util-utf8-browser/-/util-utf8-browser-3.259.0.tgz", - "integrity": "sha512-UvFa/vR+e19XookZF8RzFZBrw2EUkQWxiBW0yYQAhvk3C+QVGl0H3ouca8LDBlBfQKXwmW3huo/59H8rwb1wJw==", - "dependencies": { - "tslib": "^2.3.1" - } - }, "node_modules/@babel/code-frame": { - "version": "7.24.2", - "resolved": "https://registry.npmmirror.com/@babel/code-frame/-/code-frame-7.24.2.tgz", - "integrity": "sha512-y5+tLQyV8pg3fsiln67BVLD1P13Eg4lh5RW9mF0zUuvLrv9uIQ4MCL+CRT+FTsBlBjcIan6PGsLcBN0m3ClUyQ==", + "version": "7.24.7", + "resolved": "https://registry.npmmirror.com/@babel/code-frame/-/code-frame-7.24.7.tgz", + "integrity": "sha512-BcYH1CVJBO9tvyIZ2jVeXgSIMvGZ2FDRvDdOIVQyuklNKSsx+eppDEBq/g47Ayw+RqNFE+URvOShmf+f/qwAlA==", "dependencies": { - "@babel/highlight": "^7.24.2", + "@babel/highlight": "^7.24.7", "picocolors": "^1.0.0" }, "engines": { @@ -671,28 +703,28 @@ } }, "node_modules/@babel/compat-data": { - "version": "7.24.4", - "resolved": "https://registry.npmmirror.com/@babel/compat-data/-/compat-data-7.24.4.tgz", - "integrity": "sha512-vg8Gih2MLK+kOkHJp4gBEIkyaIi00jgWot2D9QOmmfLC8jINSOzmCLta6Bvz/JSBCqnegV0L80jhxkol5GWNfQ==", + "version": "7.24.7", + "resolved": "https://registry.npmmirror.com/@babel/compat-data/-/compat-data-7.24.7.tgz", + "integrity": "sha512-qJzAIcv03PyaWqxRgO4mSU3lihncDT296vnyuE2O8uA4w3UHWI4S3hgeZd1L8W1Bft40w9JxJ2b412iDUFFRhw==", "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/core": { - "version": "7.24.5", - "resolved": "https://registry.npmmirror.com/@babel/core/-/core-7.24.5.tgz", - "integrity": "sha512-tVQRucExLQ02Boi4vdPp49svNGcfL2GhdTCT9aldhXgCJVAI21EtRfBettiuLUwce/7r6bFdgs6JFkcdTiFttA==", + "version": "7.24.7", + "resolved": "https://registry.npmmirror.com/@babel/core/-/core-7.24.7.tgz", + "integrity": "sha512-nykK+LEK86ahTkX/3TgauT0ikKoNCfKHEaZYTUVupJdTLzGNvrblu4u6fa7DhZONAltdf8e662t/abY8idrd/g==", "dependencies": { "@ampproject/remapping": "^2.2.0", - "@babel/code-frame": "^7.24.2", - "@babel/generator": "^7.24.5", - "@babel/helper-compilation-targets": "^7.23.6", - "@babel/helper-module-transforms": "^7.24.5", - "@babel/helpers": "^7.24.5", - "@babel/parser": "^7.24.5", - "@babel/template": "^7.24.0", - "@babel/traverse": "^7.24.5", - "@babel/types": "^7.24.5", + "@babel/code-frame": "^7.24.7", + "@babel/generator": "^7.24.7", + "@babel/helper-compilation-targets": "^7.24.7", + "@babel/helper-module-transforms": "^7.24.7", + "@babel/helpers": "^7.24.7", + "@babel/parser": "^7.24.7", + "@babel/template": "^7.24.7", + "@babel/traverse": "^7.24.7", + "@babel/types": "^7.24.7", "convert-source-map": "^2.0.0", "debug": "^4.1.0", "gensync": "^1.0.0-beta.2", @@ -716,11 +748,11 @@ } }, "node_modules/@babel/generator": { - "version": "7.24.5", - "resolved": "https://registry.npmmirror.com/@babel/generator/-/generator-7.24.5.tgz", - "integrity": "sha512-x32i4hEXvr+iI0NEoEfDKzlemF8AmtOP8CcrRaEcpzysWuoEb1KknpcvMsHKPONoKZiDuItklgWhB18xEhr9PA==", + "version": "7.24.7", + "resolved": "https://registry.npmmirror.com/@babel/generator/-/generator-7.24.7.tgz", + "integrity": "sha512-oipXieGC3i45Y1A41t4tAqpnEZWgB/lC6Ehh6+rOviR5XWpTtMmLN+fGjz9vOiNRt0p6RtO6DtD0pdU3vpqdSA==", "dependencies": { - "@babel/types": "^7.24.5", + "@babel/types": "^7.24.7", "@jridgewell/gen-mapping": "^0.3.5", "@jridgewell/trace-mapping": "^0.3.25", "jsesc": "^2.5.1" @@ -730,12 +762,12 @@ } }, "node_modules/@babel/helper-compilation-targets": { - "version": "7.23.6", - "resolved": "https://registry.npmmirror.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.23.6.tgz", - "integrity": "sha512-9JB548GZoQVmzrFgp8o7KxdgkTGm6xs9DW0o/Pim72UDjzr5ObUQ6ZzYPqA+g9OTS2bBQoctLJrky0RDCAWRgQ==", + "version": "7.24.7", + "resolved": "https://registry.npmmirror.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.24.7.tgz", + "integrity": "sha512-ctSdRHBi20qWOfy27RUb4Fhp07KSJ3sXcuSvTrXrc4aG8NSYDo1ici3Vhg9bg69y5bj0Mr1lh0aeEgTvc12rMg==", "dependencies": { - "@babel/compat-data": "^7.23.5", - "@babel/helper-validator-option": "^7.23.5", + "@babel/compat-data": "^7.24.7", + "@babel/helper-validator-option": "^7.24.7", "browserslist": "^4.22.2", "lru-cache": "^5.1.1", "semver": "^6.3.1" @@ -753,57 +785,61 @@ } }, "node_modules/@babel/helper-environment-visitor": { - "version": "7.22.20", - "resolved": "https://registry.npmmirror.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz", - "integrity": "sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==", + "version": "7.24.7", + "resolved": "https://registry.npmmirror.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.24.7.tgz", + "integrity": "sha512-DoiN84+4Gnd0ncbBOM9AZENV4a5ZiL39HYMyZJGZ/AZEykHYdJw0wW3kdcsh9/Kn+BRXHLkkklZ51ecPKmI1CQ==", + "dependencies": { + "@babel/types": "^7.24.7" + }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-function-name": { - "version": "7.23.0", - "resolved": "https://registry.npmmirror.com/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz", - "integrity": "sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==", + "version": "7.24.7", + "resolved": "https://registry.npmmirror.com/@babel/helper-function-name/-/helper-function-name-7.24.7.tgz", + "integrity": "sha512-FyoJTsj/PEUWu1/TYRiXTIHc8lbw+TDYkZuoE43opPS5TrI7MyONBE1oNvfguEXAD9yhQRrVBnXdXzSLQl9XnA==", "dependencies": { - "@babel/template": "^7.22.15", - "@babel/types": "^7.23.0" + "@babel/template": "^7.24.7", + "@babel/types": "^7.24.7" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-hoist-variables": { - "version": "7.22.5", - "resolved": "https://registry.npmmirror.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz", - "integrity": "sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==", + "version": "7.24.7", + "resolved": "https://registry.npmmirror.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.24.7.tgz", + "integrity": "sha512-MJJwhkoGy5c4ehfoRyrJ/owKeMl19U54h27YYftT0o2teQ3FJ3nQUf/I3LlJsX4l3qlw7WRXUmiyajvHXoTubQ==", "dependencies": { - "@babel/types": "^7.22.5" + "@babel/types": "^7.24.7" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-module-imports": { - "version": "7.24.3", - "resolved": "https://registry.npmmirror.com/@babel/helper-module-imports/-/helper-module-imports-7.24.3.tgz", - "integrity": "sha512-viKb0F9f2s0BCS22QSF308z/+1YWKV/76mwt61NBzS5izMzDPwdq1pTrzf+Li3npBWX9KdQbkeCt1jSAM7lZqg==", + "version": "7.24.7", + "resolved": "https://registry.npmmirror.com/@babel/helper-module-imports/-/helper-module-imports-7.24.7.tgz", + "integrity": "sha512-8AyH3C+74cgCVVXow/myrynrAGv+nTVg5vKu2nZph9x7RcRwzmh0VFallJuFTZ9mx6u4eSdXZfcOzSqTUm0HCA==", "dependencies": { - "@babel/types": "^7.24.0" + "@babel/traverse": "^7.24.7", + "@babel/types": "^7.24.7" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-module-transforms": { - "version": "7.24.5", - "resolved": "https://registry.npmmirror.com/@babel/helper-module-transforms/-/helper-module-transforms-7.24.5.tgz", - "integrity": "sha512-9GxeY8c2d2mdQUP1Dye0ks3VDyIMS98kt/llQ2nUId8IsWqTF0l1LkSX0/uP7l7MCDrzXS009Hyhe2gzTiGW8A==", + "version": "7.24.7", + "resolved": "https://registry.npmmirror.com/@babel/helper-module-transforms/-/helper-module-transforms-7.24.7.tgz", + "integrity": "sha512-1fuJEwIrp+97rM4RWdO+qrRsZlAeL1lQJoPqtCYWv0NL115XM93hIH4CSRln2w52SqvmY5hqdtauB6QFCDiZNQ==", "dependencies": { - "@babel/helper-environment-visitor": "^7.22.20", - "@babel/helper-module-imports": "^7.24.3", - "@babel/helper-simple-access": "^7.24.5", - "@babel/helper-split-export-declaration": "^7.24.5", - "@babel/helper-validator-identifier": "^7.24.5" + "@babel/helper-environment-visitor": "^7.24.7", + "@babel/helper-module-imports": "^7.24.7", + "@babel/helper-simple-access": "^7.24.7", + "@babel/helper-split-export-declaration": "^7.24.7", + "@babel/helper-validator-identifier": "^7.24.7" }, "engines": { "node": ">=6.9.0" @@ -813,78 +849,78 @@ } }, "node_modules/@babel/helper-plugin-utils": { - "version": "7.24.5", - "resolved": "https://registry.npmmirror.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.5.tgz", - "integrity": "sha512-xjNLDopRzW2o6ba0gKbkZq5YWEBaK3PCyTOY1K2P/O07LGMhMqlMXPxwN4S5/RhWuCobT8z0jrlKGlYmeR1OhQ==", + "version": "7.24.7", + "resolved": "https://registry.npmmirror.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.7.tgz", + "integrity": "sha512-Rq76wjt7yz9AAc1KnlRKNAi/dMSVWgDRx43FHoJEbcYU6xOWaE2dVPwcdTukJrjxS65GITyfbvEYHvkirZ6uEg==", "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-simple-access": { - "version": "7.24.5", - "resolved": "https://registry.npmmirror.com/@babel/helper-simple-access/-/helper-simple-access-7.24.5.tgz", - "integrity": "sha512-uH3Hmf5q5n7n8mz7arjUlDOCbttY/DW4DYhE6FUsjKJ/oYC1kQQUvwEQWxRwUpX9qQKRXeqLwWxrqilMrf32sQ==", + "version": "7.24.7", + "resolved": "https://registry.npmmirror.com/@babel/helper-simple-access/-/helper-simple-access-7.24.7.tgz", + "integrity": "sha512-zBAIvbCMh5Ts+b86r/CjU+4XGYIs+R1j951gxI3KmmxBMhCg4oQMsv6ZXQ64XOm/cvzfU1FmoCyt6+owc5QMYg==", "dependencies": { - "@babel/types": "^7.24.5" + "@babel/traverse": "^7.24.7", + "@babel/types": "^7.24.7" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-split-export-declaration": { - "version": "7.24.5", - "resolved": "https://registry.npmmirror.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.24.5.tgz", - "integrity": "sha512-5CHncttXohrHk8GWOFCcCl4oRD9fKosWlIRgWm4ql9VYioKm52Mk2xsmoohvm7f3JoiLSM5ZgJuRaf5QZZYd3Q==", + "version": "7.24.7", + "resolved": "https://registry.npmmirror.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.24.7.tgz", + "integrity": "sha512-oy5V7pD+UvfkEATUKvIjvIAH/xCzfsFVw7ygW2SI6NClZzquT+mwdTfgfdbUiceh6iQO0CHtCPsyze/MZ2YbAA==", "dependencies": { - "@babel/types": "^7.24.5" + "@babel/types": "^7.24.7" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-string-parser": { - "version": "7.24.1", - "resolved": "https://registry.npmmirror.com/@babel/helper-string-parser/-/helper-string-parser-7.24.1.tgz", - "integrity": "sha512-2ofRCjnnA9y+wk8b9IAREroeUP02KHp431N2mhKniy2yKIDKpbrHv9eXwm8cBeWQYcJmzv5qKCu65P47eCF7CQ==", + "version": "7.24.7", + "resolved": "https://registry.npmmirror.com/@babel/helper-string-parser/-/helper-string-parser-7.24.7.tgz", + "integrity": "sha512-7MbVt6xrwFQbunH2DNQsAP5sTGxfqQtErvBIvIMi6EQnbgUOuVYanvREcmFrOPhoXBrTtjhhP+lW+o5UfK+tDg==", "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-validator-identifier": { - "version": "7.24.5", - "resolved": "https://registry.npmmirror.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.5.tgz", - "integrity": "sha512-3q93SSKX2TWCG30M2G2kwaKeTYgEUp5Snjuj8qm729SObL6nbtUldAi37qbxkD5gg3xnBio+f9nqpSepGZMvxA==", + "version": "7.24.7", + "resolved": "https://registry.npmmirror.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.7.tgz", + "integrity": "sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w==", "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-validator-option": { - "version": "7.23.5", - "resolved": "https://registry.npmmirror.com/@babel/helper-validator-option/-/helper-validator-option-7.23.5.tgz", - "integrity": "sha512-85ttAOMLsr53VgXkTbkx8oA6YTfT4q7/HzXSLEYmjcSTJPMPQtvq1BD79Byep5xMUYbGRzEpDsjUf3dyp54IKw==", + "version": "7.24.7", + "resolved": "https://registry.npmmirror.com/@babel/helper-validator-option/-/helper-validator-option-7.24.7.tgz", + "integrity": "sha512-yy1/KvjhV/ZCL+SM7hBrvnZJ3ZuT9OuZgIJAGpPEToANvc3iM6iDvBnRjtElWibHU6n8/LPR/EjX9EtIEYO3pw==", "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helpers": { - "version": "7.24.5", - "resolved": "https://registry.npmmirror.com/@babel/helpers/-/helpers-7.24.5.tgz", - "integrity": "sha512-CiQmBMMpMQHwM5m01YnrM6imUG1ebgYJ+fAIW4FZe6m4qHTPaRHti+R8cggAwkdz4oXhtO4/K9JWlh+8hIfR2Q==", + "version": "7.24.7", + "resolved": "https://registry.npmmirror.com/@babel/helpers/-/helpers-7.24.7.tgz", + "integrity": "sha512-NlmJJtvcw72yRJRcnCmGvSi+3jDEg8qFu3z0AFoymmzLx5ERVWyzd9kVXr7Th9/8yIJi2Zc6av4Tqz3wFs8QWg==", "dependencies": { - "@babel/template": "^7.24.0", - "@babel/traverse": "^7.24.5", - "@babel/types": "^7.24.5" + "@babel/template": "^7.24.7", + "@babel/types": "^7.24.7" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/highlight": { - "version": "7.24.5", - "resolved": "https://registry.npmmirror.com/@babel/highlight/-/highlight-7.24.5.tgz", - "integrity": "sha512-8lLmua6AVh/8SLJRRVD6V8p73Hir9w5mJrhE+IPpILG31KKlI9iz5zmBYKcWPS59qSfgP9RaSBQSHHE81WKuEw==", + "version": "7.24.7", + "resolved": "https://registry.npmmirror.com/@babel/highlight/-/highlight-7.24.7.tgz", + "integrity": "sha512-EStJpq4OuY8xYfhGVXngigBJRWxftKX9ksiGDnmlY3o7B/V7KIAc9X4oiK87uPJSc/vs5L869bem5fhZa8caZw==", "dependencies": { - "@babel/helper-validator-identifier": "^7.24.5", + "@babel/helper-validator-identifier": "^7.24.7", "chalk": "^2.4.2", "js-tokens": "^4.0.0", "picocolors": "^1.0.0" @@ -894,9 +930,9 @@ } }, "node_modules/@babel/parser": { - "version": "7.24.5", - "resolved": "https://registry.npmmirror.com/@babel/parser/-/parser-7.24.5.tgz", - "integrity": "sha512-EOv5IK8arwh3LI47dz1b0tKUb/1uhHAnHJOrjgtQMIpu1uXd9mlFrJg9IUgGUgZ41Ch0K8REPTYpO7B76b4vJg==", + "version": "7.24.7", + "resolved": "https://registry.npmmirror.com/@babel/parser/-/parser-7.24.7.tgz", + "integrity": "sha512-9uUYRm6OqQrCqQdG1iCBwBPZgN8ciDBro2nIOFaiRz1/BCxaI7CNvQbDHvsArAC7Tw9Hda/B3U+6ui9u4HWXPw==", "bin": { "parser": "bin/babel-parser.js" }, @@ -905,11 +941,11 @@ } }, "node_modules/@babel/plugin-transform-destructuring": { - "version": "7.24.5", - "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.24.5.tgz", - "integrity": "sha512-SZuuLyfxvsm+Ah57I/i1HVjveBENYK9ue8MJ7qkc7ndoNjqquJiElzA7f5yaAXjyW2hKojosOTAQQRX50bPSVg==", + "version": "7.24.7", + "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.24.7.tgz", + "integrity": "sha512-19eJO/8kdCQ9zISOf+SEUJM/bAUIsvY3YDnXZTupUCQ8LgrWnsG/gFB9dvXqdXnRXMAM8fvt7b0CBKQHNGy1mw==", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.5" + "@babel/helper-plugin-utils": "^7.24.7" }, "engines": { "node": ">=6.9.0" @@ -919,11 +955,11 @@ } }, "node_modules/@babel/plugin-transform-parameters": { - "version": "7.24.5", - "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.24.5.tgz", - "integrity": "sha512-9Co00MqZ2aoky+4j2jhofErthm6QVLKbpQrvz20c3CH9KQCLHyNB+t2ya4/UrRpQGR+Wrwjg9foopoeSdnHOkA==", + "version": "7.24.7", + "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.24.7.tgz", + "integrity": "sha512-yGWW5Rr+sQOhK0Ot8hjDJuxU3XLRQGflvT4lhlSY0DFvdb3TwKaY26CJzHtYllU0vT9j58hc37ndFPsqT1SrzA==", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.5" + "@babel/helper-plugin-utils": "^7.24.7" }, "engines": { "node": ">=6.9.0" @@ -933,11 +969,11 @@ } }, "node_modules/@babel/plugin-transform-shorthand-properties": { - "version": "7.24.1", - "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.24.1.tgz", - "integrity": "sha512-LyjVB1nsJ6gTTUKRjRWx9C1s9hE7dLfP/knKdrfeH9UPtAGjYGgxIbFfx7xyLIEWs7Xe1Gnf8EWiUqfjLhInZA==", + "version": "7.24.7", + "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.24.7.tgz", + "integrity": "sha512-KsDsevZMDsigzbA09+vacnLpmPH4aWjcZjXdyFKGzpplxhbeB4wYtury3vglQkg6KM/xEPKt73eCjPPf1PgXBA==", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.0" + "@babel/helper-plugin-utils": "^7.24.7" }, "engines": { "node": ">=6.9.0" @@ -947,31 +983,31 @@ } }, "node_modules/@babel/template": { - "version": "7.24.0", - "resolved": "https://registry.npmmirror.com/@babel/template/-/template-7.24.0.tgz", - "integrity": "sha512-Bkf2q8lMB0AFpX0NFEqSbx1OkTHf0f+0j82mkw+ZpzBnkk7e9Ql0891vlfgi+kHwOk8tQjiQHpqh4LaSa0fKEA==", + "version": "7.24.7", + "resolved": "https://registry.npmmirror.com/@babel/template/-/template-7.24.7.tgz", + "integrity": "sha512-jYqfPrU9JTF0PmPy1tLYHW4Mp4KlgxJD9l2nP9fD6yT/ICi554DmrWBAEYpIelzjHf1msDP3PxJIRt/nFNfBig==", "dependencies": { - "@babel/code-frame": "^7.23.5", - "@babel/parser": "^7.24.0", - "@babel/types": "^7.24.0" + "@babel/code-frame": "^7.24.7", + "@babel/parser": "^7.24.7", + "@babel/types": "^7.24.7" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/traverse": { - "version": "7.24.5", - "resolved": "https://registry.npmmirror.com/@babel/traverse/-/traverse-7.24.5.tgz", - "integrity": "sha512-7aaBLeDQ4zYcUFDUD41lJc1fG8+5IU9DaNSJAgal866FGvmD5EbWQgnEC6kO1gGLsX0esNkfnJSndbTXA3r7UA==", + "version": "7.24.7", + "resolved": "https://registry.npmmirror.com/@babel/traverse/-/traverse-7.24.7.tgz", + "integrity": "sha512-yb65Ed5S/QAcewNPh0nZczy9JdYXkkAbIsEo+P7BE7yO3txAY30Y/oPa3QkQ5It3xVG2kpKMg9MsdxZaO31uKA==", "dependencies": { - "@babel/code-frame": "^7.24.2", - "@babel/generator": "^7.24.5", - "@babel/helper-environment-visitor": "^7.22.20", - "@babel/helper-function-name": "^7.23.0", - "@babel/helper-hoist-variables": "^7.22.5", - "@babel/helper-split-export-declaration": "^7.24.5", - "@babel/parser": "^7.24.5", - "@babel/types": "^7.24.5", + "@babel/code-frame": "^7.24.7", + "@babel/generator": "^7.24.7", + "@babel/helper-environment-visitor": "^7.24.7", + "@babel/helper-function-name": "^7.24.7", + "@babel/helper-hoist-variables": "^7.24.7", + "@babel/helper-split-export-declaration": "^7.24.7", + "@babel/parser": "^7.24.7", + "@babel/types": "^7.24.7", "debug": "^4.3.1", "globals": "^11.1.0" }, @@ -980,12 +1016,12 @@ } }, "node_modules/@babel/types": { - "version": "7.24.5", - "resolved": "https://registry.npmmirror.com/@babel/types/-/types-7.24.5.tgz", - "integrity": "sha512-6mQNsaLeXTw0nxYUYu+NSa4Hx4BlF1x1x8/PMFbiR+GBSr+2DkECc69b8hgy2frEodNcvPffeH8YfWd3LI6jhQ==", + "version": "7.24.7", + "resolved": "https://registry.npmmirror.com/@babel/types/-/types-7.24.7.tgz", + "integrity": "sha512-XEFXSlxiG5td2EJRe8vOmRbaXVgfcBlszKujvVmWIK/UpywWljQCfzAv3RQCGujWQ1RD4YYWEAqDXfuJiy8f5Q==", "dependencies": { - "@babel/helper-string-parser": "^7.24.1", - "@babel/helper-validator-identifier": "^7.24.5", + "@babel/helper-string-parser": "^7.24.7", + "@babel/helper-validator-identifier": "^7.24.7", "to-fast-properties": "^2.0.0" }, "engines": { @@ -1109,9 +1145,9 @@ } }, "node_modules/@mongodb-js/devtools-connect": { - "version": "2.6.3", - "resolved": "https://registry.npmmirror.com/@mongodb-js/devtools-connect/-/devtools-connect-2.6.3.tgz", - "integrity": "sha512-oGM/HQ8GJmcSVKcnVz+uNy3m1WFz2a7XqcEa/JJcl+imKDPHritkNVUsPIA9fYMRduuOT9f7ko8uWTVLgcw/qA==", + "version": "3.0.1", + "resolved": "https://registry.npmmirror.com/@mongodb-js/devtools-connect/-/devtools-connect-3.0.1.tgz", + "integrity": "sha512-xbk/eGHPQTQz4VSpGb5oRqSSbzipcFDODrAc4YtYFrb0980buOAopO71NozCbQoVnoiO1pYVIqcnrZMHkdaJzg==", "dependencies": { "@mongodb-js/oidc-http-server-pages": "1.1.1", "lodash.merge": "^4.6.2", @@ -1126,7 +1162,7 @@ "resolve-mongodb-srv": "^1.1.1" }, "peerDependencies": { - "@mongodb-js/oidc-plugin": "^0.4.0", + "@mongodb-js/oidc-plugin": "^1.0.0", "mongodb": "^5.8.1 || ^6.0.0", "mongodb-log-writer": "^1.4.2" } @@ -1145,17 +1181,16 @@ "integrity": "sha512-zYkANxb4HVDN4zGuU2ud4fL+XpqRxaydCwVZyU9Mh5EhqbrCL5mGH7t3BaGnfdQUw+HVtwP3dmasc+5Hjewk+g==" }, "node_modules/@mongodb-js/oidc-plugin": { - "version": "0.4.0", - "resolved": "https://registry.npmmirror.com/@mongodb-js/oidc-plugin/-/oidc-plugin-0.4.0.tgz", - "integrity": "sha512-tinXSz6O2AmgMAgorXUcCJtDhayghkmsXVVTd5UiXhzSA/NNVtlleZXSVkG6tr46WXGzLISgVX+lUzzcEIiwJQ==", + "version": "1.0.2", + "resolved": "https://registry.npmmirror.com/@mongodb-js/oidc-plugin/-/oidc-plugin-1.0.2.tgz", + "integrity": "sha512-hwTbkmJ31RPB5ksA6pLepnaQOBz6iurE+uH89B1IIJdxVuiO0Qz+OqpTN8vk8LZzcVDb/WbNoxqxogCWwMqFKw==", "dependencies": { - "abort-controller": "^3.0.0", "express": "^4.18.2", "open": "^9.1.0", "openid-client": "^5.6.4" }, "engines": { - "node": ">= 14.18.0" + "node": ">= 16.20.1" } }, "node_modules/@mongodb-js/saslprep": { @@ -1167,12 +1202,12 @@ } }, "node_modules/@mongosh/arg-parser": { - "version": "2.2.6", - "resolved": "https://registry.npmmirror.com/@mongosh/arg-parser/-/arg-parser-2.2.6.tgz", - "integrity": "sha512-eQa3NNxgyHsExN3DQi9zCNZKTp1g0z+8CdV+RYPHpRsNXtkjESu6A30qX90UYrtoyFzDt2O7NgocDA7pDh/whw==", + "version": "2.2.9", + "resolved": "https://registry.npmmirror.com/@mongosh/arg-parser/-/arg-parser-2.2.9.tgz", + "integrity": "sha512-Bc9v3cmhpfOG3LKRnOyZ/kfDJcQB1mNm7JWD2wJsaFBsWb4S1VXh50l23vC8HIj6vU6QYHGIAc5ikSxZ+shfyQ==", "dependencies": { - "@mongosh/errors": "2.2.6", - "@mongosh/i18n": "2.2.6", + "@mongosh/errors": "2.2.9", + "@mongosh/i18n": "2.2.9", "mongodb-connection-string-url": "^3.0.1" }, "engines": { @@ -1180,9 +1215,9 @@ } }, "node_modules/@mongosh/async-rewriter2": { - "version": "2.2.6", - "resolved": "https://registry.npmmirror.com/@mongosh/async-rewriter2/-/async-rewriter2-2.2.6.tgz", - "integrity": "sha512-EYv9MFbWuq8yCBGkSxcnt/lTbiDqrHFhReq6HgoPw4hBctS+hYd2qkroLhAUvoqv78t6PRoZcvynYb7CPOmqTA==", + "version": "2.2.9", + "resolved": "https://registry.npmmirror.com/@mongosh/async-rewriter2/-/async-rewriter2-2.2.9.tgz", + "integrity": "sha512-JiS0VxGLoHNfLF9zox1dY0jX/3+ygdziigbTfS1AkKWt/Nmf/DURBFFjgLqs3mn3V3qYE4mUCmbeB9G1f6yMYA==", "dependencies": { "@babel/core": "^7.22.8", "@babel/plugin-transform-destructuring": "^7.22.5", @@ -1198,12 +1233,12 @@ } }, "node_modules/@mongosh/autocomplete": { - "version": "2.2.6", - "resolved": "https://registry.npmmirror.com/@mongosh/autocomplete/-/autocomplete-2.2.6.tgz", - "integrity": "sha512-d1oZZWXLOsJ1gFW1+A8Pdi+PuLALXYI3OwZOMtHSZCwSjR8DED90D9rDjUaOIZHKzTFWubUMRPonD9GQHo/hzg==", + "version": "2.2.9", + "resolved": "https://registry.npmmirror.com/@mongosh/autocomplete/-/autocomplete-2.2.9.tgz", + "integrity": "sha512-uwBtG2bQVk6N8/A7Jjl6w/FQZKIAUrrfeBA7q4kZ6XWzBY1CKcNOG1Kq5tTrN5xp82Au+FLF0rhFBy195fas0Q==", "dependencies": { "@mongodb-js/mongodb-constants": "^0.10.1", - "@mongosh/shell-api": "2.2.6", + "@mongosh/shell-api": "2.2.9", "semver": "^7.5.4" }, "engines": { @@ -1211,25 +1246,25 @@ } }, "node_modules/@mongosh/cli-repl": { - "version": "2.2.6", - "resolved": "https://registry.npmmirror.com/@mongosh/cli-repl/-/cli-repl-2.2.6.tgz", - "integrity": "sha512-PMQdli4DyYw5HGhxjkQS2gt/UdEiAO2X34AxTa2KkG2oOQHMZJlb8UptijDvVxvYLcqXtlTqCu1ZWe33SE8LvA==", + "version": "2.2.9", + "resolved": "https://registry.npmmirror.com/@mongosh/cli-repl/-/cli-repl-2.2.9.tgz", + "integrity": "sha512-9gcu2lG9d9aFT+KPRVXpgX84Ounpp0/uuBFln5XuZfKXZwoWbpWD7zJ3mBdzAQKyuZ5SR2x6NokGGZbEbLGhrA==", "dependencies": { - "@mongosh/arg-parser": "2.2.6", - "@mongosh/autocomplete": "2.2.6", - "@mongosh/editor": "2.2.6", - "@mongosh/errors": "2.2.6", - "@mongosh/history": "2.2.6", - "@mongosh/i18n": "2.2.6", - "@mongosh/import-node-fetch": "2.2.6", - "@mongosh/js-multiline-to-singleline": "2.2.6", - "@mongosh/logging": "2.2.6", - "@mongosh/service-provider-core": "2.2.6", - "@mongosh/service-provider-server": "2.2.6", - "@mongosh/shell-api": "2.2.6", - "@mongosh/shell-evaluator": "2.2.6", - "@mongosh/snippet-manager": "2.2.6", - "@mongosh/types": "2.2.6", + "@mongosh/arg-parser": "2.2.9", + "@mongosh/autocomplete": "2.2.9", + "@mongosh/editor": "2.2.9", + "@mongosh/errors": "2.2.9", + "@mongosh/history": "2.2.9", + "@mongosh/i18n": "2.2.9", + "@mongosh/import-node-fetch": "2.2.9", + "@mongosh/js-multiline-to-singleline": "2.2.9", + "@mongosh/logging": "2.2.9", + "@mongosh/service-provider-core": "2.2.9", + "@mongosh/service-provider-server": "2.2.9", + "@mongosh/shell-api": "2.2.9", + "@mongosh/shell-evaluator": "2.2.9", + "@mongosh/snippet-manager": "2.2.9", + "@mongosh/types": "2.2.9", "@segment/analytics-node": "^1.3.0", "ansi-escape-sequences": "^5.1.2", "askcharacter": "^2.0.4", @@ -1254,7 +1289,7 @@ "node": ">=16.15.0" }, "optionalDependencies": { - "get-console-process-list": "^1.0.4", + "get-console-process-list": "^1.0.5", "glibc-version": "^1.0.0", "macos-export-certificate-and-key": "^1.1.2", "mongodb-crypt-library-version": "^1.0.5", @@ -1262,15 +1297,15 @@ } }, "node_modules/@mongosh/editor": { - "version": "2.2.6", - "resolved": "https://registry.npmmirror.com/@mongosh/editor/-/editor-2.2.6.tgz", - "integrity": "sha512-yqKluTpcy2u3xnuiUeikvYCDdtMjTNTPSbHD6pA0v3kNNOUb5gHDs6SeLAxO7h+7Z8uR61BD2uaYmo0qUw0r0A==", + "version": "2.2.9", + "resolved": "https://registry.npmmirror.com/@mongosh/editor/-/editor-2.2.9.tgz", + "integrity": "sha512-kTCgkeZBg1AYLKq65elwusyDiKeTyh5l4W3yg2yGvuzhk1I73DPsSkA+E2TWpqVgzsTeRXUbmySSMrKxx/t+mA==", "dependencies": { - "@mongosh/js-multiline-to-singleline": "2.2.6", - "@mongosh/service-provider-core": "2.2.6", - "@mongosh/shell-api": "2.2.6", - "@mongosh/shell-evaluator": "2.2.6", - "@mongosh/types": "2.2.6", + "@mongosh/js-multiline-to-singleline": "2.2.9", + "@mongosh/service-provider-core": "2.2.9", + "@mongosh/shell-api": "2.2.9", + "@mongosh/shell-evaluator": "2.2.9", + "@mongosh/types": "2.2.9", "js-beautify": "^1.15.1" }, "engines": { @@ -1278,17 +1313,17 @@ } }, "node_modules/@mongosh/errors": { - "version": "2.2.6", - "resolved": "https://registry.npmmirror.com/@mongosh/errors/-/errors-2.2.6.tgz", - "integrity": "sha512-AFsb8QUMTg7axHkuIlq8wZ0qEKgAB+r1eIQg5BfqpMGhabCdB+2QhV7/VUq/CCOcG+rdqBwLCHodp6HBcLM4HA==", + "version": "2.2.9", + "resolved": "https://registry.npmmirror.com/@mongosh/errors/-/errors-2.2.9.tgz", + "integrity": "sha512-gN7czs7VK1OoG6H2Cq4gVVUZZPUeBxsBBKeOOFQIGy6QH5IAr4pm/w17K5dhOEoGhdH37h3WOp3dS24z/6NF0A==", "engines": { "node": ">=14.15.1" } }, "node_modules/@mongosh/history": { - "version": "2.2.6", - "resolved": "https://registry.npmmirror.com/@mongosh/history/-/history-2.2.6.tgz", - "integrity": "sha512-3TuXFo8M0l21EUTYa+sYHqxzRfy8jM/ghlFme3FeLeDPkjahDPieoOwjxZtEorxuojrvKXvFKwJ+FRGrO2hIIg==", + "version": "2.2.9", + "resolved": "https://registry.npmmirror.com/@mongosh/history/-/history-2.2.9.tgz", + "integrity": "sha512-Irm8s2z48T+OMADrmJSe+xvCXMkPUCCTltGgVY3w+vm42ftfd6k3ZXGlVu+j/QNCp1D4HmRLDY6RmnQLFb2IUw==", "dependencies": { "mongodb-connection-string-url": "^3.0.1", "mongodb-redact": "^0.2.3" @@ -1298,20 +1333,20 @@ } }, "node_modules/@mongosh/i18n": { - "version": "2.2.6", - "resolved": "https://registry.npmmirror.com/@mongosh/i18n/-/i18n-2.2.6.tgz", - "integrity": "sha512-q0bfuI0tQmS+CHJNXBDF34Dlf5jeHYG8RUPawxkYtgvP6WvuFpDbxyog2iN//jZSruIvulqd9gBffhCbbn+IbQ==", + "version": "2.2.9", + "resolved": "https://registry.npmmirror.com/@mongosh/i18n/-/i18n-2.2.9.tgz", + "integrity": "sha512-AhEEAHV/2ytZ1swDV7VmKYt4D0P+2pqf8khR3OwOg5RJ0Cx8vRS4RdWvszxKeA26s2zlPMRiherwPTdAEc5zww==", "dependencies": { - "@mongosh/errors": "2.2.6" + "@mongosh/errors": "2.2.9" }, "engines": { "node": ">=14.15.1" } }, "node_modules/@mongosh/import-node-fetch": { - "version": "2.2.6", - "resolved": "https://registry.npmmirror.com/@mongosh/import-node-fetch/-/import-node-fetch-2.2.6.tgz", - "integrity": "sha512-zQmSYu8NEzYyNQkZ82uMC2auVJIBorfuT/NWGxIkkZozc0eljkJEtgkNiAw6f17gEFzyk7fE46r091SHcXjXUw==", + "version": "2.2.9", + "resolved": "https://registry.npmmirror.com/@mongosh/import-node-fetch/-/import-node-fetch-2.2.9.tgz", + "integrity": "sha512-YbC6nJjnR1kSOZHVD/8gx6hh8eZkkZ9r4M9NFyDTTynbKgZNCwMtFBtl10zYsNMLJOCKW6o8vJ2YFsBLdZNyww==", "dependencies": { "node-fetch": "^3.3.2" }, @@ -1320,9 +1355,9 @@ } }, "node_modules/@mongosh/js-multiline-to-singleline": { - "version": "2.2.6", - "resolved": "https://registry.npmmirror.com/@mongosh/js-multiline-to-singleline/-/js-multiline-to-singleline-2.2.6.tgz", - "integrity": "sha512-M5ak3Sxd2sLQtI3mV5ubQv0vo3YsJlvRaFCvmeQQgGTDT76gwrlYf/f6qDlR6jdIHVELO5cgx4gMDdoSWGQpCw==", + "version": "2.2.9", + "resolved": "https://registry.npmmirror.com/@mongosh/js-multiline-to-singleline/-/js-multiline-to-singleline-2.2.9.tgz", + "integrity": "sha512-3EPqCQ64zwqR7PpdITBd3e8grpnwE7XIohuVbYXNo48Hlnz0Gdc8QAjSwQF2LO51ozCmPVcrQqCjVuLjdtPBUA==", "dependencies": { "@babel/core": "^7.16.12", "@babel/types": "^7.21.2" @@ -1332,14 +1367,14 @@ } }, "node_modules/@mongosh/logging": { - "version": "2.2.6", - "resolved": "https://registry.npmmirror.com/@mongosh/logging/-/logging-2.2.6.tgz", - "integrity": "sha512-D+H6T9OyQJsoUd58hSXxyRbcgM1hPcq5FqwUqUwlYnl9qKMj7W9004JaTBQPu2nYdYcdJvTGqIo9s+8IMGXB2g==", + "version": "2.2.9", + "resolved": "https://registry.npmmirror.com/@mongosh/logging/-/logging-2.2.9.tgz", + "integrity": "sha512-/LvJ3Rk2B5Po7JkG/suZIaJybAzCUSvNGRmobwR6HeDJ4RwKMKvPUJrUYu1GXXQqdLNDXH2o9eEWojMk/IA3LQ==", "dependencies": { - "@mongodb-js/devtools-connect": "^2.6.3", - "@mongosh/errors": "2.2.6", - "@mongosh/history": "2.2.6", - "@mongosh/types": "2.2.6", + "@mongodb-js/devtools-connect": "^3.0.1", + "@mongosh/errors": "2.2.9", + "@mongosh/history": "2.2.9", + "@mongosh/types": "2.2.9", "mongodb-log-writer": "^1.4.2", "mongodb-redact": "^0.2.3" }, @@ -1348,14 +1383,14 @@ } }, "node_modules/@mongosh/service-provider-core": { - "version": "2.2.6", - "resolved": "https://registry.npmmirror.com/@mongosh/service-provider-core/-/service-provider-core-2.2.6.tgz", - "integrity": "sha512-Q1NasVJc8sq+32NLVPQymLiyTsjP4Z4AsALA4IYV8dDzSlpBt8zWFnAWRGAFxLwRRR89TpqN3n1Fj9oR7DFUXw==", + "version": "2.2.9", + "resolved": "https://registry.npmmirror.com/@mongosh/service-provider-core/-/service-provider-core-2.2.9.tgz", + "integrity": "sha512-QJ+4TBD30C3cGoKoBtGOH82RVTKNMcBG1vhs8rfRheajivMLEBka2Hk/49R6yv9lhSfwgueH57+6EFNdqVFgSQ==", "dependencies": { "@aws-sdk/credential-providers": "^3.525.0", - "@mongosh/errors": "2.2.6", + "@mongosh/errors": "2.2.9", "bson": "^6.7.0", - "mongodb": "^6.6.2", + "mongodb": "^6.7.0", "mongodb-build-info": "^1.7.2" }, "engines": { @@ -1366,17 +1401,17 @@ } }, "node_modules/@mongosh/service-provider-server": { - "version": "2.2.6", - "resolved": "https://registry.npmmirror.com/@mongosh/service-provider-server/-/service-provider-server-2.2.6.tgz", - "integrity": "sha512-/4ynmXCKqhz3lSeZ1ybVvFWfYJ21HXAactY9BguPwzI2TGb/g2LcboU86DrVDmxe4+Odg8L0pH7ICIRhlaxjFg==", + "version": "2.2.9", + "resolved": "https://registry.npmmirror.com/@mongosh/service-provider-server/-/service-provider-server-2.2.9.tgz", + "integrity": "sha512-G4pXkwvvlnFW5sLQAbgDwqpt0tBJHlsQPJN+eMT9N6gRtEnhxAnOuOGA4zKTcaOZN2bTnzd6F7Yu5Z5AOOVXUA==", "dependencies": { - "@mongodb-js/devtools-connect": "^2.6.3", - "@mongodb-js/oidc-plugin": "^0.4.0", - "@mongosh/errors": "2.2.6", - "@mongosh/service-provider-core": "2.2.6", - "@mongosh/types": "2.2.6", + "@mongodb-js/devtools-connect": "^3.0.1", + "@mongodb-js/oidc-plugin": "^1.0.2", + "@mongosh/errors": "2.2.9", + "@mongosh/service-provider-core": "2.2.9", + "@mongosh/types": "2.2.9", "aws4": "^1.12.0", - "mongodb": "^6.6.2", + "mongodb": "^6.7.0", "mongodb-connection-string-url": "^3.0.1", "socks": "^2.8.3" }, @@ -1389,15 +1424,15 @@ } }, "node_modules/@mongosh/shell-api": { - "version": "2.2.6", - "resolved": "https://registry.npmmirror.com/@mongosh/shell-api/-/shell-api-2.2.6.tgz", - "integrity": "sha512-hwIG3Urj+/IyhuIknQXTWUWQ6aNDda+2xMd3a5psk7WRVYo5BRNT+kBk3QkUXIVUOJ+yNIFomPcd2f4t1zFoOg==", + "version": "2.2.9", + "resolved": "https://registry.npmmirror.com/@mongosh/shell-api/-/shell-api-2.2.9.tgz", + "integrity": "sha512-1Wo2RJ1vpYY/LRKKyIgl9vn7nycBVpO+iAaOFRSI0VxcW7dujROIm+XLBzqvJql/0qeqfnQGXv+jCTb13emduw==", "dependencies": { - "@mongosh/arg-parser": "2.2.6", - "@mongosh/errors": "2.2.6", - "@mongosh/history": "2.2.6", - "@mongosh/i18n": "2.2.6", - "@mongosh/service-provider-core": "2.2.6", + "@mongosh/arg-parser": "2.2.9", + "@mongosh/errors": "2.2.9", + "@mongosh/history": "2.2.9", + "@mongosh/i18n": "2.2.9", + "@mongosh/service-provider-core": "2.2.9", "mongodb-redact": "^0.2.3" }, "engines": { @@ -1405,27 +1440,27 @@ } }, "node_modules/@mongosh/shell-evaluator": { - "version": "2.2.6", - "resolved": "https://registry.npmmirror.com/@mongosh/shell-evaluator/-/shell-evaluator-2.2.6.tgz", - "integrity": "sha512-1R9017ia8mVtFcUtuGiiYe4E1fkwIjtB9dSYeo30GLUGZTAo79GJqHsYDVtC/UNRk2Fb6wCq8/jPi1/r/B9ATg==", + "version": "2.2.9", + "resolved": "https://registry.npmmirror.com/@mongosh/shell-evaluator/-/shell-evaluator-2.2.9.tgz", + "integrity": "sha512-p56jKPaRfFKT4yW3FrmLeawy/8qL7x2q9Gx88e0iJhBI3ybft0dQ1tWvX3mMg6YxZGNsDeHgPSAwNlFAy3lxiQ==", "dependencies": { - "@mongosh/async-rewriter2": "2.2.6", - "@mongosh/history": "2.2.6", - "@mongosh/shell-api": "2.2.6" + "@mongosh/async-rewriter2": "2.2.9", + "@mongosh/history": "2.2.9", + "@mongosh/shell-api": "2.2.9" }, "engines": { "node": ">=14.15.1" } }, "node_modules/@mongosh/snippet-manager": { - "version": "2.2.6", - "resolved": "https://registry.npmmirror.com/@mongosh/snippet-manager/-/snippet-manager-2.2.6.tgz", - "integrity": "sha512-kl2Y6AF3R7BMjUshzPywI5vkf8HOAR5jKlKt18pkkWdOleQ45+X0BVWpiLpBmZXZZGamaa3u20z9qtzuO/HPtQ==", + "version": "2.2.9", + "resolved": "https://registry.npmmirror.com/@mongosh/snippet-manager/-/snippet-manager-2.2.9.tgz", + "integrity": "sha512-JG9Svfoh1z30U7mwbojx0Wm2BkVd6wqqkkpxucgJ9ba2DG7VvgN4iez6HQa+eA3KmMKVII7IzYnt/J0gOum80g==", "dependencies": { - "@mongosh/errors": "2.2.6", - "@mongosh/import-node-fetch": "2.2.6", - "@mongosh/shell-api": "2.2.6", - "@mongosh/types": "2.2.6", + "@mongosh/errors": "2.2.9", + "@mongosh/import-node-fetch": "2.2.9", + "@mongosh/shell-api": "2.2.9", + "@mongosh/types": "2.2.9", "bson": "^6.7.0", "cross-spawn": "^7.0.3", "escape-string-regexp": "^4.0.0", @@ -1437,11 +1472,11 @@ } }, "node_modules/@mongosh/types": { - "version": "2.2.6", - "resolved": "https://registry.npmmirror.com/@mongosh/types/-/types-2.2.6.tgz", - "integrity": "sha512-+QcymQR4eqdrxhecgmeiZja794M4kuASJn7r8clDgWTBHTSdxyiq3S8bNuNekJU0h2rdcGJZepGnQbV6PBmSww==", + "version": "2.2.9", + "resolved": "https://registry.npmmirror.com/@mongosh/types/-/types-2.2.9.tgz", + "integrity": "sha512-Vo91tPc24nrybDsE/wQXbKynB3VC8BvF+yallZpMvLNtckr5q7nTuaTBWG5Er1myPA5MQhZm6DgpsIWR1YnGgg==", "dependencies": { - "@mongodb-js/devtools-connect": "^2.6.3" + "@mongodb-js/devtools-connect": "^3.0.1" }, "engines": { "node": ">=14.15.1" @@ -1553,11 +1588,11 @@ "integrity": "sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ==" }, "node_modules/@smithy/abort-controller": { - "version": "3.0.0", - "resolved": "https://registry.npmmirror.com/@smithy/abort-controller/-/abort-controller-3.0.0.tgz", - "integrity": "sha512-p6GlFGBt9K4MYLu72YuJ523NVR4A8oHlC5M2JO6OmQqN8kAc/uh1JqLE+FizTokrSJGg0CSvC+BrsmGzKtsZKA==", + "version": "3.0.1", + "resolved": "https://registry.npmmirror.com/@smithy/abort-controller/-/abort-controller-3.0.1.tgz", + "integrity": "sha512-Jb7jg4E+C+uvrUQi+h9kbILY6ts6fglKZzseMCHlH9ayq+1f5QdpYf8MV/xppuiN6DAMJAmwGz53GwP3213dmA==", "dependencies": { - "@smithy/types": "^3.0.0", + "@smithy/types": "^3.1.0", "tslib": "^2.6.2" }, "engines": { @@ -1565,14 +1600,14 @@ } }, "node_modules/@smithy/config-resolver": { - "version": "3.0.0", - "resolved": "https://registry.npmmirror.com/@smithy/config-resolver/-/config-resolver-3.0.0.tgz", - "integrity": "sha512-2GzOfADwYLQugYkKQhIyZyQlM05K+tMKvRnc6eFfZcpJGRfKoMUMYdPlBKmqHwQFXQKBrGV6cxL9oymWgDzvFw==", + "version": "3.0.2", + "resolved": "https://registry.npmmirror.com/@smithy/config-resolver/-/config-resolver-3.0.2.tgz", + "integrity": "sha512-wUyG6ezpp2sWAvfqmSYTROwFUmJqKV78GLf55WODrosBcT0BAMd9bOLO4HRhynWBgAobPml2cF9ZOdgCe00r+g==", "dependencies": { - "@smithy/node-config-provider": "^3.0.0", - "@smithy/types": "^3.0.0", + "@smithy/node-config-provider": "^3.1.1", + "@smithy/types": "^3.1.0", "@smithy/util-config-provider": "^3.0.0", - "@smithy/util-middleware": "^3.0.0", + "@smithy/util-middleware": "^3.0.1", "tslib": "^2.6.2" }, "engines": { @@ -1580,17 +1615,17 @@ } }, "node_modules/@smithy/core": { - "version": "2.0.1", - "resolved": "https://registry.npmmirror.com/@smithy/core/-/core-2.0.1.tgz", - "integrity": "sha512-rcMkjvwxH/bER+oZUPR0yTA0ELD6m3A+d92+CFkdF6HJFCBB1bXo7P5pm21L66XwTN01B6bUhSCQ7cymWRD8zg==", + "version": "2.2.2", + "resolved": "https://registry.npmmirror.com/@smithy/core/-/core-2.2.2.tgz", + "integrity": "sha512-bxZr4ZTqS6hMSQGYdcsfFQTFU0MO2xKLbkqZMSRDM+ruQ0nY00lFJUeLhXe7fqohSEd1y5wKu1Ap0bVJPzpmHg==", "dependencies": { - "@smithy/middleware-endpoint": "^3.0.0", - "@smithy/middleware-retry": "^3.0.1", - "@smithy/middleware-serde": "^3.0.0", - "@smithy/protocol-http": "^4.0.0", - "@smithy/smithy-client": "^3.0.1", - "@smithy/types": "^3.0.0", - "@smithy/util-middleware": "^3.0.0", + "@smithy/middleware-endpoint": "^3.0.2", + "@smithy/middleware-retry": "^3.0.5", + "@smithy/middleware-serde": "^3.0.1", + "@smithy/protocol-http": "^4.0.1", + "@smithy/smithy-client": "^3.1.3", + "@smithy/types": "^3.1.0", + "@smithy/util-middleware": "^3.0.1", "tslib": "^2.6.2" }, "engines": { @@ -1598,14 +1633,14 @@ } }, "node_modules/@smithy/credential-provider-imds": { - "version": "3.0.0", - "resolved": "https://registry.npmmirror.com/@smithy/credential-provider-imds/-/credential-provider-imds-3.0.0.tgz", - "integrity": "sha512-lfmBiFQcA3FsDAPxNfY0L7CawcWtbyWsBOHo34nF095728JLkBX4Y9q/VPPE2r7fqMVK+drmDigqE2/SSQeVRA==", + "version": "3.1.1", + "resolved": "https://registry.npmmirror.com/@smithy/credential-provider-imds/-/credential-provider-imds-3.1.1.tgz", + "integrity": "sha512-htndP0LwHdE3R3Nam9ZyVWhwPYOmD4xCL79kqvNxy8u/bv0huuy574CSiRY4cvEICgimv8jlVfLeZ7zZqbnB2g==", "dependencies": { - "@smithy/node-config-provider": "^3.0.0", - "@smithy/property-provider": "^3.0.0", - "@smithy/types": "^3.0.0", - "@smithy/url-parser": "^3.0.0", + "@smithy/node-config-provider": "^3.1.1", + "@smithy/property-provider": "^3.1.1", + "@smithy/types": "^3.1.0", + "@smithy/url-parser": "^3.0.1", "tslib": "^2.6.2" }, "engines": { @@ -1613,23 +1648,23 @@ } }, "node_modules/@smithy/fetch-http-handler": { - "version": "3.0.1", - "resolved": "https://registry.npmmirror.com/@smithy/fetch-http-handler/-/fetch-http-handler-3.0.1.tgz", - "integrity": "sha512-uaH74i5BDj+rBwoQaXioKpI0SHBJFtOVwzrCpxZxphOW0ki5jhj7dXvDMYM2IJem8TpdFvS2iC08sjOblfFGFg==", + "version": "3.0.3", + "resolved": "https://registry.npmmirror.com/@smithy/fetch-http-handler/-/fetch-http-handler-3.0.3.tgz", + "integrity": "sha512-31x2MokxJL/u5U/BdElvVRotOGjUcOOvI2pb5TZ02umBLw+vVHImiLn+khbN0SblaFXNRzPoGrKwXylNjV3skw==", "dependencies": { - "@smithy/protocol-http": "^4.0.0", - "@smithy/querystring-builder": "^3.0.0", - "@smithy/types": "^3.0.0", + "@smithy/protocol-http": "^4.0.1", + "@smithy/querystring-builder": "^3.0.1", + "@smithy/types": "^3.1.0", "@smithy/util-base64": "^3.0.0", "tslib": "^2.6.2" } }, "node_modules/@smithy/hash-node": { - "version": "3.0.0", - "resolved": "https://registry.npmmirror.com/@smithy/hash-node/-/hash-node-3.0.0.tgz", - "integrity": "sha512-84qXstNemP3XS5jcof0el6+bDfjzuvhJPQTEfro3lgtbCtKgzPm3MgiS6ehXVPjeQ5+JS0HqmTz8f/RYfzHVxw==", + "version": "3.0.1", + "resolved": "https://registry.npmmirror.com/@smithy/hash-node/-/hash-node-3.0.1.tgz", + "integrity": "sha512-w2ncjgk2EYO2+WhAsSQA8owzoOSY7IL1qVytlwpnL1pFGWTjIoIh5nROkEKXY51unB63bMGZqDiVoXaFbyKDlg==", "dependencies": { - "@smithy/types": "^3.0.0", + "@smithy/types": "^3.1.0", "@smithy/util-buffer-from": "^3.0.0", "@smithy/util-utf8": "^3.0.0", "tslib": "^2.6.2" @@ -1639,11 +1674,11 @@ } }, "node_modules/@smithy/invalid-dependency": { - "version": "3.0.0", - "resolved": "https://registry.npmmirror.com/@smithy/invalid-dependency/-/invalid-dependency-3.0.0.tgz", - "integrity": "sha512-F6wBBaEFgJzj0s4KUlliIGPmqXemwP6EavgvDqYwCH40O5Xr2iMHvS8todmGVZtuJCorBkXsYLyTu4PuizVq5g==", + "version": "3.0.1", + "resolved": "https://registry.npmmirror.com/@smithy/invalid-dependency/-/invalid-dependency-3.0.1.tgz", + "integrity": "sha512-RSNF/32BKygXKKMyS7koyuAq1rcdW5p5c4EFa77QenBFze9As+JiRnV9OWBh2cB/ejGZalEZjvIrMLHwJl7aGA==", "dependencies": { - "@smithy/types": "^3.0.0", + "@smithy/types": "^3.1.0", "tslib": "^2.6.2" } }, @@ -1659,12 +1694,12 @@ } }, "node_modules/@smithy/middleware-content-length": { - "version": "3.0.0", - "resolved": "https://registry.npmmirror.com/@smithy/middleware-content-length/-/middleware-content-length-3.0.0.tgz", - "integrity": "sha512-3C4s4d/iGobgCtk2tnWW6+zSTOBg1PRAm2vtWZLdriwTroFbbWNSr3lcyzHdrQHnEXYCC5K52EbpfodaIUY8sg==", + "version": "3.0.1", + "resolved": "https://registry.npmmirror.com/@smithy/middleware-content-length/-/middleware-content-length-3.0.1.tgz", + "integrity": "sha512-6QdK/VbrCfXD5/QolE2W/ok6VqxD+SM28Ds8iSlEHXZwv4buLsvWyvoEEy0322K/g5uFgPzBmZjGqesTmPL+yQ==", "dependencies": { - "@smithy/protocol-http": "^4.0.0", - "@smithy/types": "^3.0.0", + "@smithy/protocol-http": "^4.0.1", + "@smithy/types": "^3.1.0", "tslib": "^2.6.2" }, "engines": { @@ -1672,16 +1707,16 @@ } }, "node_modules/@smithy/middleware-endpoint": { - "version": "3.0.0", - "resolved": "https://registry.npmmirror.com/@smithy/middleware-endpoint/-/middleware-endpoint-3.0.0.tgz", - "integrity": "sha512-aXOAWztw/5qAfp0NcA2OWpv6ZI/E+Dh9mByif7i91D/0iyYNUcKvskmXiowKESFkuZ7PIMd3VOR4fTibZDs2OQ==", + "version": "3.0.2", + "resolved": "https://registry.npmmirror.com/@smithy/middleware-endpoint/-/middleware-endpoint-3.0.2.tgz", + "integrity": "sha512-gWEaGYB3Bei17Oiy/F2IlUPpBazNXImytoOdJ1xbrUOaJKAOiUhx8/4FOnYLLJHdAwa9PlvJ2ULda2f/Dnwi9w==", "dependencies": { - "@smithy/middleware-serde": "^3.0.0", - "@smithy/node-config-provider": "^3.0.0", - "@smithy/shared-ini-file-loader": "^3.0.0", - "@smithy/types": "^3.0.0", - "@smithy/url-parser": "^3.0.0", - "@smithy/util-middleware": "^3.0.0", + "@smithy/middleware-serde": "^3.0.1", + "@smithy/node-config-provider": "^3.1.1", + "@smithy/shared-ini-file-loader": "^3.1.1", + "@smithy/types": "^3.1.0", + "@smithy/url-parser": "^3.0.1", + "@smithy/util-middleware": "^3.0.1", "tslib": "^2.6.2" }, "engines": { @@ -1689,17 +1724,17 @@ } }, "node_modules/@smithy/middleware-retry": { - "version": "3.0.1", - "resolved": "https://registry.npmmirror.com/@smithy/middleware-retry/-/middleware-retry-3.0.1.tgz", - "integrity": "sha512-hBhSEuL841FhJBK/19WpaGk5YWSzFk/P2UaVjANGKRv3eYNO8Y1lANWgqnuPWjOyCEWMPr58vELFDWpxvRKANw==", + "version": "3.0.5", + "resolved": "https://registry.npmmirror.com/@smithy/middleware-retry/-/middleware-retry-3.0.5.tgz", + "integrity": "sha512-nKAmmea9Wm0d94obPqVgjxW2zzaNemxcTzjgd17LhGKI23D66UQKI5gpoWDsnE+R4tfuZe9dCcw8gmTVEwFpRA==", "dependencies": { - "@smithy/node-config-provider": "^3.0.0", - "@smithy/protocol-http": "^4.0.0", - "@smithy/service-error-classification": "^3.0.0", - "@smithy/smithy-client": "^3.0.1", - "@smithy/types": "^3.0.0", - "@smithy/util-middleware": "^3.0.0", - "@smithy/util-retry": "^3.0.0", + "@smithy/node-config-provider": "^3.1.1", + "@smithy/protocol-http": "^4.0.1", + "@smithy/service-error-classification": "^3.0.1", + "@smithy/smithy-client": "^3.1.3", + "@smithy/types": "^3.1.0", + "@smithy/util-middleware": "^3.0.1", + "@smithy/util-retry": "^3.0.1", "tslib": "^2.6.2", "uuid": "^9.0.1" }, @@ -1708,11 +1743,11 @@ } }, "node_modules/@smithy/middleware-serde": { - "version": "3.0.0", - "resolved": "https://registry.npmmirror.com/@smithy/middleware-serde/-/middleware-serde-3.0.0.tgz", - "integrity": "sha512-I1vKG1foI+oPgG9r7IMY1S+xBnmAn1ISqployvqkwHoSb8VPsngHDTOgYGYBonuOKndaWRUGJZrKYYLB+Ane6w==", + "version": "3.0.1", + "resolved": "https://registry.npmmirror.com/@smithy/middleware-serde/-/middleware-serde-3.0.1.tgz", + "integrity": "sha512-ak6H/ZRN05r5+SR0/IUc5zOSyh2qp3HReg1KkrnaSLXmncy9lwOjNqybX4L4x55/e5mtVDn1uf/gQ6bw5neJPw==", "dependencies": { - "@smithy/types": "^3.0.0", + "@smithy/types": "^3.1.0", "tslib": "^2.6.2" }, "engines": { @@ -1720,11 +1755,11 @@ } }, "node_modules/@smithy/middleware-stack": { - "version": "3.0.0", - "resolved": "https://registry.npmmirror.com/@smithy/middleware-stack/-/middleware-stack-3.0.0.tgz", - "integrity": "sha512-+H0jmyfAyHRFXm6wunskuNAqtj7yfmwFB6Fp37enytp2q047/Od9xetEaUbluyImOlGnGpaVGaVfjwawSr+i6Q==", + "version": "3.0.1", + "resolved": "https://registry.npmmirror.com/@smithy/middleware-stack/-/middleware-stack-3.0.1.tgz", + "integrity": "sha512-fS5uT//y1SlBdkzIvgmWQ9FufwMXrHSSbuR25ygMy1CRDIZkcBMoF4oTMYNfR9kBlVBcVzlv7joFdNrFuQirPA==", "dependencies": { - "@smithy/types": "^3.0.0", + "@smithy/types": "^3.1.0", "tslib": "^2.6.2" }, "engines": { @@ -1732,13 +1767,13 @@ } }, "node_modules/@smithy/node-config-provider": { - "version": "3.0.0", - "resolved": "https://registry.npmmirror.com/@smithy/node-config-provider/-/node-config-provider-3.0.0.tgz", - "integrity": "sha512-buqfaSdDh0zo62EPLf8rGDvcpKwGpO5ho4bXS2cdFhlOta7tBkWJt+O5uiaAeICfIOfPclNOndshDNSanX2X9g==", + "version": "3.1.1", + "resolved": "https://registry.npmmirror.com/@smithy/node-config-provider/-/node-config-provider-3.1.1.tgz", + "integrity": "sha512-z5G7+ysL4yUtMghUd2zrLkecu0mTfnYlt5dR76g/HsFqf7evFazwiZP1ag2EJenGxNBDwDM5g8nm11NPogiUVA==", "dependencies": { - "@smithy/property-provider": "^3.0.0", - "@smithy/shared-ini-file-loader": "^3.0.0", - "@smithy/types": "^3.0.0", + "@smithy/property-provider": "^3.1.1", + "@smithy/shared-ini-file-loader": "^3.1.1", + "@smithy/types": "^3.1.0", "tslib": "^2.6.2" }, "engines": { @@ -1746,14 +1781,14 @@ } }, "node_modules/@smithy/node-http-handler": { - "version": "3.0.0", - "resolved": "https://registry.npmmirror.com/@smithy/node-http-handler/-/node-http-handler-3.0.0.tgz", - "integrity": "sha512-3trD4r7NOMygwLbUJo4eodyQuypAWr7uvPnebNJ9a70dQhVn+US8j/lCnvoJS6BXfZeF7PkkkI0DemVJw+n+eQ==", + "version": "3.0.1", + "resolved": "https://registry.npmmirror.com/@smithy/node-http-handler/-/node-http-handler-3.0.1.tgz", + "integrity": "sha512-hlBI6MuREA4o1wBMEt+QNhUzoDtFFvwR6ecufimlx9D79jPybE/r8kNorphXOi91PgSO9S2fxRjcKCLk7Jw8zA==", "dependencies": { - "@smithy/abort-controller": "^3.0.0", - "@smithy/protocol-http": "^4.0.0", - "@smithy/querystring-builder": "^3.0.0", - "@smithy/types": "^3.0.0", + "@smithy/abort-controller": "^3.0.1", + "@smithy/protocol-http": "^4.0.1", + "@smithy/querystring-builder": "^3.0.1", + "@smithy/types": "^3.1.0", "tslib": "^2.6.2" }, "engines": { @@ -1761,11 +1796,11 @@ } }, "node_modules/@smithy/property-provider": { - "version": "3.0.0", - "resolved": "https://registry.npmmirror.com/@smithy/property-provider/-/property-provider-3.0.0.tgz", - "integrity": "sha512-LmbPgHBswdXCrkWWuUwBm9w72S2iLWyC/5jet9/Y9cGHtzqxi+GVjfCfahkvNV4KXEwgnH8EMpcrD9RUYe0eLQ==", + "version": "3.1.1", + "resolved": "https://registry.npmmirror.com/@smithy/property-provider/-/property-provider-3.1.1.tgz", + "integrity": "sha512-YknOMZcQkB5on+MU0DvbToCmT2YPtTETMXW0D3+/Iln7ezT+Zm1GMHhCW1dOH/X/+LkkQD9aXEoCX/B10s4Xdw==", "dependencies": { - "@smithy/types": "^3.0.0", + "@smithy/types": "^3.1.0", "tslib": "^2.6.2" }, "engines": { @@ -1773,11 +1808,11 @@ } }, "node_modules/@smithy/protocol-http": { - "version": "4.0.0", - "resolved": "https://registry.npmmirror.com/@smithy/protocol-http/-/protocol-http-4.0.0.tgz", - "integrity": "sha512-qOQZOEI2XLWRWBO9AgIYuHuqjZ2csyr8/IlgFDHDNuIgLAMRx2Bl8ck5U5D6Vh9DPdoaVpuzwWMa0xcdL4O/AQ==", + "version": "4.0.1", + "resolved": "https://registry.npmmirror.com/@smithy/protocol-http/-/protocol-http-4.0.1.tgz", + "integrity": "sha512-eBhm9zwcFPEazc654c0BEWtxYAzrw+OhoSf5pkwKzfftWKXRoqEhwOE2Pvn30v0iAdo7Mfsfb6pi1NnZlGCMpg==", "dependencies": { - "@smithy/types": "^3.0.0", + "@smithy/types": "^3.1.0", "tslib": "^2.6.2" }, "engines": { @@ -1785,11 +1820,11 @@ } }, "node_modules/@smithy/querystring-builder": { - "version": "3.0.0", - "resolved": "https://registry.npmmirror.com/@smithy/querystring-builder/-/querystring-builder-3.0.0.tgz", - "integrity": "sha512-bW8Fi0NzyfkE0TmQphDXr1AmBDbK01cA4C1Z7ggwMAU5RDz5AAv/KmoRwzQAS0kxXNf/D2ALTEgwK0U2c4LtRg==", + "version": "3.0.1", + "resolved": "https://registry.npmmirror.com/@smithy/querystring-builder/-/querystring-builder-3.0.1.tgz", + "integrity": "sha512-vKitpnG/2KOMVlx3x1S3FkBH075EROG3wcrcDaNerQNh8yuqnSL23btCD2UyX4i4lpPzNW6VFdxbn2Z25b/g5Q==", "dependencies": { - "@smithy/types": "^3.0.0", + "@smithy/types": "^3.1.0", "@smithy/util-uri-escape": "^3.0.0", "tslib": "^2.6.2" }, @@ -1798,11 +1833,11 @@ } }, "node_modules/@smithy/querystring-parser": { - "version": "3.0.0", - "resolved": "https://registry.npmmirror.com/@smithy/querystring-parser/-/querystring-parser-3.0.0.tgz", - "integrity": "sha512-UzHwthk0UEccV4dHzPySnBy34AWw3V9lIqUTxmozQ+wPDAO9csCWMfOLe7V9A2agNYy7xE+Pb0S6K/J23JSzfQ==", + "version": "3.0.1", + "resolved": "https://registry.npmmirror.com/@smithy/querystring-parser/-/querystring-parser-3.0.1.tgz", + "integrity": "sha512-Qt8DMC05lVS8NcQx94lfVbZSX+2Ym7032b/JR8AlboAa/D669kPzqb35dkjkvAG6+NWmUchef3ENtrD6F+5n8Q==", "dependencies": { - "@smithy/types": "^3.0.0", + "@smithy/types": "^3.1.0", "tslib": "^2.6.2" }, "engines": { @@ -1810,22 +1845,22 @@ } }, "node_modules/@smithy/service-error-classification": { - "version": "3.0.0", - "resolved": "https://registry.npmmirror.com/@smithy/service-error-classification/-/service-error-classification-3.0.0.tgz", - "integrity": "sha512-3BsBtOUt2Gsnc3X23ew+r2M71WwtpHfEDGhHYHSDg6q1t8FrWh15jT25DLajFV1H+PpxAJ6gqe9yYeRUsmSdFA==", + "version": "3.0.1", + "resolved": "https://registry.npmmirror.com/@smithy/service-error-classification/-/service-error-classification-3.0.1.tgz", + "integrity": "sha512-ubFUvIePjDCyIzZ+pLETqNC6KXJ/fc6g+/baqel7Zf6kJI/kZKgjwkCI7zbUhoUuOZ/4eA/87YasVu40b/B4bA==", "dependencies": { - "@smithy/types": "^3.0.0" + "@smithy/types": "^3.1.0" }, "engines": { "node": ">=16.0.0" } }, "node_modules/@smithy/shared-ini-file-loader": { - "version": "3.0.0", - "resolved": "https://registry.npmmirror.com/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-3.0.0.tgz", - "integrity": "sha512-REVw6XauXk8xE4zo5aGL7Rz4ywA8qNMUn8RtWeTRQsgAlmlvbJ7CEPBcaXU2NDC3AYBgYAXrGyWD8XrN8UGDog==", + "version": "3.1.1", + "resolved": "https://registry.npmmirror.com/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-3.1.1.tgz", + "integrity": "sha512-nD6tXIX2126/P9e3wqRY1bm9dTtPZwRDyjVOd18G28o+1UOG+kOVgUwujE795HslSuPlEgqzsH5sgNP1hDjj9g==", "dependencies": { - "@smithy/types": "^3.0.0", + "@smithy/types": "^3.1.0", "tslib": "^2.6.2" }, "engines": { @@ -1833,14 +1868,14 @@ } }, "node_modules/@smithy/signature-v4": { - "version": "3.0.0", - "resolved": "https://registry.npmmirror.com/@smithy/signature-v4/-/signature-v4-3.0.0.tgz", - "integrity": "sha512-kXFOkNX+BQHe2qnLxpMEaCRGap9J6tUGLzc3A9jdn+nD4JdMwCKTJ+zFwQ20GkY+mAXGatyTw3HcoUlR39HwmA==", + "version": "3.1.0", + "resolved": "https://registry.npmmirror.com/@smithy/signature-v4/-/signature-v4-3.1.0.tgz", + "integrity": "sha512-m0/6LW3IQ3/JBcdhqjpkpABPTPhcejqeAn0U877zxBdNLiWAnG2WmCe5MfkUyVuvpFTPQnQwCo/0ZBR4uF5kxg==", "dependencies": { "@smithy/is-array-buffer": "^3.0.0", - "@smithy/types": "^3.0.0", + "@smithy/types": "^3.1.0", "@smithy/util-hex-encoding": "^3.0.0", - "@smithy/util-middleware": "^3.0.0", + "@smithy/util-middleware": "^3.0.1", "@smithy/util-uri-escape": "^3.0.0", "@smithy/util-utf8": "^3.0.0", "tslib": "^2.6.2" @@ -1850,15 +1885,15 @@ } }, "node_modules/@smithy/smithy-client": { - "version": "3.0.1", - "resolved": "https://registry.npmmirror.com/@smithy/smithy-client/-/smithy-client-3.0.1.tgz", - "integrity": "sha512-KAiFY4Y4jdHxR+4zerH/VBhaFKM8pbaVmJZ/CWJRwtM/CmwzTfXfvYwf6GoUwiHepdv+lwiOXCuOl6UBDUEINw==", + "version": "3.1.3", + "resolved": "https://registry.npmmirror.com/@smithy/smithy-client/-/smithy-client-3.1.3.tgz", + "integrity": "sha512-YVz+akpR5lIIRPJfhE4sqoHYwMys6/33vsFvDof+71FCwa4jkVfMpzKv9TKrG/EDb5TV+YtjdXkwywdqlUOQXA==", "dependencies": { - "@smithy/middleware-endpoint": "^3.0.0", - "@smithy/middleware-stack": "^3.0.0", - "@smithy/protocol-http": "^4.0.0", - "@smithy/types": "^3.0.0", - "@smithy/util-stream": "^3.0.1", + "@smithy/middleware-endpoint": "^3.0.2", + "@smithy/middleware-stack": "^3.0.1", + "@smithy/protocol-http": "^4.0.1", + "@smithy/types": "^3.1.0", + "@smithy/util-stream": "^3.0.3", "tslib": "^2.6.2" }, "engines": { @@ -1866,9 +1901,9 @@ } }, "node_modules/@smithy/types": { - "version": "3.0.0", - "resolved": "https://registry.npmmirror.com/@smithy/types/-/types-3.0.0.tgz", - "integrity": "sha512-VvWuQk2RKFuOr98gFhjca7fkBS+xLLURT8bUjk5XQoV0ZLm7WPwWPPY3/AwzTLuUBDeoKDCthfe1AsTUWaSEhw==", + "version": "3.1.0", + "resolved": "https://registry.npmmirror.com/@smithy/types/-/types-3.1.0.tgz", + "integrity": "sha512-qi4SeCVOUPjhSSZrxxB/mB8DrmuSFUcJnD9KXjuP+7C3LV/KFV4kpuUSH3OHDZgQB9TEH/1sO/Fq/5HyaK9MPw==", "dependencies": { "tslib": "^2.6.2" }, @@ -1877,12 +1912,12 @@ } }, "node_modules/@smithy/url-parser": { - "version": "3.0.0", - "resolved": "https://registry.npmmirror.com/@smithy/url-parser/-/url-parser-3.0.0.tgz", - "integrity": "sha512-2XLazFgUu+YOGHtWihB3FSLAfCUajVfNBXGGYjOaVKjLAuAxx3pSBY3hBgLzIgB17haf59gOG3imKqTy8mcrjw==", + "version": "3.0.1", + "resolved": "https://registry.npmmirror.com/@smithy/url-parser/-/url-parser-3.0.1.tgz", + "integrity": "sha512-G140IlNFlzYWVCedC4E2d6NycM1dCUbe5CnsGW1hmGt4hYKiGOw0v7lVru9WAn5T2w09QEjl4fOESWjGmCvVmg==", "dependencies": { - "@smithy/querystring-parser": "^3.0.0", - "@smithy/types": "^3.0.0", + "@smithy/querystring-parser": "^3.0.1", + "@smithy/types": "^3.1.0", "tslib": "^2.6.2" } }, @@ -1942,13 +1977,13 @@ } }, "node_modules/@smithy/util-defaults-mode-browser": { - "version": "3.0.1", - "resolved": "https://registry.npmmirror.com/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-3.0.1.tgz", - "integrity": "sha512-nW5kEzdJn1Bn5TF+gOPHh2rcPli8JU9vSSXLbfg7uPnfR1TMRQqs9zlYRhIb87NeSxIbpdXOI94tvXSy+fvDYg==", + "version": "3.0.5", + "resolved": "https://registry.npmmirror.com/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-3.0.5.tgz", + "integrity": "sha512-VZkJ+bXCHcNSMhX8EReGyFcc/Err94YGqeEKbbxkVz2TgKlacsoplpi+kxOMVbQq/tq9sQx5ajBKG+nl2GNuxw==", "dependencies": { - "@smithy/property-provider": "^3.0.0", - "@smithy/smithy-client": "^3.0.1", - "@smithy/types": "^3.0.0", + "@smithy/property-provider": "^3.1.1", + "@smithy/smithy-client": "^3.1.3", + "@smithy/types": "^3.1.0", "bowser": "^2.11.0", "tslib": "^2.6.2" }, @@ -1957,16 +1992,16 @@ } }, "node_modules/@smithy/util-defaults-mode-node": { - "version": "3.0.1", - "resolved": "https://registry.npmmirror.com/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-3.0.1.tgz", - "integrity": "sha512-TFk+Qb+elLc/MOhtSp+50fstyfZ6avQbgH2d96xUBpeScu+Al9elxv+UFAjaTHe0HQe5n+wem8ZLpXvU8lwV6Q==", + "version": "3.0.5", + "resolved": "https://registry.npmmirror.com/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-3.0.5.tgz", + "integrity": "sha512-jy19cFQA0k4f8VUDFsZVBey3rmI8EuXCw/xh/abdiq6S1qdwdfZ5coviuyYd//LPszf2yWIYkLpvmLF9qbhLGg==", "dependencies": { - "@smithy/config-resolver": "^3.0.0", - "@smithy/credential-provider-imds": "^3.0.0", - "@smithy/node-config-provider": "^3.0.0", - "@smithy/property-provider": "^3.0.0", - "@smithy/smithy-client": "^3.0.1", - "@smithy/types": "^3.0.0", + "@smithy/config-resolver": "^3.0.2", + "@smithy/credential-provider-imds": "^3.1.1", + "@smithy/node-config-provider": "^3.1.1", + "@smithy/property-provider": "^3.1.1", + "@smithy/smithy-client": "^3.1.3", + "@smithy/types": "^3.1.0", "tslib": "^2.6.2" }, "engines": { @@ -1974,12 +2009,12 @@ } }, "node_modules/@smithy/util-endpoints": { - "version": "2.0.0", - "resolved": "https://registry.npmmirror.com/@smithy/util-endpoints/-/util-endpoints-2.0.0.tgz", - "integrity": "sha512-+exaXzEY3DNt2qtA2OtRNSDlVrE4p32j1JSsQkzA5AdP0YtJNjkYbYhJxkFmPYcjI1abuwopOZCwUmv682QkiQ==", + "version": "2.0.2", + "resolved": "https://registry.npmmirror.com/@smithy/util-endpoints/-/util-endpoints-2.0.2.tgz", + "integrity": "sha512-4zFOcBFQvifd2LSD4a1dKvfIWWwh4sWNtS3oZ7mpob/qPPmJseqKB148iT+hWCDsG//TmI+8vjYPgZdvnkYlTg==", "dependencies": { - "@smithy/node-config-provider": "^3.0.0", - "@smithy/types": "^3.0.0", + "@smithy/node-config-provider": "^3.1.1", + "@smithy/types": "^3.1.0", "tslib": "^2.6.2" }, "engines": { @@ -1998,11 +2033,11 @@ } }, "node_modules/@smithy/util-middleware": { - "version": "3.0.0", - "resolved": "https://registry.npmmirror.com/@smithy/util-middleware/-/util-middleware-3.0.0.tgz", - "integrity": "sha512-q5ITdOnV2pXHSVDnKWrwgSNTDBAMHLptFE07ua/5Ty5WJ11bvr0vk2a7agu7qRhrCFRQlno5u3CneU5EELK+DQ==", + "version": "3.0.1", + "resolved": "https://registry.npmmirror.com/@smithy/util-middleware/-/util-middleware-3.0.1.tgz", + "integrity": "sha512-WRODCQtUsO7vIvfrdxS8RFPeLKcewYtaCglZsBsedIKSUGIIvMlZT5oh+pCe72I+1L+OjnZuqRNpN2LKhWA4KQ==", "dependencies": { - "@smithy/types": "^3.0.0", + "@smithy/types": "^3.1.0", "tslib": "^2.6.2" }, "engines": { @@ -2010,12 +2045,12 @@ } }, "node_modules/@smithy/util-retry": { - "version": "3.0.0", - "resolved": "https://registry.npmmirror.com/@smithy/util-retry/-/util-retry-3.0.0.tgz", - "integrity": "sha512-nK99bvJiziGv/UOKJlDvFF45F00WgPLKVIGUfAK+mDhzVN2hb/S33uW2Tlhg5PVBoqY7tDVqL0zmu4OxAHgo9g==", + "version": "3.0.1", + "resolved": "https://registry.npmmirror.com/@smithy/util-retry/-/util-retry-3.0.1.tgz", + "integrity": "sha512-5lRtYm+8fNFEUTdqZXg5M4ppVp40rMIJfR1TpbHAhKQgPIDpWT+iYMaqgnwEbtpi9U1smyUOPv5Sg+M1neOBgw==", "dependencies": { - "@smithy/service-error-classification": "^3.0.0", - "@smithy/types": "^3.0.0", + "@smithy/service-error-classification": "^3.0.1", + "@smithy/types": "^3.1.0", "tslib": "^2.6.2" }, "engines": { @@ -2023,13 +2058,13 @@ } }, "node_modules/@smithy/util-stream": { - "version": "3.0.1", - "resolved": "https://registry.npmmirror.com/@smithy/util-stream/-/util-stream-3.0.1.tgz", - "integrity": "sha512-7F7VNNhAsfMRA8I986YdOY5fE0/T1/ZjFF6OLsqkvQVNP3vZ/szYDfGCyphb7ioA09r32K/0qbSFfNFU68aSzA==", + "version": "3.0.3", + "resolved": "https://registry.npmmirror.com/@smithy/util-stream/-/util-stream-3.0.3.tgz", + "integrity": "sha512-ztOvXkXKJromRHNzvrLEW/vvTQPnxPBRHA0gR0QX61LnHDgrm4TBT4EQNpWwwHCD1N0nnEL5bEkzo2dt2t34Kg==", "dependencies": { - "@smithy/fetch-http-handler": "^3.0.1", - "@smithy/node-http-handler": "^3.0.0", - "@smithy/types": "^3.0.0", + "@smithy/fetch-http-handler": "^3.0.3", + "@smithy/node-http-handler": "^3.0.1", + "@smithy/types": "^3.1.0", "@smithy/util-base64": "^3.0.0", "@smithy/util-buffer-from": "^3.0.0", "@smithy/util-hex-encoding": "^3.0.0", @@ -2089,17 +2124,6 @@ "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, - "node_modules/abort-controller": { - "version": "3.0.0", - "resolved": "https://registry.npmmirror.com/abort-controller/-/abort-controller-3.0.0.tgz", - "integrity": "sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==", - "dependencies": { - "event-target-shim": "^5.0.0" - }, - "engines": { - "node": ">=6.5" - } - }, "node_modules/accepts": { "version": "1.3.8", "resolved": "https://registry.npmmirror.com/accepts/-/accepts-1.3.8.tgz", @@ -2113,9 +2137,9 @@ } }, "node_modules/acorn": { - "version": "8.11.3", - "resolved": "https://registry.npmmirror.com/acorn/-/acorn-8.11.3.tgz", - "integrity": "sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==", + "version": "8.12.0", + "resolved": "https://registry.npmmirror.com/acorn/-/acorn-8.12.0.tgz", + "integrity": "sha512-RTvkC4w+KNXrM39/lWCUaG0IbRkWdCv7W/IOW9oU6SawyxulvkQy5HQPVTKxEjczcUvapcrw3cFx/60VN/NRNw==", "bin": { "acorn": "bin/acorn" }, @@ -2276,9 +2300,9 @@ } }, "node_modules/aws4": { - "version": "1.12.0", - "resolved": "https://registry.npmmirror.com/aws4/-/aws4-1.12.0.tgz", - "integrity": "sha512-NmWvPnx0F1SfrQbYwOi7OeaNGokp9XhzNioJ/CSBs8Qa4vxug81mhJEAVZwxXuBmYB5KDRfMq/F3RR0BIU7sWg==" + "version": "1.13.0", + "resolved": "https://registry.npmmirror.com/aws4/-/aws4-1.13.0.tgz", + "integrity": "sha512-3AungXC4I8kKsS9PuS4JH2nc+0bVY/mjgrephHTIi8fpEeGsTHBUJeosp0Wc1myYMElmD0B3Oc4XL/HVJ4PV2g==" }, "node_modules/balanced-match": { "version": "1.0.2", @@ -2425,9 +2449,9 @@ } }, "node_modules/browserslist": { - "version": "4.23.0", - "resolved": "https://registry.npmmirror.com/browserslist/-/browserslist-4.23.0.tgz", - "integrity": "sha512-QW8HiM1shhT2GuzkvklfjcKDiWFXHOeFCIA/huJPwHsslwcydgk7X+z2zXpEijP98UCY7HbubZt5J2Zgvf0CaQ==", + "version": "4.23.1", + "resolved": "https://registry.npmmirror.com/browserslist/-/browserslist-4.23.1.tgz", + "integrity": "sha512-TUfofFo/KsK/bWZ9TWQ5O26tsWW4Uhmt8IYklbnUa70udB6P2wA7w7o4PY4muaEPBQaAX+CEnmmIA41NVHtPVw==", "funding": [ { "type": "opencollective", @@ -2443,10 +2467,10 @@ } ], "dependencies": { - "caniuse-lite": "^1.0.30001587", - "electron-to-chromium": "^1.4.668", + "caniuse-lite": "^1.0.30001629", + "electron-to-chromium": "^1.4.796", "node-releases": "^2.0.14", - "update-browserslist-db": "^1.0.13" + "update-browserslist-db": "^1.0.16" }, "bin": { "browserslist": "cli.js" @@ -2527,9 +2551,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001620", - "resolved": "https://registry.npmmirror.com/caniuse-lite/-/caniuse-lite-1.0.30001620.tgz", - "integrity": "sha512-WJvYsOjd1/BYUY6SNGUosK9DUidBPDTnOARHp3fSmFO1ekdxaY6nKRttEVrfMmYi80ctS0kz1wiWmm14fVc3ew==", + "version": "1.0.30001636", + "resolved": "https://registry.npmmirror.com/caniuse-lite/-/caniuse-lite-1.0.30001636.tgz", + "integrity": "sha512-bMg2vmr8XBsbL6Lr0UHXy/21m84FTxDLWn2FSqMd5PrlbMxwJlQnC2YWYxVgp66PZE+BBNF2jYQUBKCo1FDeZg==", "funding": [ { "type": "opencollective", @@ -2663,9 +2687,9 @@ } }, "node_modules/debug": { - "version": "4.3.4", - "resolved": "https://registry.npmmirror.com/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", + "version": "4.3.5", + "resolved": "https://registry.npmmirror.com/debug/-/debug-4.3.5.tgz", + "integrity": "sha512-pt0bNEmneDIvdL1Xsd9oDQ/wrQRkXDT4AUWlNZNPKvW5x/jyO9VFXkJUP07vQ2upmw5PlaITaPKc31jK13V+jg==", "dependencies": { "ms": "2.1.2" }, @@ -2836,9 +2860,9 @@ "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==" }, "node_modules/electron-to-chromium": { - "version": "1.4.774", - "resolved": "https://registry.npmmirror.com/electron-to-chromium/-/electron-to-chromium-1.4.774.tgz", - "integrity": "sha512-132O1XCd7zcTkzS3FgkAzKmnBuNJjK8WjcTtNuoylj7MYbqw5eXehjQ5OK91g0zm7OTKIPeaAG4CPoRfD9M1Mg==" + "version": "1.4.805", + "resolved": "https://registry.npmmirror.com/electron-to-chromium/-/electron-to-chromium-1.4.805.tgz", + "integrity": "sha512-8W4UJwX/w9T0QSzINJckTKG6CYpAUTqsaWcWIsdud3I1FYJcMgW9QqT1/4CBff/pP/TihWh13OmiyY8neto6vw==" }, "node_modules/emoji-regex": { "version": "9.2.2", @@ -3039,14 +3063,6 @@ "node": ">= 0.6" } }, - "node_modules/event-target-shim": { - "version": "5.0.1", - "resolved": "https://registry.npmmirror.com/event-target-shim/-/event-target-shim-5.0.1.tgz", - "integrity": "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==", - "engines": { - "node": ">=6" - } - }, "node_modules/execa": { "version": "7.2.0", "resolved": "https://registry.npmmirror.com/execa/-/execa-7.2.0.tgz", @@ -3229,9 +3245,9 @@ "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" }, "node_modules/foreground-child": { - "version": "3.1.1", - "resolved": "https://registry.npmmirror.com/foreground-child/-/foreground-child-3.1.1.tgz", - "integrity": "sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==", + "version": "3.2.1", + "resolved": "https://registry.npmmirror.com/foreground-child/-/foreground-child-3.2.1.tgz", + "integrity": "sha512-PXUUyLqrR2XCWICfv6ukppP96sdFwWbNEnfEMt7jNsISjMsvaLNinAHNDYyvkyU+SZG2BTSbT5NjG+vZslfGTA==", "dependencies": { "cross-spawn": "^7.0.0", "signal-exit": "^4.0.1" @@ -3341,9 +3357,9 @@ } }, "node_modules/get-console-process-list": { - "version": "1.0.4", - "resolved": "https://registry.npmmirror.com/get-console-process-list/-/get-console-process-list-1.0.4.tgz", - "integrity": "sha512-vn5MA+CCTMgRuF9fxvJYLC2fMCuBPKQ7RwhA9H2TvMvy33oDivjIqA4mh2NJlUDoZXPcu/1moN3VfyukxxKwpA==", + "version": "1.0.5", + "resolved": "https://registry.npmmirror.com/get-console-process-list/-/get-console-process-list-1.0.5.tgz", + "integrity": "sha512-K73UHh6ht+MXnnuqQAE/5IjlevHV1ePiTy8yBLsZZPxmoY1KHtouW9E2K1bVLeQzHELztb38vFNak6J+2CNCuw==", "hasInstallScript": true, "optional": true, "os": [ @@ -3435,15 +3451,15 @@ } }, "node_modules/glob": { - "version": "10.3.15", - "resolved": "https://registry.npmmirror.com/glob/-/glob-10.3.15.tgz", - "integrity": "sha512-0c6RlJt1TICLyvJYIApxb8GsXoai0KUP7AxKKAtsYXdgJR1mGEUa7DgwShbdk1nly0PYoZj01xd4hzbq3fsjpw==", + "version": "10.4.1", + "resolved": "https://registry.npmmirror.com/glob/-/glob-10.4.1.tgz", + "integrity": "sha512-2jelhlq3E4ho74ZyVLN03oKdAZVUa6UDZzFLVH1H7dnoax+y9qyaq8zBkfDIggjniU19z0wU18y16jMB2eyVIw==", "dependencies": { "foreground-child": "^3.1.0", - "jackspeak": "^2.3.6", - "minimatch": "^9.0.1", - "minipass": "^7.0.4", - "path-scurry": "^1.11.0" + "jackspeak": "^3.1.2", + "minimatch": "^9.0.4", + "minipass": "^7.1.2", + "path-scurry": "^1.11.1" }, "bin": { "glob": "dist/esm/bin.mjs" @@ -3455,6 +3471,20 @@ "url": "https://github.com/sponsors/isaacs" } }, + "node_modules/glob/node_modules/minimatch": { + "version": "9.0.4", + "resolved": "https://registry.npmmirror.com/minimatch/-/minimatch-9.0.4.tgz", + "integrity": "sha512-KqWh+VchfxcMNRAJjj2tnsSJdNbHsVgnkBhTNrW7AjVo6OvLtxw8zfT9oLw1JSohlFzJ8jCoTgaoXvJ+kHt6fw==", + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, "node_modules/globals": { "version": "11.12.0", "resolved": "https://registry.npmmirror.com/globals/-/globals-11.12.0.tgz", @@ -3763,9 +3793,9 @@ "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==" }, "node_modules/jackspeak": { - "version": "2.3.6", - "resolved": "https://registry.npmmirror.com/jackspeak/-/jackspeak-2.3.6.tgz", - "integrity": "sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ==", + "version": "3.4.0", + "resolved": "https://registry.npmmirror.com/jackspeak/-/jackspeak-3.4.0.tgz", + "integrity": "sha512-JVYhQnN59LVPFCEcVa2C3CrEKYacvjRfqIQl+h8oi91aLYQVWRYbxjPcv1bUiUy/kLmQaANrYfNMCO3kuEDHfw==", "dependencies": { "@isaacs/cliui": "^8.0.2" }, @@ -4055,9 +4085,9 @@ } }, "node_modules/minipass": { - "version": "7.1.1", - "resolved": "https://registry.npmmirror.com/minipass/-/minipass-7.1.1.tgz", - "integrity": "sha512-UZ7eQ+h8ywIRAW1hIEl2AqdwzJucU/Kp59+8kkZeSvafXhZjul247BvIJjEVFVeON6d7lM46XX1HXCduKAS8VA==", + "version": "7.1.2", + "resolved": "https://registry.npmmirror.com/minipass/-/minipass-7.1.2.tgz", + "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", "engines": { "node": ">=16 || 14 >=14.17" } @@ -4108,9 +4138,9 @@ "optional": true }, "node_modules/mongodb": { - "version": "6.6.2", - "resolved": "https://registry.npmmirror.com/mongodb/-/mongodb-6.6.2.tgz", - "integrity": "sha512-ZF9Ugo2JCG/GfR7DEb4ypfyJJyiKbg5qBYKRintebj8+DNS33CyGMkWbrS9lara+u+h+yEOGSRiLhFO/g1s1aw==", + "version": "6.7.0", + "resolved": "https://registry.npmmirror.com/mongodb/-/mongodb-6.7.0.tgz", + "integrity": "sha512-TMKyHdtMcO0fYBNORiYdmM25ijsHs+Njs963r4Tro4OQZzqYigAzYQouwWRg4OIaiLRUEGUh/1UAcH5lxdSLIA==", "dependencies": { "@mongodb-js/saslprep": "^1.1.5", "bson": "^6.7.0", @@ -4161,20 +4191,46 @@ } }, "node_modules/mongodb-client-encryption": { - "version": "6.0.0", - "resolved": "https://registry.npmmirror.com/mongodb-client-encryption/-/mongodb-client-encryption-6.0.0.tgz", - "integrity": "sha512-GtqkqlSq19acX006/U1odA3l+gwhvABeoTUlvvgtvSs6qcN3qSHPnur3Z5N4oKOv6fZ7EtT8rIsWP2riI0+Eyg==", + "version": "6.0.1", + "resolved": "https://registry.npmmirror.com/mongodb-client-encryption/-/mongodb-client-encryption-6.0.1.tgz", + "integrity": "sha512-u6pKu9plR7hQH6VtsfYonC9dwWAM3HFEpi+Xy3EJIdUyoH6dlFgaxX8TnKx/Ycfi2I1cxTXq2IbhSpg157vVgg==", "hasInstallScript": true, "optional": true, "dependencies": { "bindings": "^1.5.0", "node-addon-api": "^4.3.0", - "prebuild-install": "^7.1.1" + "prebuild-install": "^7.1.2" }, "engines": { "node": ">=16.20.1" } }, + "node_modules/mongodb-client-encryption/node_modules/prebuild-install": { + "version": "7.1.2", + "resolved": "https://registry.npmmirror.com/prebuild-install/-/prebuild-install-7.1.2.tgz", + "integrity": "sha512-UnNke3IQb6sgarcZIDU3gbMeTp/9SSU1DAIkil7PrqG1vZlBtY5msYccSKSHDqa3hNg436IXK+SNImReuA1wEQ==", + "optional": true, + "dependencies": { + "detect-libc": "^2.0.0", + "expand-template": "^2.0.3", + "github-from-package": "0.0.0", + "minimist": "^1.2.3", + "mkdirp-classic": "^0.5.3", + "napi-build-utils": "^1.0.1", + "node-abi": "^3.3.0", + "pump": "^3.0.0", + "rc": "^1.2.7", + "simple-get": "^4.0.0", + "tar-fs": "^2.0.0", + "tunnel-agent": "^0.6.0" + }, + "bin": { + "prebuild-install": "bin.js" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/mongodb-connection-string-url": { "version": "3.0.1", "resolved": "https://registry.npmmirror.com/mongodb-connection-string-url/-/mongodb-connection-string-url-3.0.1.tgz", @@ -4243,9 +4299,9 @@ } }, "node_modules/node-abi": { - "version": "3.62.0", - "resolved": "https://registry.npmmirror.com/node-abi/-/node-abi-3.62.0.tgz", - "integrity": "sha512-CPMcGa+y33xuL1E0TcNIu4YyaZCxnnvkVaEXrsosR3FxN+fV8xvb7Mzpb7IgKler10qeMkE6+Dp8qJhpzdq35g==", + "version": "3.65.0", + "resolved": "https://registry.npmmirror.com/node-abi/-/node-abi-3.65.0.tgz", + "integrity": "sha512-ThjYBfoDNr08AWx6hGaRbfPwxKV9kVzAzOzlLKbk2CuqXE2xnCh+cbAGnwM3t8Lq4v9rUB7VfondlkBckcJrVA==", "optional": true, "dependencies": { "semver": "^7.3.5" @@ -5413,9 +5469,9 @@ } }, "node_modules/tslib": { - "version": "2.6.2", - "resolved": "https://registry.npmmirror.com/tslib/-/tslib-2.6.2.tgz", - "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + "version": "2.6.3", + "resolved": "https://registry.npmmirror.com/tslib/-/tslib-2.6.3.tgz", + "integrity": "sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==" }, "node_modules/tunnel-agent": { "version": "0.6.0", diff --git a/pkgs/development/tools/mongosh/source.json b/pkgs/development/tools/mongosh/source.json index a5d214f71700..cdebe929bf96 100644 --- a/pkgs/development/tools/mongosh/source.json +++ b/pkgs/development/tools/mongosh/source.json @@ -1,6 +1,6 @@ { - "version": "2.2.6", - "integrity": "sha512-ksL2zesQ82i6/km7ec4Ii3rtFDIPf4tmLDjkts/Kf+l6OGn54lox6sh/eDRMflggm8XYdFOYQFiLADzRtQwVOA==", - "filename": "mongosh-2.2.6.tgz", - "deps": "sha256-/zvqFRIGroP1YLSTlKv+ZKzB4c/Y78mn8BM8lnbqj/M=" + "version": "2.2.9", + "integrity": "sha512-7zROoz9tFqBW3t4aI6pO9S6GmGuDWb9m8hT0w91uL6CXTHUcYH7XM4INR2jr3+qXFYLkaXZ1WQoLgmuoJoSj7g==", + "filename": "mongosh-2.2.9.tgz", + "deps": "sha256-wefY8JDdtabrtlJfsT4iZsCwYIbIxv8T+U2S29Hl2O4=" } diff --git a/pkgs/development/tools/parsing/nex/default.nix b/pkgs/development/tools/parsing/nex/default.nix index 2d3f18cacedd..6a3415660878 100644 --- a/pkgs/development/tools/parsing/nex/default.nix +++ b/pkgs/development/tools/parsing/nex/default.nix @@ -1,12 +1,12 @@ -{ buildGoPackage +{ buildGoModule , fetchFromGitHub , lib }: # upstream is pretty stale, but it still works, so until they merge module # support we have to use gopath: see blynn/nex#57 -buildGoPackage rec { +buildGoModule rec { pname = "nex"; - version = "unstable-2021-03-30"; + version = "0-unstable-2021-03-30"; src = fetchFromGitHub { owner = "blynn"; @@ -15,9 +15,18 @@ buildGoPackage rec { hash = "sha256-DtJkV380T2B5j0+u7lYZfbC0ej0udF4GW2lbRmmbjAM="; }; - goPackagePath = "github.com/blynn/nex"; + vendorHash = null; + + postPatch = '' + go mod init github.com/blynn/nex + ''; + subPackages = [ "." ]; + # Fails with 'nex_test.go:23: got: 7a3661f13445ca7b51de2987bea127d9 wanted: 13f760d2f0dc1743dd7165781f2a318d' + # Checks failed on master before, but buildGoPackage had checks disabled. + doCheck = false; + meta = with lib; { description = "Lexer for Go"; mainProgram = "nex"; diff --git a/pkgs/development/tools/pyenv/default.nix b/pkgs/development/tools/pyenv/default.nix index 007cf3b1dd6a..9f761ef0be27 100644 --- a/pkgs/development/tools/pyenv/default.nix +++ b/pkgs/development/tools/pyenv/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "pyenv"; - version = "2.4.2"; + version = "2.4.3"; src = fetchFromGitHub { owner = "pyenv"; repo = "pyenv"; rev = "refs/tags/v${version}"; - hash = "sha256-hPbXKUg7jl4Dd4m29yaEJVX+jl8c/1oODEcRGTao58w="; + hash = "sha256-jYBKTrpc3KI1iW/VCw4Udk4TS8dXFGg5WgbEWZ+vWqE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/rubyfmt/default.nix b/pkgs/development/tools/rubyfmt/default.nix index 729a58b53383..272fe25a5b14 100644 --- a/pkgs/development/tools/rubyfmt/default.nix +++ b/pkgs/development/tools/rubyfmt/default.nix @@ -76,10 +76,12 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/fables-tales/rubyfmt"; license = licenses.mit; maintainers = with maintainers; [ bobvanderlinden ]; - # = note: Undefined symbols for architecture x86_64: - # "_utimensat", referenced from: - # _utime_internal in librubyfmt-3c969812b3b27083.rlib(file.o) - broken = stdenv.isDarwin && stdenv.isx86_64; + # https://github.com/NixOS/nixpkgs/issues/320722 + broken = true + # = note: Undefined symbols for architecture x86_64: + # "_utimensat", referenced from: + # _utime_internal in librubyfmt-3c969812b3b27083.rlib(file.o) + || stdenv.isDarwin && stdenv.isx86_64; mainProgram = "rubyfmt"; }; } diff --git a/pkgs/development/tools/rust/cargo-depgraph/default.nix b/pkgs/development/tools/rust/cargo-depgraph/default.nix index 1918501d1d92..c4379974a6ab 100644 --- a/pkgs/development/tools/rust/cargo-depgraph/default.nix +++ b/pkgs/development/tools/rust/cargo-depgraph/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-depgraph"; - version = "1.5.0"; + version = "1.6.0"; src = fetchFromSourcehut { owner = "~jplatte"; repo = "cargo-depgraph"; rev = "v${version}"; - hash = "sha256-q9a7O6lSsQz9nJ82uG1oNyNyNebzXEanVWh3xkypqqM="; + hash = "sha256-yvcKRESX2W1oLmQvkl07iG8+I74qDKsaS3amM4pZU8s="; }; - cargoHash = "sha256-gmSNYxyizaVvz38R0nTdUp9nP/f4hxgHO9hVV3RFP6U="; + cargoHash = "sha256-OJOw0V4u/bK4vw3bU2wKVeOqP205ehfZMKJ6qIpYDLU="; meta = with lib; { description = "Create dependency graphs for cargo projects using `cargo metadata` and graphviz"; diff --git a/pkgs/development/tools/rust/cargo-semver-checks/default.nix b/pkgs/development/tools/rust/cargo-semver-checks/default.nix index 006c5ea75b1d..82fa17b3405a 100644 --- a/pkgs/development/tools/rust/cargo-semver-checks/default.nix +++ b/pkgs/development/tools/rust/cargo-semver-checks/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-semver-checks"; - version = "0.31.0"; + version = "0.32.0"; src = fetchFromGitHub { owner = "obi1kenobi"; repo = pname; rev = "v${version}"; - hash = "sha256-iumHMVDlgwjjQsn0aoSJUPoOKmLztD47b7he2nJhins="; + hash = "sha256-2B9i9S6OY+7DEorZoXfQQx9cEU2Y8FoyIyytJ8C7dXU="; }; - cargoHash = "sha256-/mrVrbPHi4lo2iu/IWwDYIjqWZYNkm/4lWpRMLKBNpA="; + cargoHash = "sha256-S03fgnefhU6c5e9YtFMBart+nfBQj7f4O+lSPe8fgqg="; nativeBuildInputs = [ cmake diff --git a/pkgs/development/tools/typos/default.nix b/pkgs/development/tools/typos/default.nix index a908207182c0..b70e8448717b 100644 --- a/pkgs/development/tools/typos/default.nix +++ b/pkgs/development/tools/typos/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "typos"; - version = "1.22.3"; + version = "1.22.7"; src = fetchFromGitHub { owner = "crate-ci"; repo = pname; rev = "v${version}"; - hash = "sha256-0al9U7UFqG/ljMtT2xJnyroRz4mGhvM7ZtIs/YkcNIs="; + hash = "sha256-417z9N8oC0kIqBs63fP/xdry5EFmlnyWDryKaJITtZQ="; }; - cargoHash = "sha256-Nn5ein7W4H58fIq8MZsGkwrF1zA5rTO95Uqe/VuL0W8="; + cargoHash = "sha256-Ol/pk3/9StHzEFHXcsSS9APUXf8hjnY7fwmF1mWtsVE="; meta = with lib; { description = "Source code spell checker"; diff --git a/pkgs/development/tools/unconvert/default.nix b/pkgs/development/tools/unconvert/default.nix index 21c0d08ab5ac..478a111555a6 100644 --- a/pkgs/development/tools/unconvert/default.nix +++ b/pkgs/development/tools/unconvert/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "unconvert"; - version = "unstable-2022-09-18"; + version = "0-unstable-2023-09-07"; src = fetchFromGitHub { owner = "mdempsky"; repo = "unconvert"; - rev = "3f84926d692329767c21c2aef3dfb7889c956832"; - sha256 = "sha256-vcRHriFCT5b8SKjtRSg+kZDcCAKySC1cKVq+FMZb+9M="; + rev = "415706980c061b6f71ea923bd206aec88785638f"; + hash = "sha256-MchA8uvy+MyQ/VaglBDTC7j/lNIKAtGeeECLoFfH6pI="; }; - vendorHash = "sha256-p77mLvGtohmC8J+bqqkM5kqc1pMPcFx7GhXOZ4q4jeM="; + vendorHash = "sha256-vZDk+ZNCMP5RRNrgeIowdOKPot7rqM84JhlbfvcQbB4="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix index de2b1ab03e8c..f328190773ae 100644 --- a/pkgs/development/web/flyctl/default.nix +++ b/pkgs/development/web/flyctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "flyctl"; - version = "0.2.69"; + version = "0.2.71"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - hash = "sha256-6SPJt+az+C0amCnRScp85JqUfnWswHdS1OtOMa40Haw="; + hash = "sha256-d2qoTRWuUh7Kn0uqT3fIlB8BbFJmyVEIlfInS3m+etc="; }; - vendorHash = "sha256-O5lUw0XzQUoy3mAmSpeW6WfBgg0FLxXkk7hCUAS2+o8="; + vendorHash = "sha256-iRZrjkWQxuUW/YM5TygFt+g8suM5iLGsWsCt4QQOX3M="; subPackages = [ "." ]; @@ -35,12 +35,14 @@ buildGoModule rec { ''; # We override checkPhase to be able to test ./... while using subPackages + # Temporary fix for https://github.com/superfly/flyctl/issues/3642. We + # should go back to buildGoDir instead of go test once that is resolved. checkPhase = '' runHook preCheck # We do not set trimpath for tests, in case they reference test assets export GOFLAGS=''${GOFLAGS//-trimpath/} - buildGoDir test ./... + go test ./... runHook postCheck ''; diff --git a/pkgs/development/web/nodejs/v22.nix b/pkgs/development/web/nodejs/v22.nix index 676ef1c7e545..ec5cc40cc9c2 100644 --- a/pkgs/development/web/nodejs/v22.nix +++ b/pkgs/development/web/nodejs/v22.nix @@ -8,8 +8,8 @@ let in buildNodejs { inherit enableNpm; - version = "22.2.0"; - sha256 = "sha256-iJkIqIKNFISRDX5lm2qlet6NUo/w45Dpp372WadihHQ="; + version = "22.3.0"; + sha256 = "0k0h4s9s2y0ms3g6xhynsqsrkl9hz001dmj6j0gpc5x5vk8mpf5z"; patches = [ ./disable-darwin-v8-system-instrumentation-node19.patch ./bypass-darwin-xcrun-node16.patch diff --git a/pkgs/kde/generated/dependencies.json b/pkgs/kde/generated/dependencies.json index 70f5499bfdbc..371a13bf633b 100644 --- a/pkgs/kde/generated/dependencies.json +++ b/pkgs/kde/generated/dependencies.json @@ -492,7 +492,6 @@ "extra-cmake-modules", "karchive", "kcmutils", - "kcodecs", "kcompletion", "kconfig", "kconfigwidgets", @@ -514,7 +513,6 @@ "kwidgetsaddons", "kwindowsystem", "kxmlgui", - "plasma-activities", "sonnet", "threadweaver" ], @@ -700,6 +698,7 @@ "packagekit-qt", "phonon", "plasma-activities", + "selenium-webdriver-at-spi", "solid" ], "dolphin-plugins": [ @@ -879,6 +878,15 @@ "kxmlgui", "sonnet" ], + "glaxnimate": [ + "extra-cmake-modules", + "karchive", + "kcompletion", + "kconfigwidgets", + "kcoreaddons", + "kcrash", + "kxmlgui" + ], "granatier": [ "extra-cmake-modules", "kconfig", @@ -1035,8 +1043,11 @@ "kwindowsystem", "libquotient", "networkmanager-qt", + "plasma-integration", "prison", - "qqc2-desktop-style" + "qqc2-breeze-style", + "qqc2-desktop-style", + "selenium-webdriver-at-spi" ], "juk": [ "kcompletion", @@ -1858,6 +1869,7 @@ "kwidgetsaddons", "kxmlgui", "libplasma", + "plasma-desktop", "plasma-nano", "plasma-workspace", "plasma5support", @@ -2056,7 +2068,6 @@ "kdoctools", "ki18n", "kio", - "kparts", "kwidgetsaddons", "kxmlgui" ], @@ -2975,6 +2986,21 @@ "ktextwidgets", "kwidgetsaddons" ], + "kmuddy": [ + "extra-cmake-modules", + "karchive", + "kcmutils", + "kconfig", + "kcoreaddons", + "ki18n", + "kiconthemes", + "kio", + "knotifications", + "kservice", + "ktextwidgets", + "kwidgetsaddons", + "kxmlgui" + ], "kmymoney": [ "akonadi", "alkimia", @@ -3182,6 +3208,19 @@ "kxmlgui", "syntax-highlighting" ], + "kompare": [ + "extra-cmake-modules", + "kcodecs", + "kconfig", + "kcoreaddons", + "kdoctools", + "kiconthemes", + "kjobwidgets", + "kparts", + "ktexteditor", + "kwidgetsaddons", + "libkomparediff2" + ], "kongress": [ "extra-cmake-modules", "kcalendarcore", @@ -3511,6 +3550,14 @@ "kxmlgui", "plasma-activities" ], + "krdp": [ + "extra-cmake-modules", + "kcmutils", + "kconfig", + "kdbusaddons", + "kpipewire", + "kstatusnotifieritem" + ], "krecorder": [ "extra-cmake-modules", "kconfig", @@ -3671,6 +3718,7 @@ "kconfigwidgets", "kcoreaddons", "kcrash", + "kdeclarative", "kglobalaccel", "ki18n", "kidletime", @@ -4349,6 +4397,14 @@ "ki18n", "kwidgetsaddons" ], + "libkomparediff2": [ + "extra-cmake-modules", + "kconfig", + "kcoreaddons", + "ki18n", + "kio", + "kxmlgui" + ], "libksane": [ "extra-cmake-modules", "ki18n", @@ -4433,6 +4489,7 @@ "kdbusaddons", "ki18n", "kirigami", + "kirigami-addons", "kitemmodels" ], "lokalize": [ @@ -4500,6 +4557,7 @@ "kcolorscheme", "kconfig", "kcoreaddons", + "kcrash", "ki18n", "kirigami", "kirigami-addons", @@ -5186,6 +5244,7 @@ "ksvg", "libplasma", "plasma-workspace", + "pulseaudio-qt", "selenium-webdriver-at-spi" ], "plasma-pass": [ @@ -5274,6 +5333,7 @@ "kconfig", "kcoreaddons", "kdbusaddons", + "kdeclarative", "kglobalaccel", "ki18n", "kiconthemes", @@ -5405,6 +5465,7 @@ "plasma5support", "polkit-qt-1", "prison", + "qcoro", "qqc2-desktop-style", "selenium-webdriver-at-spi", "solid", @@ -5416,8 +5477,14 @@ "extra-cmake-modules", "kconfig", "kcoreaddons", + "kguiaddons", "ki18n", - "libplasma" + "kio", + "knotifications", + "kservice", + "libksysguard", + "libplasma", + "solid" ], "plasmatube": [ "extra-cmake-modules", @@ -5761,13 +5828,6 @@ "kxmlgui", "plasma-activities" ], - "smaragd": [ - "kconfig", - "kcoreaddons", - "kdecoration", - "ki18n", - "kwidgetsaddons" - ], "smb4k": [ "extra-cmake-modules", "kauth", @@ -5979,6 +6039,7 @@ "kconfig", "kcoreaddons", "kdbusaddons", + "kdeclarative", "ki18n", "kio", "kirigami", @@ -6146,5 +6207,5 @@ "kwindowsystem" ] }, - "version": "525ad8d3" + "version": "558e00a4" } \ No newline at end of file diff --git a/pkgs/kde/generated/licenses.json b/pkgs/kde/generated/licenses.json index 1b6a47dc218c..c0890c5a7ed0 100644 --- a/pkgs/kde/generated/licenses.json +++ b/pkgs/kde/generated/licenses.json @@ -1755,6 +1755,15 @@ "CC0-1.0", "GPL-2.0-or-later" ], + "krdp": [ + "BSD-2-Clause", + "CC0-1.0", + "GPL-2.0-or-later", + "LGPL-2.0-or-later", + "LGPL-2.1-only", + "LGPL-3.0-only", + "LicenseRef-KDE-Accepted-LGPL" + ], "krecorder": [ "BSD-3-Clause", "CC-BY-4.0", @@ -2076,7 +2085,10 @@ "layer-shell-qt": [ "BSD-3-Clause", "CC0-1.0", + "LGPL-2.1-only", + "LGPL-3.0-only", "LGPL-3.0-or-later", + "LicenseRef-KDE-Accepted-LGPL", "MIT" ], "libgravatar": [ @@ -2526,6 +2538,7 @@ "LicenseRef-Qt-Commercial" ], "plasma-mobile": [ + "Apache-2.0", "BSD-3-Clause", "CC0-1.0", "GPL-2.0-only", @@ -2635,9 +2648,11 @@ ], "plasma-workspace-wallpapers": [], "plasma5support": [ + "BSD-3-Clause", "CC0-1.0", "GPL-2.0-or-later", - "LGPL-2.0-or-later" + "LGPL-2.0-or-later", + "LGPL-2.1-or-later" ], "plasmatube": [ "CC-BY-SA-4.0", @@ -2667,6 +2682,7 @@ "GPL-2.0-or-later", "GPL-3.0-only", "LGPL-2.0-only", + "LGPL-2.0-or-later", "LGPL-2.1-only", "LGPL-2.1-or-later", "LGPL-3.0-only", @@ -2831,7 +2847,6 @@ "GPL-2.0-only", "GPL-2.0-or-later", "GPL-3.0-only", - "GPL-3.0-or-later", "LGPL-2.0-only", "LGPL-2.1-or-later", "LicenseRef-KDE-Accepted-GPL" diff --git a/pkgs/kde/generated/projects.json b/pkgs/kde/generated/projects.json index d798654c27d8..5af72a4c52d1 100644 --- a/pkgs/kde/generated/projects.json +++ b/pkgs/kde/generated/projects.json @@ -1001,6 +1001,12 @@ "project_path": "unmaintained/flickr-runner", "repo_path": "unmaintained/flickr-runner" }, + "foss-public-alert-server": { + "description": "Open source server that allows desktop applications to receive near real-time push notifications about emergency alerts worldwide.", + "name": "foss-public-alert-server", + "project_path": "playground/www/foss-public-alert-server", + "repo_path": "webapps/foss-public-alert-server" + }, "frameworkintegration": { "description": "Framework providing components to allow applications to integrate with a KDE Workspace", "name": "frameworkintegration", diff --git a/pkgs/kde/generated/sources/plasma.json b/pkgs/kde/generated/sources/plasma.json index e44e3b0e2cc9..dd11c14e8927 100644 --- a/pkgs/kde/generated/sources/plasma.json +++ b/pkgs/kde/generated/sources/plasma.json @@ -1,317 +1,322 @@ { "bluedevil": { - "version": "6.0.5.1", - "url": "mirror://kde/stable/plasma/6.0.5/bluedevil-6.0.5.1.tar.xz", - "hash": "sha256-Zvzi1J9qxxa1UeMDD47T9xvuwEKNofma9+lZvJD1POI=" + "version": "6.1.0", + "url": "mirror://kde/stable/plasma/6.1.0/bluedevil-6.1.0.tar.xz", + "hash": "sha256-9ZWwZUgK+o/B57VXPaJGqOJ2h08KGeqwz8tUBKymBoQ=" }, "breeze": { - "version": "6.0.5", - "url": "mirror://kde/stable/plasma/6.0.5/breeze-6.0.5.tar.xz", - "hash": "sha256-8kndRGT02mtoGvXE/Q6BF4EnKUstRBE087EOJwP1c3Q=" + "version": "6.1.0", + "url": "mirror://kde/stable/plasma/6.1.0/breeze-6.1.0.tar.xz", + "hash": "sha256-9xuPTnZ35WhWdqxy+WEBWFPelZseCLpzU5FHzse9HQ4=" }, "breeze-grub": { - "version": "6.0.5", - "url": "mirror://kde/stable/plasma/6.0.5/breeze-grub-6.0.5.tar.xz", - "hash": "sha256-w9+KYNSYv0WYvGwW1hmnVxdQRnPB9Q9YHN+aZ428f+I=" + "version": "6.1.0", + "url": "mirror://kde/stable/plasma/6.1.0/breeze-grub-6.1.0.tar.xz", + "hash": "sha256-VglghrnChFxWsUMK+8Rsb6cLiLnxMpvm/XWEm8BmiQ8=" }, "breeze-gtk": { - "version": "6.0.5", - "url": "mirror://kde/stable/plasma/6.0.5/breeze-gtk-6.0.5.tar.xz", - "hash": "sha256-Uez1bnWimp5P26cG9MKE2W+YsPGLCqnYZkIYw22UuRI=" + "version": "6.1.0", + "url": "mirror://kde/stable/plasma/6.1.0/breeze-gtk-6.1.0.tar.xz", + "hash": "sha256-F3tosQ/23CLiryzXAq2T6aLksWbGofPfyx1jgl4mWns=" }, "breeze-plymouth": { - "version": "6.0.5", - "url": "mirror://kde/stable/plasma/6.0.5/breeze-plymouth-6.0.5.tar.xz", - "hash": "sha256-/hcQ+oYSTOCvENFgXMN1cW0/LP6aT87X9PSg6lhYBr4=" + "version": "6.1.0", + "url": "mirror://kde/stable/plasma/6.1.0/breeze-plymouth-6.1.0.tar.xz", + "hash": "sha256-Gd8toIZclKuMhfWM0tiVZfQ3nci8iFFmsgGto6mTRc8=" }, "discover": { - "version": "6.0.5", - "url": "mirror://kde/stable/plasma/6.0.5/discover-6.0.5.tar.xz", - "hash": "sha256-lEygP+Ex4OkveVsy5Of8cUyaWfwYpLvan1BAjQxq85U=" + "version": "6.1.0", + "url": "mirror://kde/stable/plasma/6.1.0/discover-6.1.0.tar.xz", + "hash": "sha256-vrkjioN4fcaAMKrB7rpSE4rwOcB8SrL/jez+noYgOwg=" }, "drkonqi": { - "version": "6.0.5", - "url": "mirror://kde/stable/plasma/6.0.5/drkonqi-6.0.5.tar.xz", - "hash": "sha256-EBX5rXNMxOULEK0kNqYGYddLDex0hyW+kIIQMzMCmF0=" + "version": "6.1.0", + "url": "mirror://kde/stable/plasma/6.1.0/drkonqi-6.1.0.tar.xz", + "hash": "sha256-5/KbSC0C6HFK0mh/OObtIR8qXpLIVGa5NDIRIBlLp9Q=" }, "flatpak-kcm": { - "version": "6.0.5", - "url": "mirror://kde/stable/plasma/6.0.5/flatpak-kcm-6.0.5.tar.xz", - "hash": "sha256-dBuUbAfQ1OUJ+M8pabIx5fNxAg1y+idqb35hY80nDOM=" + "version": "6.1.0", + "url": "mirror://kde/stable/plasma/6.1.0/flatpak-kcm-6.1.0.tar.xz", + "hash": "sha256-DykHMvPm7nxOTmnAal3eROvc1eq1GNeC1Av+EAALlic=" }, "kactivitymanagerd": { - "version": "6.0.5", - "url": "mirror://kde/stable/plasma/6.0.5/kactivitymanagerd-6.0.5.tar.xz", - "hash": "sha256-We+Wj6CZDteuxmgr28jFHfEiSil5NAhMRjBgvJFv4J4=" + "version": "6.1.0", + "url": "mirror://kde/stable/plasma/6.1.0/kactivitymanagerd-6.1.0.tar.xz", + "hash": "sha256-yy5tpju5hPZdRbvTB4QEzWVGNT7TwtyTx7QJeNqCdzY=" }, "kde-cli-tools": { - "version": "6.0.5", - "url": "mirror://kde/stable/plasma/6.0.5/kde-cli-tools-6.0.5.tar.xz", - "hash": "sha256-wAJ64E5pHGkuGowFZdZ3n7Nuyw16949mY7kjD0WBso8=" + "version": "6.1.0", + "url": "mirror://kde/stable/plasma/6.1.0/kde-cli-tools-6.1.0.tar.xz", + "hash": "sha256-vE4iYriz4Y3sAQ7BvqT23c1fNqEnX4TRK29uhjs2Xb4=" }, "kde-gtk-config": { - "version": "6.0.5", - "url": "mirror://kde/stable/plasma/6.0.5/kde-gtk-config-6.0.5.tar.xz", - "hash": "sha256-tCKWn3sid9g9eppm25m5mcA8sKtKUDHgCwzN77pX74M=" + "version": "6.1.0", + "url": "mirror://kde/stable/plasma/6.1.0/kde-gtk-config-6.1.0.tar.xz", + "hash": "sha256-kreRiz7qxjkJiX29odEsTDMlAoF8MIGVYcxTidoRuO8=" }, "kdecoration": { - "version": "6.0.5", - "url": "mirror://kde/stable/plasma/6.0.5/kdecoration-6.0.5.tar.xz", - "hash": "sha256-CjxRYcA+i6ED/BCWarveKY3pjiXJRaJK4IpTmnhnAiQ=" + "version": "6.1.0", + "url": "mirror://kde/stable/plasma/6.1.0/kdecoration-6.1.0.tar.xz", + "hash": "sha256-hi6xlzLtGEZDDE3g71YwKsD5rvWtJgcZ0kMbY9yKr6U=" }, "kdeplasma-addons": { - "version": "6.0.5", - "url": "mirror://kde/stable/plasma/6.0.5/kdeplasma-addons-6.0.5.tar.xz", - "hash": "sha256-kRr0dUhzwXwcp9SfBmnePjhoWLCa3ygng7nFUQV2upU=" + "version": "6.1.0", + "url": "mirror://kde/stable/plasma/6.1.0/kdeplasma-addons-6.1.0.tar.xz", + "hash": "sha256-y1f6QnsxiKG8emsS4Zb8ESUnQuCPY5fjrwD/rzRnYSc=" }, "kgamma": { - "version": "6.0.5", - "url": "mirror://kde/stable/plasma/6.0.5/kgamma-6.0.5.tar.xz", - "hash": "sha256-ZZ3rZG/aFwONRUhpjHrEsIwSZgYjt411Q3pgbWp7rTY=" + "version": "6.1.0", + "url": "mirror://kde/stable/plasma/6.1.0/kgamma-6.1.0.tar.xz", + "hash": "sha256-/HuqscZYq7KfqTgpS3aXpyq8cvDDTo6itM4i281dTfk=" }, "kglobalacceld": { - "version": "6.0.5", - "url": "mirror://kde/stable/plasma/6.0.5/kglobalacceld-6.0.5.tar.xz", - "hash": "sha256-LJs5HA4/kbuLMgApx7l/yBZmWIghBtHfmtRBYAiU/K4=" + "version": "6.1.0", + "url": "mirror://kde/stable/plasma/6.1.0/kglobalacceld-6.1.0.tar.xz", + "hash": "sha256-89sf4gN5iaz/HvDAPqB3eaysr7YD/q7v7vj4SZtoAxA=" }, "kinfocenter": { - "version": "6.0.5", - "url": "mirror://kde/stable/plasma/6.0.5/kinfocenter-6.0.5.tar.xz", - "hash": "sha256-v08sYnJC2CeGcwbE6IR5bH1finoqKURKSUwqytXIiXM=" + "version": "6.1.0", + "url": "mirror://kde/stable/plasma/6.1.0/kinfocenter-6.1.0.tar.xz", + "hash": "sha256-KDyleEkIe8YSldSQX+a/aP98iwGDC4dHn6uavHLbVN4=" }, "kmenuedit": { - "version": "6.0.5", - "url": "mirror://kde/stable/plasma/6.0.5/kmenuedit-6.0.5.tar.xz", - "hash": "sha256-mqHTlyTLoee49t7YxJCs3+EVmO02jCjpqoZXJpjjWfg=" + "version": "6.1.0", + "url": "mirror://kde/stable/plasma/6.1.0/kmenuedit-6.1.0.tar.xz", + "hash": "sha256-KB9/dC0chX+dpjSrCB+9UYSxDWpr3dUpEr9k9DFkQb8=" }, "kpipewire": { - "version": "6.0.5", - "url": "mirror://kde/stable/plasma/6.0.5/kpipewire-6.0.5.tar.xz", - "hash": "sha256-QyfaJDUYbpBlPIcN5zCCp+X7YdE+BqUXywIfHVa30tY=" + "version": "6.1.0", + "url": "mirror://kde/stable/plasma/6.1.0/kpipewire-6.1.0.tar.xz", + "hash": "sha256-/MwoeEHuM8EoPL3Kg1DHji5zneulHyV0FpCaoCbNea0=" + }, + "krdp": { + "version": "6.1.0", + "url": "mirror://kde/stable/plasma/6.1.0/krdp-6.1.0.tar.xz", + "hash": "sha256-MSfrtI0TD/GuuD4KZZj7Iv0LEmS76BqdbD3Sw4qAGJA=" }, "kscreen": { - "version": "6.0.5", - "url": "mirror://kde/stable/plasma/6.0.5/kscreen-6.0.5.tar.xz", - "hash": "sha256-7e2LVYFn2JopqDCnvTx9aSs2XaUpx7blnr2t65Fqk/A=" + "version": "6.1.0", + "url": "mirror://kde/stable/plasma/6.1.0/kscreen-6.1.0.tar.xz", + "hash": "sha256-FivRlneM93bKZGmq0FmAcx/di4JXD8BF+JYSqXq7RAE=" }, "kscreenlocker": { - "version": "6.0.5", - "url": "mirror://kde/stable/plasma/6.0.5/kscreenlocker-6.0.5.tar.xz", - "hash": "sha256-W7lKKg1pzOt+1O/L94a1M4hWfVEKQQ/Z0BvpE9KxY9A=" + "version": "6.1.0", + "url": "mirror://kde/stable/plasma/6.1.0/kscreenlocker-6.1.0.tar.xz", + "hash": "sha256-CjLFLnTRzE6QRKG+KXgHNqoM+uYZ3/Awl9VnfsnxBnE=" }, "ksshaskpass": { - "version": "6.0.5", - "url": "mirror://kde/stable/plasma/6.0.5/ksshaskpass-6.0.5.tar.xz", - "hash": "sha256-bfDu70OgQesabXG6Uk/qxX/B9IrrRFQDZvEkBMxJhrw=" + "version": "6.1.0", + "url": "mirror://kde/stable/plasma/6.1.0/ksshaskpass-6.1.0.tar.xz", + "hash": "sha256-CmWqVI3U7PSYl4WDg10QNxBICYpiPHTKlQx4/BbqJKk=" }, "ksystemstats": { - "version": "6.0.5", - "url": "mirror://kde/stable/plasma/6.0.5/ksystemstats-6.0.5.tar.xz", - "hash": "sha256-vcb6lcC02tkhDHp3NOHCM7xAjwn8r0lhunCa/6H9QoQ=" + "version": "6.1.0", + "url": "mirror://kde/stable/plasma/6.1.0/ksystemstats-6.1.0.tar.xz", + "hash": "sha256-zlm//t8V/P2g+R7kWZVff+j/0r2hNDV1fnCaRAbv6Tw=" }, "kwallet-pam": { - "version": "6.0.5", - "url": "mirror://kde/stable/plasma/6.0.5/kwallet-pam-6.0.5.tar.xz", - "hash": "sha256-JcYRKOrvtWPlAFR/ZQvik+dRJu1fwvrFdO9AzMv9ANs=" + "version": "6.1.0", + "url": "mirror://kde/stable/plasma/6.1.0/kwallet-pam-6.1.0.tar.xz", + "hash": "sha256-sh7YYul1Hf6pOOVXGFrI6qJK4mDveV+5mtdNPEy5aho=" }, "kwayland": { - "version": "6.0.5", - "url": "mirror://kde/stable/plasma/6.0.5/kwayland-6.0.5.tar.xz", - "hash": "sha256-qLiEEdKtlJfifW29ldZH3l6+YxRWHnqNk1/Xmy/nroQ=" + "version": "6.1.0", + "url": "mirror://kde/stable/plasma/6.1.0/kwayland-6.1.0.tar.xz", + "hash": "sha256-xzbPiMgdkHrxPkCo7qR1VHbcIkw19jvPeRUDl130UH0=" }, "kwayland-integration": { - "version": "6.0.5", - "url": "mirror://kde/stable/plasma/6.0.5/kwayland-integration-6.0.5.tar.xz", - "hash": "sha256-sW30rZhRJCo5OHTC1TUgKXMkfduovhP9lZi+hhapoEU=" + "version": "6.1.0", + "url": "mirror://kde/stable/plasma/6.1.0/kwayland-integration-6.1.0.tar.xz", + "hash": "sha256-kblfkvmSZ5UquVTZ1t1+8HZTAHPy0g1A7qICdJfYNsg=" }, "kwin": { - "version": "6.0.5", - "url": "mirror://kde/stable/plasma/6.0.5/kwin-6.0.5.tar.xz", - "hash": "sha256-JC59IQUp7GMbxf4/4KEXo9HU7bHdOmRKr9UIkxL4sNc=" + "version": "6.1.0", + "url": "mirror://kde/stable/plasma/6.1.0/kwin-6.1.0.tar.xz", + "hash": "sha256-UK/9bFwjzCxqjCPXQaZrBvZnnILH/Tyv6mamsGQ7Ty8=" }, "kwrited": { - "version": "6.0.5", - "url": "mirror://kde/stable/plasma/6.0.5/kwrited-6.0.5.tar.xz", - "hash": "sha256-EKtotq1K/3451YlgdNusEGgNDfk/BKzy8tFaPYV/Q1k=" + "version": "6.1.0", + "url": "mirror://kde/stable/plasma/6.1.0/kwrited-6.1.0.tar.xz", + "hash": "sha256-F9z4QZtdDXdevWhQmVPKe3M46/rU51dandc2TpEOIOE=" }, "layer-shell-qt": { - "version": "6.0.5", - "url": "mirror://kde/stable/plasma/6.0.5/layer-shell-qt-6.0.5.tar.xz", - "hash": "sha256-vWv3PcebVh3TjB/HjDc7LvS532nWqCfjBdAREJ2RosI=" + "version": "6.1.0", + "url": "mirror://kde/stable/plasma/6.1.0/layer-shell-qt-6.1.0.tar.xz", + "hash": "sha256-Vb2OgZonmwWf4p2/Rj+PFfgzcHN5xxkVPsdQt7UIIdg=" }, "libkscreen": { - "version": "6.0.5", - "url": "mirror://kde/stable/plasma/6.0.5/libkscreen-6.0.5.tar.xz", - "hash": "sha256-Aad1afNy01TBcqI/LU4GYXAcAk5E2XKXGxRnNeFq4dk=" + "version": "6.1.0", + "url": "mirror://kde/stable/plasma/6.1.0/libkscreen-6.1.0.tar.xz", + "hash": "sha256-wZPUO8wltih3CfGC5OYV9QtKleErutyitxQyBiSvq3Q=" }, "libksysguard": { - "version": "6.0.5", - "url": "mirror://kde/stable/plasma/6.0.5/libksysguard-6.0.5.tar.xz", - "hash": "sha256-ypVPW7V3AL0UuuMjOoIJTqadMiccw+3W0yvPONsj4Xc=" + "version": "6.1.0", + "url": "mirror://kde/stable/plasma/6.1.0/libksysguard-6.1.0.tar.xz", + "hash": "sha256-bR6a964QsSSrYqynDi89oVt0KnL3wGRvjCGff0tl42o=" }, "libplasma": { - "version": "6.0.5", - "url": "mirror://kde/stable/plasma/6.0.5/libplasma-6.0.5.tar.xz", - "hash": "sha256-01dlwDmQHnObAU/5JkDGzUpNhSTCb+TQC9E00WqwzNI=" + "version": "6.1.0", + "url": "mirror://kde/stable/plasma/6.1.0/libplasma-6.1.0.tar.xz", + "hash": "sha256-7SXwTKaKBAlkt7zbBDy3C+69+HgMYwJqWyyxPGu+dTs=" }, "milou": { - "version": "6.0.5", - "url": "mirror://kde/stable/plasma/6.0.5/milou-6.0.5.tar.xz", - "hash": "sha256-cI4YtbQkmFoWdQfptZNN6TxlrK8vUkRmMS0JUV64Qs8=" + "version": "6.1.0", + "url": "mirror://kde/stable/plasma/6.1.0/milou-6.1.0.tar.xz", + "hash": "sha256-e2gqTq2FrW28MoI7jU3JQbSVHlBwn9TTPNml3DSJvkY=" }, "ocean-sound-theme": { - "version": "6.0.5", - "url": "mirror://kde/stable/plasma/6.0.5/ocean-sound-theme-6.0.5.tar.xz", - "hash": "sha256-YBXzkxp0E0/dfu9cfHWS74t0D8wITXcm+N+ZPcUon2s=" + "version": "6.1.0", + "url": "mirror://kde/stable/plasma/6.1.0/ocean-sound-theme-6.1.0.tar.xz", + "hash": "sha256-nsZVxPPxT55qBEUP2yyomn97Ve228X7TbZr1ZuvgBfA=" }, "oxygen": { - "version": "6.0.5", - "url": "mirror://kde/stable/plasma/6.0.5/oxygen-6.0.5.tar.xz", - "hash": "sha256-flQ3LW/ca3Nz2UjZSJ8+lLRXpvIqjwD26t4zzYPOgCI=" + "version": "6.1.0", + "url": "mirror://kde/stable/plasma/6.1.0/oxygen-6.1.0.tar.xz", + "hash": "sha256-paAuWqy8qCjJhd+Nqbyq0LabVfymjBLwyvhS5woPW20=" }, "oxygen-sounds": { - "version": "6.0.5", - "url": "mirror://kde/stable/plasma/6.0.5/oxygen-sounds-6.0.5.tar.xz", - "hash": "sha256-azR0er1oOQF9DqzB1SyFtSbbtnggH8TMNxknhnElOVI=" + "version": "6.1.0", + "url": "mirror://kde/stable/plasma/6.1.0/oxygen-sounds-6.1.0.tar.xz", + "hash": "sha256-7sCIyky+3zmafrYlAT0b8bOTPgGAb8eeFZeS2X9jQ9E=" }, "plasma-activities": { - "version": "6.0.5", - "url": "mirror://kde/stable/plasma/6.0.5/plasma-activities-6.0.5.tar.xz", - "hash": "sha256-iBGHa8aQJ47NczsjOsRepPuwa8GmLZ4XuSaKpNBeplg=" + "version": "6.1.0", + "url": "mirror://kde/stable/plasma/6.1.0/plasma-activities-6.1.0.tar.xz", + "hash": "sha256-z3rQIIRAVqYvW9jXkrW8/cJV6gU97FHA+RBAJj9P+fg=" }, "plasma-activities-stats": { - "version": "6.0.5", - "url": "mirror://kde/stable/plasma/6.0.5/plasma-activities-stats-6.0.5.tar.xz", - "hash": "sha256-16qv+XsfDDyUGxNKM/d9la8JXLsaZO/nQdev0VyYe18=" + "version": "6.1.0", + "url": "mirror://kde/stable/plasma/6.1.0/plasma-activities-stats-6.1.0.tar.xz", + "hash": "sha256-0R3Rla1kK7BXW/13fBMjvq6opk2VkW0iH8b8ZytV7RU=" }, "plasma-browser-integration": { - "version": "6.0.5", - "url": "mirror://kde/stable/plasma/6.0.5/plasma-browser-integration-6.0.5.tar.xz", - "hash": "sha256-MNzpVeJ6p2VsgnWCQK3umPJ3NglrwPgyodEDTM8+5Bg=" + "version": "6.1.0", + "url": "mirror://kde/stable/plasma/6.1.0/plasma-browser-integration-6.1.0.tar.xz", + "hash": "sha256-8dpzTyPiLMUBPtpriuL/4nQ/lNN/EzQKxXXCFne5A5Y=" }, "plasma-desktop": { - "version": "6.0.5", - "url": "mirror://kde/stable/plasma/6.0.5/plasma-desktop-6.0.5.tar.xz", - "hash": "sha256-XZABuuoy41BVM3Zn8gTijyBuvMqgoXLg8QlCa6gELs8=" + "version": "6.1.0", + "url": "mirror://kde/stable/plasma/6.1.0/plasma-desktop-6.1.0.tar.xz", + "hash": "sha256-ATHGaI2bAhBn5G0cFLiiWJXwbQ9Pdx/15J3kFgRJJM4=" }, "plasma-disks": { - "version": "6.0.5", - "url": "mirror://kde/stable/plasma/6.0.5/plasma-disks-6.0.5.tar.xz", - "hash": "sha256-Mh7C8xdwQiOZcnjvS/O5zwEuL/rsWo1X5X/qxoFOOtg=" + "version": "6.1.0", + "url": "mirror://kde/stable/plasma/6.1.0/plasma-disks-6.1.0.tar.xz", + "hash": "sha256-VKxFan5XP+6c6LkXUL+9q+CfG0+fQt1+qRU9dyfgthE=" }, "plasma-firewall": { - "version": "6.0.5", - "url": "mirror://kde/stable/plasma/6.0.5/plasma-firewall-6.0.5.tar.xz", - "hash": "sha256-C1LnQTzHRdl7sWo4rEBhL/t9x+QyPhVvoX2SNCXEsw4=" + "version": "6.1.0", + "url": "mirror://kde/stable/plasma/6.1.0/plasma-firewall-6.1.0.tar.xz", + "hash": "sha256-sct/qtoHGU6D/PH93wXF/pK2zvSi7LQUgbPMkCQXBwo=" }, "plasma-integration": { - "version": "6.0.5", - "url": "mirror://kde/stable/plasma/6.0.5/plasma-integration-6.0.5.tar.xz", - "hash": "sha256-f4FoP/j4puI9XJjps/O8PWOKvU3K1OQNJ0RsACkAT/A=" + "version": "6.1.0", + "url": "mirror://kde/stable/plasma/6.1.0/plasma-integration-6.1.0.tar.xz", + "hash": "sha256-8P/6n80DVp9sgI6NwecQfAjzC61o/m6PzD3ancB/v6c=" }, "plasma-mobile": { - "version": "6.0.5", - "url": "mirror://kde/stable/plasma/6.0.5/plasma-mobile-6.0.5.tar.xz", - "hash": "sha256-hx0BuUCuMPHjzxt0jWaoluRa473G1rHodfKMlWTwVpQ=" + "version": "6.1.0", + "url": "mirror://kde/stable/plasma/6.1.0/plasma-mobile-6.1.0.tar.xz", + "hash": "sha256-hvATS/pn8QwgdExI3JGIfb7pba4k8BeaU0m3XmoJwvg=" }, "plasma-nano": { - "version": "6.0.5", - "url": "mirror://kde/stable/plasma/6.0.5/plasma-nano-6.0.5.tar.xz", - "hash": "sha256-F4dSBUjZukxoajwhuvM7pxdmGeYOcOjOvuymQcPFlgE=" + "version": "6.1.0", + "url": "mirror://kde/stable/plasma/6.1.0/plasma-nano-6.1.0.tar.xz", + "hash": "sha256-01m8dwqVD7ear4OpyWQg+K2M/zJO1Q54T4SpPatxATU=" }, "plasma-nm": { - "version": "6.0.5", - "url": "mirror://kde/stable/plasma/6.0.5/plasma-nm-6.0.5.tar.xz", - "hash": "sha256-LFK3WpYe/Quf2e86bOtPS8U53p763DoMAIeZ12+U+Oc=" + "version": "6.1.0", + "url": "mirror://kde/stable/plasma/6.1.0/plasma-nm-6.1.0.tar.xz", + "hash": "sha256-U1Kv+bZzUYYJRQANCXID1TvhJMDxB8h7MkKBiYD1RpA=" }, "plasma-pa": { - "version": "6.0.5", - "url": "mirror://kde/stable/plasma/6.0.5/plasma-pa-6.0.5.tar.xz", - "hash": "sha256-7L87tAcggJSByraFfnwbNDaKE50RYrAM1GssxjzZqsQ=" + "version": "6.1.0", + "url": "mirror://kde/stable/plasma/6.1.0/plasma-pa-6.1.0.tar.xz", + "hash": "sha256-4squGRC7896AJHvUZUWNPXmI5s5gNOtj2pdj7xqtJjk=" }, "plasma-sdk": { - "version": "6.0.5", - "url": "mirror://kde/stable/plasma/6.0.5/plasma-sdk-6.0.5.tar.xz", - "hash": "sha256-EeVgkilQMQvf9UmfibMWE9Tr4HBW7FeDuCYCsPm+jvs=" + "version": "6.1.0", + "url": "mirror://kde/stable/plasma/6.1.0/plasma-sdk-6.1.0.tar.xz", + "hash": "sha256-oDKFPYakiYW9MTlCD67m6q7nV5YsG4zveNQ0BGCtS08=" }, "plasma-systemmonitor": { - "version": "6.0.5", - "url": "mirror://kde/stable/plasma/6.0.5/plasma-systemmonitor-6.0.5.tar.xz", - "hash": "sha256-ZiUY5tx2PRnL2HjBRaN2GmouJ2X9I3J4/90KKlJTCAs=" + "version": "6.1.0", + "url": "mirror://kde/stable/plasma/6.1.0/plasma-systemmonitor-6.1.0.tar.xz", + "hash": "sha256-tJqhz3tvhOp99xFyml0/b9AAREviorkP9l4Nu63JEiQ=" }, "plasma-thunderbolt": { - "version": "6.0.5", - "url": "mirror://kde/stable/plasma/6.0.5/plasma-thunderbolt-6.0.5.tar.xz", - "hash": "sha256-WZfeM874a3tsRK3Oai4dO7U2x9eqQ+HjUN0Ov3fLZlg=" + "version": "6.1.0", + "url": "mirror://kde/stable/plasma/6.1.0/plasma-thunderbolt-6.1.0.tar.xz", + "hash": "sha256-OG/68iQGUBzoWE6MjIY0TS6RGa+BFYgoJT5TDDVFwI0=" }, "plasma-vault": { - "version": "6.0.5", - "url": "mirror://kde/stable/plasma/6.0.5/plasma-vault-6.0.5.tar.xz", - "hash": "sha256-L+PMc/e+9NTGR26gz9MuMl1bhx/fz/XBFB8gPd4L6U0=" + "version": "6.1.0", + "url": "mirror://kde/stable/plasma/6.1.0/plasma-vault-6.1.0.tar.xz", + "hash": "sha256-tItJkyeQS4fto8v4+BSQRFDZO37vr5U8Y9HzfdnW0j0=" }, "plasma-welcome": { - "version": "6.0.5", - "url": "mirror://kde/stable/plasma/6.0.5/plasma-welcome-6.0.5.tar.xz", - "hash": "sha256-XChjJlDcoDD9mpNl28Vv4ImObUhjwkYlrW5QPBzCPsY=" + "version": "6.1.0", + "url": "mirror://kde/stable/plasma/6.1.0/plasma-welcome-6.1.0.tar.xz", + "hash": "sha256-GDF8qwiZixUExd2JFAN6QMqV7bRA9FxhN6Zq/fii9wA=" }, "plasma-workspace": { - "version": "6.0.5.1", - "url": "mirror://kde/stable/plasma/6.0.5/plasma-workspace-6.0.5.1.tar.xz", - "hash": "sha256-iQf5/e1fxuXZU1X4NGMo3hjXyIUNq9kQnXVFjVru2BM=" + "version": "6.1.0", + "url": "mirror://kde/stable/plasma/6.1.0/plasma-workspace-6.1.0.tar.xz", + "hash": "sha256-9PVC5vIB9GCA7m+5Ztn4lYEajc19TxikxsSM4MNaEnw=" }, "plasma-workspace-wallpapers": { - "version": "6.0.5", - "url": "mirror://kde/stable/plasma/6.0.5/plasma-workspace-wallpapers-6.0.5.tar.xz", - "hash": "sha256-fqtNNHNe3/oSIrK1X9JEjX9iNeReAKG/mpRQ1za1O/A=" + "version": "6.1.0", + "url": "mirror://kde/stable/plasma/6.1.0/plasma-workspace-wallpapers-6.1.0.tar.xz", + "hash": "sha256-DLke5HhfzK04Pivi3RWwRFD4vAWUw5hvdYYP3tykZ1E=" }, "plasma5support": { - "version": "6.0.5", - "url": "mirror://kde/stable/plasma/6.0.5/plasma5support-6.0.5.tar.xz", - "hash": "sha256-ioEefbocMK4mKJNMTakdLfpC3JMihul9rIlwZGKHuHo=" + "version": "6.1.0", + "url": "mirror://kde/stable/plasma/6.1.0/plasma5support-6.1.0.tar.xz", + "hash": "sha256-4YMrMhq+krNzamEDdB7C1BZFMR2CKVXznsyJOOStVyo=" }, "plymouth-kcm": { - "version": "6.0.5", - "url": "mirror://kde/stable/plasma/6.0.5/plymouth-kcm-6.0.5.tar.xz", - "hash": "sha256-veWy0OMBjv2oB44yrqN0dTtOJRdxTJkUnl+Y0EbxJu8=" + "version": "6.1.0", + "url": "mirror://kde/stable/plasma/6.1.0/plymouth-kcm-6.1.0.tar.xz", + "hash": "sha256-fS3hRSIl3UUmx0YZMAWTxY2s8PY7OApE2RyO6vLBvKs=" }, "polkit-kde-agent-1": { - "version": "6.0.5", - "url": "mirror://kde/stable/plasma/6.0.5/polkit-kde-agent-1-6.0.5.tar.xz", - "hash": "sha256-cs+jZ/3UayyRduR80TB/LqccAgfy49zPBtKS3OTUSKk=" + "version": "6.1.0", + "url": "mirror://kde/stable/plasma/6.1.0/polkit-kde-agent-1-6.1.0.tar.xz", + "hash": "sha256-QQaWh6qBGJvYMwyp0IHiFXnkbYFek4SdWHQeq+Fn7sI=" }, "powerdevil": { - "version": "6.0.5", - "url": "mirror://kde/stable/plasma/6.0.5/powerdevil-6.0.5.tar.xz", - "hash": "sha256-J/mVvObyfjW3jgwjL43uj7pQ+5HXs6/RF1g723mhL9Q=" + "version": "6.1.0", + "url": "mirror://kde/stable/plasma/6.1.0/powerdevil-6.1.0.tar.xz", + "hash": "sha256-RFsqU2a8HWSwRUfv5ucTt1otMwn+Ryfp7fYVe+bdRYA=" }, "print-manager": { - "version": "6.0.5", - "url": "mirror://kde/stable/plasma/6.0.5/print-manager-6.0.5.tar.xz", - "hash": "sha256-V6wh/zTaLIxm9Hh43iwE0uoFOV8pd/yWxR3usEczozc=" + "version": "6.1.0", + "url": "mirror://kde/stable/plasma/6.1.0/print-manager-6.1.0.tar.xz", + "hash": "sha256-xjx0BUhkCHdQQJAp7kiBvBFlq5POYBZp7cvzjMLyAhU=" }, "qqc2-breeze-style": { - "version": "6.0.5", - "url": "mirror://kde/stable/plasma/6.0.5/qqc2-breeze-style-6.0.5.tar.xz", - "hash": "sha256-1PzFlkagZv05Kp7YZXGJ7sZ35yJJyKTnJH7YmrxHRJY=" + "version": "6.1.0", + "url": "mirror://kde/stable/plasma/6.1.0/qqc2-breeze-style-6.1.0.tar.xz", + "hash": "sha256-raTAxWIsGluCXpsQQuC+cTUq3aRGQJS7beIclxAu4m8=" }, "sddm-kcm": { - "version": "6.0.5", - "url": "mirror://kde/stable/plasma/6.0.5/sddm-kcm-6.0.5.tar.xz", - "hash": "sha256-huWdNrSD+i70jYUDHG8Y8oaHvQ7otCOEsK4mwBSywCg=" + "version": "6.1.0", + "url": "mirror://kde/stable/plasma/6.1.0/sddm-kcm-6.1.0.tar.xz", + "hash": "sha256-GzCrvNGEp/RgoZY2qlDvfaNOa25BLubL+XrpW0146tw=" }, "systemsettings": { - "version": "6.0.5", - "url": "mirror://kde/stable/plasma/6.0.5/systemsettings-6.0.5.tar.xz", - "hash": "sha256-tyK6Ifq9jNJ+I3GoPjOppOFAMlfUVLPwHG+kbCh0z5M=" + "version": "6.1.0", + "url": "mirror://kde/stable/plasma/6.1.0/systemsettings-6.1.0.tar.xz", + "hash": "sha256-vZSxNCBkeUoULLKF7RAqbbaVm/JoLU5mHVYNc0poylw=" }, "wacomtablet": { - "version": "6.0.5", - "url": "mirror://kde/stable/plasma/6.0.5/wacomtablet-6.0.5.tar.xz", - "hash": "sha256-N8+dNHdReMoiPm2bM+iqwRmRO6ETFvS8Imkk4lOXDK8=" + "version": "6.1.0", + "url": "mirror://kde/stable/plasma/6.1.0/wacomtablet-6.1.0.tar.xz", + "hash": "sha256-0evmQyKNRwrVzClMWs0BD0ArpzqnfCpFKljTrIPIPIU=" }, "xdg-desktop-portal-kde": { - "version": "6.0.5", - "url": "mirror://kde/stable/plasma/6.0.5/xdg-desktop-portal-kde-6.0.5.tar.xz", - "hash": "sha256-AL30QtN7MICr/SlYQl3XJKOlAZ1Q39fLMZ5RYLJ6awU=" + "version": "6.1.0", + "url": "mirror://kde/stable/plasma/6.1.0/xdg-desktop-portal-kde-6.1.0.tar.xz", + "hash": "sha256-BUzmYjI07AvobqAA1/sTz5V+T8QqJIVBKS+jgx2ATbM=" } } \ No newline at end of file diff --git a/pkgs/kde/misc/marknote/default.nix b/pkgs/kde/misc/marknote/default.nix index b006ab1276c3..0f676c6fb07e 100644 --- a/pkgs/kde/misc/marknote/default.nix +++ b/pkgs/kde/misc/marknote/default.nix @@ -2,7 +2,6 @@ lib, mkKdeDerivation, fetchurl, - kcrash, qtdeclarative, qtsvg, qtwayland, @@ -18,7 +17,6 @@ mkKdeDerivation rec { }; extraBuildInputs = [ - kcrash qtdeclarative qtsvg qtwayland diff --git a/pkgs/kde/plasma/default.nix b/pkgs/kde/plasma/default.nix index a29c1fc36d2e..6fa4d2383f99 100644 --- a/pkgs/kde/plasma/default.nix +++ b/pkgs/kde/plasma/default.nix @@ -17,6 +17,7 @@ kinfocenter = callPackage ./kinfocenter {}; kmenuedit = callPackage ./kmenuedit {}; kpipewire = callPackage ./kpipewire {}; + krdp = callPackage ./krdp {}; kscreen = callPackage ./kscreen {}; kscreenlocker = callPackage ./kscreenlocker {}; ksshaskpass = callPackage ./ksshaskpass {}; diff --git a/pkgs/kde/plasma/kinfocenter/0001-tool-paths.patch b/pkgs/kde/plasma/kinfocenter/0001-tool-paths.patch index 543aecdec43f..84609b2ff223 100644 --- a/pkgs/kde/plasma/kinfocenter/0001-tool-paths.patch +++ b/pkgs/kde/plasma/kinfocenter/0001-tool-paths.patch @@ -1,7 +1,7 @@ -diff --git a/Modules/kwinsupportinfo/kcm_kwinsupportinfo.json.in b/Modules/kwinsupportinfo/kcm_kwinsupportinfo.json.in +diff --git a/kcms/kwinsupportinfo/kcm_kwinsupportinfo.json.in b/kcms/kwinsupportinfo/kcm_kwinsupportinfo.json.in index 0de6973e..30035768 100644 ---- a/Modules/kwinsupportinfo/kcm_kwinsupportinfo.json.in -+++ b/Modules/kwinsupportinfo/kcm_kwinsupportinfo.json.in +--- a/kcms/kwinsupportinfo/kcm_kwinsupportinfo.json.in ++++ b/kcms/kwinsupportinfo/kcm_kwinsupportinfo.json.in @@ -85,6 +85,6 @@ "Name[zh_CN]": "窗口管理器", "Name[zh_TW]": "視窗管理員" @@ -10,23 +10,23 @@ index 0de6973e..30035768 100644 + "TryExec": "@qdbus@", "X-KDE-KInfoCenter-Category": "graphical_information" } -diff --git a/Modules/kwinsupportinfo/main.cpp b/Modules/kwinsupportinfo/main.cpp +diff --git a/kcms/kwinsupportinfo/main.cpp b/kcms/kwinsupportinfo/main.cpp index 6ae168b5..89d0a2ff 100644 ---- a/Modules/kwinsupportinfo/main.cpp -+++ b/Modules/kwinsupportinfo/main.cpp +--- a/kcms/kwinsupportinfo/main.cpp ++++ b/kcms/kwinsupportinfo/main.cpp @@ -18,7 +18,7 @@ public: explicit KCMKWinSupportInfo(QObject *parent, const KPluginMetaData &data) : KQuickConfigModule(parent, data) { -- m_outputContext = new CommandOutputContext(QLibraryInfo::location(QLibraryInfo::BinariesPath) + QStringLiteral("/qdbus"), +- m_outputContext = new CommandOutputContext(QLibraryInfo::path(QLibraryInfo::BinariesPath) + QStringLiteral("/qdbus"), + m_outputContext = new CommandOutputContext(QStringLiteral("@qdbus@"), {QStringLiteral("org.kde.KWin"), QStringLiteral("/KWin"), QStringLiteral("supportInformation")}, parent); } -diff --git a/Modules/xserver/kcm_xserver.json b/Modules/xserver/kcm_xserver.json +diff --git a/kcms/xserver/kcm_xserver.json b/kcms/xserver/kcm_xserver.json index b3f1ce24..dc610932 100644 ---- a/Modules/xserver/kcm_xserver.json -+++ b/Modules/xserver/kcm_xserver.json +--- a/kcms/xserver/kcm_xserver.json ++++ b/kcms/xserver/kcm_xserver.json @@ -141,7 +141,7 @@ "Name[zh_CN]": "X 服务器", "Name[zh_TW]": "X 伺服器" @@ -36,10 +36,10 @@ index b3f1ce24..dc610932 100644 "X-DocPath": "kinfocenter/graphical.html#xserver", "X-KDE-KInfoCenter-Category": "graphical_information", "X-KDE-Keywords": "X,X-Server,XServer,XFree86,Display,VideoCard,System Information", -diff --git a/Modules/xserver/main.cpp b/Modules/xserver/main.cpp +diff --git a/kcms/xserver/main.cpp b/kcms/xserver/main.cpp index 6d4d1e25..d39fe19e 100644 ---- a/Modules/xserver/main.cpp -+++ b/Modules/xserver/main.cpp +--- a/kcms/xserver/main.cpp ++++ b/kcms/xserver/main.cpp @@ -16,7 +16,7 @@ public: explicit KCMXServer(QObject *parent, const KPluginMetaData &data) : KQuickConfigModule(parent, data) diff --git a/pkgs/kde/plasma/krdp/default.nix b/pkgs/kde/plasma/krdp/default.nix new file mode 100644 index 000000000000..38208475ca27 --- /dev/null +++ b/pkgs/kde/plasma/krdp/default.nix @@ -0,0 +1,31 @@ +{ + lib, + mkKdeDerivation, + substituteAll, + openssl, + pkg-config, + qtkeychain, + qtwayland, + freerdp, + wayland, + wayland-protocols, +}: +mkKdeDerivation { + pname = "krdp"; + + patches = [ + (substituteAll { + src = ./hardcode-openssl-path.patch; + openssl = lib.getExe openssl; + }) + ]; + + extraNativeBuildInputs = [pkg-config]; + extraBuildInputs = [ + qtkeychain + qtwayland + freerdp + wayland + wayland-protocols + ]; +} diff --git a/pkgs/kde/plasma/krdp/hardcode-openssl-path.patch b/pkgs/kde/plasma/krdp/hardcode-openssl-path.patch new file mode 100644 index 000000000000..8ef18364b72c --- /dev/null +++ b/pkgs/kde/plasma/krdp/hardcode-openssl-path.patch @@ -0,0 +1,13 @@ +diff --git a/src/kcm/kcmkrdpserver.cpp b/src/kcm/kcmkrdpserver.cpp +index 3af527c..3433a84 100644 +--- a/src/kcm/kcmkrdpserver.cpp ++++ b/src/kcm/kcmkrdpserver.cpp +@@ -218,7 +218,7 @@ void KRDPServerConfig::generateCertificate() + QString certificateKeyPath(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + QStringLiteral("/krdpserver/krdp.key")); + qDebug(KRDPKCM) << "Generating certificate files to: " << certificatePath << " and " << certificateKeyPath; + QProcess sslProcess; +- sslProcess.start(u"openssl"_qs, ++ sslProcess.start(u"@openssl@"_qs, + { + u"req"_qs, + u"-nodes"_qs, diff --git a/pkgs/kde/plasma/kwin/default.nix b/pkgs/kde/plasma/kwin/default.nix index abef3f7113c0..ffa7e146ece6 100644 --- a/pkgs/kde/plasma/kwin/default.nix +++ b/pkgs/kde/plasma/kwin/default.nix @@ -8,7 +8,9 @@ qtwayland, libinput, xorg, + xwayland, libdisplay-info, + libei, mesa, lcms2, libcap, @@ -53,9 +55,12 @@ mkKdeDerivation { lcms2 libcap libdisplay-info + libei libinput pipewire xorg.libxcvt + # we need to provide this so it knows our xwayland supports new features + xwayland ]; } diff --git a/pkgs/kde/plasma/plasma-desktop/default.nix b/pkgs/kde/plasma/plasma-desktop/default.nix index 8ee90dee3a67..a84a55779d36 100644 --- a/pkgs/kde/plasma/plasma-desktop/default.nix +++ b/pkgs/kde/plasma/plasma-desktop/default.nix @@ -10,6 +10,7 @@ pkg-config, qtsvg, qtwayland, + breeze, kaccounts-integration, SDL2, xkeyboard_config, @@ -39,6 +40,10 @@ in }) ./tzdir.patch ./no-discover-shortcut.patch + (substituteAll { + src = ./wallpaper-paths.patch; + wallpapers = "${lib.getBin breeze}/share/wallpapers"; + }) ]; extraNativeBuildInputs = [pkg-config]; diff --git a/pkgs/kde/plasma/plasma-workspace/wallpaper-paths.patch b/pkgs/kde/plasma/plasma-desktop/wallpaper-paths.patch similarity index 75% rename from pkgs/kde/plasma/plasma-workspace/wallpaper-paths.patch rename to pkgs/kde/plasma/plasma-desktop/wallpaper-paths.patch index 050200a8411f..67d46bc6879e 100644 --- a/pkgs/kde/plasma/plasma-workspace/wallpaper-paths.patch +++ b/pkgs/kde/plasma/plasma-desktop/wallpaper-paths.patch @@ -1,5 +1,5 @@ ---- a/lookandfeel/sddm-theme/theme.conf.cmake -+++ b/lookandfeel/sddm-theme/theme.conf.cmake +--- a/sddm-theme/theme.conf.cmake ++++ b/sddm-theme/theme.conf.cmake @@ -4,5 +4,5 @@ logo=${KDE_INSTALL_FULL_DATADIR}/sddm/themes/breeze/default-logo.svg type=image color=#1d99f3 diff --git a/pkgs/kde/plasma/plasma-workspace/default.nix b/pkgs/kde/plasma/plasma-workspace/default.nix index 42f46eef5eb0..e89063876a86 100644 --- a/pkgs/kde/plasma/plasma-workspace/default.nix +++ b/pkgs/kde/plasma/plasma-workspace/default.nix @@ -10,7 +10,6 @@ libcanberra, libqalculate, pipewire, - breeze, qttools, qqc2-breeze-style, gpsd, @@ -25,10 +24,6 @@ mkKdeDerivation { xsetroot = "${lib.getBin xorg.xsetroot}/bin/xsetroot"; qdbus = "${lib.getBin qttools}/bin/qdbus"; }) - (substituteAll { - src = ./wallpaper-paths.patch; - wallpapers = "${lib.getBin breeze}/share/wallpapers"; - }) ]; postInstall = '' diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix index e0d03108960c..5f5ec212f269 100644 --- a/pkgs/os-specific/bsd/netbsd/default.nix +++ b/pkgs/os-specific/bsd/netbsd/default.nix @@ -17,15 +17,7 @@ makeScopeWithSplicing' { directory = ./pkgs; } // { - - fetchNetBSD = - path: version: sha256: - fetchcvs { - cvsRoot = ":pserver:anoncvs@anoncvs.NetBSD.org:/cvsroot"; - module = "src/${path}"; - inherit sha256; - tag = "netbsd-${lib.replaceStrings [ "." ] [ "-" ] version}-RELEASE"; - }; + version = "9.2"; defaultMakeFlags = [ "MKSOFTFLOAT=${ @@ -151,18 +143,18 @@ makeScopeWithSplicing' { inherit (buildPackages.buildPackages) rsync; }; - _mainLibcExtraPaths = with self; [ - common - i18n_module.src - sys.src - ld_elf_so.src - libpthread.src - libm.src - libresolv.src - librpcsvc.src - libutil.src - librt.src - libcrypt.src + _mainLibcExtraPaths = [ + "common" + "lib/i18n_module" + "lib/libcrypt" + "lib/libm" + "lib/libpthread" + "lib/libresolv" + "lib/librpcsvc" + "lib/librt" + "lib/libutil" + "libexec/ld.elf_so" + "sys" ]; libc = self.callPackage ./pkgs/libc.nix { diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/cksum.nix b/pkgs/os-specific/bsd/netbsd/pkgs/cksum.nix index a2ec387501ae..a95df55874e4 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/cksum.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/cksum.nix @@ -2,7 +2,5 @@ mkDerivation { path = "usr.bin/cksum"; - version = "9.2"; - sha256 = "0msfhgyvh5c2jmc6qjnf12c378dhw32ffsl864qz4rdb2b98rfcq"; meta.platforms = lib.platforms.netbsd; } diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/column.nix b/pkgs/os-specific/bsd/netbsd/pkgs/column.nix index f3cebfa9ab26..a51369433f6c 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/column.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/column.nix @@ -1,7 +1,3 @@ { mkDerivation }: -mkDerivation { - path = "usr.bin/column"; - version = "9.2"; - sha256 = "0r6b0hjn5ls3j3sv6chibs44fs32yyk2cg8kh70kb4cwajs4ifyl"; -} +mkDerivation { path = "usr.bin/column"; } diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/common.nix b/pkgs/os-specific/bsd/netbsd/pkgs/common.nix deleted file mode 100644 index 464fc1c9e0c2..000000000000 --- a/pkgs/os-specific/bsd/netbsd/pkgs/common.nix +++ /dev/null @@ -1,3 +0,0 @@ -{ fetchNetBSD }: - -fetchNetBSD "common" "9.2" "1pfylz9r3ap5wnwwbwczbfjb1m5qdyspzbnmxmcdkpzz2zgj64b9" diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/compat/package.nix b/pkgs/os-specific/bsd/netbsd/pkgs/compat/package.nix index 4c149e95c1ae..91a2bb8755c8 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/compat/package.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/compat/package.nix @@ -14,19 +14,16 @@ netbsdSetupHook, makeMinimal, rsync, - fetchNetBSD, _mainLibcExtraPaths, + version, }: mkDerivation ( let - version = "9.2"; commonDeps = [ zlib ]; in { path = "tools/compat"; - sha256 = "1vsxg7136nlhc72vpa664vs22874xh7ila95nkmsd8crn3z3cyn0"; - inherit version; setupHooks = [ ../../../../../build-support/setup-hooks/role.bash @@ -133,14 +130,12 @@ mkDerivation ( --subst-var-by version ${version} ''; extraPaths = [ - include.src - libc.src - libutil.src - (fetchNetBSD "external/bsd/flex" "9.2" "0h98jpfj7vx5zh7vd7bk6b1hmzgkcb757a8j6d9zgygxxv13v43m") - (fetchNetBSD "sys/sys" "9.2" "0zawhw51klaigqqwkx0lzrx3mim2jywrc24cm7c66qsf1im9awgd") - (fetchNetBSD "common/include/rpc/types.h" "9.2" - "0n2df12mlc3cbc48jxq35yzl1y7ghgpykvy7jnfh898rdhac7m9a" - ) + include.path + libc.path + libutil.path + "external/bsd/flex" + "sys/sys" + "common/include/rpc/types.h" ] ++ libutil.extraPaths ++ _mainLibcExtraPaths; } ) diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/config.nix b/pkgs/os-specific/bsd/netbsd/pkgs/config.nix index c423f3ca8676..272e9065b29b 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/config.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/config.nix @@ -13,8 +13,6 @@ }: mkDerivation { path = "usr.bin/config"; - version = "9.2"; - sha256 = "1yz3n4hncdkk6kp595fh2q5lg150vpqg8iw2dccydkyw4y3hgsjj"; env.NIX_CFLAGS_COMPILE = toString [ "-DMAKE_BOOTSTRAP" ]; nativeBuildInputs = [ bsdSetupHook @@ -27,5 +25,5 @@ mkDerivation { rsync ]; buildInputs = compatIfNeeded; - extraPaths = [ cksum.src ]; + extraPaths = [ cksum.path ]; } diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/csu.nix b/pkgs/os-specific/bsd/netbsd/pkgs/csu.nix index 66443331490f..a0d7ca419c1c 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/csu.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/csu.nix @@ -22,8 +22,6 @@ mkDerivation { path = "lib/csu"; - version = "9.2"; - sha256 = "0al5jfazvhlzn9hvmnrbchx4d0gm282hq5gp4xs2zmj9ycmf6d03"; meta.platforms = lib.platforms.netbsd; nativeBuildInputs = [ bsdSetupHook @@ -43,7 +41,7 @@ mkDerivation { ]; buildInputs = [ headers ]; extraPaths = [ - sys.src - ld_elf_so.src + sys.path + ld_elf_so.path ]; } diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/dict.nix b/pkgs/os-specific/bsd/netbsd/pkgs/dict.nix index 0d7d026dd21d..8d27f29a75e5 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/dict.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/dict.nix @@ -3,7 +3,5 @@ mkDerivation { path = "share/dict"; noCC = true; - version = "9.2"; - sha256 = "0svfc0byk59ri37pyjslv4c4rc7zw396r73mr593i78d39q5g3ad"; makeFlags = defaultMakeFlags ++ [ "BINDIR=$(out)/share" ]; } diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/fts/package.nix b/pkgs/os-specific/bsd/netbsd/pkgs/fts/package.nix index 7c64658bf2e5..57fc0633b088 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/fts/package.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/fts/package.nix @@ -4,14 +4,11 @@ netbsdSetupHook, rsync, compatIfNeeded, - fetchNetBSD, }: mkDerivation { pname = "fts"; path = "include/fts.h"; - sha256 = "01d4fpxvz1pgzfk5xznz5dcm0x0gdzwcsfm1h3d0xc9kc6hj2q77"; - version = "9.2"; nativeBuildInputs = [ bsdSetupHook netbsdSetupHook @@ -19,11 +16,9 @@ mkDerivation { ]; propagatedBuildInputs = compatIfNeeded; extraPaths = [ - (fetchNetBSD "lib/libc/gen/fts.c" "9.2" "1a8hmf26242nmv05ipn3ircxb0jqmmi66rh78kkyi9vjwkfl3qn7") - (fetchNetBSD "lib/libc/include/namespace.h" "9.2" - "0kksr3pdwdc1cplqf5z12ih4cml6l11lqrz91f7hjjm64y7785kc" - ) - (fetchNetBSD "lib/libc/gen/fts.3" "9.2" "1asxw0n3fhjdadwkkq3xplfgqgl3q32w1lyrvbakfa3gs0wz5zc1") + "lib/libc/gen/fts.c" + "lib/libc/include/namespace.h" + "lib/libc/gen/fts.3" ]; skipIncludesPhase = true; buildPhase = '' diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/genassym.nix b/pkgs/os-specific/bsd/netbsd/pkgs/genassym.nix index 7f81a77a02dd..9eed584b29ae 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/genassym.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/genassym.nix @@ -1,7 +1,3 @@ { mkDerivation }: -mkDerivation { - path = "usr.bin/genassym"; - version = "9.2"; - sha256 = "1acl1dz5kvh9h5806vkz2ap95rdsz7phmynh5i3x5y7agbki030c"; -} +mkDerivation { path = "usr.bin/genassym"; } diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/gencat.nix b/pkgs/os-specific/bsd/netbsd/pkgs/gencat.nix index 411be85e91e2..ea701b6404ec 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/gencat.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/gencat.nix @@ -1,7 +1,3 @@ { mkDerivation }: -mkDerivation { - path = "usr.bin/gencat"; - version = "9.2"; - sha256 = "0gd463x1hg36bhr7y0xryb5jyxk0z0g7xvy8rgk82nlbnlnsbbwb"; -} +mkDerivation { path = "usr.bin/gencat"; } diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/getconf.nix b/pkgs/os-specific/bsd/netbsd/pkgs/getconf.nix index c8483d454b87..2feb6495ccf8 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/getconf.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/getconf.nix @@ -1,7 +1,3 @@ { mkDerivation }: -mkDerivation { - path = "usr.bin/getconf"; - sha256 = "122vslz4j3h2mfs921nr2s6m078zcj697yrb75rwp2hnw3qz4s8q"; - version = "9.2"; -} +mkDerivation { path = "usr.bin/getconf"; } diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/getent/package.nix b/pkgs/os-specific/bsd/netbsd/pkgs/getent/package.nix index 7a9acb1e0a9e..b6a4efad4ac9 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/getent/package.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/getent/package.nix @@ -2,7 +2,5 @@ mkDerivation { path = "usr.bin/getent"; - sha256 = "1qngywcmm0y7nl8h3n8brvkxq4jw63szbci3kc1q6a6ndhycbbvr"; - version = "9.2"; patches = [ ./getent.patch ]; } diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/i18n_module.nix b/pkgs/os-specific/bsd/netbsd/pkgs/i18n_module.nix index c76ada865775..066d9f236f9b 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/i18n_module.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/i18n_module.nix @@ -6,8 +6,6 @@ mkDerivation { path = "lib/i18n_module"; - version = "9.2"; - sha256 = "0w6y5v3binm7gf2kn7y9jja8k18rhnyl55cvvfnfipjqdxvxd9jd"; meta.platforms = lib.platforms.netbsd; - extraPaths = [ libc.src ]; + extraPaths = [ libc.path ]; } diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/include.nix b/pkgs/os-specific/bsd/netbsd/pkgs/include.nix index ec316a63174f..6df34b96095e 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/include.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/include.nix @@ -10,15 +10,12 @@ rsync, nbperf, rpcgen, - common, defaultMakeFlags, stdenv, }: mkDerivation { path = "include"; - version = "9.2"; - sha256 = "0nxnmj4c8s3hb9n3fpcmd0zl3l1nmhivqgi9a35sis943qvpgl9h"; nativeBuildInputs = [ bsdSetupHook netbsdSetupHook @@ -46,7 +43,7 @@ mkDerivation { makeFlags=''${makeFlags/INCSDIR/INCSDIR0} ''; - extraPaths = [ common ]; + extraPaths = [ "common" ]; headersOnly = true; noCC = true; meta.platforms = lib.platforms.netbsd; diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/install/package.nix b/pkgs/os-specific/bsd/netbsd/pkgs/install/package.nix index 0fc6ca452be0..2dbec08f15e8 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/install/package.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/install/package.nix @@ -26,11 +26,9 @@ let in mkDerivation { path = "usr.bin/xinstall"; - version = "9.2"; - sha256 = "1f6pbz3qv1qcrchdxif8p5lbmnwl8b9nq615hsd3cyl4avd5bfqj"; extraPaths = [ - mtree.src - make.src + mtree.path + make.path ]; nativeBuildInputs = [ bsdSetupHook diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/ld_elf_so.nix b/pkgs/os-specific/bsd/netbsd/pkgs/ld_elf_so.nix index a350e81d3206..7f25ce097ff0 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/ld_elf_so.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/ld_elf_so.nix @@ -7,8 +7,6 @@ mkDerivation { path = "libexec/ld.elf_so"; - version = "9.2"; - sha256 = "0ia9mqzdljly0vqfwflm5mzz55k7qsr4rw2bzhivky6k30vgirqa"; meta.platforms = lib.platforms.netbsd; LIBC_PIC = "${libc}/lib/libc_pic.a"; # Hack to prevent a symlink being installed here for compatibility. @@ -18,5 +16,5 @@ mkDerivation { "BINDIR=$(out)/libexec" "CLIBOBJ=${libc}/lib" ]; - extraPaths = [ libc.src ] ++ libc.extraPaths; + extraPaths = [ libc.path ] ++ libc.extraPaths; } diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/libarch.nix b/pkgs/os-specific/bsd/netbsd/pkgs/libarch.nix index 93ea02f8a17c..457ea6fa48d9 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/libarch.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/libarch.nix @@ -2,7 +2,5 @@ mkDerivation { path = "lib/libarch"; - version = "9.2"; - sha256 = "6ssenRhuSwp0Jn71ErT0PrEoCJ+cIYRztwdL4QTDZsQ="; meta.platforms = lib.platforms.netbsd; } diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/libc.nix b/pkgs/os-specific/bsd/netbsd/pkgs/libc.nix index d755e4b6870a..cf71857776d8 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/libc.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/libc.nix @@ -3,7 +3,6 @@ mkDerivation, defaultMakeFlags, _mainLibcExtraPaths, - fetchNetBSD, bsdSetupHook, netbsdSetupHook, makeMinimal, @@ -26,13 +25,9 @@ mkDerivation { path = "lib/libc"; - version = "9.2"; - sha256 = "1y9c13igg0kai07sqvf9cm6yqmd8lhfd8hq3q7biilbgs1l99as3"; USE_FORT = "yes"; MKPROFILE = "no"; - extraPaths = _mainLibcExtraPaths ++ [ - (fetchNetBSD "external/bsd/jemalloc" "9.2" "0cq704swa0h2yxv4gc79z2lwxibk9k7pxh3q5qfs7axx3jx3n8kb") - ]; + extraPaths = _mainLibcExtraPaths ++ [ "external/bsd/jemalloc" ]; nativeBuildInputs = [ bsdSetupHook netbsdSetupHook diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/libcrypt.nix b/pkgs/os-specific/bsd/netbsd/pkgs/libcrypt.nix index c5f9deff589c..abcb2cfb14fb 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/libcrypt.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/libcrypt.nix @@ -2,8 +2,6 @@ mkDerivation { path = "lib/libcrypt"; - version = "9.2"; - sha256 = "0siqan1wdqmmhchh2n8w6a8x1abbff8n4yb6jrqxap3hqn8ay54g"; SHLIBINSTALLDIR = "$(out)/lib"; meta.platforms = lib.platforms.netbsd; } diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/libcurses.nix b/pkgs/os-specific/bsd/netbsd/pkgs/libcurses.nix index 5072821db911..8d61bcfdf7d9 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/libcurses.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/libcurses.nix @@ -9,8 +9,6 @@ mkDerivation { path = "lib/libcurses"; - version = "9.2"; - sha256 = "0pd0dggl3w4bv5i5h0s1wrc8hr66n4hkv3zlklarwfdhc692fqal"; buildInputs = [ libterminfo ]; env.NIX_CFLAGS_COMPILE = toString ( [ diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/libedit.nix b/pkgs/os-specific/bsd/netbsd/pkgs/libedit.nix index ee1e7bf79f96..cb9951cb8cf1 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/libedit.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/libedit.nix @@ -9,8 +9,6 @@ mkDerivation { path = "lib/libedit"; - version = "9.2"; - sha256 = "1wqhngraxwqk4jgrf5f18jy195yrp7c06n1gf31pbplq79mg1bcj"; buildInputs = [ libterminfo libcurses diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/libm.nix b/pkgs/os-specific/bsd/netbsd/pkgs/libm.nix index f36e97f8e6ae..8a2304cacbca 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/libm.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/libm.nix @@ -6,9 +6,7 @@ mkDerivation { path = "lib/libm"; - version = "9.2"; - sha256 = "1apwfr26shdmbqqnmg7hxf7bkfxw44ynqnnnghrww9bnhqdnsy92"; SHLIBINSTALLDIR = "$(out)/lib"; meta.platforms = lib.platforms.netbsd; - extraPaths = [ sys.src ]; + extraPaths = [ sys.path ]; } diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/libossaudio.nix b/pkgs/os-specific/bsd/netbsd/pkgs/libossaudio.nix index 51bbc216e204..a74176db68cd 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/libossaudio.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/libossaudio.nix @@ -2,7 +2,5 @@ mkDerivation { path = "lib/libossaudio"; - version = "9.2"; - sha256 = "16l3bfy6dcwqnklvh3x0ps8ld1y504vf57v9rx8f9adzhb797jh0"; meta.platforms = lib.platforms.netbsd; } diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/libpci.nix b/pkgs/os-specific/bsd/netbsd/pkgs/libpci.nix index b0be4a2da723..69d1ff5accca 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/libpci.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/libpci.nix @@ -7,9 +7,7 @@ mkDerivation { pname = "libpci"; path = "lib/libpci"; - version = "9.2"; - sha256 = "+IOEO1Bw3/H3iCp3uk3bwsFZbvCqN5Ciz70irnPl8E8="; env.NIX_CFLAGS_COMPILE = toString [ "-I." ]; meta.platforms = lib.platforms.netbsd; - extraPaths = [ sys.src ]; + extraPaths = [ sys.path ]; } diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/libpthread/base.nix b/pkgs/os-specific/bsd/netbsd/pkgs/libpthread/base.nix index d8ea7c553eba..08c298c0fe5d 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/libpthread/base.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/libpthread/base.nix @@ -1,5 +1 @@ -{ - path = "lib/libpthread"; - version = "9.2"; - sha256 = "0mlmc31k509dwfmx5s2x010wxjc44mr6y0cbmk30cfipqh8c962h"; -} +{ path = "lib/libpthread"; } diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/libpthread/package.nix b/pkgs/os-specific/bsd/netbsd/pkgs/libpthread/package.nix index 88d392e20b4a..28665b351f88 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/libpthread/package.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/libpthread/package.nix @@ -2,7 +2,6 @@ lib, mkDerivation, headers, - common, libc, librt, sys, @@ -18,10 +17,10 @@ mkDerivation ( buildInputs = [ headers ]; SHLIBINSTALLDIR = "$(out)/lib"; extraPaths = [ - common - libc.src - librt.src - sys.src + "common" + libc.path + librt.path + sys.path ]; meta.platforms = lib.platforms.netbsd; } diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/libresolv.nix b/pkgs/os-specific/bsd/netbsd/pkgs/libresolv.nix index 24bc4f2f9e00..7db4948e6939 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/libresolv.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/libresolv.nix @@ -6,8 +6,6 @@ mkDerivation { path = "lib/libresolv"; - version = "9.2"; - sha256 = "1am74s74mf1ynwz3p4ncjkg63f78a1zjm983q166x4sgzps15626"; meta.platforms = lib.platforms.netbsd; - extraPaths = [ libc.src ]; + extraPaths = [ libc.path ]; } diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/librpcsvc.nix b/pkgs/os-specific/bsd/netbsd/pkgs/librpcsvc.nix index 8d757a8a8430..3f2d392ba8c5 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/librpcsvc.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/librpcsvc.nix @@ -14,8 +14,6 @@ mkDerivation { path = "lib/librpcsvc"; - version = "9.2"; - sha256 = "1q34pfiyjbrgrdqm46jwrsqms49ly6z3b0xh1wg331zga900vq5n"; makeFlags = defaultMakeFlags ++ [ "INCSDIR=$(out)/include/rpcsvc" ]; meta.platforms = lib.platforms.netbsd; nativeBuildInputs = [ diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/librt.nix b/pkgs/os-specific/bsd/netbsd/pkgs/librt.nix index fa0229953b66..4e4bf0bc5ac4 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/librt.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/librt.nix @@ -7,10 +7,8 @@ mkDerivation { path = "lib/librt"; - version = "9.2"; - sha256 = "07f8mpjcqh5kig5z5sp97fg55mc4dz6aa1x5g01nv2pvbmqczxc6"; meta.platforms = lib.platforms.netbsd; - extraPaths = [ libc.src ] ++ libc.extraPaths; + extraPaths = [ libc.path ] ++ libc.extraPaths; postPatch = '' sed -i 's,/usr\(/include/sys/syscall.h\),${headers}\1,g' \ $BSDSRCDIR/lib/{libc,librt}/sys/Makefile.inc diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/libterminfo.nix b/pkgs/os-specific/bsd/netbsd/pkgs/libterminfo.nix index 6ac573d865b1..6e7b59df2ed5 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/libterminfo.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/libterminfo.nix @@ -12,13 +12,10 @@ tic, rsync, compatIfNeeded, - fetchNetBSD, }: mkDerivation { path = "lib/libterminfo"; - version = "9.2"; - sha256 = "0pq05k3dj0dfsczv07frnnji92mazmy2qqngqbx2zgqc1x251414"; nativeBuildInputs = [ bsdSetupHook netbsdSetupHook @@ -45,7 +42,5 @@ mkDerivation { postInstall = '' make -C $BSDSRCDIR/share/terminfo $makeFlags BINDIR=$out/share install ''; - extraPaths = [ - (fetchNetBSD "share/terminfo" "9.2" "1vh9rl4w8118a9qdpblfxmv1wkpm83rm9gb4rzz5bpm56i6d7kk7") - ]; + extraPaths = [ "share/terminfo" ]; } diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/libutil.nix b/pkgs/os-specific/bsd/netbsd/pkgs/libutil.nix index fdc57df9c231..d5bf075fc5e7 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/libutil.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/libutil.nix @@ -1,6 +1,5 @@ { mkDerivation, - common, libc, sys, bsdSetupHook, @@ -18,12 +17,10 @@ mkDerivation { path = "lib/libutil"; - version = "9.2"; - sha256 = "02gm5a5zhh8qp5r5q5r7x8x6x50ir1i0ncgsnfwh1vnrz6mxbq7z"; extraPaths = [ - common - libc.src - sys.src + "common" + libc.path + sys.path ]; nativeBuildInputs = [ bsdSetupHook diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/locale/package.nix b/pkgs/os-specific/bsd/netbsd/pkgs/locale/package.nix index 3c61e8517b35..e3e06ba1a152 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/locale/package.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/locale/package.nix @@ -2,8 +2,6 @@ mkDerivation { path = "usr.bin/locale"; - version = "9.2"; - sha256 = "0kk6v9k2bygq0wf9gbinliqzqpzs9bgxn0ndyl2wcv3hh2bmsr9p"; patches = [ ./locale.patch ]; env.NIX_CFLAGS_COMPILE = "-DYESSTR=__YESSTR -DNOSTR=__NOSTR"; } diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/lorder.nix b/pkgs/os-specific/bsd/netbsd/pkgs/lorder.nix index 0b99a794b07a..836fa7500e57 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/lorder.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/lorder.nix @@ -11,8 +11,6 @@ mkDerivation { path = "usr.bin/lorder"; - version = "9.2"; - sha256 = "0rjf9blihhm0n699vr2bg88m4yjhkbxh6fxliaay3wxkgnydjwn2"; nativeBuildInputs = [ bsdSetupHook netbsdSetupHook diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/make-rules.nix b/pkgs/os-specific/bsd/netbsd/pkgs/make-rules.nix index 66086c01c233..a1e8d1482c21 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/make-rules.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/make-rules.nix @@ -9,8 +9,6 @@ mkDerivation { path = "share/mk"; - sha256 = "0w9x77cfnm6zwy40slradzi0ip9gz80x6lk7pvnlxzsr2m5ra5sy"; - version = "9.2"; noCC = true; buildInputs = [ ]; diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/make.nix b/pkgs/os-specific/bsd/netbsd/pkgs/make.nix index 4d0b9f4b4cf2..9612ca7ff489 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/make.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/make.nix @@ -1,15 +1,12 @@ { lib, mkDerivation, - fetchNetBSD, stdenv, make-rules, }: mkDerivation { path = "usr.bin/make"; - sha256 = "0vi73yicbmbp522qzqvd979cx6zm5jakhy77xh73c1kygf8klccs"; - version = "9.2"; postPatch = make-rules.postPatch @@ -21,7 +18,5 @@ mkDerivation { postInstall = '' make -C $BSDSRCDIR/share/mk FILESDIR=$out/share/mk install ''; - extraPaths = [ - (fetchNetBSD "share/mk" "9.2" "0w9x77cfnm6zwy40slradzi0ip9gz80x6lk7pvnlxzsr2m5ra5sy") - ]; + extraPaths = [ "share/mk" ]; } diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/makeMinimal.nix b/pkgs/os-specific/bsd/netbsd/pkgs/makeMinimal.nix index 62a4d4a6a124..ad70b6b8cd07 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/makeMinimal.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/makeMinimal.nix @@ -9,8 +9,6 @@ mkDerivation { path = "tools/make"; - sha256 = "0fh0nrnk18m613m5blrliq2aydciv51qhc0ihsj4k63incwbk90n"; - version = "9.2"; buildInputs = [ ]; nativeBuildInputs = [ @@ -47,5 +45,5 @@ mkDerivation { runHook postInstall ''; - extraPaths = [ make.src ]; + extraPaths = [ make.path ]; } diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/man.nix b/pkgs/os-specific/bsd/netbsd/pkgs/man.nix index bce5bcee6694..527c547fdaad 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/man.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/man.nix @@ -3,8 +3,6 @@ mkDerivation { path = "share/man"; noCC = true; - version = "9.2"; - sha256 = "1l4lmj4kmg8dl86x94sr45w0xdnkz8dn4zjx0ipgr9bnq98663zl"; # man0 generates a man.pdf using ps2pdf, but doesn't install it later, # so we can avoid the dependency on ghostscript postPatch = '' diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/misc.nix b/pkgs/os-specific/bsd/netbsd/pkgs/misc.nix index 7f96f4d1495a..726acf27d50b 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/misc.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/misc.nix @@ -3,7 +3,5 @@ mkDerivation { path = "share/misc"; noCC = true; - version = "9.2"; - sha256 = "1j2cdssdx6nncv8ffj7f7ybl7m9hadjj8vm8611skqdvxnjg6nbc"; makeFlags = defaultMakeFlags ++ [ "BINDIR=$(out)/share" ]; } diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/mkDerivation.nix b/pkgs/os-specific/bsd/netbsd/pkgs/mkDerivation.nix index 849d2b1da3fb..f4f103087587 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/mkDerivation.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/mkDerivation.nix @@ -1,8 +1,11 @@ { lib, - stdenvNoCC, stdenv, - fetchNetBSD, + stdenvNoCC, + crossLibcStdenv, + runCommand, + rsync, + source, bsdSetupHook, netbsdSetupHook, makeMinimal, @@ -12,9 +15,9 @@ mandoc, groff, statHook, - rsync, compatIfNeeded, defaultMakeFlags, + version, }: lib.makeOverridable ( @@ -23,10 +26,20 @@ lib.makeOverridable ( stdenv' = if attrs.noCC or false then stdenvNoCC else stdenv; in stdenv'.mkDerivation ( - { + rec { pname = "${attrs.pname or (baseNameOf attrs.path)}-netbsd"; - inherit (attrs) version; - src = fetchNetBSD attrs.path attrs.version attrs.sha256; + inherit version; + src = runCommand "${pname}-filtered-src" { nativeBuildInputs = [ rsync ]; } '' + for p in ${lib.concatStringsSep " " ([ attrs.path ] ++ attrs.extraPaths or [ ])}; do + set -x + path="$out/$p" + mkdir -p "$(dirname "$path")" + src_path="${source}/$p" + if [[ -d "$src_path" ]]; then src_path+=/; fi + rsync --chmod="+w" -r "$src_path" "$path" + set +x + done + ''; extraPaths = [ ]; diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/mknod.nix b/pkgs/os-specific/bsd/netbsd/pkgs/mknod.nix index 5c4c172e40a7..bf7d8b7db689 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/mknod.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/mknod.nix @@ -1,7 +1,3 @@ { mkDerivation }: -mkDerivation { - path = "sbin/mknod"; - version = "9.2"; - sha256 = "1d9369shzwgixz3nph991i8q5vk7hr04py3n9avbfbhzy4gndqs2"; -} +mkDerivation { path = "sbin/mknod"; } diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/mtree.nix b/pkgs/os-specific/bsd/netbsd/pkgs/mtree.nix index 723da3ad891b..8310941c7cb2 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/mtree.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/mtree.nix @@ -2,7 +2,5 @@ mkDerivation { path = "usr.sbin/mtree"; - version = "9.2"; - sha256 = "04p7w540vz9npvyb8g8hcf2xa05phn1y88hsyrcz3vwanvpc0yv9"; - extraPaths = [ mknod.src ]; + extraPaths = [ mknod.path ]; } diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/nbperf.nix b/pkgs/os-specific/bsd/netbsd/pkgs/nbperf.nix index a23c5dddfc9f..3b52eae96c3b 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/nbperf.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/nbperf.nix @@ -1,7 +1,3 @@ { mkDerivation }: -mkDerivation { - path = "usr.bin/nbperf"; - version = "9.2"; - sha256 = "1nxc302vgmjhm3yqdivqyfzslrg0vjpbss44s74rcryrl19mma9r"; -} +mkDerivation { path = "usr.bin/nbperf"; } diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/netbsdSetupHook/setup-hook.sh b/pkgs/os-specific/bsd/netbsd/pkgs/netbsdSetupHook/setup-hook.sh index ef00ea418e53..8c3742a76534 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/netbsdSetupHook/setup-hook.sh +++ b/pkgs/os-specific/bsd/netbsd/pkgs/netbsdSetupHook/setup-hook.sh @@ -1,16 +1,6 @@ -mergeNetBSDSourceDir() { - # merge together all extra paths - # there should be a better way to do this - chmod -R u+w $BSDSRCDIR - for path in $extraPaths; do - rsync -Er --chmod u+w $path/ $BSDSRCDIR/ - done -} - addNetBSDMakeFlags() { makeFlags="INCSDIR=${!outputDev}/include $makeFlags" makeFlags="MANDIR=${!outputMan}/share/man $makeFlags" } -postUnpackHooks+=(mergeNetBSDSourceDir) preConfigureHooks+=(addNetBSDMakeFlags) diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/rpcgen.nix b/pkgs/os-specific/bsd/netbsd/pkgs/rpcgen.nix index b1482d4dff11..dc6ceb7bd634 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/rpcgen.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/rpcgen.nix @@ -1,7 +1,3 @@ { mkDerivation }: -mkDerivation { - path = "usr.bin/rpcgen"; - version = "9.2"; - sha256 = "1kfgfx54jg98wbg0d95p0rvf4w0302v8fz724b0bdackdsrd4988"; -} +mkDerivation { path = "usr.bin/rpcgen"; } diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/source.nix b/pkgs/os-specific/bsd/netbsd/pkgs/source.nix new file mode 100644 index 000000000000..432de84ffb3e --- /dev/null +++ b/pkgs/os-specific/bsd/netbsd/pkgs/source.nix @@ -0,0 +1,12 @@ +{ + lib, + fetchcvs, + version, +}: + +fetchcvs { + cvsRoot = ":pserver:anoncvs@anoncvs.NetBSD.org:/cvsroot"; + module = "src"; + tag = "netbsd-${lib.replaceStrings [ "." ] [ "-" ] version}-RELEASE"; + sha256 = "sha256-+onT/ajWayaKALucaZBqoiEkvBBI400Fs2OCtMf/bYU="; +} diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/stat/package.nix b/pkgs/os-specific/bsd/netbsd/pkgs/stat/package.nix index 397b1f5303c1..522a7a1837b1 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/stat/package.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/stat/package.nix @@ -14,8 +14,6 @@ mkDerivation { path = "usr.bin/stat"; - version = "9.2"; - sha256 = "18nqwlndfc34qbbgqx5nffil37jfq9aw663ippasfxd2hlyc106x"; nativeBuildInputs = [ bsdSetupHook netbsdSetupHook diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/sys/base.nix b/pkgs/os-specific/bsd/netbsd/pkgs/sys/base.nix index 4c140fa3bdef..6a6f8a503276 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/sys/base.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/sys/base.nix @@ -14,12 +14,9 @@ config, genassym, defaultMakeFlags, - common, }: { path = "sys"; - version = "9.2"; - sha256 = "03s18q8d9giipf05bx199fajc2qwikji0djz7hw63d2lya6bfnpj"; # Make the build ignore linker warnings prePatch = '' @@ -89,5 +86,5 @@ ''; meta.platforms = lib.platforms.netbsd; - extraPaths = [ common ]; + extraPaths = [ "common" ]; } diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/sys/headers.nix b/pkgs/os-specific/bsd/netbsd/pkgs/sys/headers.nix index 2df35efc199a..65fabedfcb45 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/sys/headers.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/sys/headers.nix @@ -14,7 +14,6 @@ config, genassym, defaultMakeFlags, - common, }: let base = import ./base.nix { @@ -34,7 +33,6 @@ let config genassym defaultMakeFlags - common ; }; in diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/sys/package.nix b/pkgs/os-specific/bsd/netbsd/pkgs/sys/package.nix index c8e6edab5f48..cb691dc87855 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/sys/package.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/sys/package.nix @@ -14,7 +14,6 @@ config, genassym, defaultMakeFlags, - common, }: let base = import ./base.nix { @@ -34,7 +33,6 @@ let config genassym defaultMakeFlags - common ; }; in diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/tic.nix b/pkgs/os-specific/bsd/netbsd/pkgs/tic.nix index e0900652108f..f71df930ce1c 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/tic.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/tic.nix @@ -11,13 +11,10 @@ compatIfNeeded, defaultMakeFlags, libterminfo, - fetchNetBSD, }: mkDerivation { path = "tools/tic"; - version = "9.2"; - sha256 = "092y7db7k4kh2jq8qc55126r5qqvlb8lq8mhmy5ipbi36hwb4zrz"; HOSTPROG = "tic"; buildInputs = compatIfNeeded; nativeBuildInputs = [ @@ -32,8 +29,8 @@ mkDerivation { ]; makeFlags = defaultMakeFlags ++ [ "TOOLDIR=$(out)" ]; extraPaths = [ - libterminfo.src - (fetchNetBSD "usr.bin/tic" "9.2" "1mwdfg7yx1g43ss378qsgl5rqhsxskqvsd2mqvrn38qw54i8v5i1") - (fetchNetBSD "tools/Makefile.host" "9.2" "15b4ab0n36lqj00j5lz2xs83g7l8isk3wx1wcapbrn66qmzz2sxy") + libterminfo.path + "usr.bin/tic" + "tools/Makefile.host" ]; } diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/tsort.nix b/pkgs/os-specific/bsd/netbsd/pkgs/tsort.nix index 9200bc57a73e..b1ab320da0c8 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/tsort.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/tsort.nix @@ -11,8 +11,6 @@ mkDerivation { path = "usr.bin/tsort"; - version = "9.2"; - sha256 = "1dqvf9gin29nnq3c4byxc7lfd062pg7m84843zdy6n0z63hnnwiq"; nativeBuildInputs = [ bsdSetupHook netbsdSetupHook diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/uudecode.nix b/pkgs/os-specific/bsd/netbsd/pkgs/uudecode.nix index 7592db3eaf18..1e58df16ceee 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/uudecode.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/uudecode.nix @@ -6,8 +6,6 @@ mkDerivation { path = "usr.bin/uudecode"; - version = "9.2"; - sha256 = "00a3zmh15pg4vx6hz0kaa5mi8d2b1sj4h512d7p6wbvxq6mznwcn"; env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isLinux "-DNO_BASE64"; NIX_LDFLAGS = lib.optional stdenv.isDarwin "-lresolv"; } diff --git a/pkgs/os-specific/darwin/raycast/default.nix b/pkgs/os-specific/darwin/raycast/default.nix index 5df4990b59f2..4b8ef7031d07 100644 --- a/pkgs/os-specific/darwin/raycast/default.nix +++ b/pkgs/os-specific/darwin/raycast/default.nix @@ -11,12 +11,12 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "raycast"; - version = "1.76.0"; + version = "1.76.1"; src = fetchurl { name = "Raycast.dmg"; url = "https://releases.raycast.com/releases/${finalAttrs.version}/download?build=universal"; - hash = "sha256-9qvXUmCATwugK8lB1LeSnjfr5MNCjF9QTKR29LmbKes="; + hash = "sha256-dZshCh1MSHf7ywwmNOvYNCXfSqC6C8vTCNsh/+klomk="; }; dontPatch = true; diff --git a/pkgs/os-specific/linux/ethq/default.nix b/pkgs/os-specific/linux/ethq/default.nix index 581382e4faf2..94f18cccd943 100644 --- a/pkgs/os-specific/linux/ethq/default.nix +++ b/pkgs/os-specific/linux/ethq/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "ethq"; - version = "0.6.3"; + version = "0.7.0"; src = fetchFromGitHub { owner = "isc-projects"; repo = "ethq"; rev = "refs/tags/v${builtins.replaceStrings ["."] ["_"] version}"; - hash = "sha256-dr37KiSnP0S0OjQof242EcbH+y4pCCzu6R9D6fXR9qc="; + hash = "sha256-ye5ep9EM9Sq/NqNZHENPmFZefVBx1BGrPm3YEG1NcSc="; }; buildInputs = [ ncurses ]; diff --git a/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix b/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix index 386df843971c..b2125170db14 100644 --- a/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix +++ b/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix @@ -2,22 +2,22 @@ stdenvNoCC.mkDerivation { pname = "raspberrypi-wireless-firmware"; - version = "unstable-2023-11-15"; + version = "unstable-2024-02-26"; srcs = [ (fetchFromGitHub { name = "bluez-firmware"; owner = "RPi-Distro"; repo = "bluez-firmware"; - rev = "d9d4741caba7314d6500f588b1eaa5ab387a4ff5"; - hash = "sha256-CjbZ3t3TW/iJ3+t9QKEtM9NdQU7SwcUCDYuTmFEwvhU="; + rev = "78d6a07730e2d20c035899521ab67726dc028e1c"; + hash = "sha256-KakKnOBeWxh0exu44beZ7cbr5ni4RA9vkWYb9sGMb8Q="; }) (fetchFromGitHub { name = "firmware-nonfree"; owner = "RPi-Distro"; repo = "firmware-nonfree"; - rev = "88aa085bfa1a4650e1ccd88896f8343c22a24055"; - hash = "sha256-Yynww79LPPkau4YDSLI6IMOjH64nMpHUdGjnCfIR2+M="; + rev = "223ccf3a3ddb11b3ea829749fbbba4d65b380897"; + hash = "sha256-BGq0+cr+xBRwQM/LqiQuRWuZpQsKM5jfcrNCqWMuVzM="; }) ]; diff --git a/pkgs/os-specific/linux/firmware/raspberrypi/default.nix b/pkgs/os-specific/linux/firmware/raspberrypi/default.nix index 0aea94bca067..ece39dade72b 100644 --- a/pkgs/os-specific/linux/firmware/raspberrypi/default.nix +++ b/pkgs/os-specific/linux/firmware/raspberrypi/default.nix @@ -3,16 +3,13 @@ stdenvNoCC.mkDerivation rec { # NOTE: this should be updated with linux_rpi pname = "raspberrypi-firmware"; - # raspberrypi/firmware no longers tag the releases. However, since each commit - # on the stable branch corresponds to a tag in raspberrypi/linux repo, we - # assume they are cut together. - version = "stable_20231123"; + version = "1.20240529"; src = fetchFromGitHub { owner = "raspberrypi"; repo = "firmware"; - rev = "524247ac6d8b1f4ddd53730e978a70c76a320bd6"; - hash = "sha256-rESwkR7pc5MTwIZ8PaMUPXuzxfv+jVpdRp8ijvxHGcg="; + rev = version; + hash = "sha256-KsCo7ZG6vKstxRyFljZtbQvnDSqiAPdUza32xTY/tlA="; }; installPhase = '' diff --git a/pkgs/os-specific/linux/kernel/linux-rpi.nix b/pkgs/os-specific/linux/kernel/linux-rpi.nix index e0ce6549235d..775a50980f6d 100644 --- a/pkgs/os-specific/linux/kernel/linux-rpi.nix +++ b/pkgs/os-specific/linux/kernel/linux-rpi.nix @@ -2,8 +2,8 @@ let # NOTE: raspberrypifw & raspberryPiWirelessFirmware should be updated with this - modDirVersion = "6.1.63"; - tag = "stable_20231123"; + modDirVersion = "6.6.31"; + tag = "stable_20240529"; in lib.overrideDerivation (buildLinux (args // { version = "${modDirVersion}-${tag}"; @@ -14,7 +14,7 @@ lib.overrideDerivation (buildLinux (args // { owner = "raspberrypi"; repo = "linux"; rev = tag; - hash = "sha256-4Rc57y70LmRFwDnOD4rHoHGmfxD9zYEAwYm9Wvyb3no="; + hash = "sha256-UWUTeCpEN7dlFSQjog6S3HyEWCCnaqiUqV5KxCjYink="; }; defconfig = { @@ -24,32 +24,33 @@ lib.overrideDerivation (buildLinux (args // { "4" = "bcm2711_defconfig"; }.${toString rpiVersion}; + structuredExtraConfig = (args.structuredExtraConfig or {}) // (with lib.kernel; { + # Workaround https://github.com/raspberrypi/linux/issues/6198 + # Needed because NixOS 24.05+ sets DRM_SIMPLEDRM=y which pulls in + # DRM_KMS_HELPER=y. + BACKLIGHT_CLASS_DEVICE = yes; + }); + features = { efiBootStub = false; } // (args.features or {}); kernelPatches = (args.kernelPatches or []) ++ [ - # Fix "WARNING: unmet direct dependencies detected for MFD_RP1", and - # subsequent build failure. - # https://github.com/NixOS/nixpkgs/pull/268280#issuecomment-1911839809 - # https://github.com/raspberrypi/linux/pull/5900 + # Fix compilation errors due to incomplete patch backport. + # https://github.com/raspberrypi/linux/pull/6223 { - name = "drm-rp1-depends-on-instead-of-select-MFD_RP1.patch"; + name = "gpio-pwm_-_pwm_apply_might_sleep.patch"; patch = fetchpatch { - url = "https://github.com/peat-psuwit/rpi-linux/commit/6de0bb51929cd3ad4fa27b2a421a2af12e6468f5.patch"; - hash = "sha256-9pHcbgWTiztu48SBaLPVroUnxnXMKeCGt5vEo9V8WGw="; + url = "https://github.com/peat-psuwit/rpi-linux/commit/879f34b88c60dd59765caa30576cb5bfb8e73c56.patch"; + hash = "sha256-HlOkM9EFmlzOebCGoj7lNV5hc0wMjhaBFFZvaRCI0lI="; }; } - # Fix `ERROR: modpost: missing MODULE_LICENSE() in <...>/bcm2712-iommu.o` - # by preventing such code from being built as module. - # https://github.com/NixOS/nixpkgs/pull/284035#issuecomment-1913015802 - # https://github.com/raspberrypi/linux/pull/5910 { - name = "iommu-bcm2712-don-t-allow-building-as-module.patch"; + name = "ir-rx51_-_pwm_apply_might_sleep.patch"; patch = fetchpatch { - url = "https://github.com/peat-psuwit/rpi-linux/commit/693a5e69bddbcbe1d1b796ebc7581c3597685b1b.patch"; - hash = "sha256-8BYYQDM5By8cTk48ASYKJhGVQnZBIK4PXtV70UtfS+A="; + url = "https://github.com/peat-psuwit/rpi-linux/commit/23431052d2dce8084b72e399fce82b05d86b847f.patch"; + hash = "sha256-UDX/BJCJG0WVndP/6PbPK+AZsfU3vVxDCrpn1kb1kqE="; }; } ]; diff --git a/pkgs/os-specific/linux/wiringpi/default.nix b/pkgs/os-specific/linux/wiringpi/default.nix index bc80e2a33543..a8eb74217a4f 100644 --- a/pkgs/os-specific/linux/wiringpi/default.nix +++ b/pkgs/os-specific/linux/wiringpi/default.nix @@ -1,50 +1,54 @@ -{ lib -, stdenv -, symlinkJoin -, fetchFromGitHub -, libxcrypt +{ + lib, + stdenv, + symlinkJoin, + fetchFromGitHub, + libxcrypt, }: let - version = "2.61-1"; - mkSubProject = { subprj # The only mandatory argument - , buildInputs ? [] - , src ? fetchFromGitHub { + version = "3.6"; + srcAll = fetchFromGitHub { owner = "WiringPi"; repo = "WiringPi"; rev = version; - sha256 = "sha256-VxAaPhaPXd9xYt663Ju6SLblqiSLizauhhuFqCqbO5M="; - } - }: stdenv.mkDerivation (finalAttrs: { - pname = "wiringpi-${subprj}"; - inherit version src; - sourceRoot = "${src.name}/${subprj}"; - inherit buildInputs; - # Remove (meant for other OSs) lines from Makefiles - preInstall = '' - sed -i "/chown root/d" Makefile - sed -i "/chmod/d" Makefile - ''; - makeFlags = [ - "DESTDIR=${placeholder "out"}" - "PREFIX=/." - # On NixOS we don't need to run ldconfig during build: - "LDCONFIG=echo" - ]; - }); + sha256 = "sha256-Hw81Ua9LTb/9l3Js1rx8TfCOF59MrrvH6AGsAsG1SoE="; + }; + mkSubProject = + { + subprj, # The only mandatory argument + buildInputs ? [ ], + src ? srcAll, + }: + stdenv.mkDerivation (finalAttrs: { + pname = "wiringpi-${subprj}"; + inherit version src; + sourceRoot = "${src.name}/${subprj}"; + inherit buildInputs; + # Remove (meant for other OSs) lines from Makefiles + preInstall = '' + sed -i "/chown root/d" Makefile + sed -i "/chmod/d" Makefile + ''; + makeFlags = [ + "DESTDIR=${placeholder "out"}" + "PREFIX=/." + # On NixOS we don't need to run ldconfig during build: + "LDCONFIG=echo" + ]; + }); passthru = { + # Helps nix-update and probably nixpkgs-update find the src of this package + # automatically. + src = srcAll; inherit mkSubProject; wiringPi = mkSubProject { subprj = "wiringPi"; - buildInputs = [ - libxcrypt - ]; + buildInputs = [ libxcrypt ]; }; devLib = mkSubProject { subprj = "devLib"; - buildInputs = [ - passthru.wiringPi - ]; + buildInputs = [ passthru.wiringPi ]; }; wiringPiD = mkSubProject { subprj = "wiringPiD"; diff --git a/pkgs/servers/akkoma/default.nix b/pkgs/servers/akkoma/default.nix index 472089bbafae..ec69767338aa 100644 --- a/pkgs/servers/akkoma/default.nix +++ b/pkgs/servers/akkoma/default.nix @@ -222,7 +222,7 @@ beamPackages.mixRelease rec { description = "ActivityPub microblogging server"; homepage = "https://akkoma.social"; license = licenses.agpl3Only; - maintainers = with maintainers; [ mvs tcmal ]; + maintainers = with maintainers; [ mvs ]; platforms = platforms.unix; }; } diff --git a/pkgs/servers/elasticmq-server-bin/default.nix b/pkgs/servers/elasticmq-server-bin/default.nix index 1e8a97fa2b64..f878ef6e64e9 100644 --- a/pkgs/servers/elasticmq-server-bin/default.nix +++ b/pkgs/servers/elasticmq-server-bin/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "elasticmq-server"; - version = "1.6.3"; + version = "1.6.4"; src = fetchurl { url = "https://s3-eu-west-1.amazonaws.com/softwaremill-public/${finalAttrs.pname}-${finalAttrs.version}.jar"; - sha256 = "sha256-AVvzIx39IdtLzlD7jUJk3NlNRJym0N3VZmKsncYkzFU="; + sha256 = "sha256-HAxZaZofO24baPTNFqSltNgZekjOLRuCprcAksTSYiY="; }; # don't do anything? diff --git a/pkgs/servers/gotosocial/default.nix b/pkgs/servers/gotosocial/default.nix index 2e452e0e57d7..cf2e82a46db0 100644 --- a/pkgs/servers/gotosocial/default.nix +++ b/pkgs/servers/gotosocial/default.nix @@ -9,11 +9,11 @@ let owner = "superseriousbusiness"; repo = "gotosocial"; - version = "0.15.0"; + version = "0.16.0"; web-assets = fetchurl { url = "https://github.com/${owner}/${repo}/releases/download/v${version}/${repo}_${version}_web-assets.tar.gz"; - hash = "sha256-vrSdFIdBcfj6+sxtvv1s/Mu85I1mKxjyUYS902oLKk4="; + hash = "sha256-aZQpd5KvoZvXEMVzGbWrtGsc+P1JStjZ6U5mX6q7Vb0="; }; in buildGoModule rec { @@ -23,7 +23,7 @@ buildGoModule rec { src = fetchFromGitHub { inherit owner repo; rev = "refs/tags/v${version}"; - hash = "sha256-z0iETddkw4C2R6ig9ZO8MTvhuWnmQ37/6q3oZ4WAzd4="; + hash = "sha256-QoG09+jmq5e5vxDVtkhY35098W/9B1HsYTuUnz43LV4="; }; vendorHash = null; diff --git a/pkgs/servers/home-assistant/stubs.nix b/pkgs/servers/home-assistant/stubs.nix index 5a421a1f897b..4d14ee508bcb 100644 --- a/pkgs/servers/home-assistant/stubs.nix +++ b/pkgs/servers/home-assistant/stubs.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "homeassistant-stubs"; - version = "2024.6.2"; + version = "2024.6.3"; pyproject = true; disabled = python.version != home-assistant.python.version; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "KapJI"; repo = "homeassistant-stubs"; rev = "refs/tags/${version}"; - hash = "sha256-y1TiexWK5aJRa6Kfcdc8rPr+uueKJ2+4n2q6dCPCWjk="; + hash = "sha256-YMoNoR9LT38nkqoo0seaP88XUOcVmSQN1dBKiW+13SM="; }; build-system = [ diff --git a/pkgs/servers/home-automation/evcc/default.nix b/pkgs/servers/home-automation/evcc/default.nix index 2a83b6d5b8a9..b20fbee94591 100644 --- a/pkgs/servers/home-automation/evcc/default.nix +++ b/pkgs/servers/home-automation/evcc/default.nix @@ -21,13 +21,13 @@ in buildGoModule rec { pname = "evcc"; - version = "0.127.1"; + version = "0.127.2"; src = fetchFromGitHub { owner = "evcc-io"; repo = "evcc"; rev = version; - hash = "sha256-wyx0/exXi+LWC3w4VZa9AWpenSHkqn7R91HnTxO68HY="; + hash = "sha256-85AhiqAvjr63tfXovH2bt1b583ak1N09EtbLLtW7qeA="; }; vendorHash = "sha256-MdfLJpPEi6Cr34W6eJSraKJwBPtR66HM2tJIbPE9mZs="; diff --git a/pkgs/servers/http/apache-modules/mod_tile/default.nix b/pkgs/servers/http/apache-modules/mod_tile/default.nix index cd3937fe1fa6..6c64478cc125 100644 --- a/pkgs/servers/http/apache-modules/mod_tile/default.nix +++ b/pkgs/servers/http/apache-modules/mod_tile/default.nix @@ -29,6 +29,11 @@ stdenv.mkDerivation rec { hash = "sha256-zXUwTG8cqAkY5MC1jAc2TtMgNMQPLc5nc22okVYP4ME="; }; + patches = [ + # Support Mapnik >= v4.0.0-rc2 (boost:optional no longer used) + ./mod_tile-std_optional.patch + ]; + nativeBuildInputs = [ cmake pkg-config @@ -64,6 +69,8 @@ stdenv.mkDerivation rec { installFlags = [ "DESTDIR=$(out)" ]; doCheck = true; + # Do not run tests in parallel + enableParallelChecking = false; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/servers/http/apache-modules/mod_tile/mod_tile-std_optional.patch b/pkgs/servers/http/apache-modules/mod_tile/mod_tile-std_optional.patch new file mode 100644 index 000000000000..1f63ce0bc1f1 --- /dev/null +++ b/pkgs/servers/http/apache-modules/mod_tile/mod_tile-std_optional.patch @@ -0,0 +1,26 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e68d2e9..ddba150 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -48,7 +48,7 @@ find_package(LIBMEMCACHED) + find_package(LIBRADOS) + + if(LIBMAPNIK_VERSION STRGREATER_EQUAL "4") +- set(CMAKE_CXX_STANDARD 14) ++ set(CMAKE_CXX_STANDARD 17) + endif() + + # Programs +diff --git a/src/parameterize_style.cpp b/src/parameterize_style.cpp +index 8db7122..7100735 100644 +--- a/src/parameterize_style.cpp ++++ b/src/parameterize_style.cpp +@@ -72,7 +74,7 @@ static void parameterize_map_language(mapnik::Map &m, char * parameter) + mapnik::parameters params = l.datasource()->params(); + + if (params.find("table") != params.end()) { +- boost::optional table = params.get("table"); ++ auto table = params.get("table"); + + if (table && table->find(",name") != std::string::npos) { + std::string str = *table; diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 000c56b41d83..136cb0828f32 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -32,20 +32,20 @@ let in python.pkgs.buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.108.0"; + version = "1.109.0"; format = "pyproject"; src = fetchFromGitHub { owner = "element-hq"; repo = "synapse"; rev = "v${version}"; - hash = "sha256-Pvn6mf1EM7Dj3N7frBzPGU9YmTDhJuAVuvXbYgjnRqk="; + hash = "sha256-AUaHgMKte1EIfI0EQm8YeQVtlXGTm+MZwq22WzYHGsE="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-R4V/Z8f2nbSifjlYP2NCP0B6KiAAa+YSmpVLdzeuXWY="; + hash = "sha256-KwRNn2Ypt87QRUTCsj00zsu6uQtP5MSuM6B2DemoFGs="; }; postPatch = '' diff --git a/pkgs/servers/monitoring/prometheus/junos-czerwonk-exporter.nix b/pkgs/servers/monitoring/prometheus/junos-czerwonk-exporter.nix index 37631a00c679..c9b7440507aa 100644 --- a/pkgs/servers/monitoring/prometheus/junos-czerwonk-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/junos-czerwonk-exporter.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "junos-czerwonk-exporter"; - version = "0.12.2"; + version = "0.12.3"; src = fetchFromGitHub { owner = "czerwonk"; repo = "junos_exporter"; rev = version; - sha256 = "sha256-KdVyRddAr2gqiFyIGBfWbi4DHAaiey4p4OBFND/2u7U="; + sha256 = "sha256-5haMQlwGJO0WdT75AEfs41k1oWUqrFk9nj+DOcKAom0="; }; - vendorHash = "sha256-fytDr56ZhhO5u6u9CRIEKXGqgnzntSVqEVItibpLyPM="; + vendorHash = "sha256-qHs6KuBmJmmkmR23Ae7COadb2F7N8CMUmScx8JFt98Q="; meta = with lib; { description = "Exporter for metrics from devices running JunOS"; diff --git a/pkgs/servers/monitoring/prometheus/surfboard-exporter.nix b/pkgs/servers/monitoring/prometheus/surfboard-exporter.nix index d3365fc92bf4..1f215b4ffdc6 100644 --- a/pkgs/servers/monitoring/prometheus/surfboard-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/surfboard-exporter.nix @@ -1,11 +1,9 @@ -{ lib, buildGoPackage, fetchFromGitHub, nixosTests }: +{ lib, buildGoModule, fetchFromGitHub, nixosTests }: -buildGoPackage rec { +buildGoModule rec { pname = "surfboard_exporter"; version = "2.0.0"; - goPackagePath = "github.com/ipstatic/surfboard_exporter"; - src = fetchFromGitHub { rev = version; owner = "ipstatic"; @@ -13,6 +11,12 @@ buildGoPackage rec { sha256 = "11qms26648nwlwslnaflinxcr5rnp55s908rm1qpnbz0jnxf5ipw"; }; + postPatch = '' + go mod init github.com/ipstatic/surfboard_exporter + ''; + + vendorHash = null; + passthru.tests = { inherit (nixosTests.prometheus-exporters) surfboard; }; meta = with lib; { diff --git a/pkgs/servers/nosql/influxdb/default.nix b/pkgs/servers/nosql/influxdb/default.nix index 83a0dc0da83d..739fab6f8119 100644 --- a/pkgs/servers/nosql/influxdb/default.nix +++ b/pkgs/servers/nosql/influxdb/default.nix @@ -1,9 +1,9 @@ { lib, buildGoModule, fetchFromGitHub, stdenv, pkg-config, rustPlatform, libiconv, fetchpatch, nixosTests }: let - libflux_version = "0.188.0"; + libflux_version = "0.194.5"; - # This is copied from influxdb2 with flux version matching the needed by thi + # This is copied from influxdb2 with the required flux version flux = rustPlatform.buildRustPackage rec { pname = "libflux"; version = "v${libflux_version}"; @@ -11,21 +11,22 @@ let owner = "influxdata"; repo = "flux"; rev = "v${libflux_version}"; - hash = "sha256-4Z6Vfdyh0zimQlE47plSIjTWBYiju0Qu09M+MgMQOL4="; + hash = "sha256-XHT/+JMu5q1cPjZT2x/OKEPgxFJcnjrQKqn8w9/Mb3s="; }; patches = [ - # https://github.com/influxdata/flux/pull/5440 - # fix compile error with Rust 1.72.0 + # Fix build on Rust 1.78 (included after v0.195.0) (fetchpatch { - url = "https://github.com/influxdata/flux/commit/8d1d6c8b485eb7e15b6a5f57762d1f766b17defd.patch"; + name = "fix-build-on-rust-1.78.patch"; + url = "https://github.com/influxdata/flux/commit/68c831c40b396f0274f6a9f97d77707c39970b02.patch"; stripLen = 2; extraPrefix = ""; - hash = "sha256-BDBmGKsC2RWMyObDm7dPwFq/3cVIdBKF8ZVaCL+uftw="; - includes = [ "flux/src/lib.rs" ]; + excludes = [ ]; + hash = "sha256-6LOTgbOCfETNTmshyXgtDZf9y4t/2iqRuVPkz9dYPHc="; }) + ../influxdb2/fix-unsigned-char.patch ]; sourceRoot = "${src.name}/libflux"; - cargoHash = "sha256-925U9weBOvMuyApsTOjtQxik3nqT2UpK+DPM64opc7c="; + cargoHash = "sha256-O+t4f4P5291BuyARH6Xf3LejMFEQEBv+qKtyjHRhclA="; nativeBuildInputs = [ rustPlatform.bindgenHook ]; buildInputs = lib.optional stdenv.isDarwin libiconv; pkgcfg = '' @@ -48,16 +49,16 @@ let in buildGoModule rec { pname = "influxdb"; - version = "1.10.5"; + version = "1.10.7"; src = fetchFromGitHub { owner = "influxdata"; repo = pname; rev = "v${version}"; - hash = "sha256-FvKGNqy27q6/X2DI/joJXfGVrax6hQcNcx5nJDeSLm0="; + hash = "sha256-Aibu3yG/D1501Hr2F2qsGvjig14tbEAI+MBfqbxlpg8="; }; - vendorHash = "sha256-1jeZBVmNOxF5NPlTKg+YRw6VqIIZDcT3snnoMLX3y4g="; + vendorHash = "sha256-AA6uj7PgXjC+IK2ZSwRnYpHS4MFScOROO1BpP+s33IU="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/servers/nosql/influxdb2/default.nix b/pkgs/servers/nosql/influxdb2/default.nix index 46dddd6eca3a..81333a9f1ec3 100644 --- a/pkgs/servers/nosql/influxdb2/default.nix +++ b/pkgs/servers/nosql/influxdb2/default.nix @@ -13,15 +13,15 @@ }: let - version = "2.7.1"; - ui_version = "OSS-v${version}"; - libflux_version = "0.193.0"; + version = "2.7.6"; + ui_version = "OSS-v2.7.1"; + libflux_version = "0.194.5"; src = fetchFromGitHub { owner = "influxdata"; repo = "influxdb"; rev = "v${version}"; - hash = "sha256-JWu4V2k8ItbzBa421EtzgMVlDznoDdGjIhfDSaZ0j6c="; + hash = "sha256-0gqFUIV0ETdVuVmC+SwoKsO6OkoT/s+qKO1f8fkaZj4="; }; ui = fetchurl { @@ -36,21 +36,22 @@ let owner = "influxdata"; repo = "flux"; rev = "v${libflux_version}"; - hash = "sha256-gx6vnGOFu35wasLl7X/73eDsE0/50cAzjmBjZ+H2Ne4="; + hash = "sha256-XHT/+JMu5q1cPjZT2x/OKEPgxFJcnjrQKqn8w9/Mb3s="; }; patches = [ - # Fix build with recent rust versions + # Fix build on Rust 1.78 (included after v0.195.0) (fetchpatch { - url = "https://github.com/influxdata/flux/commit/6dc8054cfeec4b65b5c7ae786d633240868b8589.patch"; + name = "fix-build-on-rust-1.78.patch"; + url = "https://github.com/influxdata/flux/commit/68c831c40b396f0274f6a9f97d77707c39970b02.patch"; stripLen = 2; extraPrefix = ""; - excludes = [ "rust-toolchain.toml" ]; - hash = "sha256-w3z+Z26Xhy9TNICyNhc8XiWNSpdLA23ADI4K/AOMYhg="; + excludes = [ ]; + hash = "sha256-6LOTgbOCfETNTmshyXgtDZf9y4t/2iqRuVPkz9dYPHc="; }) - ./no-deny-warnings.patch + ./fix-unsigned-char.patch ]; sourceRoot = "${src.name}/libflux"; - cargoSha256 = "sha256-MoI5nxLGA/3pduZ+vgmSG3lm3Nx58SP+6WXQl2pX9Lc="; + cargoHash = "sha256-O+t4f4P5291BuyARH6Xf3LejMFEQEBv+qKtyjHRhclA="; nativeBuildInputs = [ rustPlatform.bindgenHook ]; buildInputs = lib.optional stdenv.isDarwin libiconv; pkgcfg = '' @@ -78,7 +79,7 @@ in buildGoModule { nativeBuildInputs = [ go-bindata pkg-config perl ]; - vendorHash = "sha256-5b1WRq3JndkOkKBhMzGZnSyBDY5Lk0UGe/WGHQJp0CQ="; + vendorHash = "sha256-3Vf8BCrOwliXrH+gmZ4RJ1YBEbqL0Szx2prW3ie9CNg="; subPackages = [ "cmd/influxd" "cmd/telemetryd" ]; PKG_CONFIG_PATH = "${flux}/pkgconfig"; diff --git a/pkgs/servers/nosql/influxdb2/fix-unsigned-char.patch b/pkgs/servers/nosql/influxdb2/fix-unsigned-char.patch new file mode 100644 index 000000000000..173e5b30e5ee --- /dev/null +++ b/pkgs/servers/nosql/influxdb2/fix-unsigned-char.patch @@ -0,0 +1,13 @@ +diff --git a/flux/src/cffi.rs b/flux/src/cffi.rs +index ba18e3d5..0c1badf8 100644 +--- a/flux/src/cffi.rs ++++ b/flux/src/cffi.rs +@@ -1149,7 +1149,7 @@ from(bucket: v.bucket) + fn parse_with_invalid_utf8() { + let cfname = CString::new("foo.flux").unwrap(); + let cfname_ptr: *const c_char = cfname.as_ptr(); +- let v: Vec = vec![-61, 0]; ++ let v: Vec = vec![-61i8 as c_char, 0]; + let csrc: *const c_char = &v[0]; + // Safety: both pointers are valid + let pkg = unsafe { flux_parse(cfname_ptr, csrc) }; diff --git a/pkgs/servers/nosql/influxdb2/no-deny-warnings.patch b/pkgs/servers/nosql/influxdb2/no-deny-warnings.patch deleted file mode 100644 index 3000ccad8256..000000000000 --- a/pkgs/servers/nosql/influxdb2/no-deny-warnings.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff --git a/flux/src/lib.rs b/flux/src/lib.rs -index 3fdf4071..a4c02277 100644 ---- a/flux/src/lib.rs -+++ b/flux/src/lib.rs -@@ -1,5 +1,3 @@ --#![cfg_attr(feature = "strict", deny(warnings, missing_docs))] -- - //! This module provides the public facing API for Flux's Go runtime, including formatting, - //! parsing, and standard library analysis. - use std::sync::Arc; diff --git a/pkgs/servers/osmocom/libosmocore/default.nix b/pkgs/servers/osmocom/libosmocore/default.nix index acc72975617f..770dcd97f0a4 100644 --- a/pkgs/servers/osmocom/libosmocore/default.nix +++ b/pkgs/servers/osmocom/libosmocore/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "libosmocore"; - version = "1.9.2"; + version = "1.9.3"; src = fetchFromGitHub { owner = "osmocom"; repo = "libosmocore"; rev = version; - hash = "sha256-rbdn7MiB0tluHgdQz1XpcQsN5FU8eGhmetzXzFAiCLg="; + hash = "sha256-9b+wQoC3lOz7mlaxzSRIrXinRVoNj4UYW0ae+JBBKsE="; }; postPatch = '' diff --git a/pkgs/servers/osmocom/osmo-bsc/default.nix b/pkgs/servers/osmocom/osmo-bsc/default.nix index 1f9a6cabbf18..1df6e7dd4c3b 100644 --- a/pkgs/servers/osmocom/osmo-bsc/default.nix +++ b/pkgs/servers/osmocom/osmo-bsc/default.nix @@ -51,5 +51,6 @@ stdenv.mkDerivation rec { license = lib.licenses.agpl3Plus; maintainers = with lib.maintainers; [ janik ]; platforms = lib.platforms.linux; + mainProgram = "osmo-bsc"; }; } diff --git a/pkgs/servers/osmocom/osmo-ggsn/default.nix b/pkgs/servers/osmocom/osmo-ggsn/default.nix index ce902e29c256..51615fdb1b3c 100644 --- a/pkgs/servers/osmocom/osmo-ggsn/default.nix +++ b/pkgs/servers/osmocom/osmo-ggsn/default.nix @@ -43,5 +43,6 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Only; maintainers = with lib.maintainers; [ janik ]; platforms = lib.platforms.linux; + mainProgram = "osmo-ggsn"; }; } diff --git a/pkgs/servers/osmocom/osmo-hlr/default.nix b/pkgs/servers/osmocom/osmo-hlr/default.nix index 6dce9cd84d40..112e3c873902 100644 --- a/pkgs/servers/osmocom/osmo-hlr/default.nix +++ b/pkgs/servers/osmocom/osmo-hlr/default.nix @@ -47,5 +47,6 @@ stdenv.mkDerivation rec { license = lib.licenses.agpl3Plus; maintainers = with lib.maintainers; [ janik ]; platforms = lib.platforms.linux; + mainProgram = "osmo-hlr"; }; } diff --git a/pkgs/servers/osmocom/osmo-sgsn/default.nix b/pkgs/servers/osmocom/osmo-sgsn/default.nix index d74ca535e140..9529c4f50cad 100644 --- a/pkgs/servers/osmocom/osmo-sgsn/default.nix +++ b/pkgs/servers/osmocom/osmo-sgsn/default.nix @@ -53,5 +53,6 @@ stdenv.mkDerivation rec { license = lib.licenses.agpl3Plus; maintainers = with lib.maintainers; [ janik ]; platforms = lib.platforms.linux; + mainProgram = "osmo-sgsn"; }; } diff --git a/pkgs/servers/spicedb/default.nix b/pkgs/servers/spicedb/default.nix index 5b1f982216a3..412f8d4de2e9 100644 --- a/pkgs/servers/spicedb/default.nix +++ b/pkgs/servers/spicedb/default.nix @@ -17,6 +17,10 @@ buildGoModule rec { vendorHash = "sha256-pqHDSQQMvfas9yeyhs5cWokBPISQygz2aHf6W5Zc+co="; + ldflags = [ + "-X 'github.com/jzelinskie/cobrautil/v2.Version=${src.rev}'" + ]; + subPackages = [ "cmd/spicedb" ]; meta = with lib; { diff --git a/pkgs/servers/spicedb/zed.nix b/pkgs/servers/spicedb/zed.nix index 5b6e9d24e114..efe77289040c 100644 --- a/pkgs/servers/spicedb/zed.nix +++ b/pkgs/servers/spicedb/zed.nix @@ -16,6 +16,10 @@ buildGoModule rec { vendorHash = "sha256-Z6j4w4/anfK0ln2MvgnwZFoe8BA5jVHG3g9m2TynmmE="; + ldflags = [ + "-X 'github.com/jzelinskie/cobrautil/v2.Version=${src.rev}'" + ]; + meta = with lib; { description = "Command line for managing SpiceDB"; mainProgram = "zed"; diff --git a/pkgs/servers/sql/patroni/default.nix b/pkgs/servers/sql/patroni/default.nix index 14f52c9d63ae..119218bada52 100644 --- a/pkgs/servers/sql/patroni/default.nix +++ b/pkgs/servers/sql/patroni/default.nix @@ -6,13 +6,13 @@ pythonPackages.buildPythonApplication rec { pname = "patroni"; - version = "3.3.0"; + version = "3.3.1"; src = fetchFromGitHub { owner = "zalando"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-gOjjE++hf3GOimvCxBR0jqqi3JNpbejLcWbLHpz2H4Q="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-GyPPBoYcJnuMer9FYGhWqursX/qJLaAlc9zFULoJqo4="; }; propagatedBuildInputs = with pythonPackages; [ diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index ff9f4f4150a2..3040e8074b32 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -1,5 +1,13 @@ self: let + # Before removing an EOL major version, make sure to check the versioning policy in: + # /nixos/modules/services/databases/postgresql.md + # + # Before removing, make sure to update it to the last minor version - and if only in + # an immediately preceding commit. This allows people relying on that old major version + # for a bit longer to still update up to this commit to at least get the latest minor + # version. In other words: Do not remove the second-to-last minor version from nixpkgs, + # yet. Update first. versions = { postgresql_12 = ./12.nix; postgresql_13 = ./13.nix; diff --git a/pkgs/servers/teleport/generic.nix b/pkgs/servers/teleport/generic.nix index 94ca520964cd..51bea403f7db 100644 --- a/pkgs/servers/teleport/generic.nix +++ b/pkgs/servers/teleport/generic.nix @@ -182,7 +182,10 @@ buildGoModule rec { # which occupies more than 31 bits of address space. broken = stdenv.hostPlatform.parsed.cpu.bits < 64 || # See comment about wasm32-unknown-unknown in rustc.nix. - lib.any (a: lib.hasAttr a stdenv.hostPlatform.gcc) [ "cpu" "float-abi" "fpu" ] || - !stdenv.hostPlatform.gcc.thumb or true; + # version 15 is the first that starts to use wasm + (lib.versionAtLeast version "15") && ( + lib.any (a: lib.hasAttr a stdenv.hostPlatform.gcc) [ "cpu" "float-abi" "fpu" ] || + !stdenv.hostPlatform.gcc.thumb or true + ); }; } diff --git a/pkgs/servers/web-apps/outline/default.nix b/pkgs/servers/web-apps/outline/default.nix index 089cd5a0c56d..35437f4fd778 100644 --- a/pkgs/servers/web-apps/outline/default.nix +++ b/pkgs/servers/web-apps/outline/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "outline"; - version = "0.77.1"; + version = "0.77.2"; src = fetchFromGitHub { owner = "outline"; repo = "outline"; rev = "v${version}"; - hash = "sha256-n2TGbCRe/NSX+4lSmLGs2WUh44s+Hr6eblsqnzYNeSs="; + hash = "sha256-Ri2qN7nR79Y1tsUsga/92nS7EuP/nqaUG2FiYJQNAr4="; }; nativeBuildInputs = [ makeWrapper prefetch-yarn-deps fixup-yarn-lock ]; diff --git a/pkgs/shells/nushell/nu_scripts/default.nix b/pkgs/shells/nushell/nu_scripts/default.nix index 9815d7934387..47d29b44ac23 100644 --- a/pkgs/shells/nushell/nu_scripts/default.nix +++ b/pkgs/shells/nushell/nu_scripts/default.nix @@ -6,13 +6,13 @@ stdenvNoCC.mkDerivation rec { pname = "nu_scripts"; - version = "0-unstable-2024-06-08"; + version = "0-unstable-2024-06-16"; src = fetchFromGitHub { owner = "nushell"; repo = pname; - rev = "398cc82308d8ddd0fb09bc9e8fc20cced26a0d30"; - hash = "sha256-zJWZakNxLQI3vxClzS4B0NqY84Oj5R1BjX2aMjCm/+Q="; + rev = "92f20ff2827b1afb3d06011bc0609a0212c53993"; + hash = "sha256-ZYrlX8Kg9VD5/eUctesAXQlBcVPiOZ3W9WCpBkByrpA="; }; installPhase = '' diff --git a/pkgs/tools/admin/azure-cli/default.nix b/pkgs/tools/admin/azure-cli/default.nix index 3336e382bb45..d401801a15ed 100644 --- a/pkgs/tools/admin/azure-cli/default.nix +++ b/pkgs/tools/admin/azure-cli/default.nix @@ -50,8 +50,8 @@ let changelog = "https://github.com/Azure/azure-cli-extensions/blob/main/src/${pname}/HISTORY.rst"; license = lib.licenses.mit; sourceProvenance = [ lib.sourceTypes.fromSource ]; - }; - } // (removeAttrs args [ "url" "sha256" "description" ])); + } // args.meta or { }; + } // (removeAttrs args [ "url" "sha256" "description" "meta" ])); extensions = callPackages ./extensions-generated.nix { inherit mkAzExtension; } @@ -233,7 +233,7 @@ py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage rec { # pip is required to install extensions locally, but it's not needed if # we're using the default immutable configuration. pip - ]; + ] ++ lib.concatMap (extension: extension.propagatedBuildInputs) withExtensions; postInstall = '' substituteInPlace az.completion.sh \ diff --git a/pkgs/tools/admin/azure-cli/extensions-manual.nix b/pkgs/tools/admin/azure-cli/extensions-manual.nix index 1ae9845f2d45..6e098fb1f3cf 100644 --- a/pkgs/tools/admin/azure-cli/extensions-manual.nix +++ b/pkgs/tools/admin/azure-cli/extensions-manual.nix @@ -1,4 +1,6 @@ -{ mkAzExtension +{ lib +, mkAzExtension +, mycli , python3Packages }: @@ -9,9 +11,24 @@ url = "https://github.com/Azure/azure-devops-cli-extension/releases/download/20240206.1/azure_devops-${version}-py2.py3-none-any.whl"; sha256 = "658a2854d8c80f874f9382d421fa45abf6a38d00334737dda006f8dec64cf70a"; description = "Tools for managing Azure DevOps"; - propagatedBuildInputs = with python3Packages; [ - distro + propagatedBuildInputs = with python3Packages; [ distro ]; + }; + + rdbms-connect = mkAzExtension rec { + pname = "rdbms-connect"; + version = "1.0.6"; + url = "https://azcliprod.blob.core.windows.net/cli-extensions/rdbms_connect-${version}-py2.py3-none-any.whl"; + sha256 = "49cbe8d9b7ea07a8974a29ad90247e864ed798bed5f28d0e3a57a4b37f5939e7"; + description = "Support for testing connection to Azure Database for MySQL & PostgreSQL servers"; + propagatedBuildInputs = (with python3Packages; [ + pgcli + psycopg2 + pymysql + setproctitle + ]) ++ [ + mycli ]; + meta.maintainers = with lib.maintainers; [ obreitwi ]; }; # Removed extensions diff --git a/pkgs/tools/admin/pulumi-bin/data.nix b/pkgs/tools/admin/pulumi-bin/data.nix index b8b0f5c11a8d..128ab8e226f7 100644 --- a/pkgs/tools/admin/pulumi-bin/data.nix +++ b/pkgs/tools/admin/pulumi-bin/data.nix @@ -1,12 +1,12 @@ # DO NOT EDIT! This file is generated automatically by update.sh { }: { - version = "3.119.0"; + version = "3.120.0"; pulumiPkgs = { x86_64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.119.0-linux-x64.tar.gz"; - sha256 = "03v3138m6dxqbq192rxs5vhk9ypmvlp64k4l8acmcxys23gz7lvq"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.120.0-linux-x64.tar.gz"; + sha256 = "1ck6i0hqzisl474vv84iwdg8yh57sc6q3pjq81xh6plp8s95rka2"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.17.2-linux-amd64.tar.gz"; @@ -17,36 +17,36 @@ sha256 = "0vwlil9awkfs774992bb9lj6bggjw4vnys0z0pzsd4lmidxc8mv8"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.56.0-linux-amd64.tar.gz"; - sha256 = "036rkgs55j2z9gkivc9iw8apc2h82c4wdf6b0wiwd16jbaj5bvwb"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.57.0-linux-amd64.tar.gz"; + sha256 = "14dh5jf6ld5prgcbz74yk9fwcf1k6fsfm70gw1xy97m4crn2l4q9"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v6.8.3-linux-amd64.tar.gz"; - sha256 = "1q6hmfq5j1qjvppb1a9mhsd0ihc7yw1sr1rdspyd76jqk7610nfz"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v7.0.0-linux-amd64.tar.gz"; + sha256 = "1nqxc28ncrq1zpclm2acvvqa8yl21nmk6lb5sqsvy5kbizpzslar"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.3.3-linux-amd64.tar.gz"; sha256 = "0vcmyzb6qbg8sfrbq06sdi1cc309132qsf92lswxydvnrqxvy0x4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.39.0-linux-amd64.tar.gz"; - sha256 = "1ca29a9y03bi0q6zk5k1585bfx0pgxgsj4m0hhxvfz8lfh1i6lw3"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.40.0-linux-amd64.tar.gz"; + sha256 = "162zhf7iy9yr47h4fik3rps2wy7fsl74mg4kcnjxv65wjwmqlab4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.79.0-linux-amd64.tar.gz"; - sha256 = "09cn9g7pxnqsgr6cz62k8vnynvkxgqi9pf172inwm0f01h945zp9"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.80.0-linux-amd64.tar.gz"; + sha256 = "1sgfw4b9s6k5854fa35y0p77v1n5h199yaghing4qn05i0miapgp"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.51.0-linux-amd64.tar.gz"; - sha256 = "0y6y8ra858a4hn7wasf2356s33an68w8dwy7y4kdpb3kpky1mx3m"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.52.0-linux-amd64.tar.gz"; + sha256 = "00cbix4cdhmgj50ilqjyn2ia3mxyp094n1979pm15j88plvambf3"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.1.1-linux-amd64.tar.gz"; sha256 = "05vyz81a5z96k35hh8ky9bl6c505jfb6rxsc82qlfh8kx110p66l"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.30.0-linux-amd64.tar.gz"; - sha256 = "159anajw61s89f08kkrkp81r4yg7vf269pzk4ldq8fljikr49y55"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.31.0-linux-amd64.tar.gz"; + sha256 = "0n1kp9ip9f70rhn619r5a4pzyalcfx46252cfk3ha50drjv27l58"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.11.3-linux-amd64.tar.gz"; @@ -73,8 +73,8 @@ sha256 = "17zngh68ssilazg5caiz2amzcgd1kp906k5viwp2ig70wp6gwkyy"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v7.26.0-linux-amd64.tar.gz"; - sha256 = "0vmq4vwfgc1smp6ls2gk4li80zksqb7rx61ci4grm1vgrhxjv2gr"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v7.27.0-linux-amd64.tar.gz"; + sha256 = "0qxp61glmnqh5a4w07b7hwbj0nkg7c15pqil8855jv15zakgp495"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.2.1-linux-amd64.tar.gz"; @@ -125,8 +125,8 @@ sha256 = "0ibyifkbbvkid3pfgiy8c25mrykkjgkaq2r8cn7jd6yaf15x0p3a"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.79.0-linux-amd64.tar.gz"; - sha256 = "0n7cj6bj4hrjrijn0pniy9fzq39cb019m1k5rqqbfpkpv1211zf1"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.80.1-linux-amd64.tar.gz"; + sha256 = "1bzmgs0xy1l2rwh843y7rdamsixm8lddybr2y088ilf69g8a63gl"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.22.1-linux-amd64.tar.gz"; @@ -145,8 +145,8 @@ sha256 = "05g9fhg25ixxxrv0pm066cjdimjzs9wp8jlxv9179hny9hcy8fyh"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.9.0-linux-amd64.tar.gz"; - sha256 = "19ag7ca5c1cnhpc3rxdy5rm5gavazjnrjh7hzpbysdmckzbc28ff"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.10.0-linux-amd64.tar.gz"; + sha256 = "0f3pa8y29n3isxa4kwqfsr6i1x3xhcj7jnqmnzkc60y7lg4r1z12"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.10.1-linux-amd64.tar.gz"; @@ -163,8 +163,8 @@ ]; x86_64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.119.0-darwin-x64.tar.gz"; - sha256 = "17g915yfckfk7jywf1sxh3hkc9n4rw9myr6zn3h3w8wwhzs74z2y"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.120.0-darwin-x64.tar.gz"; + sha256 = "090hvs9dghc4jzrsxj71gxl6gmsilfr3sydw7is9hwpjiykk1k3n"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.17.2-darwin-amd64.tar.gz"; @@ -175,36 +175,36 @@ sha256 = "0kwj3m50giwk8p0d0amy5nrvf4m4ms5salbh51nd4fm0l5hz2n0q"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.56.0-darwin-amd64.tar.gz"; - sha256 = "0czn7l0vnl8w9lkcg7rbr723q1gwv0ci4bxf6jik3vmcchl38z2h"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.57.0-darwin-amd64.tar.gz"; + sha256 = "0pyc2d7jg5bi3lz151d94i0i8sfrxhqnv388sdz6yrdkhz434z82"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v6.8.3-darwin-amd64.tar.gz"; - sha256 = "0avzcn0z4i5rhw8sdr0bxpj2lnpvmdxgw70gi7hzn551mr45fsfq"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v7.0.0-darwin-amd64.tar.gz"; + sha256 = "1qi3vmzsp3bcq7y8y7q0h7hiqk6r5mzjq7h6i0g77fjcyjabqdch"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.3.3-darwin-amd64.tar.gz"; sha256 = "1jhnh3f2zni8wmddf2bz25r37iwbh1dyf8j9wnjyync1fqjy877y"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.39.0-darwin-amd64.tar.gz"; - sha256 = "1p0qmmh4v8hm82vykpzwdmffrrfr9nrnwqyzxxvmn76p5q2hrqx4"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.40.0-darwin-amd64.tar.gz"; + sha256 = "1km113wism9yf4rlx44g171jkxz3srpyvyi5hwablpw9pk93qnsv"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.79.0-darwin-amd64.tar.gz"; - sha256 = "1vfs8nxck3fwryqbwwbqrai9bcf2b1bw4nv5521z9y6qbskqqyn0"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.80.0-darwin-amd64.tar.gz"; + sha256 = "01xjm5q6kixyz4yvgjdhfskm3l7caygd33h19w7kzaih3dfffd25"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.51.0-darwin-amd64.tar.gz"; - sha256 = "00ividjihn5258vyp0jj3jvvcclihqjpgx9rkxm2xqs6rn7yfy2h"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.52.0-darwin-amd64.tar.gz"; + sha256 = "052hkf5ljyg3fhqn7z1dk4mhp4pbzvb2klvc9d2p4qqzv8vc47gr"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.1.1-darwin-amd64.tar.gz"; sha256 = "0blhx82diydpwbfr7grj2zxk29pvg0b2w2rawlv60mhc3dw6ixar"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.30.0-darwin-amd64.tar.gz"; - sha256 = "136407vq3m2ilpgmyh01n76izm9zigdm9l8rqd7mlg0c6laivc19"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.31.0-darwin-amd64.tar.gz"; + sha256 = "120z9hs349qzjk84fwzizhpp90fp21fgapxbgy56k22pshl35wzs"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.11.3-darwin-amd64.tar.gz"; @@ -231,8 +231,8 @@ sha256 = "009w2zsmy4nkc5w8k0ldm5fl2yjl8h52574w1as27kz0800nibav"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v7.26.0-darwin-amd64.tar.gz"; - sha256 = "1ihhs7q570mssswqfgmm1741b879ky1gyakiilypi3nzlnnpa9w5"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v7.27.0-darwin-amd64.tar.gz"; + sha256 = "0d3pcwj7lncq4zalbkd3nyk4dbas5328maxa3dv55z6wi4x2ds9n"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.2.1-darwin-amd64.tar.gz"; @@ -283,8 +283,8 @@ sha256 = "1yg346nz6nrp8s9f998jynn250nywpg1nzxx6820pdinvaw81sgy"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.79.0-darwin-amd64.tar.gz"; - sha256 = "0fhmza4ynmb5bcwd0m80p4acv2l5f2imca9zg02mmv6drd4wznpm"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.80.1-darwin-amd64.tar.gz"; + sha256 = "1h06j9jpba6wxv8nz33ysz5bx928qbm64nk4gv5qa5zzdpm4c1mh"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.22.1-darwin-amd64.tar.gz"; @@ -303,8 +303,8 @@ sha256 = "1mbrrw4mvf1dnh6zp66lb9lsirg24gikvd7ls51bdld4pfs1rn3z"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.9.0-darwin-amd64.tar.gz"; - sha256 = "07g2iys3w2r0giwakymb1n1bpwp812z93nskxbkwiw4zl8p6vr9v"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.10.0-darwin-amd64.tar.gz"; + sha256 = "06vdv0mms6ksn1ah61afkfi2jx6q0sicbkvw2ngd98ch8djjqysk"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.10.1-darwin-amd64.tar.gz"; @@ -321,8 +321,8 @@ ]; aarch64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.119.0-linux-arm64.tar.gz"; - sha256 = "0m0ziqpa8q17fn330mrjrvqz27k6fd35x2ihaa6bdx37mq6vmac5"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.120.0-linux-arm64.tar.gz"; + sha256 = "0aki919lihvzva9qswc1lqigssiqqy8zqdd6v982xfc5b29xa0cb"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.17.2-linux-arm64.tar.gz"; @@ -333,36 +333,36 @@ sha256 = "0a1kqpjwsksimv29y5q8d4b36s28801vhim1f5agq0c0lrn1fcds"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.56.0-linux-arm64.tar.gz"; - sha256 = "026f789v04asxfq0a2bll5qsr28rb7mcm4jmsc4y1bwiv3brcpx8"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.57.0-linux-arm64.tar.gz"; + sha256 = "0yn3rbya6fr12m3ah2f5qywp85vf198zsdkpzx5wny6s6prnsiw8"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v6.8.3-linux-arm64.tar.gz"; - sha256 = "0hcf3q5k2rc9xmi66ybvinw9sgc9ky1rgfzsidc7by413maq027z"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v7.0.0-linux-arm64.tar.gz"; + sha256 = "0fxsa527dnvc77flfgqbmj5823mfwwfp67r9sswkhik3i6i0lm3c"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.3.3-linux-arm64.tar.gz"; sha256 = "1dv2y358fwcp6pr8mb1yhw5lygs9aqf8ma50vz3p74z1101lz3id"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.39.0-linux-arm64.tar.gz"; - sha256 = "14mz37gd25cjivwjkzrszywvz2kmc5xj2rk35dvhdy4qqw10jz4a"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.40.0-linux-arm64.tar.gz"; + sha256 = "1881iqrnsfja341nq27k6pv3c85pw27cyq5ykk5bs2vzjvv008g0"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.79.0-linux-arm64.tar.gz"; - sha256 = "1x03nwk51pkcyl6ncsnxiqmk40hd62vswncz0vkd082vhirqfq14"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.80.0-linux-arm64.tar.gz"; + sha256 = "0hmd6y0mh9bwx38k5hqbgclwfsa8ls64511zkhlmln6pix3bn4k0"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.51.0-linux-arm64.tar.gz"; - sha256 = "1b9wsnpnrky80mjrj21p7xn90s95dabync5a426nk7s089kscs6v"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.52.0-linux-arm64.tar.gz"; + sha256 = "08a20lp4ym5cncv6q3s7dbwrhhn76630x8a2arsm4j7gcqja389m"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.1.1-linux-arm64.tar.gz"; sha256 = "1chrfqdiwx6lvylrih6zx7m1zkrmcb7lz0x1cb9hc0l5fy93rc63"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.30.0-linux-arm64.tar.gz"; - sha256 = "0jiqkskhhbb6hvwg0vhh6ms2rqdr8lsl0400yhiin1q1whz9bk4y"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.31.0-linux-arm64.tar.gz"; + sha256 = "0vrlk561p3aax3cgzpvjgwsxwwc5vblqb28cvc1xrj4bphd7xjda"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.11.3-linux-arm64.tar.gz"; @@ -389,8 +389,8 @@ sha256 = "09cdx6hh2lvipnj4fsff66vq8i3fvggs253ik2a8lpajg4xdhswi"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v7.26.0-linux-arm64.tar.gz"; - sha256 = "06556faphr92rby8iyjzmzl9gxj27yij1d1rhw2cnk7q1w5m45i6"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v7.27.0-linux-arm64.tar.gz"; + sha256 = "1qs9bcsw91s450sdxb2lrqzxl2q4wmpfjfspp7g5yxnv8ns8knl6"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.2.1-linux-arm64.tar.gz"; @@ -441,8 +441,8 @@ sha256 = "15n7wi330pfqg4z196cjx5gksdz3nhaqbjvxslzx9lx501ly3npd"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.79.0-linux-arm64.tar.gz"; - sha256 = "1bd3w8lbfcxvr2bl9cqm4kysq1fklsni69w3w42ss7lvayw8rzna"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.80.1-linux-arm64.tar.gz"; + sha256 = "1jhjz9kcs09x5i128mx4k7mh5fjafmg21hnifxh2avcari52r1q6"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.22.1-linux-arm64.tar.gz"; @@ -461,8 +461,8 @@ sha256 = "08w72fz5lzsaa4q5zfnkkggpyy5brqx1zpbybkvc9r91s44kbjjf"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.9.0-linux-arm64.tar.gz"; - sha256 = "0la5pifbr558smr69nmqax7b8vkvhr243avrn04gz11sc1fwqb2a"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.10.0-linux-arm64.tar.gz"; + sha256 = "0j9w042blbs0wq3qlnjk20a9bs48v3jmg4s3z2mn39c7ff1604by"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.10.1-linux-arm64.tar.gz"; @@ -479,8 +479,8 @@ ]; aarch64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.119.0-darwin-arm64.tar.gz"; - sha256 = "13b12g1lbpg2nsff7xggp7fdz77vsmvmb5l0dk77qrxl8nr6hq25"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.120.0-darwin-arm64.tar.gz"; + sha256 = "17niys4r8i1b40g3sv783ndnbks0lqpdasi2p3sx7zc64sq6v7nm"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.17.2-darwin-arm64.tar.gz"; @@ -491,36 +491,36 @@ sha256 = "0dydbqff9rd7f8ys2imjz3rf3c4y1248zmrbhsr78jywdw1h7fa3"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.56.0-darwin-arm64.tar.gz"; - sha256 = "1qhsc01rbgvq25w7m2rjvbfg5fr3x8s3gi1z0vaz5m75znd0kbh8"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.57.0-darwin-arm64.tar.gz"; + sha256 = "0blhb4ymfwrc7lm7v4sg0kmpibwbrrxcwd30imqp0gk6awmnjggn"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v6.8.3-darwin-arm64.tar.gz"; - sha256 = "1a6hkwj3c7rwykiqls6x72gsfiqbqwqmdkyzhbbr0sq1zs1r4n05"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v7.0.0-darwin-arm64.tar.gz"; + sha256 = "1g461qcw8479fgchyg0wl086lay2irz7f1415bdvjhcjhjsyqas9"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.3.3-darwin-arm64.tar.gz"; sha256 = "0a1aibs654xbcdm8kdcjjrg55fb0yh819d52zz3h6hpg40bahqcx"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.39.0-darwin-arm64.tar.gz"; - sha256 = "1lfancfjr5qrzz9n3nb47cc1gyap4ls3dsc1wpnknafnmxqgv5h0"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.40.0-darwin-arm64.tar.gz"; + sha256 = "0kgyg5jqxrlv8jr5iyqdj6xg1x4n2zjnlaymwyvakygryfnq4b1m"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.79.0-darwin-arm64.tar.gz"; - sha256 = "1j7kxxcgysxfzyfy9a5jb3f0dcw8kq39i145cnjh5887bqxqmnvb"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.80.0-darwin-arm64.tar.gz"; + sha256 = "1abz7hc4shvijf8291528blba3n4ixwwpk5jqv7i38bsn1jh1q3f"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.51.0-darwin-arm64.tar.gz"; - sha256 = "0w5wxc9bcipx3zq9090dsqiz79a2p6md7k8wkbyyzhz9yhpx461s"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.52.0-darwin-arm64.tar.gz"; + sha256 = "0171rb3d1582vi0p67s4cmcjx19a3r278w4a1vlmqadk5jg9xx2k"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.1.1-darwin-arm64.tar.gz"; sha256 = "1m53gzviimjcr3dl0pydafa6dl1r0q6ih1gwhm7lvgpll300wl1q"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.30.0-darwin-arm64.tar.gz"; - sha256 = "07ybs8rg5hdkz0f7d72znpflc5im1sp7nk3qqdmw11wszn63wsrz"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.31.0-darwin-arm64.tar.gz"; + sha256 = "0k2aab9vn0l9sq0pgzwl3cz1gzg5yc4gqw1yln2nq637wknp7p6f"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.11.3-darwin-arm64.tar.gz"; @@ -547,8 +547,8 @@ sha256 = "1054c8cici744kyf817q8fk89ljcijxi7g5vi9080w4j6hxmabvn"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v7.26.0-darwin-arm64.tar.gz"; - sha256 = "0v3hw5m78p8qv9camvcbl0dycb1fdgxwbikgpbxa45d921ihkvsc"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v7.27.0-darwin-arm64.tar.gz"; + sha256 = "1d87xac6mwzigqrql4vq40gmz9xn9f4pi1rri54393jkfqnzi64i"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.2.1-darwin-arm64.tar.gz"; @@ -599,8 +599,8 @@ sha256 = "1gfifqyj3aab1cwwsd99pdidvqwwyab558ca98l318jzl02855b9"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.79.0-darwin-arm64.tar.gz"; - sha256 = "08x8yzjfl8j3rwlwzxfqmjlxxn177kdhmrz9g8a7igp8yggyq5hs"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.80.1-darwin-arm64.tar.gz"; + sha256 = "0z3bvfcfdx1fps2zgx7g1jmrlhrp0m6sbd91c7ddx7ig4g2l4xfz"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.22.1-darwin-arm64.tar.gz"; @@ -619,8 +619,8 @@ sha256 = "1vfl1qk2iiv1d51l9jzcy3p96n8fwk7fbdsvvyfd3cn2xp07npnv"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.9.0-darwin-arm64.tar.gz"; - sha256 = "0xc8d7ix9nxnpy376q4n36mi58p9vz9ifzvldk8s8cpld8pgrm20"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.10.0-darwin-arm64.tar.gz"; + sha256 = "0djz66nn08bm47cqwai7mlgwffm6xzn4p3niwsh280xnj0q9hkbq"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.10.1-darwin-arm64.tar.gz"; diff --git a/pkgs/tools/games/minecraft/mcaselector/default.nix b/pkgs/tools/games/minecraft/mcaselector/default.nix index 46a7f069212b..610a46526ad6 100644 --- a/pkgs/tools/games/minecraft/mcaselector/default.nix +++ b/pkgs/tools/games/minecraft/mcaselector/default.nix @@ -27,11 +27,14 @@ stdenvNoCC.mkDerivation (finalAttrs: { mkdir -p $out/{bin,lib/mcaselector} cp $src $out/lib/mcaselector/mcaselector.jar + + runHook postInstall + ''; + + preFixup = '' makeWrapper ${jre}/bin/java $out/bin/mcaselector \ --add-flags "-jar $out/lib/mcaselector/mcaselector.jar" \ ''${gappsWrapperArgs[@]} - - runHook postInstall ''; meta = with lib; { diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-chewing.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-chewing.nix index e9317cbc2eea..d7e03bafdb89 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-chewing.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-chewing.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-chewing"; - version = "5.1.4"; + version = "5.1.5"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - hash = "sha256-n/5ZFXX/vg4rZSYeq1J/hpqib7P/grNH+NdPpx0fZMo="; + hash = "sha256-qXIcIByfgfWRe0rhetTHRyA7RqUHIP6FATwvtrfXNwQ="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/misc/fluent-bit/default.nix b/pkgs/tools/misc/fluent-bit/default.nix index ab22715e0ee7..20349aa8ff4d 100644 --- a/pkgs/tools/misc/fluent-bit/default.nix +++ b/pkgs/tools/misc/fluent-bit/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "fluent"; repo = "fluent-bit"; rev = "v${finalAttrs.version}"; - hash = "sha256-UoNzgTWPyDoa3hLh9z/aw78lmGcA/ujihUuXnKKqtPc="; + hash = "sha256-AR+YmxIP6VZlpztpez6OViX1cGqoP/jeOiuzBcav1Eg="; }; # optional only to avoid linux rebuild diff --git a/pkgs/tools/misc/lesspipe/default.nix b/pkgs/tools/misc/lesspipe/default.nix index b29026eb9724..b2c310bc5f40 100644 --- a/pkgs/tools/misc/lesspipe/default.nix +++ b/pkgs/tools/misc/lesspipe/default.nix @@ -74,9 +74,9 @@ stdenv.mkDerivation rec { "mdcat" "pandoc" "docx2txt" "libreoffice" "pptx2md" "mdcat" "xlscat" "odt2txt" "wvText" "antiword" "catdoc" "broken_catppt" "sxw2txt" "groff" "mandoc" "unrtf" "dvi2tty" "pod2text" "perldoc" "h5dump" "ncdump" "matdump" "djvutxt" "openssl" "gpg" "plistutil" "plutil" "id3v2" "csvlook" "jq" "zlib-flate" "lessfilter" - ] ++ lib.optional stdenv.isDarwin [ - # resholve only identifies this on darwin - # call site is gaurded by || so it's safe to leave dynamic + ] ++ lib.optional (stdenv.isDarwin || stdenv.isFreeBSD) [ + # resholve only identifies this on darwin/bsd + # call site is guarded by || so it's safe to leave dynamic "locale" ]; builtin = [ "setopt" ]; diff --git a/pkgs/tools/misc/pv/default.nix b/pkgs/tools/misc/pv/default.nix index 740bea469a39..309a78c5400c 100644 --- a/pkgs/tools/misc/pv/default.nix +++ b/pkgs/tools/misc/pv/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "pv"; - version = "1.8.9"; + version = "1.8.10"; src = fetchurl { url = "https://www.ivarch.com/programs/sources/pv-${finalAttrs.version}.tar.gz"; - sha256 = "sha256-oHidj4xaCPrzcLWgfR2Tau/5UEpPSdp21BZHl6xGBuY="; + sha256 = "sha256-1MkMF8/NRKqWuYI3cx5PgR4HHUwgUqaJ0tgeZnH1cbE="; }; meta = { diff --git a/pkgs/tools/misc/unparam/default.nix b/pkgs/tools/misc/unparam/default.nix index 6578f08c59ae..535617b1f12e 100644 --- a/pkgs/tools/misc/unparam/default.nix +++ b/pkgs/tools/misc/unparam/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "unparam"; - version = "unstable-2023-03-12"; + version = "0-unstable-2024-05-28"; src = fetchFromGitHub { owner = "mvdan"; repo = "unparam"; - rev = "e84e2d14e3b88193890ff95d72ecb81312f36589"; - sha256 = "sha256-kbEdOqX/p/FrNfWQ2WjXX+lERprSV2EI9l+kapHuFi4="; + rev = "8a5130ca722ffad18c95cc467b561f1668b9b0d2"; + hash = "sha256-CYCXTriGUd4bNY6ZPfkX4puE1imcqYHnX1SXVdnXPGM="; }; - vendorHash = "sha256-gEZFAMcr1okqG2IXcS3hDzZKMINohd2JzxezGbzyeBE="; + vendorHash = "sha256-2lNC4V1WQkJdkagIlBu6tj4SA4KJKstHXc+B4emKu6s="; subPackages = [ "." ]; diff --git a/pkgs/tools/networking/bore/default.nix b/pkgs/tools/networking/bore/default.nix index abbbcc414751..f32e9ff7542c 100644 --- a/pkgs/tools/networking/bore/default.nix +++ b/pkgs/tools/networking/bore/default.nix @@ -46,5 +46,6 @@ rustPlatform.buildRustPackage rec { license = licenses.isc; maintainers = [ maintainers.delan ]; mainProgram = "bore"; + broken = stdenv.isDarwin; # bindgen fails on: "in6_addr_union_(...)" is not a valid Ident }; } diff --git a/pkgs/tools/security/age/default.nix b/pkgs/tools/security/age/default.nix index ea8108fde301..89acb4d14c33 100644 --- a/pkgs/tools/security/age/default.nix +++ b/pkgs/tools/security/age/default.nix @@ -2,36 +2,16 @@ buildGoModule rec { pname = "age"; - version = "1.1.1"; - vendorHash = "sha256-MumPdRTz840+hoisJ7ADgBhyK3n8P6URobbRJYDFkDY="; + version = "1.2.0"; src = fetchFromGitHub { owner = "FiloSottile"; repo = "age"; rev = "v${version}"; - sha256 = "sha256-LRxxJQLQkzoCNYGS/XBixVmYXoZ1mPHKvFicPGXYLcw="; + hash = "sha256-O0NKDPvr+6ZupakPIpnGgDcdfG3nWR1pvVE+3KkYurY="; }; - # Worked with the upstream to change the way test vectors were sourced from - # another repo at test run time, so we can run test without network access. - # https://github.com/FiloSottile/age/pull/476 - # - # Changes landed after v1.1.1, so we'll patch this one until next release. - patches = [ - # Revert "all: temporarily disable testscript tests" - (fetchpatch { - name = "0001-revert-temporarily-disabled-testscript-tests.patch"; - url = "https://github.com/FiloSottile/age/commit/5471e05672de168766f5f11453fd324c53c264e5.patch"; - sha256 = "sha256-F3oDhRWJqqcF9MDDWPeO9V/wUGXkmUXY87wgokUIoOk="; - }) - - # age: depend on c2sp.org/CCTV/age for TestVectors - (fetchpatch { - name = "0002-depend-on-c2sp_cctv_age__TestVectors.patch"; - url = "https://github.com/FiloSottile/age/commit/edf7388f7731b274b055dcab3ec4006cc4961b68.patch"; - sha256 = "sha256-CloCj/uF3cqTeCfRkV6TeYiovuDQXm1ZIklREWAot1E="; - }) - ]; + vendorHash = "sha256-5We4OYoexzzSF1AkxuGCUwuYJ3Wra+T6mCcT4XYgzhU="; ldflags = [ "-s" "-w" "-X main.Version=${version}" @@ -59,6 +39,7 @@ buildGoModule rec { ]; meta = with lib; { + changelog = "https://github.com/FiloSottile/age/releases/tag/v${version}"; homepage = "https://age-encryption.org/"; description = "Modern encryption tool with small explicit keys"; license = licenses.bsd3; diff --git a/pkgs/tools/security/nuclei/default.nix b/pkgs/tools/security/nuclei/default.nix index 20dd582b4fac..29b8a5547cfb 100644 --- a/pkgs/tools/security/nuclei/default.nix +++ b/pkgs/tools/security/nuclei/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "nuclei"; - version = "3.2.8"; + version = "3.2.9"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "nuclei"; rev = "refs/tags/v${version}"; - hash = "sha256-U/L9V/1aGMjh30s/XDgV522RdLhS1yyUkHwkFDWjA4U="; + hash = "sha256-4YfdpM+F2hP88GbB5ct2dla/balbt8uQcJSUyJut99U="; }; - vendorHash = "sha256-DGNjDKjFZ0EJPOJxC7nTCCts8pisomfe4eru2WAHHow="; + vendorHash = "sha256-zonoIvDbSHpURKPJoTfL2SrpiIAQkh0oAGEDEQiH35M="; subPackages = [ "cmd/nuclei/" ]; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 39a5ef06ffdd..b107ad5da187 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -177,6 +177,10 @@ mapAliases ({ chia-plotter = throw "chia-plotter has been removed. see https://github.com/NixOS/nixpkgs/pull/270254"; # Added 2023-11-30 chkservice = throw "chkservice has been removed from nixpkgs, as it has been deleted upstream"; # Added 2024-01-08 chocolateDoom = chocolate-doom; # Added 2023-05-01 + ChowCentaur = chow-centaur; # Added 2024-06-12 + ChowPhaser = chow-phaser; # Added 2024-06-12 + ChowKick = chow-kick; # Added 2024-06-12 + CHOWTapeModel = chow-tape-model; # Added 2024-06-12 chrome-gnome-shell = gnome-browser-connector; # Added 2022-07-27 chromiumBeta = throw "'chromiumBeta' has been removed due to the lack of maintenance in nixpkgs. Consider using 'chromium' instead."; # Added 2023-10-18 chromiumDev = throw "'chromiumDev' has been removed due to the lack of maintenance in nixpkgs. Consider using 'chromium' instead."; # Added 2023-10-18 @@ -542,6 +546,7 @@ mapAliases ({ haxe_3_2 = throw "'haxe_3_2' has been removed because it is old and no longer used by any packages in nixpkgs"; # Added 2023-03-15 haxe_3_4 = throw "'haxe_3_4' has been removed because it is old and no longer used by any packages in nixpkgs"; # Added 2023-03-15 + HentaiAtHome = hentai-at-home; # Added 2024-06-12 hepmc = throw "'hepmc' has been renamed to/replaced by 'hepmc2'"; # Converted to throw 2023-09-10 hikari = throw "hikari has been removed from nixpkgs, it was unmaintained and required wlroots_0_15 at the time of removal"; # Added 2024-03-28 hip = throw "'hip' has been removed in favor of 'rocmPackages.clr'"; # Added 2023-10-08 @@ -644,6 +649,8 @@ mapAliases ({ ### L ### larynx = piper-tts; # Added 2023-05-09 + LASzip = laszip; # Added 2024-06-12 + LASzip2 = laszip_2; # Added 2024-06-12 latinmodern-math = lmmath; ldgallery = throw "'ldgallery' has been removed from nixpkgs. Use the Flake provided by ldgallery instead"; # Added 2023-07-26 ledger_agent = ledger-agent; # Added 2024-01-07 @@ -672,6 +679,8 @@ mapAliases ({ librarian-puppet-go = throw "'librarian-puppet-go' has been removed, as it's upstream is unmaintained"; # Added 2024-06-10 libraw_unstable = throw "'libraw_unstable' has been removed, please use libraw"; # Added 2023-01-30 librdf = lrdf; # Added 2020-03-22 + LibreArp = librearp; # Added 2024-06-12 + LibreArp-lv2 = librearp-lv2; # Added 2024-06-12 libressl_3_5 = throw "'libressl_3_5' has reached end-of-life "; # Added 2023-05-07 librtlsdr = rtl-sdr; # Added 2023-02-18 librewolf-wayland = librewolf; # Added 2022-11-15 @@ -805,6 +814,7 @@ mapAliases ({ lobster-two = google-fonts; # Added 2021-07-22 luxcorerender = throw "'luxcorerender' has been removed as it's unmaintained and broken in nixpkgs since a while ago"; # Added 2023-06-07 + lv_img_conv = throw "'lv_img_conv' has been removed from nixpkgs as it is broken"; # Added 2024-06-18 lxd = lib.warn "lxd has been renamed to lxd-lts" lxd-lts; # Added 2024-04-01 lxd-unwrapped = lib.warn "lxd-unwrapped has been renamed to lxd-unwrapped-lts" lxd-unwrapped-lts; # Added 2024-04-01 lzma = xz; # moved from top-level 2021-03-14 @@ -908,11 +918,8 @@ mapAliases ({ nix-template-rpm = throw "'nix-template-rpm' has been removed as it is broken and unmaintained"; # Added 2023-11-20 nixFlakes = nixVersions.stable; # Added 2021-05-21 nixStable = nixVersions.stable; # Added 2022-01-24 - nixUnstable = nixVersions.unstable; # Added 2022-01-26 + nixUnstable = throw "nixUnstable has been removed. For bleeding edge (Nix master, roughly weekly updated) use nixVersions.git, otherwise use nixVersions.latest."; # Converted to throw 2024-04-22 nix_2_3 = nixVersions.nix_2_3; - nix_2_4 = nixVersions.nix_2_4; - nix_2_5 = nixVersions.nix_2_5; - nix_2_6 = nixVersions.nix_2_6; nixfmt = lib.warn "nixfmt was renamed to nixfmt-classic. The nixfmt attribute may be used for the new RFC 166-style formatter in the future, which is currently available as nixfmt-rfc-style" nixfmt-classic; # Added 2024-03-31 nixops = throw "'nixops' has been removed. Please use 'nixops_unstable_minimal' for the time being. E.g. nixops_unstable_minimal.withPlugins (ps: [ ps.nixops-gce ])"; # Added 2023-10-26 nixopsUnstable = nixops_unstable; # Added 2022-03-03 @@ -1030,6 +1037,7 @@ mapAliases ({ pltScheme = racket; # just to be sure pmdk = throw "'pmdk' is discontinued, no further support or maintenance is planned by upstream"; # Added 2023-02-06 pomotroid = throw "pomotroid has been removed from nixpkgs, because it depended on an insecure version of electron"; # Added 2023-09-12 + poretools = throw "poretools has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2024-06-03 powerdns = pdns; # Added 2022-03-28 # postgresql plugins diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a74d00164180..b2f50fc23e36 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2595,8 +2595,6 @@ with pkgs; cdemu-daemon = callPackage ../applications/emulators/cdemu/daemon.nix { }; - cemu = callPackage ../applications/emulators/cemu { }; - cen64 = callPackage ../applications/emulators/cen64 { }; citations = callPackage ../applications/misc/citations { }; @@ -3117,7 +3115,7 @@ with pkgs; inherit (callPackages ../development/tools/ammonite {}) ammonite_2_12 ammonite_2_13; - ammonite = if scala == scala_2_12 then ammonite_2_12 else ammonite_2_13; + ammonite = ammonite_2_13; amp = callPackage ../applications/editors/amp { }; @@ -5383,8 +5381,6 @@ with pkgs; globalarrays = callPackage ../development/libraries/globalarrays { }; - glock = callPackage ../development/tools/glock { }; - glslviewer = callPackage ../development/tools/glslviewer { inherit (darwin.apple_sdk.frameworks) Cocoa; }; @@ -6629,8 +6625,9 @@ with pkgs; citrix_workspace_23_09_0 citrix_workspace_23_11_0 citrix_workspace_24_02_0 + citrix_workspace_24_05_0 ; - citrix_workspace = citrix_workspace_24_02_0; + citrix_workspace = citrix_workspace_24_05_0; clima = callPackage ../tools/text/clima { }; @@ -6719,9 +6716,7 @@ with pkgs; unionfs-fuse = callPackage ../tools/filesystems/unionfs-fuse { }; - unparam = callPackage ../tools/misc/unparam { - buildGoModule = buildGo121Module; - }; + unparam = callPackage ../tools/misc/unparam { }; inherit (nodePackages) uppy-companion; @@ -10360,10 +10355,6 @@ with pkgs; lv = callPackage ../tools/text/lv { }; - lv_img_conv = callPackage ../development/tools/lv_img_conv { - inherit (darwin.apple_sdk.frameworks) CoreText; - }; - lwc = callPackage ../tools/misc/lwc { }; lxd-image-server = callPackage ../tools/virtualization/lxd-image-server { }; @@ -11903,8 +11894,6 @@ with pkgs; popfile = callPackage ../tools/text/popfile { }; - poretools = callPackage ../applications/science/biology/poretools { }; - porsmo = callPackage ../applications/misc/porsmo { }; pantum-driver = callPackage ../misc/drivers/pantum-driver { }; @@ -16783,7 +16772,7 @@ with pkgs; scala_2_13 = callPackage ../development/compilers/scala/2.x.nix { majorVersion = "2.13"; }; scala_3 = callPackage ../development/compilers/scala { }; - scala = scala_2_13; + scala = scala_3; scala-runners = callPackage ../development/compilers/scala-runners { coursier = coursier.override { jre = jdk8; }; }; @@ -18015,8 +18004,6 @@ with pkgs; b4 = callPackage ../development/tools/b4 { }; - babeltrace = callPackage ../development/tools/misc/babeltrace { }; - bam = callPackage ../development/tools/build-managers/bam { }; bandit = with python3Packages; toPythonApplication bandit; @@ -18546,8 +18533,6 @@ with pkgs; dwz = callPackage ../development/tools/misc/dwz { }; - eask = callPackage ../development/tools/eask { }; - easypdkprog = callPackage ../development/embedded/easypdkprog { }; editorconfig-checker = callPackage ../development/tools/misc/editorconfig-checker { }; @@ -21635,9 +21620,6 @@ with pkgs; LAStools = callPackage ../development/libraries/LAStools { }; - LASzip = callPackage ../development/libraries/LASzip { }; - LASzip2 = callPackage ../development/libraries/LASzip/LASzip2.nix { }; - laurel = callPackage ../servers/monitoring/laurel/default.nix { }; lcm = callPackage ../development/libraries/lcm { }; @@ -24647,9 +24629,7 @@ with pkgs; umockdev = callPackage ../development/libraries/umockdev { }; - unconvert = callPackage ../development/tools/unconvert { - buildGoModule = buildGo121Module; - }; + unconvert = callPackage ../development/tools/unconvert { }; uncover = callPackage ../tools/security/uncover { }; @@ -27585,6 +27565,7 @@ with pkgs; odin = callPackage ../development/compilers/odin { inherit (pkgs.darwin.apple_sdk_11_0) MacOSX-SDK; inherit (pkgs.darwin.apple_sdk_11_0.frameworks) Security; + llvmPackages = llvmPackages_18; }; odp-dpdk = callPackage ../os-specific/linux/odp-dpdk { }; @@ -29957,14 +29938,6 @@ with pkgs; cgif = callPackage ../tools/graphics/cgif { }; - ChowCentaur = callPackage ../applications/audio/ChowCentaur { }; - - ChowKick = callPackage ../applications/audio/ChowKick { }; - - ChowPhaser = callPackage ../applications/audio/ChowPhaser { }; - - CHOWTapeModel = callPackage ../applications/audio/CHOWTapeModel { }; - chromium = callPackage ../applications/networking/browsers/chromium (config.chromium or {}); chuck = callPackage ../applications/audio/chuck { @@ -31179,10 +31152,6 @@ with pkgs; lemonade = callPackage ../applications/misc/lemonade { }; - LibreArp = callPackage ../applications/audio/LibreArp { }; - - LibreArp-lv2 = callPackage ../applications/audio/LibreArp/lv2.nix { }; - librespot = callPackage ../applications/audio/librespot { withALSA = stdenv.isLinux; withPulseAudio = config.pulseaudio or stdenv.isLinux; @@ -35067,9 +35036,6 @@ with pkgs; neovim-gtk = callPackage ../applications/editors/neovim/neovim-gtk.nix { }; - neovim-qt-unwrapped = libsForQt5.callPackage ../applications/editors/neovim/neovim-qt.nix { }; - neovim-qt = libsForQt5.callPackage ../applications/editors/neovim/qt.nix { }; - gnvim-unwrapped = callPackage ../applications/editors/neovim/gnvim { }; gnvim = callPackage ../applications/editors/neovim/gnvim/wrapper.nix { }; @@ -37522,7 +37488,11 @@ with pkgs; enlightenment = recurseIntoAttrs (callPackage ../desktops/enlightenment { }); - expidus = recurseIntoAttrs (callPackage ../desktops/expidus {}); + expidus = recurseIntoAttrs (callPackages ../desktops/expidus { + # Use the Nix built Flutter Engine for testing. + # Also needed when we eventually package Genesis Shell. + flutterPackages = flutterPackages-source; + }); gnome2 = recurseIntoAttrs (callPackage ../desktops/gnome-2 { }); @@ -39249,8 +39219,6 @@ with pkgs; velero = callPackage ../applications/networking/cluster/velero { }; - HentaiAtHome = callPackage ../applications/misc/HentaiAtHome { }; - hplip = callPackage ../misc/drivers/hplip { }; hplipWithPlugin = hplip.override { withPlugin = true; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4ca44cacaeef..42562f4c3244 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1330,6 +1330,17 @@ self: super: with self; { babelgladeextractor = callPackage ../development/python-modules/babelgladeextractor { }; + babeltrace = toPythonModule (pkgs.babeltrace.override { + pythonPackages = self; + enablePython = true; + }); + + babeltrace2 = toPythonModule (pkgs.babeltrace2.override { + inherit (self) python; + pythonPackages = self; + enablePython = true; + }); + bambi = callPackage ../development/python-modules/bambi { }; pad4pi = callPackage ../development/python-modules/pad4pi { }; @@ -2728,6 +2739,8 @@ self: super: with self; { dash = callPackage ../development/python-modules/dash { }; + dash-bootstrap-components = callPackage ../development/python-modules/dash-bootstrap-components { }; + dash-core-components = callPackage ../development/python-modules/dash-core-components { }; dash-html-components = callPackage ../development/python-modules/dash-html-components { }; @@ -6535,6 +6548,7 @@ self: super: with self; { laszip = callPackage ../development/python-modules/laszip { inherit (pkgs) cmake ninja; + inherit (pkgs.__splicedPackages) laszip; }; latex2mathml = callPackage ../development/python-modules/latex2mathml { }; @@ -7083,6 +7097,8 @@ self: super: with self; { lsprotocol = callPackage ../development/python-modules/lsprotocol { }; + lsp-tree-sitter = callPackage ../development/python-modules/lsp-tree-sitter { }; + ltpycld2 = callPackage ../development/python-modules/ltpycld2 { }; lttng = callPackage ../development/python-modules/lttng { }; @@ -13502,8 +13518,6 @@ self: super: with self; { rpi-gpio = callPackage ../development/python-modules/rpi-gpio { }; - rpi-gpio2 = callPackage ../development/python-modules/rpi-gpio2 { }; - rplcd = callPackage ../development/python-modules/rplcd { }; rply = callPackage ../development/python-modules/rply { }; @@ -15468,6 +15482,20 @@ self: super: with self; { tree-sitter = callPackage ../development/python-modules/tree-sitter { }; + tree-sitter0_21 = callPackage ../development/python-modules/tree-sitter0_21 { }; + + tree-sitter-html = callPackage ../development/python-modules/tree-sitter-html { }; + + tree-sitter-python = callPackage ../development/python-modules/tree-sitter-python { }; + + tree-sitter-rust = callPackage ../development/python-modules/tree-sitter-rust { }; + + tree-sitter-javascript = callPackage ../development/python-modules/tree-sitter-javascript { }; + + tree-sitter-json = callPackage ../development/python-modules/tree-sitter-json { }; + + tree-sitter-languages = callPackage ../development/python-modules/tree-sitter-languages { }; + treelib = callPackage ../development/python-modules/treelib { }; treelog = callPackage ../development/python-modules/treelog { }; diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix index d6896155c920..4b41dc5bdcd2 100644 --- a/pkgs/top-level/release-cross.nix +++ b/pkgs/top-level/release-cross.nix @@ -258,6 +258,7 @@ in x86_64-freebsd = mapTestOnCross systems.examples.x86_64-freebsd common; x86_64-netbsd = mapTestOnCross systems.examples.x86_64-netbsd common; + x86_64-openbsd = mapTestOnCross systems.examples.x86_64-openbsd common; # we test `embedded` instead of `linuxCommon` because very few packages # successfully cross-compile to Redox so far