From aa202f1c945ee38769b61637dd53e7c46d366beb Mon Sep 17 00:00:00 2001 From: Karl H <34152449+KarlJoad@users.noreply.github.com> Date: Wed, 10 Mar 2021 16:28:10 -0600 Subject: [PATCH] octave.pkgs.sparsersb: remove librsb null override, unbreak (#115838) --- pkgs/development/octave-modules/sparsersb/default.nix | 4 +--- pkgs/top-level/octave-packages.nix | 6 +----- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/pkgs/development/octave-modules/sparsersb/default.nix b/pkgs/development/octave-modules/sparsersb/default.nix index b8147f8d281..ecea6c0f62e 100644 --- a/pkgs/development/octave-modules/sparsersb/default.nix +++ b/pkgs/development/octave-modules/sparsersb/default.nix @@ -13,7 +13,7 @@ buildOctavePackage rec { sha256 = "0nl7qppa1cm51188hqhbfswlih9hmy1yz7v0f5i07z0g0kbd62xw"; }; - buildInputs = [ + propagatedBuildInputs = [ librsb ]; @@ -22,7 +22,5 @@ buildOctavePackage rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ KarlJoad ]; description = "Interface to the librsb package implementing the RSB sparse matrix format for fast shared-memory sparse matrix computations"; - # Mark this way until KarlJoad builds librsb specifically for this package. - broken = true; }; } diff --git a/pkgs/top-level/octave-packages.nix b/pkgs/top-level/octave-packages.nix index 6278a7042e1..115b38095ed 100644 --- a/pkgs/top-level/octave-packages.nix +++ b/pkgs/top-level/octave-packages.nix @@ -179,11 +179,7 @@ makeScope newScope (self: sockets = callPackage ../development/octave-modules/sockets { }; - sparsersb = callPackage ../development/octave-modules/sparsersb { - librsb = null; - # TODO: Package the librsb library to build this package. - # http://librsb.sourceforge.net/ - }; + sparsersb = callPackage ../development/octave-modules/sparsersb { }; stk = callPackage ../development/octave-modules/stk { };