the-distro/ofborg
2
0
Fork 1
Code Issues 1 Pull requests 1 Packages Projects Releases Wiki Activity

Merge branch 'released' into released

Browse source
This commit is contained in:
Graham Christensen 2018-10-31 11:56:31 +01:00 committed by GitHub
parent a7bafa58cf 6a11392bcb
commit c6f4b44888
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
config.extra-known-users.json
View file

@ -1,10 +1,14 @@
[ [
"aanderse",
"akru", "akru",
"alyssais", "alyssais",
"arianvp",
"bbarker",
"bhipple", "bhipple",
"bignaux", "bignaux",
"brainrape", "brainrape",
"costrouc", "costrouc",
"danieldk",
"edef1c", "edef1c",
"Ekleog", "Ekleog",
"Enzime", "Enzime",
@ -14,6 +18,7 @@
"eqyiel", "eqyiel",
"fgaz", "fgaz",
"florianjacob", "florianjacob",
"geistesk",
"grwlf", "grwlf",
"imalsogreg", "imalsogreg",
"jlesquembre", "jlesquembre",
@ -38,5 +43,6 @@
"woffs", "woffs",
"worldofpeace", "worldofpeace",
"xeji", "xeji",
"yesbox",
"yurrriq" "yurrriq"
] ]

11
shell.nix
View file

@ -31,7 +31,7 @@ let
# HISTFILE = "${src}/.bash_hist"; # HISTFILE = "${src}/.bash_hist";
}; };
rustEnv = stdenv.mkDerivation rec { rustEnv = stdenv.mkDerivation (rec {
name = "gh-event-forwarder"; name = "gh-event-forwarder";
buildInputs = with pkgs; [ buildInputs = with pkgs; [
bash bash
@ -55,12 +55,13 @@ let
HISTFILE = "${toString ./.}/.bash_hist"; HISTFILE = "${toString ./.}/.bash_hist";
RUSTFLAGS = "-D warnings"; 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_BACKTRACE = "1";
RUST_LOG = "ofborg=debug"; RUST_LOG = "ofborg=debug";
passthru.phpEnv = phpEnv; 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 in rustEnv