swiftPackages: update swiftpm2nix generated files
This commit is contained in:
@@ -3,6 +3,7 @@
|
||||
, callPackage
|
||||
, swift
|
||||
, swiftpm
|
||||
, swiftpm2nix
|
||||
, Foundation
|
||||
, XCTest
|
||||
, sqlite
|
||||
@@ -12,7 +13,7 @@
|
||||
}:
|
||||
let
|
||||
sources = callPackage ../sources.nix { };
|
||||
generated = callPackage ./generated { }; # Generated by swiftpm2nix.
|
||||
generated = swiftpm2nix.helpers ./generated;
|
||||
|
||||
# On Darwin, we only want ncurses in the linker search path, because headers
|
||||
# are part of libsystem. Adding its headers to the search path causes strange
|
||||
|
||||
@@ -1,97 +0,0 @@
|
||||
{
|
||||
"object": {
|
||||
"pins": [
|
||||
{
|
||||
"package": "IndexStoreDB",
|
||||
"repositoryURL": "https://github.com/apple/indexstore-db.git",
|
||||
"state": {
|
||||
"branch": "main",
|
||||
"revision": "2ff1c0491248cd958a2ac05da9aa613eb27a8eeb",
|
||||
"version": null
|
||||
}
|
||||
},
|
||||
{
|
||||
"package": "swift-argument-parser",
|
||||
"repositoryURL": "https://github.com/apple/swift-argument-parser.git",
|
||||
"state": {
|
||||
"branch": null,
|
||||
"revision": "e394bf350e38cb100b6bc4172834770ede1b7232",
|
||||
"version": "1.0.3"
|
||||
}
|
||||
},
|
||||
{
|
||||
"package": "swift-collections",
|
||||
"repositoryURL": "https://github.com/apple/swift-collections.git",
|
||||
"state": {
|
||||
"branch": null,
|
||||
"revision": "f504716c27d2e5d4144fa4794b12129301d17729",
|
||||
"version": "1.0.3"
|
||||
}
|
||||
},
|
||||
{
|
||||
"package": "swift-crypto",
|
||||
"repositoryURL": "https://github.com/apple/swift-crypto.git",
|
||||
"state": {
|
||||
"branch": null,
|
||||
"revision": "ddb07e896a2a8af79512543b1c7eb9797f8898a5",
|
||||
"version": "1.1.7"
|
||||
}
|
||||
},
|
||||
{
|
||||
"package": "swift-driver",
|
||||
"repositoryURL": "https://github.com/apple/swift-driver.git",
|
||||
"state": {
|
||||
"branch": "main",
|
||||
"revision": "6c71f58f89d65eb79f1f6b32a707ddc39cec5ad6",
|
||||
"version": null
|
||||
}
|
||||
},
|
||||
{
|
||||
"package": "llbuild",
|
||||
"repositoryURL": "https://github.com/apple/swift-llbuild.git",
|
||||
"state": {
|
||||
"branch": "main",
|
||||
"revision": "d99c31577c60a247b065d29289a44fbdd141e2be",
|
||||
"version": null
|
||||
}
|
||||
},
|
||||
{
|
||||
"package": "SwiftPM",
|
||||
"repositoryURL": "https://github.com/apple/swift-package-manager.git",
|
||||
"state": {
|
||||
"branch": "main",
|
||||
"revision": "f04ad469a6053d713c2fb854fbeb27ee3e6c9dee",
|
||||
"version": null
|
||||
}
|
||||
},
|
||||
{
|
||||
"package": "swift-system",
|
||||
"repositoryURL": "https://github.com/apple/swift-system.git",
|
||||
"state": {
|
||||
"branch": null,
|
||||
"revision": "836bc4557b74fe6d2660218d56e3ce96aff76574",
|
||||
"version": "1.1.1"
|
||||
}
|
||||
},
|
||||
{
|
||||
"package": "swift-tools-support-core",
|
||||
"repositoryURL": "https://github.com/apple/swift-tools-support-core.git",
|
||||
"state": {
|
||||
"branch": "main",
|
||||
"revision": "0220fc394f2ae820eeacd754fb2c7ce211e9979e",
|
||||
"version": null
|
||||
}
|
||||
},
|
||||
{
|
||||
"package": "Yams",
|
||||
"repositoryURL": "https://github.com/jpsim/Yams.git",
|
||||
"state": {
|
||||
"branch": null,
|
||||
"revision": "01835dc202670b5bb90d07f3eae41867e9ed29f6",
|
||||
"version": "5.0.1"
|
||||
}
|
||||
}
|
||||
]
|
||||
},
|
||||
"version": 1
|
||||
}
|
||||
@@ -1,72 +1,16 @@
|
||||
# This file was generated by swiftpm2nix.
|
||||
{ lib, fetchgit }: rec {
|
||||
sources = {
|
||||
"indexstore-db" = fetchgit {
|
||||
url = "https://github.com/apple/indexstore-db.git";
|
||||
rev = "2ff1c0491248cd958a2ac05da9aa613eb27a8eeb";
|
||||
sha256 = "005vvkrncgpryzrn0hzgsapflpyga0n7152b2b565wislpx90cwl";
|
||||
};
|
||||
"swift-argument-parser" = fetchgit {
|
||||
url = "https://github.com/apple/swift-argument-parser.git";
|
||||
rev = "e394bf350e38cb100b6bc4172834770ede1b7232";
|
||||
sha256 = "1jph9w7lk9nr20fsv2c8p4hisx3dda817fh7pybd0r0j1jwa9nmw";
|
||||
};
|
||||
"swift-collections" = fetchgit {
|
||||
url = "https://github.com/apple/swift-collections.git";
|
||||
rev = "f504716c27d2e5d4144fa4794b12129301d17729";
|
||||
sha256 = "0l0pv16zil3n7fac7mdf5qxklxr5rwiig5bixgca1ybq7arlnv7i";
|
||||
};
|
||||
"swift-crypto" = fetchgit {
|
||||
url = "https://github.com/apple/swift-crypto.git";
|
||||
rev = "ddb07e896a2a8af79512543b1c7eb9797f8898a5";
|
||||
sha256 = "020b8q4ss2k7a65r5dgh59z40i6sn7ij1allxkh8c8a9d0jzn313";
|
||||
};
|
||||
"swift-driver" = fetchgit {
|
||||
url = "https://github.com/apple/swift-driver.git";
|
||||
rev = "6c71f58f89d65eb79f1f6b32a707ddc39cec5ad6";
|
||||
sha256 = "0nblvs47kh2hl1l70rmrbablx4m5i27w8l3dfrv2h7zccqr8jl0a";
|
||||
};
|
||||
"swift-llbuild" = fetchgit {
|
||||
url = "https://github.com/apple/swift-llbuild.git";
|
||||
rev = "d99c31577c60a247b065d29289a44fbdd141e2be";
|
||||
sha256 = "1bvqbj8ji72ilh3ah2mw411jwzbbjxjyasa6sg4b8da0kqia4021";
|
||||
};
|
||||
"swift-package-manager" = fetchgit {
|
||||
url = "https://github.com/apple/swift-package-manager.git";
|
||||
rev = "f04ad469a6053d713c2fb854fbeb27ee3e6c9dee";
|
||||
sha256 = "16qvk14f1l0hf5bphx6qk51nn9d36a2iw5v3sgkvmqi8h7l4kqg5";
|
||||
};
|
||||
"swift-system" = fetchgit {
|
||||
url = "https://github.com/apple/swift-system.git";
|
||||
rev = "836bc4557b74fe6d2660218d56e3ce96aff76574";
|
||||
sha256 = "0402hkx2q2dv27gccnn8ma79ngvwiwzkhcv4zlcdldmy6cgi0px7";
|
||||
};
|
||||
"swift-tools-support-core" = fetchgit {
|
||||
url = "https://github.com/apple/swift-tools-support-core.git";
|
||||
rev = "0220fc394f2ae820eeacd754fb2c7ce211e9979e";
|
||||
sha256 = "1ryd5iyx5mfv8bhyq3bf08z7nv886chzzqnmwaj16r2cry9yml7c";
|
||||
};
|
||||
"Yams" = fetchgit {
|
||||
url = "https://github.com/jpsim/Yams.git";
|
||||
rev = "01835dc202670b5bb90d07f3eae41867e9ed29f6";
|
||||
sha256 = "11abhcfkmqm3cmh7vp7rqzvxd1zj02j2866a2pp6v9m89456xb76";
|
||||
};
|
||||
{
|
||||
workspaceStateFile = ./workspace-state.json;
|
||||
hashes = {
|
||||
"indexstore-db" = "005vvkrncgpryzrn0hzgsapflpyga0n7152b2b565wislpx90cwl";
|
||||
"swift-argument-parser" = "1jph9w7lk9nr20fsv2c8p4hisx3dda817fh7pybd0r0j1jwa9nmw";
|
||||
"swift-collections" = "0l0pv16zil3n7fac7mdf5qxklxr5rwiig5bixgca1ybq7arlnv7i";
|
||||
"swift-crypto" = "020b8q4ss2k7a65r5dgh59z40i6sn7ij1allxkh8c8a9d0jzn313";
|
||||
"swift-driver" = "0nblvs47kh2hl1l70rmrbablx4m5i27w8l3dfrv2h7zccqr8jl0a";
|
||||
"swift-llbuild" = "1bvqbj8ji72ilh3ah2mw411jwzbbjxjyasa6sg4b8da0kqia4021";
|
||||
"swift-package-manager" = "16qvk14f1l0hf5bphx6qk51nn9d36a2iw5v3sgkvmqi8h7l4kqg5";
|
||||
"swift-system" = "0402hkx2q2dv27gccnn8ma79ngvwiwzkhcv4zlcdldmy6cgi0px7";
|
||||
"swift-tools-support-core" = "1ryd5iyx5mfv8bhyq3bf08z7nv886chzzqnmwaj16r2cry9yml7c";
|
||||
"Yams" = "11abhcfkmqm3cmh7vp7rqzvxd1zj02j2866a2pp6v9m89456xb76";
|
||||
};
|
||||
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
|
||||
}
|
||||
'';
|
||||
}
|
||||
|
||||
@@ -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";
|
||||
|
||||
@@ -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
|
||||
}
|
||||
@@ -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
|
||||
}
|
||||
'';
|
||||
}
|
||||
|
||||
@@ -4,6 +4,7 @@
|
||||
, fetchpatch
|
||||
, swift
|
||||
, swiftpm
|
||||
, swiftpm2nix
|
||||
, Foundation
|
||||
, XCTest
|
||||
, sqlite
|
||||
@@ -12,7 +13,7 @@
|
||||
}:
|
||||
let
|
||||
sources = callPackage ../sources.nix { };
|
||||
generated = callPackage ./generated { }; # Generated by swiftpm2nix.
|
||||
generated = swiftpm2nix.helpers ./generated;
|
||||
|
||||
# On Darwin, we only want ncurses in the linker search path, because headers
|
||||
# are part of libsystem. Adding its headers to the search path causes strange
|
||||
|
||||
@@ -1,52 +0,0 @@
|
||||
{
|
||||
"object": {
|
||||
"pins": [
|
||||
{
|
||||
"package": "swift-argument-parser",
|
||||
"repositoryURL": "https://github.com/apple/swift-argument-parser.git",
|
||||
"state": {
|
||||
"branch": null,
|
||||
"revision": "e1465042f195f374b94f915ba8ca49de24300a0d",
|
||||
"version": "1.0.2"
|
||||
}
|
||||
},
|
||||
{
|
||||
"package": "llbuild",
|
||||
"repositoryURL": "https://github.com/apple/swift-llbuild.git",
|
||||
"state": {
|
||||
"branch": "release/5.7",
|
||||
"revision": "564424db5fdb62dcb5d863bdf7212500ef03a87b",
|
||||
"version": null
|
||||
}
|
||||
},
|
||||
{
|
||||
"package": "swift-system",
|
||||
"repositoryURL": "https://github.com/apple/swift-system.git",
|
||||
"state": {
|
||||
"branch": null,
|
||||
"revision": "836bc4557b74fe6d2660218d56e3ce96aff76574",
|
||||
"version": "1.1.1"
|
||||
}
|
||||
},
|
||||
{
|
||||
"package": "swift-tools-support-core",
|
||||
"repositoryURL": "https://github.com/apple/swift-tools-support-core.git",
|
||||
"state": {
|
||||
"branch": "release/5.7",
|
||||
"revision": "184eba382f6abbb362ffc02942d790ff35019ad4",
|
||||
"version": null
|
||||
}
|
||||
},
|
||||
{
|
||||
"package": "Yams",
|
||||
"repositoryURL": "https://github.com/jpsim/Yams.git",
|
||||
"state": {
|
||||
"branch": null,
|
||||
"revision": "9ff1cc9327586db4e0c8f46f064b6a82ec1566fa",
|
||||
"version": "4.0.6"
|
||||
}
|
||||
}
|
||||
]
|
||||
},
|
||||
"version": 1
|
||||
}
|
||||
@@ -1,47 +1,11 @@
|
||||
# This file was generated by swiftpm2nix.
|
||||
{ lib, fetchgit }: rec {
|
||||
sources = {
|
||||
"swift-argument-parser" = fetchgit {
|
||||
url = "https://github.com/apple/swift-argument-parser.git";
|
||||
rev = "e1465042f195f374b94f915ba8ca49de24300a0d";
|
||||
sha256 = "11did5snqj8chcbdbiyx84mpif940ls2pr1iikwivvfp63i248hm";
|
||||
};
|
||||
"swift-llbuild" = fetchgit {
|
||||
url = "https://github.com/apple/swift-llbuild.git";
|
||||
rev = "564424db5fdb62dcb5d863bdf7212500ef03a87b";
|
||||
sha256 = "07zbp2dyfqd1bnyg7snpr9brn40jf22ivly5v10mql3hrg76a18h";
|
||||
};
|
||||
"swift-system" = fetchgit {
|
||||
url = "https://github.com/apple/swift-system.git";
|
||||
rev = "836bc4557b74fe6d2660218d56e3ce96aff76574";
|
||||
sha256 = "0402hkx2q2dv27gccnn8ma79ngvwiwzkhcv4zlcdldmy6cgi0px7";
|
||||
};
|
||||
"swift-tools-support-core" = fetchgit {
|
||||
url = "https://github.com/apple/swift-tools-support-core.git";
|
||||
rev = "184eba382f6abbb362ffc02942d790ff35019ad4";
|
||||
sha256 = "005akmisnkcg6zjwm545183c12xm8z504yxxqmnqf0rakfcab1mi";
|
||||
};
|
||||
"Yams" = fetchgit {
|
||||
url = "https://github.com/jpsim/Yams.git";
|
||||
rev = "9ff1cc9327586db4e0c8f46f064b6a82ec1566fa";
|
||||
sha256 = "1893y13sis2aimi1a5kgkczbf06z4yig054xb565yg2xm13srb45";
|
||||
};
|
||||
{
|
||||
workspaceStateFile = ./workspace-state.json;
|
||||
hashes = {
|
||||
"swift-argument-parser" = "11did5snqj8chcbdbiyx84mpif940ls2pr1iikwivvfp63i248hm";
|
||||
"swift-llbuild" = "07zbp2dyfqd1bnyg7snpr9brn40jf22ivly5v10mql3hrg76a18h";
|
||||
"swift-system" = "0402hkx2q2dv27gccnn8ma79ngvwiwzkhcv4zlcdldmy6cgi0px7";
|
||||
"swift-tools-support-core" = "1vabl1z5sm2lrd75f5c781rkrq0liinpjvnrjr6i6r8cqrp0q5jb";
|
||||
"Yams" = "1893y13sis2aimi1a5kgkczbf06z4yig054xb565yg2xm13srb45";
|
||||
};
|
||||
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
|
||||
}
|
||||
'';
|
||||
}
|
||||
|
||||
@@ -64,7 +64,7 @@
|
||||
"state": {
|
||||
"checkoutState": {
|
||||
"branch": "release/5.7",
|
||||
"revision": "184eba382f6abbb362ffc02942d790ff35019ad4"
|
||||
"revision": "afc0938503bac012f76ceb619d031f63edc4c5f7"
|
||||
},
|
||||
"name": "sourceControlCheckout"
|
||||
},
|
||||
|
||||
@@ -1,10 +1,11 @@
|
||||
{ lib
|
||||
, callPackage
|
||||
, stdenv
|
||||
, callPackage
|
||||
, cmake
|
||||
, ninja
|
||||
, git
|
||||
, swift
|
||||
, swiftpm2nix
|
||||
, Foundation
|
||||
, XCTest
|
||||
, sqlite
|
||||
@@ -25,6 +26,7 @@ let
|
||||
sharedLibraryExt = stdenv.hostPlatform.extensions.sharedLibrary;
|
||||
|
||||
sources = callPackage ../sources.nix { };
|
||||
generated = swiftpm2nix.helpers ./generated;
|
||||
|
||||
# Common attributes for the bootstrap swiftpm and the final swiftpm.
|
||||
commonAttrs = {
|
||||
@@ -122,9 +124,6 @@ let
|
||||
];
|
||||
});
|
||||
|
||||
# Generated by swiftpm2nix.
|
||||
generated = callPackage ./generated { };
|
||||
|
||||
# On Darwin, we only want ncurses in the linker search path, because headers
|
||||
# are part of libsystem. Adding its headers to the search path causes strange
|
||||
# mixing and errors.
|
||||
|
||||
@@ -1,79 +0,0 @@
|
||||
{
|
||||
"object": {
|
||||
"pins": [
|
||||
{
|
||||
"package": "swift-argument-parser",
|
||||
"repositoryURL": "https://github.com/apple/swift-argument-parser.git",
|
||||
"state": {
|
||||
"branch": null,
|
||||
"revision": "e394bf350e38cb100b6bc4172834770ede1b7232",
|
||||
"version": "1.0.3"
|
||||
}
|
||||
},
|
||||
{
|
||||
"package": "swift-collections",
|
||||
"repositoryURL": "https://github.com/apple/swift-collections.git",
|
||||
"state": {
|
||||
"branch": null,
|
||||
"revision": "f504716c27d2e5d4144fa4794b12129301d17729",
|
||||
"version": "1.0.3"
|
||||
}
|
||||
},
|
||||
{
|
||||
"package": "swift-crypto",
|
||||
"repositoryURL": "https://github.com/apple/swift-crypto.git",
|
||||
"state": {
|
||||
"branch": null,
|
||||
"revision": "ddb07e896a2a8af79512543b1c7eb9797f8898a5",
|
||||
"version": "1.1.7"
|
||||
}
|
||||
},
|
||||
{
|
||||
"package": "swift-driver",
|
||||
"repositoryURL": "https://github.com/apple/swift-driver.git",
|
||||
"state": {
|
||||
"branch": "release/5.7",
|
||||
"revision": "719426df790661020de657bf38beb2a8b1de5ad3",
|
||||
"version": null
|
||||
}
|
||||
},
|
||||
{
|
||||
"package": "llbuild",
|
||||
"repositoryURL": "https://github.com/apple/swift-llbuild.git",
|
||||
"state": {
|
||||
"branch": "release/5.7",
|
||||
"revision": "564424db5fdb62dcb5d863bdf7212500ef03a87b",
|
||||
"version": null
|
||||
}
|
||||
},
|
||||
{
|
||||
"package": "swift-system",
|
||||
"repositoryURL": "https://github.com/apple/swift-system.git",
|
||||
"state": {
|
||||
"branch": null,
|
||||
"revision": "836bc4557b74fe6d2660218d56e3ce96aff76574",
|
||||
"version": "1.1.1"
|
||||
}
|
||||
},
|
||||
{
|
||||
"package": "swift-tools-support-core",
|
||||
"repositoryURL": "https://github.com/apple/swift-tools-support-core.git",
|
||||
"state": {
|
||||
"branch": "release/5.7",
|
||||
"revision": "184eba382f6abbb362ffc02942d790ff35019ad4",
|
||||
"version": null
|
||||
}
|
||||
},
|
||||
{
|
||||
"package": "Yams",
|
||||
"repositoryURL": "https://github.com/jpsim/Yams.git",
|
||||
"state": {
|
||||
"branch": null,
|
||||
"revision": "9ff1cc9327586db4e0c8f46f064b6a82ec1566fa",
|
||||
"version": "4.0.6"
|
||||
}
|
||||
}
|
||||
]
|
||||
},
|
||||
"version": 1
|
||||
}
|
||||
@@ -1,62 +1,14 @@
|
||||
# This file was generated by swiftpm2nix.
|
||||
{ lib, fetchgit }: rec {
|
||||
sources = {
|
||||
"swift-argument-parser" = fetchgit {
|
||||
url = "https://github.com/apple/swift-argument-parser.git";
|
||||
rev = "e394bf350e38cb100b6bc4172834770ede1b7232";
|
||||
sha256 = "1jph9w7lk9nr20fsv2c8p4hisx3dda817fh7pybd0r0j1jwa9nmw";
|
||||
};
|
||||
"swift-collections" = fetchgit {
|
||||
url = "https://github.com/apple/swift-collections.git";
|
||||
rev = "f504716c27d2e5d4144fa4794b12129301d17729";
|
||||
sha256 = "0l0pv16zil3n7fac7mdf5qxklxr5rwiig5bixgca1ybq7arlnv7i";
|
||||
};
|
||||
"swift-crypto" = fetchgit {
|
||||
url = "https://github.com/apple/swift-crypto.git";
|
||||
rev = "ddb07e896a2a8af79512543b1c7eb9797f8898a5";
|
||||
sha256 = "020b8q4ss2k7a65r5dgh59z40i6sn7ij1allxkh8c8a9d0jzn313";
|
||||
};
|
||||
"swift-driver" = fetchgit {
|
||||
url = "https://github.com/apple/swift-driver.git";
|
||||
rev = "719426df790661020de657bf38beb2a8b1de5ad3";
|
||||
sha256 = "0cfz9g5mds8isn1simxal4vn3z7yh2kh6wg5267w3m0ifrcxfkmj";
|
||||
};
|
||||
"swift-llbuild" = fetchgit {
|
||||
url = "https://github.com/apple/swift-llbuild.git";
|
||||
rev = "564424db5fdb62dcb5d863bdf7212500ef03a87b";
|
||||
sha256 = "07zbp2dyfqd1bnyg7snpr9brn40jf22ivly5v10mql3hrg76a18h";
|
||||
};
|
||||
"swift-system" = fetchgit {
|
||||
url = "https://github.com/apple/swift-system.git";
|
||||
rev = "836bc4557b74fe6d2660218d56e3ce96aff76574";
|
||||
sha256 = "0402hkx2q2dv27gccnn8ma79ngvwiwzkhcv4zlcdldmy6cgi0px7";
|
||||
};
|
||||
"swift-tools-support-core" = fetchgit {
|
||||
url = "https://github.com/apple/swift-tools-support-core.git";
|
||||
rev = "184eba382f6abbb362ffc02942d790ff35019ad4";
|
||||
sha256 = "005akmisnkcg6zjwm545183c12xm8z504yxxqmnqf0rakfcab1mi";
|
||||
};
|
||||
"Yams" = fetchgit {
|
||||
url = "https://github.com/jpsim/Yams.git";
|
||||
rev = "9ff1cc9327586db4e0c8f46f064b6a82ec1566fa";
|
||||
sha256 = "1893y13sis2aimi1a5kgkczbf06z4yig054xb565yg2xm13srb45";
|
||||
};
|
||||
{
|
||||
workspaceStateFile = ./workspace-state.json;
|
||||
hashes = {
|
||||
"swift-argument-parser" = "1jph9w7lk9nr20fsv2c8p4hisx3dda817fh7pybd0r0j1jwa9nmw";
|
||||
"swift-collections" = "0l0pv16zil3n7fac7mdf5qxklxr5rwiig5bixgca1ybq7arlnv7i";
|
||||
"swift-crypto" = "020b8q4ss2k7a65r5dgh59z40i6sn7ij1allxkh8c8a9d0jzn313";
|
||||
"swift-driver" = "1lcb5wqragc74nd0fjnk47lyph9hs0i9cps1mplvp2i91yzjqk05";
|
||||
"swift-llbuild" = "07zbp2dyfqd1bnyg7snpr9brn40jf22ivly5v10mql3hrg76a18h";
|
||||
"swift-system" = "0402hkx2q2dv27gccnn8ma79ngvwiwzkhcv4zlcdldmy6cgi0px7";
|
||||
"swift-tools-support-core" = "1vabl1z5sm2lrd75f5c781rkrq0liinpjvnrjr6i6r8cqrp0q5jb";
|
||||
"Yams" = "1893y13sis2aimi1a5kgkczbf06z4yig054xb565yg2xm13srb45";
|
||||
};
|
||||
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
|
||||
}
|
||||
'';
|
||||
}
|
||||
|
||||
@@ -64,7 +64,7 @@
|
||||
"state": {
|
||||
"checkoutState": {
|
||||
"branch": "release/5.7",
|
||||
"revision": "719426df790661020de657bf38beb2a8b1de5ad3"
|
||||
"revision": "82b274af66cfbb8f3131677676517b34d01e30fd"
|
||||
},
|
||||
"name": "sourceControlCheckout"
|
||||
},
|
||||
@@ -115,7 +115,7 @@
|
||||
"state": {
|
||||
"checkoutState": {
|
||||
"branch": "release/5.7",
|
||||
"revision": "184eba382f6abbb362ffc02942d790ff35019ad4"
|
||||
"revision": "afc0938503bac012f76ceb619d031f63edc4c5f7"
|
||||
},
|
||||
"name": "sourceControlCheckout"
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user