treewide: pkgs/**.nix: remove trailing whitespaces

Manually remove trailing white spaces
in `pkgs/**.nix` with the help of an editor

Auto-generated nix expressions containing trailing whitespaces:

* pkgs/development/haskell-modules/hackage-packages.nix
* See issue https://github.com/NixOS/cabal2nix/issues/208
* pkgs/**/eggs.nix
* I don't know how they are generated,
but they seems to be Python-related.

+38 -40
+1 -2
pkgs/build-support/upstream-updater/attrset-to-dir.nix
··· 1 - a : 2 a.stdenv.mkDerivation { 3 buildCommand = '' 4 mkdir -p "$out/attributes" 5 - 6 '' + (a.lib.concatStrings (map 7 (n: '' 8 ln -s "${a.writeTextFile {name=n; text=builtins.getAttr n a.theAttrSet;}}" $out/attributes/${n};
··· 1 + a : 2 a.stdenv.mkDerivation { 3 buildCommand = '' 4 mkdir -p "$out/attributes" 5 '' + (a.lib.concatStrings (map 6 (n: '' 7 ln -s "${a.writeTextFile {name=n; text=builtins.getAttr n a.theAttrSet;}}" $out/attributes/${n};
+1 -1
pkgs/development/libraries/languagemachines/test.nix
··· 5 runCommand "frog-test" {} '' 6 ${languageMachines.frog}/bin/frog >$out <<EOF 7 Dit is een test 8 - 9 EOF 10 echo "Frog output:" 11 cat $out
··· 5 runCommand "frog-test" {} '' 6 ${languageMachines.frog}/bin/frog >$out <<EOF 7 Dit is een test 8 + 9 EOF 10 echo "Frog output:" 11 cat $out
+16 -16
pkgs/development/libraries/science/math/clmagma/default.nix
··· 2 3 with lib; 4 5 - let 6 version = "1.3.0"; 7 incfile = builtins.toFile "make.inc.custom" '' 8 CC = g++ 9 FORT = gfortran 10 - 11 ARCH = ar 12 ARCHFLAGS = cr 13 RANLIB = ranlib ··· 16 FOPTS = -fPIC -O3 -DADD_ -Wall -x f95-cpp-input 17 F77OPTS = -fPIC -O3 -DADD_ -Wall 18 LDOPTS = -fPIC 19 - 20 -include make.check-mkl 21 -include make.check-clblas 22 - 23 # Gnu mkl is not available I guess? 24 #LIB = -lmkl_gf_lp64 -lmkl_gnu_thread -lmkl_core -lpthread -lm -fopenmp 25 LIB = -lmkl_intel_lp64 -lmkl_intel_thread -lmkl_core -liomp5 -lm -fopenmp 26 LIB += -lclBLAS -lOpenCL 27 - 28 LIBDIR = -L$(MKLROOT)/lib/intel64 \ 29 -L$(MKLROOT)/../compiler/lib/intel64 \ 30 -L$(clBLAS)/lib64 31 - 32 - INC = -I$(clBLAS)/include 33 #-I$(AMDAPP)/include 34 - ''; 35 in stdenv.mkDerivation { 36 name = "clmagma-${version}"; 37 src = fetchurl { ··· 40 name = "clmagma-${version}.tar.gz"; 41 }; 42 43 - buildInputs = [ 44 - gfortran 45 - clblas 46 - opencl-headers 47 - ocl-icd 48 mkl 49 intel-ocl 50 ]; ··· 54 MKLROOT = "${mkl}"; 55 clBLAS = "${clblas}"; 56 57 - # Otherwise build looks for it in /run/opengl-driver/etc/OpenCL/vendors, 58 # which is not available. 59 OPENCL_VENDOR_PATH="${intel-ocl}/etc/OpenCL/vendors"; 60 61 - preBuild = '' 62 # By default it tries to use GPU, and thus fails for CPUs 63 - sed -i "s/CL_DEVICE_TYPE_GPU/CL_DEVICE_TYPE_DEFAULT/" interface_opencl/clmagma_runtime.cpp 64 sed -i "s%/usr/local/clmagma%/$out%" Makefile.internal 65 cp ${incfile} make.inc 66 '';
··· 2 3 with lib; 4 5 + let 6 version = "1.3.0"; 7 incfile = builtins.toFile "make.inc.custom" '' 8 CC = g++ 9 FORT = gfortran 10 + 11 ARCH = ar 12 ARCHFLAGS = cr 13 RANLIB = ranlib ··· 16 FOPTS = -fPIC -O3 -DADD_ -Wall -x f95-cpp-input 17 F77OPTS = -fPIC -O3 -DADD_ -Wall 18 LDOPTS = -fPIC 19 + 20 -include make.check-mkl 21 -include make.check-clblas 22 + 23 # Gnu mkl is not available I guess? 24 #LIB = -lmkl_gf_lp64 -lmkl_gnu_thread -lmkl_core -lpthread -lm -fopenmp 25 LIB = -lmkl_intel_lp64 -lmkl_intel_thread -lmkl_core -liomp5 -lm -fopenmp 26 LIB += -lclBLAS -lOpenCL 27 + 28 LIBDIR = -L$(MKLROOT)/lib/intel64 \ 29 -L$(MKLROOT)/../compiler/lib/intel64 \ 30 -L$(clBLAS)/lib64 31 + 32 + INC = -I$(clBLAS)/include 33 #-I$(AMDAPP)/include 34 + ''; 35 in stdenv.mkDerivation { 36 name = "clmagma-${version}"; 37 src = fetchurl { ··· 40 name = "clmagma-${version}.tar.gz"; 41 }; 42 43 + buildInputs = [ 44 + gfortran 45 + clblas 46 + opencl-headers 47 + ocl-icd 48 mkl 49 intel-ocl 50 ]; ··· 54 MKLROOT = "${mkl}"; 55 clBLAS = "${clblas}"; 56 57 + # Otherwise build looks for it in /run/opengl-driver/etc/OpenCL/vendors, 58 # which is not available. 59 OPENCL_VENDOR_PATH="${intel-ocl}/etc/OpenCL/vendors"; 60 61 + preBuild = '' 62 # By default it tries to use GPU, and thus fails for CPUs 63 + sed -i "s/CL_DEVICE_TYPE_GPU/CL_DEVICE_TYPE_DEFAULT/" interface_opencl/clmagma_runtime.cpp 64 sed -i "s%/usr/local/clmagma%/$out%" Makefile.internal 65 cp ${incfile} make.inc 66 '';
+20 -21
pkgs/top-level/emscripten-packages.nix
··· 28 libjson-c.a \ 29 -o ./test1.js 30 31 - echo "Using node to execute the test which basically outputs an error on stderr which we grep for" 32 - ${pkgs.nodejs}/bin/node ./test1.js 33 34 set +x 35 if [ $? -ne 0 ]; then ··· 41 echo "================= /testing json_c using node =================" 42 ''; 43 }); 44 - 45 libxml2 = (pkgs.libxml2.override { 46 stdenv = emscriptenStdenv; 47 pythonSupport = false; 48 }).overrideDerivation 49 - (old: { 50 propagatedBuildInputs = [ zlib ]; 51 buildInputs = old.buildInputs ++ [ pkg-config ]; 52 53 # just override it with nothing so it does not fail 54 - autoreconfPhase = "echo autoreconfPhase not used..."; 55 configurePhase = '' 56 HOME=$TMPDIR 57 emconfigure ./configure --prefix=$out --without-python ··· 63 set -x 64 emcc -O2 -s EMULATE_FUNCTION_POINTER_CASTS=1 xmllint.o \ 65 ./.libs/libxml2.a `pkg-config zlib --cflags` `pkg-config zlib --libs` -o ./xmllint.test.js \ 66 - --embed-file ./test/xmlid/id_err1.xml 67 68 - echo "Using node to execute the test which basically outputs an error on stderr which we grep for" 69 - ${pkgs.nodejs}/bin/node ./xmllint.test.js --noout test/xmlid/id_err1.xml 2>&1 | grep 0bar 70 71 set +x 72 if [ $? -ne 0 ]; then ··· 77 fi 78 echo "================= /testing libxml2 using node =================" 79 ''; 80 - }); 81 - 82 xmlmirror = pkgs.buildEmscriptenPackage rec { 83 pname = "xmlmirror"; 84 version = "unstable-2016-06-05"; ··· 91 rev = "4fd7e86f7c9526b8f4c1733e5c8b45175860a8fd"; 92 sha256 = "1jasdqnbdnb83wbcnyrp32f36w3xwhwp0wq8lwwmhqagxrij1r4b"; 93 }; 94 - 95 configurePhase = '' 96 rm -f fastXmlLint.js* 97 # a fix for ERROR:root:For asm.js, TOTAL_MEMORY must be a multiple of 16MB, was 234217728 ··· 103 # https://gitlab.com/odfplugfest/xmlmirror/issues/11 104 sed -e "s/-o fastXmlLint.js/-s EXTRA_EXPORTED_RUNTIME_METHODS='[\"ccall\", \"cwrap\"]' -o fastXmlLint.js/g" -i Makefile.emEnv 105 ''; 106 - 107 buildPhase = '' 108 HOME=$TMPDIR 109 make -f Makefile.emEnv 110 ''; 111 - 112 outputs = [ "out" "doc" ]; 113 - 114 installPhase = '' 115 mkdir -p $out/share 116 mkdir -p $doc/share/${pname} 117 - 118 cp Demo* $out/share 119 cp -R codemirror-5.12 $out/share 120 cp fastXmlLint.js* $out/share ··· 127 cp README.md $doc/share/${pname} 128 ''; 129 checkPhase = '' 130 - 131 ''; 132 - }; 133 134 zlib = (pkgs.zlib.override { 135 stdenv = pkgs.emscriptenStdenv; 136 }).overrideDerivation 137 - (old: { 138 buildInputs = old.buildInputs ++ [ pkg-config ]; 139 # we need to reset this setting! 140 NIX_CFLAGS_COMPILE=""; ··· 165 -L. libz.so.${old.version} -I . -o example.js 166 167 echo "Using node to execute the test" 168 - ${pkgs.nodejs}/bin/node ./example.js 169 170 set +x 171 if [ $? -ne 0 ]; then ··· 183 --replace 'AR="libtool"' 'AR="ar"' \ 184 --replace 'ARFLAGS="-o"' 'ARFLAGS="-r"' 185 ''; 186 - }); 187 - 188 }
··· 28 libjson-c.a \ 29 -o ./test1.js 30 31 + echo "Using node to execute the test which basically outputs an error on stderr which we grep for" 32 + ${pkgs.nodejs}/bin/node ./test1.js 33 34 set +x 35 if [ $? -ne 0 ]; then ··· 41 echo "================= /testing json_c using node =================" 42 ''; 43 }); 44 + 45 libxml2 = (pkgs.libxml2.override { 46 stdenv = emscriptenStdenv; 47 pythonSupport = false; 48 }).overrideDerivation 49 + (old: { 50 propagatedBuildInputs = [ zlib ]; 51 buildInputs = old.buildInputs ++ [ pkg-config ]; 52 53 # just override it with nothing so it does not fail 54 + autoreconfPhase = "echo autoreconfPhase not used..."; 55 configurePhase = '' 56 HOME=$TMPDIR 57 emconfigure ./configure --prefix=$out --without-python ··· 63 set -x 64 emcc -O2 -s EMULATE_FUNCTION_POINTER_CASTS=1 xmllint.o \ 65 ./.libs/libxml2.a `pkg-config zlib --cflags` `pkg-config zlib --libs` -o ./xmllint.test.js \ 66 + --embed-file ./test/xmlid/id_err1.xml 67 68 + echo "Using node to execute the test which basically outputs an error on stderr which we grep for" 69 + ${pkgs.nodejs}/bin/node ./xmllint.test.js --noout test/xmlid/id_err1.xml 2>&1 | grep 0bar 70 71 set +x 72 if [ $? -ne 0 ]; then ··· 77 fi 78 echo "================= /testing libxml2 using node =================" 79 ''; 80 + }); 81 + 82 xmlmirror = pkgs.buildEmscriptenPackage rec { 83 pname = "xmlmirror"; 84 version = "unstable-2016-06-05"; ··· 91 rev = "4fd7e86f7c9526b8f4c1733e5c8b45175860a8fd"; 92 sha256 = "1jasdqnbdnb83wbcnyrp32f36w3xwhwp0wq8lwwmhqagxrij1r4b"; 93 }; 94 + 95 configurePhase = '' 96 rm -f fastXmlLint.js* 97 # a fix for ERROR:root:For asm.js, TOTAL_MEMORY must be a multiple of 16MB, was 234217728 ··· 103 # https://gitlab.com/odfplugfest/xmlmirror/issues/11 104 sed -e "s/-o fastXmlLint.js/-s EXTRA_EXPORTED_RUNTIME_METHODS='[\"ccall\", \"cwrap\"]' -o fastXmlLint.js/g" -i Makefile.emEnv 105 ''; 106 + 107 buildPhase = '' 108 HOME=$TMPDIR 109 make -f Makefile.emEnv 110 ''; 111 + 112 outputs = [ "out" "doc" ]; 113 + 114 installPhase = '' 115 mkdir -p $out/share 116 mkdir -p $doc/share/${pname} 117 + 118 cp Demo* $out/share 119 cp -R codemirror-5.12 $out/share 120 cp fastXmlLint.js* $out/share ··· 127 cp README.md $doc/share/${pname} 128 ''; 129 checkPhase = '' 130 ''; 131 + }; 132 133 zlib = (pkgs.zlib.override { 134 stdenv = pkgs.emscriptenStdenv; 135 }).overrideDerivation 136 + (old: { 137 buildInputs = old.buildInputs ++ [ pkg-config ]; 138 # we need to reset this setting! 139 NIX_CFLAGS_COMPILE=""; ··· 164 -L. libz.so.${old.version} -I . -o example.js 165 166 echo "Using node to execute the test" 167 + ${pkgs.nodejs}/bin/node ./example.js 168 169 set +x 170 if [ $? -ne 0 ]; then ··· 182 --replace 'AR="libtool"' 'AR="ar"' \ 183 --replace 'ARFLAGS="-o"' 'ARFLAGS="-r"' 184 ''; 185 + }); 186 + 187 }