diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-04-09 18:28:16 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-04-12 18:46:15 +0000 |
| commit | fd2e737e0678ee7d8081baef05b305146a2c0034 (patch) | |
| tree | ac3e9b27576a0382335532d126f9a66d486bc638 /overlays | |
| parent | cc207d720b6aa836e256c1ee9842bc739e630a8a (diff) | |
| parent | 9e377a6ce42dccd9b624ae4ce8f978dc892ba0e2 (diff) | |
| download | nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.tar nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.tar.gz nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.tar.bz2 nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.tar.lz nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.tar.xz nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.tar.zst nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.zip | |
Merge remote-tracking branch 'nixpkgs/nixos-unstable'
Diffstat (limited to 'overlays')
| -rw-r--r-- | overlays/patches/gh/Support-reading-auth-token-from-file-descriptor.patch | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/overlays/patches/gh/Support-reading-auth-token-from-file-descriptor.patch b/overlays/patches/gh/Support-reading-auth-token-from-file-descriptor.patch index 36544ed7fdb3..0e82646855bd 100644 --- a/overlays/patches/gh/Support-reading-auth-token-from-file-descriptor.patch +++ b/overlays/patches/gh/Support-reading-auth-token-from-file-descriptor.patch @@ -1,4 +1,4 @@ -From 195e1f1f08e2aa92bcdbfba5848d732a2147ccd1 Mon Sep 17 00:00:00 2001 +From 26fb22ee6b075aacf849c128f54fad07a3b45316 Mon Sep 17 00:00:00 2001 From: Alyssa Ross <hi@alyssa.is> Date: Mon, 29 Mar 2021 14:12:17 +0000 Subject: [PATCH] Support reading auth token from file descriptor @@ -14,10 +14,10 @@ This is a quick hack: 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/internal/config/from_env.go b/internal/config/from_env.go -index 7b2853bd..4d4734e1 100644 +index 97a5e5b4..f2e758bc 100644 --- a/internal/config/from_env.go +++ b/internal/config/from_env.go -@@ -2,12 +2,15 @@ package config +@@ -2,13 +2,16 @@ package config import ( "fmt" @@ -29,11 +29,12 @@ index 7b2853bd..4d4734e1 100644 ) const ( + GH_HOST = "GH_HOST" + GH_TOKEN_FD = "GH_TOKEN_FD" GH_TOKEN = "GH_TOKEN" GITHUB_TOKEN = "GITHUB_TOKEN" GH_ENTERPRISE_TOKEN = "GH_ENTERPRISE_TOKEN" -@@ -71,7 +74,27 @@ func (c *envConfig) CheckWriteable(hostname, key string) error { +@@ -84,7 +87,27 @@ func (c *envConfig) CheckWriteable(hostname, key string) error { return c.Config.CheckWriteable(hostname, key) } @@ -61,7 +62,7 @@ index 7b2853bd..4d4734e1 100644 if ghinstance.IsEnterprise(hostname) { if token := os.Getenv(GH_ENTERPRISE_TOKEN); token != "" { return token, GH_ENTERPRISE_TOKEN -@@ -88,7 +111,8 @@ func AuthTokenFromEnv(hostname string) (string, string) { +@@ -101,7 +124,8 @@ func AuthTokenFromEnv(hostname string) (string, string) { } func AuthTokenProvidedFromEnv() bool { |