From 7c4ef6834a24ab09e2f5b0361050fc516bbe26be Mon Sep 17 00:00:00 2001 From: Stacky McStackface <95074132+stackable-bot@users.noreply.github.com> Date: Fri, 16 Aug 2024 15:37:07 +0200 Subject: [PATCH] chore: Generated commit to update templated files since the last template run up to stackabletech/operator-templating@96bde7f0390a2c0ebbd5ce7919076408d4219ce1 (#491) Reference-to: stackabletech/operator-templating@96bde7f (@sbernauer: Bump to Rust 0.80.1) --- .github/workflows/build.yml | 2 +- Cargo.nix | 894 +++++++++++++++++------------------- crate-hashes.json | 6 +- nix/sources.json | 12 +- 4 files changed, 426 insertions(+), 488 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 41473c67..22968241 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -430,7 +430,7 @@ jobs: steps: - name: Install preflight run: | - wget https://github.com/redhat-openshift-ecosystem/openshift-preflight/releases/download/1.9.4/preflight-linux-amd64 + wget https://github.com/redhat-openshift-ecosystem/openshift-preflight/releases/download/1.10.0/preflight-linux-amd64 chmod +x preflight-linux-amd64 - name: Check container run: | diff --git a/Cargo.nix b/Cargo.nix index a52918d9..c82c47a5 100644 --- a/Cargo.nix +++ b/Cargo.nix @@ -1,5 +1,5 @@ -# This file was @generated by crate2nix 0.14.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. @@ -14,6 +14,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. @@ -274,9 +276,9 @@ rec { }; "anstream" = rec { crateName = "anstream"; - version = "0.6.14"; + version = "0.6.15"; edition = "2021"; - sha256 = "0nx1vnfs2lil1sl14l49i6jvp6zpjczn85wxx4xw1ycafvx7b321"; + sha256 = "09nm4qj34kiwgzczdvj14x7hgsb235g4sqsay3xsz7zqn4d5rqb4"; dependencies = [ { name = "anstyle"; @@ -319,9 +321,9 @@ rec { }; "anstyle" = rec { crateName = "anstyle"; - version = "1.0.7"; + version = "1.0.8"; edition = "2021"; - sha256 = "06qxmrba0xbhv07jpdvrdrhw1hjlb9icj88bqvlnissz9bqgr383"; + sha256 = "1cfmkza63xpn1kkz844mgjwm9miaiz4jkyczmwxzivcsypk1vv0v"; features = { "default" = [ "std" ]; }; @@ -329,9 +331,9 @@ rec { }; "anstyle-parse" = rec { crateName = "anstyle-parse"; - version = "0.2.4"; + version = "0.2.5"; edition = "2021"; - sha256 = "1m121pa4plpcb4g7xali2kv9njmgb3713q3fxf60b4jd0fli2fn0"; + sha256 = "1jy12rvgbldflnb2x7mcww9dcffw1mx22nyv6p3n7d62h0gdwizb"; libName = "anstyle_parse"; dependencies = [ { @@ -349,9 +351,9 @@ rec { }; "anstyle-query" = rec { crateName = "anstyle-query"; - version = "1.1.0"; + version = "1.1.1"; edition = "2021"; - sha256 = "14a3h3k541jmqm5s8hbdw8l0dcgkrryqwxgicm8x6623fvxnw65d"; + sha256 = "0aj22iy4pzk6mz745sfrm1ym14r0y892jhcrbs8nkj7nqx9gqdkd"; libName = "anstyle_query"; dependencies = [ { @@ -365,9 +367,9 @@ rec { }; "anstyle-wincon" = rec { crateName = "anstyle-wincon"; - version = "3.0.3"; + version = "3.0.4"; edition = "2021"; - sha256 = "06gv2vbj4hvwb8fxqjmvabp5kx2w01cjgh86pd98y1mpzr4q98v1"; + sha256 = "1y2pkvsrdxbcwircahb4wimans2pzmwwxad7ikdhj5lpdqdlxxsv"; libName = "anstyle_wincon"; dependencies = [ { @@ -474,7 +476,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.70"; + packageId = "syn 2.0.74"; features = [ "full" "visit-mut" ]; } ]; @@ -501,7 +503,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.70"; + packageId = "syn 2.0.74"; usesDefaultFeatures = false; features = [ "full" "visit-mut" "parsing" "printing" "proc-macro" ]; } @@ -925,7 +927,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.70"; + packageId = "syn 2.0.74"; features = [ "full" "extra-traits" "visit-mut" ]; } { @@ -1114,9 +1116,9 @@ rec { }; "bytes" = rec { crateName = "bytes"; - version = "1.6.0"; + version = "1.7.1"; edition = "2018"; - sha256 = "1jf2awc1fywpk15m6pxay3wqcg65ararg9xi4b08vnszwiyy2kai"; + sha256 = "0l5sf69avjxcw41cznyzxsnymwmkpmk08q0sm7fgicvvn0ysa643"; authors = [ "Carl Lerche " "Sean McArthur " @@ -1159,9 +1161,9 @@ rec { }; "cc" = rec { crateName = "cc"; - version = "1.1.1"; + version = "1.1.10"; edition = "2018"; - sha256 = "0gdqz6g6hhvjc6vnai3b2mhfvfrk4xh7s3ifixzl2r876s0qazch"; + sha256 = "14jjp993s17yfvl5linq3gs4jzb7f42nkq09r5kyfjskmjzsms79"; authors = [ "Alex Crichton " ]; @@ -1179,14 +1181,9 @@ rec { usesDefaultFeatures = false; target = { target, features }: (target."unix" or false); } - { - name = "once_cell"; - packageId = "once_cell"; - optional = true; - } ]; features = { - "parallel" = [ "dep:libc" "dep:jobserver" "dep:once_cell" ]; + "parallel" = [ "dep:libc" "dep:jobserver" ]; }; resolvedDefaultFeatures = [ "parallel" ]; }; @@ -1255,7 +1252,7 @@ rec { } { name = "windows-targets"; - packageId = "windows-targets 0.52.6"; + packageId = "windows-targets"; optional = true; target = { target, features }: (target."windows" or false); } @@ -1377,10 +1374,10 @@ rec { }; "clap" = rec { crateName = "clap"; - version = "4.5.9"; + version = "4.5.15"; edition = "2021"; crateBin = []; - sha256 = "0ql4kc5nclygivr0711lzid3z3g26jf1ip3qda9zxhaldn2c3b34"; + sha256 = "1k656mr99srcla2bx2h7wjwlb9mywavb5k1szpd5b9pxaj287n0i"; dependencies = [ { name = "clap_builder"; @@ -1408,6 +1405,7 @@ rec { "suggestions" = [ "clap_builder/suggestions" ]; "unicode" = [ "clap_builder/unicode" ]; "unstable-doc" = [ "clap_builder/unstable-doc" "derive" ]; + "unstable-ext" = [ "clap_builder/unstable-ext" ]; "unstable-styles" = [ "clap_builder/unstable-styles" ]; "unstable-v5" = [ "clap_builder/unstable-v5" "clap_derive?/unstable-v5" "deprecated" ]; "usage" = [ "clap_builder/usage" ]; @@ -1417,9 +1415,9 @@ rec { }; "clap_builder" = rec { crateName = "clap_builder"; - version = "4.5.9"; + version = "4.5.15"; edition = "2021"; - sha256 = "0hp9xn5dnzr0xc8mancr7b3kqm1b9s74a8waybx7nbmscwykkf3g"; + sha256 = "1dmas5z20yqmlmfhykr38pn1hkcnr4jzxjw4cs2f6lkn2wmyqsi1"; dependencies = [ { name = "anstream"; @@ -1447,7 +1445,7 @@ rec { "std" = [ "anstyle/std" ]; "suggestions" = [ "dep:strsim" "error-context" ]; "unicode" = [ "dep:unicode-width" "dep:unicase" ]; - "unstable-doc" = [ "cargo" "wrap_help" "env" "unicode" "string" ]; + "unstable-doc" = [ "cargo" "wrap_help" "env" "unicode" "string" "unstable-ext" ]; "unstable-styles" = [ "color" ]; "unstable-v5" = [ "deprecated" ]; "wrap_help" = [ "help" "dep:terminal_size" ]; @@ -1456,9 +1454,9 @@ rec { }; "clap_derive" = rec { crateName = "clap_derive"; - version = "4.5.8"; + version = "4.5.13"; edition = "2021"; - sha256 = "11bh9ybcslr1psl06y9jlq9pr4cpmvzs9nbmsba0y1pvvb33bb1b"; + sha256 = "1860xq3rbgwsqwcj9rd14cky9iiywwx86j7fvvngdjixbyfka7ah"; procMacro = true; dependencies = [ { @@ -1475,7 +1473,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.70"; + packageId = "syn 2.0.74"; features = [ "full" ]; } ]; @@ -1487,16 +1485,16 @@ rec { }; "clap_lex" = rec { crateName = "clap_lex"; - version = "0.7.1"; + version = "0.7.2"; edition = "2021"; - sha256 = "0w0fci2zp1bi2kqjnp14vdxsa0r34yjd35i845c8bmfvmc5wz0jb"; + sha256 = "15zcrc2fa6ycdzaihxghf48180bnvzsivhf0fmah24bnnaf76qhl"; }; "colorchoice" = rec { crateName = "colorchoice"; - version = "1.0.1"; + version = "1.0.2"; edition = "2021"; - sha256 = "08h4jsrd2j5k6lp1b9v5p1f1g7cmyzm4djsvb3ydywdb4hmqashb"; + sha256 = "1h18ph538y8yjmbpaf8li98l0ifms2xmh3rax9666c5qfjfi3zfk"; }; "concurrent-queue" = rec { @@ -1621,9 +1619,9 @@ rec { }; "core-foundation-sys" = rec { crateName = "core-foundation-sys"; - version = "0.8.6"; + version = "0.8.7"; edition = "2018"; - sha256 = "13w6sdf06r0hn7bx2b45zxsg1mm2phz34jikm6xc5qrbr6djpsh6"; + sha256 = "12w8j73lazxmr1z0h98hf3z623kl8ms7g07jch7n4p8f9nwlhdkp"; libName = "core_foundation_sys"; authors = [ "The Servo Project Developers" @@ -1645,7 +1643,7 @@ rec { { name = "libc"; packageId = "libc"; - target = { target, features }: (pkgs.rust.lib.toRustTarget stdenv.hostPlatform == "aarch64-linux-android"); + target = { target, features }: (stdenv.hostPlatform.rust.rustcTarget == "aarch64-linux-android"); } { name = "libc"; @@ -1706,6 +1704,25 @@ rec { }; resolvedDefaultFeatures = [ "default" "iov" ]; }; + "crossbeam-channel" = rec { + crateName = "crossbeam-channel"; + version = "0.5.13"; + edition = "2021"; + sha256 = "1wkx45r34v7g3wyi3lg2wz536lrrrab4h4hh741shfhr8rlhsj1k"; + libName = "crossbeam_channel"; + dependencies = [ + { + name = "crossbeam-utils"; + packageId = "crossbeam-utils"; + usesDefaultFeatures = false; + } + ]; + features = { + "default" = [ "std" ]; + "std" = [ "crossbeam-utils/std" ]; + }; + resolvedDefaultFeatures = [ "default" "std" ]; + }; "crossbeam-utils" = rec { crateName = "crossbeam-utils"; version = "0.8.20"; @@ -1716,6 +1733,7 @@ rec { "default" = [ "std" ]; "loom" = [ "dep:loom" ]; }; + resolvedDefaultFeatures = [ "std" ]; }; "crypto-common" = rec { crateName = "crypto-common"; @@ -1800,7 +1818,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.70"; + packageId = "syn 2.0.74"; features = [ "full" "extra-traits" ]; } ]; @@ -1830,7 +1848,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.70"; + packageId = "syn 2.0.74"; } ]; @@ -1856,7 +1874,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.70"; + packageId = "syn 2.0.74"; features = [ "full" "visit-mut" ]; } ]; @@ -2529,7 +2547,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.70"; + packageId = "syn 2.0.74"; features = [ "full" ]; } ]; @@ -2828,7 +2846,7 @@ rec { } { name = "indexmap"; - packageId = "indexmap 2.2.6"; + packageId = "indexmap 2.3.0"; features = [ "std" ]; } { @@ -3080,9 +3098,9 @@ rec { }; "http-body" = rec { crateName = "http-body"; - version = "1.0.0"; + version = "1.0.1"; edition = "2018"; - sha256 = "0hyn8n3iadrbwq8y0p1rl1275s4nm49bllw5wji29g4aa3dqbb0w"; + sha256 = "111ir5k2b9ihz5nr9cz7cwm7fnydca7dx4hc7vr16scfzghxrzhy"; libName = "http_body"; authors = [ "Carl Lerche " @@ -3507,9 +3525,9 @@ rec { }; "hyper-util" = rec { crateName = "hyper-util"; - version = "0.1.6"; + version = "0.1.7"; edition = "2021"; - sha256 = "0mm9biwckhwqz23s5dp02410aw7sw2ibg167jzwv8kzf957jzf9s"; + sha256 = "1fg9h591skksq5zxnffyisj7487jhdcgj6c7bvlkckn535bhbryd"; libName = "hyper_util"; authors = [ "Sean McArthur " @@ -3736,11 +3754,11 @@ rec { "serde-1" = [ "serde" ]; }; }; - "indexmap 2.2.6" = rec { + "indexmap 2.3.0" = rec { crateName = "indexmap"; - version = "2.2.6"; + version = "2.3.0"; edition = "2021"; - sha256 = "09hgwi2ig0wyj5rjziia76zmhgfj95k0jb4ic3iiawm4vlavg3qn"; + sha256 = "182yvyck0zk3swa9bs8l9a8lmis3q7zy338wj6rx2bd81giw4gyy"; dependencies = [ { name = "equivalent"; @@ -3831,9 +3849,9 @@ rec { }; "is_terminal_polyfill" = rec { crateName = "is_terminal_polyfill"; - version = "1.70.0"; + version = "1.70.1"; edition = "2021"; - sha256 = "0018q5cf3rifbnzfc1w1z1xcx9c6i7xlywp2n0fw4limq1vqaizq"; + sha256 = "1kwfgglh91z33kl0w5i338mfpa3zs0hidq5j4ny4rmjwrikchhvr"; features = { }; resolvedDefaultFeatures = [ "default" ]; @@ -3918,9 +3936,9 @@ rec { }; "jobserver" = rec { crateName = "jobserver"; - version = "0.1.31"; + version = "0.1.32"; edition = "2021"; - sha256 = "0vnyfxr5gm03j3lpnd1zswnyvqa40kbssy08pz2m35salfm9kc6j"; + sha256 = "1l2k50qmj84x9mn39ivjz76alqmx72jhm12rw33zx9xnpv5xpla8"; authors = [ "Alex Crichton " ]; @@ -4126,11 +4144,7 @@ rec { crateName = "krb5"; version = "0.0.0-dev"; edition = "2021"; - # 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 = ./rust/krb5; } - else ./rust/krb5; + src = lib.cleanSourceWith { filter = sourceFilter; src = ./rust/krb5; }; authors = [ "Stackable GmbH " ]; @@ -4150,11 +4164,7 @@ rec { crateName = "krb5-sys"; version = "0.0.0-dev"; edition = "2021"; - # 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 = ./rust/krb5-sys; } - else ./rust/krb5-sys; + src = lib.cleanSourceWith { filter = sourceFilter; src = ./rust/krb5-sys; }; libName = "krb5_sys"; authors = [ "Stackable GmbH " @@ -4173,9 +4183,9 @@ rec { }; "kube" = rec { crateName = "kube"; - version = "0.92.1"; + version = "0.93.1"; edition = "2021"; - sha256 = "01j5jnj0pjf72qfqgwl8aawp7pgisdh9f693v6qakqnrj99ml713"; + sha256 = "05k4wwb1f1hs0izn4hnyaw0l1wljqh0sh74wc4ijs6mgfl094r83"; authors = [ "clux " "Natalie Klestrup Röijezon " @@ -4243,9 +4253,9 @@ rec { }; "kube-client" = rec { crateName = "kube-client"; - version = "0.92.1"; + version = "0.93.1"; edition = "2021"; - sha256 = "0q8w69qi62hyasyxdd1mlp21z4wfkix3xyqd587gcbq66m0zajwg"; + sha256 = "00w69ym31mzdi7kmxq1cjjnjps92cvb7mad5jw6a842v7bmkc4yq"; libName = "kube_client"; authors = [ "clux " @@ -4484,9 +4494,9 @@ rec { }; "kube-core" = rec { crateName = "kube-core"; - version = "0.92.1"; + version = "0.93.1"; edition = "2021"; - sha256 = "0x99l5j0ir4jipb1vhs5gdhcpd3r2qvjs4frn3k0zg0w2kc9pys0"; + sha256 = "1rhg99v7w5qrj3ikh6n0pbbhp1kj6q7spvydcf846zbq9nkp7qyc"; libName = "kube_core"; authors = [ "clux " @@ -4557,9 +4567,9 @@ rec { }; "kube-derive" = rec { crateName = "kube-derive"; - version = "0.92.1"; + version = "0.93.1"; edition = "2021"; - sha256 = "1yqmzba3x9ngcbqb27fw6z2qmh3dg4mbsfs35zgiz4kn03vqdz08"; + sha256 = "1wkqxfjxx4lc8gapd44kylprwgxhk29cwpdy55ri47kr8jc6r8h4"; procMacro = true; libName = "kube_derive"; authors = [ @@ -4586,7 +4596,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.70"; + packageId = "syn 2.0.74"; features = [ "extra-traits" ]; } ]; @@ -4594,9 +4604,9 @@ rec { }; "kube-runtime" = rec { crateName = "kube-runtime"; - version = "0.92.1"; + version = "0.93.1"; edition = "2021"; - sha256 = "09a2qgx6y161yq8293bn70dv66bh35z8azzcapmp05zqhswjzsxp"; + sha256 = "197zjakpach42n6s62qdh0g6qrs8cawzyhqb474qaq7d1wy7711v"; libName = "kube_runtime"; authors = [ "clux " @@ -4991,9 +5001,9 @@ rec { }; "libloading" = rec { crateName = "libloading"; - version = "0.8.4"; + version = "0.8.5"; edition = "2015"; - sha256 = "0g8h1vfb53gzzihbg5kxgifp74svyh7rdd6d5wh9jzwhnnkb6473"; + sha256 = "194dvczq4sifwkzllfmw0qkgvilpha7m5xy90gd6i446vcpz4ya9"; authors = [ "Simonas Kazlauskas " ]; @@ -5005,7 +5015,7 @@ rec { } { name = "windows-targets"; - packageId = "windows-targets 0.52.6"; + packageId = "windows-targets"; target = { target, features }: (target."windows" or false); } ]; @@ -5221,15 +5231,21 @@ rec { }; "mio" = rec { crateName = "mio"; - version = "0.8.11"; - edition = "2018"; - sha256 = "034byyl0ardml5yliy1hmvx8arkmn9rv479pid794sm07ia519m4"; + version = "1.0.2"; + edition = "2021"; + sha256 = "1v1cnnn44awxbcfm4zlavwgkvbyg7gp5zzjm8mqf1apkrwflvq40"; authors = [ "Carl Lerche " "Thomas de Zeeuw " "Tokio Contributors " ]; dependencies = [ + { + name = "hermit-abi"; + packageId = "hermit-abi"; + rename = "libc"; + target = { target, features }: ("hermit" == target."os" or null); + } { name = "libc"; packageId = "libc"; @@ -5247,9 +5263,9 @@ rec { } { name = "windows-sys"; - packageId = "windows-sys 0.48.0"; + packageId = "windows-sys 0.52.0"; target = { target, features }: (target."windows" or false); - features = [ "Win32_Foundation" "Win32_Networking_WinSock" "Win32_Storage_FileSystem" "Win32_System_IO" "Win32_System_WindowsProgramming" ]; + features = [ "Wdk_Foundation" "Wdk_Storage_FileSystem" "Wdk_System_IO" "Win32_Foundation" "Win32_Networking_WinSock" "Win32_Storage_FileSystem" "Win32_System_IO" "Win32_System_WindowsProgramming" ]; } ]; features = { @@ -5451,9 +5467,9 @@ rec { }; "object" = rec { crateName = "object"; - version = "0.36.1"; + version = "0.36.3"; edition = "2018"; - sha256 = "1kng5iqp4az48kn2vfd1irv12yp0yvj25agizlcgrpan3mnq86q8"; + sha256 = "1nggchwvjgilrxarwcmfcisa9fq1phg382y672aa6lb86ir4kdi7"; dependencies = [ { name = "memchr"; @@ -5504,9 +5520,9 @@ rec { }; "openssl" = rec { crateName = "openssl"; - version = "0.10.64"; + version = "0.10.66"; edition = "2018"; - sha256 = "07vb455yh08qh3n493ssw1qsa3zg3zfj438kk2180453hq94i84m"; + sha256 = "1hfr9ffx67j455aqrmyys3c8l65ngbqrl5qi3v3fi8vhddwg8acm"; authors = [ "Steven Fackler " ]; @@ -5566,7 +5582,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.70"; + packageId = "syn 2.0.74"; features = [ "full" ]; } ]; @@ -5585,10 +5601,10 @@ rec { }; "openssl-sys" = rec { crateName = "openssl-sys"; - version = "0.9.102"; + version = "0.9.103"; edition = "2018"; links = "openssl"; - sha256 = "18jzni7xzdcqwf9r8kp6j46abrxqn82dvc2ylf9kij7varyn75y5"; + sha256 = "1mi9r5vbgqqwfa2nqlh2m0r1v5abhzjigfbi7ja0mx0xx7p8v7kz"; build = "build/main.rs"; libName = "openssl_sys"; authors = [ @@ -5811,7 +5827,7 @@ rec { } { name = "ordered-float"; - packageId = "ordered-float 4.2.1"; + packageId = "ordered-float 4.2.2"; } { name = "percent-encoding"; @@ -5899,11 +5915,11 @@ rec { }; resolvedDefaultFeatures = [ "default" "std" ]; }; - "ordered-float 4.2.1" = rec { + "ordered-float 4.2.2" = rec { crateName = "ordered-float"; - version = "4.2.1"; + version = "4.2.2"; edition = "2021"; - sha256 = "1gmha7aiqz7hjanr15rhmz22sn603p7c9mjkssg3vh6653sjrzqr"; + sha256 = "19k5c2m8m7xfkw7wa4i65krswbnd2299ar6fj1wqqvv78hc1g4aa"; libName = "ordered_float"; authors = [ "Jonathan Reem " @@ -6067,7 +6083,7 @@ rec { } { name = "windows-targets"; - packageId = "windows-targets 0.52.6"; + packageId = "windows-targets"; target = { target, features }: (target."windows" or false); } ]; @@ -6212,7 +6228,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.70"; + packageId = "syn 2.0.74"; } ]; features = { @@ -6270,7 +6286,7 @@ rec { } { name = "indexmap"; - packageId = "indexmap 2.2.6"; + packageId = "indexmap 2.3.0"; } ]; features = { @@ -6316,7 +6332,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.70"; + packageId = "syn 2.0.74"; features = [ "full" "visit-mut" ]; } ]; @@ -6368,13 +6384,20 @@ rec { }; "ppv-lite86" = rec { crateName = "ppv-lite86"; - version = "0.2.17"; - edition = "2018"; - sha256 = "1pp6g52aw970adv3x2310n7glqnji96z0a9wiamzw89ibf0ayh2v"; + version = "0.2.20"; + edition = "2021"; + sha256 = "017ax9ssdnpww7nrl1hvqh2lzncpv04nnsibmnw9nxjnaqlpp5bp"; libName = "ppv_lite86"; authors = [ "The CryptoCorrosion Contributors" ]; + dependencies = [ + { + name = "zerocopy"; + packageId = "zerocopy"; + features = [ "simd" "derive" ]; + } + ]; features = { "default" = [ "std" ]; }; @@ -6397,7 +6420,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.70"; + packageId = "syn 2.0.74"; usesDefaultFeatures = false; features = [ "full" ]; } @@ -6410,7 +6433,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.70"; + packageId = "syn 2.0.74"; usesDefaultFeatures = false; features = [ "parsing" ]; } @@ -6595,7 +6618,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.70"; + packageId = "syn 2.0.74"; optional = true; features = [ "full" ]; } @@ -6643,7 +6666,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.70"; + packageId = "syn 2.0.74"; features = [ "extra-traits" ]; } ]; @@ -6821,9 +6844,9 @@ rec { }; "redox_syscall" = rec { crateName = "redox_syscall"; - version = "0.5.2"; + version = "0.5.3"; edition = "2018"; - sha256 = "1zg03n8rjbqnnbzp5nvai2pjgzxf7cw42hpcamgh8mj4y77zhb68"; + sha256 = "1916m7abg9649gkif055pn5nsvqjhp70isy0v7gx1zgi01p8m41a"; libName = "syscall"; authors = [ "Jeremy Soller " @@ -6841,9 +6864,9 @@ rec { }; "regex" = rec { crateName = "regex"; - version = "1.10.5"; + version = "1.10.6"; edition = "2021"; - sha256 = "0zsiqk2sxc1kd46qw0yp87s2a14ialwyxinpl0k266ddkm1i64mr"; + sha256 = "06cnlxwzyqfbw1za1i7ks89ns4i2kr0lpg5ykx56b8v7dd6df6a2"; authors = [ "The Rust Project Developers" "Andrew Gallant " @@ -7219,9 +7242,9 @@ rec { }; "rustls" = rec { crateName = "rustls"; - version = "0.23.11"; + version = "0.23.12"; edition = "2021"; - sha256 = "1l4rfcy6hydvv4zvh8lqvhq40d93aryvnbb4b9749bjlh59fla28"; + sha256 = "0i5h0sw8j6bly8rilidb0snd5czpkyjhzqfcd890mz1f7628r3y5"; dependencies = [ { name = "log"; @@ -7321,9 +7344,9 @@ rec { }; "rustls-pemfile" = rec { crateName = "rustls-pemfile"; - version = "2.1.2"; + version = "2.1.3"; edition = "2018"; - sha256 = "0ggpmk5n7p096nim2hn57facx6rwf76l55qqsj4fny37d0jkm699"; + sha256 = "09bl873pkibmb2da49kkbm9jlagscjvzrv257q6k01p101my2vqr"; libName = "rustls_pemfile"; dependencies = [ { @@ -7346,9 +7369,9 @@ rec { }; "rustls-pki-types" = rec { crateName = "rustls-pki-types"; - version = "1.7.0"; + version = "1.8.0"; edition = "2021"; - sha256 = "0banlc9xzwqrx8n0h4bd0igmq3z5hc72rn941lf22cp3gkkraqlp"; + sha256 = "1w6a1x8h61p5ddlnijfvj5fvs516h5xr5rw1pc0m8rgq8vk2q2pw"; libName = "rustls_pki_types"; features = { "default" = [ "alloc" ]; @@ -7360,9 +7383,9 @@ rec { }; "rustls-webpki" = rec { crateName = "rustls-webpki"; - version = "0.102.5"; + version = "0.102.6"; edition = "2021"; - sha256 = "0y2d2qsx02zbgikr6ibsllxqzzf35gva44xm0p0w4hjag76zr9pr"; + sha256 = "0bl55zb5m78l45d8i5frracq96x8shsshmfwby1zsxm1zpa54swf"; libName = "webpki"; dependencies = [ { @@ -7530,7 +7553,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.70"; + packageId = "syn 2.0.74"; features = [ "extra-traits" ]; } ]; @@ -7578,9 +7601,9 @@ rec { }; "security-framework" = rec { crateName = "security-framework"; - version = "2.11.0"; + version = "2.11.1"; edition = "2021"; - sha256 = "1h0ipvv8wi9wvhad0a9w7jpmb189jng4jhfgnp6vl1lps0zp49y6"; + sha256 = "00ldclwx78dm61v7wkach9lcx76awlrv0fdgjdwch4dmy12j4yw9"; libName = "security_framework"; authors = [ "Steven Fackler " @@ -7617,17 +7640,17 @@ rec { "OSX_10_14" = [ "OSX_10_13" "security-framework-sys/OSX_10_14" ]; "OSX_10_15" = [ "OSX_10_14" "security-framework-sys/OSX_10_15" ]; "OSX_10_9" = [ "security-framework-sys/OSX_10_9" ]; - "default" = [ "OSX_10_11" ]; + "default" = [ "OSX_10_12" ]; "log" = [ "dep:log" ]; "serial-number-bigint" = [ "dep:num-bigint" ]; }; - resolvedDefaultFeatures = [ "OSX_10_10" "OSX_10_11" "OSX_10_9" "default" ]; + resolvedDefaultFeatures = [ "OSX_10_10" "OSX_10_11" "OSX_10_12" "OSX_10_9" "default" ]; }; "security-framework-sys" = rec { crateName = "security-framework-sys"; - version = "2.11.0"; + version = "2.11.1"; edition = "2021"; - sha256 = "1mq7ykz3fi0ba55aj4afz24v9qvwdpkbjiirb197f8h5pnxkcy9i"; + sha256 = "1byfpx39sbmndfjrlqqylcxdpn3mpjyb9d92dffzw24vkgz2knkm"; libName = "security_framework_sys"; authors = [ "Steven Fackler " @@ -7650,9 +7673,9 @@ rec { "OSX_10_13" = [ "OSX_10_12" ]; "OSX_10_14" = [ "OSX_10_13" ]; "OSX_10_15" = [ "OSX_10_14" ]; - "default" = [ "OSX_10_11" ]; + "default" = [ "OSX_10_12" ]; }; - resolvedDefaultFeatures = [ "OSX_10_10" "OSX_10_11" "OSX_10_9" "default" ]; + resolvedDefaultFeatures = [ "OSX_10_10" "OSX_10_11" "OSX_10_12" "OSX_10_9" "default" ]; }; "semver" = rec { crateName = "semver"; @@ -7670,9 +7693,9 @@ rec { }; "serde" = rec { crateName = "serde"; - version = "1.0.204"; + version = "1.0.206"; edition = "2018"; - sha256 = "04kwpwqz559xlhxkggmm8rjxqgywy5swam3kscwsicnbw1cgaxmw"; + sha256 = "1102kmaf7cdln5f44l1ygqz457ly9pii3kcb28555p9387clqgjv"; authors = [ "Erick Tryzelaar " "David Tolnay " @@ -7725,9 +7748,9 @@ rec { }; "serde_derive" = rec { crateName = "serde_derive"; - version = "1.0.204"; + version = "1.0.206"; edition = "2015"; - sha256 = "08p25262mbmhsr2cg0508d5b1wvljj956rvpg0v3qgg6gc8pxkg0"; + sha256 = "15rgfrcs56hqhhfnhq4413sazcfzkkvcr66g121fm0r3il9vdgzs"; procMacro = true; authors = [ "Erick Tryzelaar " @@ -7748,7 +7771,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.70"; + packageId = "syn 2.0.74"; usesDefaultFeatures = false; features = [ "clone-impls" "derive" "parsing" "printing" "proc-macro" ]; } @@ -7780,7 +7803,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.70"; + packageId = "syn 2.0.74"; usesDefaultFeatures = false; features = [ "clone-impls" "derive" "parsing" "printing" ]; } @@ -7789,9 +7812,9 @@ rec { }; "serde_json" = rec { crateName = "serde_json"; - version = "1.0.120"; + version = "1.0.124"; edition = "2021"; - sha256 = "1idpv3zxcvl76z2z47jgg1f1wjqdnhfc204asmd27qfam34j23af"; + sha256 = "13g3zka165qqnvbw0c6k708wdfc4738sr4f8ijjxpcsnga265bb6"; authors = [ "Erick Tryzelaar " "David Tolnay " @@ -7801,6 +7824,11 @@ rec { name = "itoa"; packageId = "itoa"; } + { + name = "memchr"; + packageId = "memchr"; + usesDefaultFeatures = false; + } { name = "ryu"; packageId = "ryu"; @@ -7823,7 +7851,7 @@ rec { "default" = [ "std" ]; "indexmap" = [ "dep:indexmap" ]; "preserve_order" = [ "indexmap" "std" ]; - "std" = [ "serde/std" ]; + "std" = [ "memchr/std" "serde/std" ]; }; resolvedDefaultFeatures = [ "alloc" "default" "std" ]; }; @@ -7838,7 +7866,7 @@ rec { dependencies = [ { name = "indexmap"; - packageId = "indexmap 2.2.6"; + packageId = "indexmap 2.3.0"; } { name = "itoa"; @@ -8049,7 +8077,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.70"; + packageId = "syn 2.0.74"; } ]; @@ -8172,7 +8200,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.70"; + packageId = "syn 2.0.74"; features = [ "full" ]; } ]; @@ -8242,11 +8270,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 = ./rust/krb5-provision-keytab; } - else ./rust/krb5-provision-keytab; + src = lib.cleanSourceWith { filter = sourceFilter; src = ./rust/krb5-provision-keytab; }; libName = "stackable_krb5_provision_keytab"; authors = [ "Stackable GmbH " @@ -8319,13 +8343,13 @@ rec { }; "stackable-operator" = rec { crateName = "stackable-operator"; - version = "0.70.0"; + version = "0.73.0"; edition = "2021"; workspace_member = null; src = pkgs.fetchgit { url = "https://github.com/stackabletech/operator-rs.git"; - rev = "045af8d77cb91d412bfcdc939e85d98ac77f1029"; - sha256 = "1z4pa8xsh5hlnjizx37y0wv50dm943q1gj78madqzasssr8l8rwa"; + rev = "4d98a29b08a7d959e5e287f774cf064c02ffbd62"; + sha256 = "0cmfbc3v9kklsfkqbnhwig45106gfizhmlmg9p1qgdjp8az43l9m"; }; libName = "stackable_operator"; authors = [ @@ -8453,6 +8477,10 @@ rec { name = "tracing"; packageId = "tracing"; } + { + name = "tracing-appender"; + packageId = "tracing-appender"; + } { name = "tracing-opentelemetry"; packageId = "tracing-opentelemetry"; @@ -8460,7 +8488,7 @@ rec { { name = "tracing-subscriber"; packageId = "tracing-subscriber"; - features = [ "env-filter" ]; + features = [ "env-filter" "json" ]; } { name = "url"; @@ -8480,8 +8508,8 @@ rec { workspace_member = null; src = pkgs.fetchgit { url = "https://github.com/stackabletech/operator-rs.git"; - rev = "045af8d77cb91d412bfcdc939e85d98ac77f1029"; - sha256 = "1z4pa8xsh5hlnjizx37y0wv50dm943q1gj78madqzasssr8l8rwa"; + rev = "4d98a29b08a7d959e5e287f774cf064c02ffbd62"; + sha256 = "0cmfbc3v9kklsfkqbnhwig45106gfizhmlmg9p1qgdjp8az43l9m"; }; procMacro = true; libName = "stackable_operator_derive"; @@ -8503,7 +8531,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.70"; + packageId = "syn 2.0.74"; } ]; @@ -8519,11 +8547,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 = ./rust/operator-binary; } - else ./rust/operator-binary; + src = lib.cleanSourceWith { filter = sourceFilter; src = ./rust/operator-binary; }; authors = [ "Stackable GmbH " ]; @@ -8682,11 +8706,7 @@ rec { crateName = "stackable-secret-operator-crd-utils"; version = "0.0.0-dev"; edition = "2021"; - # 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 = ./rust/crd-utils; } - else ./rust/crd-utils; + src = lib.cleanSourceWith { filter = sourceFilter; src = ./rust/crd-utils; }; libName = "stackable_secret_operator_crd_utils"; authors = [ "Stackable GmbH " @@ -8773,7 +8793,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.70"; + packageId = "syn 2.0.74"; features = [ "parsing" "extra-traits" ]; } ]; @@ -8826,11 +8846,11 @@ rec { }; resolvedDefaultFeatures = [ "clone-impls" "default" "derive" "extra-traits" "full" "parsing" "printing" "proc-macro" "quote" "visit" ]; }; - "syn 2.0.70" = rec { + "syn 2.0.74" = rec { crateName = "syn"; - version = "2.0.70"; + version = "2.0.74"; edition = "2021"; - sha256 = "05jc0v1jch76xayprcwc7glczvfaxia5747cw29v04rnifv0j0ig"; + sha256 = "1mxk5h27mzl0r2j434rqrm279k302jdl1lr16kc0nval7lgb9khz"; authors = [ "David Tolnay " ]; @@ -8924,9 +8944,9 @@ rec { }; "tempfile" = rec { crateName = "tempfile"; - version = "3.10.1"; + version = "3.12.0"; edition = "2021"; - sha256 = "1wdzz35ri168jn9al4s1g2rnsrr5ci91khgarc2rvpb3nappzdw5"; + sha256 = "0r3sm3323crr50ranvask8z4qb3x5zfqxs1mrzab1swlqz8cvjq4"; authors = [ "Steven Allen " "The Rust Project Developers" @@ -8942,6 +8962,12 @@ rec { name = "fastrand"; packageId = "fastrand"; } + { + name = "once_cell"; + packageId = "once_cell"; + usesDefaultFeatures = false; + features = [ "std" ]; + } { name = "rustix"; packageId = "rustix"; @@ -8950,7 +8976,7 @@ rec { } { name = "windows-sys"; - packageId = "windows-sys 0.52.0"; + packageId = "windows-sys 0.59.0"; target = { target, features }: (target."windows" or false); features = [ "Win32_Storage_FileSystem" "Win32_Foundation" ]; } @@ -8960,9 +8986,9 @@ rec { }; "thiserror" = rec { crateName = "thiserror"; - version = "1.0.62"; + version = "1.0.63"; edition = "2021"; - sha256 = "1fwb3pcx84pkyi67nwrnskwshxkrl9b0hszhvz17d4a9n4rmcrzj"; + sha256 = "092p83mf4p1vkjb2j6h6z96dan4raq2simhirjv12slbndq26d60"; authors = [ "David Tolnay " ]; @@ -8976,9 +9002,9 @@ rec { }; "thiserror-impl" = rec { crateName = "thiserror-impl"; - version = "1.0.62"; + version = "1.0.63"; edition = "2021"; - sha256 = "133rmw7x6rf5qh5xisclamhxzgm8r8wd79amks89xx095dsnh16j"; + sha256 = "0qd21l2jjrkvnpr5da3l3b58v4wmrkn6aa0h1z5dg6kb8rc8nmd4"; procMacro = true; libName = "thiserror_impl"; authors = [ @@ -8995,7 +9021,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.70"; + packageId = "syn 2.0.74"; } ]; @@ -9095,6 +9121,11 @@ rec { usesDefaultFeatures = false; features = [ "powerfmt" ]; } + { + name = "itoa"; + packageId = "itoa"; + optional = true; + } { name = "num-conv"; packageId = "num-conv"; @@ -9152,7 +9183,7 @@ rec { "std" = [ "alloc" "deranged/std" ]; "wasm-bindgen" = [ "dep:js-sys" ]; }; - resolvedDefaultFeatures = [ "alloc" "default" "parsing" "std" ]; + resolvedDefaultFeatures = [ "alloc" "default" "formatting" "parsing" "std" ]; }; "time-core" = rec { crateName = "time-core"; @@ -9189,7 +9220,7 @@ rec { ]; features = { }; - resolvedDefaultFeatures = [ "parsing" ]; + resolvedDefaultFeatures = [ "formatting" "parsing" ]; }; "tinyvec" = rec { crateName = "tinyvec"; @@ -9229,9 +9260,9 @@ rec { }; "tokio" = rec { crateName = "tokio"; - version = "1.38.0"; + version = "1.39.2"; edition = "2021"; - sha256 = "0jjsb2c9dqi93yij3rqzsh9bk0z3qyasmw1n8qkny3d8lw14lkxs"; + sha256 = "1cb7yhba7nnf00cylcywk7rai5kkdb8b4jzwrc26zgbqqwdzp96s"; authors = [ "Tokio Contributors " ]; @@ -9258,11 +9289,6 @@ rec { optional = true; usesDefaultFeatures = false; } - { - name = "num_cpus"; - packageId = "num_cpus"; - optional = true; - } { name = "parking_lot"; packageId = "parking_lot"; @@ -9292,7 +9318,7 @@ rec { } { name = "windows-sys"; - packageId = "windows-sys 0.48.0"; + packageId = "windows-sys 0.52.0"; optional = true; target = { target, features }: (target."windows" or false); } @@ -9310,7 +9336,7 @@ rec { } { name = "windows-sys"; - packageId = "windows-sys 0.48.0"; + packageId = "windows-sys 0.52.0"; target = {target, features}: (target."windows" or false); features = [ "Win32_Foundation" "Win32_Security_Authorization" ]; } @@ -9323,10 +9349,9 @@ rec { "macros" = [ "tokio-macros" ]; "mio" = [ "dep:mio" ]; "net" = [ "libc" "mio/os-poll" "mio/os-ext" "mio/net" "socket2" "windows-sys/Win32_Foundation" "windows-sys/Win32_Security" "windows-sys/Win32_Storage_FileSystem" "windows-sys/Win32_System_Pipes" "windows-sys/Win32_System_SystemServices" ]; - "num_cpus" = [ "dep:num_cpus" ]; "parking_lot" = [ "dep:parking_lot" ]; "process" = [ "bytes" "libc" "mio/os-poll" "mio/os-ext" "mio/net" "signal-hook-registry" "windows-sys/Win32_Foundation" "windows-sys/Win32_System_Threading" "windows-sys/Win32_System_WindowsProgramming" ]; - "rt-multi-thread" = [ "num_cpus" "rt" ]; + "rt-multi-thread" = [ "rt" ]; "signal" = [ "libc" "mio/os-poll" "mio/net" "mio/os-ext" "signal-hook-registry" "windows-sys/Win32_Foundation" "windows-sys/Win32_System_Console" ]; "signal-hook-registry" = [ "dep:signal-hook-registry" ]; "socket2" = [ "dep:socket2" ]; @@ -9335,13 +9360,13 @@ rec { "tracing" = [ "dep:tracing" ]; "windows-sys" = [ "dep:windows-sys" ]; }; - resolvedDefaultFeatures = [ "bytes" "default" "fs" "full" "io-std" "io-util" "libc" "macros" "mio" "net" "num_cpus" "parking_lot" "process" "rt" "rt-multi-thread" "signal" "signal-hook-registry" "socket2" "sync" "time" "tokio-macros" "windows-sys" ]; + resolvedDefaultFeatures = [ "bytes" "default" "fs" "full" "io-std" "io-util" "libc" "macros" "mio" "net" "parking_lot" "process" "rt" "rt-multi-thread" "signal" "signal-hook-registry" "socket2" "sync" "time" "tokio-macros" "windows-sys" ]; }; "tokio-macros" = rec { crateName = "tokio-macros"; - version = "2.3.0"; + version = "2.4.0"; edition = "2021"; - sha256 = "16nkan0x9b62hnqmjqcyd71j1mgpda2sv7gfm2mvbm39l2cfjnjz"; + sha256 = "0lnpg14h1v3fh2jvnc8cz7cjf0m7z1xgkwfpcyy632g829imjgb9"; procMacro = true; libName = "tokio_macros"; authors = [ @@ -9358,7 +9383,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.70"; + packageId = "syn 2.0.74"; features = [ "full" ]; } ]; @@ -9541,9 +9566,9 @@ rec { }; "tonic" = rec { crateName = "tonic"; - version = "0.12.0"; + version = "0.12.1"; edition = "2021"; - sha256 = "1pc15rjz0nblkvp9df00nz2hk3m08jfbhvb5757cm6x2d6hvcf7p"; + sha256 = "00bl9i4fal2s90g1p877053dkpbxvgsqj5c24y6mka5bj559yr9q"; authors = [ "Lucio Franco " ]; @@ -9636,7 +9661,7 @@ rec { { name = "tokio-stream"; packageId = "tokio-stream"; - features = [ "net" ]; + usesDefaultFeatures = false; } { name = "tower"; @@ -9676,7 +9701,7 @@ rec { "gzip" = [ "dep:flate2" ]; "prost" = [ "dep:prost" ]; "router" = [ "dep:axum" "dep:tower" "tower?/util" ]; - "server" = [ "router" "dep:async-stream" "dep:h2" "dep:hyper" "hyper?/server" "dep:hyper-util" "hyper-util?/service" "hyper-util?/server-auto" "dep:socket2" "dep:tokio" "tokio?/macros" "tokio?/net" "tokio?/time" "dep:tower" "tower?/util" "tower?/limit" ]; + "server" = [ "router" "dep:async-stream" "dep:h2" "dep:hyper" "hyper?/server" "dep:hyper-util" "hyper-util?/service" "hyper-util?/server-auto" "dep:socket2" "dep:tokio" "tokio?/macros" "tokio?/net" "tokio?/time" "tokio-stream/net" "dep:tower" "tower?/util" "tower?/limit" ]; "tls" = [ "dep:rustls-pemfile" "dep:tokio-rustls" "dep:tokio" "tokio?/rt" "tokio?/macros" ]; "tls-roots" = [ "tls" "channel" "dep:rustls-native-certs" ]; "tls-webpki-roots" = [ "tls" "channel" "dep:webpki-roots" ]; @@ -9687,9 +9712,9 @@ rec { }; "tonic-build" = rec { crateName = "tonic-build"; - version = "0.12.0"; + version = "0.12.1"; edition = "2021"; - sha256 = "1di99gs6ndg6x27m4dxsk7lqh6xd7rbjwyjrpdkxvp1s4b6462b9"; + sha256 = "0r5riq6gm79hmmsd1z6rdziszava2y8phf1z7rr2005xlb2r50sn"; libName = "tonic_build"; authors = [ "Lucio Franco " @@ -9714,7 +9739,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.70"; + packageId = "syn 2.0.74"; } ]; features = { @@ -9727,9 +9752,9 @@ rec { }; "tonic-reflection" = rec { crateName = "tonic-reflection"; - version = "0.12.0"; + version = "0.12.1"; edition = "2021"; - sha256 = "02jk16p2dw4rgj7yq1dmwq4m8z3am1mrqyw75pi0nfwfd33d7q47"; + sha256 = "0wy1vdj4fj90j6zjqs78c2fvwcl9krxiz6709idspsbksqxchhmp"; libName = "tonic_reflection"; authors = [ "James Nugent " @@ -10074,6 +10099,42 @@ rec { }; resolvedDefaultFeatures = [ "attributes" "default" "log" "std" "tracing-attributes" ]; }; + "tracing-appender" = rec { + crateName = "tracing-appender"; + version = "0.2.3"; + edition = "2018"; + sha256 = "1kq69qyjvb4dxch5c9zgii6cqhy9nkk81z0r4pj3y2nc537fhrim"; + libName = "tracing_appender"; + authors = [ + "Zeki Sherif " + "Tokio Contributors " + ]; + dependencies = [ + { + name = "crossbeam-channel"; + packageId = "crossbeam-channel"; + } + { + name = "thiserror"; + packageId = "thiserror"; + } + { + name = "time"; + packageId = "time"; + usesDefaultFeatures = false; + features = [ "formatting" "parsing" ]; + } + { + name = "tracing-subscriber"; + packageId = "tracing-subscriber"; + usesDefaultFeatures = false; + features = [ "fmt" "std" ]; + } + ]; + features = { + "parking_lot" = [ "dep:parking_lot" ]; + }; + }; "tracing-attributes" = rec { crateName = "tracing-attributes"; version = "0.1.27"; @@ -10097,7 +10158,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.70"; + packageId = "syn 2.0.74"; usesDefaultFeatures = false; features = [ "full" "parsing" "printing" "visit-mut" "clone-impls" "extra-traits" "proc-macro" ]; } @@ -10266,6 +10327,31 @@ rec { }; resolvedDefaultFeatures = [ "default" "metrics" "smallvec" "tracing-log" ]; }; + "tracing-serde" = rec { + crateName = "tracing-serde"; + version = "0.1.3"; + edition = "2018"; + sha256 = "1qfr0va69djvxqvjrx4vqq7p6myy414lx4w1f6amcn0hfwqj2sxw"; + libName = "tracing_serde"; + authors = [ + "Tokio Contributors " + ]; + dependencies = [ + { + name = "serde"; + packageId = "serde"; + } + { + name = "tracing-core"; + packageId = "tracing-core"; + } + ]; + features = { + "valuable" = [ "valuable_crate" "valuable-serde" "tracing-core/valuable" ]; + "valuable-serde" = [ "dep:valuable-serde" ]; + "valuable_crate" = [ "dep:valuable_crate" ]; + }; + }; "tracing-subscriber" = rec { crateName = "tracing-subscriber"; version = "0.3.18"; @@ -10300,6 +10386,16 @@ rec { usesDefaultFeatures = false; features = [ "std" "unicode-case" "unicode-perl" ]; } + { + name = "serde"; + packageId = "serde"; + optional = true; + } + { + name = "serde_json"; + packageId = "serde_json"; + optional = true; + } { name = "sharded-slab"; packageId = "sharded-slab"; @@ -10333,6 +10429,11 @@ rec { usesDefaultFeatures = false; features = [ "log-tracer" "std" ]; } + { + name = "tracing-serde"; + packageId = "tracing-serde"; + optional = true; + } ]; devDependencies = [ { @@ -10378,7 +10479,7 @@ rec { "valuable-serde" = [ "dep:valuable-serde" ]; "valuable_crate" = [ "dep:valuable_crate" ]; }; - resolvedDefaultFeatures = [ "alloc" "ansi" "default" "env-filter" "fmt" "matchers" "nu-ansi-term" "once_cell" "regex" "registry" "sharded-slab" "smallvec" "std" "thread_local" "tracing" "tracing-log" ]; + resolvedDefaultFeatures = [ "alloc" "ansi" "default" "env-filter" "fmt" "json" "matchers" "nu-ansi-term" "once_cell" "regex" "registry" "serde" "serde_json" "sharded-slab" "smallvec" "std" "thread_local" "tracing" "tracing-log" "tracing-serde" ]; }; "try-lock" = rec { crateName = "try-lock"; @@ -10628,9 +10729,9 @@ rec { }; "version_check" = rec { crateName = "version_check"; - version = "0.9.4"; + version = "0.9.5"; edition = "2015"; - sha256 = "0gs8grwdlgh0xq660d7wr80x14vxbizmd8dbp29p2pdncx8lp1s9"; + sha256 = "0nhhi4i5x89gm911azqbn7avs9mdacw2i3vcz3cnmz3mv4rqz4hb"; authors = [ "Sergio Benitez " ]; @@ -10733,7 +10834,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.70"; + packageId = "syn 2.0.74"; features = [ "full" ]; } { @@ -10792,7 +10893,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.70"; + packageId = "syn 2.0.74"; features = [ "visit" "full" ]; } { @@ -10891,12 +10992,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 = { @@ -10941,7 +11042,7 @@ rec { } { name = "windows-targets"; - packageId = "windows-targets 0.52.6"; + packageId = "windows-targets"; } ]; features = { @@ -11619,18 +11720,18 @@ rec { dependencies = [ { name = "windows-targets"; - packageId = "windows-targets 0.52.6"; + packageId = "windows-targets"; } ]; features = { }; resolvedDefaultFeatures = [ "default" ]; }; - "windows-sys 0.48.0" = rec { + "windows-sys 0.52.0" = rec { crateName = "windows-sys"; - version = "0.48.0"; - edition = "2018"; - sha256 = "1aan23v5gs7gya1lc46hqn9mdh8yph3fhxmhxlw36pn6pqc28zb7"; + version = "0.52.0"; + edition = "2021"; + sha256 = "0gd3v4ji88490zgb6b5mq5zgbvwv7zx1ibn8v3x83rwcdbryaar8"; libName = "windows_sys"; authors = [ "Microsoft" @@ -11638,34 +11739,38 @@ rec { dependencies = [ { name = "windows-targets"; - packageId = "windows-targets 0.48.5"; + packageId = "windows-targets"; } ]; features = { + "Wdk_Foundation" = [ "Wdk" ]; + "Wdk_Graphics" = [ "Wdk" ]; + "Wdk_Graphics_Direct3D" = [ "Wdk_Graphics" ]; + "Wdk_Storage" = [ "Wdk" ]; + "Wdk_Storage_FileSystem" = [ "Wdk_Storage" ]; + "Wdk_Storage_FileSystem_Minifilters" = [ "Wdk_Storage_FileSystem" ]; "Wdk_System" = [ "Wdk" ]; + "Wdk_System_IO" = [ "Wdk_System" ]; "Wdk_System_OfflineRegistry" = [ "Wdk_System" ]; + "Wdk_System_Registry" = [ "Wdk_System" ]; + "Wdk_System_SystemInformation" = [ "Wdk_System" ]; + "Wdk_System_SystemServices" = [ "Wdk_System" ]; + "Wdk_System_Threading" = [ "Wdk_System" ]; "Win32_Data" = [ "Win32" ]; "Win32_Data_HtmlHelp" = [ "Win32_Data" ]; "Win32_Data_RightsManagement" = [ "Win32_Data" ]; - "Win32_Data_Xml" = [ "Win32_Data" ]; - "Win32_Data_Xml_MsXml" = [ "Win32_Data_Xml" ]; - "Win32_Data_Xml_XmlLite" = [ "Win32_Data_Xml" ]; "Win32_Devices" = [ "Win32" ]; "Win32_Devices_AllJoyn" = [ "Win32_Devices" ]; "Win32_Devices_BiometricFramework" = [ "Win32_Devices" ]; "Win32_Devices_Bluetooth" = [ "Win32_Devices" ]; "Win32_Devices_Communication" = [ "Win32_Devices" ]; - "Win32_Devices_DeviceAccess" = [ "Win32_Devices" ]; "Win32_Devices_DeviceAndDriverInstallation" = [ "Win32_Devices" ]; "Win32_Devices_DeviceQuery" = [ "Win32_Devices" ]; "Win32_Devices_Display" = [ "Win32_Devices" ]; "Win32_Devices_Enumeration" = [ "Win32_Devices" ]; "Win32_Devices_Enumeration_Pnp" = [ "Win32_Devices_Enumeration" ]; "Win32_Devices_Fax" = [ "Win32_Devices" ]; - "Win32_Devices_FunctionDiscovery" = [ "Win32_Devices" ]; - "Win32_Devices_Geolocation" = [ "Win32_Devices" ]; "Win32_Devices_HumanInterfaceDevice" = [ "Win32_Devices" ]; - "Win32_Devices_ImageAcquisition" = [ "Win32_Devices" ]; "Win32_Devices_PortableDevices" = [ "Win32_Devices" ]; "Win32_Devices_Properties" = [ "Win32_Devices" ]; "Win32_Devices_Pwm" = [ "Win32_Devices" ]; @@ -11680,6 +11785,7 @@ rec { "Win32_Graphics" = [ "Win32" ]; "Win32_Graphics_Dwm" = [ "Win32_Graphics" ]; "Win32_Graphics_Gdi" = [ "Win32_Graphics" ]; + "Win32_Graphics_GdiPlus" = [ "Win32_Graphics" ]; "Win32_Graphics_Hlsl" = [ "Win32_Graphics" ]; "Win32_Graphics_OpenGL" = [ "Win32_Graphics" ]; "Win32_Graphics_Printing" = [ "Win32_Graphics" ]; @@ -11688,17 +11794,9 @@ rec { "Win32_Management_MobileDeviceManagementRegistration" = [ "Win32_Management" ]; "Win32_Media" = [ "Win32" ]; "Win32_Media_Audio" = [ "Win32_Media" ]; - "Win32_Media_Audio_Apo" = [ "Win32_Media_Audio" ]; - "Win32_Media_Audio_DirectMusic" = [ "Win32_Media_Audio" ]; - "Win32_Media_Audio_Endpoints" = [ "Win32_Media_Audio" ]; - "Win32_Media_Audio_XAudio2" = [ "Win32_Media_Audio" ]; - "Win32_Media_DeviceManager" = [ "Win32_Media" ]; "Win32_Media_DxMediaObjects" = [ "Win32_Media" ]; "Win32_Media_KernelStreaming" = [ "Win32_Media" ]; - "Win32_Media_LibrarySharingServices" = [ "Win32_Media" ]; - "Win32_Media_MediaPlayer" = [ "Win32_Media" ]; "Win32_Media_Multimedia" = [ "Win32_Media" ]; - "Win32_Media_Speech" = [ "Win32_Media" ]; "Win32_Media_Streaming" = [ "Win32_Media" ]; "Win32_Media_WindowsMediaFormat" = [ "Win32_Media" ]; "Win32_NetworkManagement" = [ "Win32" ]; @@ -11706,14 +11804,12 @@ rec { "Win32_NetworkManagement_Dns" = [ "Win32_NetworkManagement" ]; "Win32_NetworkManagement_InternetConnectionWizard" = [ "Win32_NetworkManagement" ]; "Win32_NetworkManagement_IpHelper" = [ "Win32_NetworkManagement" ]; - "Win32_NetworkManagement_MobileBroadband" = [ "Win32_NetworkManagement" ]; "Win32_NetworkManagement_Multicast" = [ "Win32_NetworkManagement" ]; "Win32_NetworkManagement_Ndis" = [ "Win32_NetworkManagement" ]; "Win32_NetworkManagement_NetBios" = [ "Win32_NetworkManagement" ]; "Win32_NetworkManagement_NetManagement" = [ "Win32_NetworkManagement" ]; "Win32_NetworkManagement_NetShell" = [ "Win32_NetworkManagement" ]; "Win32_NetworkManagement_NetworkDiagnosticsFramework" = [ "Win32_NetworkManagement" ]; - "Win32_NetworkManagement_NetworkPolicyServer" = [ "Win32_NetworkManagement" ]; "Win32_NetworkManagement_P2P" = [ "Win32_NetworkManagement" ]; "Win32_NetworkManagement_QoS" = [ "Win32_NetworkManagement" ]; "Win32_NetworkManagement_Rras" = [ "Win32_NetworkManagement" ]; @@ -11721,19 +11817,15 @@ rec { "Win32_NetworkManagement_WNet" = [ "Win32_NetworkManagement" ]; "Win32_NetworkManagement_WebDav" = [ "Win32_NetworkManagement" ]; "Win32_NetworkManagement_WiFi" = [ "Win32_NetworkManagement" ]; - "Win32_NetworkManagement_WindowsConnectNow" = [ "Win32_NetworkManagement" ]; "Win32_NetworkManagement_WindowsConnectionManager" = [ "Win32_NetworkManagement" ]; "Win32_NetworkManagement_WindowsFilteringPlatform" = [ "Win32_NetworkManagement" ]; "Win32_NetworkManagement_WindowsFirewall" = [ "Win32_NetworkManagement" ]; "Win32_NetworkManagement_WindowsNetworkVirtualization" = [ "Win32_NetworkManagement" ]; "Win32_Networking" = [ "Win32" ]; "Win32_Networking_ActiveDirectory" = [ "Win32_Networking" ]; - "Win32_Networking_BackgroundIntelligentTransferService" = [ "Win32_Networking" ]; "Win32_Networking_Clustering" = [ "Win32_Networking" ]; "Win32_Networking_HttpServer" = [ "Win32_Networking" ]; "Win32_Networking_Ldap" = [ "Win32_Networking" ]; - "Win32_Networking_NetworkListManager" = [ "Win32_Networking" ]; - "Win32_Networking_RemoteDifferentialCompression" = [ "Win32_Networking" ]; "Win32_Networking_WebSocket" = [ "Win32_Networking" ]; "Win32_Networking_WinHttp" = [ "Win32_Networking" ]; "Win32_Networking_WinInet" = [ "Win32_Networking" ]; @@ -11743,10 +11835,7 @@ rec { "Win32_Security_AppLocker" = [ "Win32_Security" ]; "Win32_Security_Authentication" = [ "Win32_Security" ]; "Win32_Security_Authentication_Identity" = [ "Win32_Security_Authentication" ]; - "Win32_Security_Authentication_Identity_Provider" = [ "Win32_Security_Authentication_Identity" ]; "Win32_Security_Authorization" = [ "Win32_Security" ]; - "Win32_Security_Authorization_UI" = [ "Win32_Security_Authorization" ]; - "Win32_Security_ConfigurationSnapin" = [ "Win32_Security" ]; "Win32_Security_Credentials" = [ "Win32_Security" ]; "Win32_Security_Cryptography" = [ "Win32_Security" ]; "Win32_Security_Cryptography_Catalog" = [ "Win32_Security_Cryptography" ]; @@ -11760,64 +11849,48 @@ rec { "Win32_Security_Isolation" = [ "Win32_Security" ]; "Win32_Security_LicenseProtection" = [ "Win32_Security" ]; "Win32_Security_NetworkAccessProtection" = [ "Win32_Security" ]; - "Win32_Security_Tpm" = [ "Win32_Security" ]; "Win32_Security_WinTrust" = [ "Win32_Security" ]; "Win32_Security_WinWlx" = [ "Win32_Security" ]; "Win32_Storage" = [ "Win32" ]; "Win32_Storage_Cabinets" = [ "Win32_Storage" ]; "Win32_Storage_CloudFilters" = [ "Win32_Storage" ]; "Win32_Storage_Compression" = [ "Win32_Storage" ]; - "Win32_Storage_DataDeduplication" = [ "Win32_Storage" ]; "Win32_Storage_DistributedFileSystem" = [ "Win32_Storage" ]; - "Win32_Storage_EnhancedStorage" = [ "Win32_Storage" ]; "Win32_Storage_FileHistory" = [ "Win32_Storage" ]; - "Win32_Storage_FileServerResourceManager" = [ "Win32_Storage" ]; "Win32_Storage_FileSystem" = [ "Win32_Storage" ]; "Win32_Storage_Imapi" = [ "Win32_Storage" ]; "Win32_Storage_IndexServer" = [ "Win32_Storage" ]; "Win32_Storage_InstallableFileSystems" = [ "Win32_Storage" ]; "Win32_Storage_IscsiDisc" = [ "Win32_Storage" ]; "Win32_Storage_Jet" = [ "Win32_Storage" ]; + "Win32_Storage_Nvme" = [ "Win32_Storage" ]; "Win32_Storage_OfflineFiles" = [ "Win32_Storage" ]; "Win32_Storage_OperationRecorder" = [ "Win32_Storage" ]; "Win32_Storage_Packaging" = [ "Win32_Storage" ]; "Win32_Storage_Packaging_Appx" = [ "Win32_Storage_Packaging" ]; - "Win32_Storage_Packaging_Opc" = [ "Win32_Storage_Packaging" ]; "Win32_Storage_ProjectedFileSystem" = [ "Win32_Storage" ]; "Win32_Storage_StructuredStorage" = [ "Win32_Storage" ]; "Win32_Storage_Vhd" = [ "Win32_Storage" ]; - "Win32_Storage_VirtualDiskService" = [ "Win32_Storage" ]; - "Win32_Storage_Vss" = [ "Win32_Storage" ]; "Win32_Storage_Xps" = [ "Win32_Storage" ]; - "Win32_Storage_Xps_Printing" = [ "Win32_Storage_Xps" ]; "Win32_System" = [ "Win32" ]; "Win32_System_AddressBook" = [ "Win32_System" ]; "Win32_System_Antimalware" = [ "Win32_System" ]; "Win32_System_ApplicationInstallationAndServicing" = [ "Win32_System" ]; "Win32_System_ApplicationVerifier" = [ "Win32_System" ]; - "Win32_System_AssessmentTool" = [ "Win32_System" ]; "Win32_System_ClrHosting" = [ "Win32_System" ]; "Win32_System_Com" = [ "Win32_System" ]; - "Win32_System_Com_CallObj" = [ "Win32_System_Com" ]; - "Win32_System_Com_ChannelCredentials" = [ "Win32_System_Com" ]; - "Win32_System_Com_Events" = [ "Win32_System_Com" ]; "Win32_System_Com_Marshal" = [ "Win32_System_Com" ]; "Win32_System_Com_StructuredStorage" = [ "Win32_System_Com" ]; - "Win32_System_Com_UI" = [ "Win32_System_Com" ]; "Win32_System_Com_Urlmon" = [ "Win32_System_Com" ]; "Win32_System_ComponentServices" = [ "Win32_System" ]; "Win32_System_Console" = [ "Win32_System" ]; - "Win32_System_Contacts" = [ "Win32_System" ]; "Win32_System_CorrelationVector" = [ "Win32_System" ]; "Win32_System_DataExchange" = [ "Win32_System" ]; "Win32_System_DeploymentServices" = [ "Win32_System" ]; - "Win32_System_DesktopSharing" = [ "Win32_System" ]; "Win32_System_DeveloperLicensing" = [ "Win32_System" ]; "Win32_System_Diagnostics" = [ "Win32_System" ]; "Win32_System_Diagnostics_Ceip" = [ "Win32_System_Diagnostics" ]; - "Win32_System_Diagnostics_ClrProfiling" = [ "Win32_System_Diagnostics" ]; "Win32_System_Diagnostics_Debug" = [ "Win32_System_Diagnostics" ]; - "Win32_System_Diagnostics_Debug_ActiveScript" = [ "Win32_System_Diagnostics_Debug" ]; "Win32_System_Diagnostics_Debug_Extensions" = [ "Win32_System_Diagnostics_Debug" ]; "Win32_System_Diagnostics_Etw" = [ "Win32_System_Diagnostics" ]; "Win32_System_Diagnostics_ProcessSnapshotting" = [ "Win32_System_Diagnostics" ]; @@ -11846,19 +11919,15 @@ rec { "Win32_System_Memory_NonVolatile" = [ "Win32_System_Memory" ]; "Win32_System_MessageQueuing" = [ "Win32_System" ]; "Win32_System_MixedReality" = [ "Win32_System" ]; - "Win32_System_Mmc" = [ "Win32_System" ]; "Win32_System_Ole" = [ "Win32_System" ]; - "Win32_System_ParentalControls" = [ "Win32_System" ]; "Win32_System_PasswordManagement" = [ "Win32_System" ]; "Win32_System_Performance" = [ "Win32_System" ]; "Win32_System_Performance_HardwareCounterProfiling" = [ "Win32_System_Performance" ]; "Win32_System_Pipes" = [ "Win32_System" ]; "Win32_System_Power" = [ "Win32_System" ]; "Win32_System_ProcessStatus" = [ "Win32_System" ]; - "Win32_System_RealTimeCommunications" = [ "Win32_System" ]; "Win32_System_Recovery" = [ "Win32_System" ]; "Win32_System_Registry" = [ "Win32_System" ]; - "Win32_System_RemoteAssistance" = [ "Win32_System" ]; "Win32_System_RemoteDesktop" = [ "Win32_System" ]; "Win32_System_RemoteManagement" = [ "Win32_System" ]; "Win32_System_RestartManager" = [ "Win32_System" ]; @@ -11867,64 +11936,50 @@ rec { "Win32_System_Search" = [ "Win32_System" ]; "Win32_System_Search_Common" = [ "Win32_System_Search" ]; "Win32_System_SecurityCenter" = [ "Win32_System" ]; - "Win32_System_ServerBackup" = [ "Win32_System" ]; "Win32_System_Services" = [ "Win32_System" ]; - "Win32_System_SettingsManagementInfrastructure" = [ "Win32_System" ]; "Win32_System_SetupAndMigration" = [ "Win32_System" ]; "Win32_System_Shutdown" = [ "Win32_System" ]; "Win32_System_StationsAndDesktops" = [ "Win32_System" ]; "Win32_System_SubsystemForLinux" = [ "Win32_System" ]; "Win32_System_SystemInformation" = [ "Win32_System" ]; "Win32_System_SystemServices" = [ "Win32_System" ]; - "Win32_System_TaskScheduler" = [ "Win32_System" ]; "Win32_System_Threading" = [ "Win32_System" ]; "Win32_System_Time" = [ "Win32_System" ]; "Win32_System_TpmBaseServices" = [ "Win32_System" ]; - "Win32_System_UpdateAgent" = [ "Win32_System" ]; - "Win32_System_UpdateAssessment" = [ "Win32_System" ]; "Win32_System_UserAccessLogging" = [ "Win32_System" ]; + "Win32_System_Variant" = [ "Win32_System" ]; "Win32_System_VirtualDosMachines" = [ "Win32_System" ]; "Win32_System_WindowsProgramming" = [ "Win32_System" ]; - "Win32_System_WindowsSync" = [ "Win32_System" ]; "Win32_System_Wmi" = [ "Win32_System" ]; "Win32_UI" = [ "Win32" ]; "Win32_UI_Accessibility" = [ "Win32_UI" ]; - "Win32_UI_Animation" = [ "Win32_UI" ]; "Win32_UI_ColorSystem" = [ "Win32_UI" ]; "Win32_UI_Controls" = [ "Win32_UI" ]; "Win32_UI_Controls_Dialogs" = [ "Win32_UI_Controls" ]; - "Win32_UI_Controls_RichEdit" = [ "Win32_UI_Controls" ]; "Win32_UI_HiDpi" = [ "Win32_UI" ]; "Win32_UI_Input" = [ "Win32_UI" ]; "Win32_UI_Input_Ime" = [ "Win32_UI_Input" ]; - "Win32_UI_Input_Ink" = [ "Win32_UI_Input" ]; "Win32_UI_Input_KeyboardAndMouse" = [ "Win32_UI_Input" ]; "Win32_UI_Input_Pointer" = [ "Win32_UI_Input" ]; - "Win32_UI_Input_Radial" = [ "Win32_UI_Input" ]; "Win32_UI_Input_Touch" = [ "Win32_UI_Input" ]; "Win32_UI_Input_XboxController" = [ "Win32_UI_Input" ]; "Win32_UI_InteractionContext" = [ "Win32_UI" ]; - "Win32_UI_LegacyWindowsEnvironmentFeatures" = [ "Win32_UI" ]; "Win32_UI_Magnification" = [ "Win32_UI" ]; - "Win32_UI_Notifications" = [ "Win32_UI" ]; - "Win32_UI_Ribbon" = [ "Win32_UI" ]; "Win32_UI_Shell" = [ "Win32_UI" ]; - "Win32_UI_Shell_Common" = [ "Win32_UI_Shell" ]; "Win32_UI_Shell_PropertiesSystem" = [ "Win32_UI_Shell" ]; "Win32_UI_TabletPC" = [ "Win32_UI" ]; "Win32_UI_TextServices" = [ "Win32_UI" ]; "Win32_UI_WindowsAndMessaging" = [ "Win32_UI" ]; - "Win32_UI_Wpf" = [ "Win32_UI" ]; "Win32_Web" = [ "Win32" ]; "Win32_Web_InternetExplorer" = [ "Win32_Web" ]; }; - resolvedDefaultFeatures = [ "Win32" "Win32_Foundation" "Win32_Networking" "Win32_Networking_WinSock" "Win32_Security" "Win32_Storage" "Win32_Storage_FileSystem" "Win32_System" "Win32_System_Console" "Win32_System_IO" "Win32_System_Pipes" "Win32_System_SystemServices" "Win32_System_Threading" "Win32_System_WindowsProgramming" "default" ]; + resolvedDefaultFeatures = [ "Wdk" "Wdk_Foundation" "Wdk_Storage" "Wdk_Storage_FileSystem" "Wdk_System" "Wdk_System_IO" "Win32" "Win32_Foundation" "Win32_NetworkManagement" "Win32_NetworkManagement_IpHelper" "Win32_Networking" "Win32_Networking_WinSock" "Win32_Security" "Win32_Security_Authentication" "Win32_Security_Authentication_Identity" "Win32_Security_Credentials" "Win32_Security_Cryptography" "Win32_Storage" "Win32_Storage_FileSystem" "Win32_System" "Win32_System_Com" "Win32_System_Console" "Win32_System_Diagnostics" "Win32_System_Diagnostics_Debug" "Win32_System_IO" "Win32_System_Memory" "Win32_System_Pipes" "Win32_System_SystemServices" "Win32_System_Threading" "Win32_System_WindowsProgramming" "Win32_UI" "Win32_UI_Shell" "default" ]; }; - "windows-sys 0.52.0" = rec { + "windows-sys 0.59.0" = rec { crateName = "windows-sys"; - version = "0.52.0"; + version = "0.59.0"; edition = "2021"; - sha256 = "0gd3v4ji88490zgb6b5mq5zgbvwv7zx1ibn8v3x83rwcdbryaar8"; + sha256 = "0fw5672ziw8b3zpmnbp9pdv1famk74f1l9fcbc3zsrzdg56vqf0y"; libName = "windows_sys"; authors = [ "Microsoft" @@ -11932,23 +11987,32 @@ rec { dependencies = [ { name = "windows-targets"; - packageId = "windows-targets 0.52.6"; + packageId = "windows-targets"; } ]; features = { + "Wdk" = [ "Win32_Foundation" ]; + "Wdk_Devices" = [ "Wdk" ]; + "Wdk_Devices_Bluetooth" = [ "Wdk_Devices" ]; + "Wdk_Devices_HumanInterfaceDevice" = [ "Wdk_Devices" ]; "Wdk_Foundation" = [ "Wdk" ]; "Wdk_Graphics" = [ "Wdk" ]; "Wdk_Graphics_Direct3D" = [ "Wdk_Graphics" ]; + "Wdk_NetworkManagement" = [ "Wdk" ]; + "Wdk_NetworkManagement_Ndis" = [ "Wdk_NetworkManagement" ]; + "Wdk_NetworkManagement_WindowsFilteringPlatform" = [ "Wdk_NetworkManagement" ]; "Wdk_Storage" = [ "Wdk" ]; "Wdk_Storage_FileSystem" = [ "Wdk_Storage" ]; "Wdk_Storage_FileSystem_Minifilters" = [ "Wdk_Storage_FileSystem" ]; "Wdk_System" = [ "Wdk" ]; "Wdk_System_IO" = [ "Wdk_System" ]; + "Wdk_System_Memory" = [ "Wdk_System" ]; "Wdk_System_OfflineRegistry" = [ "Wdk_System" ]; "Wdk_System_Registry" = [ "Wdk_System" ]; "Wdk_System_SystemInformation" = [ "Wdk_System" ]; "Wdk_System_SystemServices" = [ "Wdk_System" ]; "Wdk_System_Threading" = [ "Wdk_System" ]; + "Win32" = [ "Win32_Foundation" ]; "Win32_Data" = [ "Win32" ]; "Win32_Data_HtmlHelp" = [ "Win32_Data" ]; "Win32_Data_RightsManagement" = [ "Win32_Data" ]; @@ -12088,6 +12152,7 @@ rec { "Win32_System_Diagnostics_Etw" = [ "Win32_System_Diagnostics" ]; "Win32_System_Diagnostics_ProcessSnapshotting" = [ "Win32_System_Diagnostics" ]; "Win32_System_Diagnostics_ToolHelp" = [ "Win32_System_Diagnostics" ]; + "Win32_System_Diagnostics_TraceLogging" = [ "Win32_System_Diagnostics" ]; "Win32_System_DistributedTransactionCoordinator" = [ "Win32_System" ]; "Win32_System_Environment" = [ "Win32_System" ]; "Win32_System_ErrorReporting" = [ "Win32_System" ]; @@ -12159,6 +12224,7 @@ rec { "Win32_UI_InteractionContext" = [ "Win32_UI" ]; "Win32_UI_Magnification" = [ "Win32_UI" ]; "Win32_UI_Shell" = [ "Win32_UI" ]; + "Win32_UI_Shell_Common" = [ "Win32_UI_Shell" ]; "Win32_UI_Shell_PropertiesSystem" = [ "Win32_UI_Shell" ]; "Win32_UI_TabletPC" = [ "Win32_UI" ]; "Win32_UI_TextServices" = [ "Win32_UI" ]; @@ -12166,57 +12232,9 @@ rec { "Win32_Web" = [ "Win32" ]; "Win32_Web_InternetExplorer" = [ "Win32_Web" ]; }; - resolvedDefaultFeatures = [ "Win32" "Win32_Foundation" "Win32_NetworkManagement" "Win32_NetworkManagement_IpHelper" "Win32_Networking" "Win32_Networking_WinSock" "Win32_Security" "Win32_Security_Authentication" "Win32_Security_Authentication_Identity" "Win32_Security_Credentials" "Win32_Security_Cryptography" "Win32_Storage" "Win32_Storage_FileSystem" "Win32_System" "Win32_System_Com" "Win32_System_Console" "Win32_System_Diagnostics" "Win32_System_Diagnostics_Debug" "Win32_System_IO" "Win32_System_Memory" "Win32_System_Threading" "Win32_System_WindowsProgramming" "Win32_UI" "Win32_UI_Shell" "default" ]; + resolvedDefaultFeatures = [ "Win32" "Win32_Foundation" "Win32_Storage" "Win32_Storage_FileSystem" "default" ]; }; - "windows-targets 0.48.5" = rec { - crateName = "windows-targets"; - version = "0.48.5"; - edition = "2018"; - sha256 = "034ljxqshifs1lan89xwpcy1hp0lhdh4b5n0d2z4fwjx2piacbws"; - libName = "windows_targets"; - authors = [ - "Microsoft" - ]; - dependencies = [ - { - name = "windows_aarch64_gnullvm"; - packageId = "windows_aarch64_gnullvm 0.48.5"; - target = { target, features }: (pkgs.rust.lib.toRustTarget stdenv.hostPlatform == "aarch64-pc-windows-gnullvm"); - } - { - name = "windows_aarch64_msvc"; - packageId = "windows_aarch64_msvc 0.48.5"; - target = { target, features }: (("aarch64" == target."arch" or null) && ("msvc" == target."env" or null) && (!(target."windows_raw_dylib" or false))); - } - { - name = "windows_i686_gnu"; - packageId = "windows_i686_gnu 0.48.5"; - target = { target, features }: (("x86" == target."arch" or null) && ("gnu" == target."env" or null) && (!(target."windows_raw_dylib" or false))); - } - { - name = "windows_i686_msvc"; - packageId = "windows_i686_msvc 0.48.5"; - target = { target, features }: (("x86" == target."arch" or null) && ("msvc" == target."env" or null) && (!(target."windows_raw_dylib" or false))); - } - { - name = "windows_x86_64_gnu"; - packageId = "windows_x86_64_gnu 0.48.5"; - target = { target, features }: (("x86_64" == target."arch" or null) && ("gnu" == target."env" or null) && (!("llvm" == target."abi" or null)) && (!(target."windows_raw_dylib" or false))); - } - { - 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"); - } - { - name = "windows_x86_64_msvc"; - packageId = "windows_x86_64_msvc 0.48.5"; - target = { target, features }: (("x86_64" == target."arch" or null) && ("msvc" == target."env" or null) && (!(target."windows_raw_dylib" or false))); - } - ]; - - }; - "windows-targets 0.52.6" = rec { + "windows-targets" = rec { crateName = "windows-targets"; version = "0.52.6"; edition = "2021"; @@ -12228,58 +12246,48 @@ rec { dependencies = [ { name = "windows_aarch64_gnullvm"; - packageId = "windows_aarch64_gnullvm 0.52.6"; - target = { target, features }: (pkgs.rust.lib.toRustTarget stdenv.hostPlatform == "aarch64-pc-windows-gnullvm"); + packageId = "windows_aarch64_gnullvm"; + target = { target, features }: (stdenv.hostPlatform.rust.rustcTarget == "aarch64-pc-windows-gnullvm"); } { name = "windows_aarch64_msvc"; - packageId = "windows_aarch64_msvc 0.52.6"; + packageId = "windows_aarch64_msvc"; target = { target, features }: (("aarch64" == target."arch" or null) && ("msvc" == target."env" or null) && (!(target."windows_raw_dylib" or false))); } { name = "windows_i686_gnu"; - packageId = "windows_i686_gnu 0.52.6"; + packageId = "windows_i686_gnu"; target = { target, features }: (("x86" == target."arch" or null) && ("gnu" == target."env" or null) && (!("llvm" == target."abi" or null)) && (!(target."windows_raw_dylib" or false))); } { name = "windows_i686_gnullvm"; packageId = "windows_i686_gnullvm"; - target = { target, features }: (pkgs.rust.lib.toRustTarget stdenv.hostPlatform == "i686-pc-windows-gnullvm"); + target = { target, features }: (stdenv.hostPlatform.rust.rustcTarget == "i686-pc-windows-gnullvm"); } { name = "windows_i686_msvc"; - packageId = "windows_i686_msvc 0.52.6"; + packageId = "windows_i686_msvc"; target = { target, features }: (("x86" == target."arch" or null) && ("msvc" == target."env" or null) && (!(target."windows_raw_dylib" or false))); } { name = "windows_x86_64_gnu"; - packageId = "windows_x86_64_gnu 0.52.6"; + packageId = "windows_x86_64_gnu"; target = { target, features }: (("x86_64" == target."arch" or null) && ("gnu" == target."env" or null) && (!("llvm" == target."abi" or null)) && (!(target."windows_raw_dylib" or false))); } { name = "windows_x86_64_gnullvm"; - packageId = "windows_x86_64_gnullvm 0.52.6"; - target = { target, features }: (pkgs.rust.lib.toRustTarget stdenv.hostPlatform == "x86_64-pc-windows-gnullvm"); + packageId = "windows_x86_64_gnullvm"; + target = { target, features }: (stdenv.hostPlatform.rust.rustcTarget == "x86_64-pc-windows-gnullvm"); } { name = "windows_x86_64_msvc"; - packageId = "windows_x86_64_msvc 0.52.6"; + packageId = "windows_x86_64_msvc"; target = { target, features }: ((("x86_64" == target."arch" or null) || ("arm64ec" == target."arch" or null)) && ("msvc" == target."env" or null) && (!(target."windows_raw_dylib" or false))); } ]; }; - "windows_aarch64_gnullvm 0.48.5" = rec { - crateName = "windows_aarch64_gnullvm"; - version = "0.48.5"; - edition = "2018"; - sha256 = "1n05v7qblg1ci3i567inc7xrkmywczxrs1z3lj3rkkxw18py6f1b"; - authors = [ - "Microsoft" - ]; - - }; - "windows_aarch64_gnullvm 0.52.6" = rec { + "windows_aarch64_gnullvm" = rec { crateName = "windows_aarch64_gnullvm"; version = "0.52.6"; edition = "2021"; @@ -12289,17 +12297,7 @@ rec { ]; }; - "windows_aarch64_msvc 0.48.5" = rec { - crateName = "windows_aarch64_msvc"; - version = "0.48.5"; - edition = "2018"; - sha256 = "1g5l4ry968p73g6bg6jgyvy9lb8fyhcs54067yzxpcpkf44k2dfw"; - authors = [ - "Microsoft" - ]; - - }; - "windows_aarch64_msvc 0.52.6" = rec { + "windows_aarch64_msvc" = rec { crateName = "windows_aarch64_msvc"; version = "0.52.6"; edition = "2021"; @@ -12309,17 +12307,7 @@ rec { ]; }; - "windows_i686_gnu 0.48.5" = rec { - crateName = "windows_i686_gnu"; - version = "0.48.5"; - edition = "2018"; - sha256 = "0gklnglwd9ilqx7ac3cn8hbhkraqisd0n83jxzf9837nvvkiand7"; - authors = [ - "Microsoft" - ]; - - }; - "windows_i686_gnu 0.52.6" = rec { + "windows_i686_gnu" = rec { crateName = "windows_i686_gnu"; version = "0.52.6"; edition = "2021"; @@ -12339,17 +12327,7 @@ rec { ]; }; - "windows_i686_msvc 0.48.5" = rec { - crateName = "windows_i686_msvc"; - version = "0.48.5"; - edition = "2018"; - sha256 = "01m4rik437dl9rdf0ndnm2syh10hizvq0dajdkv2fjqcywrw4mcg"; - authors = [ - "Microsoft" - ]; - - }; - "windows_i686_msvc 0.52.6" = rec { + "windows_i686_msvc" = rec { crateName = "windows_i686_msvc"; version = "0.52.6"; edition = "2021"; @@ -12359,17 +12337,7 @@ rec { ]; }; - "windows_x86_64_gnu 0.48.5" = rec { - crateName = "windows_x86_64_gnu"; - version = "0.48.5"; - edition = "2018"; - sha256 = "13kiqqcvz2vnyxzydjh73hwgigsdr2z1xpzx313kxll34nyhmm2k"; - authors = [ - "Microsoft" - ]; - - }; - "windows_x86_64_gnu 0.52.6" = rec { + "windows_x86_64_gnu" = rec { crateName = "windows_x86_64_gnu"; version = "0.52.6"; edition = "2021"; @@ -12379,17 +12347,7 @@ rec { ]; }; - "windows_x86_64_gnullvm 0.48.5" = rec { - crateName = "windows_x86_64_gnullvm"; - version = "0.48.5"; - edition = "2018"; - sha256 = "1k24810wfbgz8k48c2yknqjmiigmql6kk3knmddkv8k8g1v54yqb"; - authors = [ - "Microsoft" - ]; - - }; - "windows_x86_64_gnullvm 0.52.6" = rec { + "windows_x86_64_gnullvm" = rec { crateName = "windows_x86_64_gnullvm"; version = "0.52.6"; edition = "2021"; @@ -12399,17 +12357,7 @@ rec { ]; }; - "windows_x86_64_msvc 0.48.5" = rec { - crateName = "windows_x86_64_msvc"; - version = "0.48.5"; - edition = "2018"; - sha256 = "0f4mdp895kkjh9zv8dxvn4pc10xr7839lf5pa9l0193i2pkgr57d"; - authors = [ - "Microsoft" - ]; - - }; - "windows_x86_64_msvc 0.52.6" = rec { + "windows_x86_64_msvc" = rec { crateName = "windows_x86_64_msvc"; version = "0.52.6"; edition = "2021"; @@ -12421,10 +12369,10 @@ rec { }; "xml-rs" = rec { crateName = "xml-rs"; - version = "0.8.20"; + version = "0.8.21"; edition = "2021"; crateBin = []; - sha256 = "14s1czpj83zhgr4pizxa4j07layw9wmlqhkq0k3wz5q5ixwph6br"; + sha256 = "00g63s3kcnj69hsgg96gvbh822qa71vv2sfsqvf37qqdgkp7g6jk"; libName = "xml"; authors = [ "Vladimir Matveev " @@ -12455,6 +12403,12 @@ rec { "Joshua Liebow-Feeser " ]; dependencies = [ + { + name = "byteorder"; + packageId = "byteorder"; + optional = true; + usesDefaultFeatures = false; + } { name = "zerocopy-derive"; packageId = "zerocopy-derive"; @@ -12480,7 +12434,7 @@ rec { "simd-nightly" = [ "simd" ]; "zerocopy-derive" = [ "dep:zerocopy-derive" ]; }; - resolvedDefaultFeatures = [ "simd" ]; + resolvedDefaultFeatures = [ "byteorder" "default" "derive" "simd" "zerocopy-derive" ]; }; "zerocopy-derive" = rec { crateName = "zerocopy-derive"; @@ -12503,7 +12457,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.70"; + packageId = "syn 2.0.74"; } ]; @@ -12540,14 +12494,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" @@ -12636,52 +12587,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 - # It's necessary to locate the source in $NIX_BUILD_TOP/source/ - # instead of $NIX_BUILD_TOP/ - # because we compiled those test binaries in the former and not the latter. - # So all paths will expect source tree to be there and not in the build top directly. - # For example: $NIX_BUILD_TOP := /build in general, if you ask yourself. - # NOTE: There could be edge cases if `crate.sourceRoot` does exist but - # it's very hard to reason about them. - # Open a bug if you run into this! - mkdir -p source/ - cd source/ - - ${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" { @@ -12790,7 +12730,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 @@ -12865,8 +12805,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"; diff --git a/crate-hashes.json b/crate-hashes.json index 35c0ee8c..bc60f196 100644 --- a/crate-hashes.json +++ b/crate-hashes.json @@ -1,6 +1,6 @@ { "git+https://github.com/stackabletech/h2.git?branch=feature%2Fgrpc-uds-%2F0.4.5#h2@0.4.5": "0v0865w398zw0q6mhkwifbbfwffilhhlr4ympjz6fg0ac1q95s1x", - "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.70.0#stackable-operator-derive@0.3.1": "1z4pa8xsh5hlnjizx37y0wv50dm943q1gj78madqzasssr8l8rwa", - "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.70.0#stackable-operator@0.70.0": "1z4pa8xsh5hlnjizx37y0wv50dm943q1gj78madqzasssr8l8rwa", + "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.73.0#stackable-operator-derive@0.3.1": "0cmfbc3v9kklsfkqbnhwig45106gfizhmlmg9p1qgdjp8az43l9m", + "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.73.0#stackable-operator@0.73.0": "0cmfbc3v9kklsfkqbnhwig45106gfizhmlmg9p1qgdjp8az43l9m", "git+https://github.com/stackabletech/product-config.git?tag=0.7.0#product-config@0.7.0": "0gjsm80g6r75pm3824dcyiz4ysq1ka4c1if6k1mjm9cnd5ym0gny" -} +} \ No newline at end of file diff --git a/nix/sources.json b/nix/sources.json index e367f0bf..4761dbc7 100644 --- a/nix/sources.json +++ b/nix/sources.json @@ -17,10 +17,10 @@ "homepage": "", "owner": "kolloch", "repo": "crate2nix", - "rev": "cf034861fdc4e091fc7c5f01d6c022dc46686cf1", - "sha256": "03gd74lrfwgkj21b1w8wabbhisvdk96r1a70jhmdvalz59cx7rmc", + "rev": "236f6addfd452a48be805819e3216af79e988fd5", + "sha256": "1cnq84c1bhhbn3blm31scrqsxw2bl1w67v6gpav01m0s2509klf5", "type": "tarball", - "url": "https://github.com/kolloch/crate2nix/archive/cf034861fdc4e091fc7c5f01d6c022dc46686cf1.tar.gz", + "url": "https://github.com/kolloch/crate2nix/archive/236f6addfd452a48be805819e3216af79e988fd5.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "nixpkgs": { @@ -29,10 +29,10 @@ "homepage": "", "owner": "NixOS", "repo": "nixpkgs", - "rev": "af8b9db5c00f1a8e4b83578acc578ff7d823b786", - "sha256": "0kd64p8i1gmgdjfdag2fvj4gfcsk0wa3h7w7j5l6b2yxr9plnhpm", + "rev": "8b908192e64224420e2d59dfd9b2e4309e154c5d", + "sha256": "1yfsvb2cjinlydcmy8maaa2qafh2sqnn7h6mq80syzvr81li2kcy", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/af8b9db5c00f1a8e4b83578acc578ff7d823b786.tar.gz", + "url": "https://github.com/NixOS/nixpkgs/archive/8b908192e64224420e2d59dfd9b2e4309e154c5d.tar.gz", "url_template": "https://github.com///archive/.tar.gz" } }