diff options
Diffstat (limited to 'pkgs/applications/science/misc')
25 files changed, 87 insertions, 94 deletions
diff --git a/pkgs/applications/science/misc/bada-bib/default.nix b/pkgs/applications/science/misc/bada-bib/default.nix index 1895315325747..83abd40030ee5 100644 --- a/pkgs/applications/science/misc/bada-bib/default.nix +++ b/pkgs/applications/science/misc/bada-bib/default.nix @@ -74,7 +74,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { homepage = "https://github.com/RogerCrocker/BadaBib"; - description = "A simple BibTeX Viewer and Editor"; + description = "Simple BibTeX Viewer and Editor"; mainProgram = "badabib"; maintainers = [ maintainers.Cogitri ]; license = licenses.gpl3Plus; diff --git a/pkgs/applications/science/misc/boinc/default.nix b/pkgs/applications/science/misc/boinc/default.nix index 6a0aafad3e914..199759437e911 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.1"; + version = "8.0.3"; src = fetchFromGitHub { name = "${pname}-${version}-src"; owner = "BOINC"; repo = "boinc"; rev = "client_release/${lib.versions.majorMinor version}/${version}"; - hash = "sha256-pjk9+VRWrFIoHolIEEWlRx89hifLNeFtIi34F1OBD38="; + hash = "sha256-kkEEJp7NTpHwbo03BGjjJAraFQIJcoNyV+oDsCZlzPQ="; }; 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/cwltool/default.nix b/pkgs/applications/science/misc/cwltool/default.nix index 7919dfd176828..ab43eac8bffb0 100644 --- a/pkgs/applications/science/misc/cwltool/default.nix +++ b/pkgs/applications/science/misc/cwltool/default.nix @@ -7,14 +7,14 @@ python3.pkgs.buildPythonApplication rec { pname = "cwltool"; - version = "3.1.20240404144621"; + version = "3.1.20240508115724"; pyproject = true; src = fetchFromGitHub { owner = "common-workflow-language"; repo = "cwltool"; rev = "refs/tags/${version}"; - hash = "sha256-atpXkMIQ60POuUk99uiiuCoRXt4Seg11g/eHCeTDe+Q="; + hash = "sha256-hBP/8PIqvs820UsxrRuyMVIWgQGFVcMHCUToxhcupTk="; }; postPatch = '' @@ -24,7 +24,6 @@ python3.pkgs.buildPythonApplication rec { --replace '"schema-salad >= 8.4.20230426093816, < 9",' "" \ --replace "PYTEST_RUNNER + " "" substituteInPlace pyproject.toml \ - --replace "mypy==1.8.0" "mypy" \ --replace "ruamel.yaml>=0.16.0,<0.18" "ruamel.yaml" ''; diff --git a/pkgs/applications/science/misc/cytoscape/default.nix b/pkgs/applications/science/misc/cytoscape/default.nix index 1d42600d9770d..392a529f0dedd 100644 --- a/pkgs/applications/science/misc/cytoscape/default.nix +++ b/pkgs/applications/science/misc/cytoscape/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.cytoscape.org"; - description = "A general platform for complex network analysis and visualization"; + description = "General platform for complex network analysis and visualization"; mainProgram = "cytoscape"; license = lib.licenses.lgpl21; maintainers = [lib.maintainers.mimame]; 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 ab8134daf3aea..77b6584412a5a 100644 --- a/pkgs/applications/science/misc/gephi/default.nix +++ b/pkgs/applications/science/misc/gephi/default.nix @@ -36,7 +36,7 @@ mavenJdk11.buildMavenPackage rec { ''; meta = with lib; { - description = "A platform for visualizing and manipulating large graphs"; + description = "Platform for visualizing and manipulating large graphs"; mainProgram = "gephi"; homepage = "https://gephi.org"; sourceProvenance = with sourceTypes; [ diff --git a/pkgs/applications/science/misc/graphia/default.nix b/pkgs/applications/science/misc/graphia/default.nix index b24d5375ef9b8..a5055220e95fb 100644 --- a/pkgs/applications/science/misc/graphia/default.nix +++ b/pkgs/applications/science/misc/graphia/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { meta = with lib; { # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/graphia.x86_64-darwin broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; - description = "A visualisation tool for the creation and analysis of graphs."; + description = "Visualisation tool for the creation and analysis of graphs"; homepage = "https://graphia.app"; license = licenses.gpl3Only; mainProgram = "Graphia"; diff --git a/pkgs/applications/science/misc/netlogo/default.nix b/pkgs/applications/science/misc/netlogo/default.nix index 13c3c36f90ae6..20d001d8dba23 100644 --- a/pkgs/applications/science/misc/netlogo/default.nix +++ b/pkgs/applications/science/misc/netlogo/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "A multi-agent programmable modeling environment"; + description = "Multi-agent programmable modeling environment"; mainProgram = "netlogo"; longDescription = '' NetLogo is a multi-agent programmable modeling environment. It is used by diff --git a/pkgs/applications/science/misc/openmodelica/combined/default.nix b/pkgs/applications/science/misc/openmodelica/combined/default.nix index bc6bc96202152..8d937dddac547 100644 --- a/pkgs/applications/science/misc/openmodelica/combined/default.nix +++ b/pkgs/applications/science/misc/openmodelica/combined/default.nix @@ -21,7 +21,7 @@ symlinkJoin { ''; meta = with lib; { - description = "An open-source Modelica-based modeling and simulation environment intended for industrial and academic usage"; + description = "Open-source Modelica-based modeling and simulation environment intended for industrial and academic usage"; homepage = "https://openmodelica.org"; license = licenses.gpl3Only; maintainers = with maintainers; [ balodja smironov ]; diff --git a/pkgs/applications/science/misc/openmodelica/omcompiler/default.nix b/pkgs/applications/science/misc/openmodelica/omcompiler/default.nix index 360fea56fedfb..82b9f8e36fe1d 100644 --- a/pkgs/applications/science/misc/openmodelica/omcompiler/default.nix +++ b/pkgs/applications/science/misc/openmodelica/omcompiler/default.nix @@ -44,6 +44,11 @@ mkOpenModelicaDerivation ({ $(find ./OMCompiler -name 'Makefile*') ''; + env.CFLAGS = toString [ + "-Wno-error=dynamic-exception-spec" + "-Wno-error=implicit-function-declaration" + ]; + preFixup = '' for entry in $(find $out -name libipopt.so); do patchelf --shrink-rpath --allowed-rpath-prefixes "$NIX_STORE" "$entry" diff --git a/pkgs/applications/science/misc/openmodelica/omedit/default.nix b/pkgs/applications/science/misc/openmodelica/omedit/default.nix index 57863482fef65..731d64c41755b 100644 --- a/pkgs/applications/science/misc/openmodelica/omedit/default.nix +++ b/pkgs/applications/science/misc/openmodelica/omedit/default.nix @@ -30,7 +30,7 @@ mkOpenModelicaDerivation rec { QMAKESPEC = "linux-clang"; meta = with lib; { - description = "A Modelica connection editor for OpenModelica"; + description = "Modelica connection editor for OpenModelica"; homepage = "https://openmodelica.org"; license = licenses.gpl3Only; maintainers = with maintainers; [ balodja smironov ]; diff --git a/pkgs/applications/science/misc/openmodelica/omlibrary/default.nix b/pkgs/applications/science/misc/openmodelica/omlibrary/default.nix index 6821e33d1a629..dee5aacf66655 100644 --- a/pkgs/applications/science/misc/openmodelica/omlibrary/default.nix +++ b/pkgs/applications/science/misc/openmodelica/omlibrary/default.nix @@ -24,7 +24,7 @@ mkOpenModelicaDerivation { ''; meta = with lib; { - description = "A collection of Modelica libraries to use with OpenModelica, + description = "Collection of Modelica libraries to use with OpenModelica, including Modelica Standard Library"; homepage = "https://openmodelica.org"; license = licenses.gpl3Only; diff --git a/pkgs/applications/science/misc/openmodelica/omparser/default.nix b/pkgs/applications/science/misc/openmodelica/omparser/default.nix index cbf8f2255e76c..03030de2cf486 100644 --- a/pkgs/applications/science/misc/openmodelica/omparser/default.nix +++ b/pkgs/applications/science/misc/openmodelica/omparser/default.nix @@ -18,7 +18,7 @@ mkOpenModelicaDerivation rec { patches = [ ./Makefile.in.patch ]; meta = with lib; { - description = "An antlr4-based parser of Modelica files from OpenModelica + description = "Antlr4-based parser of Modelica files from OpenModelica suite"; homepage = "https://openmodelica.org"; license = licenses.gpl3Only; diff --git a/pkgs/applications/science/misc/openmodelica/omsimulator/default.nix b/pkgs/applications/science/misc/openmodelica/omsimulator/default.nix index d91d427a07703..9e28e3f21f26d 100644 --- a/pkgs/applications/science/misc/openmodelica/omsimulator/default.nix +++ b/pkgs/applications/science/misc/openmodelica/omsimulator/default.nix @@ -5,6 +5,7 @@ , libxml2 , openmodelica , mkOpenModelicaDerivation +, fetchpatch }: mkOpenModelicaDerivation rec { @@ -12,12 +13,25 @@ mkOpenModelicaDerivation rec { omdir = "OMSimulator"; omdeps = [ openmodelica.omcompiler ]; + patches = [ + (fetchpatch { + url = "https://github.com/OpenModelica/OMSimulator/commit/5ef06e251d639a0224adc205cdbfa1f99bf9a956.patch"; + stripLen = 1; + extraPrefix = "OMSimulator/"; + hash = "sha256-hLsS6TNEjddm2o2Optnf8n6hh14up9bWJBoztNmisH0="; + }) + ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ readline libxml2 boost ]; + env.CFLAGS = toString [ + "-Wno-error=implicit-function-declaration" + ]; + meta = with lib; { - description = "The OpenModelica FMI & SSP-based co-simulation environment"; + description = "OpenModelica FMI & SSP-based co-simulation environment"; homepage = "https://openmodelica.org"; license = licenses.gpl3Only; maintainers = with maintainers; [ balodja smironov ]; diff --git a/pkgs/applications/science/misc/openmvg/default.nix b/pkgs/applications/science/misc/openmvg/default.nix index 5cf4dc4377521..f622f87d2e412 100644 --- a/pkgs/applications/science/misc/openmvg/default.nix +++ b/pkgs/applications/science/misc/openmvg/default.nix @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { meta = { broken = stdenv.isDarwin && stdenv.isx86_64; - description = "A library for computer-vision scientists and targeted for the Multiple View Geometry community"; + description = "Library for computer-vision scientists and targeted for the Multiple View Geometry community"; homepage = "https://openmvg.readthedocs.io/en/latest/"; license = lib.licenses.mpl20; platforms = lib.platforms.unix; diff --git a/pkgs/applications/science/misc/openrefine/default.nix b/pkgs/applications/science/misc/openrefine/default.nix index 9f2ef0f29b31f..b94f23671024b 100644 --- a/pkgs/applications/science/misc/openrefine/default.nix +++ b/pkgs/applications/science/misc/openrefine/default.nix @@ -15,12 +15,12 @@ let inherit jdk; }; - version = "3.7.9"; + version = "3.8.1"; src = fetchFromGitHub { owner = "openrefine"; repo = "openrefine"; rev = version; - hash = "sha256-wtg0BOGr/aJPZeFQbJSBHtTVfpcSCSHP++8AnpS8pgQ="; + hash = "sha256-MnFwFJdKIU7D8GQgnDvCO+P8r8h1Se/wmbt/Z3EX+3Q="; }; npmPkg = buildNpmPackage { @@ -29,7 +29,7 @@ let pname = "openrefine-npm"; sourceRoot = "${src.name}/main/webapp"; - npmDepsHash = "sha256-8GhcL4tohQ5u2HeYN6JyTMMobUOqAL8ETCLiP1SoDSk="; + npmDepsHash = "sha256-u9qledNFqGgMmOIsm2T8w3UoaLbb7WtksUw6xLoRgU8="; # package.json doesn't supply a version, which npm doesn't like - fix this. # directly referencing jq because buildNpmPackage doesn't pass @@ -55,20 +55,14 @@ in maven'.buildMavenPackage { postPatch = '' cp -r ${npmPkg} main/webapp/modules/core/3rdparty ''; - mvnParameters = "-DskipTests=true -pl !packaging"; - mvnHash = "sha256-MqE+iloqzBav6E3/rf1LP5BlKhW/FBIt6+6U+S8UJWA="; + mvnParameters = "-pl !packaging"; + mvnHash = "sha256-0qsKUMV9M0ZaddR5ust8VikSrsutdxVNNezKqR+F/6M="; nativeBuildInputs = [ makeWrapper ]; - installPhase = let - gitProperties = writeText "git.properties" (builtins.toJSON { - "git.build.version" = version; - "git.branch" = "none"; - "git.build.time" = "1970-01-01T00:00:00+0000"; - "git.commit.id.abbrev" = "none"; - "git.commit.id.describe" = "none"; - }); - in '' + doCheck = false; + + installPhase = '' mkdir -p $out/lib/server/target/lib cp -r server/target/lib/* $out/lib/server/target/lib/ cp server/target/openrefine-*-server.jar $out/lib/server/target/lib/ @@ -85,8 +79,6 @@ in maven'.buildMavenPackage { done ) - cp ${gitProperties} $out/lib/webapp/WEB-INF/classes/git.properties - mkdir -p $out/etc cp refine.ini $out/etc/ diff --git a/pkgs/applications/science/misc/reason-shell/default.nix b/pkgs/applications/science/misc/reason-shell/default.nix index 848f31abe4c6b..5491593cc7f70 100644 --- a/pkgs/applications/science/misc/reason-shell/default.nix +++ b/pkgs/applications/science/misc/reason-shell/default.nix @@ -31,7 +31,7 @@ rustPlatform.buildRustPackage rec { ]; meta = with lib; { - description = "A shell for research papers"; + description = "Shell for research papers"; mainProgram = "reason"; homepage = "https://github.com/jaywonchung/reason"; changelog = "https://github.com/jaywonchung/reason/releases/tag/${src.rev}"; diff --git a/pkgs/applications/science/misc/rink/default.nix b/pkgs/applications/science/misc/rink/default.nix index 1e88047eba72c..6b5917e163287 100644 --- a/pkgs/applications/science/misc/rink/default.nix +++ b/pkgs/applications/science/misc/rink/default.nix @@ -1,22 +1,22 @@ { lib, stdenv, fetchFromGitHub, rustPlatform, openssl, pkg-config, ncurses -, libiconv, Security }: +, curl, libiconv, Security }: rustPlatform.buildRustPackage rec { - version = "0.7.0"; + version = "0.8.0"; pname = "rink"; src = fetchFromGitHub { owner = "tiffany352"; repo = "rink-rs"; rev = "v${version}"; - sha256 = "sha256-5UrSJ/y6GxDUNaljal57JJY17NuI+2yLwVTwp+xBNxs="; + hash = "sha256-2+ZkyWhEnnO/QgCzWscbMr0u5kwdv2HqPLjtiXDfv/o="; }; - cargoHash = "sha256-G30NcP1ej01ygHzaxZ2OdgfksvXe/SCsmZFwamxlDvA="; + cargoHash = "sha256-j1pQfMjDNu57otOBTVBQEZIx80p4/beEUQdUkAJhvso="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ ncurses ] - ++ (if stdenv.isDarwin then [ libiconv Security ] else [ openssl ]); + ++ (if stdenv.isDarwin then [ curl libiconv Security ] else [ openssl ]); # Some tests fail and/or attempt to use internet servers. doCheck = false; diff --git a/pkgs/applications/science/misc/root/5.nix b/pkgs/applications/science/misc/root/5.nix index dfe7b5eca97f3..80f2df0688da3 100644 --- a/pkgs/applications/science/misc/root/5.nix +++ b/pkgs/applications/science/misc/root/5.nix @@ -153,7 +153,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://root.cern.ch/"; - description = "A data analysis framework"; + description = "Data analysis framework"; platforms = platforms.unix; broken = !stdenv.isx86_64 || stdenv.cc.isClang or false; maintainers = with maintainers; [ veprbl ]; diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix index 59bb9415b37d9..ded47a661a21a 100644 --- a/pkgs/applications/science/misc/root/default.nix +++ b/pkgs/applications/science/misc/root/default.nix @@ -1,8 +1,8 @@ { stdenv , lib , callPackage +, fetchgit , fetchurl -, fetchpatch , makeWrapper , cmake , coreutils @@ -24,7 +24,7 @@ , libGL , libxcrypt , libxml2 -, llvm_13 +, llvm_16 , lsof , lz4 , xz @@ -40,7 +40,6 @@ , xxHash , zlib , zstd -, libAfterImage , giflib , libjpeg , libtiff @@ -57,7 +56,7 @@ stdenv.mkDerivation rec { pname = "root"; - version = "6.30.06"; + version = "6.32.00"; passthru = { tests = import ./tests { inherit callPackage; }; @@ -65,7 +64,13 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://root.cern.ch/download/root_v${version}.source.tar.gz"; - hash = "sha256-MA237RtnjtL7ljXKZ1khoZRcfCED2oQAM7STCR9VcAw="; + hash = "sha256-EvIDaBpZBBxHTOlSN2Hm8OiGGzvueN9feZqNtVGJ5dI="; + }; + + clad_src = fetchgit { + url = "https://github.com/vgvassilev/clad"; + rev = "refs/tags/v1.5"; # Make sure that this is the same tag as in the ROOT build files! + hash = "sha256-s0DbHfLthv51ZICnTd30O4qG/DyZPk5tADeu3bBRoOw="; }; nativeBuildInputs = [ makeWrapper cmake pkg-config git ]; @@ -83,7 +88,7 @@ stdenv.mkDerivation rec { lapack libxcrypt libxml2 - llvm_13 + llvm_16 lz4 xz gsl @@ -91,7 +96,6 @@ stdenv.mkDerivation rec { openblas openssl xxHash - libAfterImage giflib libjpeg libtiff @@ -109,17 +113,6 @@ stdenv.mkDerivation rec { patches = [ ./sw_vers.patch - - # compatibility with recent XRootD - # https://github.com/root-project/root/pull/13752 - (fetchpatch { - url = "https://github.com/root-project/root/commit/3d3cda6c520791282298782189cdb8ca07ace4b9.diff"; - hash = "sha256-O3aXzrOEQiPjZgbAj9TL6Wt/adN1kKFwjooeaFRyT4I="; - }) - (fetchpatch { - url = "https://github.com/root-project/root/commit/6e7798e62dbed1ffa8b91a180fa5a080b7c04ba3.diff"; - hash = "sha256-47/J631DBnVlvM1Pm9iicKXDKAqN8v9hjAstQuHmH8Q="; - }) ]; preConfigure = '' @@ -131,6 +124,18 @@ stdenv.mkDerivation rec { substituteInPlace cmake/modules/SearchInstalledSoftware.cmake \ --replace 'set(lcgpackages ' '#set(lcgpackages ' + # We have to bypass the connection check, because it would disable clad. + # This should probably be fixed upstream with a flag to disable the + # connectivity check! + substituteInPlace CMakeLists.txt \ + --replace 'if(clad AND NO_CONNECTION)' 'if(FALSE)' + # Make sure that clad is not downloaded when building + substituteInPlace interpreter/cling/tools/plugins/clad/CMakeLists.txt \ + --replace 'UPDATE_COMMAND ""' 'SOURCE_DIR ${clad_src} DOWNLOAD_COMMAND "" UPDATE_COMMAND ""' + # Make sure that clad is finding the right llvm version + substituteInPlace interpreter/cling/tools/plugins/clad/CMakeLists.txt \ + --replace '-DLLVM_DIR=''${LLVM_BINARY_DIR}' '-DLLVM_DIR=${llvm_16.dev}/lib/cmake/llvm' + substituteInPlace interpreter/llvm-project/clang/tools/driver/CMakeLists.txt \ --replace 'add_clang_symlink(''${link} clang)' "" @@ -151,40 +156,18 @@ stdenv.mkDerivation rec { ''; cmakeFlags = [ - "-Drpath=ON" "-DCMAKE_INSTALL_BINDIR=bin" "-DCMAKE_INSTALL_LIBDIR=lib" "-DCMAKE_INSTALL_INCLUDEDIR=include" "-Dbuiltin_llvm=OFF" - "-Dbuiltin_freetype=OFF" - "-Dbuiltin_gtest=OFF" - "-Dbuiltin_nlohmannjson=OFF" - "-Dbuiltin_openui5=ON" - "-Dclad=OFF" - "-Ddavix=ON" - "-Ddcache=OFF" "-Dfail-on-missing=ON" - "-Dfftw3=OFF" "-Dfitsio=OFF" - "-Dfortran=OFF" "-Dgnuinstall=ON" - "-Dimt=ON" - "-Dgviz=OFF" - "-Dhttp=ON" "-Dmysql=OFF" - "-Dodbc=OFF" - "-Dopengl=ON" "-Dpgsql=OFF" - "-Dpythia8=OFF" - "-Droot7=ON" "-Dsqlite=OFF" - "-Dssl=ON" - "-Dtmva=ON" "-Dtmva-pymva=OFF" "-Dvdt=OFF" - "-Dwebgui=ON" - "-Dxml=ON" - "-Dxrootd=ON" ] ++ lib.optional (stdenv.cc.libc != null) "-DC_INCLUDE_DIRS=${lib.getDev stdenv.cc.libc}/include" ++ lib.optionals stdenv.isDarwin [ @@ -251,8 +234,8 @@ stdenv.mkDerivation rec { setupHook = ./setup-hook.sh; meta = with lib; { - homepage = "https://root.cern.ch/"; - description = "A data analysis framework"; + homepage = "https://root.cern/"; + description = "Data analysis framework"; platforms = platforms.unix; maintainers = [ maintainers.guitargeek maintainers.veprbl ]; license = licenses.lgpl21; diff --git a/pkgs/applications/science/misc/root/setup-hook.sh b/pkgs/applications/science/misc/root/setup-hook.sh index 34c9bfdcebbd0..7affd21012eb6 100644 --- a/pkgs/applications/science/misc/root/setup-hook.sh +++ b/pkgs/applications/science/misc/root/setup-hook.sh @@ -12,8 +12,8 @@ thisroot () { postHooks+=(thisroot) -addRootInludePath() { +addRootIncludePath() { addToSearchPath ROOT_INCLUDE_PATH $1/include } -addEnvHooks "$targetOffset" addRootInludePath +addEnvHooks "$targetOffset" addRootIncludePath diff --git a/pkgs/applications/science/misc/root/sw_vers.patch b/pkgs/applications/science/misc/root/sw_vers.patch index 54ad1091392e1..2a0fcd7577190 100644 --- a/pkgs/applications/science/misc/root/sw_vers.patch +++ b/pkgs/applications/science/misc/root/sw_vers.patch @@ -48,7 +48,7 @@ diff a/cmake/modules/SetUpMacOS.cmake b/cmake/modules/SetUpMacOS.cmake #---Set Linker flags---------------------------------------------------------------------- - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -mmacosx-version-min=${MACOSX_VERSION}") else (CMAKE_SYSTEM_NAME MATCHES Darwin) - MESSAGE(FATAL_ERROR "There is no setup for this this Apple system up to now. Don't know waht to do. Stop cmake at this point.") + MESSAGE(FATAL_ERROR "There is no setup for this this Apple system up to now. Don't know what to do. Stop cmake at this point.") endif (CMAKE_SYSTEM_NAME MATCHES Darwin) diff a/config/root-config.in b/config/root-config.in --- a/config/root-config.in diff --git a/pkgs/applications/science/misc/sasview/xhtml2pdf.nix b/pkgs/applications/science/misc/sasview/xhtml2pdf.nix index 41d15e2f1babc..b7ace57d74afc 100644 --- a/pkgs/applications/science/misc/sasview/xhtml2pdf.nix +++ b/pkgs/applications/science/misc/sasview/xhtml2pdf.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { }; meta = { - description = "A pdf converter for the ReportLab Toolkit"; + description = "Pdf converter for the ReportLab Toolkit"; homepage = "https://github.com/xhtml2pdf/xhtml2pdf"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ rprospero ]; diff --git a/pkgs/applications/science/misc/snakemake/default.nix b/pkgs/applications/science/misc/snakemake/default.nix index fa670b85621c0..7f0e70c642134 100644 --- a/pkgs/applications/science/misc/snakemake/default.nix +++ b/pkgs/applications/science/misc/snakemake/default.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "snakemake"; - version = "8.11.0"; + version = "8.14.0"; format = "setuptools"; src = fetchFromGitHub { owner = "snakemake"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-bAzhQMGI4t/ftcZnz6h/PmlDlGgMU8vFVHb9QXED/Hw="; + hash = "sha256-6oguN4u4OUDXpDsbueSBNwtWgLCaKmgq3w/d/MsMh7Y="; # https://github.com/python-versioneer/python-versioneer/issues/217 postFetch = '' sed -i "$out"/snakemake/_version.py -e 's#git_refnames = ".*"#git_refnames = " (tag: v${version})"#' diff --git a/pkgs/applications/science/misc/tulip/default.nix b/pkgs/applications/science/misc/tulip/default.nix index 02b5ad0c0458d..9808a572836d8 100644 --- a/pkgs/applications/science/misc/tulip/default.nix +++ b/pkgs/applications/science/misc/tulip/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "tulip"; - version = "5.7.3"; + version = "5.7.4"; src = fetchurl { url = "mirror://sourceforge/auber/tulip-${version}_src.tar.gz"; - hash = "sha256-arpC+FsDYGMf47phtSzyjjvDg/UYZS+akOe5CYfajdU="; + hash = "sha256-7z21WkPi1v2AGishDmXZPAedMjgXPRnpUiHTzEnc5LY="; }; nativeBuildInputs = [ cmake wrapQtAppsHook ] @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { doCheck = false; meta = { - description = "A visualization framework for the analysis and visualization of relational data"; + description = "Visualization framework for the analysis and visualization of relational data"; longDescription = '' Tulip is an information visualization framework dedicated to the |