git.iko.soy/typeable/nixpkgs
on master help sign in
hackagePackages.neuron: Fix build
commita61cf82b6d836797398043a1ccd2fdc0be67f893 authorMalte Brandy <malte.brandy@maralorn.de> dateThu 7 May 2020, 19:43 (7 years ago) parent730024f
3 files changed+24−4
pkgs/development/haskell-modules/configuration-common.nix+4 pkgs/development/haskell-modules/configuration-hackage2nix.yaml−4 pkgs/development/haskell-modules/configuration-nix.nix+20
pkgs/development/haskell-modules/configuration-common.nix+4
@@ -1515,4 +1515,8 @@ self: super: {
15151515 };
15161516 };
15171517
1518+ # hasn‘t bumped upper bounds
1519+ # upstream: https://github.com/obsidiansystems/which/pull/6
1520+ which = doJailbreak super.which;
1521+
15181522} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
pkgs/development/haskell-modules/configuration-hackage2nix.yaml−4
@@ -2733,7 +2733,6 @@ broken-packages:
27332733 - aeson-diff-generic
27342734 - aeson-filthy
27352735 - aeson-flowtyped
2736− - aeson-gadt-th
27372736 - aeson-injector
27382737 - aeson-iproute
27392738 - aeson-native
@@ -7801,7 +7800,6 @@ broken-packages:
78017800 - neural
78027801 - neural-network-blashs
78037802 - neural-network-hmatrix
7804− - neuron
78057803 - newhope
78067804 - newports
78077805 - newsletter
@@ -8895,7 +8893,6 @@ broken-packages:
88958893 - rhine
88968894 - rhine-gloss
88978895 - rhythm-game-tutorial
8898− - rib
88998896 - ribbit
89008897 - RichConditional
89018898 - ridley
@@ -10608,7 +10605,6 @@ broken-packages:
1060810605 - wheb-mongo
1060910606 - wheb-redis
1061010607 - wheb-strapped
10611− - which
1061210608 - while-lang-parser
1061310609 - whim
1061410610 - whiskers
pkgs/development/haskell-modules/configuration-nix.nix+20
@@ -730,4 +730,24 @@ self: super: builtins.intersectAttrs super {
730730
731731 # Tests access homeless-shelter.
732732 hie-bios = dontCheck super.hie-bios;
733+
734+ # Compiling the readme throws errors and has no purpose in nixpkgs
735+ aeson-gadt-th =
736+ disableCabalFlag (doJailbreak (super.aeson-gadt-th)) "build-readme";
737+
738+ neuron = overrideCabal (super.neuron) (drv: {
739+ # neuron expects the neuron-search script to be in PATH at built-time.
740+ buildTools = [ pkgs.makeWrapper ];
741+ preConfigure = ''
742+ mkdir -p $out/bin
743+ cp src-bash/neuron-search $out/bin/neuron-search
744+ chmod +x $out/bin/neuron-search
745+ wrapProgram $out/bin/neuron-search --prefix 'PATH' ':' ${
746+ with pkgs;
747+ lib.makeBinPath [ fzf ripgrep gawk bat findutils envsubst ]
748+ }
749+ PATH=$PATH:$out/bin
750+ '';
751+ });
752+
733753}