diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-11-11 18:00:58 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-11 18:00:58 +0000 |
| commit | 9776723357705dedeb933221c8f9b295d44813d7 (patch) | |
| tree | 15d5753e5cb6835221543be566b71f0a05dd9860 /maintainers | |
| parent | 940180423aaad6f43db3510e9418ced525613d51 (diff) | |
| parent | a4e452c906b13806fcea511ab58792d7748203b0 (diff) | |
| download | nixlib-9776723357705dedeb933221c8f9b295d44813d7.tar nixlib-9776723357705dedeb933221c8f9b295d44813d7.tar.gz nixlib-9776723357705dedeb933221c8f9b295d44813d7.tar.bz2 nixlib-9776723357705dedeb933221c8f9b295d44813d7.tar.lz nixlib-9776723357705dedeb933221c8f9b295d44813d7.tar.xz nixlib-9776723357705dedeb933221c8f9b295d44813d7.tar.zst nixlib-9776723357705dedeb933221c8f9b295d44813d7.zip | |
Merge master into staging-next
Diffstat (limited to 'maintainers')
| -rw-r--r-- | maintainers/maintainer-list.nix | 5 | ||||
| -rwxr-xr-x | maintainers/scripts/haskell/upload-nixos-package-list-to-hackage.sh | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 7c1d6d5ed9ee..ead9eb41d1d0 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -12478,6 +12478,11 @@ githubId = 6709831; name = "Jake Hill"; }; + nasageek = { + github = "NasaGeek"; + githubId = 474937; + name = "Chris Roberts"; + }; nasirhm = { email = "nasirhussainm14@gmail.com"; github = "nasirhm"; diff --git a/maintainers/scripts/haskell/upload-nixos-package-list-to-hackage.sh b/maintainers/scripts/haskell/upload-nixos-package-list-to-hackage.sh index 86fecbc3d87c..9130941a5366 100755 --- a/maintainers/scripts/haskell/upload-nixos-package-list-to-hackage.sh +++ b/maintainers/scripts/haskell/upload-nixos-package-list-to-hackage.sh @@ -39,5 +39,5 @@ fi package_list="$(nix-build -A haskell.package-list)/nixos-hackage-packages.csv" username=$(grep "^username:" "$CABAL_DIR/config" | sed "s/^username: //") password_command=$(grep "^password-command:" "$CABAL_DIR/config" | sed "s/^password-command: //") -curl -u "$username:$($password_command | head -n1)" --digest -H "Content-type: text/csv" -T "$package_list" http://hackage.haskell.org/distro/NixOS/packages.csv +curl -u "$username:$($password_command | head -n1)" --digest -H "Content-type: text/csv" -T "$package_list" https://hackage.haskell.org/distro/NixOS/packages.csv echo |