4 files changed, 7 insertions, 71 deletions

diff --git a/package.yaml b/package.yaml
index 75b14dc..7f85434 100644
--- a/package.yaml
+++ b/package.yaml
@@ -7,6 +7,8 @@ category: Sound
 build-type: Simple
 git: https://git.yggdrasil.li/gkleen/pub/trivmix
 
+ghc-options: -threaded
+
 library:
   source-dirs: src
   exposed-modules: Trivmix.Types
diff --git a/trivmix.cabal b/trivmix.cabal
deleted file mode 100644
index 8cadc37..0000000
--- a/trivmix.cabal
+++ /dev/null
@@ -1,68 +0,0 @@
-name:           trivmix
-version:        4.0.1
-category:       Sound
-author:         Gregor Kleen <aethoago@141.li>
-license:        PublicDomain
-license-file:   LICENSE
-build-type:     Simple
-cabal-version:  >= 1.10
-
-source-repository head
-  type: git
-  location: https://git.yggdrasil.li/gkleen/pub/trivmix
-
-library
-  exposed-modules:
-      Trivmix.Types
-  other-modules:
-      Data.Scientific.Lift
-      Paths_trivmix
-  hs-source-dirs:
-      src
-  build-depends:
-      base >=4.8 && <5
-    , case-insensitive >=1.2 && <2
-    , data-default >=0.5 && <1
-    , refined >=0.1.2.1 && <1
-    , scientific >=0.3.5.3 && <1
-    , th-lift >=0.7.8 && <1
-  default-language: Haskell2010
-
-executable adjmix
-  main-is: Adjmix.hs
-  other-modules:
-      Paths_trivmix
-  hs-source-dirs:
-      adjmix
-  build-depends:
-      base >=4.8 && <5
-    , filelock >=0.1 && <1
-    , filepath >=1.3 && <2
-    , optparse-applicative >=0.11 && <1
-    , trivmix
-  default-language: Haskell2010
-
-executable trivmix
-  main-is: Trivmix.hs
-  other-modules:
-      Paths_trivmix
-  hs-source-dirs:
-      trivmix
-  build-depends:
-      base >=4.8 && <5
-    , directory >=1.2 && <2
-    , explicit-exception >=0.1 && <1
-    , filelock >=0.1 && <1
-    , filepath >=1.3 && <2
-    , heredoc >=0.2.0.0 && <1
-    , hinotify >=0.3 && <1
-    , jack >=0.7 && <1
-    , optparse-applicative >=0.11 && <1
-    , process >=1.2 && <2
-    , refined >=0.1.2.1 && <1
-    , scientific >=0.3.5.3 && <1
-    , systemd >=1.1.2 && <2
-    , transformers >=0.3 && <1
-    , trivmix
-    , unix >=2.7 && <3
-  default-language: Haskell2010
diff --git a/trivmix.nix b/trivmix.nix
index bd9c278..8ddce63 100644
--- a/trivmix.nix
+++ b/trivmix.nix
@@ -1,6 +1,6 @@
 { mkDerivation, base, case-insensitive, data-default, directory
-, explicit-exception, filelock, filepath, heredoc, hinotify, jack
-, optparse-applicative, process, refined, scientific, stdenv
+, explicit-exception, filelock, filepath, heredoc, hinotify, hpack
+, jack, optparse-applicative, process, refined, scientific, stdenv
 , systemd, th-lift, transformers, unix
 }:
 mkDerivation {
@@ -12,10 +12,12 @@ mkDerivation {
   libraryHaskellDepends = [
     base case-insensitive data-default refined scientific th-lift
   ];
+  libraryToolDepends = [ hpack ];
   executableHaskellDepends = [
     base directory explicit-exception filelock filepath heredoc
     hinotify jack optparse-applicative process refined scientific
     systemd transformers unix
   ];
+  preConfigure = "hpack";
   license = stdenv.lib.licenses.publicDomain;
 }
diff --git a/trivmix.nix.gup b/trivmix.nix.gup
index bc92dcd..2af68e4 100644
--- a/trivmix.nix.gup
+++ b/trivmix.nix.gup
@@ -1,5 +1,5 @@
 #!/usr/bin/env zsh
 
-gup -u ${2:r}.cabal
+gup -u package.yaml
 cd ${2:h}
 cabal2nix ./. >! ${1}