diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2020-11-04 09:28:07 +0100 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-11-04 09:28:07 +0100 |
commit | 10c57af49c077493988b5bf123cb3f611e02322d (patch) | |
tree | 35c30f913782cd4131df023299e57c7deca8d921 /pkgs/applications/science | |
parent | 4148fc489b29e826bd42ed05e12ba6fe64c2921e (diff) | |
parent | 9e6d7d3c744a5cbaba603b14cd0676c132e2d499 (diff) |
Merge staging-next into staging
Diffstat (limited to 'pkgs/applications/science')
-rw-r--r-- | pkgs/applications/science/biology/plink/default.nix | 25 | ||||
-rw-r--r-- | pkgs/applications/science/chemistry/marvin/default.nix | 4 |
2 files changed, 2 insertions, 27 deletions
diff --git a/pkgs/applications/science/biology/plink/default.nix b/pkgs/applications/science/biology/plink/default.nix deleted file mode 100644 index 009e12aa02f0..000000000000 --- a/pkgs/applications/science/biology/plink/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ stdenv, fetchurl, zlib, unzip }: - -stdenv.mkDerivation { - name = "plink-1.07"; - - src = fetchurl { - url = "http://pngu.mgh.harvard.edu/~purcell/plink/dist/plink-1.07-src.zip"; - sha256 = "4af56348443d0c6a1db64950a071b1fcb49cc74154875a7b43cccb4b6a7f482b"; - }; - - buildInputs = [ zlib unzip ] ; - - installPhase = '' - mkdir -p $out/bin - cp plink $out/bin - ''; - - meta = { - description = "Whole genome association toolkit"; - homepage = "http://pngu.mgh.harvard.edu/~purcell/plink/"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.all; - broken = true; - }; -} diff --git a/pkgs/applications/science/chemistry/marvin/default.nix b/pkgs/applications/science/chemistry/marvin/default.nix index e8cd077afd20..84a1034849f7 100644 --- a/pkgs/applications/science/chemistry/marvin/default.nix +++ b/pkgs/applications/science/chemistry/marvin/default.nix @@ -4,12 +4,12 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "marvin"; - version = "20.17.0"; + version = "20.19.0"; src = fetchurl { name = "marvin-${version}.deb"; url = "http://dl.chemaxon.com/marvin/${version}/marvin_linux_${versions.majorMinor version}.deb"; - sha256 = "0ip6ma9ivk5b74s9najn2rrkiha7hya1rjhgyrc71kwsj5gqgli0"; + sha256 = "0b9a0yl3mxfb2dfdkgs2wphhxsgwixqk6nl2hsn1ly3gz53cws1q"; }; nativeBuildInputs = [ dpkg makeWrapper ]; |