diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2021-02-26 10:25:13 +0100 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2021-02-26 10:25:13 +0100 |
commit | c456a2512f7a7558cbe25328a423762033822cc0 (patch) | |
tree | d64f521751037012a1c4d05fedeb485eeee39b05 /pkgs/applications/science | |
parent | babf9d6100c3e5dcdbbbe8850de99d3fe2b3cf86 (diff) | |
parent | 6d7128414cf2763ab14f31365c21c6cec3547dac (diff) | |
download | nixpkgs-c456a2512f7a7558cbe25328a423762033822cc0.tar nixpkgs-c456a2512f7a7558cbe25328a423762033822cc0.tar.gz nixpkgs-c456a2512f7a7558cbe25328a423762033822cc0.tar.bz2 nixpkgs-c456a2512f7a7558cbe25328a423762033822cc0.tar.lz nixpkgs-c456a2512f7a7558cbe25328a423762033822cc0.tar.xz nixpkgs-c456a2512f7a7558cbe25328a423762033822cc0.tar.zst nixpkgs-c456a2512f7a7558cbe25328a423762033822cc0.zip |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/science')
10 files changed, 34 insertions, 33 deletions
diff --git a/pkgs/applications/science/biology/star/default.nix b/pkgs/applications/science/biology/star/default.nix index 34586384737..9ad53502cd7 100644 --- a/pkgs/applications/science/biology/star/default.nix +++ b/pkgs/applications/science/biology/star/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "star"; - version = "2.7.7a"; + version = "2.7.8a"; src = fetchFromGitHub { repo = "STAR"; owner = "alexdobin"; rev = version; - sha256 = "sha256-0K49yjcnTzC56ZIB20OeTiMJ5EW8mRx+xEpyWEfFcts="; + sha256 = "sha256-2qqdCan67bcoUGgr5ro2LGGHDAyS/egTrT8pWX1chX0="; }; sourceRoot = "source/source"; diff --git a/pkgs/applications/science/electronics/diylc/default.nix b/pkgs/applications/science/electronics/diylc/default.nix index 70d07460a75..dac6713a495 100644 --- a/pkgs/applications/science/electronics/diylc/default.nix +++ b/pkgs/applications/science/electronics/diylc/default.nix @@ -2,11 +2,11 @@ let pname = "diylc"; - version = "4.15.1"; + version = "4.17.0"; files = { app = fetchurl { url = "https://github.com/bancika/diy-layout-creator/releases/download/v${version}/diylc-${version}.zip"; - sha256 = "09vzbxas654n8npxljqljf930y5gcjfvv3r4dv97dwk5sy66xvaf"; + sha256 = "0cysqkrddhbs7rprm8xm21c286mz4apw66fxakhzlg50kjn0nwjv"; }; icon16 = fetchurl { url = "https://raw.githubusercontent.com/bancika/diy-layout-creator/v${version}/diylc/diylc-core/src/org/diylc/core/images/icon_small.png"; @@ -39,6 +39,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ unzip ]; installPhase = '' + runHook preInstall + install -d $out/share/diylc ${unzip}/bin/unzip -UU ${files.app} -d $out/share/diylc rm $out/share/diylc/diylc.exe @@ -59,6 +61,8 @@ stdenv.mkDerivation rec { ${jre8}/bin/java -Xms512m -Xmx2048m -Dorg.diylc.scriptRun=true -Dfile.encoding=UTF-8 -cp diylc.jar:lib org.diylc.DIYLCStarter EOF chmod +x $out/bin/diylc + + runHook postInstall ''; meta = with lib; { @@ -67,5 +71,6 @@ stdenv.mkDerivation rec { changelog = "https://github.com/bancika/diy-layout-creator/releases"; license = licenses.gpl3Plus; platforms = platforms.linux; + maintainers = with maintainers; [ eduardosm ]; }; } diff --git a/pkgs/applications/science/electronics/kicad/base.nix b/pkgs/applications/science/electronics/kicad/base.nix index 3ed6234b4f8..1a5c0de5fb7 100644 --- a/pkgs/applications/science/electronics/kicad/base.nix +++ b/pkgs/applications/science/electronics/kicad/base.nix @@ -1,5 +1,5 @@ -{ lib, stdenv -, fetchFromGitLab +{ lib +, stdenv , cmake , libGLU , libGL @@ -18,9 +18,7 @@ , pcre , libpthreadstubs , libXdmcp -, fetchpatch , lndir -, callPackage , stable , baseName diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix index 88bb7978881..dcf51e657c4 100644 --- a/pkgs/applications/science/electronics/kicad/default.nix +++ b/pkgs/applications/science/electronics/kicad/default.nix @@ -15,19 +15,15 @@ , stable ? true , oceSupport ? false , withOCE ? false -, opencascade , withOCCT ? false , withOCC ? true -, opencascade-occt , ngspiceSupport ? false , withNgspice ? true , libngspice , scriptingSupport ? false , withScripting ? true -, swig , python3 , debug ? false -, valgrind , with3d ? true , withI18n ? true , srcs ? { } diff --git a/pkgs/applications/science/electronics/ngspice/default.nix b/pkgs/applications/science/electronics/ngspice/default.nix index f8fbdffc634..0eed8b1692a 100644 --- a/pkgs/applications/science/electronics/ngspice/default.nix +++ b/pkgs/applications/science/electronics/ngspice/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "ngspice"; - version = "33"; + version = "34"; src = fetchurl { url = "mirror://sourceforge/ngspice/ngspice-${version}.tar.gz"; - sha256 = "1wa1hmpn13spmxqgbb1m7vgy32mwvjqwrxhymzll8z65q5nbd7dr"; + sha256 = "sha256-ImP//GaUdUlyr3By7wHP5irHkIANrWUbwpC/yueb17U="; }; nativeBuildInputs = [ flex bison ]; diff --git a/pkgs/applications/science/logic/acgtk/default.nix b/pkgs/applications/science/logic/acgtk/default.nix index 13364beed5c..1cf08741206 100644 --- a/pkgs/applications/science/logic/acgtk/default.nix +++ b/pkgs/applications/science/logic/acgtk/default.nix @@ -1,20 +1,20 @@ -{ lib, stdenv, fetchurl, dune, ocamlPackages }: +{ lib, stdenv, fetchurl, dune_2, ocamlPackages }: stdenv.mkDerivation { pname = "acgtk"; - version = "1.5.1"; + version = "1.5.2"; src = fetchurl { - url = "https://acg.loria.fr/software/acg-1.5.1-20191113.tar.gz"; - sha256 = "17595qfwhzz5q091ak6i6bg5wlppbn8zfn58x3hmmmjvx2yfajn1"; + url = "https://acg.loria.fr/software/acg-1.5.2-20201204.tar.gz"; + sha256 = "09yax7dyw8kgwzlb69r9d20y7rrymzwi3bbq2dh0qdq01vjz2xwq"; }; - buildInputs = [ dune ] ++ (with ocamlPackages; [ + buildInputs = [ dune_2 ] ++ (with ocamlPackages; [ ocaml findlib ansiterminal cairo2 cmdliner fmt logs menhir mtime yojson ]); - buildPhase = "dune build"; + buildPhase = "dune build --profile=release"; installPhase = '' dune install --prefix $out --libdir $OCAMLFIND_DESTDIR diff --git a/pkgs/applications/science/logic/alt-ergo/default.nix b/pkgs/applications/science/logic/alt-ergo/default.nix index 519b1f98138..dd72d148e29 100644 --- a/pkgs/applications/science/logic/alt-ergo/default.nix +++ b/pkgs/applications/science/logic/alt-ergo/default.nix @@ -9,20 +9,22 @@ let sha256 = "124k2a4ikk4wdpmvgjpgl97x9skvr9qznk8m68dzsynzpv6yksaj"; }; + useDune2 = true; + nativeBuildInputs = [ which ]; in let alt-ergo-lib = ocamlPackages.buildDunePackage rec { pname = "alt-ergo-lib"; - inherit version src nativeBuildInputs; + inherit version src useDune2 nativeBuildInputs; configureFlags = pname; propagatedBuildInputs = with ocamlPackages; [ num ocplib-simplex stdlib-shims zarith ]; }; in let alt-ergo-parsers = ocamlPackages.buildDunePackage rec { pname = "alt-ergo-parsers"; - inherit version src nativeBuildInputs; + inherit version src useDune2 nativeBuildInputs; configureFlags = pname; buildInputs = with ocamlPackages; [ menhir ]; propagatedBuildInputs = [ alt-ergo-lib ] ++ (with ocamlPackages; [ camlzip psmt2-frontend ]); @@ -30,7 +32,7 @@ let alt-ergo-parsers = ocamlPackages.buildDunePackage rec { ocamlPackages.buildDunePackage { - inherit pname version src nativeBuildInputs; + inherit pname version src useDune2 nativeBuildInputs; configureFlags = pname; diff --git a/pkgs/applications/science/logic/hol/default.nix b/pkgs/applications/science/logic/hol/default.nix index 6fc7286154a..569c455e653 100644 --- a/pkgs/applications/science/logic/hol/default.nix +++ b/pkgs/applications/science/logic/hol/default.nix @@ -3,14 +3,14 @@ let pname = "hol4"; - vnum = "10"; + vnum = "14"; in let version = "k.${vnum}"; longVersion = "kananaskis-${vnum}"; holsubdir = "hol-${longVersion}"; - kernelFlag = if experimentalKernel then "-expk" else "-stdknl"; + kernelFlag = if experimentalKernel then "--expk" else "--stdknl"; in let @@ -24,7 +24,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://sourceforge/hol/hol/${longVersion}/${holsubdir}.tar.gz"; - sha256 = "0x2wxksr305h1lrbklf6p42lp09rbhb4rsh74g0l70sgapyiac9b"; + sha256 = "6Mc/qsEjzxGqzt6yP6x/1Tmqpwc1UDGlwV1Gl+4pMsY="; }; buildInputs = [polymlEnableShared graphviz fontconfig liberation_ttf]; @@ -46,8 +46,8 @@ stdenv.mkDerivation { cd ${holsubdir} substituteInPlace tools/Holmake/Holmake_types.sml \ - --replace "\"/bin/mv\"" "\"mv\"" \ - --replace "\"/bin/cp\"" "\"cp\"" + --replace "\"/bin/" "\"" \ + for f in tools/buildutils.sml help/src-sml/DOT; do @@ -58,7 +58,7 @@ stdenv.mkDerivation { poly < tools/smart-configure.sml - bin/build ${kernelFlag} -symlink + bin/build ${kernelFlag} mkdir -p "$out/bin" ln -st $out/bin $out/src/${holsubdir}/bin/* @@ -81,8 +81,7 @@ stdenv.mkDerivation { ''; homepage = "http://hol.sourceforge.net/"; license = licenses.bsd3; + platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ mudri ]; - platforms = with platforms; linux; - broken = true; }; } diff --git a/pkgs/applications/science/math/calc/default.nix b/pkgs/applications/science/math/calc/default.nix index 256e7b45bca..456ce878e49 100644 --- a/pkgs/applications/science/math/calc/default.nix +++ b/pkgs/applications/science/math/calc/default.nix @@ -42,7 +42,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "C-style arbitrary precision calculator"; homepage = "http://www.isthe.com/chongo/tech/comp/calc/"; - license = licenses.lgpl21Only; + # The licensing situation depends on readline (see section 3 of the LGPL) + # If linked against readline then GPLv2 otherwise LGPLv2.1 + license = with licenses; if enableReadline then gpl2Only else lgpl21Only; maintainers = with maintainers; [ matthewbauer ]; platforms = platforms.all; }; diff --git a/pkgs/applications/science/math/nasc/default.nix b/pkgs/applications/science/math/nasc/default.nix index 931e83defdc..b55e4047fe4 100644 --- a/pkgs/applications/science/math/nasc/default.nix +++ b/pkgs/applications/science/math/nasc/default.nix @@ -9,7 +9,6 @@ , gtk3 , glib , pantheon -, libsoup , gtksourceview , libgee , nix-update-script |