BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #93762 from maralorn/fix-neuron

Browse source 
[haskell-updates] haskellPackages.neuron: Fix deps and build
This commit is contained in:
maralorn 2020-07-24 15:53:31 +02:00 committed by GitHub
commit 7841ad9663
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 63 additions and 68 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

69
pkgs/development/haskell-modules/configuration-common.nix
View file

@ -1237,14 +1237,6 @@ self: super: {
# Requested version bump on upstream https://github.com/obsidiansystems/constraints-extras/issues/32
constraints-extras = doJailbreak super.constraints-extras;
# 2020-06-22: NOTE: > 0.10.0.0 => rm dhall override: https://github.com/srid/rib/issues/161
rib = doJailbreak (super.rib.override {
dhall = self.dhall_1_30_0;
});
# Necessary for neuron 0.4.0
neuron = super.neuron.override {
dhall = self.dhall_1_30_0;
};
# Necessary for stack
# x509-validation test suite hangs: upstream https://github.com/vincenthz/hs-certificate/issues/120
@ -1407,4 +1399,65 @@ self: super: {
# The current LTS 15.x version has a bug in the test suite.
streaming-commons = self.streaming-commons_0_2_2_1;
# Version bumps have not been merged by upstream yet.
# https://github.com/obsidiansystems/dependent-sum-aeson-orphans/pull/5
dependent-sum-aeson-orphans = appendPatch super.dependent-sum-aeson-orphans (pkgs.fetchpatch {
url = "https://github.com/obsidiansystems/dependent-sum-aeson-orphans/commit/5a369e433ad7e3eef54c7c3725d34270f6aa48cc.patch";
sha256 = "1lzrcicvdg77hd8j2fg37z19amp5yna5xmw1fc06zi0j95csll4r";
});
# Tests are broken because of missing files in hackage tarball.
# https://github.com/jgm/commonmark-hs/issues/55
commonmark-extensions = dontCheck super.commonmark-extensions;
# The overrides in the following lines all have the following causes:
# * neuron needs commonmark-pandoc
# * which needs a newer pandoc-types (>= 1.21)
# * which means we need a newer pandoc (>= 2.10)
# * which needs a newer hslua (1.1.2) and a newer jira-wiki-markup (1.3.2)
# Then we need to apply those overrides to all transitive dependencies
# All of this will be obsolete, when pandoc 2.10 hits stack lts.
commonmark-pandoc = super.commonmark-pandoc.override {
pandoc-types = self.pandoc-types_1_21;
};
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-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
neuron = (appendPatch super.neuron (pkgs.fetchpatch {
url= "https://github.com/srid/neuron/commit/9ddcb7e9d63b8266d1372ef7c14c13b6b5277990.patch";
sha256 = "01f9v3jnl05fnpd624wv3a0j5prcbnf62ysa16fbc0vabw19zv1b";
excludes = [ "commonmark-hs/github.json" ];
stripLen = 2;
extraPrefix = "";
}))
# See comment about overrides above commonmark-pandoc
.override {
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;
};
};
} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super

4
pkgs/development/haskell-modules/configuration-hackage2nix.yaml
View file

@ -2556,7 +2556,6 @@ extra-packages:
- dbus <1 # for xmonad-0.26
- deepseq == 1.3.0.1 # required to build Cabal with GHC 6.12.3
- dhall == 1.29.0 # required for spago 0.14.0.
- dhall == 1.30.0 # required for neuron 0.4.0.0.
- doctemplates == 0.8 # required by pandoc-2.9.x
- generic-deriving == 1.10.5.* # new versions don't compile with GHC 7.10.x
- ghc-check == 0.3.0.1 # only version compatible with ghcide 0.2.0
@ -2678,6 +2677,7 @@ package-maintainers:
- shh
- brittany
- hlint
- neuron
- releaser
- taskwarrior
sorki:
@ -4355,7 +4355,6 @@ broken-packages:
- dependent-hashmap
- dependent-monoidal-map
- dependent-state
- dependent-sum-aeson-orphans
- depends
- dephd
- deptrack-core
@ -8017,7 +8016,6 @@ broken-packages:
- neural
- neural-network-blashs
- neural-network-hmatrix
- neuron
- newhope
- newports
- newsletter

58
pkgs/development/haskell-modules/hackage-packages.nix generated
View file

@ -70629,8 +70629,6 @@ self: {
];
description = "JSON instances for DSum, DMap, and Some";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
broken = true;
}) {};
"dependent-sum-template" = callPackage
@ -71536,59 +71534,6 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"dhall_1_30_0" = callPackage
({ mkDerivation, aeson, aeson-pretty, ansi-terminal, atomic-write
, base, bytestring, case-insensitive, cborg, cborg-json, containers
, contravariant, cryptonite, data-fix, deepseq, Diff, directory
, doctest, dotgen, either, exceptions, filepath, foldl, gauge
, generic-random, hashable, haskeline, http-client, http-client-tls
, http-types, lens-family-core, megaparsec, memory, mockery, mtl
, network-uri, optparse-applicative, parser-combinators, parsers
, pretty-simple, prettyprinter, prettyprinter-ansi-terminal
, profunctors, QuickCheck, quickcheck-instances, repline
, scientific, semigroups, serialise, special-values, spoon, tasty
, tasty-expected-failure, tasty-hunit, tasty-quickcheck
, template-haskell, text, th-lift-instances, transformers
, transformers-compat, turtle, unordered-containers, uri-encode
, vector
}:
mkDerivation {
pname = "dhall";
version = "1.30.0";
sha256 = "10aagimwa5ycrq15240ff2g7r0n995waa33vaz0h51nqvncrbgpj";
revision = "1";
editedCabalFile = "1pazhb3h1rabb80wxh29k5yfp915zqp1gmhcv4mx7ibzv9zw7miq";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
aeson aeson-pretty ansi-terminal atomic-write base bytestring
case-insensitive cborg cborg-json containers contravariant
cryptonite data-fix deepseq Diff directory dotgen either exceptions
filepath hashable haskeline http-client http-client-tls http-types
lens-family-core megaparsec memory mtl network-uri
optparse-applicative parser-combinators parsers pretty-simple
prettyprinter prettyprinter-ansi-terminal profunctors repline
scientific serialise template-haskell text th-lift-instances
transformers transformers-compat unordered-containers uri-encode
vector
];
executableHaskellDepends = [ base ];
testHaskellDepends = [
base bytestring cborg containers data-fix deepseq directory doctest
either filepath foldl generic-random lens-family-core megaparsec
mockery prettyprinter QuickCheck quickcheck-instances scientific
semigroups serialise special-values spoon tasty
tasty-expected-failure tasty-hunit tasty-quickcheck text
transformers turtle unordered-containers vector
];
benchmarkHaskellDepends = [
base bytestring containers directory gauge serialise text
];
description = "A configuration language guaranteed to terminate";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"dhall" = callPackage
({ mkDerivation, aeson, aeson-pretty, ansi-terminal, atomic-write
, base, bytestring, case-insensitive, cborg, cborg-json, containers
@ -179415,8 +179360,7 @@ self: {
];
description = "Future-proof system for plain-text notes";
license = stdenv.lib.licenses.agpl3;
hydraPlatforms = stdenv.lib.platforms.none;
broken = true;
maintainers = with stdenv.lib.maintainers; [ maralorn ];
}) {};
"newhope" = callPackage