master...b81f8bd · stackage

git.iko.soy/stackage

on b81f8bd help sign in

2 files changed+28−26

since splitsnapshots

unifiedsplit

build-constraints.yaml+9−13 etc/commenter/src/lib.rs+19−13

build-constraints.yaml+9−13

@@ -1576,7 +1576,7 @@ packages:

15761576 - hasql

15771577 - hasql-optparse-applicative

15781578 - hasql-pool

1579− - hasql-th < 0 # 0.4.0.9 TH compile error

1579+ - hasql-th < 0 # 0.4.0.10 TH compile error

15801580 - hasql-transaction

15811581 - headed-megaparsec

15821582 - jsonifier

@@ -5204,18 +5204,18 @@ packages:

52045204 - boxes

52055205 - cassava

52065206 - charsetdetect-ae # #6326/closed

5207− - coercible-utils # 6271

5207+ - coercible-utils # #6271

52085208 - compiler-warnings # #6326/closed

52095209 - curl

52105210 - docopt # #6326/closed

52115211 - dynamic-state # #6326/closed

52125212 - first-class-patterns # #5965/closed

52135213 - ghc-trace-events # #6326/closed

5214− - hashing # 6271

5215− - hnix-store-core # 6271

5214+ - hashing # #6271

5215+ - hnix-store-core # #6271

52165216 - ilist # #5965/closed

52175217 - io-storage # #6326/closed

5218− - monadlist # 6271

5218+ - monadlist # #6271

52195219 - non-empty-sequence

52205220 - numeric-limits # #6326/closed

52215221 - oo-prototypes # #6326/closed

@@ -5223,7 +5223,7 @@ packages:

52235223 - opentelemetry-extra # #6326/closed

52245224 - opentelemetry-lightstep # #6326/closed

52255225 - opentelemetry-wai # #6326/closed

5226− - path # 6271

5226+ - path # #6271

52275227 - pattern-arrows

52285228 - planb-token-introspection # #6326/closed

52295229 - pointedlist # #6326/closed

@@ -5324,7 +5324,6 @@ packages:

53245324 - exinst < 0 # 0.8

53255325 - ftp-client-conduit < 0 # 0.5.0.5

53265326 - giphy-api < 0 # 0.7.0.0 https://github.com/passy/giphy-api/pull/19

5327− - groundhog-th < 0 # 0.11

53285327 - gluturtle < 0 # 0.0.58.1

53295328 - haskell-import-graph < 0 # 1.0.4

53305329 - haskell-spacegoo < 0 # 0.2.0.1

@@ -5387,7 +5386,6 @@ packages:

53875386 - tintin < 0 # 1.10.1

53885387 - turtle-options < 0 # 0.1.0.4

53895388 - type-assertions < 0 # 0.1.0.0

5390− - type-map < 0 # 0.1.6.0

53915389 - typecheck-plugin-nat-simple < 0 # 0.1.0.2

53925390 - ulid < 0 # 0.3.0.0

53935391 - uncertain < 0 # 0.3.1.0

@@ -5973,7 +5971,7 @@ packages:

59735971 - google-translate < 0 # tried google-translate-0.5, but its *library* does not support: http-client-0.7.9

59745972 - graphql-client < 0 # tried graphql-client-1.1.1, but its *executable* does not support: path-0.9.2

59755973 - groundhog-inspector < 0 # tried groundhog-inspector-0.11.0, but its *library* does not support: groundhog-0.12.0

5976− - groundhog-inspector < 0 # tried groundhog-inspector-0.11.0, but its *library* requires the disabled package: groundhog-th

5974+ - groundhog-inspector < 0 # tried groundhog-inspector-0.11.0, but its *library* does not support: groundhog-th-0.12

59775975 - groundhog-mysql < 0 # tried groundhog-mysql-0.12, but its *library* does not support: mysql-0.2.1

59785976 - grouped-list < 0 # tried grouped-list-0.2.2.1, but its *library* does not support: base-4.15.1.0

59795977 - gtk3 < 0 # tried gtk3-0.15.6, but its *library* does not support: Cabal-3.4.1.0

@@ -6042,8 +6040,8 @@ packages:

60426040 - haskell-tools-rewrite < 0 # tried haskell-tools-rewrite-1.1.1.0, but its *library* requires the disabled package: references

60436041 - haskey < 0 # tried haskey-0.3.1.0, but its *library* does not support: stm-containers-1.2

60446042 - haskey-mtl < 0 # tried haskey-mtl-0.3.1.0, but its *library* does not support: monad-control-1.0.3.1

6045− - haskoin-store < 0 # tried haskoin-store-0.64.10, but its *library* requires the disabled package: haskoin-node

6046− - haskoin-store < 0 # tried haskoin-store-0.64.10, but its *library* requires the disabled package: haskoin-store-data

6043+ - haskoin-store < 0 # tried haskoin-store-0.64.11, but its *library* requires the disabled package: haskoin-node

6044+ - haskoin-store < 0 # tried haskoin-store-0.64.11, but its *library* requires the disabled package: haskoin-store-data

60476045 - hasmin < 0 # tried hasmin-1.0.3, but its *executable* does not support: optparse-applicative-0.16.1.0

60486046 - hasmin < 0 # tried hasmin-1.0.3, but its *library* does not support: attoparsec-0.14.3

60496047 - haxl-amazonka < 0 # tried haxl-amazonka-0.1.1, but its *library* requires the disabled package: haxl

@@ -7441,7 +7439,6 @@ expected-test-failures:

74417439 - cpio-conduit # Test file not in tarball https://github.com/da-x/cpio-conduit/issues/1

74427440 - crypto-pubkey # https://github.com/vincenthz/hs-crypto-pubkey/issues/23

74437441 - doctest

7444− - doctest-discover # 0.1.0.9 https://github.com/karun012/doctest-discover/issues/22

74457442 - ghc-events # https://github.com/haskell/ghc-events/issues/70

74467443 - gitlab-haskell # https://github.com/commercialhaskell/stackage/issues/6088

74477444 - hspec-core # https://github.com/commercialhaskell/stackage/issues/6291

@@ -7696,7 +7693,6 @@ expected-benchmark-failures:

76967693 # Compilation failures

76977694 - OrderedBits # 0.0.2.0

76987695 - aeson-combinators # 0.0.5.0

7699− - cipher-blowfish # 0.0.11 https://github.com/vincenthz/hs-crypto-cipher/issues/46

77007696 - cmark-gfm # https://github.com/kivikakk/cmark-gfm-hs/issues/5

77017697 - cryptohash # 0.11.9 https://github.com/vincenthz/hs-cryptohash/pull/43

77027698 - incremental-parser # 0.5.0.2

etc/commenter/src/lib.rs+19−13

@@ -41,20 +41,20 @@ impl VersionTag {

4141

4242 fn version(&self) -> &str {

4343 match self {

44− VersionTag::Manual(s) => &s,

45− VersionTag::Auto(s) => &s,

44+ VersionTag::Manual(s) => s,

45+ VersionTag::Auto(s) => s,

4646 }

4747 }

4848}

4949

5050pub fn outdated() {

5151 let mut all: Vec<String> = vec![];

52− let disabled = handle(false, |_loc, lines| {

52+ let versioned = handle(false, |_loc, lines| {

5353 all.extend(lines);

5454 vec![]

5555 });

5656 let mut map: BTreeMap<String, VersionTag> = BTreeMap::new();

57− for DisabledPackage { package, version } in disabled {

57+ for VersionedPackage { package, version } in versioned {

5858 map.insert(package, VersionTag::Manual(version));

5959 }

6060 let mut support: BTreeMap<(String, String), BTreeSet<(String, String)>> = BTreeMap::new();

@@ -107,7 +107,7 @@ pub fn outdated() {

107107 let latest = latest_version(&package);

108108 if version != latest {

109109 let max = 3;

110− let dependents_stripped = dependents.len().checked_sub(max).unwrap_or(0);

110+ let dependents_stripped = dependents.len().saturating_sub(max);

111111 let dependents = dependents

112112 .into_iter()

113113 .take(max)

@@ -139,9 +139,11 @@ fn is_boot(package: &str) -> bool {

139139 "filepath",

140140 "deepseq",

141141 "ghc",

142+ "ghc-bignum",

142143 "ghc-boot",

143144 "ghc-boot-th",

144145 "ghc-prim",

146+ "ghc-lib-parser", // not a boot lib, but tied to the GHC version.

145147 "integer-gmp",

146148 "process",

147149 "stm",

@@ -175,34 +177,38 @@ enum State {

175177 Done,

176178}

177179

178−struct DisabledPackage {

180+struct VersionedPackage {

179181 package: String,

180182 version: String,

181183}

182184

183−fn parse_disabled_package(s: &str) -> Option<DisabledPackage> {

185+fn parse_versioned_package(s: &str) -> Option<VersionedPackage> {

184186 if let Some(caps) = regex!(r#"- *([^ ]+) < *0 *# *([\d.]+)"#).captures(s) {

185187 let package = caps.get(1).unwrap().as_str().to_owned();

186188 let version = caps.get(2).unwrap().as_str().to_owned();

187− Some(DisabledPackage { package, version })

189+ Some(VersionedPackage { package, version })

190+ } else if let Some(caps) = regex!(r#"- *([^ ]+) *# *([\d.]+)"#).captures(s) {

191+ let package = caps.get(1).unwrap().as_str().to_owned();

192+ let version = caps.get(2).unwrap().as_str().to_owned();

193+ Some(VersionedPackage { package, version })

188194 } else {

189195 None

190196 }

191197}

192198

193−fn handle<F>(write: bool, mut f: F) -> Vec<DisabledPackage>

199+fn handle<F>(write: bool, mut f: F) -> Vec<VersionedPackage>

194200where

195201 F: FnMut(Location, Vec<String>) -> Vec<String>,

196202{

197203 let path = "build-constraints.yaml";

198204 let mut new_lines: Vec<String> = vec![];

199− let mut disabled_packages: Vec<DisabledPackage> = vec![];

205+ let mut versioned_packages: Vec<VersionedPackage> = vec![];

200206

201207 let mut state = State::LookingForLibBounds;

202208 let mut buf = vec![];

203209 for line in read_lines(path).map(|s| s.unwrap()) {

204− if let Some(disabled_package) = parse_disabled_package(&line) {

205− disabled_packages.push(disabled_package);

210+ if let Some(versioned_package) = parse_versioned_package(&line) {

211+ versioned_packages.push(versioned_package);

206212 }

207213

208214 match state {

@@ -273,7 +279,7 @@ where

273279 file.flush().unwrap();

274280 }

275281

276− disabled_packages

282+ versioned_packages

277283}

278284

279285enum Location {