Unverified Commit 0a955a5e authored by Doron Behar's avatar Doron Behar Committed by GitHub
Browse files

octave: 9.4.0 -> 10.1.0 (#394495)

parents a04b9772 4f21f5e0
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@
## Introduction {#ssec-octave-introduction}

Octave is a modular scientific programming language and environment.
A majority of the packages supported by Octave from their [website](https://octave.sourceforge.io/packages.php) are packaged in nixpkgs.
A majority of the packages supported by Octave from their [website](https://gnu-octave.github.io/packages/) are packaged in nixpkgs.

## Structure {#ssec-octave-structure}

+4 −0
Original line number Diff line number Diff line
@@ -601,6 +601,10 @@

- `programs.fzf.keybindings` now supports the fish shell.

- `gerbera` now has wavpack support.

- `octave` (and `octaveFull`) was updated to version `10.x`. The update broke a few `octavePackages`, and `librsb`. See [the PR's commits](https://github.com/NixOS/nixpkgs/pull/394495/commits) for more details.

- A toggle has been added under `users.users.<name>.enable` to allow toggling individual users conditionally. If set to false, the user account will not be created.

<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
+2 −2
Original line number Diff line number Diff line
@@ -98,12 +98,12 @@ let
  allPkgs = pkgs;
in
stdenv.mkDerivation (finalAttrs: {
  version = "9.4.0";
  version = "10.1.0";
  pname = "octave";

  src = fetchurl {
    url = "mirror://gnu/octave/octave-${finalAttrs.version}.tar.gz";
    sha256 = "sha256-2pSBIFv6cXZgt9ShZzLYstWKrc6rSZPUEkKo4oSOpsE=";
    sha256 = "sha256-rtRJy6N5/B4Rhuw/w8luCGB4knj7yCOuLOvmA0Q0S3g=";
  };

  postPatch = ''
+8 −8
Original line number Diff line number Diff line
@@ -22,11 +22,11 @@

stdenv.mkDerivation rec {
  pname = "librsb";
  version = "1.2.0.10";
  version = "1.3.0.2";

  src = fetchurl {
    url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz";
    sha256 = "sha256-7Enz94p8Q/yeEJdlk9EAqkmxhjMJ7Y+jzLt6rVLS97g=";
    sha256 = "sha256-GMb8RD+hz9KoEQ99S4jVu8tJO56Fs6YgFLi7V6hI4E8=";
  };

  # The default configure flags are still present when building
@@ -81,7 +81,7 @@ stdenv.mkDerivation rec {
  ];
  checkTarget = "tests";

  meta = with lib; {
  meta = {
    homepage = "https://librsb.sourceforge.net/";
    description = "Shared memory parallel sparse matrix and sparse BLAS library";
    longDescription = ''
@@ -94,10 +94,10 @@ stdenv.mkDerivation rec {
      Contains libraries and header files for developing applications that
      want to make use of librsb.
    '';
    license = with licenses; [ lgpl3Plus ];
    maintainers = with maintainers; [ KarlJoad ];
    platforms = platforms.all;
    # ./rsb_common.h:56:10: fatal error: 'omp.h' file not found
    broken = stdenv.hostPlatform.isDarwin;
    license = with lib.licenses; [ lgpl3Plus ];
    maintainers = with lib.maintainers; [ KarlJoad ];
    platforms = lib.platforms.all;
    # linking errors such as 'undefined reference to `gzungetc'
    broken = true;
  };
}
+4 −4
Original line number Diff line number Diff line
@@ -23,11 +23,11 @@ buildOctavePackage rec {
    arduino-core-unwrapped
  ];

  meta = with lib; {
  meta = {
    name = "Octave Arduino Toolkit";
    homepage = "https://octave.sourceforge.io/arduino/index.html";
    license = licenses.gpl3Plus;
    maintainers = with maintainers; [ KarlJoad ];
    homepage = "https://gnu-octave.github.io/packages/arduino/";
    license = lib.licenses.gpl3Plus;
    maintainers = with lib.maintainers; [ KarlJoad ];
    description = "Basic Octave implementation of the matlab arduino extension, allowing communication to a programmed arduino board to control its hardware";
  };
}
Loading