commit d2e027aa445bc132c64c39354f5d6567f9520e2c · pyrox.dev/nixpkgs

+18 -12

pkgs/development/libraries/physics/fastnlo/default.nix pkgs/development/libraries/physics/fastnlo_toolkit/default.nix

···

       1
       1
        
       { lib

     

       2
       2
        
       , stdenv

     

       3
       3
        
       , fetchurl

     

       4
       4
       +
       , autoreconfHook

     

       4
       5
        
       , boost

     

       5
       5
       -
       , fastjet

     

       6
       6
        
       , gfortran

     

       7
       7
        
       , lhapdf

     

       8
       8
       -
       , python2

     

       9
       9
       -
       , root

     

       8
       8
       +
       , ncurses

     

       9
       9
       +
       , python

     

       10
       10
       +
       , swig

     

       10
       11
        
       , yoda

     

       11
       12
        
       , zlib

     

       13
       13
       +
       , withPython ? false

     

       12
       14
        
       }:

     

       13
       15
        
       

     

       14
       16
        
       stdenv.mkDerivation rec {

     

       15
       17
        
         pname = "fastnlo_toolkit";

     

       16
       16
       -
         version = "2.3.1pre-2402";

     

       18
       18
       +
         version = "2.3.1pre-2411";

     

       17
       19
        
       

     

       18
       20
        
         src = fetchurl {

     

       19
       19
       -
           url = "https://fastnlo.hepforge.org/code/v23/${pname}-${version}.tar.gz";

     

       20
       20
       -
           sha256 = "1h41xnqcz401x3zbs8i2dsb4xlhbv8i5ps0561p6y7gcyridgcbl";

     

       21
       21
       +
           urls = [

     

       22
       22
       +
             "https://fastnlo.hepforge.org/code/v23/${pname}-${version}.tar.gz"

     

       23
       23
       +
             "https://sid.ethz.ch/debian/fastnlo/${pname}-${version}.tar.gz"

     

       24
       24
       +
           ];

     

       25
       25
       +
           sha256 = "0fm9k732pmi3prbicj2yaq815nmcjll95fagjqzf542ng3swpqnb";

     

       21
       26
        
         };

     

       27
       27
       +
       

     

       28
       28
       +
         nativeBuildInputs = lib.optional withPython autoreconfHook;

     

       22
       29
        
       

     

       23
       30
        
         buildInputs = [

     

       24
       31
        
           boost

     

       25
       25
       -
           fastjet

     

       26
       32
        
           gfortran

     

       27
       33
        
           gfortran.cc.lib

     

       28
       34
        
           lhapdf

     

       29
       29
       -
           python2

     

       30
       30
       -
           root

     

       31
       35
        
           yoda

     

       32
       32
       -
         ];

     

       36
       36
       +
         ] ++ lib.optional withPython python

     

       37
       37
       +
           ++ lib.optional (withPython && python.isPy3k) ncurses;

     

       38
       38
       +
       

     

       33
       39
        
         propagatedBuildInputs = [

     

       34
       40
        
           zlib

     

       35
       35
       -
         ];

     

       41
       41
       +
         ] ++ lib.optional withPython swig;

     

       36
       42
        
       

     

       37
       43
        
         preConfigure = ''

     

       38
       44
        
           substituteInPlace ./fastnlotoolkit/Makefile.in \

     
···

       41
       47
        
       

     

       42
       48
        
         configureFlags = [

     

       43
       49
        
           "--with-yoda=${yoda}"

     

       44
       44
       -
         ];

     

       50
       50
       +
         ] ++ lib.optional withPython "--enable-pyext";

     

       45
       51
        
       

     

       46
       52
        
         enableParallelBuilding = true;

     

       47
       53

+1

pkgs/top-level/aliases.nix

···

       195
       195
        
         exfat-utils = exfat;                  # 2015-09-11

     

       196
       196
        
         facette = throw "facette has been removed."; # added 2020-01-06

     

       197
       197
        
         fast-neural-doodle = throw "fast-neural-doodle has been removed, as the upstream project has been abandoned"; # added 2020-03-28

     

       198
       198
       +
         fastnlo = fastnlo_toolkit; # added 2021-04-24

     

       198
       199
        
         fedora-coreos-config-transpiler = throw "fedora-coreos-config-transpiler has been renamed to 'butane'."; # added 2021-04-13

     

       199
       200
        
         fetchFromGithub = throw "You meant fetchFromGitHub, with a capital H.";

     

       200
       201
        
         ffadoFull = ffado; # added 2018-05-01

+1 -1

pkgs/top-level/all-packages.nix

···

       29717
       29717
        
       

     

       29718
       29718
        
         fastjet-contrib = callPackage ../development/libraries/physics/fastjet-contrib { };

     

       29719
       29719
        
       

     

       29720
       29720
       -
         fastnlo = callPackage ../development/libraries/physics/fastnlo { };

     

       29720
       29720
       +
         fastnlo_toolkit = callPackage ../development/libraries/physics/fastnlo_toolkit { };

     

       29721
       29721
        
       

     

       29722
       29722
        
         geant4 = libsForQt5.callPackage ../development/libraries/physics/geant4 { };

     

       29723
       29723

+5

pkgs/top-level/python-packages.nix

···

       2303
       2303
        
       

     

       2304
       2304
        
         fastjsonschema = callPackage ../development/python-modules/fastjsonschema { };

     

       2305
       2305
        
       

     

       2306
       2306
       +
         fastnlo_toolkit = toPythonModule (pkgs.fastnlo_toolkit.override {

     

       2307
       2307
       +
           withPython = true;

     

       2308
       2308
       +
           inherit python;

     

       2309
       2309
       +
         });

     

       2310
       2310
       +
       

     

       2306
       2311
        
         fastpair = callPackage ../development/python-modules/fastpair { };

     

       2307
       2312
        
       

     

       2308
       2313
        
         fastparquet = callPackage ../development/python-modules/fastparquet { };