Skip to content

Commit

Permalink
Use cabal-version 2.4 (#141)
Browse files Browse the repository at this point in the history
On cabal-install-2.4, using cabal-version 2.2 means that a lot of
extra-source-files don't get detected.
  • Loading branch information
ocharles authored Oct 23, 2018
1 parent bcb8dab commit 5768ce9
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 16 deletions.
2 changes: 1 addition & 1 deletion dhall-to-cabal.cabal
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cabal-version: 2.2
cabal-version: 2.4
-- * * * * * * * * * * * * WARNING * * * * * * * * * * * *
-- This file has been AUTO-GENERATED by dhall-to-cabal.
--
Expand Down
4 changes: 3 additions & 1 deletion dhall-to-cabal.dhall
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,9 @@ in let warning-options =

in prelude.utils.GitHub-project
{ owner = "ocharles", repo = "dhall-to-cabal" }
{ synopsis =
{ cabal-version =
v "2.4"
, synopsis =
"Compile Dhall expressions to Cabal files"
, description =
''
Expand Down
27 changes: 27 additions & 0 deletions dhall-to-cabal.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
{ mkDerivation, base, bytestring, Cabal, containers, contravariant
, dhall, Diff, directory, filepath, hashable, microlens
, optparse-applicative, prettyprinter, stdenv, tasty, tasty-golden
, tasty-hunit, text, transformers, vector
}:
mkDerivation {
pname = "dhall-to-cabal";
version = "1.3.1.0";
src = ./.;
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
base bytestring Cabal containers contravariant dhall hashable text
transformers vector
];
executableHaskellDepends = [
base bytestring Cabal dhall directory filepath microlens
optparse-applicative prettyprinter text transformers
];
testHaskellDepends = [
base bytestring Cabal dhall Diff filepath microlens prettyprinter
tasty tasty-golden tasty-hunit text
];
homepage = "https://github.com/ocharles/dhall-to-cabal";
description = "Compile Dhall expressions to Cabal files";
license = stdenv.lib.licenses.mit;
}
15 changes: 1 addition & 14 deletions release.nix
Original file line number Diff line number Diff line change
Expand Up @@ -39,20 +39,7 @@ let

insert-ordered-containers = self.callPackage ./insert-ordered-containers.nix {};

dhall-to-cabal =
self.callCabal2nix
"dhall-to-cabal"
( import
./cabal-sdist.nix
{ inherit ( pkgs.stdenv ) mkDerivation;
inherit ( pkgs ) cabal-install;
ghc = self.ghcWithPackages (hs: [
(hs.callPackage ./cabal.nix {})
]);
}
./.
)
{};
dhall-to-cabal = self.callPackage ./dhall-to-cabal.nix {};
};
};
};
Expand Down

0 comments on commit 5768ce9

Please sign in to comment.