Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: b13d7daee93c
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 4904c02ad977
Choose a head ref
  • 1 commit
  • 3 files changed
  • 1 contributor

Commits on Oct 30, 2019

  1. treewide: fix flags types

    @globin
    globin committed Oct 30, 2019
    Copy the full SHA
    4904c02 View commit details
Showing with 27 additions and 26 deletions.
  1. +4 −4 pkgs/development/compilers/ocaml/4.00.1.nix
  2. +21 −20 pkgs/development/libraries/science/math/fenics/default.nix
  3. +2 −2 pkgs/os-specific/linux/amdgpu-pro/default.nix
8 changes: 4 additions & 4 deletions pkgs/development/compilers/ocaml/4.00.1.nix
View file
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
let
useX11 = !stdenv.isAarch32 && !stdenv.isMips;
useNativeCompilers = !stdenv.isMips;
inherit (stdenv.lib) optionals optionalString;
inherit (stdenv.lib) optional optionals optionalString;
in

stdenv.mkDerivation rec {
@@ -16,9 +16,9 @@ stdenv.mkDerivation rec {
};

prefixKey = "-prefix ";
configureFlags = ["-no-tk"] ++ optionals useX11 [ "-x11lib" xlibsWrapper ];
buildFlags = [ "world" ] + optionals useNativeCompilers [ "bootstrap" "world.opt" ];
buildInputs = [ncurses] ++ optionals useX11 [ xlibsWrapper ];
configureFlags = [ "-no-tk" ] ++ optionals useX11 [ "-x11lib" xlibsWrapper ];
buildFlags = [ "world" ] ++ optionals useNativeCompilers [ "bootstrap" "world.opt" ];
buildInputs = [ ncurses ] ++ optional useX11 xlibsWrapper;
installTargets = "install" + optionalString useNativeCompilers " installopt";
preConfigure = ''
CAT=$(type -tp cat)
41 changes: 21 additions & 20 deletions pkgs/development/libraries/science/math/fenics/default.nix
View file
Original file line number Diff line number Diff line change
@@ -142,26 +142,27 @@ stdenv.mkDerivation {
numpy pkgconfig six sphinx suitesparse sympy ufl vtk zlib
] ++ stdenv.lib.optionals pythonBindings [ ply python numpy swig ];
patches = [ ./unicode.patch ];
cmakeFlags = [ "-DDOLFIN_CXX_FLAGS=-std=c++11" ]
+ " -DDOLFIN_AUTO_DETECT_MPI=OFF"
+ " -DDOLFIN_ENABLE_CHOLMOD=" + (if suitesparse != null then "ON" else "OFF")
+ " -DDOLFIN_ENABLE_DOCS=" + (if docs then "ON" else "OFF")
+ " -DDOLFIN_ENABLE_GTEST=" + (if gtest != null then "ON" else "OFF")
+ " -DDOLFIN_ENABLE_HDF5=" + (if hdf5 != null then "ON" else "OFF")
+ " -DDOLFIN_ENABLE_MPI=" + (if mpi != null then "ON" else "OFF")
+ " -DDOLFIN_ENABLE_PARMETIS=OFF"
+ " -DDOLFIN_ENABLE_PETSC4PY=OFF"
+ " -DDOLFIN_ENABLE_PETSC=OFF"
+ " -DDOLFIN_ENABLE_PYTHON=" + (if pythonBindings then "ON" else "OFF")
+ " -DDOLFIN_ENABLE_SCOTCH=OFF"
+ " -DDOLFIN_ENABLE_SLEPC4PY=OFF"
+ " -DDOLFIN_ENABLE_SLEPC=OFF"
+ " -DDOLFIN_ENABLE_SPHINX=" + (if sphinx != null then "ON" else "OFF")
+ " -DDOLFIN_ENABLE_TESTING=" + (if doCheck then "ON" else "OFF")
+ " -DDOLFIN_ENABLE_TRILINOS=OFF"
+ " -DDOLFIN_ENABLE_UMFPACK=" + (if suitesparse != null then "ON" else "OFF")
+ " -DDOLFIN_ENABLE_VTK=" + (if vtk != null then "ON" else "OFF")
+ " -DDOLFIN_ENABLE_ZLIB=" + (if zlib != null then "ON" else "OFF");
cmakeFlags = [ "-DDOLFIN_CXX_FLAGS=-std=c++11"
"-DDOLFIN_AUTO_DETECT_MPI=OFF"
("-DDOLFIN_ENABLE_CHOLMOD=" + (if suitesparse != null then "ON" else "OFF"))
("-DDOLFIN_ENABLE_DOCS=" + (if docs then "ON" else "OFF"))
("-DDOLFIN_ENABLE_GTEST=" + (if gtest != null then "ON" else "OFF"))
("-DDOLFIN_ENABLE_HDF5=" + (if hdf5 != null then "ON" else "OFF"))
("-DDOLFIN_ENABLE_MPI=" + (if mpi != null then "ON" else "OFF"))
"-DDOLFIN_ENABLE_PARMETIS=OFF"
"-DDOLFIN_ENABLE_PETSC4PY=OFF"
"-DDOLFIN_ENABLE_PETSC=OFF"
("-DDOLFIN_ENABLE_PYTHON=" + (if pythonBindings then "ON" else "OFF"))
"-DDOLFIN_ENABLE_SCOTCH=OFF"
"-DDOLFIN_ENABLE_SLEPC4PY=OFF"
"-DDOLFIN_ENABLE_SLEPC=OFF"
("-DDOLFIN_ENABLE_SPHINX=" + (if sphinx != null then "ON" else "OFF"))
("-DDOLFIN_ENABLE_TESTING=" + (if doCheck then "ON" else "OFF"))
"-DDOLFIN_ENABLE_TRILINOS=OFF"
("-DDOLFIN_ENABLE_UMFPACK=" + (if suitesparse != null then "ON" else "OFF"))
("-DDOLFIN_ENABLE_VTK=" + (if vtk != null then "ON" else "OFF"))
("-DDOLFIN_ENABLE_ZLIB=" + (if zlib != null then "ON" else "OFF"))
];
checkPhase = ''
make runtests
'';
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/amdgpu-pro/default.nix
View file
Original file line number Diff line number Diff line change
@@ -75,7 +75,7 @@ in stdenv.mkDerivation rec {

preBuild = optionalString (!libsOnly) ''
pushd usr/src/amdgpu-${build}
makeFlags="$makeFlags M=$(pwd)"
makeFlags+=("M=$(pwd)")
patchShebangs pre-build.sh
./pre-build.sh ${kernel.version}
popd
@@ -96,7 +96,7 @@ in stdenv.mkDerivation rec {

NIX_CFLAGS_COMPILE = "-Werror";

makeFlags = optionalString (!libsOnly)
makeFlags = optional (!libsOnly)
"-C ${kernel.dev}/lib/modules/${kernel.modDirVersion}/build modules";

depLibPath = makeLibraryPath [