940e54c · typeable/cassava-streams

git.iko.soy/typeable/cassava-streams

Update build files to match latest release of nix-hs

commit940e54ccfdb32d382bc31ae49137cceafc022bda authorPeter Jones <pjones@devalot.com> dateFri 13 Sep 2019, 10:59 (7 years ago) parentbd4d86d

5 files changed+17−35

compare with trunk

unifiedsplit

.envrc+4 .gitignore+1 cassava-streams.nix−20 default.nix+10−15 shell.nix+2

.envrcnew file+4

@@ -0,0 +1,4 @@

1+# -*- sh -*-

3+# Load in the shell.nix file:

4+use nix

.gitignore+1

@@ -2,3 +2,4 @@

22/.stack-work

33/build/.stack-work

44/dist

5+/result

cassava-streams.nixdeleted−20

@@ -1,20 +0,0 @@

1−{ mkDerivation, base, bytestring, cassava, io-streams, QuickCheck

2−, stdenv, tasty, tasty-quickcheck, vector

3−}:

4−mkDerivation {

5− pname = "cassava-streams";

6− version = "0.3.0.4";

7− src = ./.;

8− isLibrary = true;

9− isExecutable = true;

10− libraryHaskellDepends = [

11− base bytestring cassava io-streams vector

12− ];

13− testHaskellDepends = [

14− base bytestring cassava io-streams QuickCheck tasty

15− tasty-quickcheck vector

16− ];

17− homepage = "https://code.devalot.com/open/cassava-streams";

18− description = "io-streams interface for the cassava CSV library";

19− license = stdenv.lib.licenses.bsd3;

20−}

default.nix+10−15

@@ -1,20 +1,15 @@

1−{ pkgs ? (import <nixpkgs> {}).pkgs }:

1+{ pkgs ? import <nixpkgs> { }

2+}:

34let

4− # List any extra packages you want available while your package is

5− # building or while in a nix shell:

6− extraPackages = with pkgs; [ ];

5+ nix-hs-src = fetchGit {

6+ url = "https://code.devalot.com/open/nix-hs.git";

7+ rev = "2003332a1e8e518b54e6143f9a9467a8a05abca4";

8+ };

8− # Helpful if you want to override any Haskell packages:

9− haskell = pkgs.haskellPackages;

10−in

10+ nix-hs = import "${nix-hs-src}/default.nix" { inherit pkgs; };

1111

12−# Load the local nix file and use the overrides from above:

13−haskell.callPackage ./cassava-streams.nix {

14− mkDerivation = { buildTools ? []

15− , ...

16− }@args:

17− haskell.mkDerivation (args // {

18− buildTools = buildTools ++ extraPackages;

19− });

12+in nix-hs {

13+ cabal = ./cassava-streams.cabal;

14+ flags = [ "tutorial" ];

2015}

shell.nixnew file+2

@@ -0,0 +1,2 @@

1+# Load an interactive environment:

2+(import ./. {}).interactive