From 59a6891b8ba9604c94a8fa35839418a63c2511a2 Mon Sep 17 00:00:00 2001 From: Tissevert Date: Sun, 13 Feb 2022 18:51:52 +0100 Subject: [PATCH] * Fix test data missing from sdist archive * Bump dependencies versions * Add guix package for development --- CHANGELOG.md | 6 ++++++ SJW.cabal | 24 +++++++++++++++--------- SJW.scm | 35 +++++++++++++++++++++++++++++++++++ 3 files changed, 56 insertions(+), 9 deletions(-) create mode 100644 SJW.scm diff --git a/CHANGELOG.md b/CHANGELOG.md index 539b05f..2964df0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Revision history for SJW +## 0.1.2.4 -- 2022-02-13 + +* Fix test data missing from sdist archive +* Bump dependencies versions +* Add a guix package for development + ## 0.1.2.3 -- 2021-01-20 * Ensure compilation on Nix as far as 18.09 diff --git a/SJW.cabal b/SJW.cabal index 1b29d06..8b06664 100644 --- a/SJW.cabal +++ b/SJW.cabal @@ -1,18 +1,18 @@ -cabal-version: >=1.10 +cabal-version: 2.4 -- Initial package description 'SJW.cabal' generated by 'cabal init'. For -- further documentation, see http://haskell.org/cabal/users-guide/ name: SJW -version: 0.1.2.3 +version: 0.1.2.4 synopsis: The Simple Javascript Wrench description: - SJW is a very simple tool to pack several JS «modules» into a single script. + SJW is a very simple tool to pack several JS modules into a single script. It doesn't really do proper compilation work (yet) except resolving the modules dependencies and detecting import loops but it provides each module with an independent execution context in the resulting script. homepage: https://git.marvid.fr/Tissevert/SJW -- bug-reports: -license: BSD3 +license: BSD-3-Clause license-file: LICENSE author: Tissevert maintainer: tissevert+devel@marvid.fr @@ -20,6 +20,11 @@ maintainer: tissevert+devel@marvid.fr category: Web build-type: Simple extra-source-files: CHANGELOG.md + , test/data/**/*.js + +source-repository head + type: git + location: http://git.marvid.fr/Tissevert/SJW.git library exposed-modules: SJW @@ -29,15 +34,15 @@ library , SJW.Module.File , SJW.Module.Imports , SJW.Source - build-depends: attoparsec >= 0.13.2 && < 0.14 - , base >=4.9 && <4.15 + build-depends: attoparsec >= 0.13.2 && < 0.15 + , base >=4.9 && <4.16 , containers >= 0.5.0 && < 0.7 , directory >= 1.2.0 && < 1.4 , filepath >= 1.4.2 && < 1.5 , mtl >= 2.2.2 && < 2.3 , random >= 1.1 && < 1.3 - , text >= 1.2.3 && < 1.3 - , time >= 1.8.0 && < 1.12 + , text >= 1.2.3 && < 2.1 + , time >= 1.8.0 && < 1.14 , unix >= 2.7.2 && < 2.8 hs-source-dirs: src default-language: Haskell2010 @@ -46,10 +51,11 @@ library executable sjw main-is: src/Main.hs other-modules: Paths_SJW + autogen-modules: Paths_SJW -- other-extensions: build-depends: attoparsec , base - , optparse-applicative >= 0.14 && < 0.17 + , optparse-applicative >= 0.14 && < 0.18 , SJW , text default-language: Haskell2010 diff --git a/SJW.scm b/SJW.scm new file mode 100644 index 0000000..cbc975d --- /dev/null +++ b/SJW.scm @@ -0,0 +1,35 @@ +(use-modules (guix build-system haskell) + (guix download) + (guix gexp) + (guix git-download) + (guix licenses) + (guix packages) + (gnu packages haskell-xyz)) + +(let + ((%source-dir (dirname (current-filename)))) + (package + (name "SJW") + (version "devel") + (source + (local-file %source-dir + #:recursive? #t + #:select? (git-predicate %source-dir))) + (build-system haskell-build-system) + (inputs + (list ghc-attoparsec + ghc-random + ghc-optparse-applicative)) + (native-search-paths + (list + (search-path-specification (variable "SJW_PACKAGE_DB") + (files '("lib/SJW"))))) + (home-page "https://git.marvid.fr/Tissevert/SJW") + (synopsis "The Simple Javascript Wrench") + (description + "SJW is a very simple tool to pack several JS modules into a single +script. It doesn't really do proper compilation work (yet) except +resolving the modules dependencies and detecting import loops but it +provides each module with an independent execution context in the +resulting script.") + (license bsd-3)))