From ccf050218c8c93d0753f2d899fe8cb026271c71d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Tue, 23 Oct 2018 11:57:41 +0200 Subject: [PATCH 1/6] Add danieldk to extra-known-users --- config.extra-known-users.json | 1 + 1 file changed, 1 insertion(+) diff --git a/config.extra-known-users.json b/config.extra-known-users.json index 880523a..00bc947 100644 --- a/config.extra-known-users.json +++ b/config.extra-known-users.json @@ -5,6 +5,7 @@ "bignaux", "brainrape", "costrouc", + "danieldk", "dywedir", "edef1c", "Ekleog", From ca394e80b1dd0e4c24a0708c3de8e4f839627165 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Wed, 24 Oct 2018 08:05:19 +0200 Subject: [PATCH 2/6] make glibcLocales linux only On darwin this isn't needed and is null, causing an evaluation error. --- shell.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/shell.nix b/shell.nix index cf33fed..1c1e486 100644 --- a/shell.nix +++ b/shell.nix @@ -31,7 +31,7 @@ let # HISTFILE = "${src}/.bash_hist"; }; - rustEnv = stdenv.mkDerivation rec { + rustEnv = stdenv.mkDerivation (rec { name = "gh-event-forwarder"; buildInputs = with pkgs; [ bash @@ -55,12 +55,13 @@ let HISTFILE = "${toString ./.}/.bash_hist"; RUSTFLAGS = "-D warnings"; - LOCALE_ARCHIVE_2_21 = "${oldpkgs.glibcLocales}/lib/locale/locale-archive"; - LOCALE_ARCHIVE_2_27 = "${pkgs.glibcLocales}/lib/locale/locale-archive"; RUST_BACKTRACE = "1"; RUST_LOG = "ofborg=debug"; passthru.phpEnv = phpEnv; - }; - + } + // stdenv.lib.optionalAttrs stdenv.isLinux { + LOCALE_ARCHIVE_2_21 = "${oldpkgs.glibcLocales}/lib/locale/locale-archive"; + LOCALE_ARCHIVE_2_27 = "${pkgs.glibcLocales}/lib/locale/locale-archive"; + }); in rustEnv From d541d7da93286ba57ac7940d9969f521b36012c2 Mon Sep 17 00:00:00 2001 From: Brandon Elam Barker Date: Wed, 24 Oct 2018 14:25:10 -0400 Subject: [PATCH 3/6] Add bbarker to extra-known-users I'd like to be able to trigger builds in order to expedite the PR review process, see e.g. https://github.com/NixOS/nixpkgs/pull/48877 Thanks! --- config.extra-known-users.json | 1 + 1 file changed, 1 insertion(+) diff --git a/config.extra-known-users.json b/config.extra-known-users.json index 880523a..7b9d0ad 100644 --- a/config.extra-known-users.json +++ b/config.extra-known-users.json @@ -1,6 +1,7 @@ [ "akru", "alyssais", + "bbarker", "bhipple", "bignaux", "brainrape", From b8045dd569c5e9e9f32f78491dc8225f66ca3964 Mon Sep 17 00:00:00 2001 From: geistesk Date: Sun, 28 Oct 2018 11:11:25 +0100 Subject: [PATCH 4/6] Add geistesk to extra-known-users --- config.extra-known-users.json | 1 + 1 file changed, 1 insertion(+) diff --git a/config.extra-known-users.json b/config.extra-known-users.json index 880523a..0146367 100644 --- a/config.extra-known-users.json +++ b/config.extra-known-users.json @@ -15,6 +15,7 @@ "eqyiel", "fgaz", "florianjacob", + "geistesk", "grwlf", "imalsogreg", "jlesquembre", From cd732cbeb2f12d75676e15b408eb54a244b2cfcb Mon Sep 17 00:00:00 2001 From: yesbox Date: Sun, 28 Oct 2018 12:48:13 +0100 Subject: [PATCH 5/6] extra-known-users addition --- config.extra-known-users.json | 1 + 1 file changed, 1 insertion(+) diff --git a/config.extra-known-users.json b/config.extra-known-users.json index 880523a..a1336ff 100644 --- a/config.extra-known-users.json +++ b/config.extra-known-users.json @@ -41,5 +41,6 @@ "woffs", "worldofpeace", "xeji", + "yesbox", "yurrriq" ] From e6819c4b3f03cdb50da443c21d16937ee18e88df Mon Sep 17 00:00:00 2001 From: aanderse Date: Sun, 28 Oct 2018 12:16:31 -0400 Subject: [PATCH 6/6] Add aanderse to extra-known-users.json --- config.extra-known-users.json | 1 + 1 file changed, 1 insertion(+) diff --git a/config.extra-known-users.json b/config.extra-known-users.json index 880523a..f1a5220 100644 --- a/config.extra-known-users.json +++ b/config.extra-known-users.json @@ -1,4 +1,5 @@ [ + "aanderse", "akru", "alyssais", "bhipple",