ehmry/dhall-haskell
ehmry
/
dhall-haskell
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Upgrade to more recent Nixpkgs (#12)

This commit is contained in:
Gabriel Gonzalez 2018-08-11 15:40:33 -05:00 committed by GitHub
parent eb6d561503
commit 7e5d14a776
2 changed files with 3 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
dhall-nix/nix/hnix.nix
View File

@ -1,60 +0,0 @@
{ mkDerivation, aeson, ansi-wl-pprint, array, base
, base16-bytestring, binary, bytestring, containers, criterion
, cryptohash-md5, cryptohash-sha1, cryptohash-sha256
, cryptohash-sha512, data-fix, deepseq, deriving-compat, Diff
, directory, exceptions, filepath, generic-random, Glob, hashable
, hashing, haskeline, http-client, http-client-tls, http-types
, interpolate, lens-family, lens-family-core, lens-family-th
, logict, megaparsec, monadlist, mtl, optparse-applicative
, pretty-show, process, QuickCheck, quickcheck-instances
, regex-tdfa, regex-tdfa-text, repline, scientific, semigroups
, serialise, split, stdenv, syb, tasty, tasty-hunit
, tasty-quickcheck, tasty-th, template-haskell, text, these, time
, transformers, unix, unordered-containers, vector, xml
}:
mkDerivation {
pname = "hnix";
version = "0.5.1";
sha256 = "5425ad5fcd163e83194a1f09822ceb618919ec771bb33be42181bcdfe3e90be6";
revision = "1";
editedCabalFile = "1l8h9zc9mrqvp8hvkfz1g2inq2b95x42gscyfn6qv0jcxwn4sbpr";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
aeson ansi-wl-pprint array base base16-bytestring binary bytestring
containers cryptohash-md5 cryptohash-sha1 cryptohash-sha256
cryptohash-sha512 data-fix deepseq deriving-compat directory
exceptions filepath hashable hashing haskeline http-client
http-client-tls http-types lens-family lens-family-core
lens-family-th logict megaparsec monadlist mtl optparse-applicative
pretty-show process regex-tdfa regex-tdfa-text scientific
semigroups serialise split syb template-haskell text these time
transformers unix unordered-containers vector xml
];
executableHaskellDepends = [
aeson ansi-wl-pprint base base16-bytestring bytestring containers
cryptohash-md5 cryptohash-sha1 cryptohash-sha256 cryptohash-sha512
data-fix deepseq exceptions filepath hashing haskeline mtl
optparse-applicative pretty-show repline serialise template-haskell
text time transformers unordered-containers
];
testHaskellDepends = [
ansi-wl-pprint base base16-bytestring bytestring containers
cryptohash-md5 cryptohash-sha1 cryptohash-sha256 cryptohash-sha512
data-fix deepseq Diff directory exceptions filepath generic-random
Glob hashing interpolate megaparsec mtl optparse-applicative
pretty-show process QuickCheck quickcheck-instances serialise split
tasty tasty-hunit tasty-quickcheck tasty-th template-haskell text
time transformers unix unordered-containers
];
benchmarkHaskellDepends = [
ansi-wl-pprint base base16-bytestring bytestring containers
criterion cryptohash-md5 cryptohash-sha1 cryptohash-sha256
cryptohash-sha512 data-fix deepseq exceptions filepath hashing mtl
optparse-applicative serialise template-haskell text time
transformers unordered-containers
];
homepage = "https://github.com/haskell-nix/hnix#readme";
description = "Haskell implementation of the Nix language";
license = stdenv.lib.licenses.bsd3;
}

15
dhall-nix/release.nix
View File

@ -2,11 +2,11 @@ let
fetchNixpkgs = import ./nix/fetchNixpkgs.nix;
nixpkgs = fetchNixpkgs {
rev = "804060ff9a79ceb0925fe9ef79ddbf564a225d47";
rev = "1d4de0d552ae9aa66a5b8dee5fb0650a4372d148";
sha256 = "01pb6p07xawi60kshsxxq1bzn8a0y4s5jjqvhkwps4f5xjmmwav3";
sha256 = "09qx58dp1kbj7cpzp8ahbqfbbab1frb12sh1qng87rybcaz0dz01";
outputSha256 = "0ga345hgw6v2kzyhvf5kw96hf60mx5pbd9c4qj5q4nan4lr7nkxn";
outputSha256 = "0xpqc1fhkvvv5dv1zmas2j1q27mi7j7dgyjcdh82mlgl1q63i660";
};
config = {
@ -24,17 +24,8 @@ let
(haskellPackagesNew.callPackage ./nix/dhall-nix.nix { })
);
hnix =
pkgs.haskell.lib.dontCheck
(haskellPackagesNew.callPackage ./nix/hnix.nix { });
prettyprinter = haskellPackagesOld.prettyprinter_1_2_0_1;
serialise =
pkgs.haskell.lib.dontCheck haskellPackagesOld.serialise;
unordered-containers =
haskellPackagesOld.unordered-containers_0_2_9_0;
};
};
};