diff options
| author | Peter Simons <simons@cryp.to> | 2015-01-23 11:52:08 +0100 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2015-01-23 13:24:40 +0100 |
| commit | 3b35ae7a7318972517da3d9a43a1f4cd22d4c426 (patch) | |
| tree | d198b1676239aa53f97878a37879caf5950b2b9a /pkgs/development/haskell-modules | |
| parent | 48a20a63ceeeee4471f129a8e22303f005ed5487 (diff) | |
| download | nixpkgs-3b35ae7a7318972517da3d9a43a1f4cd22d4c426.tar nixpkgs-3b35ae7a7318972517da3d9a43a1f4cd22d4c426.tar.gz nixpkgs-3b35ae7a7318972517da3d9a43a1f4cd22d4c426.tar.bz2 nixpkgs-3b35ae7a7318972517da3d9a43a1f4cd22d4c426.tar.lz nixpkgs-3b35ae7a7318972517da3d9a43a1f4cd22d4c426.tar.xz nixpkgs-3b35ae7a7318972517da3d9a43a1f4cd22d4c426.tar.zst nixpkgs-3b35ae7a7318972517da3d9a43a1f4cd22d4c426.zip | |
cryptol: update 2.x branch to version 2.1.0 and remove broken 1.x build
Diffstat (limited to 'pkgs/development/haskell-modules')
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-common.nix | 6 | ||||
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix | 26 |
2 files changed, 29 insertions, 3 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index cebbb17e298..0dd60f9e5a7 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -376,9 +376,9 @@ self: super: { # https://github.com/rrnewton/haskell-lockfree/issues/44 chaselev-deque = markBrokenVersion "0.5.0.3" super.chaselev-deque; -} -// { - # Not on Hackage yet. +} // { + + # Not on Hackage. cabal2nix = self.mkDerivation { pname = "cabal2nix"; version = "2.0"; diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix index d4eec32809a..2a1f47c1a90 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix @@ -63,4 +63,30 @@ self: super: { # Choose appropriate flags for our version of 'bytestring'. bytestring-builder = disableCabalFlag super.bytestring-builder "bytestring_has_builder"; +} // { + + # Not on Hackage. + cryptol = self.mkDerivation rec { + pname = "cryptol"; + version = "2.1.0"; + src = pkgs.fetchFromGitHub { + owner = "GaloisInc"; + repo = "cryptol"; + rev = "v${version}"; + sha256 = "00bmad3qc7h47j26xp7hbrlb0qv0f7k9spxgsc1f6lsmpgq9axr3"; + }; + isLibrary = true; + isExecutable = true; + buildDepends = with self; [ + ansi-terminal array async base containers deepseq directory + executable-path filepath GraphSCC haskeline monadLib mtl old-time + presburger pretty process QuickCheck random smtLib syb text + tf-random transformers utf8-string + ]; + buildTools = with self; [ alex happy Cabal_1_22_0_0 ]; + patchPhase = "sed -i -e 's|process .*,|process,|' cryptol.cabal"; + description = "Cryptol: The Language of Cryptography"; + license = pkgs.stdenv.lib.licenses.bsd3; + }; + } |