diff options
author | Stéphan Kochen <git@stephank.nl> | 2023-04-01 21:43:12 +0200 |
---|---|---|
committer | Stéphan Kochen <git@stephank.nl> | 2023-04-30 15:03:20 +0200 |
commit | f85d12198f4a4201d763cc481ccaf7025f0ec6ff (patch) | |
tree | 434cd0d8c08d00f9dc897536d0c743b0fc8735fe /pkgs/development/compilers/swift/swift-docc | |
parent | 88be91f08c8fcf6a5912b83dea31fcee090e0dab (diff) |
swift: 5.7.3 -> 5.8
Diffstat (limited to 'pkgs/development/compilers/swift/swift-docc')
3 files changed, 25 insertions, 37 deletions
diff --git a/pkgs/development/compilers/swift/swift-docc/default.nix b/pkgs/development/compilers/swift/swift-docc/default.nix index f85512f840711..1c8cf4f3736f4 100644 --- a/pkgs/development/compilers/swift/swift-docc/default.nix +++ b/pkgs/development/compilers/swift/swift-docc/default.nix @@ -28,6 +28,12 @@ stdenv.mkDerivation { configurePhase = generated.configure; + # We only install the docc binary, so don't need the other products. + # This works around a failure building generate-symbol-graph: + # Sources/generate-symbol-graph/main.swift:13:18: error: module 'SwiftDocC' was not compiled for testing + # TODO: Figure out the cause. It doesn't seem to happen outside Nixpkgs. + swiftpmFlags = "--product docc"; + # TODO: Tests depend on indexstore-db being provided by an existing Swift # toolchain. (ie. looks for `../lib/libIndexStore.so` relative to swiftc. #doCheck = true; diff --git a/pkgs/development/compilers/swift/swift-docc/generated/default.nix b/pkgs/development/compilers/swift/swift-docc/generated/default.nix index bcd873a44f89d..47822ca40bb48 100644 --- a/pkgs/development/compilers/swift/swift-docc/generated/default.nix +++ b/pkgs/development/compilers/swift/swift-docc/generated/default.nix @@ -2,14 +2,13 @@ { workspaceStateFile = ./workspace-state.json; hashes = { - "swift-argument-parser" = "070gip241dgn3d0nxgwxva4vp6kbnf11g01q5yaq6kmflcmz58f2"; - "swift-cmark" = "0xfchdgls3070z16in8ks69y8fpiajmyk7lmp5h7ym7164isa6bb"; - "swift-crypto" = "0h054rq14jyg94aiymmp37vqz60a13dlczp5g09pln724j4ypv92"; + "swift-argument-parser" = "1jph9w7lk9nr20fsv2c8p4hisx3dda817fh7pybd0r0j1jwa9nmw"; + "swift-cmark" = "1qswlh6j9mlfq8qj7xfqspla7w7rrzvplgcs4mgllgi012yfgwnp"; + "swift-crypto" = "020b8q4ss2k7a65r5dgh59z40i6sn7ij1allxkh8c8a9d0jzn313"; "swift-docc-plugin" = "11d6nhi139yzk1lxxrixsbgyj1bnvmh40wj30y725q83nqq49ljh"; - "swift-docc-symbolkit" = "14hb2wc09hisf2r2yny17z28z0m58cf4lnqaczad2x2hk4s1iayi"; - "swift-lmdb" = "1m5y6x2vs1wflcv2c57rx87gh12sy0hkwy5iy9inxmda2mcs8qcb"; - "swift-markdown" = "09270bfrwlp904cma29hsbhr1p25v8kwgvhcfi7lg2av7aaknd97"; + "swift-docc-symbolkit" = "14w37wzbx1mygfwm4iv0ypj120n1axhk627rg5a7v8j0ln511r7s"; + "swift-lmdb" = "0azmc24mnxn4pbda8w8v7hy3h0gqqm4br43pnr7lc4sfj3dcv43m"; + "swift-markdown" = "1l4ydc0xyv88gnyc33p61qavdh8cv98c548n1icphrfd6i78yygw"; "swift-nio" = "04bvay94b34ynmlvgyl9a7f431l3cf8k2zr483spv8mvyh1hxiqn"; - "swift-nio-ssl" = "1ak4aldilmz0pnfgbwq1x4alr38nfyvx2pz7p2vi2plf82da80g5"; }; } diff --git a/pkgs/development/compilers/swift/swift-docc/generated/workspace-state.json b/pkgs/development/compilers/swift/swift-docc/generated/workspace-state.json index ced9a6df956c0..699de93f79079 100644 --- a/pkgs/development/compilers/swift/swift-docc/generated/workspace-state.json +++ b/pkgs/development/compilers/swift/swift-docc/generated/workspace-state.json @@ -12,8 +12,8 @@ }, "state": { "checkoutState": { - "revision": "d2930e8fcf9c33162b9fcc1d522bc975e2d4179b", - "version": "1.0.1" + "revision": "e394bf350e38cb100b6bc4172834770ede1b7232", + "version": "1.0.3" }, "name": "sourceControlCheckout" }, @@ -29,8 +29,8 @@ }, "state": { "checkoutState": { - "branch": "release/5.7-gfm", - "revision": "792c1c3326327515ce9bf64c44196b7f4daab9a6" + "branch": "gfm", + "revision": "eb9a6a357b6816c68f4b194eaa5b67f3cd1fa5c3" }, "name": "sourceControlCheckout" }, @@ -46,8 +46,8 @@ }, "state": { "checkoutState": { - "revision": "9680b7251cd2be22caaed8f1468bd9e8915a62fb", - "version": "1.1.2" + "revision": "ddb07e896a2a8af79512543b1c7eb9797f8898a5", + "version": "1.1.7" }, "name": "sourceControlCheckout" }, @@ -80,8 +80,8 @@ }, "state": { "checkoutState": { - "branch": "release/5.7", - "revision": "8682202025906dce29a8b04f9263f40ba87b89d8" + "branch": "main", + "revision": "b45d1f2ed151d057b54504d653e0da5552844e34" }, "name": "sourceControlCheckout" }, @@ -97,8 +97,8 @@ }, "state": { "checkoutState": { - "branch": "release/5.7", - "revision": "6ea45a7ebf6d8f72bd299dfcc3299e284bbb92ee" + "branch": "main", + "revision": "584941b1236b15bad74d8163785d389c028b1ad8" }, "name": "sourceControlCheckout" }, @@ -114,8 +114,8 @@ }, "state": { "checkoutState": { - "branch": "release/5.7", - "revision": "d6cd065a7e4b6c3fad615dcd39890e095a2f63a2" + "branch": "main", + "revision": "d491147940587dbadfb3472354f4d0c6e063e061" }, "name": "sourceControlCheckout" }, @@ -137,25 +137,8 @@ "name": "sourceControlCheckout" }, "subpath": "swift-nio" - }, - { - "basedOn": null, - "packageRef": { - "identity": "swift-nio-ssl", - "kind": "remoteSourceControl", - "location": "https://github.com/apple/swift-nio-ssl.git", - "name": "swift-nio-ssl" - }, - "state": { - "checkoutState": { - "revision": "2e74773972bd6254c41ceeda827f229bccbf1c0f", - "version": "2.15.0" - }, - "name": "sourceControlCheckout" - }, - "subpath": "swift-nio-ssl" } ] }, - "version": 5 + "version": 6 } |