diff options
author | Alastair Pharo <asppsa@gmail.com> | 2017-03-29 19:55:26 +1100 |
---|---|---|
committer | Alastair Pharo <asppsa@gmail.com> | 2017-04-09 21:54:39 +1000 |
commit | 68c56c46fb319696b9c4e0909c91f1c2c3641155 (patch) | |
tree | 5a8cccbd1ef174af54e7aa48edb4ebeed30cd516 | |
parent | 813eb41cf6a3edcff719fad7d67193f7ca39faf7 (diff) | |
download | nixpkgs-68c56c46fb319696b9c4e0909c91f1c2c3641155.tar nixpkgs-68c56c46fb319696b9c4e0909c91f1c2c3641155.tar.gz nixpkgs-68c56c46fb319696b9c4e0909c91f1c2c3641155.tar.bz2 nixpkgs-68c56c46fb319696b9c4e0909c91f1c2c3641155.tar.lz nixpkgs-68c56c46fb319696b9c4e0909c91f1c2c3641155.tar.xz nixpkgs-68c56c46fb319696b9c4e0909c91f1c2c3641155.tar.zst nixpkgs-68c56c46fb319696b9c4e0909c91f1c2c3641155.zip |
purePackages.octave: Use octaveHg
Pure's Octave package compiles but crashes with Octave 4.2 due to an upstream bug which is fixed in mercurial.
-rw-r--r-- | pkgs/development/pure-modules/octave/default.nix | 4 | ||||
-rw-r--r-- | pkgs/top-level/pure-packages.nix | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/development/pure-modules/octave/default.nix b/pkgs/development/pure-modules/octave/default.nix index 61bc7a4d5c1..f1a54eb50ae 100644 --- a/pkgs/development/pure-modules/octave/default.nix +++ b/pkgs/development/pure-modules/octave/default.nix @@ -19,7 +19,9 @@ stdenv.mkDerivation rec { description = "An Octave module for the Pure programming language"; homepage = http://puredocs.bitbucket.org/pure-octave.html; license = stdenv.lib.licenses.gpl3Plus; - platforms = stdenv.lib.platforms.linux; + # This is set to none for now because it does not work with the + # current stable version of Octave. + platforms = stdenv.lib.platforms.none; maintainers = with stdenv.lib.maintainers; [ asppsa ]; }; } diff --git a/pkgs/top-level/pure-packages.nix b/pkgs/top-level/pure-packages.nix index 005e09cc003..a1600888032 100644 --- a/pkgs/top-level/pure-packages.nix +++ b/pkgs/top-level/pure-packages.nix @@ -1,4 +1,4 @@ -{ callPackage }: +{ callPackage, octaveHg }: 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 = callPackage ../development/pure-modules/octave { octave = octaveHg; }; odbc = callPackage ../development/pure-modules/odbc { }; pandoc = callPackage ../development/pure-modules/pandoc { }; rational = callPackage ../development/pure-modules/rational { }; |