octaveHg: drop

This package is broken and unmaintained (no updates since 2017) and lags
behind octave.
This commit is contained in:
Lancelot SIX 2020-02-09 19:21:16 +01:00 committed by Frederik Rietdijk
parent db8434a694
commit d969e70230
3 changed files with 14 additions and 100 deletions

View file

@ -1,75 +0,0 @@
args@{ stdenv, openblas, ghostscript ? null, texinfo
, # These are arguments that shouldn't be passed to the
# octave package.
texlive, tex ? texlive.combined.scheme-small
, epstool, pstoedit, transfig
, lib, fetchhg, callPackage
, autoconf, automake, libtool
, bison, librsvg, icoutils, gperf
, # These are options that can be passed in addition to the ones
# octave usually takes.
# - rev is the HG revision. Use "tip" for the bleeding edge.
# - docs can be set to false to skip building documentation.
rev ? "23269", docs ? true
, # All remaining arguments will be passed to the octave package.
...
}:
with stdenv.lib;
let
octaveArgs = removeAttrs args
[ "texlive" "tex"
"epstool" "pstoedit" "transfig"
"lib" "fetchhg" "callPackage"
"autoconf" "automake" "libtool"
"bison" "librsvg" "icoutils" "gperf"
"rev" "docs"
];
octave = callPackage ./default.nix octaveArgs;
# List of hashes for known HG revisions.
sha256s = {
"23269" = "87f560e873ad1454fdbcdd8aca65f9f0b1e605bdc00aebbdc4f9d862ca72ff1d";
};
in lib.overrideDerivation octave (attrs: rec {
version = "4.3.0pre${rev}";
name = "octave-${version}";
src = fetchhg {
url = http://www.octave.org/hg/octave;
inherit rev;
sha256 =
if builtins.hasAttr rev sha256s
then builtins.getAttr rev sha256s
else null;
fetchSubrepos = true;
};
# Octave's test for including this flag seems to be broken in 4.3.
F77_INTEGER_8_FLAG = optional openblas.blas64 "-fdefault-integer-8";
# This enables texinfo to find the files it needs.
TEXINPUTS = ".:build-aux:${texinfo}/texmf-dist/tex/generic/epsf:";
disableDocs = !docs || ghostscript == null;
nativeBuildInputs = attrs.nativeBuildInputs
++ [ autoconf automake libtool bison librsvg icoutils gperf ]
++ optionals (!disableDocs) [ tex epstool pstoedit transfig ];
# Run bootstrap before any other patches, as other patches may refer
# to files that are generated by the bootstrap.
prePatch = ''
patchShebangs bootstrap
./bootstrap
'' + attrs.prePatch;
configureFlags = attrs.configureFlags ++
optional disableDocs "--disable-docs";
})

View file

@ -9186,29 +9186,18 @@ in
git = gitMinimal;
};
inherit (
let
defaultOctaveOptions = {
qt = null;
qscintilla = null;
ghostscript = null;
graphicsmagick = null;
llvm = null;
hdf5 = null;
glpk = null;
suitesparse = null;
jdk = null;
openblas = if stdenv.isDarwin then openblasCompat else openblas;
};
hgOctaveOptions =
(removeAttrs defaultOctaveOptions ["ghostscript"]) // {
overridePlatforms = stdenv.lib.platforms.none;
};
in {
octave = callPackage ../development/interpreters/octave defaultOctaveOptions;
octaveHg = lowPrio (callPackage ../development/interpreters/octave/hg.nix hgOctaveOptions);
}) octave octaveHg;
octave = callPackage ../development/interpreters/octave {
qt = null;
qscintilla = null;
ghostscript = null;
graphicsmagick = null;
llvm = null;
hdf5 = null;
glpk = null;
suitesparse = null;
jdk = null;
openblas = if stdenv.isDarwin then openblasCompat else openblas;
};
octaveFull = (lowPrio (octave.override {
qt = qt4;

View file

@ -1,4 +1,4 @@
{ callPackage, octaveHg }:
{ callPackage }:
rec {
audio = callPackage ../development/pure-modules/audio { };
@ -19,7 +19,7 @@ rec {
lv2 = callPackage ../development/pure-modules/lv2 { };
midi = callPackage ../development/pure-modules/midi { };
mpfr = callPackage ../development/pure-modules/mpfr { };
octave = callPackage ../development/pure-modules/octave { octave = octaveHg; };
octave = callPackage ../development/pure-modules/octave { };
odbc = callPackage ../development/pure-modules/odbc { };
pandoc = callPackage ../development/pure-modules/pandoc { };
rational = callPackage ../development/pure-modules/rational { };