diff options
author | Stéphan Kochen <git@stephank.nl> | 2022-11-15 14:17:58 +0100 |
---|---|---|
committer | Stéphan Kochen <git@stephank.nl> | 2022-11-21 11:04:54 +0100 |
commit | 7d559a3cb38276bb809479cede72d01787a39f42 (patch) | |
tree | 28e7570b27b876400ea92e5c96bbea5ffcd0102d /pkgs/development/compilers/swift/swift-docc | |
parent | 9cb7163973209084290dae1f8c3d2520b427b94f (diff) |
swiftPackages: update swiftpm2nix generated files
Diffstat (limited to 'pkgs/development/compilers/swift/swift-docc')
3 files changed, 14 insertions, 153 deletions
diff --git a/pkgs/development/compilers/swift/swift-docc/default.nix b/pkgs/development/compilers/swift/swift-docc/default.nix index ebdaefdaf8635..6f0615fe19357 100644 --- a/pkgs/development/compilers/swift/swift-docc/default.nix +++ b/pkgs/development/compilers/swift/swift-docc/default.nix @@ -3,6 +3,7 @@ , callPackage , swift , swiftpm +, swiftpm2nix , Foundation , XCTest , CryptoKit @@ -10,7 +11,7 @@ }: let sources = callPackage ../sources.nix { }; - generated = callPackage ./generated { }; # Generated by swiftpm2nix. + generated = swiftpm2nix.helpers ./generated; in stdenv.mkDerivation { pname = "swift-docc"; diff --git a/pkgs/development/compilers/swift/swift-docc/generated/Package.resolved b/pkgs/development/compilers/swift/swift-docc/generated/Package.resolved deleted file mode 100644 index c4cb2c3620b26..0000000000000 --- a/pkgs/development/compilers/swift/swift-docc/generated/Package.resolved +++ /dev/null @@ -1,88 +0,0 @@ -{ - "object": { - "pins": [ - { - "package": "swift-argument-parser", - "repositoryURL": "https://github.com/apple/swift-argument-parser", - "state": { - "branch": null, - "revision": "d2930e8fcf9c33162b9fcc1d522bc975e2d4179b", - "version": "1.0.1" - } - }, - { - "package": "cmark-gfm", - "repositoryURL": "https://github.com/apple/swift-cmark.git", - "state": { - "branch": "release/5.7-gfm", - "revision": "792c1c3326327515ce9bf64c44196b7f4daab9a6", - "version": null - } - }, - { - "package": "swift-crypto", - "repositoryURL": "https://github.com/apple/swift-crypto.git", - "state": { - "branch": null, - "revision": "9680b7251cd2be22caaed8f1468bd9e8915a62fb", - "version": "1.1.2" - } - }, - { - "package": "SwiftDocCPlugin", - "repositoryURL": "https://github.com/apple/swift-docc-plugin", - "state": { - "branch": null, - "revision": "3303b164430d9a7055ba484c8ead67a52f7b74f6", - "version": "1.0.0" - } - }, - { - "package": "SymbolKit", - "repositoryURL": "https://github.com/apple/swift-docc-symbolkit", - "state": { - "branch": "release/5.7", - "revision": "8682202025906dce29a8b04f9263f40ba87b89d8", - "version": null - } - }, - { - "package": "CLMDB", - "repositoryURL": "https://github.com/apple/swift-lmdb.git", - "state": { - "branch": "release/5.7", - "revision": "6ea45a7ebf6d8f72bd299dfcc3299e284bbb92ee", - "version": null - } - }, - { - "package": "swift-markdown", - "repositoryURL": "https://github.com/apple/swift-markdown.git", - "state": { - "branch": "release/5.7", - "revision": "d6cd065a7e4b6c3fad615dcd39890e095a2f63a2", - "version": null - } - }, - { - "package": "swift-nio", - "repositoryURL": "https://github.com/apple/swift-nio.git", - "state": { - "branch": null, - "revision": "1d425b0851ffa2695d488cce1d68df2539f42500", - "version": "2.31.2" - } - }, - { - "package": "swift-nio-ssl", - "repositoryURL": "https://github.com/apple/swift-nio-ssl.git", - "state": { - "branch": null, - "revision": "2e74773972bd6254c41ceeda827f229bccbf1c0f", - "version": "2.15.0" - } - } - ] - }, - "version": 1 -} diff --git a/pkgs/development/compilers/swift/swift-docc/generated/default.nix b/pkgs/development/compilers/swift/swift-docc/generated/default.nix index 4dc8715b218da..bcd873a44f89d 100644 --- a/pkgs/development/compilers/swift/swift-docc/generated/default.nix +++ b/pkgs/development/compilers/swift/swift-docc/generated/default.nix @@ -1,67 +1,15 @@ # This file was generated by swiftpm2nix. -{ lib, fetchgit }: rec { - sources = { - "swift-argument-parser" = fetchgit { - url = "https://github.com/apple/swift-argument-parser"; - rev = "d2930e8fcf9c33162b9fcc1d522bc975e2d4179b"; - sha256 = "070gip241dgn3d0nxgwxva4vp6kbnf11g01q5yaq6kmflcmz58f2"; - }; - "swift-cmark" = fetchgit { - url = "https://github.com/apple/swift-cmark.git"; - rev = "792c1c3326327515ce9bf64c44196b7f4daab9a6"; - sha256 = "0xfchdgls3070z16in8ks69y8fpiajmyk7lmp5h7ym7164isa6bb"; - }; - "swift-crypto" = fetchgit { - url = "https://github.com/apple/swift-crypto.git"; - rev = "9680b7251cd2be22caaed8f1468bd9e8915a62fb"; - sha256 = "0h054rq14jyg94aiymmp37vqz60a13dlczp5g09pln724j4ypv92"; - }; - "swift-docc-plugin" = fetchgit { - url = "https://github.com/apple/swift-docc-plugin"; - rev = "3303b164430d9a7055ba484c8ead67a52f7b74f6"; - sha256 = "11d6nhi139yzk1lxxrixsbgyj1bnvmh40wj30y725q83nqq49ljh"; - }; - "swift-docc-symbolkit" = fetchgit { - url = "https://github.com/apple/swift-docc-symbolkit"; - rev = "8682202025906dce29a8b04f9263f40ba87b89d8"; - sha256 = "14hb2wc09hisf2r2yny17z28z0m58cf4lnqaczad2x2hk4s1iayi"; - }; - "swift-lmdb" = fetchgit { - url = "https://github.com/apple/swift-lmdb.git"; - rev = "6ea45a7ebf6d8f72bd299dfcc3299e284bbb92ee"; - sha256 = "1m5y6x2vs1wflcv2c57rx87gh12sy0hkwy5iy9inxmda2mcs8qcb"; - }; - "swift-markdown" = fetchgit { - url = "https://github.com/apple/swift-markdown.git"; - rev = "d6cd065a7e4b6c3fad615dcd39890e095a2f63a2"; - sha256 = "09270bfrwlp904cma29hsbhr1p25v8kwgvhcfi7lg2av7aaknd97"; - }; - "swift-nio" = fetchgit { - url = "https://github.com/apple/swift-nio.git"; - rev = "1d425b0851ffa2695d488cce1d68df2539f42500"; - sha256 = "04bvay94b34ynmlvgyl9a7f431l3cf8k2zr483spv8mvyh1hxiqn"; - }; - "swift-nio-ssl" = fetchgit { - url = "https://github.com/apple/swift-nio-ssl.git"; - rev = "2e74773972bd6254c41ceeda827f229bccbf1c0f"; - sha256 = "1ak4aldilmz0pnfgbwq1x4alr38nfyvx2pz7p2vi2plf82da80g5"; - }; +{ + workspaceStateFile = ./workspace-state.json; + hashes = { + "swift-argument-parser" = "070gip241dgn3d0nxgwxva4vp6kbnf11g01q5yaq6kmflcmz58f2"; + "swift-cmark" = "0xfchdgls3070z16in8ks69y8fpiajmyk7lmp5h7ym7164isa6bb"; + "swift-crypto" = "0h054rq14jyg94aiymmp37vqz60a13dlczp5g09pln724j4ypv92"; + "swift-docc-plugin" = "11d6nhi139yzk1lxxrixsbgyj1bnvmh40wj30y725q83nqq49ljh"; + "swift-docc-symbolkit" = "14hb2wc09hisf2r2yny17z28z0m58cf4lnqaczad2x2hk4s1iayi"; + "swift-lmdb" = "1m5y6x2vs1wflcv2c57rx87gh12sy0hkwy5iy9inxmda2mcs8qcb"; + "swift-markdown" = "09270bfrwlp904cma29hsbhr1p25v8kwgvhcfi7lg2av7aaknd97"; + "swift-nio" = "04bvay94b34ynmlvgyl9a7f431l3cf8k2zr483spv8mvyh1hxiqn"; + "swift-nio-ssl" = "1ak4aldilmz0pnfgbwq1x4alr38nfyvx2pz7p2vi2plf82da80g5"; }; - configure = '' - mkdir -p .build/checkouts - ln -sf ${./Package.resolved} ./Package.resolved - install -m 0600 ${./workspace-state.json} ./.build/workspace-state.json - '' - + lib.concatStrings (lib.mapAttrsToList (name: src: '' - ln -s '${src}' '.build/checkouts/${name}' - '') sources) - + '' - # Helper that makes a swiftpm dependency mutable by copying the source. - swiftpmMakeMutable() { - local orig="$(readlink .build/checkouts/$1)" - rm .build/checkouts/$1 - cp -r "$orig" .build/checkouts/$1 - chmod -R u+w .build/checkouts/$1 - } - ''; } |