nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-10-03 13:30:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

cabal2nix: fix (and clean up)override for hpack dependency

Browse Source 
(cherry picked from commit 1c5d7ad52e)
Signed-off-by: Domen Kožar <domen@dev.si>
This commit is contained in:
Peter Simons
2018-09-03 11:38:33 +02:00
committed by Domen Kožar
parent 52f36810cd
commit 4e96a5fc5f
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/haskell-modules/configuration-common.nix
View File

@@ -1079,10 +1079,15 @@ self: super: {
hpack = self.hpack_0_31_0;
yaml = self.yaml_0_10_1_1;
});
stack2nix = super.stack2nix.overrideScope (self: super: {
hpack = self.hpack_0_31_0;
yaml = self.yaml_0_10_1_1;
});
# Break out of "aeson <1.3, temporary <1.3".
stack = doJailbreak super.stack;
# https://github.com/pikajude/stylish-cabal/issues/11
stylish-cabal = super.stylish-cabal.override { hspec = self.hspec_2_4_8; hspec-core = self.hspec-core_2_4_8; };
hspec_2_4_8 = super.hspec_2_4_8.override { hspec-core = self.hspec-core_2_4_8; hspec-discover = self.hspec-discover_2_4_8; };

5
pkgs/development/haskell-modules/hackage-packages.nix generated
View File

@@ -41639,6 +41639,10 @@ self: {
base Cabal containers directory filepath language-nix lens pretty
process tasty tasty-golden
];
preCheck = ''
export PATH="$PWD/dist/build/cabal2nix:$PATH"
export HOME="$TMPDIR/home"
'';
description = "Convert Cabal files into Nix build instructions";
license = stdenv.lib.licenses.bsd3;
maintainers = with stdenv.lib.maintainers; [ peti ];
@@ -203186,7 +203190,6 @@ self: {
];
description = "Terminal emulator configurable in Haskell";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
}) {gtk3 = pkgs.gnome3.gtk;};
"termplot" = callPackage