Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update dependencies in cabal files and remove unused packages #423

Merged
merged 7 commits into from
Feb 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/workflow.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ jobs:
- stack-lts-19.yaml
- stack-lts-20.yaml
- stack-lts-21.yaml
- stack-nightly.yaml
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v4
Expand Down
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/dist/
/dist-newstyle/
dist
dist-newstyle
.cabal-sandbox
cabal.sandbox.config
.stack-work
Expand Down
7 changes: 2 additions & 5 deletions H/H.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,10 @@ executable H
main-is: H.hs
other-modules: Paths_H
build-depends: base >= 4.6 && < 5
, bytestring >= 0.10 && <0.12
, bytestring >= 0.10 && <0.13
, cmdargs >= 0.10.5 && <0.11
, file-embed >= 0.0.7 && <0.1
, inline-r >= 0.9 && <1.1
, pretty >= 1.1 && <1.2
, process >= 1.2 && <1.7
, temporary >= 1.2.0.3 && <1.4
, vector >= 0.10 && <0.14
default-language: Haskell2010
ghc-options: -Wall -threaded
ghc-options: -Werror=unused-packages -Wall -threaded
7 changes: 3 additions & 4 deletions IHaskell/ihaskell-inline-r.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,16 @@ library
,inline-r >=0.6.0.1 && <1.11
,ihaskell >=0.10.2.2 && <0.12
,ihaskell-blaze >=0.3.0.1 && <0.4
,filepath >=1.4.2.1 && <1.5
,blaze-html >=0.9.1.2 && <0.10
,bytestring >=0.10.12.0 && <0.12
,bytestring >=0.10.12.0 && <0.13
,base64-bytestring >=1.1.0.0 && <1.3
,template-haskell >=2.16.0.0 && <2.21
,template-haskell >=2.16.0.0 && <2.22
,temporary >=1.2 && <1.4
other-extensions: TemplateHaskell
QuasiQuotes
hs-source-dirs: src
default-language: Haskell2010
ghc-options: -Wall
ghc-options: -Werror=unused-packages -Wall

source-repository head
type: git
Expand Down
62 changes: 35 additions & 27 deletions examples/HaskellR-examples.cabal
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
cabal-version: 2.2
name: HaskellR-examples
version: 0.1.0.0
license: AllRightsReserved
license: BSD-3-Clause
license-file: LICENSE
copyright: Copyright (c) 2013-2015 Amgen, Inc.
Copyright (c) 2015 Tweag I/O Limited.
build-type: Simple
Category: FFI
Synopsis: Examples bundled with the HaskellR project
description: This package is part of the HaskellR project.
cabal-version: >=1.10
extra-source-files:
nls/nls.H
nls2/nls2.H
Expand All @@ -17,47 +18,54 @@ source-repository head
location: git://github.com/tweag/HaskellR.git
subdir: examples

common common-config
default-language: Haskell2010
ghc-options: -Wall -threaded

common common-deps
build-depends:
inline-r,
base >= 4.6 && < 5,

executable fft
import:
common-config,
common-deps,
main-is: Main.hs
hs-source-dirs: fft
build-depends: inline-r
, base >= 4.6 && < 5
default-language: Haskell2010
ghc-options: -Wall -threaded

executable fib
import:
common-config,
common-deps,
main-is: Main.hs
hs-source-dirs: fib
other-modules: Fib
build-depends: inline-r
, base >= 4.6 && < 5
default-language: Haskell2010
ghc-options: -Wall -threaded

executable nls
import:
common-config,
common-deps,
main-is: Main.hs
hs-source-dirs: nls
build-depends: inline-r
, base >= 4.6 && < 5
, mwc-random >= 0.12 && <0.16
default-language: Haskell2010
ghc-options: -Wall -threaded
build-depends:
mwc-random >= 0.12 && <0.16,

executable nls2
import:
common-config,
common-deps,
main-is: Main.hs
hs-source-dirs: nls2
build-depends: inline-r
, base >= 4.6 && < 5
, mwc-random >= 0.12 && <0.16
default-language: Haskell2010
ghc-options: -Wall -threaded
build-depends:
mwc-random >= 0.12 && <0.16,

executable RelaxWithNM
import:
common-config,
common-deps,
main-is: RelaxWithNM.hs
build-depends: inline-r
, base >= 4.6 && < 5
, deepseq >=1.4.4.0 && <1.5
, integration >=0.2.1 && <0.3
, temporary >= 1.2.0.3 && <1.4
default-language: Haskell2010
ghc-options: -Wall -threaded
build-depends:
deepseq >=1.4.4.0 && <1.6,
integration >=0.2.1 && <0.3,
temporary >= 1.2.0.3 && <1.4,
28 changes: 28 additions & 0 deletions examples/LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
Copyright (c) 2013-2015 Amgen, Inc.
Copyright (c) 2015 Tweag I/O Limited.

All rights reserved.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
1. Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
3. The names of the author may not be used to endorse or promote
products derived from this software without specific prior written
permission.

THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
SUCH DAMAGE.
Loading
Loading