summaryrefslogtreecommitdiffstats
path: root/makefu/source.nix
diff options
context:
space:
mode:
authorlassulus <lassulus@lassul.us>2018-03-29 11:17:55 +0200
committerlassulus <lassulus@lassul.us>2018-03-29 11:17:55 +0200
commit1589a668023312ad6d0a24abb4caefe76ea95bac (patch)
tree5165721158e632af1b2a8081e0be52cae944f429 /makefu/source.nix
parent22f33b8e99cf9ffe575905370df736ddc3517338 (diff)
parent10bcf2db927692818a948c755fdfbf961a2ac3d7 (diff)
Merge remote-tracking branch 'gum/master' into staging/18.03
Diffstat (limited to 'makefu/source.nix')
-rw-r--r--makefu/source.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/makefu/source.nix b/makefu/source.nix
index 6b32a1b40..d25fe5528 100644
--- a/makefu/source.nix
+++ b/makefu/source.nix
@@ -21,9 +21,9 @@ let
];
};
# TODO: automate updating of this ref + cherry-picks
- ref = "6b6e72b"; # nixos-17.09 @ 2018-03-07
+ ref = "6583793"; # nixos-17.09 @ 2018-03-07
# + do_sqlite3 ruby: 55a952be5b5
- # + signal: 0f19beef3
+ # + signal: 0f19beef3, 50ad913, 9449782, b7046ab2
in
evalSource (toString _file) [