summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregor Kleen <gkleen@yggdrasil.li>2015-06-21 17:12:55 +0200
committerGregor Kleen <gkleen@yggdrasil.li>2015-06-21 17:12:55 +0200
commit1b132d2821ef778676518dbfcff98e807c997945 (patch)
treee044053070648aebd7f045d4f6508e9ab6d0be88
parent6e52329462db4d76d5bc028412d932f73e56ed9d (diff)
downloadnixos-1b132d2821ef778676518dbfcff98e807c997945.tar
nixos-1b132d2821ef778676518dbfcff98e807c997945.tar.gz
nixos-1b132d2821ef778676518dbfcff98e807c997945.tar.bz2
nixos-1b132d2821ef778676518dbfcff98e807c997945.tar.xz
nixos-1b132d2821ef778676518dbfcff98e807c997945.zip
Version bump in trivmix
-rw-r--r--bragi.nix14
-rw-r--r--custom/filelock.nix15
l---------custom/trivmix.nix2
m---------trivmix0
4 files changed, 28 insertions, 3 deletions
diff --git a/bragi.nix b/bragi.nix
index 7fe311d9..da80adb1 100644
--- a/bragi.nix
+++ b/bragi.nix
@@ -23,8 +23,18 @@
23 nixpkgs.config.packageOverrides = pkgs: 23 nixpkgs.config.packageOverrides = pkgs:
24 let 24 let
25 trivmixService = opts: (pkgs.callPackage ./custom/trivmix-service.nix opts).out; 25 trivmixService = opts: (pkgs.callPackage ./custom/trivmix-service.nix opts).out;
26 in { 26 in rec {
27 trivmix = let trivmix = pkgs.haskellPackages.callPackage ./custom/trivmix.nix {}; in 27 customizedHaskellPackages = pkgs.recurseIntoAttrs (
28 pkgs.haskellPackages.override {
29 extensios = self: super: let
30 callPackage = pkgs.lib.callPackageWith self;
31 in {
32 trivmix = callPackage ./custom/trivmix.nix {};
33 filelock = callPackage ./custom/filelock.nix {};
34 };
35 };
36 );
37 trivmix = let trivmix = customizedHaskellPackages.trivmix; in
28 pkgs.stdenv.mkDerivation { 38 pkgs.stdenv.mkDerivation {
29 name = "trivmix-wrapper"; 39 name = "trivmix-wrapper";
30 nativeBuildInputs = [ pkgs.makeWrapper ]; 40 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 @@
1# This file was auto-generated by cabal2nix. Please do NOT edit manually!
2
3{ cabal }:
4
5cabal.mkDerivation (self: {
6 pname = "filelock";
7 version = "0.1.0.1";
8 sha256 = "0qypjnbkfayqyaymx8qrq4abddlrlzanf6lqhfn9cqzcgzr6735d";
9 meta = {
10 homepage = "http://github.com/takano-akio/filelock";
11 description = "Portable interface to file locking (flock / LockFileEx)";
12 license = self.stdenv.lib.licenses.publicDomain;
13 platforms = self.ghc.meta.platforms;
14 };
15})
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
Subproject 42c671b4a48dd1431ab43c1f842af33e2fe5cbe Subproject 415f3cd98436807242e082b9c11dd89115e01f7