From 1b132d2821ef778676518dbfcff98e807c997945 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Sun, 21 Jun 2015 17:12:55 +0200
Subject: Version bump in trivmix

---
 bragi.nix           | 14 ++++++++++++--
 custom/filelock.nix | 15 +++++++++++++++
 custom/trivmix.nix  |  2 +-
 trivmix             |  2 +-
 4 files changed, 29 insertions(+), 4 deletions(-)
 create mode 100644 custom/filelock.nix

diff --git a/bragi.nix b/bragi.nix
index 7fe311d9..da80adb1 100644
--- a/bragi.nix
+++ b/bragi.nix
@@ -23,8 +23,18 @@
   nixpkgs.config.packageOverrides = pkgs:
     let
       trivmixService = opts: (pkgs.callPackage ./custom/trivmix-service.nix opts).out;
-    in {
-      trivmix = let trivmix = pkgs.haskellPackages.callPackage ./custom/trivmix.nix {}; in
+    in rec {
+      customizedHaskellPackages = pkgs.recurseIntoAttrs (
+        pkgs.haskellPackages.override {
+          extensios = self: super: let
+            callPackage = pkgs.lib.callPackageWith self;
+          in {
+            trivmix = callPackage ./custom/trivmix.nix {};
+            filelock = callPackage ./custom/filelock.nix {};
+          };
+        };
+      );
+      trivmix = let trivmix = customizedHaskellPackages.trivmix; in
         pkgs.stdenv.mkDerivation {
           name = "trivmix-wrapper";
           nativeBuildInputs = [ pkgs.makeWrapper ];
diff --git a/custom/filelock.nix b/custom/filelock.nix
new file mode 100644
index 00000000..d19d3b9c
--- /dev/null
+++ b/custom/filelock.nix
@@ -0,0 +1,15 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal }:
+
+cabal.mkDerivation (self: {
+  pname = "filelock";
+  version = "0.1.0.1";
+  sha256 = "0qypjnbkfayqyaymx8qrq4abddlrlzanf6lqhfn9cqzcgzr6735d";
+  meta = {
+    homepage = "http://github.com/takano-akio/filelock";
+    description = "Portable interface to file locking (flock / LockFileEx)";
+    license = self.stdenv.lib.licenses.publicDomain;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/custom/trivmix.nix b/custom/trivmix.nix
index c968101a..4dedc26c 120000
--- a/custom/trivmix.nix
+++ b/custom/trivmix.nix
@@ -1 +1 @@
-../trivmix/trivmix.nix
\ No newline at end of file
+../trivmix/package.nix
\ No newline at end of file
diff --git a/trivmix b/trivmix
index 42c671b4..415f3cd9 160000
--- a/trivmix
+++ b/trivmix
@@ -1 +1 @@
-Subproject commit 42c671b4a48dd1431ab43c1f842af33e2fe5cbe9
+Subproject commit 415f3cd98436807242e082b9c11dd89115e01f78
-- 
cgit v1.2.3