Merge pull request #138061 from Stunkymonkey/switch-fetchFromGitLab
quantum-espresso,postgresql11Packages.pg_ed25519: switch to fetchFromGitlab
This commit is contained in:
commit
c1dac4490e
2 changed files with 24 additions and 16 deletions
|
@ -1,5 +1,10 @@
|
|||
{ lib, stdenv, fetchurl
|
||||
, gfortran, fftw, blas, lapack
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitLab
|
||||
, gfortran
|
||||
, fftw
|
||||
, blas
|
||||
, lapack
|
||||
, useMpi ? false
|
||||
, mpi
|
||||
}:
|
||||
|
@ -8,9 +13,11 @@ stdenv.mkDerivation rec {
|
|||
version = "6.6";
|
||||
pname = "quantum-espresso";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://gitlab.com/QEF/q-e/-/archive/qe-${version}/q-e-qe-${version}.tar.gz";
|
||||
sha256 = "0b3718bwdqfyssyz25jknijar79qh5cf1bbizv9faliz135mcilj";
|
||||
src = fetchFromGitLab {
|
||||
owner = "QEF";
|
||||
repo = "q-e";
|
||||
rev = "qe-${version}";
|
||||
sha256 = "1mkfmw0fq1dabplzdn6v1abhw0ds55gzlvbx3a9brv493whk21yp";
|
||||
};
|
||||
|
||||
passthru = {
|
||||
|
@ -24,18 +31,18 @@ stdenv.mkDerivation rec {
|
|||
buildInputs = [ fftw blas lapack gfortran ]
|
||||
++ (lib.optionals useMpi [ mpi ]);
|
||||
|
||||
configureFlags = if useMpi then [ "LD=${mpi}/bin/mpif90" ] else [ "LD=${gfortran}/bin/gfortran" ];
|
||||
configureFlags = if useMpi then [ "LD=${mpi}/bin/mpif90" ] else [ "LD=${gfortran}/bin/gfortran" ];
|
||||
|
||||
makeFlags = [ "all" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Electronic-structure calculations and materials modeling at the nanoscale";
|
||||
longDescription = ''
|
||||
Quantum ESPRESSO is an integrated suite of Open-Source computer codes for
|
||||
electronic-structure calculations and materials modeling at the
|
||||
nanoscale. It is based on density-functional theory, plane waves, and
|
||||
pseudopotentials.
|
||||
'';
|
||||
Quantum ESPRESSO is an integrated suite of Open-Source computer codes for
|
||||
electronic-structure calculations and materials modeling at the
|
||||
nanoscale. It is based on density-functional theory, plane waves, and
|
||||
pseudopotentials.
|
||||
'';
|
||||
homepage = "https://www.quantum-espresso.org/";
|
||||
license = licenses.gpl2;
|
||||
platforms = [ "x86_64-linux" "x86_64-darwin" ];
|
||||
|
|
|
@ -1,12 +1,13 @@
|
|||
{ lib, stdenv, fetchurl, postgresql }:
|
||||
{ lib, stdenv, fetchFromGitLab, postgresql }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pg_ed25519";
|
||||
version = "0.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://gitlab.com/dwagin/${pname}/-/archive/${version}/${pname}-${version}.tar.bz2";
|
||||
sha256 = "0q46pvk1vq5w3al6i3inzlw6w7za3n7p1gd4wfbbxzvzh7qnynda";
|
||||
src = fetchFromGitLab {
|
||||
owner = "dwagin";
|
||||
repo = "pg_ed25519";
|
||||
rev = version;
|
||||
sha256 = "16w3qx3wj81bzfhydl2pjhn8b1jak6h7ja9wq1kc626g0siggqi0";
|
||||
};
|
||||
|
||||
buildInputs = [ postgresql ];
|
||||
|
|
Loading…
Reference in a new issue