[haskell-updates] ghcWithPackages: fix ghclibdir computation with variantSuffix

[sternenseemann]

This is an incorrectness pointed out in #153319 which we already have
a proper solution for.

Description of changes

Things done

• Built on platform(s)
  • x86_64-linux
  • aarch64-linux
  • x86_64-darwin
  • aarch64-darwin
• For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
• Tested, as applicable:
  • NixOS test(s) (look inside nixos/tests)
  • and/or package tests
  • or, for functions and "core" functionality, tests in lib/tests or pkgs/test
  • made sure NixOS tests are linked to the relevant packages
• Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
• Tested basic functionality of all binary files (usually in ./result/bin/)
• 22.05 Release Notes (or backporting 21.11 Release notes)
  • (Package updates) Added a release notes entry if the change is major or breaking
  • (Module updates) Added a release notes entry if the change is significant
  • (Module addition) Added a release notes entry if adding a new NixOS module
  • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
• Fits CONTRIBUTING.md.

[sternenseemann]

Test checklist

• Native
  • haskellPackages.cabal2nix-unstable
  • gitit service was already broken before
  • ghc-mod (n/a)
  • structured-haskell-mode
  • hindent
  • Normal ghcWithPackages
  • integer-simple / native-bignum ghcWithPackages
  • musl ghcWithPackages
• Cross
  • pkgsCross.aarch64-multiplatform.haskellPackages.hello
  • pkgsCross.aarch64-multiplatform.ghc.withPackages (p: [ p.error ])
  • pkgsStatic.haskellPackages.ghc.withPackages (p: [ p.error ])

[sternenseemann]

Set rebuild is caused by ghc-binary-8.10.7 being corrected to ghc-8.10.7:

- /nix/store/wbij2lvvciix06xndfhawqbhbm82y42d-hello-1.0.0.2.drv:{out}
+ /nix/store/88d4ca757hx451qr5yqs1iy179rrjab8-hello-1.0.0.2.drv:{out}
• The input derivation named `ghc-9.0.2` differs
  - /nix/store/l4r0kvvc0g496rx0gqzqlzlqg50jl8ji-ghc-9.0.2.drv:{out}
  + /nix/store/mfcjmby0f6dwhf28an4vk12ddck03j71-ghc-9.0.2.drv:{out}
  • The input derivation named `alex-3.2.7.1` differs
    - /nix/store/igwcj2lp04464lpxhspsxz0r6lnhfymz-alex-3.2.7.1.drv:{out}
    + /nix/store/ji99l4m2l1hh7k55f2sccpxm5052hskj-alex-3.2.7.1.drv:{out}
    • The input derivation named `happy-1.20.0` differs
      - /nix/store/a73wg49pg0hjbdfsagd8bjcd7rnf5har-happy-1.20.0.drv:{out}
      + /nix/store/zq2lgp22vrx4j3dkn4gjvnvzgw30wcn6-happy-1.20.0.drv:{out}
      • The environments do not match:
          setupCompilerEnvironmentPhase=''
          NIX_BUILD_CORES=$(( NIX_BUILD_CORES < 16 ? NIX_BUILD_CORES : 16 ))
          runHook preSetupCompilerEnvironment
          
          echo "Build with /nix/store/467916mp56bgz4v7lgbs226d7w5dmrmi-ghc-binary-8.10.7."
          
          
          setupPackageConfDir="$TMPDIR/setup-package.conf.d"
          mkdir -p $setupPackageConfDir
          packageConfDir="$TMPDIR/package.conf.d"
          mkdir -p $packageConfDir
          
          setupCompileFlags="-package-db=$setupPackageConfDir -j$NIX_BUILD_CORES +RTS -A64M -RTS -threaded -rtsopts"
          configureFlags="--verbose --prefix=$out --libdir=\$prefix/lib/\$compiler --libsubdir=\$abi/\$libname ←--datadir=$data/share/ghc-binary-8.10.7←→--datadir=$data/share/ghc-8.10.7→  --with-gcc=$CC --package-db=$packageConfDir   --ghc-options=-j$NIX_BUILD_CORES +RTS -A64M -RTS  --disable-split-objs --disable-library-profiling  --disable-profiling --disable-shared --disable-coverage --enable-static --disable-executable-dynamic --disable-tests --disable-benchmarks --enable-library-vanilla --disable-library-for-ghci --ghc-option=-split-sections $configureFlags"
          for p in "${pkgsBuildBuild[@]}" "${pkgsBuildHost[@]}" "${pkgsBuildTarget[@]}"; do
            # If this dependency has a package database, then copy the contents of it,
          # unless it is one of our GHCs. These can appear in our dependencies when
          # we are doing native builds, and they have package databases in them, but
          # we do not want to copy them over.
          #
          # We don't need to, since those packages will be provided by the GHC when
          # we compile with it, and doing so can result in having multiple copies of
          # e.g. Cabal in the database with the same name and version, which is
          # ambiguous.
          if [ -d ←"$p/lib/ghc-binary-8.10.7/package.conf.d"←→"$p/lib/ghc-8.10.7/package.conf.d"→ ] && [ "$p" != "/nix/store/467916mp56bgz4v7lgbs226d7w5dmrmi-ghc-binary-8.10.7" ] && [ "$p" != "/nix/store/467916mp56bgz4v7lgbs226d7w5dmrmi-ghc-binary-8.10.7" ]; then
            cp -f ←"$p/lib/ghc-binary-8.10.7/package.conf.d/"*.conf←→"$p/lib/ghc-8.10.7/package.conf.d/"*.conf→ $setupPackageConfDir/
            continue
          fi
          
          done
          ghc-pkg --package-db="$setupPackageConfDir" recache
          for p in "${pkgsHostHost[@]}" "${pkgsHostTarget[@]}"; do
            # If this dependency has a package database, then copy the contents of it,
          # unless it is one of our GHCs. These can appear in our dependencies when
          # we are doing native builds, and they have package databases in them, but
          # we do not want to copy them over.
          #
          # We don't need to, since those packages will be provided by the GHC when
          # we compile with it, and doing so can result in having multiple copies of
          # e.g. Cabal in the database with the same name and version, which is
          # ambiguous.
          if [ -d ←"$p/lib/ghc-binary-8.10.7/package.conf.d"←→"$p/lib/ghc-8.10.7/package.conf.d"→ ] && [ "$p" != "/nix/store/467916mp56bgz4v7lgbs226d7w5dmrmi-ghc-binary-8.10.7" ] && [ "$p" != "/nix/store/467916mp56bgz4v7lgbs226d7w5dmrmi-ghc-binary-8.10.7" ]; then
            cp -f ←"$p/lib/ghc-binary-8.10.7/package.conf.d/"*.conf←→"$p/lib/ghc-8.10.7/package.conf.d/"*.conf→ $packageConfDir/
            continue
          fi
          
            if [ -d "$p/include" ]; then
              configureFlags+=" --extra-include-dirs=$p/include"
            fi
            if [ -d "$p/lib" ]; then
              configureFlags+=" --extra-lib-dirs=$p/lib"
            fi
          if [[ -d "$p/Library/Frameworks" ]]; then
            configureFlags+=" --extra-framework-dirs=$p/Library/Frameworks"
          fi
          done
          ghc-pkg --package-db="$packageConfDir" recache
          
          runHook postSetupCompilerEnvironment
      ''
    • Skipping environment comparison
  • The input derivation named `happy-1.20.0` differs
    • These two derivations have already been compared
  • The input derivation named `hscolour-1.24.4` differs
    - /nix/store/8sbyxf5xln4cxbpkk8shk1a06gm4af1n-hscolour-1.24.4.drv:{out}
    + /nix/store/7m449d61zjh3jz7i9s1cgky2d541dik5-hscolour-1.24.4.drv:{out}
    • The input derivation named `hscolour-1.24.4` differs
      - /nix/store/hqw5jk50jxiadf09w8s0y6y0jrxxl3k0-hscolour-1.24.4.drv:{out}
      + /nix/store/m4jc8ax7w6siz03wa7sxvfrwxm1ipzxy-hscolour-1.24.4.drv:{out}
      • The environments do not match:
          setupCompilerEnvironmentPhase=''
          NIX_BUILD_CORES=$(( NIX_BUILD_CORES < 16 ? NIX_BUILD_CORES : 16 ))
          runHook preSetupCompilerEnvironment
          
          echo "Build with /nix/store/467916mp56bgz4v7lgbs226d7w5dmrmi-ghc-binary-8.10.7."
          
          
          setupPackageConfDir="$TMPDIR/setup-package.conf.d"
          mkdir -p $setupPackageConfDir
          packageConfDir="$TMPDIR/package.conf.d"
          mkdir -p $packageConfDir
          
          setupCompileFlags="-package-db=$setupPackageConfDir -j$NIX_BUILD_CORES +RTS -A64M -RTS -threaded -rtsopts"
          configureFlags="--verbose --prefix=$out --libdir=\$prefix/lib/\$compiler --libsubdir=\$abi/\$libname ←--datadir=$data/share/ghc-binary-8.10.7←→--datadir=$data/share/ghc-8.10.7→  --with-gcc=$CC --package-db=$packageConfDir   --ghc-options=-j$NIX_BUILD_CORES +RTS -A64M -RTS  --disable-split-objs --disable-library-profiling  --disable-profiling --disable-shared --disable-coverage --enable-static --disable-executable-dynamic --disable-tests --disable-benchmarks --enable-library-vanilla --disable-library-for-ghci --ghc-option=-split-sections $configureFlags"
          for p in "${pkgsBuildBuild[@]}" "${pkgsBuildHost[@]}" "${pkgsBuildTarget[@]}"; do
            # If this dependency has a package database, then copy the contents of it,
          # unless it is one of our GHCs. These can appear in our dependencies when
          # we are doing native builds, and they have package databases in them, but
          # we do not want to copy them over.
          #
          # We don't need to, since those packages will be provided by the GHC when
          # we compile with it, and doing so can result in having multiple copies of
          # e.g. Cabal in the database with the same name and version, which is
          # ambiguous.
          if [ -d ←"$p/lib/ghc-binary-8.10.7/package.conf.d"←→"$p/lib/ghc-8.10.7/package.conf.d"→ ] && [ "$p" != "/nix/store/467916mp56bgz4v7lgbs226d7w5dmrmi-ghc-binary-8.10.7" ] && [ "$p" != "/nix/store/467916mp56bgz4v7lgbs226d7w5dmrmi-ghc-binary-8.10.7" ]; then
            cp -f ←"$p/lib/ghc-binary-8.10.7/package.conf.d/"*.conf←→"$p/lib/ghc-8.10.7/package.conf.d/"*.conf→ $setupPackageConfDir/
            continue
          fi
          
          done
          ghc-pkg --package-db="$setupPackageConfDir" recache
          for p in "${pkgsHostHost[@]}" "${pkgsHostTarget[@]}"; do
            # If this dependency has a package database, then copy the contents of it,
          # unless it is one of our GHCs. These can appear in our dependencies when
          # we are doing native builds, and they have package databases in them, but
          # we do not want to copy them over.
          #
          # We don't need to, since those packages will be provided by the GHC when
          # we compile with it, and doing so can result in having multiple copies of
          # e.g. Cabal in the database with the same name and version, which is
          # ambiguous.
          if [ -d ←"$p/lib/ghc-binary-8.10.7/package.conf.d"←→"$p/lib/ghc-8.10.7/package.conf.d"→ ] && [ "$p" != "/nix/store/467916mp56bgz4v7lgbs226d7w5dmrmi-ghc-binary-8.10.7" ] && [ "$p" != "/nix/store/467916mp56bgz4v7lgbs226d7w5dmrmi-ghc-binary-8.10.7" ]; then
            cp -f ←"$p/lib/ghc-binary-8.10.7/package.conf.d/"*.conf←→"$p/lib/ghc-8.10.7/package.conf.d/"*.conf→ $packageConfDir/
            continue
          fi
          
            if [ -d "$p/include" ]; then
              configureFlags+=" --extra-include-dirs=$p/include"
            fi
            if [ -d "$p/lib" ]; then
              configureFlags+=" --extra-lib-dirs=$p/lib"
            fi
          if [[ -d "$p/Library/Frameworks" ]]; then
            configureFlags+=" --extra-framework-dirs=$p/Library/Frameworks"
          fi
          done
          ghc-pkg --package-db="$packageConfDir" recache
          
          runHook postSetupCompilerEnvironment
      ''
    • Skipping environment comparison
  • Skipping environment comparison
• Skipping environment comparison

[sternenseemann]

cc @guibou This is hopefully the complete version of what you've attempted before, testing should confirm that though.

[sternenseemann]

Seems like the datadirs of packages are a bit iffy, but in the same way as before, would like to look into this as well though.

Edit: We should do it separately, since it would change behavior, it has the potential to break things. The other things we are changing were just broken before!