From 2ac98950dab9b1871cbe0541eabb7b3eaa656d73 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Sun, 6 Dec 2015 01:40:15 +0100 Subject: bumped to new haskellPackages --- trivmix.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/trivmix.nix b/trivmix.nix index 5fca173..3441455 100644 --- a/trivmix.nix +++ b/trivmix.nix @@ -1,7 +1,7 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ mkDerivation, stdenv, caseInsensitive, dataDefault, explicitException, filelock -, filepath, hinotify, jack, optparseApplicative, transformers +{ mkDerivation, stdenv, case-insensitive, data-default, explicit-exception, filelock +, filepath, hinotify, jack, optparse-applicative, transformers }: mkDerivation { @@ -11,8 +11,8 @@ mkDerivation { isLibrary = true; isExecutable = true; buildDepends = [ - caseInsensitive dataDefault explicitException filelock filepath - hinotify jack optparseApplicative transformers + caseInsensitive data-default explicit-exception filelock filepath + hinotify jack optparse-applicative transformers ]; license = stdenv.lib.licenses.publicDomain; } -- cgit v1.2.3 From 8b1cc0ea290ef4b870107e82a50a168a5af05e02 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Sun, 6 Dec 2015 01:45:25 +0100 Subject: Rev bump --- package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.nix b/package.nix index 07aaaa7..b6384b1 100644 --- a/package.nix +++ b/package.nix @@ -7,7 +7,7 @@ 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 = "3985236807ab90276d1a25b7dc80074a3fb378db"; - sha256 = "1a1819d86a821ec14e02b389fdbbccefc8bd50c228885bdc6fe6bebc186eb60b"; + rev = "2ac98950dab9b1871cbe0541eabb7b3eaa656d73"; + sha256 = "99a30c71204463bca9d6d74b9350079a6675bd0bedc2b32a5e80caa21079bf04"; }; }) -- cgit v1.2.3 From 6c3b75847db4b769820f62feebb626f9404a6c64 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Sun, 6 Dec 2015 01:48:03 +0100 Subject: typo --- trivmix.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/trivmix.nix b/trivmix.nix index 3441455..88f76cc 100644 --- a/trivmix.nix +++ b/trivmix.nix @@ -11,7 +11,7 @@ mkDerivation { isLibrary = true; isExecutable = true; buildDepends = [ - caseInsensitive data-default explicit-exception filelock filepath + case-insensitive data-default explicit-exception filelock filepath hinotify jack optparse-applicative transformers ]; license = stdenv.lib.licenses.publicDomain; -- cgit v1.2.3 From d30e060e91d84718a79b3c2bcf925ff249f5b68d Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Sun, 6 Dec 2015 01:49:29 +0100 Subject: rev bump --- package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.nix b/package.nix index b6384b1..5aec859 100644 --- a/package.nix +++ b/package.nix @@ -7,7 +7,7 @@ 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 = "2ac98950dab9b1871cbe0541eabb7b3eaa656d73"; - sha256 = "99a30c71204463bca9d6d74b9350079a6675bd0bedc2b32a5e80caa21079bf04"; + rev = "6c3b75847db4b769820f62feebb626f9404a6c64"; + sha256 = "935d533dc9378011d69f07f68cdd58c594bcaae3f237e737529d59664117929f"; }; }) -- cgit v1.2.3 From 97535354f19912d7663d2b2569df42f976e660a2 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Sun, 6 Dec 2015 02:41:52 +0100 Subject: Haskell bump --- trivmix.cabal | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/trivmix.cabal b/trivmix.cabal index 78ec056..49b14c2 100644 --- a/trivmix.cabal +++ b/trivmix.cabal @@ -27,7 +27,7 @@ executable trivmix main-is: Trivmix.hs -- other-modules: -- other-extensions: - build-depends: base >=4.7 && <4.8 + build-depends: base >=4.7 && <4.9 , jack >=0.7 && <1 , optparse-applicative >=0.11 && <1 , directory >=1.2 && <2 @@ -45,7 +45,7 @@ executable trivmix executable adjmix main-is: Adjmix.hs - build-depends: base >=4.7 && <4.8 + build-depends: base >=4.7 && <4.9 , optparse-applicative >=0.11 && <1 , filepath >=1.3 && <2 , filelock >=0.1 && <1 -- cgit v1.2.3 From 8c0ee03791ae6901e31b3b79cfe5a1279fb24396 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Sun, 6 Dec 2015 02:43:03 +0100 Subject: rev bump --- package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.nix b/package.nix index 5aec859..ff33a2b 100644 --- a/package.nix +++ b/package.nix @@ -7,7 +7,7 @@ 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 = "6c3b75847db4b769820f62feebb626f9404a6c64"; - sha256 = "935d533dc9378011d69f07f68cdd58c594bcaae3f237e737529d59664117929f"; + rev = "97535354f19912d7663d2b2569df42f976e660a2"; + sha256 = "ce12c99e5450c985fc0e2a330a3ce471f22ca746ba9a7a3c1c1eee820a4ee42a"; }; }) -- cgit v1.2.3 From 3e9a4410d19483aa9d77de40c71f4f0fd491a0bb Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Sun, 6 Dec 2015 02:45:00 +0100 Subject: ditto --- trivmix.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/trivmix.cabal b/trivmix.cabal index 49b14c2..30cb33f 100644 --- a/trivmix.cabal +++ b/trivmix.cabal @@ -19,7 +19,7 @@ library hs-source-dirs: src default-language: Haskell2010 exposed-modules: Trivmix.Types - build-depends: base >=4.7 && <4.8 + build-depends: base >=4.7 && <4.9 , data-default >=0.5 && <1 , case-insensitive >=1.2 && <2 -- cgit v1.2.3 From 782b5b37976fce5e10b4e7df96bcc19c48fff0bf Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Sun, 6 Dec 2015 02:45:32 +0100 Subject: rev bump --- package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.nix b/package.nix index ff33a2b..73e72e5 100644 --- a/package.nix +++ b/package.nix @@ -7,7 +7,7 @@ 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 = "97535354f19912d7663d2b2569df42f976e660a2"; - sha256 = "ce12c99e5450c985fc0e2a330a3ce471f22ca746ba9a7a3c1c1eee820a4ee42a"; + rev = "3e9a4410d19483aa9d77de40c71f4f0fd491a0bb"; + sha256 = "6d7dc29c9bb97e4c8f4e011a08d4176aa8743becf7748f5dbbc057016f467c4a"; }; }) -- cgit v1.2.3 From 00ccb93caaebc67e323b3e71f83e546bc950fed2 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Sun, 17 Apr 2016 20:38:22 +0200 Subject: fixed build --- default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/default.nix b/default.nix index 2c2a8cc..804e871 100644 --- a/default.nix +++ b/default.nix @@ -1,7 +1,7 @@ let pkgs = import {}; in rec { - trivmix = pkgs.stdenv.lib.overrideDerivation (pkgs.myHaskellPackages.callPackage ./trivmix.nix {}) (attrs : { + trivmix = pkgs.stdenv.lib.overrideDerivation (pkgs.haskellPackages.callPackage ./trivmix.nix {}) (attrs : { src = ./.; }); } -- cgit v1.2.3