Skip to content
Snippets Groups Projects
This project is mirrored from https://github.com/haskell/Cabal.git. Pull mirroring updated .
  1. May 06, 2024
  2. May 05, 2024
  3. May 01, 2024
    • mergify[bot]'s avatar
      Merge pull request #9961 from haskell/mergify/bp/3.12/pr-9950 · aa968f81
      mergify[bot] authored
      Reinstate 'initialBuildSteps' function (backport #9950)
      aa968f81
    • sheaf's avatar
      Reinstate 'initialBuildSteps' function · 14d9bedf
      sheaf authored
      This patch reinstates the 'initialBuildSteps' function, as it is
      used by stack in its implementation of the multi-repl feature.
      
      A deprecation warning has been added to that function: calling it does
      not suffice to prepare the sources for a package, as there are other
      steps that one might also need to perform:
      
        - running pre-processors (such as alex/happy)
        - running pre-build hooks or custom logic (in build-type: Hooks
          or build-type: Custom or Configure)
      
      Consumers wanting to prepare the sources of a package, e.g. in order to
      launch a REPL session, are advised to run
      `Setup repl --repl-multi-file=<fn>` instead.
      
      Fixes #9856
      
      (cherry picked from commit dd74e921)
      14d9bedf
    • mergify[bot]'s avatar
      CI: stop validating GHC 7 (backport #9886) (#9957) (#9957) · 815b141e
      mergify[bot] authored
      
      3.12 changelog fixup (#9922)
      
      * Incorporate Brandon’s suggestions
      
      See #9920.
      
      * Incorporate Artem’s suggestions
      
      See #9920.
      
      * Do not repeat yourself
      
      * Fix release notes grammar (#9924)
      
      * Fix release notes grammar
      
      See #9920.
      
      * Fix whitespace
      
      * Support GHC 9.12
      
      (cherry picked from commit da6bdefd)
      
      * Fix changelog/readme (backport #9935) (#9936)
      
      * Fix changelog/readme
      
      (cherry picked from commit ea0f4640)
      
      * Remove previous release date
      
      ---------
      
      Co-authored-by: default avatarFrancesco Ariis <fa-ml@ariis.it>
      
      * Tell zlib not to use pkg-config in GitLab CI.
      
      (cherry picked from commit 62c74fe1)
      
      * Revert "Mark ForeignLibs test as broken with ghc-8.4.4"
      
      This reverts commit a90d44ff.
      
      (cherry picked from commit d0a690bd)
      
      * CI: drop validation of GHC 7
      
      Changes:
      - bump GHC_FOR_RELEASE to 9.4.8
      - bump action versions
      - uniform quoting style
      - satisfy actionlint
      - fix order: setup Haskell before cache restore (uses setup.haskell-outputs)
      - use `--ignore-project` in `cabal install hackage-repo-tool`
      - use GHC_FOR_RELEASE also in validate-old-ghcs
      - closes #8858: deleted comment
      - closes #9858 by dropping container and using ghcup to setup ghcs
      
      GHCs that do not install on ubuntu-22.04 with GHCup are dropped, meaning we only keep GHC 8.0.2 and up.
      
      (cherry picked from commit 29dc53c3)
      
      # Conflicts:
      #	.github/workflows/validate.yml
      
      * fix validate.yml conflicts
      
      How is this backport conflicting with _itself_?
      
      * copy an import list from #9551
      
      because `System.Process.Internals` just (like, within the past
      hour or so) started exporting a name we are using.
      
      * CI: force MacOS jobs to use Intel runners (macos-13) (backport #9949) (#9956)
      
      * CI: force MacOS jobs to use Intel runners (`macos-13`)
      
      GitHub just switched macos-latest to the ARM chips (now alisasing
      `macos-14`), and it brings a bunch of problems.
      
      - First of all, GHC's 8.8 and 8.6 don't exist there.
      - ghcup and llvm are unavailable
      
      For the time being, lets stay on the previous version of the runner.
      
      (cherry picked from commit d36e0d09)
      
      * CI: GitHub MacOS runners lost ghcup since 2024-04-27, so use haskell-action/setup instead
      
      (cherry picked from commit 082d9520)
      
      * fixup! more compat with new macos runners
      
      (cherry picked from commit 326a1f60)
      
      * !fixup resolve conflicts
      
      * copy an import list from #9551
      
      because `System.Process.Internals` just (like, within the past
      hour or so) started exporting a name we are using.
      
      ---------
      
      Co-authored-by: default avatarArtem Pelenitsyn <a.pelenitsyn@gmail.com>
      Co-authored-by: Brandon S. Allbery's avatarbrandon s allbery kf8nh <allbery.b@gmail.com>
      
      * Merge branch '3.12' into mergify/bp/3.12/pr-9886
      
      * Update validate.yml
      
      github nicely decided to ~revert~ the OS X validate fix when I rebased on top of it.
      
      * make validate.yml consistent with master
      
      Co-authored-by: default avatarMikolaj <281893+Mikolaj@users.noreply.github.com>
      Co-authored-by: default avatarmergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
      815b141e
    • mergify[bot]'s avatar
      Merge pull request #9895 from haskell/mergify/bp/3.12/pr-9705 · 31eb97a6
      mergify[bot] authored
      Add a warning when an env file is created (backport #9705)
      31eb97a6
    • mergify[bot]'s avatar
      4852cf0f
    • mergify[bot]'s avatar
      Merge pull request #9907 from haskell/mergify/bp/3.12/pr-9851 · 017ed010
      mergify[bot] authored
      Update cabal-install to allow time 1.14 (backport #9851)
      017ed010
    • Tom Smeding's avatar
      Add a warning when an env file is created (#9705) · 5b89d825
      Tom Smeding authored
      * Add a warning when an env file is created
      
      https://github.com/haskell/cabal/issues/6481#issuecomment-1934909998
      
      * Formatting
      
      * Improve wording of warning message
      
      * Only show warning if --package-env not given
      
      * Improve message and its formatting
      
      * Formatting
      
      (cherry picked from commit 00ce0249)
      5b89d825
    • Brandon S. Allbery's avatar
      Update cabal-install to allow time 1.14 · 2334372c
      Brandon S. Allbery authored
      Note that #9848 covers Cabal and Cabal-syntax already.
      
      (cherry picked from commit 65842cbd)
      2334372c
    • mergify[bot]'s avatar
      Merge pull request #9910 from haskell/mergify/bp/3.12/pr-9896 · fdfa4f07
      mergify[bot] authored
      update idna per dependabot / CVE-2024-3651 (backport #9896)
      fdfa4f07
    • Brandon S. Allbery's avatar
      update idna per dependabot / CVE-2024-3651 · e144a430
      Brandon S. Allbery authored
      (cherry picked from commit 385bb147)
      e144a430
  4. Apr 30, 2024
  5. Apr 29, 2024
    • mergify[bot]'s avatar
      CI: force MacOS jobs to use Intel runners (macos-13) (backport #9949) (#9956) · d871c1e1
      mergify[bot] authored
      
      * CI: force MacOS jobs to use Intel runners (`macos-13`)
      
      GitHub just switched macos-latest to the ARM chips (now alisasing
      `macos-14`), and it brings a bunch of problems.
      
      - First of all, GHC's 8.8 and 8.6 don't exist there.
      - ghcup and llvm are unavailable
      
      For the time being, lets stay on the previous version of the runner.
      
      (cherry picked from commit d36e0d09)
      
      # Conflicts:
      #	.github/workflows/validate.yml
      
      * CI: GitHub MacOS runners lost ghcup since 2024-04-27, so use haskell-action/setup instead
      
      (cherry picked from commit 082d9520)
      
      * fixup! more compat with new macos runners
      
      (cherry picked from commit 326a1f60)
      
      * !fixup resolve conflicts
      
      * copy an import list from #9551
      
      because `System.Process.Internals` just (like, within the past
      hour or so) started exporting a name we are using.
      
      ---------
      
      Co-authored-by: default avatarArtem Pelenitsyn <a.pelenitsyn@gmail.com>
      Co-authored-by: Brandon S. Allbery's avatarbrandon s allbery kf8nh <allbery.b@gmail.com>
      d871c1e1
  6. Apr 26, 2024
  7. Apr 25, 2024
  8. Apr 24, 2024
  9. Apr 23, 2024
  10. Apr 22, 2024
  11. Apr 18, 2024
    • f-a's avatar
      3.12 changelogs updated (#9908) · fd82dbe7
      f-a authored
      * Update changelog for 3.12
      
      (and for future WIP 3.12.1.0 cabal-install)
      
      * Remove changelog.d files
      fd82dbe7
  12. Apr 16, 2024
    • mergify[bot]'s avatar
      Merge pull request #9898 from haskell/mergify/bp/3.12/pr-9865 · 983fdcd4
      mergify[bot] authored
      GitLab CI: Shake up available platforms (backport #9865)
      983fdcd4
    • Bryan R's avatar
      Rework Darwin jobs · cb290f1b
      Bryan R authored
      * Use `arch` explicitly in both jobs. I don't know why x86_64 is the
        default, and I don't like it.
      
      * Stop using brew. This means a toolchain needs to already be installed
        where CI is run. This is the case today, although it's a bit fragile
        and I'll probably revisit it.
      
      * Use a matrix build to clean up the yml.
      
      * Use GHC 9.8.2 to work around GHC#24050
      
      (cherry picked from commit 1f60a977)
      cb290f1b
    • Bryan R's avatar
      Update ci-images pin and bootstrap versions · 155541dc
      Bryan R authored
      (cherry picked from commit 50c0c0f8)
      155541dc
    • Bryan R's avatar
      Only use ghcup where needed · 5e6ad862
      Bryan R authored
      (cherry picked from commit 6b6c6842)
      5e6ad862
    • Bryan R's avatar
      Simplify job names · 7cd0615f
      Bryan R authored
      (cherry picked from commit 3792f658)
      7cd0615f
    • mergify[bot]'s avatar
      Merge pull request #9893 from haskell/mergify/bp/3.12/pr-9583 · b6c1ed6d
      mergify[bot] authored
      Redesign 'cabal path' command to account for projects (backport #9583)
      b6c1ed6d
    • fendor's avatar
      Redesign 'cabal path' command to account for projects (#9583) · 354224c4
      fendor authored
      
      * Redesign 'cabal path' command to account for projects
      
      Previously, `cabal path` was only able to query from the global
      configuration file, e.g., `~/.cabal/config` or the XDG equivalent.
      Adding support for cabal project is a huge boost to usability.
      
      We take the foundations and turn them into `cabal v2-path` which takes
      project configuration, such as `cabal.project` into account.
      Note, the command is still named `cabal path`, but for the sake of
      disambiguation, we refer to this new iteration of the command as `cabal
      v2-path`.
      
      In addition, we add support for multiple output formats, such as
      key-value pairs and json.
      
      The key-value pair output prints a line for each queried key and its
      respective value:
      
          key1: value2
          key2: value2
      
      If only a single key is queried, we print only the
      value, for example:
      
          value1
      
      The json output format is versioned by the cabal-install version which
      is part of the json object.
      Thus, all result objects contain at least the key "cabal-install-version".
      
      We expand the `cabal v2-path` to also produce information of the
      compiler that is going to be used in a `cabal build` or `cabal repl` invocation.
      To do that, we rebuild the install plan and query for the configured
      compiler program.
      This is helpful for downstream tools, such as HLS, to figure out the GHC
      version required to compile a project with.
      
      We also add an exhaustive test suite for 'cabal path' cmd
      
      We test that each query honours cabal.project files, cli parameters, and
      is composable with the other query flags.
      
      We extend the test output normalisers for ghc compiler location and
      cabal-install version, as the 'cabal path' command outputs the exact ghc
      and ghc-pkg location. In addition, the json output format is versioned
      on the cabal-install version.
      
      Currently, we query the cabal-install version on each test normalisation
      run. This might be unnecessary expensive, and could be avoided by
      introducing a 'cabalProgram' that specifies how the program version can
      be found. This way, we can cache the version query.
      
      Add '--cache-home' flag thats shows the cabal's cache root
      
      Rename '--cache-dir' to the more correct '--remote-repo-dir'.
      
      * Update 'cabal path' documentation
      
      * Add changelog.d entry
      
      ---------
      
      Co-authored-by: default avatarmergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
      (cherry picked from commit 4a8a7c5d)
      354224c4
    • mergify[bot]'s avatar
      Merge pull request #9894 from haskell/mergify/bp/3.12/pr-9882 · bc0fb925
      mergify[bot] authored
      Update setupMinCabalVersionConstraint for GHC 9.10 (backport #9882)
      bc0fb925
    • f-a's avatar
      Update setupMinCabalVersionConstraint · 192fa5a7
      f-a authored
      (cherry picked from commit ecb174da)
      192fa5a7
  13. Apr 10, 2024
Loading