Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 5f5570b31d42
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d8c21cb4bcb8
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Mar 30, 2020

  1. marvin: 20.6.0 -> 20.9.0

    @r-ryantm
    r-ryantm committed Mar 30, 2020
    Copy the full SHA
    1d349b8 View commit details

  2. Merge pull request #83746 from r-ryantm/auto-update/marvin 

    marvin: 20.6.0 -> 20.9.0
    @ryantm
    ryantm authored Mar 30, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    d8c21cb View commit details
Showing with 3 additions and 3 deletions.
  1. +3 −3 pkgs/applications/science/chemistry/marvin/default.nix
6 changes: 3 additions & 3 deletions pkgs/applications/science/chemistry/marvin/default.nix
View file
Original file line number Diff line number Diff line change
@@ -4,12 +4,12 @@ with stdenv.lib;

stdenv.mkDerivation rec {
pname = "marvin";
version = "20.6.0";
version = "20.9.0";

src = fetchurl {
name = "marvin-${version}.deb";
url = "http://dl.chemaxon.com/marvin/${version}/marvin_linux_${versions.majorMinor version}.deb";
sha256 = "1vd1hsj36wzghpn6xnppjmva35kdcin7h0xdj3xmi4w5l3qw7fl6";
sha256 = "1c6q1vb96jsb37g5qbhzcnasd5pdqjyc190yg3caw3gwrd97889q";
};

nativeBuildInputs = [ dpkg makeWrapper ];
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {

meta = {
description = "A chemical modelling, analysis and structure drawing program";
homepage = https://chemaxon.com/products/marvin;
homepage = "https://chemaxon.com/products/marvin";
maintainers = with maintainers; [ fusion809 ];
license = licenses.unfree;
platforms = platforms.linux;