summaryrefslogtreecommitdiffstats
path: root/makefu
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2018-09-13 16:41:25 +0200
committermakefu <github@syntax-fehler.de>2018-09-13 16:41:25 +0200
commitb830d7476a8f19f968513a219d53c0e091d4a03f (patch)
tree261db8acf25fe0d372a2d8d49bf512425fc8ad2f /makefu
parentb658de054d724064a3531de2d4a53a7a28cdc6ac (diff)
parentd580af7fd9c210f584603aa32318761b4eb3a877 (diff)
Merge remote-tracking branch 'lass/master'
Diffstat (limited to 'makefu')
-rw-r--r--makefu/2configs/tools/dev.nix1
-rw-r--r--makefu/source.nix2
2 files changed, 1 insertions, 2 deletions
diff --git a/makefu/2configs/tools/dev.nix b/makefu/2configs/tools/dev.nix
index b652241bd..0de65cceb 100644
--- a/makefu/2configs/tools/dev.nix
+++ b/makefu/2configs/tools/dev.nix
@@ -20,7 +20,6 @@
brain
gen-oath-safe
cdrtools
- stockholm
# nix related
nix-repl
nix-index
diff --git a/makefu/source.nix b/makefu/source.nix
index 82a41886b..c350fe72c 100644
--- a/makefu/source.nix
+++ b/makefu/source.nix
@@ -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 = {