diff options
Diffstat (limited to 'fun')
| -rw-r--r-- | fun/paroxysm/Cargo.nix | 192 |
1 files changed, 127 insertions, 65 deletions
diff --git a/fun/paroxysm/Cargo.nix b/fun/paroxysm/Cargo.nix index 4318ee2cb89b..ff7574cf7a69 100644 --- a/fun/paroxysm/Cargo.nix +++ b/fun/paroxysm/Cargo.nix @@ -1,4 +1,4 @@ -# This file was @generated by crate2nix 0.12.0 with the command: +# This file was @generated by crate2nix 0.14.1 with the command: # "generate" # See https://github.com/kolloch/crate2nix for more info. @@ -13,6 +13,8 @@ , rootFeatures ? [ "default" ] # If true, throw errors instead of issueing deprecation warnings. , strictDeprecation ? false + # Elements to add to the `-C target-feature=` argument passed to `rustc` + # (separated by `,`, prefixed with `+`). # Used for conditional compilation based on CPU feature detection. , targetFeatures ? [ ] # Whether to perform release builds: longer compile times, faster binaries. @@ -155,6 +157,7 @@ rec { version = "0.1.1"; edition = "2018"; sha256 = "1w7ynjxrfs97xg3qlcdns4kgfpwcdv824g611fq32cag4cdr96g9"; + libName = "android_tzdata"; authors = [ "RumovZ" ]; @@ -393,6 +396,7 @@ rec { version = "0.1.10"; edition = "2018"; sha256 = "08h80ihs74jcyp24cd75wwabygbbdgl05k6p5dmq8akbr78vv1a7"; + libName = "cfg_if"; authors = [ "Alex Crichton <alex@alexcrichton.com>" ]; @@ -407,6 +411,7 @@ rec { version = "1.0.0"; edition = "2018"; sha256 = "1za0vb97n4brpzpv8lsbnzmq5r8f2b0cpqqr0sy8h5bn751xxwds"; + libName = "cfg_if"; authors = [ "Alex Crichton <alex@alexcrichton.com>" ]; @@ -572,6 +577,7 @@ rec { version = "0.9.4"; edition = "2018"; sha256 = "13zvbbj07yk3b61b8fhwfzhy35535a583irf23vlcg59j7h9bqci"; + libName = "core_foundation"; authors = [ "The Servo Project Developers" ]; @@ -603,6 +609,7 @@ rec { version = "0.8.6"; edition = "2018"; sha256 = "13w6sdf06r0hn7bx2b45zxsg1mm2phz34jikm6xc5qrbr6djpsh6"; + libName = "core_foundation_sys"; authors = [ "The Servo Project Developers" ]; @@ -615,12 +622,7 @@ rec { crateName = "crimp"; version = "4087.0.0"; edition = "2015"; - # We can't filter paths with references in Nix 2.4 - # See https://github.com/NixOS/nix/issues/5410 - src = - if ((lib.versionOlder builtins.nixVersion "2.4pre20211007") || (lib.versionOlder "2.5" builtins.nixVersion)) - then lib.cleanSourceWith { filter = sourceFilter; src = ../../net/crimp; } - else ../../net/crimp; + src = lib.cleanSourceWith { filter = sourceFilter; src = ../../net/crimp; }; authors = [ "Vincent Ambo <tazjin@tvl.su>" ]; @@ -653,6 +655,7 @@ rec { version = "0.7.4"; edition = "2015"; sha256 = "1v99xcdjk4zixvxnq7pssip670mlyhw1ma3qc88ca11jxnfz43y2"; + libName = "crossbeam_deque"; authors = [ "The Crossbeam Project Developers" ]; @@ -677,6 +680,7 @@ rec { version = "0.8.2"; edition = "2015"; sha256 = "1knsf0zz7rgzxn0nwz5gajjcrivxpw3zrdcp946gdhdgr9sd53h5"; + libName = "crossbeam_epoch"; authors = [ "The Crossbeam Project Developers" ]; @@ -729,6 +733,7 @@ rec { version = "0.2.3"; edition = "2015"; sha256 = "0w15z68nz3ac4f2s4djhwha8vmlwsh9dlfrmsl4x84y2ah5acjvp"; + libName = "crossbeam_queue"; authors = [ "The Crossbeam Project Developers" ]; @@ -759,6 +764,7 @@ rec { version = "0.7.2"; edition = "2015"; sha256 = "1a31wbrda1320gj2a6az1lin2d34xfc3xf88da4c17qy5lxcgiy3"; + libName = "crossbeam_utils"; authors = [ "The Crossbeam Project Developers" ]; @@ -1331,6 +1337,7 @@ rec { version = "0.3.2"; edition = "2015"; sha256 = "1cgk0vyd7r45cj769jym4a6s7vwshvd0z4bqrb92q1fwibmkkwzn"; + libName = "foreign_types"; authors = [ "Steven Fackler <sfackler@gmail.com>" ]; @@ -1347,6 +1354,7 @@ rec { version = "0.1.1"; edition = "2015"; sha256 = "0jxgzd04ra4imjv8jgkmdq59kj8fsz6w4zxsbmlai34h26225c00"; + libName = "foreign_types_shared"; authors = [ "Steven Fackler <sfackler@gmail.com>" ]; @@ -1357,6 +1365,7 @@ rec { version = "0.3.3"; edition = "2015"; sha256 = "10jxc5ks1x06gpd0xg51kcjrxr35nj6qhx2zlc5n7bmskv3675rf"; + libName = "fuchsia_zircon"; authors = [ "Raph Levien <raph@google.com>" ]; @@ -1377,6 +1386,7 @@ rec { version = "0.3.3"; edition = "2015"; sha256 = "19zp2085qsyq2bh1gvcxq1lb8w6v6jj9kbdkhpdjrl95fypakjix"; + libName = "fuchsia_zircon_sys"; authors = [ "Raph Levien <raph@google.com>" ]; @@ -1455,6 +1465,7 @@ rec { version = "0.1.19"; edition = "2018"; sha256 = "0cxcm8093nf5fyn114w8vxbrbcyvv91d4015rdnlgfll7cs6gd32"; + libName = "hermit_abi"; authors = [ "Stefan Lankes" ]; @@ -1477,6 +1488,7 @@ rec { version = "0.3.9"; edition = "2021"; sha256 = "092hxjbjnq5fmz66grd9plxd0sh6ssg5fhgwwwqbrzgzkjwdycfj"; + libName = "hermit_abi"; authors = [ "Stefan Lankes" ]; @@ -1509,6 +1521,7 @@ rec { version = "0.1.60"; edition = "2018"; sha256 = "0hdid5xz3jznm04lysjm3vi93h3c523w0hcc3xba47jl3ddbpzz7"; + libName = "iana_time_zone"; authors = [ "Andrew Straw <strawman@astraw.com>" "René Kijewski <rene.kijewski@fu-berlin.de>" @@ -1554,6 +1567,7 @@ rec { version = "0.1.2"; edition = "2018"; sha256 = "17r6jmj31chn7xs9698r122mapq85mfnv98bb4pg6spm0si2f67k"; + libName = "iana_time_zone_haiku"; authors = [ "René Kijewski <crates.io@k6i.de>" ]; @@ -1688,6 +1702,7 @@ rec { version = "0.3.69"; edition = "2018"; sha256 = "0v99rz97asnzapb0jsc3jjhvxpfxr7h7qd97yqyrf9i7viimbh99"; + libName = "js_sys"; authors = [ "The wasm-bindgen Developers" ]; @@ -1772,6 +1787,7 @@ rec { edition = "2018"; links = "z"; sha256 = "1xj89rjhk642x8271xr9phj7da7ivwyvd5g8fmb7ma5asgsk2xq3"; + libName = "libz_sys"; authors = [ "Alex Crichton <alex@alexcrichton.com>" "Josh Triplett <josh@joshtriplett.org>" @@ -1811,6 +1827,7 @@ rec { version = "0.3.0"; edition = "2015"; sha256 = "1kaf95grvfqchxn8pl0854g8ab0fzl56217hndhhhz5qqm2j09kd"; + libName = "linked_hash_map"; authors = [ "Stepan Koltsov <stepan.koltsov@gmail.com>" "Andrew Paseltiner <apaseltiner@gmail.com>" @@ -1840,6 +1857,7 @@ rec { version = "0.5.6"; edition = "2015"; sha256 = "03vpgw7x507g524nx5i1jf5dl8k3kv0fzg8v3ip6qqwbpkqww5q7"; + libName = "linked_hash_map"; authors = [ "Stepan Koltsov <stepan.koltsov@gmail.com>" "Andrew Paseltiner <apaseltiner@gmail.com>" @@ -1856,6 +1874,7 @@ rec { version = "0.4.13"; edition = "2021"; sha256 = "172k2c6422gsc914ig8rh99mb9yc7siw6ikc3d9xw1k7vx0s3k81"; + libName = "linux_raw_sys"; authors = [ "Dan Gohman <dev@sunfishcode.online>" ]; @@ -1943,6 +1962,7 @@ rec { version = "2.0.0"; edition = "2015"; sha256 = "004y0nzmpfdrhz251278341z6ql34iv1k6dp1h6af7d6nd6jwc30"; + libName = "maybe_uninit"; authors = [ "est31 <MTest31@outlook.com>" "The Rust Project Developers" @@ -2082,6 +2102,7 @@ rec { version = "0.6.8"; edition = "2015"; sha256 = "1w36w09gd8as1mah80wdy0kgpshmphmljj68gij34hvdnag6kjxg"; + libName = "mio_uds"; authors = [ "Alex Crichton <alex@alexcrichton.com>" ]; @@ -2138,6 +2159,7 @@ rec { version = "0.2.11"; edition = "2015"; sha256 = "0bmrlg0fmzxaycjpkgkchi93av07v2yf9k33gc12ca9gqdrn28h7"; + libName = "native_tls"; authors = [ "Steven Fackler <sfackler@gmail.com>" ]; @@ -2271,6 +2293,7 @@ rec { version = "0.1.43"; edition = "2015"; sha256 = "0c9whknf2dm74a3cqirafy6gj83a76gl56g4v3g19k6lkwz13rcj"; + libName = "num_traits"; authors = [ "The Rust Project Developers" ]; @@ -2287,6 +2310,7 @@ rec { version = "0.2.18"; edition = "2018"; sha256 = "0yjib8p2p9kzmaz48xwhs69w5dh1wipph9jgnillzd2x33jz03fs"; + libName = "num_traits"; authors = [ "The Rust Project Developers" ]; @@ -2427,6 +2451,7 @@ rec { edition = "2018"; sha256 = "173xxvfc63rr5ybwqwylsir0vq6xsj4kxiv4hmg4c3vscdmncj59"; procMacro = true; + libName = "openssl_macros"; dependencies = [ { name = "proc-macro2"; @@ -2449,6 +2474,7 @@ rec { version = "0.1.5"; edition = "2015"; sha256 = "1kq18qm48rvkwgcggfkqq6pm948190czqc94d6bm2sir5hq1l0gz"; + libName = "openssl_probe"; authors = [ "Alex Crichton <alex@alexcrichton.com>" ]; @@ -2461,6 +2487,7 @@ rec { links = "openssl"; sha256 = "1zwd35nc5bq7m26vjsmja4hxf3fzk389blgpmhpzr3p78krv18nx"; build = "build/main.rs"; + libName = "openssl_sys"; authors = [ "Alex Crichton <alex@alexcrichton.com>" "Steven Fackler <sfackler@gmail.com>" @@ -2655,12 +2682,7 @@ rec { requiredFeatures = [ ]; } ]; - # We can't filter paths with references in Nix 2.4 - # See https://github.com/NixOS/nix/issues/5410 - src = - if ((lib.versionOlder builtins.nixVersion "2.4pre20211007") || (lib.versionOlder "2.5" builtins.nixVersion)) - then lib.cleanSourceWith { filter = sourceFilter; src = ./.; } - else ./.; + src = lib.cleanSourceWith { filter = sourceFilter; src = ./.; }; authors = [ "eeeeeta <eta@theta.eu.org>" ]; @@ -2723,6 +2745,7 @@ rec { version = "0.3.30"; edition = "2015"; sha256 = "1v07557dj1sa0aly9c90wsygc0i8xv5vnmyv0g94lpkvj8qb4cfj"; + libName = "pkg_config"; authors = [ "Alex Crichton <alex@alexcrichton.com>" ]; @@ -2733,6 +2756,7 @@ rec { version = "0.2.17"; edition = "2018"; sha256 = "1pp6g52aw970adv3x2310n7glqnji96z0a9wiamzw89ibf0ayh2v"; + libName = "ppv_lite86"; authors = [ "The CryptoCorrosion Contributors" ]; @@ -2764,6 +2788,7 @@ rec { version = "1.0.78"; edition = "2021"; sha256 = "1bjak27pqdn4f4ih1c9nr3manzyavsgqmf76ygw9k76q8pb2lhp2"; + libName = "proc_macro2"; authors = [ "David Tolnay <dtolnay@gmail.com>" "Alex Crichton <alex@alexcrichton.com>" @@ -2784,6 +2809,7 @@ rec { version = "1.2.3"; edition = "2015"; sha256 = "1q6za3v78hsspisc197bg3g7rpc989qycy8ypr8ap8igv10ikl51"; + libName = "quick_error"; authors = [ "Paul Colomiets <paul@colomiets.name>" "Colin Kiegel <kiegel@gmx.de>" @@ -3060,6 +3086,7 @@ rec { version = "0.4.6"; edition = "2021"; sha256 = "1spaq7y4im7s56d1gxa2hi4hzf6dwswb1bv8xyavzya7k25kpf46"; + libName = "regex_automata"; authors = [ "The Rust Project Developers" "Andrew Gallant <jamslam@gmail.com>" @@ -3120,6 +3147,7 @@ rec { version = "0.8.2"; edition = "2021"; sha256 = "17rd2s8xbiyf6lb4aj2nfi44zqlj98g2ays8zzj2vfs743k79360"; + libName = "regex_syntax"; authors = [ "The Rust Project Developers" "Andrew Gallant <jamslam@gmail.com>" @@ -3147,6 +3175,7 @@ rec { version = "0.1.23"; edition = "2015"; sha256 = "0xnbk2bmyzshacjm2g1kd4zzv2y2az14bw3sjccq5qkpmsfvn9nn"; + libName = "rustc_demangle"; authors = [ "Alex Crichton <alex@alexcrichton.com>" ]; @@ -3323,6 +3352,7 @@ rec { version = "0.2.7"; edition = "2018"; sha256 = "068s77f9xcpvzl70nsxk8750dzzc6f9pixajhd979815cj0ndg1w"; + libName = "scheduled_thread_pool"; authors = [ "Steven Fackler <sfackler@gmail.com>" ]; @@ -3339,6 +3369,7 @@ rec { version = "0.1.2"; edition = "2015"; sha256 = "0a2bn9d2mb07c6l16sadijy4p540g498zddfxyiq4rsqpwrglbrk"; + libName = "scoped_tls"; authors = [ "Alex Crichton <alex@alexcrichton.com>" ]; @@ -3361,6 +3392,7 @@ rec { version = "2.9.2"; edition = "2021"; sha256 = "1pplxk15s5yxvi2m1sz5xfmjibp96cscdcl432w9jzbk0frlzdh5"; + libName = "security_framework"; authors = [ "Steven Fackler <sfackler@gmail.com>" "Kornel <kornel@geekhood.net>" @@ -3407,6 +3439,7 @@ rec { version = "2.9.1"; edition = "2021"; sha256 = "0yhciwlsy9dh0ps1gw3197kvyqx1bvc4knrhiznhid6kax196cp9"; + libName = "security_framework_sys"; authors = [ "Steven Fackler <sfackler@gmail.com>" "Kornel <kornel@geekhood.net>" @@ -3458,6 +3491,7 @@ rec { version = "0.7.0"; edition = "2015"; sha256 = "18vhypw6zgccnrlm5ps1pwa0khz7ry927iznpr88b87cagr1v2iq"; + libName = "semver_parser"; authors = [ "Steve Klabnik <steve@steveklabnik.com>" ]; @@ -3519,6 +3553,7 @@ rec { version = "0.8.2"; edition = "2015"; sha256 = "0lv1qwis9rr767xv9w27y1g1r71ayf02k2wkypawwlkxsrd3r0qb"; + libName = "serde_hjson"; authors = [ "Christian Zangl <laktak@cdak.net>" ]; @@ -4022,6 +4057,7 @@ rec { version = "0.1.2"; edition = "2015"; sha256 = "0swpfngcb331lzggk6j68yks6w0bnw35vpl4hv8p03msc239kci5"; + libName = "tokio_codec"; authors = [ "Carl Lerche <me@carllerche.com>" "Bryan Burgers <bryan@burgers.io>" @@ -4047,6 +4083,7 @@ rec { version = "0.1.18"; edition = "2015"; sha256 = "1m7zij19xy13wmlb7a1bghvi4vs8s1hlyggnaajvqfj46i9kkcc7"; + libName = "tokio_core"; authors = [ "Carl Lerche <me@carllerche.com>" ]; @@ -4103,6 +4140,7 @@ rec { version = "0.1.7"; edition = "2015"; sha256 = "03p2w316ha0irgzvy37njx9hl71133gcrmrq4801w4rzm0r0xpmi"; + libName = "tokio_current_thread"; authors = [ "Carl Lerche <me@carllerche.com>" ]; @@ -4123,6 +4161,7 @@ rec { version = "0.1.10"; edition = "2015"; sha256 = "0w8n78d2vixs1vghqc4wy9w0d1h6qkli51c1yzhzbns88n7inbgv"; + libName = "tokio_executor"; authors = [ "Carl Lerche <me@carllerche.com>" ]; @@ -4143,6 +4182,7 @@ rec { version = "0.1.7"; edition = "2015"; sha256 = "1x3gkdi5x7bjlzzg7qlnymb549rb546p0nykxsh04qyaw0314yi9"; + libName = "tokio_fs"; authors = [ "Carl Lerche <me@carllerche.com>" ]; @@ -4173,6 +4213,7 @@ rec { version = "0.1.13"; edition = "2015"; sha256 = "0x06zyzinans1pn90g6i150lgixijdf1cg8y2gipjd09ms58dz2p"; + libName = "tokio_io"; authors = [ "Carl Lerche <me@carllerche.com>" ]; @@ -4197,6 +4238,7 @@ rec { version = "1.1.0"; edition = "2015"; sha256 = "0mg1i39cl8x32wxwbn74hlirks8a6f3g0gfzkb0n0zwbxwvc9gs1"; + libName = "tokio_mockstream"; authors = [ "Aaron Weiss <awe@pdgn.co>" ]; @@ -4217,6 +4259,7 @@ rec { version = "0.1.12"; edition = "2015"; sha256 = "0l8klnd41q55f3ialzz0lb7s5bfwa38nh86sa9vai2xsqh75kg09"; + libName = "tokio_reactor"; authors = [ "Carl Lerche <me@carllerche.com>" ]; @@ -4279,6 +4322,7 @@ rec { version = "0.1.8"; edition = "2015"; sha256 = "1vkxz0y7qf9sshfpxvn506pvxy4vza8piavd8p64y5n85cam1zpd"; + libName = "tokio_sync"; authors = [ "Carl Lerche <me@carllerche.com>" ]; @@ -4299,6 +4343,7 @@ rec { version = "0.1.4"; edition = "2015"; sha256 = "0whzqnkyfym1ipzznibyjl3j9281walq4n0q5xs2xdz3cvniipwq"; + libName = "tokio_tcp"; authors = [ "Carl Lerche <me@carllerche.com>" ]; @@ -4335,6 +4380,7 @@ rec { version = "0.1.18"; edition = "2015"; sha256 = "12azq8jm71b7hdm72pxrgqm2879bn6b0fcdl1s7i2k3qh5jhnwnz"; + libName = "tokio_threadpool"; authors = [ "Carl Lerche <me@carllerche.com>" ]; @@ -4383,6 +4429,7 @@ rec { version = "0.1.2"; edition = "2015"; sha256 = "1z0fwbh5bm6hdbfm0y17fa5l60na7fl9vbca7wdzz1vp0f0ffcb1"; + libName = "tokio_timer"; authors = [ "Carl Lerche <me@carllerche.com>" ]; @@ -4403,6 +4450,7 @@ rec { version = "0.2.13"; edition = "2015"; sha256 = "15pjjj6daks3sii8p24a509b0dapl2kyk740nwfgz59w64nly14k"; + libName = "tokio_timer"; authors = [ "Carl Lerche <me@carllerche.com>" ]; @@ -4431,6 +4479,7 @@ rec { version = "0.2.1"; edition = "2015"; sha256 = "0z0gmvv7jrpan6y42p5f5wd48rqcd96igp592w1c5cr573c8qjrm"; + libName = "tokio_tls"; authors = [ "Carl Lerche <me@carllerche.com>" ]; @@ -4455,6 +4504,7 @@ rec { version = "0.1.6"; edition = "2015"; sha256 = "10hdcnxdp0dxvj44jl1nrrpg30jbisqclbqs0f5w6f8bc47b3872"; + libName = "tokio_udp"; authors = [ "Carl Lerche <me@carllerche.com>" ]; @@ -4495,6 +4545,7 @@ rec { version = "0.2.7"; edition = "2015"; sha256 = "1q74sydx22l4mkmrz02l4i5swddwr1pryxvhrzdwkj0i86na8mxb"; + libName = "tokio_uds"; authors = [ "Carl Lerche <me@carllerche.com>" ]; @@ -4563,6 +4614,7 @@ rec { version = "1.0.12"; edition = "2018"; sha256 = "0jzf1znfpb2gx8nr8mvmyqs1crnv79l57nxnbiszc7xf7ynbjm1k"; + libName = "unicode_ident"; authors = [ "David Tolnay <dtolnay@gmail.com>" ]; @@ -4573,6 +4625,7 @@ rec { version = "0.2.4"; edition = "2015"; sha256 = "131dfzf7d8fsr1ivch34x42c2d1ik5ig3g78brxncnn0r1sdyqpr"; + libName = "unicode_xid"; authors = [ "erick.tryzelaar <erick.tryzelaar@gmail.com>" "kwantam <kwantam@gmail.com>" @@ -4623,6 +4676,7 @@ rec { version = "0.2.92"; edition = "2018"; sha256 = "1a4mcw13nsk3fr8fxjzf9kk1wj88xkfsmnm0pjraw01ryqfm7qjb"; + libName = "wasm_bindgen"; authors = [ "The wasm-bindgen Developers" ]; @@ -4654,6 +4708,7 @@ rec { version = "0.2.92"; edition = "2018"; sha256 = "1nj7wxbi49f0rw9d44rjzms26xlw6r76b2mrggx8jfbdjrxphkb1"; + libName = "wasm_bindgen_backend"; authors = [ "The wasm-bindgen Developers" ]; @@ -4699,6 +4754,7 @@ rec { edition = "2018"; sha256 = "09npa1srjjabd6nfph5yc03jb26sycjlxhy0c2a1pdrpx4yq5y51"; procMacro = true; + libName = "wasm_bindgen_macro"; authors = [ "The wasm-bindgen Developers" ]; @@ -4723,6 +4779,7 @@ rec { version = "0.2.92"; edition = "2018"; sha256 = "1dqv2xs8zcyw4kjgzj84bknp2h76phmsb3n7j6hn396h4ssifkz9"; + libName = "wasm_bindgen_macro_support"; authors = [ "The wasm-bindgen Developers" ]; @@ -4761,6 +4818,7 @@ rec { edition = "2018"; links = "wasm_bindgen"; sha256 = "15kyavsrna2cvy30kg03va257fraf9x00ny554vxngvpyaa0q6dg"; + libName = "wasm_bindgen_shared"; authors = [ "The wasm-bindgen Developers" ]; @@ -4788,12 +4846,12 @@ rec { { name = "winapi-i686-pc-windows-gnu"; packageId = "winapi-i686-pc-windows-gnu"; - target = { target, features }: (pkgs.rust.lib.toRustTarget stdenv.hostPlatform == "i686-pc-windows-gnu"); + target = { target, features }: (stdenv.hostPlatform.rust.rustcTarget == "i686-pc-windows-gnu"); } { name = "winapi-x86_64-pc-windows-gnu"; packageId = "winapi-x86_64-pc-windows-gnu"; - target = { target, features }: (pkgs.rust.lib.toRustTarget stdenv.hostPlatform == "x86_64-pc-windows-gnu"); + target = { target, features }: (stdenv.hostPlatform.rust.rustcTarget == "x86_64-pc-windows-gnu"); } ]; features = { @@ -4817,6 +4875,7 @@ rec { version = "0.4.0"; edition = "2015"; sha256 = "1dmpa6mvcvzz16zg6d5vrfy4bxgg541wxrcip7cnshi06v38ffxc"; + libName = "winapi_i686_pc_windows_gnu"; authors = [ "Peter Atashian <retep998@gmail.com>" ]; @@ -4827,6 +4886,7 @@ rec { version = "0.1.6"; edition = "2021"; sha256 = "15i5lm39wd44004i9d5qspry2cynkrpvwzghr6s2c3dsk28nz7pj"; + libName = "winapi_util"; authors = [ "Andrew Gallant <jamslam@gmail.com>" ]; @@ -4845,6 +4905,7 @@ rec { version = "0.4.0"; edition = "2015"; sha256 = "0gqq64czqb64kskjryj8isp62m2sgvx25yyj3kpc2myh85w24bki"; + libName = "winapi_x86_64_pc_windows_gnu"; authors = [ "Peter Atashian <retep998@gmail.com>" ]; @@ -4855,6 +4916,7 @@ rec { version = "0.52.0"; edition = "2021"; sha256 = "1nc3qv7sy24x0nlnb32f7alzpd6f72l4p24vl65vydbyil669ark"; + libName = "windows_core"; authors = [ "Microsoft" ]; @@ -4872,6 +4934,7 @@ rec { version = "0.52.0"; edition = "2021"; sha256 = "0gd3v4ji88490zgb6b5mq5zgbvwv7zx1ibn8v3x83rwcdbryaar8"; + libName = "windows_sys"; authors = [ "Microsoft" ]; @@ -5119,6 +5182,7 @@ rec { version = "0.48.5"; edition = "2018"; sha256 = "034ljxqshifs1lan89xwpcy1hp0lhdh4b5n0d2z4fwjx2piacbws"; + libName = "windows_targets"; authors = [ "Microsoft" ]; @@ -5126,7 +5190,7 @@ rec { { name = "windows_aarch64_gnullvm"; packageId = "windows_aarch64_gnullvm 0.48.5"; - target = { target, features }: (pkgs.rust.lib.toRustTarget stdenv.hostPlatform == "aarch64-pc-windows-gnullvm"); + target = { target, features }: (stdenv.hostPlatform.rust.rustcTarget == "aarch64-pc-windows-gnullvm"); } { name = "windows_aarch64_msvc"; @@ -5151,7 +5215,7 @@ rec { { name = "windows_x86_64_gnullvm"; packageId = "windows_x86_64_gnullvm 0.48.5"; - target = { target, features }: (pkgs.rust.lib.toRustTarget stdenv.hostPlatform == "x86_64-pc-windows-gnullvm"); + target = { target, features }: (stdenv.hostPlatform.rust.rustcTarget == "x86_64-pc-windows-gnullvm"); } { name = "windows_x86_64_msvc"; @@ -5166,6 +5230,7 @@ rec { version = "0.52.4"; edition = "2021"; sha256 = "06sdd7fin3dj9cmlg6n1dw0n1l10jhn9b8ckz1cqf0drb9z7plvx"; + libName = "windows_targets"; authors = [ "Microsoft" ]; @@ -5173,7 +5238,7 @@ rec { { name = "windows_aarch64_gnullvm"; packageId = "windows_aarch64_gnullvm 0.52.4"; - target = { target, features }: (pkgs.rust.lib.toRustTarget stdenv.hostPlatform == "aarch64-pc-windows-gnullvm"); + target = { target, features }: (stdenv.hostPlatform.rust.rustcTarget == "aarch64-pc-windows-gnullvm"); } { name = "windows_aarch64_msvc"; @@ -5198,7 +5263,7 @@ rec { { name = "windows_x86_64_gnullvm"; packageId = "windows_x86_64_gnullvm 0.52.4"; - target = { target, features }: (pkgs.rust.lib.toRustTarget stdenv.hostPlatform == "x86_64-pc-windows-gnullvm"); + target = { target, features }: (stdenv.hostPlatform.rust.rustcTarget == "x86_64-pc-windows-gnullvm"); } { name = "windows_x86_64_msvc"; @@ -5376,6 +5441,7 @@ rec { version = "0.4.5"; edition = "2018"; sha256 = "118wbqrr4n6wgk5rjjnlrdlahawlxc1bdsx146mwk8f79in97han"; + libName = "yaml_rust"; authors = [ "Yuheng Chen <yuhengchen@sensetime.com>" ]; @@ -5402,14 +5468,11 @@ rec { fuchsia = true; test = false; - /* We are choosing an arbitrary rust version to grab `lib` from, - which is unfortunate, but `lib` has been version-agnostic the - whole time so this is good enough for now. - */ - os = pkgs.rust.lib.toTargetOs platform; - arch = pkgs.rust.lib.toTargetArch platform; - family = pkgs.rust.lib.toTargetFamily platform; - vendor = pkgs.rust.lib.toTargetVendor platform; + inherit (platform.rust.platform) + arch + os + vendor; + family = platform.rust.platform.target-family; env = "gnu"; endian = if platform.parsed.cpu.significantByte.name == "littleEndian" @@ -5486,6 +5549,7 @@ rec { ( _: { buildTests = true; + release = false; } ); # If the user hasn't set any pre/post commands, we don't want to @@ -5498,41 +5562,41 @@ rec { testPostRun ]); in - pkgs.runCommand "run-tests-${testCrate.name}" - { - inherit testCrateFlags; - buildInputs = testInputs; - } '' - set -e - - export RUST_BACKTRACE=1 - - # recreate a file hierarchy as when running tests with cargo - - # the source for test data - ${pkgs.buildPackages.xorg.lndir}/bin/lndir ${crate.src} - - # build outputs - testRoot=target/debug - mkdir -p $testRoot - - # executables of the crate - # we copy to prevent std::env::current_exe() to resolve to a store location - for i in ${crate}/bin/*; do - cp "$i" "$testRoot" - done - chmod +w -R . - - # test harness executables are suffixed with a hash, like cargo does - # this allows to prevent name collision with the main - # executables of the crate - hash=$(basename $out) - for file in ${drv}/tests/*; do - f=$testRoot/$(basename $file)-$hash - cp $file $f - ${testCommand} - done - ''; + pkgs.stdenvNoCC.mkDerivation { + name = "run-tests-${testCrate.name}"; + + inherit (crate) src; + + inherit testCrateFlags; + + buildInputs = testInputs; + + buildPhase = '' + set -e + export RUST_BACKTRACE=1 + + # build outputs + testRoot=target/debug + mkdir -p $testRoot + + # executables of the crate + # we copy to prevent std::env::current_exe() to resolve to a store location + for i in ${crate}/bin/*; do + cp "$i" "$testRoot" + done + chmod +w -R . + + # test harness executables are suffixed with a hash, like cargo does + # this allows to prevent name collision with the main + # executables of the crate + hash=$(basename $out) + for file in ${drv}/tests/*; do + f=$testRoot/$(basename $file)-$hash + cp $file $f + ${testCommand} + done + ''; + }; in pkgs.runCommand "${crate.name}-linked" { @@ -5641,7 +5705,7 @@ rec { let self = { crates = lib.mapAttrs (packageId: value: buildByPackageIdForPkgsImpl self pkgs packageId) crateConfigs; - target = makeTarget pkgs.stdenv.hostPlatform; + target = makeTarget stdenv.hostPlatform; build = mkBuiltByPackageIdByPkgs pkgs.buildPackages; }; in @@ -5716,8 +5780,6 @@ rec { buildRustCrateForPkgsFunc pkgs ( crateConfig // { - # https://github.com/NixOS/nixpkgs/issues/218712 - dontStrip = stdenv.hostPlatform.isDarwin; src = crateConfig.src or ( pkgs.fetchurl rec { name = "${crateConfig.crateName}-${crateConfig.version}.tar.gz"; |