Skip to content

Commit

Permalink
upgraded to GHC 8.2.2
Browse files Browse the repository at this point in the history
  • Loading branch information
@bwbush
bwbush committed Aug 21, 2019
1 parent e40729e commit 0ca3d38
Show file tree
Hide file tree
Showing 44 changed files with 549 additions and 340 deletions.
7 changes: 7 additions & 0 deletions libs/Haskell/nixpkgs.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"url": "https://github.com/NixOS/nixpkgs.git",
"rev": "ea0820818a7bfd9086d021122c6e23f24d166be7",
"date": "2019-02-17T15:23:14+00:00",
"sha256": "1mcxdzjnxmch7225shn104c33vdg0swray8g1pg4w2bs9i0q6n03",
"fetchSubmodules": false
}
9 changes: 6 additions & 3 deletions libs/Haskell/records-haystack/aesd-records-haystack.cabal
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
name : aesd-records-haystack
version : 0.4.1.3
version : 0.5.0.0
synopsis : Haystack support for AESD records API.
description :
Haystack support for AESD records API.
license : MIT
license-file : LICENSE
author : Brian W Bush <[email protected]>
maintainer : Brian W Bush <[email protected]>
copyright : (c) 2016-18 Alliance for Sustainable Energy
copyright : (c) 2016-19 Alliance for Sustainable Energy
category : Network
build-type : Simple
cabal-version: >= 1.10
Expand All @@ -28,7 +28,7 @@ library
exposed-modules : AESD.Haystack
AESD.Haystack.Cache.Memory
NREL.Meters
build-depends : base >=4.8 && <4.9
build-depends : base >= 4.8 && < 5
, aeson
, bytestring
, aesd-records
Expand All @@ -51,6 +51,9 @@ library
executable aesd-haystack-server
hs-source-dirs : src
main-is : Main.hs
other-modules : AESD.Haystack
AESD.Haystack.Cache.Memory
NREL.Meters
build-depends : base
, aeson
, bytestring
Expand Down
193 changes: 93 additions & 100 deletions libs/Haskell/records-haystack/aesd-records-haystack.config
View file
Original file line number Diff line number Diff line change
@@ -1,131 +1,124 @@
constraints: SHA ==1.6.4.2,
StateVar ==1.1.0.4,
adjunctions ==4.3,
aesd-records ==0.4.4.4,
aeson ==1.1.2.0,
array ==0.5.1.0,
constraints: SHA ==1.6.4.4,
StateVar ==1.1.1.1,
adjunctions ==4.4,
aesd-records ==0.5.0.0,
aeson ==1.3.1.1,
array ==0.5.2.0,
asn1-encoding ==0.9.5,
asn1-parse ==0.9.4,
asn1-types ==0.3.2,
async ==2.1.1.1,
attoparsec ==0.13.1.0,
base ==4.8.2.0,
base-compat ==0.9.3,
base-orphans ==0.6,
async ==2.2.1,
attoparsec ==0.13.2.2,
base ==4.10.1.0,
base-compat ==0.10.4,
base-orphans ==0.7,
base64-bytestring ==1.0.0.1,
bifunctors ==5.4.2,
binary ==0.7.5.0,
blaze-builder ==0.4.0.2,
basement ==0.0.8,
bifunctors ==5.5.3,
binary ==0.8.5.1,
blaze-builder ==0.4.1.0,
byteable ==0.1.1,
bytestring ==0.10.6.0,
bytestring ==0.10.8.2,
bytestring-builder ==0.10.8.1.0,
call-stack ==0.1.0,
case-insensitive ==1.2.0.10,
cereal ==0.5.4.0,
comonad ==5.0.2,
conduit ==1.2.11,
conduit-extra ==1.1.16,
case-insensitive ==1.2.0.11,
cereal ==0.5.7.0,
comonad ==5.0.4,
conduit ==1.3.0.3,
conduit-extra ==1.3.0,
connection ==0.2.8,
containers ==0.5.6.2,
contravariant ==1.4,
cookie ==0.4.2.1,
containers ==0.5.10.2,
contravariant ==1.4.1,
cookie ==0.4.4,
cryptohash-md5 ==0.11.100.1,
cryptohash-sha1 ==0.11.100.1,
cryptonite ==0.23,
daft ==0.4.14.6,
cryptonite ==0.25,
daft ==0.5.0.0,
data-binary-ieee754 ==0.4.4,
data-default ==0.7.1.1,
data-default-class ==0.1.2.0,
data-default-instances-containers ==0.0.1,
data-default-instances-dlist ==0.0.1,
data-default-instances-old-locale ==0.0.1,
deepseq ==1.4.1.1,
directory ==1.2.2.0,
deepseq ==1.4.3.0,
directory ==1.3.0.2,
distributive ==0.5.3,
dlist ==0.8.0.3,
entropy ==0.3.8,
exceptions ==0.8.3,
fail ==4.9.0.0,
filepath ==1.4.0.0,
foundation ==0.0.13,
free ==4.12.4,
generic-deriving ==1.11.2,
ghc-prim ==0.4.0.0,
hashable ==1.2.6.1,
hourglass ==0.2.10,
http-client ==0.5.7.0,
http-client-tls ==0.3.5.1,
http-conduit ==2.2.3.2,
http-types ==0.9.1,
integer-gmp ==1.0.0.0,
integer-logarithms ==1.0.2,
kan-extensions ==5.0.2,
lens ==4.15.4,
lifted-base ==0.2.3.11,
memory ==0.14.6,
mime-types ==0.1.0.7,
mmorph ==1.0.9,
monad-control ==1.0.2.2,
mtl ==2.2.1,
network ==2.6.3.2,
network-info ==0.2.0.8,
dlist ==0.8.0.4,
entropy ==0.4.1.1,
exceptions ==0.10.0,
filepath ==1.4.1.2,
foundation ==0.0.21,
free ==5.0.2,
ghc-boot-th ==8.2.2,
ghc-prim ==0.5.1.1,
hashable ==1.2.7.0,
hourglass ==0.2.12,
http-client ==0.5.13.1,
http-client-tls ==0.3.5.3,
http-conduit ==2.3.2,
http-types ==0.12.1,
integer-gmp ==1.0.1.0,
integer-logarithms ==1.0.2.1,
invariant ==0.5.1,
kan-extensions ==5.2,
lens ==4.16.1,
memory ==0.14.16,
mime-types ==0.1.0.8,
mono-traversable ==1.0.9.0,
mtl ==2.2.2,
network ==2.6.3.6,
network-info ==0.2.0.10,
network-uri ==2.6.1.0,
old-locale ==1.0.0.7,
parallel ==3.2.1.1,
parsec ==3.1.11,
pem ==0.2.2,
prelude-extras ==0.4.0.3,
pretty ==1.1.2.0,
primitive ==0.6.2.0,
process ==1.2.3.0,
profunctors ==5.2.1,
protobuf ==0.2.1.1,
raft ==0.3.11.1,
parallel ==3.2.2.0,
parsec ==3.1.13.0,
pem ==0.2.4,
pretty ==1.1.3.3,
primitive ==0.6.3.0,
process ==1.6.1.0,
profunctors ==5.2.2,
protobuf ==0.2.1.2,
raft ==0.4.0.0,
random ==1.1,
reflection ==2.1.2,
reflection ==2.1.4,
regex-base ==0.93.2,
regex-posix ==0.95.2,
resourcet ==1.1.9,
resourcet ==1.2.1,
rts ==1.0,
safe ==0.3.15,
scientific ==0.3.5.2,
semigroupoids ==5.2.1,
semigroups ==0.18.3,
singletons ==2.1,
socks ==0.5.5,
split ==0.2.3.2,
stm ==2.4.4.1,
streaming-commons ==0.1.17,
syb ==0.7,
scientific ==0.3.6.2,
semigroupoids ==5.2.2,
semigroups ==0.18.5,
socks ==0.5.6,
split ==0.2.3.3,
stm ==2.4.5.1,
streaming-commons ==0.2.1.0,
tagged ==0.8.5,
template-haskell ==2.10.0.0,
text ==1.2.2.2,
th-abstraction ==0.2.5.0,
th-desugar ==1.6,
th-expand-syns ==0.4.3.0,
th-lift ==0.7.7,
th-lift-instances ==0.1.11,
th-orphans ==0.13.4,
th-reify-many ==0.1.8,
time ==1.5.0.1,
time-locale-compat ==0.1.1.3,
tls ==1.3.11,
template-haskell ==2.12.0.0,
text ==1.2.3.0,
th-abstraction ==0.2.8.0,
time ==1.8.0.2,
time-locale-compat ==0.1.1.5,
tls ==1.4.1,
tostring ==0.2.1.1,
transformers ==0.4.2.0,
transformers-base ==0.4.4,
transformers-compat ==0.5.1.4,
transformers ==0.5.2.0,
transformers-base ==0.4.5.2,
transformers-compat ==0.6.2,
type-list ==0.5.0.0,
unix ==2.7.1.0,
unordered-containers ==0.2.8.0,
typed-process ==0.2.3.0,
unix ==2.7.2.2,
unliftio-core ==0.1.2.0,
unordered-containers ==0.2.9.0,
utf8-string ==1.0.1.1,
uuid ==1.3.13,
uuid-types ==1.0.3,
vector ==0.12.0.1,
vinyl ==0.5.3,
vector-algorithms ==0.7.0.4,
vinyl ==0.5.2,
void ==0.7.2,
websockets ==0.10.0.0,
x509 ==1.7.2,
x509-store ==1.6.5,
websockets ==0.12.5.1,
x509 ==1.7.3,
x509-store ==1.6.6,
x509-system ==1.6.6,
x509-validation ==1.6.9,
yaml ==0.8.23.3,
zlib ==0.6.1.2
x509-validation ==1.6.10,
yaml ==0.8.32,
zlib ==0.6.2
18 changes: 7 additions & 11 deletions libs/Haskell/records-haystack/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,24 +1,20 @@
{ mkDerivation, aeson, base, bytestring, aesd-records, daft
, data-default, http-conduit, lens, mtl, network-uri, raft
, resourcet, stdenv, text, time, unordered-containers, vinyl, yaml
{
mkDerivation, stdenv
, aeson, base, bytestring, aesd-records, daft, data-default, http-conduit, lens, mtl, network-uri, raft, resourcet, text, time, unordered-containers, vinyl, yaml
}:
mkDerivation {
pname = "aesd-records-haystack";
version = "0.4.1.3";
version = "0.5.0.0";
src = ./.;
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
aeson base bytestring aesd-records daft data-default http-conduit
lens mtl network-uri raft resourcet text time unordered-containers
vinyl yaml
aeson base bytestring aesd-records daft data-default http-conduit lens mtl network-uri raft resourcet text time unordered-containers vinyl yaml
];
executableHaskellDepends = [
aeson base bytestring aesd-records daft data-default http-conduit
lens mtl network-uri raft resourcet text time unordered-containers
vinyl yaml
aeson base bytestring aesd-records daft data-default http-conduit lens mtl network-uri raft resourcet text time unordered-containers vinyl yaml
];
homepage = "https://github.com/NREL/AESD/libs/Haskell/records-haystack";
homepage = "https://github.com/NREL/AESD/libs/Haskell/records-haystack/ReadMe.md";
description = "Haystack support for AESD records API";
license = stdenv.lib.licenses.mit;
}
16 changes: 11 additions & 5 deletions libs/Haskell/records-haystack/release.nix
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,22 @@
{ compiler ? "ghc7103" }:
{
nixpkgs ? import <nixpkgs>
, compiler ? "ghc822"
}:

let
config = {
allowUnfree = true;
packageOverrides = pkgs: rec {
haskell = pkgs.haskell // {
packages = pkgs.haskell.packages // {
"${compiler}" = pkgs.haskell.packages."${compiler}".override {
overrides = haskellPackagesNew: haskellPackagesOld: rec {
aesd-records-haystack =
haskellPackagesNew.callPackage ./default.nix { };
aesd-records =
haskellPackagesNew.callPackage ../records/default.nix { };
aesd-records-haystack = haskellPackagesNew.callPackage ./default.nix { };
aesd-records = haskellPackagesNew.callPackage ../records/default.nix { };
raft = haskellPackagesNew.callPackage ../../../../raft/default.nix { };
daft = haskellPackagesNew.callPackage ../../../../daft-public/daft/default.nix { };
vinyl = haskellPackagesNew.callPackage ../../../../daft-public/daft/vinyl.nix { };
type-list = haskellPackagesNew.callPackage ../../../../daft-public/daft/type-list.nix { };
};
};
};
Expand Down
45 changes: 44 additions & 1 deletion libs/Haskell/records-haystack/shell.nix
View file
Original file line number Diff line number Diff line change
@@ -1 +1,44 @@
((import ./release.nix) {}).aesd-records-haystack.env
{
nixpkgs ? import <nixpkgs>
, compiler ? "ghc822"
}:

let

nixpkgs1 =
if nixpkgs == null
then let
bootstrap = import <nixpkgs> { };
location = builtins.fromJSON (builtins.readFile ../nixpkgs.json);
src = bootstrap.fetchFromGitHub {
owner = "NixOS";
repo = "nixpkgs";
inherit (location) rev sha256;
};
in
import src
else nixpkgs;

pkgs = nixpkgs1 { };

release = (import ./release.nix) {nixpkgs = nixpkgs1; compiler = compiler;};

aesd-records-haystack = release.aesd-records-haystack;

haskellPackages = pkgs.haskell.packages."${compiler}";

in

pkgs.lib.overrideDerivation aesd-records-haystack.env (old: {
buildInputs = old.buildInputs ++ [
haskellPackages.cabal-install
# haskellPackages.ghc-mod
haskellPackages.ghcid
# haskellPackages.hasktags
haskellPackages.hdevtools
haskellPackages.hindent
haskellPackages.hlint
haskellPackages.pointfree
haskellPackages.pointful
];
})
2 changes: 1 addition & 1 deletion libs/Haskell/records-haystack/src/AESD/Haystack.hs
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{-|
Module : $Header$
Copyright : (c) 2016-18 Alliance for Sustainable Energy LLC
Copyright : (c) 2016-19 Alliance for Sustainable Energy LLC
License : MIT
Maintainer : Brian W Bush <[email protected]>
Stability : Stable
Expand Down
3 changes: 1 addition & 2 deletions libs/Haskell/records-haystack/src/AESD/Haystack/Cache/Memory.hs
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{-|
Module : $Header$
Copyright : (c) 2016-18 Alliance for Sustainable Energy LLC
Copyright : (c) 2016-19 Alliance for Sustainable Energy LLC
License : MIT
Maintainer : Brian W Bush <[email protected]>
Stability : Stable
Expand All @@ -14,7 +14,6 @@ A memory cache for data from Haystack.
{-# LANGUAGE FlexibleContexts #-}
{-# LANGUAGE OverloadedStrings #-}
{-# LANGUAGE RecordWildCards #-}
{-# LANGUAGE TupleSections #-}


module AESD.Haystack.Cache.Memory (
Expand Down
Loading

0 comments on commit 0ca3d38

Please sign in to comment.