Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WIP] staging: update flake.lock and fix fallout from gcc-14 update #601

Open
wants to merge 29 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
ffe0a62
scripts: fix flake update script.
markuskowa Dec 25, 2024
6f190cb
update flake.lock
markuskowa Dec 25, 2024
e877b11
autodock-vina: pin boost
markuskowa Dec 25, 2024
8548fe1
gamess-us: fix for gcc-14
markuskowa Dec 25, 2024
1d5d093
gamess-us: remove unused code
markuskowa Dec 25, 2024
ae0b04d
sharc: 3.0.1 -> 3.0.2
markuskowa Dec 25, 2024
5172e1b
sharc: fix build with gcc-14
markuskowa Dec 25, 2024
592df39
sharc: remove dead code
markuskowa Dec 25, 2024
d98b0c9
libvdwxc: remove in favor of upstream package
markuskowa Dec 25, 2024
3c792da
update flake.lock
markuskowa Dec 27, 2024
48110c7
mendeleev: 0.17 -> 0.19
markuskowa Dec 27, 2024
8ac03d3
mpb: add to opimized builds
markuskowa Dec 27, 2024
ba6313a
update flake.lock
markuskowa Dec 30, 2024
2285bbd
update flake.lock
markuskowa Jan 1, 2025
2fe3003
update flake.lock
markuskowa Jan 2, 2025
81f7d76
update flake.lock
markuskowa Jan 14, 2025
e6c91b9
python.autodock-vina: fix build with gcc-14
markuskowa Jan 14, 2025
cb948fc
python.autodock-vina: remove dead code
markuskowa Jan 14, 2025
4af8b8c
cclib: add patch for build with numpy-2
markuskowa Jan 14, 2025
14ed31a
gabedit: fix build with gcc-14
markuskowa Jan 14, 2025
31db400
gator,veloxchem: mark broken
markuskowa Jan 14, 2025
10ee5fd
update flake.lock
markuskowa Jan 15, 2025
9f1693b
vmd: fix build with gcc-14
markuskowa Jan 15, 2025
34dcea6
xtb-python: remove
sheepforce Jan 16, 2025
c328ca7
python3.pkgs.mendeleev: 0.19.0 -> 0.20.1
sheepforce Jan 16, 2025
a8099da
python3.pkgs.pyastronomy: 0.19.0 -> 0.22.0
sheepforce Jan 16, 2025
769fd57
python3.pkgs.qmcpack: 3.17.1 -> unstable-2025-01-16
sheepforce Jan 16, 2025
b3a5d00
Merge pull request #602 from Nix-QChem/staging-fixes
sheepforce Jan 16, 2025
715f229
gabedit: fix formatting
markuskowa Jan 16, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions nixpkgs-opt.nix
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,9 @@ let
libint = recallPackage libint {};
libmbd = recallPackage libmbd {};
libvori = recallPackage libvori {};
libvdwxc = recallPackage libvdwxc {};
libxc = recallPackage libxc {};
mpb = recallPackage mpb {};
meep = python3.pkgs.toPythonApplication (recallPackage python3.pkgs.meep {});
mkl = recallPackage mkl {};
molden = recallPackage molden {};
Expand All @@ -63,6 +65,7 @@ let
scalapack = recallPackage scalapack {};
siesta = recallPackage siesta {};
siesta-mpi = recallPackage siesta-mpi {};
sirius = recallPackage sirius {};
spglib = recallPackage spglib {};

fftwSinglePrec = self.fftw.override { precision = "single"; };
Expand Down
4 changes: 3 additions & 1 deletion overlay.nix
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,9 @@ let
#
ambertools = super.python311.pkgs.toPythonApplication self.python311.pkgs.ambertools;

autodock-vina = callPackage ./pkgs/apps/autodock-vina { };
autodock-vina = callPackage ./pkgs/apps/autodock-vina {
boost = final.boost182;
};

autoint = super.python3.pkgs.toPythonApplication self.python3.pkgs.pyphspu;

Expand Down
6 changes: 3 additions & 3 deletions pkgs/apps/autodock-vina/python.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
{ buildPythonPackage
, lib
, fetchFromGitHub
, boost
, swig
, numpy
Expand All @@ -9,7 +7,7 @@
, openbabel-bindings
}:

buildPythonPackage rec {
buildPythonPackage {
inherit (autodock-vina) pname version src meta;

# Remove hardcoded include paths and fix version constraint formats
Expand All @@ -25,6 +23,8 @@ buildPythonPackage rec {
export PATH=$PATH:${swig}/bin
'';

env.NIX_CFLAGS_COMPILE = "-Wno-error=parentheses";

nativeBuildInputs = [ sphinx ];

buildInputs = [ swig ];
Expand Down
9 changes: 5 additions & 4 deletions pkgs/apps/sharc/unwrapped.nix
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
{ stdenv
, lib
, fetchFromGitHub
, makeWrapper
, which
, gfortran
, blas
, lapack
, fftw
, python3
, gnuplot
, wfoverlap
, enablePysharc ? true
, hdf5
Expand All @@ -18,7 +16,7 @@
}:

let
version = "3.0.1";
version = "3.0.2";
python = python3.withPackages (p: with p; [
numpy
openbabel-bindings
Expand All @@ -33,11 +31,14 @@ in stdenv.mkDerivation {
owner = "sharc-md";
repo = "sharc";
rev = "v${version}";
hash = "sha256-aTFrLrp2PTZXvMI4UkXw/hAv225rADwo9W+k09td52U=";
hash = "sha256-B4cnqp9YRG4GdkhXSzPJ1uYE55MIT0MwXxxAGuuMDGg=";
};

outputs = [ "out" "doc" "tests" ];

# Needed to build with gcc-14
env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types -Wno-error=int-conversion";

passthru = { inherit python; };

nativeBuildInputs = [ which gfortran ];
Expand Down
4 changes: 4 additions & 0 deletions pkgs/apps/vmd/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ let

sourceRoot = "plugins";

env.NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration";

makeFlags = [ "LINUXAMD64" ];

preBuild = ''
Expand Down Expand Up @@ -67,6 +69,8 @@ in stdenv.mkDerivation {
sourceRoot = "vmd-${version}";


env.NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration";

# non-standard configure script
configurePhase = ''
patchShebangs ./configure
Expand Down
2 changes: 1 addition & 1 deletion pkgs/by-name/gabedit/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
OMPCFLAGS = -fopenmp
DRAWGEOMGL = -DDRAWGEOMGL

COMMONCFLAGS = -Wformat -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2 -O2 -DENABLE_DEPRECATED $(OMPCFLAGS) $(DRAWGEOMGL) -Wformat-security -Wno-unused-variable
COMMONCFLAGS = -Wformat -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2 -O2 -DENABLE_DEPRECATED $(OMPCFLAGS) $(DRAWGEOMGL) -Wformat-security -Wno-unused-variable -Wno-error=implicit-function-declaration -Wno-error=int-conversion
LDFLAGS = -Wl,-z,relro
EOF
'';
Expand Down
9 changes: 6 additions & 3 deletions pkgs/by-name/gamess-us/package.nix
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{ stdenv, lib, makeWrapper, fetchFromGitLab, requireFile, mpiCheckPhaseHook, gfortran, writeTextFile, cmake, perl
, tcsh, mpi, openblas, hostname, openssh, gnused, libxc, ncurses
{ stdenv, lib, makeWrapper, fetchFromGitLab, requireFile, mpiCheckPhaseHook, gfortran, cmake, perl
, tcsh, mpi, openblas, hostname, openssh, gnused, ncurses
, enableMpi ? true
}:

Expand All @@ -10,7 +10,7 @@ in stdenv.mkDerivation rec {

# The website always provides "gamess-current.tar.gz". However, we expect the file to be renamed,
# to a more reasonable name.
src = requireFile rec {
src = requireFile {
name = "${pname}-${version}.tar.gz";
sha256 = "sha256-mQUe3sPLh2aCLh93t7Qc+fLULOYeZnE+S1El9zV83qk=";
url = "https://www.msg.chem.iastate.edu/gamess/download.html";
Expand Down Expand Up @@ -73,6 +73,9 @@ in stdenv.mkDerivation rec {
substituteInPlace lked --replace "libopenblas.a" "libopenblas.so"
'';

# Needed to build with gcc-14
env.NIX_CFLAGS_COMPILE = "-Wno-error=int-conversion";

# The interactive config script of gamess. Pretty standard build with MPI parallelism, but
# without additional interfaces (such as libxc, qcengine, tinker, ...)
configurePhase =
Expand Down
54 changes: 0 additions & 54 deletions pkgs/by-name/libvdwxc/package.nix

This file was deleted.

7 changes: 7 additions & 0 deletions pkgs/python-by-name/cclib/package.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{ buildPythonPackage
, lib
, fetchFromGitHub
, fetchpatch
, isPy311
, setuptools
, pytestCheckHook
Expand Down Expand Up @@ -30,6 +31,12 @@ buildPythonPackage rec {
hash = "sha256-XYFVSJ11MGx2dq/yYa5jaC2XsrStZCT5WzwSCelEV3U=";
};

patches = [(fetchpatch {
name = "numpy-2";
url = "https://github.com/cclib/cclib/pull/1513/commits/bfca15ca759f2d8fbb34b4cce24b91c4cd48b20f.patch";
hash = "sha256-Pm3CGk6WEzh7Ov9JUrXHESxPanBFNGA49YpVrZBObYk=";
})];

pyproject = true;

postPatch = ''
Expand Down
1 change: 1 addition & 0 deletions pkgs/python-by-name/gator/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ buildPythonPackage rec {
homepage = "https://github.com/gator-program/gator";
license = licenses.gpl3Only;
maintainers = [ maintainers.markuskowa ];
broken = true; # Needs an update to the latest version
};
}

17 changes: 12 additions & 5 deletions pkgs/python-by-name/mendeleev/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
, pythonRelaxDepsHook
, numpy
, colorama
, pydantic
, pyfiglet
, pygments
, pandas
Expand All @@ -12,22 +13,28 @@
, plotly
, seaborn
, poetry-core
, deprecated
}:

buildPythonPackage rec {
pname = "mendeleev";
version = "0.17.0";
version = "0.20.1";

src = fetchFromGitHub {
owner = "lmmentel";
repo = pname;
rev = "v${version}";
hash = "sha256-LYWMbQARuOJXhu4yMAuQqeHckDFVgjwD73bpx5GR15U=";
hash = "sha256-NA0pgfhgk1XBA1Ei8IUtYuw8rh53Dp4XBqZ+5btzhYU=";
};

format = "pyproject";
pyproject = true;

propagatedBuildInputs = [
build-system = [
poetry-core
];

dependencies = [
pydantic
numpy
colorama
pyfiglet
Expand All @@ -37,7 +44,7 @@ buildPythonPackage rec {
bokeh
plotly
seaborn
poetry-core
deprecated
];

nativeBuildInputs = [
Expand Down
4 changes: 2 additions & 2 deletions pkgs/python-by-name/pyastronomy/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@

buildPythonPackage rec {
pname = "PyAstronomy";
version = "0.19.0";
version = "0.22.0";

src = with lib.versions; fetchFromGitHub {
owner = "sczesla";
repo = pname;
rev = "v_${major version}-${minor version}-${patch version}";
hash = "sha256-HFlPTvnUtfCrXV2P8kTrqpo2Ph2PoixyoCDXi+kT8ic=";
hash = "sha256-eZorxlBHRE6NZH4elF0bRDNo8NY8DFij55uctv+YrK4=";
};

propagatedBuildInputs = [
Expand Down
6 changes: 3 additions & 3 deletions pkgs/python-by-name/qmcpack/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@

buildPythonPackage rec {
pname = "qmcpack";
version = "3.17.1";
version = "unstable-2025-01-16";

src = fetchFromGitHub {
owner = "QMCPACK";
repo = "qmcpack";
rev = "v${version}";
sha256 = "sha256-D/wcKULhAsOkyGHN1AlVs3av0yeOvouPMHLcmNmOUo8=";
rev = "0373d2c6c20ef45412805cd973b522e5a988d832";
sha256 = "sha256-CyCGj8cY907RjkMZexnMyC8wEtuXcDYyJe/jeWrWDg8=";
};

format = "other";
Expand Down
1 change: 1 addition & 0 deletions pkgs/python-by-name/veloxchem/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ buildPythonPackage rec {
homepage = "https://veloxchem.org";
license = [ licenses.lgpl3 ];
maintainers = [ maintainers.markuskowa ];
broken = true; # Needs an update to the latest version
};
}

Loading
Loading