diff --git a/.gitignore b/.gitignore --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,2 @@ # Stack uses this directory as scratch space. /.stack-work/ - -# Stack generates the Cabal file from `package.yaml` through hpack. -/*.cabal diff --git a/CHANGELOG.md b/CHANGELOG.md --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,12 @@ +2.8 (2023-01-28) + + * Fix for change to the Cabal Distribution API + * Switched from hpack to modern cabal + * Moved copyright date up to 2023 + + 2.7 (2021-12-01) - * Minor changes for some hlint suggestions * Changed how default prefix is constructed * Turned off stdout/stderr buffering * Support projects that build with either cabal or stack @@ -12,6 +18,7 @@ * Now using newtype wrappers for all Options fields * Added more newtype wrappers around many data types * Applied hlint suggestions + * Moved stack resolver up to lts-18.18 2.6 (2020-01-12) diff --git a/LICENSE b/LICENSE --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2016-2020, Dino Morelli +Copyright (c) 2016-2023, Dino Morelli Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted, provided diff --git a/Setup.hs b/Setup.hs deleted file mode 100644 --- a/Setup.hs +++ /dev/null @@ -1,2 +0,0 @@ -import Distribution.Simple -main = defaultMain diff --git a/hsinstall.cabal b/hsinstall.cabal --- a/hsinstall.cabal +++ b/hsinstall.cabal @@ -1,53 +1,84 @@ -cabal-version: 1.12 - --- This file has been generated from package.yaml by hpack version 0.34.4. --- --- see: https://github.com/sol/hpack +cabal-version: 2.2 -name: hsinstall -version: 2.7 -synopsis: Install Haskell software -description: This is a tool for deploying software projects into directory structures suitable for installation on a system. It builds upon the `stack install` command and adds more features. It's also a tool for easier AppImage creation. -category: Utility -homepage: https://github.com/dino-/hsinstall#readme -bug-reports: https://github.com/dino-/hsinstall/issues -author: Dino Morelli -maintainer: Dino Morelli -copyright: 2016-2020 Dino Morelli -license: ISC -license-file: LICENSE -build-type: Simple +name: hsinstall +version: 2.8 +synopsis: Install Haskell software +description: This is a tool for deploying software projects into directory structures suitable for installation on a system. It builds upon the `stack install` command and adds more features. It's also a tool for easier AppImage creation. +category: Utility +homepage: https://github.com/dino-/hsinstall#readme +bug-reports: https://github.com/dino-/hsinstall/issues +author: Dino Morelli +maintainer: Dino Morelli +copyright: 2016-2023 Dino Morelli +license: ISC +license-file: LICENSE +build-type: Simple extra-source-files: - CHANGELOG.md - doc/hcar/hsinstall.tex - .gitignore - hsinstall/share/applications/hsinstall.desktop - hsinstall/share/hsinstall/resources/unix-terminal.svg - hsinstall/share/icons/hicolor/scalable/apps/hsinstall.svg - package.yaml - README.md - stack.yaml - stack.yaml.lock + CHANGELOG.md + doc/hcar/hsinstall.tex + .gitignore + hsinstall/share/applications/hsinstall.desktop + hsinstall/share/hsinstall/resources/unix-terminal.svg + hsinstall/share/icons/hicolor/scalable/apps/hsinstall.svg + README.md + stack.yaml + stack.yaml.lock source-repository head type: git location: https://github.com/dino-/hsinstall +common lang + default-language: Haskell2010 + default-extensions: + BangPatterns + DeriveFoldable + DeriveFunctor + DeriveGeneric + DeriveLift + DeriveTraversable + EmptyCase + FlexibleContexts + FlexibleInstances + GeneralizedNewtypeDeriving + InstanceSigs + KindSignatures + LambdaCase + MultiParamTypeClasses + MultiWayIf + NamedFieldPuns + NumericUnderscores + OverloadedStrings + ScopedTypeVariables + StandaloneDeriving + TupleSections + build-depends: + directory + , filepath + ghc-options: + -fwarn-tabs + -Wall + -Wcompat + -Wincomplete-record-updates + -Wincomplete-uni-patterns + -Wpartial-fields + -Wredundant-constraints + autogen-modules: + Paths_hsinstall + library + import: lang exposed-modules: HSInstall.Paths other-modules: Paths_hsinstall hs-source-dirs: src/lib - ghc-options: -fwarn-tabs -Wall -Wcompat -Wincomplete-record-updates -Wincomplete-uni-patterns -Wredundant-constraints build-depends: base >=4.8 && <5.0 - , directory - , filepath - default-language: Haskell2010 executable hsinstall + import: lang main-is: hsinstall.hs other-modules: HSInstall.AppImage @@ -60,14 +91,11 @@ Paths_hsinstall hs-source-dirs: src/app - ghc-options: -fwarn-tabs -Wall -Wcompat -Wincomplete-record-updates -Wincomplete-uni-patterns -Wredundant-constraints build-depends: - Cabal - , ansi-wl-pprint + ansi-wl-pprint , base >=4.8 && <5.0 - , directory + , Cabal , exceptions - , filepath , heredoc , hsinstall , newtype-generics @@ -75,4 +103,3 @@ , process , safe-exceptions , transformers - default-language: Haskell2010 diff --git a/package.yaml b/package.yaml deleted file mode 100644 --- a/package.yaml +++ /dev/null @@ -1,54 +0,0 @@ -name: hsinstall -version: '2.7' -synopsis: Install Haskell software -description: This is a tool for deploying software projects into directory structures suitable for installation on a system. It builds upon the `stack install` command and adds more features. It's also a tool for easier AppImage creation. -license: ISC -author: Dino Morelli -maintainer: Dino Morelli -copyright: 2016-2020 Dino Morelli -category: Utility -extra-source-files: -- CHANGELOG.md -- doc/hcar/hsinstall.tex -- .gitignore -- hsinstall/share/applications/hsinstall.desktop -- hsinstall/share/hsinstall/resources/unix-terminal.svg -- hsinstall/share/icons/hicolor/scalable/apps/hsinstall.svg -- package.yaml -- README.md -- stack.yaml -- stack.yaml.lock - -github: dino-/hsinstall - -ghc-options: -- -fwarn-tabs -- -Wall -- -Wcompat -- -Wincomplete-record-updates -- -Wincomplete-uni-patterns -- -Wredundant-constraints - -dependencies: -- base >= 4.8 && < 5.0 -- directory -- filepath - -library: - source-dirs: src/lib - -executables: - hsinstall: - source-dirs: src/app - main: hsinstall.hs - dependencies: - - ansi-wl-pprint - - Cabal - - exceptions - - heredoc - - hsinstall - - newtype-generics - - optparse-applicative - - process - - safe-exceptions - - transformers diff --git a/src/app/HSInstall/DeploymentInfo.hs b/src/app/HSInstall/DeploymentInfo.hs --- a/src/app/HSInstall/DeploymentInfo.hs +++ b/src/app/HSInstall/DeploymentInfo.hs @@ -26,9 +26,9 @@ ( GenericPackageDescription (packageDescription) , PackageDescription (package) ) -import Distribution.PackageDescription.Parsec - ( readGenericPackageDescription ) import Distribution.Pretty ( prettyShow ) +import Distribution.Simple.PackageDescription + ( readGenericPackageDescription ) import Distribution.Types.PackageName ( unPackageName ) import Distribution.Types.Version ( Version ) import Distribution.Verbosity ( normal ) diff --git a/stack.yaml b/stack.yaml --- a/stack.yaml +++ b/stack.yaml @@ -1,4 +1,4 @@ -resolver: lts-18.18 +resolver: nightly-2023-01-28 packages: - '.' diff --git a/stack.yaml.lock b/stack.yaml.lock --- a/stack.yaml.lock +++ b/stack.yaml.lock @@ -6,7 +6,7 @@ packages: [] snapshots: - completed: - size: 586296 - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/18/18.yaml - sha256: 63539429076b7ebbab6daa7656cfb079393bf644971156dc349d7c0453694ac2 - original: lts-18.18 + sha256: bd7b6edef8b9ad5efdf118923b9a530b9b8c2236af1b92abc3e5d9416fc1d452 + size: 595944 + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/nightly/2023/1/28.yaml + original: nightly-2023-01-28