summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--pkgs/development/pure-modules/octave/default.nix4
-rw-r--r--pkgs/top-level/pure-packages.nix4
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 { };