diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-05-01 18:01:22 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-01 18:01:22 +0000 |
| commit | 67f8ba4a30028468182899667963ca1ad074224d (patch) | |
| tree | a98f430f6bde3e78136139d40e784197ede6d45b /pkgs/applications/science | |
| parent | 2b32fd65a31d54e9858734ad488df2a6434b4e8a (diff) | |
| parent | 6b39739b77c4ab3f39ee3276677ce94af3e2b39c (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/science')
| -rw-r--r-- | pkgs/applications/science/biology/igv/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/science/math/scotch/default.nix | 36 |
2 files changed, 2 insertions, 38 deletions
diff --git a/pkgs/applications/science/biology/igv/default.nix b/pkgs/applications/science/biology/igv/default.nix index c72cbe4a8b059..219792326b685 100644 --- a/pkgs/applications/science/biology/igv/default.nix +++ b/pkgs/applications/science/biology/igv/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "igv"; - version = "2.17.3"; + version = "2.17.4"; src = fetchzip { url = "https://data.broadinstitute.org/igv/projects/downloads/${lib.versions.majorMinor version}/IGV_${version}.zip"; - sha256 = "sha256-SGqkWBv4nol0+lnGN7wBHJvndcIqZ5+Wt1wAcXA42cU="; + sha256 = "sha256-LF/rwm/XlLHAJjiAlQVTmx5l+5Np2b5rPjoCdN/qERU="; }; installPhase = '' diff --git a/pkgs/applications/science/math/scotch/default.nix b/pkgs/applications/science/math/scotch/default.nix deleted file mode 100644 index 1eb057cfc7c5c..0000000000000 --- a/pkgs/applications/science/math/scotch/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib, stdenv, fetchurl, bison, mpi, flex, zlib}: - -stdenv.mkDerivation rec { - version = "6.1.1"; - pname = "scotch"; - src_name = "scotch_${version}"; - - buildInputs = [ bison mpi flex zlib ]; - - src = fetchurl { - url = "https://gforge.inria.fr/frs/download.php/file/34618/${src_name}.tar.gz"; - sha256 = "sha256-OQUvWf9HSkppzvwlzzyvhClACIneugEO5kA8oYj4sxE="; - }; - - sourceRoot = "${src_name}/src"; - - preConfigure = '' - ln -s Make.inc/Makefile.inc.x86-64_pc_linux2 Makefile.inc - ''; - - buildFlags = [ "scotch ptscotch" ]; - installFlags = [ "prefix=\${out}" ]; - - meta = { - description = "Graph and mesh/hypergraph partitioning, graph clustering, and sparse matrix ordering"; - longDescription = '' - Scotch is a software package for graph and mesh/hypergraph partitioning, graph clustering, - and sparse matrix ordering. - ''; - homepage = "http://www.labri.fr/perso/pelegrin/scotch"; - license = lib.licenses.cecill-c; - maintainers = [ lib.maintainers.bzizou ]; - platforms = lib.platforms.linux; - }; -} - |