diff options
38 files changed, 399 insertions, 365 deletions
diff --git a/doc/contributing/reviewing-contributions.chapter.md b/doc/contributing/reviewing-contributions.chapter.md index 3417854730ef..4452695a6f38 100644 --- a/doc/contributing/reviewing-contributions.chapter.md +++ b/doc/contributing/reviewing-contributions.chapter.md @@ -185,6 +185,111 @@ Sample template for a new module review is provided below. ##### Comments ``` +## Individual maintainer list {#reviewing-contributions-indvidual-maintainer-list} + +When adding users to `maintainers/maintainer-list.nix`, the following +checks should be performed: + +- If the user has specified a GPG key, verify that the commit is + signed by their key. + + First, validate that the commit adding the maintainer is signed by + the key the maintainer listed. Check out the pull request and + compare its signing key with the listed key in the commit. + + If the commit is not signed or it is signed by a different user, ask + them to either recommit using that key or to remove their key + information. + + Given a maintainter entry like this: + + ``` nix + { + example = { + email = "user@example.com"; + name = "Example User"; + keys = [{ + fingerprint = "0000 0000 2A70 6423 0AED 3C11 F04F 7A19 AAA6 3AFE"; + }]; + } + }; + ``` + + First receive their key from a keyserver: + + $ gpg --recv-keys 0xF04F7A19AAA63AFE + gpg: key 0xF04F7A19AAA63AFE: public key "Example <user@example.com>" imported + gpg: Total number processed: 1 + gpg: imported: 1 + + Then check the commit is signed by that key: + + $ git log --show-signature + commit b87862a4f7d32319b1de428adb6cdbdd3a960153 + gpg: Signature made Wed Mar 12 13:32:24 2003 +0000 + gpg: using RSA key 000000002A7064230AED3C11F04F7A19AAA63AFE + gpg: Good signature from "Example User <user@example.com> + Author: Example User <user@example.com> + Date: Wed Mar 12 13:32:24 2003 +0000 + + maintainers: adding example + + and validate that there is a `Good signature` and the printed key + matches the user's submitted key. + + Note: GitHub's "Verified" label does not display the user's full key + fingerprint, and should not be used for validating the key matches. + +- If the user has specified a `github` account name, ensure they have + also specified a `githubId` and verify the two match. + + Maintainer entries that include a `github` field must also include + their `githubId`. People can and do change their GitHub name + frequently, and the ID is used as the official and stable identity + of the maintainer. + + Given a maintainer entry like this: + + ``` nix + { + example = { + email = "user@example.com"; + name = "Example User"; + github = "ghost"; + githubId = 10137; + } + }; + ``` + + First, make sure that the listed GitHub handle matches the author of + the commit. + + Then, visit the URL `https://api.github.com/users/ghost` and + validate that the `id` field matches the provided `githubId`. + +## Maintainer teams {#reviewing-contributions-maintainer-teams} + +Feel free to create a new maintainer team in `maintainers/team-list.nix` +when a group is collectively responsible for a collection of packages. +Use taste and personal judgement when deciding if a team is warranted. + +Teams are allowed to define their own rules about membership. + +For example, some teams will represent a business or other group which +wants to carefully track its members. Other teams may be very open about +who can join, and allow anybody to participate. + +When reviewing changes to a team, read the team's scope and the context +around the member list for indications about the team's membership +policy. + +In any case, request reviews from the existing team members. If the team +lists no specific membership policy, feel free to merge changes to the +team after giving the existing members a few days to respond. + +*Important:* If a team says it is a closed group, do not merge additions +to the team without an approval by at least one existing member. + ## Other submissions {#reviewing-contributions-other-submissions} Other type of submissions requires different reviewing steps. diff --git a/lib/tests/maintainer-module.nix b/lib/tests/maintainer-module.nix new file mode 100644 index 000000000000..8cf8411b476a --- /dev/null +++ b/lib/tests/maintainer-module.nix @@ -0,0 +1,31 @@ +{ lib, ... }: +let + inherit (lib) types; +in { + options = { + name = lib.mkOption { + type = types.str; + }; + email = lib.mkOption { + type = types.str; + }; + matrix = lib.mkOption { + type = types.nullOr types.str; + default = null; + }; + github = lib.mkOption { + type = types.nullOr types.str; + default = null; + }; + githubId = lib.mkOption { + type = types.nullOr types.ints.unsigned; + default = null; + }; + keys = lib.mkOption { + type = types.listOf (types.submodule { + options.fingerprint = lib.mkOption { type = types.str; }; + }); + default = []; + }; + }; +} diff --git a/lib/tests/maintainers.nix b/lib/tests/maintainers.nix index 3cbfba569481..935d256d218d 100644 --- a/lib/tests/maintainers.nix +++ b/lib/tests/maintainers.nix @@ -1,50 +1,19 @@ # to run these tests (and the others) # nix-build nixpkgs/lib/tests/release.nix { # The pkgs used for dependencies for the testing itself - pkgs -, lib + pkgs ? import ../.. {} +, lib ? pkgs.lib }: let inherit (lib) types; - - maintainerModule = { config, ... }: { - options = { - name = lib.mkOption { - type = types.str; - }; - email = lib.mkOption { - type = types.str; - }; - matrix = lib.mkOption { - type = types.nullOr types.str; - default = null; - }; - github = lib.mkOption { - type = types.nullOr types.str; - default = null; - }; - githubId = lib.mkOption { - type = types.nullOr types.ints.unsigned; - default = null; - }; - keys = lib.mkOption { - type = types.listOf (types.submodule { - options.longkeyid = lib.mkOption { type = types.str; }; - options.fingerprint = lib.mkOption { type = types.str; }; - }); - default = []; - }; - }; - }; - checkMaintainer = handle: uncheckedAttrs: let prefix = [ "lib" "maintainers" handle ]; checkedAttrs = (lib.modules.evalModules { inherit prefix; modules = [ - maintainerModule + ./maintainer-module.nix { _file = toString ../../maintainers/maintainer-list.nix; config = uncheckedAttrs; diff --git a/lib/tests/release.nix b/lib/tests/release.nix index 815841e0a8f3..b93a4236f91e 100644 --- a/lib/tests/release.nix +++ b/lib/tests/release.nix @@ -11,6 +11,10 @@ pkgs.runCommand "nixpkgs-lib-tests" { inherit pkgs; lib = import ../.; }) + (import ./teams.nix { + inherit pkgs; + lib = import ../.; + }) ]; } '' datadir="${pkgs.nix}/share" diff --git a/lib/tests/teams.nix b/lib/tests/teams.nix new file mode 100644 index 000000000000..8a0a5d272634 --- /dev/null +++ b/lib/tests/teams.nix @@ -0,0 +1,50 @@ +# to run these tests: +# nix-build nixpkgs/lib/tests/teams.nix +# If it builds, all tests passed +{ pkgs ? import ../.. {}, lib ? pkgs.lib }: + +let + inherit (lib) types; + + teamModule = { config, ... }: { + options = { + shortName = lib.mkOption { + type = types.str; + }; + scope = lib.mkOption { + type = types.str; + }; + enableFeatureFreezePing = lib.mkOption { + type = types.bool; + default = false; + }; + members = lib.mkOption { + type = types.listOf (types.submodule + (import ./maintainer-module.nix { inherit lib; }) + ); + default = []; + }; + githubTeams = lib.mkOption { + type = types.listOf types.str; + default = []; + }; + }; + }; + + checkTeam = team: uncheckedAttrs: + let + prefix = [ "lib" "maintainer-team" team ]; + checkedAttrs = (lib.modules.evalModules { + inherit prefix; + modules = [ + teamModule + { + _file = toString ../../maintainers/team-list.nix; + config = uncheckedAttrs; + } + ]; + }).config; + in checkedAttrs; + + checkedTeams = lib.mapAttrs checkTeam lib.teams; +in pkgs.writeTextDir "maintainer-teams.json" (builtins.toJSON checkedTeams) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 747d5337359a..689503eb7a55 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -10,7 +10,6 @@ github = "GithubUsername"; githubId = your-github-id; keys = [{ - longkeyid = "rsa2048/0x0123456789ABCDEF"; fingerprint = "AAAA BBBB CCCC DDDD EEEE FFFF 0000 1111 2222 3333"; }]; }; @@ -24,7 +23,7 @@ - `matrix` is your Matrix user ID, - `github` is your GitHub handle (as it appears in the URL of your profile page, `https://github.com/<userhandle>`), - `githubId` is your GitHub user ID, which can be found at `https://api.github.com/users/<userhandle>`, - - `keys` is a list of your PGP/GPG key IDs and fingerprints. + - `keys` is a list of your PGP/GPG key fingerprints. `handle == github` is strongly preferred whenever `github` is an acceptable attribute name and is short and convenient. @@ -39,14 +38,18 @@ To get the required PGP/GPG values for a key run ```shell - gpg --keyid-format 0xlong --fingerprint <email> | head -n 2 + gpg --fingerprint <email> | 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. More fields may be added in the future, however, in order to comply with GDPR this file should stay as minimal as possible. - Please keep the list alphabetically sorted. + When editing this file: + * keep the list alphabetically sorted + * 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. */ { @@ -63,7 +66,6 @@ github = "0x4A6F"; githubId = 9675338; keys = [{ - longkeyid = "rsa8192/0x87027528B006D66D"; fingerprint = "F466 A548 AD3F C1F1 8C88 4576 8702 7528 B006 D66D"; }]; }; @@ -73,7 +75,6 @@ github = "0xbe7a"; githubId = 6232980; keys = [{ - longkeyid = "rsa4096/0x6510870A77F49A99"; fingerprint = "2536 9E86 1AA5 9EB7 4C47 B138 6510 870A 77F4 9A99"; }]; }; @@ -182,7 +183,6 @@ githubId = 2255192; name = "Ashish SHUKLA"; keys = [{ - longkeyid = "rsa4096/0xC746CFA9E74FA4B0"; fingerprint = "F682 CDCC 39DC 0FEA E116 20B6 C746 CFA9 E74F A4B0"; }]; }; @@ -524,7 +524,6 @@ github = "alexshpilkin"; githubId = 1010468; keys = [{ - longkeyid = "rsa4096/0x73E9AA114B3A894B"; fingerprint = "B595 D74D 6615 C010 469F 5A13 73E9 AA11 4B3A 894B"; }]; matrix = "@alexshpilkin:matrix.org"; @@ -588,7 +587,6 @@ github = "AluisioASG"; githubId = 1904165; keys = [{ - longkeyid = "rsa4096/0x9FAA63E097506D9D"; fingerprint = "7FDB 17B3 C29B 5BA6 E5A9 8BB2 9FAA 63E0 9750 6D9D"; }]; }; @@ -610,7 +608,6 @@ githubId = 42881386; name = "Alva"; keys = [{ - longkeyid = "ed25519/0xF53E323342F7A6D3"; fingerprint = "B422 CFB1 C9EF 73F7 E1E2 698D F53E 3233 42F7 A6D3A"; }]; }; @@ -620,7 +617,6 @@ githubId = 74795488; name = "Alexandra Hollmeier"; keys = [{ - longkeyid = "rsa3072/0x87D1AADCD25B8DEE"; fingerprint = "1F73 8879 5E5A 3DFC E2B3 FA32 87D1 AADC D25B 8DEE"; }]; }; @@ -660,7 +656,6 @@ github = "matilde-ametrine"; githubId = 90799677; keys = [{ - longkeyid = "rsa3072/0x07EE1FFCA58A11C5"; fingerprint = "7931 EB4E 4712 D7BE 04F8 6D34 07EE 1FFC A58A 11C5"; }]; }; @@ -688,7 +683,6 @@ github = "notbandali"; githubId = 1254858; keys = [{ - longkeyid = "rsa4096/0xA21A020248816103"; fingerprint = "BE62 7373 8E61 6D6D 1B3A 08E8 A21A 0202 4881 6103"; }]; }; @@ -824,7 +818,6 @@ github = "anhdle14"; githubId = 9645992; keys = [{ - longkeyid = "rsa4096/0x0299AFF9ECBB5169"; fingerprint = "AA4B 8EC3 F971 D350 482E 4E20 0299 AFF9 ECBB 5169"; }]; }; @@ -840,7 +833,6 @@ github = "Anillc"; githubId = 23411248; keys = [{ - longkeyid = "ed25519/0x0BE8A88F47B2145C"; fingerprint = "6141 1E4F FE10 CE7B 2E14 CD76 0BE8 A88F 47B2 145C"; }]; }; @@ -929,7 +921,6 @@ githubId = 17154507; name = "Lein Matsumaru"; keys = [{ - longkeyid = "rsa4096/0xAAA50652F0479205"; fingerprint = "BF8B F725 DA30 E53E 7F11 4ED8 AAA5 0652 F047 9205"; }]; }; @@ -1047,7 +1038,6 @@ githubId = 1226638; name = "Artemis Tosini"; keys = [{ - longkeyid = "rsa4096/0x4FDC96F161E7BA8A"; fingerprint = "3D2B B230 F9FA F0C5 1832 46DD 4FDC 96F1 61E7 BA8A"; }]; }; @@ -1142,7 +1132,6 @@ githubId = 192147; name = "aszlig"; keys = [{ - longkeyid = "ed25519/0x684089CE67EBB691"; fingerprint = "DD52 6BC7 767D BA28 16C0 95E5 6840 89CE 67EB B691"; }]; }; @@ -1236,7 +1225,6 @@ githubId = 5110816; name = "avitex"; keys = [{ - longkeyid = "rsa4096/0x8B366C443CABE942"; fingerprint = "271E 136C 178E 06FA EA4E B854 8B36 6C44 3CAB E942"; }]; }; @@ -1278,7 +1266,6 @@ github = "azahi"; githubId = 22211000; keys = [{ - longkeyid = "rsa4096/0xC8C6BDDB3847F72B"; fingerprint = "2688 0377 C31D 9E81 9BDF 83A8 C8C6 BDDB 3847 F72B"; }]; }; @@ -1300,7 +1287,6 @@ githubId = 448169; name = "Fabian Möller"; keys = [{ - longkeyid = "rsa4096/0x754B5C0963C42C5"; fingerprint = "6309 E212 29D4 DA30 AF24 BDED 754B 5C09 63C4 2C50"; }]; }; @@ -1310,7 +1296,6 @@ githubId = 12128029; name = "Bastien Rivière"; keys = [{ - longkeyid = "rsa4096/0xF202AD3B6EDF4BD1"; fingerprint = "2F85 B362 B274 0012 37E2 81EE F202 AD3B 6EDF 4BD1"; }]; }; @@ -1320,7 +1305,6 @@ github = "babbaj"; githubId = 12820770; keys = [{ - longkeyid = "rsa4096/0xF044309848A07CAC"; fingerprint = "6FBC A462 4EAF C69C A7C4 98C1 F044 3098 48A0 7CAC"; }]; }; @@ -1401,7 +1385,6 @@ githubId = 17708295; name = "Wanderson Ferreira"; keys = [{ - longkeyid = "rsa4096/0x56840A614DBE37AE"; fingerprint = "A3E1 C409 B705 50B3 BF41 492B 5684 0A61 4DBE 37AE"; }]; }; @@ -1515,7 +1498,6 @@ github = "bertof"; githubId = 9915675; keys = [{ - longkeyid = "rsa4096/0xFE98AE5EC52B1056"; fingerprint = "17C5 1EF9 C0FE 2EB2 FE56 BB53 FE98 AE5E C52B 1056"; }]; }; @@ -1731,7 +1713,6 @@ github = "booklearner"; githubId = 103979114; keys = [{ - longkeyid = "ed25519/0x0C61C4E5907F76C8"; fingerprint = "17C7 95D4 871C 2F87 83C8 053D 0C61 C4E5 907F 76C8"; }]; }; @@ -1753,7 +1734,6 @@ githubId = 71049646; name = "Zack A"; keys = [{ - longkeyid = "rsa4096/0x6310C97DE31D1545"; fingerprint = "E8D7 5C19 9F65 269B 439D F77B 6310 C97D E31D 1545"; }]; }; @@ -1823,7 +1803,6 @@ githubId = 12615679; name = "Oleksii Filonenko"; keys = [{ - longkeyid = "rsa3072/0xA1BC8428323ECFE8"; fingerprint = "F549 3B7F 9372 5578 FDD3 D0B8 A1BC 8428 323E CFE8"; }]; }; @@ -1863,7 +1842,6 @@ githubId = 4763746; name = "Billy Rhoades"; keys = [{ - longkeyid = "rsa4096/0x8AE74787A4B7C07E"; fingerprint = "BF4FCB85C69989B4ED95BF938AE74787A4B7C07E"; }]; }; @@ -1962,11 +1940,9 @@ # compare with https://keybase.io/cab404 { fingerprint = "1BB96810926F4E715DEF567E6BA7C26C3FDF7BB3"; - longkeyid = "rsa3072/0xCBDECF658C38079E"; } { fingerprint = "1EBC648C64D6045463013B3EB7EFFC271D55DB8A"; - longkeyid = "ed25519/0xB7EFFC271D55DB8A"; } ]; }; @@ -2085,7 +2061,6 @@ githubId = 109908; name = "Carsten Burstedde"; keys = [{ - longkeyid = "rsa2048/0x0704CD9E550A6BCD"; fingerprint = "1127 A432 6524 BF02 737B 544E 0704 CD9E 550A 6BCD"; }]; }; @@ -2139,11 +2114,9 @@ name = "Constantine Evans"; keys = [ { - longkeyid = "rsa4096/0xB67DB1D20A93A9F9"; fingerprint = "32B1 6EE7 DBA5 16DE 526E 4C5A B67D B1D2 0A93 A9F9"; } { - longkeyid = "rsa4096/0x1A1D58B86AE2AABD"; fingerprint = "669C 1D24 5A87 DB34 6BE4 3216 1A1D 58B8 6AE2 AABD"; } ]; @@ -2218,7 +2191,6 @@ github = "Chili-Man"; githubId = 631802; keys = [{ - longkeyid = "rsa4096/0xE0EBAD78F0190BD9"; fingerprint = "099E 3F97 FA08 3D47 8C75 EBEC E0EB AD78 F019 0BD9"; }]; }; @@ -2294,7 +2266,6 @@ githubId = 13007345; name = "Christian Harke"; keys = [{ - longkeyid = "rsa4096/0x830A9728630966F4"; fingerprint = "4EBB 30F1 E89A 541A A7F2 52BE 830A 9728 6309 66F4"; }]; }; @@ -2317,7 +2288,6 @@ github = "chuangzhu"; githubId = 31200881; keys = [{ - longkeyid = "rsa4096/E838CED81CFFD3F9"; fingerprint = "5D03 A5E6 0754 A3E3 CA57 5037 E838 CED8 1CFF D3F9"; }]; }; @@ -2358,7 +2328,6 @@ githubId = 5567402; name = "Alex Zero"; keys = [{ - longkeyid = "rsa4096/0xA51550EDB450302C"; fingerprint = "A0AA 4646 B8F6 9D45 4553 5A88 A515 50ED B450 302C"; }]; }; @@ -2385,7 +2354,6 @@ github = "ckiee"; githubId = 25263210; keys = [{ - longkeyid = "rsa4096/0x13E79449C0525215"; fingerprint = "539F 0655 4D35 38A5 429A E253 13E7 9449 C052 5215"; }]; name = "ckie"; @@ -2440,7 +2408,6 @@ githubId = 23741; name = "Casey Marshall"; keys = [{ - longkeyid = "rsa3072/0x6DEC2758ACD5A973"; fingerprint = "6B78 7E5F B493 FA4F D009 5D10 6DEC 2758 ACD5 A973"; }]; }; @@ -2525,7 +2492,6 @@ github = "cole-h"; githubId = 28582702; keys = [{ - longkeyid = "rsa4096/0xB37E0F2371016A4C"; fingerprint = "68B8 0D57 B2E5 4AC3 EC1F 49B0 B37E 0F23 7101 6A4C"; }]; }; @@ -2599,11 +2565,9 @@ name = "Corban Raun"; keys = [ { - longkeyid = "rsa4096/0xA697A56F1F151189"; fingerprint = "6607 0B24 8CE5 64ED 22CE 0950 A697 A56F 1F15 1189"; } { - longkeyid = "ed25519/0x230F4AC153F90F29"; fingerprint = "D8CB 816A B678 A4E6 1EC7 5325 230F 4AC1 53F9 0F29"; } ]; @@ -2626,7 +2590,6 @@ githubId = 292650; name = "Daniel McCarney"; keys = [{ - longkeyid = "rsa2048/0x08FB2BFC470E75B4"; fingerprint = "8026 D24A A966 BF9C D3CD CB3C 08FB 2BFC 470E 75B4"; }]; }; @@ -2667,7 +2630,6 @@ githubId = 2440581; name = "Carl Richard Theodor Schneider"; keys = [{ - longkeyid = "rsa4096/0x45BCC1E2709B1788"; fingerprint = "2017 E152 BB81 5C16 955C E612 45BC C1E2 709B 1788"; }]; }; @@ -2707,7 +2669,6 @@ githubId = 389387; name = "Serg Nesterov"; keys = [{ - longkeyid = "rsa4096/0x1512F6EB84AECC8C"; fingerprint = "6E7D BA30 DB5D BA60 693C 3BE3 1512 F6EB 84AE CC8C"; }]; }; @@ -2730,11 +2691,9 @@ name = "Ștefan D. Mihăilă"; keys = [ { - longkeyid = "rsa4096/6E68A39BF16A3ECB"; fingerprint = "CBC9 C7CC 51F0 4A61 3901 C723 6E68 A39B F16A 3ECB"; } { - longkeyid = "rsa4096/6220AD7846220A52"; fingerprint = "7EAB 1447 5BBA 7DDE 7092 7276 6220 AD78 4622 0A52"; } ]; @@ -2752,7 +2711,6 @@ githubId = 43349662; name = "Dima"; keys = [{ - longkeyid = "rsa4096/BAB1D15FB7B4D4CE"; fingerprint = "1C4E F4FE 7F8E D8B7 1E88 CCDF BAB1 D15F B7B4 D4CE"; }]; }; @@ -2768,7 +2726,6 @@ github = "dadada"; githubId = 7216772; keys = [{ - longkeyid = "ed25519/0xEEB8D1CE62C4DFEA"; fingerprint = "D68C 8469 5C08 7E0F 733A 28D0 EEB8 D1CE 62C4 DFEA"; }]; }; @@ -2852,7 +2809,6 @@ github = "danth"; githubId = 28959268; keys = [{ - longkeyid = "rsa3072/0xD8AFC4BF05670F9D"; fingerprint = "4779 D1D5 3C97 2EAE 34A5 ED3D D8AF C4BF 0567 0F9D"; }]; }; @@ -2887,7 +2843,6 @@ github = "dasisdormax"; githubId = 3714905; keys = [{ - longkeyid = "rsa4096/0x02BA0D4480CA6C44"; fingerprint = "E59B A198 61B0 A9ED C1FA 3FB2 02BA 0D44 80CA 6C44"; }]; name = "Maximilian Wende"; @@ -2951,7 +2906,6 @@ githubId = 1295100; name = "David Wood"; keys = [{ - longkeyid = "rsa4096/0x01760B4F9F53F154"; fingerprint = "5B08 313C 6853 E5BF FA91 A817 0176 0B4F 9F53 F154"; }]; }; @@ -2979,7 +2933,6 @@ githubId = 7545665; name = "David Birks"; keys = [{ - longkeyid = "ed25519/0xBB999F83D9A19A36"; fingerprint = "B26F 9AD8 DA20 3392 EF87 C61A BB99 9F83 D9A1 9A36"; }]; }; @@ -3013,7 +2966,6 @@ github = "dearrude"; githubId = 30749142; keys = [{ - longkeyid = "rsa4096/19151E03BF2CF012"; fingerprint = "4E35 F2E5 2132 D654 E815 A672 DB2C BC24 2868 6000"; }]; }; @@ -3352,7 +3304,6 @@ githubId = 16120; name = "Misha Gusarov"; keys = [{ - longkeyid = "rsa4096/0x9D20F6503E338888"; fingerprint = "A8DF 1326 9E5D 9A38 E57C FAC2 9D20 F650 3E33 8888"; }]; }; @@ -3374,7 +3325,6 @@ githubId = 1965950; name = "Tobias Stenzel"; keys = [{ - longkeyid = "rsa2048/0x78C7DD40DF23FB16"; fingerprint = "4749 0887 CF3B 85A1 6355 C671 78C7 DD40 DF23 FB16"; }]; }; @@ -3418,7 +3368,6 @@ githubId = 92106371; name = "Dr Perceptron"; keys = [{ - longkeyid = "rsa4096/0x95EB6DFF26D1CEB0"; fingerprint = "7E38 89D9 B1A8 B381 C8DE A15F 95EB 6DFF 26D1 CEB0"; }]; }; @@ -3429,7 +3378,6 @@ github = "drupol"; githubId = 252042; keys = [{ - longkeyid = "ed25519/0x0AAF2901E8040715"; fingerprint = "85F3 72DF 4AF3 EF13 ED34 72A3 0AAF 2901 E804 0715"; }]; }; @@ -3451,7 +3399,6 @@ github = "dschrempf"; githubId = 5596239; keys = [{ - longkeyid = "rsa2048/0x875F2BCF163F1B29"; fingerprint = "62BC E2BD 49DF ECC7 35C7 E153 875F 2BCF 163F 1B29"; }]; }; @@ -3467,7 +3414,6 @@ githubId = 817330; name = "Will Dietz"; keys = [{ - longkeyid = "rsa4096/0xFD42C7D0D41494C8"; fingerprint = "389A 78CB CD88 5E0C 4701 DEB9 FD42 C7D0 D414 94C8"; }]; }; @@ -3483,7 +3429,6 @@ githubId = 1749762; name = "Mikhail Klementev"; keys = [{ - longkeyid = "rsa4096/0x1525585D1B43C62A"; fingerprint = "5DD7 C6F6 0630 F08E DAE7 4711 1525 585D 1B43 C62A"; }]; }; @@ -3561,7 +3506,6 @@ githubId = 20522234; name = "Daniel Ebbert"; keys = [{ - longkeyid = "rsa2048/0x47BC155927CBB9C7"; fingerprint = "E765 FCA3 D9BF 7FDB 856E AD73 47BC 1559 27CB B9C7"; }]; }; @@ -3879,7 +3823,6 @@ githubId = 2663216; name = "Alexandre Iooss"; keys = [{ - longkeyid = "rsa4096/0x6C79278F3FCDCC02"; fingerprint = "2D37 1AD2 7E2B BC77 97E1 B759 6C79 278F 3FCD CC02"; }]; }; @@ -3921,7 +3864,6 @@ githubId = 11532355; name = "Kerstin Humm"; keys = [{ - longkeyid = "rsa4096/0x40293358C7B9326B"; fingerprint = "F178 B4B4 6165 6D1B 7C15 B55D 4029 3358 C7B9 326B"; }]; }; @@ -3983,7 +3925,6 @@ githubId = 60861925; name = "Ethan Carter Edwards"; keys = [{ - longkeyid = "rsa4096/0xF93DDAFA26EF2458"; fingerprint = "0E69 0F46 3457 D812 3387 C978 F93D DAFA 26EF 2458"; }]; }; @@ -4013,7 +3954,6 @@ githubId = 461970; name = "Elis Hirwing"; keys = [{ - longkeyid = "rsa4096/0xD57EFA625C9A925F"; fingerprint = "67FE 98F2 8C44 CF22 1828 E12F D57E FA62 5C9A 925F"; }]; }; @@ -4030,7 +3970,6 @@ github = "evalexpr"; githubId = 23485511; keys = [{ - longkeyid = "rsa4096/0x2D1D402E17763DD6"; fingerprint = "8129 5B85 9C5A F703 C2F4 1E29 2D1D 402E 1776 3DD6"; }]; }; @@ -4102,7 +4041,6 @@ githubId = 857308; name = "Ellie Hermaszewska"; keys = [{ - longkeyid = "rsa4096/0xC8116E3A0C1CA76A"; fingerprint = "FC1D 3E4F CBCA 80DF E870 6397 C811 6E3A 0C1C A76A"; }]; }; @@ -4138,7 +4076,6 @@ github = "fabaff"; githubId = 116184; keys = [{ - longkeyid = "dsa1024/0xE23CD2DD36A4397F"; fingerprint = "2F6C 930F D3C4 7E38 6AFA 4EB4 E23C D2DD 36A4 397F"; }]; }; @@ -4154,7 +4091,6 @@ githubId = 368799; name = "Fabian Hauser"; keys = [{ - longkeyid = "rsa4096/0x8A52A140BEBF7D2C"; fingerprint = "50B7 11F4 3DFD 2018 DCE6 E8D0 8A52 A140 BEBF 7D2C"; }]; }; @@ -4240,11 +4176,9 @@ keys = [ { # historical - longkeyid = "ed25519/0x910ACB9F6BD26F58"; fingerprint = "6AB3 7A28 5420 9A41 82D9 0068 910A CB9F 6BD2 6F58"; } { - longkeyid = "ed25519/0x671E39E6744C807D"; fingerprint = "7E08 6842 0934 AA1D 6821 1F2A 671E 39E6 744C 807D"; } ]; @@ -4305,7 +4239,6 @@ githubId = 6499211; name = "Sebastian Neubauer"; keys = [{ - longkeyid = "rsa4096/0xECC755EE583C1672"; fingerprint = "2F93 661D AC17 EA98 A104 F780 ECC7 55EE 583C 1672"; }]; }; @@ -4413,7 +4346,6 @@ githubId = 114159; name = "Franz Pletz"; keys = [{ - longkeyid = "rsa4096/0x846FDED7792617B4"; fingerprint = "8A39 615D CE78 AF08 2E23 F303 846F DED7 7926 17B4"; }]; }; @@ -4570,7 +4502,6 @@ githubId = 1883533; name = "Florian Brandes"; keys = [{ - longkeyid = "rsa4096/0xBBB3E40E53797FD9"; fingerprint = "0200 3EF8 8D2B CF2D 8F00 FFDC BBB3 E40E 5379 7FD9"; }]; }; @@ -4646,7 +4577,6 @@ github = "genofire"; githubId = 6905586; keys = [{ - longkeyid = "rsa4096/0xFC83907C125BC2BC"; fingerprint = "386E D1BF 848A BB4A 6B4A 3C45 FC83 907C 125B C2BC"; }]; }; @@ -4662,7 +4592,6 @@ githubId = 19374; name = "George Shammas"; keys = [{ - longkeyid = "rsa4096/0x82BB70D541AE2DB4"; fingerprint = "D0CF 440A A703 E0F9 73CB A078 82BB 70D5 41AE 2DB4"; }]; }; @@ -4745,7 +4674,6 @@ github = "glittershark"; githubId = 1481027; keys = [{ - longkeyid = "rsa2048/0x44EF5B5E861C09A7"; fingerprint = "0F11 A989 879E 8BBB FDC1 E236 44EF 5B5E 861C 09A7"; }]; }; @@ -4797,7 +4725,6 @@ github = "gordiasdot"; githubId = 94724133; keys = [{ - longkeyid = "ed25519/0x5D47284830FAA4FA"; fingerprint = "C006 B8A0 0618 F3B6 E0E4 2ECD 5D47 2848 30FA A4FA"; }]; }; @@ -4807,7 +4734,6 @@ github = "govanify"; githubId = 6375438; keys = [{ - longkeyid = "rsa4096/0xDE62E1E2A6145556"; fingerprint = "5214 2D39 A7CE F8FA 872B CA7F DE62 E1E2 A614 5556"; }]; }; @@ -4817,7 +4743,6 @@ github = "gpanders"; githubId = 8965202; keys = [{ - longkeyid = "rsa2048/0x56E93C2FB6B08BDB"; fingerprint = "B9D5 0EDF E95E ECD0 C135 00A9 56E9 3C2F B6B0 8BDB"; }]; }; @@ -4857,7 +4782,6 @@ githubId = 4647221; name = "GRBurst"; keys = [{ - longkeyid = "rsa4096/0x797F623868CD00C2"; fingerprint = "7FC7 98AB 390E 1646 ED4D 8F1F 797F 6238 68CD 00C2"; }]; }; @@ -5012,7 +4936,6 @@ githubId = 4336207; name = "Rohit Goswami"; keys = [{ - longkeyid = "rsa4096/0x9CCCE36402CB49A6"; fingerprint = "74B1 F67D 8E43 A94A 7554 0768 9CCC E364 02CB 49A6"; }]; }; @@ -5041,7 +4964,6 @@ githubId = 1422583; name = "Martin Hardselius"; keys = [{ - longkeyid = "rsa4096/0x03A6E6F786936619"; fingerprint = "3F35 E4CA CBF4 2DE1 2E90 53E5 03A6 E6F7 8693 6619"; }]; }; @@ -5088,7 +5010,6 @@ github = "hdhog"; githubId = 386666; keys = [{ - longkeyid = "rsa496/952EACB76703BA63"; fingerprint = "A25F 6321 AAB4 4151 4085 9924 952E ACB7 6703 BA63"; }]; }; @@ -5212,7 +5133,6 @@ githubId = 4025991; name = "Valentin Boettcher"; keys = [{ - longkeyid = "rsa2048/0xC22D4DE4D7B32D19"; fingerprint = "45A9 9917 578C D629 9F5F B5B4 C22D 4DE4 D7B3 2D19"; }]; }; @@ -5228,7 +5148,6 @@ github = "hkjn"; githubId = 287215; keys = [{ - longkeyid = "rsa4096/0x03EFBF839A5FDC15"; fingerprint = "D618 7A03 A40A 3D56 62F5 4B46 03EF BF83 9A5F DC15"; }]; }; @@ -5250,7 +5169,6 @@ githubId = 20039091; name = "Hugo Reeves"; keys = [{ - longkeyid = "rsa4096/0x49FA39F8A7F735F9"; fingerprint = "78C2 E81C 828A 420B 269A EBC1 49FA 39F8 A7F7 35F9"; }]; }; @@ -5357,7 +5275,6 @@ github = "hyshka"; githubId = 2090758; keys = [{ - longkeyid = "rsa2048/0xDB2D93D1BFAAA6EA"; fingerprint = "24F4 1925 28C4 8797 E539 F247 DB2D 93D1 BFAA A6EA"; }]; }; @@ -5385,7 +5302,6 @@ githubId = 18238046; name = "Iago Manoel Brito"; keys = [{ - longkeyid = "rsa4096/0x35D39F9A9A1BC8DA"; fingerprint = "DF90 9D58 BEE4 E73A 1B8C 5AF3 35D3 9F9A 9A1B C8DA"; }]; }; @@ -5420,7 +5336,6 @@ githubId = 1044950; name = "Pierre Penninckx"; keys = [{ - longkeyid = "rsa2048/0xD4C5C37E6031A3FE"; fingerprint = "A01F 10C6 7176 B2AE 2A34 1A56 D4C5 C37E 6031 A3FE"; }]; }; @@ -5578,7 +5493,6 @@ githubId = 20525370; name = "Silvan Mosberger"; keys = [{ - longkeyid = "rsa4096/0x422E9EDAE0157170"; fingerprint = "6C2B 55D4 4E04 8266 6B7D DA1A 422E 9EDA E015 7170"; }]; }; @@ -5595,7 +5509,6 @@ github = "IreneKnapp"; githubId = 157678; keys = [{ - longkeyid = "rsa4096/0xDBF252AFFB2619FD"; fingerprint = "E864 BDFA AB55 36FD C905 5195 DBF2 52AF FB26 19FD"; }]; }; @@ -5611,7 +5524,6 @@ github = "isgy"; githubId = 13622947; keys = [{ - longkeyid = "rsa4096/0xD3E1B013B4631293"; fingerprint = "1412 816B A9FA F62F D051 1975 D3E1 B013 B463 1293"; }]; }; @@ -5650,7 +5562,6 @@ githubId = 1672874; name = "Ivan Brennan"; keys = [{ - longkeyid = "rsa4096/0x79C3C47DC652EA54"; fingerprint = "7311 2700 AB4F 4CDF C68C F6A5 79C3 C47D C652 EA54"; }]; }; @@ -5660,7 +5571,6 @@ githubId = 75213; name = "Ivan Kovnatsky"; keys = [{ - longkeyid = "rsa4096/0x3A33FA4C82ED674F"; fingerprint = "6BD3 7248 30BD 941E 9180 C1A3 3A33 FA4C 82ED 674F"; }]; }; @@ -5875,7 +5785,6 @@ githubId = 1235045; name = "Jichao Ouyang"; keys = [{ - longkeyid = "rsa2048/0xDA8B833B52604E63"; fingerprint = "A506 C38D 5CC8 47D0 DF01 134A DA8B 833B 5260 4E63"; }]; }; @@ -5902,7 +5811,6 @@ github = "jdanekrh"; githubId = 17877663; keys = [{ - longkeyid = "ed25519/0x69275CADF15D872E"; fingerprint = "D4A6 F051 AD58 2E7C BCED 5439 6927 5CAD F15D 872E"; }]; name = "Jiri Daněk"; @@ -6003,7 +5911,6 @@ githubId = 3001; name = "Jean-Francois Chevrette"; keys = [{ - longkeyid = "rsa4096/0x67A0585801290DC6"; fingerprint = "B612 96A9 498E EECD D5E9 C0F0 67A0 5858 0129 0DC6"; }]; }; @@ -6026,7 +5933,6 @@ github = "jfroche"; githubId = 207369; keys = [{ - longkeyid = "dsa1024/0xD1D09DE169EA19A0"; fingerprint = "7EB1 C02A B62B B464 6D7C E4AE D1D0 9DE1 69EA 19A0"; }]; }; @@ -6147,12 +6053,10 @@ keys = [ # GitHub signing key { - longkeyid = "rsa4096/0xDC7AE56AE98E02D7"; fingerprint = "EC08 7AA3 DEAD A972 F015 6371 DC7A E56A E98E 02D7"; } # Email encryption { - longkeyid = "ed25519/0x197F9A632D139E30"; fingerprint = "816D 23F5 E672 EC58 7674 4A73 197F 9A63 2D13 9E30"; } ]; @@ -6289,7 +6193,6 @@ github = "jojosch"; githubId = 327488; keys = [{ - longkeyid = "ed25519/059093B1A278BCD0"; fingerprint = "7249 70E6 A661 D84E 8B47 678A 0590 93B1 A278 BCD0"; }]; }; @@ -6299,7 +6202,6 @@ githubId = 1252547; keys = [{ # compare with https://keybase.io/joko - longkeyid = "rsa2048/0x85EAE7D9DF56C5CA"; fingerprint = "B154 A8F9 0610 DB45 0CA8 CF39 85EA E7D9 DF56 C5CA"; }]; name = "Ioannis Koutras"; @@ -6439,7 +6341,6 @@ github = "jtcoolen"; githubId = 54635632; keys = [{ - longkeyid = "rsa4096/0x19642151C218F6F5"; fingerprint = "4C68 56EE DFDA 20FB 77E8 9169 1964 2151 C218 F6F5"; }]; }; @@ -6529,7 +6430,6 @@ githubId = 1529052; name = "Jan van Brügge"; keys = [{ - longkeyid = "rsa4096/0x366572BE7D6C78A2"; fingerprint = "3513 5CE5 77AD 711F 3825 9A99 3665 72BE 7D6C 78A2"; }]; }; @@ -6573,7 +6473,6 @@ githubId = 63786778; name = "Joel"; keys = [{ - longkeyid = "rsa4096/18550BD205E9EF64"; fingerprint = "9148 DC9E F4D5 3EB6 A30E 8EF0 1855 0BD2 05E9 EF64"; }]; }; @@ -6608,7 +6507,6 @@ github = "kaction"; githubId = 44864956; keys = [{ - longkeyid = "ed25519/0x749FD4DFA2E94236"; fingerprint = "3F87 0A7C A7B4 3731 2F13 6083 749F D4DF A2E9 4236"; }]; }; @@ -6637,7 +6535,6 @@ github = "kamadorueda"; githubId = 47480384; keys = [{ - longkeyid = "rsa4096/0x04D0CEAF916A9A40"; fingerprint = "2BE3 BAFD 793E A349 ED1F F00F 04D0 CEAF 916A 9A40"; }]; }; @@ -6705,7 +6602,6 @@ githubId = 2186188; name = "Kenny Ballou"; keys = [{ - longkeyid = "rsa4096/0xB0CAA28A02958308"; fingerprint = "932F 3E8E 1C0F 4A98 95D7 B8B8 B0CA A28A 0295 8308"; }]; }; @@ -6778,7 +6674,6 @@ githubId = 44947946; name = "Khushraj Rathod"; keys = [{ - longkeyid = "rsa2048/0xB77B2A40E7702F19"; fingerprint = "1988 3FD8 EA2E B4EC 0A93 1E22 B77B 2A40 E770 2F19"; }]; }; @@ -6867,7 +6762,6 @@ githubId = 67870215; name = "Kat Inskip"; keys = [{ - longkeyid = "rsa4096/0xE8DDE3ED1C90F3A0"; fingerprint = "9CC6 44B5 69CD A59B C874 C4C9 E8DD E3ED 1C90 F3A0"; }]; }; @@ -6877,7 +6771,6 @@ githubId = 35715; name = "Robert Djubek"; keys = [{ - longkeyid = "rsa4096/0x156C88A5B0A04B2A"; fingerprint = "8992 44FC D291 5CA2 0A97 802C 156C 88A5 B0A0 4B2A"; }]; }; @@ -6916,7 +6809,6 @@ github = "kloenk"; githubId = 12898828; keys = [{ - longkeyid = "ed25519/0xB92445CFC9546F9D"; fingerprint = "6881 5A95 D715 D429 659B 48A4 B924 45CF C954 6F9D"; }]; }; @@ -7119,7 +7011,6 @@ githubId = 1640900; name = "Kyle Ondy"; keys = [{ - longkeyid = "rsa4096/0xDB0E3C33491F91C9"; fingerprint = "3C79 9D26 057B 64E6 D907 B0AC DB0E 3C33 491F 91C9"; }]; }; @@ -7131,7 +7022,6 @@ githubId = 6677292; keys = [{ - longkeyid = "rsa4096/81A1540948162372"; fingerprint = "5A9A 1C9B 2369 8049 3B48 CF5B 81A1 5409 4816 2372"; }]; }; @@ -7141,7 +7031,6 @@ github = "L-as"; githubId = 22075344; keys = [{ - longkeyid = "rsa2048/0xAC458A7D1087D025"; fingerprint = "A093 EA17 F450 D4D1 60A0 1194 AC45 8A7D 1087 D025"; }]; name = "Las Safin"; @@ -7158,7 +7047,6 @@ github = "CertainLach"; githubId = 6235312; keys = [{ - longkeyid = "rsa3072/40B5D6948143175F"; fingerprint = "323C 95B5 DBF7 2D74 8570 C0B7 40B5 D694 8143 175F"; }]; name = "Yaroslav Bolyukin"; @@ -7311,7 +7199,6 @@ githubId = 30902201; name = "legendofmiracles"; keys = [{ - longkeyid = "rsa4096/0x19B082B3DEFE5451"; fingerprint = "CC50 F82C 985D 2679 0703 AF15 19B0 82B3 DEFE 5451"; }]; }; @@ -7322,7 +7209,6 @@ githubId = 17183803; name = "Aleix Boné"; keys = [{ - longkeyid = "rsa4096/0xFC035BB2BB28E15D"; fingerprint = "63D3 F436 EDE8 7E1F 1292 24AF FC03 5BB2 BB28 E15D"; }]; }; @@ -7387,7 +7273,6 @@ github = "LEXUGE"; githubId = 13804737; keys = [{ - longkeyid = "rsa4096/0xAE53B4C2E58EDD45"; fingerprint = "7FE2 113A A08B 695A C8B8 DDE6 AE53 B4C2 E58E DD45"; }]; }; @@ -7501,7 +7386,6 @@ githubId = 3964494; name = "Lev Livnev"; keys = [{ - longkeyid = "rsa2048/0x68FF81E6A7850F49"; fingerprint = "74F5 E5CC 19D3 B5CB 608F 6124 68FF 81E6 A785 0F49"; }]; }; @@ -7511,7 +7395,6 @@ github = "lourkeur"; githubId = 15657735; keys = [{ - longkeyid = "ed25519/0xDFE1D4A017337E2A"; fingerprint = "5B93 9CFA E8FC 4D8F E07A 3AEA DFE1 D4A0 1733 7E2A"; }]; }; @@ -7582,7 +7465,6 @@ githubId = 25434434; name = "Jan Schmitt"; keys = [{ - longkeyid = "dsa2048/0xA2BC3C6F14351991"; fingerprint = "1763 9903 2D7C 5B82 5D5A 0EAD A2BC 3C6F 1435 1991"; }]; }; @@ -7635,7 +7517,6 @@ githubId = 7243783; name = "Bernardo Meurer"; keys = [{ - longkeyid = "rsa4096/0xF4C0D53B8D14C246"; fingerprint = "F193 7596 57D5 6DA4 CCD4 786B F4C0 D53B 8D14 C246"; }]; }; @@ -7716,7 +7597,6 @@ github = "Luflosi"; githubId = 15217907; keys = [{ - longkeyid = "rsa4096/0x6F987CCF224D20B9"; fingerprint = "66D1 3048 2B5F 2069 81A6 6B83 6F98 7CCF 224D 20B9"; }]; }; @@ -7770,7 +7650,6 @@ githubId = 13547699; name = "Corin Hoad"; keys = [{ - longkeyid = "rsa2048/0x6A37DF9483188492"; fingerprint = "BA3A 5886 AE6D 526E 20B4 57D6 6A37 DF94 8318 8492"; }]; }; @@ -8029,7 +7908,6 @@ githubId = 2551444; name = "Marcial Gaißert"; keys = [{ - longkeyid = "rsa2048/0xB629036BE399EEE9"; fingerprint = "B573 5118 0375 A872 FBBF 7770 B629 036B E399 EEE9"; }]; }; @@ -8112,7 +7990,6 @@ githubId = 26559841; name = "Matthew Penner"; keys = [{ - longkeyid = "ed25519/0x31311906AD4CF6D6"; fingerprint = "5118 F1CC B7B0 6C17 4DD1 5267 3131 1906 AD4C F6D6"; }]; }; @@ -8134,7 +8011,6 @@ githubId = 19580458; name = "Max Niederman"; keys = [{ - longkeyid = "rsa3072/0x9AED881481D8444E"; fingerprint = "1DE4 424D BF77 1192 5DC4 CF5E 9AED 8814 81D8 444E"; }]; }; @@ -8258,7 +8134,6 @@ githubId = 13689192; name = "Nguyễn Gia Phong"; keys = [{ - longkeyid = "rsa3072/0x27148B2C06A2224B"; fingerprint = "E90E 11B8 0493 343B 6132 E394 2714 8B2C 06A2 224B"; }]; }; @@ -8292,7 +8167,6 @@ githubId = 1926905; name = "Matt Layher"; keys = [{ - longkeyid = "rsa2048/0x77BFE531397EDE94"; fingerprint = "D709 03C8 0BE9 ACDC 14F0 3BFB 77BF E531 397E DE94"; }]; }; @@ -8422,7 +8296,6 @@ name = "Jörg Thalheim"; keys = [{ # compare with https://keybase.io/Mic92 - longkeyid = "rsa4096/0x003F2096411B5F92"; fingerprint = "3DEE 1C55 6E1C 3DC5 54F5 875A 003F 2096 411B 5F92"; }]; }; @@ -8475,7 +8348,6 @@ githubId = 7343721; name = "midchildan"; keys = [{ - longkeyid = "rsa4096/0x186A1EDAC5C63F83"; fingerprint = "FEF0 AE2D 5449 3482 5F06 40AA 186A 1EDA C5C6 3F83"; }]; }; @@ -8509,7 +8381,6 @@ githubId = 3490861; name = "Mark Vainomaa"; keys = [{ - longkeyid = "rsa4096/0xDA015B05B5A11B22"; fingerprint = "DB43 2895 CF68 F0CE D4B7 EF60 DA01 5B05 B5A1 1B22"; }]; }; @@ -8565,7 +8436,6 @@ githubId = 1200507; name = "Rémi Nicole"; keys = [{ - longkeyid = "rsa2048/0xFEA888C9F5D64F62"; fingerprint = "3196 83D3 9A1B 4DE1 3DC2 51FD FEA8 88C9 F5D6 4F62"; }]; }; @@ -8576,7 +8446,6 @@ github = "Minion3665"; githubId = 34243578; keys = [{ - longkeyid = "rsa4096/0x1AFD10256B3C714D"; fingerprint = "D520 AC8D 7C96 9212 5B2B BD3A 1AFD 1025 6B3C 714D"; }]; }; @@ -8605,7 +8474,6 @@ matrix = "@misterio:matrix.org"; name = "Gabriel Fontes"; keys = [{ - longkeyid = "rsa3072/0x245CAB70B4C225E9"; fingerprint = "7088 C742 1873 E0DB 97FF 17C2 245C AB70 B4C2 25E9"; }]; }; @@ -8645,7 +8513,6 @@ githubId = 7753506; name = "Michał Krzysztof Feiler"; keys = [{ - longkeyid = "rsa4096/0xE35C2D7C2C6AC724"; fingerprint = "1E36 9940 CC7E 01C4 CFE8 F20A E35C 2D7C 2C6A C724"; }]; }; @@ -8662,7 +8529,6 @@ githubId = 7735145; name = "Maciej Krüger"; keys = [{ - longkeyid = "rsa4096/0x0D948CE19CF49C5F"; fingerprint = "E90C BA34 55B3 6236 740C 038F 0D94 8CE1 9CF4 9C5F"; }]; }; @@ -8745,7 +8611,6 @@ github = "mohe2015"; githubId = 13287984; keys = [{ - longkeyid = "rsa4096/0x6794D45A488C2EDE"; fingerprint = "1248 D3E1 1D11 4A85 75C9 8934 6794 D45A 488C 2EDE"; }]; }; @@ -8773,7 +8638,6 @@ githubId = 100848; name = "André-Patrick Bubel"; keys = [{ - longkeyid = "rsa8192/0x118CE7C424B45728"; fingerprint = "4412 38AD CAD3 228D 876C 5455 118C E7C4 24B4 5728"; }]; }; @@ -8899,7 +8763,6 @@ name = "Harsh Shandilya"; email = "nixos@msfjarvis.dev"; keys = [{ - longkeyid = "rsa4096/0xB7843F823355E9B9"; fingerprint = "8F87 050B 0F9C B841 1515 7399 B784 3F82 3355 E9B9"; }]; }; @@ -9006,7 +8869,6 @@ github = "mvisonneau"; githubId = 1761583; keys = [{ - longkeyid = "rsa4096/0x150D6F0AE9198D24"; fingerprint = "EC63 0CEA E8BC 5EE5 5C58 F2E3 150D 6F0A E919 8D24"; }]; }; @@ -9065,7 +8927,6 @@ githubId = 35005234; name = "Nasir Hussain"; keys = [{ - longkeyid = "rsa4096/0xD8126E559CE7C35D"; fingerprint = "7A10 AB8E 0BEC 566B 090C 9BE3 D812 6E55 9CE7 C35D"; }]; }; @@ -9104,7 +8965,6 @@ github = "nazarewk"; githubId = 3494992; keys = [{ - longkeyid = "rsa4096/0x916D8B67241892AE"; fingerprint = "4BFF 0614 03A2 47F0 AA0B 4BC4 916D 8B67 2418 92AE"; }]; }; @@ -9127,7 +8987,6 @@ githubId = 4323933; name = "Naïm Favier"; keys = [{ - longkeyid = "rsa2048/0x49B07322580B7EE2"; fingerprint = "51A0 705E 7DD2 3CBC 5EAA B43E 49B0 7322 580B 7EE2"; }]; }; @@ -9267,7 +9126,6 @@ githubId = 77309427; name = "Nicolás Kennedy"; keys = [{ - longkeyid = "rsa4096/0xC061089EFEBF7A35"; fingerprint = "7BC1 77D9 C222 B1DC FB2F 0484 C061 089E FEBF 7A35"; }]; }; @@ -9313,7 +9171,6 @@ githubId = 23580910; name = "Jakub Kądziołka"; keys = [{ - longkeyid = "rsa4096/0xE315A75846131564"; fingerprint = "E576 BFB2 CF6E B13D F571 33B9 E315 A758 4613 1564"; }]; }; @@ -9354,7 +9211,6 @@ githubId = 354934; name = "Pontus Stenetorp"; keys = [{ - longkeyid = "rsa4096/0xD430287500E6483C"; fingerprint = "0966 2F9F 3FDA C22B C22E 4CE1 D430 2875 00E6 483C"; }]; }; @@ -9370,7 +9226,6 @@ github = "NKJe"; githubId = 1102306; keys = [{ - longkeyid = "nistp256/0xDE3BADFECD31A89D"; fingerprint = "B956 C6A4 22AF 86A0 8F77 A8CA DE3B ADFE CD31 A89D"; }]; }; @@ -9392,7 +9247,6 @@ githubId = 45737139; name = "nixbitcoindev"; keys = [{ - longkeyid = "rsa4096/0xDD11F9AD5308B3BA"; fingerprint = "577A 3452 7F3E 2A85 E80F E164 DD11 F9AD 5308 B3BA"; }]; }; @@ -9573,7 +9427,6 @@ name = "nzbr"; matrix = "@nzbr:nzbr.de"; keys = [{ - longkeyid = "rsa2048/0x6C78B50B97A42F8A"; fingerprint = "BF3A 3EE6 3144 2C5F C9FB 39A7 6C78 B50B 97A4 2F8A"; }]; }; @@ -9602,7 +9455,6 @@ githubId = 1260687; name = "Felix C. Stegerman"; keys = [{ - longkeyid = "rsa4096/0x2F9607F09B360F2D"; fingerprint = "D5E4 A51D F8D2 55B9 FAC6 A9BB 2F96 07F0 9B36 0F2D"; }]; }; @@ -9772,7 +9624,6 @@ githubId = 14816024; name = "oxalica"; keys = [{ - longkeyid = "ed25519/0x7571654CF88E31C2"; fingerprint = "F90F FD6D 585C 2BA1 F13D E8A9 7571 654C F88E 31C2"; }]; }; @@ -9782,7 +9633,6 @@ githubId = 391919; name = "Jan Malakhovski"; keys = [{ - longkeyid = "rsa2048/0x0E6CA66E5C557AA8"; fingerprint = "514B B966 B46E 3565 0508 86E8 0E6C A66E 5C55 7AA8"; }]; }; @@ -9792,7 +9642,6 @@ githubId = 8402811; name = "Alvar Penning"; keys = [{ - longkeyid = "rsa4096/0xF32A45637FA25E31"; fingerprint = "EB14 4E67 E57D 27E2 B5A4 CD8C F32A 4563 7FA2 5E31"; }]; }; @@ -9931,7 +9780,6 @@ githubId = 3395477; name = "Patryk Wychowaniec"; keys = [{ - longkeyid = "rsa4096/0xF62547D075E09767"; fingerprint = "196A BFEC 6A1D D1EC 7594 F8D1 F625 47D0 75E0 9767"; }]; }; @@ -10154,7 +10002,6 @@ githubId = 1576660; name = "Jelle Besseling"; keys = [{ - longkeyid = "rsa4096/0x9712452E8BE3372E"; fingerprint = "A3A3 65AE 16ED A7A0 C29C 88F1 9712 452E 8BE3 372E"; }]; }; @@ -10164,7 +10011,6 @@ githubId = 1719781; name = "Pablo Ovelleiro Corral"; keys = [{ - longkeyid = "rsa4096/0x823A6154426408D3"; fingerprint = "D03B 218C AE77 1F77 D7F9 20D9 823A 6154 4264 08D3"; }]; }; @@ -10202,7 +10048,6 @@ github = "plabadens"; githubId = 4303706; keys = [{ - longkeyid = "rsa2048/0xF55814E4D6874375"; fingerprint = "B00F E582 FD3F 0732 EA48 3937 F558 14E4 D687 4375"; }]; }; @@ -10242,7 +10087,6 @@ githubId = 898922; name = "Philipp Menke"; keys = [{ - longkeyid = "rsa4096/0xEB7F2D4CCBE23B69"; fingerprint = "ED54 5EFD 64B6 B5AA EC61 8C16 EB7F 2D4C CBE2 3B69"; }]; }; @@ -10294,7 +10138,6 @@ githubId = 46154511; name = "Kevin Mullins"; keys = [{ - longkeyid = "rsa4096/361820A45DB41E9A"; fingerprint = "2CD2 B030 BD22 32EF DF5A 008A 3618 20A4 5DB4 1E9A"; }]; }; @@ -10358,7 +10201,6 @@ githubId = 53291983; name = "Poscat Tarski"; keys = [{ - longkeyid = "rsa4096/2D2595A00D08ACE0"; fingerprint = "48AD DE10 F27B AFB4 7BB0 CCAF 2D25 95A0 0D08 ACE0"; }]; }; @@ -10386,7 +10228,6 @@ githubId = 9904569; name = "Pradyuman Vig"; keys = [{ - longkeyid = "rsa4096/4F74D5361C4CA31E"; fingerprint = "240B 57DE 4271 2480 7CE3 EAC8 4F74 D536 1C4C A31E"; }]; }; @@ -10416,11 +10257,11 @@ name = "Michael Weiss"; keys = [ { - longkeyid = "ed25519/0x130826A6C2A389FD"; # Git only + # Git only fingerprint = "86A7 4A55 07D0 58D1 322E 37FD 1308 26A6 C2A3 89FD"; } { - longkeyid = "rsa3072/0xBCA9943DD1DF4C04"; # Email, etc. + # Email, etc. fingerprint = "AF85 991C C950 49A2 4205 1933 BCA9 943D D1DF 4C04"; } ]; @@ -10461,7 +10302,6 @@ githubId = 42201; name = "Pavol Rusnak"; keys = [{ - longkeyid = "rsa4096/0x91F3B339B9A02A3D"; fingerprint = "86E6 792F C27B FD47 8860 C110 91F3 B339 B9A0 2A3D"; }]; }; @@ -10605,7 +10445,6 @@ githubId = 2768870; name = "Alyssa Ross"; keys = [{ - longkeyid = "rsa4096/736CCDF9EF51BD97"; fingerprint = "7573 56D7 79BB B888 773E 415E 736C CDF9 EF51 BD97"; }]; }; @@ -10736,7 +10575,6 @@ github = "rbreslow"; githubId = 1774125; keys = [{ - longkeyid = "ed25519/0xA0D32ACCA38B88ED"; fingerprint = "B5B7 BCA0 EE6F F31E 263A 69E3 A0D3 2ACC A38B 88ED"; }]; }; @@ -10767,7 +10605,6 @@ keys = [ # compare with https://keybase.io/reckenrode { - longkeyid = "ed25519/0xFBF19A982CCE0048"; fingerprint = "01D7 5486 3A6D 64EA AC77 0D26 FBF1 9A98 2CCE 0048"; } ]; @@ -10850,7 +10687,6 @@ github = "revol-xut"; githubId = 32239737; keys = [{ - longkeyid = "rsa4096/B966009D57E69CC6"; fingerprint = "91EB E870 1639 1323 642A 6803 B966 009D 57E6 9CC6"; }]; }; @@ -10978,11 +10814,9 @@ githubId = 18313093; keys = [ { - longkeyid = "rsa4096/0xF6FD87B15C263EC9"; fingerprint = "8A0E 6A7C 08AB B9DE 67DE 2A13 F6FD 87B1 5C26 3EC9"; } { - longkeyid = "ed25519/0xBBB7A6801DF1E03F"; fingerprint = "C0A7 A9BB 115B C857 4D75 EA99 BBB7 A680 1DF1 E03F"; } ]; @@ -11037,7 +10871,6 @@ githubId = 2817565; name = "Michele Guerini Rocco"; keys = [{ - longkeyid = "ed25519/0xBFBAF4C975F76450"; fingerprint = "92B2 904F D293 C94D C4C9 3E6B BFBA F4C9 75F7 6450"; }]; }; @@ -11139,7 +10972,6 @@ githubId = 3621083; name = "Roosembert (Roosemberth) Palacios"; keys = [{ - longkeyid = "rsa2048/0xCAAAECE5C2242BB7"; fingerprint = "78D9 1871 D059 663B 6117 7532 CAAA ECE5 C224 2BB7"; }]; }; @@ -11149,7 +10981,6 @@ github = "rople380"; githubId = 55679162; keys = [{ - longkeyid = "rsa2048/0x8526B7574A536236"; fingerprint = "1401 1B63 393D 16C1 AA9C C521 8526 B757 4A53 6236"; }]; }; @@ -11310,7 +11141,6 @@ githubId = 798147; name = "Robert Helgesson"; keys = [{ - longkeyid = "rsa4096/0x3573356C25C424D4"; fingerprint = "36CA CF52 D098 CC0E 78FB 0CB1 3573 356C 25C4 24D4"; }]; }; @@ -11326,7 +11156,6 @@ githubId = 8082305; name = "Maxwell Beck"; keys = [{ - longkeyid = "rsa2048/0xBB3EFA303760A0DB"; fingerprint = "D260 79E3 C2BC 2E43 905B D057 BB3E FA30 3760 A0DB"; }]; }; @@ -11350,7 +11179,6 @@ github = "sagikazarmark"; githubId = 1226384; keys = [{ - longkeyid = "rsa4096/0xF251ADDC9D041C7E"; fingerprint = "E628 C811 6FB8 1657 F706 4EA4 F251 ADDC 9D04 1C7E"; }]; }; @@ -11384,7 +11212,6 @@ githubId = 1349989; name = "samlich"; keys = [{ - longkeyid = "rsa4096/B1568953B1939F1C"; fingerprint = "AE8C 0836 FDF6 3FFC 9580 C588 B156 8953 B193 9F1C"; }]; }; @@ -11419,7 +11246,6 @@ github = "Samyak2"; githubId = 34161949; keys = [{ - longkeyid = "rsa4096/0x365873F2F0C6153B"; fingerprint = "155C F413 0129 C058 9A5F 5524 3658 73F2 F0C6 153B"; }]; }; @@ -11535,7 +11361,6 @@ github = "Sciencentistguy"; githubId = 4983935; keys = [{ - longkeyid = "rsa2048/0x8E8FF66E2AE8D970"; fingerprint = "30BB FF3F AB0B BB3E 0435 F83C 8E8F F66E 2AE8 D970"; }]; }; @@ -11673,7 +11498,6 @@ githubId = 51969817; name = "Serval"; keys = [{ - longkeyid = "rsa4096/0x4A2AAAA382F8294C"; fingerprint = "A317 37B3 693C 921B 480C C629 4A2A AAA3 82F8 294C"; }]; }; @@ -11683,7 +11507,6 @@ github = "seylerius"; githubId = 1145981; keys = [{ - longkeyid = "rsa4096/0xDC26B921A9E9DBDE"; fingerprint = "7246 B6E1 ABB9 9A48 4395 FD11 DC26 B921 A9E9 DBDE"; }]; }; @@ -11740,7 +11563,6 @@ github = "shanesveller"; githubId = 831; keys = [{ - longkeyid = "rsa4096/0x9210C218023C15CD"; fingerprint = "F83C 407C ADC4 5A0F 1F2F 44E8 9210 C218 023C 15CD"; }]; name = "Shane Sveller"; @@ -11799,7 +11621,6 @@ github = "shiryel"; githubId = 35617139; keys = [{ - longkeyid = "ed25519/0xC4041EA6B32633DE"; fingerprint = "AB63 4CD9 3322 BD42 6231 F764 C404 1EA6 B326 33DE"; }]; }; @@ -11839,7 +11660,6 @@ github = "Shrimpram"; githubId = 67710369; keys = [{ - longkeyid = "rsa4096/0x163B16EE76ED24CE"; fingerprint = "EA88 EA07 26E9 6CBF 6365 3966 163B 16EE 76ED 24CE"; }]; }; @@ -11879,7 +11699,6 @@ githubId = 688044; name = "Nikolay Korotkiy"; keys = [{ - longkeyid = "rsa2048/0xD1DE6D7F693663A5"; fingerprint = "ADF4 C13D 0E36 1240 BD01 9B51 D1DE 6D7F 6936 63A5"; }]; }; @@ -11932,7 +11751,6 @@ githubId = 23038812; name = "Sirio Balmelli"; keys = [{ - longkeyid = "ed25519/0xF72C4A887F9A24CA"; fingerprint = "B234 EFD4 2B42 FE81 EE4D 7627 F72C 4A88 7F9A 24CA"; }]; }; @@ -12011,7 +11829,6 @@ githubId = 12733495; name = "Sergey Makarov"; keys = [{ - longkeyid = "rsa2048/6AA23A1193B7064B"; fingerprint = "6F8A 18AE 4101 103F 3C54 24B9 6AA2 3A11 93B7 064B"; }]; }; @@ -12027,7 +11844,6 @@ githubId = 95471; name = "Sébastien Maret"; keys = [{ - longkeyid = "rsa4096/0x86E30E5A0F5FC59C"; fingerprint = "4242 834C D401 86EF 8281 4093 86E3 0E5A 0F5F C59C"; }]; }; @@ -12112,7 +11928,6 @@ githubId = 2280539; name = "Sondre Nilsen"; keys = [{ - longkeyid = "ed25519/0x25676BCBFFAD76B1"; fingerprint = "0EC3 FA89 EFBA B421 F82E 40B0 2567 6BCB FFAD 76B1"; }]; }; @@ -12257,7 +12072,6 @@ github = "steinybot"; githubId = 4659562; keys = [{ - longkeyid = "ed25519/0x21DE1CAE59762A0F"; fingerprint = "2709 1DEC CC42 4635 4299 569C 21DE 1CAE 5976 2A0F"; }]; }; @@ -12304,7 +12118,6 @@ github = "steshaw"; githubId = 45735; keys = [{ - longkeyid = "rsa4096/0x1D9A17DFD23DCB91"; fingerprint = "0AFE 77F7 474D 1596 EE55 7A29 1D9A 17DF D23D CB91"; }]; }; @@ -12563,7 +12376,6 @@ githubId = 4098453; name = "Tadeo Kondrak"; keys = [{ - longkeyid = "ed25519/0xFBE607FCC49516D3"; fingerprint = "0F2B C0C7 E77C 5B42 AC5B 4C18 FBE6 07FC C495 16D3"; }]; }; @@ -12597,7 +12409,6 @@ githubId = 94917129; name = "taikx4"; keys = [{ - longkeyid = "ed25519/0xCCD52C7B37BB837E"; fingerprint = "6B02 8103 C4E5 F68C D77C 9E54 CCD5 2C7B 37BB 837E"; }]; }; @@ -12693,7 +12504,6 @@ github = "tchekda"; githubId = 23559888; keys = [{ - longkeyid = "rsa4096/0xD0A007EDA4EADA0F"; fingerprint = "44CE A8DD 3B31 49CD 6246 9D8F D0A0 07ED A4EA DA0F"; }]; name = "David Tchekachev"; @@ -12832,7 +12642,6 @@ github = "thblt"; githubId = 2453136; keys = [{ - longkeyid = "rsa4096/0x63A44817A52EAB7B"; fingerprint = "D2A2 F0A1 E7A8 5E6F B711 DEE5 63A4 4817 A52E AB7B"; }]; }; @@ -12867,7 +12676,6 @@ github = "ModdedGamers"; githubId = 35778371; keys = [{ - longkeyid = "rsa4096/0x7D5107866B1C6752"; fingerprint = "38A0 29B0 4A7E 4C13 A4BB 86C8 7D51 0786 6B1C 6752"; }]; }; @@ -12888,7 +12696,6 @@ github = "thesola10"; githubId = 7287268; keys = [{ - longkeyid = "rsa4096/0x89245619BEBB95BA"; fingerprint = "1D05 13A6 1AC4 0D8D C6D6 5F2C 8924 5619 BEBB 95BA"; }]; name = "Karim Vergnes"; @@ -12966,7 +12773,6 @@ githubId = 11243138; name = "Chinmay D. Pai"; keys = [{ - longkeyid = "rsa4096/0x75507BE256F40CED"; fingerprint = "7F3E EEAA EE66 93CC 8782 042A 7550 7BE2 56F4 0CED"; }]; }; @@ -13043,7 +12849,6 @@ githubId = 5722198; name = "Thomas Kerber"; keys = [{ - longkeyid = "rsa4096/0x8489B911F9ED617B"; fingerprint = "556A 403F B0A2 D423 F656 3424 8489 B911 F9ED 617B"; }]; }; @@ -13085,7 +12890,6 @@ githubId = 561087; name = "toastal"; keys = [{ - longkeyid = "ed25519/5CCE6F1466D47C9E"; fingerprint = "7944 74B7 D236 DAB9 C9EF E7F9 5CCE 6F14 66D4 7C9E"; }]; }; @@ -13276,7 +13080,6 @@ githubId = 722482; name = "Denny Schäfer"; keys = [{ - longkeyid = "rsa4096/0xB057455D1E567270"; fingerprint = "C752 0E49 4D92 1740 D263 C467 B057 455D 1E56 7270"; }]; }; @@ -13322,7 +13125,6 @@ github = "twhitehead"; githubId = 787843; keys = [{ - longkeyid = "rsa2048/0x594258F0389D2802"; fingerprint = "E631 8869 586F 99B4 F6E6 D785 5942 58F0 389D 2802"; }]; }; @@ -13362,7 +13164,6 @@ github = "unclechu"; githubId = 799353; keys = [{ - longkeyid = "rsa4096/0xD276FF7467007335"; fingerprint = "EE59 5E29 BB5B F2B3 5ED2 3F1C D276 FF74 6700 7335"; }]; }; @@ -13478,7 +13279,6 @@ githubId = 25173827; name = "Vanilla"; keys = [{ - longkeyid = "rsa4096/0x3750028ED04FA42E"; fingerprint = "2649 340C C909 F821 D251 6714 3750 028E D04F A42E"; }]; }; @@ -13526,7 +13326,6 @@ github = "vcunat"; githubId = 1785925; keys = [{ - longkeyid = "rsa4096/0xE747DF1F9575A3AA"; fingerprint = "B600 6460 B60A 80E7 8206 2449 E747 DF1F 9575 A3AA"; }]; }; @@ -13542,7 +13341,6 @@ github = "veehaitch"; githubId = 15069839; keys = [{ - longkeyid = "rsa4096/0x874BD6F916FAA742"; fingerprint = "4D23 ECDF 880D CADF 5ECA 4458 874B D6F9 16FA A742"; }]; }; @@ -13588,7 +13386,6 @@ githubId = 7953163; name = "Vika Shleina"; keys = [{ - longkeyid = "rsa2048/0x4F62CD07CE64796A"; fingerprint = "B3C0 DA1A C18B 82E8 CA8B B1D1 4F62 CD07 CE64 796A"; }]; }; @@ -13598,7 +13395,6 @@ githubId = 631446; name = "Vincent Bernat"; keys = [{ - longkeyid = "rsa4096/0x95A42FE8353525F9"; fingerprint = "AEF2 3487 66F3 71C6 89A7 3600 95A4 2FE8 3535 25F9"; }]; }; @@ -13745,7 +13541,6 @@ github = "wackbyte"; githubId = 29505620; keys = [{ - longkeyid = "rsa4096/0x937F2AE5CCEFBF59"; fingerprint = "E595 7FE4 FEF6 714B 1AD3 1483 937F 2AE5 CCEF BF59"; }]; }; @@ -13755,7 +13550,6 @@ github = "wakira"; githubId = 2338339; keys = [{ - longkeyid = "rsa4096/0x8C9B0A8FC0C0D862"; fingerprint = "47F7 009E 3AE3 1DA7 988E 12E1 8C9B 0A8F C0C0 D862"; }]; }; @@ -13794,7 +13588,6 @@ github = "WeebSorceress"; githubId = 106774777; keys = [{ - longkeyid = "rsa4096/0x7F57344317F0FA43"; fingerprint = "659A 9BC3 F904 EC24 1461 2EFE 7F57 3443 17F0 FA43"; }]; }; @@ -13816,7 +13609,6 @@ githubId = 16267532; name = "Han Verstraete"; keys = [{ - longkeyid = "rsa4096/0x11F7BAEA856743FF"; fingerprint = "2145 955E 3F5E 0C95 3458 41B5 11F7 BAEA 8567 43FF"; }]; }; @@ -13850,7 +13642,6 @@ github = "wildsebastian"; githubId = 1215623; keys = [{ - longkeyid = "rsa4096/0x366A2940479A06FC"; fingerprint = "DA03 D6C6 3F58 E796 AD26 E99B 366A 2940 479A 06FC"; }]; }; @@ -14245,7 +14036,6 @@ githubId = 24368641; name = "Guillaume Pagnoux"; keys = [{ - longkeyid = "rsa4096/0xEC5065899AEAAF4C"; fingerprint = "85F8 E850 F8F2 F823 F934 535B EC50 6589 9AEA AF4C"; }]; }; @@ -14263,7 +14053,6 @@ githubId = 19897088; name = "Yusuf Bera Ertan"; keys = [{ - longkeyid = "rsa2048/0x61807181F60EFCB2"; fingerprint = "9270 66BD 8125 A45B 4AC4 0326 6180 7181 F60E FCB2"; }]; }; @@ -14273,7 +14062,6 @@ githubId = 86538850; name = "Yuu Yin"; keys = [{ - longkeyid = "rsa4096/0x416F303B43C20AC3"; fingerprint = "9F19 3AE8 AA25 647F FC31 46B5 416F 303B 43C2 0AC3"; }]; }; @@ -14360,7 +14148,6 @@ githubId = 5024958; name = "Jona Abdinghoff"; keys = [{ - longkeyid = "rsa4096/0x8333735E784DF9D4"; fingerprint = "44F7 B797 9D3A 27B1 89E0 841E 8333 735E 784D F9D4"; }]; }; @@ -14545,7 +14332,6 @@ github = "ymatsiuk"; githubId = 24990891; keys = [{ - longkeyid = "rsa4096/0x61302290298601AA"; fingerprint = "7BB8 84B5 74DA FDB1 E194 ED21 6130 2290 2986 01AA"; }]; }; @@ -14617,7 +14403,6 @@ github = "hmenke"; githubId = 1903556; keys = [{ - longkeyid = "rsa4096/0xD65C9AFB4C224DA3"; fingerprint = "F1C5 760E 45B9 9A44 72E9 6BFB D65C 9AFB 4C22 4DA3"; }]; }; @@ -14627,7 +14412,6 @@ github = "berbiche"; githubId = 20448408; keys = [{ - longkeyid = "rsa4096/0xB461292445C6E696"; fingerprint = "D446 E58D 87A0 31C7 EC15 88D7 B461 2924 45C6 E696"; }]; }; @@ -14649,7 +14433,6 @@ github = "starcraft66"; githubId = 1858154; keys = [{ - longkeyid = "rsa4096/0x9D98CDACFF04FD78"; fingerprint = "8597 4506 EC69 5392 0443 0805 9D98 CDAC FF04 FD78"; }]; }; @@ -14684,7 +14467,6 @@ github = "princemachiavelli"; githubId = 2730968; keys = [{ - longkeyid = "ed25519/0x83124F97A318EA18"; fingerprint = "DD54 130B ABEC B65C 1F6B 2A38 8312 4F97 A318 EA18"; }]; }; @@ -14694,7 +14476,6 @@ github = "ydlr"; githubId = 58453832; keys = [{ - longkeyid = "rsa4096/0x43AB44130A29AD9D"; fingerprint = "FD0A C425 9EF5 4084 F99F 9B47 2ACC 9749 7C68 FAD4"; }]; }; @@ -14704,7 +14485,6 @@ github = "vs49688"; githubId = 4423262; keys = [{ - longkeyid = "rsa4096/0x68616B2D8AC4DCC5"; fingerprint = "61AE D40F 368B 6F26 9DAE 3892 6861 6B2D 8AC4 DCC5"; }]; }; @@ -14726,7 +14506,6 @@ github = "ZenithalHourlyRate"; githubId = 19512674; keys = [{ - longkeyid = "rsa4096/0x87E17EEF9B18B6C9"; fingerprint = "1127 F188 280A E312 3619 3329 87E1 7EEF 9B18 B6C9"; }]; }; @@ -14743,7 +14522,6 @@ name = "Zoey de Souza Pessanha"; email = "zoey.spessanha@outlook.com"; keys = [{ - longkeyid = "rsa4096/0x1E1E889CDBD6A315"; fingerprint = "EAA1 51DB 472B 0122 109A CB17 1E1E 889C DBD6 A315"; }]; }; @@ -14759,7 +14537,6 @@ github = "zseri"; githubId = 1618343; keys = [{ - longkeyid = "rsa4096/0x229E63AE5644A96D"; fingerprint = "7AFB C595 0D3A 77BD B00F 947B 229E 63AE 5644 A96D"; }]; }; @@ -14812,7 +14589,6 @@ githubId = 68368; matrix = "@qbit:tapenet.org"; keys = [{ - longkeyid = "rsa4096/0x1F81112D62A9ADCE"; fingerprint = "3586 3350 BFEA C101 DB1A 4AF0 1F81 112D 62A9 ADCE"; }]; }; @@ -14860,7 +14636,6 @@ name = "Bryan Bennett"; keys = [{ # compare with https://keybase.io/bbenne10 - longkeyid = "rsa2048/0xEF90E3E98B8F5C0B"; fingerprint = "41EA 00B4 00F9 6970 1CB2 D3AF EF90 E3E9 8B8F 5C0B"; }]; }; diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 2ea345a652d2..1b96dce645ef 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -19,7 +19,10 @@ More fields may be added in the future. - Please keep the list alphabetically sorted. + When editing this file: + * keep the list alphabetically sorted + * test the validity of the format with: + nix-build lib/tests/teams.nix */ { lib }: diff --git a/pkgs/applications/blockchains/wasabibackend/deps.nix b/pkgs/applications/blockchains/wasabibackend/deps.nix index 782f183da07e..273f2a5eafd7 100644 --- a/pkgs/applications/blockchains/wasabibackend/deps.nix +++ b/pkgs/applications/blockchains/wasabibackend/deps.nix @@ -1,8 +1,7 @@ { fetchNuGet }: [ - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "3.1.10"; sha256 = "0xn4zh7shvijqlr03fqsmps6gz856isd9bg9rk4z2c4599ggal77"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "3.1.21"; sha256 = "056g9nv8a7n8zdbgzmyzmn3pbg52yq2kv5d1rcp7h6plwzgpiwql"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "3.1.21"; sha256 = "0akdzi35497v8yxr3a9q1g26cnx9vxnwv81kwxi293jklwnx8gsr"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "3.1.21"; sha256 = "16kya6xvi7k42sr8bxgpbz9116dj7g3i18ylpvji9qngdx41891v"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "3.1.26"; sha256 = "0rib2121wri6wj6h4f6w4yqw9qp2xsad3ind63fmp1sr649jifyh"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "3.1.26"; sha256 = "0z29rrhc87g0bi273lcqd608f7ngd16nv85v8549231yvf99n60x"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "3.1.26"; sha256 = "0pbm6hpibsvq5w8hyvvllz4qns287x3l8bc07krffv23yfbv8zwy"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.JsonPatch"; version = "3.1.1"; sha256 = "0c0aaz9rlh9chc53dnv5jryp0x0415hipaizrmih3kzwd3fmqpml"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.Mvc.NewtonsoftJson"; version = "3.1.1"; sha256 = "1c2lrlp64kkacnjgdyygr6fqdawk10l8j4qgppii6rq61yjwhcig"; }) (fetchNuGet { pname = "Microsoft.Build"; version = "15.3.409"; sha256 = "0vzq6csp2yys9s96c7i37bjml439rdi47g8f5rzqdr7xf5a1jk81"; }) @@ -19,13 +18,11 @@ (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "1.0.0"; sha256 = "1sh9bidmhy32gkz6fkli79mxv06546ybrzppfw5v2aq0bda1ghka"; }) (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "2.0.0"; sha256 = "1xppr5jbny04slyjgngxjdm0maxdh47vq481ps944d7jrfs0p3mb"; }) (fetchNuGet { pname = "Microsoft.NETCore.App"; version = "2.0.5"; sha256 = "0qb7k624w7l0zhapdp519ymqg84a67r8zyd8cpj42hywsgb0dqv6"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "3.1.21"; sha256 = "01kbhi29lhv6mg1zfsyakz3z8hfbxnc0kxy0fczl8xqviik9svx7"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "3.1.21"; sha256 = "1s5g9gk0hvs268q2zpc32m0my2m2ivlmsmza86797a9vkxr6pzw6"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "3.1.21"; sha256 = "0dl4yakfmdkx6xr18f09cdnl11b4fyp23jg3msr8a25zqdqvcr29"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "3.1.0"; sha256 = "08svsiilx9spvjamcnjswv0dlpdrgryhr3asdz7cvnl914gjzq4y"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "3.1.21"; sha256 = "13692wqcww0w6x4nhyxpxwprdg6mx9xmlvv38m6fvp6g0m27r43v"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "3.1.21"; sha256 = "1p7fpcmx4m2374zjfh53i3mv4lkr8xrkz5lnawv95s7j005m07pc"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "3.1.21"; sha256 = "02zgxzf8l607mh17900n7msga0yfcnqgd70rj1rlwj23plifykx1"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "3.1.26"; sha256 = "1vk4dr2z72nmjg2skqvy2m2h5brqp21v51pnd7ldpm7asgr5ck8n"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "3.1.26"; sha256 = "0l5yfnpbd36n38rjlmhsnq4bniq1fcssv4qh8kb9h3qigz40qxj9"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "3.1.26"; sha256 = "1h9b8fwgwbycvn1ngxnpdz3s1zh59wi2iy8n4y2nfkmz2rbldrrm"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "3.1.26"; sha256 = "0y06qz4pgflwia222mljg19nlfmhcg0qs1a8wm3zwj602wzy3nll"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "3.1.26"; sha256 = "1half7rywhxb1x19gzddvjqbll4whx9wmwdlk57iy68djas95lmy"; }) (fetchNuGet { pname = "Microsoft.NETCore.DotNetAppHost"; version = "2.0.5"; sha256 = "00bsxdg9c8msjxyffvfi8siqk8v2m7ca8fqy1npv7b2pzg3byjws"; }) (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostPolicy"; version = "2.0.5"; sha256 = "0v5csskiwpk8kz8wclqad8kcjmxr7ik4w99wl05740qvaag3qysk"; }) (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostResolver"; version = "2.0.5"; sha256 = "1sz2fdp8fdwz21x3lr2m1zhhrbix6iz699fjkwiryqdjl4ygd3hw"; }) @@ -69,9 +66,9 @@ (fetchNuGet { pname = "runtime.unix.System.Diagnostics.Debug"; version = "4.0.11"; sha256 = "05ndbai4vpqrry0ghbfgqc8xblmplwjgndxmdn1zklqimczwjg2d"; }) (fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.0.1"; sha256 = "0ic5dgc45jkhcr1g9xmmzjm7ffiw4cymm0fprczlx4fnww4783nm"; }) (fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.1.0"; sha256 = "0x1cwd7cvifzmn5x1wafvj75zdxlk3mxy860igh3x1wx0s8167y4"; }) - (fetchNuGet { pname = "runtime.win7.System.Private.Uri"; version = "4.0.1"; sha256 = "1ibrwabavdpqapnplm5kh6nz9vgcwv0wn61w1p60v262kif6sglp"; }) (fetchNuGet { pname = "runtime.win.System.Diagnostics.Debug"; version = "4.0.11"; sha256 = "1ylkj4v7aq00svij7aq82d86afpwqgrqf2kpikabxl26p19ry9wm"; }) (fetchNuGet { pname = "runtime.win.System.Runtime.Extensions"; version = "4.1.0"; sha256 = "1zmx2msa04ka8mgh8viahi4pqpp86vdhzij2rg1jg131bwlv59yw"; }) + (fetchNuGet { pname = "runtime.win7.System.Private.Uri"; version = "4.0.1"; sha256 = "1ibrwabavdpqapnplm5kh6nz9vgcwv0wn61w1p60v262kif6sglp"; }) (fetchNuGet { pname = "Swashbuckle.AspNetCore"; version = "5.0.0"; sha256 = "0rn2awmzrsrppk97xbbwk4kq1mys9bygb5xhl6mphbk0hchrvh09"; }) (fetchNuGet { pname = "Swashbuckle.AspNetCore.Swagger"; version = "5.0.0"; sha256 = "1341nv8nmh6avs3y7w2szzir5qd0bndxwrkdmvvj3hcxj1126w2f"; }) (fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerGen"; version = "5.0.0"; sha256 = "00swg2avqnb38q2bsxljd34n8rpknp74h9vbn0fdnfds3a32cqr4"; }) diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix index c63d9d982a0f..14525e6d5fcc 100644 --- a/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -45,13 +45,13 @@ in stdenv.mkDerivation rec { pname = "imagemagick"; - version = "7.1.0-37"; + version = "7.1.0-39"; src = fetchFromGitHub { owner = "ImageMagick"; repo = "ImageMagick"; rev = version; - hash = "sha256-Okp3oPIAEXl+fTnEw0jufSxcRU6ip+on5/IyGEjzx2E="; + hash = "sha256-2KSsRkzaC3muNwH4GJfIiMy4pnSjh8waDpYRTuu6GG0="; }; outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 58566af20e48..57a3051b98ed 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -32,15 +32,15 @@ } }, "dev": { - "version": "104.0.5110.0", - "sha256": "12qdwkrhnjykmjc0q42xwq0cz1mllb3bv3ajp53pdpkjb6c3dvf1", - "sha256bin64": "0zg9n2z9pccw42gsd2fqs5ifvk2kkr4yznpz04839grs4bdsdv0j", + "version": "104.0.5112.12", + "sha256": "040xi7cwgxi1hahv8is088gma2cyz8xhsb62jfq5ahzjx2d93qp9", + "sha256bin64": "1av8wn3x7m9gixh8s0mv8w0hxlk80dh7y7x3fska5fjplf4x94ij", "deps": { "gn": { "version": "2022-06-08", "url": "https://gn.googlesource.com/gn", - "rev": "fd6cae41bd7d5d255dc2fb96004a8bf74ac9d972", - "sha256": "04v7hrxy48q7awj6in5q6j3nr05anjq9ldx71ky6lgla10yyzx7m" + "rev": "2ecd43a10266bd091c98e6dcde507c64f6a0dad3", + "sha256": "1q06vsz9b4bb764wy1wy8n177z2pgpm97kq3rl1hmq185mz5fhra" } } }, diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index 57e4d222f1c1..be134d465738 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -20,11 +20,11 @@ let vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi"; in stdenv.mkDerivation rec { pname = "vivaldi"; - version = "5.3.2679.55-1"; + version = "5.3.2679.58-1"; src = fetchurl { url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}_amd64.deb"; - sha256 = "0bsvcvf453x9rmbksczqhzrl0j9xm49rn2ngvkw0ar9di3aiqy3z"; + sha256 = "085r5mrj8kp65fv0fw3azcgl9a7wxw4vcmnma36ihml8r53f8iaw"; }; unpackPhase = '' diff --git a/pkgs/applications/networking/cluster/nomad/1.2.nix b/pkgs/applications/networking/cluster/nomad/1.2.nix index c888581ae4d8..5df87528448c 100644 --- a/pkgs/applications/networking/cluster/nomad/1.2.nix +++ b/pkgs/applications/networking/cluster/nomad/1.2.nix @@ -1,11 +1,9 @@ { callPackage , buildGoModule -, nvidia_x11 -, nvidiaGpuSupport }: callPackage ./generic.nix { - inherit buildGoModule nvidia_x11 nvidiaGpuSupport; + inherit buildGoModule; version = "1.2.8"; sha256 = "11yn8g9wsdb35q97wn5vy93kgbn5462k0a33wxlfdz14i5h00yj8"; vendorSha256 = "06wyfnlm37qjvd1pwzygflfpcp9p52f61wgi6pb9l7hnqy2ph6j5"; diff --git a/pkgs/applications/networking/cluster/nomad/1.3.nix b/pkgs/applications/networking/cluster/nomad/1.3.nix index 6670b35f67e0..0145a5b10905 100644 --- a/pkgs/applications/networking/cluster/nomad/1.3.nix +++ b/pkgs/applications/networking/cluster/nomad/1.3.nix @@ -1,11 +1,9 @@ { callPackage , buildGoModule -, nvidia_x11 -, nvidiaGpuSupport }: callPackage ./generic.nix { - inherit buildGoModule nvidia_x11 nvidiaGpuSupport; + inherit buildGoModule; version = "1.3.1"; sha256 = "03ckhqh5xznvhbk380ka0g9w9hrvsi389h5maw68f3g3acx68jm7"; vendorSha256 = "08k5dxaq4r2q0km6y9mc14haski6l7hmhmzn5wjb961hwf5hkfgh"; diff --git a/pkgs/applications/networking/cluster/nomad/generic.nix b/pkgs/applications/networking/cluster/nomad/generic.nix index 180cf48e3fb1..c5d92eaf1f7e 100644 --- a/pkgs/applications/networking/cluster/nomad/generic.nix +++ b/pkgs/applications/networking/cluster/nomad/generic.nix @@ -4,9 +4,6 @@ , version , sha256 , vendorSha256 -, nvidiaGpuSupport -, patchelf -, nvidia_x11 , nixosTests }: @@ -25,22 +22,10 @@ buildGoModule rec { inherit vendorSha256; - nativeBuildInputs = lib.optionals nvidiaGpuSupport [ - patchelf - ]; - # ui: # Nomad release commits include the compiled version of the UI, but the file # is only included if we build with the ui tag. - tags = [ "ui" ] ++ lib.optional (!nvidiaGpuSupport) "nonvidia"; - - # The dependency on NVML isn't explicit. We have to make it so otherwise the - # binary will not know where to look for the relevant symbols. - postFixup = lib.optionalString nvidiaGpuSupport '' - for bin in $out/bin/*; do - patchelf --add-needed "${nvidia_x11}/lib/libnvidia-ml.so" "$bin" - done - ''; + tags = [ "ui" ]; passthru.tests.nomad = nixosTests.nomad; diff --git a/pkgs/applications/networking/dnscontrol/default.nix b/pkgs/applications/networking/dnscontrol/default.nix index da2104b649ab..88fe43884f87 100644 --- a/pkgs/applications/networking/dnscontrol/default.nix +++ b/pkgs/applications/networking/dnscontrol/default.nix @@ -2,21 +2,24 @@ buildGoModule rec { pname = "dnscontrol"; - version = "3.16.2"; + version = "3.17.0"; src = fetchFromGitHub { owner = "StackExchange"; repo = pname; rev = "v${version}"; - sha256 = "sha256-lzE35PT0QLlZ2jftXpDDvr4S3zD1DOpZVXrGGnzvpc8="; + sha256 = "sha256-eXm2oOHtNnDK4mikge8Ubjkg4b4mG7HMT17nL/CdU88="; }; - vendorSha256 = "sha256-M+Kzw2ZmKV527rPUJ1codtXWN0/5tmph7GMBTze4C7c="; - - subPackages = [ "." ]; + vendorSha256 = "sha256-14SnK5CeMTmt0ZQ+CI14FACcMaNNbBWvAYfbQoJ2K/A="; ldflags = [ "-s" "-w" ]; + preCheck = '' + # requires network + rm pkg/spflib/flatten_test.go pkg/spflib/parse_test.go + ''; + meta = with lib; { description = "Synchronize your DNS to multiple providers from a simple DSL"; homepage = "https://stackexchange.github.io/dnscontrol/"; diff --git a/pkgs/build-support/appimage/default.nix b/pkgs/build-support/appimage/default.nix index d41ceba37c17..17d5bca65669 100644 --- a/pkgs/build-support/appimage/default.nix +++ b/pkgs/build-support/appimage/default.nix @@ -37,7 +37,13 @@ rec { extractType2 = extract; wrapType1 = wrapType2; - wrapAppImage = args@{ name ? "${args.pname}-${args.version}", src, extraPkgs, ... }: buildFHSUserEnv + wrapAppImage = args@{ + name ? "${args.pname}-${args.version}", + src, + extraPkgs, + meta ? {}, + ... + }: buildFHSUserEnv (defaultFhsEnvArgs // { inherit name; @@ -45,6 +51,10 @@ rec { ++ defaultFhsEnvArgs.targetPkgs pkgs ++ extraPkgs pkgs; runScript = "appimage-exec.sh -w ${src} --"; + + meta = { + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + } // meta; } // (removeAttrs args ([ "pname" "version" ] ++ (builtins.attrNames (builtins.functionArgs wrapAppImage))))); wrapType2 = args@{ name ? "${args.pname}-${args.version}", src, extraPkgs ? pkgs: [ ], ... }: wrapAppImage diff --git a/pkgs/development/compilers/dotnet/default.nix b/pkgs/development/compilers/dotnet/default.nix index 8dcae9f27bbd..9097604e428e 100644 --- a/pkgs/development/compilers/dotnet/default.nix +++ b/pkgs/development/compilers/dotnet/default.nix @@ -22,60 +22,60 @@ rec { ##### Following attributes with urls and hashes should be auto-generated by print-hashes.sh ##### - # v3.1 (lts) + # v3.1 (maintenance) aspnetcore_3_1 = buildAspNetCore { icu = icu70; - version = "3.1.21"; + version = "3.1.26"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/c4565012-97e8-4a5a-9edf-8d6c94f0ac5c/dd227c01d532bcb731b026243a51f55f/aspnetcore-runtime-3.1.21-linux-x64.tar.gz"; - sha512 = "f59252166dbfe11a78373226222d6a34484b9132e24283222aea8a950a5e9657da2e4d4e9ff8cbcc2fd7c7705e13bf42a31232a6012d1e247efc718e3d8e2df1"; + url = "https://download.visualstudio.microsoft.com/download/pr/6f72adf7-0e78-48ea-85ef-e72a39a1f8a1/1ec0238c236c3757e5628563a329fdc4/aspnetcore-runtime-3.1.26-linux-x64.tar.gz"; + sha512 = "8bbf06012cdd2cff23c592e0d3c49d032d77add4dda8fba1d7ba73e6cc4ae97b1676908b14cdc7fc2fe723302e1efd27a44b48190a91d69c0e41bb5edb47501f"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/5d245f70-4e8f-457a-9c4f-d4140136e496/56193e7de38e0f4101eb6f3fd2c60c41/aspnetcore-runtime-3.1.21-linux-arm64.tar.gz"; - sha512 = "f3d014431064362c29361e3d3b33b7aaaffe46e22f324cd42ba6fc6a6d5b712153e9ec82f10cf1bee416360a68fb4520dc9c0b0a8860316c4c9fce75f1adae80"; + url = "https://download.visualstudio.microsoft.com/download/pr/6b68a14a-b4dd-4a75-bb32-26c08d19190f/1d6b637e290775f668701f8f6092ab35/aspnetcore-runtime-3.1.26-linux-arm64.tar.gz"; + sha512 = "757ff6cbc31b1c8743077288d7fa621c73fa7f4d155d636ad100cda6e1f601e31d2f842d5cfef3dec5daa4c8c3efbcf76f02afd1c518cae7b67b2a46a9faab08"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/dd423a05-c133-464d-a117-d2e73d6dfeb5/a2d7c629802b8a283819a445a3024944/aspnetcore-runtime-3.1.21-osx-x64.tar.gz"; - sha512 = "477912671e21c7c61f5666323ad9e9c246550d40b4d127ccc71bcb296c86e07051e3c75251beef11806f198eebd0cd4b36790950f24c730dc6723156c0dc11b5"; + url = "https://download.visualstudio.microsoft.com/download/pr/33e8be5c-5e6a-4dc2-9aa8-846aaffa6897/fe9d96af1d75f8d5f4cba4bff95f2fae/aspnetcore-runtime-3.1.26-osx-x64.tar.gz"; + sha512 = "0657d8b11a58357f5374e5d8201b401e55f9f4710794be565f7b9022d10639c2e72aebc6b7433b34fd24a03e8e12541c998fad28b5263de4439b3d31a8252c4c"; }; }; }; runtime_3_1 = buildNetRuntime { icu = icu70; - version = "3.1.21"; + version = "3.1.26"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/286e526e-282b-47e5-afeb-4f99ee481972/495908d6a6019e47249bd05f8346aeb5/dotnet-runtime-3.1.21-linux-x64.tar.gz"; - sha512 = "cc4b2fef46e94df88bf0fc11cb15439e79bd48da524561dffde80d3cd6db218133468ad2f6785803cf0c13f000d95ff71eb258cec76dd8eb809676ec1cb38fac"; + url = "https://download.visualstudio.microsoft.com/download/pr/a14c8e4d-a22b-47f8-953c-bb4337634513/58017d103d432f7106c44b0891936aba/dotnet-runtime-3.1.26-linux-x64.tar.gz"; + sha512 = "03676885ec4d1f5ba184678a6b774f8e385abfff800a6bcee6f85557b39e9cdde500be49b5d6c956fc95cdfb9f33d31e467548bb498a52bc4fd639b3cb87c8d0"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/45b3ad17-6ce6-4cd6-a975-d4f152203750/c6df44d802c52e65ad5d9c783ccd46ab/dotnet-runtime-3.1.21-linux-arm64.tar.gz"; - sha512 = "80971125650a2fa0163e39a2de98bc2e871c295b723559e6081a3ab59d99195aa5b794450f8182c5eb4e7e472ca1c13340ef1cc8a5588114c494bbb5981f19c4"; + url = "https://download.visualstudio.microsoft.com/download/pr/cb0e8b4b-7b2b-40cc-b7a6-30f0d4fabe6c/f5cb06cbb1b1b5d198792333b3db235a/dotnet-runtime-3.1.26-linux-arm64.tar.gz"; + sha512 = "574409616f5cbef35a2bd6fd1a2f0bcb3bdaa81457aea3af5e0e237ba768ced5214c51a3045697fe7478e8211e2045fc2072e382d6f456509a8f2923e9b1fc26"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/3896eba4-4ef4-47a7-846c-8acb44b15feb/4920ee69b26772423edc686e499da061/dotnet-runtime-3.1.21-osx-x64.tar.gz"; - sha512 = "049257f680fe7dfb8e98a2ae4da6aa184f171b04b81c506e7a83509e46b1ea81ea6000c4d01c5bed46d5495328c6d9a0eeecbc0dc7c2c698296251fb04b5e855"; + url = "https://download.visualstudio.microsoft.com/download/pr/6bedea65-b104-45b8-abe9-36cefbeedadf/05f4e472ec2395dad7103fda9ed278b2/dotnet-runtime-3.1.26-osx-x64.tar.gz"; + sha512 = "7957b5e697db7548964c399197ae8e61cc31f15374df384b6db9b47472a7d6f1b5b3e256c191e203c4d18c18cc8bdb6c4a331c5875bd37bd6415f3c83b8062da"; }; }; }; sdk_3_1 = buildNetSdk { icu = icu70; - version = "3.1.415"; + version = "3.1.420"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/6425056e-bfd5-48be-8b00-223c03a4d0f3/08a801489b7f18e9e73a1378082fbe66/dotnet-sdk-3.1.415-linux-x64.tar.gz"; - sha512 = "df7a6d1abed609c382799a8f69f129ec72ce68236b2faecf01aed4c957a40a9cfbbc9126381bf517dff3dbe0e488f1092188582701dd0fef09a68b8c5707c747"; + url = "https://download.visualstudio.microsoft.com/download/pr/5424da8c-ce12-46de-a51a-8fa61aefdde6/52a9d6b5718ea40863db96901c780d4b/dotnet-sdk-3.1.420-linux-x64.tar.gz"; + sha512 = "b3bdd964182f9edc3c2976541e657fcc43b0eaf9bc97197597c7ecb8b784d79e3efb9e0405c84e1dcb434cf4cd38ddc4af628c5df486c3d7ae8a23e5254796e3"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/4a78a923-e891-40fe-88d2-4bff2c90519f/126bee4399caeabde4f34f4ace7f44e3/dotnet-sdk-3.1.415-linux-arm64.tar.gz"; - sha512 = "7a5b9922988bcbde63d39f97e283ca1d373d5521cca0ab8946e2f86deaef6e21f00244228a0d5d8c38c2b9634b38bc7338b61984f0e12dd8fdb8b2e6eed5dd34"; + url = "https://download.visualstudio.microsoft.com/download/pr/a84bf296-ee6e-4e66-9694-90d3da7af2b4/b00b2efe2432938e5a19c45d3759d80f/dotnet-sdk-3.1.420-linux-arm64.tar.gz"; + sha512 = "ac66b1544fe178153bb85c2e5be584464374ce4c036fc95720547c231c2730312018fbdfc735f9071579749415bc54e1f6b8f080cc2b08d5799a0da941e8a5f5"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/7d663efa-2180-4562-8735-be11d8ba465d/605910e63a687d8c9e72ba108ffb1da4/dotnet-sdk-3.1.415-osx-x64.tar.gz"; - sha512 = "e26529714021d1828687c404dd0800c61eb267c9da62ee629b91f5ffa8af77d156911bd3c1a58bf11e5c589cfe4a852a95c14a7cb25f731e92a484348868964d"; + url = "https://download.visualstudio.microsoft.com/download/pr/bb0efe58-450c-4e28-81c1-4081acd6ffa4/1d0eaf8b624dff000c8b10ea0497e731/dotnet-sdk-3.1.420-osx-x64.tar.gz"; + sha512 = "370cba4685e07d1cdb5d7f9b754812b237802ace679c9b9985c6e5c4dc09f500580f1413679a288615079bd155b68b362adb00151b2b8f5ca7c3718ab9e16194"; }; }; }; diff --git a/pkgs/development/dotnet-modules/python-language-server/deps.nix b/pkgs/development/dotnet-modules/python-language-server/deps.nix index 1a1ac569bb2a..3f4e4fa3f2aa 100644 --- a/pkgs/development/dotnet-modules/python-language-server/deps.nix +++ b/pkgs/development/dotnet-modules/python-language-server/deps.nix @@ -2,19 +2,19 @@ (fetchNuGet { pname = "MessagePack"; version = "2.1.90"; sha256 = "1j5wjl7aq7nn5ga3j6zaaivdf2wlfyd7w66ak0i7krgrmv26lb8i"; }) (fetchNuGet { pname = "MessagePack.Annotations"; version = "2.1.90"; sha256 = "08sghhwbz8h7ji9lg0klhwcyndxg6v11pq9jac975sb38samnm11"; }) (fetchNuGet { pname = "MicroBuild.Core"; version = "0.3.0"; sha256 = "190d755l60j3l5m1661wj19gj9w6ngza56q3vkijkkmbbabdmqln"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "3.1.21"; sha256 = "056g9nv8a7n8zdbgzmyzmn3pbg52yq2kv5d1rcp7h6plwzgpiwql"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "3.1.21"; sha256 = "0akdzi35497v8yxr3a9q1g26cnx9vxnwv81kwxi293jklwnx8gsr"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "3.1.21"; sha256 = "16kya6xvi7k42sr8bxgpbz9116dj7g3i18ylpvji9qngdx41891v"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "3.1.21"; sha256 = "0rd3w3i6fzwhi71jcr8i0mchgfgpp1a0qhancg4dxsva032as4s6"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "3.1.26"; sha256 = "0rib2121wri6wj6h4f6w4yqw9qp2xsad3ind63fmp1sr649jifyh"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "3.1.26"; sha256 = "0z29rrhc87g0bi273lcqd608f7ngd16nv85v8549231yvf99n60x"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "3.1.26"; sha256 = "0pbm6hpibsvq5w8hyvvllz4qns287x3l8bc07krffv23yfbv8zwy"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "3.1.26"; sha256 = "1kiahv55qyqy7g772m0v731yb5jfpqxqb0wlyp5wa0jppkhdnqxc"; }) (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "1.0.0"; sha256 = "00dx5armvkqjxvkldz3invdlck9nj7w21dlsr2aqp1rqbyrbsbbh"; }) (fetchNuGet { pname = "Microsoft.Extensions.FileSystemGlobbing"; version = "3.1.8"; sha256 = "1v2lr0vbssqayzgxvdwb54jmvz7mvlih4l9h7i71gm3c62nlbq8y"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "3.1.21"; sha256 = "1s5g9gk0hvs268q2zpc32m0my2m2ivlmsmza86797a9vkxr6pzw6"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "3.1.21"; sha256 = "0dl4yakfmdkx6xr18f09cdnl11b4fyp23jg3msr8a25zqdqvcr29"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "3.1.21"; sha256 = "1l5wh5c9bgnzph07cd72q08mr87lsczwl0vy0rzrsi7xpzryvw7l"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "3.1.21"; sha256 = "13692wqcww0w6x4nhyxpxwprdg6mx9xmlvv38m6fvp6g0m27r43v"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "3.1.21"; sha256 = "1p7fpcmx4m2374zjfh53i3mv4lkr8xrkz5lnawv95s7j005m07pc"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "3.1.21"; sha256 = "02zgxzf8l607mh17900n7msga0yfcnqgd70rj1rlwj23plifykx1"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "3.1.21"; sha256 = "1gsrajdhlyndwb0s1c03cbm7wh1yfiwpk075nrlfvicbc4m7h347"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "3.1.26"; sha256 = "1vk4dr2z72nmjg2skqvy2m2h5brqp21v51pnd7ldpm7asgr5ck8n"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "3.1.26"; sha256 = "0l5yfnpbd36n38rjlmhsnq4bniq1fcssv4qh8kb9h3qigz40qxj9"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "3.1.26"; sha256 = "0z8g5jp18r0k4klw4jch17ps4f78vxaxkcmnmj8wrr7qdp81jy44"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "3.1.26"; sha256 = "1h9b8fwgwbycvn1ngxnpdz3s1zh59wi2iy8n4y2nfkmz2rbldrrm"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "3.1.26"; sha256 = "0y06qz4pgflwia222mljg19nlfmhcg0qs1a8wm3zwj602wzy3nll"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "3.1.26"; sha256 = "1half7rywhxb1x19gzddvjqbll4whx9wmwdlk57iy68djas95lmy"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "3.1.26"; sha256 = "09grar210h1r6af15ng418vx6ln3pi4x22vn5n2889xldf4x2n56"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.1"; sha256 = "164wycgng4mi9zqi2pnsf1pq6gccbqvw6ib916mqizgjmd8f44pj"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "3.0.0"; sha256 = "1bk8r4r3ihmi6322jmcag14jmw11mjqys202azqjzglcx59pxh51"; }) diff --git a/pkgs/development/libraries/libcef/default.nix b/pkgs/development/libraries/libcef/default.nix index bbc39a111b81..87471114a87b 100644 --- a/pkgs/development/libraries/libcef/default.nix +++ b/pkgs/development/libraries/libcef/default.nix @@ -112,6 +112,10 @@ stdenv.mkDerivation rec { description = "Simple framework for embedding Chromium-based browsers in other applications"; homepage = "https://cef-builds.spotifycdn.com/index.html"; maintainers = with maintainers; [ puffnfresh ]; + sourceProvenance = with sourceTypes; [ + fromSource + binaryNativeCode + ]; license = licenses.bsd3; platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" ]; }; diff --git a/pkgs/development/libraries/libfprint-2-tod1-goodix/default.nix b/pkgs/development/libraries/libfprint-2-tod1-goodix/default.nix index e4121bc9e908..eb7de9bbc09d 100644 --- a/pkgs/development/libraries/libfprint-2-tod1-goodix/default.nix +++ b/pkgs/development/libraries/libfprint-2-tod1-goodix/default.nix @@ -30,6 +30,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Goodix driver module for libfprint-2-tod Touch OEM Driver"; homepage = "https://git.launchpad.net/~oem-solutions-engineers/libfprint-2-tod1-goodix/+git/libfprint-2-tod1-goodix/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = platforms.linux; maintainers = with maintainers; [ grahamc ]; diff --git a/pkgs/development/libraries/ndi/default.nix b/pkgs/development/libraries/ndi/default.nix index 90032f774bbc..7ea64aa3f134 100644 --- a/pkgs/development/libraries/ndi/default.nix +++ b/pkgs/development/libraries/ndi/default.nix @@ -56,6 +56,7 @@ stdenv.mkDerivation rec { description = "NDI Software Developer Kit"; platforms = ["x86_64-linux"]; hydraPlatforms = []; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; }; } diff --git a/pkgs/development/libraries/science/math/cudnn/generic.nix b/pkgs/development/libraries/science/math/cudnn/generic.nix index 1e9bac5efed2..731b5588f887 100644 --- a/pkgs/development/libraries/science/math/cudnn/generic.nix +++ b/pkgs/development/libraries/science/math/cudnn/generic.nix @@ -107,6 +107,7 @@ stdenv.mkDerivation { broken = !(elem cudaVersion supportedCudaVersions); description = "NVIDIA CUDA Deep Neural Network library (cuDNN)"; homepage = "https://developer.nvidia.com/cudnn"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; # TODO: consider marking unfreRedistributable when not using runfile license = licenses.unfree; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/development/libraries/science/math/cutensor/generic.nix b/pkgs/development/libraries/science/math/cutensor/generic.nix index e7c5e0b298c0..e4cbf0ab7bf7 100644 --- a/pkgs/development/libraries/science/math/cutensor/generic.nix +++ b/pkgs/development/libraries/science/math/cutensor/generic.nix @@ -62,6 +62,7 @@ stdenv.mkDerivation { meta = with lib; { description = "cuTENSOR: A High-Performance CUDA Library For Tensor Primitives"; homepage = "https://developer.nvidia.com/cutensor"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ obsidian-systems-maintenance ]; diff --git a/pkgs/development/libraries/scmccid/default.nix b/pkgs/development/libraries/scmccid/default.nix index f6b9194a608c..daa861b31ea7 100644 --- a/pkgs/development/libraries/scmccid/default.nix +++ b/pkgs/development/libraries/scmccid/default.nix @@ -34,6 +34,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.scmmicro.com/support/pc-security-support/downloads.html"; description = "PCSC drivers for linux, for the SCM SCR3310 v2.0 card and others"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfree; maintainers = with lib.maintainers; [viric]; platforms = with lib.platforms; linux; diff --git a/pkgs/development/libraries/wtk/default.nix b/pkgs/development/libraries/wtk/default.nix index 94dea0edae1d..da856226d4e9 100644 --- a/pkgs/development/libraries/wtk/default.nix +++ b/pkgs/development/libraries/wtk/default.nix @@ -21,6 +21,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://java.sun.com/products/sjwtoolkit/download.html"; description = "Sun Java Wireless Toolkit 2.5.2_01 for CLDC"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfree; }; } diff --git a/pkgs/development/misc/msp430/mspds/binary.nix b/pkgs/development/misc/msp430/mspds/binary.nix index 967562580c67..5b64ec328ae6 100644 --- a/pkgs/development/misc/msp430/mspds/binary.nix +++ b/pkgs/development/misc/msp430/mspds/binary.nix @@ -29,6 +29,7 @@ in stdenv.mkDerivation rec { meta = { description = "Unfree binary release of the TI MSP430 FET debug driver"; homepage = "https://www.ti.com/tool/MSPDS"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ aerialx ]; diff --git a/pkgs/development/python-modules/hahomematic/default.nix b/pkgs/development/python-modules/hahomematic/default.nix index de6c8412005a..587931af03ec 100644 --- a/pkgs/development/python-modules/hahomematic/default.nix +++ b/pkgs/development/python-modules/hahomematic/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "hahomematic"; - version = "1.8.5"; + version = "1.9.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-hkfTFmiJAgVgbJ/0G61sq6k0+B5gCo7t51DCAESzGUQ="; + sha256 = "sha256-BmFJuugU6SsKxSB60O5dtODmgApClRT/AAzzTWAMXKI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 96eb2364d3f6..afd1bb4d7523 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -938,6 +938,22 @@ let ]; otherOverrides = old: new: { + gifski = old.gifski.overrideDerivation (attrs: { + cargoDeps = pkgs.rustPlatform.fetchCargoTarball { + src = attrs.src; + sourceRoot = "gifski/src/myrustlib"; + hash = "sha256-vBrTQ+5JZA8554Aasbqw7mbaOfJNQjrOpG00IXAcamI="; + }; + + cargoRoot = "src/myrustlib"; + + nativeBuildInputs = attrs.nativeBuildInputs ++ [ + pkgs.rustPlatform.cargoSetupHook + pkgs.cargo + pkgs.rustc + ]; + }); + stringi = old.stringi.overrideDerivation (attrs: { postInstall = let icuName = "icudt52l"; diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index 5886c9750d18..25a7778b7602 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -32,14 +32,14 @@ with py.pkgs; buildPythonApplication rec { pname = "checkov"; - version = "2.0.1218"; + version = "2.0.1223"; format = "setuptools"; src = fetchFromGitHub { owner = "bridgecrewio"; repo = pname; rev = version; - hash = "sha256-nSW8t1N2qK35SUgxT3VtPxnCj1gaPEA6FWq6tSB0cgk="; + hash = "sha256-/5HJucSOQyfX0Og3fCGhuegye79huw4LPlNkzgCO+qM="; }; nativeBuildInputs = with py.pkgs; [ diff --git a/pkgs/development/tools/gosca/default.nix b/pkgs/development/tools/gosca/default.nix new file mode 100644 index 000000000000..18459ec94322 --- /dev/null +++ b/pkgs/development/tools/gosca/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, gosca +, testers +}: + +buildGoModule rec { + pname = "gosca"; + version = "0.4.2"; + + src = fetchFromGitHub { + owner = "TARI0510"; + repo = pname; + rev = "v${version}"; + hash = "sha256-mjQSYkcLl9X3IPv0liX26hvystsQOSVXvovKp4VekAY="; + }; + + vendorSha256 = "sha256-0EqMW4aNYPZEuk+mxmLTuenGdam56YneEad8lodVeBo="; + + passthru.tests.version = testers.testVersion { + package = gosca; + command = "gosca -v"; + version = "GoSCA_v${version}"; + }; + + meta = with lib; { + description = "Golang dependence security checker"; + homepage = "https://github.com/TARI0510/gosca"; + changelog = "https://github.com/TARI0510/gosca/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/tools/rgp/default.nix b/pkgs/development/tools/rgp/default.nix index 30c6dee23bfb..4df82444ecb8 100644 --- a/pkgs/development/tools/rgp/default.nix +++ b/pkgs/development/tools/rgp/default.nix @@ -69,6 +69,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A tool from AMD that allows for deep inspection of GPU workloads"; homepage = "https://gpuopen.com/rgp/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ Flakebi ]; diff --git a/pkgs/development/tools/sauce-connect/default.nix b/pkgs/development/tools/sauce-connect/default.nix index 64517d865cdf..ab75664f5a4b 100644 --- a/pkgs/development/tools/sauce-connect/default.nix +++ b/pkgs/development/tools/sauce-connect/default.nix @@ -37,6 +37,7 @@ stdenv.mkDerivation rec { meta = { description = "A secure tunneling app for executing tests securely when testing behind firewalls"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; homepage = "https://docs.saucelabs.com/reference/sauce-connect/"; maintainers = with maintainers; [offline]; diff --git a/pkgs/development/tools/selenium/chromedriver/default.nix b/pkgs/development/tools/selenium/chromedriver/default.nix index 66a73b1c1e98..2ce075272ebb 100644 --- a/pkgs/development/tools/selenium/chromedriver/default.nix +++ b/pkgs/development/tools/selenium/chromedriver/default.nix @@ -67,6 +67,7 @@ in stdenv.mkDerivation rec { input, JavaScript execution, and more. ChromeDriver is a standalone server that implements the W3C WebDriver standard. ''; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.bsd3; maintainers = with maintainers; [ goibhniu marsam primeos ]; # Note from primeos: By updating Chromium I also update Google Chrome and diff --git a/pkgs/development/web/insomnia/default.nix b/pkgs/development/web/insomnia/default.nix index c93be3155ac1..4aaae2701451 100644 --- a/pkgs/development/web/insomnia/default.nix +++ b/pkgs/development/web/insomnia/default.nix @@ -87,6 +87,7 @@ in stdenv.mkDerivation rec { meta = with lib; { homepage = "https://insomnia.rest/"; description = "The most intuitive cross-platform REST API Client"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = licenses.mit; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ markus1189 babariviere ]; diff --git a/pkgs/tools/admin/trivy/default.nix b/pkgs/tools/admin/trivy/default.nix index af8ceece0e78..7488ad331bcb 100644 --- a/pkgs/tools/admin/trivy/default.nix +++ b/pkgs/tools/admin/trivy/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "trivy"; - version = "0.29.0"; + version = "0.29.1"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "sha256-iGUBqO2BMJF6cySmIMXNY6mjdmaPnOV372AJL0Mr+yU="; + sha256 = "sha256-L1MjPgypKWVTdR16grloRY1JoJ6giXqihsWFa8yWXd0="; }; vendorSha256 = "sha256-wM8OOOVw8Pb37/JMpz0AWbpJyHeDBQ0+DO15AiDduUU="; diff --git a/pkgs/tools/networking/dnsmonster/default.nix b/pkgs/tools/networking/dnsmonster/default.nix new file mode 100644 index 000000000000..e222ae9a407c --- /dev/null +++ b/pkgs/tools/networking/dnsmonster/default.nix @@ -0,0 +1,39 @@ +{ lib +, stdenv +, buildGoModule +, fetchFromGitHub +, libpcap +}: + +buildGoModule rec { + pname = "dnsmonster"; + version = "0.9.3"; + + src = fetchFromGitHub { + owner = "mosajjal"; + repo = pname; + rev = "v${version}"; + hash = "sha256-1tYC76g3GOqMaosAYYXOrOKTdW7muPTaeeLzGUsjogE="; + }; + + vendorSha256 = "sha256-2gWifzBjAx+c/if6ZZQ/s73oPPTY9eJfHYL4F/058h0="; + + buildInputs = [ + libpcap + ]; + + ldflags = [ + "-s" + "-w" + "-X github.com/mosajjal/dnsmonster/util.releaseVersion=${version}" + ]; + + meta = with lib; { + description = "Passive DNS Capture and Monitoring Toolkit"; + homepage = "https://github.com/mosajjal/dnsmonster"; + changelog = "https://github.com/mosajjal/dnsmonster/releases/tag/v${version}"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ fab ]; + broken = stdenv.isDarwin; + }; +} diff --git a/pkgs/tools/text/sad/default.nix b/pkgs/tools/text/sad/default.nix index 8ddf15041f32..08665e22d9ec 100644 --- a/pkgs/tools/text/sad/default.nix +++ b/pkgs/tools/text/sad/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "sad"; - version = "0.4.21"; + version = "0.4.22"; src = fetchFromGitHub { owner = "ms-jpq"; repo = pname; rev = "v${version}"; - sha256 = "sha256-kM5jeoFmDOwgnzdSwfPJfZhpBS8RPMNt143S5iYYrF4="; + sha256 = "sha256-v1fXEC+bV561cewH17x+1anhfXstGBOHG5rHvhYIvLo="; }; - cargoSha256 = "sha256-JwYUM4o4I3dC1HgG4bkUS1PH4MsxcvwdefjefnEZQFs="; + cargoSha256 = "sha256-krQTa9R3hmMVKLoBgnbCw+aSQu9HUXfA3XflB8AZv6w="; meta = with lib; { description = "CLI tool to search and replace"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b52f7432369c..6809b9547810 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2487,6 +2487,8 @@ with pkgs; gopass-summon-provider = callPackage ../tools/security/gopass/summon.nix { }; + gosca = callPackage ../development/tools/gosca { }; + gosh = callPackage ../tools/security/gosh { }; gospider = callPackage ../tools/security/gospider { }; @@ -5242,7 +5244,9 @@ with pkgs; dnscrypt-wrapper = callPackage ../tools/networking/dnscrypt-wrapper { }; - dnscontrol = callPackage ../applications/networking/dnscontrol { }; + dnscontrol = callPackage ../applications/networking/dnscontrol { + buildGoModule = buildGo118Module; + }; dnsenum = callPackage ../tools/security/dnsenum { }; @@ -5250,6 +5254,8 @@ with pkgs; dnsmon-go = callPackage ../tools/networking/dnsmon-go { }; + dnsmonster = callPackage ../tools/networking/dnsmonster { }; + dnspeep = callPackage ../tools/security/dnspeep { }; dnsproxy = callPackage ../tools/networking/dnsproxy { }; @@ -8759,13 +8765,9 @@ with pkgs; # https://github.com/hashicorp/nomad/blob/master/contributing/golang.md nomad_1_2 = callPackage ../applications/networking/cluster/nomad/1.2.nix { buildGoModule = buildGo117Module; - inherit (linuxPackages) nvidia_x11; - nvidiaGpuSupport = config.cudaSupport or false; }; nomad_1_3 = callPackage ../applications/networking/cluster/nomad/1.3.nix { buildGoModule = buildGo117Module; - inherit (linuxPackages) nvidia_x11; - nvidiaGpuSupport = config.cudaSupport or false; }; nomad-autoscaler = callPackage ../applications/networking/cluster/nomad-autoscaler { }; |