Skip to content

Commit fa46002

Browse files
committed
move base dependency to common stanza
1 parent 3c229a2 commit fa46002

File tree

1 file changed

+5
-29
lines changed

1 file changed

+5
-29
lines changed

toysolver.cabal

+5-29
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,9 @@ Common common-options
124124
Default-Language: Haskell2010
125125
GHC-Options: -rtsopts
126126
-- GHC-Prof-Options: -auto-all
127+
Build-Depends:
128+
-- GHC >=9.2 && <9.13
129+
base >=4.16 && <4.22
127130

128131
Common exe-options
129132
Import: common-options
@@ -140,8 +143,6 @@ Library
140143
Build-Depends:
141144
aeson >=1.4.2.0 && <2.3,
142145
array >=0.5,
143-
-- GHC >=9.2 && <9.13
144-
base >=4.16 && <4.22,
145146
bytestring >=0.9.2.1 && <0.13,
146147
bytestring-builder,
147148
bytestring-encoding >=0.1.1.0,
@@ -397,7 +398,6 @@ Executable toysolver
397398
HS-Source-Dirs: app
398399
Build-Depends:
399400
array,
400-
base >=4.16 && <4.22,
401401
containers,
402402
data-default-class,
403403
filepath,
@@ -416,7 +416,6 @@ Executable toysat
416416
HS-Source-Dirs: app/toysat
417417
Build-Depends:
418418
array,
419-
base >=4.16 && <4.22,
420419
bytestring,
421420
containers,
422421
clock,
@@ -439,6 +438,7 @@ Executable toysat
439438
CPP-Options: "-DWITH_ZLIB"
440439

441440
Foreign-Library toysat-ipasir
441+
import: common-options
442442
type: native-shared
443443
if !flag(BuildForeignLibraries)
444444
buildable: False
@@ -448,7 +448,6 @@ Foreign-Library toysat-ipasir
448448
if os(Linux)
449449
ld-options: -Wl,--version-script=app/toysat-ipasir/ipasir.map
450450
build-depends:
451-
base >=4.16 && <4.22,
452451
containers,
453452
toysolver
454453
hs-source-dirs: app/toysat-ipasir
@@ -475,7 +474,6 @@ Executable toysmt
475474
Smtlib.Syntax.Syntax,
476475
Smtlib.Syntax.ShowSL
477476
Build-Depends:
478-
base >=4.16 && <4.22,
479477
containers,
480478
-- TODO: remove intern dependency
481479
intern,
@@ -496,7 +494,6 @@ Executable toyqbf
496494
Main-is: toyqbf.hs
497495
HS-Source-Dirs: app
498496
Build-Depends:
499-
base >=4.16 && <4.22,
500497
containers,
501498
data-default-class,
502499
optparse-applicative,
@@ -511,8 +508,7 @@ Executable toyfmf
511508
HS-Source-Dirs: app
512509
If flag(BuildToyFMF)
513510
Build-Depends:
514-
base >=4.16 && <4.22,
515-
containers,
511+
containers,
516512
intern,
517513
logic-TPTP >=0.4.6.0 && <0.7,
518514
optparse-applicative,
@@ -527,7 +523,6 @@ Executable toyconvert
527523
HS-Source-Dirs: app
528524
Build-Depends:
529525
aeson,
530-
base >=4.16 && <4.22,
531526
bytestring,
532527
bytestring-builder,
533528
containers,
@@ -560,7 +555,6 @@ Executable sudoku
560555
HS-Source-Dirs: samples/programs/sudoku
561556
Build-Depends:
562557
array,
563-
base >=4.16 && <4.22,
564558
toysolver
565559

566560
Executable nonogram
@@ -571,7 +565,6 @@ Executable nonogram
571565
HS-Source-Dirs: samples/programs/nonogram
572566
Build-Depends:
573567
array,
574-
base >=4.16 && <4.22,
575568
containers,
576569
toysolver
577570

@@ -583,7 +576,6 @@ Executable nqueens
583576
HS-Source-Dirs: samples/programs/nqueens
584577
Build-Depends:
585578
array,
586-
base >=4.16 && <4.22,
587579
toysolver
588580

589581
Executable numberlink
@@ -594,7 +586,6 @@ Executable numberlink
594586
HS-Source-Dirs: samples/programs/numberlink
595587
Build-Depends:
596588
array,
597-
base >=4.16 && <4.22,
598589
bytestring,
599590
containers,
600591
data-default-class,
@@ -609,7 +600,6 @@ Executable knapsack
609600
Main-is: knapsack.hs
610601
HS-Source-Dirs: samples/programs/knapsack
611602
Build-Depends:
612-
base >=4.16 && <4.22,
613603
toysolver
614604

615605
Executable assign
@@ -620,7 +610,6 @@ Executable assign
620610
HS-Source-Dirs: samples/programs/assign
621611
Build-Depends:
622612
attoparsec,
623-
base >=4.16 && <4.22,
624613
bytestring,
625614
containers,
626615
toysolver,
@@ -633,7 +622,6 @@ Executable shortest-path
633622
Main-is: shortest-path.hs
634623
HS-Source-Dirs: samples/programs/shortest-path
635624
Build-Depends:
636-
base >=4.16 && <4.22,
637625
bytestring,
638626
containers,
639627
unordered-containers,
@@ -646,7 +634,6 @@ Executable htc
646634
Main-is: htc.hs
647635
HS-Source-Dirs: samples/programs/htc
648636
Build-Depends:
649-
base >=4.16 && <4.22,
650637
containers,
651638
toysolver
652639

@@ -657,7 +644,6 @@ Executable svm2lp
657644
Main-is: svm2lp.hs
658645
HS-Source-Dirs: samples/programs/svm2lp
659646
Build-Depends:
660-
base >=4.16 && <4.22,
661647
containers,
662648
data-default-class,
663649
MIP,
@@ -673,7 +659,6 @@ Executable survey-propagation
673659
Main-is: survey-propagation.hs
674660
HS-Source-Dirs: samples/programs/survey-propagation
675661
Build-Depends:
676-
base >=4.16 && <4.22,
677662
data-default-class,
678663
toysolver
679664
GHC-Options: -rtsopts
@@ -685,7 +670,6 @@ Executable probsat
685670
Main-is: probsat.hs
686671
HS-Source-Dirs: samples/programs/probsat
687672
Build-Depends:
688-
base >=4.16 && <4.22,
689673
clock,
690674
data-default-class,
691675
mwc-random,
@@ -702,7 +686,6 @@ Executable pigeonhole
702686
Main-is: pigeonhole.hs
703687
HS-Source-Dirs: app
704688
Build-Depends:
705-
base >=4.16 && <4.22,
706689
bytestring,
707690
containers,
708691
pseudo-boolean,
@@ -716,7 +699,6 @@ Executable maxsatverify
716699
HS-Source-Dirs: app
717700
Build-Depends:
718701
array,
719-
base >=4.16 && <4.22,
720702
toysolver
721703

722704
Executable pbverify
@@ -727,7 +709,6 @@ Executable pbverify
727709
HS-Source-Dirs: app
728710
Build-Depends:
729711
array,
730-
base >=4.16 && <4.22,
731712
pseudo-boolean,
732713
toysolver
733714

@@ -739,7 +720,6 @@ Test-suite TestPolynomial
739720
HS-Source-Dirs: test
740721
Main-is: TestPolynomial.hs
741722
Build-depends:
742-
base >=4.16 && <4.22,
743723
containers,
744724
data-interval,
745725
finite-field >=0.7.0 && <1.0.0,
@@ -803,7 +783,6 @@ Test-suite TestSuite
803783
Build-depends:
804784
aeson,
805785
array,
806-
base >=4.16 && <4.22,
807786
bytestring,
808787
bytestring-builder,
809788
containers,
@@ -850,7 +829,6 @@ Benchmark BenchmarkSATLIB
850829
main-is: BenchmarkSATLIB.hs
851830
build-depends:
852831
array,
853-
base >=4.16 && <4.22,
854832
criterion >=1.0 && <1.7,
855833
data-default-class,
856834
toysolver
@@ -861,7 +839,6 @@ Benchmark BenchmarkKnapsack
861839
hs-source-dirs: benchmarks
862840
main-is: BenchmarkKnapsack.hs
863841
build-depends:
864-
base >=4.16 && <4.22,
865842
criterion >=1.0 && <1.7,
866843
toysolver
867844

@@ -871,7 +848,6 @@ Benchmark BenchmarkSubsetSum
871848
hs-source-dirs: benchmarks
872849
main-is: BenchmarkSubsetSum.hs
873850
build-depends:
874-
base >=4.16 && <4.22,
875851
criterion >=1.0 && <1.7,
876852
toysolver,
877853
vector

0 commit comments

Comments
 (0)