Merge remote-tracking branch 'lass/master'

This commit is contained in:
makefu 2018-09-13 16:41:25 +02:00
commit de3ad13baf
2 changed files with 1 additions and 2 deletions

View file

@ -20,7 +20,6 @@
brain
gen-oath-safe
cdrtools
stockholm
# nix related
nix-repl
nix-index

View file

@ -57,7 +57,7 @@ in
stockholm.file = toString <stockholm>;
stockholm-version.pipe = "${pkgs.stockholm}/bin/get-version";
stockholm-version.pipe = "${pkgs.coreutils}/bin/echo derp";
}
(mkIf ( musnix ) {
musnix.git = {