git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #121130 from expipiplus1/joe-ecpdap

ecpdap: init at 0.1.5

commit29f3b5374a937efdb9a6b3c62bd7642ec0c62f44 authorMaciej Krüger <mkg20001@gmail.com> dateThu 29 Apr 2021, 19:54 (6 years ago) parente1ff5c3ba86df9
3 files changed+383
pkgs/development/tools/ecpdap/default.nix+36 pkgs/development/tools/ecpdap/lock-update.patch+345 pkgs/top-level/all-packages.nix+2
pkgs/development/tools/ecpdap/default.nixnew file+36
@@ -0,0 +1,36 @@
1+{ lib, fetchFromGitHub, rustPlatform, pkg-config, libusb1 }:
2+
3+rustPlatform.buildRustPackage rec {
4+ pname = "ecpdap";
5+ version = "0.1.5";
6+
7+ src = fetchFromGitHub {
8+ owner = "adamgreig";
9+ repo = pname;
10+ rev = "v${version}";
11+ sha256 = "1z8w37i6wjz6cr453md54ip21y26605vrx4vpq5wwd11mfvc1jsg";
12+ };
13+
14+ # The lock file was not up to date with cargo.toml for this release
15+ #
16+ # This patch is the lock file after running `cargo update`
17+ cargoPatches = [ ./lock-update.patch ];
18+
19+ cargoSha256 = "08xcnvbxm508v03b3hmz71mpa3yd8lamvazxivp6qsv46ri163mn";
20+
21+ nativeBuildInputs = [ pkg-config ];
22+
23+ buildInputs = [ libusb1 ];
24+
25+ meta = with lib; {
26+ description = "A tool to program ECP5 FPGAs";
27+ longDescription = ''
28+ ECPDAP allows you to program ECP5 FPGAs and attached SPI flash
29+ using CMSIS-DAP probes in JTAG mode.
30+ '';
31+ homepage = "https://github.com/adamgreig/ecpdap";
32+ license = licenses.asl20;
33+ maintainers = with maintainers; [ expipiplus1 ];
34+ };
35+}
36+
pkgs/development/tools/ecpdap/lock-update.patchnew file+345
@@ -0,0 +1,345 @@
1+diff --git a/Cargo.lock b/Cargo.lock
2+index 91f7e0c..1610002 100644
3+--- a/Cargo.lock
4++++ b/Cargo.lock
5+@@ -26,9 +26,9 @@ dependencies = [
6+
7+ [[package]]
8+ name = "anyhow"
9+-version = "1.0.37"
10++version = "1.0.40"
11+ source = "registry+https://github.com/rust-lang/crates.io-index"
12+-checksum = "ee67c11feeac938fae061b232e38e0b6d94f97a9df10e6271319325ac4c56a86"
13++checksum = "28b2cd92db5cbd74e8e5028f7e27dd7aa3090e89e4f2a197cc7c8dfb69c7063b"
14+
15+ [[package]]
16+ name = "atty"
17+@@ -49,15 +49,9 @@ checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
18+
19+ [[package]]
20+ name = "cc"
21+-version = "1.0.66"
22++version = "1.0.67"
23+ source = "registry+https://github.com/rust-lang/crates.io-index"
24+-checksum = "4c0496836a84f8d0495758516b8621a622beb77c0fed418570e50764093ced48"
25+-
26+-[[package]]
27+-name = "cfg-if"
28+-version = "0.1.10"
29+-source = "registry+https://github.com/rust-lang/crates.io-index"
30+-checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
31++checksum = "e3c69b077ad434294d3ce9f1f6143a2a4b89a8a2d54ef813d85003a4fd1137fd"
32+
33+ [[package]]
34+ name = "cfg-if"
35+@@ -82,9 +76,9 @@ dependencies = [
36+
37+ [[package]]
38+ name = "console"
39+-version = "0.14.0"
40++version = "0.14.1"
41+ source = "registry+https://github.com/rust-lang/crates.io-index"
42+-checksum = "7cc80946b3480f421c2f17ed1cb841753a371c7c5104f51d507e13f532c856aa"
43++checksum = "3993e6445baa160675931ec041a5e03ca84b9c6e32a056150d3aa2bdda0a1f45"
44+ dependencies = [
45+ "encode_unicode",
46+ "lazy_static",
47+@@ -101,14 +95,14 @@ version = "1.2.1"
48+ source = "registry+https://github.com/rust-lang/crates.io-index"
49+ checksum = "81156fece84ab6a9f2afdb109ce3ae577e42b1228441eded99bd77f627953b1a"
50+ dependencies = [
51+- "cfg-if 1.0.0",
52++ "cfg-if",
53+ ]
54+
55+ [[package]]
56+ name = "derivative"
57+-version = "2.1.1"
58++version = "2.2.0"
59+ source = "registry+https://github.com/rust-lang/crates.io-index"
60+-checksum = "cb582b60359da160a9477ee80f15c8d784c477e69c217ef2cdd4169c24ea380f"
61++checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b"
62+ dependencies = [
63+ "proc-macro2",
64+ "quote",
65+@@ -117,7 +111,7 @@ dependencies = [
66+
67+ [[package]]
68+ name = "ecpdap"
69+-version = "0.1.4"
70++version = "0.1.5"
71+ dependencies = [
72+ "anyhow",
73+ "clap",
74+@@ -153,11 +147,11 @@ dependencies = [
75+
76+ [[package]]
77+ name = "filetime"
78+-version = "0.2.13"
79++version = "0.2.14"
80+ source = "registry+https://github.com/rust-lang/crates.io-index"
81+-checksum = "0c122a393ea57648015bf06fbd3d372378992e86b9ff5a7a497b076a28c79efe"
82++checksum = "1d34cfa13a63ae058bfa601fe9e313bbdb3746427c1459185464ce0fcf62e1e8"
83+ dependencies = [
84+- "cfg-if 1.0.0",
85++ "cfg-if",
86+ "libc",
87+ "redox_syscall",
88+ "winapi",
89+@@ -165,9 +159,9 @@ dependencies = [
90+
91+ [[package]]
92+ name = "hermit-abi"
93+-version = "0.1.17"
94++version = "0.1.18"
95+ source = "registry+https://github.com/rust-lang/crates.io-index"
96+-checksum = "5aca5565f760fb5b220e499d72710ed156fdb74e631659e99377d9ebfbd13ae8"
97++checksum = "322f4de77956e22ed0e5032c359a0f1273f1f7f0d79bfa3b8ffbc730d7fbcc5c"
98+ dependencies = [
99+ "libc",
100+ ]
101+@@ -206,9 +200,9 @@ dependencies = [
102+
103+ [[package]]
104+ name = "jep106"
105+-version = "0.2.4"
106++version = "0.2.5"
107+ source = "registry+https://github.com/rust-lang/crates.io-index"
108+-checksum = "f57cd08ee4fbc8043949150a59e34ea5f2afeb172f875db9607689e48600c653"
109++checksum = "939876d20519325db0883757e29e9858ee02919d0f03e43c74f69296caa314f4"
110+ dependencies = [
111+ "serde",
112+ ]
113+@@ -221,33 +215,35 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
114+
115+ [[package]]
116+ name = "libc"
117+-version = "0.2.81"
118++version = "0.2.94"
119+ source = "registry+https://github.com/rust-lang/crates.io-index"
120+-checksum = "1482821306169ec4d07f6aca392a4681f66c75c9918aa49641a2595db64053cb"
121++checksum = "18794a8ad5b29321f790b55d93dfba91e125cb1a9edbd4f8e3150acc771c1a5e"
122+
123+ [[package]]
124+ name = "libflate"
125+-version = "1.0.3"
126++version = "1.1.0"
127+ source = "registry+https://github.com/rust-lang/crates.io-index"
128+-checksum = "389de7875e06476365974da3e7ff85d55f1972188ccd9f6020dd7c8156e17914"
129++checksum = "6d87eae36b3f680f7f01645121b782798b56ef33c53f83d1c66ba3a22b60bfe3"
130+ dependencies = [
131+ "adler32",
132+ "crc32fast",
133+ "libflate_lz77",
134+- "rle-decode-fast",
135+ ]
136+
137+ [[package]]
138+ name = "libflate_lz77"
139+-version = "1.0.0"
140++version = "1.1.0"
141+ source = "registry+https://github.com/rust-lang/crates.io-index"
142+-checksum = "3286f09f7d4926fc486334f28d8d2e6ebe4f7f9994494b6dab27ddfad2c9b11b"
143++checksum = "39a734c0493409afcd49deee13c006a04e3586b9761a03543c6272c9c51f2f5a"
144++dependencies = [
145++ "rle-decode-fast",
146++]
147+
148+ [[package]]
149+ name = "libusb1-sys"
150+-version = "0.4.3"
151++version = "0.4.4"
152+ source = "registry+https://github.com/rust-lang/crates.io-index"
153+-checksum = "5e3b8385bdc8931a82a0865a3a7285e2c28e41287824dc92c7724b7759a0c685"
154++checksum = "be241693102a24766d0b8526c8988771edac2842630d7e730f8e9fbc014f3703"
155+ dependencies = [
156+ "cc",
157+ "libc",
158+@@ -259,11 +255,11 @@ dependencies = [
159+
160+ [[package]]
161+ name = "log"
162+-version = "0.4.11"
163++version = "0.4.14"
164+ source = "registry+https://github.com/rust-lang/crates.io-index"
165+-checksum = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b"
166++checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710"
167+ dependencies = [
168+- "cfg-if 0.1.10",
169++ "cfg-if",
170+ ]
171+
172+ [[package]]
173+@@ -327,9 +323,9 @@ dependencies = [
174+
175+ [[package]]
176+ name = "proc-macro2"
177+-version = "1.0.24"
178++version = "1.0.26"
179+ source = "registry+https://github.com/rust-lang/crates.io-index"
180+-checksum = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71"
181++checksum = "a152013215dca273577e18d2bf00fa862b89b24169fb78c4c95aeb07992c9cec"
182+ dependencies = [
183+ "unicode-xid",
184+ ]
185+@@ -342,36 +338,38 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
186+
187+ [[package]]
188+ name = "quote"
189+-version = "1.0.8"
190++version = "1.0.9"
191+ source = "registry+https://github.com/rust-lang/crates.io-index"
192+-checksum = "991431c3519a3f36861882da93630ce66b52918dcf1b8e2fd66b397fc96f28df"
193++checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7"
194+ dependencies = [
195+ "proc-macro2",
196+ ]
197+
198+ [[package]]
199+ name = "redox_syscall"
200+-version = "0.1.57"
201++version = "0.2.6"
202+ source = "registry+https://github.com/rust-lang/crates.io-index"
203+-checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce"
204++checksum = "8270314b5ccceb518e7e578952f0b72b88222d02e8f77f5ecf7abbb673539041"
205++dependencies = [
206++ "bitflags",
207++]
208+
209+ [[package]]
210+ name = "regex"
211+-version = "1.4.2"
212++version = "1.4.6"
213+ source = "registry+https://github.com/rust-lang/crates.io-index"
214+-checksum = "38cf2c13ed4745de91a5eb834e11c00bcc3709e773173b2ce4c56c9fbde04b9c"
215++checksum = "2a26af418b574bd56588335b3a3659a65725d4e636eb1016c2f9e3b38c7cc759"
216+ dependencies = [
217+ "aho-corasick",
218+ "memchr",
219+ "regex-syntax",
220+- "thread_local",
221+ ]
222+
223+ [[package]]
224+ name = "regex-syntax"
225+-version = "0.6.21"
226++version = "0.6.23"
227+ source = "registry+https://github.com/rust-lang/crates.io-index"
228+-checksum = "3b181ba2dcf07aaccad5448e8ead58db5b742cf85dfe035e2227f137a539a189"
229++checksum = "24d5f089152e60f62d28b835fbff2cd2e8dc0baf1ac13343bef92ab7eed84548"
230+
231+ [[package]]
232+ name = "rle-decode-fast"
233+@@ -391,18 +389,18 @@ dependencies = [
234+
235+ [[package]]
236+ name = "serde"
237+-version = "1.0.118"
238++version = "1.0.125"
239+ source = "registry+https://github.com/rust-lang/crates.io-index"
240+-checksum = "06c64263859d87aa2eb554587e2d23183398d617427327cf2b3d0ed8c69e4800"
241++checksum = "558dc50e1a5a5fa7112ca2ce4effcb321b0300c0d4ccf0776a9f60cd89031171"
242+ dependencies = [
243+ "serde_derive",
244+ ]
245+
246+ [[package]]
247+ name = "serde_derive"
248+-version = "1.0.118"
249++version = "1.0.125"
250+ source = "registry+https://github.com/rust-lang/crates.io-index"
251+-checksum = "c84d3526699cd55261af4b941e4e725444df67aa4f9e6a3564f18030d12672df"
252++checksum = "b093b7a2bb58203b5da3056c05b4ec1fed827dcfdb37347a8841695263b3d06d"
253+ dependencies = [
254+ "proc-macro2",
255+ "quote",
256+@@ -431,9 +429,9 @@ checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
257+
258+ [[package]]
259+ name = "syn"
260+-version = "1.0.57"
261++version = "1.0.71"
262+ source = "registry+https://github.com/rust-lang/crates.io-index"
263+-checksum = "4211ce9909eb971f111059df92c45640aad50a619cf55cd76476be803c4c68e6"
264++checksum = "ad184cc9470f9117b2ac6817bfe297307418819ba40552f9b3846f05c33d5373"
265+ dependencies = [
266+ "proc-macro2",
267+ "quote",
268+@@ -442,13 +440,12 @@ dependencies = [
269+
270+ [[package]]
271+ name = "tar"
272+-version = "0.4.30"
273++version = "0.4.33"
274+ source = "registry+https://github.com/rust-lang/crates.io-index"
275+-checksum = "489997b7557e9a43e192c527face4feacc78bfbe6eed67fd55c4c9e381cba290"
276++checksum = "c0bcfbd6a598361fda270d82469fff3d65089dc33e175c9a131f7b4cd395f228"
277+ dependencies = [
278+ "filetime",
279+ "libc",
280+- "redox_syscall",
281+ "xattr",
282+ ]
283+
284+@@ -463,9 +460,9 @@ dependencies = [
285+
286+ [[package]]
287+ name = "terminal_size"
288+-version = "0.1.15"
289++version = "0.1.16"
290+ source = "registry+https://github.com/rust-lang/crates.io-index"
291+-checksum = "4bd2d183bd3fac5f5fe38ddbeb4dc9aec4a39a9d7d59e7491d900302da01cbe1"
292++checksum = "86ca8ced750734db02076f44132d802af0b33b09942331f4459dde8636fd2406"
293+ dependencies = [
294+ "libc",
295+ "winapi",
296+@@ -482,33 +479,24 @@ dependencies = [
297+
298+ [[package]]
299+ name = "thiserror"
300+-version = "1.0.23"
301++version = "1.0.24"
302+ source = "registry+https://github.com/rust-lang/crates.io-index"
303+-checksum = "76cc616c6abf8c8928e2fdcc0dbfab37175edd8fb49a4641066ad1364fdab146"
304++checksum = "e0f4a65597094d4483ddaed134f409b2cb7c1beccf25201a9f73c719254fa98e"
305+ dependencies = [
306+ "thiserror-impl",
307+ ]
308+
309+ [[package]]
310+ name = "thiserror-impl"
311+-version = "1.0.23"
312++version = "1.0.24"
313+ source = "registry+https://github.com/rust-lang/crates.io-index"
314+-checksum = "9be73a2caec27583d0046ef3796c3794f868a5bc813db689eed00c7631275cd1"
315++checksum = "7765189610d8241a44529806d6fd1f2e0a08734313a35d5b3a556f92b381f3c0"
316+ dependencies = [
317+ "proc-macro2",
318+ "quote",
319+ "syn",
320+ ]
321+
322+-[[package]]
323+-name = "thread_local"
324+-version = "1.0.1"
325+-source = "registry+https://github.com/rust-lang/crates.io-index"
326+-checksum = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14"
327+-dependencies = [
328+- "lazy_static",
329+-]
330+-
331+ [[package]]
332+ name = "toml"
333+ version = "0.5.8"
334+@@ -532,9 +520,9 @@ checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564"
335+
336+ [[package]]
337+ name = "vcpkg"
338+-version = "0.2.11"
339++version = "0.2.12"
340+ source = "registry+https://github.com/rust-lang/crates.io-index"
341+-checksum = "b00bca6106a5e23f3eee943593759b7fcddb00554332e856d990c893966879fb"
342++checksum = "cbdbff6266a24120518560b5dc983096efb98462e51d0d68169895b237be3e5d"
343+
344+ [[package]]
345+ name = "vec_map"
pkgs/top-level/all-packages.nix+2
@@ -22698,6 +22698,8 @@ in
2269822698 jdk = jdk11;
2269922699 });
2270022700
22701+ ecpdap = callPackage ../development/tools/ecpdap { };
22702+
2270122703 ecs-agent = callPackage ../applications/virtualization/ecs-agent { };
2270222704
2270322705 ed = callPackage ../applications/editors/ed { };