diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-09-08 00:02:13 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-08 00:02:13 +0000 |
| commit | 542aa87231d98d70caeb56bef05028ecdc48a388 (patch) | |
| tree | 5bc18e8342f7aa036d1d49f30dd2b0bfa59862f1 /pkgs/top-level | |
| parent | c528ade384ecd788835ae3388bce1054ed5554b4 (diff) | |
| parent | e6aa338820933e16090002fd3a8d029462d70134 (diff) | |
| download | nixpkgs-542aa87231d98d70caeb56bef05028ecdc48a388.tar nixpkgs-542aa87231d98d70caeb56bef05028ecdc48a388.tar.gz nixpkgs-542aa87231d98d70caeb56bef05028ecdc48a388.tar.bz2 nixpkgs-542aa87231d98d70caeb56bef05028ecdc48a388.tar.lz nixpkgs-542aa87231d98d70caeb56bef05028ecdc48a388.tar.xz nixpkgs-542aa87231d98d70caeb56bef05028ecdc48a388.tar.zst nixpkgs-542aa87231d98d70caeb56bef05028ecdc48a388.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b3497525297..1283e4c4ea0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11035,9 +11035,7 @@ with pkgs; netavark = callPackage ../tools/networking/netavark { }; - netcdf = callPackage ../development/libraries/netcdf { - hdf5 = hdf5.override { usev110Api = true; }; - }; + netcdf = callPackage ../development/libraries/netcdf { }; netcdf-mpi = netcdf.override { hdf5 = hdf5-mpi.override { usev110Api = true; }; |