summaryrefslogtreecommitdiffstats
path: root/makefu/source.nix
diff options
context:
space:
mode:
authorlassulus <lassulus@lassul.us>2018-04-21 13:03:18 +0200
committerlassulus <lassulus@lassul.us>2018-04-21 13:03:18 +0200
commitd7320041b80fa7a429a65dab9ab6227e0c953da0 (patch)
tree5d10b2c16e667b90fa072da4d810d7f24d3c1ae6 /makefu/source.nix
parent92f7e3e12bdaee3265f583f72e43972269268b1e (diff)
parentee30fc920e0512d9d2359404051ba12efc3ee6f2 (diff)
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'makefu/source.nix')
-rw-r--r--makefu/source.nix7
1 files changed, 3 insertions, 4 deletions
diff --git a/makefu/source.nix b/makefu/source.nix
index d25fe5528..bcdb66a66 100644
--- a/makefu/source.nix
+++ b/makefu/source.nix
@@ -21,9 +21,8 @@ let
];
};
# TODO: automate updating of this ref + cherry-picks
- ref = "6583793"; # nixos-17.09 @ 2018-03-07
- # + do_sqlite3 ruby: 55a952be5b5
- # + signal: 0f19beef3, 50ad913, 9449782, b7046ab2
+ ref = "a09afbfb8a4"; # nixos-18.03 @ 2018-04-04
+ # + do_sqlite3 ruby: 55a952be5b5
in
evalSource (toString _file) [
@@ -54,7 +53,7 @@ in
(mkIf ( musnix ) {
musnix.git = {
url = https://github.com/musnix/musnix.git;
- ref = "d8b989f";
+ ref = "master"; # follow the musnix channel, lets see how this works out
};
})