diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-09-21 12:01:19 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-09-21 12:01:19 +0000 |
commit | 4c610adf95276c9c810b715121bd24ad453dc77a (patch) | |
tree | 9363bf05c0d30523c23b7b6f1685a13f4b1f5671 /pkgs/applications/science | |
parent | 743d7baa31ff74f2e1dbf09a6ea38a7e24aedfc3 (diff) | |
parent | c9a667043fdd65c3511d9b61481240dd56c56f2d (diff) |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/science')
6 files changed, 19 insertions, 19 deletions
diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index 86111327f063f..fe8180899c0a4 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -55,7 +55,7 @@ let "8.16.1".sha256 = "sha256-n7830+zfZeyYHEOGdUo57bH6bb2/SZs8zv8xJhV+iAc="; "8.17.0".sha256 = "sha256-TGwm7S6+vkeZ8cidvp8pkiAd9tk008jvvPvYgfEOXhM="; "8.17.1".sha256 = "sha256-x+RwkbxMg9aR0L3WSCtpIz8jwA5cJA4tXAtHMZb20y4="; - "8.18+rc1".sha256 = "sha256-TmV0lzfzhpSnBoVyfTfVFUyBrXpUWSnyN1Le7b8IPTs="; + "8.18.0".sha256 = "sha256-WhiBs4nzPHQ0R24xAdM49kmxSCPOxiOVMA1iiMYunz4="; }; releaseRev = v: "V${v}"; fetched = import ../../../../build-support/coq/meta-fetch/default.nix diff --git a/pkgs/applications/science/math/maxima/default.nix b/pkgs/applications/science/math/maxima/default.nix index c102c645b3bf9..e7ac178cd5d13 100644 --- a/pkgs/applications/science/math/maxima/default.nix +++ b/pkgs/applications/science/math/maxima/default.nix @@ -18,12 +18,12 @@ let searchPath = lib.makeBinPath (lib.filter (x: x != null) [ lisp-compiler rlwrap tk gnuplot ]); in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "maxima"; version = "5.46.0"; src = fetchurl { - url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; + url = "mirror://sourceforge/${finalAttrs.pname}/${finalAttrs.pname}-${finalAttrs.version}.tar.gz"; sha256 = "sha256-c5Dwa0jaZckDPosvYpuXi5AFZFSlQCLbfecOIiWqiwc="; }; @@ -52,11 +52,11 @@ stdenv.mkDerivation rec { done # Move emacs modules and documentation into the right place. mkdir -p $out/share/emacs $out/share/doc - ln -s ../maxima/${version}/emacs $out/share/emacs/site-lisp - ln -s ../maxima/${version}/doc $out/share/doc/maxima + ln -s ../maxima/${finalAttrs.version}/emacs $out/share/emacs/site-lisp + ln -s ../maxima/${finalAttrs.version}/doc $out/share/doc/maxima '' + (lib.optionalString (lisp-compiler.pname == "ecl") '' - cp src/binary-ecl/maxima.fas* "$out/lib/maxima/${version}/binary-ecl/" + cp src/binary-ecl/maxima.fas* "$out/lib/maxima/${finalAttrs.version}/binary-ecl/" '') ; @@ -115,4 +115,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ doronbehar ]; platforms = platforms.unix; }; -} +}) diff --git a/pkgs/applications/science/math/qalculate-gtk/default.nix b/pkgs/applications/science/math/qalculate-gtk/default.nix index 405561510be0e..f245e8745b4a0 100644 --- a/pkgs/applications/science/math/qalculate-gtk/default.nix +++ b/pkgs/applications/science/math/qalculate-gtk/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub, intltool, autoreconfHook, pkg-config, libqalculate, gtk3, curl, wrapGAppsHook }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "qalculate-gtk"; version = "4.8.0"; src = fetchFromGitHub { owner = "qalculate"; repo = "qalculate-gtk"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-GYy3Ot2vjXpCp89Rib3Ua0XeVGOOTejKcaqNZvPmxm0="; }; @@ -24,4 +24,4 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; platforms = platforms.all; }; -} +}) diff --git a/pkgs/applications/science/math/qalculate-qt/default.nix b/pkgs/applications/science/math/qalculate-qt/default.nix index be9dd27695f7e..34d2d98171eb5 100644 --- a/pkgs/applications/science/math/qalculate-qt/default.nix +++ b/pkgs/applications/science/math/qalculate-qt/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub, intltool, pkg-config, qmake, wrapQtAppsHook, libqalculate, qtbase, qttools, qtsvg, qtwayland }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "qalculate-qt"; version = "4.8.0"; src = fetchFromGitHub { owner = "qalculate"; repo = "qalculate-qt"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-7VlaoiY+HgHCMZCegUdy2wpgfx3fKaViMtkdNRleHaA="; }; @@ -33,4 +33,4 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; platforms = platforms.unix; }; -} +}) diff --git a/pkgs/applications/science/math/wxmaxima/default.nix b/pkgs/applications/science/math/wxmaxima/default.nix index ee2f62317c0cd..c475dbd5ef2b6 100644 --- a/pkgs/applications/science/math/wxmaxima/default.nix +++ b/pkgs/applications/science/math/wxmaxima/default.nix @@ -10,14 +10,14 @@ , glib }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs:{ pname = "wxmaxima"; version = "23.02.1"; src = fetchFromGitHub { owner = "wxMaxima-developers"; repo = "wxmaxima"; - rev = "Version-${version}"; + rev = "Version-${finalAttrs.version}"; sha256 = "sha256-Lrj/oJNmKlCkNbnCGY2TewCospwajKdWgmKkreHzEIU="; }; @@ -51,4 +51,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ doronbehar ]; platforms = platforms.linux; }; -} +}) diff --git a/pkgs/applications/science/molecular-dynamics/lammps/default.nix b/pkgs/applications/science/molecular-dynamics/lammps/default.nix index 580dbb6796800..f11e9bdeeb13e 100644 --- a/pkgs/applications/science/molecular-dynamics/lammps/default.nix +++ b/pkgs/applications/science/molecular-dynamics/lammps/default.nix @@ -43,7 +43,7 @@ , extraBuildInputs ? [] }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { # LAMMPS has weird versioning converted to ISO 8601 format version = "2Aug2023"; pname = "lammps"; @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "lammps"; repo = "lammps"; - rev = "stable_${version}"; + rev = "stable_${finalAttrs.version}"; hash = "sha256-6T4YAa4iN3pJpODGPW+faR16xxyYYdkHLavtiPUbZ4o="; }; preConfigure = '' @@ -117,4 +117,4 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.costrouc maintainers.doronbehar ]; mainProgram = "lmp"; }; -} +}) |