diff options
Diffstat (limited to 'pkgs/tools')
166 files changed, 5440 insertions, 2387 deletions
diff --git a/pkgs/tools/admin/aws-sso-cli/default.nix b/pkgs/tools/admin/aws-sso-cli/default.nix index 998da596c0688..efe07ba5e96ca 100644 --- a/pkgs/tools/admin/aws-sso-cli/default.nix +++ b/pkgs/tools/admin/aws-sso-cli/default.nix @@ -6,13 +6,13 @@ }: buildGoModule rec { pname = "aws-sso-cli"; - version = "1.14.3"; + version = "1.15.0"; src = fetchFromGitHub { owner = "synfinatic"; repo = pname; rev = "v${version}"; - hash = "sha256-6UP+5niKAdO4DgdEnTdpbUnr2BLKwAgHcEZqkgzCcqs="; + hash = "sha256-FbJ9l1C6mOgB7I5+jIQVKI3xJAJI3GuDFCjmIP8Qf10="; }; vendorHash = "sha256-TU5kJ0LIqHcfEQEkk69xWJZk30VD9XwlJ5b83w1mHKk="; diff --git a/pkgs/tools/admin/aws-sso-creds/default.nix b/pkgs/tools/admin/aws-sso-creds/default.nix index caa1b05c1b1dd..3dbf8f135f0fe 100644 --- a/pkgs/tools/admin/aws-sso-creds/default.nix +++ b/pkgs/tools/admin/aws-sso-creds/default.nix @@ -6,15 +6,15 @@ }: buildGoModule rec { pname = "aws-sso-creds"; - version = "1.5.0"; + version = "2.0.0"; src = fetchFromGitHub { owner = "jaxxstorm"; repo = pname; rev = "v${version}"; - sha256 = "sha256-/zvXVDVlnDcgYpnumN7owN2fHexvQu5D4LvNmuQNS+w="; + sha256 = "sha256-QYE+HvvBEWPxopVP8QMqb4lNRyAtVDewuiWzja9XdM4="; }; - vendorHash = "sha256-mJj5ilH4crlL5jesvg0y3RZaMgqlrenWgJApxUw6jEk="; + vendorHash = "sha256-2EDpyw7Mqhvc0i6+UjWfNlvndRYJDaezRkOy9PBeD1Y="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/admin/awscli2/default.nix b/pkgs/tools/admin/awscli2/default.nix index 4404fed5b09e7..a556d7cb90f0b 100644 --- a/pkgs/tools/admin/awscli2/default.nix +++ b/pkgs/tools/admin/awscli2/default.nix @@ -59,14 +59,14 @@ let in with py.pkgs; buildPythonApplication rec { pname = "awscli2"; - version = "2.15.32"; # N.B: if you change this, check if overrides are still up-to-date + version = "2.15.34"; # N.B: if you change this, check if overrides are still up-to-date pyproject = true; src = fetchFromGitHub { owner = "aws"; repo = "aws-cli"; rev = "refs/tags/${version}"; - hash = "sha256-EdS8nsSlFtCvHn6Aysj8C5tmdBBRUtbTEVqkYex5vgc="; + hash = "sha256-lFovWxPlo3WlKE4yOlTtILbsRsILgioqVmPptOQO0bM="; }; postPatch = '' diff --git a/pkgs/tools/admin/drawterm/default.nix b/pkgs/tools/admin/drawterm/default.nix index c83b3dfd65979..b1e7acb3f8f5f 100644 --- a/pkgs/tools/admin/drawterm/default.nix +++ b/pkgs/tools/admin/drawterm/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation { pname = "drawterm"; - version = "unstable-2024-03-20"; + version = "unstable-2024-03-31"; src = fetchFrom9Front { owner = "plan9front"; repo = "drawterm"; - rev = "77b464a5d5648bb646467111b8faf719cd5c46b6"; - hash = "sha256-3J/Fa3NXxUieEqRcCepGdd0ktxQFKhyY4z8Pvcq94Kw="; + rev = "401b33384215ea3f7e6a89e61f75e8acb35a3cc4"; + hash = "sha256-BJqZ4gf6PvGlpS3sab3pLqNxVFIM5nzLRrswrR/ehE4="; }; enableParallelBuilding = true; diff --git a/pkgs/tools/admin/exoscale-cli/default.nix b/pkgs/tools/admin/exoscale-cli/default.nix index 4abc7a998eabc..0ed890ff5b742 100644 --- a/pkgs/tools/admin/exoscale-cli/default.nix +++ b/pkgs/tools/admin/exoscale-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "exoscale-cli"; - version = "1.76.2"; + version = "1.77.0"; src = fetchFromGitHub { owner = "exoscale"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-0wobPnSrKVJ61+gj3cZsNUt6hun3qa/zVoBZlP3viSk="; + sha256 = "sha256-mUigWOFNfo/tI/2Vf3r2FWw+LHQU7vGodnXnJ6bIwAM="; }; vendorHash = null; diff --git a/pkgs/tools/admin/fastlane/Gemfile.lock b/pkgs/tools/admin/fastlane/Gemfile.lock index 9f2cbafb8949a..d9ca6d0777e26 100644 --- a/pkgs/tools/admin/fastlane/Gemfile.lock +++ b/pkgs/tools/admin/fastlane/Gemfile.lock @@ -1,29 +1,32 @@ GEM remote: https://rubygems.org/ specs: - CFPropertyList (3.0.6) + CFPropertyList (3.0.7) + base64 + nkf rexml addressable (2.8.6) public_suffix (>= 2.0.2, < 6.0) - artifactory (3.0.15) + artifactory (3.0.17) atomos (0.1.3) aws-eventstream (1.3.0) - aws-partitions (1.877.0) - aws-sdk-core (3.190.1) + aws-partitions (1.909.0) + aws-sdk-core (3.191.6) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.651.0) aws-sigv4 (~> 1.8) jmespath (~> 1, >= 1.6.1) - aws-sdk-kms (1.76.0) - aws-sdk-core (~> 3, >= 3.188.0) + aws-sdk-kms (1.78.0) + aws-sdk-core (~> 3, >= 3.191.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.142.0) - aws-sdk-core (~> 3, >= 3.189.0) + aws-sdk-s3 (1.146.1) + aws-sdk-core (~> 3, >= 3.191.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.8) aws-sigv4 (1.8.0) aws-eventstream (~> 1, >= 1.0.2) babosa (1.0.4) + base64 (0.2.0) claide (1.1.0) colored (1.2) colored2 (3.1.2) @@ -32,10 +35,10 @@ GEM declarative (0.0.20) digest-crc (0.6.5) rake (>= 12.0.0, < 14.0.0) - domain_name (0.6.20231109) + domain_name (0.6.20240107) dotenv (2.8.1) emoji_regex (3.2.3) - excon (0.109.0) + excon (0.110.0) faraday (1.10.3) faraday-em_http (~> 1.0) faraday-em_synchrony (~> 1.0) @@ -64,15 +67,15 @@ GEM faraday-retry (1.0.3) faraday_middleware (1.2.0) faraday (~> 1.0) - fastimage (2.3.0) - fastlane (2.219.0) + fastimage (2.3.1) + fastlane (2.220.0) CFPropertyList (>= 2.3, < 4.0.0) addressable (>= 2.8, < 3.0.0) artifactory (~> 3.0) aws-sdk-s3 (~> 1.0) babosa (>= 1.0.3, < 2.0.0) bundler (>= 1.12.0, < 3.0.0) - colored + colored (~> 1.2) commander (~> 4.6) dotenv (>= 2.1.1, < 3.0.0) emoji_regex (>= 0.1, < 4.0) @@ -93,10 +96,10 @@ GEM mini_magick (>= 4.9.4, < 5.0.0) multipart-post (>= 2.0.0, < 3.0.0) naturally (~> 2.2) - optparse (>= 0.1.1) + optparse (>= 0.1.1, < 1.0.0) plist (>= 3.1.0, < 4.0.0) rubyzip (>= 2.0.0, < 3.0.0) - security (= 0.1.3) + security (= 0.1.5) simctl (~> 1.6.3) terminal-notifier (>= 2.0.0, < 3.0.0) terminal-table (~> 3) @@ -105,11 +108,11 @@ GEM word_wrap (~> 1.0.0) xcodeproj (>= 1.13.0, < 2.0.0) xcpretty (~> 0.3.0) - xcpretty-travis-formatter (>= 0.0.3) + xcpretty-travis-formatter (>= 0.0.3, < 2.0.0) gh_inspector (1.1.3) google-apis-androidpublisher_v3 (0.54.0) google-apis-core (>= 0.11.0, < 2.a) - google-apis-core (0.11.2) + google-apis-core (0.11.3) addressable (~> 2.5, >= 2.5.1) googleauth (>= 0.16.2, < 2.a) httpclient (>= 2.8.1, < 3.a) @@ -117,24 +120,23 @@ GEM representable (~> 3.0) retriable (>= 2.0, < 4.a) rexml - webrick google-apis-iamcredentials_v1 (0.17.0) google-apis-core (>= 0.11.0, < 2.a) google-apis-playcustomapp_v1 (0.13.0) google-apis-core (>= 0.11.0, < 2.a) - google-apis-storage_v1 (0.29.0) + google-apis-storage_v1 (0.31.0) google-apis-core (>= 0.11.0, < 2.a) - google-cloud-core (1.6.1) + google-cloud-core (1.7.0) google-cloud-env (>= 1.0, < 3.a) google-cloud-errors (~> 1.0) google-cloud-env (1.6.0) faraday (>= 0.17.3, < 3.0) - google-cloud-errors (1.3.1) - google-cloud-storage (1.45.0) + google-cloud-errors (1.4.0) + google-cloud-storage (1.47.0) addressable (~> 2.8) digest-crc (~> 0.4) google-apis-iamcredentials_v1 (~> 0.1) - google-apis-storage_v1 (~> 0.29.0) + google-apis-storage_v1 (~> 0.31.0) google-cloud-core (~> 1.6) googleauth (>= 0.16.2, < 2.a) mini_mime (~> 1.0) @@ -149,19 +151,21 @@ GEM domain_name (~> 0.5) httpclient (2.8.3) jmespath (1.6.2) - json (2.7.1) - jwt (2.7.1) + json (2.7.2) + jwt (2.8.1) + base64 mini_magick (4.12.0) mini_mime (1.1.5) multi_json (1.15.0) - multipart-post (2.3.0) + multipart-post (2.4.0) nanaimo (0.3.0) naturally (2.2.1) + nkf (0.2.0) optparse (0.4.0) os (1.1.4) plist (3.7.1) - public_suffix (5.0.4) - rake (13.1.0) + public_suffix (5.0.5) + rake (13.2.1) representable (3.2.0) declarative (< 0.1.0) trailblazer-option (>= 0.1.1, < 0.2.0) @@ -171,8 +175,8 @@ GEM rouge (2.0.7) ruby2_keywords (0.0.5) rubyzip (2.3.2) - security (0.1.3) - signet (0.18.0) + security (0.1.5) + signet (0.19.0) addressable (~> 2.8) faraday (>= 0.17.5, < 3.a) jwt (>= 1.5, < 3.0) @@ -190,9 +194,8 @@ GEM tty-cursor (~> 0.7) uber (0.1.0) unicode-display_width (2.5.0) - webrick (1.8.1) word_wrap (1.0.0) - xcodeproj (1.23.0) + xcodeproj (1.24.0) CFPropertyList (>= 2.3.3, < 4.0) atomos (~> 0.1.3) claide (>= 1.0.2, < 2.0) @@ -211,4 +214,4 @@ DEPENDENCIES fastlane BUNDLED WITH - 2.4.22 + 2.5.6 diff --git a/pkgs/tools/admin/fastlane/gemset.nix b/pkgs/tools/admin/fastlane/gemset.nix index 1afc21c27a166..1019d157c1e5f 100644 --- a/pkgs/tools/admin/fastlane/gemset.nix +++ b/pkgs/tools/admin/fastlane/gemset.nix @@ -15,10 +15,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0wify8rhjwr5bw5y6ary61vba290vk766cxw9a9mg05yswmaisls"; + sha256 = "0qzj389l2a3zig040h882mf6cxfa71pm2nk51l4p85n3ck4xa8rh"; type = "gem"; }; - version = "3.0.15"; + version = "3.0.17"; }; atomos = { groups = ["default"]; @@ -45,10 +45,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zcwrlg4in3gzvsiynpzp9fzlr5grrhc2881xcgfs01ppmxysllm"; + sha256 = "00iknq94smbskgmxqmlxlcgpq5famd968l12nvv8bxi7gk1hagsk"; type = "gem"; }; - version = "1.877.0"; + version = "1.909.0"; }; aws-sdk-core = { dependencies = ["aws-eventstream" "aws-partitions" "aws-sigv4" "jmespath"]; @@ -56,10 +56,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ansagfl5irx1y6b9xf4xpi9j6q6k5pbd2aw80hn0p4m3ycafamh"; + sha256 = "08h9apxdn2aflkg751j4i56ks4750znfbj56w4zlxf4jk7jxkbyk"; type = "gem"; }; - version = "3.190.1"; + version = "3.191.6"; }; aws-sdk-kms = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -67,10 +67,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jfgw9a9c8xyjhkmgpd9rpi95h9i0rhbqszn8iqkbfm9rc9m1xz7"; + sha256 = "0fbp2vw5qnyiya63hlmwiqkbh30lipyqplancmhm84ad7i98ambb"; type = "gem"; }; - version = "1.76.0"; + version = "1.78.0"; }; aws-sdk-s3 = { dependencies = ["aws-sdk-core" "aws-sdk-kms" "aws-sigv4"]; @@ -78,10 +78,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1sfpipfdmixpc0madfx1yvpwpv52fdhxfx4bmvrjxzb6ra78ikbr"; + sha256 = "1al80phz4x9wwfnr07q1l8h5f0qxgfrrycbg8jvznhxm3zhrakrq"; type = "gem"; }; - version = "1.142.0"; + version = "1.146.1"; }; aws-sigv4 = { dependencies = ["aws-eventstream"]; @@ -104,16 +104,26 @@ }; version = "1.0.4"; }; + base64 = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "01qml0yilb9basf7is2614skjp8384h2pycfx86cr8023arfj98g"; + type = "gem"; + }; + version = "0.2.0"; + }; CFPropertyList = { - dependencies = ["rexml"]; + dependencies = ["base64" "nkf" "rexml"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1a36zn77yyibqsfpka0i8vgf3yv98ic2b9wwlbc29566y8wpa2bq"; + sha256 = "0k1w5i4lb1z941m7ds858nly33f3iv12wvr1zav5x3fa99hj2my4"; type = "gem"; }; - version = "3.0.6"; + version = "3.0.7"; }; claide = { groups = ["default"]; @@ -182,10 +192,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gpciaifmxql8h01ci12qq08dnqrdlzkkz6fmia9v9yc3r9a29si"; + sha256 = "0cyr2xm576gqhqicsyqnhanni47408w2pgvrfi8pd13h2li3nsaz"; type = "gem"; }; - version = "0.6.20231109"; + version = "0.6.20240107"; }; dotenv = { groups = ["default"]; @@ -212,10 +222,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1kmmwgjzlrnc3nnrdnw1z67c95nbw0hv54a73yj8jw6pcvl9585x"; + sha256 = "1m3gzvp1wqki0yh4b7761qhdy4pyr4phy429b7s9w25nrkhp4lsz"; type = "gem"; }; - version = "0.109.0"; + version = "0.110.0"; }; faraday = { dependencies = ["faraday-em_http" "faraday-em_synchrony" "faraday-excon" "faraday-httpclient" "faraday-multipart" "faraday-net_http" "faraday-net_http_persistent" "faraday-patron" "faraday-rack" "faraday-retry" "ruby2_keywords"]; @@ -356,10 +366,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "104kn1lj55hifcpiw1x7x9slskvqmfanylcz3nj8acjgmri0av72"; + sha256 = "1sfc7svf7h1ja6zmsq9f3ps6pg0q4hymphh6rk7ipmp7ygqjkii3"; type = "gem"; }; - version = "2.3.0"; + version = "2.3.1"; }; fastlane = { dependencies = ["CFPropertyList" "addressable" "artifactory" "aws-sdk-s3" "babosa" "colored" "commander" "dotenv" "emoji_regex" "excon" "faraday" "faraday-cookie_jar" "faraday_middleware" "fastimage" "gh_inspector" "google-apis-androidpublisher_v3" "google-apis-playcustomapp_v1" "google-cloud-env" "google-cloud-storage" "highline" "http-cookie" "json" "jwt" "mini_magick" "multipart-post" "naturally" "optparse" "plist" "rubyzip" "security" "simctl" "terminal-notifier" "terminal-table" "tty-screen" "tty-spinner" "word_wrap" "xcodeproj" "xcpretty" "xcpretty-travis-formatter"]; @@ -367,10 +377,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0g3rg730nf7fr4pjy7fpw19iwxng871mb1d85639fn1bmhma6j7v"; + sha256 = "14ywmlipmryzdxzn4235ah67hy06wh5hf32jbs3a9j7byc2x1kx3"; type = "gem"; }; - version = "2.219.0"; + version = "2.220.0"; }; gh_inspector = { groups = ["default"]; @@ -394,15 +404,15 @@ version = "0.54.0"; }; google-apis-core = { - dependencies = ["addressable" "googleauth" "httpclient" "mini_mime" "representable" "retriable" "rexml" "webrick"]; + dependencies = ["addressable" "googleauth" "httpclient" "mini_mime" "representable" "retriable" "rexml"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1cly6ycryjhk15d60v3nqvhqpjk9f0nznnslbdnin90f5r54sbpd"; + sha256 = "15ycm7al9dizabbqmri5xmiz8mbcci343ygb64ndbmr9n49p08a3"; type = "gem"; }; - version = "0.11.2"; + version = "0.11.3"; }; google-apis-iamcredentials_v1 = { dependencies = ["google-apis-core"]; @@ -432,10 +442,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1k432qgxf41c4m6d68rascm0gyj18r7ypmrnyzmxh7k7nh543awx"; + sha256 = "13yvc9r8bhs16vq3fjc93qlffmq9p6zx97c9g1c3wh0jbrvwrs03"; type = "gem"; }; - version = "0.29.0"; + version = "0.31.0"; }; google-cloud-core = { dependencies = ["google-cloud-env" "google-cloud-errors"]; @@ -443,10 +453,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00wfvdvdv9m4l5ydn6xp65n68mgmpqr3n09hzvxs7gp8fly3j17v"; + sha256 = "0dagdfx3rnk9xplnj19gqpqn41fd09xfn8lp2p75psihhnj2i03l"; type = "gem"; }; - version = "1.6.1"; + version = "1.7.0"; }; google-cloud-env = { dependencies = ["faraday"]; @@ -464,10 +474,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0flpj7v196c3xsqx4yjb7rjcj8p0by4rhj6qf5zanw4p1i41ssf0"; + sha256 = "056yw9cg771c1xqvw15wpdfdw9lz3m13fh5b6a3p1c9xaq7jwkhb"; type = "gem"; }; - version = "1.3.1"; + version = "1.4.0"; }; google-cloud-storage = { dependencies = ["addressable" "digest-crc" "google-apis-iamcredentials_v1" "google-apis-storage_v1" "google-cloud-core" "googleauth" "mini_mime"]; @@ -475,10 +485,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0033bi8qwm0ksxsv5zhz4nzwsiaapq3xk79z8f8rx3v09vdap07j"; + sha256 = "0xpb3s7zr7g647xg66y2mavdargk5ixsfbfdmi4m2jc3khdd0hxm"; type = "gem"; }; - version = "1.45.0"; + version = "1.47.0"; }; googleauth = { dependencies = ["faraday" "jwt" "multi_json" "os" "signet"]; @@ -537,20 +547,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0r9jmjhg2ly3l736flk7r2al47b5c8cayh0gqkq0yhjqzc9a6zhq"; + sha256 = "0b4qsi8gay7ncmigr0pnbxyb17y3h8kavdyhsh7nrlqwr35vb60q"; type = "gem"; }; - version = "2.7.1"; + version = "2.7.2"; }; jwt = { + dependencies = ["base64"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "16z11alz13vfc4zs5l3fk6n51n2jw9lskvc4h4prnww0y797qd87"; + sha256 = "02m3vza49pb9dirwpn8vmzbcypi3fc6l3a9dh253jwm1121g7ajb"; type = "gem"; }; - version = "2.7.1"; + version = "2.8.1"; }; mini_magick = { groups = ["default"]; @@ -587,10 +598,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lgyysrpl50wgcb9ahg29i4p01z0irb3p9lirygma0kkfr5dgk9x"; + sha256 = "1033p35166d9p97y4vajbbvr13pmkk9zwn7sylxpmk9jrpk8ri67"; type = "gem"; }; - version = "2.3.0"; + version = "2.4.0"; }; nanaimo = { groups = ["default"]; @@ -612,6 +623,16 @@ }; version = "2.2.1"; }; + nkf = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "09piyp2pd74klb9wcn0zw4mb5l0k9wzwppxggxi1yi95l2ym3hgv"; + type = "gem"; + }; + version = "0.2.0"; + }; optparse = { groups = ["default"]; platforms = []; @@ -647,20 +668,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1bni4qjrsh2q49pnmmd6if4iv3ak36bd2cckrs6npl111n769k9m"; + sha256 = "14y4vzjwf5gp0mqgs880kis0k7n2biq8i6ci6q2n315kichl1hvj"; type = "gem"; }; - version = "5.0.4"; + version = "5.0.5"; }; rake = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ilr853hawi09626axx0mps4rkkmxcs54mapz9jnqvpnlwd3wsmy"; + sha256 = "17850wcwkgi30p7yqh60960ypn7yibacjjha0av78zaxwvd3ijs6"; type = "gem"; }; - version = "13.1.0"; + version = "13.2.1"; }; representable = { dependencies = ["declarative" "trailblazer-option" "uber"]; @@ -728,10 +749,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ryjxs0j66wrbky2c08yf0mllwalvpg12rpxzbdx2rdhj3cbrlxa"; + sha256 = "1drkm2wgjazwzj09db1szrllkag036bdvc3dr42fh1kpr877m5rs"; type = "gem"; }; - version = "0.1.3"; + version = "0.1.5"; }; signet = { dependencies = ["addressable" "faraday" "jwt" "multi_json"]; @@ -739,10 +760,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0fzakk5y7zzii76zlkynpp1c764mzkkfg4mpj18f5pf2xp1aikb6"; + sha256 = "0cfxa11wy1nv9slmnzjczkdgld0gqizajsb03rliy53zylwkjzsk"; type = "gem"; }; - version = "0.18.0"; + version = "0.19.0"; }; simctl = { dependencies = ["CFPropertyList" "naturally"]; @@ -837,16 +858,6 @@ }; version = "2.5.0"; }; - webrick = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "13qm7s0gr2pmfcl7dxrmq38asaza4w0i2n9my4yzs499j731wh8r"; - type = "gem"; - }; - version = "1.8.1"; - }; word_wrap = { groups = ["default"]; platforms = []; @@ -863,10 +874,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "176ndahc5fssyx04q176vy6wngs1av4vrsdrkdpjij700hqll8hn"; + sha256 = "1wpg4n7b8571j2h8h7v2kk8pr141rgf6m8mhk221k990fissrq56"; type = "gem"; }; - version = "1.23.0"; + version = "1.24.0"; }; xcpretty = { dependencies = ["rouge"]; diff --git a/pkgs/tools/admin/lxd/default.nix b/pkgs/tools/admin/lxd/default.nix deleted file mode 100644 index d66fd7cb3a45d..0000000000000 --- a/pkgs/tools/admin/lxd/default.nix +++ /dev/null @@ -1,94 +0,0 @@ -{ lib -, hwdata -, pkg-config -, lxc -, buildGoModule -, fetchurl -, acl -, libcap -, dqlite -, raft-canonical -, sqlite -, udev -, installShellFiles -, nixosTests -, gitUpdater -, callPackage -}: - -buildGoModule rec { - pname = "lxd-unwrapped"; - version = "5.21.0"; - - src = fetchurl { - url = "https://github.com/canonical/lxd/releases/download/lxd-${version}/lxd-${version}.tar.gz"; - hash = "sha256-vnh+8Jm4Olg+VdAPpGboLSbChdnwsU84IgyzGe4ltg8="; - }; - - vendorHash = null; - - postPatch = '' - substituteInPlace shared/usbid/load.go \ - --replace "/usr/share/misc/usb.ids" "${hwdata}/share/hwdata/usb.ids" - ''; - - excludedPackages = [ "test" "lxd/db/generate" "lxd-agent" "lxd-migrate" ]; - - nativeBuildInputs = [ installShellFiles pkg-config ]; - buildInputs = [ - lxc - acl - libcap - dqlite.dev - raft-canonical.dev - sqlite - udev.dev - ]; - - ldflags = [ "-s" "-w" ]; - tags = [ "libsqlite3" ]; - - preBuild = '' - # required for go-dqlite. See: https://github.com/canonical/lxd/pull/8939 - export CGO_LDFLAGS_ALLOW="(-Wl,-wrap,pthread_create)|(-Wl,-z,now)" - ''; - - # build static binaries: https://github.com/canonical/lxd/blob/6fd175c45e65cd475d198db69d6528e489733e19/Makefile#L43-L51 - postBuild = '' - make lxd-agent lxd-migrate - ''; - - preCheck = - let skippedTests = [ - "TestValidateConfig" - "TestConvertNetworkConfig" - "TestConvertStorageConfig" - "TestSnapshotCommon" - "TestContainerTestSuite" - ]; in - '' - # Disable tests requiring local operations - buildFlagsArray+=("-run" "[^(${builtins.concatStringsSep "|" skippedTests})]") - ''; - - postInstall = '' - installShellCompletion --bash --name lxd ./scripts/bash/lxd-client - ''; - - passthru.tests.lxd = nixosTests.lxd; - passthru.tests.lxd-to-incus = nixosTests.incus.lxd-to-incus; - passthru.ui = callPackage ./ui.nix { }; - passthru.updateScript = gitUpdater { - url = "https://github.com/canonical/lxd.git"; - rev-prefix = "lxd-"; - }; - - meta = with lib; { - description = "Daemon based on liblxc offering a REST API to manage containers"; - homepage = "https://ubuntu.com/lxd"; - changelog = "https://github.com/canonical/lxd/releases/tag/lxd-${version}"; - license = with licenses; [ asl20 agpl3Plus ]; - maintainers = teams.lxc.members; - platforms = platforms.linux; - }; -} diff --git a/pkgs/tools/admin/lxd/ui.nix b/pkgs/tools/admin/lxd/ui.nix deleted file mode 100644 index 138e99d268904..0000000000000 --- a/pkgs/tools/admin/lxd/ui.nix +++ /dev/null @@ -1,70 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, fetchYarnDeps -, nodejs -, prefetch-yarn-deps -, yarn -, nixosTests -}: - -stdenv.mkDerivation rec { - pname = "lxd-ui"; - version = "0.7"; - - src = fetchFromGitHub { - owner = "canonical"; - repo = "lxd-ui"; - rev = "refs/tags/${version}"; - hash = "sha256-DJLkXZpParmEYHbTpl6KFC9l9y5DqzUTrC0pb2dJXI4="; - }; - - offlineCache = fetchYarnDeps { - yarnLock = "${src}/yarn.lock"; - hash = "sha256-ckTWE/czzvxbGOF8fsJ3W1sal7+NaHquoSjZSPjkGj4="; - }; - - nativeBuildInputs = [ - nodejs - prefetch-yarn-deps - yarn - ]; - - configurePhase = '' - runHook preConfigure - - export HOME=$(mktemp -d) - yarn config --offline set yarn-offline-mirror "$offlineCache" - fixup-yarn-lock yarn.lock - yarn --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive install - patchShebangs node_modules - - runHook postConfigure - ''; - - buildPhase = '' - runHook preBuild - - yarn --offline build - - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - - cp -r build/ui/ $out - - runHook postInstall - ''; - - passthru.tests.default = nixosTests.lxd.ui; - - meta = { - description = "Web user interface for LXD"; - homepage = "https://github.com/canonical/lxd-ui"; - license = lib.licenses.gpl3; - maintainers = lib.teams.lxc.members; - platforms = lib.platforms.linux; - }; -} diff --git a/pkgs/tools/admin/lxd/wrapper.nix b/pkgs/tools/admin/lxd/wrapper.nix deleted file mode 100644 index 9edfefd57ccd7..0000000000000 --- a/pkgs/tools/admin/lxd/wrapper.nix +++ /dev/null @@ -1,122 +0,0 @@ -{ lib -, lxd-unwrapped -, linkFarm -, makeWrapper -, stdenv -, symlinkJoin -, writeShellScriptBin -, acl -, apparmor-parser -, apparmor-profiles -, attr -, bash -, btrfs-progs -, cdrkit -, criu -, dnsmasq -, e2fsprogs -, getent -, gnutar -, gptfdisk -, gzip -, iproute2 -, iptables -, kmod -, lvm2 -, minio -, nftables -, OVMF -, qemu_kvm -, qemu-utils -, rsync -, spice-gtk -, squashfsTools -, thin-provisioning-tools -, util-linux -, virtiofsd -, xz -}: -let - binPath = lib.makeBinPath [ - acl - attr - bash - btrfs-progs - cdrkit - criu - dnsmasq - e2fsprogs - getent - gnutar - gptfdisk - gzip - iproute2 - iptables - kmod - lvm2 - minio - nftables - qemu_kvm - qemu-utils - rsync - squashfsTools - thin-provisioning-tools - util-linux - virtiofsd - xz - - (writeShellScriptBin "apparmor_parser" '' - exec '${apparmor-parser}/bin/apparmor_parser' -I '${apparmor-profiles}/etc/apparmor.d' "$@" - '') - ]; - - clientBinPath = [ - spice-gtk - ]; - - ovmf-2mb = OVMF.override { - secureBoot = true; - fdSize2MB = true; - }; - - ovmf-4mb = OVMF.override { - secureBoot = true; - fdSize4MB = true; - }; - - ovmf-prefix = if stdenv.hostPlatform.isAarch64 then "AAVMF" else "OVMF"; - - # mimic ovmf from https://github.com/canonical/lxd-pkg-snap/blob/3abebe1dfeb20f9b7729556960c7e9fe6ad5e17c/snapcraft.yaml#L378 - # also found in /snap/lxd/current/share/qemu/ on a snap install - ovmf = linkFarm "lxd-ovmf" [ - { name = "OVMF_CODE.2MB.fd"; path = "${ovmf-2mb.fd}/FV/${ovmf-prefix}_CODE.fd"; } - { name = "OVMF_CODE.4MB.fd"; path = "${ovmf-4mb.fd}/FV/${ovmf-prefix}_CODE.fd"; } - { name = "OVMF_CODE.fd"; path = "${ovmf-2mb.fd}/FV/${ovmf-prefix}_CODE.fd"; } - - { name = "OVMF_VARS.2MB.fd"; path = "${ovmf-2mb.fd}/FV/${ovmf-prefix}_VARS.fd"; } - { name = "OVMF_VARS.2MB.ms.fd"; path = "${ovmf-2mb.fd}/FV/${ovmf-prefix}_VARS.fd"; } - { name = "OVMF_VARS.4MB.fd"; path = "${ovmf-4mb.fd}/FV/${ovmf-prefix}_VARS.fd"; } - { name = "OVMF_VARS.4MB.ms.fd"; path = "${ovmf-4mb.fd}/FV/${ovmf-prefix}_VARS.fd"; } - { name = "OVMF_VARS.fd"; path = "${ovmf-2mb.fd}/FV/${ovmf-prefix}_VARS.fd"; } - { name = "OVMF_VARS.ms.fd"; path = "${ovmf-2mb.fd}/FV/${ovmf-prefix}_VARS.fd"; } - ]; -in -symlinkJoin { - name = "lxd-${lxd-unwrapped.version}"; - - paths = [ lxd-unwrapped ]; - - nativeBuildInputs = [ makeWrapper ]; - - postBuild = '' - wrapProgram $out/bin/lxd --prefix PATH : ${lib.escapeShellArg binPath}:${qemu_kvm}/libexec:$out/bin --set LXD_OVMF_PATH ${ovmf} - - wrapProgram $out/bin/lxc --prefix PATH : ${lib.makeBinPath clientBinPath} - ''; - - passthru = { - inherit (lxd-unwrapped) tests ui; - }; - - inherit (lxd-unwrapped) meta pname version; -} diff --git a/pkgs/tools/admin/mycli/default.nix b/pkgs/tools/admin/mycli/default.nix index 58f1236db037a..b0ab1f890705b 100644 --- a/pkgs/tools/admin/mycli/default.nix +++ b/pkgs/tools/admin/mycli/default.nix @@ -8,11 +8,11 @@ with python3.pkgs; buildPythonApplication rec { pname = "mycli"; - version = "1.27.0"; + version = "1.27.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-px21vZwafQAG9PL/AVSM51Y30/UMo6fne5ULW0av980="; + sha256 = "sha256-6fUno+YZLnuH/ntwiqO9Wx63rDSJwcFZVn5f9cmMqJk="; }; propagatedBuildInputs = [ diff --git a/pkgs/tools/admin/pgadmin/default.nix b/pkgs/tools/admin/pgadmin/default.nix index 31093f0497b41..3092eba0d37e9 100644 --- a/pkgs/tools/admin/pgadmin/default.nix +++ b/pkgs/tools/admin/pgadmin/default.nix @@ -14,14 +14,14 @@ let pname = "pgadmin"; - version = "8.4"; - yarnHash = "sha256-Wizgb3WgNPYOLytEj7hBVMV/U3RqW9vhNnhQU4k+j+8="; + version = "8.5"; + yarnHash = "sha256-VLf8GRJ2IIcrfBqdgT2uZG3kOEt0pd7Cksm+tdrQogA="; src = fetchFromGitHub { owner = "pgadmin-org"; repo = "pgadmin4"; rev = "REL-${lib.versions.major version}_${lib.versions.minor version}"; - hash = "sha256-kj/a1JjSDFnLY/UQNBqYdhs3J5wi0mlDyJ1jD/L12FM="; + hash = "sha256-D/8tiVL2DwxvDiSqHeOF1P/yRRniZY39TyUfibrfAOo="; }; # keep the scope, as it is used throughout the derivation and tests diff --git a/pkgs/tools/admin/pgadmin/yarn.lock b/pkgs/tools/admin/pgadmin/yarn.lock index 1acf9a14a07c7..9da02d0b2e9b5 100644 --- a/pkgs/tools/admin/pgadmin/yarn.lock +++ b/pkgs/tools/admin/pgadmin/yarn.lock @@ -1735,10 +1735,10 @@ "@codemirror/view" "^6.0.0" "@lezer/common" "^1.1.0" -"@codemirror/lang-sql@^6.5.5": - version "6.5.5" - resolved "https://registry.npmjs.org/@codemirror/lang-sql/-/lang-sql-6.5.5.tgz#85619f4ea6738c07c0241b19c62d8ef86678e672" - integrity sha512-DvOaP2RXLb2xlxJxxydTFfwyYw5YDqEFea6aAfgh9UH0kUD6J1KFZ0xPgPpw1eo/5s2w3L6uh5PVR7GM23GxkQ== +"@codemirror/lang-sql@^6.6.2": + version "6.6.2" + resolved "https://registry.npmjs.org/@codemirror/lang-sql/-/lang-sql-6.6.2.tgz#ad5bcbeb4552957a32267219985b00c583874a17" + integrity sha512-ZVt7AHflRDFVwxSq7nnj1pko9yR6wKFDtc6Ln7zUs8RX34v5sgVxy3d2lQfORhMPVblEJLaugn+sjwRmAFWNIg== dependencies: "@codemirror/autocomplete" "^6.0.0" "@codemirror/language" "^6.0.0" @@ -3783,12 +3783,12 @@ axios-mock-adapter@^1.17.0: fast-deep-equal "^3.1.3" is-buffer "^2.0.5" -axios@^1.4.0: - version "1.4.0" - resolved "https://registry.npmjs.org/axios/-/axios-1.4.0.tgz#38a7bf1224cd308de271146038b551d725f0be1f" - integrity sha512-S4XCWMEmzvo64T9GfvQDOXgYRDJ/wsSZc7Jvdgx5u1sd0JwsuPLqb3SYmusag+edF6ziyMensPVqLTSc1PiSEA== +axios@^1.6.8: + version "1.6.8" + resolved "https://registry.npmjs.org/axios/-/axios-1.6.8.tgz#66d294951f5d988a00e87a0ffb955316a619ea66" + integrity sha512-v/ZHtJDU39mDpyBoFVkETcd/uNdxrWRrg3bKpOKzXFA6Bvqopts6ALSMU3y6ijYxbw2B+wPrIv46egTzJXCLGQ== dependencies: - follow-redirects "^1.15.0" + follow-redirects "^1.15.6" form-data "^4.0.0" proxy-from-env "^1.1.0" @@ -6447,10 +6447,10 @@ flatted@^3.1.0: resolved "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz#609f39207cb614b89d0765b477cb2d437fbf9787" integrity sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ== -follow-redirects@^1.15.0: - version "1.15.2" - resolved "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz#b460864144ba63f2681096f274c4e57026da2c13" - integrity sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA== +follow-redirects@^1.15.6: + version "1.15.6" + resolved "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz#7f815c0cda4249c74ff09e95ef97c23b5fd0399b" + integrity sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA== for-each@^0.3.3: version "0.3.3" diff --git a/pkgs/tools/admin/simplotask/default.nix b/pkgs/tools/admin/simplotask/default.nix deleted file mode 100644 index b2b15ebe982a2..0000000000000 --- a/pkgs/tools/admin/simplotask/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: - -buildGoModule rec { - pname = "simplotask"; - version = "1.13.1"; - - src = fetchFromGitHub { - owner = "umputun"; - repo = "spot"; - rev = "v${version}"; - hash = "sha256-Sg84Q5I82W2fz/CHh9ov0QPCzAoyqkNrATWNFnMrnEw="; - }; - - vendorHash = null; - - nativeBuildInputs = [ installShellFiles ]; - - ldflags = [ - "-s -w" - "-X main.revision=v${version}" - ]; - - doCheck = false; - - postInstall = '' - mv $out/bin/{secrets,spot-secrets} - installManPage *.1 - ''; - - meta = with lib; { - description = "A tool for effortless deployment and configuration management"; - homepage = "https://spot.umputun.dev/"; - maintainers = with maintainers; [ sikmir ]; - license = licenses.mit; - mainProgram = "spot"; - }; -} diff --git a/pkgs/tools/admin/stripe-cli/default.nix b/pkgs/tools/admin/stripe-cli/default.nix index c42d4f348c0c8..d8e2251bb13bd 100644 --- a/pkgs/tools/admin/stripe-cli/default.nix +++ b/pkgs/tools/admin/stripe-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "stripe-cli"; - version = "1.19.3"; + version = "1.19.4"; src = fetchFromGitHub { owner = "stripe"; repo = pname; rev = "v${version}"; - hash = "sha256-VHTr/+sc34Z9WazURXNq7EXKPbpf08cQ0FI98OV7CAA="; + hash = "sha256-pcDlZQCVy1xy8LZ+S5JcGNoiw1Px7C4U6Pn1pe31DoI="; }; vendorHash = "sha256-DYA6cu2KzEBZ4wsT7wjcdY1endQQOZlj2aOwu6iGLew="; diff --git a/pkgs/tools/admin/syft/default.nix b/pkgs/tools/admin/syft/default.nix index c71ae0821896e..33951c4ab9b44 100644 --- a/pkgs/tools/admin/syft/default.nix +++ b/pkgs/tools/admin/syft/default.nix @@ -1,14 +1,19 @@ -{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: +{ + lib, + buildGoModule, + fetchFromGitHub, + installShellFiles, +}: buildGoModule rec { pname = "syft"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "anchore"; - repo = pname; - rev = "v${version}"; - hash = "sha256-VLCxbD9LFXH8bdc2v9RB/vlLZtg1ekDotZi1xwORdjc="; + repo = "syft"; + rev = "refs/tags/v${version}"; + hash = "sha256-75puiKfXp8vS9iiSk6R85RBn9xlQp9jk51ZNBeJXc/U="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -22,7 +27,8 @@ buildGoModule rec { }; # hash mismatch with darwin proxyVendor = true; - vendorHash = "sha256-eJCXRXeYAk3VTe+RcFjjKUbKCniPKY1wPXsBpZjeCNw="; + + vendorHash = "sha256-AHzKmitIUw0CqBU2Xinb6UVnlZB+2ED85uqGUFonkWM="; nativeBuildInputs = [ installShellFiles ]; @@ -31,9 +37,9 @@ buildGoModule rec { ldflags = [ "-s" "-w" - "-X main.version=${version}" - "-X main.gitDescription=v${version}" - "-X main.gitTreeState=clean" + "-X=main.version=${version}" + "-X=main.gitDescription=v${version}" + "-X=main.gitTreeState=clean" ]; preBuild = '' @@ -66,16 +72,20 @@ buildGoModule rec { ''; meta = with lib; { + description = "CLI tool and library for generating a Software Bill of Materials from container images and filesystems"; homepage = "https://github.com/anchore/syft"; changelog = "https://github.com/anchore/syft/releases/tag/v${version}"; - description = "CLI tool and library for generating a Software Bill of Materials from container images and filesystems"; longDescription = '' A CLI tool and Go library for generating a Software Bill of Materials (SBOM) from container images and filesystems. Exceptional for vulnerability detection when used with a scanner tool like Grype. ''; license = with licenses; [ asl20 ]; - maintainers = with maintainers; [ jk developer-guy kashw2 ]; + maintainers = with maintainers; [ + developer-guy + jk + kashw2 + ]; mainProgram = "syft"; }; } diff --git a/pkgs/tools/admin/trinsic-cli/default.nix b/pkgs/tools/admin/trinsic-cli/default.nix index 264e04c71c772..547d3020620a0 100644 --- a/pkgs/tools/admin/trinsic-cli/default.nix +++ b/pkgs/tools/admin/trinsic-cli/default.nix @@ -2,11 +2,11 @@ rustPlatform.buildRustPackage rec { pname = "trinsic-cli"; - version = "1.13.0"; + version = "1.14.0"; src = fetchurl { url = "https://github.com/trinsic-id/sdk/releases/download/v${version}/trinsic-cli-vendor-${version}.tar.gz"; - sha256 = "sha256-uW4PNlDfyxzec9PzfXr25gPrFZQGr8qm0jLMOeIazoE="; + sha256 = "sha256-lPw55QcGMvY2YRYJGq4WC0fPbKiika4NF55tlb+i6So="; }; cargoVendorDir = "vendor"; diff --git a/pkgs/tools/archivers/rar/default.nix b/pkgs/tools/archivers/rar/default.nix index 3799afd736ef8..fabcfde887e00 100644 --- a/pkgs/tools/archivers/rar/default.nix +++ b/pkgs/tools/archivers/rar/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation { pname = "rar"; inherit version; - src = fetchurl (srcs.${stdenv.hostPlatform.system}); + src = fetchurl (srcs.${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}")); dontBuild = true; diff --git a/pkgs/tools/audio/dl-librescore/default.nix b/pkgs/tools/audio/dl-librescore/default.nix index 75a35a02beb21..3f9a652bde47e 100644 --- a/pkgs/tools/audio/dl-librescore/default.nix +++ b/pkgs/tools/audio/dl-librescore/default.nix @@ -8,13 +8,13 @@ buildNpmPackage rec { pname = "dl-librescore"; - version = "0.35.1"; + version = "0.35.7"; src = fetchFromGitHub { owner = "LibreScore"; repo = "dl-librescore"; rev = "v${version}"; - hash = "sha256-W/55Bbq5yiocNLOU1+j1TwkGawyF8sObtMmPW3ph35A="; + hash = "sha256-g/dOQj2S9iUmN3Ohj7RPBpSk/4N9a39qY+/UIbsKDf4="; }; npmDepsHash = "sha256-Boa/WnptJYJNRdcLgua5GmLT2H9tBpZR+vvAFZC1s4k="; diff --git a/pkgs/tools/audio/spotdl/default.nix b/pkgs/tools/audio/spotdl/default.nix index f4a7e207bef3e..e80ee6773106e 100644 --- a/pkgs/tools/audio/spotdl/default.nix +++ b/pkgs/tools/audio/spotdl/default.nix @@ -9,24 +9,24 @@ let python = python3; in python.pkgs.buildPythonApplication rec { pname = "spotdl"; - version = "4.2.4"; + version = "4.2.5"; pyproject = true; src = fetchFromGitHub { owner = "spotDL"; repo = "spotify-downloader"; rev = "refs/tags/v${version}"; - hash = "sha256-U0UA94t7WdCeU9Y86rcnT8BzXVx8ryhD3MTJxmNBYcc="; + hash = "sha256-vxMhFs2mLbVQndlC2UpeDP+M4pwU9Y4cZHbZ8y3vWbI="; }; - nativeBuildInputs = with python.pkgs; [ + build-system = with python.pkgs; [ poetry-core pythonRelaxDepsHook ]; pythonRelaxDeps = true; - propagatedBuildInputs = with python.pkgs; [ + dependencies = with python.pkgs; [ spotipy ytmusicapi pytube @@ -43,10 +43,8 @@ in python.pkgs.buildPythonApplication rec { platformdirs pykakasi syncedlyrics - typing-extensions soundcloud-v2 bandcamp-api - setuptools # for pkg_resources ] ++ python-slugify.optional-dependencies.unidecode; nativeCheckInputs = with python.pkgs; [ diff --git a/pkgs/tools/backup/zfs-replicate/default.nix b/pkgs/tools/backup/zfs-replicate/default.nix index 5a377d8cae28e..c5a4d2f0317f2 100644 --- a/pkgs/tools/backup/zfs-replicate/default.nix +++ b/pkgs/tools/backup/zfs-replicate/default.nix @@ -11,12 +11,12 @@ buildPythonApplication rec { pname = "zfs_replicate"; - version = "3.2.11"; + version = "3.2.12"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-8u65Ht7s2RqBYetKf/3erb6B2+/iZgnqHBogYa4J/rs="; + hash = "sha256-Pyn/ehXVb5knHS1A/MFTYE0t+IVgtBe1dAnYdaHutyk="; }; postPatch = '' diff --git a/pkgs/tools/bluetooth/blueman/default.nix b/pkgs/tools/bluetooth/blueman/default.nix index 962ad4b2e0f16..879a1689d01a0 100644 --- a/pkgs/tools/bluetooth/blueman/default.nix +++ b/pkgs/tools/bluetooth/blueman/default.nix @@ -8,11 +8,11 @@ let in stdenv.mkDerivation rec { pname = "blueman"; - version = "2.3.5"; + version = "2.4"; src = fetchurl { url = "https://github.com/blueman-project/blueman/releases/download/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-stIa/fd6Bs2G2vVAJAb30qU0WYF+KeC+vEkR1PDc/aE="; + sha256 = "sha256-Gfp3bpWQuy0w6pBcHJaCIyo0fX66qwqdSz1guv5J+uE="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/bootloaders/refind/default.nix b/pkgs/tools/bootloaders/refind/default.nix index 1a0b333b70a78..9574632f4bad3 100644 --- a/pkgs/tools/bootloaders/refind/default.nix +++ b/pkgs/tools/bootloaders/refind/default.nix @@ -5,6 +5,7 @@ , nixosTests , efibootmgr , openssl +, withSbsigntool ? false # currently, cross compiling sbsigntool is broken, so default to false , sbsigntool , makeWrapper }: @@ -112,7 +113,7 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram $out/bin/refind-install \ - --prefix PATH : ${lib.makeBinPath [ efibootmgr openssl sbsigntool ]} + --prefix PATH : ${lib.makeBinPath ( [ efibootmgr openssl ] ++ lib.optional withSbsigntool sbsigntool )} wrapProgram $out/bin/refind-mvrefind \ --prefix PATH : ${lib.makeBinPath [ efibootmgr ]} ''; diff --git a/pkgs/tools/filesystems/httpdirfs/default.nix b/pkgs/tools/filesystems/httpdirfs/default.nix deleted file mode 100644 index 6163e1a0158ab..0000000000000 --- a/pkgs/tools/filesystems/httpdirfs/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, curl, expat, fuse, gumbo, libuuid }: - -stdenv.mkDerivation rec { - pname = "httpdirfs"; - version = "1.2.3"; - - src = fetchFromGitHub { - owner = "fangfufu"; - repo = pname; - rev = version; - sha256 = "sha256-rdeBlAV3t/si9x488tirUGLZRYAxh13zdRIQe0OPd+A="; - }; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ curl expat fuse gumbo libuuid ]; - - makeFlags = [ "prefix=${placeholder "out"}" ]; - - meta = with lib; { - description = "A FUSE filesystem for HTTP directory listings"; - homepage = "https://github.com/fangfufu/httpdirfs"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ sbruder schnusch ]; - platforms = platforms.unix; - mainProgram = "httpdirfs"; - }; -} diff --git a/pkgs/tools/filesystems/juicefs/default.nix b/pkgs/tools/filesystems/juicefs/default.nix index 6f6dd4101597a..2a8cade877eb5 100644 --- a/pkgs/tools/filesystems/juicefs/default.nix +++ b/pkgs/tools/filesystems/juicefs/default.nix @@ -1,10 +1,12 @@ { lib -, buildGoModule +, buildGo121Module , fetchFromGitHub , stdenv }: -buildGoModule rec { +# JuiceFS 1.1.2 doesn't build with Go 1.22. Fixed in upstream. This can be +# reverted in future releases. https://github.com/juicedata/juicefs/issues/4339 +buildGo121Module rec { pname = "juicefs"; version = "1.1.2"; diff --git a/pkgs/tools/filesystems/mtdutils/default.nix b/pkgs/tools/filesystems/mtdutils/default.nix index 0ca64234e5f01..405cecfd6e644 100644 --- a/pkgs/tools/filesystems/mtdutils/default.nix +++ b/pkgs/tools/filesystems/mtdutils/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "mtd-utils"; - version = "2.1.6"; + version = "2.2.0"; src = fetchgit { url = "git://git.infradead.org/mtd-utils.git"; rev = "v${version}"; - sha256 = "sha256-NMYzUPt/91lv8f7E1ytX91SqwbBEOtHjCL54EcumcZA="; + sha256 = "sha256-uYXzZnVL5PkyDAntH8YsocwmQ8tf1f0Vl78SdE2B+Oc="; }; nativeBuildInputs = [ autoreconfHook pkg-config ] ++ lib.optional doCheck cmocka; diff --git a/pkgs/tools/filesystems/nilfs-utils/default.nix b/pkgs/tools/filesystems/nilfs-utils/default.nix index ae96def578f6e..3fe4f9af4a08d 100644 --- a/pkgs/tools/filesystems/nilfs-utils/default.nix +++ b/pkgs/tools/filesystems/nilfs-utils/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "nilfs-utils"; - version = "2.2.10"; + version = "2.2.11"; src = fetchFromGitHub { owner = "nilfs-dev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-xTnd3sfBaVU4Ovcsk4oufylNpGS+5n3ZLa2GXzUbeCE="; + sha256 = "sha256-qvs0PBkMYzGfIQ/Z2Wz0aHe2Y2Ia6fA4pMSk5Jhejf4="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/tools/filesystems/stratisd/default.nix b/pkgs/tools/filesystems/stratisd/default.nix index 0f585f631878e..afbe1c9c7c580 100644 --- a/pkgs/tools/filesystems/stratisd/default.nix +++ b/pkgs/tools/filesystems/stratisd/default.nix @@ -27,18 +27,18 @@ stdenv.mkDerivation rec { pname = "stratisd"; - version = "3.6.6"; + version = "3.6.7"; src = fetchFromGitHub { owner = "stratis-storage"; repo = pname; rev = "refs/tags/stratisd-v${version}"; - hash = "sha256-zksMYPvbFKKYaLqdZql56D5rG+IBDMBJTTQK1RMyj4Q="; + hash = "sha256-cODi0YWAcnMs7bWu1oCtcZ0Wz9FAjBcoyam0G6GH7Xc="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit pname version src; - hash = "sha256-red7cjNwZrhQzfvh6Lev5CPWj8QihuVr7fIiHo9D3Jg="; + hash = "sha256-eCuCqFwGm7pslyKTwk2iX42omM3gFeXrAy/2ll+tJts="; }; postPatch = '' diff --git a/pkgs/tools/graphics/deqp-runner/default.nix b/pkgs/tools/graphics/deqp-runner/default.nix index 88fa06d36b3c8..93ca48daaf683 100644 --- a/pkgs/tools/graphics/deqp-runner/default.nix +++ b/pkgs/tools/graphics/deqp-runner/default.nix @@ -2,17 +2,17 @@ rustPlatform.buildRustPackage rec { pname = "deqp-runner"; - version = "0.16.1"; + version = "0.18.0"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "anholt"; repo = "deqp-runner"; rev = "v${version}"; - hash = "sha256-Spx7Y0es+s3k2dod/kdEgypncED8mNR23uRdOOcLxJc="; + hash = "sha256-5ngyONV7X3JyU0Kd7VE8XGgsAMb9OCSrZuAuFIbQjgs="; }; - cargoHash = "sha256-G4fxtpIhwAVleJ+0rN1+ZhKWw7QbWTB5aLUa3EdFyvA="; + cargoHash = "sha256-xLtKrzjDwBxsg9YNlLQdteAkhuS1rpUbyMWdMwFTrf4="; meta = with lib; { description = "A VK-GL-CTS/dEQP wrapper program to parallelize it across CPUs and report results against a baseline"; diff --git a/pkgs/tools/graphics/netpbm/default.nix b/pkgs/tools/graphics/netpbm/default.nix index 99aeb576939ef..e7cc5a6cfae5c 100644 --- a/pkgs/tools/graphics/netpbm/default.nix +++ b/pkgs/tools/graphics/netpbm/default.nix @@ -20,14 +20,14 @@ stdenv.mkDerivation { # Determine version and revision from: # https://sourceforge.net/p/netpbm/code/HEAD/log/?path=/advanced pname = "netpbm"; - version = "11.5.3"; + version = "11.6.0"; outputs = [ "bin" "out" "dev" ]; src = fetchsvn { url = "https://svn.code.sf.net/p/netpbm/code/advanced"; - rev = "4867"; - sha256 = "JCJW6BBdxoYWMpZoJp6ovHNqyuU4a1FIvjLB2poDGGM="; + rev = "4897"; + sha256 = "2aTDM0aVfav2mnOLXj0HuTdbsY7EUH8ieBrXgaFU7FU="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/graphics/resvg/default.nix b/pkgs/tools/graphics/resvg/default.nix index 199fff0d615e4..75fa23a60641e 100644 --- a/pkgs/tools/graphics/resvg/default.nix +++ b/pkgs/tools/graphics/resvg/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "resvg"; - version = "0.40.0"; + version = "0.41.0"; src = fetchFromGitHub { owner = "RazrFalcon"; repo = pname; rev = "v${version}"; - hash = "sha256-M1log9JAgKB+S1jyieXNOhI8Wa0GwujbzyLJUd6b8VI="; + hash = "sha256-plZiyEiBWeV2mwTsNK5Je8Axs/hcHH8aV2VpOix6QCY="; }; - cargoHash = "sha256-KyiwupObxEVyDzwsQOKWw0+avhf96L83m7tiI6EK3/U="; + cargoHash = "sha256-U7xzb9e9wh9XbLvlYQ0ofIjH8FuSzVcrXnrehQmZgww="; cargoBuildFlags = [ "--package=resvg" diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix index 7f1131f092b88..e01f8f8485a6c 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix @@ -13,13 +13,13 @@ in stdenv.mkDerivation rec { pname = "ibus-typing-booster"; - version = "2.25.3"; + version = "2.25.4"; src = fetchFromGitHub { owner = "mike-fabian"; repo = "ibus-typing-booster"; rev = version; - hash = "sha256-5WQTJdGKEp231r5vibbNEOPLoLFz7Scnq65FiVar5kY="; + hash = "sha256-uTq+/g2DtiftfQvNVYIKtARyxA9Y8LE6VCeGFcWs5SQ="; }; nativeBuildInputs = [ autoreconfHook pkg-config wrapGAppsHook gobject-introspection ]; diff --git a/pkgs/tools/misc/aichat/default.nix b/pkgs/tools/misc/aichat/default.nix index 69fc0891eea46..21cebfc7cb4b1 100644 --- a/pkgs/tools/misc/aichat/default.nix +++ b/pkgs/tools/misc/aichat/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "aichat"; - version = "0.14.0"; + version = "0.15.0"; src = fetchFromGitHub { owner = "sigoden"; repo = "aichat"; rev = "v${version}"; - hash = "sha256-0VNFqfl1La6jSUE7IsS/pYIQGaNrAgSgiGUjo65pUR4="; + hash = "sha256-xts3/ySE/bEkof6QfVCSiT2gWXHAjdQTFoqrmtidZvs="; }; - cargoHash = "sha256-zrX4e9Z8FgZvvNyyiw29Dr/0KO1uL20/+DUASyPjxjE="; + cargoHash = "sha256-8exPmH299smIE5lG5VidaWvwZud3bYhqFiH8zBTyJtY="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/tools/misc/archi/update.sh b/pkgs/tools/misc/archi/update.sh index dbdf876a2a4f2..07d488637945b 100755 --- a/pkgs/tools/misc/archi/update.sh +++ b/pkgs/tools/misc/archi/update.sh @@ -12,14 +12,15 @@ if [[ "$latestVersion" == "$currentVersion" ]]; then exit 0 fi -hash_aarch64_darwin=$(nix-prefetch-url https://www.archimatetool.com/downloads/archi_5.php?/$latestVersion/Archi-Mac-Silicon-$latestVersion.dmg) -hash_x86_64_darwin=$(nix-prefetch-url https://www.archimatetool.com/downloads/archi_5.php?/$latestVersion/Archi-Mac-$latestVersion.dmg) -hash_x86_64_linux=$(nix-prefetch-url https://www.archimatetool.com/downloads/archi_5.php?/$latestVersion/Archi-Linux64-$latestVersion.tgz) - -update-source-version archi 0 "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=" --system=aarch64-darwin -update-source-version archi $latestVersion $hash_aarch64_darwin --system=aarch64-darwin -update-source-version archi 0 "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=" --system=x86_64-darwin -update-source-version archi $latestVersion $hash_x86_64_darwin --system=x86_64-darwin -update-source-version archi 0 "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=" --system=x86_64-linux -update-source-version archi $latestVersion $hash_x86_64_linux --system=x86_64-linux +for i in \ + "aarch64-darwin Archi-Mac-Silicon-$latestVersion.dmg" \ + "x86_64-darwin Archi-Mac-$latestVersion.dmg" \ + "x86_64-linux Archi-Linux64-$latestVersion.tgz" +do + set -- $i + prefetch=$(nix-prefetch-url https://www.archimatetool.com/downloads/archi/$latestVersion/$2) + hash=$(nix-hash --type sha256 --to-sri $prefetch) + update-source-version archi 0 "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=" --system=$1 + update-source-version archi $latestVersion $hash --system=$1 +done diff --git a/pkgs/tools/misc/audible-cli/default.nix b/pkgs/tools/misc/audible-cli/default.nix deleted file mode 100644 index 4d0134e8eaee8..0000000000000 --- a/pkgs/tools/misc/audible-cli/default.nix +++ /dev/null @@ -1,64 +0,0 @@ -{ lib, python3Packages, fetchFromGitHub, installShellFiles }: - -python3Packages.buildPythonApplication rec { - pname = "audible-cli"; - version = "0.2.6"; - pyproject = true; - - src = fetchFromGitHub { - owner = "mkb79"; - repo = "audible-cli"; - rev = "refs/tags/v${version}"; - hash = "sha256-J81RcehFokOpsQBJLvmeihSrlMyX0geHPl3PPxvGjmY="; - }; - - nativeBuildInputs = with python3Packages; [ - pythonRelaxDepsHook - setuptools - ] ++ [ - installShellFiles - ]; - - propagatedBuildInputs = with python3Packages; [ - aiofiles - audible - click - httpx - packaging - pillow - questionary - setuptools - tabulate - toml - tqdm - ]; - - pythonRelaxDeps = [ - "httpx" - "audible" - ]; - - postInstall = '' - export PATH=$out/bin:$PATH - installShellCompletion --cmd audible \ - --bash <(source utils/code_completion/audible-complete-bash.sh) \ - --fish <(source utils/code_completion/audible-complete-zsh-fish.sh) \ - --zsh <(source utils/code_completion/audible-complete-zsh-fish.sh) - ''; - - # upstream has no tests - doCheck = false; - - pythonImportsCheck = [ - "audible_cli" - ]; - - meta = with lib; { - description = "A command line interface for audible package. With the cli you can download your Audible books, cover, chapter files"; - license = licenses.agpl3Only; - homepage = "https://github.com/mkb79/audible-cli"; - changelog = "https://github.com/mkb79/audible-cli/blob/${src.rev}/CHANGELOG.md"; - maintainers = with maintainers; [ jvanbruegge ]; - mainProgram = "audible"; - }; -} diff --git a/pkgs/tools/misc/btdu/default.nix b/pkgs/tools/misc/btdu/default.nix index 631c542a9f8ad..833d339277912 100644 --- a/pkgs/tools/misc/btdu/default.nix +++ b/pkgs/tools/misc/btdu/default.nix @@ -1,93 +1,42 @@ -{ lib -, stdenv -, fetchurl -, dub -, ncurses -, ldc -, zlib -, removeReferencesTo +{ + lib, + buildDubPackage, + fetchFromGitHub, + ncurses, + zlib, }: -let - _d_ae_ver = "0.0.3236"; - _d_btrfs_ver = "0.0.18"; - _d_ncurses_ver = "1.0.0"; - _d_emsi_containers_ver = "0.9.0"; -in -stdenv.mkDerivation rec { - pname = "btdu"; - version = "0.5.1"; - - srcs = [ - (fetchurl { - url = "https://github.com/CyberShadow/${pname}/archive/v${version}.tar.gz"; - sha256 = "566269f365811f6db53280fc5476a7fcf34791396ee4e090c150af4280b35ba5"; - }) - (fetchurl { - url = "https://github.com/CyberShadow/ae/archive/v${_d_ae_ver}.tar.gz"; - sha256 = "5ea3f0d9d2d13012ce6a1ee1b52d9fdff9dfb1d5cc7ee5d1b04cab1947ed4d36"; - }) - (fetchurl { - url = "https://github.com/CyberShadow/d-btrfs/archive/v${_d_btrfs_ver}.tar.gz"; - sha256 = "32af4891d93c7898b0596eefb8297b88d3ed5c14c84a5951943b7b54c7599dbd"; - }) - (fetchurl { - url = "https://github.com/D-Programming-Deimos/ncurses/archive/v${_d_ncurses_ver}.tar.gz"; - sha256 = "b5db677b75ebef7a1365ca4ef768f7344a2bc8d07ec223a2ada162f185d0d9c6"; - }) - (fetchurl { - url = "https://github.com/dlang-community/containers/archive/v${_d_emsi_containers_ver}.tar.gz"; - sha256 = "5e256b84bbdbd2bd625cba0472ea27a1fde6d673d37a85fe971a20d52874acaa"; - }) - ]; - - sourceRoot = "."; - - postUnpack = '' - mv ae-${_d_ae_ver} "ae" - ''; - - - nativeBuildInputs = [ dub ldc ]; - buildInputs = [ ncurses zlib ]; - - configurePhase = '' - runHook preConfigure - mkdir home - HOME="home" dub add-local ae ${_d_ae_ver} - HOME="home" dub add-local d-btrfs-${_d_btrfs_ver} ${_d_btrfs_ver} - HOME="home" dub add-local ncurses-${_d_ncurses_ver} ${_d_ncurses_ver} - HOME="home" dub add-local containers-${_d_emsi_containers_ver} ${_d_emsi_containers_ver} - runHook postConfigure - ''; - - buildPhase = '' - runHook preBuild - cd ${pname}-${version} - HOME="../home" dub --skip-registry=all build -b release - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - mkdir -p $out/bin - cp btdu $out/bin/ - runHook postInstall - ''; - - postInstall = '' - ${removeReferencesTo}/bin/remove-references-to -t ${ldc} $out/bin/btdu - ''; - - passthru.updateScript = ./update.py; - - meta = with lib; { - description = "Sampling disk usage profiler for btrfs"; - homepage = "https://github.com/CyberShadow/btdu"; - changelog = "https://github.com/CyberShadow/btdu/releases/tag/v${version}"; - license = licenses.gpl2Only; - platforms = platforms.linux; - maintainers = with maintainers; [ atila ]; - mainProgram = "btdu"; - }; +buildDubPackage rec { + pname = "btdu"; + version = "0.5.1"; + + src = fetchFromGitHub { + owner = "CyberShadow"; + repo = "btdu"; + rev = "v${version}"; + hash = "sha256-3sSZq+5UJH02IO0Y1yL3BLHDb4lk8k6awb5ZysBQciE="; + }; + + dubLock = ./dub-lock.json; + + buildInputs = [ + ncurses + zlib + ]; + + installPhase = '' + runHook preInstall + install -Dm755 btdu -t $out/bin + runHook postInstall + ''; + + meta = with lib; { + description = "Sampling disk usage profiler for btrfs"; + homepage = "https://github.com/CyberShadow/btdu"; + changelog = "https://github.com/CyberShadow/btdu/releases/tag/${src.rev}"; + license = licenses.gpl2Only; + platforms = platforms.linux; + maintainers = with maintainers; [ atila cybershadow ]; + mainProgram = "btdu"; + }; } diff --git a/pkgs/tools/misc/btdu/dub-lock.json b/pkgs/tools/misc/btdu/dub-lock.json new file mode 100644 index 0000000000000..9a7ab79a5e049 --- /dev/null +++ b/pkgs/tools/misc/btdu/dub-lock.json @@ -0,0 +1,20 @@ +{ + "dependencies": { + "ae": { + "version": "0.0.3236", + "sha256": "0by9yclvk795nw7ilwhv7wh17j2dd7xk54phs8s5jxrwpqx10x52" + }, + "btrfs": { + "version": "0.0.18", + "sha256": "0m8r4skfiryn2nk4wyb61lpvlga1330crr4y1h0q39g9xl3g6myf" + }, + "ncurses": { + "version": "1.0.0", + "sha256": "0ivl88vp2dy9rpv6x3f9jlyqa7aps2x1kkyx80w2d4vcs31pzmb2" + }, + "emsi_containers": { + "version": "0.9.0", + "sha256": "1viz1fjh6jhfvl0d25bb1q7aclm1hrs0d7hhcx1d9c0gg5k6lcpm" + } + } +} diff --git a/pkgs/tools/misc/btdu/update.py b/pkgs/tools/misc/btdu/update.py deleted file mode 100755 index aa3b149d733ea..0000000000000 --- a/pkgs/tools/misc/btdu/update.py +++ /dev/null @@ -1,82 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i python -p python39Packages.requests - -import requests -import subprocess - -pkgbuild = requests.get('https://aur.archlinux.org/cgit/aur.git/plain/PKGBUILD?h=btdu').text - -def grabDepVersions(depDict, pkgbuild=pkgbuild): - for line in pkgbuild.split('\n'): - if depDict["string"] in line: - start = len(depDict["string"]) + 1 - depDict["version"] = line[start:] - break - -def grabDepHashes(key,pkgbuild=pkgbuild): - start = pkgbuild.find(key) + len(key) - end = start+64 - hashes = [] - for i in range(5): - hashes.append(pkgbuild[start:end]) - start = pkgbuild.find("'",end+1) + 1 - end = start+64 - return hashes - -def findLine(key,derivation): - count = 0 - lines = [] - for line in derivation: - if key in line: - lines.append(count) - count += 1 - return lines - -def updateVersions(btdu,ae,btrfs,ncurses,containers,derivation): - key = "let" - line = findLine(key,derivation)[0] + 1 - derivation[line+0] = f' _d_ae_ver = "{ae["version"]}";\n' - derivation[line+1] = f' _d_btrfs_ver = "{btrfs["version"]}";\n' - derivation[line+2] = f' _d_ncurses_ver = "{ncurses["version"]}";\n' - derivation[line+3] = f' _d_emsi_containers_ver = "{containers["version"]}";\n' - - key = "version = " - line = findLine(key,derivation)[0] - derivation[line] = f' version = "{btdu["version"]}";\n' - - return derivation - -def updateHashes(btdu,ae,btrfs,ncurses,containers,derivation): - key = "sha256 = " - hashLines = findLine(key,derivation) - for i in range(len(hashes)): - derivation[hashLines[i]] = f' sha256 = "{hashes[i]}";\n' - - return derivation - -if __name__ == "__main__": - - btdu = {"string": "pkgver"} - ae = {"string": "_d_ae_ver"} - btrfs = {"string": "_d_btrfs_ver"} - ncurses = {"string": "_d_ncurses_ver"} - containers = {"string": "_d_emsi_containers_ver"} - - grabDepVersions(btdu) - grabDepVersions(ae) - grabDepVersions(btrfs) - grabDepVersions(ncurses) - grabDepVersions(containers) - - hashes = grabDepHashes("sha256sums=('") - - nixpkgs = subprocess.check_output(["git", "rev-parse", "--show-toplevel"]).decode("utf-8").strip('\n') - btduFolder = "/pkgs/tools/misc/btdu/" - with open(nixpkgs + btduFolder + "default.nix", 'r') as arq: - derivation = arq.readlines() - - derivation = updateVersions(btdu,ae,btrfs,ncurses,containers,derivation) - derivation = updateHashes(btdu,ae,btrfs,ncurses,containers,derivation) - - with open(nixpkgs + btduFolder + "default.nix", 'w') as arq: - arq.writelines(derivation) diff --git a/pkgs/tools/misc/btrfs-assistant/default.nix b/pkgs/tools/misc/btrfs-assistant/default.nix index 474a5e5dc5b4e..d3bdc74980228 100644 --- a/pkgs/tools/misc/btrfs-assistant/default.nix +++ b/pkgs/tools/misc/btrfs-assistant/default.nix @@ -7,24 +7,22 @@ , coreutils , git , pkg-config -, qtbase -, qtsvg -, qttools +, qt6 , snapper , util-linux -, wrapQtAppsHook , enableSnapper ? true +, nix-update-script }: stdenv.mkDerivation (finalAttrs: { pname = "btrfs-assistant"; - version = "1.9"; + version = "2.0"; src = fetchFromGitLab { owner = "btrfs-assistant"; repo = "btrfs-assistant"; rev = finalAttrs.version; - hash = "sha256-a854WI8f9/G/BRU5rn1FKC6WRZyXNYsUL4p258C8ppw="; + hash = "sha256-nE8Vsc0leXWhbrjMgJDef6jl9MqdojRniGcvUmrQNUQ="; }; nativeBuildInputs = [ @@ -35,12 +33,13 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ btrfs-progs - qtbase - qtsvg - qttools + qt6.qtbase + qt6.qtsvg + qt6.qttools + qt6.qtwayland ]; - propagatedBuildInputs = [ wrapQtAppsHook ]; + propagatedBuildInputs = [ qt6.wrapQtAppsHook ]; prePatch = '' substituteInPlace src/util/System.cpp \ @@ -78,6 +77,8 @@ stdenv.mkDerivation (finalAttrs: { "--prefix PATH : ${runtimeDeps}" ]; + passthru.updateScript = nix-update-script { }; + meta = { description = "A GUI management tool to make managing a Btrfs filesystem easier"; homepage = "https://gitlab.com/btrfs-assistant/btrfs-assistant"; diff --git a/pkgs/tools/misc/calamares-nixos-extensions/default.nix b/pkgs/tools/misc/calamares-nixos-extensions/default.nix index 6bca9abeb9f6e..2b8965544ab3d 100644 --- a/pkgs/tools/misc/calamares-nixos-extensions/default.nix +++ b/pkgs/tools/misc/calamares-nixos-extensions/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "calamares-nixos-extensions"; - version = "0.3.14"; + version = "0.3.15"; src = fetchFromGitHub { owner = "NixOS"; repo = "calamares-nixos-extensions"; rev = version; - hash = "sha256-wRKZ80yU3WsUkGn5/ft4wDR22s39/WTxTrjFE0/9mlc="; + hash = "sha256-PZQjrteLWcInXIavuANHfzfl9gOXATWtIlDUp45j5Ao="; }; installPhase = '' diff --git a/pkgs/tools/misc/calamares/default.nix b/pkgs/tools/misc/calamares/default.nix index 6b9b50144708c..87f81724eaa5a 100644 --- a/pkgs/tools/misc/calamares/default.nix +++ b/pkgs/tools/misc/calamares/default.nix @@ -7,12 +7,12 @@ mkDerivation rec { pname = "calamares"; - version = "3.2.62"; + version = "3.3.3"; # release including submodule src = fetchurl { url = "https://github.com/calamares/calamares/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-oPvOwqQ4aTdT/BdCIDVhGa1624orGcMXUYqhywJdbdA="; + sha256 = "sha256-XCp2Qc2y9eF2Z0BqfTtzUkf6860KzHl1lZE7kiHZbQM="; }; patches = lib.optionals nixos-extensions [ diff --git a/pkgs/tools/misc/calamares/nixos-extensions-paths.patch b/pkgs/tools/misc/calamares/nixos-extensions-paths.patch index 4e0012160e9fb..292310e314f9a 100644 --- a/pkgs/tools/misc/calamares/nixos-extensions-paths.patch +++ b/pkgs/tools/misc/calamares/nixos-extensions-paths.patch @@ -1,21 +1,20 @@ diff --git a/src/calamares/main.cpp b/src/calamares/main.cpp -index de709156f..a0b6c5faf 100644 +index e0491e5f9..faf272016 100644 --- a/src/calamares/main.cpp +++ b/src/calamares/main.cpp -@@ -131,6 +132,8 @@ main( int argc, char* argv[] ) - // TODO: umount anything in /tmp/calamares-... as an emergency save function +@@ -132,6 +132,7 @@ main( int argc, char* argv[] ) #endif -+ CalamaresUtils::setNixosDirs(); -+ - bool is_debug = handle_args( a ); - - #ifdef WITH_KF5DBus + std::unique_ptr< KDSingleApplication > possiblyUnique; ++ Calamares::setNixosDirs(); + const bool is_debug = handle_args( a ); + if ( !is_debug ) + { diff --git a/src/libcalamares/utils/Dirs.cpp b/src/libcalamares/utils/Dirs.cpp -index f333d6e64..6118fb412 100644 +index c42768a08..bac98645a 100644 --- a/src/libcalamares/utils/Dirs.cpp +++ b/src/libcalamares/utils/Dirs.cpp -@@ -115,6 +116,14 @@ setXdgDirs() +@@ -114,6 +114,14 @@ setXdgDirs() s_haveExtraDirs = !( s_extraConfigDirs.isEmpty() && s_extraDataDirs.isEmpty() ); } @@ -31,7 +30,7 @@ index f333d6e64..6118fb412 100644 extraConfigDirs() { diff --git a/src/libcalamares/utils/Dirs.h b/src/libcalamares/utils/Dirs.h -index 445cbe1f1..da869d446 100644 +index d0edd7a4f..26bd16b4e 100644 --- a/src/libcalamares/utils/Dirs.h +++ b/src/libcalamares/utils/Dirs.h @@ -50,6 +50,9 @@ DLLEXPORT bool isAppDataDirOverridden(); diff --git a/pkgs/tools/misc/calamares/nonroot.patch b/pkgs/tools/misc/calamares/nonroot.patch index 7843f45f284ce..24e47574142f3 100644 --- a/pkgs/tools/misc/calamares/nonroot.patch +++ b/pkgs/tools/misc/calamares/nonroot.patch @@ -1,8 +1,8 @@ diff --git a/src/libcalamares/utils/Runner.cpp b/src/libcalamares/utils/Runner.cpp -index c7146c2d7..e165d9a8f 100644 +index 632f32028..fe9052449 100644 --- a/src/libcalamares/utils/Runner.cpp +++ b/src/libcalamares/utils/Runner.cpp -@@ -140,13 +140,13 @@ Calamares::Utils::Runner::run() +@@ -137,13 +137,13 @@ Calamares::Utils::Runner::run() } if ( m_location == RunLocation::RunInTarget ) { @@ -21,10 +21,10 @@ index c7146c2d7..e165d9a8f 100644 if ( m_output ) diff --git a/src/modules/mount/main.py b/src/modules/mount/main.py -index a3318d1a0..5fbe202fd 100644 +index 4202639f3..de2556b91 100644 --- a/src/modules/mount/main.py +++ b/src/modules/mount/main.py -@@ -152,7 +152,8 @@ def mount_partition(root_mount_point, partition, partitions): +@@ -235,7 +235,8 @@ def mount_partition(root_mount_point, partition, partitions, mount_options, moun # Ensure that the created directory has the correct SELinux context on # SELinux-enabled systems. @@ -34,7 +34,7 @@ index a3318d1a0..5fbe202fd 100644 try: subprocess.call(['chcon', '--reference=' + raw_mount_point, mount_point]) except FileNotFoundError as e: -@@ -193,13 +194,13 @@ def mount_partition(root_mount_point, partition, partitions): +@@ -278,13 +279,13 @@ def mount_partition(root_mount_point, partition, partitions, mount_options, moun for s in btrfs_subvolumes: if not s["subvolume"]: continue @@ -52,10 +52,10 @@ index a3318d1a0..5fbe202fd 100644 device = partition["device"] diff --git a/src/modules/welcome/checker/GeneralRequirements.cpp b/src/modules/welcome/checker/GeneralRequirements.cpp -index ca7219ca4..6ac682ba4 100644 +index a58f3df83..b66576b09 100644 --- a/src/modules/welcome/checker/GeneralRequirements.cpp +++ b/src/modules/welcome/checker/GeneralRequirements.cpp -@@ -371,10 +371,34 @@ GeneralRequirements::checkEnoughStorage( qint64 requiredSpace ) +@@ -431,10 +431,35 @@ GeneralRequirements::checkEnoughStorage( qint64 requiredSpace ) cWarning() << "GeneralRequirements is configured without libparted."; return false; #else @@ -88,9 +88,10 @@ index ca7219ca4..6ac682ba4 100644 + + return false; +} - ++ bool GeneralRequirements::checkEnoughRam( qint64 requiredRam ) + { diff --git a/src/modules/welcome/checker/GeneralRequirements.h b/src/modules/welcome/checker/GeneralRequirements.h index b6646da11..ea27324fa 100644 --- a/src/modules/welcome/checker/GeneralRequirements.h diff --git a/pkgs/tools/misc/calamares/supportedlocale.patch b/pkgs/tools/misc/calamares/supportedlocale.patch index ab161ffdee7c2..859018d4947ff 100644 --- a/pkgs/tools/misc/calamares/supportedlocale.patch +++ b/pkgs/tools/misc/calamares/supportedlocale.patch @@ -1,5 +1,5 @@ diff --git a/src/modules/locale/Config.cpp b/src/modules/locale/Config.cpp -index 2357019a7..75b547430 100644 +index 54ff5eb64..1a2b98c9c 100644 --- a/src/modules/locale/Config.cpp +++ b/src/modules/locale/Config.cpp @@ -48,7 +48,7 @@ loadLocales( const QString& localeGenPath ) diff --git a/pkgs/tools/misc/calamares/uimod.patch b/pkgs/tools/misc/calamares/uimod.patch index 5a6ec6cdeea2e..f45f68f9a5b30 100644 --- a/pkgs/tools/misc/calamares/uimod.patch +++ b/pkgs/tools/misc/calamares/uimod.patch @@ -1,33 +1,33 @@ diff --git a/src/modules/finished/FinishedPage.cpp b/src/modules/finished/FinishedPage.cpp -index 6c5f9ad16..24d75e07b 100644 +index 23cb194c4..8714937f6 100644 --- a/src/modules/finished/FinishedPage.cpp +++ b/src/modules/finished/FinishedPage.cpp -@@ -71,7 +71,10 @@ FinishedPage::retranslate() +@@ -74,7 +74,10 @@ FinishedPage::retranslate() { ui->mainText->setText( tr( "<h1>All done.</h1><br/>" "%1 has been set up on your computer.<br/>" -- "You may now start using your new system." ) +- "You may now start using your new system.", "@info" ) + "You may now start using your new system.<br/>" + "You can change every setting later except the bootloader.<br/>" + "Check the <a href=\"https://nixos.org/manual/nixos/stable/\">manual</a> for instructions on how to install software, upgrade the system or enable services.<br/>" -+ "You can find ways to get in touch with the <a href=\"https://nixos.org/community/\">community on the website!</a>") ++ "You can find ways to get in touch with the <a href=\"https://nixos.org/community/\">community on the website!</a>", "@info" ) .arg( branding->versionedName() ) ); ui->restartCheckBox->setToolTip( tr( "<html><head/><body>" "<p>When this box is checked, your system will " -@@ -84,7 +87,10 @@ FinishedPage::retranslate() +@@ -87,7 +90,10 @@ FinishedPage::retranslate() ui->mainText->setText( tr( "<h1>All done.</h1><br/>" "%1 has been installed on your computer.<br/>" "You may now restart into your new system, or continue " -- "using the %2 Live environment." ) +- "using the %2 Live environment.", "@info" ) + "using the %2 Live environment.<br/>" + "You can change every setting later except the bootloader.<br/>" + "Check the <a href=\"https://nixos.org/manual/nixos/stable/\">manual</a> for instructions on how to install software, upgrade the system or enable services.<br/>" -+ "You can find ways to get in touch with the <a href=\"https://nixos.org/community/\">community on the website!</a>") ++ "You can find ways to get in touch with the <a href=\"https://nixos.org/community/\">community on the website!</a>", "@info" ) .arg( branding->versionedName(), branding->productName() ) ); ui->restartCheckBox->setToolTip( tr( "<html><head/><body>" "<p>When this box is checked, your system will " diff --git a/src/modules/packagechooser/PackageChooserPage.cpp b/src/modules/packagechooser/PackageChooserPage.cpp -index 721329c1b..164b9945e 100644 +index 44a570d2f..4dc931bf3 100644 --- a/src/modules/packagechooser/PackageChooserPage.cpp +++ b/src/modules/packagechooser/PackageChooserPage.cpp @@ -52,6 +52,7 @@ PackageChooserPage::currentChanged( const QModelIndex& index ) @@ -39,14 +39,14 @@ index 721329c1b..164b9945e 100644 ui->productDescription->setText( m_introduction.description.get() ); } diff --git a/src/modules/packagechooser/page_package.ui b/src/modules/packagechooser/page_package.ui -index d021b08b3..fecfa3060 100644 +index 2ab5b7f13..bed462069 100644 --- a/src/modules/packagechooser/page_package.ui +++ b/src/modules/packagechooser/page_package.ui -@@ -38,19 +38,6 @@ SPDX-License-Identifier: GPL-3.0-or-later +@@ -37,20 +37,7 @@ SPDX-License-Identifier: GPL-3.0-or-later + </widget> </item> <item> - <layout class="QVBoxLayout" name="verticalLayout" stretch="1,30,1"> -+ <layout class="QVBoxLayout" name="verticalLayout" stretch="30,1,1"> - <item> - <widget class="QLabel" name="productName"> - <property name="sizePolicy"> @@ -60,6 +60,7 @@ index d021b08b3..fecfa3060 100644 - </property> - </widget> - </item> ++ <layout class="QVBoxLayout" name="verticalLayout" stretch="30,1,1"> <item> <widget class="FixedAspectRatioLabel" name="productScreenshot"> <property name="sizePolicy"> diff --git a/pkgs/tools/misc/calamares/waylandkbd.patch b/pkgs/tools/misc/calamares/waylandkbd.patch index 37cddcf4e2af9..4c282b04062f2 100644 --- a/pkgs/tools/misc/calamares/waylandkbd.patch +++ b/pkgs/tools/misc/calamares/waylandkbd.patch @@ -1,20 +1,20 @@ diff --git a/src/modules/keyboard/Config.cpp b/src/modules/keyboard/Config.cpp -index 720588810..af0dd1c8d 100644 +index d8b1e8e86..b2e1b7b5f 100644 --- a/src/modules/keyboard/Config.cpp +++ b/src/modules/keyboard/Config.cpp -@@ -219,7 +219,10 @@ Config::xkbApply() +@@ -307,7 +307,10 @@ Config::xkbApply() + xkbmap_layout_args( { m_additionalLayoutInfo.additionalLayout, m_selectedLayout }, { m_additionalLayoutInfo.additionalVariant, m_selectedVariant }, m_additionalLayoutInfo.groupSwitcher ) ); - - + QString xkbmap = QString( "[('xkb','%1\%2'),('xkb','%3\%4')]").arg( -+ m_selectedLayout, ((!m_selectedVariant.isEmpty()) ? "+" + m_selectedVariant : ""), -+ m_additionalLayoutInfo.additionalLayout, ((!m_additionalLayoutInfo.additionalVariant.isEmpty()) ? "+" + m_additionalLayoutInfo.additionalVariant : "")); ++ m_selectedLayout, ((!m_selectedVariant.isEmpty()) ? "+" + m_selectedVariant : ""), ++ m_additionalLayoutInfo.additionalLayout, ((!m_additionalLayoutInfo.additionalVariant.isEmpty()) ? "+" + m_additionalLayoutInfo.additionalVariant : "")); + QProcess::execute( "sh", { "-c", "if command -v gsettings; then gsettings set org.gnome.desktop.input-sources sources \"$0\"; fi", xkbmap }); cDebug() << "xkbmap selection changed to: " << m_selectedLayout << '-' << m_selectedVariant << "(added " << m_additionalLayoutInfo.additionalLayout << "-" << m_additionalLayoutInfo.additionalVariant << " since current layout is not ASCII-capable)"; -@@ -227,6 +230,8 @@ Config::xkbApply() +@@ -315,6 +318,8 @@ Config::xkbApply() else { QProcess::execute( "setxkbmap", xkbmap_layout_args( m_selectedLayout, m_selectedVariant ) ); diff --git a/pkgs/tools/misc/cyberchef/default.nix b/pkgs/tools/misc/cyberchef/default.nix index 3fc4aab54dc69..ee4c695a43e65 100644 --- a/pkgs/tools/misc/cyberchef/default.nix +++ b/pkgs/tools/misc/cyberchef/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "cyberchef"; - version = "10.9.0"; + version = "10.15.0"; src = fetchzip { url = "https://github.com/gchq/CyberChef/releases/download/v${version}/CyberChef_v${version}.zip"; - sha256 = "sha256-lsQC86gTfDQy7wonoYdQitdF+4hn8qyFpXKg+AL5TnU="; + sha256 = "sha256-QXVqFMG6NJeeTON7w+46MjWXs1bIRL2ji047IvHgvYI="; stripRoot = false; }; diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index 171cbc2dfe720..cec60f83471d8 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -93,6 +93,7 @@ python3.pkgs.buildPythonApplication rec { patches = [ ./ignore_links.patch + ./openssh-no-dsa.patch # https://salsa.debian.org/reproducible-builds/diffoscope/-/merge_requests/139 ]; postPatch = '' diff --git a/pkgs/tools/misc/diffoscope/openssh-no-dsa.patch b/pkgs/tools/misc/diffoscope/openssh-no-dsa.patch new file mode 100644 index 0000000000000..d8e88f30a92d8 --- /dev/null +++ b/pkgs/tools/misc/diffoscope/openssh-no-dsa.patch @@ -0,0 +1,29 @@ +diff --git a/tests/comparators/test_openssh_pub_key.py b/tests/comparators/test_openssh_pub_key.py +index da143097..8d6f3efa 100644 +--- a/tests/comparators/test_openssh_pub_key.py ++++ b/tests/comparators/test_openssh_pub_key.py +@@ -29,7 +29,7 @@ + from ..utils.tools import skip_unless_tools_exist, skip_unless_tool_is_at_least + + +-# Generated by: ssh-keygen -t dsa -C "Test1" ++# Generated by: ssh-keygen -t ed25519 -C "Test1" + opensshpubkey1 = load_fixture("test_openssh_pub_key1.pub") + # Generated by: ssh-keygen -t rsa -b 4096 -C "Test2" + opensshpubkey2 = load_fixture("test_openssh_pub_key2.pub") +diff --git a/tests/data/openssh_pub_key_expected_diff b/tests/data/openssh_pub_key_expected_diff +index 0b6ec624..88d1eccf 100644 +--- a/tests/data/openssh_pub_key_expected_diff ++++ b/tests/data/openssh_pub_key_expected_diff +@@ -1,3 +1,3 @@ + @@ -1 +1 @@ +--1024 SHA256:v/O+0ETvi2H5TGRXky1RhQ1/WFwLlPpxch5E2Mrj6FM Test1 (DSA) ++-256 SHA256:ix2OOXDuTWjxGTICJcP7fLWIcwOO+wr4FPJHz8fOhtQ Test1 (ED25519) + +4096 SHA256:9dH1CMkA6DSfPWU7vNwdPKS5/ppN4LMdvHTP60l7aSA Test2 (RSA) +diff --git a/tests/data/test_openssh_pub_key1.pub b/tests/data/test_openssh_pub_key1.pub +index a2674adc..d564f55c 100644 +--- a/tests/data/test_openssh_pub_key1.pub ++++ b/tests/data/test_openssh_pub_key1.pub +@@ -1 +1 @@ +-ssh-dss AAAAB3NzaC1kc3MAAACBAIa8YajID9g38jwQm8sNBGoGkkwIOv6sQ8k+Bcq8oPXPy1FRXWcra6Kd3iKqApIzLuZUvoYO/f3G2K4lue5yrv72rgwANWmyL4dHVXgcsjwvWwjOl6o4xWTPFspkdNcAAMcZfzG0+w1AOkQxhwMsnK380m3J9a3VOWugUiU4fV1jAAAAFQDzkrIZuJoxlxes564ltb2Vn3hnpQAAAIBHr6uzpiSeSkWLuItB00hHx1RHtBns0zaheNFTTUMGftxtfBU2eBLqObcTlqHJZ3UUY3/YAvD6Ux/uLSgUzEe7JaqvHcgML3K5V4HWIwE0ARRIwzrfU4cAErJObmZZ/OXbXNNRmW2IJgQJI52x4gVuSt0EEuctzASOOvyPA8IekAAAAIA7xe4o0o/ZwUqfWKR9K4QrbPPa6/D4ruFVhMcRJEE/A1LMY1Xo4nVSRU5bxzvMmJPBZvsbR5NEE3CgESqYxp5IPzK8LLyxcf8YxhdHFDYqFL1TbavwaDqtj6/9a/e7+bd8mMYe7zXJUdKWa/Uf+Xm6WRt3HgdLiCEsS2OlpvS2KA== Test1 ++ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGo65kxbPUbb4fdujB2AX/XEZQ+23NDDxu3cJvw2E/DF Test1 diff --git a/pkgs/tools/misc/dooit/default.nix b/pkgs/tools/misc/dooit/default.nix index 1a76a304277c4..c532b13877d30 100644 --- a/pkgs/tools/misc/dooit/default.nix +++ b/pkgs/tools/misc/dooit/default.nix @@ -3,6 +3,7 @@ , dooit , python3 , testers +, nix-update-script }: python3.pkgs.buildPythonApplication rec { @@ -39,9 +40,13 @@ python3.pkgs.buildPythonApplication rec { # No tests available doCheck = false; - passthru.tests.version = testers.testVersion { - package = dooit; - command = "HOME=$(mktemp -d) dooit --version"; + passthru = { + tests.version = testers.testVersion { + package = dooit; + command = "HOME=$(mktemp -d) dooit --version"; + }; + + updateScript = nix-update-script { }; }; meta = with lib; { diff --git a/pkgs/tools/misc/fastfetch/default.nix b/pkgs/tools/misc/fastfetch/default.nix index cbc880f2cf1b0..fc9493be55211 100644 --- a/pkgs/tools/misc/fastfetch/default.nix +++ b/pkgs/tools/misc/fastfetch/default.nix @@ -8,6 +8,7 @@ , dconf , ddcutil , glib +, hwdata , imagemagick_light , libXrandr , libglvnd @@ -20,7 +21,6 @@ , nix-update-script , ocl-icd , opencl-headers -, pciutils , pcre , pcre2 , pkg-config @@ -43,13 +43,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "fastfetch"; - version = "2.8.10"; + version = "2.9.1"; src = fetchFromGitHub { owner = "fastfetch-cli"; repo = "fastfetch"; rev = finalAttrs.version; - hash = "sha256-MIrjfd1KudtU+4X65M+qdPtWUPWQXBlE13Myp1u8hPM="; + hash = "sha256-FTZXfZhLplpjB6QQssz/5hXckNaR9KTdw8NRDLYOvaM="; }; outputs = [ "out" "man" ]; @@ -73,13 +73,13 @@ stdenv.mkDerivation (finalAttrs: { dconf ddcutil glib + hwdata libpulseaudio libselinux libsepol networkmanager ocl-icd opencl-headers - pciutils util-linux zlib ] ++ lib.optionals rpmSupport [ diff --git a/pkgs/tools/misc/fd/default.nix b/pkgs/tools/misc/fd/default.nix index 32d0d1b271244..eddcb4b7784dd 100644 --- a/pkgs/tools/misc/fd/default.nix +++ b/pkgs/tools/misc/fd/default.nix @@ -20,6 +20,9 @@ rustPlatform.buildRustPackage rec { # skip flaky test checkFlags = [ "--skip=test_owner_current_group" + # Fails if the filesystem performs UTF-8 validation (such as ZFS with utf8only=on) + "--skip=test_exec_invalid_utf8" + "--skip=test_invalid_utf8" ]; postInstall = '' diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix index 2f5eac6b7396b..94ec13ead9e42 100644 --- a/pkgs/tools/misc/fzf/default.nix +++ b/pkgs/tools/misc/fzf/default.nix @@ -1,39 +1,25 @@ -{ stdenv -, lib +{ lib , buildGoModule , fetchFromGitHub -, writeShellScriptBin -, runtimeShell , installShellFiles , bc , ncurses -, perl , testers , fzf }: -let - # on Linux, wrap perl in the bash completion scripts with the glibc locales, - # so that using the shell completion (ctrl+r, etc) doesn't result in ugly - # warnings on non-nixos machines - ourPerl = if !stdenv.isLinux then perl else ( - writeShellScriptBin "perl" '' - export PERL_BADLANG=0 - exec ${perl}/bin/perl "$@" - ''); -in buildGoModule rec { pname = "fzf"; - version = "0.47.0"; + version = "0.49.0"; src = fetchFromGitHub { owner = "junegunn"; repo = pname; rev = version; - hash = "sha256-rIRn8g4j/drWEHnvZnJW2sSLq5mrw8Q2pn3LN2sEXDY="; + hash = "sha256-XecMHKi5JMWx3RHQRk2FqS3SjyR6KzWjfyQ5JCI45xM="; }; - vendorHash = "sha256-BOPACUQKcllmA2eWQs+sOfofAQLle2Byb/rZgOhmkVY="; + vendorHash = "sha256-ZEwB2GKohmOx8xosj14VII6sQ4a82s7+h9r620MKEeU="; CGO_ENABLED = 0; @@ -56,14 +42,9 @@ buildGoModule rec { exit 1 fi - # Has a sneaky dependency on perl - # Include first args to make sure we're patching the right thing - substituteInPlace shell/key-bindings.bash \ - --replace "command -v perl" "command -v ${ourPerl}/bin/perl" \ - --replace " perl -n " " ${ourPerl}/bin/perl -n " # fzf-tmux depends on bc - substituteInPlace bin/fzf-tmux \ - --replace "bc" "${bc}/bin/bc" + substituteInPlace bin/fzf-tmux \ + --replace "bc" "${bc}/bin/bc" ''; postInstall = '' @@ -74,23 +55,6 @@ buildGoModule rec { install -D plugin/* -t $out/share/vim-plugins/${pname}/plugin mkdir -p $out/share/nvim ln -s $out/share/vim-plugins/${pname} $out/share/nvim/site - - # Install shell integrations - install -D shell/* -t $out/share/fzf/ - install -D shell/key-bindings.fish $out/share/fish/vendor_functions.d/fzf_key_bindings.fish - mkdir -p $out/share/fish/vendor_conf.d - cat << EOF > $out/share/fish/vendor_conf.d/load-fzf-key-bindings.fish - status is-interactive; or exit 0 - fzf_key_bindings - EOF - - cat <<SCRIPT > $out/bin/fzf-share - #!${runtimeShell} - # Run this script to find the fzf shared folder where all the shell - # integration scripts are living. - echo $out/share/fzf - SCRIPT - chmod +x $out/bin/fzf-share ''; passthru.tests.version = testers.testVersion { diff --git a/pkgs/tools/misc/geekbench/5.nix b/pkgs/tools/misc/geekbench/5.nix index 7784b3632a730..49efe2ea0bf93 100644 --- a/pkgs/tools/misc/geekbench/5.nix +++ b/pkgs/tools/misc/geekbench/5.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { inherit version; pname = "geekbench"; - src = fetchurl (sources.${stdenv.system}); + src = fetchurl (sources.${stdenv.system} or (throw "unsupported system ${stdenv.hostPlatform.system}")); dontConfigure = true; dontBuild = true; diff --git a/pkgs/tools/misc/geekbench/6.nix b/pkgs/tools/misc/geekbench/6.nix index 4ac5f1d0e49a3..373d93dc193c1 100644 --- a/pkgs/tools/misc/geekbench/6.nix +++ b/pkgs/tools/misc/geekbench/6.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { inherit version; pname = "geekbench"; - src = fetchurl (sources.${stdenv.system}); + src = fetchurl (sources.${stdenv.system} or (throw "unsupported system ${stdenv.hostPlatform.system}")); dontConfigure = true; dontBuild = true; diff --git a/pkgs/tools/misc/goreleaser/default.nix b/pkgs/tools/misc/goreleaser/default.nix index da0445730f0f7..b405df9159086 100644 --- a/pkgs/tools/misc/goreleaser/default.nix +++ b/pkgs/tools/misc/goreleaser/default.nix @@ -9,16 +9,16 @@ }: buildGoModule rec { pname = "goreleaser"; - version = "1.24.0"; + version = "1.25.0"; src = fetchFromGitHub { owner = "goreleaser"; repo = pname; rev = "v${version}"; - hash = "sha256-oC35g9F9tsbpoccfh1bgLHveW4xAQ3cMnvdYiGoI8Ys="; + hash = "sha256-1GQOnDwQkzoyLPehog32uwg6h2swBcbvxmZENaVaLCI="; }; - vendorHash = "sha256-5M2OkmjQJM+n5Hr4nRGSFWSmNAj5vXJp/3aw6ppOXoI="; + vendorHash = "sha256-vI/S4QtN72tmBVZ2PPcavotJBkl+bdXO9OFqlOGw1J8="; ldflags = [ "-s" "-w" "-X main.version=${version}" "-X main.builtBy=nixpkgs" ]; diff --git a/pkgs/tools/misc/hakuneko/default.nix b/pkgs/tools/misc/hakuneko/default.nix index 0ad8c5907a700..0359da603ccbb 100644 --- a/pkgs/tools/misc/hakuneko/default.nix +++ b/pkgs/tools/misc/hakuneko/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { url = "https://github.com/manga-download/hakuneko/releases/download/v${version}/hakuneko-desktop_${version}_linux_i386.deb"; sha256 = "32017d26bafffaaf0a83dd6954d3926557014af4022a972371169c56c0e3d98b"; }; - }."${stdenv.hostPlatform.system}"; + }."${stdenv.hostPlatform.system}" or (throw "unsupported system ${stdenv.hostPlatform.system}"); dontBuild = true; dontConfigure = true; diff --git a/pkgs/tools/misc/kak-lsp/0001-Use-full-Perl-path.patch b/pkgs/tools/misc/kak-lsp/0001-Use-full-Perl-path.patch deleted file mode 100644 index 38f0d38cb2156..0000000000000 --- a/pkgs/tools/misc/kak-lsp/0001-Use-full-Perl-path.patch +++ /dev/null @@ -1,37 +0,0 @@ -From b93660cfa8a80a5e5bf72e1f06fb7bf95272c7e4 Mon Sep 17 00:00:00 2001 -From: PoweredByPie <poweredbypie@users.noreply.github.com> -Date: Fri, 8 Dec 2023 04:39:01 -0800 -Subject: [PATCH] Use full Perl path - ---- - rc/lsp.kak | 7 +------ - 1 file changed, 1 insertion(+), 6 deletions(-) - -diff --git a/rc/lsp.kak b/rc/lsp.kak -index d695a2e..7c6a436 100644 ---- a/rc/lsp.kak -+++ b/rc/lsp.kak -@@ -2339,11 +2339,6 @@ define-command -hidden lsp-snippets-insert-completion -params 1 %{ evaluate-comm - }} - - define-command lsp-snippets-insert -hidden -params 1 %[ -- evaluate-commands %sh{ -- if ! command -v perl > /dev/null 2>&1; then -- printf "fail '''perl'' must be installed to use the ''snippets-insert'' command'" -- fi -- } - evaluate-commands -draft -save-regs '^"' %[ - set-register '"' %arg{1} - execute-keys <a-P> -@@ -2397,7 +2392,7 @@ define-command lsp-snippets-insert -hidden -params 1 %[ - - define-command -hidden lsp-snippets-insert-perl-impl %[ - evaluate-commands %sh[ # $kak_quoted_selections -- perl -e ' -+ @perlPath@/bin/perl -e ' - use strict; - use warnings; - use Text::ParseWords(); --- -2.42.0 - diff --git a/pkgs/tools/misc/kak-lsp/default.nix b/pkgs/tools/misc/kak-lsp/default.nix deleted file mode 100644 index a49847f8e11f5..0000000000000 --- a/pkgs/tools/misc/kak-lsp/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ stdenv, lib, fetchFromGitHub, rustPlatform, perl, CoreServices, Security, SystemConfiguration }: - -rustPlatform.buildRustPackage rec { - pname = "kak-lsp"; - version = "15.0.1"; - - src = fetchFromGitHub { - owner = pname; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-W4z2YtOEBCTM+NsL1HBHSYCXJXN459chE4RW0CPMjD4="; - }; - - cargoHash = "sha256-tAA9eu4y1h6huNmEgY3L6v29itP5I4a8UZgoA+ANoq0="; - - buildInputs = [ perl ] ++ lib.optionals stdenv.isDarwin [ CoreServices Security SystemConfiguration ]; - - patches = [ ./0001-Use-full-Perl-path.patch ]; - - postPatch = '' - substituteInPlace rc/lsp.kak \ - --subst-var-by perlPath ${lib.getBin perl} - ''; - - meta = with lib; { - description = "Kakoune Language Server Protocol Client"; - homepage = "https://github.com/kak-lsp/kak-lsp"; - license = with licenses; [ unlicense /* or */ mit ]; - maintainers = with maintainers; [ spacekookie poweredbypie ]; - mainProgram = "kak-lsp"; - }; -} diff --git a/pkgs/tools/misc/kalker/default.nix b/pkgs/tools/misc/kalker/default.nix index 6b90866493c32..ef152524da7ad 100644 --- a/pkgs/tools/misc/kalker/default.nix +++ b/pkgs/tools/misc/kalker/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "kalker"; - version = "2.1.0"; + version = "2.2.0"; src = fetchFromGitHub { owner = "PaddiM8"; repo = pname; rev = "v${version}"; - hash = "sha256-oBdo/FQZsJnUwhGrBuRWKZIvw2lZab9N/rv/muofs04="; + hash = "sha256-Ri0Os+/AqGWgf/2V5D7xvelOC3JTOMjNzjq56mhA3G4="; }; - cargoHash = "sha256-v4biE3J1a3qxiqJrSTFxyZhOJpoCnh2lZFBjy4O3XiE="; + cargoHash = "sha256-0+NYbVMIUarLppBZu6mtyGd+2fvkjEUq0TX7urBq3XI="; buildInputs = [ gmp mpfr libmpc ]; diff --git a/pkgs/tools/misc/mise/default.nix b/pkgs/tools/misc/mise/default.nix index 3321f40b95184..f013f6a035615 100644 --- a/pkgs/tools/misc/mise/default.nix +++ b/pkgs/tools/misc/mise/default.nix @@ -17,16 +17,16 @@ rustPlatform.buildRustPackage rec { pname = "mise"; - version = "2024.3.10"; + version = "2024.4.0"; src = fetchFromGitHub { owner = "jdx"; repo = "mise"; rev = "v${version}"; - hash = "sha256-Vx6BI2GmnyvBlDGAkNDJaEMXBphbaIxB5npD/o5c48M="; + hash = "sha256-l+Em04q40R5iTm4lNjY6sRE7Vu7UBl7lPNU9yj/hKzk="; }; - cargoHash = "sha256-uhpF5jKWtwEx2HkkHd+88HIao4rqvnSQblinVc4ip44="; + cargoHash = "sha256-BPPjR0o+M5sTBWRgq3kOL+94qnRKnskLyFRUEPlPQtA="; nativeBuildInputs = [ installShellFiles pkg-config ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; diff --git a/pkgs/tools/misc/moar/default.nix b/pkgs/tools/misc/moar/default.nix index 85eefe9f36eb1..d8972a89912ee 100644 --- a/pkgs/tools/misc/moar/default.nix +++ b/pkgs/tools/misc/moar/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "moar"; - version = "1.23.9"; + version = "1.23.10"; src = fetchFromGitHub { owner = "walles"; repo = pname; rev = "v${version}"; - hash = "sha256-qpbsNHIWiYTa5kt0GTybnWiSnUdPYIeFYsWXinYjtQA="; + hash = "sha256-ue/ZcIIJJAxUMhsEA3FtrkE5mgtiY626b+GmX62Q8dM="; }; vendorHash = "sha256-1u/2OlMX2FuZaxWnpU4n5r/4xKe+rK++GoCJiSq/BdE="; diff --git a/pkgs/tools/misc/nomino/default.nix b/pkgs/tools/misc/nomino/default.nix index e4b7acfa8883e..9dd489f459487 100644 --- a/pkgs/tools/misc/nomino/default.nix +++ b/pkgs/tools/misc/nomino/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "nomino"; - version = "1.3.3"; + version = "1.3.4"; src = fetchFromGitHub { owner = "yaa110"; repo = pname; rev = version; - hash = "sha256-XT8+mwfDFsBVEcpttus1KeIS+4sKqJMJTwqYI3LfW5k="; + hash = "sha256-jV1GqwQURRFPGuFXPhtgbBJHOdroQk6KHMI5yHa0Z64="; }; - cargoHash = "sha256-KpjGwqjVORyxXJbMi2Ok7s6gRmM/aJRTsPtu/0PgGr8="; + cargoHash = "sha256-QluOfU8TO5422lVXswjiQb2YleWiq5twwYzpBJsBs2Y="; meta = with lib; { description = "Batch rename utility for developers"; diff --git a/pkgs/tools/misc/ollama/cmake-include.patch b/pkgs/tools/misc/ollama/cmake-include.patch deleted file mode 100644 index 013ed66bf91c6..0000000000000 --- a/pkgs/tools/misc/ollama/cmake-include.patch +++ /dev/null @@ -1,7 +0,0 @@ ---- a/llm/llama.cpp/examples/server/CMakeLists.txt -+++ b/llm/llama.cpp/examples/server/CMakeLists.txt -@@ -11,3 +11,4 @@ - TARGET_LINK_LIBRARIES(${TARGET} PRIVATE ws2_32) - endif() - target_compile_features(${TARGET} PRIVATE cxx_std_11) -+include (../../../ext_server/CMakeLists.txt) # ollama diff --git a/pkgs/tools/misc/ollama/default.nix b/pkgs/tools/misc/ollama/default.nix index fc3320d9e0a5b..2b02cc3ff5000 100644 --- a/pkgs/tools/misc/ollama/default.nix +++ b/pkgs/tools/misc/ollama/default.nix @@ -28,14 +28,32 @@ let pname = "ollama"; - version = "0.1.29"; + # don't forget to invalidate all hashes each update + version = "0.1.30"; + src = fetchFromGitHub { owner = "jmorganca"; repo = "ollama"; rev = "v${version}"; - hash = "sha256-M2G53DJF/22ZVCAb4jGjyErKO6q2argehHSV7AEef6w="; + hash = "sha256-+cdYT5NUf00Rx0fpCvWUNg4gi+PAOmZVDUdB3omibm0="; fetchSubmodules = true; }; + vendorHash = "sha256-Lj7CBvS51RqF63c01cOCgY7BCQeCKGu794qzb/S80C0="; + # ollama's patches of llama.cpp's example server + # `ollama/llm/generate/gen_common.sh` -> "apply temporary patches until fix is upstream" + # each update, these patches should be synchronized with the contents of `ollama/llm/patches/` + llamacppPatches = [ + (preparePatch "03-load_exception.diff" "sha256-1DfNahFYYxqlx4E4pwMKQpL+XR0bibYnDFGt6dCL4TM=") + (preparePatch "04-locale.diff" "sha256-r5nHiP6yN/rQObRu2FZIPBKpKP9yByyZ6sSI2SKj6Do=") + ]; + + preparePatch = patch: hash: fetchpatch { + url = "file://${src}/llm/patches/${patch}"; + inherit hash; + stripLen = 1; + extraPrefix = "llm/llama.cpp/"; + }; + validAccel = lib.assertOneOf "ollama.acceleration" acceleration [ null "rocm" "cuda" ]; @@ -45,6 +63,7 @@ let enableRocm = validAccel && (acceleration == "rocm") && (warnIfNotLinux "rocm"); enableCuda = validAccel && (acceleration == "cuda") && (warnIfNotLinux "cuda"); + rocmClang = linkFarm "rocm-clang" { llvm = rocmPackages.llvm.clang; }; @@ -94,12 +113,6 @@ let buildGo122Module.override { stdenv = overrideCC stdenv gcc12; } else buildGo122Module; - preparePatch = patch: hash: fetchpatch { - url = "file://${src}/llm/patches/${patch}"; - inherit hash; - stripLen = 1; - extraPrefix = "llm/llama.cpp/"; - }; inherit (lib) licenses platforms maintainers; in goBuild ((lib.optionalAttrs enableRocm { @@ -110,8 +123,7 @@ goBuild ((lib.optionalAttrs enableRocm { CUDACXX = "${cudaToolkit}/bin/nvcc"; CUDAToolkit_ROOT = cudaToolkit; }) // { - inherit pname version src; - vendorHash = "sha256-Lj7CBvS51RqF63c01cOCgY7BCQeCKGu794qzb/S80C0="; + inherit pname version src vendorHash; nativeBuildInputs = [ cmake @@ -133,31 +145,20 @@ goBuild ((lib.optionalAttrs enableRocm { metalFrameworks; patches = [ - # remove uses of `git` in the `go generate` script - # instead use `patch` where necessary - ./remove-git.patch - # replace a hardcoded use of `g++` with `$CXX` - ./replace-gcc.patch - - # ollama's patches of llama.cpp's example server - # `ollama/llm/generate/gen_common.sh` -> "apply temporary patches until fix is upstream" - (preparePatch "01-cache.diff" "sha256-VDwu/iK6taBCyscpndQiOJ3eGqonnLVwmS2rJNMBVGU=") - (preparePatch "02-cudaleaks.diff" "sha256-nxsWgrePUMsZBWWQAjqVHWMJPzr1owH1zSJvUU7Q5pA=") - (preparePatch "03-load_exception.diff" "sha256-1DfNahFYYxqlx4E4pwMKQpL+XR0bibYnDFGt6dCL4TM=") - (preparePatch "04-locale.diff" "sha256-r5nHiP6yN/rQObRu2FZIPBKpKP9yByyZ6sSI2SKj6Do=") - (preparePatch "05-fix-clip-free.diff" "sha256-EFZ+QTtZCvstVxYgVdFKHsQqdkL98T0eXOEBOqCrlL4=") - ]; + # disable uses of `git` in the `go generate` script + # ollama's build script assumes the source is a git repo, but nix removes the git directory + # this also disables necessary patches contained in `ollama/llm/patches/` + # those patches are added to `llamacppPatches`, and reapplied here in the patch phase + ./disable-git.patch + ] ++ llamacppPatches; postPatch = '' - # use a patch from the nix store in the `go generate` script - substituteInPlace llm/generate/gen_common.sh \ - --subst-var-by cmakeIncludePatch '${./cmake-include.patch}' - # `ollama/llm/generate/gen_common.sh` -> "avoid duplicate main symbols when we link into the cgo binary" - substituteInPlace llm/llama.cpp/examples/server/server.cpp \ - --replace-fail 'int main(' 'int __main(' + # replace a hardcoded use of `g++` with `$CXX` so clang can be used on darwin + substituteInPlace llm/generate/gen_common.sh --replace-fail 'g++' '$CXX' # replace inaccurate version number with actual release version substituteInPlace version/version.go --replace-fail 0.0.0 '${version}' ''; preBuild = '' + # disable uses of `git`, since nix removes the git directory export OLLAMA_SKIP_PATCHING=true # build llama.cpp libraries for ollama go generate ./... @@ -168,9 +169,10 @@ goBuild ((lib.optionalAttrs enableRocm { '' + lib.optionalString (enableRocm || enableCuda) '' # expose runtime libraries necessary to use the gpu mv "$out/bin/ollama" "$out/bin/.ollama-unwrapped" - makeWrapper "$out/bin/.ollama-unwrapped" "$out/bin/ollama" \ - --suffix LD_LIBRARY_PATH : '/run/opengl-driver/lib:${lib.makeLibraryPath runtimeLibs}' '' + lib.optionalString enableRocm ''\ - --set-default HIP_PATH ${rocmPath} + makeWrapper "$out/bin/.ollama-unwrapped" "$out/bin/ollama" ${ + lib.optionalString enableRocm + ''--set-default HIP_PATH '${rocmPath}' ''} \ + --suffix LD_LIBRARY_PATH : '/run/opengl-driver/lib:${lib.makeLibraryPath runtimeLibs}' ''; ldflags = [ @@ -191,9 +193,9 @@ goBuild ((lib.optionalAttrs enableRocm { }; meta = { - changelog = "https://github.com/ollama/ollama/releases/tag/v${version}"; description = "Get up and running with large language models locally"; - homepage = "https://github.com/jmorganca/ollama"; + homepage = "https://github.com/ollama/ollama"; + changelog = "https://github.com/ollama/ollama/releases/tag/v${version}"; license = licenses.mit; platforms = platforms.unix; mainProgram = "ollama"; diff --git a/pkgs/tools/misc/ollama/disable-git.patch b/pkgs/tools/misc/ollama/disable-git.patch new file mode 100644 index 0000000000000..5f9b4b3323b6a --- /dev/null +++ b/pkgs/tools/misc/ollama/disable-git.patch @@ -0,0 +1,20 @@ +--- a/llm/generate/gen_common.sh ++++ b/llm/generate/gen_common.sh +@@ -65,6 +65,8 @@ + echo 'add_subdirectory(../ext_server ext_server) # ollama' >>${LLAMACPP_DIR}/CMakeLists.txt + fi + ++ return ++ + if [ -n "$(ls -A ../patches/*.diff)" ]; then + # apply temporary patches until fix is upstream + for patch in ../patches/*.diff; do +@@ -110,6 +112,8 @@ + + # Keep the local tree clean after we're done with the build + cleanup() { ++ return ++ + (cd ${LLAMACPP_DIR}/ && git checkout CMakeLists.txt) + + if [ -n "$(ls -A ../patches/*.diff)" ]; then diff --git a/pkgs/tools/misc/ollama/remove-git.patch b/pkgs/tools/misc/ollama/remove-git.patch deleted file mode 100644 index 9ef4487051ff1..0000000000000 --- a/pkgs/tools/misc/ollama/remove-git.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- a/llm/generate/gen_common.sh -+++ b/llm/generate/gen_common.sh -@@ -60,6 +60,9 @@ - } - - apply_patches() { -+ patch -i '@cmakeIncludePatch@' "${LLAMACPP_DIR}/examples/server/CMakeLists.txt" -+ return -+ - # Wire up our CMakefile - if ! grep ollama ${LLAMACPP_DIR}/examples/server/CMakeLists.txt; then - echo 'include (../../../ext_server/CMakeLists.txt) # ollama' >>${LLAMACPP_DIR}/examples/server/CMakeLists.txt -@@ -113,6 +116,8 @@ - - # Keep the local tree clean after we're done with the build - cleanup() { -+ return -+ - (cd ${LLAMACPP_DIR}/examples/server/ && git checkout CMakeLists.txt server.cpp) - - if [ -n "$(ls -A ../patches/*.diff)" ]; then diff --git a/pkgs/tools/misc/ollama/replace-gcc.patch b/pkgs/tools/misc/ollama/replace-gcc.patch deleted file mode 100644 index 2ebd24e1dc3f1..0000000000000 --- a/pkgs/tools/misc/ollama/replace-gcc.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/llm/generate/gen_common.sh -+++ b/llm/generate/gen_common.sh -@@ -86,7 +89,7 @@ - cmake -S ${LLAMACPP_DIR} -B ${BUILD_DIR} ${CMAKE_DEFS} - cmake --build ${BUILD_DIR} ${CMAKE_TARGETS} -j8 - mkdir -p ${BUILD_DIR}/lib/ -- g++ -fPIC -g -shared -o ${BUILD_DIR}/lib/libext_server.${LIB_EXT} \ -+ $CXX -fPIC -g -shared -o ${BUILD_DIR}/lib/libext_server.${LIB_EXT} \ - ${GCC_ARCH} \ - ${WHOLE_ARCHIVE} ${BUILD_DIR}/examples/server/libext_server.a ${NO_WHOLE_ARCHIVE} \ - ${BUILD_DIR}/common/libcommon.a \ diff --git a/pkgs/tools/misc/open-pdf-sign/default.nix b/pkgs/tools/misc/open-pdf-sign/default.nix index 282ad778db5f5..76d957d340adc 100644 --- a/pkgs/tools/misc/open-pdf-sign/default.nix +++ b/pkgs/tools/misc/open-pdf-sign/default.nix @@ -7,12 +7,12 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "0.1.7"; + version = "0.2.0"; pname = "open-pdf-sign"; src = fetchurl { url = "https://github.com/open-pdf-sign/open-pdf-sign/releases/download/v${finalAttrs.version}/open-pdf-sign.jar"; - hash = "sha256-pUIE2pTa+5Rt8PNYtfbtqoX0dxdS6lViqdqjJU5feoo="; + hash = "sha256-W4WymhjLrHtNK5XY8aahpZOIIh/Qp9scE3zybXF6/9o="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/misc/opentelemetry-collector/contrib.nix b/pkgs/tools/misc/opentelemetry-collector/contrib.nix index bad1051fcc643..a7c8eb79af576 100644 --- a/pkgs/tools/misc/opentelemetry-collector/contrib.nix +++ b/pkgs/tools/misc/opentelemetry-collector/contrib.nix @@ -8,18 +8,18 @@ buildGoModule rec { pname = "opentelemetry-collector-contrib"; - version = "0.96.0"; + version = "0.97.0"; src = fetchFromGitHub { owner = "open-telemetry"; repo = "opentelemetry-collector-contrib"; rev = "v${version}"; - sha256 = "sha256-eQau6PcslY/Bzghmndv1lq5fb+Q+x9guouKzLw5sJTg="; + sha256 = "sha256-tUvjNxjPLU5GbWbm4ZbU5oJv8VvAxz4+1n++H8hDqI0="; }; # proxy vendor to avoid hash missmatches between linux and macOS proxyVendor = true; - vendorHash = "sha256-aMxOu6eCskTlphMjM/CBs0lN6UkLDgSidS9qwlSUUiU="; + vendorHash = "sha256-raTqiNCb0bXK2vE/3yBo40Um5SY+XZEbzdeIPRyFoQk="; # there is a nested go.mod sourceRoot = "${src.name}/cmd/otelcontribcol"; diff --git a/pkgs/tools/misc/ostree/01-Drop-ostree-trivial-httpd-CLI-move-to-tests-director.patch b/pkgs/tools/misc/ostree/01-Drop-ostree-trivial-httpd-CLI-move-to-tests-director.patch deleted file mode 100644 index c255a2762017e..0000000000000 --- a/pkgs/tools/misc/ostree/01-Drop-ostree-trivial-httpd-CLI-move-to-tests-director.patch +++ /dev/null @@ -1,268 +0,0 @@ -From 196c2e1036ed990bca57c199f271c0359509e9f9 Mon Sep 17 00:00:00 2001 -From: Colin Walters <walters@verbum.org> -Date: Tue, 19 Jun 2018 09:34:18 -0400 -Subject: [PATCH] Drop "ostree trivial-httpd" CLI, move to tests directory - -See https://github.com/ostreedev/ostree/issues/1593 - -Basically this makes it easier for people packaging, as the trivial-httpd -is only for tests, and this way the binary will live with the tests. - -Also at this point nothing should depend on `ostree trivial-httpd`. ---- - Makefile-man.am | 6 -- - Makefile-ostree.am | 7 --- - Makefile-tests.am | 7 +++ - configure.ac | 9 --- - man/ostree-trivial-httpd.xml | 116 ----------------------------------- - src/ostree/main.c | 5 -- - tests/libtest.sh | 13 ++-- - 7 files changed, 12 insertions(+), 151 deletions(-) - delete mode 100644 man/ostree-trivial-httpd.xml - -diff --git a/Makefile-man.am b/Makefile-man.am -index 78025fff..4aa668f6 100644 ---- a/Makefile-man.am -+++ b/Makefile-man.am -@@ -32,12 +32,6 @@ ostree-init.1 ostree-log.1 ostree-ls.1 ostree-prune.1 ostree-pull-local.1 \ - ostree-pull.1 ostree-refs.1 ostree-remote.1 ostree-reset.1 \ - ostree-rev-parse.1 ostree-show.1 ostree-sign.1 ostree-summary.1 \ - ostree-static-delta.1 --if USE_LIBSOUP --man1_files += ostree-trivial-httpd.1 --else --# We still want to distribute the source, even if we are not building it --EXTRA_DIST += man/ostree-trivial-httpd.xml --endif - - if BUILDOPT_FUSE - man1_files += rofiles-fuse.1 -diff --git a/Makefile-ostree.am b/Makefile-ostree.am -index 82af1681..dabc7004 100644 ---- a/Makefile-ostree.am -+++ b/Makefile-ostree.am -@@ -138,13 +138,6 @@ ostree_SOURCES += src/ostree/ot-builtin-pull.c - endif - - if USE_LIBSOUP --# Eventually once we stop things from using this, we should support disabling this --ostree_SOURCES += src/ostree/ot-builtin-trivial-httpd.c --pkglibexec_PROGRAMS += ostree-trivial-httpd --ostree_trivial_httpd_SOURCES = src/ostree/ostree-trivial-httpd.c --ostree_trivial_httpd_CFLAGS = $(ostree_bin_shared_cflags) $(OT_INTERNAL_SOUP_CFLAGS) --ostree_trivial_httpd_LDADD = $(ostree_bin_shared_ldadd) $(OT_INTERNAL_SOUP_LIBS) -- - if !USE_CURL - # This is necessary for the cookie jar bits - ostree_CFLAGS += $(OT_INTERNAL_SOUP_CFLAGS) -diff --git a/Makefile-tests.am b/Makefile-tests.am -index 6bae65cf..47b3ab20 100644 ---- a/Makefile-tests.am -+++ b/Makefile-tests.am -@@ -275,6 +275,13 @@ _installed_or_uninstalled_test_programs += \ - $(NULL) - endif - -+if USE_LIBSOUP -+test_extra_programs += ostree-trivial-httpd -+ostree_trivial_httpd_SOURCES = src/ostree/ostree-trivial-httpd.c -+ostree_trivial_httpd_CFLAGS = $(common_tests_cflags) $(OT_INTERNAL_SOUP_CFLAGS) -+ostree_trivial_httpd_LDADD = $(common_tests_ldadd) $(OT_INTERNAL_SOUP_LIBS) -+endif -+ - if USE_AVAHI - test_programs += tests/test-repo-finder-avahi - endif -diff --git a/configure.ac b/configure.ac -index 93b98cb9..a588eea6 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -186,14 +186,6 @@ if test x$with_soup != xno; then OSTREE_FEATURES="$OSTREE_FEATURES libsoup"; fi - AM_CONDITIONAL(USE_LIBSOUP, test x$with_soup != xno) - AM_CONDITIONAL(HAVE_LIBSOUP_CLIENT_CERTS, test x$have_libsoup_client_certs = xyes) - --AC_ARG_ENABLE(trivial-httpd-cmdline, -- [AS_HELP_STRING([--enable-trivial-httpd-cmdline], -- [Continue to support "ostree trivial-httpd" [default=no]])],, -- enable_trivial_httpd_cmdline=no) --AS_IF([test x$enable_trivial_httpd_cmdline = xyes], -- [AC_DEFINE([BUILDOPT_ENABLE_TRIVIAL_HTTPD_CMDLINE], 1, [Define if we are enabling ostree trivial-httpd entrypoint])] --) -- - AS_IF([test x$with_curl = xyes && test x$with_soup = xno], [ - AC_MSG_WARN([Curl enabled, but libsoup is not; libsoup is needed for tests (make check, etc.)]) - ]) -@@ -606,7 +598,6 @@ echo " - introspection: $found_introspection - rofiles-fuse: $enable_rofiles_fuse - HTTP backend: $fetcher_backend -- \"ostree trivial-httpd\": $enable_trivial_httpd_cmdline - SELinux: $with_selinux - fs-verity: $ac_cv_header_linux_fsverity_h - cryptographic checksums: $with_crypto -diff --git a/man/ostree-trivial-httpd.xml b/man/ostree-trivial-httpd.xml -deleted file mode 100644 -index 7ba1dae8..00000000 ---- a/man/ostree-trivial-httpd.xml -+++ /dev/null -@@ -1,116 +0,0 @@ --<?xml version='1.0'?> <!--*-nxml-*--> --<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" -- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> -- --<!-- --Copyright 2011,2013 Colin Walters <walters@verbum.org> -- --SPDX-License-Identifier: LGPL-2.0+ -- --This library is free software; you can redistribute it and/or --modify it under the terms of the GNU Lesser General Public --License as published by the Free Software Foundation; either --version 2 of the License, or (at your option) any later version. -- --This library is distributed in the hope that it will be useful, --but WITHOUT ANY WARRANTY; without even the implied warranty of --MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU --Lesser General Public License for more details. -- --You should have received a copy of the GNU Lesser General Public --License along with this library. If not, see <https://www.gnu.org/licenses/>. ----> -- --<refentry id="ostree"> -- -- <refentryinfo> -- <title>ostree trivial-httpd</title> -- <productname>OSTree</productname> -- -- <authorgroup> -- <author> -- <contrib>Developer</contrib> -- <firstname>Colin</firstname> -- <surname>Walters</surname> -- <email>walters@verbum.org</email> -- </author> -- </authorgroup> -- </refentryinfo> -- -- <refmeta> -- <refentrytitle>ostree trivial-httpd</refentrytitle> -- <manvolnum>1</manvolnum> -- </refmeta> -- -- <refnamediv> -- <refname>ostree-trivial-httpd</refname> -- <refpurpose>Simple webserver</refpurpose> -- </refnamediv> -- -- <refsynopsisdiv> -- <cmdsynopsis> -- <command>ostree trivial-httpd</command> <arg choice="opt" rep="repeat">OPTIONS</arg> <arg choice="opt">DIR</arg> -- </cmdsynopsis> -- </refsynopsisdiv> -- --<!-- Don't entirely understand this command. Needs details, better content--> -- <refsect1> -- <title>Description</title> -- -- <para> -- This runs a simple webserver and keeps it running until killed. If DIR is not specified, it defaults to the current directory. -- </para> -- </refsect1> -- -- <refsect1> -- <title>Options</title> -- -- <variablelist> -- <varlistentry> -- <term><option>--daemonize</option>,<option>-d</option></term> -- -- <listitem><para> -- Fork into background when ready. -- </para></listitem> -- </varlistentry> -- -- <varlistentry> -- <term><option>--autoexit</option></term> -- -- <listitem><para> -- Automatically exit when directory is deleted. -- </para></listitem> -- </varlistentry> -- -- <varlistentry> -- <term><option>--port-file</option>,<option>-p</option>="PATH"</term> -- -- <listitem><para> -- Write port number to PATH (- for standard output). -- </para></listitem> -- </varlistentry> -- -- <varlistentry> -- <term><option>--port</option>,<option>-P</option></term> -- -- <listitem><para> -- Use the specified TCP port to listen on. -- </para></listitem> -- </varlistentry> -- -- <varlistentry> -- <term><option>--force-range-requests</option></term> -- -- <listitem><para> -- Force range requests by only serving half of files. -- </para></listitem> -- </varlistentry> -- </variablelist> -- </refsect1> -- --<!-- NEED EXAMPLE OUTPUT HERE!--> -- <refsect1> -- <title>Example</title> -- <para><command>$ ostree trivial-httpd</command></para> -- </refsect1> --</refentry> -diff --git a/src/ostree/main.c b/src/ostree/main.c -index 7d17080c..19d9b8b0 100644 ---- a/src/ostree/main.c -+++ b/src/ostree/main.c -@@ -118,11 +118,6 @@ static OstreeCommand commands[] = { - { "summary", OSTREE_BUILTIN_FLAG_NONE, - ostree_builtin_summary, - "Manage summary metadata" }, --#if defined(HAVE_LIBSOUP) && defined(BUILDOPT_ENABLE_TRIVIAL_HTTPD_CMDLINE) -- { "trivial-httpd", OSTREE_BUILTIN_FLAG_NONE, -- ostree_builtin_trivial_httpd, -- NULL }, --#endif - { NULL } - }; - -diff --git a/tests/libtest.sh b/tests/libtest.sh -index 686f08dc..79f8bd1f 100755 ---- a/tests/libtest.sh -+++ b/tests/libtest.sh -@@ -174,15 +174,12 @@ fi - if test -n "${OSTREE_UNINSTALLED:-}"; then - OSTREE_HTTPD=${OSTREE_UNINSTALLED}/ostree-trivial-httpd - else -- # trivial-httpd is now in $libexecdir by default, which we don't -- # know at this point. Fortunately, libtest.sh is also in -- # $libexecdir, so make an educated guess. If it's not found, assume -- # it's still runnable as "ostree trivial-httpd". -- if [ -x "${test_srcdir}/../../libostree/ostree-trivial-httpd" ]; then -- OSTREE_HTTPD="${CMD_PREFIX} ${test_srcdir}/../../libostree/ostree-trivial-httpd" -- else -- OSTREE_HTTPD="${CMD_PREFIX} ostree trivial-httpd" -+ # trivial-httpd is now the test directory. -+ OSTREE_HTTPD="${G_TEST_BUILDDIR}/ostree-trivial-httpd" -+ if ! [ -x "${OSTREE_HTTPD}" ]; then -+ fatal "Failed to find ${OSTREE_HTTPD}" - fi -+ OSTREE_HTTPD="${CMD_PREFIX} ${OSTREE_HTTPD}" - fi - - files_are_hardlinked() { --- -2.35.1 - diff --git a/pkgs/tools/misc/ostree/default.nix b/pkgs/tools/misc/ostree/default.nix index dcb4065a02c0e..025b57a8eb442 100644 --- a/pkgs/tools/misc/ostree/default.nix +++ b/pkgs/tools/misc/ostree/default.nix @@ -42,31 +42,15 @@ let ]); in stdenv.mkDerivation rec { pname = "ostree"; - version = "2023.2"; + version = "2024.4"; outputs = [ "out" "dev" "man" "installedTests" ]; src = fetchurl { url = "https://github.com/ostreedev/ostree/releases/download/v${version}/libostree-${version}.tar.xz"; - sha256 = "sha256-zrB4h1Wgv/VzjURUNVL7+IPPcd9IG6o8pyiNp6QCu4U="; + sha256 = "sha256-Y8kZCCEzOsc3Pg2SPkwnZrJevc/fTvtEy1koxlidn8s="; }; - patches = [ - # Tests access the helper using relative path - # https://github.com/ostreedev/ostree/issues/1593 - # Patch from https://github.com/ostreedev/ostree/pull/1633 - ./01-Drop-ostree-trivial-httpd-CLI-move-to-tests-director.patch - - # Workarounds for https://github.com/ostreedev/ostree/issues/1592 - ./fix-1592.patch - - # Hard-code paths in tests - (substituteAll { - src = ./fix-test-paths.patch; - python3 = testPython.interpreter; - openssl = "${openssl}/bin/openssl"; - }) - ]; nativeBuildInputs = [ autoconf diff --git a/pkgs/tools/misc/ostree/fix-1592.patch b/pkgs/tools/misc/ostree/fix-1592.patch deleted file mode 100644 index 6b154d3def18c..0000000000000 --- a/pkgs/tools/misc/ostree/fix-1592.patch +++ /dev/null @@ -1,149 +0,0 @@ ---- a/tests/basic-test.sh -+++ b/tests/basic-test.sh -@@ -226,7 +226,7 @@ cd ${test_tmpdir} - if $OSTREE commit ${COMMIT_ARGS} -b test-bootable --bootable $test_tmpdir/checkout-test2-4 2>err.txt; then - fatal "committed non-bootable tree" - fi --assert_file_has_content err.txt "error: .*No such file or directory" -+assert_file_has_content err.txt "error:.*No such file or directory" - echo "ok commit fails bootable if no kernel" - - cd ${test_tmpdir} -diff --git a/tests/pull-test.sh b/tests/pull-test.sh -index f4084290..4af5ec6f 100644 ---- a/tests/pull-test.sh -+++ b/tests/pull-test.sh -@@ -297,7 +297,7 @@ ostree_repo_init mirrorrepo-local --mode=archive - if ${CMD_PREFIX} ostree --repo=mirrorrepo-local pull-local otherrepo 2>err.txt; then - fatal "pull with mixed refs succeeded?" - fi --assert_file_has_content err.txt "error: Invalid ref name origin:main" -+assert_file_has_content err.txt "Invalid ref name origin:main" - ${CMD_PREFIX} ostree --repo=mirrorrepo-local pull-local otherrepo localbranch - ${CMD_PREFIX} ostree --repo=mirrorrepo-local rev-parse localbranch - ${CMD_PREFIX} ostree --repo=mirrorrepo-local fsck -@@ -308,7 +308,7 @@ if ${CMD_PREFIX} ostree --repo=mirrorrepo-local pull-local otherrepo nosuchbranc - fatal "pulled nonexistent branch" - fi - # So true --assert_file_has_content_literal err.txt "error: Refspec 'nosuchbranch' not found" -+assert_file_has_content_literal err.txt "Refspec 'nosuchbranch' not found" - echo "ok pull-local nonexistent branch" - - cd ${test_tmpdir} -@@ -687,5 +687,5 @@ rm ostree-srv/gnomerepo/summary - if ${CMD_PREFIX} ostree --repo=repo pull origin main 2>err.txt; then - fatal "pull of invalid ref succeeded" - fi --assert_file_has_content_literal err.txt 'error: Fetching checksum for ref ((empty), main): Invalid rev lots of html here lots of html here lots of html here lots of' -+assert_file_has_content_literal err.txt 'Fetching checksum for ref ((empty), main): Invalid rev lots of html here lots of html here lots of html here lots of' - echo "ok pull got HTML for a ref" -diff --git a/tests/test-config.sh b/tests/test-config.sh -index 2d9aaf53..f1e28614 100755 ---- a/tests/test-config.sh -+++ b/tests/test-config.sh -@@ -44,7 +44,7 @@ assert_file_has_content list.txt "http://example\.com/ostree/repo/" - if ${CMD_PREFIX} ostree config --repo=repo get --group=core lock-timeout-secs extra 2>err.txt; then - assert_not_reached "ostree config get should error out if too many arguments are given" - fi --assert_file_has_content err.txt "error: Too many arguments given" -+assert_file_has_content err.txt "Too many arguments given" - echo "ok config get" - - ${CMD_PREFIX} ostree config --repo=repo set core.mode bare-user-only -@@ -61,7 +61,7 @@ assert_file_has_content repo/config "http://example\.com/ostree/" - if ${CMD_PREFIX} ostree config --repo=repo set --group=core lock-timeout-secs 120 extra 2>err.txt; then - assert_not_reached "ostree config set should error out if too many arguments are given" - fi --assert_file_has_content err.txt "error: Too many arguments given" -+assert_file_has_content err.txt "Too many arguments given" - echo "ok config set" - - # Check that using `--` works and that "ostree config unset" works -@@ -78,7 +78,7 @@ if ${CMD_PREFIX} ostree config --repo=repo get core.lock-timeout-secs 2>err.txt; - fi - # Check for any character where quotation marks would be as they appear differently in the Fedora and Debian - # test suites (“” and '' respectively). See: https://github.com/ostreedev/ostree/pull/1839 --assert_file_has_content err.txt "error: Key file does not have key .lock-timeout-secs. in group .core." -+assert_file_has_content err.txt "Key file does not have key .lock-timeout-secs. in group .core." - - # Check that it's idempotent - ${CMD_PREFIX} ostree config --repo=repo unset core.lock-timeout-secs -@@ -95,5 +95,5 @@ ${CMD_PREFIX} ostree config --repo=repo unset --group='remote "aoeuhtns"' 'xa.ti - if ${CMD_PREFIX} ostree config --repo=repo unset core.lock-timeout-secs extra 2>err.txt; then - assert_not_reached "ostree config unset should error out if too many arguments are given" - fi --assert_file_has_content err.txt "error: Too many arguments given" -+assert_file_has_content err.txt "Too many arguments given" - echo "ok config unset" -diff --git a/tests/test-fsck-collections.sh b/tests/test-fsck-collections.sh -index 3dbcdd23..d6359979 100755 ---- a/tests/test-fsck-collections.sh -+++ b/tests/test-fsck-collections.sh -@@ -98,7 +98,7 @@ ${CMD_PREFIX} ostree fsck --repo=repo - if ${CMD_PREFIX} ostree fsck --repo=repo --verify-bindings > fsck 2> fsck-error; then - assert_not_reached "fsck unexpectedly succeeded after adding unbound ref!" - fi --assert_file_has_content fsck-error "Commit has no requested ref ‘new-ref’ in ref binding metadata (‘ref1’)" -+assert_file_has_content fsck-error "Commit has no requested ref .new-ref. in ref binding metadata (.ref1.)" - assert_file_has_content fsck "^Validating refs\.\.\.$" - - echo "ok 3 fsck detects missing ref bindings" -@@ -111,7 +111,7 @@ ${CMD_PREFIX} ostree --repo=repo refs --collections --create=org.example.Collect - if ${CMD_PREFIX} ostree fsck --repo=repo --verify-bindings > fsck 2> fsck-error; then - assert_not_reached "fsck unexpectedly succeeded after adding unbound ref!" - fi --assert_file_has_content fsck-error "Commit has no requested ref ‘new-ref’ in ref binding metadata (‘ref1’)" -+assert_file_has_content fsck-error "Commit has no requested ref .new-ref. in ref binding metadata (.ref1.)" - assert_file_has_content fsck "^Validating refs\.\.\.$" - assert_file_has_content fsck "^Validating refs in collections\.\.\.$" - -@@ -125,7 +125,7 @@ ${CMD_PREFIX} ostree --repo=repo refs --collections --create=org.example.Collect - if ${CMD_PREFIX} ostree fsck --repo=repo --verify-bindings > fsck 2> fsck-error; then - assert_not_reached "fsck unexpectedly succeeded after adding unbound ref!" - fi --assert_file_has_content fsck-error "Commit has collection ID ‘org\.example\.Collection’ in collection binding metadata, while the remote it came from has collection ID ‘org\.example\.Collection2’" -+assert_file_has_content fsck-error "Commit has collection ID .org\.example\.Collection. in collection binding metadata, while the remote it came from has collection ID .org\.example\.Collection2." - assert_file_has_content fsck "^Validating refs\.\.\.$" - assert_file_has_content fsck "^Validating refs in collections\.\.\.$" - -@@ -145,7 +145,7 @@ echo "ok 6 fsck ignores unreferenced ref bindings" - if ${CMD_PREFIX} ostree fsck --repo=repo --verify-back-refs > fsck 2> fsck-error; then - assert_not_reached "fsck unexpectedly succeeded after adding unbound ref!" - fi --assert_file_has_content fsck-error "Collection–ref (org\.example\.Collection, ref1) in bindings for commit .* does not exist" -+assert_file_has_content fsck-error 'Collection.ref (org\.example\.Collection, ref1) in bindings for commit .* does not exist' - assert_file_has_content fsck "^Validating refs\.\.\.$" - assert_file_has_content fsck "^Validating refs in collections\.\.\.$" - -@@ -184,7 +184,7 @@ ${CMD_PREFIX} ostree --repo=repo refs --create=new-ref $(cat ref3-checksum) - if ${CMD_PREFIX} ostree fsck --repo=repo --verify-bindings > fsck 2> fsck-error; then - assert_not_reached "fsck unexpectedly succeeded after adding unbound ref!" - fi --assert_file_has_content fsck-error "Commit has no requested ref ‘new-ref’ in ref binding metadata (‘ref3’, ‘ref4’)" -+assert_file_has_content fsck-error "Commit has no requested ref .new-ref. in ref binding metadata (.ref3., .ref4.)" - assert_file_has_content fsck "^Validating refs\.\.\.$" - - echo "ok 9 fsck detects missing ref bindings" -@@ -203,7 +203,7 @@ echo "ok 10 fsck ignores unreferenced ref bindings" - if ${CMD_PREFIX} ostree fsck --repo=repo --verify-back-refs > fsck 2> fsck-error; then - assert_not_reached "fsck unexpectedly succeeded after adding unbound ref!" - fi --assert_file_has_content fsck-error "Ref ‘ref3’ in bindings for commit .* does not exist" -+assert_file_has_content fsck-error 'Ref .ref3. in bindings for commit .* does not exist' - assert_file_has_content fsck "^Validating refs\.\.\.$" - - echo "ok 11 fsck ignores unreferenced ref bindings" -diff --git a/tests/test-remote-add.sh b/tests/test-remote-add.sh -index 2f5ea634..0f63853c 100755 ---- a/tests/test-remote-add.sh -+++ b/tests/test-remote-add.sh -@@ -81,7 +81,7 @@ echo "ok remote delete" - if $OSTREE remote delete nosuchremote 2>err.txt; then - assert_not_reached "Deleting remote unexpectedly succeeded" - fi --assert_file_has_content err.txt "error: " -+assert_file_has_content err.txt "not found" - - $OSTREE remote delete --if-exists nosuchremote - echo "ok" diff --git a/pkgs/tools/misc/ostree/fix-test-paths.patch b/pkgs/tools/misc/ostree/fix-test-paths.patch deleted file mode 100644 index 3e5b7e06999e8..0000000000000 --- a/pkgs/tools/misc/ostree/fix-test-paths.patch +++ /dev/null @@ -1,55 +0,0 @@ -diff --git a/tests/libtest.sh b/tests/libtest.sh -index ca457fa2..c0a529ff 100755 ---- a/tests/libtest.sh -+++ b/tests/libtest.sh -@@ -709,12 +709,12 @@ gen_ed25519_keys () - { - # Generate private key in PEM format - pemfile="$(mktemp -p ${test_tmpdir} ed25519_XXXXXX.pem)" -- openssl genpkey -algorithm ed25519 -outform PEM -out "${pemfile}" -+ @openssl@ genpkey -algorithm ed25519 -outform PEM -out "${pemfile}" - - # Based on: http://openssl.6102.n7.nabble.com/ed25519-key-generation-td73907.html - # Extract the private and public parts from generated key. -- ED25519PUBLIC="$(openssl pkey -outform DER -pubout -in ${pemfile} | tail -c 32 | base64)" -- ED25519SEED="$(openssl pkey -outform DER -in ${pemfile} | tail -c 32 | base64)" -+ ED25519PUBLIC="$(@openssl@ pkey -outform DER -pubout -in ${pemfile} | tail -c 32 | base64)" -+ ED25519SEED="$(@openssl@ pkey -outform DER -in ${pemfile} | tail -c 32 | base64)" - # Secret key is concantination of SEED and PUBLIC - ED25519SECRET="$(echo ${ED25519SEED}${ED25519PUBLIC} | base64 -d | base64 -w 0)" - -@@ -725,7 +725,7 @@ gen_ed25519_keys () - - gen_ed25519_random_public() - { -- openssl genpkey -algorithm ED25519 | openssl pkey -outform DER | tail -c 32 | base64 -+ @openssl@ genpkey -algorithm ED25519 | @openssl@ pkey -outform DER | tail -c 32 | base64 - } - - is_bare_user_only_repo () { -diff --git a/tests/test-basic-user-only.sh b/tests/test-basic-user-only.sh -index f65094fd..105be893 100755 ---- a/tests/test-basic-user-only.sh -+++ b/tests/test-basic-user-only.sh -@@ -29,7 +29,7 @@ extra_basic_tests=5 - . $(dirname $0)/basic-test.sh - - $CMD_PREFIX ostree --version > version.yaml --python3 -c 'import yaml; yaml.safe_load(open("version.yaml"))' -+@python3@ -c 'import yaml; yaml.safe_load(open("version.yaml"))' - echo "ok yaml version" - - # Reset things so we don't inherit a lot of state from earlier tests -diff --git a/tests/test-remote-headers.sh b/tests/test-remote-headers.sh -index a41d087a..77b34c90 100755 ---- a/tests/test-remote-headers.sh -+++ b/tests/test-remote-headers.sh -@@ -26,7 +26,7 @@ echo '1..2' - . $(dirname $0)/libtest.sh - - V=$($CMD_PREFIX ostree --version | \ -- python3 -c 'import sys, yaml; print(yaml.safe_load(sys.stdin)["libostree"]["Version"])') -+ @python3@ -c 'import sys, yaml; print(yaml.safe_load(sys.stdin)["libostree"]["Version"])') - - setup_fake_remote_repo1 "archive" "" \ - --expected-header foo=bar \ diff --git a/pkgs/tools/misc/parquet-tools/default.nix b/pkgs/tools/misc/parquet-tools/default.nix index bd35304f3cf1d..988c7245ded14 100644 --- a/pkgs/tools/misc/parquet-tools/default.nix +++ b/pkgs/tools/misc/parquet-tools/default.nix @@ -7,7 +7,7 @@ with python3Packages; buildPythonApplication rec { pname = "parquet-tools"; - version = "0.2.14"; + version = "0.2.16"; format = "pyproject"; @@ -15,9 +15,15 @@ buildPythonApplication rec { owner = "ktrueda"; repo = "parquet-tools"; rev = "refs/tags/${version}"; - hash = "sha256-2jIwDsxB+g37zV9hLc2VNC5YuZXTpTmr2aQ72AeHYJo="; + hash = "sha256-mV66R5ejfzH1IasmoyAWAH5vzrnLVVhOqKBMfWKIVY0="; }; + patches = [ + # support Moto 5.x + # https://github.com/ktrueda/parquet-tools/pull/55 + ./moto5.patch + ]; + postPatch = '' substituteInPlace tests/test_inspect.py \ --replace "parquet-cpp-arrow version 5.0.0" "parquet-cpp-arrow version ${pyarrow.version}" \ @@ -46,6 +52,11 @@ buildPythonApplication rec { thrift ]; + # TestGetMetaData.test_inspect shells out to `parquet-tools` CLI entrypoint + preCheck = '' + export PATH=$out/bin:$PATH + ''; + nativeCheckInputs = [ moto pytest-mock @@ -53,9 +64,6 @@ buildPythonApplication rec { ]; disabledTests = [ - # These tests try to read Python code as parquet and fail - "test_local_wildcard" - "test_local_and_s3_wildcard_files" # test file is 2 bytes bigger than expected "test_excute_simple" ]; diff --git a/pkgs/tools/misc/parquet-tools/moto5.patch b/pkgs/tools/misc/parquet-tools/moto5.patch new file mode 100644 index 0000000000000..5e79c1a204fcc --- /dev/null +++ b/pkgs/tools/misc/parquet-tools/moto5.patch @@ -0,0 +1,28 @@ +diff --git a/tests/fixtures/aws.py b/tests/fixtures/aws.py +index 7eea4bd..9fb3345 100644 +--- a/tests/fixtures/aws.py ++++ b/tests/fixtures/aws.py +@@ -1,15 +1,17 @@ + import boto3 +-from moto import mock_s3 + import pytest + ++try: ++ # Moto 4.x ++ from moto import mock_s3 ++except ImportError: ++ # Moto 5.x ++ from moto import mock_aws as mock_s3 + + @pytest.fixture + def aws_session(): +- mock_s3_server = mock_s3() +- mock_s3_server.start() +- yield boto3.Session() +- mock_s3_server.stop() +- ++ with mock_s3(): ++ yield boto3.Session() + + @pytest.fixture + def aws_s3_bucket(aws_session): diff --git a/pkgs/tools/misc/phrase-cli/default.nix b/pkgs/tools/misc/phrase-cli/default.nix index 9a7c6fc4633e9..a9a842f8451d4 100644 --- a/pkgs/tools/misc/phrase-cli/default.nix +++ b/pkgs/tools/misc/phrase-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "phrase-cli"; - version = "2.22.0"; + version = "2.23.0"; src = fetchFromGitHub { owner = "phrase"; repo = "phrase-cli"; rev = version; - sha256 = "sha256-k0Di69toio7uZiTCI34H0N+PnYXfxygQW9sZ9GpG3rU="; + sha256 = "sha256-ucuksG3T4cI/cuEsHe4+7RtY+n05p3RvW/tijZ49lVY="; }; - vendorHash = "sha256-/V1jAF3Uf0AT8JF7hERK3Kc4fX15lDnoEsjeHS0QjpE="; + vendorHash = "sha256-ZWCwSiKoU/zXD9JJ/8qW2tiXWAMqkh0Md0MLz0V4P4E="; ldflags = [ "-X=github.com/phrase/phrase-cli/cmd.PHRASE_CLIENT_VERSION=${version}" ]; diff --git a/pkgs/tools/misc/plantuml-server/default.nix b/pkgs/tools/misc/plantuml-server/default.nix index e0fa8b00db56a..7335944ff4237 100644 --- a/pkgs/tools/misc/plantuml-server/default.nix +++ b/pkgs/tools/misc/plantuml-server/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchurl, nixosTests }: let - version = "1.2024.3"; + version = "1.2024.4"; in stdenv.mkDerivation rec { pname = "plantuml-server"; inherit version; src = fetchurl { url = "https://github.com/plantuml/plantuml-server/releases/download/v${version}/plantuml-v${version}.war"; - sha256 = "sha256-tuRtQl6tbjrgew6s6OV4EeY+GUo3DPVJJyuoD2vfnoo="; + sha256 = "sha256-7m0MOP6AN7V7mlrVfwxGy1AfCQx2ufp5GU2WQoSTIBc="; }; dontUnpack = true; diff --git a/pkgs/tools/misc/plantuml/default.nix b/pkgs/tools/misc/plantuml/default.nix index a237bb88c64b6..8f4d82f2ea49e 100644 --- a/pkgs/tools/misc/plantuml/default.nix +++ b/pkgs/tools/misc/plantuml/default.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "plantuml"; - version = "1.2024.3"; + version = "1.2024.4"; src = fetchurl { url = "https://github.com/plantuml/plantuml/releases/download/v${finalAttrs.version}/plantuml-pdf-${finalAttrs.version}.jar"; - hash = "sha256-zgpqXawlIdNgSxiOjtk7XLOnrVVD09T5qE9K8LD4TtY="; + hash = "sha256-8Xs7fyYr4CvXNO+g2g+7LLObUUVKxmt/27/wHdCwSIE="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/misc/ripdrag/default.nix b/pkgs/tools/misc/ripdrag/default.nix index fd9d5a8a3514b..b437018c8a7c5 100644 --- a/pkgs/tools/misc/ripdrag/default.nix +++ b/pkgs/tools/misc/ripdrag/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "ripdrag"; - version = "0.4.6"; + version = "0.4.7"; src = fetchFromGitHub { owner = "nik012003"; repo = "ripdrag"; rev = "v${version}"; - hash = "sha256-42sfSrwRlpaO4Dkw6m6wcKXef5yKZjw9MMoYNwIF6/o="; + hash = "sha256-nO+eiQLlK5sgOrFpYrP/svzUff0gKju1DjAUMEti6HM="; }; - cargoHash = "sha256-mW334GTAUAUw8xs2Idpr2ThGyN1P0GbP/RjDqj5Ttr0="; + cargoHash = "sha256-/OAaxB1AzmuSTJiZKGoEkh0TcVu+HkBvEmgyeg8R1Ds="; nativeBuildInputs = [ pkg-config wrapGAppsHook4 ]; diff --git a/pkgs/tools/misc/rmlint/default.nix b/pkgs/tools/misc/rmlint/default.nix index 502761dc94261..2c11cbf195bd2 100644 --- a/pkgs/tools/misc/rmlint/default.nix +++ b/pkgs/tools/misc/rmlint/default.nix @@ -1,11 +1,11 @@ { lib, stdenv , cairo +, elfutils , fetchFromGitHub , glib , gobject-introspection , gtksourceview3 , json-glib -, libelf , makeWrapper , pango , pkg-config @@ -48,7 +48,6 @@ stdenv.mkDerivation rec { buildInputs = [ glib json-glib - libelf util-linux ] ++ lib.optionals withGui [ cairo @@ -57,6 +56,8 @@ stdenv.mkDerivation rec { polkit python3 python3.pkgs.pygobject3 + ] ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform elfutils) [ + elfutils ]; prePatch = '' diff --git a/pkgs/tools/misc/rustypaste-cli/default.nix b/pkgs/tools/misc/rustypaste-cli/default.nix index 93b5340abcc58..e78074ca63304 100644 --- a/pkgs/tools/misc/rustypaste-cli/default.nix +++ b/pkgs/tools/misc/rustypaste-cli/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "rustypaste-cli"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "orhun"; repo = "rustypaste-cli"; rev = "v${version}"; - hash = "sha256-FfAX7a94EY2Y+FHE33UdxbLbFlSq69flvx3uPYlvkT4="; + hash = "sha256-Nx0mnwoyJlZSaOiGsqhrx6o9ZDJAGbEpOBhPknbZBjI="; }; - cargoHash = "sha256-FVhOxJE1sI9Ka2teDU8xnbuDvtdIwubuE7+3ypo4+yQ="; + cargoHash = "sha256-z/llEeUfiWPCy8JspmpbbX0FCb8eXPvV1SJAW7ujSyU="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security diff --git a/pkgs/tools/misc/szyszka/default.nix b/pkgs/tools/misc/szyszka/default.nix index 335bc81febe0c..7bcce4158faf0 100644 --- a/pkgs/tools/misc/szyszka/default.nix +++ b/pkgs/tools/misc/szyszka/default.nix @@ -8,7 +8,7 @@ , atk , gdk-pixbuf , gtk4 -, wrapGAppsHook +, wrapGAppsHook4 }: rustPlatform.buildRustPackage rec { @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config - wrapGAppsHook + wrapGAppsHook4 ]; buildInputs = [ diff --git a/pkgs/tools/misc/topicctl/default.nix b/pkgs/tools/misc/topicctl/default.nix index e4f5c11a980aa..f573ffb2bd1a2 100644 --- a/pkgs/tools/misc/topicctl/default.nix +++ b/pkgs/tools/misc/topicctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "topicctl"; - version = "1.14.2"; + version = "1.16.0"; src = fetchFromGitHub { owner = "segmentio"; repo = "topicctl"; rev = "v${version}"; - sha256 = "sha256-VOy6IoXw3MCa5hNQ/BmuGKwjbNRvDC+xwIcLXep8rRI="; + sha256 = "sha256-yB9VOrfL6eFdENiWsqQcVMEVJjRjp3El/JUp2jX5nM8="; }; vendorHash = "sha256-+mnnvdna1g6JE29weOJZmdO3jFp2a75dV9wK2XcWJ9s="; diff --git a/pkgs/tools/misc/vrc-get/default.nix b/pkgs/tools/misc/vrc-get/default.nix index e89d4d4758341..140fba5c11f30 100644 --- a/pkgs/tools/misc/vrc-get/default.nix +++ b/pkgs/tools/misc/vrc-get/default.nix @@ -1,28 +1,23 @@ -{ fetchFromGitHub, lib, rustPlatform, pkg-config, openssl, stdenv, Security, SystemConfiguration }: +{ fetchCrate, lib, rustPlatform, pkg-config, stdenv, Security, SystemConfiguration }: rustPlatform.buildRustPackage rec { pname = "vrc-get"; - version = "1.5.2"; + version = "1.8.0"; - src = fetchFromGitHub { - owner = "anatawa12"; - repo = pname; - rev = "v${version}"; - hash = "sha256-DTiYyTZKYNprQSsAjHmpGdnS6dkXa3hSRGmIiLT/xr8="; + src = fetchCrate { + inherit pname version; + hash = "sha256-+xbHw1DpFmapjsFoUvxUqTok8TKMebMw3gYjO/rx/iU="; }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; + buildInputs = lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; - # Make openssl-sys use pkg-config. - OPENSSL_NO_VENDOR = 1; - - cargoHash = "sha256-4bhle98/zfw1uGNx+m1/4H9n63DnIezg/ZdV+zj0JNA="; + cargoHash = "sha256-iuLhDcii+wXDNUsUMo8lj4kfJve5RAz7FT5Pxs9yFPQ="; meta = with lib; { description = "Command line client of VRChat Package Manager, the main feature of VRChat Creator Companion (VCC)"; - homepage = "https://github.com/anatawa12/vrc-get"; + homepage = "https://github.com/vrc-get/vrc-get"; license = licenses.mit; maintainers = with maintainers; [ bddvlpr ]; mainProgram = "vrc-get"; diff --git a/pkgs/tools/misc/vtm/default.nix b/pkgs/tools/misc/vtm/default.nix index 05218731add15..80f7d69db3041 100644 --- a/pkgs/tools/misc/vtm/default.nix +++ b/pkgs/tools/misc/vtm/default.nix @@ -6,21 +6,19 @@ stdenv.mkDerivation (finalAttrs: { pname = "vtm"; - version = "0.9.74"; + version = "0.9.76"; src = fetchFromGitHub { owner = "netxs-group"; repo = "vtm"; rev = "v${finalAttrs.version}"; - hash = "sha256-O8fnh8I3KbiOD40bU0eO7tbvpMoSCVonKPVFx5pynR4="; + hash = "sha256-F1ia1xyg2/Jnm/lsSn7bKNJ7cXIJuvEhNTEZWiYxGAo="; }; nativeBuildInputs = [ cmake ]; - cmakeFlags = [ "../src" ]; - meta = { description = "Terminal multiplexer with window manager and session sharing"; homepage = "https://vtm.netxs.online/"; diff --git a/pkgs/tools/misc/wakapi/default.nix b/pkgs/tools/misc/wakapi/default.nix index be27225ed3c4a..372d20771f37d 100644 --- a/pkgs/tools/misc/wakapi/default.nix +++ b/pkgs/tools/misc/wakapi/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "wakapi"; - version = "2.10.5"; + version = "2.11.1"; src = fetchFromGitHub { owner = "muety"; repo = pname; rev = version; - sha256 = "sha256-u+br+C5tWSCc8LPGS3/CMkxpqaO30BsWPRFGOkloMlA="; + sha256 = "sha256-ZdKPaHe4miMKb6qEKdRz/fRIkTWDXp2Veu7CP1gRuQw="; }; - vendorHash = "sha256-TeKVhG1V9inyDWfILwtpU9QknJ9bt3Dja5GVHrK9PkA="; + vendorHash = "sha256-pRj7Y2xp+Z2StaXRIzI5b2WAkIhR9y8T8DMXWrxOiy4="; # Not a go module required by the project, contains development utilities excludedPackages = [ "scripts" ]; diff --git a/pkgs/tools/networking/axel/default.nix b/pkgs/tools/networking/axel/default.nix index 0a5a11bd8eb71..2480d0e31e251 100644 --- a/pkgs/tools/networking/axel/default.nix +++ b/pkgs/tools/networking/axel/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "axel"; - version = "2.17.13"; + version = "2.17.14"; src = fetchFromGitHub { owner = "axel-download-accelerator"; repo = pname; rev = "v${version}"; - sha256 = "sha256-iCxKQsymTE8ppOAilQtFeQUS+Fpdjhkcw4jaa9TEv3E="; + sha256 = "sha256-5GUna5k8GhAx1Xe8n9IvXT7IO6gksxCLh+sMANlxTBM="; }; nativeBuildInputs = [ autoreconfHook pkg-config autoconf-archive txt2man ]; diff --git a/pkgs/tools/networking/croc/default.nix b/pkgs/tools/networking/croc/default.nix index f6a16b11b54b5..04665914a5ee5 100644 --- a/pkgs/tools/networking/croc/default.nix +++ b/pkgs/tools/networking/croc/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "croc"; - version = "9.6.14"; + version = "9.6.15"; src = fetchFromGitHub { owner = "schollz"; repo = pname; rev = "v${version}"; - sha256 = "sha256-0FtzPjaWJ1Q94rsx2WF7n24mQu2IsVBSQfddbPzQZ84="; + sha256 = "sha256-sRRL2+LgWowUFSiTHZudJqX404y36cko1i3WFd6kGV4="; }; - vendorHash = "sha256-IsecKLKPJgM4IoKAn8k8ipSWamdTVXcfF9V3r87eApE="; + vendorHash = "sha256-VELBEnWdPfznlBdAdnHWyWZngPBQ+INNr+xfNQMw8yk="; subPackages = [ "." ]; diff --git a/pkgs/tools/networking/davix/default.nix b/pkgs/tools/networking/davix/default.nix index 159fd0f154104..87520e2ca00b9 100644 --- a/pkgs/tools/networking/davix/default.nix +++ b/pkgs/tools/networking/davix/default.nix @@ -26,7 +26,7 @@ let boolToUpper = b: lib.toUpper (lib.boolToString b); in stdenv.mkDerivation rec { - version = "0.8.5"; + version = "0.8.6"; pname = "davix" + lib.optionalString enableThirdPartyCopy "-copy"; nativeBuildInputs = [ cmake pkg-config python3 ]; buildInputs = [ @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { # https://github.com/cern-fts/davix/releases/tag/R_0_8_0 src = fetchurl { url = "https://github.com/cern-fts/davix/releases/download/R_${lib.replaceStrings ["."] ["_"] version}/davix-${version}.tar.gz"; - sha256 = "sha256-+c4hvMLtJI94JQWdF1d4dmFiWMNRd9dPrY+FSoGKh/k="; + sha256 = "sha256-c4O29llcd6ncjAPFSDxn3DK9bSN1HpVs+cF0do5+61s="; }; preConfigure = '' diff --git a/pkgs/tools/networking/ddns-go/default.nix b/pkgs/tools/networking/ddns-go/default.nix index b1f3f95b82496..208989767a1f0 100644 --- a/pkgs/tools/networking/ddns-go/default.nix +++ b/pkgs/tools/networking/ddns-go/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "ddns-go"; - version = "6.3.0"; + version = "6.3.1"; src = fetchFromGitHub { owner = "jeessy2"; repo = pname; rev = "v${version}"; - hash = "sha256-YQaD0eWIufqyWF3bUXBdcd9nw5smvXkyWqZlROwBxBk="; + hash = "sha256-tUJym19w9vjnriYVjZdxzZCJlIvE1DTKCaPKjDpNIq0="; }; vendorHash = "sha256-zUqsuph0fn1x4dwvBY0W0+S6SzS086SHya2ViNpDXGU="; diff --git a/pkgs/tools/networking/dnsproxy/default.nix b/pkgs/tools/networking/dnsproxy/default.nix index 804def68c25fc..8b2dff9e462b7 100644 --- a/pkgs/tools/networking/dnsproxy/default.nix +++ b/pkgs/tools/networking/dnsproxy/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dnsproxy"; - version = "0.66.0"; + version = "0.67.0"; src = fetchFromGitHub { owner = "AdguardTeam"; repo = "dnsproxy"; rev = "v${version}"; - hash = "sha256-6cTqAKhPtSNlUHe/DqzrxjjxwfRc4Zn79h5CBLgqchA="; + hash = "sha256-CqEvGE1MSll+khEFvH8Y0q4XyxbTjwNRr9h9FKf5Kfs="; }; - vendorHash = "sha256-98fwlPbOuCUBHR1xsp5Ff6AO89zYVTUYbhYOfQ/+AZU="; + vendorHash = "sha256-AZQl70NJwE6lVMO/G1RG1NIfXK1SbYWh4/wAIi4Ac5o="; ldflags = [ "-s" "-w" "-X" "github.com/AdguardTeam/dnsproxy/internal/version.version=${version}" ]; diff --git a/pkgs/tools/networking/gobgp/default.nix b/pkgs/tools/networking/gobgp/default.nix index ed04e7f57b0a9..295791556f2a3 100644 --- a/pkgs/tools/networking/gobgp/default.nix +++ b/pkgs/tools/networking/gobgp/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gobgp"; - version = "3.24.0"; + version = "3.25.0"; src = fetchFromGitHub { owner = "osrg"; repo = "gobgp"; rev = "v${version}"; - sha256 = "sha256-JGgkhNSKprqaUBaW+m/5vYnuDri1Ibyf2Y6SMlscnIU="; + sha256 = "sha256-cb4FYsYMkrna/1IjPlEglAmeQ/vfbUiaTb5OjrWiYR4="; }; - vendorHash = "sha256-5eB3vFOo3LCsjMnWYFH0yq5+IunwKXp5C34x6NvpFZ8="; + vendorHash = "sha256-fB/PjOO3+/RVQ5DGAHx4O8wAb9p+RdDC9+xkTCefP8A="; postConfigure = '' export CGO_ENABLED=0 diff --git a/pkgs/tools/networking/i2pd/default.nix b/pkgs/tools/networking/i2pd/default.nix index 01c07c0436a52..6ee9bafb61252 100644 --- a/pkgs/tools/networking/i2pd/default.nix +++ b/pkgs/tools/networking/i2pd/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "i2pd"; - version = "2.50.2"; + version = "2.51.0"; src = fetchFromGitHub { owner = "PurpleI2P"; repo = pname; rev = version; - sha256 = "sha256-6BzY7t+bFYYwKnj+uuX+vWHg0w0BOuMGwgMg1yIF578="; + sha256 = "sha256-qMdlB7SyiYZcZL1DBDKXNUXlPnHcAxkAxUFpFrLs1go="; }; buildInputs = [ boost zlib openssl ] diff --git a/pkgs/tools/networking/lxi-tools/default.nix b/pkgs/tools/networking/lxi-tools/default.nix index 5a5db2a970942..1fcb0676194aa 100644 --- a/pkgs/tools/networking/lxi-tools/default.nix +++ b/pkgs/tools/networking/lxi-tools/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub , meson, ninja, cmake, pkg-config , liblxi, readline, lua, bash-completion -, wrapGAppsHook +, wrapGAppsHook4 , glib, gtk4, gtksourceview5, libadwaita, json-glib , desktop-file-utils, appstream-glib , gsettings-desktop-schemas @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja cmake pkg-config - ] ++ lib.optional withGui wrapGAppsHook; + ] ++ lib.optional withGui wrapGAppsHook4; buildInputs = [ liblxi readline lua bash-completion diff --git a/pkgs/tools/networking/minio-client/default.nix b/pkgs/tools/networking/minio-client/default.nix index 68e67d88ba03b..9e27fd8e3f93b 100644 --- a/pkgs/tools/networking/minio-client/default.nix +++ b/pkgs/tools/networking/minio-client/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "minio-client"; - version = "2024-03-13T23-51-57Z"; + version = "2024-03-30T15-29-52Z"; src = fetchFromGitHub { owner = "minio"; repo = "mc"; rev = "RELEASE.${version}"; - sha256 = "sha256-aLIK7N7Xz39GnqhyaCzTx+UHnMN9/oIikxGlPeqM6XE="; + sha256 = "sha256-xt/WDQFE4uw/eno8RSIjxgjpahjbJVMMOapleuv5avE="; }; - vendorHash = "sha256-DCjjHriD/J/MGcksJX3fn9wSaf+lXX73Dm5K1VU/2B8="; + vendorHash = "sha256-RwhkR3uQreSO1tq8R7ip7CY7E88MRa151HV8rT68YdQ="; subPackages = [ "." ]; diff --git a/pkgs/tools/networking/mozillavpn/default.nix b/pkgs/tools/networking/mozillavpn/default.nix index 4974c873894c3..8e677c806622d 100644 --- a/pkgs/tools/networking/mozillavpn/default.nix +++ b/pkgs/tools/networking/mozillavpn/default.nix @@ -16,6 +16,7 @@ , qtnetworkauth , qtsvg , qttools +, qtwayland , qtwebsockets , rustPlatform , rustc @@ -26,13 +27,13 @@ let pname = "mozillavpn"; - version = "2.20.0"; + version = "2.21.0"; src = fetchFromGitHub { owner = "mozilla-mobile"; repo = "mozilla-vpn-client"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-pPc7++m21DO349VJsaJZRk3xY+qqzgv6Jj5cwYQI3NI="; + hash = "sha256-XBvKSgMuWgMuV+is2G028UNQ4hID7tKiHFuMdPOZcsI="; }; patches = [ ]; @@ -46,19 +47,19 @@ let inherit src patches; name = "${pname}-${version}-extension-bridge"; preBuild = "cd extension/bridge"; - hash = "sha256-wXr9+eyHBQcwEHy/DLixLZ/0DnFHhtiqrbl5q/7qx0U="; + hash = "sha256-1BXlp9AC9oQo/UzCtgNWVv8Er2ERoDLKdlTYXLzodMQ="; }; signatureDeps = rustPlatform.fetchCargoTarball { inherit src patches; name = "${pname}-${version}-signature"; preBuild = "cd signature"; - hash = "sha256-7Gz4T5wF/xpbNJZqudEaEs67q1Y6NMUuXe6u34FWqIA="; + hash = "sha256-GtkDkeFdPsLuTpZh5UqIhFMpzW3HMkbz7npryOQkkGw="; }; qtgleanDeps = rustPlatform.fetchCargoTarball { inherit src patches; name = "${pname}-${version}-qtglean"; preBuild = "cd qtglean"; - hash = "sha256-CTubwS4O3az8AHGa5YQgvjXQfh1j9w6jFmiX37aYjOw="; + hash = "sha256-HFmRcfxCcc83IPPIovbf3jNftp0olKQ6RzV8vPpCYAM="; }; in @@ -74,6 +75,7 @@ stdenv.mkDerivation { qtbase qtnetworkauth qtsvg + qtwayland qtwebsockets ]; nativeBuildInputs = [ diff --git a/pkgs/tools/networking/netbird/default.nix b/pkgs/tools/networking/netbird/default.nix index bbd6f238000d5..bf2b531954553 100644 --- a/pkgs/tools/networking/netbird/default.nix +++ b/pkgs/tools/networking/netbird/default.nix @@ -31,16 +31,16 @@ let in buildGoModule rec { pname = "netbird"; - version = "0.26.6"; + version = "0.27.1"; src = fetchFromGitHub { owner = "netbirdio"; repo = pname; rev = "v${version}"; - hash = "sha256-LsgkUQ6uYdd1qPaINeza4MDDG0ynGhJ7jiZoAy8pjEE="; + hash = "sha256-Cgu4OvmCZb7/X09fWct73Ztbb7uiB7KqnxgYoL3uR4k="; }; - vendorHash = "sha256-SSTpXila4eze3XA3vrTczBwt5XEjtLDvaCiQ5oi4FXg="; + vendorHash = "sha256-HJEZ1VrKS1MXKtpDjVorMiecb94+f1mBWPkWng4YqZk="; nativeBuildInputs = [ installShellFiles ] ++ lib.optional ui pkg-config; diff --git a/pkgs/tools/networking/nzbget/default.nix b/pkgs/tools/networking/nzbget/default.nix index 9a57a2e8a3b53..574045aaa10b3 100644 --- a/pkgs/tools/networking/nzbget/default.nix +++ b/pkgs/tools/networking/nzbget/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , autoreconfHook , boost , pkg-config @@ -17,7 +18,7 @@ }: stdenv.mkDerivation (finalAttrs: { - pname = "nzbget-ng"; + pname = "nzbget"; version = "23.0"; src = fetchFromGitHub { @@ -27,6 +28,14 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-JqC82zpsIqRYB7128gTSOQMWJFR/t63NJXlPgGqP0jE="; }; + patches = [ + # add nzbget-ng patch not in nzbgetcom for buffer overflow issue -- see https://github.com/nzbget-ng/nzbget/pull/43 + (fetchpatch { + url = "https://github.com/nzbget-ng/nzbget/commit/8fbbbfb40003c6f32379a562ce1d12515e61e93e.patch"; + hash = "sha256-mgI/twEoMTFMFGfH1/Jm6mE9u9/CE6RwELCSGx5erUo="; + }) + ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ diff --git a/pkgs/tools/networking/oapi-codegen/default.nix b/pkgs/tools/networking/oapi-codegen/default.nix index 05098a828a113..00be12a82d8cd 100644 --- a/pkgs/tools/networking/oapi-codegen/default.nix +++ b/pkgs/tools/networking/oapi-codegen/default.nix @@ -5,20 +5,24 @@ buildGoModule rec { pname = "oapi-codegen"; - version = "1.13.4"; + version = "2.1.0"; src = fetchFromGitHub { owner = "deepmap"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-9uHgc2q3ZNM0hQsAY+1RLAH3NfcV+dQo+WRk4OQ8q4Q="; - }; + hash = "sha256-5Bwe0THxwynuUuw7jI7KBDNC1Q4sHlnWwO2Kx5F/7PA="; + } ; - vendorHash = "sha256-VsZcdbOGRbHfjKPU+Y01xZCBq4fiVi7qoRBY9AqS0PM="; + vendorHash = "sha256-SqnFfx9bWneVEIyJS8fKe9NNcbPF4wI3qP5QvENqBrI="; # Tests use network doCheck = false; + subPackages = [ "cmd/oapi-codegen" ]; + + ldflags = [ "-X main.noVCSVersionOverride=${version}" ] ; + meta = with lib; { description = "Go client and server OpenAPI 3 generator"; homepage = "https://github.com/deepmap/oapi-codegen"; diff --git a/pkgs/tools/networking/ockam/default.nix b/pkgs/tools/networking/ockam/default.nix index 5596844451f45..5b60f8147a6bd 100644 --- a/pkgs/tools/networking/ockam/default.nix +++ b/pkgs/tools/networking/ockam/default.nix @@ -12,7 +12,7 @@ let pname = "ockam"; - version = "0.118.0"; + version = "0.120.0"; in rustPlatform.buildRustPackage { inherit pname version; @@ -21,10 +21,10 @@ rustPlatform.buildRustPackage { owner = "build-trust"; repo = pname; rev = "ockam_v${version}"; - sha256 = "sha256-cH32moDRBIl5zbXAQNbltwPGcfeNlCBAlAa/iL0gG7c="; + hash = "sha256-Z3yRk0AZefTYITYT9dADrqqpX9PtNeHTgtLFCsICEQ4="; }; - cargoHash = "sha256-bgB1AYjDvpIsHKQUyRlPZHXKo3egmPdCBioCuDYPTaI="; + cargoHash = "sha256-7jKD1WGTHEW2hzJAuZ7Z5D28hT9nucf0aW17AKKMH7w="; nativeBuildInputs = [ git pkg-config ]; buildInputs = [ openssl dbus ] ++ lib.optionals stdenv.isDarwin [ Security ]; diff --git a/pkgs/tools/networking/openssh/common.nix b/pkgs/tools/networking/openssh/common.nix index 5bae2050fbfca..dc43f6dd36b8b 100644 --- a/pkgs/tools/networking/openssh/common.nix +++ b/pkgs/tools/networking/openssh/common.nix @@ -30,6 +30,7 @@ , nixosTests , withFIDO ? stdenv.hostPlatform.isUnix && !stdenv.hostPlatform.isMusl , withPAM ? stdenv.hostPlatform.isLinux +, dsaKeysSupport ? false , linkOpenssl ? true }: @@ -84,6 +85,7 @@ stdenv.mkDerivation { "--with-libedit=yes" "--disable-strip" (lib.withFeature withPAM "pam") + (lib.enableFeature dsaKeysSupport "dsa-keys") ] ++ lib.optional (etcDir != null) "--sysconfdir=${etcDir}" ++ lib.optional withFIDO "--with-security-key-builtin=yes" ++ lib.optional withKerberos (assert libkrb5 != null; "--with-kerberos5=${libkrb5}") diff --git a/pkgs/tools/networking/redli/default.nix b/pkgs/tools/networking/redli/default.nix index 41bc3d9265e63..9703fe4d4089e 100644 --- a/pkgs/tools/networking/redli/default.nix +++ b/pkgs/tools/networking/redli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "redli"; - version = "0.12.0"; + version = "0.13.0"; src = fetchFromGitHub { owner = "IBM-Cloud"; repo = pname; rev = "v${version}"; - hash = "sha256-DKARqhoSaTQEUm+xUwAFFLR65q1L+bab7+50LONwvEQ="; + hash = "sha256-uXTzDRluBP9pm0SM8sIiGIvvbwATO60JQfQpXWGl5EA="; }; vendorHash = null; diff --git a/pkgs/tools/networking/trickle/default.nix b/pkgs/tools/networking/trickle/default.nix index 5d1ca8e4ee7db..c1640a259969d 100644 --- a/pkgs/tools/networking/trickle/default.nix +++ b/pkgs/tools/networking/trickle/default.nix @@ -31,5 +31,6 @@ stdenv.mkDerivation rec { license = lib.licenses.bsd3; homepage = "https://monkey.org/~marius/pages/?page=trickle"; platforms = lib.platforms.linux; + mainProgram = "trickle"; }; } diff --git a/pkgs/tools/networking/veilid/Cargo.lock b/pkgs/tools/networking/veilid/Cargo.lock index 835967588eb7f..5baab49d437fb 100644 --- a/pkgs/tools/networking/veilid/Cargo.lock +++ b/pkgs/tools/networking/veilid/Cargo.lock @@ -294,16 +294,16 @@ checksum = "f28243a43d821d11341ab73c80bed182dc015c514b951616cf79bd4af39af0c3" dependencies = [ "concurrent-queue", "event-listener 5.2.0", - "event-listener-strategy 0.5.0", + "event-listener-strategy 0.5.1", "futures-core", "pin-project-lite", ] [[package]] name = "async-executor" -version = "1.8.0" +version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17ae5ebefcc48e7452b4987947920dac9450be1110cadf34d1b8c116bdbaf97c" +checksum = "10b3e585719c2358d2660232671ca8ca4ddb4be4ce8a1842d6c2dc8685303316" dependencies = [ "async-lock 3.3.0", "async-task", @@ -484,7 +484,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.58", ] [[package]] @@ -501,7 +501,7 @@ checksum = "a507401cad91ec6a857ed5513a2073c82a9b9048762b885bb98655b306964681" dependencies = [ "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.58", ] [[package]] @@ -732,7 +732,7 @@ checksum = "e0b121a9fe0df916e362fb3271088d071159cdf11db0e4182d02152850756eff" dependencies = [ "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.58", ] [[package]] @@ -984,7 +984,7 @@ dependencies = [ "anstream", "anstyle", "clap_lex", - "strsim 0.11.0", + "strsim 0.11.1", "terminal_size", ] @@ -997,7 +997,7 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.58", ] [[package]] @@ -1226,9 +1226,9 @@ checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" [[package]] name = "core-graphics" -version = "0.23.1" +version = "0.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "970a29baf4110c26fedbc7f82107d42c23f7e88e404c4577ed73fe99ff85a212" +checksum = "c07782be35f9e1140080c6b96f0d44b739e2278479f64e02fdab4e32dfd8b081" dependencies = [ "bitflags 1.3.2", "core-foundation", @@ -1360,7 +1360,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ad291aa74992b9b7a7e88c38acbbf6ad7e107f1d90ee8775b7bc1fc3394f485c" dependencies = [ "quote", - "syn 2.0.55", + "syn 2.0.58", ] [[package]] @@ -1474,7 +1474,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.58", ] [[package]] @@ -1530,7 +1530,7 @@ dependencies = [ "ident_case", "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.58", ] [[package]] @@ -1552,7 +1552,7 @@ checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f" dependencies = [ "darling_core 0.20.8", "quote", - "syn 2.0.55", + "syn 2.0.58", ] [[package]] @@ -1576,9 +1576,9 @@ checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" [[package]] name = "der" -version = "0.7.8" +version = "0.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fffa369a668c8af7dbf8b5e56c9f744fbd399949ed171606040001947de40b1c" +checksum = "f55bf8e7b65898637379c1b74eb1551107c8294ed26d855ceb9fd1a09cfc9bc0" dependencies = [ "const-oid", "zeroize", @@ -1719,7 +1719,7 @@ dependencies = [ "heck 0.4.1", "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.58", ] [[package]] @@ -1739,7 +1739,7 @@ checksum = "f282cfdfe92516eb26c2af8589c274c7c17681f5ecc03c18255fe741c6aa64eb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.58", ] [[package]] @@ -1782,7 +1782,7 @@ dependencies = [ "darling 0.20.8", "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.58", ] [[package]] @@ -1881,9 +1881,9 @@ dependencies = [ [[package]] name = "event-listener-strategy" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "feedafcaa9b749175d5ac357452a9d41ea2911da598fde46ce1fe02c37751291" +checksum = "332f51cb23d20b0de8458b86580878211da09bcd4503cb579c225b3d124cabb3" dependencies = [ "event-listener 5.2.0", "pin-project-lite", @@ -2033,7 +2033,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" dependencies = [ "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.58", ] [[package]] @@ -2145,7 +2145,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.58", ] [[package]] @@ -2328,9 +2328,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.25" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fbd2820c5e49886948654ab546d0688ff24530286bdcf8fca3cefb16d4618eb" +checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" dependencies = [ "bytes", "fnv", @@ -2541,6 +2541,17 @@ dependencies = [ ] [[package]] +name = "hostname" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9c7c7c8ac16c798734b8a24560c1362120597c40d5e1459f09498f8f6c8f2ba" +dependencies = [ + "cfg-if 1.0.0", + "libc", + "windows 0.52.0", +] + +[[package]] name = "http" version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2980,13 +2991,12 @@ dependencies = [ [[package]] name = "libredox" -version = "0.0.1" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" +checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ "bitflags 2.5.0", "libc", - "redox_syscall 0.4.1", ] [[package]] @@ -3069,9 +3079,9 @@ dependencies = [ [[package]] name = "lz4_flex" -version = "0.11.2" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "912b45c753ff5f7f5208307e8ace7d2a2e30d024e26d3509f3dce546c044ce15" +checksum = "75761162ae2b0e580d7e7c390558127e5f01b4194debd6221fd8c207fc80e3f5" [[package]] name = "malloc_buf" @@ -3825,9 +3835,9 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pest" -version = "2.7.8" +version = "2.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56f8023d0fb78c8e03784ea1c7f3fa36e68a723138990b8d5a47d916b651e7a8" +checksum = "311fb059dee1a7b802f036316d790138c613a4e8b180c822e3925a662e9f0c95" dependencies = [ "memchr", "thiserror", @@ -3836,9 +3846,9 @@ dependencies = [ [[package]] name = "pest_derive" -version = "2.7.8" +version = "2.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0d24f72393fd16ab6ac5738bc33cdb6a9aa73f8b902e8fe29cf4e67d7dd1026" +checksum = "f73541b156d32197eecda1a4014d7f868fd2bcb3c550d5386087cfba442bf69c" dependencies = [ "pest", "pest_generator", @@ -3846,22 +3856,22 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.7.8" +version = "2.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdc17e2a6c7d0a492f0158d7a4bd66cc17280308bbaff78d5bef566dca35ab80" +checksum = "c35eeed0a3fab112f75165fdc026b3913f4183133f19b49be773ac9ea966e8bd" dependencies = [ "pest", "pest_meta", "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.58", ] [[package]] name = "pest_meta" -version = "2.7.8" +version = "2.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "934cd7631c050f4674352a6e835d5f6711ffbfb9345c2fc0107155ac495ae293" +checksum = "2adbf29bb9776f28caece835398781ab24435585fe0d4dc1374a61db5accedca" dependencies = [ "once_cell", "pest", @@ -3895,14 +3905,14 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.58", ] [[package]] name = "pin-project-lite" -version = "0.2.13" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" [[package]] name = "pin-utils" @@ -4081,7 +4091,7 @@ dependencies = [ "itertools 0.11.0", "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.58", ] [[package]] @@ -4202,9 +4212,9 @@ dependencies = [ [[package]] name = "redox_users" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" +checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891" dependencies = [ "getrandom", "libredox", @@ -4261,7 +4271,7 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "52e44394d2086d010551b14b53b1f24e31647570cd1deb0379e2c21b329aba00" dependencies = [ - "hostname", + "hostname 0.3.1", "quick-error", ] @@ -4561,9 +4571,9 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.9.2" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" +checksum = "770452e37cad93e0a50d5abc3990d2bc351c36d0328f86cefec2f2fb206eaef6" dependencies = [ "bitflags 1.3.2", "core-foundation", @@ -4574,9 +4584,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.9.1" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" +checksum = "41f3cc463c0ef97e11c3461a9d3787412d30e8e7eb907c79180c4a57bf7c04ef" dependencies = [ "core-foundation-sys", "libc", @@ -4670,7 +4680,7 @@ checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.58", ] [[package]] @@ -4692,7 +4702,7 @@ checksum = "e578a843d40b4189a4d66bba51d7684f57da5bd7c304c64e14bd63efbef49509" dependencies = [ "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.58", ] [[package]] @@ -4714,7 +4724,7 @@ checksum = "0b2e6b945e9d3df726b65d6ee24060aff8e3533d431f677a9695db04eff9dfdb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.58", ] [[package]] @@ -4761,7 +4771,7 @@ checksum = "91d129178576168c589c9ec973feedf7d3126c01ac2bf08795109aa35b69fb8f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.58", ] [[package]] @@ -4990,9 +5000,9 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] name = "strsim" -version = "0.11.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ee073c9e4cd00e28217186dbe12796d692868f432bf2e97ee73bed0c56dfa01" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "subtle" @@ -5013,9 +5023,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.55" +version = "2.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "002a1b3dbf967edfafc32655d0f377ab0bb7b994aa1d32c8cc7e9b8bf3ebb8f0" +checksum = "44cfb93f38070beee36b3fef7d4f5a16f27751d94b187b666a5cc5e9b0d30687" dependencies = [ "proc-macro2", "quote", @@ -5030,9 +5040,9 @@ checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" [[package]] name = "sysinfo" -version = "0.30.7" +version = "0.30.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c385888ef380a852a16209afc8cfad22795dd8873d69c9a14d2e2088f118d18" +checksum = "4b1a378e48fb3ce3a5cf04359c456c9c98ff689bcf1c1bc6e6a31f247686f275" dependencies = [ "cfg-if 1.0.0", "core-foundation-sys", @@ -5098,7 +5108,7 @@ checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.58", ] [[package]] @@ -5181,9 +5191,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.36.0" +version = "1.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931" +checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787" dependencies = [ "backtrace", "bytes", @@ -5217,7 +5227,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.58", ] [[package]] @@ -5419,7 +5429,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.58", ] [[package]] @@ -5575,7 +5585,7 @@ dependencies = [ "proc-macro2", "quote", "serde_derive_internals 0.28.0", - "syn 2.0.55", + "syn 2.0.58", ] [[package]] @@ -5761,7 +5771,7 @@ dependencies = [ [[package]] name = "veilid-cli" -version = "0.3.0" +version = "0.3.1" dependencies = [ "arboard", "async-std", @@ -5802,7 +5812,7 @@ dependencies = [ [[package]] name = "veilid-core" -version = "0.3.0" +version = "0.3.1" dependencies = [ "argon2", "async-io 1.13.0", @@ -5905,7 +5915,7 @@ dependencies = [ [[package]] name = "veilid-flutter" -version = "0.3.0" +version = "0.3.1" dependencies = [ "allo-isolate", "android_log-sys 0.3.1", @@ -5916,7 +5926,7 @@ dependencies = [ "data-encoding", "ffi-support", "futures-util", - "hostname", + "hostname 0.3.1", "jni", "lazy_static", "libc-print", @@ -5962,7 +5972,7 @@ dependencies = [ [[package]] name = "veilid-server" -version = "0.3.0" +version = "0.3.1" dependencies = [ "ansi_term", "async-std", @@ -5977,7 +5987,7 @@ dependencies = [ "directories", "flume", "futures-util", - "hostname", + "hostname 0.4.0", "json", "lazy_static", "nix 0.28.0", @@ -6012,7 +6022,7 @@ dependencies = [ [[package]] name = "veilid-tools" -version = "0.3.0" +version = "0.3.1" dependencies = [ "android_logger 0.13.3", "async-lock 2.8.0", @@ -6070,7 +6080,7 @@ dependencies = [ [[package]] name = "veilid-wasm" -version = "0.3.0" +version = "0.3.1" dependencies = [ "cfg-if 1.0.0", "console_error_panic_hook", @@ -6156,7 +6166,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.58", "wasm-bindgen-shared", ] @@ -6190,7 +6200,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.58", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -6223,7 +6233,7 @@ checksum = "b7f89739351a2e03cb94beb799d47fb2cac01759b40ec441f7de39b00cbf7ef0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.58", ] [[package]] @@ -6697,9 +6707,9 @@ checksum = "a67300977d3dc3f8034dae89778f502b6ba20b269527b3223ba59c0cf393bb8a" [[package]] name = "xml-rs" -version = "0.8.19" +version = "0.8.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fcb9cbac069e033553e8bb871be2fbdffcab578eb25bd0f7c508cedc6dcd75a" +checksum = "791978798f0597cfc70478424c2b4fdc2b7a8024aaff78497ef00f24ef674193" [[package]] name = "xmltree" @@ -6771,7 +6781,7 @@ checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.58", ] [[package]] @@ -6791,7 +6801,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.58", ] [[package]] diff --git a/pkgs/tools/networking/veilid/default.nix b/pkgs/tools/networking/veilid/default.nix index bbeddca8b7cd7..e88671b370689 100644 --- a/pkgs/tools/networking/veilid/default.nix +++ b/pkgs/tools/networking/veilid/default.nix @@ -10,13 +10,13 @@ rustPlatform.buildRustPackage rec { pname = "veilid"; - version = "0.3.0"; + version = "0.3.1"; src = fetchFromGitLab { owner = "veilid"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Hwumwc6XHHCyjmOqIhhUzGEhah5ASrBZ8EYwYVag0Fo="; + sha256 = "sha256-pBMUwCZ1dLLde+RF9smy4/RZYmtyW+oTeo3LHNtscSc="; }; cargoLock = { diff --git a/pkgs/tools/nix/nixdoc/default.nix b/pkgs/tools/nix/nixdoc/default.nix index 616ee90d9a3fd..54d0c1be4ce6b 100644 --- a/pkgs/tools/nix/nixdoc/default.nix +++ b/pkgs/tools/nix/nixdoc/default.nix @@ -22,7 +22,6 @@ rustPlatform.buildRustPackage rec { license = [ licenses.gpl3 ]; maintainers = with maintainers; [ infinisil - asymmetric hsjobeki ]; platforms = platforms.unix; diff --git a/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/html.py b/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/html.py index 2e43a6a2be876..1de511c7ce313 100644 --- a/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/html.py +++ b/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/html.py @@ -219,13 +219,13 @@ class HTMLRenderer(Renderer): def example_open(self, token: Token, tokens: Sequence[Token], i: int) -> str: if id := cast(str, token.attrs.get('id', '')): id = f'id="{escape(id, True)}"' if id else '' - return f'<div class="example"><span {id} ></span>' + return f'<div class="example"><span {id} ></span><details>' def example_close(self, token: Token, tokens: Sequence[Token], i: int) -> str: - return '</div></div><br class="example-break" />' + return '</div></details></div><br class="example-break" />' def example_title_open(self, token: Token, tokens: Sequence[Token], i: int) -> str: - return '<p class="title"><strong>' + return '<summary><span class="title"><strong>' def example_title_close(self, token: Token, tokens: Sequence[Token], i: int) -> str: - return '</strong></p><div class="example-contents">' + return '</strong></span></summary><div class="example-contents">' def image(self, token: Token, tokens: Sequence[Token], i: int) -> str: src = self._pull_image(cast(str, token.attrs['src'])) alt = f'alt="{escape(token.content, True)}"' if token.content else "" diff --git a/pkgs/tools/package-management/nix/common.nix b/pkgs/tools/package-management/nix/common.nix index 9c22b29755016..69e5db4b0aeb6 100644 --- a/pkgs/tools/package-management/nix/common.nix +++ b/pkgs/tools/package-management/nix/common.nix @@ -15,6 +15,7 @@ let atLeast210 = lib.versionAtLeast version "2.10pre"; atLeast213 = lib.versionAtLeast version "2.13pre"; atLeast214 = lib.versionAtLeast version "2.14pre"; + atLeast219 = lib.versionAtLeast version "2.19pre"; atLeast220 = lib.versionAtLeast version "2.20pre"; atLeast221 = lib.versionAtLeast version "2.21pre"; # Major.minor versions unaffected by CVE-2024-27297 @@ -147,6 +148,7 @@ self = stdenv.mkDerivation { installCheckInputs = lib.optionals atLeast221 [ git + ] ++ lib.optionals atLeast219 [ man ]; diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 75d1442bd38fc..61053e491dbb3 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -248,11 +248,8 @@ in lib.makeExtensible (self: ({ }; nix_2_19 = common { - version = "2.19.3"; - hash = "sha256-EtL6M0H5+0mFbFh+teVjm+0B+xmHoKwtBvigS5NMWoo="; - patches = [ - ./patches/2_19/CVE-2024-27297.patch - ]; + version = "2.19.4"; + hash = "sha256-qXjyVmDm1SFWk1az3GWIsJ0fVG0nWet2FdldFOnUydI="; }; nix_2_20 = common { @@ -261,8 +258,8 @@ in lib.makeExtensible (self: ({ }; nix_2_21 = common { - version = "2.21.1"; - hash = "sha256-iRtvOcJbohyhav+deEajI/Ln/LU/6WqSfLyXDQaNEro="; + version = "2.21.2"; + hash = "sha256-ObaVDDPtnOeIE0t7m4OVk5G+OS6d9qYh+ktK67Fe/zE="; }; # The minimum Nix version supported by Nixpkgs diff --git a/pkgs/tools/package-management/nix/patches/2_19/CVE-2024-27297.patch b/pkgs/tools/package-management/nix/patches/2_19/CVE-2024-27297.patch deleted file mode 100644 index e75b7577af1e5..0000000000000 --- a/pkgs/tools/package-management/nix/patches/2_19/CVE-2024-27297.patch +++ /dev/null @@ -1,407 +0,0 @@ -From ca05f6d2038a749f63205fccc4a4daa914a6b95b Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Th=C3=A9ophane=20Hufschmitt?= - <theophane.hufschmitt@tweag.io> -Date: Mon, 12 Feb 2024 21:28:20 +0100 -Subject: [PATCH 1/4] Add a NixOS test for the sandbox escape - -Test that we can't leverage abstract unix domain sockets to leak file -descriptors out of the sandbox and modify the path after it has been -registered. ---- - tests/nixos/ca-fd-leak/default.nix | 90 ++++++++++++++++++++++++++++++ - tests/nixos/ca-fd-leak/sender.c | 65 +++++++++++++++++++++ - tests/nixos/ca-fd-leak/smuggler.c | 66 ++++++++++++++++++++++ - tests/nixos/default.nix | 2 + - 4 files changed, 223 insertions(+) - create mode 100644 tests/nixos/ca-fd-leak/default.nix - create mode 100644 tests/nixos/ca-fd-leak/sender.c - create mode 100644 tests/nixos/ca-fd-leak/smuggler.c - -diff --git a/tests/nixos/ca-fd-leak/default.nix b/tests/nixos/ca-fd-leak/default.nix -new file mode 100644 -index 000000000..40e57ea02 ---- /dev/null -+++ b/tests/nixos/ca-fd-leak/default.nix -@@ -0,0 +1,90 @@ -+# Nix is a sandboxed build system. But Not everything can be handled inside its -+# sandbox: Network access is normally blocked off, but to download sources, a -+# trapdoor has to exist. Nix handles this by having "Fixed-output derivations". -+# The detail here is not important, but in our case it means that the hash of -+# the output has to be known beforehand. And if you know that, you get a few -+# rights: you no longer run inside a special network namespace! -+# -+# Now, Linux has a special feature, that not many other unices do: Abstract -+# unix domain sockets! Not only that, but those are namespaced using the -+# network namespace! That means that we have a way to create sockets that are -+# available in every single fixed-output derivation, and also all processes -+# running on the host machine! Now, this wouldn't be that much of an issue, as, -+# well, the whole idea is that the output is pure, and all processes in the -+# sandbox are killed before finalizing the output. What if we didn't need those -+# processes at all? Unix domain sockets have a semi-known trick: you can pass -+# file descriptors around! -+# This makes it possible to exfiltrate a file-descriptor with write access to -+# $out outside of the sandbox. And that file-descriptor can be used to modify -+# the contents of the store path after it has been registered. -+ -+{ config, ... }: -+ -+let -+ pkgs = config.nodes.machine.nixpkgs.pkgs; -+ -+ # Simple C program that sends a a file descriptor to `$out` to a Unix -+ # domain socket. -+ # Compiled statically so that we can easily send it to the VM and use it -+ # inside the build sandbox. -+ sender = pkgs.runCommandWith { -+ name = "sender"; -+ stdenv = pkgs.pkgsStatic.stdenv; -+ } '' -+ $CC -static -o $out ${./sender.c} -+ ''; -+ -+ # Okay, so we have a file descriptor shipped out of the FOD now. But the -+ # Nix store is read-only, right? .. Well, yeah. But this file descriptor -+ # lives in a mount namespace where it is not! So even when this file exists -+ # in the actual Nix store, we're capable of just modifying its contents... -+ smuggler = pkgs.writeCBin "smuggler" (builtins.readFile ./smuggler.c); -+ -+ # The abstract socket path used to exfiltrate the file descriptor -+ socketName = "FODSandboxExfiltrationSocket"; -+in -+{ -+ name = "ca-fd-leak"; -+ -+ nodes.machine = -+ { config, lib, pkgs, ... }: -+ { virtualisation.writableStore = true; -+ nix.settings.substituters = lib.mkForce [ ]; -+ virtualisation.additionalPaths = [ pkgs.busybox-sandbox-shell sender smuggler pkgs.socat ]; -+ }; -+ -+ testScript = { nodes }: '' -+ start_all() -+ -+ machine.succeed("echo hello") -+ # Start the smuggler server -+ machine.succeed("${smuggler}/bin/smuggler ${socketName} >&2 &") -+ -+ # Build the smuggled derivation. -+ # This will connect to the smuggler server and send it the file descriptor -+ machine.succeed(r""" -+ nix-build -E ' -+ builtins.derivation { -+ name = "smuggled"; -+ system = builtins.currentSystem; -+ # look ma, no tricks! -+ outputHashMode = "flat"; -+ outputHashAlgo = "sha256"; -+ outputHash = builtins.hashString "sha256" "hello, world\n"; -+ builder = "${pkgs.busybox-sandbox-shell}/bin/sh"; -+ args = [ "-c" "echo \"hello, world\" > $out; ''${${sender}} ${socketName}" ]; -+ }' -+ """.strip()) -+ -+ -+ # Tell the smuggler server that we're done -+ machine.execute("echo done | ${pkgs.socat}/bin/socat - ABSTRACT-CONNECT:${socketName}") -+ -+ # Check that the file was modified -+ machine.succeed(r""" -+ cat ./result -+ test "$(cat ./result)" = "hello, world" -+ """.strip()) -+ ''; -+ -+} -diff --git a/tests/nixos/ca-fd-leak/sender.c b/tests/nixos/ca-fd-leak/sender.c -new file mode 100644 -index 000000000..75e54fc8f ---- /dev/null -+++ b/tests/nixos/ca-fd-leak/sender.c -@@ -0,0 +1,65 @@ -+#include <sys/socket.h> -+#include <sys/un.h> -+#include <stdlib.h> -+#include <stddef.h> -+#include <stdio.h> -+#include <unistd.h> -+#include <fcntl.h> -+#include <errno.h> -+#include <string.h> -+#include <assert.h> -+ -+int main(int argc, char **argv) { -+ -+ assert(argc == 2); -+ -+ int sock = socket(AF_UNIX, SOCK_STREAM, 0); -+ -+ // Set up a abstract domain socket path to connect to. -+ struct sockaddr_un data; -+ data.sun_family = AF_UNIX; -+ data.sun_path[0] = 0; -+ strcpy(data.sun_path + 1, argv[1]); -+ -+ // Now try to connect, To ensure we work no matter what order we are -+ // executed in, just busyloop here. -+ int res = -1; -+ while (res < 0) { -+ res = connect(sock, (const struct sockaddr *)&data, -+ offsetof(struct sockaddr_un, sun_path) -+ + strlen(argv[1]) -+ + 1); -+ if (res < 0 && errno != ECONNREFUSED) perror("connect"); -+ if (errno != ECONNREFUSED) break; -+ } -+ -+ // Write our message header. -+ struct msghdr msg = {0}; -+ msg.msg_control = malloc(128); -+ msg.msg_controllen = 128; -+ -+ // Write an SCM_RIGHTS message containing the output path. -+ struct cmsghdr *hdr = CMSG_FIRSTHDR(&msg); -+ hdr->cmsg_len = CMSG_LEN(sizeof(int)); -+ hdr->cmsg_level = SOL_SOCKET; -+ hdr->cmsg_type = SCM_RIGHTS; -+ int fd = open(getenv("out"), O_RDWR | O_CREAT, 0640); -+ memcpy(CMSG_DATA(hdr), (void *)&fd, sizeof(int)); -+ -+ msg.msg_controllen = CMSG_SPACE(sizeof(int)); -+ -+ // Write a single null byte too. -+ msg.msg_iov = malloc(sizeof(struct iovec)); -+ msg.msg_iov[0].iov_base = ""; -+ msg.msg_iov[0].iov_len = 1; -+ msg.msg_iovlen = 1; -+ -+ // Send it to the othher side of this connection. -+ res = sendmsg(sock, &msg, 0); -+ if (res < 0) perror("sendmsg"); -+ int buf; -+ -+ // Wait for the server to close the socket, implying that it has -+ // received the commmand. -+ recv(sock, (void *)&buf, sizeof(int), 0); -+} -diff --git a/tests/nixos/ca-fd-leak/smuggler.c b/tests/nixos/ca-fd-leak/smuggler.c -new file mode 100644 -index 000000000..82acf37e6 ---- /dev/null -+++ b/tests/nixos/ca-fd-leak/smuggler.c -@@ -0,0 +1,66 @@ -+#include <sys/socket.h> -+#include <sys/un.h> -+#include <stdlib.h> -+#include <stddef.h> -+#include <stdio.h> -+#include <unistd.h> -+#include <assert.h> -+ -+int main(int argc, char **argv) { -+ -+ assert(argc == 2); -+ -+ int sock = socket(AF_UNIX, SOCK_STREAM, 0); -+ -+ // Bind to the socket. -+ struct sockaddr_un data; -+ data.sun_family = AF_UNIX; -+ data.sun_path[0] = 0; -+ strcpy(data.sun_path + 1, argv[1]); -+ int res = bind(sock, (const struct sockaddr *)&data, -+ offsetof(struct sockaddr_un, sun_path) -+ + strlen(argv[1]) -+ + 1); -+ if (res < 0) perror("bind"); -+ -+ res = listen(sock, 1); -+ if (res < 0) perror("listen"); -+ -+ int smuggling_fd = -1; -+ -+ // Accept the connection a first time to receive the file descriptor. -+ fprintf(stderr, "%s\n", "Waiting for the first connection"); -+ int a = accept(sock, 0, 0); -+ if (a < 0) perror("accept"); -+ -+ struct msghdr msg = {0}; -+ msg.msg_control = malloc(128); -+ msg.msg_controllen = 128; -+ -+ // Receive the file descriptor as sent by the smuggler. -+ recvmsg(a, &msg, 0); -+ -+ struct cmsghdr *hdr = CMSG_FIRSTHDR(&msg); -+ while (hdr) { -+ if (hdr->cmsg_level == SOL_SOCKET -+ && hdr->cmsg_type == SCM_RIGHTS) { -+ -+ // Grab the copy of the file descriptor. -+ memcpy((void *)&smuggling_fd, CMSG_DATA(hdr), sizeof(int)); -+ } -+ -+ hdr = CMSG_NXTHDR(&msg, hdr); -+ } -+ fprintf(stderr, "%s\n", "Got the file descriptor. Now waiting for the second connection"); -+ close(a); -+ -+ // Wait for a second connection, which will tell us that the build is -+ // done -+ a = accept(sock, 0, 0); -+ fprintf(stderr, "%s\n", "Got a second connection, rewriting the file"); -+ // Write a new content to the file -+ if (ftruncate(smuggling_fd, 0)) perror("ftruncate"); -+ char * new_content = "Pwned\n"; -+ int written_bytes = write(smuggling_fd, new_content, strlen(new_content)); -+ if (written_bytes != strlen(new_content)) perror("write"); -+} -diff --git a/tests/nixos/default.nix b/tests/nixos/default.nix -index 4459aa664..4c1cf785c 100644 ---- a/tests/nixos/default.nix -+++ b/tests/nixos/default.nix -@@ -40,4 +40,6 @@ in - setuid = lib.genAttrs - ["i686-linux" "x86_64-linux"] - (system: runNixOSTestFor system ./setuid.nix); -+ -+ ca-fd-leak = runNixOSTestFor "x86_64-linux" ./ca-fd-leak; - } --- -2.42.0 - - -From 558dab42315f493aa4e8480a57c2d3b0834392ec Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Th=C3=A9ophane=20Hufschmitt?= - <theophane.hufschmitt@tweag.io> -Date: Tue, 13 Feb 2024 08:28:02 +0100 -Subject: [PATCH 2/4] Copy the output of fixed-output derivations before - registering them - -It is possible to exfiltrate a file descriptor out of the build sandbox -of FODs, and use it to modify the store path after it has been -registered. -To avoid that issue, don't register the output of the build, but a copy -of it (that will be free of any leaked file descriptor). ---- - src/libstore/build/local-derivation-goal.cc | 6 ++++++ - src/libutil/file-system.cc | 5 +++++ - src/libutil/file-system.hh | 7 +++++++ - 3 files changed, 18 insertions(+) - -diff --git a/src/libstore/build/local-derivation-goal.cc b/src/libstore/build/local-derivation-goal.cc -index a9f930773..d83c47d00 100644 ---- a/src/libstore/build/local-derivation-goal.cc -+++ b/src/libstore/build/local-derivation-goal.cc -@@ -2543,6 +2543,12 @@ SingleDrvOutputs LocalDerivationGoal::registerOutputs() - [&](const DerivationOutput::CAFixed & dof) { - auto & wanted = dof.ca.hash; - -+ // Replace the output by a fresh copy of itself to make sure -+ // that there's no stale file descriptor pointing to it -+ Path tmpOutput = actualPath + ".tmp"; -+ copyFile(actualPath, tmpOutput, true); -+ renameFile(tmpOutput, actualPath); -+ - auto newInfo0 = newInfoFromCA(DerivationOutput::CAFloating { - .method = dof.ca.method, - .hashType = wanted.type, -diff --git a/src/libutil/file-system.cc b/src/libutil/file-system.cc -index c96effff9..777f83c30 100644 ---- a/src/libutil/file-system.cc -+++ b/src/libutil/file-system.cc -@@ -616,6 +616,11 @@ void copy(const fs::directory_entry & from, const fs::path & to, bool andDelete) - } - } - -+void copyFile(const Path & oldPath, const Path & newPath, bool andDelete) -+{ -+ return copy(fs::directory_entry(fs::path(oldPath)), fs::path(newPath), andDelete); -+} -+ - void renameFile(const Path & oldName, const Path & newName) - { - fs::rename(oldName, newName); -diff --git a/src/libutil/file-system.hh b/src/libutil/file-system.hh -index 4637507b3..71db7d8bc 100644 ---- a/src/libutil/file-system.hh -+++ b/src/libutil/file-system.hh -@@ -186,6 +186,13 @@ void renameFile(const Path & src, const Path & dst); - */ - void moveFile(const Path & src, const Path & dst); - -+/** -+ * Recursively copy the content of `oldPath` to `newPath`. If `andDelete` is -+ * `true`, then also remove `oldPath` (making this equivalent to `moveFile`, but -+ * with the guaranty that the destination will be “fresh”, with no stale inode -+ * or file descriptor pointing to it). -+ */ -+void copyFile(const Path & oldPath, const Path & newPath, bool andDelete); - - /** - * Automatic cleanup of resources. --- -2.42.0 - - -From 6adce5c3baddf20a5865a646a6d5117e83693497 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Th=C3=A9ophane=20Hufschmitt?= - <7226587+thufschmitt@users.noreply.github.com> -Date: Wed, 21 Feb 2024 17:32:36 +0100 -Subject: [PATCH 3/4] Fix a typo in a test comment - -Co-authored-by: Valentin Gagarin <valentin.gagarin@tweag.io> ---- - tests/nixos/ca-fd-leak/default.nix | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tests/nixos/ca-fd-leak/default.nix b/tests/nixos/ca-fd-leak/default.nix -index 40e57ea02..a6ae72adc 100644 ---- a/tests/nixos/ca-fd-leak/default.nix -+++ b/tests/nixos/ca-fd-leak/default.nix -@@ -80,7 +80,7 @@ in - # Tell the smuggler server that we're done - machine.execute("echo done | ${pkgs.socat}/bin/socat - ABSTRACT-CONNECT:${socketName}") - -- # Check that the file was modified -+ # Check that the file was not modified - machine.succeed(r""" - cat ./result - test "$(cat ./result)" = "hello, world" --- -2.42.0 - - -From 7a803d9d5460cc990f20eff7d4d5a3623298c15b Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Th=C3=A9ophane=20Hufschmitt?= - <theophane.hufschmitt@tweag.io> -Date: Fri, 1 Mar 2024 09:31:05 +0100 -Subject: [PATCH 4/4] Add release notes - ---- - doc/manual/rl-next/fod-sandbox-escape.md | 14 ++++++++++++++ - 1 file changed, 14 insertions(+) - create mode 100644 doc/manual/rl-next/fod-sandbox-escape.md - -diff --git a/doc/manual/rl-next/fod-sandbox-escape.md b/doc/manual/rl-next/fod-sandbox-escape.md -new file mode 100644 -index 000000000..ed451711e ---- /dev/null -+++ b/doc/manual/rl-next/fod-sandbox-escape.md -@@ -0,0 +1,14 @@ -+--- -+synopsis: Fix a FOD sandbox escape -+issues: -+prs: -+--- -+ -+Cooperating Nix derivations could send file descriptors to files in the Nix -+store to each other via Unix domain sockets in the abstract namespace. This -+allowed one derivation to modify the output of the other derivation, after Nix -+has registered the path as "valid" and immutable in the Nix database. -+In particular, this allowed the output of fixed-output derivations to be -+modified from their expected content. -+ -+This isn't the case any more. --- -2.42.0 diff --git a/pkgs/tools/package-management/pdm/default.nix b/pkgs/tools/package-management/pdm/default.nix index 88ed0768b1d86..fd8539da9654e 100644 --- a/pkgs/tools/package-management/pdm/default.nix +++ b/pkgs/tools/package-management/pdm/default.nix @@ -1,8 +1,6 @@ { lib -, stdenv , python3 , fetchFromGitHub -, fetchpatch , fetchPypi , nix-update-script , runtimeShell @@ -35,41 +33,46 @@ in with python.pkgs; buildPythonApplication rec { pname = "pdm"; - version = "2.12.4"; + version = "2.13.2"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-0Eh3Ni+Vz5/8HSw4uFH2k3BuSSiEDkiYauV22tV0FJY="; + hash = "sha256-4oK/HK8KCD/A+16JrW9518V5/1LHu1juhYfqPVu54Uo="; }; nativeBuildInputs = [ - pdm-backend installShellFiles ]; - propagatedBuildInputs = [ + build-system = [ + pdm-backend + ]; + + dependencies = [ blinker - certifi - cachecontrol dep-logic + filelock findpython + hishel + httpx installer + msgpack packaging + pbs-installer platformdirs pyproject-hooks python-dotenv - requests-toolbelt resolvelib rich shellingham tomlkit unearth virtualenv - ] - ++ cachecontrol.optional-dependencies.filecache + ] ++ httpx.optional-dependencies.socks + ++ pbs-installer.optional-dependencies.install ++ lib.optionals (pythonOlder "3.11") [ tomli ] @@ -100,7 +103,6 @@ buildPythonApplication rec { nativeCheckInputs = [ pytestCheckHook pytest-mock - pytest-rerunfailures pytest-xdist pytest-httpserver ] ++ lib.optional stdenv.isLinux first; @@ -120,7 +122,9 @@ buildPythonApplication rec { "test_convert_setup_py_project" # pythonfinder isn't aware of nix's python infrastructure "test_use_wrapper_python" - "test_use_invalid_wrapper_python" + + # touches the network + "test_find_candidates_from_find_links" ]; __darwinAllowLocalNetworking = true; @@ -134,7 +138,7 @@ buildPythonApplication rec { meta = with lib; { homepage = "https://pdm-project.org"; changelog = "https://github.com/pdm-project/pdm/releases/tag/${version}"; - description = "A modern Python package manager with PEP 582 support"; + description = "A modern Python package and dependency manager supporting the latest PEP standards"; license = licenses.mit; maintainers = with maintainers; [ cpcloud ]; mainProgram = "pdm"; diff --git a/pkgs/tools/package-management/pkg/default.nix b/pkgs/tools/package-management/pkg/default.nix index b100b9984915f..83ae30ee22a37 100644 --- a/pkgs/tools/package-management/pkg/default.nix +++ b/pkgs/tools/package-management/pkg/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "pkg"; - version = "1.20.8"; + version = "1.21.0"; src = fetchFromGitHub { owner = "freebsd"; repo = "pkg"; rev = finalAttrs.version; - sha256 = "sha256-pQgZMCd4PEjNZKm9V35Rca7Miblv1EgkH+CxaiKvhpY="; + sha256 = "sha256-5Yoe0Y2WTBc19OzB1QvJCX8FXtBlgxORyUppX6ZWnAM="; }; setOutputFlags = false; diff --git a/pkgs/tools/security/arti/default.nix b/pkgs/tools/security/arti/default.nix index c1e1ae120f971..c58ccce99aec9 100644 --- a/pkgs/tools/security/arti/default.nix +++ b/pkgs/tools/security/arti/default.nix @@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec { pname = "arti"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitLab { domain = "gitlab.torproject.org"; @@ -18,10 +18,10 @@ rustPlatform.buildRustPackage rec { owner = "core"; repo = "arti"; rev = "arti-v${version}"; - hash = "sha256-ba07btx3eorFiocRk1YbkkGcblgsWaMI14r1SaPNr9g="; + hash = "sha256-Ps1AIvL6hOnSYtvi4wbgJQiuv2eb1XIEPul/WypM9bo="; }; - cargoHash = "sha256-+TVmmyjAFLDlnXMED0+S0M3VbGBRHds4C1GNyTGD4wI="; + cargoHash = "sha256-2u/8nn/9tz+hlNDz6I/g2cMPWXZSMVNV7FPsKFP8jqo="; nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ]; diff --git a/pkgs/tools/security/bws/Cargo.lock b/pkgs/tools/security/bws/Cargo.lock new file mode 100644 index 0000000000000..ca4305f8d0738 --- /dev/null +++ b/pkgs/tools/security/bws/Cargo.lock @@ -0,0 +1,4127 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "addr2line" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +dependencies = [ + "gimli", +] + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "aes" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac1f845298e95f983ff1944b728ae08b8cebab80d684f0a832ed0fc74dfa27e2" +dependencies = [ + "cfg-if", + "cipher", + "cpufeatures", +] + +[[package]] +name = "aho-corasick" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +dependencies = [ + "memchr", +] + +[[package]] +name = "android-tzdata" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" + +[[package]] +name = "android_system_properties" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +dependencies = [ + "libc", +] + +[[package]] +name = "ansi_colours" +version = "1.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a1558bd2075d341b9ca698ec8eb6fcc55a746b1fc4255585aad5b141d918a80" +dependencies = [ + "rgb", +] + +[[package]] +name = "anstream" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d664a92ecae85fd0a7392615844904654d1d5f5514837f471ddef4a057aba1b6" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" + +[[package]] +name = "anstyle-parse" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "anstyle-wincon" +version = "3.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" +dependencies = [ + "anstyle", + "windows-sys 0.52.0", +] + +[[package]] +name = "anyhow" +version = "1.0.75" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" + +[[package]] +name = "arc-swap" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6" + +[[package]] +name = "argon2" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17ba4cac0a46bc1d2912652a751c47f2a9f3a7fe89bcae2275d418f5270402f9" +dependencies = [ + "base64ct", + "blake2", + "cpufeatures", + "password-hash", +] + +[[package]] +name = "askama" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b79091df18a97caea757e28cd2d5fda49c6cd4bd01ddffd7ff01ace0c0ad2c28" +dependencies = [ + "askama_derive", + "askama_escape", +] + +[[package]] +name = "askama_derive" +version = "0.12.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a0fc7dcf8bd4ead96b1d36b41df47c14beedf7b0301fc543d8f2384e66a2ec0" +dependencies = [ + "askama_parser", + "basic-toml", + "mime", + "mime_guess", + "proc-macro2", + "quote", + "serde", + "syn 2.0.41", +] + +[[package]] +name = "askama_escape" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "619743e34b5ba4e9703bba34deac3427c72507c7159f5fd030aea8cac0cfe341" + +[[package]] +name = "askama_parser" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c268a96e01a4c47c8c5c2472aaa570707e006a875ea63e819f75474ceedaf7b4" +dependencies = [ + "nom", +] + +[[package]] +name = "assert-json-diff" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47e4f2b81832e72834d7518d8487a0396a28cc408186a2e8854c0f98011faf12" +dependencies = [ + "serde", + "serde_json", +] + +[[package]] +name = "async-channel" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" +dependencies = [ + "concurrent-queue", + "event-listener 2.5.3", + "futures-core", +] + +[[package]] +name = "async-compat" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f68a707c1feb095d8c07f8a65b9f506b117d30af431cab89374357de7c11461b" +dependencies = [ + "futures-core", + "futures-io", + "once_cell", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "async-lock" +version = "3.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7125e42787d53db9dd54261812ef17e937c95a51e4d291373b670342fa44310c" +dependencies = [ + "event-listener 4.0.0", + "event-listener-strategy", + "pin-project-lite", +] + +[[package]] +name = "async-trait" +version = "0.1.74" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.41", +] + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "backtrace" +version = "0.3.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" +dependencies = [ + "addr2line", + "cc", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", +] + +[[package]] +name = "base64" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" + +[[package]] +name = "base64" +version = "0.21.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" + +[[package]] +name = "base64ct" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" + +[[package]] +name = "basic-toml" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f2139706359229bfa8f19142ac1155b4b80beafb7a60471ac5dd109d4a19778" +dependencies = [ + "serde", +] + +[[package]] +name = "bat" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9dcc9e5637c2330d8eb7b920f2aa5d9e184446c258466f825ea1412c7614cc86" +dependencies = [ + "ansi_colours", + "bincode", + "bytesize", + "clircle", + "console", + "content_inspector", + "encoding_rs", + "flate2", + "globset", + "home", + "nu-ansi-term 0.49.0", + "once_cell", + "path_abs", + "plist", + "semver", + "serde", + "serde_yaml", + "syntect", + "thiserror", + "unicode-width", +] + +[[package]] +name = "bincode" +version = "1.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" +dependencies = [ + "serde", +] + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bitflags" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" + +[[package]] +name = "bitwarden" +version = "0.4.0" +dependencies = [ + "aes", + "argon2", + "base64 0.21.5", + "bitwarden-api-api", + "bitwarden-api-identity", + "cbc", + "chrono", + "data-encoding", + "getrandom 0.2.11", + "hkdf", + "hmac", + "lazy_static", + "log", + "num-bigint", + "num-traits", + "pbkdf2", + "rand 0.8.5", + "rand_chacha 0.3.1", + "reqwest", + "rsa", + "schemars", + "serde", + "serde_json", + "serde_qs 0.12.0", + "serde_repr", + "sha1", + "sha2", + "subtle", + "thiserror", + "tokio", + "uniffi", + "uuid", + "wiremock", +] + +[[package]] +name = "bitwarden-api-api" +version = "0.2.3" +dependencies = [ + "reqwest", + "serde", + "serde_derive", + "serde_json", + "serde_repr", + "url", + "uuid", +] + +[[package]] +name = "bitwarden-api-identity" +version = "0.2.3" +dependencies = [ + "reqwest", + "serde", + "serde_derive", + "serde_json", + "serde_repr", + "url", + "uuid", +] + +[[package]] +name = "bitwarden-c" +version = "0.1.0" +dependencies = [ + "bitwarden-json", + "env_logger", + "tokio", +] + +[[package]] +name = "bitwarden-cli" +version = "0.1.0" +dependencies = [ + "clap", + "color-eyre", + "inquire", + "supports-color", +] + +[[package]] +name = "bitwarden-json" +version = "0.3.0" +dependencies = [ + "bitwarden", + "log", + "schemars", + "serde", + "serde_json", +] + +[[package]] +name = "bitwarden-napi" +version = "0.3.1" +dependencies = [ + "bitwarden-json", + "env_logger", + "log", + "napi", + "napi-build", + "napi-derive", +] + +[[package]] +name = "bitwarden-py" +version = "0.1.0" +dependencies = [ + "bitwarden-json", + "pyo3", + "pyo3-asyncio", + "pyo3-build-config", + "pyo3-log", + "tokio", +] + +[[package]] +name = "bitwarden-uniffi" +version = "0.1.0" +dependencies = [ + "async-lock", + "bitwarden", + "chrono", + "env_logger", + "openssl", + "schemars", + "uniffi", +] + +[[package]] +name = "bitwarden-wasm" +version = "0.1.0" +dependencies = [ + "bitwarden-json", + "console_error_panic_hook", + "console_log", + "js-sys", + "log", + "serde", + "wasm-bindgen", + "wasm-bindgen-futures", + "wasm-bindgen-test", +] + +[[package]] +name = "blake2" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46502ad458c9a52b69d4d4d32775c788b7a1b85e8bc9d482d92250fc0e3f8efe" +dependencies = [ + "digest", +] + +[[package]] +name = "block-buffer" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" +dependencies = [ + "generic-array", +] + +[[package]] +name = "block-padding" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8894febbff9f758034a5b8e12d87918f56dfc64a8e1fe757d65e29041538d93" +dependencies = [ + "generic-array", +] + +[[package]] +name = "bstr" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "542f33a8835a0884b006a0c3df3dadd99c0c3f296ed26c2fdc8028e01ad6230c" +dependencies = [ + "memchr", + "serde", +] + +[[package]] +name = "bumpalo" +version = "3.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" + +[[package]] +name = "bw" +version = "0.0.2" +dependencies = [ + "bitwarden", + "bitwarden-cli", + "clap", + "color-eyre", + "env_logger", + "inquire", + "log", + "tempfile", + "tokio", +] + +[[package]] +name = "bws" +version = "0.4.0" +dependencies = [ + "bat", + "bitwarden", + "chrono", + "clap", + "clap_complete", + "color-eyre", + "comfy-table", + "directories", + "env_logger", + "log", + "openssl", + "regex", + "serde", + "serde_json", + "serde_yaml", + "supports-color", + "tempfile", + "thiserror", + "tokio", + "toml 0.8.8", + "uuid", +] + +[[package]] +name = "bytemuck" +version = "1.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" + +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + +[[package]] +name = "bytes" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" + +[[package]] +name = "bytesize" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3e368af43e418a04d52505cf3dbc23dda4e3407ae2fa99fd0e4f308ce546acc" + +[[package]] +name = "camino" +version = "1.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c59e92b5a388f549b863a7bea62612c09f24c8393560709a54558a9abdfb3b9c" +dependencies = [ + "serde", +] + +[[package]] +name = "cargo-platform" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e34637b3140142bdf929fb439e8aa4ebad7651ebf7b1080b3930aa16ac1459ff" +dependencies = [ + "serde", +] + +[[package]] +name = "cargo_metadata" +version = "0.15.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eee4243f1f26fc7a42710e7439c149e2b10b05472f88090acce52632f231a73a" +dependencies = [ + "camino", + "cargo-platform", + "semver", + "serde", + "serde_json", + "thiserror", +] + +[[package]] +name = "cbc" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26b52a9543ae338f279b96b0b9fed9c8093744685043739079ce85cd58f289a6" +dependencies = [ + "cipher", +] + +[[package]] +name = "cc" +version = "1.0.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +dependencies = [ + "libc", +] + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "chrono" +version = "0.4.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" +dependencies = [ + "android-tzdata", + "iana-time-zone", + "js-sys", + "num-traits", + "serde", + "wasm-bindgen", + "windows-targets 0.48.5", +] + +[[package]] +name = "cipher" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" +dependencies = [ + "crypto-common", + "inout", +] + +[[package]] +name = "clap" +version = "4.4.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfaff671f6b22ca62406885ece523383b9b64022e341e53e009a62ebc47a45f2" +dependencies = [ + "clap_builder", + "clap_derive", +] + +[[package]] +name = "clap_builder" +version = "4.4.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a216b506622bb1d316cd51328dce24e07bdff4a6128a47c7e7fad11878d5adbb" +dependencies = [ + "anstream", + "anstyle", + "clap_lex", + "strsim", +] + +[[package]] +name = "clap_complete" +version = "4.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bffe91f06a11b4b9420f62103854e90867812cd5d01557f853c5ee8e791b12ae" +dependencies = [ + "clap", +] + +[[package]] +name = "clap_derive" +version = "4.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn 2.0.41", +] + +[[package]] +name = "clap_lex" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" + +[[package]] +name = "clircle" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8e87cbed5354f17bd8ca8821a097fb62599787fe8f611743fad7ee156a0a600" +dependencies = [ + "cfg-if", + "libc", + "serde", + "winapi", +] + +[[package]] +name = "color-eyre" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a667583cca8c4f8436db8de46ea8233c42a7d9ae424a82d338f2e4675229204" +dependencies = [ + "backtrace", + "color-spantrace", + "eyre", + "indenter", + "once_cell", + "owo-colors", + "tracing-error", +] + +[[package]] +name = "color-spantrace" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd6be1b2a7e382e2b98b43b2adcca6bb0e465af0bdd38123873ae61eb17a72c2" +dependencies = [ + "once_cell", + "owo-colors", + "tracing-core", + "tracing-error", +] + +[[package]] +name = "colorchoice" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" + +[[package]] +name = "comfy-table" +version = "7.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c64043d6c7b7a4c58e39e7efccfdea7b93d885a795d0c054a69dbbf4dd52686" +dependencies = [ + "crossterm 0.27.0", + "strum", + "strum_macros", + "unicode-width", +] + +[[package]] +name = "concurrent-queue" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d16048cd947b08fa32c24458a22f5dc5e835264f689f4f5653210c69fd107363" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "console" +version = "0.15.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c926e00cc70edefdc64d3a5ff31cc65bb97a3460097762bd23afb4d8145fccf8" +dependencies = [ + "encode_unicode", + "lazy_static", + "libc", + "unicode-width", + "windows-sys 0.45.0", +] + +[[package]] +name = "console_error_panic_hook" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a06aeb73f470f66dcdbf7223caeebb85984942f22f1adb2a088cf9668146bbbc" +dependencies = [ + "cfg-if", + "wasm-bindgen", +] + +[[package]] +name = "console_log" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be8aed40e4edbf4d3b4431ab260b63fdc40f5780a4766824329ea0f1eefe3c0f" +dependencies = [ + "log", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "const-oid" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" + +[[package]] +name = "content_inspector" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7bda66e858c683005a53a9a60c69a4aca7eeaa45d124526e389f7aec8e62f38" +dependencies = [ + "memchr", +] + +[[package]] +name = "convert_case" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca" +dependencies = [ + "unicode-segmentation", +] + +[[package]] +name = "core-foundation" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" + +[[package]] +name = "cpufeatures" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0" +dependencies = [ + "libc", +] + +[[package]] +name = "crc32fast" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c06d96137f14f244c37f989d9fff8f95e6c18b918e71f36638f8c49112e4c78f" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "crossterm" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e64e6c0fbe2c17357405f7c758c1ef960fce08bdfb2c03d88d2a18d7e09c4b67" +dependencies = [ + "bitflags 1.3.2", + "crossterm_winapi", + "libc", + "mio", + "parking_lot", + "signal-hook", + "signal-hook-mio", + "winapi", +] + +[[package]] +name = "crossterm" +version = "0.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f476fe445d41c9e991fd07515a6f463074b782242ccf4a5b7b1d1012e70824df" +dependencies = [ + "bitflags 2.4.1", + "crossterm_winapi", + "libc", + "parking_lot", + "winapi", +] + +[[package]] +name = "crossterm_winapi" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acdd7c62a3665c7f6830a51635d9ac9b23ed385797f70a83bb8bafe9c572ab2b" +dependencies = [ + "winapi", +] + +[[package]] +name = "crypto-common" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +dependencies = [ + "generic-array", + "typenum", +] + +[[package]] +name = "ctor" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30d2b3721e861707777e3195b0158f950ae6dc4a27e4d02ff9f67e3eb3de199e" +dependencies = [ + "quote", + "syn 2.0.41", +] + +[[package]] +name = "data-encoding" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" + +[[package]] +name = "deadpool" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "421fe0f90f2ab22016f32a9881be5134fdd71c65298917084b0c7477cbc3856e" +dependencies = [ + "async-trait", + "deadpool-runtime", + "num_cpus", + "retain_mut", + "tokio", +] + +[[package]] +name = "deadpool-runtime" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "63dfa964fe2a66f3fde91fc70b267fe193d822c7e603e2a675a49a7f46ad3f49" + +[[package]] +name = "der" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fffa369a668c8af7dbf8b5e56c9f744fbd399949ed171606040001947de40b1c" +dependencies = [ + "const-oid", + "pem-rfc7468", + "zeroize", +] + +[[package]] +name = "deranged" +version = "0.3.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8eb30d70a07a3b04884d2677f06bec33509dc67ca60d92949e5535352d3191dc" +dependencies = [ + "powerfmt", +] + +[[package]] +name = "digest" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer", + "const-oid", + "crypto-common", + "subtle", +] + +[[package]] +name = "directories" +version = "5.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a49173b84e034382284f27f1af4dcbbd231ffa358c0fe316541a7337f376a35" +dependencies = [ + "dirs-sys", +] + +[[package]] +name = "dirs-sys" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" +dependencies = [ + "libc", + "option-ext", + "redox_users", + "windows-sys 0.48.0", +] + +[[package]] +name = "dyn-clone" +version = "1.0.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "545b22097d44f8a9581187cdf93de7a71e4722bf51200cfaba810865b49a495d" + +[[package]] +name = "either" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" + +[[package]] +name = "encode_unicode" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" + +[[package]] +name = "encoding_rs" +version = "0.8.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "env_logger" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95b3f3e67048839cb0d0781f445682a35113da7121f7c949db0e2be96a4fbece" +dependencies = [ + "humantime", + "is-terminal", + "log", + "regex", + "termcolor", +] + +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + +[[package]] +name = "errno" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "event-listener" +version = "2.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" + +[[package]] +name = "event-listener" +version = "4.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "770d968249b5d99410d61f5bf89057f3199a077a04d087092f58e7d10692baae" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener-strategy" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3" +dependencies = [ + "event-listener 4.0.0", + "pin-project-lite", +] + +[[package]] +name = "eyre" +version = "0.6.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6267a1fa6f59179ea4afc8e50fd8612a3cc60bc858f786ff877a4a8cb042799" +dependencies = [ + "indenter", + "once_cell", +] + +[[package]] +name = "fastrand" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" +dependencies = [ + "instant", +] + +[[package]] +name = "fastrand" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" + +[[package]] +name = "flate2" +version = "1.0.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" +dependencies = [ + "crc32fast", + "miniz_oxide", +] + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "foreign-types" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +dependencies = [ + "foreign-types-shared", +] + +[[package]] +name = "foreign-types-shared" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" + +[[package]] +name = "form_urlencoded" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" +dependencies = [ + "percent-encoding", +] + +[[package]] +name = "fs-err" +version = "2.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88a41f105fe1d5b6b34b2055e3dc59bb79b46b48b2040b9e6c7b4b5de097aa41" +dependencies = [ + "autocfg", +] + +[[package]] +name = "futures" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da0290714b38af9b4a7b094b8a37086d1b4e61f2df9122c3cad2577669145335" +dependencies = [ + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-channel" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb" +dependencies = [ + "futures-core", + "futures-sink", +] + +[[package]] +name = "futures-core" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c" + +[[package]] +name = "futures-executor" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f4fb8693db0cf099eadcca0efe2a5a22e4550f98ed16aba6c48700da29597bc" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-io" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa" + +[[package]] +name = "futures-lite" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" +dependencies = [ + "fastrand 1.9.0", + "futures-core", + "futures-io", + "memchr", + "parking", + "pin-project-lite", + "waker-fn", +] + +[[package]] +name = "futures-macro" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.41", +] + +[[package]] +name = "futures-sink" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817" + +[[package]] +name = "futures-task" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2" + +[[package]] +name = "futures-timer" +version = "3.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c" + +[[package]] +name = "futures-util" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-macro", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "generator" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cc16584ff22b460a382b7feec54b23d2908d858152e5739a120b949293bd74e" +dependencies = [ + "cc", + "libc", + "log", + "rustversion", + "windows", +] + +[[package]] +name = "generic-array" +version = "0.14.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +dependencies = [ + "typenum", + "version_check", +] + +[[package]] +name = "getrandom" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" +dependencies = [ + "cfg-if", + "libc", + "wasi 0.9.0+wasi-snapshot-preview1", +] + +[[package]] +name = "getrandom" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" +dependencies = [ + "cfg-if", + "js-sys", + "libc", + "wasi 0.11.0+wasi-snapshot-preview1", + "wasm-bindgen", +] + +[[package]] +name = "gimli" +version = "0.28.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" + +[[package]] +name = "glob" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" + +[[package]] +name = "globset" +version = "0.4.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1" +dependencies = [ + "aho-corasick", + "bstr", + "log", + "regex-automata 0.4.3", + "regex-syntax 0.8.2", +] + +[[package]] +name = "goblin" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d6b4de4a8eb6c46a8c77e1d3be942cb9a8bf073c22374578e5ba4b08ed0ff68" +dependencies = [ + "log", + "plain", + "scroll", +] + +[[package]] +name = "h2" +version = "0.3.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d6250322ef6e60f93f9a2162799302cd6f68f79f6e5d85c8c16f14d1d958178" +dependencies = [ + "bytes", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http", + "indexmap 2.1.0", + "slab", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" + +[[package]] +name = "hashbrown" +version = "0.14.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" + +[[package]] +name = "heck" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" + +[[package]] +name = "hermit-abi" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" + +[[package]] +name = "hkdf" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7" +dependencies = [ + "hmac", +] + +[[package]] +name = "hmac" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" +dependencies = [ + "digest", +] + +[[package]] +name = "home" +version = "0.5.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "http" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + +[[package]] +name = "http-body" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" +dependencies = [ + "bytes", + "http", + "pin-project-lite", +] + +[[package]] +name = "http-types" +version = "2.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e9b187a72d63adbfba487f48095306ac823049cb504ee195541e91c7775f5ad" +dependencies = [ + "anyhow", + "async-channel", + "base64 0.13.1", + "futures-lite", + "http", + "infer", + "pin-project-lite", + "rand 0.7.3", + "serde", + "serde_json", + "serde_qs 0.8.5", + "serde_urlencoded", + "url", +] + +[[package]] +name = "httparse" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" + +[[package]] +name = "httpdate" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" + +[[package]] +name = "humantime" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" + +[[package]] +name = "hyper" +version = "0.14.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" +dependencies = [ + "bytes", + "futures-channel", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "httparse", + "httpdate", + "itoa", + "pin-project-lite", + "socket2 0.4.10", + "tokio", + "tower-service", + "tracing", + "want", +] + +[[package]] +name = "hyper-tls" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" +dependencies = [ + "bytes", + "hyper", + "native-tls", + "tokio", + "tokio-native-tls", +] + +[[package]] +name = "iana-time-zone" +version = "0.1.58" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8326b86b6cff230b97d0d312a6c40a60726df3332e721f72a1b035f451663b20" +dependencies = [ + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "wasm-bindgen", + "windows-core", +] + +[[package]] +name = "iana-time-zone-haiku" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" +dependencies = [ + "cc", +] + +[[package]] +name = "idna" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "indenter" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683" + +[[package]] +name = "indexmap" +version = "1.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" +dependencies = [ + "autocfg", + "hashbrown 0.12.3", + "serde", +] + +[[package]] +name = "indexmap" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" +dependencies = [ + "equivalent", + "hashbrown 0.14.3", +] + +[[package]] +name = "indoc" +version = "2.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e186cfbae8084e513daff4240b4797e342f988cecda4fb6c939150f96315fd8" + +[[package]] +name = "infer" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64e9829a50b42bb782c1df523f78d332fe371b10c661e78b7a3c34b0198e9fac" + +[[package]] +name = "inout" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" +dependencies = [ + "block-padding", + "generic-array", +] + +[[package]] +name = "inquire" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c33e7c1ddeb15c9abcbfef6029d8e29f69b52b6d6c891031b88ed91b5065803b" +dependencies = [ + "bitflags 1.3.2", + "crossterm 0.25.0", + "dyn-clone", + "lazy_static", + "newline-converter", + "thiserror", + "unicode-segmentation", + "unicode-width", +] + +[[package]] +name = "instant" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "ipnet" +version = "2.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" + +[[package]] +name = "is-terminal" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" +dependencies = [ + "hermit-abi", + "rustix", + "windows-sys 0.48.0", +] + +[[package]] +name = "is_ci" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "616cde7c720bb2bb5824a224687d8f77bfd38922027f01d825cd7453be5099fb" + +[[package]] +name = "itertools" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25db6b064527c5d482d0423354fcd07a89a2dfe07b67892e62411946db7f07b0" +dependencies = [ + "either", +] + +[[package]] +name = "itoa" +version = "1.0.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" + +[[package]] +name = "js-sys" +version = "0.3.66" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cee9c64da59eae3b50095c18d3e74f8b73c0b86d2792824ff01bbce68ba229ca" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +dependencies = [ + "spin", +] + +[[package]] +name = "libc" +version = "0.2.151" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4" + +[[package]] +name = "libloading" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c571b676ddfc9a8c12f1f3d3085a7b163966a8fd8098a90640953ce5f6170161" +dependencies = [ + "cfg-if", + "windows-sys 0.48.0", +] + +[[package]] +name = "libm" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" + +[[package]] +name = "libredox" +version = "0.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" +dependencies = [ + "bitflags 2.4.1", + "libc", + "redox_syscall", +] + +[[package]] +name = "line-wrap" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f30344350a2a51da54c1d53be93fade8a237e545dbcc4bdbe635413f2117cab9" +dependencies = [ + "safemem", +] + +[[package]] +name = "linux-raw-sys" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456" + +[[package]] +name = "lock_api" +version = "0.4.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" + +[[package]] +name = "loom" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff50ecb28bb86013e935fb6683ab1f6d3a20016f123c76fd4c27470076ac30f5" +dependencies = [ + "cfg-if", + "generator", + "pin-utils", + "scoped-tls", + "tracing", + "tracing-subscriber", +] + +[[package]] +name = "matchers" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" +dependencies = [ + "regex-automata 0.1.10", +] + +[[package]] +name = "memchr" +version = "2.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" + +[[package]] +name = "memoffset" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" +dependencies = [ + "autocfg", +] + +[[package]] +name = "mime" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" + +[[package]] +name = "mime_guess" +version = "2.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef" +dependencies = [ + "mime", + "unicase", +] + +[[package]] +name = "minimal-lexical" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + +[[package]] +name = "miniz_oxide" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +dependencies = [ + "adler", +] + +[[package]] +name = "mio" +version = "0.8.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09" +dependencies = [ + "libc", + "log", + "wasi 0.11.0+wasi-snapshot-preview1", + "windows-sys 0.48.0", +] + +[[package]] +name = "napi" +version = "2.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1133249c46e92da921bafc8aba4912bf84d6c475f7625183772ed2d0844dc3a7" +dependencies = [ + "bitflags 2.4.1", + "ctor", + "napi-derive", + "napi-sys", + "once_cell", + "tokio", +] + +[[package]] +name = "napi-build" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4b4532cf86bfef556348ac65e561e3123879f0e7566cca6d43a6ff5326f13df" + +[[package]] +name = "napi-derive" +version = "2.14.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b5af262f1d8e660742eb722abc7113a5b3c3de4144d0ef23ede2518672ceff1" +dependencies = [ + "cfg-if", + "convert_case", + "napi-derive-backend", + "proc-macro2", + "quote", + "syn 2.0.41", +] + +[[package]] +name = "napi-derive-backend" +version = "1.0.57" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ea236321b521d6926213a2021e407b0562e28a257c037a45919e414d2cdb4f8" +dependencies = [ + "convert_case", + "once_cell", + "proc-macro2", + "quote", + "regex", + "semver", + "syn 2.0.41", +] + +[[package]] +name = "napi-sys" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2503fa6af34dc83fb74888df8b22afe933b58d37daf7d80424b1c60c68196b8b" +dependencies = [ + "libloading", +] + +[[package]] +name = "native-tls" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" +dependencies = [ + "lazy_static", + "libc", + "log", + "openssl", + "openssl-probe", + "openssl-sys", + "schannel", + "security-framework", + "security-framework-sys", + "tempfile", +] + +[[package]] +name = "newline-converter" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f71d09d5c87634207f894c6b31b6a2b2c64ea3bdcf71bd5599fdbbe1600c00f" +dependencies = [ + "unicode-segmentation", +] + +[[package]] +name = "nom" +version = "7.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" +dependencies = [ + "memchr", + "minimal-lexical", +] + +[[package]] +name = "nu-ansi-term" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" +dependencies = [ + "overload", + "winapi", +] + +[[package]] +name = "nu-ansi-term" +version = "0.49.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c073d3c1930d0751774acf49e66653acecb416c3a54c6ec095a9b11caddb5a68" +dependencies = [ + "windows-sys 0.48.0", +] + +[[package]] +name = "num-bigint" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-bigint-dig" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc84195820f291c7697304f3cbdadd1cb7199c0efc917ff5eafd71225c136151" +dependencies = [ + "byteorder", + "lazy_static", + "libm", + "num-integer", + "num-iter", + "num-traits", + "rand 0.8.5", + "smallvec", + "zeroize", +] + +[[package]] +name = "num-integer" +version = "0.1.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" +dependencies = [ + "autocfg", + "num-traits", +] + +[[package]] +name = "num-iter" +version = "0.1.43" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" +dependencies = [ + "autocfg", + "libm", +] + +[[package]] +name = "num_cpus" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" +dependencies = [ + "hermit-abi", + "libc", +] + +[[package]] +name = "object" +version = "0.32.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" +dependencies = [ + "memchr", +] + +[[package]] +name = "once_cell" +version = "1.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" + +[[package]] +name = "oneshot" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f6640c6bda7731b1fdbab747981a0f896dd1fedaf9f4a53fa237a04a84431f4" +dependencies = [ + "loom", +] + +[[package]] +name = "onig" +version = "6.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c4b31c8722ad9171c6d77d3557db078cab2bd50afcc9d09c8b315c59df8ca4f" +dependencies = [ + "bitflags 1.3.2", + "libc", + "once_cell", + "onig_sys", +] + +[[package]] +name = "onig_sys" +version = "69.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b829e3d7e9cc74c7e315ee8edb185bf4190da5acde74afd7fc59c35b1f086e7" +dependencies = [ + "cc", + "pkg-config", +] + +[[package]] +name = "openssl" +version = "0.10.61" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b8419dc8cc6d866deb801274bba2e6f8f6108c1bb7fcc10ee5ab864931dbb45" +dependencies = [ + "bitflags 2.4.1", + "cfg-if", + "foreign-types", + "libc", + "once_cell", + "openssl-macros", + "openssl-sys", +] + +[[package]] +name = "openssl-macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.41", +] + +[[package]] +name = "openssl-probe" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" + +[[package]] +name = "openssl-src" +version = "300.2.1+3.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fe476c29791a5ca0d1273c697e96085bbabbbea2ef7afd5617e78a4b40332d3" +dependencies = [ + "cc", +] + +[[package]] +name = "openssl-sys" +version = "0.9.97" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3eaad34cdd97d81de97964fc7f29e2d104f483840d906ef56daa1912338460b" +dependencies = [ + "cc", + "libc", + "openssl-src", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "option-ext" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" + +[[package]] +name = "overload" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" + +[[package]] +name = "owo-colors" +version = "3.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f" + +[[package]] +name = "parking" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" + +[[package]] +name = "parking_lot" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +dependencies = [ + "lock_api", + "parking_lot_core", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall", + "smallvec", + "windows-targets 0.48.5", +] + +[[package]] +name = "password-hash" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "346f04948ba92c43e8469c1ee6736c7563d71012b17d40745260fe106aac2166" +dependencies = [ + "base64ct", + "rand_core 0.6.4", + "subtle", +] + +[[package]] +name = "paste" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" + +[[package]] +name = "path_abs" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05ef02f6342ac01d8a93b65f96db53fe68a92a15f41144f97fb00a9e669633c3" +dependencies = [ + "std_prelude", +] + +[[package]] +name = "pbkdf2" +version = "0.12.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2" +dependencies = [ + "digest", +] + +[[package]] +name = "pem-rfc7468" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412" +dependencies = [ + "base64ct", +] + +[[package]] +name = "percent-encoding" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" + +[[package]] +name = "pin-project-lite" +version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "pkcs1" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8ffb9f10fa047879315e6625af03c164b16962a5368d724ed16323b68ace47f" +dependencies = [ + "der", + "pkcs8", + "spki", +] + +[[package]] +name = "pkcs8" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" +dependencies = [ + "der", + "spki", +] + +[[package]] +name = "pkg-config" +version = "0.3.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" + +[[package]] +name = "plain" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6" + +[[package]] +name = "plist" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5699cc8a63d1aa2b1ee8e12b9ad70ac790d65788cd36101fa37f87ea46c4cef" +dependencies = [ + "base64 0.21.5", + "indexmap 2.1.0", + "line-wrap", + "quick-xml", + "serde", + "time", +] + +[[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + +[[package]] +name = "ppv-lite86" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + +[[package]] +name = "proc-macro2" +version = "1.0.70" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "pyo3" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04e8453b658fe480c3e70c8ed4e3d3ec33eb74988bd186561b0cc66b85c3bc4b" +dependencies = [ + "cfg-if", + "indoc", + "libc", + "memoffset", + "parking_lot", + "pyo3-build-config", + "pyo3-ffi", + "pyo3-macros", + "unindent", +] + +[[package]] +name = "pyo3-asyncio" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ea6b68e93db3622f3bb3bf363246cf948ed5375afe7abff98ccbdd50b184995" +dependencies = [ + "futures", + "once_cell", + "pin-project-lite", + "pyo3", + "pyo3-asyncio-macros", + "tokio", +] + +[[package]] +name = "pyo3-asyncio-macros" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56c467178e1da6252c95c29ecf898b133f742e9181dca5def15dc24e19d45a39" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "pyo3-build-config" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a96fe70b176a89cff78f2fa7b3c930081e163d5379b4dcdf993e3ae29ca662e5" +dependencies = [ + "once_cell", + "target-lexicon", +] + +[[package]] +name = "pyo3-ffi" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "214929900fd25e6604661ed9cf349727c8920d47deff196c4e28165a6ef2a96b" +dependencies = [ + "libc", + "pyo3-build-config", +] + +[[package]] +name = "pyo3-log" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c10808ee7250403bedb24bc30c32493e93875fef7ba3e4292226fe924f398bd" +dependencies = [ + "arc-swap", + "log", + "pyo3", +] + +[[package]] +name = "pyo3-macros" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dac53072f717aa1bfa4db832b39de8c875b7c7af4f4a6fe93cdbf9264cf8383b" +dependencies = [ + "proc-macro2", + "pyo3-macros-backend", + "quote", + "syn 2.0.41", +] + +[[package]] +name = "pyo3-macros-backend" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7774b5a8282bd4f25f803b1f0d945120be959a36c72e08e7cd031c792fdfd424" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn 2.0.41", +] + +[[package]] +name = "quick-xml" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33" +dependencies = [ + "memchr", +] + +[[package]] +name = "quote" +version = "1.0.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "rand" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" +dependencies = [ + "getrandom 0.1.16", + "libc", + "rand_chacha 0.2.2", + "rand_core 0.5.1", + "rand_hc", +] + +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha 0.3.1", + "rand_core 0.6.4", +] + +[[package]] +name = "rand_chacha" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" +dependencies = [ + "ppv-lite86", + "rand_core 0.5.1", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core 0.6.4", +] + +[[package]] +name = "rand_core" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" +dependencies = [ + "getrandom 0.1.16", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom 0.2.11", +] + +[[package]] +name = "rand_hc" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" +dependencies = [ + "rand_core 0.5.1", +] + +[[package]] +name = "redox_syscall" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "redox_users" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" +dependencies = [ + "getrandom 0.2.11", + "libredox", + "thiserror", +] + +[[package]] +name = "regex" +version = "1.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata 0.4.3", + "regex-syntax 0.8.2", +] + +[[package]] +name = "regex-automata" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" +dependencies = [ + "regex-syntax 0.6.29", +] + +[[package]] +name = "regex-automata" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax 0.8.2", +] + +[[package]] +name = "regex-syntax" +version = "0.6.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" + +[[package]] +name = "regex-syntax" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" + +[[package]] +name = "regex-syntax" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" + +[[package]] +name = "reqwest" +version = "0.11.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b" +dependencies = [ + "base64 0.21.5", + "bytes", + "encoding_rs", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "hyper", + "hyper-tls", + "ipnet", + "js-sys", + "log", + "mime", + "mime_guess", + "native-tls", + "once_cell", + "percent-encoding", + "pin-project-lite", + "serde", + "serde_json", + "serde_urlencoded", + "system-configuration", + "tokio", + "tokio-native-tls", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "winreg", +] + +[[package]] +name = "retain_mut" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4389f1d5789befaf6029ebd9f7dac4af7f7e3d61b69d4f30e2ac02b57e7712b0" + +[[package]] +name = "rgb" +version = "0.8.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05aaa8004b64fd573fc9d002f4e632d51ad4f026c2b5ba95fcb6c2f32c2c47d8" +dependencies = [ + "bytemuck", +] + +[[package]] +name = "rsa" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d0e5124fcb30e76a7e79bfee683a2746db83784b86289f6251b54b7950a0dfc" +dependencies = [ + "const-oid", + "digest", + "num-bigint-dig", + "num-integer", + "num-traits", + "pkcs1", + "pkcs8", + "rand_core 0.6.4", + "signature", + "spki", + "subtle", + "zeroize", +] + +[[package]] +name = "rustc-demangle" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" + +[[package]] +name = "rustix" +version = "0.38.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72e572a5e8ca657d7366229cdde4bd14c4eb5499a9573d4d366fe1b599daa316" +dependencies = [ + "bitflags 2.4.1", + "errno", + "libc", + "linux-raw-sys", + "windows-sys 0.52.0", +] + +[[package]] +name = "rustversion" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" + +[[package]] +name = "ryu" +version = "1.0.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" + +[[package]] +name = "safemem" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072" + +[[package]] +name = "same-file" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "schannel" +version = "0.1.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" +dependencies = [ + "windows-sys 0.48.0", +] + +[[package]] +name = "schemars" +version = "0.8.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45a28f4c49489add4ce10783f7911893516f15afe45d015608d41faca6bc4d29" +dependencies = [ + "chrono", + "dyn-clone", + "indexmap 1.9.3", + "schemars_derive", + "serde", + "serde_json", + "uuid", +] + +[[package]] +name = "schemars_derive" +version = "0.8.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c767fd6fa65d9ccf9cf026122c1b555f2ef9a4f0cea69da4d7dbc3e258d30967" +dependencies = [ + "proc-macro2", + "quote", + "serde_derive_internals", + "syn 1.0.109", +] + +[[package]] +name = "scoped-tls" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" + +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + +[[package]] +name = "scroll" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04c565b551bafbef4157586fa379538366e4385d42082f255bfd96e4fe8519da" +dependencies = [ + "scroll_derive", +] + +[[package]] +name = "scroll_derive" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1db149f81d46d2deba7cd3c50772474707729550221e69588478ebf9ada425ae" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.41", +] + +[[package]] +name = "sdk-schemas" +version = "0.1.0" +dependencies = [ + "anyhow", + "bitwarden", + "bitwarden-json", + "bitwarden-uniffi", + "itertools", + "schemars", + "serde_json", +] + +[[package]] +name = "security-framework" +version = "2.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "core-foundation-sys", + "libc", + "security-framework-sys", +] + +[[package]] +name = "security-framework-sys" +version = "2.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "semver" +version = "1.0.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" +dependencies = [ + "serde", +] + +[[package]] +name = "serde" +version = "1.0.193" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.193" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.41", +] + +[[package]] +name = "serde_derive_internals" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85bf8229e7920a9f636479437026331ce11aa132b4dde37d121944a44d6e5f3c" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "serde_json" +version = "1.0.108" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" +dependencies = [ + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "serde_qs" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7715380eec75f029a4ef7de39a9200e0a63823176b759d055b613f5a87df6a6" +dependencies = [ + "percent-encoding", + "serde", + "thiserror", +] + +[[package]] +name = "serde_qs" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0431a35568651e363364210c91983c1da5eb29404d9f0928b67d4ebcfa7d330c" +dependencies = [ + "percent-encoding", + "serde", + "thiserror", +] + +[[package]] +name = "serde_repr" +version = "0.1.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3081f5ffbb02284dda55132aa26daecedd7372a42417bbbab6f14ab7d6bb9145" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.41", +] + +[[package]] +name = "serde_spanned" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12022b835073e5b11e90a14f86838ceb1c8fb0325b72416845c487ac0fa95e80" +dependencies = [ + "serde", +] + +[[package]] +name = "serde_urlencoded" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" +dependencies = [ + "form_urlencoded", + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "serde_yaml" +version = "0.9.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3cc7a1570e38322cfe4154732e5110f887ea57e22b76f4bfd32b5bdd3368666c" +dependencies = [ + "indexmap 2.1.0", + "itoa", + "ryu", + "serde", + "unsafe-libyaml", +] + +[[package]] +name = "sha1" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "sha2" +version = "0.10.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "sharded-slab" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" +dependencies = [ + "lazy_static", +] + +[[package]] +name = "signal-hook" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801" +dependencies = [ + "libc", + "signal-hook-registry", +] + +[[package]] +name = "signal-hook-mio" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29ad2e15f37ec9a6cc544097b78a1ec90001e9f71b81338ca39f430adaca99af" +dependencies = [ + "libc", + "mio", + "signal-hook", +] + +[[package]] +name = "signal-hook-registry" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +dependencies = [ + "libc", +] + +[[package]] +name = "signature" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" +dependencies = [ + "digest", + "rand_core 0.6.4", +] + +[[package]] +name = "siphasher" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" + +[[package]] +name = "slab" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" +dependencies = [ + "autocfg", +] + +[[package]] +name = "smallvec" +version = "1.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" + +[[package]] +name = "smawk" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7c388c1b5e93756d0c740965c41e8822f866621d41acbdf6336a6a168f8840c" + +[[package]] +name = "socket2" +version = "0.4.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "socket2" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" +dependencies = [ + "libc", + "windows-sys 0.48.0", +] + +[[package]] +name = "spin" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" + +[[package]] +name = "spki" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d" +dependencies = [ + "base64ct", + "der", +] + +[[package]] +name = "static_assertions" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + +[[package]] +name = "std_prelude" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8207e78455ffdf55661170876f88daf85356e4edd54e0a3dbc79586ca1e50cbe" + +[[package]] +name = "strsim" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + +[[package]] +name = "strum" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125" + +[[package]] +name = "strum_macros" +version = "0.25.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "rustversion", + "syn 2.0.41", +] + +[[package]] +name = "subtle" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" + +[[package]] +name = "supports-color" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6398cde53adc3c4557306a96ce67b302968513830a77a95b2b17305d9719a89" +dependencies = [ + "is-terminal", + "is_ci", +] + +[[package]] +name = "syn" +version = "1.0.109" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "2.0.41" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syntect" +version = "5.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e02b4b303bf8d08bfeb0445cba5068a3d306b6baece1d5582171a9bf49188f91" +dependencies = [ + "bincode", + "bitflags 1.3.2", + "flate2", + "fnv", + "once_cell", + "onig", + "regex-syntax 0.7.5", + "serde", + "serde_json", + "thiserror", + "walkdir", +] + +[[package]] +name = "system-configuration" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "system-configuration-sys", +] + +[[package]] +name = "system-configuration-sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "target-lexicon" +version = "0.12.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14c39fd04924ca3a864207c66fc2cd7d22d7c016007f9ce846cbb9326331930a" + +[[package]] +name = "tempfile" +version = "3.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" +dependencies = [ + "cfg-if", + "fastrand 2.0.1", + "redox_syscall", + "rustix", + "windows-sys 0.48.0", +] + +[[package]] +name = "termcolor" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff1bc3d3f05aff0403e8ac0d92ced918ec05b666a43f83297ccef5bea8a3d449" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "textwrap" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" +dependencies = [ + "smawk", + "unicode-linebreak", + "unicode-width", +] + +[[package]] +name = "thiserror" +version = "1.0.51" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f11c217e1416d6f036b870f14e0413d480dbf28edbee1f877abaf0206af43bb7" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.51" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01742297787513b79cf8e29d1056ede1313e2420b7b3b15d0a768b4921f549df" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.41", +] + +[[package]] +name = "thread_local" +version = "1.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" +dependencies = [ + "cfg-if", + "once_cell", +] + +[[package]] +name = "time" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5" +dependencies = [ + "deranged", + "itoa", + "powerfmt", + "serde", + "time-core", + "time-macros", +] + +[[package]] +name = "time-core" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" + +[[package]] +name = "time-macros" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20" +dependencies = [ + "time-core", +] + +[[package]] +name = "tinyvec" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" + +[[package]] +name = "tokio" +version = "1.35.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "841d45b238a16291a4e1584e61820b8ae57d696cc5015c459c229ccc6990cc1c" +dependencies = [ + "backtrace", + "bytes", + "libc", + "mio", + "num_cpus", + "pin-project-lite", + "socket2 0.5.5", + "tokio-macros", + "windows-sys 0.48.0", +] + +[[package]] +name = "tokio-macros" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.41", +] + +[[package]] +name = "tokio-native-tls" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" +dependencies = [ + "native-tls", + "tokio", +] + +[[package]] +name = "tokio-util" +version = "0.7.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" +dependencies = [ + "bytes", + "futures-core", + "futures-sink", + "pin-project-lite", + "tokio", + "tracing", +] + +[[package]] +name = "toml" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" +dependencies = [ + "serde", +] + +[[package]] +name = "toml" +version = "0.8.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1a195ec8c9da26928f773888e0742ca3ca1040c6cd859c919c9f59c1954ab35" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit", +] + +[[package]] +name = "toml_datetime" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_edit" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03" +dependencies = [ + "indexmap 2.1.0", + "serde", + "serde_spanned", + "toml_datetime", + "winnow", +] + +[[package]] +name = "tower-service" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" + +[[package]] +name = "tracing" +version = "0.1.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +dependencies = [ + "pin-project-lite", + "tracing-attributes", + "tracing-core", +] + +[[package]] +name = "tracing-attributes" +version = "0.1.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.41", +] + +[[package]] +name = "tracing-core" +version = "0.1.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +dependencies = [ + "once_cell", + "valuable", +] + +[[package]] +name = "tracing-error" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d686ec1c0f384b1277f097b2f279a2ecc11afe8c133c1aabf036a27cb4cd206e" +dependencies = [ + "tracing", + "tracing-subscriber", +] + +[[package]] +name = "tracing-log" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" +dependencies = [ + "log", + "once_cell", + "tracing-core", +] + +[[package]] +name = "tracing-subscriber" +version = "0.3.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" +dependencies = [ + "matchers", + "nu-ansi-term 0.46.0", + "once_cell", + "regex", + "sharded-slab", + "smallvec", + "thread_local", + "tracing", + "tracing-core", + "tracing-log", +] + +[[package]] +name = "try-lock" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" + +[[package]] +name = "typenum" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" + +[[package]] +name = "unicase" +version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" +dependencies = [ + "version_check", +] + +[[package]] +name = "unicode-bidi" +version = "0.3.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f2528f27a9eb2b21e69c95319b30bd0efd85d09c379741b0f78ea1d86be2416" + +[[package]] +name = "unicode-ident" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" + +[[package]] +name = "unicode-linebreak" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f" + +[[package]] +name = "unicode-normalization" +version = "0.1.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "unicode-segmentation" +version = "1.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" + +[[package]] +name = "unicode-width" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" + +[[package]] +name = "uniffi" +version = "0.25.2" +source = "git+https://github.com/mozilla/uniffi-rs?rev=23711c8151bbb794369aa1f9d383db386792dff9#23711c8151bbb794369aa1f9d383db386792dff9" +dependencies = [ + "anyhow", + "camino", + "clap", + "uniffi_bindgen", + "uniffi_build", + "uniffi_core", + "uniffi_macros", +] + +[[package]] +name = "uniffi-bindgen" +version = "0.1.0" +dependencies = [ + "uniffi", +] + +[[package]] +name = "uniffi_bindgen" +version = "0.25.2" +source = "git+https://github.com/mozilla/uniffi-rs?rev=23711c8151bbb794369aa1f9d383db386792dff9#23711c8151bbb794369aa1f9d383db386792dff9" +dependencies = [ + "anyhow", + "askama", + "camino", + "cargo_metadata", + "clap", + "fs-err", + "glob", + "goblin", + "heck", + "once_cell", + "paste", + "serde", + "textwrap", + "toml 0.5.11", + "uniffi_meta", + "uniffi_testing", + "uniffi_udl", +] + +[[package]] +name = "uniffi_build" +version = "0.25.2" +source = "git+https://github.com/mozilla/uniffi-rs?rev=23711c8151bbb794369aa1f9d383db386792dff9#23711c8151bbb794369aa1f9d383db386792dff9" +dependencies = [ + "anyhow", + "camino", + "uniffi_bindgen", +] + +[[package]] +name = "uniffi_checksum_derive" +version = "0.25.2" +source = "git+https://github.com/mozilla/uniffi-rs?rev=23711c8151bbb794369aa1f9d383db386792dff9#23711c8151bbb794369aa1f9d383db386792dff9" +dependencies = [ + "quote", + "syn 2.0.41", +] + +[[package]] +name = "uniffi_core" +version = "0.25.2" +source = "git+https://github.com/mozilla/uniffi-rs?rev=23711c8151bbb794369aa1f9d383db386792dff9#23711c8151bbb794369aa1f9d383db386792dff9" +dependencies = [ + "anyhow", + "async-compat", + "bytes", + "camino", + "log", + "once_cell", + "oneshot", + "paste", + "static_assertions", +] + +[[package]] +name = "uniffi_macros" +version = "0.25.2" +source = "git+https://github.com/mozilla/uniffi-rs?rev=23711c8151bbb794369aa1f9d383db386792dff9#23711c8151bbb794369aa1f9d383db386792dff9" +dependencies = [ + "bincode", + "camino", + "fs-err", + "once_cell", + "proc-macro2", + "quote", + "serde", + "syn 2.0.41", + "toml 0.5.11", + "uniffi_build", + "uniffi_meta", +] + +[[package]] +name = "uniffi_meta" +version = "0.25.2" +source = "git+https://github.com/mozilla/uniffi-rs?rev=23711c8151bbb794369aa1f9d383db386792dff9#23711c8151bbb794369aa1f9d383db386792dff9" +dependencies = [ + "anyhow", + "bytes", + "siphasher", + "uniffi_checksum_derive", +] + +[[package]] +name = "uniffi_testing" +version = "0.25.2" +source = "git+https://github.com/mozilla/uniffi-rs?rev=23711c8151bbb794369aa1f9d383db386792dff9#23711c8151bbb794369aa1f9d383db386792dff9" +dependencies = [ + "anyhow", + "camino", + "cargo_metadata", + "fs-err", + "once_cell", +] + +[[package]] +name = "uniffi_udl" +version = "0.25.2" +source = "git+https://github.com/mozilla/uniffi-rs?rev=23711c8151bbb794369aa1f9d383db386792dff9#23711c8151bbb794369aa1f9d383db386792dff9" +dependencies = [ + "anyhow", + "textwrap", + "uniffi_meta", + "uniffi_testing", + "weedle2", +] + +[[package]] +name = "unindent" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7de7d73e1754487cb58364ee906a499937a0dfabd86bcb980fa99ec8c8fa2ce" + +[[package]] +name = "unsafe-libyaml" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab4c90930b95a82d00dc9e9ac071b4991924390d46cbd0dfe566148667605e4b" + +[[package]] +name = "url" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" +dependencies = [ + "form_urlencoded", + "idna", + "percent-encoding", + "serde", +] + +[[package]] +name = "utf8parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" + +[[package]] +name = "uuid" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e395fcf16a7a3d8127ec99782007af141946b4795001f876d54fb0d55978560" +dependencies = [ + "serde", +] + +[[package]] +name = "valuable" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" + +[[package]] +name = "vcpkg" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "waker-fn" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690" + +[[package]] +name = "walkdir" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" +dependencies = [ + "same-file", + "winapi-util", +] + +[[package]] +name = "want" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" +dependencies = [ + "try-lock", +] + +[[package]] +name = "wasi" +version = "0.9.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "wasm-bindgen" +version = "0.2.89" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ed0d4f68a3015cc185aff4db9506a015f4b96f95303897bfa23f846db54064e" +dependencies = [ + "cfg-if", + "serde", + "serde_json", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.89" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b56f625e64f3a1084ded111c4d5f477df9f8c92df113852fa5a374dbda78826" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn 2.0.41", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.39" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac36a15a220124ac510204aec1c3e5db8a22ab06fd6706d881dc6149f8ed9a12" +dependencies = [ + "cfg-if", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.89" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0162dbf37223cd2afce98f3d0785506dcb8d266223983e4b5b525859e6e182b2" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.89" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.41", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.89" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f" + +[[package]] +name = "wasm-bindgen-test" +version = "0.3.39" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2cf9242c0d27999b831eae4767b2a146feb0b27d332d553e605864acd2afd403" +dependencies = [ + "console_error_panic_hook", + "js-sys", + "scoped-tls", + "wasm-bindgen", + "wasm-bindgen-futures", + "wasm-bindgen-test-macro", +] + +[[package]] +name = "wasm-bindgen-test-macro" +version = "0.3.39" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "794645f5408c9a039fd09f4d113cdfb2e7eba5ff1956b07bcf701cf4b394fe89" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.41", +] + +[[package]] +name = "web-sys" +version = "0.3.66" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50c24a44ec86bb68fbecd1b3efed7e85ea5621b39b35ef2766b66cd984f8010f" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "weedle2" +version = "4.0.0" +source = "git+https://github.com/mozilla/uniffi-rs?rev=23711c8151bbb794369aa1f9d383db386792dff9#23711c8151bbb794369aa1f9d383db386792dff9" +dependencies = [ + "nom", +] + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" +dependencies = [ + "winapi", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" +dependencies = [ + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-core" +version = "0.51.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" +dependencies = [ + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-sys" +version = "0.45.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +dependencies = [ + "windows-targets 0.42.2", +] + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.0", +] + +[[package]] +name = "windows-targets" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +dependencies = [ + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", +] + +[[package]] +name = "windows-targets" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + +[[package]] +name = "windows-targets" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +dependencies = [ + "windows_aarch64_gnullvm 0.52.0", + "windows_aarch64_msvc 0.52.0", + "windows_i686_gnu 0.52.0", + "windows_i686_msvc 0.52.0", + "windows_x86_64_gnu 0.52.0", + "windows_x86_64_gnullvm 0.52.0", + "windows_x86_64_msvc 0.52.0", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" + +[[package]] +name = "windows_i686_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" + +[[package]] +name = "windows_i686_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" + +[[package]] +name = "winnow" +version = "0.5.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c830786f7720c2fd27a1a0e27a709dbd3c4d009b56d098fc742d4f4eab91fe2" +dependencies = [ + "memchr", +] + +[[package]] +name = "winreg" +version = "0.50.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" +dependencies = [ + "cfg-if", + "windows-sys 0.48.0", +] + +[[package]] +name = "wiremock" +version = "0.5.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13a3a53eaf34f390dd30d7b1b078287dd05df2aa2e21a589ccb80f5c7253c2e9" +dependencies = [ + "assert-json-diff", + "async-trait", + "base64 0.21.5", + "deadpool", + "futures", + "futures-timer", + "http-types", + "hyper", + "log", + "once_cell", + "regex", + "serde", + "serde_json", + "tokio", +] + +[[package]] +name = "zeroize" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" diff --git a/pkgs/tools/security/bws/default.nix b/pkgs/tools/security/bws/default.nix index 5c3987319109b..aef7a39de2809 100644 --- a/pkgs/tools/security/bws/default.nix +++ b/pkgs/tools/security/bws/default.nix @@ -1,38 +1,49 @@ { lib , rustPlatform , fetchFromGitHub +, installShellFiles , pkg-config , oniguruma , openssl , stdenv , darwin , python3 +, perl }: rustPlatform.buildRustPackage rec { pname = "bws"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "bitwarden"; repo = "sdk"; rev = "bws-v${version}"; - hash = "sha256-o+tmO9E881futhA/fN6+EX2yEBKnKUmKk/KilIt5vYY="; + hash = "sha256-oCAyUTVAUfXBEb2K7vkYBOzcwqCsm2wxEKsYLZcfm6w="; }; - cargoHash = "sha256-nmsAfXNn1nqmqHzGD7jl2JNrif/nJycCJZWZYjv7G4c="; + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "uniffi-0.25.2" = "sha256-YckrtociJV3VKGs5DJ0a1r1Cvq06S/mtr9iL1kLmAi8="; + }; + }; nativeBuildInputs = [ + installShellFiles pkg-config + ] ++ lib.optionals stdenv.isLinux [ + perl ]; buildInputs = [ oniguruma + ] ++ lib.optionals stdenv.isLinux [ openssl ] ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.Security + darwin.apple_sdk.frameworks.SystemConfiguration ]; env = { @@ -40,12 +51,21 @@ rustPlatform.buildRustPackage rec { RUSTONIG_SYSTEM_LIBONIG = true; }; - buildAndTestSubdir = "crates/bws"; + cargoBuildFlags = [ "--package" "bws" ]; + + cargoTestFlags = [ "--package" "bws" ]; + + postInstall = '' + installShellCompletion --cmd bws \ + --bash <($out/bin/bws completions bash) \ + --fish <($out/bin/bws completions fish) \ + --zsh <($out/bin/bws completions zsh) + ''; meta = { - changelog = "https://github.com/bitwarden/sdk/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/bitwarden/sdk/blob/${src.rev}/crates/bws/CHANGELOG.md"; description = "Bitwarden Secrets Manager CLI"; - homepage = "https://github.com/bitwarden/sdk"; + homepage = "https://bitwarden.com/help/secrets-manager-cli/"; license = lib.licenses.unfree; # BITWARDEN SOFTWARE DEVELOPMENT KIT LICENSE AGREEMENT mainProgram = "bws"; maintainers = with lib.maintainers; [ dit7ya ]; diff --git a/pkgs/tools/security/cdxgen/default.nix b/pkgs/tools/security/cdxgen/default.nix index 351fee2ff2af6..ce87f2b35a967 100644 --- a/pkgs/tools/security/cdxgen/default.nix +++ b/pkgs/tools/security/cdxgen/default.nix @@ -5,16 +5,16 @@ buildNpmPackage rec { pname = "cdxgen"; - version = "10.2.4"; + version = "10.2.6"; src = fetchFromGitHub { owner = "AppThreat"; repo = pname; rev = "v${version}"; - sha256 = "sha256-fou0BfQfL66Iv+STY0JcRqu22XTgA9nSOse1LJYl3vs="; + sha256 = "sha256-tbZVSFsvjWp+VPcET4/gynwDVF1XBhFQ1dObj4fSWBo="; }; - npmDepsHash = "sha256-ISmNasK44T21HagHKrX1LyCFVm0GF0CsTwIIi3n8h2o="; + npmDepsHash = "sha256-svp8h5xjV3/Ikq7YR/2y70Y9ufOrrAPcG4/nWF1jUug="; dontNpmBuild = true; diff --git a/pkgs/tools/security/cie-middleware-linux/default.nix b/pkgs/tools/security/cie-middleware-linux/default.nix index 9982da5ae8966..d882959150945 100644 --- a/pkgs/tools/security/cie-middleware-linux/default.nix +++ b/pkgs/tools/security/cie-middleware-linux/default.nix @@ -1,13 +1,12 @@ { stdenv , lib , fetchFromGitHub -, fetchpatch , makeWrapper -, strip-nondeterminism +, stripJavaArchivesHook , meson , ninja , pkg-config -, gradle_7 +, gradle_8 , curl , cryptopp , fontconfig @@ -21,16 +20,16 @@ let pname = "cie-middleware-linux"; - version = "1.5.0"; + version = "1.5.2"; src = fetchFromGitHub { owner = "M0rf30"; repo = pname; rev = version; - sha256 = "sha256-Z8K2Ibg5bBfSql5HEapKgdfiCf/EIKTTD15oVeysQGk="; + sha256 = "sha256-M3Xwg3G2ZZhPRV7uhFVXQPyvuuY4zI5Z+D/Dt26KVM0="; }; - gradle = gradle_7; + gradle = gradle_8; # Shared libraries needed by the Java application libraries = lib.makeLibraryPath [ ghostscript ]; @@ -45,7 +44,6 @@ let buildPhase = '' # Run the fetchDeps task export GRADLE_USER_HOME=$(mktemp -d) - ls -l gradle --no-daemon -b cie-java/build.gradle fetchDeps ''; @@ -62,7 +60,7 @@ let outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "sha256-jtaH8dBpnx8KMJe+jzJfkvcx1NO4nL5jsRO4+GI+d0c="; + outputHash = "sha256-fxrjo4iduXzTgMqmQGwdI1vLMA4EZLObsHyKGZ6b14I="; }; in @@ -72,44 +70,31 @@ stdenv.mkDerivation { hardeningDisable = [ "format" ]; - outputs = [ "out" "dev" ]; - nativeBuildInputs = [ makeWrapper + stripJavaArchivesHook meson ninja pkg-config gradle - strip-nondeterminism ]; buildInputs = [ cryptopp fontconfig - podofo.dev + podofo openssl pcsclite curl libxml2 ]; - patches = [ - # Fix gcc-13 build by adding missing include. - (fetchpatch { - name = "gcc-13.patch"; - url = "https://github.com/M0Rf30/cie-middleware-linux/commit/1da1196152f7a3bbe92ba3ce993ebb6785ff049e.patch"; - hash = "sha256-aM23A1ZX8kebgX6RXVS78SEa+to93glUmIYO+lfUzfg="; - }) - ]; + patches = [ ./use-system-podofo.patch ]; postPatch = '' # substitute the cieid command with this $out/bin/cieid substituteInPlace libs/pkcs11/src/CSP/AbilitaCIE.cpp \ --replace 'file = "cieid"' 'file = "'$out'/bin/cieid"' - - # revert https://github.com/M0Rf30/cie-middleware-linux/commit/1a389d8 - sed -i libs/meson.build \ - -e "s@podofo_dep = .\+@podofo_dep = dependency('libpodofo')@g" ''; # Note: we use pushd/popd to juggle between the @@ -159,14 +144,6 @@ stdenv.mkDerivation { install -Dm644 LICENSE "$out/share/licenses/cieid/LICENSE" ''; - postFixup = '' - # Move static libraries to the dev output - mv -t "$dev/lib" "$out/lib/"*.a - - # Make the jar deterministic (mainly, sorting its files) - strip-nondeterminism "$out/share/cieid/cieid.jar" - ''; - passthru = { inherit javaDeps; }; meta = with lib; { diff --git a/pkgs/tools/security/cie-middleware-linux/use-system-podofo.patch b/pkgs/tools/security/cie-middleware-linux/use-system-podofo.patch new file mode 100644 index 0000000000000..52806d4f96e8c --- /dev/null +++ b/pkgs/tools/security/cie-middleware-linux/use-system-podofo.patch @@ -0,0 +1,343 @@ +commit c9ac4243a6def08790bbf5552bb31894169596ca +Author: rnhmjoj <rnhmjoj@inventati.org> +Date: Wed Apr 3 12:54:58 2024 +0200 + + use system podofo + +diff --git a/libs/meson.build b/libs/meson.build +index 3ee31c1..5022ba8 100644 +--- a/libs/meson.build ++++ b/libs/meson.build +@@ -16,21 +16,15 @@ curl_dep = dependency('libcurl') + fontconfig_dep = dependency('fontconfig') + freetype_dep = dependency('freetype2') + png_dep = dependency('libpng') +-podofo_dep = cpp.find_library('libpodofo', dirs: libdir) ++podofo_dep = dependency('libpodofo') + libxml2_dep = dependency('libxml-2.0', required: false) + xml2_dep = dependency('xml2', required: false) + zlib_dep = dependency('zlib') + + inc_so = include_directories('pkcs11/src/.', 'shared/src/') + +-inc_a = include_directories( +- 'sign-sdk/include', +- 'sign-sdk/include/podofo', +- 'sign-sdk/include/podofo/include', +- 'sign-sdk/include/podofo/include/podofo', +- 'sign-sdk/src', +- 'shared/src/', +-) ++inc_a = include_directories('sign-sdk/include', 'sign-sdk/src', 'shared/src/') ++ + cie_pkcs11_sources = [ + 'shared/src/Util/log.cpp', + 'shared/src/Util/funccallinfo.cpp', +diff --git a/libs/sign-sdk/include/PdfSignatureGenerator.h b/libs/sign-sdk/include/PdfSignatureGenerator.h +index 93ab445..65d438f 100644 +--- a/libs/sign-sdk/include/PdfSignatureGenerator.h ++++ b/libs/sign-sdk/include/PdfSignatureGenerator.h +@@ -10,9 +10,7 @@ + #ifndef _PDFSIGNATUREGENERATOR_H_ + #define _PDFSIGNATUREGENERATOR_H_ + #include "Util/UUCByteArray.h" +-#include "podofo/doc/PdfSignOutputDevice.h" +-#include "podofo/doc/PdfSignatureField.h" +-#include "podofo/podofo.h" ++#include <podofo/podofo.h> + + using namespace PoDoFo; + using namespace std; +@@ -60,7 +58,11 @@ class PdfSignatureGenerator { + const double getHeight(int pageIndex); + + private: +- PdfMemDocument* m_pPdfDocument; ++ PdfDocument* m_pPdfDocument; ++ ++ PdfMemDocument* m_pPdfMemDocument; ++ ++ PdfWriter* m_pPdfWriter; + + PdfSignatureField* m_pSignatureField; + +diff --git a/libs/sign-sdk/src/PdfSignatureGenerator.cpp b/libs/sign-sdk/src/PdfSignatureGenerator.cpp +index 44ef54a..e8b8c8e 100644 +--- a/libs/sign-sdk/src/PdfSignatureGenerator.cpp ++++ b/libs/sign-sdk/src/PdfSignatureGenerator.cpp +@@ -27,7 +27,7 @@ int GetNumberOfSignatures(PdfMemDocument* pPdfDocument); + USE_LOG; + + PdfSignatureGenerator::PdfSignatureGenerator() +- : m_pPdfDocument(NULL), ++ : m_pPdfMemDocument(NULL), + m_pSignatureField(NULL), + m_pSignOutputDevice(NULL), + m_pFinalOutDevice(NULL), +@@ -37,7 +37,7 @@ PdfSignatureGenerator::PdfSignatureGenerator() + } + + PdfSignatureGenerator::~PdfSignatureGenerator() { +- if (m_pPdfDocument) delete m_pPdfDocument; ++ if (m_pPdfMemDocument) delete m_pPdfMemDocument; + + if (m_pSignatureField) delete m_pSignatureField; + +@@ -51,21 +51,21 @@ PdfSignatureGenerator::~PdfSignatureGenerator() { + } + + int PdfSignatureGenerator::Load(const char* pdf, int len) { +- if (m_pPdfDocument) delete m_pPdfDocument; ++ if (m_pPdfMemDocument) delete m_pPdfMemDocument; + + try { + printf("PDF LENGTH"); + printf("%i", len); + printf("STOP"); + +- m_pPdfDocument = new PdfMemDocument(); +- m_pPdfDocument->Load(pdf, len); +- printf("OK m_pPdfDocument"); +- int nSigns = PDFVerifier::GetNumberOfSignatures(m_pPdfDocument); ++ m_pPdfMemDocument = new PdfMemDocument(); ++ m_pPdfMemDocument->Load(pdf); ++ printf("OK m_pPdfMemDocument"); ++ int nSigns = PDFVerifier::GetNumberOfSignatures(m_pPdfMemDocument); + printf("OK nSigns: %d", nSigns); + + if (nSigns > 0) { +- m_pPdfDocument->SetIncrementalUpdates(true); ++ m_pPdfWriter->PdfWriter::SetIncrementalUpdate(true); + } + m_actualLen = len; + +@@ -82,14 +82,8 @@ void PdfSignatureGenerator::AddFont(const char* szFontName, + // printf(szFontName); + // printf(szFontPath); + +- m_pPdfDocument->CreateFont( +- szFontName, false, false, +- PdfEncodingFactory::GlobalWinAnsiEncodingInstance(), +- PdfFontCache::eFontCreationFlags_AutoSelectBase14, true, szFontPath); +- m_pPdfDocument->CreateFont( +- szFontName, true, false, +- PdfEncodingFactory::GlobalWinAnsiEncodingInstance(), +- PdfFontCache::eFontCreationFlags_AutoSelectBase14, true, szFontPath); ++ m_pPdfDocument->PoDoFo::PdfDocument::CreateFont( szFontName, false, PdfEncodingFactory::GlobalWinAnsiEncodingInstance(), PdfFontCache::eFontCreationFlags_AutoSelectBase14, true); ++ m_pPdfDocument->PoDoFo::PdfDocument::CreateFont( szFontName, true, PdfEncodingFactory::GlobalWinAnsiEncodingInstance(), PdfFontCache::eFontCreationFlags_AutoSelectBase14, true); + } + + void PdfSignatureGenerator::InitSignature( +@@ -130,7 +124,7 @@ void PdfSignatureGenerator::InitSignature( + + if (m_pSignatureField) delete m_pSignatureField; + +- PdfPage* pPage = m_pPdfDocument->GetPage(pageIndex); ++ PdfPage* pPage = m_pPdfMemDocument->GetPage(pageIndex); + PdfRect cropBox = pPage->GetCropBox(); + + float left0 = left * cropBox.GetWidth(); +@@ -145,15 +139,14 @@ void PdfSignatureGenerator::InitSignature( + + LOG_DBG((0, "InitSignature", "PdfSignatureField")); + +- m_pSignatureField = new PdfSignatureField( +- pPage, rect, m_pPdfDocument, PdfString(szFieldName), szSubFilter); ++ m_pSignatureField = new PdfSignatureField(pPage, rect, m_pPdfMemDocument); + + LOG_DBG((0, "InitSignature", "PdfSignatureField OK")); + + if (szReason && szReason[0]) { + PdfString reason(szReason); + PdfString reasonLabel(szReasonLabel); +- m_pSignatureField->SetSignatureReason(reasonLabel, reason); ++ m_pSignatureField->SetSignatureReason(reason); + } + + LOG_DBG((0, "InitSignature", "szReason OK")); +@@ -161,7 +154,7 @@ void PdfSignatureGenerator::InitSignature( + if (szLocation && szLocation[0]) { + PdfString location(szLocation); + PdfString locationLabel(szLocationLabel); +- m_pSignatureField->SetSignatureLocation(locationLabel, location); ++ m_pSignatureField->SetSignatureLocation(location); + } + + LOG_DBG((0, "InitSignature", "szLocation OK")); +@@ -171,54 +164,42 @@ void PdfSignatureGenerator::InitSignature( + + LOG_DBG((0, "InitSignature", "Date OK")); + +- if (szName && szName[0]) { +- PdfString name(szName); +- PdfString nameLabel(szNameLabel); +- m_pSignatureField->SetSignatureName(nameLabel, name); +- } +- +- LOG_DBG((0, "InitSignature", "szName OK")); +- +- m_pSignatureField->SetSignatureSize(SIGNATURE_SIZE); ++ m_pSignOutputDevice->PdfSignOutputDevice::SetSignatureSize(SIGNATURE_SIZE); + + LOG_DBG((0, "InitSignature", "SIGNATURE_SIZE OK")); + +- // if((szImagePath && szImagePath[0]) || (szDescription && szDescription[0])) +- if (width * height > 0) { +- try { +- // m_pSignatureField->SetFontSize(5); +- m_pSignatureField->SetAppearance(szImagePath, szDescription); +- LOG_DBG((0, "InitSignature", "SetAppearance OK")); +- } catch (PdfError& error) { +- LOG_ERR((0, "InitSignature", "SetAppearance error: %s, %s", +- PdfError::ErrorMessage(error.GetError()), error.what())); +- } catch (PdfError* perror) { +- LOG_ERR((0, "InitSignature", "SetAppearance error2: %s, %s", +- PdfError::ErrorMessage(perror->GetError()), perror->what())); +- } catch (std::exception& ex) { +- LOG_ERR( +- (0, "InitSignature", "SetAppearance std exception, %s", ex.what())); +- } catch (std::exception* pex) { +- LOG_ERR((0, "InitSignature", "SetAppearance std exception2, %s", +- pex->what())); +- } catch (...) { +- LOG_ERR((0, "InitSignature", "SetAppearance unknown error")); +- } +- } ++ // if (width * height > 0) { ++ // try { ++ // m_pSignatureField->SetAppearance(szImagePath, szDescription); ++ // LOG_DBG((0, "InitSignature", "SetAppearance OK")); ++ // } catch (PdfError& error) { ++ // LOG_ERR((0, "InitSignature", "SetAppearance error: %s, %s", ++ // PdfError::ErrorMessage(error.GetError()), error.what())); ++ // } catch (PdfError* perror) { ++ // LOG_ERR((0, "InitSignature", "SetAppearance error2: %s, %s", ++ // PdfError::ErrorMessage(perror->GetError()), perror->what())); ++ // } catch (std::exception& ex) { ++ // LOG_ERR( ++ // (0, "InitSignature", "SetAppearance std exception, %s", ++ // ex.what())); ++ // } catch (std::exception* pex) { ++ // LOG_ERR((0, "InitSignature", "SetAppearance std exception2, %s", ++ // pex->what())); ++ // } catch (...) { ++ // LOG_ERR((0, "InitSignature", "SetAppearance unknown error")); ++ // } ++ // } + +- if (szGraphometricData && szGraphometricData[0]) +- m_pSignatureField->SetGraphometricData( +- PdfString("Aruba_Sign_Biometric_Data"), PdfString(szGraphometricData), +- PdfString(szVersion)); ++ // if (szGraphometricData && szGraphometricData[0]) ++ // m_pSignatureField->SetGraphometricData( ++ // PdfString("Aruba_Sign_Biometric_Data"), ++ // PdfString(szGraphometricData), PdfString(szVersion)); + +- LOG_DBG((0, "InitSignature", "szGraphometricData OK")); ++ // LOG_DBG((0, "InitSignature", "szGraphometricData OK")); + + LOG_DBG((0, "InitSignature", "m_actualLen %d", m_actualLen)); + // crea il nuovo doc con il campo di firma +- int fulllen = m_actualLen * 2 + SIGNATURE_SIZE * 2 + +- (szGraphometricData +- ? (strlen(szGraphometricData) + strlen(szVersion) + 100) +- : 0); ++ int fulllen = m_actualLen * 2 + SIGNATURE_SIZE * 2; + + int mainDoclen = 0; + m_pMainDocbuffer = NULL; +@@ -227,7 +208,7 @@ void PdfSignatureGenerator::InitSignature( + LOG_DBG((0, "InitSignature", "fulllen %d", fulllen)); + m_pMainDocbuffer = new char[fulllen]; + PdfOutputDevice pdfOutDevice(m_pMainDocbuffer, fulllen); +- m_pPdfDocument->Write(&pdfOutDevice); ++ m_pPdfMemDocument->Write(&pdfOutDevice); + mainDoclen = pdfOutDevice.GetLength(); + } catch (::PoDoFo::PdfError err) { + if (m_pMainDocbuffer) { +@@ -301,32 +282,32 @@ void PdfSignatureGenerator::GetSignedPdf(UUCByteArray& signedPdf) { + } + + const double PdfSignatureGenerator::getWidth(int pageIndex) { +- if (m_pPdfDocument) { +- PdfPage* pPage = m_pPdfDocument->GetPage(pageIndex); ++ if (m_pPdfMemDocument) { ++ PdfPage* pPage = m_pPdfMemDocument->GetPage(pageIndex); + return pPage->GetPageSize().GetWidth(); + } + return 0; + } + + const double PdfSignatureGenerator::getHeight(int pageIndex) { +- if (m_pPdfDocument) { +- PdfPage* pPage = m_pPdfDocument->GetPage(pageIndex); ++ if (m_pPdfMemDocument) { ++ PdfPage* pPage = m_pPdfMemDocument->GetPage(pageIndex); + return pPage->GetPageSize().GetHeight(); + } + return 0; + } + + const double PdfSignatureGenerator::lastSignatureY(int left, int bottom) { +- if (!m_pPdfDocument) return -1; ++ if (!m_pPdfMemDocument) return -1; + /// Find the document catalog dictionary +- const PdfObject* const trailer = m_pPdfDocument->GetTrailer(); ++ const PdfObject* const trailer = m_pPdfMemDocument->GetTrailer(); + if (!trailer->IsDictionary()) return -1; + const PdfObject* const catalogRef = + trailer->GetDictionary().GetKey(PdfName("Root")); + if (catalogRef == 0 || !catalogRef->IsReference()) + return -2; // throw std::invalid_argument("Invalid /Root entry"); + const PdfObject* const catalog = +- m_pPdfDocument->GetObjects().GetObject(catalogRef->GetReference()); ++ m_pPdfMemDocument->GetObjects().GetObject(catalogRef->GetReference()); + if (catalog == 0 || !catalog->IsDictionary()) + return -3; // throw std::invalid_argument("Invalid or non-dictionary + // referenced by /Root entry"); +@@ -336,8 +317,8 @@ const double PdfSignatureGenerator::lastSignatureY(int left, int bottom) { + catalog->GetDictionary().GetKey(PdfName("AcroForm")); + if (acroFormValue == 0) return bottom; + if (acroFormValue->IsReference()) +- acroFormValue = +- m_pPdfDocument->GetObjects().GetObject(acroFormValue->GetReference()); ++ acroFormValue = m_pPdfMemDocument->GetObjects().GetObject( ++ acroFormValue->GetReference()); + + if (!acroFormValue->IsDictionary()) return bottom; + +@@ -346,8 +327,8 @@ const double PdfSignatureGenerator::lastSignatureY(int left, int bottom) { + if (fieldsValue == 0) return bottom; + + if (fieldsValue->IsReference()) +- fieldsValue = +- m_pPdfDocument->GetObjects().GetObject(acroFormValue->GetReference()); ++ fieldsValue = m_pPdfMemDocument->GetObjects().GetObject( ++ acroFormValue->GetReference()); + + if (!fieldsValue->IsArray()) return bottom; + +@@ -360,8 +341,8 @@ const double PdfSignatureGenerator::lastSignatureY(int left, int bottom) { + + for (unsigned int i = 0; i < array.size(); i++) { + const PdfObject* pObj = +- m_pPdfDocument->GetObjects().GetObject(array[i].GetReference()); +- if (IsSignatureField(m_pPdfDocument, pObj)) { ++ m_pPdfMemDocument->GetObjects().GetObject(array[i].GetReference()); ++ if (IsSignatureField(m_pPdfMemDocument, pObj)) { + const PdfObject* const keyRect = + pObj->GetDictionary().GetKey(PdfName("Rect")); + if (keyRect == 0) { +diff --git a/libs/sign-sdk/src/disigonsdk.cpp b/libs/sign-sdk/src/disigonsdk.cpp +index 250c93f..84e1b0b 100644 +--- a/libs/sign-sdk/src/disigonsdk.cpp ++++ b/libs/sign-sdk/src/disigonsdk.cpp +@@ -5,6 +5,7 @@ + + #include <libxml/tree.h> + #include <libxml/xmlmemory.h> ++#include <podofo/podofo.h> + #include <stdlib.h> + #include <string.h> + diff --git a/pkgs/tools/security/cnquery/default.nix b/pkgs/tools/security/cnquery/default.nix index c3e8caf06e478..a731d5e4e661a 100644 --- a/pkgs/tools/security/cnquery/default.nix +++ b/pkgs/tools/security/cnquery/default.nix @@ -1,28 +1,36 @@ -{ lib -, buildGoModule -, fetchFromGitHub +{ + lib, + buildGoModule, + fetchFromGitHub, }: buildGoModule rec { pname = "cnquery"; - version = "10.9.2"; + version = "10.11.0"; src = fetchFromGitHub { owner = "mondoohq"; repo = "cnquery"; - rev = "v${version}"; - hash = "sha256-4oAJ55qCUaqsJJ+memW078ZuKyvHoO71XhfowEg7dpg="; + rev = "refs/tags/v${version}"; + hash = "sha256-Dm001NDTi+KO3+OoF9f/X/m83KtqfnWmj0hZU6Zf71k="; }; subPackages = [ "apps/cnquery" ]; - vendorHash = "sha256-M8U6M3ejRrbQMfTh4JWYRLMQLfaDwtPiJOUEywiH6sg="; + vendorHash = "sha256-prtiCzIJizh0/viXwYylJc+GS2dVpNlBd3YvIDfltvs="; + + ldflags = [ + "-w" + "-s" + ]; meta = with lib; { - description = "cloud-native, graph-based asset inventory"; + description = "Cloud-native, graph-based asset inventory"; longDescription = '' - cnquery is a cloud-native tool for querying your entire fleet. It answers thousands of questions about your infrastructure and integrates with over 300 resources across cloud accounts, Kubernetes, containers, services, VMs, APIs, and more. - ''; + cnquery is a cloud-native tool for querying your entire fleet. It answers thousands of + questions about your infrastructure and integrates with over 300 resources across cloud + accounts, Kubernetes, containers, services, VMs, APIs, and more. + ''; homepage = "https://mondoo.com/cnquery"; changelog = "https://github.com/mondoohq/cnquery/releases/tag/v${version}"; license = licenses.bsl11; diff --git a/pkgs/tools/security/cnspec/default.nix b/pkgs/tools/security/cnspec/default.nix index 91fb3a554fd7e..a88ead4f6f163 100644 --- a/pkgs/tools/security/cnspec/default.nix +++ b/pkgs/tools/security/cnspec/default.nix @@ -1,26 +1,25 @@ -{ lib -, buildGoModule -, fetchFromGitHub +{ + lib, + buildGoModule, + fetchFromGitHub, }: buildGoModule rec { pname = "cnspec"; - version = "10.9.2"; + version = "10.11.0"; src = fetchFromGitHub { owner = "mondoohq"; repo = "cnspec"; rev = "refs/tags/v${version}"; - hash = "sha256-2Vy2IFsq9vbNECnf873FYcWiitnzsbxP8v2IwjE5j1I="; + hash = "sha256-z8pWAazoafyrsz3EmfhtHDBhmHHjkGFEIL5BftW79fg="; }; proxyVendor = true; - vendorHash = "sha256-zGtvA1m6U55+0Toy5zvQeU0jkumQzPqle6rCfyg3aN0="; + vendorHash = "sha256-6MVl8QuzxzcyFVP04ikO7B4Gk17e0TA4hxmL17OehCo="; - subPackages = [ - "apps/cnspec" - ]; + subPackages = [ "apps/cnspec" ]; ldflags = [ "-s" @@ -33,6 +32,9 @@ buildGoModule rec { homepage = "https://github.com/mondoohq/cnspec"; changelog = "https://github.com/mondoohq/cnspec/releases/tag/v${version}"; license = licenses.bsl11; - maintainers = with maintainers; [ fab mariuskimmina ]; + maintainers = with maintainers; [ + fab + mariuskimmina + ]; }; } diff --git a/pkgs/tools/security/crowdsec/default.nix b/pkgs/tools/security/crowdsec/default.nix index f9428bdd31706..06cbecad8474a 100644 --- a/pkgs/tools/security/crowdsec/default.nix +++ b/pkgs/tools/security/crowdsec/default.nix @@ -23,9 +23,9 @@ buildGoModule rec { ldflags = [ "-s" "-w" - "-X github.com/crowdsecurity/go-cs-lib/pkg/version.Version=v${version}" - "-X github.com/crowdsecurity/go-cs-lib/pkg/version.BuildDate=1970-01-01_00:00:00" - "-X github.com/crowdsecurity/go-cs-lib/pkg/version.Tag=${src.rev}" + "-X github.com/crowdsecurity/go-cs-lib/version.Version=v${version}" + "-X github.com/crowdsecurity/go-cs-lib/version.BuildDate=1970-01-01_00:00:00" + "-X github.com/crowdsecurity/go-cs-lib/version.Tag=${src.rev}" "-X github.com/crowdsecurity/crowdsec/pkg/cwversion.Codename=alphaga" "-X github.com/crowdsecurity/crowdsec/pkg/csconfig.defaultConfigDir=/etc/crowdsec" "-X github.com/crowdsecurity/crowdsec/pkg/csconfig.defaultDataDir=/var/lib/crowdsec/data" @@ -43,6 +43,11 @@ buildGoModule rec { --zsh <($out/bin/cscli completion zsh) ''; + # It's important that the version is correctly set as it also determines feature capabilities + checkPhase = '' + $GOPATH/bin/cscli version 2>&1 | grep -q "version: v${version}" + ''; + meta = with lib; { homepage = "https://crowdsec.net/"; changelog = "https://github.com/crowdsecurity/crowdsec/releases/tag/v${version}"; diff --git a/pkgs/tools/security/cyclonedx-gomod/default.nix b/pkgs/tools/security/cyclonedx-gomod/default.nix index 1a00303ac96f4..2a27f7b6a35b9 100644 --- a/pkgs/tools/security/cyclonedx-gomod/default.nix +++ b/pkgs/tools/security/cyclonedx-gomod/default.nix @@ -1,20 +1,26 @@ -{ lib -, buildGoModule -, fetchFromGitHub +{ + lib, + buildGoModule, + fetchFromGitHub, }: buildGoModule rec { pname = "cyclonedx-gomod"; - version = "1.6.0"; + version = "1.7.0"; src = fetchFromGitHub { owner = "CycloneDX"; - repo = pname; - rev = "v${version}"; - hash = "sha256-3YHlh7edRWU8plAJh96RDkrC9YUQjvV4vNGOxmbS0sA="; + repo = "cyclonedx-gomod"; + rev = "refs/tags/v${version}"; + hash = "sha256-RM8ZH1mO+72ptoU7YKXlCZAyDhYZ7MFXyDYrqBQwsDI="; }; - vendorHash = "sha256-0Fx9pOofcY5rpX6DU2xPeg7xEZ8ows/DWwyV5B7LHGY="; + vendorHash = "sha256-1ibMneSOYs5C6Ul8m/rVXVFBJHZrH1D5eWRwVVJ6a+A="; + + ldflags = [ + "-w" + "-s" + ]; # Tests require network access and cyclonedx executable doCheck = false; diff --git a/pkgs/tools/security/evtx/default.nix b/pkgs/tools/security/evtx/default.nix index 92f8a29cf8200..0bd753fab5270 100644 --- a/pkgs/tools/security/evtx/default.nix +++ b/pkgs/tools/security/evtx/default.nix @@ -1,20 +1,21 @@ -{ lib -, rustPlatform -, fetchFromGitHub +{ + lib, + fetchFromGitHub, + rustPlatform, }: rustPlatform.buildRustPackage rec { pname = "evtx"; - version = "0.8.1"; + version = "0.8.2"; src = fetchFromGitHub { owner = "omerbenamram"; - repo = pname; + repo = "evtx"; rev = "refs/tags/v${version}"; - hash = "sha256-aa04Ia11+Ae1amc3JAtYdSWf+f/fenTt0Bny/AauaHo="; + hash = "sha256-uuoHDIZ76BfRSb1XXHDwsSQ3ium22FPv1fjrB35liXw="; }; - cargoHash = "sha256-4pQP+cvKfOvRgWRFa4+/dEpBq+gfcOuEENC5aP4Cp7U="; + cargoHash = "sha256-OmwfI86Rj0Ph5cXpGzAycEw+A4liki7+gc1iokDBwhU="; postPatch = '' # CLI tests will fail in the sandbox @@ -23,10 +24,13 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Parser for the Windows XML Event Log (EVTX) format"; - mainProgram = "evtx_dump"; homepage = "https://github.com/omerbenamram/evtx"; changelog = "https://github.com/omerbenamram/evtx/blob/v${version}/CHANGELOG.md"; - license = with licenses; [ asl20 /* or */ mit ]; + license = with licenses; [ + asl20 # or + mit + ]; maintainers = with maintainers; [ fab ]; + mainProgram = "evtx_dump"; }; } diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index 333668fbfc9d5..37b493c1f1e09 100644 --- a/pkgs/tools/security/exploitdb/default.nix +++ b/pkgs/tools/security/exploitdb/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2024-03-29"; + version = "2024-04-04"; src = fetchFromGitLab { owner = "exploit-database"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-SNgC7gMedVpy07PQTt5MfyxZdb5bN3tTDx72l/rusvw="; + hash = "sha256-qWmHY2CNZBY3kaWaru7jXJuPZOH96+Ea/8pUT0oKHF0="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/security/fulcio/default.nix b/pkgs/tools/security/fulcio/default.nix index 46b533e4e68a7..2681c7126ebe1 100644 --- a/pkgs/tools/security/fulcio/default.nix +++ b/pkgs/tools/security/fulcio/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "fulcio"; - version = "1.4.4"; + version = "1.4.5"; src = fetchFromGitHub { owner = "sigstore"; repo = pname; rev = "v${version}"; - sha256 = "sha256-zL+53GIGDQagWtsSHQT1Gn1hZUCpYF3uYKXmJWFGy7k="; + sha256 = "sha256-cuBL+LvUXp4Ke+88jK/0cYaG072CFz3RG/kunXHzkA8="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -20,7 +20,7 @@ buildGoModule rec { find "$out" -name .git -print0 | xargs -0 rm -rf ''; }; - vendorHash = "sha256-B4/SIY9G5uEP+P+oSdhaMM7HRaHm5nq2jqXdIWxdP+8="; + vendorHash = "sha256-7QifP5dgKT7b3lruB+P6c0Cc/BgL4I+FnkzFIztt0oM="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/security/gopass/default.nix b/pkgs/tools/security/gopass/default.nix index 2b17f935d5113..5cc6624b721d9 100644 --- a/pkgs/tools/security/gopass/default.nix +++ b/pkgs/tools/security/gopass/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { pname = "gopass"; - version = "1.15.12"; + version = "1.15.13"; nativeBuildInputs = [ installShellFiles makeWrapper ]; @@ -21,10 +21,10 @@ buildGoModule rec { owner = "gopasspw"; repo = "gopass"; rev = "v${version}"; - hash = "sha256-sg3I/h0mkkWmK4GD1yoX14gM2oqwRjMXpX3KULHFJsg="; + hash = "sha256-FoDb4+9x8waLWBk4d0TclpReu60vzNGE+8GQmKMmcMQ="; }; - vendorHash = "sha256-jbwtxOfBL/5aXdWcsXZ5HQi83Oy00SSnLcvuWeCPBug="; + vendorHash = "sha256-Om4ne8oyZBr6a4dgBIvd0NZaDwmmC68pg8D+1UApzLw="; subPackages = [ "." ]; diff --git a/pkgs/tools/security/gopass/git-credential.nix b/pkgs/tools/security/gopass/git-credential.nix index cf05591bbbfce..c2fe96331236d 100644 --- a/pkgs/tools/security/gopass/git-credential.nix +++ b/pkgs/tools/security/gopass/git-credential.nix @@ -2,30 +2,21 @@ , makeWrapper , buildGoModule , fetchFromGitHub -, fetchpatch , gopass }: buildGoModule rec { pname = "git-credential-gopass"; - version = "1.15.12"; + version = "1.15.13"; src = fetchFromGitHub { owner = "gopasspw"; repo = "git-credential-gopass"; rev = "v${version}"; - hash = "sha256-5j5+so4LT3x+epEZf9OVn/kLNHBk2ENQxxRrzbziEA4="; + hash = "sha256-X2i0w5sJXteCI1F1PAtIzElAD51I/nk1DPkBlQV5fxs="; }; - patches = [ - # go mod tidy. Remove with next release - (fetchpatch { - url = "https://github.com/gopasspw/git-credential-gopass/commit/88d11d2b1b49f00b7fba9a917cf90f7ea14c9d1b.patch"; - hash = "sha256-mXxI9GXan0zYL8msL83VLqxOp4oAOwMyCOFaUOLAg5E="; - }) - ]; - - vendorHash = "sha256-y1PH0+tt/kcHw2I4LWD2XfLud3JtsYqrRd/yVRPdaTA="; + vendorHash = "sha256-s1Zouw1619DbGjnZY26N6En91lzDaeDRZmul/te2z7M="; subPackages = [ "." ]; diff --git a/pkgs/tools/security/gopass/hibp.nix b/pkgs/tools/security/gopass/hibp.nix index c9fca15f90582..02dcaa31206db 100644 --- a/pkgs/tools/security/gopass/hibp.nix +++ b/pkgs/tools/security/gopass/hibp.nix @@ -2,30 +2,21 @@ , makeWrapper , buildGoModule , fetchFromGitHub -, fetchpatch , gopass }: buildGoModule rec { pname = "gopass-hibp"; - version = "1.15.12"; + version = "1.15.13"; src = fetchFromGitHub { owner = "gopasspw"; repo = "gopass-hibp"; rev = "v${version}"; - hash = "sha256-5BnCaxF2XZ4f26KsTbapcZ2+Ii58nR/14pCj0c0QLKE="; + hash = "sha256-ja9/iS6422ygnXD6lsowjmlKbNloS0Zr3CkOkO0ieus="; }; - patches = [ - # go mod tidy. Remove with next release - (fetchpatch { - url = "https://github.com/gopasspw/gopass-hibp/commit/cdfdbc6da154874c74d7c8fc83bb11a98dd8fd81.patch"; - hash = "sha256-jCzg3c8EizhoRYvWUZCys6/q2ChVWy/psPofNGIYdxs="; - }) - ]; - - vendorHash = "sha256-GLqtwUg3fa1okdPoQBkF+ygpm8GLmDyIyUiC7/TTTaE="; + vendorHash = "sha256-FI/GXPyibcQpNNHWPVSp4diFfbRPv2A8BFi4nRXCU+Y="; subPackages = [ "." ]; diff --git a/pkgs/tools/security/gopass/jsonapi.nix b/pkgs/tools/security/gopass/jsonapi.nix index ca0ad5a96fd3e..ed0740bbf5b8a 100644 --- a/pkgs/tools/security/gopass/jsonapi.nix +++ b/pkgs/tools/security/gopass/jsonapi.nix @@ -2,31 +2,22 @@ , makeWrapper , buildGoModule , fetchFromGitHub -, fetchpatch , installShellFiles , gopass }: buildGoModule rec { pname = "gopass-jsonapi"; - version = "1.15.12"; + version = "1.15.13"; src = fetchFromGitHub { owner = "gopasspw"; repo = "gopass-jsonapi"; rev = "v${version}"; - hash = "sha256-sR+48MRBHj3XpKLp/AOGf2H4ltZD1fHlIA2HPYSHdp0="; + hash = "sha256-6l4y+osYYLtrtDmlmXuWDRqkatehwpu6ujvsk86hUIE="; }; - patches = [ - # go mod tidy. Remove with next release - (fetchpatch { - url = "https://github.com/gopasspw/gopass-jsonapi/commit/cab33faab113d0c9702ebaa14cde13e5ccd465d2.patch"; - hash = "sha256-IoxU5r1k0Y6N+PKAZH8LEO/fXHjryx5y58RRFeHP7Bc="; - }) - ]; - - vendorHash = "sha256-2JADTyBgAK2j524G+ksKLJC255PmvMViFFCwmgtXZzA="; + vendorHash = "sha256-R9aSa1Jy4R1ZJGWnOhnlJn3ZvT97lrf1BtuK/FadSJg="; subPackages = [ "." ]; diff --git a/pkgs/tools/security/gopass/summon.nix b/pkgs/tools/security/gopass/summon.nix index fca94219cf076..ddb93ef9fe378 100644 --- a/pkgs/tools/security/gopass/summon.nix +++ b/pkgs/tools/security/gopass/summon.nix @@ -2,30 +2,21 @@ , makeWrapper , buildGoModule , fetchFromGitHub -, fetchpatch , gopass }: buildGoModule rec { pname = "gopass-summon-provider"; - version = "1.15.12"; + version = "1.15.13"; src = fetchFromGitHub { owner = "gopasspw"; repo = "gopass-summon-provider"; rev = "v${version}"; - hash = "sha256-gvgHqeVB+4d8UJhMv3CYYidttCcaRPkgI7PXasv7pCI="; + hash = "sha256-cYr9yk5AyTxEo+bO6TgBBZRDWsTR+lvGcCr4kF1aMik="; }; - patches = [ - # go mod tidy. Remove with next release - (fetchpatch { - url = "https://github.com/gopasspw/gopass-summon-provider/commit/b3085cab14588cb6a5a383033947d9266fe0cd56.patch"; - hash = "sha256-8mvJqejqmuOloj9mW9zzsE/Xr0DtPhJeDItzVFVv4+c="; - }) - ]; - - vendorHash = "sha256-y1PH0+tt/kcHw2I4LWD2XfLud3JtsYqrRd/yVRPdaTA="; + vendorHash = "sha256-s1Zouw1619DbGjnZY26N6En91lzDaeDRZmul/te2z7M="; subPackages = [ "." ]; diff --git a/pkgs/tools/security/gotestwaf/default.nix b/pkgs/tools/security/gotestwaf/default.nix index 6198fc58ad734..a8a759dd1c77f 100644 --- a/pkgs/tools/security/gotestwaf/default.nix +++ b/pkgs/tools/security/gotestwaf/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "gotestwaf"; - version = "0.4.17"; + version = "0.4.18"; src = fetchFromGitHub { owner = "wallarm"; repo = "gotestwaf"; rev = "refs/tags/v${version}"; - hash = "sha256-Ix2S+yJMAn7RCMuw5SkvnfVy7XH6yIuGwXP/EAnhyI0="; + hash = "sha256-+AM+x/jKkoXLeWOhrCALhCDuoGCl5jt0BiCit885K7I="; }; vendorHash = null; diff --git a/pkgs/tools/security/grype/default.nix b/pkgs/tools/security/grype/default.nix index db9a24ecc4293..2f850eb98b903 100644 --- a/pkgs/tools/security/grype/default.nix +++ b/pkgs/tools/security/grype/default.nix @@ -1,20 +1,21 @@ -{ lib -, buildGoModule -, fetchFromGitHub -, git -, installShellFiles -, openssl +{ + lib, + buildGoModule, + fetchFromGitHub, + git, + installShellFiles, + openssl, }: buildGoModule rec { pname = "grype"; - version = "0.74.7"; + version = "0.75.0"; src = fetchFromGitHub { owner = "anchore"; repo = "grype"; rev = "refs/tags/v${version}"; - hash = "sha256-mP9Yjg5AVMIMvlOI+5AaCYzlw7h2K9WCFLY9ZwXmZk0="; + hash = "sha256-FOKSJ9u1+johBRL37I/sYo+BH9Na3vzxRTr6PqiLWrs="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -29,20 +30,16 @@ buildGoModule rec { proxyVendor = true; - vendorHash = "sha256-X+E2g/FoDgjKq8XcPeEA/XbRJV8JkhY5AHPnw26hRnM="; + vendorHash = "sha256-C1xM0OcEsplWOe0SGL6SCAvFq7M5LcekYyQTjP9EZB4="; - nativeBuildInputs = [ - installShellFiles - ]; + nativeBuildInputs = [ installShellFiles ]; nativeCheckInputs = [ git openssl ]; - subPackages = [ - "cmd/grype" - ]; + subPackages = [ "cmd/grype" ]; excludedPackages = "test/integration"; @@ -115,6 +112,10 @@ buildGoModule rec { container image or filesystem to find known vulnerabilities. ''; license = with licenses; [ asl20 ]; - maintainers = with maintainers; [ fab jk kashw2 ]; + maintainers = with maintainers; [ + fab + jk + kashw2 + ]; }; } diff --git a/pkgs/tools/security/iaito/default.nix b/pkgs/tools/security/iaito/default.nix index 2fc43ad670551..2ba6dd0aec265 100644 --- a/pkgs/tools/security/iaito/default.nix +++ b/pkgs/tools/security/iaito/default.nix @@ -13,13 +13,13 @@ let pname = "iaito"; - version = "5.8.8"; + version = "5.9.0"; main_src = fetchFromGitHub rec { owner = "radareorg"; repo = pname; rev = version; - hash = "sha256-/sXdp6QpDxltesg5i2CD0K2r18CrbGZmmI7HqULvFfA="; + hash = "sha256-Ep3Cbi0qjY4PKG0urr12y0DgX/l/Tsq8w1qlyH0lu3s="; name = repo; }; diff --git a/pkgs/tools/security/keybase/default.nix b/pkgs/tools/security/keybase/default.nix index 3d990468109b8..38b5bf72fd315 100644 --- a/pkgs/tools/security/keybase/default.nix +++ b/pkgs/tools/security/keybase/default.nix @@ -5,7 +5,7 @@ buildGoModule rec { pname = "keybase"; - version = "6.2.4"; + version = "6.2.8"; modRoot = "go"; subPackages = [ "kbnm" "keybase" ]; @@ -16,9 +16,9 @@ buildGoModule rec { owner = "keybase"; repo = "client"; rev = "v${version}"; - hash = "sha256-z7vpCUK+NU7xU9sNBlQnSy9sjXD7/m8jSRKfJAgyyN8="; + hash = "sha256-k/AMJNXS/gabJMjXdrQltxxc1Bez4VIR/l8RXXpiPWw="; }; - vendorHash = "sha256-tXEEVEfjoKub2A4m7F3hDc5ABJ+R+axwX1+1j7e3BAM="; + vendorHash = "sha256-DNTJtgZ2jDuEu4XqxbPTHLh+NR0vU2hcNNcD4amIDk4="; patches = [ (substituteAll { diff --git a/pkgs/tools/security/metasploit/Gemfile b/pkgs/tools/security/metasploit/Gemfile index cad0fef74f582..10a41bf970587 100644 --- a/pkgs/tools/security/metasploit/Gemfile +++ b/pkgs/tools/security/metasploit/Gemfile @@ -1,4 +1,4 @@ # frozen_string_literal: true source "https://rubygems.org" -gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.4.1" +gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.4.2" diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock index 9ec271d8b7e01..453e2f2b2c045 100644 --- a/pkgs/tools/security/metasploit/Gemfile.lock +++ b/pkgs/tools/security/metasploit/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/rapid7/metasploit-framework - revision: 73d98ad0ca24cdd33bbb9dfb110f3b781c613b55 - ref: refs/tags/6.4.1 + revision: 87b5f6c43676408498c88393a46890f22acc76e3 + ref: refs/tags/6.4.2 specs: - metasploit-framework (6.4.1) + metasploit-framework (6.4.2) actionpack (~> 7.0.0) activerecord (~> 7.0.0) activesupport (~> 7.0.0) diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix index 0db72c46ae48f..8d856a8134bb3 100644 --- a/pkgs/tools/security/metasploit/default.nix +++ b/pkgs/tools/security/metasploit/default.nix @@ -15,13 +15,13 @@ let }; in stdenv.mkDerivation rec { pname = "metasploit-framework"; - version = "6.4.1"; + version = "6.4.2"; src = fetchFromGitHub { owner = "rapid7"; repo = "metasploit-framework"; rev = "refs/tags/${version}"; - hash = "sha256-swKIiUgxsT6EnJV21sXOYU+s9fNTURLtJd1kjINyMd0="; + hash = "sha256-c/0XOz86v3So7GUGdOiDEorHeJ+rxfdsRXIGvuT/d/I="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/tools/security/metasploit/gemset.nix index fdaf84e0bb0e4..3bca89f2ea824 100644 --- a/pkgs/tools/security/metasploit/gemset.nix +++ b/pkgs/tools/security/metasploit/gemset.nix @@ -674,12 +674,12 @@ platforms = []; source = { fetchSubmodules = false; - rev = "73d98ad0ca24cdd33bbb9dfb110f3b781c613b55"; - sha256 = "1p9ifa1qqr6x4pni4lakygssqkv1rv2xcxlmkj23xc9i924qh0mk"; + rev = "87b5f6c43676408498c88393a46890f22acc76e3"; + sha256 = "1wkpzzjbw1kj8mnggidbkxwcg2hjhgl781k5xjl79grs7wxigzbk"; type = "git"; url = "https://github.com/rapid7/metasploit-framework"; }; - version = "6.4.1"; + version = "6.4.2"; }; metasploit-model = { groups = ["default"]; diff --git a/pkgs/tools/security/nuclei/default.nix b/pkgs/tools/security/nuclei/default.nix index a89bb3cbf62ec..5e183e44ebab2 100644 --- a/pkgs/tools/security/nuclei/default.nix +++ b/pkgs/tools/security/nuclei/default.nix @@ -1,24 +1,23 @@ -{ lib -, buildGoModule -, fetchFromGitHub +{ + lib, + buildGoModule, + fetchFromGitHub, }: buildGoModule rec { pname = "nuclei"; - version = "3.2.2"; + version = "3.2.3"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "nuclei"; rev = "refs/tags/v${version}"; - hash = "sha256-eYFHKXB6TSCLPMKiXvuSpt/2B+rbn7VZqoGEHp2vito="; + hash = "sha256-rcFgSblSXQUGu58cLbjGtvVfEa3AJUwkYEcrizqJTwM="; }; - vendorHash = "sha256-s0hspa3fKMHmFPPwB0tCDJoGEH2JpgFUaIbiSQJTtr0="; + vendorHash = "sha256-Ttv25D7GAFjbP25AcRfKPu4wT3SMroAAf3px48IWZLA="; - subPackages = [ - "cmd/nuclei/" - ]; + subPackages = [ "cmd/nuclei/" ]; ldflags = [ "-w" @@ -40,7 +39,10 @@ buildGoModule rec { homepage = "https://github.com/projectdiscovery/nuclei"; changelog = "https://github.com/projectdiscovery/nuclei/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ fab Misaka13514 ]; + maintainers = with maintainers; [ + fab + Misaka13514 + ]; mainProgram = "nuclei"; }; } diff --git a/pkgs/tools/security/opencryptoki/default.nix b/pkgs/tools/security/opencryptoki/default.nix index 056c379ac68f8..67acc540348b4 100644 --- a/pkgs/tools/security/opencryptoki/default.nix +++ b/pkgs/tools/security/opencryptoki/default.nix @@ -7,17 +7,18 @@ , openldap , openssl , trousers +, libcap }: stdenv.mkDerivation rec { pname = "opencryptoki"; - version = "3.20.0"; + version = "3.23.0"; src = fetchFromGitHub { owner = "opencryptoki"; repo = "opencryptoki"; rev = "v${version}"; - hash = "sha256-Z11CDw9ykmJ7MI7I0H4Y/i+8/I+hRgC2frklYPP1di0="; + hash = "sha256-5FcvwGTzsL0lYrSYGlbSY89s6OKzg+2TRlwHlJjdzXo="; }; nativeBuildInputs = [ @@ -30,14 +31,17 @@ stdenv.mkDerivation rec { openldap openssl trousers + libcap ]; postPatch = '' substituteInPlace configure.ac \ - --replace "usermod" "true" \ - --replace "groupadd" "true" \ - --replace "chmod" "true" \ - --replace "chgrp" "true" + --replace-fail "usermod" "true" \ + --replace-fail "useradd" "true" \ + --replace-fail "groupadd" "true" \ + --replace-fail "chmod" "true" \ + --replace-fail "chown" "true" \ + --replace-fail "chgrp" "true" ''; configureFlags = [ diff --git a/pkgs/tools/security/pass/extensions/update.nix b/pkgs/tools/security/pass/extensions/update.nix index 50a4c49b90d15..dfabe7603cce3 100644 --- a/pkgs/tools/security/pass/extensions/update.nix +++ b/pkgs/tools/security/pass/extensions/update.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pass-update"; - version = "2.1"; + version = "2.2.1"; src = fetchFromGitHub { owner = "roddhjav"; repo = "pass-update"; rev = "v${version}"; - sha256 = "0yx8w97jcp6lv7ad5jxqnj04csbrn2hhc4pskssxknw2sbvg4g6c"; + sha256 = "sha256-NFdPnGMs8myiHufeHAQUNDUuvDzYeoWYZllI9+4HL+s="; }; postPatch = '' diff --git a/pkgs/tools/security/pinentry/default.nix b/pkgs/tools/security/pinentry/default.nix index 61002917eb0d7..10984e489fd4f 100644 --- a/pkgs/tools/security/pinentry/default.nix +++ b/pkgs/tools/security/pinentry/default.nix @@ -103,7 +103,7 @@ let platforms.all; longDescription = '' Pinentry provides a console and (optional) GTK and Qt GUIs allowing users - to enter a passphrase when `gpg' or `gpg2' is run and needs it. + to enter a passphrase when `gpg` or `gpg2` is run and needs it. ''; maintainers = with maintainers; [ fpletz ]; mainProgram = "pinentry"; diff --git a/pkgs/tools/security/quark-engine/default.nix b/pkgs/tools/security/quark-engine/default.nix index 1e9cf9168aed0..43e9413d125cd 100644 --- a/pkgs/tools/security/quark-engine/default.nix +++ b/pkgs/tools/security/quark-engine/default.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "quark-engine"; - version = "24.2.1"; + version = "24.4.1"; pyproject = true; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-77yfysmFEneVOiejoCooi1buqEM/Ljv5xqjKv17DFWE="; + sha256 = "sha256-cWO/avMz9nT9yo10b1ugC0C8NsEp2jAlcR0/+86gFKc="; }; nativeBuildInputs = with python3.pkgs; [ diff --git a/pkgs/tools/security/scilla/default.nix b/pkgs/tools/security/scilla/default.nix index 0484cfaa9f87e..24daa9f386c7a 100644 --- a/pkgs/tools/security/scilla/default.nix +++ b/pkgs/tools/security/scilla/default.nix @@ -1,20 +1,26 @@ -{ lib -, buildGoModule -, fetchFromGitHub +{ + lib, + buildGoModule, + fetchFromGitHub, }: buildGoModule rec { pname = "scilla"; - version = "1.2.7"; + version = "1.3.0"; src = fetchFromGitHub { owner = "edoardottt"; - repo = pname; + repo = "scilla"; rev = "refs/tags/v${version}"; - hash = "sha256-gZuNXQaxHJYLsEaOpNYo7ybg3f0GhkpiaLrex5lkDu4="; + hash = "sha256-ms52ii2cbZSZtcyxhVN+FbGP6hysoLvS7XwdPqxYymU="; }; - vendorHash = "sha256-bVGmleuOJzi/Sz7MJlnQuJsDgRWuwieLUx8hcyKkWXI="; + vendorHash = "sha256-tOg4T9yQm1aj5G89lUeRUTxi4YrwpRi5KDcpWw4TimY="; + + ldflags = [ + "-w" + "-s" + ]; checkFlags = [ # requires network access diff --git a/pkgs/tools/security/sonar-scanner-cli/default.nix b/pkgs/tools/security/sonar-scanner-cli/default.nix index 553019299ba72..b97a2bc3a105d 100644 --- a/pkgs/tools/security/sonar-scanner-cli/default.nix +++ b/pkgs/tools/security/sonar-scanner-cli/default.nix @@ -19,7 +19,7 @@ in stdenv.mkDerivation rec { inherit version; pname = "sonar-scanner-cli"; - src = fetchurl sonarScannerArchPackage.${stdenv.hostPlatform.system}; + src = fetchurl sonarScannerArchPackage.${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}"); nativeBuildInputs = [ unzip ]; diff --git a/pkgs/tools/security/spire/default.nix b/pkgs/tools/security/spire/default.nix index 49d0b296fd52a..4655f5c2aa017 100644 --- a/pkgs/tools/security/spire/default.nix +++ b/pkgs/tools/security/spire/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "spire"; - version = "1.9.2"; + version = "1.9.3"; outputs = [ "out" "agent" "server" ]; @@ -10,7 +10,7 @@ buildGoModule rec { owner = "spiffe"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Gbi6nM9tjH/bYOFwpBrjH/rFEtSs9ihxM3jDAt+5HTU="; + sha256 = "sha256-5Wisxo5RvDMmTgwPprpqVOPVTETCuUGWKuTu035swoY="; }; vendorHash = "sha256-XYM6r/+31apm9Ygq3eMX5DRf8p7/jwkBNaE2OvooRwM="; diff --git a/pkgs/tools/security/step-cli/default.nix b/pkgs/tools/security/step-cli/default.nix index 32446eeaa75be..2afbec7f9069d 100644 --- a/pkgs/tools/security/step-cli/default.nix +++ b/pkgs/tools/security/step-cli/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { owner = "smallstep"; repo = "cli"; rev = "refs/tags/v${version}"; - hash = "sha256-B0LGedExlk9XllWilZ0QAwQHNyISAI2WJ48P2STbxSY="; + hash = "sha256-fxBWYz95yxNa7xotmId2SHLAIymJIBOJumYzAPB3Ias="; }; ldflags = [ diff --git a/pkgs/tools/security/sudo/default.nix b/pkgs/tools/security/sudo/default.nix index 996baca2567f7..a2501cb34f58e 100644 --- a/pkgs/tools/security/sudo/default.nix +++ b/pkgs/tools/security/sudo/default.nix @@ -14,6 +14,8 @@ stdenv.mkDerivation (finalAttrs: { pname = "sudo"; + # be sure to check if nixos/modules/security/sudo.nix needs updating when bumping + # e.g. links to man pages, value constraints etc. version = "1.9.15p5"; src = fetchurl { diff --git a/pkgs/tools/security/trufflehog/default.nix b/pkgs/tools/security/trufflehog/default.nix index 205a94cd87f1d..336c304aa1fd5 100644 --- a/pkgs/tools/security/trufflehog/default.nix +++ b/pkgs/tools/security/trufflehog/default.nix @@ -1,22 +1,23 @@ -{ lib -, fetchFromGitHub -, buildGoModule -, testers -, trufflehog +{ + lib, + fetchFromGitHub, + buildGoModule, + testers, + trufflehog, }: buildGoModule rec { pname = "trufflehog"; - version = "3.71.2"; + version = "3.72.0"; src = fetchFromGitHub { owner = "trufflesecurity"; repo = "trufflehog"; rev = "refs/tags/v${version}"; - hash = "sha256-PxaZl3OV3bAbZzKVxHO8MuwqO2c16w4MNypsZpVOQTU="; + hash = "sha256-2xgvXHeltoODr5Rok7yaUqdVcO2crtdPvvRrN+DDGr4="; }; - vendorHash = "sha256-xU6mUhSgB9DMyVMo2tTd5uNyrDoFsY2zMaTKSPBcgwM="; + vendorHash = "sha256-dQ/oKVy5RZ5R8cbNom1msSbuzrQ7VbtK7m+8aS33u7Y="; ldflags = [ "-s" @@ -32,9 +33,7 @@ buildGoModule rec { ''; passthru = { - tests.version = testers.testVersion { - package = trufflehog; - }; + tests.version = testers.testVersion { package = trufflehog; }; }; meta = with lib; { diff --git a/pkgs/tools/security/vals/default.nix b/pkgs/tools/security/vals/default.nix index 4196ef3d8ac6d..e734893d527ff 100644 --- a/pkgs/tools/security/vals/default.nix +++ b/pkgs/tools/security/vals/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "vals"; - version = "0.36.0"; + version = "0.37.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "helmfile"; repo = pname; - sha256 = "sha256-jD7fYvPOR6fwpCqNhxNXzjc8qtmjXkJy+f/L7t9Jlu4="; + sha256 = "sha256-R/nTlB8VM41Yah+3sH/J3Y3m9KUFsIZQNQ9kFddo+Mo="; }; - vendorHash = "sha256-b4GmDzRvWQzoKzQo7am/3M9cFqO+QNW4UxlWZrPswiA="; + vendorHash = "sha256-VKJIbsVIIEEGqo+LXfYzhIJLtcj0jbbq/UXVpykgcz8="; ldflags = [ "-s" diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix index d3a9b1a906e7d..4f748ca1b4251 100644 --- a/pkgs/tools/security/vault/default.nix +++ b/pkgs/tools/security/vault/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "vault"; - version = "1.16.0"; + version = "1.16.1"; src = fetchFromGitHub { owner = "hashicorp"; repo = "vault"; rev = "v${version}"; - hash = "sha256-nrpe7GyT2GpnCWdJhHefx1iAvJPzahv4wjQe0xTRSys="; + hash = "sha256-dafK7PkjWmLbV9fcaR+Vl1CQrpGdo8IQpaSbUwY26Uw="; }; - vendorHash = "sha256-Bxa0244qowVnFJb9AUdJTp6CRo+GZTswVLg6lF1QITo="; + vendorHash = "sha256-hWIIGQb2tZjhQ+XxaUacBgRSFFQIWj728pjKZFi0Wto="; proxyVendor = true; diff --git a/pkgs/tools/security/vault/vault-bin.nix b/pkgs/tools/security/vault/vault-bin.nix index 8644949bf68bd..c80f35a16cbbb 100644 --- a/pkgs/tools/security/vault/vault-bin.nix +++ b/pkgs/tools/security/vault/vault-bin.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "vault-bin"; - version = "1.15.6"; + version = "1.16.1"; src = let @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { aarch64-darwin = "darwin_arm64"; }; sha256 = selectSystem { - x86_64-linux = "sha256-qZXR0bqsU0BcM4hWbCZ6vqnjh5pnddl7WTKKBGt1ioU="; - aarch64-linux = "sha256-4f0D+D+rL28mzCN8ku/FWrRFFUevY5yWIgifvZrDbuw="; - i686-linux = "sha256-YoG2NC6cBCunIql7kIRIOs0hU0dIQKIHN/Z27IGj1io="; - x86_64-darwin = "sha256-sdbwnoWZKbq0l86ikfHAR+LYI285IGRiZBB7woD/s/8="; - aarch64-darwin = "sha256-JcTt67eWgORgEmuiBpY5fSGJr8vvCOwKbnOTYZh2fIM="; + x86_64-linux = "sha256-s520fOri0caLMeMmNaGS3+Y9I9dcXtNtiRtwrvj1pvA="; + aarch64-linux = "sha256-12yFC3uPyqv2kQIv2KC+skXMrdU+IZir5z62JRtKBMs="; + i686-linux = "sha256-LGkRnI5rZ8j6Fm1FBKiTUJNK8dUF9154OlNEHIsT36Q="; + x86_64-darwin = "sha256-V7uLlQhsRQ36jtbIsdPfU3LvM41xDO3pj97KOlZWSYg="; + aarch64-darwin = "sha256-QGxg11DR1LbRzRE2CqyGSWvus1IXIECbtamONrqcBVc="; }; in fetchzip { diff --git a/pkgs/tools/security/vulnix/default.nix b/pkgs/tools/security/vulnix/default.nix index 305c3dc2f9a9b..7388d8278ed06 100644 --- a/pkgs/tools/security/vulnix/default.nix +++ b/pkgs/tools/security/vulnix/default.nix @@ -1,17 +1,19 @@ { lib , python3Packages -, fetchPypi +, fetchFromGitHub , nix , ronn }: python3Packages.buildPythonApplication rec { pname = "vulnix"; - version = "1.10.1"; + version = "1.10.1-unstable-2024-04-02"; - src = fetchPypi { - inherit pname version; - sha256 = "07v3ddvvhi3bslwrlin45kz48i3va2lzd6ny0blj5i2z8z40qcfm"; + src = fetchFromGitHub { + owner = "nix-community"; + repo = "vulnix"; + rev = "ebd8ea84553c0fd95bc3042584b495560821500f"; + hash = "sha256-huC520cLPjcmnbh+qOamyVfiIJNrCUpwK+orEp+X2LQ="; }; postPatch = '' @@ -56,7 +58,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { description = "NixOS vulnerability scanner"; mainProgram = "vulnix"; - homepage = "https://github.com/flyingcircusio/vulnix"; + homepage = "https://github.com/nix-community/vulnix"; license = licenses.bsd3; maintainers = with maintainers; [ ckauhaus ]; }; diff --git a/pkgs/tools/system/dool/default.nix b/pkgs/tools/system/dool/default.nix index b312e0a363c18..fc0da53123cab 100644 --- a/pkgs/tools/system/dool/default.nix +++ b/pkgs/tools/system/dool/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { changelog = "https://github.com/scottchiefbaker/dool/blob/${src.rev}/ChangeLog"; license = licenses.gpl3Plus; maintainers = with maintainers; [ figsoda ]; - platforms = platforms.unix; + platforms = platforms.linux; mainProgram = "dool"; }; } diff --git a/pkgs/tools/system/lact/default.nix b/pkgs/tools/system/lact/default.nix index c694b96d85f57..11901caa4cafa 100644 --- a/pkgs/tools/system/lact/default.nix +++ b/pkgs/tools/system/lact/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , blueprint-compiler , pkg-config -, wrapGAppsHook +, wrapGAppsHook4 , gdk-pixbuf , gtk4 , libdrm @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ blueprint-compiler pkg-config - wrapGAppsHook + wrapGAppsHook4 ]; buildInputs = [ diff --git a/pkgs/tools/system/rsyslog/default.nix b/pkgs/tools/system/rsyslog/default.nix index 865c669262590..dbe89c9092135 100644 --- a/pkgs/tools/system/rsyslog/default.nix +++ b/pkgs/tools/system/rsyslog/default.nix @@ -61,11 +61,11 @@ stdenv.mkDerivation rec { pname = "rsyslog"; - version = "8.2402.0"; + version = "8.2404.0"; src = fetchurl { url = "https://www.rsyslog.com/files/download/rsyslog/${pname}-${version}.tar.gz"; - hash = "sha256-rL3YV5SJ3za0o4PcaQmmG3YjgH8K/1TAYhFfLefqhbo="; + hash = "sha256-MFKNFA7BsfB5IkCB+jffbgZYf/QrAuPmHy2qBSbFTTM="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/system/skeema/default.nix b/pkgs/tools/system/skeema/default.nix index 38d6c4d1f75a7..68d1a1c627b39 100644 --- a/pkgs/tools/system/skeema/default.nix +++ b/pkgs/tools/system/skeema/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "skeema"; - version = "1.11.1"; + version = "1.11.2"; src = fetchFromGitHub { owner = "skeema"; repo = "skeema"; rev = "v${version}"; - hash = "sha256-S7eMqaz8BZ80AwIrVmX+rnEgIwEdy8q65FIy6Mac4CY="; + hash = "sha256-rnoIuftPmx1Qbn2ifEBGz4RiA/lBVemjMjcPr9Woflc="; }; vendorHash = null; diff --git a/pkgs/tools/system/stress-ng/default.nix b/pkgs/tools/system/stress-ng/default.nix index 81e80bd5e8301..0e87cbffd0504 100644 --- a/pkgs/tools/system/stress-ng/default.nix +++ b/pkgs/tools/system/stress-ng/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "stress-ng"; - version = "0.17.06"; + version = "0.17.07"; src = fetchFromGitHub { owner = "ColinIanKing"; repo = pname; rev = "V${version}"; - hash = "sha256-69Ckl3n09J25Y0hzkH/RV9hJNlSfYfoxTdWiD5gBlQQ="; + hash = "sha256-eXDCzyZ/YeumHjuLpr6stkWkApwfi8ExDx3uZTVa/cs="; }; postPatch = '' diff --git a/pkgs/tools/system/thermald/default.nix b/pkgs/tools/system/thermald/default.nix index 1b96a33cdd337..911678165c2c2 100644 --- a/pkgs/tools/system/thermald/default.nix +++ b/pkgs/tools/system/thermald/default.nix @@ -10,7 +10,6 @@ , libevdev , libtool , libxml2 -, xz , pkg-config , lib, stdenv , upower @@ -18,7 +17,7 @@ stdenv.mkDerivation rec { pname = "thermald"; - version = "2.5.6"; + version = "2.5.7"; outputs = [ "out" "devdoc" ]; @@ -26,7 +25,7 @@ stdenv.mkDerivation rec { owner = "intel"; repo = "thermal_daemon"; rev = "v${version}"; - sha256 = "sha256-7QoHq3NtBtGJ/ihiAkGWBng9mP+NAUiNX03Fb4T11cg="; + sha256 = "sha256-FU9nPuyCWMEmx2i3YTT/Y3BYinYU0MBCOjH5Pm3LENA="; }; nativeBuildInputs = [ @@ -45,7 +44,6 @@ stdenv.mkDerivation rec { dbus-glib libevdev libxml2 - xz upower ]; diff --git a/pkgs/tools/text/base16384/default.nix b/pkgs/tools/text/base16384/default.nix index 7111eece42958..b075b0665aaef 100644 --- a/pkgs/tools/text/base16384/default.nix +++ b/pkgs/tools/text/base16384/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "base16384"; - version = "2.2.5"; + version = "2.3.0"; src = fetchFromGitHub { owner = "fumiama"; repo = pname; rev = "v${version}"; - hash = "sha256-S9DA9C+6OJcSLJTSLRo9rolJO9yVQ0FOE7uwbvmJiGk="; + hash = "sha256-FzZ8k7dkGksQvknrHoSjX1iUpIyL5xGlFTm3mgpBIig="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/tools/text/crowdin-cli/default.nix b/pkgs/tools/text/crowdin-cli/default.nix index 712da353282f1..af46fb1b6fe9d 100644 --- a/pkgs/tools/text/crowdin-cli/default.nix +++ b/pkgs/tools/text/crowdin-cli/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "crowdin-cli"; - version = "3.19.1"; + version = "3.19.2"; src = fetchurl { url = "https://github.com/crowdin/${pname}/releases/download/${version}/${pname}.zip"; - hash = "sha256-ydkVdPhd9c5VPI6T9i+/yfbLHjOGNJbMw02AJCyuTGs="; + hash = "sha256-tVfdpyQ/m6ZpVA7YFmkGSnpo8/FirIBEiIqHlUr1TKk="; }; nativeBuildInputs = [ installShellFiles makeWrapper unzip ]; diff --git a/pkgs/tools/text/diffutils/default.nix b/pkgs/tools/text/diffutils/default.nix index 040f363fa55d8..8c4a160d4b1e5 100644 --- a/pkgs/tools/text/diffutils/default.nix +++ b/pkgs/tools/text/diffutils/default.nix @@ -33,7 +33,8 @@ stdenv.mkDerivation rec { lib.optional (coreutils != null) "PR_PROGRAM=${coreutils}/bin/pr" ++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "gl_cv_func_getopt_gnu=yes"; - doCheck = true; + # Test failure on QEMU only (#300550) + doCheck = !stdenv.buildPlatform.isRiscV64; meta = with lib; { homepage = "https://www.gnu.org/software/diffutils/diffutils.html"; diff --git a/pkgs/tools/text/fanficfare/default.nix b/pkgs/tools/text/fanficfare/default.nix index adf1415140389..f4cf0f68b45b1 100644 --- a/pkgs/tools/text/fanficfare/default.nix +++ b/pkgs/tools/text/fanficfare/default.nix @@ -2,12 +2,12 @@ python3Packages.buildPythonApplication rec { pname = "FanFicFare"; - version = "4.32.3"; + version = "4.33.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-Qfe24Ees3LLnSuU4kjn+dwtKjLBSYgF22U1YAtpw1po="; + hash = "sha256-1s3YeI4deej+lkDXtFzfBOtATY+jx+KB7JAnLUDZK8w="; }; nativeBuildInputs = with python3Packages; [ diff --git a/pkgs/tools/virtualization/govc/default.nix b/pkgs/tools/virtualization/govc/default.nix index de78d5d4ced91..64334c3cd1210 100644 --- a/pkgs/tools/virtualization/govc/default.nix +++ b/pkgs/tools/virtualization/govc/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "govc"; - version = "0.36.2"; + version = "0.36.3"; subPackages = [ "govc" ]; @@ -10,7 +10,7 @@ buildGoModule rec { rev = "v${version}"; owner = "vmware"; repo = "govmomi"; - sha256 = "sha256-1Ap15DE+Fe76mDxrfeiVTYhur5GjZj0FzjvKDDWbhsg="; + sha256 = "sha256-R/YqP7vrgfTeRVf6VDFdY2GGtHJZmZm1z/QA9tIE9HE="; }; vendorHash = "sha256-1EAQMYaTEtfAiu7+UTkC7QZwSWC1Ihwj9leTd90T0ZU="; diff --git a/pkgs/tools/wayland/wayland-proxy-virtwl/default.nix b/pkgs/tools/wayland/wayland-proxy-virtwl/default.nix index 029e30b2645a0..a9ad770008c3e 100644 --- a/pkgs/tools/wayland/wayland-proxy-virtwl/default.nix +++ b/pkgs/tools/wayland/wayland-proxy-virtwl/default.nix @@ -8,13 +8,13 @@ ocamlPackages.buildDunePackage rec { pname = "wayland-proxy-virtwl"; - version = "unstable-2023-12-09"; + version = "unstable-2024-04-05"; src = fetchFromGitHub { owner = "talex5"; repo = pname; - rev = "ec052fa0e9ae2b2926afc27e23a50b4d3072e6ac"; - sha256 = "sha256-ZWW44hfWs0F4SwwEjx62o/JnuXSrSlq2lrRFRTuPUFE="; + rev = "99d6b3fb8e5e226dd2f8bf01b788fd69e1e1ae62"; + sha256 = "sha256-BkQK5VGME/HA09brZ61jmjtCQG/s34MwdP0Nc80crkA="; }; minimalOCamlVersion = "5.0"; |