diff options
author | Alyssa Ross <hi@alyssa.is> | 2021-09-27 16:00:58 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2021-09-27 16:00:58 +0000 |
commit | c504e5d19d940926b3ddcf62c983d66f49f3cbb2 (patch) | |
tree | ec955e58bcac2cb93b9f8c10786b23f61d40cd7e /nixpkgs/pkgs/development/libraries/physics | |
parent | 72789cefce7b17419815f600fbd18238d89afcc9 (diff) | |
parent | 1737f98af6667560e3e4f930312f9b5002649d04 (diff) | |
download | nixlib-c504e5d19d940926b3ddcf62c983d66f49f3cbb2.tar nixlib-c504e5d19d940926b3ddcf62c983d66f49f3cbb2.tar.gz nixlib-c504e5d19d940926b3ddcf62c983d66f49f3cbb2.tar.bz2 nixlib-c504e5d19d940926b3ddcf62c983d66f49f3cbb2.tar.lz nixlib-c504e5d19d940926b3ddcf62c983d66f49f3cbb2.tar.xz nixlib-c504e5d19d940926b3ddcf62c983d66f49f3cbb2.tar.zst nixlib-c504e5d19d940926b3ddcf62c983d66f49f3cbb2.zip |
Merge commit '1737f98af6667560e3e4f930312f9b5002649d04'
Conflicts: nixpkgs/nixos/modules/services/networking/ssh/sshd.nix nixpkgs/pkgs/applications/networking/irc/weechat/scripts/default.nix nixpkgs/pkgs/development/node-packages/default.nix nixpkgs/pkgs/development/python-modules/priority/deadline.patch
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/physics')
5 files changed, 17 insertions, 12 deletions
diff --git a/nixpkgs/pkgs/development/libraries/physics/applgrid/default.nix b/nixpkgs/pkgs/development/libraries/physics/applgrid/default.nix index 65aa7b8b4703..3ed2f24f45f9 100644 --- a/nixpkgs/pkgs/development/libraries/physics/applgrid/default.nix +++ b/nixpkgs/pkgs/development/libraries/physics/applgrid/default.nix @@ -9,8 +9,10 @@ stdenv.mkDerivation rec { sha256 = "1yw9wrk3vjv84kd3j4s1scfhinirknwk6xq0hvj7x2srx3h93q9p"; }; + nativeBuildInputs = [ gfortran ]; + # For some reason zlib was only needed after bump to gfortran8 - buildInputs = [ gfortran hoppet lhapdf root5 zlib ]; + buildInputs = [ hoppet lhapdf root5 zlib ]; patches = [ ./bad_code.patch diff --git a/nixpkgs/pkgs/development/libraries/physics/fastjet/default.nix b/nixpkgs/pkgs/development/libraries/physics/fastjet/default.nix index 35ce8dedca74..65fb04b707ab 100644 --- a/nixpkgs/pkgs/development/libraries/physics/fastjet/default.nix +++ b/nixpkgs/pkgs/development/libraries/physics/fastjet/default.nix @@ -1,20 +1,24 @@ -{ lib, stdenv, fetchurl, python2 }: +{ lib +, stdenv +, fetchurl +, python +, withPython ? false +}: stdenv.mkDerivation rec { pname = "fastjet"; - version = "3.3.4"; + version = "3.4.0"; src = fetchurl { url = "http://fastjet.fr/repo/fastjet-${version}.tar.gz"; - sha256 = "00zwvmnp2j79z95n9lgnq67q02bqfgirqla8j9y6jd8k3r052as3"; + hash = "sha256-7gfIdHyOrYbYjeSp5OjR6efXYUlz9WMbqCl/egJHi5E="; }; - buildInputs = [ python2 ]; + buildInputs = lib.optional withPython python; configureFlags = [ "--enable-allcxxplugins" - "--enable-pyext" - ]; + ] ++ lib.optional withPython "--enable-pyext"; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/development/libraries/physics/herwig/default.nix b/nixpkgs/pkgs/development/libraries/physics/herwig/default.nix index 0a7e9b4d948e..1c3bfaa2064e 100644 --- a/nixpkgs/pkgs/development/libraries/physics/herwig/default.nix +++ b/nixpkgs/pkgs/development/libraries/physics/herwig/default.nix @@ -9,9 +9,9 @@ stdenv.mkDerivation rec { sha256 = "10y3fb33zsinr0z3hzap9rsbcqhy1yjqnv4b4vz21g7mdlw6pq2k"; }; - nativeBuildInputs = [ autoconf automake libtool ]; + nativeBuildInputs = [ autoconf automake libtool gfortran ]; - buildInputs = [ boost fastjet gfortran gsl thepeg zlib ] + buildInputs = [ boost fastjet gsl thepeg zlib ] # There is a bug that requires for default PDF's to be present during the build ++ (with lhapdf.pdf_sets; [ CT14lo CT14nlo ]); diff --git a/nixpkgs/pkgs/development/libraries/physics/hoppet/default.nix b/nixpkgs/pkgs/development/libraries/physics/hoppet/default.nix index 7ad5b9861a1d..af90192878d7 100644 --- a/nixpkgs/pkgs/development/libraries/physics/hoppet/default.nix +++ b/nixpkgs/pkgs/development/libraries/physics/hoppet/default.nix @@ -9,8 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0j7437rh4xxbfzmkjr22ry34xm266gijzj6mvrq193fcsfzipzdz"; }; - buildInputs = [ gfortran ]; - nativeBuildInputs = [ perl ]; + nativeBuildInputs = [ perl gfortran ]; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/development/libraries/physics/mela/default.nix b/nixpkgs/pkgs/development/libraries/physics/mela/default.nix index 90cf5ac8b2d1..e48a2f4638bc 100644 --- a/nixpkgs/pkgs/development/libraries/physics/mela/default.nix +++ b/nixpkgs/pkgs/development/libraries/physics/mela/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "01sgd4mwx4n58x95brphp4dskqkkx8434bvsr38r5drg9na5nc9y"; }; - buildInputs = [ gfortran ]; + nativeBuildInputs = [ gfortran ]; enableParallelBuilding = true; |