From 66e44425c6dfecbea68a5d6dc221ccd56561d4f1 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Fri, 22 Jan 2021 00:00:13 +0700 Subject: pkgs/development/libraries: stdenv.lib -> lib --- pkgs/development/libraries/physics/apfel/default.nix | 4 ++-- .../libraries/physics/apfelgrid/default.nix | 4 ++-- .../development/libraries/physics/applgrid/default.nix | 4 ++-- pkgs/development/libraries/physics/cernlib/default.nix | 6 +++--- .../libraries/physics/fastjet-contrib/default.nix | 4 ++-- pkgs/development/libraries/physics/fastjet/default.nix | 8 ++++---- pkgs/development/libraries/physics/fastnlo/default.nix | 8 ++++---- pkgs/development/libraries/physics/geant4/datasets.nix | 2 +- pkgs/development/libraries/physics/geant4/default.nix | 18 +++++++++--------- pkgs/development/libraries/physics/hepmc2/default.nix | 4 ++-- pkgs/development/libraries/physics/hepmc3/default.nix | 12 ++++++------ pkgs/development/libraries/physics/herwig/default.nix | 4 ++-- pkgs/development/libraries/physics/hoppet/default.nix | 4 ++-- pkgs/development/libraries/physics/lhapdf/default.nix | 12 ++++++------ pkgs/development/libraries/physics/lhapdf/pdf_sets.nix | 4 ++-- pkgs/development/libraries/physics/mela/default.nix | 4 ++-- pkgs/development/libraries/physics/nlojet/default.nix | 8 ++++---- pkgs/development/libraries/physics/pythia/default.nix | 10 +++++----- pkgs/development/libraries/physics/qcdnum/default.nix | 8 ++++---- pkgs/development/libraries/physics/rivet/default.nix | 6 +++--- pkgs/development/libraries/physics/thepeg/default.nix | 4 ++-- pkgs/development/libraries/physics/yoda/default.nix | 10 +++++----- 22 files changed, 74 insertions(+), 74 deletions(-) (limited to 'pkgs/development/libraries/physics') diff --git a/pkgs/development/libraries/physics/apfel/default.nix b/pkgs/development/libraries/physics/apfel/default.nix index 7b201cf9b16..e3fd0a26a7f 100644 --- a/pkgs/development/libraries/physics/apfel/default.nix +++ b/pkgs/development/libraries/physics/apfel/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, gfortran, lhapdf, python2, zlib }: +{ lib, stdenv, fetchFromGitHub, gfortran, lhapdf, python2, zlib }: stdenv.mkDerivation rec { pname = "apfel"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "A PDF Evolution Library"; license = licenses.gpl3; homepage = "https://apfel.mi.infn.it/"; diff --git a/pkgs/development/libraries/physics/apfelgrid/default.nix b/pkgs/development/libraries/physics/apfelgrid/default.nix index 5c63ce7c4b9..33ca0326727 100644 --- a/pkgs/development/libraries/physics/apfelgrid/default.nix +++ b/pkgs/development/libraries/physics/apfelgrid/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, apfel, applgrid, lhapdf, root5 }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, apfel, applgrid, lhapdf, root5 }: stdenv.mkDerivation rec { pname = "apfelgrid"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Ultra-fast theory predictions for collider observables"; license = licenses.mit; homepage = "http://nhartland.github.io/APFELgrid/"; diff --git a/pkgs/development/libraries/physics/applgrid/default.nix b/pkgs/development/libraries/physics/applgrid/default.nix index 6b1bc71c660..65aa7b8b470 100644 --- a/pkgs/development/libraries/physics/applgrid/default.nix +++ b/pkgs/development/libraries/physics/applgrid/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gfortran, hoppet, lhapdf, root5, zlib }: +{ lib, stdenv, fetchurl, gfortran, hoppet, lhapdf, root5, zlib }: stdenv.mkDerivation rec { pname = "applgrid"; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "The APPLgrid project provides a fast and flexible way to reproduce the results of full NLO calculations with any input parton distribution set in only a few milliseconds rather than the weeks normally required to gain adequate statistics"; license = licenses.gpl3; homepage = "http://applgrid.hepforge.org"; diff --git a/pkgs/development/libraries/physics/cernlib/default.nix b/pkgs/development/libraries/physics/cernlib/default.nix index 3c2cd4c6914..84657d72679 100644 --- a/pkgs/development/libraries/physics/cernlib/default.nix +++ b/pkgs/development/libraries/physics/cernlib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gfortran, gnumake, imake, makedepend, motif, xorg }: +{ lib, stdenv, fetchurl, gfortran, gnumake, imake, makedepend, motif, xorg }: stdenv.mkDerivation rec { version = "2006"; @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { description = "Legacy collection of libraries and modules for data analysis in high energy physics"; broken = stdenv.isDarwin; platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; - maintainers = with stdenv.lib.maintainers; [ veprbl ]; - license = stdenv.lib.licenses.gpl2; + maintainers = with lib.maintainers; [ veprbl ]; + license = lib.licenses.gpl2; }; } diff --git a/pkgs/development/libraries/physics/fastjet-contrib/default.nix b/pkgs/development/libraries/physics/fastjet-contrib/default.nix index 68e07e7b42d..a09f031e765 100644 --- a/pkgs/development/libraries/physics/fastjet-contrib/default.nix +++ b/pkgs/development/libraries/physics/fastjet-contrib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fastjet }: +{ lib, stdenv, fetchurl, fastjet }: stdenv.mkDerivation rec { pname = "fastjet-contrib"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { make fragile-shared-install ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Third party extensions for FastJet"; homepage = "http://fastjet.fr/"; license = licenses.gpl2; diff --git a/pkgs/development/libraries/physics/fastjet/default.nix b/pkgs/development/libraries/physics/fastjet/default.nix index b854fa88cd6..35ce8dedca7 100644 --- a/pkgs/development/libraries/physics/fastjet/default.nix +++ b/pkgs/development/libraries/physics/fastjet/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python2 }: +{ lib, stdenv, fetchurl, python2 }: stdenv.mkDerivation rec { pname = "fastjet"; @@ -20,9 +20,9 @@ stdenv.mkDerivation rec { meta = { description = "A software package for jet finding in pp and e+e− collisions"; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; homepage = "http://fastjet.fr/"; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ veprbl ]; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ veprbl ]; }; } diff --git a/pkgs/development/libraries/physics/fastnlo/default.nix b/pkgs/development/libraries/physics/fastnlo/default.nix index 22251e10a4f..916303f00ce 100644 --- a/pkgs/development/libraries/physics/fastnlo/default.nix +++ b/pkgs/development/libraries/physics/fastnlo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, boost, fastjet, gfortran, lhapdf, python2, root, yoda, zlib }: +{ lib, stdenv, fetchurl, boost, fastjet, gfortran, lhapdf, python2, root, yoda, zlib }: stdenv.mkDerivation rec { pname = "fastnlo_toolkit"; @@ -25,9 +25,9 @@ stdenv.mkDerivation rec { meta = { description = "A computer code to create and evaluate fast interpolation tables of pre-computed coefficients in perturbation theory for observables in hadron-induced processes"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; homepage = "http://fastnlo.hepforge.org"; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ veprbl ]; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ veprbl ]; }; } diff --git a/pkgs/development/libraries/physics/geant4/datasets.nix b/pkgs/development/libraries/physics/geant4/datasets.nix index 42014949c0b..e51a5937ddb 100644 --- a/pkgs/development/libraries/physics/geant4/datasets.nix +++ b/pkgs/development/libraries/physics/geant4/datasets.nix @@ -24,7 +24,7 @@ let inherit envvar; setupHook = ./datasets-hook.sh; - meta = with stdenv.lib; { + meta = with lib; { description = "Data files for the Geant4 toolkit"; homepage = "https://geant4.web.cern.ch/support/download"; license = licenses.g4sl; diff --git a/pkgs/development/libraries/physics/geant4/default.nix b/pkgs/development/libraries/physics/geant4/default.nix index 0b48b291555..27d67d9af0c 100644 --- a/pkgs/development/libraries/physics/geant4/default.nix +++ b/pkgs/development/libraries/physics/geant4/default.nix @@ -9,7 +9,7 @@ , enableRaytracerX11 ? false # Standard build environment with cmake. -, stdenv, fetchurl, fetchpatch, cmake +, lib, stdenv, fetchurl, fetchpatch, cmake # Optional system packages, otherwise internal GEANT4 packages are used. , clhep ? null # not packaged currently @@ -80,9 +80,9 @@ stdenv.mkDerivation rec { "-DGEANT4_USE_SYSTEM_EXPAT=${if expat != null then "ON" else "OFF"}" "-DGEANT4_USE_SYSTEM_ZLIB=${if zlib != null then "ON" else "OFF"}" "-DGEANT4_BUILD_MULTITHREADED=${if enableMultiThreading then "ON" else "OFF"}" - ] ++ stdenv.lib.optionals (enableMultiThreading && enablePython) [ + ] ++ lib.optionals (enableMultiThreading && enablePython) [ "-DGEANT4_BUILD_TLS_MODEL=global-dynamic" - ] ++ stdenv.lib.optionals enableInventor [ + ] ++ lib.optionals enableInventor [ "-DINVENTOR_INCLUDE_DIR=${coin3d}/include" "-DINVENTOR_LIBRARY_RELEASE=${coin3d}/lib/libCoin.so" ]; @@ -90,13 +90,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ libGLU xlibsWrapper libXmu ] - ++ stdenv.lib.optionals enableInventor [ libXpm coin3d soxt motif ] - ++ stdenv.lib.optionals enablePython [ boost_python python3 ]; + ++ lib.optionals enableInventor [ libXpm coin3d soxt motif ] + ++ lib.optionals enablePython [ boost_python python3 ]; propagatedBuildInputs = [ clhep expat zlib libGL ] - ++ stdenv.lib.optionals enableGDML [ xercesc ] - ++ stdenv.lib.optionals enableXM [ motif ] - ++ stdenv.lib.optionals enableQT [ qtbase ]; + ++ lib.optionals enableGDML [ xercesc ] + ++ lib.optionals enableXM [ motif ] + ++ lib.optionals enableQT [ qtbase ]; postFixup = '' # Don't try to export invalid environment variables. @@ -119,7 +119,7 @@ stdenv.mkDerivation rec { source $out/nix-support/setup-hook ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A toolkit for the simulation of the passage of particles through matter"; longDescription = '' Geant4 is a toolkit for the simulation of the passage of particles through matter. diff --git a/pkgs/development/libraries/physics/hepmc2/default.nix b/pkgs/development/libraries/physics/hepmc2/default.nix index b27d947ea5c..e2ab42c418a 100644 --- a/pkgs/development/libraries/physics/hepmc2/default.nix +++ b/pkgs/development/libraries/physics/hepmc2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake }: +{ lib, stdenv, fetchurl, cmake }: stdenv.mkDerivation rec { pname = "hepmc"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { "-Dlength:STRING=MM" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "The HepMC package is an object oriented event record written in C++ for High Energy Physics Monte Carlo Generators"; license = licenses.lgpl21; homepage = "http://hepmc.web.cern.ch/hepmc/"; diff --git a/pkgs/development/libraries/physics/hepmc3/default.nix b/pkgs/development/libraries/physics/hepmc3/default.nix index 10b789f514f..0b1b1f8fa57 100644 --- a/pkgs/development/libraries/physics/hepmc3/default.nix +++ b/pkgs/development/libraries/physics/hepmc3/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, cmake, coreutils, python, root }: +{ lib, stdenv, fetchurl, cmake, coreutils, python, root }: let - pythonVersion = with stdenv.lib.versions; "${major python.version}${minor python.version}"; + pythonVersion = with lib.versions; "${major python.version}${minor python.version}"; withPython = python != null; # ensure that root is built with the same python interpreter, as it links against numpy root_py = if withPython then root.override { inherit python; } else root; @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ root_py ] - ++ stdenv.lib.optional withPython python; + ++ lib.optional withPython python; cmakeFlags = [ "-DHEPMC3_ENABLE_PYTHON=${if withPython then "ON" else "OFF"}" - ] ++ stdenv.lib.optionals withPython [ + ] ++ lib.optionals withPython [ "-DHEPMC3_PYTHON_VERSIONS=${if python.isPy3k then "3.X" else "2.X"}" "-DHEPMC3_Python_SITEARCH${pythonVersion}=${placeholder "out"}/${python.sitePackages}" ]; @@ -35,11 +35,11 @@ stdenv.mkDerivation rec { doInstallCheck = withPython; # prevent nix from trying to dereference a null python - installCheckPhase = stdenv.lib.optionalString withPython '' + installCheckPhase = lib.optionalString withPython '' PYTHONPATH=${placeholder "out"}/${python.sitePackages} python -c 'import pyHepMC3' ''; - meta = with stdenv.lib; { + meta = with lib; { description = "The HepMC package is an object oriented, C++ event record for High Energy Physics Monte Carlo generators and simulation"; license = licenses.gpl3; homepage = "http://hepmc.web.cern.ch/hepmc/"; diff --git a/pkgs/development/libraries/physics/herwig/default.nix b/pkgs/development/libraries/physics/herwig/default.nix index c1a803fd314..d3f6bcb7474 100644 --- a/pkgs/development/libraries/physics/herwig/default.nix +++ b/pkgs/development/libraries/physics/herwig/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, boost, fastjet, gfortran, gsl, lhapdf, thepeg, zlib, autoconf, automake, libtool }: +{ lib, stdenv, fetchurl, boost, fastjet, gfortran, gsl, lhapdf, thepeg, zlib, autoconf, automake, libtool }: stdenv.mkDerivation rec { pname = "herwig"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "A multi-purpose particle physics event generator"; homepage = "https://herwig.hepforge.org/"; license = licenses.gpl3; diff --git a/pkgs/development/libraries/physics/hoppet/default.nix b/pkgs/development/libraries/physics/hoppet/default.nix index 6ac3b950be3..7ad5b9861a1 100644 --- a/pkgs/development/libraries/physics/hoppet/default.nix +++ b/pkgs/development/libraries/physics/hoppet/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gfortran, perl }: +{ lib, stdenv, fetchurl, gfortran, perl }: stdenv.mkDerivation rec { pname = "hoppet"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { patchShebangs . ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Higher Order Perturbative Parton Evolution Toolkit"; license = licenses.gpl2; homepage = "https://hoppet.hepforge.org"; diff --git a/pkgs/development/libraries/physics/lhapdf/default.nix b/pkgs/development/libraries/physics/lhapdf/default.nix index 7d412f86596..19e9f9d9ec8 100644 --- a/pkgs/development/libraries/physics/lhapdf/default.nix +++ b/pkgs/development/libraries/physics/lhapdf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python2, makeWrapper }: +{ lib, stdenv, fetchurl, python2, makeWrapper }: stdenv.mkDerivation rec { pname = "lhapdf"; @@ -15,18 +15,18 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; passthru = { - pdf_sets = import ./pdf_sets.nix { inherit stdenv fetchurl; }; + pdf_sets = import ./pdf_sets.nix { inherit lib stdenv fetchurl; }; }; postInstall = '' wrapProgram $out/bin/lhapdf --prefix PYTHONPATH : "$(toPythonPath "$out")" ''; - meta = { + meta = with lib; { description = "A general purpose interpolator, used for evaluating Parton Distribution Functions from discretised data files"; - license = stdenv.lib.licenses.gpl2; + license = licenses.gpl2; homepage = "http://lhapdf.hepforge.org"; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ veprbl ]; + platforms = platforms.unix; + maintainers = with maintainers; [ veprbl ]; }; } diff --git a/pkgs/development/libraries/physics/lhapdf/pdf_sets.nix b/pkgs/development/libraries/physics/lhapdf/pdf_sets.nix index 2309e6671f8..7fb3e640c7d 100644 --- a/pkgs/development/libraries/physics/lhapdf/pdf_sets.nix +++ b/pkgs/development/libraries/physics/lhapdf/pdf_sets.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: let mkPdfSet = name: sha256: @@ -20,7 +20,7 @@ let setupHook = ./pdfset-hook.sh; }; in - stdenv.lib.mapAttrs mkPdfSet { + lib.mapAttrs mkPdfSet { "ABMP15_3_nnlo" = "028q5xixxjxhb8sr7l5v5mwh9mkszm5m59fgnpb69yxvv40a70v0"; "ABMP15_4_nnlo" = "11zjp4dxmgp69kdkmdwqkpsajvwjrbwylmwgs56mgjb0vgb8wk0i"; "ABMP15_5_nnlo" = "0z47g5fwh53gg5ws5bbip5q2m5mm7vl09q2w58g6ah9dk25r10ll"; diff --git a/pkgs/development/libraries/physics/mela/default.nix b/pkgs/development/libraries/physics/mela/default.nix index 1e31577026c..90cf5ac8b2d 100644 --- a/pkgs/development/libraries/physics/mela/default.nix +++ b/pkgs/development/libraries/physics/mela/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, gfortran }: +{ lib, stdenv, fetchFromGitHub, gfortran }: stdenv.mkDerivation rec { pname = "mela"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "a Mellin Evolution LibrAry"; license = licenses.gpl3; homepage = "https://github.com/vbertone/MELA"; diff --git a/pkgs/development/libraries/physics/nlojet/default.nix b/pkgs/development/libraries/physics/nlojet/default.nix index 20df49d9ae7..f84c1bda32d 100644 --- a/pkgs/development/libraries/physics/nlojet/default.nix +++ b/pkgs/development/libraries/physics/nlojet/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "nlojet++"; @@ -15,9 +15,9 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.desy.de/~znagy/Site/NLOJet++.html"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; description = "Implementation of calculation of the hadron jet cross sections"; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ veprbl ]; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ veprbl ]; }; } diff --git a/pkgs/development/libraries/physics/pythia/default.nix b/pkgs/development/libraries/physics/pythia/default.nix index 53b2889a25c..1bec3300f80 100644 --- a/pkgs/development/libraries/physics/pythia/default.nix +++ b/pkgs/development/libraries/physics/pythia/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, boost, fastjet, hepmc, lhapdf, rsync, zlib }: +{ lib, stdenv, fetchurl, boost, fastjet, hepmc, lhapdf, rsync, zlib }: stdenv.mkDerivation rec { pname = "pythia"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-shared" "--with-lhapdf6=${lhapdf}" - ] ++ (if stdenv.lib.versions.major hepmc.version == "3" then [ + ] ++ (if lib.versions.major hepmc.version == "3" then [ "--with-hepmc3=${hepmc}" ] else [ "--with-hepmc2=${hepmc}" @@ -28,9 +28,9 @@ stdenv.mkDerivation rec { meta = { description = "A program for the generation of high-energy physics events"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; homepage = "http://home.thep.lu.se/~torbjorn/Pythia.html"; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ veprbl ]; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ veprbl ]; }; } diff --git a/pkgs/development/libraries/physics/qcdnum/default.nix b/pkgs/development/libraries/physics/qcdnum/default.nix index 1c17b318c9d..834e3fcbba8 100644 --- a/pkgs/development/libraries/physics/qcdnum/default.nix +++ b/pkgs/development/libraries/physics/qcdnum/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gfortran, zlib }: +{ lib, stdenv, fetchurl, gfortran, zlib }: stdenv.mkDerivation rec { pname = "QCDNUM"; @@ -16,9 +16,9 @@ stdenv.mkDerivation rec { meta = { description = "A very fast QCD evolution program written in FORTRAN77"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; homepage = "https://www.nikhef.nl/~h24/qcdnum/index.html"; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ veprbl ]; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ veprbl ]; }; } diff --git a/pkgs/development/libraries/physics/rivet/default.nix b/pkgs/development/libraries/physics/rivet/default.nix index f95328964bf..ce905bff17c 100644 --- a/pkgs/development/libraries/physics/rivet/default.nix +++ b/pkgs/development/libraries/physics/rivet/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fastjet, fastjet-contrib, ghostscript, gsl, hepmc, imagemagick, less, python3, rsync, texlive, yoda, which, makeWrapper }: +{ lib, stdenv, fetchurl, fastjet, fastjet-contrib, ghostscript, gsl, hepmc, imagemagick, less, python3, rsync, texlive, yoda, which, makeWrapper }: stdenv.mkDerivation rec { pname = "rivet"; @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-fastjet=${fastjet}" "--with-yoda=${yoda}" - ] ++ (if stdenv.lib.versions.major hepmc.version == "3" then [ + ] ++ (if lib.versions.major hepmc.version == "3" then [ "--with-hepmc3=${hepmc}" ] else [ "--with-hepmc=${hepmc}" @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A framework for comparison of experimental measurements from high-energy particle colliders to theory predictions"; license = licenses.gpl3; homepage = "https://rivet.hepforge.org"; diff --git a/pkgs/development/libraries/physics/thepeg/default.nix b/pkgs/development/libraries/physics/thepeg/default.nix index 876aeec0fab..d5a272955f4 100644 --- a/pkgs/development/libraries/physics/thepeg/default.nix +++ b/pkgs/development/libraries/physics/thepeg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, boost, fastjet, gsl, hepmc2, lhapdf, rivet, zlib }: +{ lib, stdenv, fetchurl, boost, fastjet, gsl, hepmc2, lhapdf, rivet, zlib }: stdenv.mkDerivation rec { pname = "thepeg"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Toolkit for High Energy Physics Event Generation"; homepage = "https://herwig.hepforge.org/"; license = licenses.gpl3; diff --git a/pkgs/development/libraries/physics/yoda/default.nix b/pkgs/development/libraries/physics/yoda/default.nix index 39bffb65237..bf53cfcb62c 100644 --- a/pkgs/development/libraries/physics/yoda/default.nix +++ b/pkgs/development/libraries/physics/yoda/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python, root, makeWrapper, zlib, withRootSupport ? false }: +{ lib, stdenv, fetchurl, python, root, makeWrapper, zlib, withRootSupport ? false }: stdenv.mkDerivation rec { pname = "yoda"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = with python.pkgs; [ cython makeWrapper ]; buildInputs = [ python ] ++ (with python.pkgs; [ numpy matplotlib ]) - ++ stdenv.lib.optional withRootSupport root; + ++ lib.optional withRootSupport root; propagatedBuildInputs = [ zlib ]; enableParallelBuilding = true; @@ -35,10 +35,10 @@ stdenv.mkDerivation rec { meta = { description = "Provides small set of data analysis (specifically histogramming) classes"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; homepage = "https://yoda.hepforge.org"; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ veprbl ]; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ veprbl ]; # https://gitlab.com/hepcedar/yoda/-/issues/24 broken = withRootSupport; }; -- cgit 1.4.1