diff options
Diffstat (limited to 'nixpkgs/pkgs/applications/science')
76 files changed, 620 insertions, 315 deletions
diff --git a/nixpkgs/pkgs/applications/science/astronomy/kstars/default.nix b/nixpkgs/pkgs/applications/science/astronomy/kstars/default.nix new file mode 100644 index 00000000000..0b53e3e85ac --- /dev/null +++ b/nixpkgs/pkgs/applications/science/astronomy/kstars/default.nix @@ -0,0 +1,48 @@ +{ + mkDerivation, lib, fetchgit, + extra-cmake-modules, + + kconfig, kdoctools, kguiaddons, ki18n, kinit, kiconthemes, kio, + knewstuff, kplotting, kwidgetsaddons, kxmlgui, + + qtx11extras, qtwebsockets, + + eigen, zlib, + + cfitsio, indilib, xplanet +}: + +mkDerivation { + name = "kstars"; + + src = fetchgit { + url = "https://anongit.kde.org/kstars.git"; + rev = "7acc527939280edd22823371dc4e22494c6c626a"; + sha256 = "1n1lgi7p3dj893fdnzjbnrha40p4apl0dy8zppcabxwrb1khb84v"; + }; + + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ + kconfig kdoctools kguiaddons ki18n kinit kiconthemes kio + knewstuff kplotting kwidgetsaddons kxmlgui + + qtx11extras qtwebsockets + + eigen zlib + + cfitsio indilib xplanet + ]; + + meta = with lib; { + description = "Virtual planetarium astronomy software"; + homepage = "https://kde.org/applications/education/org.kde.kstars"; + longDescription = '' + It provides an accurate graphical simulation of the night sky, from any location on Earth, at any date and time. + The display includes up to 100 million stars, 13.000 deep-sky objects, all 8 planets, the Sun and Moon, and thousands of comets, asteroids, supernovae, and satellites. + For students and teachers, it supports adjustable simulation speeds in order to view phenomena that happen over long timescales, the KStars Astrocalculator to predict conjunctions, and many common astronomical calculations. + ''; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ timput ]; + }; +} diff --git a/nixpkgs/pkgs/applications/science/astronomy/stellarium/default.nix b/nixpkgs/pkgs/applications/science/astronomy/stellarium/default.nix index a0cd535f362..7ef7776c0fe 100644 --- a/nixpkgs/pkgs/applications/science/astronomy/stellarium/default.nix +++ b/nixpkgs/pkgs/applications/science/astronomy/stellarium/default.nix @@ -6,13 +6,13 @@ mkDerivation rec { pname = "stellarium"; - version = "0.20.0"; + version = "0.20.1"; src = fetchFromGitHub { owner = "Stellarium"; repo = "stellarium"; rev = "v${version}"; - sha256 = "1732dxkgyqd4xf0ry7v930vcbv60l8iry596869z1d47j2piibs4"; + sha256 = "1x8svan03k1x9jwqflimbpj7jpg6mjrbz26bg1sbhsqdlc8rbhky"; }; nativeBuildInputs = [ cmake perl wrapQtAppsHook ]; diff --git a/nixpkgs/pkgs/applications/science/biology/EZminc/default.nix b/nixpkgs/pkgs/applications/science/biology/EZminc/default.nix index 978615fa459..7502a4ffd2a 100644 --- a/nixpkgs/pkgs/applications/science/biology/EZminc/default.nix +++ b/nixpkgs/pkgs/applications/science/biology/EZminc/default.nix @@ -1,18 +1,18 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, libminc, bicpl, itk, fftwFloat, gsl }: +{ stdenv, fetchFromGitHub, cmake, pkgconfig, libminc, bicpl, itk4, fftwFloat, gsl }: stdenv.mkDerivation rec { pname = "EZminc"; - name = "${pname}-unstable-2019-07-25"; + name = "${pname}-unstable-2019-03-12"; src = fetchFromGitHub { owner = "BIC-MNI"; repo = pname; - rev = "9591edd5389a5bda2c1f606816c7cdb35c065adf"; - sha256 = "02k87qbpx0f48l2lbcjmlqx82py684z3sfi29va5icfg3hjd6j7b"; + rev = "5e3333ee356f914d34d66d33ea8df809c7f7fa51"; + sha256 = "0wy8cppf5xpgfqvgb3mqs1cjh81n6qzkk6zxv29wvng8nar9wsy4"; }; nativeBuildInputs = [ cmake pkgconfig ]; - buildInputs = [ itk libminc bicpl fftwFloat gsl ]; + buildInputs = [ itk4 libminc bicpl fftwFloat gsl ]; cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/" "-DEZMINC_BUILD_TOOLS=TRUE" diff --git a/nixpkgs/pkgs/applications/science/biology/dcm2niix/default.nix b/nixpkgs/pkgs/applications/science/biology/dcm2niix/default.nix index 8ea3588fa8c..59b173ac98c 100644 --- a/nixpkgs/pkgs/applications/science/biology/dcm2niix/default.nix +++ b/nixpkgs/pkgs/applications/science/biology/dcm2niix/default.nix @@ -6,14 +6,14 @@ }: stdenv.mkDerivation rec { - version = "1.0.20190902"; + version = "1.0.20200331"; pname = "dcm2niix"; src = fetchFromGitHub { owner = "rordenlab"; repo = "dcm2niix"; rev = "v${version}"; - sha256 = "0h8jsadgv831lqb0jhnaxm7lldirmnp5agrhgg5bcxvn860fl15b"; + sha256 = "1cncfwhyhmg18n970lkn6yvp0i74ajznsl8dqz00asqfzmg681n1"; }; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/applications/science/biology/mosdepth/default.nix b/nixpkgs/pkgs/applications/science/biology/mosdepth/default.nix index 569c63afa7a..21af5b82207 100644 --- a/nixpkgs/pkgs/applications/science/biology/mosdepth/default.nix +++ b/nixpkgs/pkgs/applications/science/biology/mosdepth/default.nix @@ -4,8 +4,8 @@ let hts-nim = fetchFromGitHub { owner = "brentp"; repo = "hts-nim"; - rev = "v0.2.14"; - sha256 = "0d1z4b6mrppmz3hgkxd4wcy79w68icvhi7q7n3m2k17n8f3xbdx3"; + rev = "v0.3.4"; + sha256 = "0670phk1bq3l9j2zaa8i5wcpc5dyfrc0l2a6c21g0l2mmdczffa7"; }; docopt = fetchFromGitHub { @@ -17,13 +17,13 @@ let in stdenv.mkDerivation rec { pname = "mosdepth"; - version = "0.2.6"; + version = "0.2.9"; src = fetchFromGitHub { owner = "brentp"; repo = "mosdepth"; rev = "v${version}"; - sha256 = "0i9pl9lsli3y84ygxanrr525gfg8fs9h481944cbzsmqmbldwvgk"; + sha256 = "01gm9gj2x2zs4yx6wk761fi1papi7qr3gp4ln1kkn8n2f9y9h849"; }; buildInputs = [ nim ]; diff --git a/nixpkgs/pkgs/applications/science/biology/mrtrix/default.nix b/nixpkgs/pkgs/applications/science/biology/mrtrix/default.nix index 6959b2caab8..528277e05e3 100644 --- a/nixpkgs/pkgs/applications/science/biology/mrtrix/default.nix +++ b/nixpkgs/pkgs/applications/science/biology/mrtrix/default.nix @@ -1,17 +1,17 @@ { stdenv, lib, fetchFromGitHub, python, makeWrapper -, eigen, fftw, libtiff, zlib, ants, bc +, eigen, fftw, libtiff, libpng, zlib, ants, bc , qt5, libGL, libGLU, libX11, libXext , withGui ? true }: stdenv.mkDerivation rec { pname = "mrtrix"; - version = "3.0_RC3_latest"; + version = "3.0.0"; src = fetchFromGitHub { owner = "MRtrix3"; repo = "mrtrix3"; rev = version; - sha256 = "184nv524p8j94qicjy9l288bqcgl2yxqqs55a7042i0gfsnwp51c"; + sha256 = "1vvmmbw3m0bdfwp4szr62ygzsvkj0ss91cx5zlkspsr1rff05f9b"; fetchSubmodules = true; }; @@ -22,7 +22,9 @@ stdenv.mkDerivation rec { python fftw libtiff - zlib ] ++ lib.optionals withGui [ + libpng + zlib + ] ++ lib.optionals withGui [ libGL libGLU libX11 @@ -34,9 +36,14 @@ stdenv.mkDerivation rec { installCheckInputs = [ bc ]; postPatch = '' - patchShebangs ./build ./configure ./run_tests ./bin/population_template + patchShebangs ./build ./configure ./run_tests ./bin/* + + # patching interpreters before fixup is needed for tests: + patchShebangs ./bin/* + patchShebangs testing/binaries/data/vectorstats/*py + substituteInPlace ./run_tests \ - --replace 'git submodule update --init >> $LOGFILE 2>&1' "" + --replace 'git submodule update --init $datadir >> $LOGFILE 2>&1' "" ''; configurePhase = '' @@ -50,7 +57,13 @@ stdenv.mkDerivation rec { (cd testing && ../build) ''; - installCheckPhase = "./run_tests"; + installCheckPhase = '' + ./run_tests units + ./run_tests binaries + + # can also `./run_tests scripts`, but this fails due to lack of FSL package + # (and there's no convenient way to disable individual tests) + ''; doInstallCheck = true; installPhase = '' @@ -63,7 +76,9 @@ stdenv.mkDerivation rec { postInstall = '' for prog in $out/bin/*; do - wrapProgram $prog --prefix PATH : ${lib.makeBinPath [ ants ]} + if [[ -x "$prog" ]]; then + wrapProgram $prog --prefix PATH : ${lib.makeBinPath [ ants ]} + fi done ''; diff --git a/nixpkgs/pkgs/applications/science/biology/picard-tools/default.nix b/nixpkgs/pkgs/applications/science/biology/picard-tools/default.nix index 246c9876810..5073d0f0f32 100644 --- a/nixpkgs/pkgs/applications/science/biology/picard-tools/default.nix +++ b/nixpkgs/pkgs/applications/science/biology/picard-tools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "picard-tools"; - version = "2.22.2"; + version = "2.22.4"; src = fetchurl { url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar"; - sha256 = "11mzz483f89pb2s8jmwhl12d0m6k41kmi4xh0i6hq69rxrqi8l4s"; + sha256 = "0gzna5df8nk42l7mc0qbp9h73gwr1030jnw10fawjp6ql6213kdd"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/applications/science/biology/plink-ng/default.nix b/nixpkgs/pkgs/applications/science/biology/plink-ng/default.nix index 13f00c53fe6..0a31ff6ba4f 100644 --- a/nixpkgs/pkgs/applications/science/biology/plink-ng/default.nix +++ b/nixpkgs/pkgs/applications/science/biology/plink-ng/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, zlib, openblas, darwin}: +{ stdenv, fetchFromGitHub, zlib, blas, lapack, darwin}: stdenv.mkDerivation rec { pname = "plink-ng"; @@ -11,14 +11,20 @@ stdenv.mkDerivation rec { sha256 = "1zhffjbwpd50dxywccbnv1rxy9njwz73l4awc5j7i28rgj3davcq"; }; - buildInputs = [ zlib ] ++ (if stdenv.isDarwin then [ darwin.apple_sdk.frameworks.Accelerate ] else [ openblas ]) ; + buildInputs = [ zlib ] ++ (if stdenv.isDarwin then [ darwin.apple_sdk.frameworks.Accelerate ] else [ blas lapack ]) ; - buildPhase = '' + preBuild = '' sed -i 's|zlib-1.2.8/zlib.h|zlib.h|g' *.c *.h ${if stdenv.cc.isClang then "sed -i 's|g++|clang++|g' Makefile.std" else ""} - make ZLIB=-lz ${if stdenv.isDarwin then "" else "BLASFLAGS=-lopenblas"} -f Makefile.std + + makeFlagsArray+=( + ZLIB=-lz + BLASFLAGS="-lblas -lcblas -llapack" + ); ''; + makefile = "Makefile.std"; + installPhase = '' mkdir -p $out/bin cp plink $out/bin @@ -31,4 +37,3 @@ stdenv.mkDerivation rec { platforms = stdenv.lib.platforms.linux; }; } - diff --git a/nixpkgs/pkgs/applications/science/biology/quast/default.nix b/nixpkgs/pkgs/applications/science/biology/quast/default.nix new file mode 100644 index 00000000000..e3c3ea23c2c --- /dev/null +++ b/nixpkgs/pkgs/applications/science/biology/quast/default.nix @@ -0,0 +1,58 @@ +{ stdenv, fetchurl, python3Packages, zlib, bash, coreutils }: + +let + pythonPackages = python3Packages; + inherit (pythonPackages) python; +in + +pythonPackages.buildPythonApplication rec { + pname = "quast"; + version = "5.0.2"; + + src = fetchurl { + url = "https://github.com/ablab/quast/releases/download/${pname}_${version}/${pname}-${version}.tar.gz"; + sha256 = "13ml8qywbb4cc7wf2x7z5mz1rjqg51ab8wkizwcg4f6c40zgif6d"; + }; + + pythonPath = with pythonPackages; [ simplejson joblib setuptools matplotlib ]; + + nativeBuildInputs = [ coreutils ]; + + buildInputs = [ zlib ] ++ pythonPath; + + dontConfigure = true; + + dontBuild = true; + + installPhase = '' + substituteInPlace quast_libs/bedtools/Makefile \ + --replace "/bin/bash" "${bash}/bin/bash" + mkdir -p "$out/${python.sitePackages}" + export PYTHONPATH="$out/${python.sitePackages}:$PYTHONPATH" + ${python.interpreter} setup.py install \ + --install-lib=$out/${python.sitePackages} \ + --prefix="$out" + ''; + + postFixup = '' + for file in $(find $out -type f -type f -perm /0111); do + old_rpath=$(patchelf --print-rpath $file) && \ + patchelf --set-rpath $old_rpath:${stdenv.cc.cc.lib}/lib $file || true + done + # Link to the master program + ln -s $out/bin/quast.py $out/bin/quast + ''; + + dontPatchELF = true; + + # Tests need to download data files, so manual run after packaging is needed + doCheck = false; + + meta = with stdenv.lib ; { + description = "Evaluates genome assemblies by computing various metrics"; + homepage = "https://github.com/ablab/quast"; + license = licenses.gpl2; + maintainers = [ maintainers.bzizou ]; + platforms = platforms.all; + }; +} diff --git a/nixpkgs/pkgs/applications/science/biology/spades/default.nix b/nixpkgs/pkgs/applications/science/biology/spades/default.nix index 08a6a0d2509..d555f2873a6 100644 --- a/nixpkgs/pkgs/applications/science/biology/spades/default.nix +++ b/nixpkgs/pkgs/applications/science/biology/spades/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "SPAdes"; - version = "3.14.0"; + version = "3.14.1"; src = fetchurl { url = "http://cab.spbu.ru/files/release${version}/${pname}-${version}.tar.gz"; - sha256 = "1ffxswd2ngkpy1d6l3lb6a9cmyy1fglbdsws00b3m1k22zaqv60q"; + sha256 = "1ji3afn6yvx7ysg7p9j0d1g28zrnxg1b7x90mhs2bj3lgs7vfafn"; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/applications/science/biology/stacks/default.nix b/nixpkgs/pkgs/applications/science/biology/stacks/default.nix index 93a02a46bd8..12c86516242 100644 --- a/nixpkgs/pkgs/applications/science/biology/stacks/default.nix +++ b/nixpkgs/pkgs/applications/science/biology/stacks/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "stacks"; - version = "2.52"; + version = "2.53"; src = fetchurl { url = "http://catchenlab.life.illinois.edu/stacks/source/${pname}-${version}.tar.gz"; - sha256 = "0gq3kbj910jsq591wylzjmd23srjlsssmrckmf46m4ysjqdqd8vm"; + sha256 = "1zchds205nwdqch1246953dr8c0019yas178qbq3jypbxvmgq7pf"; }; buildInputs = [ zlib ]; diff --git a/nixpkgs/pkgs/applications/science/chemistry/marvin/default.nix b/nixpkgs/pkgs/applications/science/chemistry/marvin/default.nix index c54fb3444bb..9512a288d80 100644 --- a/nixpkgs/pkgs/applications/science/chemistry/marvin/default.nix +++ b/nixpkgs/pkgs/applications/science/chemistry/marvin/default.nix @@ -4,12 +4,12 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "marvin"; - version = "20.9.0"; + version = "20.10.0"; src = fetchurl { name = "marvin-${version}.deb"; url = "http://dl.chemaxon.com/marvin/${version}/marvin_linux_${versions.majorMinor version}.deb"; - sha256 = "1c6q1vb96jsb37g5qbhzcnasd5pdqjyc190yg3caw3gwrd97889q"; + sha256 = "042ndlns48pa6mn6wyrp4q9c1v0a2vzcnhw5l766zdnxdjyv0acx"; }; nativeBuildInputs = [ dpkg makeWrapper ]; diff --git a/nixpkgs/pkgs/applications/science/chemistry/octopus/default.nix b/nixpkgs/pkgs/applications/science/chemistry/octopus/default.nix index f8ce3e925fd..adb31d32650 100644 --- a/nixpkgs/pkgs/applications/science/chemistry/octopus/default.nix +++ b/nixpkgs/pkgs/applications/science/chemistry/octopus/default.nix @@ -1,7 +1,9 @@ { stdenv, fetchFromGitLab, symlinkJoin, gfortran, perl, procps -, libyaml, libxc, fftw, openblas, gsl, netcdf, arpack, autoreconfHook +, libyaml, libxc, fftw, blas, lapack, gsl, netcdf, arpack, autoreconfHook }: +assert (!blas.isILP64) && (!lapack.isILP64); + stdenv.mkDerivation rec { pname = "octopus"; version = "9.2"; @@ -14,12 +16,12 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ perl procps autoreconfHook ]; - buildInputs = [ libyaml gfortran libxc openblas gsl fftw netcdf arpack ]; + buildInputs = [ libyaml gfortran libxc blas lapack gsl fftw netcdf arpack ]; configureFlags = [ "--with-yaml-prefix=${libyaml}" - "--with-blas=-lopenblas" - "--with-lapack=-lopenblas" + "--with-blas=-lblas" + "--with-lapack=-llapack" "--with-fftw-prefix=${fftw.dev}" "--with-gsl-prefix=${gsl}" "--with-libxc-prefix=${libxc}" diff --git a/nixpkgs/pkgs/applications/science/chemistry/openmolcas/default.nix b/nixpkgs/pkgs/applications/science/chemistry/openmolcas/default.nix index b1720e105fd..0d74e784d77 100644 --- a/nixpkgs/pkgs/applications/science/chemistry/openmolcas/default.nix +++ b/nixpkgs/pkgs/applications/science/chemistry/openmolcas/default.nix @@ -1,9 +1,11 @@ { stdenv, fetchFromGitLab, cmake, gfortran, perl -, openblas, hdf5-cpp, python3, texlive +, openblas, blas, lapack, hdf5-cpp, python3, texlive , armadillo, openmpi, globalarrays, openssh , makeWrapper, fetchpatch } : +assert blas.implementation == "openblas" && lapack.implementation == "openblas"; + let version = "19.11"; gitLabRev = "v${version}"; diff --git a/nixpkgs/pkgs/applications/science/chemistry/quantum-espresso/default.nix b/nixpkgs/pkgs/applications/science/chemistry/quantum-espresso/default.nix index bd420519ce0..2443e6b23ab 100644 --- a/nixpkgs/pkgs/applications/science/chemistry/quantum-espresso/default.nix +++ b/nixpkgs/pkgs/applications/science/chemistry/quantum-espresso/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl -, gfortran, fftw, openblas +, gfortran, fftw, blas, lapack , mpi ? null }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { patchShebangs configure ''; - buildInputs = [ fftw openblas gfortran ] + buildInputs = [ fftw blas lapack gfortran ] ++ (stdenv.lib.optionals (mpi != null) [ mpi ]); configureFlags = if (mpi != null) then [ "LD=${mpi}/bin/mpif90" ] else [ "LD=${gfortran}/bin/gfortran" ]; diff --git a/nixpkgs/pkgs/applications/science/chemistry/siesta/default.nix b/nixpkgs/pkgs/applications/science/chemistry/siesta/default.nix index 11f3e551431..c053c0a09cd 100644 --- a/nixpkgs/pkgs/applications/science/chemistry/siesta/default.nix +++ b/nixpkgs/pkgs/applications/science/chemistry/siesta/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl -, gfortran, openblas +, gfortran, blas, lapack , mpi ? null, scalapack }: @@ -16,7 +16,7 @@ stdenv.mkDerivation { inherit mpi; }; - buildInputs = [ openblas gfortran ] + buildInputs = [ blas lapack gfortran ] ++ (stdenv.lib.optionals (mpi != null) [ mpi scalapack ]); enableParallelBuilding = true; @@ -33,11 +33,11 @@ stdenv.mkDerivation { makeFlagsArray=( CC="mpicc" FC="mpifort" FPPFLAGS="-DMPI" MPI_INTERFACE="libmpi_f90.a" MPI_INCLUDE="." - COMP_LIBS="" LIBS="-lopenblas -lscalapack" + COMP_LIBS="" LIBS="-lblas -llapack -lscalapack" ); '' else '' makeFlagsArray=( - COMP_LIBS="" LIBS="-lopenblas" + COMP_LIBS="" LIBS="-lblas -llapack" ); ''; diff --git a/nixpkgs/pkgs/applications/science/electronics/caneda/default.nix b/nixpkgs/pkgs/applications/science/electronics/caneda/default.nix index 6f832013e8c..c90ceac6788 100644 --- a/nixpkgs/pkgs/applications/science/electronics/caneda/default.nix +++ b/nixpkgs/pkgs/applications/science/electronics/caneda/default.nix @@ -1,6 +1,6 @@ -{stdenv, fetchFromGitHub, cmake, qtbase, qttools, qtsvg, qwt }: +{ mkDerivation, stdenv, fetchFromGitHub, cmake, qtbase, qttools, qtsvg, qwt }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "caneda"; version = "0.3.1"; diff --git a/nixpkgs/pkgs/applications/science/electronics/eagle/eagle.nix b/nixpkgs/pkgs/applications/science/electronics/eagle/eagle.nix index 7c5942d825a..58bdd5c722d 100644 --- a/nixpkgs/pkgs/applications/science/electronics/eagle/eagle.nix +++ b/nixpkgs/pkgs/applications/science/electronics/eagle/eagle.nix @@ -13,11 +13,11 @@ let in mkDerivation rec { pname = "eagle"; - version = "9.6.0"; + version = "9.6.1"; src = fetchurl { url = "https://eagle-updates.circuits.io/downloads/${builtins.replaceStrings ["."] ["_"] version}/Autodesk_EAGLE_${version}_English_Linux_64bit.tar.gz"; - sha256 = "1crkyc7ws2zz5dfs00h6rj4z2hyqb97kp6r4hxhmcgg5647ij4z8"; + sha256 = "1iq4aahrh4g3549vbr7gka5y2h7f17n3yafzl21njc2mkqb12jdw"; }; desktopItem = makeDesktopItem { diff --git a/nixpkgs/pkgs/applications/science/electronics/kicad/base.nix b/nixpkgs/pkgs/applications/science/electronics/kicad/base.nix index 6bc66596229..9fc1111c7b9 100644 --- a/nixpkgs/pkgs/applications/science/electronics/kicad/base.nix +++ b/nixpkgs/pkgs/applications/science/electronics/kicad/base.nix @@ -2,7 +2,6 @@ , libX11, gettext, glew, glm, cairo, curl, openssl, boost, pkgconfig , doxygen, pcre, libpthreadstubs, libXdmcp, fetchpatch, lndir, callPackages -, pname ? "kicad" , stable ? true , baseName ? "kicad" , versions ? { } @@ -20,26 +19,26 @@ with lib; let versionConfig = versions.${baseName}; - baseVersion = "${versions.${baseName}.kicadVersion.version}"; # oce on aarch64 fails a test withOCE = oceSupport && !stdenv.isAarch64; withOCC = (withOCCT && !withOCE) || (oceSupport && stdenv.isAarch64); - kicad-libraries = callPackages ./libraries.nix versionConfig.libVersion; + libraries = callPackages ./libraries.nix versionConfig.libVersion; in stdenv.mkDerivation rec { - inherit pname; - version = "base-${baseVersion}"; + i18n = libraries.i18n; + + pname = "kicad-base"; + version = "${versions.${baseName}.kicadVersion.version}"; src = fetchFromGitLab ( { group = "kicad"; owner = "code"; repo = "kicad"; - rev = baseVersion; } // versionConfig.kicadVersion.src ); @@ -57,9 +56,11 @@ stdenv.mkDerivation rec { # tagged releases don't have "unknown" # kicad nightlies use git describe --dirty # nix removes .git, so its approximated here + # "-1" appended to indicate we're adding a patch postPatch = '' substituteInPlace CMakeModules/KiCadVersion.cmake \ - --replace "unknown" ${builtins.substring 0 10 src.rev} + --replace "unknown" "${builtins.substring 0 10 src.rev}-1" \ + --replace "${version}" "${version}-1" ''; makeFlags = optional (debug) [ "CFLAGS+=-Og" "CFLAGS+=-ggdb" ]; @@ -113,7 +114,7 @@ stdenv.mkDerivation rec { postInstall = optional (withI18n) '' mkdir -p $out/share - lndir ${kicad-libraries.i18n}/share $out/share + lndir ${i18n}/share $out/share ''; meta = { @@ -124,7 +125,6 @@ stdenv.mkDerivation rec { ''; homepage = "https://www.kicad-pcb.org/"; license = licenses.agpl3; - maintainers = with maintainers; [ evils kiwi berce ]; - platforms = with platforms; linux; + platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/applications/science/electronics/kicad/default.nix b/nixpkgs/pkgs/applications/science/electronics/kicad/default.nix index f03a0a0ccef..2aa2686a29a 100644 --- a/nixpkgs/pkgs/applications/science/electronics/kicad/default.nix +++ b/nixpkgs/pkgs/applications/science/electronics/kicad/default.nix @@ -4,6 +4,7 @@ , librsvg, cups , pname ? "kicad" +, stable ? true , oceSupport ? false, opencascade , withOCCT ? true, opencascade-occt , ngspiceSupport ? true, libngspice @@ -18,7 +19,6 @@ assert ngspiceSupport -> libngspice != null; with lib; let - stable = pname != "kicad-unstable"; baseName = if (stable) then "kicad" else "kicad-unstable"; versions = import ./versions.nix; @@ -35,17 +35,16 @@ let python = python3; wxPython = python3Packages.wxPython_4_0; - libraries = callPackages ./libraries.nix versionConfig.libVersion; +in +stdenv.mkDerivation rec { + + passthru.libraries = callPackages ./libraries.nix versionConfig.libVersion; base = callPackage ./base.nix { - pname = baseName; inherit versions stable baseName; inherit wxGTK python wxPython; inherit debug withI18n withOCCT oceSupport ngspiceSupport scriptingSupport; }; -in -stdenv.mkDerivation rec { - inherit pname; version = versions.${baseName}.kicadVersion.version; @@ -63,7 +62,7 @@ stdenv.mkDerivation rec { # wrapGAppsHook added the equivalent to ${base}/share # though i noticed no difference without it - makeWrapperArgs = [ + makeWrapperArgs = with passthru.libraries; [ "--prefix XDG_DATA_DIRS : ${base}/share" "--prefix XDG_DATA_DIRS : ${hicolor-icon-theme}/share" "--prefix XDG_DATA_DIRS : ${gnome3.defaultIconTheme}/share" @@ -73,47 +72,40 @@ stdenv.mkDerivation rec { "--prefix XDG_DATA_DIRS : ${cups}/share" "--prefix GIO_EXTRA_MODULES : ${gnome3.dconf}/lib/gio/modules" - "--set KISYSMOD ${libraries.footprints}/share/kicad/modules" - "--set KICAD_SYMBOL_DIR ${libraries.symbols}/share/kicad/library" - "--set KICAD_TEMPLATE_DIR ${libraries.templates}/share/kicad/template" - "--prefix KICAD_TEMPLATE_DIR : ${libraries.symbols}/share/kicad/template" - "--prefix KICAD_TEMPLATE_DIR : ${libraries.footprints}/share/kicad/template" + "--set KISYSMOD ${footprints}/share/kicad/modules" + "--set KICAD_SYMBOL_DIR ${symbols}/share/kicad/library" + "--set KICAD_TEMPLATE_DIR ${templates}/share/kicad/template" + "--prefix KICAD_TEMPLATE_DIR : ${symbols}/share/kicad/template" + "--prefix KICAD_TEMPLATE_DIR : ${footprints}/share/kicad/template" ] - ++ optionals (with3d) [ "--set KISYS3DMOD ${libraries.packages3d}/share/kicad/modules/packages3d" ] + ++ optionals (with3d) [ "--set KISYS3DMOD ${packages3d}/share/kicad/modules/packages3d" ] ++ optionals (ngspiceSupport) [ "--prefix LD_LIBRARY_PATH : ${libngspice}/lib" ] # infinisil's workaround for #39493 ++ [ "--set GDK_PIXBUF_MODULE_FILE ${librsvg}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache" ] ; - # dunno why i have to add $makeWrapperArgs manually... + # why does $makeWrapperArgs have to be added explicitly? # $out and $program_PYTHONPATH don't exist when makeWrapperArgs gets set? - # not sure if anything has to be done with the other stuff in base/bin - # dxf2idf, idf2vrml, idfcyl, idfrect, kicad2step, kicad-ogltest - installPhase = - optionalString (scriptingSupport) '' buildPythonPath "${base} $pythonPath" - '' + - '' makeWrapper ${base}/bin/kicad $out/bin/kicad $makeWrapperArgs '' - + optionalString (scriptingSupport) '' --set PYTHONPATH "$program_PYTHONPATH" - '' + - '' makeWrapper ${base}/bin/pcbnew $out/bin/pcbnew $makeWrapperArgs '' - + optionalString (scriptingSupport) '' --set PYTHONPATH "$program_PYTHONPATH" - '' + - '' makeWrapper ${base}/bin/eeschema $out/bin/eeschema $makeWrapperArgs '' - + optionalString (scriptingSupport) '' --set PYTHONPATH "$program_PYTHONPATH" - '' + - '' makeWrapper ${base}/bin/gerbview $out/bin/gerbview $makeWrapperArgs '' - + optionalString (scriptingSupport) '' --set PYTHONPATH "$program_PYTHONPATH" - '' + - '' makeWrapper ${base}/bin/pcb_calculator $out/bin/pcb_calculator $makeWrapperArgs '' - + optionalString (scriptingSupport) '' --set PYTHONPATH "$program_PYTHONPATH" - '' + - '' makeWrapper ${base}/bin/pl_editor $out/bin/pl_editor $makeWrapperArgs '' - + optionalString (scriptingSupport) '' --set PYTHONPATH "$program_PYTHONPATH" - '' + - '' makeWrapper ${base}/bin/bitmap2component $out/bin/bitmap2component $makeWrapperArgs '' - + optionalString (scriptingSupport) '' --set PYTHONPATH "$program_PYTHONPATH" - '' + # kicad-ogltest's source seems to indicate that crashing is expected behaviour... + installPhase = with lib; + let + tools = [ "kicad" "pcbnew" "eeschema" "gerbview" "pcb_calculator" "pl_editor" "bitmap2component" ]; + utils = [ "dxf2idf" "idf2vrml" "idfcyl" "idfrect" "kicad2step" "kicad-ogltest" ]; + in + ( concatStringsSep "\n" + ( flatten [ + ( optionalString (scriptingSupport) "buildPythonPath \"${base} $pythonPath\" \n" ) + + # wrap each of the directly usable tools + ( map ( tool: "makeWrapper ${base}/bin/${tool} $out/bin/${tool} $makeWrapperArgs" + + optionalString (scriptingSupport) " --set PYTHONPATH \"$program_PYTHONPATH\"" + ) tools ) + + # link in the CLI utils + ( map ( util: "ln -s ${base}/bin/${util} $out/bin/${util}" ) utils ) + ]) + ) ; # can't run this for each pname @@ -123,10 +115,11 @@ stdenv.mkDerivation rec { # and can't git commit if this could be running in parallel with other scripts passthru.updateScript = [ ./update.sh "all" ]; - meta = { - description = if (stable) - then "Open Source Electronics Design Automation Suite" - else "Open Source EDA Suite, Development Build"; + meta = rec { + description = (if (stable) + then "Open Source Electronics Design Automation suite" + else "Open Source EDA suite, development build") + + (if (!with3d) then ", without 3D models" else ""); homepage = "https://www.kicad-pcb.org/"; longDescription = '' KiCad is an open source software suite for Electronic Design Automation. @@ -134,12 +127,20 @@ stdenv.mkDerivation rec { ''; license = licenses.agpl3; # berce seems inactive... - maintainers = with maintainers; [ evils kiwi berce ]; - # kicad's cross-platform, not sure what to fill in here - platforms = with platforms; linux; - } // optionalAttrs with3d { - # We can't download the 3d models on Hydra - they are a ~1 GiB download and - # they occupy ~5 GiB in store. - hydraPlatforms = []; + maintainers = with stdenv.lib.maintainers; [ evils kiwi berce ]; + # kicad is cross platform + platforms = stdenv.lib.platforms.all; + # despite that, nipkgs' wxGTK for darwin is "wxmac" + # and wxPython_4_0 does not account for this + # adjusting this package to downgrade to python2Packages.wxPython (wxPython 3), + # seems like more trouble than fixing wxPython_4_0 would be + # additionally, libngspice is marked as linux only, though it should support darwin + + hydraPlatforms = if (with3d) then [ ] else platforms; + # We can't download the 3d models on Hydra, + # they are a ~1 GiB download and they occupy ~5 GiB in store. + # as long as the base and libraries (minus 3d) are build, + # this wrapper does not need to get built + # the kicad-*small "packages" cause this to happen }; } diff --git a/nixpkgs/pkgs/applications/science/electronics/kicad/libraries.nix b/nixpkgs/pkgs/applications/science/electronics/kicad/libraries.nix index 7cdf9373e08..4dde2a0a122 100644 --- a/nixpkgs/pkgs/applications/science/electronics/kicad/libraries.nix +++ b/nixpkgs/pkgs/applications/science/electronics/kicad/libraries.nix @@ -13,21 +13,27 @@ with lib; let mkLib = name: - stdenv.mkDerivation - { - pname = "kicad-${name}"; - version = "${version}"; - src = fetchFromGitHub ( - { - owner = "KiCad"; - repo = "kicad-${name}"; - rev = version; - inherit name; - } // (libSources.${name} or { }) - ); - nativeBuildInputs = [ cmake ]; - meta.license = licenses.cc-by-sa-40; + stdenv.mkDerivation { + pname = "kicad-${name}"; + version = "${version}"; + src = fetchFromGitHub ( + { + owner = "KiCad"; + repo = "kicad-${name}"; + rev = version; + inherit name; + } // (libSources.${name} or { }) + ); + nativeBuildInputs = [ cmake ]; + + meta = rec { + license = licenses.cc-by-sa-40; + platforms = stdenv.lib.platforms.all; + # the 3d models are a ~1 GiB download and occupy ~5 GiB in store. + # this would exceed the hydra output limit + hydraPlatforms = if (name == "packages3d" ) then [ ] else platforms; }; + }; in { symbols = mkLib "symbols"; @@ -56,6 +62,9 @@ in ); buildInputs = [ gettext ]; nativeBuildInputs = [ cmake ]; - meta.license = licenses.gpl2; # https://github.com/KiCad/kicad-i18n/issues/3 + meta = { + license = licenses.gpl2; # https://github.com/KiCad/kicad-i18n/issues/3 + platforms = stdenv.lib.platforms.all; + }; }; } diff --git a/nixpkgs/pkgs/applications/science/electronics/kicad/update.sh b/nixpkgs/pkgs/applications/science/electronics/kicad/update.sh index 7dc0b008b6c..f048ccde4ec 100755 --- a/nixpkgs/pkgs/applications/science/electronics/kicad/update.sh +++ b/nixpkgs/pkgs/applications/science/electronics/kicad/update.sh @@ -1,6 +1,8 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p coreutils git nix curl +set -e + # this script will generate versions.nix in the right location # this should contain the versions' revs and hashes # the stable revs are stored only for ease of skipping @@ -50,12 +52,11 @@ for arg in "$@"; do done here="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" -now=$(date --iso-8601) +now=$(date --iso-8601 --utc) file="${here}/versions.nix" # just in case this runs in parallel -rand="$(head -c 3 /dev/urandom | base64)" -tmp="${here}/,versions.nix.${rand}" +tmp="${here}/,versions.nix.${RANDOM}" # libraries currently on github, move to $gitlab/libraries planned libs=( symbols templates footprints packages3d ) @@ -112,16 +113,16 @@ for version in "${all_versions[@]}"; do echo "Checking src" >&2 src_rev="$(${get_rev} "${gitlab}"/code/kicad.git "${version}" | cut -f1)" - ret="$(grep -sm 1 "\"${pname}\"" -A 4 "${file}" | grep -sm 1 "${src_rev}")" + has_rev="$(grep -sm 1 "\"${pname}\"" -A 4 "${file}" | grep -sm 1 "${src_rev}" || true)" has_hash="$(grep -sm 1 "\"${pname}\"" -A 5 "${file}" | grep -sm 1 "sha256")" - if [[ -n ${ret} && -n ${has_hash} && -z ${clean} ]]; then + if [[ -n ${has_rev} && -n ${has_hash} && -z ${clean} ]]; then echo "Reusing old ${pname}.src.sha256, already latest .rev" >&2 grep -sm 1 "\"${pname}\"" -A 5 "${file}" | grep -sm 1 "rev" -A 1 else printf "%8srev =\t\t\t\"%s\";\n" "" "${src_rev}" printf "%8ssha256 =\t\t\"%s\";\n" \ "" "$(${prefetch} "${gitlab_pre}${src_rev}")" - (( count++ )) + count=$((count+1)) fi printf "%6s};\n" "" printf "%4s};\n" "" @@ -132,25 +133,25 @@ for version in "${all_versions[@]}"; do echo "Checking i18n" >&2 i18n_rev="$(${get_rev} "${i18n}" "${version}" | cut -f1)" - ret="$(grep -sm 1 "\"${pname}\"" -A 11 "${file}" | grep -sm 1 "${i18n_rev}")" + has_rev="$(grep -sm 1 "\"${pname}\"" -A 11 "${file}" | grep -sm 1 "${i18n_rev}" || true)" has_hash="$(grep -sm 1 "\"${pname}\"" -A 12 "${file}" | grep -sm 1 "i18n.sha256")" - if [[ -n ${ret} && -n ${has_hash} && -z ${clean} ]]; then + if [[ -n ${has_rev} && -n ${has_hash} && -z ${clean} ]]; then echo "Reusing old kicad-i18n-${today}.src.sha256, already latest .rev" >&2 grep -sm 1 "\"${pname}\"" -A 12 "${file}" | grep -sm 1 "i18n" -A 1 else printf "%8si18n.rev =\t\t\"%s\";\n" "" "${i18n_rev}" printf "%8si18n.sha256 =\t\t\"%s\";\n" "" \ "$(${prefetch} "${i18n_pre}${i18n_rev}")" - (( count++ )) + count=$((count+1)) fi for lib in "${libs[@]}"; do echo "Checking ${lib}" >&2 url="${github}-${lib}.git" lib_rev="$(${get_rev} "${url}" "${version}" | cut -f1)" - ret="$(grep -sm 1 "\"${pname}\"" -A 19 "${file}" | grep -sm 1 "${lib_rev}" -A 1)" + has_rev="$(grep -sm 1 "\"${pname}\"" -A 19 "${file}" | grep -sm 1 "${lib_rev}" || true)" has_hash="$(grep -sm 1 "\"${pname}\"" -A 20 "${file}" | grep -sm 1 "${lib}.sha256")" - if [[ -n ${ret} && -n ${has_hash} && -z ${clean} ]]; then + if [[ -n ${has_rev} && -n ${has_hash} && -z ${clean} ]]; then echo "Reusing old kicad-${lib}-${today}.src.sha256, already latest .rev" >&2 grep -sm 1 "\"${pname}\"" -A 20 "${file}" | grep -sm 1 "${lib}" -A 1 else @@ -161,7 +162,7 @@ for version in "${all_versions[@]}"; do printf "\"%s\";\n" "${lib_rev}" printf "%8s%s.sha256 =\t\"%s\";\n" "" \ "${lib}" "$(${prefetch} "${github}-${lib}/archive/${lib_rev}.tar.gz")" - (( count++ )) + count=$((count+1)) fi done printf "%6s};\n" "" @@ -175,6 +176,11 @@ done printf "}\n" } > "${tmp}" +if grep '""' "${tmp}"; then + echo "empty value detected, out of space?" >&2 + exit "1" +fi + mv "${tmp}" "${file}" printf "\nFinished\nMoved output to %s\n\n" "${file}" >&2 diff --git a/nixpkgs/pkgs/applications/science/electronics/kicad/versions.nix b/nixpkgs/pkgs/applications/science/electronics/kicad/versions.nix index 6b9a981a87c..2b7c91751e5 100644 --- a/nixpkgs/pkgs/applications/science/electronics/kicad/versions.nix +++ b/nixpkgs/pkgs/applications/science/electronics/kicad/versions.nix @@ -27,25 +27,25 @@ }; "kicad-unstable" = { kicadVersion = { - version = "2020-02-10"; + version = "2020-05-06"; src = { - rev = "1190e60dd426d246661e478db3287f266ec6cda2"; - sha256 = "0cgfad07j69cks97llj4hf3kga0d5qf728s89xwxrzcwm06k62bi"; + rev = "c92181621e2e51dc8aae1bd9f4483bb3301ffaa5"; + sha256 = "0s50xn5gbjy7yxnp9yiynxvxi2mkcrp6yghgdzclpm40rnfyi0v5"; }; }; libVersion = { - version = "2020-02-10"; + version = "2020-05-06"; libSources = { - i18n.rev = "26786c4ca804bad7eb072f1ef381f00b5a2ff3ee"; - i18n.sha256 = "0iqr1xfw4s677afjy9bn5y41z4isp327f9y90wypkxiwwq3dfkfl"; - symbols.rev = "35b7da2d211d7cc036b37ad7f5e40ef03faa1bc7"; - symbols.sha256 = "0wbfw1swbfvfp47cn48pxpqlygjs3xh568ydrrs51v3w102x8y64"; - templates.rev = "0c0490897f803ab8b7c3dad438b7eb1f80e0417c"; - templates.sha256 = "0cs3bm3zb5ngw5ldn0lzw5bvqm4kvcidyrn76438alffwiz2b15g"; - footprints.rev = "9357b6f09312966c57fec9f66a516941d79c3038"; - footprints.sha256 = "0cgah1q0h012ffwfl220k7qb6hgbs0i91spq2j4v3lgpfr4g638d"; - packages3d.rev = "de368eb739abe41dfc3163e0e370477e857f9cc1"; - packages3d.sha256 = "0b3p5v8g24h6l7q3sbqz7ns0gnrf9l89glj86m5ybhizvls9vrrs"; + i18n.rev = "f29cab831eb823165fa2c5efab5d9c9b443e62e2"; + i18n.sha256 = "0cc0zvpml75yxphay3281f762ls08fzvv538cd5hmkr8xqlj3vbi"; + symbols.rev = "d4245ae8cf633095a0994ab01492bd56cd124112"; + symbols.sha256 = "11pynjgji3skw42q5mryz98f8z418k43jy6s2k90w6jv638z3cb0"; + templates.rev = "7db8d4d0ea0711f1961d117853547fb3edbc3857"; + templates.sha256 = "1hppcsrkn4dk6ggby6ckh0q65qxkywrbyxa4lwpaf7pxjyv498xg"; + footprints.rev = "3bff23ee339bc48490bb39deba5d8b2f1f42733e"; + footprints.sha256 = "0430r8k49ib6w1sjr8fx42szbz960yhlzg4w80jl5bwasq67nqwd"; + packages3d.rev = "889a3dd550233ec51baed4a04a01d4cc64a8d747"; + packages3d.sha256 = "152zv4j51v8skqlvrabblpcqpbn5yf3grisjj8vnwf7kdd41chb2"; }; }; }; diff --git a/nixpkgs/pkgs/applications/science/electronics/librepcb/default.nix b/nixpkgs/pkgs/applications/science/electronics/librepcb/default.nix index 7e0894fb337..de01b095e38 100644 --- a/nixpkgs/pkgs/applications/science/electronics/librepcb/default.nix +++ b/nixpkgs/pkgs/applications/science/electronics/librepcb/default.nix @@ -2,14 +2,14 @@ mkDerivation { pname = "librepcb"; - version = "0.1.3"; + version = "0.1.4"; src = fetchFromGitHub { owner = "LibrePCB"; repo = "LibrePCB"; fetchSubmodules = true; - rev = "56bc60d347ff67df0fe1d57807d03f0606de557f"; - sha256 = "0z6jn5zawp0x5i9zda7l787jnsv3yl8aqwnpii3g4hsnf2q3hhrh"; + rev = "ae04eef5a71b5ba66ae2cee6b631c1c933ace535"; + sha256 = "0wk5qny1jb6n4mwyyrs7syir3hmwxlwazcd80bpxharmsj7p0rzc"; }; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/applications/science/electronics/magic-vlsi/0001-strip-bin-prefix.patch b/nixpkgs/pkgs/applications/science/electronics/magic-vlsi/0001-strip-bin-prefix.patch new file mode 100644 index 00000000000..1cef96ea140 --- /dev/null +++ b/nixpkgs/pkgs/applications/science/electronics/magic-vlsi/0001-strip-bin-prefix.patch @@ -0,0 +1,10 @@ +diff --git a/scripts/makedbh b/scripts/makedbh +index 01e4fa5..d6299c6 100755 +--- a/scripts/makedbh ++++ b/scripts/makedbh +@@ -1,4 +1,4 @@ +-#!/bin/csh -f ++#!/usr/bin/env tcsh + # + # makes the "database.h" (1st argument, $1) file from "database.h.in" + # (2nd argument, $2), setting various mask operation definitions diff --git a/nixpkgs/pkgs/applications/science/electronics/magic-vlsi/0002-fix-format-security.patch b/nixpkgs/pkgs/applications/science/electronics/magic-vlsi/0002-fix-format-security.patch new file mode 100644 index 00000000000..37ae3519550 --- /dev/null +++ b/nixpkgs/pkgs/applications/science/electronics/magic-vlsi/0002-fix-format-security.patch @@ -0,0 +1,19 @@ +diff --git a/database/DBio.c b/database/DBio.c +index 93c4b0b..292ea5f 100644 +--- a/database/DBio.c ++++ b/database/DBio.c +@@ -2378,12 +2378,12 @@ DBCellWriteFile(cellDef, f) + + #define FPRINTF(f,s)\ + {\ +- if (fprintf(f,s) == EOF) goto ioerror;\ ++ if (fprintf(f,"%s",s) == EOF) goto ioerror;\ + DBFileOffset += strlen(s);\ + } + #define FPRINTR(f,s)\ + {\ +- if (fprintf(f,s) == EOF) return 1;\ ++ if (fprintf(f,"%s",s) == EOF) return 1;\ + DBFileOffset += strlen(s);\ + } + diff --git a/nixpkgs/pkgs/applications/science/electronics/magic-vlsi/default.nix b/nixpkgs/pkgs/applications/science/electronics/magic-vlsi/default.nix new file mode 100644 index 00000000000..62b830547e5 --- /dev/null +++ b/nixpkgs/pkgs/applications/science/electronics/magic-vlsi/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchurl, m4, tcsh, libX11, tcl, tk, cairo, ncurses, mesa_glu, python3 }: + +stdenv.mkDerivation { + pname = "magic-vlsi"; + version = "8.3.5"; + + src = fetchurl { + url = "http://opencircuitdesign.com/magic/archive/magic-8.3.5.tgz"; + sha256 = "0wv4zmxlqjfaakgp802icn0cd9f8ylkz2sppix83axq8p5cg90yq"; + }; + + buildInputs = [ m4 tcsh libX11 tcl tk cairo ncurses mesa_glu ]; + nativeBuildInputs = [ python3 ]; + + configureFlags = [ + "--with-tcl=${tcl}" + "--with-tk=${tk}" + "--disable-werror" + ]; + + postPatch = '' + patchShebangs scripts/* + ''; + + patches = [ + ./0001-strip-bin-prefix.patch + ./0002-fix-format-security.patch + ]; + + meta = with stdenv.lib; { + description = "VLSI layout tool written in Tcl"; + homepage = "http://opencircuitdesign.com/magic/"; + license = licenses.mit; + maintainers = [ maintainers.dkudriavtsev ]; + }; +} diff --git a/nixpkgs/pkgs/applications/science/electronics/verilator/default.nix b/nixpkgs/pkgs/applications/science/electronics/verilator/default.nix index 85f6ac42126..189e09f8241 100644 --- a/nixpkgs/pkgs/applications/science/electronics/verilator/default.nix +++ b/nixpkgs/pkgs/applications/science/electronics/verilator/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "verilator"; - version = "4.030"; + version = "4.034"; src = fetchurl { url = "https://www.veripool.org/ftp/${pname}-${version}.tgz"; - sha256 = "07ldkf7xkr31n1dmx82bmzam8bvc1vsp32k76vd7yzn7r853qyky"; + sha256 = "02xqvl9ic21jpda0xldh4ihqwl4ss8389s8fklgx5d98xq37pval"; }; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/applications/science/logic/beluga/default.nix b/nixpkgs/pkgs/applications/science/logic/beluga/default.nix index 55cee9b7e17..44478a032b3 100644 --- a/nixpkgs/pkgs/applications/science/logic/beluga/default.nix +++ b/nixpkgs/pkgs/applications/science/logic/beluga/default.nix @@ -1,34 +1,40 @@ -{ stdenv, fetchFromGitHub, ocamlPackages, omake }: +{ lib, fetchFromGitHub, ocamlPackages, rsync }: -stdenv.mkDerivation { - name = "beluga-20180403"; +ocamlPackages.buildDunePackage { + pname = "beluga"; + version = "unstable-2020-03-11"; src = fetchFromGitHub { owner = "Beluga-lang"; repo = "Beluga"; - rev = "046aa59f008be70a7c4700b723bed0214ea8b687"; - sha256 = "0m68y0r0wdw3mg2jks68bihaww7sg305zdfnic1rkndq2cxv0mld"; + rev = "6133b2f572219333f304bb4f77c177592324c55b"; + sha256 = "0sy6mi50z3mvs5z7dx38piydapk89all81rh038x3559b5fsk68q"; }; - nativeBuildInputs = with ocamlPackages; [ findlib ocamlbuild omake ]; - buildInputs = with ocamlPackages; [ ocaml ulex ocaml_extlib ]; + useDune2 = true; - installPhase = '' - mkdir -p $out - cp -r bin $out/ + buildInputs = with ocamlPackages; [ + gen sedlex_2 ocaml_extlib dune-build-info linenoise + ]; - mkdir -p $out/share/beluga - cp -r tools/ examples/ $out/share/beluga + postPatch = '' + patchShebangs ./TEST ./run_harpoon_test.sh + ''; + + checkPhase = "./TEST"; + checkInputs = [ rsync ]; + doCheck = true; + postInstall = '' mkdir -p $out/share/emacs/site-lisp/beluga/ cp -r tools/beluga-mode.el $out/share/emacs/site-lisp/beluga ''; - meta = { + meta = with lib; { description = "A functional language for reasoning about formal systems"; homepage = "http://complogic.cs.mcgill.ca/beluga/"; - license = stdenv.lib.licenses.gpl3Plus; - maintainers = [ stdenv.lib.maintainers.bcdarwin ]; - platforms = stdenv.lib.platforms.unix; + license = licenses.gpl3Plus; + maintainers = [ maintainers.bcdarwin ]; + platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/applications/science/logic/cryptominisat/default.nix b/nixpkgs/pkgs/applications/science/logic/cryptominisat/default.nix index 113c6307c40..8c1b3bd0369 100644 --- a/nixpkgs/pkgs/applications/science/logic/cryptominisat/default.nix +++ b/nixpkgs/pkgs/applications/science/logic/cryptominisat/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "cryptominisat"; - version = "5.6.8"; + version = "5.7.0"; src = fetchFromGitHub { owner = "msoos"; repo = "cryptominisat"; rev = version; - sha256 = "0csimmy1nvkfcsxjra9bm4mlcyxa3ac8zarm88zfb7640ca0d0wv"; + sha256 = "0ny5ln8fc0irprs04qw01c9mppps8q27lkx01a549zazwhj4b5rm"; }; buildInputs = [ python3 boost ]; diff --git a/nixpkgs/pkgs/applications/science/logic/elan/default.nix b/nixpkgs/pkgs/applications/science/logic/elan/default.nix index ea3b0585099..743bbf163c2 100644 --- a/nixpkgs/pkgs/applications/science/logic/elan/default.nix +++ b/nixpkgs/pkgs/applications/science/logic/elan/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "elan"; - version = "0.8.0"; + version = "0.10.0"; src = fetchFromGitHub { owner = "kha"; repo = "elan"; rev = "v${version}"; - sha256 = "0n2ncssjcmp3x5kbnci7xbq5fgcihlr3vaglyhhwzrxkjy2vpmpd"; + sha256 = "0aw538shvpfbk481y0gw3z97nsazdnk8qh8fwsb6ji62p2r51v6f"; }; - cargoSha256 = "1pkg0n7kxckr0zhr8dr12b9fxg5q185kj3r9k2rmnkj2dpa2mxh3"; + cargoSha256 = "0zg3q31z516049v9fhli4yxldx9fg31k2qfx4ag8rmyvpgy9xh6c"; nativeBuildInputs = [ pkgconfig ]; @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { postInstall = '' pushd $out/bin mv elan-init elan - for link in lean leanpkg leanchecker leanc; do + for link in lean leanpkg leanchecker leanc leanmake; do ln -s elan $link done popd diff --git a/nixpkgs/pkgs/applications/science/logic/lean/default.nix b/nixpkgs/pkgs/applications/science/logic/lean/default.nix index 594f596b5ef..ed077b03908 100644 --- a/nixpkgs/pkgs/applications/science/logic/lean/default.nix +++ b/nixpkgs/pkgs/applications/science/logic/lean/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchFromGitHub, cmake, gmp }: +{ stdenv, fetchFromGitHub, cmake, gmp, coreutils }: stdenv.mkDerivation rec { pname = "lean"; - version = "3.8.0"; + version = "3.13.1"; src = fetchFromGitHub { owner = "leanprover-community"; repo = "lean"; rev = "v${version}"; - sha256 = "0frs2vhxlzdliyydb462c1886dn585zd7yp7hdxzsri2v6gdh89g"; + sha256 = "1ak5l40h5yjlbzz92l724l6bm5q341cg6k1yk13sbwn42l8szsar"; }; nativeBuildInputs = [ cmake ]; @@ -19,6 +19,11 @@ stdenv.mkDerivation rec { cd src ''; + postInstall = stdenv.lib.optionalString stdenv.isDarwin '' + substituteInPlace $out/bin/leanpkg \ + --replace "greadlink" "${coreutils}/bin/readlink" + ''; + meta = with stdenv.lib; { description = "Automatic and interactive theorem prover"; homepage = "https://leanprover.github.io/"; diff --git a/nixpkgs/pkgs/applications/science/logic/tlaplus/default.nix b/nixpkgs/pkgs/applications/science/logic/tlaplus/default.nix index 3476b5ea9d9..14944f5e19b 100644 --- a/nixpkgs/pkgs/applications/science/logic/tlaplus/default.nix +++ b/nixpkgs/pkgs/applications/science/logic/tlaplus/default.nix @@ -1,24 +1,24 @@ { stdenv, fetchFromGitHub, makeWrapper -, jdk, jre, ant +, adoptopenjdk-bin, jre, ant }: stdenv.mkDerivation rec { pname = "tlaplus"; - version = "1.5.6"; + version = "1.7.0"; src = fetchFromGitHub { owner = "tlaplus"; repo = "tlaplus"; rev = "refs/tags/v${version}"; - sha256 = "0966mvgxamknj4hsp980qbxwda886w1dv309kn7isxn0420lfv4f"; + sha256 = "1mm6r9bq79zks50yk0agcpdkw9yy994m38ibmgpb3bi3wkpq9891"; }; - buildInputs = [ makeWrapper jdk ant ]; + buildInputs = [ makeWrapper adoptopenjdk-bin ant ]; - buildPhase = "ant -f tlatools/customBuild.xml compile dist"; + buildPhase = "ant -f tlatools/org.lamport.tlatools/customBuild.xml compile dist"; installPhase = '' mkdir -p $out/share/java $out/bin - cp tlatools/dist/*.jar $out/share/java + cp tlatools/org.lamport.tlatools/dist/*.jar $out/share/java makeWrapper ${jre}/bin/java $out/bin/tlc2 \ --add-flags "-cp $out/share/java/tla2tools.jar tlc2.TLC" diff --git a/nixpkgs/pkgs/applications/science/logic/verifast/default.nix b/nixpkgs/pkgs/applications/science/logic/verifast/default.nix index c5e8078eff2..49618d2586b 100644 --- a/nixpkgs/pkgs/applications/science/logic/verifast/default.nix +++ b/nixpkgs/pkgs/applications/science/logic/verifast/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { meta = { description = "Verification for C and Java programs via separation logic"; homepage = "http://people.cs.kuleuven.be/~bart.jacobs/verifast/"; - license = stdenv.lib.licenses.msrla; + license = stdenv.lib.licenses.mit; platforms = [ "x86_64-linux" ]; maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; }; diff --git a/nixpkgs/pkgs/applications/science/machine-learning/fasttext/default.nix b/nixpkgs/pkgs/applications/science/machine-learning/fasttext/default.nix index 2ae5e0eeddc..64124594e1e 100644 --- a/nixpkgs/pkgs/applications/science/machine-learning/fasttext/default.nix +++ b/nixpkgs/pkgs/applications/science/machine-learning/fasttext/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fasttext"; - version = "0.9.1"; + version = "0.9.2"; src = fetchFromGitHub { owner = "facebookresearch"; repo = "fastText"; rev = "v${version}"; - sha256 = "1cbzz98qn8aypp4r5kwwwc9wiq5bwzv51kcsb15xjfs9lz8h3rii"; + sha256 = "07cz2ghfq6amcljaxpdr5chbd64ph513y8zqmibfx2xwfp74xkhn"; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/applications/science/machine-learning/shogun/default.nix b/nixpkgs/pkgs/applications/science/machine-learning/shogun/default.nix index 988ea8c855c..031ca55a048 100644 --- a/nixpkgs/pkgs/applications/science/machine-learning/shogun/default.nix +++ b/nixpkgs/pkgs/applications/science/machine-learning/shogun/default.nix @@ -2,7 +2,7 @@ # data, compression , bzip2, curl, hdf5, json_c, lzma, lzo, protobuf, snappy # maths -, openblasCompat, eigen, nlopt, lp_solve, colpack, liblapack, glpk +, blas, lapack, eigen, nlopt, lp_solve, colpack, glpk # libraries , libarchive, libxml2 # extra support @@ -13,6 +13,8 @@ assert pythonSupport -> pythonPackages != null; assert opencvSupport -> opencv != null; +assert (!blas.isILP64) && (!lapack.isILP64); + let pname = "shogun"; version = "6.1.4"; @@ -64,8 +66,8 @@ stdenv.mkDerivation rec { CCACHE_DIR=".ccache"; buildInputs = with lib; [ - openblasCompat bzip2 cmake colpack curl ctags eigen hdf5 json_c lp_solve lzma lzo - protobuf nlopt snappy swig (libarchive.dev) libxml2 liblapack glpk + blas lapack bzip2 cmake colpack curl ctags eigen hdf5 json_c lp_solve lzma lzo + protobuf nlopt snappy swig (libarchive.dev) libxml2 lapack glpk ] ++ optionals (pythonSupport) (with pythonPackages; [ python ply numpy ]) ++ optional (opencvSupport) opencv; diff --git a/nixpkgs/pkgs/applications/science/math/R/0001-Disable-test-pending-upstream-fix.patch b/nixpkgs/pkgs/applications/science/math/R/0001-Disable-test-pending-upstream-fix.patch deleted file mode 100644 index 7bf32df0b7a..00000000000 --- a/nixpkgs/pkgs/applications/science/math/R/0001-Disable-test-pending-upstream-fix.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 85ede2cf452800710de136f4f864921d3bb9773c Mon Sep 17 00:00:00 2001 -From: Tom Hall <tahall256@protonmail.ch> -Date: Fri, 21 Feb 2020 22:56:06 +0000 -Subject: [PATCH] Disable test pending upstream fix - -See https://bugs.r-project.org/bugzilla/show_bug.cgi?id=17718 ---- - tests/reg-tests-1d.R | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tests/reg-tests-1d.R b/tests/reg-tests-1d.R -index 9b551a1fc8..18ce6027ed 100644 ---- a/tests/reg-tests-1d.R -+++ b/tests/reg-tests-1d.R -@@ -3079,7 +3079,7 @@ stopifnot(exprs = { - x[1:52] %% 3 == 2:1 - -x[1:52] %% 3 == 1:2 - }) # larger x suffer from cancellation (well, warning too early now): --tools::assertWarning(x[60:68] %% 3) -+#tools::assertWarning(x[60:68] %% 3) - - - ## Hilmar Berger's on R-devel list: 'data.frame() == NULL' etc --- -2.24.1 - diff --git a/nixpkgs/pkgs/applications/science/math/R/default.nix b/nixpkgs/pkgs/applications/science/math/R/default.nix index 3ee62fad44d..52da3b4a1ac 100644 --- a/nixpkgs/pkgs/applications/science/math/R/default.nix +++ b/nixpkgs/pkgs/applications/science/math/R/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, bzip2, gfortran, libX11, libXmu, libXt, libjpeg, libpng -, libtiff, ncurses, pango, pcre, perl, readline, tcl, texLive, tk, xz, zlib -, less, texinfo, graphviz, icu, pkgconfig, bison, imake, which, jdk, openblas +, libtiff, ncurses, pango, pcre2, perl, readline, tcl, texLive, tk, xz, zlib +, less, texinfo, graphviz, icu, pkgconfig, bison, imake, which, jdk, blas, lapack , curl, Cocoa, Foundation, libobjc, libcxx, tzdata, fetchpatch , withRecommendedPackages ? true , enableStrictBarrier ? false @@ -9,28 +9,27 @@ , static ? false }: +assert (!blas.isILP64) && (!lapack.isILP64); + stdenv.mkDerivation rec { - name = "R-3.6.3"; + name = "R-4.0.0"; src = fetchurl { - url = "https://cran.r-project.org/src/base/R-3/${name}.tar.gz"; - sha256 = "13xaxwfbzj0bd6rn2n27z0n04lb93mcyq991w4vdbbg8v282jc49"; + url = "https://cran.r-project.org/src/base/R-4/${name}.tar.gz"; + sha256 = "0h1995smlyiyhx7gpg9paxsfqrcn6g9bbp5h9r47i6an3clv1gh6"; }; dontUseImakeConfigure = true; buildInputs = [ bzip2 gfortran libX11 libXmu libXt libXt libjpeg libpng libtiff ncurses - pango pcre perl readline texLive xz zlib less texinfo graphviz icu - pkgconfig bison imake which openblas curl tcl tk jdk + pango pcre2 perl readline texLive xz zlib less texinfo graphviz icu + pkgconfig bison imake which blas lapack curl tcl tk jdk ] ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa Foundation libobjc libcxx ]; patches = [ ./no-usr-local-search-paths.patch - ] ++ stdenv.lib.optionals stdenv.hostPlatform.isAarch64 [ - # Remove a test which fails on aarch64. - # See https://bugs.r-project.org/bugzilla/show_bug.cgi?id=17718 - ./0001-Disable-test-pending-upstream-fix.patch + ./fix-failing-test.patch ]; prePatch = stdenv.lib.optionalString stdenv.isDarwin '' @@ -43,8 +42,8 @@ stdenv.mkDerivation rec { configureFlagsArray=( --disable-lto --with${stdenv.lib.optionalString (!withRecommendedPackages) "out"}-recommended-packages - --with-blas="-L${openblas}/lib -lopenblas" - --with-lapack="-L${openblas}/lib -lopenblas" + --with-blas="-L${blas}/lib -lblas" + --with-lapack="-L${lapack}/lib -llapack" --with-readline --with-tcltk --with-tcl-config="${tcl}/lib/tclConfig.sh" --with-tk-config="${tk}/lib/tkConfig.sh" --with-cairo diff --git a/nixpkgs/pkgs/applications/science/math/R/fix-failing-test.patch b/nixpkgs/pkgs/applications/science/math/R/fix-failing-test.patch new file mode 100644 index 00000000000..5fb3b3b9c31 --- /dev/null +++ b/nixpkgs/pkgs/applications/science/math/R/fix-failing-test.patch @@ -0,0 +1,25 @@ +From e8f54bc562eb301d204b5f880614be58a2b39a2b Mon Sep 17 00:00:00 2001 +From: maechler <maechler@00db46b3-68df-0310-9c12-caf00c1e9a41> +Date: Mon, 30 Mar 2020 19:15:59 +0000 +Subject: [PATCH] no longer fail in norm() check for broken OpenBLAS Lapack + 3.9.0 + +git-svn-id: https://svn.r-project.org/R/trunk@78112 00db46b3-68df-0310-9c12-caf00c1e9a41 +--- + tests/reg-tests-1d.R | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/tests/reg-tests-1d.R b/tests/reg-tests-1d.R +index 6b7de765a95..fafd6911e7a 100644 +--- a/tests/reg-tests-1d.R ++++ b/tests/reg-tests-1d.R +@@ -3836,7 +3836,8 @@ stopifnot(is.na( norm(diag(c(1, NA)), "2") )) + ## norm(<matrix-w-NA>, "F") + (m <- cbind(0, c(NA, 0), 0:-1)) + nTypes <- eval(formals(base::norm)$type) # "O" "I" "F" "M" "2" +-stopifnot(is.na( print(vapply(nTypes, norm, 0., x = m)) )) # print(): show NA *or* NaN ++print( # stopifnot( -- for now, as Lapack is still broken in some OpenBLAS -- FIXME ++ is.na( print(vapply(nTypes, norm, 0., x = m)) )) # print(): show NA *or* NaN + ## "F" gave non-NA with LAPACK 3.9.0, before our patch in R-devel and R-patched + + diff --git a/nixpkgs/pkgs/applications/science/math/caffe/default.nix b/nixpkgs/pkgs/applications/science/math/caffe/default.nix index ea87c4953ee..4a6a2dc6c7e 100644 --- a/nixpkgs/pkgs/applications/science/math/caffe/default.nix +++ b/nixpkgs/pkgs/applications/science/math/caffe/default.nix @@ -9,7 +9,7 @@ , opencv3 , protobuf , doxygen -, openblas +, blas , Accelerate, CoreGraphics, CoreVideo , lmdbSupport ? true, lmdb , leveldbSupport ? true, leveldb, snappy @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { ++ ["-DUSE_LEVELDB=${toggle leveldbSupport}"] ++ ["-DUSE_LMDB=${toggle lmdbSupport}"]; - buildInputs = [ boost gflags glog protobuf hdf5-cpp opencv3 openblas ] + buildInputs = [ boost gflags glog protobuf hdf5-cpp opencv3 blas ] ++ lib.optional cudaSupport cudatoolkit ++ lib.optional cudnnSupport cudnn ++ lib.optional lmdbSupport lmdb diff --git a/nixpkgs/pkgs/applications/science/math/calculix/calculix.patch b/nixpkgs/pkgs/applications/science/math/calculix/calculix.patch index 311421f2ef5..5b8f492a8e7 100644 --- a/nixpkgs/pkgs/applications/science/math/calculix/calculix.patch +++ b/nixpkgs/pkgs/applications/science/math/calculix/calculix.patch @@ -15,7 +15,7 @@ index 9cab2fc..6e977b8 100755 OCCXMAIN = $(SCCXMAIN:.c=.o) -DIR=../../../SPOOLES.2.2 -+LIBS = -lpthread -lm -lc -lspooles -larpack -lopenblas ++LIBS = -lpthread -lm -lc -lspooles -larpack -lblas -llapack -LIBS = \ - $(DIR)/spooles.a \ diff --git a/nixpkgs/pkgs/applications/science/math/calculix/default.nix b/nixpkgs/pkgs/applications/science/math/calculix/default.nix index 6f2d61cd80f..44882594550 100644 --- a/nixpkgs/pkgs/applications/science/math/calculix/default.nix +++ b/nixpkgs/pkgs/applications/science/math/calculix/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gfortran, arpack, spooles, openblas }: +{ stdenv, fetchurl, gfortran, arpack, spooles, blas, lapack }: stdenv.mkDerivation rec { pname = "calculix"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gfortran ]; - buildInputs = [ arpack spooles openblas ]; + buildInputs = [ arpack spooles blas lapack ]; NIX_CFLAGS_COMPILE = "-I${spooles}/include/spooles"; diff --git a/nixpkgs/pkgs/applications/science/math/cemu/default.nix b/nixpkgs/pkgs/applications/science/math/cemu/default.nix index f91e5be5170..b41135229dd 100644 --- a/nixpkgs/pkgs/applications/science/math/cemu/default.nix +++ b/nixpkgs/pkgs/applications/science/math/cemu/default.nix @@ -4,7 +4,7 @@ , SDL2 , libGL , libarchive -, libusb +, libusb-compat-0_1 , qtbase , qmake , git @@ -33,7 +33,7 @@ mkDerivation rec { SDL2 libGL libarchive - libusb + libusb-compat-0_1 qtbase libpng_apng ]; diff --git a/nixpkgs/pkgs/applications/science/math/cntk/default.nix b/nixpkgs/pkgs/applications/science/math/cntk/default.nix index e2db40a402e..401454a6b69 100644 --- a/nixpkgs/pkgs/applications/science/math/cntk/default.nix +++ b/nixpkgs/pkgs/applications/science/math/cntk/default.nix @@ -1,11 +1,12 @@ { lib, stdenv, fetchgit, fetchFromGitHub, cmake -, openblas, opencv3, libzip, boost, protobuf, openmpi +, openblas, blas, lapack, opencv3, libzip, boost, protobuf, openmpi , onebitSGDSupport ? false , cudaSupport ? false, addOpenGLRunpath, cudatoolkit, nvidia_x11 , cudnnSupport ? cudaSupport, cudnn }: assert cudnnSupport -> cudaSupport; +assert blas.implementation == "openblas" && lapack.implementation == "openblas"; let # Old specific version required for CNTK. diff --git a/nixpkgs/pkgs/applications/science/math/csdp/default.nix b/nixpkgs/pkgs/applications/science/math/csdp/default.nix index eef60829f8e..ef9d5e733ca 100644 --- a/nixpkgs/pkgs/applications/science/math/csdp/default.nix +++ b/nixpkgs/pkgs/applications/science/math/csdp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, blas, gfortran, liblapack }: +{ lib, stdenv, fetchurl, blas, gfortran, lapack }: stdenv.mkDerivation { name = "csdp-6.1.1"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "1f9ql6cjy2gwiyc51ylfan24v1ca9sjajxkbhszlds1lqmma8n05"; }; - buildInputs = [ blas gfortran.cc.lib liblapack ]; + buildInputs = [ blas gfortran.cc.lib lapack ]; postPatch = '' substituteInPlace Makefile --replace /usr/local/bin $out/bin diff --git a/nixpkgs/pkgs/applications/science/math/getdp/default.nix b/nixpkgs/pkgs/applications/science/math/getdp/default.nix index 0ac2ea7d1b3..ae93e89f141 100644 --- a/nixpkgs/pkgs/applications/science/math/getdp/default.nix +++ b/nixpkgs/pkgs/applications/science/math/getdp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, gfortran, openblas, openmpi, petsc, python3 }: +{ stdenv, fetchurl, cmake, gfortran, blas, lapack, openmpi, petsc, python3 }: stdenv.mkDerivation rec { name = "getdp-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake gfortran ]; - buildInputs = [ openblas openmpi petsc python3 ]; + buildInputs = [ blas lapack openmpi petsc python3 ]; meta = with stdenv.lib; { description = "A General Environment for the Treatment of Discrete Problems"; diff --git a/nixpkgs/pkgs/applications/science/math/giac/default.nix b/nixpkgs/pkgs/applications/science/math/giac/default.nix index b3777528ecd..ea9c921f19e 100644 --- a/nixpkgs/pkgs/applications/science/math/giac/default.nix +++ b/nixpkgs/pkgs/applications/science/math/giac/default.nix @@ -1,10 +1,11 @@ -{ stdenv, lib, fetchurl, fetchpatch, texlive, bison, flex, liblapack -, gmp, mpfr, pari, ntl, gsl, blas, mpfi, ecm, glpk, nauty +{ stdenv, lib, fetchurl, fetchpatch, texlive, bison, flex, lapack, blas +, gmp, mpfr, pari, ntl, gsl, mpfi, ecm, glpk, nauty , readline, gettext, libpng, libao, gfortran, perl , enableGUI ? false, libGL ? null, libGLU ? null, xorg ? null, fltk ? null }: assert enableGUI -> libGLU != null && libGL != null && xorg != null && fltk != null; +assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { pname = "giac${lib.optionalString enableGUI "-with-xcas"}"; @@ -41,7 +42,7 @@ stdenv.mkDerivation rec { # gfortran.cc default output contains static libraries compiled without -fPIC # we want libgfortran.so.3 instead (stdenv.lib.getLib gfortran.cc) - liblapack + lapack blas ] ++ stdenv.lib.optionals enableGUI [ libGL libGLU fltk xorg.libX11 ]; diff --git a/nixpkgs/pkgs/applications/science/math/gmsh/default.nix b/nixpkgs/pkgs/applications/science/math/gmsh/default.nix index 2c4d5f254da..946beff8003 100644 --- a/nixpkgs/pkgs/applications/science/math/gmsh/default.nix +++ b/nixpkgs/pkgs/applications/science/math/gmsh/default.nix @@ -1,6 +1,8 @@ -{ stdenv, fetchurl, cmake, openblasCompat, gfortran, gmm, fltk, libjpeg +{ stdenv, fetchurl, cmake, blas, lapack, gfortran, gmm, fltk, libjpeg , zlib, libGL, libGLU, xorg, opencascade-occt }: +assert (!blas.isILP64) && (!lapack.isILP64); + stdenv.mkDerivation rec { pname = "gmsh"; version = "4.5.6"; @@ -10,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0gs65bgr1ph5lz7r6manqj8cra30s7c94pxilkd2z0p5vq6fpsj6"; }; - buildInputs = [ openblasCompat gmm fltk libjpeg zlib libGLU libGL + buildInputs = [ blas lapack gmm fltk libjpeg zlib libGLU libGL libGLU xorg.libXrender xorg.libXcursor xorg.libXfixes xorg.libXext xorg.libXft xorg.libXinerama xorg.libX11 xorg.libSM xorg.libICE opencascade-occt diff --git a/nixpkgs/pkgs/applications/science/math/jags/default.nix b/nixpkgs/pkgs/applications/science/math/jags/default.nix index 5ac1594e19a..122c6288847 100644 --- a/nixpkgs/pkgs/applications/science/math/jags/default.nix +++ b/nixpkgs/pkgs/applications/science/math/jags/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, gfortran, openblas}: +{stdenv, fetchurl, gfortran, blas, lapack}: stdenv.mkDerivation rec { name = "JAGS-4.3.0"; @@ -6,8 +6,8 @@ stdenv.mkDerivation rec { url = "mirror://sourceforge/mcmc-jags/${name}.tar.gz"; sha256 = "1z3icccg2ic56vmhyrpinlsvpq7kcaflk1731rgpvz9bk1bxvica"; }; - buildInputs = [gfortran openblas]; - configureFlags = [ "--with-blas=-lopenblas" "--with-lapack=-lopenblas" ]; + buildInputs = [gfortran blas lapack]; + configureFlags = [ "--with-blas=-lblas" "--with-lapack=-llapack" ]; meta = with stdenv.lib; { description = "Just Another Gibbs Sampler"; diff --git a/nixpkgs/pkgs/applications/science/math/mathematica/10.nix b/nixpkgs/pkgs/applications/science/math/mathematica/10.nix index c7da7b16da8..277fb1984c4 100644 --- a/nixpkgs/pkgs/applications/science/math/mathematica/10.nix +++ b/nixpkgs/pkgs/applications/science/math/mathematica/10.nix @@ -8,7 +8,7 @@ , gcc , glib , ncurses -, opencv +, opencv2 , openssl , unixODBC , xorg @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { gcc.libc glib ncurses - opencv + opencv2 openssl unixODBC libxml2 diff --git a/nixpkgs/pkgs/applications/science/math/mathematica/11.nix b/nixpkgs/pkgs/applications/science/math/mathematica/11.nix index 898d6a48635..1c698a5e542 100644 --- a/nixpkgs/pkgs/applications/science/math/mathematica/11.nix +++ b/nixpkgs/pkgs/applications/science/math/mathematica/11.nix @@ -10,7 +10,7 @@ , gcc , glib , ncurses -, opencv +, opencv2 , openssl , unixODBC , xkeyboard_config @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { gcc.libc glib ncurses - opencv + opencv2 openssl unixODBC xkeyboard_config diff --git a/nixpkgs/pkgs/applications/science/math/mathematica/9.nix b/nixpkgs/pkgs/applications/science/math/mathematica/9.nix index 617ac865713..d0967485c01 100644 --- a/nixpkgs/pkgs/applications/science/math/mathematica/9.nix +++ b/nixpkgs/pkgs/applications/science/math/mathematica/9.nix @@ -8,7 +8,7 @@ , gcc , glib , ncurses -, opencv +, opencv2 , openssl , unixODBC , xorg @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { gcc.libc glib ncurses - opencv + opencv2 openssl unixODBC ] ++ (with xorg; [ diff --git a/nixpkgs/pkgs/applications/science/math/mathematica/default.nix b/nixpkgs/pkgs/applications/science/math/mathematica/default.nix index 7831640b124..94d72eec6ae 100644 --- a/nixpkgs/pkgs/applications/science/math/mathematica/default.nix +++ b/nixpkgs/pkgs/applications/science/math/mathematica/default.nix @@ -11,7 +11,7 @@ , glib , libssh2 , ncurses -, opencv +, opencv2 , openssl , unixODBC , xkeyboard_config @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { glib libssh2 ncurses - opencv + opencv2 openssl stdenv.cc.cc.lib unixODBC diff --git a/nixpkgs/pkgs/applications/science/math/mxnet/default.nix b/nixpkgs/pkgs/applications/science/math/mxnet/default.nix index 5b7688f6051..b006a9dd18d 100644 --- a/nixpkgs/pkgs/applications/science/math/mxnet/default.nix +++ b/nixpkgs/pkgs/applications/science/math/mxnet/default.nix @@ -1,5 +1,5 @@ { config, stdenv, lib, fetchurl, bash, cmake -, opencv3, gtest, openblas, liblapack, perl +, opencv3, gtest, blas, perl , cudaSupport ? config.cudaSupport or false, cudatoolkit, nvidia_x11 , cudnnSupport ? cudaSupport, cudnn }: @@ -8,16 +8,16 @@ assert cudnnSupport -> cudaSupport; stdenv.mkDerivation rec { pname = "mxnet"; - version = "1.4.1"; + version = "1.6.0"; src = fetchurl { url = "https://github.com/apache/incubator-mxnet/releases/download/${version}/apache-mxnet-src-${version}-incubating.tar.gz"; - sha256 = "1d0lhlpdaxycjzpwwrpgjd3v2q2ka89v5rr13ddxayy7ld2hxiaj"; + sha256 = "1vvdb7pfh63kb9fzs6gqp95q550a3ck4cj9mqxlk9wwhkh30dsq1"; }; nativeBuildInputs = [ cmake perl ]; - buildInputs = [ opencv3 gtest openblas liblapack ] + buildInputs = [ opencv3 gtest blas ] ++ lib.optionals cudaSupport [ cudatoolkit nvidia_x11 ] ++ lib.optional cudnnSupport cudnn; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { substituteInPlace 3rdparty/mkldnn/tests/CMakeLists.txt \ --replace "/bin/bash" "${bash}/bin/bash" - # Build against the system version of OpenMP. + # Build against the system version of OpenMP. # https://github.com/apache/incubator-mxnet/pull/12160 rm -rf 3rdparty/openmp ''; diff --git a/nixpkgs/pkgs/applications/science/math/palp/default.nix b/nixpkgs/pkgs/applications/science/math/palp/default.nix index 4912b82d158..42259a2c689 100644 --- a/nixpkgs/pkgs/applications/science/math/palp/default.nix +++ b/nixpkgs/pkgs/applications/science/math/palp/default.nix @@ -9,16 +9,15 @@ let in stdenv.mkDerivation rec { pname = "palp"; - version = "2.1"; + version = "2.11"; src = fetchurl { url = "http://hep.itp.tuwien.ac.at/~kreuzer/CY/palp/palp-${version}.tar.gz"; - sha256 = "1s7s2lc5f0ig1yy7ygsh3sddm3sbq4mxwybqsj8lp9wjdxs7qfrs"; + sha256 = "09l4ysrdkqs91igg1faah75ay6ii684634ggvcxbkjsck65378l4"; }; hardeningDisable = [ "format" - "strictoverflow" # causes runtime failure (tested in checkPhase) ]; patchPhase = stdenv.lib.optionalString stdenv.isDarwin '' @@ -78,6 +77,9 @@ stdenv.mkDerivation rec { facet enumeration compares well with existing packages. ''; homepage = "http://hep.itp.tuwien.ac.at/~kreuzer/CY/CYpalp.html"; + # Not really a changelog, but a one-line summary of each update that should + # be reviewed on update. + changelog = "http://hep.itp.tuwien.ac.at/~kreuzer/CY/CYpalp.html"; # Just a link on the website pointing to gpl -- now gplv3. When the last # version was released that pointed to gplv2 however, so thats probably # the right license. diff --git a/nixpkgs/pkgs/applications/science/math/rofi-calc/default.nix b/nixpkgs/pkgs/applications/science/math/rofi-calc/default.nix index 842265cf3d5..84adb2358d2 100644 --- a/nixpkgs/pkgs/applications/science/math/rofi-calc/default.nix +++ b/nixpkgs/pkgs/applications/science/math/rofi-calc/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "rofi-calc"; - version = "1.6"; + version = "1.7"; src = fetchFromGitHub { owner = "svenstaro"; repo = pname; rev = "v${version}"; - sha256 = "00pz0s99pihjdjy8pl4ckg2qciyp32k439lmjb5iazwck512ar92"; + sha256 = "046x2zpvza7n0m81s75qkvmnpkvsvvyqqqjxcqzj7by0llpqs7wa"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/science/math/sage/sage-env.nix b/nixpkgs/pkgs/applications/science/math/sage/sage-env.nix index 68e0d134ace..626e1bf1ea9 100644 --- a/nixpkgs/pkgs/applications/science/math/sage/sage-env.nix +++ b/nixpkgs/pkgs/applications/science/math/sage/sage-env.nix @@ -41,7 +41,8 @@ , lcalc , rubiks , flintqs -, openblasCompat +, blas +, lapack , flint , gmp , mpfr @@ -53,6 +54,8 @@ , less }: +assert (!blas.isILP64) && (!lapack.isILP64); + # This generates a `sage-env` shell file that will be sourced by sage on startup. # It sets up various environment variables, telling sage where to find its # dependencies. @@ -114,7 +117,7 @@ writeTextFile rec { # testsuite instead, but since all the packages are also runtime # dependencies it doesn't really hurt to include them here. singular - openblasCompat + blas lapack fflas-ffpack givaro gd libpng zlib diff --git a/nixpkgs/pkgs/applications/science/math/sage/sage-src.nix b/nixpkgs/pkgs/applications/science/math/sage/sage-src.nix index cd465a8c413..4791d12450a 100644 --- a/nixpkgs/pkgs/applications/science/math/sage/sage-src.nix +++ b/nixpkgs/pkgs/applications/science/math/sage/sage-src.nix @@ -29,6 +29,14 @@ stdenv.mkDerivation rec { url = "https://git.sagemath.org/sage.git/patch?id2=8bdc326ba57d1bb9664f63cf165a9e9920cc1afc&id=dc673c17555efca611f68398d5013b66e9825463"; sha256 = "1hhannz7xzprijakn2w2d0rhd5zv2zikik9p51i87bas3nc658f7"; }) + + # `is_unitary` test in `matrix_double_dense.pyx` fails with some BLAS implementations + # https://trac.sagemath.org/ticket/29297 should be included in 9.1 + (fetchpatch { + name = "is_unitary-special-case.patch"; + url = "https://git.sagemath.org/sage.git/patch?id=cc3eb9ffa991e328b09028d32aab7e7cc2ddbb6a"; + sha256 = "0jq4w8hnp5c9q99011ldr4n3knvm1rx2g85z0hidv3i9x868p0ay"; + }) # Unfortunately inclusion in upstream sage was rejected. Instead the bug was # fixed in python, but of course not backported to 2.7. So we'll probably diff --git a/nixpkgs/pkgs/applications/science/math/sage/sage-with-env.nix b/nixpkgs/pkgs/applications/science/math/sage/sage-with-env.nix index 524085e8c01..87c1e07f530 100644 --- a/nixpkgs/pkgs/applications/science/math/sage/sage-with-env.nix +++ b/nixpkgs/pkgs/applications/science/math/sage/sage-with-env.nix @@ -2,7 +2,8 @@ , lib , makeWrapper , sage-env -, openblasCompat +, blas +, lapack , pkg-config , three , singular @@ -21,6 +22,9 @@ , pythonEnv }: +# lots of segfaults with (64 bit) blas +assert (!blas.isILP64) && (!lapack.isILP64); + # Wrapper that combined `sagelib` with `sage-env` to produce an actually # executable sage. No tests are run yet and no documentation is built. @@ -29,7 +33,7 @@ let pythonEnv # for patchShebangs makeWrapper pkg-config - openblasCompat # lots of segfaults with regular (64 bit) openblas + blas lapack singular three pynac diff --git a/nixpkgs/pkgs/applications/science/math/sage/sagelib.nix b/nixpkgs/pkgs/applications/science/math/sage/sagelib.nix index 69f7624078e..830d806a8bc 100644 --- a/nixpkgs/pkgs/applications/science/math/sage/sagelib.nix +++ b/nixpkgs/pkgs/applications/science/math/sage/sagelib.nix @@ -3,7 +3,8 @@ , perl , buildPythonPackage , arb -, openblasCompat +, blas +, lapack , brial , cliquer , cypari2 @@ -52,6 +53,8 @@ , pplpy }: +assert (!blas.isILP64) && (!lapack.isILP64); + # This is the core sage python package. Everything else is just wrappers gluing # stuff together. It is not very useful on its own though, since it will not # find many of its dependencies without `sage-env`, will not be tested without @@ -103,7 +106,8 @@ buildPythonPackage rec { m4rie mpfi ntl - openblasCompat + blas + lapack pari planarity ppl diff --git a/nixpkgs/pkgs/applications/science/math/wxmaxima/default.nix b/nixpkgs/pkgs/applications/science/math/wxmaxima/default.nix index 4d6e4bea34e..a6afc95ac09 100644 --- a/nixpkgs/pkgs/applications/science/math/wxmaxima/default.nix +++ b/nixpkgs/pkgs/applications/science/math/wxmaxima/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "wxmaxima"; - version = "20.02.4"; + version = "20.04.0"; src = fetchFromGitHub { owner = "wxMaxima-developers"; repo = "wxmaxima"; rev = "Version-${version}"; - sha256 = "106a7jrjwfmymzj70nsv44fm3jbxngr8pmkaghhpwy0ln38lhf54"; + sha256 = "0vrjxzfgmjdzm1rgl0crz4b4badl14jwh032y3xkcdvjl5j67lp3"; }; buildInputs = [ wxGTK maxima gnome3.adwaita-icon-theme ]; diff --git a/nixpkgs/pkgs/applications/science/misc/colmap/default.nix b/nixpkgs/pkgs/applications/science/misc/colmap/default.nix index 02adb689e20..83dff3e08f1 100644 --- a/nixpkgs/pkgs/applications/science/misc/colmap/default.nix +++ b/nixpkgs/pkgs/applications/science/misc/colmap/default.nix @@ -1,10 +1,10 @@ -{ mkDerivation, lib, fetchpatch, fetchFromGitHub, cmake, boost, ceres-solver, eigen, +{ mkDerivation, lib, fetchpatch, fetchFromGitHub, cmake, boost17x, ceres-solver, eigen, freeimage, glog, libGLU, glew, qtbase, cudaSupport ? false, cudatoolkit ? null }: assert !cudaSupport || cudatoolkit != null; -let boost_static = boost.override { enableStatic = true; }; +let boost_static = boost17x.override { enableStatic = true; }; in mkDerivation rec { version = "3.5"; diff --git a/nixpkgs/pkgs/applications/science/misc/foldingathome/client.nix b/nixpkgs/pkgs/applications/science/misc/foldingathome/client.nix index 9a29fde0a43..74a53902ee0 100644 --- a/nixpkgs/pkgs/applications/science/misc/foldingathome/client.nix +++ b/nixpkgs/pkgs/applications/science/misc/foldingathome/client.nix @@ -10,7 +10,7 @@ }: let majMin = stdenv.lib.versions.majorMinor version; - version = "7.5.1"; + version = "7.6.9"; fahclient = stdenv.mkDerivation rec { inherit version; @@ -18,7 +18,7 @@ let src = fetchurl { url = "https://download.foldingathome.org/releases/public/release/fahclient/debian-stable-64bit/v${majMin}/fahclient_${version}_amd64.deb"; - hash = "sha256-7+RwYdMoZnJZwYFbmLxsN9ozk2P7jpOGZz9qlvTTfSY="; + sha256 = "1v4yijjjdq9qx1fp60flp9ya6ywl9qdsgkzwmzjzp8sd5gfvhyr6"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/science/misc/foldingathome/control.nix b/nixpkgs/pkgs/applications/science/misc/foldingathome/control.nix index e8eba4c2ab2..72217689ff1 100644 --- a/nixpkgs/pkgs/applications/science/misc/foldingathome/control.nix +++ b/nixpkgs/pkgs/applications/science/misc/foldingathome/control.nix @@ -8,7 +8,7 @@ }: let majMin = stdenv.lib.versions.majorMinor version; - version = "7.5.1"; + version = "7.6.9"; python = python2.withPackages ( @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://download.foldingathome.org/releases/public/release/fahcontrol/debian-stable-64bit/v${majMin}/fahcontrol_${version}-1_all.deb"; - hash = "sha256-ydN4I6vmZpI9kD+/TXxgWc+AQqIIlUvABEycWmY1tNg="; + sha256 = "1fh7ybbp3qlqzh18c4gva3aaymv7d31mqchrv235a1axldha1s9s"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/science/misc/foldingathome/viewer.nix b/nixpkgs/pkgs/applications/science/misc/foldingathome/viewer.nix index 03fa54cd733..a35df650300 100644 --- a/nixpkgs/pkgs/applications/science/misc/foldingathome/viewer.nix +++ b/nixpkgs/pkgs/applications/science/misc/foldingathome/viewer.nix @@ -11,7 +11,7 @@ }: let majMin = stdenv.lib.versions.majorMinor version; - version = "7.5.1"; + version = "7.6.9"; in stdenv.mkDerivation rec { inherit version; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://download.foldingathome.org/releases/public/release/fahviewer/debian-stable-64bit/v${majMin}/fahviewer_${version}_amd64.deb"; - hash = "sha256-yH0zGjX8aNBEJ5lq7wWydcpp2rO+9Ah++q9eJ+ldeyk="; + sha256 = "04wr86g11wpmsczzwzak4gvalcihb47rn3zp6qriawhxyac9nf93"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/science/misc/openmodelica/default.nix b/nixpkgs/pkgs/applications/science/misc/openmodelica/default.nix index ed4101bdb47..50d4dcc1a9f 100644 --- a/nixpkgs/pkgs/applications/science/misc/openmodelica/default.nix +++ b/nixpkgs/pkgs/applications/science/misc/openmodelica/default.nix @@ -1,5 +1,5 @@ {stdenv, fetchgit, fetchsvn, autoconf, automake, libtool, gfortran, clang, cmake, gnumake, -hwloc, jre, liblapack, blas, hdf5, expat, ncurses, readline, qt4, webkitgtk, which, +hwloc, jre, lapack, blas, hdf5, expat, ncurses, readline, qt4, webkitgtk, which, lp_solve, omniorb, sqlite, libatomic_ops, pkgconfig, file, gettext, flex, bison, doxygen, boost, openscenegraph, gnome2, xorg, git, bash, gtk2, makeWrapper }: @@ -15,7 +15,7 @@ stdenv.mkDerivation { src = fetchgit (import ./src-main.nix); buildInputs = [autoconf cmake automake libtool gfortran clang gnumake - hwloc jre liblapack blas hdf5 expat ncurses readline qt4 webkitgtk which + hwloc jre lapack blas hdf5 expat ncurses readline qt4 webkitgtk which lp_solve omniorb sqlite libatomic_ops pkgconfig file gettext flex bison doxygen boost openscenegraph gnome2.gtkglext xorg.libXmu git gtk2 makeWrapper]; @@ -40,7 +40,7 @@ stdenv.mkDerivation { for e in $(cd $out/bin && ls); do wrapProgram $out/bin/$e \ --prefix PATH : "${gnumake}/bin" \ - --prefix LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ liblapack blas ]}" + --prefix LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ lapack blas ]}" done ''; @@ -53,5 +53,3 @@ stdenv.mkDerivation { broken = true; }; } - - diff --git a/nixpkgs/pkgs/applications/science/misc/rink/default.nix b/nixpkgs/pkgs/applications/science/misc/rink/default.nix index 839fc8f9546..5d592c233b6 100644 --- a/nixpkgs/pkgs/applications/science/misc/rink/default.nix +++ b/nixpkgs/pkgs/applications/science/misc/rink/default.nix @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { meta = with stdenv.lib; { description = "Unit-aware calculator"; - homepage = "http://rink.tiffnix.com"; + homepage = "https://rink.tiffnix.com"; license = with licenses; [ mpl20 gpl3 ]; maintainers = with maintainers; [ sb0 filalex77 ]; }; diff --git a/nixpkgs/pkgs/applications/science/misc/snakemake/default.nix b/nixpkgs/pkgs/applications/science/misc/snakemake/default.nix index 34bdaf6bacf..741330e4ad2 100644 --- a/nixpkgs/pkgs/applications/science/misc/snakemake/default.nix +++ b/nixpkgs/pkgs/applications/science/misc/snakemake/default.nix @@ -2,7 +2,7 @@ python3Packages.buildPythonApplication rec { pname = "snakemake"; - version = "5.13.0"; + version = "5.16.0"; propagatedBuildInputs = with python3Packages; [ appdirs @@ -22,13 +22,13 @@ python3Packages.buildPythonApplication rec { src = python3Packages.fetchPypi { inherit pname version; - sha256 = "11snr7sgv70d3y63s5svijfx8f4xpggh96g8chr6lccl4mi1s9x9"; + sha256 = "0jlf3y8b1gdv5xz37yk9b5g2b65zkk45p15x0ypvd2blpzy80537"; }; doCheck = false; # Tests depend on Google Cloud credentials at ${HOME}/gcloud-service-key.json meta = with stdenv.lib; { - homepage = "http://snakemake.bitbucket.io"; + homepage = "https://snakemake.readthedocs.io"; license = licenses.mit; description = "Python-based execution environment for make-like workflows"; longDescription = '' diff --git a/nixpkgs/pkgs/applications/science/molecular-dynamics/gromacs/default.nix b/nixpkgs/pkgs/applications/science/molecular-dynamics/gromacs/default.nix index fadd60d9ebb..d345827ed4e 100644 --- a/nixpkgs/pkgs/applications/science/molecular-dynamics/gromacs/default.nix +++ b/nixpkgs/pkgs/applications/science/molecular-dynamics/gromacs/default.nix @@ -9,11 +9,11 @@ }: stdenv.mkDerivation { - name = "gromacs-2020.1"; + name = "gromacs-2020.2"; src = fetchurl { - url = "ftp://ftp.gromacs.org/pub/gromacs/gromacs-2020.1.tar.gz"; - sha256 = "1kwrk3i1dxp8abhqqsl049lh361n4910h0415g052f8shdc6arp1"; + url = "ftp://ftp.gromacs.org/pub/gromacs/gromacs-2020.2.tar.gz"; + sha256 = "1wyjgcdl30wy4hy6jvi9lkq53bqs9fgfq6fri52dhnb3c76y8rbl"; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/applications/science/molecular-dynamics/lammps/default.nix b/nixpkgs/pkgs/applications/science/molecular-dynamics/lammps/default.nix index ab706a88931..5dc31695c60 100644 --- a/nixpkgs/pkgs/applications/science/molecular-dynamics/lammps/default.nix +++ b/nixpkgs/pkgs/applications/science/molecular-dynamics/lammps/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub -, libpng, gzip, fftw, openblas +, libpng, gzip, fftw, blas, lapack , mpi ? null }: let packages = [ @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { inherit packages; }; - buildInputs = [ fftw libpng openblas gzip ] + buildInputs = [ fftw libpng blas lapack gzip ] ++ (stdenv.lib.optionals withMPI [ mpi ]); configurePhase = '' diff --git a/nixpkgs/pkgs/applications/science/physics/elmerfem/default.nix b/nixpkgs/pkgs/applications/science/physics/elmerfem/default.nix new file mode 100644 index 00000000000..46cc32fa168 --- /dev/null +++ b/nixpkgs/pkgs/applications/science/physics/elmerfem/default.nix @@ -0,0 +1,49 @@ +{ stdenv, fetchFromGitHub, cmake, git, gfortran, openmpi, blas, liblapack, qt4, qwt6_qt4, pkg-config }: + +stdenv.mkDerivation rec { + pname = "elmerfem"; + version = "8.4"; + + src = fetchFromGitHub { + owner = "elmercsc"; + repo = "elmerfem"; + rev = "release-${version}"; + sha256 = "0vk31lplxlng173q8jjcpbyj1gaf98jvkqjvi9077d1nslya7vpm"; + }; + + hardeningDisable = [ "format" ]; + + nativeBuildInputs = [ cmake pkg-config git ]; + buildInputs = [ gfortran openmpi blas liblapack qt4 qwt6_qt4 ]; + + preConfigure = '' + patchShebangs ./ + ''; + + storepath = placeholder "out"; + + cmakeFlags = [ + "-DELMER_INSTALL_LIB_DIR=${storepath}/lib" + "-DWITH_OpenMP:BOOLEAN=TRUE" + "-DWITH_MPI:BOOLEAN=TRUE" + "-DWITH_ELMERGUI:BOOLEAN=TRUE" + "-DCMAKE_INSTALL_LIBDIR=lib" + "-DCMAKE_INSTALL_INCLUDEDIR=include" + "-DCMAKE_OpenGL_GL_PREFERENCE=GLVND" + ]; + + patches = [ + ./fix-cmake.patch + ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = "https://elmerfem.org/"; + description = "A finite element software for multiphysical problems."; + platforms = platforms.unix; + maintainers = [ maintainers.wulfsta ]; + license = licenses.lgpl21; + }; + +} diff --git a/nixpkgs/pkgs/applications/science/physics/elmerfem/fix-cmake.patch b/nixpkgs/pkgs/applications/science/physics/elmerfem/fix-cmake.patch new file mode 100644 index 00000000000..098f6520733 --- /dev/null +++ b/nixpkgs/pkgs/applications/science/physics/elmerfem/fix-cmake.patch @@ -0,0 +1,13 @@ +diff --exclude '*~' -ruN A/torch/CMakeLists.txt B/torch/CMakeLists.txt +--- A/fem/tests/CMakeLists.txt 2020-04-23 02:35:03.243388917 -0400 ++++ B/fem/tests/CMakeLists.txt 2018-12-19 20:18:40.671857320 -0400 +@@ -14,7 +14,7 @@ + SET(MESH2D_BIN "${CMAKE_BINARY_DIR}/meshgen2d/src/Mesh2D") + + MACRO(SUBDIRLIST result curdir depth) + set(glob_pattern "*") +- FOREACH(D RANGE 1 depth) ++ FOREACH(D RANGE 1 ${depth}) + FILE(GLOB children RELATIVE ${curdir} ${glob_pattern}) + FOREACH(child ${children}) + IF(IS_DIRECTORY ${curdir}/${child}) diff --git a/nixpkgs/pkgs/applications/science/physics/sherpa/default.nix b/nixpkgs/pkgs/applications/science/physics/sherpa/default.nix index 85b2ddd4d07..314fc522500 100644 --- a/nixpkgs/pkgs/applications/science/physics/sherpa/default.nix +++ b/nixpkgs/pkgs/applications/science/physics/sherpa/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "sherpa"; - version = "2.2.8"; + version = "2.2.9"; src = fetchurl { url = "https://www.hepforge.org/archive/sherpa/SHERPA-MC-${version}.tar.gz"; - sha256 = "1al1imdrknvbcy8k113xysc14lln4msbv281bf0kx7p73wz59mv3"; + sha256 = "1z7vws97k6zfzyqx0dkv2kq8d83dibi73i5jiqk5a22yplp6bnjh"; }; buildInputs = [ gfortran sqlite lhapdf rivet ]; @@ -21,13 +21,11 @@ stdenv.mkDerivation rec { "--enable-rivet=${rivet}" ]; - CXXFLAGS = "-std=c++11"; # needed for rivet on OSX - - meta = { + meta = with stdenv.lib; { description = "Simulation of High-Energy Reactions of PArticles in lepton-lepton, lepton-photon, photon-photon, lepton-hadron and hadron-hadron collisions"; - license = stdenv.lib.licenses.gpl2; - homepage = "https://gitlab.com/sherpa-team/sherpa"; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ veprbl ]; + license = licenses.gpl2; + homepage = "https://gitlab.com/sherpa-team/sherpa"; + platforms = platforms.unix; + maintainers = with maintainers; [ veprbl ]; }; } diff --git a/nixpkgs/pkgs/applications/science/physics/xfitter/default.nix b/nixpkgs/pkgs/applications/science/physics/xfitter/default.nix index f4d70e79079..b992851e40a 100644 --- a/nixpkgs/pkgs/applications/science/physics/xfitter/default.nix +++ b/nixpkgs/pkgs/applications/science/physics/xfitter/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, apfel, apfelgrid, applgrid, blas, gfortran, lhapdf, liblapack, libyaml, lynx, mela, root5, qcdnum, which }: +{ stdenv, fetchurl, apfel, apfelgrid, applgrid, blas, gfortran, lhapdf, lapack, libyaml, lynx, mela, root5, qcdnum, which }: stdenv.mkDerivation rec { pname = "xfitter"; @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gfortran which ]; buildInputs = - [ apfel apfelgrid applgrid blas lhapdf liblapack mela root5 qcdnum ] + [ apfel apfelgrid applgrid blas lhapdf lapack mela root5 qcdnum ] # pdf2yaml requires fmemopen and open_memstream which are not readily available on Darwin ++ stdenv.lib.optional (!stdenv.isDarwin) libyaml ; diff --git a/nixpkgs/pkgs/applications/science/robotics/gazebo/default.nix b/nixpkgs/pkgs/applications/science/robotics/gazebo/default.nix index aea298b6548..86572e73c75 100644 --- a/nixpkgs/pkgs/applications/science/robotics/gazebo/default.nix +++ b/nixpkgs/pkgs/applications/science/robotics/gazebo/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, cmake, pkgconfig, boost, protobuf, freeimage , boost-build, boost_process , xorg_sys_opengl, tbb, ogre, tinyxml-2 - , libtar, glxinfo, libusb, libxslt, ignition + , libtar, glxinfo, libusb-compat-0_1, libxslt, ignition , pythonPackages, utillinux # these deps are hidden; cmake doesn't catch them @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { tinyxml-2 libtar glxinfo - libusb + libusb-compat-0_1 libxslt ignition.math2 sdformat diff --git a/nixpkgs/pkgs/applications/science/robotics/mavproxy/default.nix b/nixpkgs/pkgs/applications/science/robotics/mavproxy/default.nix index 0348d015309..c354dad8042 100644 --- a/nixpkgs/pkgs/applications/science/robotics/mavproxy/default.nix +++ b/nixpkgs/pkgs/applications/science/robotics/mavproxy/default.nix @@ -3,11 +3,11 @@ buildPythonApplication rec { pname = "MAVProxy"; - version = "1.8.18"; + version = "1.8.19"; src = fetchPypi { inherit pname version; - sha256 = "1fi4m3591wws5cq43q8aljf91mzs6i9yhn9rimhpfrskbyf9knvm"; + sha256 = "1rbq2nm01212rp5xbl8p8kjl2mpgfppkwjsq3lnfw1v6g0m4359h"; }; propagatedBuildInputs = [ |