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

Commits on Nov 18, 2020

  1. marvin: 20.19.0 -> 20.20.0

    r-ryantm committed Nov 18, 2020
    Copy the full SHA
    5a4772e View commit details
  2. Merge pull request #104209 from r-ryantm/auto-update/marvin

    marvin: 20.19.0 -> 20.20.0
    ryantm authored Nov 18, 2020
    Copy the full SHA
    7266cae 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
Original file line number Diff line number Diff line change
@@ -4,12 +4,12 @@ with stdenv.lib;

stdenv.mkDerivation rec {
pname = "marvin";
version = "20.19.0";
version = "20.20.0";

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

nativeBuildInputs = [ dpkg makeWrapper ];