Commit Graph

153 Commits

Author SHA1 Message Date
Wolfgang Walther
c9d880432a
pkgs/development/interpreters/octave/hooks: remove unused hook file
This was added as a duplicate in
481e1d3a77 but never referenced.
2024-11-15 20:10:27 +01:00
Artturin
f0e657f3b1 Merge branch 'master' into staging-next 2024-09-25 06:05:01 +03:00
Artturin
e0464e4788 treewide: replace stdenv.is with stdenv.hostPlatform.is
In preparation for the deprecation of `stdenv.isX`.

These shorthands are not conducive to cross-compilation because they
hide the platforms.

Darwin might get cross-compilation for which the continued usage of `stdenv.isDarwin` will get in the way

One example of why this is bad and especially affects compiler packages
https://www.github.com/NixOS/nixpkgs/pull/343059

There are too many files to go through manually but a treewide should
get users thinking when they see a `hostPlatform.isX` in a place where it
doesn't make sense.

```
fd --type f "\.nix" | xargs sd --fixed-strings "stdenv.is" "stdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "stdenv'.is" "stdenv'.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "clangStdenv.is" "clangStdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "gccStdenv.is" "gccStdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "stdenvNoCC.is" "stdenvNoCC.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "inherit (stdenv) is" "inherit (stdenv.hostPlatform) is"
fd --type f "\.nix" | xargs sd --fixed-strings "buildStdenv.is" "buildStdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "effectiveStdenv.is" "effectiveStdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "originalStdenv.is" "originalStdenv.hostPlatform.is"
```
2024-09-25 00:04:37 +03:00
Yueh-Shun Li
054c5f0e10 treewide: handle preDistPhases __structuredAttrs-agnostically
Always specify the preDistPhases attribute as a list instead of a string.

Append elements to the preDistPhases Bash variable using appendToVar
instead of string or Bash array concatenation.

Handle element insertion before a specific element using string
substitution as before, but handle both structured and unstructured
attributes.
2024-09-03 05:33:59 +08:00
Sergei Trofimovich
5ee19b6f17 octave.buildEnv: fix the eval
Without the change the eval fails as:

    nix-repl> octave.buildEnv
    error:
       … while evaluating the attribute 'buildEnv'
         at pkgs/development/interpreters/octave/default.nix:205:7:
          204|       inherit enableQt enableReadline enableJava;
          205|       buildEnv = callPackage ./build-env.nix {
             |       ^
          206|         octave = finalAttrs.finalPackage;

       … while calling a functor (an attribute set with a '__functor' attribute)
         at /home/slyfox/dev/git/nixpkgs-master/lib/customisation.nix:264:13:
          263|     in if missingArgs == {}
          264|        then makeOverridable f allArgs
             |             ^
          265|        # This needs to be an abort so it can't be caught with `builtins.tryEval`,

       (stack trace truncated; use '--show-trace' to show the full, detailed trace)

       error: function 'anonymous lambda' called with unexpected argument 'octavePackages'
       at pkgs/development/interpreters/octave/build-env.nix:1:1:
            1| { lib, stdenv, octave, buildEnv
             | ^
            2| , makeWrapper, texinfo
2024-08-06 21:39:08 +01:00
Sigmanificient
63d05d989e pkgs/development: remove unused arguments 2024-08-03 17:18:20 +02:00
Sigmanificient
6dd44107ac treewide: remove unused lib (and other) arguments 2024-07-26 11:18:09 +02:00
R. Ryantm
47b85e1d7a octave: 8.4.0 -> 9.2.0 2024-07-19 01:21:39 +00:00
Doron Behar
2bf27860a0 octave.buildEnv: fix Exec= line in .desktop file
Fixes #311926.
2024-05-15 16:05:16 +03:00
Peder Bergebakken Sundt
f41aba3739 treewide: remove unreferenced patch files
Found with `fd \\.patch$ pkgs/ -x bash -c 'rg -F "{/}" pkgs/ -q || echo {}'`
2023-12-01 06:11:20 +01:00
R. Ryantm
10545e7033 octave: 8.3.0 -> 8.4.0 2023-11-07 08:48:11 +00:00
Doron Behar
138eebe549 qscintilla: move to qt{5,6}Packages.nix
Since it is a somewhat common library, with support for multiple qt
versions, it is safer to put each version of it in libsForQt5 and
qt6Packages attribute sets. Also, it is cleaner to put the darwin
if-else inside the expression, in relation to https://github.com/NixOS/rfcs/pull/140 .
2023-09-21 11:45:35 +03:00
Doron Behar
8ace65ff3d
treewide: use finalAttrs in all packages I maintain (#255902)
* mpd-touch-screen-gui: use finalAttrs in mkDerivation; reformat

* musescore: use finalAttrs in mkDerivation

* syncthingtray: use stdenv.mkDerivation with a function; reformat

* ocrfeeder: use finalAttrs in mkDerivation; reformat

* castget: use finalAttrs in mkDerivation

* gnome-network-displays: use finalAttrs in mkDerivation

* mailreaders: use finalAttrs in mkDerivation

* mswatch: use finalAttrs in mkDerivation

* uhd: use finalAttrs in mkDerivation

* maxima: use finalAttrs in mkDerivation

* qalculate-gtk: use finalAttrs in mkDerivation

* qalculate-qt: use finalAttrs in mkDerivation

* wxmaxima: use finalAttrs in mkDerivation

* lammps: use finalAttrs in mkDerivation

* mlterm: use finalAttrs in mkDerivation

* video-trimmer: use finalAttrs in mkDerivation

* nerdfonts: use finalAttrs in mkDerivation

* gnomeExtensions.easyScreenCast: use finalAttrs in mkDerivation

* octave: use finalAttrs in mkDerivation; reformat

* comedilib: use finalAttrs in mkDerivation

* cpp-utilities: use finalAttrs in mkDerivation

* libsForQt5.kpeoplevcard: use finalAttrs in mkDerivation; reformat

* liberio: use finalAttrs in mkDerivation

* libqalculate: use finalAttrs in mkDerivation; reformat

* libwtk-sdl2: use finalAttrs in mkDerivation

* libsForQt5.pulseaudio-qt: use finalAttrs in mkDerivation; reformat

* qrupdate: use finalAttrs in mkDerivation; reformat

* libsForQt5.qtforkawesome: use finalAttrs in mkDerivation; reformat

* libsForQt5.qtutilities: use finalAttrs in mkDerivation; reformat

* sqlitecpp: use finalAttrs in mkDerivation; reformat

* tweeny: use finalAttrs in mkDerivation

* volk: use finalAttrs in mkDerivation

* wiringpi: use finalAttrs in mkDerivation

* snzip: use finalAttrs in mkDerivation; reformat

* bpm-tools: use finalAttrs in mkDerivation; reformat

* sacd: use finalAttrs in mkDerivation

* gtk-gnutella: use finalAttrs in mkDerivation; reformat

* sile: use finalAttrs in mkDerivation

* pplatex: use finalAttrs in mkDerivation; reformat
2023-09-21 11:31:17 +03:00
R. Ryantm
cca0cba839 octave: 8.2.0 -> 8.3.0 2023-08-31 19:14:49 +00:00
Sandro
cac19e0266
trivial-builders: move into the directory named alike (#223429)
While searching for something different I wondered why there is a
trivial-builders.nix file next to the trivial-builders directory where
only tests live. Lets fix that.
2023-05-06 00:16:26 +02:00
R. Ryantm
2f35bf5d34 octaveFull: 8.1.0 -> 8.2.0 2023-04-17 18:53:20 +00:00
R. Ryantm
97e9bfa750 octave: 7.3.0 -> 8.1.0
https://octave.org/NEWS-8.html
2023-03-28 13:36:08 +03:00
Karl Hallsby
17ea94881f octavePackages: add automatic updating script based on Python's
This script is heavily based on the script used to update all python
libraries at
pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py

The Octave Packages' website uses YAML as their basis, so we must
reformat to use YAML instead of JSON.
2023-03-15 15:58:01 +02:00
github-actions[bot]
58cfebde3e
Merge staging-next into staging 2023-02-15 00:02:50 +00:00
Felix Buehler
cdb39a86e0 treewide: use optionalString 2023-02-13 21:52:34 +01:00
Artturin
4e3dcf364e treewide: makeSetupHook deps -> propagatedBuildInputs 2023-02-07 21:02:00 +02:00
Artturin
9a9c42e19f makeSetupHook: support depsTargetTargetPropagated 2023-02-07 21:00:18 +02:00
figsoda
ec8cb34358 treewide: fix typos 2022-12-17 19:39:44 -05:00
Markus Kowalewski
5ed3812a9f
octave: enable JSON
Add rapidjson to inputs, which enables the functions
jsonencode and jsondecode.
2022-11-10 10:36:31 +01:00
Doron Behar
b42282abdf octave: 7.1.0 -> 7.3.0 2022-11-05 20:56:58 +02:00
Karl Hallsby
8399907be3 octave: add patch for octave incorrectly failing on package builds
Patch comes from https://savannah.gnu.org/bugs/?func=detailitem&item_id=62436
2022-05-13 12:50:35 -05:00
Doron Behar
88e6baf832 octave: Remove JIT support (removed upstream) 2022-04-09 19:52:16 +03:00
R. Ryantm
bd1e8ccfef octave: 6.4.0 -> 7.1.0 2022-04-08 16:23:23 +00:00
Tom McLaughlin
3aab0e3ad9
Fix typo in Octave description (#147799) 2021-11-29 11:22:43 +08:00
github-actions[bot]
9d44a614de
Merge master into staging-next 2021-11-19 12:01:09 +00:00
Doron Behar
03a46c8b3d
Merge pull request #144155 from KarlJoad/octave/update-packages 2021-11-19 09:12:45 +02:00
Kim Lindberger
855a211fd9
Merge pull request #145473 from talyz/qt512-big-sur-fix
qt512: Make apps work on macOS Big Sur
2021-11-15 19:46:52 +01:00
Doron Behar
ecc55a619d octave: 6.3.0 -> 6.4.0 2021-11-12 14:55:56 +02:00
talyz
39ce18a7ec
qt512: Make apps work on macOS Big Sur
Make Qt applications work on macOS Big Sur even if they're built with
an older version of the macOS SDK (<10.14 - we're currently using
10.12). This issue is fixed in 5.12.11, but it requires macOS SDK
10.13 to build. See https://bugreports.qt.io/browse/QTBUG-87014 for
more info.
2021-11-11 11:11:08 +01:00
Karl Hallsby
e80c50b44d octavePackages: buildOctavePackage respects user-provided hooks
octavePackages: Allow user to provide extra steps and information
2021-11-01 16:21:21 -05:00
Doron Behar
4a49c7bf1f octave: 6.2.0 -> 6.3.0 2021-10-11 13:48:41 +03:00
Graham Bennett
461466306e octaveFull: set QT_MAC_WANTS_LAYER=1 on Darwin
This avoids a Qt 5.12 problem on Big Sur:
https://bugreports.qt.io/browse/QTBUG-87014
2021-07-24 20:45:24 +01:00
Graham Bennett
09b931bd40 octaveFull: fix linker error on Darwin
See https://trac.macports.org/ticket/61865.
2021-07-24 13:02:54 +01:00
Doron Behar
351187d848 octave.buildEnv: Handle better no packages situation
Use `rm -f` for *.tar.gz files so the command won't fail in case there
aren't any packages.
Create the `$out/.octave_packages` file before iterating the packages.
2021-05-23 09:19:18 +03:00
John Ericson
07ecf87693 treewide: Fix various tools wrappers "with packages"
Now that `buildEnv` is ready, always put `makeWrapper` in
`nativeBuildInputs`, rather than `buildInputs` or (worse) mucking around
with setup hooks by hand.

(C.f. #112276, which didn't catch these because the manual setup hook
sourcing is such a hack to being with!)

Fixes #114687
2021-03-02 22:38:04 +00:00
Cole Helbling
24e5a77861
octave.pkgs: stdenv.lib -> lib
stdenv.lib is a deprecated alias to lib.
2021-02-25 22:16:54 -08:00
Karl Hallsby
481e1d3a77 octave.pkgs: init
Heavily based on Python's packages set.
2021-02-24 21:00:48 +02:00
R. RyanTM
1563577634 octave: 6.1.0 -> 6.2.0 2021-02-22 10:57:14 -05:00
Doron Behar
f9c6e07c67 treewide: Remove usages of stdenv.lib by @doronbehar
Per: https://github.com/NixOS/nixpkgs/issues/108938
2021-01-23 10:52:19 +02:00
Jonathan Ringer
9bb3fccb5b treewide: pkgs.pkgconfig -> pkgs.pkg-config, move pkgconfig to alias.nix
continuation of #109595

pkgconfig was aliased in 2018, however, it remained in
all-packages.nix due to its wide usage. This cleans
up the remaining references to pkgs.pkgsconfig and
moves the entry to aliases.nix.

python3Packages.pkgconfig remained unchanged because
it's the canonical name of the upstream package
on pypi.
2021-01-19 01:16:25 -08:00
Doron Behar
865f8ae377 octave: Use latest sundials 2020-12-19 10:58:04 +02:00
Doron Behar
421e81780c octave: inherit features enabled in passthru 2020-12-19 10:31:29 +02:00
Doron Behar
58b27b5ffe octave: inherit python in passthru
For in case one day python will be overridden, we'll know which python
to use.
2020-12-19 10:28:14 +02:00
Doron Behar
74c94d1a35 octave: Remove version from passthru
It's already defined in the derivation.
2020-12-19 10:27:43 +02:00
Doron Behar
247cf9f283 octave: add @doronbehar as maintainer 2020-12-19 10:12:18 +02:00