Fix build

8 files changed, 32 insertions, 23 deletions

diff --git a/.gitignore b/.gitignore
index e2f5dd2..ec8ef8d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
-result
\ No newline at end of file
+result
+**/.gup
diff --git a/adjmix/Adjmix.hs b/adjmix/Adjmix.hs
index 0545395..c2f7fee 100644
--- a/adjmix/Adjmix.hs
+++ b/adjmix/Adjmix.hs
@@ -6,6 +6,7 @@ import System.FilePath
 import System.FileLock
 
 import Data.Char
+import Data.Monoid
 
 import Trivmix.Types
 
diff --git a/all.gup b/all.gup
new file mode 100644
index 0000000..c83d29c
--- /dev/null
+++ b/all.gup
@@ -0,0 +1,3 @@
+#!/usr/bin/env zsh
+
+gup -u result
\ No newline at end of file
diff --git a/default.nix b/default.nix
index 804e871..57608b3 100644
--- a/default.nix
+++ b/default.nix
@@ -1,7 +1,6 @@
+argumentPackages@{ ... }:
+
 let
-  pkgs = import <nixpkgs> {};
-in rec {
-  trivmix = pkgs.stdenv.lib.overrideDerivation (pkgs.haskellPackages.callPackage ./trivmix.nix {}) (attrs : {
-          src = ./.;
-        });
-}
+  defaultPackages = with (import <nixpkgs> {}); haskellPackages;
+  pkgs = defaultPackages // argumentPackages;
+in pkgs.callPackage ./trivmix.nix {}
diff --git a/package.nix b/package.nix
deleted file mode 100644
index 37cc9e2..0000000
--- a/package.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ fetchgit
-, stdenv
-, callPackage
-}:
-
-stdenv.lib.overrideDerivation (callPackage ./trivmix.nix {}) (attrs : {
-  src = fetchgit {
-    url = git://git.yggdrasil.li/trivmix;
-    # nix-shell -p nix-prefetch-scripts --command 'nix-prefetch-git git://git.yggdrasil.li/beuteltier' 2>&1 | grep -E '(git revision|hash) is ' | sed -r 's/git revision is /rev = "/' | sed -r 's/hash is /sha256 = "/' | sed -r 's/$/";/'
-    rev = "304e7615ddee7a8b1d8f7d7690c8da57f8a2704e";
-    sha256 = "1hz8zxqsv1700jn7siysm7prfjjx2a4cn1ip4kcrigckvjw6a67r";
-  };
-})
diff --git a/result.gup b/result.gup
new file mode 100644
index 0000000..86b28dd
--- /dev/null
+++ b/result.gup
@@ -0,0 +1,8 @@
+#!/usr/bin/env zsh
+
+gup --always
+gup -u trivmix.nix default.nix
+
+nix-build -o ${1} ./default.nix
+
+find . \( \( -name '.gup' -or -name '.git' \) -prune \) -or \( -type f -exec shasum '{}' ';' \) | gup --contents
diff --git a/trivmix.nix.gup b/trivmix.nix.gup
new file mode 100644
index 0000000..bc92dcd
--- /dev/null
+++ b/trivmix.nix.gup
@@ -0,0 +1,5 @@
+#!/usr/bin/env zsh
+
+gup -u ${2:r}.cabal
+cd ${2:h}
+cabal2nix ./. >! ${1}
diff --git a/trivmix/Trivmix.hs b/trivmix/Trivmix.hs
index b437abc..a13460f 100644
--- a/trivmix/Trivmix.hs
+++ b/trivmix/Trivmix.hs
@@ -30,6 +30,7 @@ import System.IO
 import System.FileLock
 import System.INotify
 
+import Data.Monoid
 import Data.Char
 import Data.Function
 
@@ -41,6 +42,7 @@ data Options = Options
                { input :: String
                , output :: String
                , client :: String
+               , initialLevel :: Level
                , run :: Maybe String
                , levelFiles :: [FilePath]
                }
@@ -63,6 +65,12 @@ optionParser = Options
                                <> metavar "STRING"
                                <> help "Client name to use in jack (the part before the colon in port names)"
                              )
+               <*> option auto ( long "level"
+                               <> metavar "LEVEL"
+                               <> help "Initial value for level"
+                               <> value def
+                               <> showDefault
+                               )
                <*> optional ( strOption ( long "run"
                                           <> metavar "FILE"
                                           <> help "Execute a file once setup of jacks is done (use this to autoconnect)\nThe executable gets passed the input port (including client name) as its first argument and the output as its second."
@@ -84,9 +92,6 @@ watchedAttrs = [ Modify
                , DeleteSelf
                ]
 
-initialLevel :: Level
-initialLevel = def
-
 defFileMode :: FileMode
 defFileMode = foldl unionFileModes nullFileMode [ ownerReadMode
                                                 , ownerWriteMode