diff --git a/pkgs/applications/science/math/sage/dist-tests.nix b/pkgs/applications/science/math/sage/dist-tests.nix index 24a86a8f37a4..45376b832b9f 100644 --- a/pkgs/applications/science/math/sage/dist-tests.nix +++ b/pkgs/applications/science/math/sage/dist-tests.nix @@ -7,10 +7,10 @@ # subset of files responsible for the vast majority of packaging tests, we can # think about moving this upstream. [ - "src/sage/env.py" # [1] - "src/sage/misc/persist.pyx" # [1] - "src/sage/misc/inline_fortran.py" # [1] - "src/sage/repl/ipython_extension.py" # [1] + "src/sage/env.py" # [1] + "src/sage/misc/persist.pyx" # [1] + "src/sage/misc/inline_fortran.py" # [1] + "src/sage/repl/ipython_extension.py" # [1] ] # Numbered list of past failures to annotate files with diff --git a/pkgs/build-support/dotnet/dotnetenv/build-solution.nix b/pkgs/build-support/dotnet/dotnetenv/build-solution.nix index b3372b942177..9984db1cb2d3 100644 --- a/pkgs/build-support/dotnet/dotnetenv/build-solution.nix +++ b/pkgs/build-support/dotnet/dotnetenv/build-solution.nix @@ -31,41 +31,37 @@ stdenv.mkDerivation { ''; installPhase = '' - addDeps() - { - if [ -f $1/nix-support/dotnet-assemblies ] - then - for i in $(cat $1/nix-support/dotnet-assemblies) - do - windowsPath=$(cygpath --windows $i) - assemblySearchPaths="$assemblySearchPaths;$windowsPath" + runHook preInstall - addDeps $i - done - fi + addDeps() { + if [ -f $1/nix-support/dotnet-assemblies ]; then + for i in $(cat $1/nix-support/dotnet-assemblies); do + windowsPath=$(cygpath --windows $i) + assemblySearchPaths="$assemblySearchPaths;$windowsPath" + + addDeps $i + done + fi } - for i in ${toString assemblyInputs} - do - windowsPath=$(cygpath --windows $i) - echo "Using assembly path: $windowsPath" + for i in ${toString assemblyInputs}; do + windowsPath=$(cygpath --windows $i) + echo "Using assembly path: $windowsPath" - if [ "$assemblySearchPaths" = "" ] - then - assemblySearchPaths="$windowsPath" - else - assemblySearchPaths="$assemblySearchPaths;$windowsPath" - fi + if [ "$assemblySearchPaths" = "" ]; then + assemblySearchPaths="$windowsPath" + else + assemblySearchPaths="$assemblySearchPaths;$windowsPath" + fi - addDeps $i + addDeps $i done echo "Assembly search paths are: $assemblySearchPaths" - if [ "$assemblySearchPaths" != "" ] - then - echo "Using assembly search paths args: $assemblySearchPathsArg" - export AssemblySearchPaths=$assemblySearchPaths + if [ "$assemblySearchPaths" != "" ]; then + echo "Using assembly search paths args: $assemblySearchPathsArg" + export AssemblySearchPaths=$assemblySearchPaths fi mkdir -p $out @@ -77,9 +73,10 @@ stdenv.mkDerivation { mkdir -p $out/nix-support - for i in ${toString assemblyInputs} - do - echo $i >> $out/nix-support/dotnet-assemblies + for i in ${toString assemblyInputs}; do + echo $i >> $out/nix-support/dotnet-assemblies done + + runHook postInstall ''; } diff --git a/pkgs/build-support/dotnet/dotnetenv/wrapper.nix b/pkgs/build-support/dotnet/dotnetenv/wrapper.nix index 423303c3084a..549abd07e2b9 100644 --- a/pkgs/build-support/dotnet/dotnetenv/wrapper.nix +++ b/pkgs/build-support/dotnet/dotnetenv/wrapper.nix @@ -28,27 +28,23 @@ dotnetenv.buildSolution { slnFile = "Wrapper.sln"; assemblyInputs = [ application ]; preBuild = '' - addRuntimeDeps() - { - if [ -f $1/nix-support/dotnet-assemblies ] - then - for i in $(cat $1/nix-support/dotnet-assemblies) - do - windowsPath=$(cygpath --windows $i | sed 's|\\|\\\\|g') - assemblySearchArray="$assemblySearchArray @\"$windowsPath\"" + addRuntimeDeps() { + if [ -f $1/nix-support/dotnet-assemblies ]; then + for i in $(cat $1/nix-support/dotnet-assemblies); do + windowsPath=$(cygpath --windows $i | sed 's|\\|\\\\|g') + assemblySearchArray="$assemblySearchArray @\"$windowsPath\"" - addRuntimeDeps $i - done - fi + addRuntimeDeps $i + done + fi } export exePath=$(cygpath --windows $(find ${application} -name \*.exe) | sed 's|\\|\\\\|g') # Generate assemblySearchPaths string array contents - for path in ${toString assemblyInputs} - do - assemblySearchArray="$assemblySearchArray @\"$(cygpath --windows $path | sed 's|\\|\\\\|g')\", " - addRuntimeDeps $path + for path in ${toString assemblyInputs}; do + assemblySearchArray="$assemblySearchArray @\"$(cygpath --windows $path | sed 's|\\|\\\\|g')\", " + addRuntimeDeps $path done sed -e "s|@ROOTNAMESPACE@|${namespace}Wrapper|" \ @@ -57,8 +53,8 @@ dotnetenv.buildSolution { sed -e "s|@NAMESPACE@|${namespace}|g" \ -e "s|@MAINCLASSNAME@|${mainClassName}|g" \ - -e "s|@EXEPATH@|$exePath|g" \ - -e "s|@ASSEMBLYSEARCHPATH@|$assemblySearchArray|" \ + -e "s|@EXEPATH@|$exePath|g" \ + -e "s|@ASSEMBLYSEARCHPATH@|$assemblySearchArray|" \ Wrapper/Wrapper.cs.in > Wrapper/Wrapper.cs ''; } diff --git a/pkgs/build-support/rust/build-rust-crate/log.nix b/pkgs/build-support/rust/build-rust-crate/log.nix index 9054815f4a1b..cb0846190eac 100644 --- a/pkgs/build-support/rust/build-rust-crate/log.nix +++ b/pkgs/build-support/rust/build-rust-crate/log.nix @@ -49,11 +49,11 @@ in { noisily = colors: verbose: '' noisily() { - ${lib.optionalString verbose '' + ${lib.optionalString verbose '' echo_colored -n "Running " echo $@ - ''} - $@ + ''} + $@ } ''; } diff --git a/pkgs/by-name/lz/lzlib/package.nix b/pkgs/by-name/lz/lzlib/package.nix index db517669c5e8..6e9510215abe 100644 --- a/pkgs/by-name/lz/lzlib/package.nix +++ b/pkgs/by-name/lz/lzlib/package.nix @@ -30,4 +30,4 @@ stdenv.mkDerivation (finalAttrs: { platforms = lib.platforms.all; maintainers = with lib.maintainers; [ ehmry ]; }; -}) \ No newline at end of file +}) diff --git a/pkgs/data/icons/apple-cursor/default.nix b/pkgs/data/icons/apple-cursor/default.nix index 6f33219ed6c5..e2f059ecb1fb 100644 --- a/pkgs/data/icons/apple-cursor/default.nix +++ b/pkgs/data/icons/apple-cursor/default.nix @@ -31,7 +31,6 @@ in stdenv.mkDerivation rec { homepage = "https://github.com/ful1e5/apple_cursor"; license = [ licenses.gpl3Only - # Potentially a derivative work of copyrighted Apple designs licenses.unfree ];