diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2020-04-13 18:50:35 +0200 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2020-04-13 18:50:35 +0200 |
commit | a04625379a9e842cb987197c4f273de1bea807b7 (patch) | |
tree | 1d7de56a82a7806d6560a17c1bbdf19f86136c97 /maintainers | |
parent | 1ab03c3a76dd142a44c27951018f145ff78fb57e (diff) | |
parent | 6f6d2124fc890c41c7aaf0bee50f386866d30c15 (diff) |
Merge branch 'master' into staging-next
Diffstat (limited to 'maintainers')
-rw-r--r-- | maintainers/maintainer-list.nix | 22 | ||||
-rwxr-xr-x | maintainers/scripts/update-discord | 36 |
2 files changed, 20 insertions, 38 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 1a4079300c8a..f2671657fd63 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4703,6 +4703,18 @@ githubId = 136037; name = "Matthew Maurer"; }; + maxdamantus = { + email = "maxdamantus@gmail.com"; + github = "Maxdamantus"; + githubId = 502805; + name = "Max Zerzouri"; + }; + maxeaubrey = { + email = "maxeaubrey@gmail.com"; + github = "maxeaubrey"; + githubId = 35892750; + name = "Maxine Aubrey"; + }; mbakke = { email = "mbakke@fastmail.com"; github = "mbakke"; @@ -5771,6 +5783,12 @@ githubId = 5515707; name = "Peter Romfeld"; }; + petersjt014 = { + email = "petersjt014@gmail.com"; + github = "petersjt014"; + githubId = 29493551; + name = "Josh Peters"; + }; peti = { email = "simons@cryp.to"; github = "peti"; @@ -7873,8 +7891,8 @@ githubId = 7953163; name = "Vika Shleina"; keys = [{ - longkeyid = "rsa4096/0x5402B9B5497BACDB"; - fingerprint = "A03C D09C 36CF D9F6 1ADF AF11 5402 B9B5 497B ACDB"; + longkeyid = "rsa2048/0x4F62CD07CE64796A"; + fingerprint = "B3C0 DA1A C18B 82E8 CA8B B1D1 4F62 CD07 CE64 796A"; }]; }; vinymeuh = { diff --git a/maintainers/scripts/update-discord b/maintainers/scripts/update-discord deleted file mode 100755 index b4c26b3bdefd..000000000000 --- a/maintainers/scripts/update-discord +++ /dev/null @@ -1,36 +0,0 @@ -#!/usr/bin/env bash -# script to generate `pkgs/networking/instant-messengers/discord/default.nix` - -set -e -exec >${1:?usage: $0 <output-file>} - -cat <<EOF -{ branch ? "stable", pkgs }: -# Generated by /maintainers/scripts/update-discord -let - inherit (pkgs) callPackage fetchurl; -in { -EOF - -for branch in "" ptb canary; do - url=$(curl -sI "https://discordapp.com/api/download${branch:+/}${branch}?platform=linux&format=tar.gz" | grep -oP 'location: \K\S+') - version=${url##https://dl*.discordapp.net/apps/linux/} - version=${version%%/*.tar.gz} - echo " ${branch:-stable} = callPackage ./base.nix rec {" - echo " pname = \"discord${branch:+-}${branch}\";" - case $branch in - "") suffix="" ;; - ptb) suffix="PTB" ;; - canary) suffix="Canary" ;; - esac - echo " binaryName = \"Discord${suffix}\";" - echo " desktopName = \"Discord${suffix:+ }${suffix}\";" - echo " version = \"${version}\";" - echo " src = fetchurl {" - echo " url = \"${url//${version}/\$\{version\}}\";" - echo " sha256 = \"$(nix-prefetch-url "$url")\";" - echo " };" - echo " };" -done - -echo "}.\${branch}" |