diff options
Diffstat (limited to 'pkgs/applications/science/misc')
8 files changed, 53 insertions, 29 deletions
diff --git a/pkgs/applications/science/misc/boinc/default.nix b/pkgs/applications/science/misc/boinc/default.nix index 0c559a530e089..b8b57857c02aa 100644 --- a/pkgs/applications/science/misc/boinc/default.nix +++ b/pkgs/applications/science/misc/boinc/default.nix @@ -10,7 +10,7 @@ , libGL , libXmu , libXi -, freeglut +, libglut , libjpeg , libtool , wxGTK32 @@ -27,14 +27,14 @@ stdenv.mkDerivation rec { pname = "boinc"; - version = "8.0.2"; + version = "8.0.4"; src = fetchFromGitHub { name = "${pname}-${version}-src"; owner = "BOINC"; repo = "boinc"; rev = "client_release/${lib.versions.majorMinor version}/${version}"; - hash = "sha256-e0zEdiN3QQHj6MNGd1pfaZf3o9rOpCTmuNSJQb3sss4="; + hash = "sha256-dp0zRMIG0PGXhth+Cc8FDhzl5X/4ud3GFCdE7wqPL/c="; }; nativeBuildInputs = [ libtool automake autoconf m4 pkg-config ]; @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { libGL libXmu libXi - freeglut + libglut libjpeg wxGTK32 gtk3 diff --git a/pkgs/applications/science/misc/colmap/default.nix b/pkgs/applications/science/misc/colmap/default.nix index d071c90562cd4..59e58351c0f6b 100644 --- a/pkgs/applications/science/misc/colmap/default.nix +++ b/pkgs/applications/science/misc/colmap/default.nix @@ -1,43 +1,62 @@ -{ mkDerivation, lib, fetchFromGitHub, cmake, boost179, ceres-solver, eigen, +{ lib, fetchFromGitHub, cmake, boost179, ceres-solver, eigen, freeimage, glog, libGLU, glew, qtbase, + flann, + cgal, + gmp, + mpfr, autoAddDriverRunpath, config, - cudaSupport ? config.cudaSupport, cudaPackages + stdenv, + qt5, + xorg, + cudaSupport ? config.cudaSupport, + cudaCapabilities ? cudaPackages.cudaFlags.cudaCapabilities, + cudaPackages }: assert cudaSupport -> cudaPackages != { }; let boost_static = boost179.override { enableStatic = true; }; + stdenv' = if cudaSupport then cudaPackages.backendStdenv else stdenv; # TODO: migrate to redist packages inherit (cudaPackages) cudatoolkit; in -mkDerivation rec { - version = "3.7"; +stdenv'.mkDerivation rec { + version = "3.9.1"; pname = "colmap"; src = fetchFromGitHub { owner = "colmap"; repo = "colmap"; rev = version; - hash = "sha256-uVAw6qwhpgIpHkXgxttKupU9zU+vD0Za0maw2Iv4x+I="; + hash = "sha256-Xb4JOttCMERwPYs5DyGKHw+f9Wik1/rdJQKbgVuygH8="; }; - # TODO: rm once the gcc11 issue is closed, https://github.com/colmap/colmap/issues/1418#issuecomment-1049305256 cmakeFlags = lib.optionals cudaSupport [ - "-DCUDA_ENABLED=ON" - "-DCUDA_NVCC_FLAGS=--std=c++14" + (lib.cmakeBool "CUDA_ENABLED" true) + (lib.cmakeFeature "CMAKE_CUDA_ARCHITECTURES" + (lib.strings.concatStringsSep ";" + (map cudaPackages.cudaFlags.dropDot + cudaCapabilities))) ]; buildInputs = [ boost_static ceres-solver eigen freeimage glog libGLU glew qtbase + flann + cgal + gmp + mpfr + xorg.libSM ] ++ lib.optionals cudaSupport [ cudatoolkit + cudaPackages.cuda_cudart.static ]; nativeBuildInputs = [ cmake + qt5.wrapQtAppsHook ] ++ lib.optionals cudaSupport [ autoAddDriverRunpath ]; diff --git a/pkgs/applications/science/misc/foldingathome/viewer.nix b/pkgs/applications/science/misc/foldingathome/viewer.nix index 7f28c8d1b1463..bb2c3c0abe30e 100644 --- a/pkgs/applications/science/misc/foldingathome/viewer.nix +++ b/pkgs/applications/science/misc/foldingathome/viewer.nix @@ -2,7 +2,7 @@ , autoPatchelfHook , dpkg , fetchurl -, freeglut +, libglut , gcc-unwrapped , libGL , libGLU @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - freeglut + libglut gcc-unwrapped.lib libGL libGLU diff --git a/pkgs/applications/science/misc/gephi/default.nix b/pkgs/applications/science/misc/gephi/default.nix index 77b6584412a5a..fe638bde1ba46 100644 --- a/pkgs/applications/science/misc/gephi/default.nix +++ b/pkgs/applications/science/misc/gephi/default.nix @@ -1,11 +1,6 @@ { lib, fetchFromGitHub, jdk11, maven, jogl }: -let - mavenJdk11 = maven.override { - jdk = jdk11; - }; -in -mavenJdk11.buildMavenPackage rec { +maven.buildMavenPackage rec { pname = "gephi"; version = "0.10.1"; @@ -16,6 +11,7 @@ mavenJdk11.buildMavenPackage rec { hash = "sha256-ZNSEaiD32zFfF2ISKa1CmcT9Nq6r5i2rNHooQAcVbn4="; }; + mvnJdk = jdk11; mvnHash = "sha256-/2/Yb26Ry0NHQQ3j0LXnjwC0wQqJiztvTgWixyMJqvg="; nativeBuildInputs = [ jdk11 ]; diff --git a/pkgs/applications/science/misc/golly/default.nix b/pkgs/applications/science/misc/golly/default.nix index 52b05cbb7e9b2..b509387fe8838 100644 --- a/pkgs/applications/science/misc/golly/default.nix +++ b/pkgs/applications/science/misc/golly/default.nix @@ -12,6 +12,10 @@ stdenv.mkDerivation rec { wxGTK perl python3 zlib libGLU libGL libX11 SDL2 ]; + nativeBuildInputs = [ + (python3.withPackages (ps: [ps.setuptools])) + ]; + setSourceRoot = '' sourceRoot=$(echo */gui-wx) ''; diff --git a/pkgs/applications/science/misc/openmvs/default.nix b/pkgs/applications/science/misc/openmvs/default.nix index 35f46f7a4552b..57c4367d2a822 100644 --- a/pkgs/applications/science/misc/openmvs/default.nix +++ b/pkgs/applications/science/misc/openmvs/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { owner = "cdcseacave"; repo = "openmvs"; rev = "v${version}"; - sha256 = "sha256-j/tGkR73skZiU+bP4j6aZ5CxkbIcHtqKcaUTgNvj0C8="; + hash = "sha256-j/tGkR73skZiU+bP4j6aZ5CxkbIcHtqKcaUTgNvj0C8="; fetchSubmodules = true; }; diff --git a/pkgs/applications/science/misc/openrefine/default.nix b/pkgs/applications/science/misc/openrefine/default.nix index 4f928e727da10..60809a420b391 100644 --- a/pkgs/applications/science/misc/openrefine/default.nix +++ b/pkgs/applications/science/misc/openrefine/default.nix @@ -7,14 +7,9 @@ , jq , makeWrapper , maven -, writeText }: let - maven' = maven.override { - inherit jdk; - }; - version = "3.8.1"; src = fetchFromGitHub { owner = "openrefine"; @@ -47,7 +42,7 @@ let ''; }; -in maven'.buildMavenPackage { +in maven.buildMavenPackage { inherit src version; pname = "openrefine"; @@ -55,6 +50,8 @@ in maven'.buildMavenPackage { postPatch = '' cp -r ${npmPkg} main/webapp/modules/core/3rdparty ''; + + mvnJdk = jdk; mvnParameters = "-pl !packaging"; mvnHash = "sha256-FD4g0Mshz39N1h8MDAk907PhF5TguWTZ7AXKECHuhzQ="; diff --git a/pkgs/applications/science/misc/rink/default.nix b/pkgs/applications/science/misc/rink/default.nix index 6b5917e163287..ae51d55168a9f 100644 --- a/pkgs/applications/science/misc/rink/default.nix +++ b/pkgs/applications/science/misc/rink/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, rustPlatform, openssl, pkg-config, ncurses -, curl, libiconv, Security }: +, curl, installShellFiles, asciidoctor, libiconv, Security }: rustPlatform.buildRustPackage rec { version = "0.8.0"; @@ -14,13 +14,21 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-j1pQfMjDNu57otOBTVBQEZIx80p4/beEUQdUkAJhvso="; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config installShellFiles asciidoctor ]; buildInputs = [ ncurses ] ++ (if stdenv.isDarwin then [ curl libiconv Security ] else [ openssl ]); # Some tests fail and/or attempt to use internet servers. doCheck = false; + postBuild = '' + make man + ''; + + postInstall = '' + installManPage build/* + ''; + meta = with lib; { description = "Unit-aware calculator"; mainProgram = "rink"; |