ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-26 21:33:03 +03:00
Code Issues Projects Releases Wiki Activity

haskellPackages.neuron: Fix build

Browse Source
This commit is contained in:
Malte Brandy 2020-08-18 23:54:21 +02:00
parent 019780631c
commit fe868f7435
No known key found for this signature in database
GPG Key ID: 226A2D41EF5378C9
3 changed files with 28 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1383,23 +1383,11 @@ self: super: {
reflex-dom-pandoc = super.reflex-dom-pandoc.override {
pandoc-types = self.pandoc-types_1_21;
};
pandoc_2_10_1 = super.pandoc_2_10_1.override {
pandoc_2_10_1 = super.pandoc_2_10_1.overrideScope (self: super: {
pandoc-types = self.pandoc-types_1_21;
hslua = self.hslua_1_1_2;
texmath = self.texmath.override {
pandoc-types = self.pandoc-types_1_21;
};
tasty-lua = self.tasty-lua.override {
hslua = self.hslua_1_1_2;
};
hslua-module-text = self.hslua-module-text.override {
hslua = self.hslua_1_1_2;
};
hslua-module-system = self.hslua-module-system.override {
hslua = self.hslua_1_1_2;
};
jira-wiki-markup = self.jira-wiki-markup_1_3_2;
};
});
# Apply version-bump patch that is not contained in released version yet.
# Upstream PR: https://github.com/srid/neuron/pull/304
@ -1411,14 +1399,10 @@ self: super: {
extraPrefix = "";
}))
# See comment about overrides above commonmark-pandoc
.override {
.overrideScope (self: super: {
pandoc = self.pandoc_2_10_1;
pandoc-types = self.pandoc-types_1_21;
rib = super.rib.override {
pandoc = self.pandoc_2_10_1;
pandoc-types = self.pandoc-types_1_21;
};
};
});
# Testsuite trying to run `which haskeline-examples-Test`
haskeline_0_8_0_0 = dontCheck super.haskeline_0_8_0_0;

1
pkgs/development/haskell-modules/configuration-hackage2nix.yaml
View File

@ -2581,6 +2581,7 @@ extra-packages:
- hoogle == 5.0.14 # required by hie-hoogle
- html-conduit ^>= 1.2 # pre-lts-11.x versions neeed by git-annex 6.20180227
- http-conduit ^>= 2.2 # pre-lts-11.x versions neeed by git-annex 6.20180227
- hslua == 1.1.2 # required for pandoc 2.10
- inline-c < 0.6 # required on GHC 8.0.x
- inline-c-cpp < 0.2 # required on GHC 8.0.x
- lens-labels == 0.1.* # required for proto-lens-descriptors

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

@ -133316,6 +133316,29 @@ self: {
license = stdenv.lib.licenses.mit;
}) {inherit (pkgs) lua5_3;};
"hslua_1_1_2" = callPackage
({ mkDerivation, base, bytestring, containers, exceptions, lua5_3
, mtl, QuickCheck, quickcheck-instances, tasty, tasty-hunit
, tasty-quickcheck, text
}:
mkDerivation {
pname = "hslua";
version = "1.1.2";
sha256 = "1cv4lwr91ckscwm2jksrg29ka1z32974xgkcgmna4ibpyjwkslbl";
configureFlags = [ "-fsystem-lua" "-f-use-pkgconfig" ];
libraryHaskellDepends = [
base bytestring containers exceptions mtl text
];
librarySystemDepends = [ lua5_3 ];
testHaskellDepends = [
base bytestring containers exceptions mtl QuickCheck
quickcheck-instances tasty tasty-hunit tasty-quickcheck text
];
description = "Bindings to Lua, an embeddable scripting language";
license = stdenv.lib.licenses.mit;
hydraPlatforms = stdenv.lib.platforms.none;
}) {inherit (pkgs) lua5_3;};
"hslua_1_2_0" = callPackage
({ mkDerivation, base, bytestring, containers, exceptions, lua5_3
, mtl, QuickCheck, quickcheck-instances, tasty, tasty-hunit