git.iko.soy/typeable/nixpkgs
on master help sign in
octaveHg: drop

This package is broken and unmaintained (no updates since 2017) and lags behind octave.

commitd969e702309fabc5630108a7548876358af79b2c authorLancelot SIX <lsix@lancelotsix.com> dateSun 9 Feb 2020, 19:21 (7 years ago) parentdb8434a
3 files changed+14−100
pkgs/development/interpreters/octave/hg.nix−75 pkgs/top-level/all-packages.nix+12−23 pkgs/top-level/pure-packages.nix+2−2
pkgs/development/interpreters/octave/hg.nixdeleted−75
@@ -1,75 +0,0 @@
1−args@{ stdenv, openblas, ghostscript ? null, texinfo
2−
3− , # These are arguments that shouldn't be passed to the
4− # octave package.
5− texlive, tex ? texlive.combined.scheme-small
6− , epstool, pstoedit, transfig
7− , lib, fetchhg, callPackage
8− , autoconf, automake, libtool
9− , bison, librsvg, icoutils, gperf
10−
11− , # These are options that can be passed in addition to the ones
12− # octave usually takes.
13− # - rev is the HG revision. Use "tip" for the bleeding edge.
14− # - docs can be set to false to skip building documentation.
15− rev ? "23269", docs ? true
16−
17− , # All remaining arguments will be passed to the octave package.
18− ...
19− }:
20−
21−with stdenv.lib;
22−let
23− octaveArgs = removeAttrs args
24− [ "texlive" "tex"
25− "epstool" "pstoedit" "transfig"
26− "lib" "fetchhg" "callPackage"
27− "autoconf" "automake" "libtool"
28− "bison" "librsvg" "icoutils" "gperf"
29− "rev" "docs"
30− ];
31− octave = callPackage ./default.nix octaveArgs;
32−
33− # List of hashes for known HG revisions.
34− sha256s = {
35− "23269" = "87f560e873ad1454fdbcdd8aca65f9f0b1e605bdc00aebbdc4f9d862ca72ff1d";
36− };
37−
38−in lib.overrideDerivation octave (attrs: rec {
39− version = "4.3.0pre${rev}";
40− name = "octave-${version}";
41−
42− src = fetchhg {
43− url = http://www.octave.org/hg/octave;
44− inherit rev;
45−
46− sha256 =
47− if builtins.hasAttr rev sha256s
48− then builtins.getAttr rev sha256s
49− else null;
50−
51− fetchSubrepos = true;
52− };
53−
54− # Octave's test for including this flag seems to be broken in 4.3.
55− F77_INTEGER_8_FLAG = optional openblas.blas64 "-fdefault-integer-8";
56−
57− # This enables texinfo to find the files it needs.
58− TEXINPUTS = ".:build-aux:${texinfo}/texmf-dist/tex/generic/epsf:";
59−
60− disableDocs = !docs || ghostscript == null;
61−
62− nativeBuildInputs = attrs.nativeBuildInputs
63− ++ [ autoconf automake libtool bison librsvg icoutils gperf ]
64− ++ optionals (!disableDocs) [ tex epstool pstoedit transfig ];
65−
66− # Run bootstrap before any other patches, as other patches may refer
67− # to files that are generated by the bootstrap.
68− prePatch = ''
69− patchShebangs bootstrap
70− ./bootstrap
71− '' + attrs.prePatch;
72−
73− configureFlags = attrs.configureFlags ++
74− optional disableDocs "--disable-docs";
75−})
pkgs/top-level/all-packages.nix+12−23
@@ -9186,29 +9186,18 @@ in
91869186 git = gitMinimal;
91879187 };
91889188
9189− inherit (
9190− let
9191− defaultOctaveOptions = {
9192− qt = null;
9193− qscintilla = null;
9194− ghostscript = null;
9195− graphicsmagick = null;
9196− llvm = null;
9197− hdf5 = null;
9198− glpk = null;
9199− suitesparse = null;
9200− jdk = null;
9201− openblas = if stdenv.isDarwin then openblasCompat else openblas;
9202− };
9203−
9204− hgOctaveOptions =
9205− (removeAttrs defaultOctaveOptions ["ghostscript"]) // {
9206− overridePlatforms = stdenv.lib.platforms.none;
9207− };
9208− in {
9209− octave = callPackage ../development/interpreters/octave defaultOctaveOptions;
9210− octaveHg = lowPrio (callPackage ../development/interpreters/octave/hg.nix hgOctaveOptions);
9211− }) octave octaveHg;
9189+ octave = callPackage ../development/interpreters/octave {
9190+ qt = null;
9191+ qscintilla = null;
9192+ ghostscript = null;
9193+ graphicsmagick = null;
9194+ llvm = null;
9195+ hdf5 = null;
9196+ glpk = null;
9197+ suitesparse = null;
9198+ jdk = null;
9199+ openblas = if stdenv.isDarwin then openblasCompat else openblas;
9200+ };
92129201
92139202 octaveFull = (lowPrio (octave.override {
92149203 qt = qt4;
pkgs/top-level/pure-packages.nix+2−2
@@ -1,4 +1,4 @@
1−{ callPackage, octaveHg }:
1+{ callPackage }:
22
33rec {
44 audio = callPackage ../development/pure-modules/audio { };
@@ -19,7 +19,7 @@ rec {
1919 lv2 = callPackage ../development/pure-modules/lv2 { };
2020 midi = callPackage ../development/pure-modules/midi { };
2121 mpfr = callPackage ../development/pure-modules/mpfr { };
22− octave = callPackage ../development/pure-modules/octave { octave = octaveHg; };
22+ octave = callPackage ../development/pure-modules/octave { };
2323 odbc = callPackage ../development/pure-modules/odbc { };
2424 pandoc = callPackage ../development/pure-modules/pandoc { };
2525 rational = callPackage ../development/pure-modules/rational { };