summaryrefslogtreecommitdiffstats
path: root/makefu
diff options
context:
space:
mode:
authorlassulus <lass@blue.r>2018-09-11 23:43:11 +0200
committerlassulus <lass@blue.r>2018-09-11 23:43:11 +0200
commit637d9fb880e44c244cc81e5e6c0967cfe295e205 (patch)
tree2e8f5bb6178d0eb151f1fcecf7aa3f2231a8ed7e /makefu
parenteed2c14ee748fa761b398355f8651bb1653450c2 (diff)
parentca2477ab3a4dbe392e8b9e6614540c4b089ade82 (diff)
Merge remote-tracking branch 'ni/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 b652241b..0de65cce 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 82a41886..c350fe72 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 = {