Skip to content

Commit 5768ce9

Browse files
authored
Use cabal-version 2.4 (#141)
On cabal-install-2.4, using cabal-version 2.2 means that a lot of extra-source-files don't get detected.
1 parent bcb8dab commit 5768ce9

File tree

4 files changed

+32
-16
lines changed

4 files changed

+32
-16
lines changed

dhall-to-cabal.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cabal-version: 2.2
1+
cabal-version: 2.4
22
-- * * * * * * * * * * * * WARNING * * * * * * * * * * * *
33
-- This file has been AUTO-GENERATED by dhall-to-cabal.
44
--

dhall-to-cabal.dhall

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,9 @@ in let warning-options =
7575

7676
in prelude.utils.GitHub-project
7777
{ owner = "ocharles", repo = "dhall-to-cabal" }
78-
{ synopsis =
78+
{ cabal-version =
79+
v "2.4"
80+
, synopsis =
7981
"Compile Dhall expressions to Cabal files"
8082
, description =
8183
''

dhall-to-cabal.nix

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
{ mkDerivation, base, bytestring, Cabal, containers, contravariant
2+
, dhall, Diff, directory, filepath, hashable, microlens
3+
, optparse-applicative, prettyprinter, stdenv, tasty, tasty-golden
4+
, tasty-hunit, text, transformers, vector
5+
}:
6+
mkDerivation {
7+
pname = "dhall-to-cabal";
8+
version = "1.3.1.0";
9+
src = ./.;
10+
isLibrary = true;
11+
isExecutable = true;
12+
libraryHaskellDepends = [
13+
base bytestring Cabal containers contravariant dhall hashable text
14+
transformers vector
15+
];
16+
executableHaskellDepends = [
17+
base bytestring Cabal dhall directory filepath microlens
18+
optparse-applicative prettyprinter text transformers
19+
];
20+
testHaskellDepends = [
21+
base bytestring Cabal dhall Diff filepath microlens prettyprinter
22+
tasty tasty-golden tasty-hunit text
23+
];
24+
homepage = "https://github.com/ocharles/dhall-to-cabal";
25+
description = "Compile Dhall expressions to Cabal files";
26+
license = stdenv.lib.licenses.mit;
27+
}

release.nix

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -39,20 +39,7 @@ let
3939

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

42-
dhall-to-cabal =
43-
self.callCabal2nix
44-
"dhall-to-cabal"
45-
( import
46-
./cabal-sdist.nix
47-
{ inherit ( pkgs.stdenv ) mkDerivation;
48-
inherit ( pkgs ) cabal-install;
49-
ghc = self.ghcWithPackages (hs: [
50-
(hs.callPackage ./cabal.nix {})
51-
]);
52-
}
53-
./.
54-
)
55-
{};
42+
dhall-to-cabal = self.callPackage ./dhall-to-cabal.nix {};
5643
};
5744
};
5845
};

0 commit comments

Comments
 (0)