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

Merge branch 'released' into patch-1

Browse source
This commit is contained in:
Graham Christensen 2018-10-31 11:55:20 +01:00 committed by GitHub
parent 346649f490 b5f95f4650
commit 74bd9f766c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,11 +1,14 @@
[
"aanderse",
"akru",
"alyssais",
"arianvp",
"bbarker",
"bhipple",
"bignaux",
"brainrape",
"costrouc",
"danieldk",
"dywedir",
"edef1c",
"Ekleog",
@ -16,6 +19,7 @@
"eqyiel",
"fgaz",
"florianjacob",
"geistesk",
"grwlf",
"imalsogreg",
"jlesquembre",
@ -42,5 +46,6 @@
"woffs",
"worldofpeace",
"xeji",
"yesbox",
"yurrriq"
]

11
shell.nix
View file

@ -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