From 76bcbfce467328cb502e8e593aec256e634c2ed7 Mon Sep 17 00:00:00 2001 From: Karl Hallsby Date: Thu, 17 Dec 2020 20:16:01 -0600 Subject: [PATCH] octave.pkgs.general: init at version 2.1.1 --- .../octave-modules/general/default.nix | 31 +++++++++++++++++++ pkgs/top-level/octave-packages.nix | 8 ++--- 2 files changed, 33 insertions(+), 6 deletions(-) create mode 100644 pkgs/development/octave-modules/general/default.nix diff --git a/pkgs/development/octave-modules/general/default.nix b/pkgs/development/octave-modules/general/default.nix new file mode 100644 index 00000000000..52ad9af93b0 --- /dev/null +++ b/pkgs/development/octave-modules/general/default.nix @@ -0,0 +1,31 @@ +{ buildOctavePackage +, lib +, fetchurl +, pkg-config +, nettle +}: + +buildOctavePackage rec { + pname = "general"; + version = "2.1.1"; + + src = fetchurl { + url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz"; + sha256 = "0jmvczssqz1aa665v9h8k9cchb7mg3n9af6b5kh9b2qcjl4r9l7v"; + }; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + nettle + ]; + + meta = with lib; { + homepage = "https://octave.sourceforge.io/general/index.html"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ KarlJoad ]; + description = "General tools for Octave"; + }; +} diff --git a/pkgs/top-level/octave-packages.nix b/pkgs/top-level/octave-packages.nix index 897cd99e927..05d8637b027 100644 --- a/pkgs/top-level/octave-packages.nix +++ b/pkgs/top-level/octave-packages.nix @@ -84,12 +84,8 @@ makeScope newScope (self: linear-algebra = callPackage ../development/octave-modules/linear-algebra { }; ltfat = callPackage ../development/octave-modules/ltfat { - fftw = pkgs.fftw; - fftwSinglePrec = pkgs.fftwSinglePrec; - fftwFloat = pkgs.fftwFloat; - fftwLongDouble = pkgs.fftwLongDouble; - portaudio = pkgs.portaudio; - jre = pkgs.jre; + inherit (octave) fftw fftwSinglePrec portaudio jdk; + inherit (pkgs) fftwFloat fftwLongDouble; }; signal = callPackage ../development/octave-modules/signal { };