From 882247fc3fefbc869def6b60b32c099df23b6d57 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 2 Apr 2019 15:30:36 -0700 Subject: [PATCH 1/2] quantum-espresso: 6.3 -> 6.4 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/quantum-espresso/versions --- .../science/chemistry/quantum-espresso/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/chemistry/quantum-espresso/default.nix b/pkgs/applications/science/chemistry/quantum-espresso/default.nix index 7a7f1b3596d..829e82b7494 100644 --- a/pkgs/applications/science/chemistry/quantum-espresso/default.nix +++ b/pkgs/applications/science/chemistry/quantum-espresso/default.nix @@ -4,12 +4,12 @@ }: stdenv.mkDerivation rec { - version = "6.3"; + version = "6.4"; name = "quantum-espresso-${version}"; src = fetchurl { url = "https://gitlab.com/QEF/q-e/-/archive/qe-${version}/q-e-qe-${version}.tar.gz"; - sha256 = "1738z3nhkzcrgnhnfg1r4lipbwvcrcprwhzjbjysnylmzbzwhrs0"; + sha256 = "1zjblzf0xzwmhmpjm56xvv8wsv5jmp5a204irzyicmd77p86c4vq"; }; passthru = { @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { patchShebangs configure ''; - # remove after 6.3 version: + # remove after 6.4 version: # makefile needs to ignore install directory easier than applying patch preInstall = '' printf "\n.PHONY: install\n" >> Makefile From c109aaa5cb6edfa6813d664ea6117ac77e883518 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 3 Apr 2019 15:00:17 +0200 Subject: [PATCH 2/2] quantum-espresso: remove outdated makefile fix --- .../science/chemistry/quantum-espresso/default.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pkgs/applications/science/chemistry/quantum-espresso/default.nix b/pkgs/applications/science/chemistry/quantum-espresso/default.nix index 829e82b7494..777b3499bed 100644 --- a/pkgs/applications/science/chemistry/quantum-espresso/default.nix +++ b/pkgs/applications/science/chemistry/quantum-espresso/default.nix @@ -20,12 +20,6 @@ stdenv.mkDerivation rec { patchShebangs configure ''; - # remove after 6.4 version: - # makefile needs to ignore install directory easier than applying patch - preInstall = '' - printf "\n.PHONY: install\n" >> Makefile - ''; - buildInputs = [ fftw openblas gfortran ] ++ (stdenv.lib.optionals (mpi != null) [ mpi ]);