From 91706b67afb5cc527ea56526400e20183374a84c Mon Sep 17 00:00:00 2001 From: makefu Date: Sat, 15 Jul 2017 22:35:34 +0200 Subject: ma: deploy musnix via new source.nix --- makefu/1systems/studio/source.nix | 4 ++++ makefu/1systems/x/config.nix | 3 --- makefu/2configs/audio/realtime-audio.nix | 1 - makefu/2configs/sources/default.nix | 7 ------- makefu/2configs/sources/musnix.nix | 6 ------ 5 files changed, 4 insertions(+), 17 deletions(-) delete mode 100644 makefu/2configs/sources/default.nix delete mode 100644 makefu/2configs/sources/musnix.nix diff --git a/makefu/1systems/studio/source.nix b/makefu/1systems/studio/source.nix index f5a7e19c4..092330a50 100644 --- a/makefu/1systems/studio/source.nix +++ b/makefu/1systems/studio/source.nix @@ -1,3 +1,7 @@ import { name="studio"; + override.musnix.git = { + url = https://github.com/musnix/musnix.git; + ref = "f0ec1f3"; + }; } diff --git a/makefu/1systems/x/config.nix b/makefu/1systems/x/config.nix index b84394cd2..2dd232193 100644 --- a/makefu/1systems/x/config.nix +++ b/makefu/1systems/x/config.nix @@ -26,9 +26,6 @@ with import ; # # - # development - - # Krebs diff --git a/makefu/2configs/audio/realtime-audio.nix b/makefu/2configs/audio/realtime-audio.nix index 6cb18c45c..8c392dbb6 100644 --- a/makefu/2configs/audio/realtime-audio.nix +++ b/makefu/2configs/audio/realtime-audio.nix @@ -4,7 +4,6 @@ let in { imports = [ - ../sources/musnix.nix # populate musnix ]; musnix.enable = true; diff --git a/makefu/2configs/sources/default.nix b/makefu/2configs/sources/default.nix deleted file mode 100644 index 232117aec..000000000 --- a/makefu/2configs/sources/default.nix +++ /dev/null @@ -1,7 +0,0 @@ -# the builder pc (my laptop) will also require the sources i use to deploy -# other boxes -{ - imports = [ - ./musnix.nix - ]; -} diff --git a/makefu/2configs/sources/musnix.nix b/makefu/2configs/sources/musnix.nix deleted file mode 100644 index a5be303e9..000000000 --- a/makefu/2configs/sources/musnix.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ - krebs.build.source.musnix.git = { - url = https://github.com/musnix/musnix.git; - ref = "f0ec1f3"; - }; -} -- cgit v1.2.3