summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2017-11-03 08:28:53 +0100
committermakefu <github@syntax-fehler.de>2017-11-03 08:28:53 +0100
commit88c60e327ce72f5f1ff9f01df4c1fe12e4c972b1 (patch)
tree5cd4320e79ba455dbaf59c1bcdeabecf1a1ac69c
parent83333b77b2b46f28537449a0974e4c46878560fb (diff)
ma source: add nixpkgs cherry-picked fixes
-rw-r--r--source.nix7
1 files changed, 5 insertions, 2 deletions
diff --git a/source.nix b/source.nix
index 0e5bd1a93..9efdadf09 100644
--- a/source.nix
+++ b/source.nix
@@ -11,8 +11,11 @@ let
then "buildbot"
else "makefu";
_file = <stockholm> + "/makefu/1systems/${name}/source.nix";
- ref = "e4d07bd"; # unstable @ 2017-11-02
- # + ruby stuff (2f0b17e4be9,55a952be5b5)
+ ref = "a0f7ced"; # unstable @ 2017-11-02
+ # + ruby stuff: 2f0b17e4be9 55a952be5b5
+ # + jsbeautifier: c60bee3
+ # + mitmproxy fix: a0f7cedfae31
+ # + synergy fix: 5e6c76bc1
in
evalSource (toString _file) [