Skip to content
This repository has been archived by the owner on Feb 9, 2020. It is now read-only.

Commit

Permalink
Update to the latest LTS.
Browse files Browse the repository at this point in the history
  • Loading branch information
pbogdan committed Mar 24, 2018
1 parent 05be18d commit cc5c05b
Show file tree
Hide file tree
Showing 4 changed files with 57 additions and 30 deletions.
29 changes: 23 additions & 6 deletions default.nix
Original file line number Diff line number Diff line change
@@ -1,8 +1,25 @@
{ nixpkgs ? import <nixpkgs> {}, compiler ? "ghc802" }:
{ nixpkgs ? import <nixpkgs> {}, compiler ? "ghc822" }:
with nixpkgs.pkgs.haskell.lib;
let log-parser-src = (nixpkgs.fetchgit {
url = "https://github.com/pbogdan/log-parser";
rev = "d130df9b01ffe17a6694fe1c8482eda537937d9a";
});
in nixpkgs.pkgs.haskell.packages.${compiler}.callPackage ./ngx-top.nix {
log-parser = import (log-parser-src) { };
url = "https://github.com/pbogdan/log-parser";
rev = "2ea5c2c63a483fa245f8202095232945bfb7507b";
sha256 = "1dwk3sy1ghq4yjdyil33l4kxnx4chy55a1yjnf498yvfiia33s6z";
});
packageOverrides = super: let self = super.pkgs; in
{
haskell = super.haskell // {
packages = super.haskell.packages // {
"${compiler}" = super.haskell.packages.${compiler}.override {
overrides = self: super: {
streaming = (doJailbreak (self.callHackage "streaming" "0.1.4.5" {}));
tailfile-hinotify = (doJailbreak super.tailfile-hinotify);
};
};
};
};
};
config = { inherit packageOverrides; };
pkgs = (import <nixpkgs> { inherit config; }).pkgs;
in pkgs.haskell.packages.${compiler}.callPackage ./ngx-top.nix {
log-parser = import (log-parser-src) { };
}
38 changes: 19 additions & 19 deletions ngx-top.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -31,30 +31,30 @@ library
build-depends:
base >=4.9 && <5,
attoparsec >=0.13.1.0 && <0.14,
brick ==0.17.*,
brick >=0.29.1,
containers >=0.5.7.1 && <0.6,
foldl >=1.2.3 && <1.3,
foldl >=1.2.3,
iproute >= 1.7 && < 1.8,
lens >=4.15.1 && <4.16,
lens >=4.15.1,
log-parser >=0.1.0.0 && <0.2,
pipes >=4.3.2 && <4.4,
pipes-attoparsec >=0.5.1.4 && <0.6,
pipes-bytestring >=2.1.4 && <2.2,
pipes-group >=1.0.6 && <1.1,
pipes-parse >=3.0.8 && <3.1,
protolude >=0.1.6 && <0.2,
protolude >=0.2,
stm >=2.4.4.1 && <2.5,
vty ==5.15.*,
vty >=5.15,
tailfile-hinotify >=1.0.0.2 && <1.1,
unordered-containers >=0.2.7.2 && <0.3,
uri-bytestring >=0.2.2.1 && <0.3,
uri-bytestring >=0.2.2.1,
file-embed >=0.0.10 && < 0.0.11,
geoip2 >= 0.2.0.0 && < 0.3.0,
geoip2 >= 0.2.0.0,
bytestring >=0.10.8.1 && <0.11,
safe-exceptions >= 0.1.4.0 && < 0.1.5,
QuickCheck >=2.9.0 && <2.10,
safe-exceptions >= 0.1.4.0,
QuickCheck >=2.9.0,
quickcheck-instances >=0.3.12 && <0.4,
time >=1.6.0.1 && <1.7,
time >=1.6.0.1,
stringsearch >= 0.3.6.6 && < 0.4.0
default-language: Haskell2010
default-extensions: OverloadedStrings NoImplicitPrelude
Expand All @@ -64,9 +64,9 @@ library
executable ngx-top
main-is: Main.hs
build-depends:
base >=4.9.1.0 && <4.10,
ngx-top >=0.2.0.0 && <0.3,
protolude >=0.1.6 && <0.2
base >=4.9.1.0 && <5,
ngx-top,
protolude >=0.2
default-language: Haskell2010
default-extensions: OverloadedStrings NoImplicitPrelude
hs-source-dirs: app
Expand All @@ -75,9 +75,9 @@ executable ngx-top
executable ngx-top-gen
main-is: Generator.hs
build-depends:
base >=4.9.1.0 && <4.10,
ngx-top >=0.2.0.0 && <0.3,
protolude >=0.1.6 && <0.2
base >=4.9.1.0 && <5,
ngx-top,
protolude >=0.2
default-language: Haskell2010
default-extensions: OverloadedStrings NoImplicitPrelude
hs-source-dirs: app
Expand All @@ -87,9 +87,9 @@ test-suite ngx-top-test
type: exitcode-stdio-1.0
main-is: Spec.hs
build-depends:
base >=4.9.1.0 && <4.10,
ngx-top >=0.2.0.0 && <0.3,
protolude >=0.1.6 && <0.2
base >=4.9.1.0 && <5,
ngx-top,
protolude >=0.2
default-language: Haskell2010
default-extensions: OverloadedStrings NoImplicitPrelude
hs-source-dirs: test
Expand Down
2 changes: 1 addition & 1 deletion shell.nix
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
{ nixpkgs ? import <nixpkgs> {}, compiler ? "ghc802" }:
{ nixpkgs ? import <nixpkgs> {}, compiler ? "ghc822" }:
(import ./default.nix { inherit nixpkgs compiler; }).env
18 changes: 14 additions & 4 deletions stack.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
# resolver:
# name: custom-snapshot
# location: "./custom-snapshot.yaml"
resolver: nightly-2017-01-31
resolver: lts-11.1

# User packages to be built.
# Various formats can be used as shown in the example below.
Expand All @@ -39,15 +39,21 @@ packages:
- '.'
- location:
git: https://github.com/pbogdan/log-parser.git
commit: 41d1b9c79f09789f4282fe032d0752538d67a6a4
commit: 2ea5c2c63a483fa245f8202095232945bfb7507b
extra-dep: true

# Dependency packages to be pulled from upstream that are not in the resolver
# (e.g., acme-missiles-0.3)
extra-deps:
- tailfile-hinotify-1.0.0.2
- streaming-eversion-0.3.1.0
- geoip2-0.2.2.0
- streaming-0.1.4.5
- geoip2-0.3.1.0
- foldl-1.2.5
- lens-4.15.4
- free-4.12.4
- mmorph-1.0.9
- resourcet-1.1.11

# Override default flag values for local packages and extra-deps
flags: {}
Expand All @@ -56,7 +62,11 @@ flags: {}
extra-package-dbs: []

# Control whether we use the GHC we find on the path
system-ghc: false
system-ghc: true

# nix:
# enable: true
# packages: [ ghc git binutils]

#
# Require a specific version of stack, using version ranges
Expand Down

0 comments on commit cc5c05b

Please sign in to comment.