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: c09177d5dc8a
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: aabcccf1af5c
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jul 5, 2020

  1. marvin: 20.13.0 -> 20.15.0

    @r-ryantm
    r-ryantm committed Jul 5, 2020
    Copy the full SHA
    c0ebe72 View commit details

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

    marvin: 20.13.0 -> 20.15.0
    @ryantm
    ryantm authored Jul 5, 2020
    Copy the full SHA
    aabcccf View commit details
Showing with 2 additions and 2 deletions.
  1. +2 −2 pkgs/applications/science/chemistry/marvin/default.nix
4 changes: 2 additions & 2 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.13.0";
version = "20.15.0";

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

nativeBuildInputs = [ dpkg makeWrapper ];