summaryrefslogtreecommitdiff
path: root/bragi.nix
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 /bragi.nix
parent6e52329462db4d76d5bc028412d932f73e56ed9d (diff)
downloadnixos-1b132d2821ef778676518dbfcff98e807c997945.tar
nixos-1b132d2821ef778676518dbfcff98e807c997945.tar.gz
nixos-1b132d2821ef778676518dbfcff98e807c997945.tar.bz2
nixos-1b132d2821ef778676518dbfcff98e807c997945.tar.xz
nixos-1b132d2821ef778676518dbfcff98e807c997945.zip
Version bump in trivmix
Diffstat (limited to 'bragi.nix')
-rw-r--r--bragi.nix14
1 files changed, 12 insertions, 2 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 ];