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

Commits on Jun 11, 2019

  1. octopus: 8.4 -> 9.0

    @markuskowa
    markuskowa committed Jun 11, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    brainrake Márton Boros
    GPG key ID: C0D4B398D4F3158F
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    4df1e91 View commit details

Commits on Jun 12, 2019

  1. Merge pull request #62976 from markuskowa/upd-octopus 

    octopus: 8.4 -> 9.0
    @markuskowa
    markuskowa authored Jun 12, 2019
    Copy the full SHA
    ca09991 View commit details
Showing with 2 additions and 2 deletions.
  1. +2 −2 pkgs/applications/science/chemistry/octopus/default.nix
4 changes: 2 additions & 2 deletions pkgs/applications/science/chemistry/octopus/default.nix
View file
Original file line number Diff line number Diff line change
@@ -3,15 +3,15 @@
}:

let
version = "8.4";
version = "9.0";
fftwAll = symlinkJoin { name ="ftw-dev-out"; paths = [ fftw.dev fftw.out ]; };

in stdenv.mkDerivation {
name = "octopus-${version}";

src = fetchurl {
url = "http://www.tddft.org/programs/octopus/down.php?file=${version}/octopus-${version}.tar.gz";
sha256 = "1fx5ssnf65b9ld7xs9rvvg8i80pblxpyhqkir0a7xshkk1g60z55";
sha256 = "0p1gjykjnzm4m93mgjsmnxd0n2j381jk5kn3a7gkzxanixp60ilm";
};

nativeBuildInputs = [ perl procps fftw.dev ];