diff options
| author | Lancelot SIX <lsix@lancelotsix.com> | 2020-02-09 19:21:16 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2020-02-09 19:24:18 +0100 |
| commit | d969e702309fabc5630108a7548876358af79b2c (patch) | |
| tree | 149d415bd5133fcd5868a7b95b3198fd978d71b5 /pkgs/top-level | |
| parent | db8434a6945561fc94284f1e8fc5c2baac298f9b (diff) | |
| download | nixlib-d969e702309fabc5630108a7548876358af79b2c.tar nixlib-d969e702309fabc5630108a7548876358af79b2c.tar.gz nixlib-d969e702309fabc5630108a7548876358af79b2c.tar.bz2 nixlib-d969e702309fabc5630108a7548876358af79b2c.tar.lz nixlib-d969e702309fabc5630108a7548876358af79b2c.tar.xz nixlib-d969e702309fabc5630108a7548876358af79b2c.tar.zst nixlib-d969e702309fabc5630108a7548876358af79b2c.zip | |
octaveHg: drop
This package is broken and unmaintained (no updates since 2017) and lags behind octave.
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 35 | ||||
| -rw-r--r-- | pkgs/top-level/pure-packages.nix | 4 |
2 files changed, 14 insertions, 25 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d462acbdfede..361b30a187f7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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; diff --git a/pkgs/top-level/pure-packages.nix b/pkgs/top-level/pure-packages.nix index a16008880328..005e09cc003e 100644 --- a/pkgs/top-level/pure-packages.nix +++ b/pkgs/top-level/pure-packages.nix @@ -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 { }; |