diff options
author | Alyssa Ross <hi@alyssa.is> | 2024-03-24 11:04:41 +0100 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2024-03-24 11:04:41 +0100 |
commit | 5423cabbbf2b6dec5568f1ecabd288d5d9a642ec (patch) | |
tree | f316a6a921bfefd3a63bd4502c2eb50ff1644f67 /nixpkgs/pkgs/applications/science/misc | |
parent | 46a88117a05c3469af5d99433af140c3de8ca088 (diff) | |
parent | 8aa81f34981add12aecada6c702ddbbd0375ca36 (diff) | |
download | nixlib-5423cabbbf2b6dec5568f1ecabd288d5d9a642ec.tar nixlib-5423cabbbf2b6dec5568f1ecabd288d5d9a642ec.tar.gz nixlib-5423cabbbf2b6dec5568f1ecabd288d5d9a642ec.tar.bz2 nixlib-5423cabbbf2b6dec5568f1ecabd288d5d9a642ec.tar.lz nixlib-5423cabbbf2b6dec5568f1ecabd288d5d9a642ec.tar.xz nixlib-5423cabbbf2b6dec5568f1ecabd288d5d9a642ec.tar.zst nixlib-5423cabbbf2b6dec5568f1ecabd288d5d9a642ec.zip |
Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs
Diffstat (limited to 'nixpkgs/pkgs/applications/science/misc')
15 files changed, 24 insertions, 7 deletions
diff --git a/nixpkgs/pkgs/applications/science/misc/bada-bib/default.nix b/nixpkgs/pkgs/applications/science/misc/bada-bib/default.nix index 0eafebd9628c..189531532574 100644 --- a/nixpkgs/pkgs/applications/science/misc/bada-bib/default.nix +++ b/nixpkgs/pkgs/applications/science/misc/bada-bib/default.nix @@ -75,6 +75,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { homepage = "https://github.com/RogerCrocker/BadaBib"; description = "A simple BibTeX Viewer and Editor"; + mainProgram = "badabib"; maintainers = [ maintainers.Cogitri ]; license = licenses.gpl3Plus; }; diff --git a/nixpkgs/pkgs/applications/science/misc/colmap/default.nix b/nixpkgs/pkgs/applications/science/misc/colmap/default.nix index a029f5440b25..64a7952be4cc 100644 --- a/nixpkgs/pkgs/applications/science/misc/colmap/default.nix +++ b/nixpkgs/pkgs/applications/science/misc/colmap/default.nix @@ -37,7 +37,7 @@ mkDerivation rec { nativeBuildInputs = [ cmake ] ++ lib.optionals cudaSupport [ - cudaPackages.autoAddOpenGLRunpathHook + cudaPackages.autoAddDriverRunpath ]; meta = with lib; { diff --git a/nixpkgs/pkgs/applications/science/misc/convertall/default.nix b/nixpkgs/pkgs/applications/science/misc/convertall/default.nix index 9a7ac2a8b13c..534562b028d8 100644 --- a/nixpkgs/pkgs/applications/science/misc/convertall/default.nix +++ b/nixpkgs/pkgs/applications/science/misc/convertall/default.nix @@ -30,6 +30,7 @@ in stdenv.mkDerivation rec { meta = with lib; { homepage = "https://convertall.bellz.org/"; description = "Graphical unit converter"; + mainProgram = "convertall"; license = licenses.gpl2Plus; maintainers = with maintainers; [ orivej ]; platforms = pyqt5.meta.platforms; diff --git a/nixpkgs/pkgs/applications/science/misc/cwltool/default.nix b/nixpkgs/pkgs/applications/science/misc/cwltool/default.nix index fb3b26a12edf..9b4c711aba8f 100644 --- a/nixpkgs/pkgs/applications/science/misc/cwltool/default.nix +++ b/nixpkgs/pkgs/applications/science/misc/cwltool/default.nix @@ -84,6 +84,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "Common Workflow Language reference implementation"; + mainProgram = "cwltool"; homepage = "https://www.commonwl.org"; changelog = "https://github.com/common-workflow-language/cwltool/releases/tag/${version}"; license = with licenses; [ asl20 ]; diff --git a/nixpkgs/pkgs/applications/science/misc/cytoscape/default.nix b/nixpkgs/pkgs/applications/science/misc/cytoscape/default.nix index bd5b698988d4..f4aaac1a3823 100644 --- a/nixpkgs/pkgs/applications/science/misc/cytoscape/default.nix +++ b/nixpkgs/pkgs/applications/science/misc/cytoscape/default.nix @@ -37,6 +37,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.cytoscape.org"; description = "A general platform for complex network analysis and visualization"; + mainProgram = "cytoscape"; license = lib.licenses.lgpl21; maintainers = [lib.maintainers.mimame]; platforms = lib.platforms.unix; diff --git a/nixpkgs/pkgs/applications/science/misc/foldingathome/client.nix b/nixpkgs/pkgs/applications/science/misc/foldingathome/client.nix index 108dcc284ea9..6ff159cc54cb 100644 --- a/nixpkgs/pkgs/applications/science/misc/foldingathome/client.nix +++ b/nixpkgs/pkgs/applications/science/misc/foldingathome/client.nix @@ -3,18 +3,23 @@ , fetchFromGitHub , ocl-icd , openssl +, re2 +, libevent +, git +, zlib +, expat , scons , stdenv , extraPkgs ? [ ] }: let - version = "8.3.1"; + version = "8.3.7"; cbangSrc = fetchFromGitHub { owner = "cauldrondevelopmentllc"; repo = "cbang"; rev = "bastet-v${version}"; - hash = "sha256-cuyfJG5aDJ6e2SllxwKTViG0j8FWHvjcTaaBBtkgEdU="; + sha256 = "sha256-acAImItdkgo6PBFL6Vu/caIdcnvp/3VEW2lgVDgKy9g="; }; fah-client = stdenv.mkDerivation { @@ -25,10 +30,10 @@ let owner = "FoldingAtHome"; repo = "fah-client-bastet"; rev = "v${version}"; - hash = "sha256-Ztc2im4Xmk8f6GotGRgA5zDkcyQFnodUvroJVl+ApT4="; + sha256 = "sha256-d+LY/R4TAko+2e2W76KEBQ8fXj0hzzmBOm+c4tksXMA="; }; - nativeBuildInputs = [ scons ]; + nativeBuildInputs = [ scons re2 libevent git ]; buildInputs = [ openssl ]; @@ -63,7 +68,7 @@ in buildFHSEnv { name = fah-client.name; - targetPkgs = _: [ fah-client ocl-icd ] ++ extraPkgs; + targetPkgs = _: [ fah-client ocl-icd zlib expat ] ++ extraPkgs; runScript = "/bin/fah-client"; diff --git a/nixpkgs/pkgs/applications/science/misc/gephi/default.nix b/nixpkgs/pkgs/applications/science/misc/gephi/default.nix index 22c453dbab30..ab8134daf3ae 100644 --- a/nixpkgs/pkgs/applications/science/misc/gephi/default.nix +++ b/nixpkgs/pkgs/applications/science/misc/gephi/default.nix @@ -37,6 +37,7 @@ mavenJdk11.buildMavenPackage rec { meta = with lib; { description = "A platform for visualizing and manipulating large graphs"; + mainProgram = "gephi"; homepage = "https://gephi.org"; sourceProvenance = with sourceTypes; [ fromSource diff --git a/nixpkgs/pkgs/applications/science/misc/gplates/default.nix b/nixpkgs/pkgs/applications/science/misc/gplates/default.nix index 4ab17c22934e..74dd61a2228c 100644 --- a/nixpkgs/pkgs/applications/science/misc/gplates/default.nix +++ b/nixpkgs/pkgs/applications/science/misc/gplates/default.nix @@ -67,6 +67,7 @@ in stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "Desktop software for the interactive visualisation of plate-tectonics"; + mainProgram = "gplates"; homepage = "https://www.gplates.org"; license = licenses.gpl2Only; platforms = platforms.all; diff --git a/nixpkgs/pkgs/applications/science/misc/netlogo/default.nix b/nixpkgs/pkgs/applications/science/misc/netlogo/default.nix index db8f0a717aa1..13c3c36f90ae 100644 --- a/nixpkgs/pkgs/applications/science/misc/netlogo/default.nix +++ b/nixpkgs/pkgs/applications/science/misc/netlogo/default.nix @@ -46,6 +46,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A multi-agent programmable modeling environment"; + mainProgram = "netlogo"; longDescription = '' NetLogo is a multi-agent programmable modeling environment. It is used by many tens of thousands of students, teachers and researchers worldwide. diff --git a/nixpkgs/pkgs/applications/science/misc/nextinspace/default.nix b/nixpkgs/pkgs/applications/science/misc/nextinspace/default.nix index 78e21dcd8788..742b4cb622c2 100644 --- a/nixpkgs/pkgs/applications/science/misc/nextinspace/default.nix +++ b/nixpkgs/pkgs/applications/science/misc/nextinspace/default.nix @@ -37,6 +37,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "Print upcoming space-related events in your terminal"; + mainProgram = "nextinspace"; homepage = "https://github.com/The-Kid-Gid/nextinspace"; license = licenses.gpl3Only; maintainers = with maintainers; [ penguwin ]; diff --git a/nixpkgs/pkgs/applications/science/misc/openrefine/default.nix b/nixpkgs/pkgs/applications/science/misc/openrefine/default.nix index 2ad67027ade4..9f2ef0f29b31 100644 --- a/nixpkgs/pkgs/applications/science/misc/openrefine/default.nix +++ b/nixpkgs/pkgs/applications/science/misc/openrefine/default.nix @@ -27,7 +27,7 @@ let inherit src version; pname = "openrefine-npm"; - sourceRoot = "source/main/webapp"; + sourceRoot = "${src.name}/main/webapp"; npmDepsHash = "sha256-8GhcL4tohQ5u2HeYN6JyTMMobUOqAL8ETCLiP1SoDSk="; diff --git a/nixpkgs/pkgs/applications/science/misc/reason-shell/default.nix b/nixpkgs/pkgs/applications/science/misc/reason-shell/default.nix index aa1544669ed8..848f31abe4c6 100644 --- a/nixpkgs/pkgs/applications/science/misc/reason-shell/default.nix +++ b/nixpkgs/pkgs/applications/science/misc/reason-shell/default.nix @@ -32,6 +32,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "A shell for research papers"; + mainProgram = "reason"; homepage = "https://github.com/jaywonchung/reason"; changelog = "https://github.com/jaywonchung/reason/releases/tag/${src.rev}"; license = licenses.mit; diff --git a/nixpkgs/pkgs/applications/science/misc/rink/default.nix b/nixpkgs/pkgs/applications/science/misc/rink/default.nix index b7e523f67474..1e88047eba72 100644 --- a/nixpkgs/pkgs/applications/science/misc/rink/default.nix +++ b/nixpkgs/pkgs/applications/science/misc/rink/default.nix @@ -23,6 +23,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Unit-aware calculator"; + mainProgram = "rink"; homepage = "https://rinkcalc.app"; license = with licenses; [ mpl20 gpl3Plus ]; maintainers = with maintainers; [ sb0 Br1ght0ne ]; diff --git a/nixpkgs/pkgs/applications/science/misc/snakemake/default.nix b/nixpkgs/pkgs/applications/science/misc/snakemake/default.nix index 5081b471fc95..628b40cd1300 100644 --- a/nixpkgs/pkgs/applications/science/misc/snakemake/default.nix +++ b/nixpkgs/pkgs/applications/science/misc/snakemake/default.nix @@ -89,6 +89,7 @@ python3.pkgs.buildPythonApplication rec { homepage = "https://snakemake.github.io"; license = licenses.mit; description = "Python-based execution environment for make-like workflows"; + mainProgram = "snakemake"; longDescription = '' Snakemake is a workflow management system that aims to reduce the complexity of creating workflows by providing a fast and comfortable execution environment, diff --git a/nixpkgs/pkgs/applications/science/misc/vite/default.nix b/nixpkgs/pkgs/applications/science/misc/vite/default.nix index c748b6d1bd3f..f1c9329c94df 100644 --- a/nixpkgs/pkgs/applications/science/misc/vite/default.nix +++ b/nixpkgs/pkgs/applications/science/misc/vite/default.nix @@ -17,6 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "Visual Trace Explorer (ViTE), a tool to visualize execution traces"; + mainProgram = "vite"; longDescription = '' ViTE is a trace explorer. It is a tool to visualize execution |