diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-12-05 12:01:50 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-12-05 12:01:50 +0000 |
commit | 7386ca48e330e1b17c04633b1edfc184c6c66d1c (patch) | |
tree | 3b4fade996ab4edb6479bcf40a14ebd242af3afa | |
parent | be6c8161de9281ccfe923c70def50676767202c8 (diff) | |
parent | 4d8ab2a7038169050381133439b450bec1858577 (diff) | |
download | nixlib-7386ca48e330e1b17c04633b1edfc184c6c66d1c.tar nixlib-7386ca48e330e1b17c04633b1edfc184c6c66d1c.tar.gz nixlib-7386ca48e330e1b17c04633b1edfc184c6c66d1c.tar.bz2 nixlib-7386ca48e330e1b17c04633b1edfc184c6c66d1c.tar.lz nixlib-7386ca48e330e1b17c04633b1edfc184c6c66d1c.tar.xz nixlib-7386ca48e330e1b17c04633b1edfc184c6c66d1c.tar.zst nixlib-7386ca48e330e1b17c04633b1edfc184c6c66d1c.zip |
Merge staging-next into staging
56 files changed, 1842 insertions, 1661 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 5ce24431c00a..c56575012f09 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -13130,6 +13130,12 @@ fingerprint = "9B1A 7906 5D2F 2B80 6C8A 5A1C 7D2A CDAF 4653 CF28"; }]; }; + ninjafb = { + email = "oscar@oronberg.com"; + github = "NinjaFB"; + githubId = 54169044; + name = "NinjaFB"; + }; nintron = { email = "nintron@sent.com"; github = "Nintron27"; diff --git a/nixos/modules/services/cluster/kubernetes/flannel.nix b/nixos/modules/services/cluster/kubernetes/flannel.nix index 11c5adc6a885..dca8996df083 100644 --- a/nixos/modules/services/cluster/kubernetes/flannel.nix +++ b/nixos/modules/services/cluster/kubernetes/flannel.nix @@ -13,6 +13,13 @@ in ###### interface options.services.kubernetes.flannel = { enable = mkEnableOption (lib.mdDoc "flannel networking"); + + openFirewallPorts = mkOption { + description = lib.mdDoc '' + Whether to open the Flannel UDP ports in the firewall on all interfaces.''; + type = types.bool; + default = true; + }; }; ###### implementation @@ -38,7 +45,7 @@ in }; networking = { - firewall.allowedUDPPorts = [ + firewall.allowedUDPPorts = mkIf cfg.openFirewallPorts [ 8285 # flannel udp 8472 # flannel vxlan ]; diff --git a/nixos/modules/services/development/zammad.nix b/nixos/modules/services/development/zammad.nix index 87aceddd6635..c084d6541ad3 100644 --- a/nixos/modules/services/development/zammad.nix +++ b/nixos/modules/services/development/zammad.nix @@ -21,6 +21,7 @@ let NODE_ENV = "production"; RAILS_SERVE_STATIC_FILES = "true"; RAILS_LOG_TO_STDOUT = "true"; + REDIS_URL = "redis://${cfg.redis.host}:${toString cfg.redis.port}"; }; databaseConfig = settingsFormat.generate "database.yml" cfg.database.settings; in @@ -65,6 +66,36 @@ in description = lib.mdDoc "Websocket service port."; }; + redis = { + createLocally = mkOption { + type = types.bool; + default = true; + description = lib.mdDoc "Whether to create a local redis automatically."; + }; + + name = mkOption { + type = types.str; + default = "zammad"; + description = lib.mdDoc '' + Name of the redis server. Only used if `createLocally` is set to true. + ''; + }; + + host = mkOption { + type = types.str; + default = "localhost"; + description = lib.mdDoc '' + Redis server address. + ''; + }; + + port = mkOption { + type = types.port; + default = 6379; + description = lib.mdDoc "Port of the redis server."; + }; + }; + database = { type = mkOption { type = types.enum [ "PostgreSQL" "MySQL" ]; @@ -206,6 +237,10 @@ in assertion = cfg.database.createLocally -> cfg.database.passwordFile == null; message = "a password cannot be specified if services.zammad.database.createLocally is set to true"; } + { + assertion = cfg.redis.createLocally -> cfg.redis.host == "localhost"; + message = "the redis host must be localhost if services.zammad.redis.createLocally is set to true"; + } ]; services.mysql = optionalAttrs (cfg.database.createLocally && cfg.database.type == "MySQL") { @@ -231,6 +266,13 @@ in ]; }; + services.redis = optionalAttrs cfg.redis.createLocally { + servers."${cfg.redis.name}" = { + enable = true; + port = cfg.redis.port; + }; + }; + systemd.services.zammad-web = { inherit environment; serviceConfig = serviceConfig // { @@ -240,6 +282,8 @@ in after = [ "network.target" "postgresql.service" + ] ++ optionals cfg.redis.createLocally [ + "redis-${cfg.redis.name}.service" ]; requires = [ "postgresql.service" @@ -303,16 +347,15 @@ in script = "./script/websocket-server.rb -b ${cfg.host} -p ${toString cfg.websocketPort} start"; }; - systemd.services.zammad-scheduler = { - inherit environment; - serviceConfig = serviceConfig // { Type = "forking"; }; + systemd.services.zammad-worker = { + inherit serviceConfig environment; after = [ "zammad-web.service" ]; requires = [ "zammad-web.service" ]; - description = "Zammad scheduler"; + description = "Zammad background worker"; wantedBy = [ "multi-user.target" ]; - script = "./script/scheduler.rb start"; + script = "./script/background-worker.rb start"; }; }; - meta.maintainers = with lib.maintainers; [ garbas taeer ]; + meta.maintainers = with lib.maintainers; [ taeer netali ]; } diff --git a/nixos/tests/zammad.nix b/nixos/tests/zammad.nix index 7a2d40e82b3e..1b2f24594699 100644 --- a/nixos/tests/zammad.nix +++ b/nixos/tests/zammad.nix @@ -4,7 +4,7 @@ import ./make-test-python.nix ( { name = "zammad"; - meta.maintainers = with lib.maintainers; [ garbas taeer n0emis ]; + meta.maintainers = with lib.maintainers; [ taeer n0emis netali ]; nodes.machine = { config, ... }: { services.zammad.enable = true; @@ -44,9 +44,10 @@ import ./make-test-python.nix ( testScript = '' start_all() machine.wait_for_unit("postgresql.service") + machine.wait_for_unit("redis-zammad.service") machine.wait_for_unit("zammad-web.service") machine.wait_for_unit("zammad-websocket.service") - machine.wait_for_unit("zammad-scheduler.service") + machine.wait_for_unit("zammad-worker.service") # wait for zammad to fully come up machine.sleep(120) diff --git a/pkgs/applications/gis/spatialite-gui/default.nix b/pkgs/applications/gis/spatialite-gui/default.nix index 76014887d2b8..b33818e35486 100644 --- a/pkgs/applications/gis/spatialite-gui/default.nix +++ b/pkgs/applications/gis/spatialite-gui/default.nix @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { homepage = "https://www.gaia-gis.it/fossil/spatialite_gui"; license = licenses.gpl3Plus; platforms = platforms.unix; - maintainers = with maintainers; [ sikmir ]; + maintainers = teams.geospatial.members; mainProgram = "spatialite_gui"; }; } diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index 32d1e71facf0..ab2c10d15779 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -101,6 +101,7 @@ let kaccounts-providers = callPackage ./kaccounts-providers.nix {}; kaddressbook = callPackage ./kaddressbook.nix {}; kalarm = callPackage ./kalarm.nix {}; + kalgebra = callPackage ./kalgebra.nix {}; merkuro = callPackage ./merkuro.nix {}; kalzium = callPackage ./kalzium.nix {}; kamoso = callPackage ./kamoso.nix {}; diff --git a/pkgs/applications/kde/kalgebra.nix b/pkgs/applications/kde/kalgebra.nix new file mode 100644 index 000000000000..ed1b0b567e0b --- /dev/null +++ b/pkgs/applications/kde/kalgebra.nix @@ -0,0 +1,46 @@ +{ mkDerivation +, lib +, extra-cmake-modules +, kdoctools +, analitza +, ki18n +, kinit +, kirigami2 +, kconfigwidgets +, kwidgetsaddons +, kio +, kxmlgui +, qtwebengine +, plasma-framework +}: + +mkDerivation { + pname = "kalgebra"; + + outputs = [ "out" "dev" ]; + + nativeBuildInputs = [ + extra-cmake-modules + kdoctools + ]; + + buildInputs = [ + ki18n + analitza + kinit + kirigami2 + kconfigwidgets + kwidgetsaddons + kio + kxmlgui + qtwebengine + plasma-framework + ]; + + meta = { + homepage = "https://apps.kde.org/kalgebra/"; + description = "A 2D and 3D Graph Calculator"; + license = with lib.licenses; [ gpl2Plus ]; + maintainers = with lib.maintainers; [ ninjafb ]; + }; +} diff --git a/pkgs/applications/networking/misc/zammad/0001-nulldb.patch b/pkgs/applications/networking/misc/zammad/0001-nulldb.patch index 61971525b99d..cf024c998b6c 100644 --- a/pkgs/applications/networking/misc/zammad/0001-nulldb.patch +++ b/pkgs/applications/networking/misc/zammad/0001-nulldb.patch @@ -7,7 +7,7 @@ index d85a17491..90ea5e387 100644 require 'rails/all' +require 'nulldb' - require_relative 'issue_2656_workaround_for_rails_issue_33600' + require_relative '../lib/zammad/safe_mode' # DO NOT REMOVE THIS LINE - see issue #2037 diff --git a/db/schema.rb b/db/schema.rb diff --git a/pkgs/applications/networking/misc/zammad/default.nix b/pkgs/applications/networking/misc/zammad/default.nix index b69f90d321a4..4b8a397afa8f 100644 --- a/pkgs/applications/networking/misc/zammad/default.nix +++ b/pkgs/applications/networking/misc/zammad/default.nix @@ -19,11 +19,12 @@ , yarn2nix-moretea , v8 , cacert +, redis }: let pname = "zammad"; - version = "5.4.1"; + version = "6.1.0"; src = applyPatches { @@ -100,7 +101,7 @@ let offlineCache = fetchYarnDeps { yarnLock = "${src}/yarn.lock"; - hash = "sha256-HI4RR4/ll/zNBNtDCb8OvEsG/BMVYacM0CcYqbkNHEY="; + hash = "sha256-PVQ2L+Io6Ct9UHvfoQmxV01ECG8fj0+xKwpMfAvD7q0="; }; yarnPreBuild = '' @@ -124,13 +125,26 @@ stdenv.mkDerivation { cacert ]; + nativeBuildInputs = [ + redis + ]; + RAILS_ENV = "production"; buildPhase = '' node_modules=${yarnEnv}/libexec/Zammad/node_modules ${yarn2nix-moretea.linkNodeModulesHook} + mkdir redis-work + pushd redis-work + redis-server & + REDIS_PID=$! + popd + rake DATABASE_URL="nulldb://user:pass@127.0.0.1/dbname" assets:precompile + + kill $REDIS_PID + rm -r redis-work ''; installPhase = '' @@ -151,6 +165,6 @@ stdenv.mkDerivation { homepage = "https://zammad.org"; license = licenses.agpl3Plus; platforms = [ "x86_64-linux" "aarch64-linux" ]; - maintainers = with maintainers; [ n0emis garbas taeer ]; + maintainers = with maintainers; [ n0emis taeer netali ]; }; } diff --git a/pkgs/applications/networking/misc/zammad/gemset.nix b/pkgs/applications/networking/misc/zammad/gemset.nix index bf33453ca6f8..3c96ab18ef8c 100644 --- a/pkgs/applications/networking/misc/zammad/gemset.nix +++ b/pkgs/applications/networking/misc/zammad/gemset.nix @@ -16,10 +16,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bndmmby5qxq8rs42fbb2ax3hhbjj2ds8wja08s0iadkbrn7shvf"; + sha256 = "1fdbks9byqqlkd6glj6lkz5f1z6948hh8fhv9x5pzqciralmz142"; type = "gem"; }; - version = "6.1.7.3"; + version = "6.1.7.6"; }; actionmailbox = { dependencies = ["actionpack" "activejob" "activerecord" "activestorage" "activesupport" "mail"]; @@ -27,10 +27,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cx00kf0syq5gdhlrmw0q9v92ki55drbsk4gzy86ls2q8xkd792s"; + sha256 = "1rfya6qgsl14cm9l2w7h7lg4znsyg3gqiskhqr8wn76sh0x2hln0"; type = "gem"; }; - version = "6.1.7.3"; + version = "6.1.7.6"; }; actionmailer = { dependencies = ["actionpack" "actionview" "activejob" "activesupport" "mail" "rails-dom-testing"]; @@ -38,10 +38,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vbif021cyndq3v3m61dkmgdbbirqk9zcsszb9nisq24m3gx1aai"; + sha256 = "0jr9jpf542svzqz8x68s08jnf30shxrrh7rq1a0s7jia5a5zx3qd"; type = "gem"; }; - version = "6.1.7.3"; + version = "6.1.7.6"; }; actionpack = { dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"]; @@ -49,10 +49,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0k6hc7klvn8m88b88vykl83jrpqhn4zz67l2zx9v266xga6fhala"; + sha256 = "0vf6ncs647psa9p23d2108zgmlf0pr7gcjr080yg5yf68gyhs53k"; type = "gem"; }; - version = "6.1.7.3"; + version = "6.1.7.6"; }; actiontext = { dependencies = ["actionpack" "activerecord" "activestorage" "activesupport" "nokogiri"]; @@ -60,10 +60,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "16ldxyxlxl9scggpmkww2fxzim7sl2b4js610pvddcsr74z9fjs7"; + sha256 = "1i8s3v6m8q3y17c40l6d3k2vs1mdqr0y1lfm7i6dfbj2y673lk9r"; type = "gem"; }; - version = "6.1.7.3"; + version = "6.1.7.6"; }; actionview = { dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"]; @@ -71,10 +71,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ck02cfc17s6g05qn0k7khwvvazwbf2rxbjcma8px2nw2j1ngvcn"; + sha256 = "1s4c1n5lv31sc7w4w74xz8gzyq3sann00bm4l7lxgy3vgi2wqkid"; type = "gem"; }; - version = "6.1.7.3"; + version = "6.1.7.6"; }; activejob = { dependencies = ["activesupport" "globalid"]; @@ -82,10 +82,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05bkw9qgjgj2nxzjj2fh6jp1fcvgff0aa4r77k0gcfmnzc1g8wdl"; + sha256 = "1641003plszig5ybhrqy90fv43l1vcai5h35qmhh9j12byk5hp26"; type = "gem"; }; - version = "6.1.7.3"; + version = "6.1.7.6"; }; activemodel = { dependencies = ["activesupport"]; @@ -93,10 +93,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "03hy5bwghdklcxbdylmsq70y0qzslck5slb2zkvp7g6mmvk86kwd"; + sha256 = "148szdj5jlnfpv3nmy8cby8rxgpdvs43f3rzqby1f7a0l2knd3va"; type = "gem"; }; - version = "6.1.7.3"; + version = "6.1.7.6"; }; activerecord = { dependencies = ["activemodel" "activesupport"]; @@ -104,10 +104,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1alshkgbcxp9s4vqb2b0yrrnyg15kxhlp1slsb03a61w7h42pspw"; + sha256 = "0n7hg582ajdncilfk1kkw8qfdchymp2gqgkad1znlhlmclihsafr"; type = "gem"; }; - version = "6.1.7.3"; + version = "6.1.7.6"; }; activerecord-import = { dependencies = ["activerecord"]; @@ -115,10 +115,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1cwm95795c6j5hk76csdkfg7ad228cmp086shkcmhnad4mycbh4m"; + sha256 = "12prkcp68jqpbl06lv46n7cgbvgsxmjwkn88q36wh9rz9bvlpbhg"; type = "gem"; }; - version = "1.4.1"; + version = "1.5.0"; }; activerecord-nulldb-adapter = { dependencies = ["activerecord"]; @@ -126,10 +126,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1c0f7fn06fzc7pn0dydchnq6xgcaga9rbzhmin5z5xvg5nkv783c"; + sha256 = "07lx5l6dgippsywwfq1c9ykf5iza75520gam465kz9hsifp6xp7i"; type = "gem"; }; - version = "0.8.0"; + version = "0.9.0"; }; activerecord-session_store = { dependencies = ["actionpack" "activerecord" "multi_json" "rack" "railties"]; @@ -148,10 +148,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06w4wlabqqr9bwdig44r5vdwkcbbivwgwn2fl775w7h05vrccgp8"; + sha256 = "16pylwnqsbvq2wxhl7k1rnravbr3dgpjmnj0psz5gijgkydd52yc"; type = "gem"; }; - version = "6.1.7.3"; + version = "6.1.7.6"; }; activesupport = { dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"]; @@ -159,10 +159,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06mihpy83a5xmavvn7l8vbix472dsi0vh30xj6g594k0679m0ir6"; + sha256 = "1nhrdih0rk46i0s6x7nqhbypmj1hf23zl5gfl9xasb6k4r2a1dxk"; type = "gem"; }; - version = "6.1.7.3"; + version = "6.1.7.6"; }; acts_as_list = { dependencies = ["activerecord"]; @@ -181,10 +181,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ypdmpdn20hxp5vwxz3zc04r5xcwqc25qszdlg41h8ghdqbllwmw"; + sha256 = "05r1fwy487klqkya7vzia8hnklcxy4vr92m9dmni3prfwk6zpw33"; type = "gem"; }; - version = "2.8.1"; + version = "2.8.5"; + }; + android_key_attestation = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "02spc1sh7zsljl02v9d5rdb717b628vw2k7jkkplifyjk4db0zj6"; + type = "gem"; + }; + version = "0.3.0"; }; argon2 = { dependencies = ["ffi" "ffi-compiler"]; @@ -226,10 +236,40 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "020v30xd1v2yvyfshbii497c83n4kafc6967pwmgl54sxkx04xwq"; + sha256 = "0hax4yd41f61ypfs7f0snjzbcgpp19s9d2i0bv4hyjv21kkdz736"; + type = "gem"; + }; + version = "10.4.13.0"; + }; + awrence = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0gj8f8c54r9cabkm41s59sa1ca5wpbipw7gq3sfl87x9296227fx"; type = "gem"; }; - version = "10.4.7.0"; + version = "1.2.1"; + }; + base64 = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0cydk9p2cv25qysm0sn2pb97fcpz1isa7n3c8xm1gd99li8x6x8c"; + type = "gem"; + }; + version = "0.1.1"; + }; + bindata = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "04y4zgh4bbcb8wmkxwfqg4saky1d1f3xw8z6yk543q13h8ky8rz5"; + type = "gem"; + }; + version = "2.4.15"; }; binding_of_caller = { dependencies = ["debug_inspector"]; @@ -269,10 +309,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lcxxlrzgpi9z2mr2v19xda6fdysmn5psa9bsp2rksa915v91fds"; + sha256 = "1gliwnyma9f1mpr928c79i36q51yl68dwjd3jgwvsyr4piiiqr1r"; type = "gem"; }; - version = "5.4.0"; + version = "6.0.1"; }; browser = { groups = ["default"]; @@ -330,10 +370,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "123198zk2ak8mziwa5jc3ckgpmsg08zn064n3aywnqm9s1bwjv3v"; + sha256 = "114qm5f5vhwaaw9rj1h2lcamh46zl13v1m18jiw68zl961gwmw6n"; type = "gem"; }; - version = "3.38.0"; + version = "3.39.2"; + }; + cbor = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0511idr8xps9625nh3kxr68sdy6l3xy2kcz7r57g47fxb1v18jj3"; + type = "gem"; + }; + version = "0.5.9.6"; }; childprocess = { groups = ["default" "development" "test"]; @@ -434,10 +484,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qnsflsbjj38im8xq35g0vihlz96h09wjn2dad5g543l3vvrkrx5"; + sha256 = "0krcwb6mn0iklajwngwsg850nk8k9b35dhmc2qkbdqvmifdi2y9q"; type = "gem"; }; - version = "1.2.0"; + version = "1.2.2"; + }; + cose = { + dependencies = ["cbor" "openssl-signature_algorithm"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "00c6x4ha7qiaaf88qdbyf240mk146zz78rbm4qwyaxmwlmk7q933"; + type = "gem"; + }; + version = "1.3.0"; }; crack = { dependencies = ["rexml"]; @@ -465,10 +526,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0l5f5cq8ki3h4djh7pb8yqdkywqd08vjy3vd64yqh7qd6pdwky6w"; + sha256 = "0r20iryb3ls3ly2c8k675ixz1zsifrkcj0h2i0326pgb3dwkicxa"; type = "gem"; }; - version = "3.2.6"; + version = "3.2.7"; }; daemons = { groups = ["default"]; @@ -485,10 +546,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xyza6gjci6qp83srcvsg3i225x17n27bwci4wqzpmn9bykjac2n"; + sha256 = "11ig4scb2h93j4z6rikfjd00wk2y4bhkikhia86a65gs4gl44kja"; type = "gem"; }; - version = "3.2.3"; + version = "3.2.5"; }; date = { groups = ["default"]; @@ -580,10 +641,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0fxrvqv3l5w9p20s129rg41zc6agf1n4yrmganancnvykbkygki2"; + sha256 = "1q2pywgyn6cbnm0fh3dln5z1qgd1g8hvb4x8rppjc1bpfxnfhi13"; type = "gem"; }; - version = "5.6.4"; + version = "5.6.6"; }; dotenv = { groups = ["development" "test"]; @@ -600,10 +661,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ffdpd18n1h1fxsl4yz7wpjlxb0nw8s0wxzwypi9vcyzij0d993s"; + sha256 = "1w39jms4bsggxvl23cxanhccv1ngb6nqxsqhi784v5bjz1lx3si8"; type = "gem"; }; - version = "0.7.0"; + version = "1.0.0"; }; dry-core = { dependencies = ["concurrent-ruby" "zeitwerk"]; @@ -611,10 +672,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01gks2hrp7nl3pzb487azvd25dlbrc40d5cpk4n0szwnf2c0k4ks"; + sha256 = "03a5qn74c4lk2rpy6wlhv66synjlyzc4wn086xzphkpmw12l4bzk"; type = "gem"; }; - version = "1.0.0"; + version = "1.0.1"; }; dry-inflector = { groups = ["default"]; @@ -654,10 +715,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1s5cqx3i7bigfhy8pniswdhinc9k2xxvkk05ikqy0kmwiy4bc991"; + sha256 = "1f6dz0hm67rhybh6xq2s3vvr700cp43kf50z2lids62s2i0mh5hj"; type = "gem"; }; - version = "1.7.0"; + version = "1.7.1"; }; eco = { dependencies = ["coffee-script" "eco-source" "execjs"]; @@ -717,10 +778,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "11bz1v1cxabm8672gabrw542zyg51dizlcvdck6vvwzagxbjv9zx"; + sha256 = "08s75vs9cxlc4r1q2bjg4br8g9wc5lc5x5vl0vv4zq5ivxsdpgi7"; type = "gem"; }; - version = "1.11.0"; + version = "1.12.0"; }; eventmachine = { groups = ["default"]; @@ -770,10 +831,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1b8772jybi0vxzbcs5zw17k40z661c8adn2rd6vqqr7ay71bzl09"; + sha256 = "0ysiqlvyy1351bzx7h92r93a35s32l8giyf9bac6sgr142sh3cnn"; type = "gem"; }; - version = "3.1.1"; + version = "3.2.1"; }; faraday = { dependencies = ["faraday-net_http" "ruby2_keywords"]; @@ -781,10 +842,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1f20vjx0ywx0zdb4dfx4cpa7kd51z6vg7dw5hs35laa45dy9g9pj"; + sha256 = "187clqhp9mv5mnqmjlfdp57svhsg1bggz84ak8v333j9skrnrgh9"; type = "gem"; }; - version = "2.7.4"; + version = "2.7.10"; }; faraday-mashify = { dependencies = ["faraday" "hashie"]; @@ -844,10 +905,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rv8dlq9nqpias29jh40qb6xzznlk6ra41nan6s5hy56402f0k29"; + sha256 = "1l38x0i0z8pjwr54lmnk8q1lxd7cqyl5m0qqqwb2iw28kncvmb3i"; type = "gem"; }; - version = "2.21.0"; + version = "2.21.1"; }; globalid = { dependencies = ["activesupport"]; @@ -855,10 +916,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "040bxzfd7mz1p6z4bc9vk5yrf762hdllvf98hmk848fq28xc5dsk"; + sha256 = "0kqm5ndzaybpnpxqiqkc41k4ksyxl41ln8qqr6kb130cdxsf2dxk"; type = "gem"; }; - version = "1.0.1"; + version = "1.1.0"; }; gmail_xoauth = { dependencies = ["oauth"]; @@ -876,10 +937,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "14knjmj2csrl9s890ikvipsbxn01xn6vdb64iwlbv6xnc20scwxf"; + sha256 = "0j5y4zgvraq5jhs2jjrblarj93nhq94m7bk8k1cqk18nq985x5ac"; type = "gem"; }; - version = "2.0.17"; + version = "2.0.26"; }; graphql-batch = { dependencies = ["graphql" "promise.rb"]; @@ -887,10 +948,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1nsjfi47h9ma8gkqi7v6ky3jqp1zb05l4y2xdsa13f0s8vmq04jv"; + sha256 = "0y8lclq94jjqg4sbn6lkbfa8cm64nnicgzkrmaihl8ml7p6mslal"; type = "gem"; }; - version = "0.5.2"; + version = "0.5.3"; }; hashdiff = { groups = ["default" "development" "test"]; @@ -1001,10 +1062,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vdcchz7jli1p0gnc669a7bj3q1fv09y9ppf0y3k0vb1jwdwrqwi"; + sha256 = "0qaamqsh5f3szhcakkak8ikxlzxqnv49n2p7504hcz2l0f4nj0wx"; type = "gem"; }; - version = "1.12.0"; + version = "1.14.1"; }; icalendar = { dependencies = ["ice_cube"]; @@ -1012,10 +1073,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "11zfs0l8y2a6gpf0krm91d0ap2mnf04qky89dyzxwaspqxqgj174"; + sha256 = "03isrw8mma83hifham5iab80bnbx7b1xabnh8v4zragb04gpfzs5"; type = "gem"; }; - version = "2.8.0"; + version = "2.9.0"; }; icalendar-recurrence = { dependencies = ["icalendar" "ice_cube"]; @@ -1098,26 +1159,26 @@ }; version = "2.3.0"; }; - kgio = { - groups = ["default" "unicorn"]; + koala = { + dependencies = ["addressable" "faraday" "faraday-multipart" "json" "rexml"]; + groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ipzvw7n0kz1w8rkqybyxvf3hb601a770khm0xdqm68mc4aa59xx"; + sha256 = "0qrs0yra1d0kxrn28fh1hvm099rh26dp4hpkw36vgfm286qjslww"; type = "gem"; }; - version = "2.11.4"; + version = "3.5.0"; }; - koala = { - dependencies = ["addressable" "faraday" "faraday-multipart" "json" "rexml"]; - groups = ["default"]; + language_server-protocol = { + groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "14jq1q8314x5qncmfgs53iv1ycz1fm887gnp7w04h963gbwr3yhc"; + sha256 = "0gvb1j8xsqxms9mww01rmdl78zkd72zgxaap56bhv8j45z05hp1x"; type = "gem"; }; - version = "3.4.0"; + version = "3.17.0.3"; }; listen = { dependencies = ["rb-fsevent" "rb-inotify"]; @@ -1140,6 +1201,16 @@ }; version = "1.1.4"; }; + localhost = { + groups = ["development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "12p4sy88qnw5c8ga6fdlxy2w2i0xw9mmnzckzj71k4rvbwpdzlg1"; + type = "gem"; + }; + version = "1.1.10"; + }; logging = { dependencies = ["little-plugger" "multi_json"]; groups = ["default"]; @@ -1157,10 +1228,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08qhzck271anrx9y6qa6mh8hwwdzsgwld8q0000rcd7yvvpnjr3c"; + sha256 = "1p744kjpb5zk2ihklbykzii77alycjc04vpnm2ch2f3cp65imlj3"; type = "gem"; }; - version = "2.19.1"; + version = "2.21.3"; }; mail = { dependencies = ["mini_mime" "net-imap" "net-pop" "net-smtp"]; @@ -1231,50 +1302,50 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ipw892jbksbxxcrlx9g5ljq60qx47pm24ywgfbyjskbcl78pkvb"; + sha256 = "0q8d881k1b3rbsfcdi3fx0b5vpdr5wcrhn88r2d9j7zjdkxp5mw5"; type = "gem"; }; - version = "3.4.1"; + version = "3.5.1"; }; mime-types-data = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pky3vzaxlgm9gw5wlqwwi7wsw3jrglrfflrppvvnsrlaiz043z9"; + sha256 = "17zdim7kzrh5j8c97vjqp4xp78wbyz7smdp4hi5iyzk0s9imdn5a"; type = "gem"; }; - version = "3.2023.0218.1"; + version = "3.2023.0808"; }; mini_mime = { groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lbim375gw2dk6383qirz13hgdmxlan0vc5da2l072j3qw6fqjm5"; + sha256 = "1vycif7pjzkr29mfk4dlqv3disc5dn0va04lkwajlpr1wkibg0c6"; type = "gem"; }; - version = "1.1.2"; + version = "1.1.5"; }; mini_portile2 = { groups = ["assets" "default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1af4yarhbbx62f7qsmgg5fynrik0s36wjy3difkawy536xg343mp"; + sha256 = "02mj8mpd6ck5gpcnsimx5brzggw5h5mmmpq2djdypfq16wcw82qq"; type = "gem"; }; - version = "2.8.1"; + version = "2.8.4"; }; minitest = { groups = ["assets" "default" "development" "nulldb" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1kjy67qajw4rnkbjs5jyk7kc3lyhz5613fwj1i8f6ppdk4zampy0"; + sha256 = "0jnpsbb2dbcs95p4is4431l2pw1l5pn7dfg3vkgb4ga464j0c5l6"; type = "gem"; }; - version = "5.17.0"; + version = "5.19.0"; }; minitest-profile = { groups = ["development" "test"]; @@ -1291,10 +1362,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1q03pb0vq8388s431nbxabsfxnch6p304c8vnjlk0zzpcv713yr3"; + sha256 = "1a5adcb7bwan09mqhj3wi9ib52hmdzmqg7q08pggn3adibyn5asr"; type = "gem"; }; - version = "1.6.0"; + version = "1.7.2"; }; multi_json = { groups = ["default"]; @@ -1331,10 +1402,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xsy70mg4p854jska7ff7cy8fyn9nhlkrmfdvkkfmk8qxairbfq1"; + sha256 = "1gjvj215qdhwk3292sc7xsn6fmwnnaq2xs35hh5hc8d8j22izlbn"; type = "gem"; }; - version = "0.5.4"; + version = "0.5.5"; }; naught = { groups = ["default"]; @@ -1384,20 +1455,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1d996zf3g8xz244791b0qsl9vr7zg4lqnnmf9k2kshr9lki5jam8"; + sha256 = "0lf7wqg7czhaj51qsnmn28j7jmcxhkh3m28rl1cjrqsgjxhwj7r3"; type = "gem"; }; - version = "0.3.4"; + version = "0.3.7"; }; net-ldap = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ycw0qsw3hap8svakl0i30jkj0ffd4lpyrn17a1j0w8mz5ainmsj"; + sha256 = "0xqcffn3c1564c4fizp10dzw2v5g2pabdzrcn25hq05bqhsckbar"; type = "gem"; }; - version = "0.17.1"; + version = "0.18.0"; }; net-pop = { dependencies = ["net-protocol"]; @@ -1437,10 +1508,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xk64wghkscs6bv2n22853k2nh39d131c6rfpnlw12mbjnnv9v1v"; + sha256 = "0w9978zwjf1qhy3amkivab0f9syz6a7k0xgydjidaf7xc831d78f"; type = "gem"; }; - version = "2.5.8"; + version = "2.5.9"; }; nokogiri = { dependencies = ["mini_portile2" "racc"]; @@ -1448,10 +1519,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0n79k78c5vdcyl0m3y3l5x9kxl6xf5lgriwi2vd665qmdkr01vnk"; + sha256 = "0k9w2z0953mnjrsji74cshqqp08q7m1r6zhadw1w0g34xzjh3a74"; type = "gem"; }; - version = "1.13.10"; + version = "1.15.4"; }; nori = { groups = ["default"]; @@ -1497,15 +1568,15 @@ version = "2.0.9"; }; omniauth = { - dependencies = ["hashie" "rack"]; + dependencies = ["hashie" "rack" "rack-protection"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1jn9j54l5h7xcba2vjq74l1dk0xrwvsjxam4qhylpi52nw0h5502"; + sha256 = "15xjsxis357np7dy1lak39x1n8g8wxljb08wplw5i4gxi743zr7j"; type = "gem"; }; - version = "1.9.2"; + version = "2.1.1"; }; omniauth-facebook = { dependencies = ["omniauth-oauth2"]; @@ -1524,10 +1595,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xbk0dbxqfpyfb33ghz6vrlz3m6442rp18ryf13gwzlnifcawhlb"; + sha256 = "1m6a7kg3lxz2nm96prln2ja8r4wlm37m5vsy9199vnynqq5fgy4g"; type = "gem"; }; - version = "1.4.0"; + version = "2.0.1"; }; omniauth-gitlab = { dependencies = ["omniauth" "omniauth-oauth2"]; @@ -1535,21 +1606,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1nbrg93p0nqxs1i2ddyij2rr7jn4vr3la4la39q4fknpin535k3z"; + sha256 = "04wnjnapgwsnyd3dfnp8dp1jjnsg64zkls5xharj10j822kiygsl"; type = "gem"; }; - version = "2.0.0"; + version = "4.1.0"; }; omniauth-google-oauth2 = { - dependencies = ["jwt" "omniauth" "omniauth-oauth2"]; + dependencies = ["jwt" "oauth2" "omniauth" "omniauth-oauth2"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "17pgqasl048irs2c6w6g57zvk0ygb5ml1krwir4qi4b6y53zyr55"; + sha256 = "0fahkghfa2iczmwss9bz5l4rh7siwzjnjp3akh7pdbsfx0kg35j4"; type = "gem"; }; - version = "0.8.0"; + version = "1.1.1"; }; omniauth-linkedin-oauth2 = { dependencies = ["omniauth-oauth2"]; @@ -1557,10 +1628,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ydkj9f2hd3fskpc2gazz9dim70z2k6z6pb8j3glnlhkd67iyzci"; + sha256 = "0xai5k6xzinc4d67n64y1acffs8p7xi2hikz493dz6jx8qv9b2g3"; type = "gem"; }; - version = "1.0.0"; + version = "1.0.1"; }; omniauth-microsoft-office365 = { dependencies = ["omniauth" "omniauth-oauth2"]; @@ -1590,10 +1661,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ia73zcbmhf02krlkq2rxmksx93jp777ax5x58fzkq3jzacqyniz"; + sha256 = "0y4y122xm8zgrxn5nnzwg6w39dnjss8pcq2ppbpx9qn7kiayky5j"; type = "gem"; }; - version = "1.7.3"; + version = "1.8.0"; }; omniauth-rails_csrf_protection = { dependencies = ["actionpack" "omniauth"]; @@ -1601,10 +1672,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xgkxwg17w39q3yjqcj0fm6hdkw37qm1l82dvm9zxn6q2pbzm2zv"; + sha256 = "1kwswnkyl8ym6i4wv65qh3qchqbf2n0c6lbhfgbvkds3gpmnlm7w"; type = "gem"; }; - version = "0.1.2"; + version = "1.0.1"; }; omniauth-saml = { dependencies = ["omniauth" "ruby-saml"]; @@ -1612,10 +1683,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0gxl14lbksnjkl8dfn23lsjkk63md77icm5racrh6fsp5n4ni9d4"; + sha256 = "01k9rkg97npcgm8r4x3ja8y20hsg4zy0dcjpzafx148q4yxbg74n"; type = "gem"; }; - version = "1.10.3"; + version = "2.1.0"; }; omniauth-twitter = { dependencies = ["omniauth-oauth" "rack"]; @@ -1633,9 +1704,11 @@ groups = ["default"]; platforms = []; source = { - remotes = ["https://rubygems.org"]; - sha256 = "02cz73lj38cjqkbrdnfr7iymzqdcxgqcjy992r5hmawgpqqgxvwb"; - type = "gem"; + fetchSubmodules = false; + rev = "06803ef97f822ede854322587db8049cc67dcfa6"; + sha256 = "10bsx11padnmd88xhkr583mgwwsn8155vpg2flw7wqjkd2hy6671"; + type = "git"; + url = "https://github.com/zammad-deps/omniauth-weibo-oauth2"; }; version = "0.5.2"; }; @@ -1649,6 +1722,17 @@ }; version = "3.1.0"; }; + openssl-signature_algorithm = { + dependencies = ["openssl"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "103yjl68wqhl5kxaciir5jdnyi7iv9yckishdr52s5knh9g0pd53"; + type = "gem"; + }; + version = "1.3.0"; + }; overcommit = { dependencies = ["childprocess" "iniparse" "rexml"]; groups = ["development" "test"]; @@ -1665,21 +1749,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07vnk6bb54k4yc06xnwck7php50l09vvlw1ga8wdz0pia461zpzb"; + sha256 = "0jcc512l38c0c163ni3jgskvq1vc3mr8ly5pvjijzwvfml9lf597"; type = "gem"; }; - version = "1.22.1"; + version = "1.23.0"; }; parser = { - dependencies = ["ast"]; + dependencies = ["ast" "racc"]; groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zk8mdyr0322r11d63rcp5jhz4lakxilhvyvdv0ql5dw4lb83623"; + sha256 = "1swigds85jddb5gshll1g8lkmbcgbcp9bi1d4nigwvxki8smys0h"; type = "gem"; }; - version = "3.2.0.0"; + version = "3.2.2.3"; }; pg = { groups = ["postgres"]; @@ -1707,10 +1791,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "17yx4bc0k182lhydwa8aqn0kx776kqymziydpb2szmxzx5q2sghx"; + sha256 = "1y2c5mvkq7zc5vh4ijs1wc9hc0yn4mwsbrjch34jf11pcz116pnd"; type = "gem"; }; - version = "2.0.2"; + version = "2.0.3"; }; "promise.rb" = { groups = ["default"]; @@ -1728,10 +1812,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0m445x8fwcjdyv2bc0glzss2nbm1ll51bq45knixapc7cl3dzdlr"; + sha256 = "0k9kqkd9nps1w1r1rb7wjr31hqzkka2bhi8b518x78dcxppm9zn4"; type = "gem"; }; - version = "0.14.1"; + version = "0.14.2"; }; pry-rails = { dependencies = ["pry"]; @@ -1782,10 +1866,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0hz0bx2qs2pwb0bwazzsah03ilpf3aai8b7lk7s35jsfzwbkjq35"; + sha256 = "0n9j7mczl15r3kwqrah09cxj8hxdfawiqxa60kga2bmxl9flfz9k"; type = "gem"; }; - version = "5.0.1"; + version = "5.0.3"; }; puma = { dependencies = ["nio4r"]; @@ -1793,10 +1877,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0df9bknc2dllk8v9fhgidzbvbryaxa8fgifrk40cdz9csjsphbky"; + sha256 = "1x4dwx2shx0p7lsms97r85r7ji7zv57bjy3i1kmcpxc8bxvrr67c"; type = "gem"; }; - version = "4.3.12"; + version = "6.3.1"; }; pundit = { dependencies = ["activesupport"]; @@ -1804,41 +1888,41 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1wb03yzy1j41822rbfh9nn77im3zh1f5v8di05cd8rsrdpws542b"; + sha256 = "10diasjqi1g7s19ns14sldia4wl4c0z1m4pva66q4y2jqvks4qjw"; type = "gem"; }; - version = "2.3.0"; + version = "2.3.1"; }; pundit-matchers = { - dependencies = ["rspec-rails"]; + dependencies = ["rspec-core" "rspec-expectations" "rspec-mocks" "rspec-support"]; groups = ["development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0hs0z7flj8yibk8jm5x7pnnfnl0rh0rhrvmq27b6pxvqxxvywsq3"; + sha256 = "0gmvppwknijhy013azyws85bkyck8x9ly7yh2162kxa59z1kbsgq"; type = "gem"; }; - version = "1.8.4"; + version = "3.1.2"; }; racc = { groups = ["assets" "default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09jgz6r0f7v84a7jz9an85q8vvmp743dqcsdm3z9c8rqcqv6pljq"; + sha256 = "11v3l46mwnlzlc371wr3x6yylpgafgwdf0q7hc7c1lzx6r414r5g"; type = "gem"; }; - version = "1.6.2"; + version = "1.7.1"; }; rack = { groups = ["assets" "default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qgwkcb8kxns8d5187cxjaxf18b7dmg9gh6cr9c1125m0bj2pnfk"; + sha256 = "15rdwbyk71c9nxvd527bvb8jxkcys8r3dj3vqra5b3sa63qs30vv"; type = "gem"; }; - version = "2.2.6.4"; + version = "2.2.8"; }; rack-attack = { dependencies = ["rack"]; @@ -1846,10 +1930,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "049s3y3dpl6dn478g912y6f9nzclnnkl30psrbc2w5kaihj5szhq"; + sha256 = "0z6pj5vjgl6swq7a33gssf795k958mss8gpmdb4v4cydcs7px91w"; + type = "gem"; + }; + version = "6.7.0"; + }; + rack-protection = { + dependencies = ["rack"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0xsz78hccgza144n37bfisdkzpr2c8m0xl6rnlzgxdbsm1zrkg7r"; type = "gem"; }; - version = "6.6.1"; + version = "3.1.0"; }; rack-proxy = { dependencies = ["rack"]; @@ -1868,10 +1963,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rjl709krgf499dhjdapg580l2qaj9d91pwzk8ck8fpnazlx1bdd"; + sha256 = "1ysx29gk9k14a14zsp5a8czys140wacvp91fja8xcja0j1hzqq8c"; type = "gem"; }; - version = "2.0.2"; + version = "2.1.0"; }; rails = { dependencies = ["actioncable" "actionmailbox" "actionmailer" "actionpack" "actiontext" "actionview" "activejob" "activemodel" "activerecord" "activestorage" "activesupport" "railties" "sprockets-rails"]; @@ -1879,10 +1974,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07cs7qdkx6vwp66diwdy9g6mx52rsd8rxhbnsqf9bqam58g2aynj"; + sha256 = "0gf5dqabzd0mf0q39a07kf0smdm2cv2z5swl3zr4cz50yb85zz3l"; type = "gem"; }; - version = "6.1.7.3"; + version = "6.1.7.6"; }; rails-controller-testing = { dependencies = ["actionpack" "actionview" "activesupport"]; @@ -1896,26 +1991,26 @@ version = "1.0.5"; }; rails-dom-testing = { - dependencies = ["activesupport" "nokogiri"]; + dependencies = ["activesupport" "minitest" "nokogiri"]; groups = ["assets" "default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1lfq2a7kp2x64dzzi5p4cjcbiv62vxh9lyqk2f0rqq3fkzrw8h5i"; + sha256 = "0fx9dx1ag0s1lr6lfr34lbx5i1bvn3bhyf3w3mx6h7yz90p725g5"; type = "gem"; }; - version = "2.0.3"; + version = "2.2.0"; }; rails-html-sanitizer = { - dependencies = ["loofah"]; + dependencies = ["loofah" "nokogiri"]; groups = ["assets" "default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mcb75qvldfz6zsr4inrfx7dmb0ngxy507awx28khqmnla3hqpc9"; + sha256 = "1pm4z853nyz1bhhqr7fzl44alnx4bjachcr6rh6qjj375sfz3sc6"; type = "gem"; }; - version = "1.4.4"; + version = "1.6.0"; }; railties = { dependencies = ["actionpack" "activesupport" "method_source" "rake" "thor"]; @@ -1923,10 +2018,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1d2snjnx1j848axppj2napy3zjgbka3fnw2528rcamhm6dp694nd"; + sha256 = "1vq4ahyg9hraixxmmwwypdnpcylpvznvdxhj4xa23xk45wzbl3h7"; type = "gem"; }; - version = "6.1.7.3"; + version = "6.1.7.6"; }; rainbow = { groups = ["default" "development" "test"]; @@ -1938,16 +2033,6 @@ }; version = "3.1.1"; }; - raindrops = { - groups = ["default" "unicorn"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0wb2x51parf6v78w0cic90m33bdc92y5h8rj4wqs75dhw1b69hc7"; - type = "gem"; - }; - version = "0.20.0"; - }; rake = { groups = ["assets" "default" "development" "test"]; platforms = []; @@ -2004,20 +2089,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0d6241adx6drsfzz74nx1ld3394nm6fjpv3ammzr0g659krvgf7q"; + sha256 = "136br91alxdwh1s85z912dwz23qlhm212vy6i3wkinz3z8mkxxl3"; type = "gem"; }; - version = "2.7.0"; + version = "2.8.1"; }; rexml = { groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08ximcyfjy94pm1rhcx04ny1vx2sk0x4y185gzn86yfsbzwkng53"; + sha256 = "05i8518ay14kjbma550mv0jm8a6di8yp5phzrd8rj44z9qnrlrp0"; type = "gem"; }; - version = "3.2.5"; + version = "3.2.6"; + }; + rotp = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "10mmzc85y7andsich586ndykw678qn1ns2wpjxrg0sc0gr4w3pig"; + type = "gem"; + }; + version = "6.2.2"; }; rspec-core = { dependencies = ["rspec-support"]; @@ -2025,10 +2120,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ibb81slc35q5yp276sixp3yrvj9q92wlmi1glbnwlk6g49z8rn4"; + sha256 = "0l95bnjxdabrn79hwdhn2q1n7mn26pj7y1w5660v5qi81x458nqm"; type = "gem"; }; - version = "3.12.0"; + version = "3.12.2"; }; rspec-expectations = { dependencies = ["diff-lcs" "rspec-support"]; @@ -2036,10 +2131,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qldsmjhqr4344zdlamzggr3y98wdk2c4hihkhwx8imk800gkl8v"; + sha256 = "05j44jfqlv7j2rpxb5vqzf9hfv7w8ba46wwgxwcwd8p0wzi1hg89"; type = "gem"; }; - version = "3.12.0"; + version = "3.12.3"; }; rspec-mocks = { dependencies = ["diff-lcs" "rspec-support"]; @@ -2047,10 +2142,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yvwnb0x5d6d4ff3wlgahk0wcw72ic51gd2snr1xxc5ify41kabv"; + sha256 = "1gq7gviwpck7fhp4y5ibljljvxgjklza18j62qf6zkm2icaa8lfy"; type = "gem"; }; - version = "3.12.0"; + version = "3.12.6"; }; rspec-rails = { dependencies = ["actionpack" "activesupport" "railties" "rspec-core" "rspec-expectations" "rspec-mocks" "rspec-support"]; @@ -2058,10 +2153,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0d3fnabkaw8n0na2dpnlg2xygggj51djzpj9x6y5rkiqbfyqwv01"; + sha256 = "086qdyz7c4s5dslm6j06mq7j4jmj958whc3yinhabnqqmz7i463d"; type = "gem"; }; - version = "6.0.1"; + version = "6.0.3"; }; rspec-retry = { dependencies = ["rspec-core"]; @@ -2079,10 +2174,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12y52zwwb3xr7h91dy9k3ndmyyhr3mjcayk0nnarnrzz8yr48kfx"; + sha256 = "1ky86j3ksi26ng9ybd7j0qsdf1lpr8mzrmn98yy9gzv801fvhsgr"; type = "gem"; }; - version = "3.12.0"; + version = "3.12.1"; }; rszr = { groups = ["default"]; @@ -2095,15 +2190,15 @@ version = "1.3.0"; }; rubocop = { - dependencies = ["json" "parallel" "parser" "rainbow" "regexp_parser" "rexml" "rubocop-ast" "ruby-progressbar" "unicode-display_width"]; + dependencies = ["base64" "json" "language_server-protocol" "parallel" "parser" "rainbow" "regexp_parser" "rexml" "rubocop-ast" "ruby-progressbar" "unicode-display_width"]; groups = ["development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1jsiy93y5c2sx2sr5jmdah208idw038m2fpihgan4klmldm3r1pm"; + sha256 = "1n5d0n5yczh9d1xbqy07hs3vamq3683zc9jg0zg2n5jz8n7jwmah"; type = "gem"; }; - version = "1.45.1"; + version = "1.56.1"; }; rubocop-ast = { dependencies = ["parser"]; @@ -2111,10 +2206,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pdzabz95hv3z5sfbkfqa8bdybsfl13gv7rjb32v3ss8klq99lbd"; + sha256 = "188bs225kkhrb17dsf3likdahs2p1i1sqn0pr3pvlx50g6r2mnni"; type = "gem"; }; - version = "1.24.1"; + version = "1.29.0"; }; rubocop-capybara = { dependencies = ["rubocop"]; @@ -2122,10 +2217,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1h4qcjkz0365qlhi7y1ni94qj14k397cad566zygm20p15ypbp5v"; + sha256 = "01fn05a87g009ch1sh00abdmgjab87i995msap26vxq1a5smdck6"; + type = "gem"; + }; + version = "2.18.0"; + }; + rubocop-factory_bot = { + dependencies = ["rubocop"]; + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0kqchl8f67k2g56sq2h1sm2wb6br5gi47s877hlz94g5086f77n1"; type = "gem"; }; - version = "2.17.0"; + version = "2.23.1"; }; rubocop-faker = { dependencies = ["faker" "rubocop"]; @@ -2144,10 +2250,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0hryrjmcl04br06ibjzzrbb2am8ybbhnl2l7w13xl3wz3k4jyjxs"; + sha256 = "1fmjnfhdaqxf4pdvfyjiayxazvqw52gj49m57abnri48ydvy4r06"; type = "gem"; }; - version = "0.19.0"; + version = "1.4.0"; }; rubocop-inflector = { dependencies = ["activesupport" "rubocop" "rubocop-rspec"]; @@ -2166,10 +2272,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1n7g0vg06ldjaq4f8c11c7yqy99zng1qdrkkk4kfziippy24yxnc"; + sha256 = "1v3a2g3wk3aqa0k0zzla10qkxlc625zkj3yf4zcsybs86r5bm4xn"; type = "gem"; }; - version = "1.16.0"; + version = "1.19.0"; }; rubocop-rails = { dependencies = ["activesupport" "rack" "rubocop"]; @@ -2177,31 +2283,31 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1nxyifly45y7dfiaf0ql8aq7xykrg0sh1l7dxmn3sb9p2jd18140"; + sha256 = "05r46ds0dm44fb4p67hbz721zck8mdwblzssz2y25yh075hvs36j"; type = "gem"; }; - version = "2.17.4"; + version = "2.20.2"; }; rubocop-rspec = { - dependencies = ["rubocop" "rubocop-capybara"]; + dependencies = ["rubocop" "rubocop-capybara" "rubocop-factory_bot"]; groups = ["development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vmmin3ymgq7bhv2hl4pd0zpwawy709p816axc4vi67w61b4bij1"; + sha256 = "0ylwy4afnxhbrvlaf8an9nrizj78axnzggiyfcp8v531cv8six5f"; type = "gem"; }; - version = "2.18.1"; + version = "2.23.2"; }; ruby-progressbar = { groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02nmaw7yx9kl7rbaan5pl8x5nn0y4j5954mzrkzi9i3dhsrps4nc"; + sha256 = "0cwvyb7j47m7wihpfaq7rc47zwwx9k4v7iqd9s1xch5nm53rrz40"; type = "gem"; }; - version = "1.11.0"; + version = "1.13.0"; }; ruby-saml = { dependencies = ["nokogiri" "rexml"]; @@ -2209,10 +2315,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1irn32sy9gx6xj9jxc28h7dax7vp9z8j6hjjfsb2f5hd4qz0z20x"; + sha256 = "18vnbzin5ypxrgcs9lllg7x311b69dyrdw2w1pwz84438hmxm79s"; type = "gem"; }; - version = "1.14.0"; + version = "1.15.0"; }; ruby2_keywords = { groups = ["default" "development" "test"]; @@ -2244,6 +2350,17 @@ }; version = "2.3.2"; }; + safety_net_attestation = { + dependencies = ["jwt"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1khq0y5w7lf2b9a220298hphf3pakd216jc9a4x4a9pdwxs2vgln"; + type = "gem"; + }; + version = "0.4.0"; + }; sassc = { dependencies = ["ffi"]; groups = ["assets" "default"]; @@ -2272,10 +2389,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1dkcyq2hfvf4wdj7q5cqqlka1dw6gz28dckxf4r17jmd53ymwg28"; + sha256 = "0ws0mh230l1pvyxcrlcr48w01alfhprjs1jbd8yrn463drsr2yac"; type = "gem"; }; - version = "4.8.0"; + version = "4.11.0"; }; shoulda-matchers = { dependencies = ["activesupport"]; @@ -2330,15 +2447,15 @@ version = "2.4.0"; }; slack-ruby-client = { - dependencies = ["faraday" "faraday-mashify" "faraday-multipart" "gli" "hashie" "websocket-driver"]; + dependencies = ["faraday" "faraday-mashify" "faraday-multipart" "gli" "hashie"]; groups = ["development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "110rhsxxf0g4qdrhy1ahyfjg1hqqwwwf4rjn8vrrbvpfd04b8xa5"; + sha256 = "1mf62j2z6djz7lbqawp1biziyy40sv5k1q29i4mvwza79652dlkf"; type = "gem"; }; - version = "2.0.0"; + version = "2.1.0"; }; slop = { groups = ["default" "development" "test"]; @@ -2388,10 +2505,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "14678jlva69bxx24sz5i882x25h357xmbmqsichvq8vdiw2xf6aa"; + sha256 = "1hg3zfn6p4ahp6mybk6ylr169f4mf4sl7lljylf5gljazs1yngf3"; type = "gem"; }; - version = "0.2.2"; + version = "0.3.0"; }; telegram-bot-ruby = { dependencies = ["dry-struct" "faraday" "faraday-multipart" "zeitwerk"]; @@ -2409,10 +2526,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1c5cnx7w3wp6ddsw84s131asfs6pr650fhwqhzwx2v3987d38kz1"; + sha256 = "0fbzaizg3f7ydlsp88zshkf47d07pc5jjpn9z7qckvah62f8r7a0"; type = "gem"; }; - version = "1.4.19"; + version = "1.4.20"; }; terser = { dependencies = ["execjs"]; @@ -2420,10 +2537,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01c8wp7z6v71jqgn6fgi8wfw62488i4arxdjqjg8zkn0jsflyd8b"; + sha256 = "1ja8pz7dfj0g7a6smz3wbc6imdmmf07ka83qhkv2xdfd73c9p4d9"; type = "gem"; }; - version = "1.1.13"; + version = "1.1.17"; }; test-unit = { dependencies = ["power_assert"]; @@ -2431,20 +2548,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1rdhpdi8mlk7jwv9pxz3mhchpd5q93jxzijqhw334w5yv1ajl5hf"; + sha256 = "02v0aa6rfanas00p47xi0anbza1ymcgv6h03ipil8pbj21cw998a"; type = "gem"; }; - version = "3.5.7"; + version = "3.6.1"; }; thor = { groups = ["assets" "default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0inl77jh4ia03jw3iqm5ipr76ghal3hyjrd6r8zqsswwvi9j2xdi"; + sha256 = "0k7j2wn14h1pl4smibasw0bp66kg626drxb59z7rzflch99cd4rg"; type = "gem"; }; - version = "1.2.1"; + version = "1.2.2"; }; thread_safe = { groups = ["default"]; @@ -2461,10 +2578,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "186nfbcsk0l4l86gvng1fw6jq6p6s7rc0caxr23b3pnbfb20y63v"; + sha256 = "0bmjgbv8158klwp2r3klxjwaj93nh1sbl4xvj9wsha0ic478avz7"; type = "gem"; }; - version = "2.0.11"; + version = "2.2.0"; }; time = { dependencies = ["date"]; @@ -2482,10 +2599,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pfddf51n5fnj4f9ggwj3wbf23ynj0nbxlxqpz12y1gvl9g7d6r6"; + sha256 = "1d9cvm0f4zdpwa795v3zv4973y5zk59j7s1x3yn90jjrhcz1yvfd"; type = "gem"; }; - version = "0.3.2"; + version = "0.4.0"; + }; + tpm-key_attestation = { + dependencies = ["bindata" "openssl" "openssl-signature_algorithm"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0v8y5dibsyskv1ncdgszhxwzq0gzmvb0zl7sgmx0xvsgy86dhcz1"; + type = "gem"; + }; + version = "0.12.0"; }; twilio-ruby = { dependencies = ["faraday" "jwt" "nokogiri"]; @@ -2493,10 +2621,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1wn7ybr54i8p6rrg79k0z4pga4n91d9rvrlvwgms8mx3aq9dpbib"; + sha256 = "174asqbk2fwr2kck3rwww0q5lnj8z17mnkhzzyq81k18n781xhw5"; type = "gem"; }; - version = "5.74.3"; + version = "6.5.0"; }; twitter = { dependencies = ["addressable" "buftok" "equalizer" "http" "http-form_data" "http_parser.rb" "memoizable" "multipart-post" "naught" "simple_oauth"]; @@ -2526,10 +2654,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0drm9pygji01pyimxq65ngdvgpn228g7fhffmrqw0xn7l2rdhclp"; + sha256 = "0m2d0gpsgqnv29j5h2d6g57g0rayvd460b8s2vjr8sn46bqf89m5"; type = "gem"; }; - version = "1.2022.7"; + version = "1.2023.3"; }; unf = { dependencies = ["unf_ext"]; @@ -2562,46 +2690,35 @@ }; version = "2.4.2"; }; - unicorn = { - dependencies = ["kgio" "raindrops"]; - groups = ["unicorn"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1h0gma14jjxiz6piyi6p99q7lya2mxrq79l03160hascvmx9ipa5"; - type = "gem"; - }; - version = "6.1.0"; - }; uri = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vigw7nfszfqgikr6n574k9bfh0rvs74z8xq46rz2zsm8249l8cc"; + sha256 = "0fa49cdssxllj1j37a56kq27wsibx5lmqxkqdk1rz3452y0bsydy"; type = "gem"; }; - version = "0.12.1"; + version = "0.12.2"; }; vcr = { groups = ["development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xzd8f17mmcq9f6lxg4w0x4nd9pyp41lr77gjzxwynijzp8rcgjl"; + sha256 = "02j9z7yapninfqwsly4l65596zhv2xqyfb91p9vkakwhiyhajq7r"; type = "gem"; }; - version = "6.1.0"; + version = "6.2.0"; }; version_gem = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0v2vj7q1rk3wd7hdqa3i1d4hq7sfcgf55qc70g6dsichsbgacb9w"; + sha256 = "0q6zs0wgcrql9671fw6lmbvgh155snaak4fia24iji5wk9klpfh7"; type = "gem"; }; - version = "1.1.1"; + version = "1.1.3"; }; viewpoint = { dependencies = ["httpclient" "logging" "nokogiri" "rubyntlm"]; @@ -2620,10 +2737,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "035bjh0db28bgjx6hf01ykrrl4088gygnsva1x7asznzd9aq4669"; + sha256 = "0q7qbi3npw47xza8spvd8ni0x0ahjb6lkd12y9a4pqppxn555v5q"; type = "gem"; }; - version = "3.0.14"; + version = "3.0.15"; }; vite_ruby = { dependencies = ["dry-cli" "rack-proxy" "zeitwerk"]; @@ -2631,10 +2748,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "119adbqdx4qb0hl5f34346j2w8a6z5xxy19wc6ad7bnc98v7l0hw"; + sha256 = "036qi8w4qzglhqrrrrkc0m7ivfzmagsdyj61r0h27p56hn1l6ph2"; type = "gem"; }; - version = "3.2.14"; + version = "3.3.4"; + }; + webauthn = { + dependencies = ["android_key_attestation" "awrence" "bindata" "cbor" "cose" "openssl" "safety_net_attestation" "tpm-key_attestation"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1ri09bf640kkw4v6k2g90q2nw1mx2hsghhngaqgb7958q8id8xrz"; + type = "gem"; + }; + version = "3.0.0"; }; webmock = { dependencies = ["addressable" "crack" "hashdiff"]; @@ -2642,10 +2770,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1myj44wvbbqvv18ragv3ihl0h61acgnfwrnj3lccdgp49bgmbjal"; + sha256 = "05134klki4zln7dfa2w0hpsj8nkvw99bdhqkbsrr0yjirhxak724"; type = "gem"; }; - version = "3.18.1"; + version = "3.19.0"; }; websocket = { groups = ["default" "development" "test"]; @@ -2659,17 +2787,17 @@ }; websocket-driver = { dependencies = ["websocket-extensions"]; - groups = ["default" "development" "test"]; + groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0a3bwxd9v3ghrxzjc4vxmf4xa18c6m4xqy5wb0yk5c6b9psc7052"; + sha256 = "1nyh873w4lvahcl8kzbjfca26656d5c6z3md4sbqg5y1gfz0157n"; type = "gem"; }; - version = "0.7.5"; + version = "0.7.6"; }; websocket-extensions = { - groups = ["default" "development" "test"]; + groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; @@ -2678,15 +2806,16 @@ }; version = "0.1.5"; }; - writeexcel = { + write_xlsx = { + dependencies = ["rubyzip"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0waaf1drp17m5qdchxqlqzj51sfa9hxqccw7d71qdg73gzay1x34"; + sha256 = "0w89lrp5k1ayp28p8785cbrmsmqsr5zrhvajs68pg7vvgn3qmqva"; type = "gem"; }; - version = "1.0.5"; + version = "1.11.1"; }; xpath = { dependencies = ["nokogiri"]; @@ -2704,10 +2833,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "028ld9qmgdllxrl7d0qkl65s58wb1n3gv8yjs28g43a8b1hplxk1"; + sha256 = "1mwdd445w63khz13hpv17m2br5xngyjl3jdj08xizjbm78i2zrxd"; type = "gem"; }; - version = "2.6.7"; + version = "2.6.11"; }; zendesk_api = { dependencies = ["faraday" "faraday-multipart" "hashie" "inflection" "mini_mime" "multipart-post"]; @@ -2715,9 +2844,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0yizpglgfwml6a2w696m97d1q50hq3v0vldja431rv93s9sjbgly"; + sha256 = "0cjiqm50zc4gpsn456235k8x0prafbmz921yqjgava4rp706467d"; type = "gem"; }; - version = "1.38.0.rc1"; + version = "2.0.1"; }; } diff --git a/pkgs/applications/networking/misc/zammad/package.json b/pkgs/applications/networking/misc/zammad/package.json index 09c7bc0ca139..98c898d90594 100644 --- a/pkgs/applications/networking/misc/zammad/package.json +++ b/pkgs/applications/networking/misc/zammad/package.json @@ -1,12 +1,12 @@ { "private": true, "scripts": { - "generate-graphql-api": "RAILS_ENV=development bundle exec rails generate zammad:graphql_introspection > tmp/graphql_introspection.json && npx graphql-codegen -c .graphql_code_generator.yml && rm tmp/graphql_introspection.json", + "generate-graphql-api": "RAILS_ENV=development bundle exec rails generate zammad:graphql_introspection > app/graphql/graphql_introspection.json && npx graphql-codegen -c .graphql_code_generator.yml", + "generate-setting-types": "RAILS_ENV=development bundle exec rails generate zammad:setting_types", "dev": "RAILS_ENV=development forego start -f Procfile.dev", - "dev:https": "VITE_RUBY_HTTPS=true RAILS_ENV=development forego start -f Procfile.dev-https", - "https:generate": "sh contrib/ssl/generate-ssl.sh", + "dev:https": "VITE_RUBY_HOST=0.0.0.0 VITE_RUBY_HTTPS=true RAILS_ENV=development forego start -f Procfile.dev-https", "i18n": "rails generate zammad:translation_catalog", - "lint": "vue-tsc --noEmit && eslint --cache --cache-location ./tmp/eslintcache.js -c .eslintrc.js --ext .js,.ts,.vue app/frontend/ .eslint-plugin-zammad/", + "lint": "vue-tsc --noEmit && eslint --cache --cache-location ./tmp/eslintcache.js --cache-strategy content -c .eslintrc.js --ext .js,.ts,.vue app/frontend/ .eslint-plugin-zammad/", "lint:fix": "yarn lint -- --fix", "lint:css": "stylelint **/*.{css,vue,scss}", "lint:css:fix": "stylelint **/*.{css,vue,scss} --fix", @@ -24,129 +24,134 @@ }, "packageManager": "yarn@1.22.19", "devDependencies": { - "@graphql-codegen/cli": "^3.0.0", - "@graphql-codegen/introspection": "^3.0.0", + "@faker-js/faker": "^8.0.2", + "@graphql-codegen/cli": "^5.0.0", + "@graphql-codegen/introspection": "^4.0.0", "@graphql-codegen/near-operation-file-preset": "^2.5.0", - "@graphql-codegen/typescript": "^3.0.0", - "@graphql-codegen/typescript-operations": "^3.0.0", + "@graphql-codegen/typescript": "^4.0.1", + "@graphql-codegen/typescript-operations": "^4.0.1", "@graphql-codegen/typescript-vue-apollo": "^3.3.7", - "@histoire/plugin-vue": "^0.14.2", - "@pinia/testing": "^0.0.14", - "@tailwindcss/line-clamp": "^0.4.2", - "@testing-library/jest-dom": "^5.16.5", + "@histoire/plugin-vue": "^0.17.1", + "@pinia/testing": "^0.1.3", + "@testing-library/jest-dom": "^5.17.0", "@testing-library/user-event": "^14.4.3", - "@testing-library/vue": "^6.6.1", - "@types/lodash-es": "^4.17.6", + "@testing-library/vue": "^7.0.0", + "@types/lodash-es": "^4.17.8", "@types/rails__actioncable": "^6.1.6", "@types/ua-parser-js": "^0.7.36", - "@types/uuid": "^9.0.0", - "@typescript-eslint/eslint-plugin": "^5.51.0", - "@typescript-eslint/parser": "^5.51.0", - "@vitejs/plugin-vue": "^4.0.0", - "@vue/eslint-config-prettier": "^7.0.0", - "@vue/eslint-config-typescript": "^11.0.2", - "@vue/test-utils": "^2.2.10", - "autoprefixer": "^10.4.13", - "eslint": "^8.33.0", + "@types/uuid": "^9.0.2", + "@typescript-eslint/eslint-plugin": "^5.62.0", + "@typescript-eslint/parser": "^5.62.0", + "@vitejs/plugin-vue": "^4.2.3", + "@vue/eslint-config-prettier": "^8.0.0", + "@vue/eslint-config-typescript": "^11.0.3", + "@vue/test-utils": "^2.4.1", + "autoprefixer": "^10.4.15", + "eslint": "^8.45.0", "eslint-config-airbnb-base": "^15.0.0", - "eslint-config-prettier": "^8.6.0", + "eslint-config-prettier": "^8.8.0", "eslint-import-resolver-alias": "^1.1.2", + "eslint-import-resolver-typescript": "^3.5.5", "eslint-plugin-import": "^2.27.5", - "eslint-plugin-prettier": "^4.2.1", + "eslint-plugin-prettier": "^5.0.0", "eslint-plugin-prettier-vue": "^4.2.0", "eslint-plugin-security": "^1.7.1", - "eslint-plugin-sonarjs": "^0.18.0", - "eslint-plugin-vue": "^9.9.0", + "eslint-plugin-sonarjs": "^0.19.0", + "eslint-plugin-vue": "^9.15.1", "eslint-plugin-zammad": "file:.eslint-plugin-zammad", - "histoire": "^0.14.2", - "jsdom": "^21.1.0", + "histoire": "^0.17.0", + "jsdom": "^22.1.0", "mock-apollo-client": "^1.2.1", - "postcss": "^8.4.21", + "postcss": "^8.4.28", "postcss-html": "^1.5.0", - "prettier": "2.8.4", - "prettier-plugin-tailwindcss": "^0.2.2", - "regenerator-runtime": "^0.13.11", - "sass": "^1.58.0", - "stylelint": "^14.16.1", + "prettier": "3.0.2", + "prettier-plugin-tailwindcss": "^0.5.3", + "regenerator-runtime": "^0.14.0", + "sass": "^1.65.1", + "stylelint": "^15.10.3", "stylelint-config-prettier": "^9.0.5", - "stylelint-config-recommended-vue": "^1.4.0", - "stylelint-config-standard": "^29.0.0", - "stylelint-config-standard-scss": "^6.1.0", - "stylelint-prettier": "^2.0.0", - "stylelint-scss": "^4.4.0", - "tailwindcss": "^3.2.6", + "stylelint-config-recommended-vue": "^1.5.0", + "stylelint-config-standard": "^34.0.0", + "stylelint-config-standard-scss": "^10.0.0", + "stylelint-prettier": "^4.0.2", + "stylelint-scss": "^5.1.0", + "svg-baker": "^1.7.0", + "svgo": "^3.0.2", + "tailwindcss": "^3.3.3", "timezone-mock": "^1.3.6", - "ts-node": "^10.9.1", - "type-fest": "^3.5.7", - "typescript": "^4.9.5", - "vite": "^4.0.4", - "vite-plugin-pwa": "^0.14.1", - "vite-plugin-ruby": "^3.1.3", - "vite-plugin-svg-icons": "^2.0.1", - "vitest": "^0.28.4", + "type-fest": "^3.13.1", + "typescript": "^5.1.6", + "vite": "^4.4.9", + "vite-plugin-pwa": "^0.16.4", + "vite-plugin-ruby": "^3.2.2", + "vitest": "^0.34.3", "vitest-axe": "^0.1.0", - "vue-tsc": "^1.0.24" + "vue-tsc": "^1.8.8" }, "dependencies": { - "@apollo/client": "^3.7.7", - "@formkit/core": "^1.0.0-beta.13-c578106", - "@formkit/dev": "^1.0.0-beta.13-c578106", - "@formkit/i18n": "^1.0.0-beta.13-c578106", - "@formkit/inputs": "^1.0.0-beta.13-c578106", - "@formkit/rules": "^1.0.0-beta.13-c578106", - "@formkit/tailwindcss": "^1.0.0-beta.13-c578106", - "@formkit/themes": "^1.0.0-beta.13-c578106", - "@formkit/utils": "^1.0.0-beta.13-c578106", - "@formkit/validation": "^1.0.0-beta.13-c578106", - "@formkit/vue": "^1.0.0-beta.13-c578106", + "@apollo/client": "^3.7.17", + "@formkit/core": "^0.17.4", + "@formkit/dev": "^0.17.4", + "@formkit/i18n": "^0.17.4", + "@formkit/inputs": "^0.17.4", + "@formkit/rules": "^0.17.4", + "@formkit/tailwindcss": "^0.17.4", + "@formkit/themes": "^0.17.4", + "@formkit/utils": "^0.17.4", + "@formkit/validation": "^0.17.4", + "@formkit/vue": "^0.17.4", + "@github/webauthn-json": "^2.1.1", "@rails/actioncable": "6.1.7", - "@tiptap/core": "^2.0.0-beta.217", - "@tiptap/extension-blockquote": "^2.0.0-beta.217", - "@tiptap/extension-character-count": "^2.0.0-beta.217", - "@tiptap/extension-image": "^2.0.0-beta.217", - "@tiptap/extension-link": "^2.0.0-beta.217", - "@tiptap/extension-list-item": "^2.0.0-beta.217", - "@tiptap/extension-mention": "^2.0.0-beta.217", - "@tiptap/extension-ordered-list": "^2.0.0-beta.217", - "@tiptap/extension-paragraph": "^2.0.0-beta.217", - "@tiptap/extension-strike": "^2.0.0-beta.217", - "@tiptap/extension-underline": "^2.0.0-beta.217", - "@tiptap/pm": "^2.0.0-beta.217", - "@tiptap/starter-kit": "^2.0.0-beta.217", - "@tiptap/suggestion": "^2.0.0-beta.217", - "@tiptap/vue-3": "^2.0.0-beta.217", - "@vue/apollo-composable": "^4.0.0-beta.2", - "@vueuse/core": "^9.12.0", - "@vueuse/router": "^9.12.0", - "@vueuse/shared": "^9.12.0", + "@tiptap/core": "^2.0.4", + "@tiptap/extension-blockquote": "^2.0.4", + "@tiptap/extension-character-count": "^2.0.4", + "@tiptap/extension-hard-break": "^2.0.4", + "@tiptap/extension-image": "^2.0.4", + "@tiptap/extension-link": "^2.0.4", + "@tiptap/extension-list-item": "^2.0.4", + "@tiptap/extension-mention": "^2.0.4", + "@tiptap/extension-ordered-list": "^2.0.4", + "@tiptap/extension-paragraph": "^2.0.4", + "@tiptap/extension-strike": "^2.0.4", + "@tiptap/extension-underline": "^2.0.4", + "@tiptap/pm": "^2.0.4", + "@tiptap/starter-kit": "^2.0.4", + "@tiptap/suggestion": "^2.0.4", + "@tiptap/vue-3": "^2.0.4", + "@vue/apollo-composable": "4.0.0-beta.5", + "@vueuse/core": "^10.4.0", + "@vueuse/router": "^10.4.0", + "@vueuse/shared": "^10.4.0", "async-mutex": "^0.4.0", "flatpickr": "^4.6.13", - "graphql": "^16.6.0", - "graphql-ruby-client": "^1.11.5", + "graphql": "^16.7.1", + "graphql-ruby-client": "^1.11.8", "graphql-tag": "^2.12.6", - "linkify-string": "^4.1.0", - "linkifyjs": "^4.1.0", + "linkify-string": "^4.1.1", + "linkifyjs": "^4.1.1", "lodash-es": "^4.17.21", "loglevel": "^1.8.1", - "mitt": "^3.0.0", - "pinia": "^2.0.30", + "mitt": "^3.0.1", + "pinia": "^2.1.6", "tippy.js": "^6.3.7", - "ua-parser-js": "^1.0.33", + "tiptap-text-direction": "^0.3.0", + "ua-parser-js": "^1.0.35", "uuid": "^9.0.0", - "vue": "^3.2.47", + "vue": "^3.3.4", "vue-advanced-cropper": "^2.8.8", - "vue-easy-lightbox": "1.12.0", - "vue-router": "^4.1.6", + "vue-easy-lightbox": "1.16.0", + "vue-router": "^4.2.4", "vue3-draggable-resizable": "^1.6.5", "vuedraggable": "^4.1.0", - "workbox-core": "^6.5.4", - "workbox-precaching": "^6.5.4", - "workbox-window": "^6.5.4" + "workbox-core": "^7.0.0", + "workbox-precaching": "^7.0.0", + "workbox-window": "^7.0.0" }, "resolutions": { "loader-utils": "^3.2.1", - "postcss": "^8.4.21" + "postcss": "^8.4.28", + "stylelint-config-recommended": "^13.0.0" }, "name": "Zammad", - "version": "5.4.1" + "version": "6.1.0" } diff --git a/pkgs/applications/networking/misc/zammad/source.json b/pkgs/applications/networking/misc/zammad/source.json index f7b7280b468d..39b17e82847a 100644 --- a/pkgs/applications/networking/misc/zammad/source.json +++ b/pkgs/applications/networking/misc/zammad/source.json @@ -1,8 +1,8 @@ { "owner": "zammad", "repo": "zammad", - "rev": "643aba6ba4ba66c6127038c8cc2cc7a20b912678", - "hash": "sha256-vLLn989M5ZN+jTh60BopEKbuaxOBfDsk6PiM+gHFClo=", + "rev": "ec4ddb8ae6a55d1c8e64ab5ddda9ff3e9d4f45c8", + "hash": "sha256-+AphZ0pKlXFdcncnDxeLdDL3OH2dyF0nb69+/W2dLgc=", "fetchSubmodules": true } diff --git a/pkgs/applications/networking/misc/zammad/update.sh b/pkgs/applications/networking/misc/zammad/update.sh index dd030f10f0e6..b97e75e4bd59 100755 --- a/pkgs/applications/networking/misc/zammad/update.sh +++ b/pkgs/applications/networking/misc/zammad/update.sh @@ -55,11 +55,6 @@ pushd $SOURCE_DIR echo ":: Creating gemset.nix" bundix --lockfile=./Gemfile.lock --gemfile=./Gemfile --gemset=$TARGET_DIR/gemset.nix -echo ":: Creating yarn.nix" -yarn install -cp yarn.lock $TARGET_DIR -yarn2nix > $TARGET_DIR/yarn.nix - # needed to avoid import from derivation jq --arg VERSION "$VERSION" '. += {name: "Zammad", version: $VERSION}' package.json > $TARGET_DIR/package.json diff --git a/pkgs/applications/science/logic/cryptominisat/default.nix b/pkgs/applications/science/logic/cryptominisat/default.nix index 0645fd29522f..a028803db139 100644 --- a/pkgs/applications/science/logic/cryptominisat/default.nix +++ b/pkgs/applications/science/logic/cryptominisat/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "cryptominisat"; - version = "5.11.14"; + version = "5.11.15"; src = fetchFromGitHub { owner = "msoos"; repo = "cryptominisat"; rev = version; - hash = "sha256-p/sVinjEh078PGtJ6JBRA8EmrJVcchBs9L3bRZvCHuo="; + hash = "sha256-OenuIPo5U0+egWMpxfaKWPLbO5YRQJSXLYptih+ZQQ0="; }; buildInputs = [ python3 boost ]; diff --git a/pkgs/applications/science/math/cbc/default.nix b/pkgs/applications/science/math/cbc/default.nix index 1909e4bb1d04..fb92b1cc98fb 100644 --- a/pkgs/applications/science/math/cbc/default.nix +++ b/pkgs/applications/science/math/cbc/default.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { }; # or-tools has a hard dependency on Cbc static libraries, so we build both - configureFlags = [ "-C" "--enable-static" ]; + configureFlags = [ "-C" "--enable-static" ] + ++ lib.optionals stdenv.cc.isClang [ "CXXFLAGS=-std=c++14" ]; enableParallelBuilding = true; diff --git a/pkgs/applications/science/misc/foldingathome/client.nix b/pkgs/applications/science/misc/foldingathome/client.nix index cdc083a467d8..f61fe5b01857 100644 --- a/pkgs/applications/science/misc/foldingathome/client.nix +++ b/pkgs/applications/science/misc/foldingathome/client.nix @@ -1,8 +1,11 @@ { lib -, stdenv +, buildFHSEnv , fetchFromGitHub -, scons +, ocl-icd , openssl +, scons +, stdenv +, extraPkgs ? [ ] }: let version = "8.1.18"; @@ -14,57 +17,64 @@ let hash = "sha256-G0rknVmZiyC4sRTOowFjf7EQ5peGf+HLPPcLWXXFlX4="; }; - fah-web-client-bastetSrc = fetchFromGitHub { - owner = "foldingathome"; - repo = "fah-web-client-bastet"; - rev = "v${version}"; - hash = lib.fakeHash; - }; -in -stdenv.mkDerivation { - pname = "fah-client"; - inherit version; - - src = fetchFromGitHub { - owner = "FoldingAtHome"; - repo = "fah-client-bastet"; - rev = "v${version}"; - hash = "sha256-IgT/5NqCwN8N8OObjtASuT4IRb2EN4bdixxUdjiyddI="; - }; + fah-client = stdenv.mkDerivation { + pname = "fah-client"; + inherit version; - nativeBuildInputs = [ scons ]; + src = fetchFromGitHub { + owner = "FoldingAtHome"; + repo = "fah-client-bastet"; + rev = "v${version}"; + hash = "sha256-IgT/5NqCwN8N8OObjtASuT4IRb2EN4bdixxUdjiyddI="; + }; - buildInputs = [ openssl ]; + nativeBuildInputs = [ scons ]; - postUnpack = '' - export CBANG_HOME=$NIX_BUILD_TOP/cbang + buildInputs = [ openssl ]; - cp -r --no-preserve=mode ${cbangSrc} $CBANG_HOME - ''; + postUnpack = '' + export CBANG_HOME=$NIX_BUILD_TOP/cbang - preBuild = '' - scons -C $CBANG_HOME - ''; + cp -r --no-preserve=mode ${cbangSrc} $CBANG_HOME + ''; + + preBuild = '' + scons -C $CBANG_HOME + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/{bin,share/applications,share/feh-client} - installPhase = '' - runHook preInstall + cp fah-client $out/bin/fah-client - mkdir -p $out/{bin,share/applications,share/feh-client} + cp install/lin/fah-client.desktop $out/share/applications/ + cp -r images $out/share/feh-client/ - cp fah-client $out/bin/fah-client + sed -e "s|Icon=.*|Icon=$out/share/feh-client/images/fahlogo.png|g" -i $out/share/applications/fah-client.desktop + + runHook postInstall + ''; + + }; +in +buildFHSEnv { + name = fah-client.name; - cp install/lin/fah-client.desktop $out/share/applications/ - cp -r images $out/share/feh-client/ + targetPkgs = _: [ fah-client ocl-icd ] ++ extraPkgs; - sed -e "s|Icon=.*|Icon=$out/share/feh-client/images/fahlogo.png|g" -i $out/share/applications/fah-client.desktop + runScript = "/bin/fah-client"; - runHook postInstall + extraInstallCommands = '' + mv $out/bin/$name $out/bin/fah-client ''; meta = { description = "Folding@home client"; homepage = "https://foldingathome.org/"; license = lib.licenses.gpl3; + mainProgram = "fah-client"; maintainers = [ lib.maintainers.zimbatm ]; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/applications/video/video-trimmer/default.nix b/pkgs/applications/video/video-trimmer/default.nix index d3d55d2cb4a6..3ff12dbffcce 100644 --- a/pkgs/applications/video/video-trimmer/default.nix +++ b/pkgs/applications/video/video-trimmer/default.nix @@ -13,7 +13,7 @@ , gtk4 , libadwaita , gst_all_1 -, ffmpeg-full +, ffmpeg-headless }: stdenv.mkDerivation (finalAttrs: { @@ -63,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: { preFixup = '' gappsWrapperArgs+=( - --prefix PATH : "${lib.makeBinPath [ ffmpeg-full ]}" + --prefix PATH : "${lib.makeBinPath [ ffmpeg-headless ]}" ) ''; diff --git a/pkgs/build-support/templaterpm/default.nix b/pkgs/build-support/templaterpm/default.nix deleted file mode 100644 index 56c543e8a930..000000000000 --- a/pkgs/build-support/templaterpm/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{lib, stdenv, makeWrapper, python, toposort, rpm}: - -stdenv.mkDerivation { - pname = "nix-template-rpm"; - version = "0.1"; - - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ python toposort rpm ]; - - dontUnpack = true; - - installPhase = '' - mkdir -p $out/bin - cp ${./nix-template-rpm.py} $out/bin/nix-template-rpm - wrapProgram $out/bin/nix-template-rpm \ - --set PYTHONPATH "${rpm}/lib/${python.libPrefix}/site-packages":"${toposort}/lib/${python.libPrefix}/site-packages" - ''; - - meta = with lib; { - description = "Create templates of nix expressions from RPM .spec files"; - maintainers = with maintainers; [ ]; - platforms = platforms.unix; - hydraPlatforms = []; - }; -} diff --git a/pkgs/build-support/templaterpm/nix-template-rpm.py b/pkgs/build-support/templaterpm/nix-template-rpm.py deleted file mode 100755 index db8c0f2064c2..000000000000 --- a/pkgs/build-support/templaterpm/nix-template-rpm.py +++ /dev/null @@ -1,518 +0,0 @@ -#!/bin/env python - -import sys -import os -import subprocess -import argparse -import re -import shutil -import rpm -import urlparse -import traceback -import toposort - - - - - -class SPECTemplate(object): - def __init__(self, specFilename, outputDir, inputDir=None, buildRootInclude=None, translateTable=None, repositoryDir=None, allPackagesDir=None, maintainer="MAINTAINER"): - rpm.addMacro("buildroot","$out") - rpm.addMacro("_libdir","lib") - rpm.addMacro("_libexecdir","libexec") - rpm.addMacro("_sbindir","sbin") - rpm.addMacro("_sysconfdir","etc") - rpm.addMacro("_topdir","SPACER_DIR_FOR_REMOVAL") - rpm.addMacro("_sourcedir","SOURCE_DIR_SPACER") - - self.packageGroups = [ "ocaml", "python" ] - - ts = rpm.TransactionSet() - - self.specFilename = specFilename - self.spec = ts.parseSpec(specFilename) - - self.inputDir = inputDir - self.buildRootInclude = buildRootInclude - self.repositoryDir = repositoryDir - self.allPackagesDir = allPackagesDir - self.maintainer = maintainer - - self.translateTable = translateTable - - self.facts = self.getFacts() - self.key = self.getSelfKey() - - tmpDir = os.path.join(outputDir, self.rewriteName(self.spec.sourceHeader['name'])) - if self.translateTable is not None: - self.relOutputDir = self.translateTable.path(self.key,tmpDir) - else: - self.relOutputDir = tmpDir - - self.final_output_dir = os.path.normpath( self.relOutputDir ) - - if self.repositoryDir is not None: - self.potential_repository_dir = os.path.normpath( os.path.join(self.repositoryDir,self.relOutputDir) ) - - - - def rewriteCommands(self, string): - string = string.replace('SPACER_DIR_FOR_REMOVAL/','') - string = string.replace('SPACER_DIR_FOR_REMOVAL','') - string = '\n'.join(map(lambda line: ' '.join(map(lambda x: x.replace('SOURCE_DIR_SPACER/',('${./' if (self.buildRootInclude is None) else '${buildRoot}/usr/share/buildroot/SOURCES/'))+('}' if (self.buildRootInclude is None) else '') if x.startswith('SOURCE_DIR_SPACER/') else x, line.split(' '))), string.split('\n'))) - string = string.replace('\n','\n ') - string = string.rstrip() - return string - - - def rewriteName(self, string): - parts = string.split('-') - parts = filter(lambda x: not x == "devel", parts) - parts = filter(lambda x: not x == "doc", parts) - if len(parts) > 1 and parts[0] in self.packageGroups: - return parts[0] + '-' + ''.join(parts[1:2] + map(lambda x: x.capitalize(), parts[2:])) - else: - return ''.join(parts[:1] + map(lambda x: x.capitalize(), parts[1:])) - - - def rewriteInputs(self,target,inputs): - camelcase = lambda l: l[:1] + map(lambda x: x.capitalize(), l[1:]) - filterDevel = lambda l: filter(lambda x: not x == "devel", l) - filterDoc = lambda l: filter(lambda x: not x == "doc", l) - rewrite = lambda l: ''.join(camelcase(filterDoc(filterDevel(l)))) - - def filterPackageGroup(target): - if target is None: - return [ rewrite(x.split('-')) for x in inputs if (not x.split('-')[0] in self.packageGroups) or (len(x.split('-')) == 1) ] - elif target in self.packageGroups: - return [ target + '_' + rewrite(x.split('-')[1:]) for x in inputs if (x.split('-')[0] == target) and (len(x.split('-')) > 1)] - else: - raise Exception("Unknown target") - return [] - - if target is None: - packages = filterPackageGroup(None) - packages.sort() - elif target in self.packageGroups: - packages = filterPackageGroup(target) - packages.sort() - elif target == "ALL": - packages = [] - for t in [None] + self.packageGroups: - tmp = filterPackageGroup(t) - tmp.sort() - packages += tmp - else: - raise Exception("Unknown target") - packages = [] - - return packages - - - def getBuildInputs(self,target=None): - inputs = self.rewriteInputs(target,self.spec.sourceHeader['requires']) - if self.translateTable is not None: - return map(lambda x: self.translateTable.name(x), inputs) - else: - return inputs - - def getSelfKey(self): - name = self.spec.sourceHeader['name'] - if len(name.split('-')) > 1 and name.split('-')[0] in self.packageGroups: - key = self.rewriteInputs(name.split('-')[0], [self.spec.sourceHeader['name']])[0] - else: - key = self.rewriteInputs(None, [self.spec.sourceHeader['name']])[0] - return key - - def getSelf(self): - if self.translateTable is not None: - return self.translateTable.name(self.key) - else: - return self.key - - - - - def copyPatches(self, input_dir, output_dir): - patches = [source for (source, _, flag) in self.spec.sources if flag==2] - for filename in patches: - shutil.copyfile(os.path.join(input_dir, filename), os.path.join(output_dir, filename)) - - - def copySources(self, input_dir, output_dir): - filenames = [source for (source, _, flag) in self.spec.sources if flag==1 if not urlparse.urlparse(source).scheme in ["http", "https"] ] - for filename in filenames: - shutil.copyfile(os.path.join(input_dir, filename), os.path.join(output_dir, filename)) - - - def getFacts(self): - facts = {} - facts["name"] = self.rewriteName(self.spec.sourceHeader['name']) - facts["version"] = self.spec.sourceHeader['version'] - - facts["url"] = [] - facts["sha256"] = [] - sources = [source for (source, _, flag) in self.spec.sources if flag==1 if urlparse.urlparse(source).scheme in ["http", "https"] ] - for url in sources: - p = subprocess.Popen(['nix-prefetch-url', url], stdout=subprocess.PIPE, stderr=subprocess.PIPE) - output, err = p.communicate() - sha256 = output[:-1] #remove new line - facts["url"].append(url) - facts["sha256"].append(sha256) - - patches = [source for (source, _, flag) in self.spec.sources if flag==2] - if self.buildRootInclude is None: - facts["patches"] = map(lambda x: './'+x, patches) - else: - facts["patches"] = map(lambda x: '"${buildRoot}/usr/share/buildroot/SOURCES/'+x+'"', reversed(patches)) - - return facts - - - @property - def name(self): - out = ' name = "' + self.facts["name"] + '-' + self.facts["version"] + '";\n' - out += ' version = "' + self.facts['version'] + '";\n' - return out - - - @property - def src(self): - sources = [source for (source, _, flag) in self.spec.sources if flag==1 if urlparse.urlparse(source).scheme in ["http", "https"] ] - out = '' - for (url,sha256) in zip(self.facts['url'],self.facts['sha256']): - out += ' src = fetchurl {\n' - out += ' url = "' + url + '";\n' - out += ' sha256 = "' + sha256 + '";\n' - out += ' };\n' - return out - - - @property - def patch(self): - out = ' patches = [ ' + ' '.join(self.facts['patches']) + ' ];\n' - return out - - - @property - def buildInputs(self): - out = ' buildInputs = [ ' - out += ' '.join(self.getBuildInputs("ALL")) - out += ' ];\n' - return out - - - @property - def configure(self): - out = ' configurePhase = \'\'\n ' + self.rewriteCommands(self.spec.prep) + '\n \'\';\n'; - return out - - - @property - def build(self): - out = ' buildPhase = \'\'\n ' + self.rewriteCommands(self.spec.build) + '\n \'\';\n'; - return out - - - @property - def install(self): - out = ' installPhase = \'\'\n ' + self.rewriteCommands(self.spec.install) + '\n \'\';\n'; - return out - - @property - def ocamlExtra(self): - if "ocaml" in self.getBuildInputs("ALL"): - return ' createFindlibDestdir = true;\n' - else: - return '' - - - @property - def meta(self): - out = ' meta = with lib; {\n' - out += ' homepage = ' + self.spec.sourceHeader['url'] + ';\n' - out += ' description = "' + self.spec.sourceHeader['summary'] + '";\n' - out += ' license = lib.licenses.' + self.spec.sourceHeader['license'] + ';\n' - out += ' platforms = [ "i686-linux" "x86_64-linux" ];\n' - out += ' maintainers = with lib.maintainers; [ ' + self.maintainer + ' ];\n' - out += ' };\n' - out += '}\n' - return out - - - def __str__(self): - head = '{lib, stdenv, fetchurl, ' + ', '.join(self.getBuildInputs("ALL")) + '}:\n\n' - head += 'stdenv.mkDerivation {\n' - body = [ self.name, self.src, self.patch, self.buildInputs, self.configure, self.build, self.ocamlExtra, self.install, self.meta ] - return head + '\n'.join(body) - - - def getTemplate(self): - head = '{lib, stdenv, buildRoot, fetchurl, ' + ', '.join(self.getBuildInputs("ALL")) + '}:\n\n' - head += 'let\n' - head += ' buildRootInput = (import "${buildRoot}/usr/share/buildroot/buildRootInput.nix") { fetchurl=fetchurl; buildRoot=buildRoot; };\n' - head += 'in\n\n' - head += 'stdenv.mkDerivation {\n' - head += ' inherit (buildRootInput.'+self.rewriteName(self.spec.sourceHeader['name'])+') name version src;\n' - head += ' patches = buildRootInput.'+self.rewriteName(self.spec.sourceHeader['name'])+'.patches ++ [];\n\n' - body = [ self.buildInputs, self.configure, self.build, self.ocamlExtra, self.install, self.meta ] - return head + '\n'.join(body) - - - def getInclude(self): - head = self.rewriteName(self.spec.sourceHeader['name']) + ' = {\n' - body = [ self.name, self.src, self.patch ] - return head + '\n'.join(body) + '};\n' - - - def __cmp__(self,other): - if self.getSelf() in other.getBuildInputs("ALL"): - return 1 - else: - return -1 - - - def callPackage(self): - callPackage = ' ' + self.getSelf() + ' = callPackage ' + os.path.relpath(self.final_output_dir, self.allPackagesDir) + ' {' - newline = False; - for target in self.packageGroups: - tmp = self.getBuildInputs(target) - if len(tmp) > 0: - newline = True; - callPackage += '\n ' + 'inherit (' + target + 'Packages) ' + ' '.join(tmp) + ';' - if newline: - callPackage += '\n };' - else: - callPackage += ' };' - return callPackage - - - - def generateCombined(self): - if not os.path.exists(self.final_output_dir): - os.makedirs(self.final_output_dir) - - if self.inputDir is not None: - self.copySources(self.inputDir, self.final_output_dir) - self.copyPatches(self.inputDir, self.final_output_dir) - - nixfile = open(os.path.join(self.final_output_dir,'default.nix'), 'w') - nixfile.write(str(self)) - nixfile.close() - - shutil.copyfile(self.specFilename, os.path.join(self.final_output_dir, os.path.basename(self.specFilename))) - - - - def generateSplit(self): - if not os.path.exists(self.final_output_dir): - os.makedirs(self.final_output_dir) - - nixfile = open(os.path.join(self.final_output_dir,'default.nix'), 'w') - nixfile.write(self.getTemplate()) - nixfile.close() - - return self.getInclude() - - - - - - -class NixTemplate(object): - def __init__(self, nixfile): - self.nixfile = nixfile - self.original = { "name":None, "version":None, "url":None, "sha256":None, "patches":None } - self.update = { "name":None, "version":None, "url":None, "sha256":None, "patches":None } - self.matchedLines = {} - - if os.path.isfile(nixfile): - with file(nixfile, 'r') as infile: - for (n,line) in enumerate(infile): - name = re.match(r'^\s*name\s*=\s*"(.*?)"\s*;\s*$', line) - version = re.match(r'^\s*version\s*=\s*"(.*?)"\s*;\s*$', line) - url = re.match(r'^\s*url\s*=\s*"?(.*?)"?\s*;\s*$', line) - sha256 = re.match(r'^\s*sha256\s*=\s*"(.*?)"\s*;\s*$', line) - patches = re.match(r'^\s*patches\s*=\s*(\[.*?\])\s*;\s*$', line) - if name is not None and self.original["name"] is None: - self.original["name"] = name.group(1) - self.matchedLines[n] = "name" - if version is not None and self.original["version"] is None: - self.original["version"] = version.group(1) - self.matchedLines[n] = "version" - if url is not None and self.original["url"] is None: - self.original["url"] = url.group(1) - self.matchedLines[n] = "url" - if sha256 is not None and self.original["sha256"] is None: - self.original["sha256"] = sha256.group(1) - self.matchedLines[n] = "sha256" - if patches is not None and self.original["patches"] is None: - self.original["patches"] = patches.group(1) - self.matchedLines[n] = "patches" - - - def generateUpdated(self, nixOut): - nixTemplateFile = open(os.path.normpath(self.nixfile),'r') - nixOutFile = open(os.path.normpath(nixOut),'w') - for (n,line) in enumerate(nixTemplateFile): - if self.matchedLines.has_key(n) and self.update[self.matchedLines[n]] is not None: - nixOutFile.write(line.replace(self.original[self.matchedLines[n]], self.update[self.matchedLines[n]], 1)) - else: - nixOutFile.write(line) - nixTemplateFile.close() - nixOutFile.close() - - - def loadUpdate(self,orig): - if orig.has_key("name") and orig.has_key("version"): - self.update["name"] = orig["name"] + '-' + orig["version"] - self.update["version"] = orig["version"] - if orig.has_key("url") and orig.has_key("sha256") and len(orig["url"])>0: - self.update["url"] = orig["url"][0] - self.update["sha256"] = orig["sha256"][0] - for url in orig["url"][1:-1]: - sys.stderr.write("WARNING: URL has been dropped: %s\n" % url) - if orig.has_key("patches"): - self.update["patches"] = '[ ' + ' '.join(orig['patches']) + ' ]' - - -class TranslationTable(object): - def __init__(self): - self.tablePath = {} - self.tableName = {} - - def update(self, key, path, name=None): - self.tablePath[key] = path - if name is not None: - self.tableName[key] = name - - def readTable(self, tableFile): - with file(tableFile, 'r') as infile: - for line in infile: - match = re.match(r'^(.+?)\s+(.+?)\s+(.+?)\s*$', line) - if match is not None: - if not self.tablePath.has_key(match.group(1)): - self.tablePath[match.group(1)] = match.group(2) - if not self.tableName.has_key(match.group(1)): - self.tableName[match.group(1)] = match.group(3) - else: - match = re.match(r'^(.+?)\s+(.+?)\s*$', line) - if not self.tablePath.has_key(match.group(1)): - self.tablePath[match.group(1)] = match.group(2) - - def writeTable(self, tableFile): - outFile = open(os.path.normpath(tableFile),'w') - keys = self.tablePath.keys() - keys.sort() - for k in keys: - if self.tableName.has_key(k): - outFile.write( k + " " + self.tablePath[k] + " " + self.tableName[k] + "\n" ) - else: - outFile.write( k + " " + self.tablePath[k] + "\n" ) - outFile.close() - - def name(self, key): - if self.tableName.has_key(key): - return self.tableName[key] - else: - return key - - def path(self, key, orig): - if self.tablePath.has_key(key): - return self.tablePath[key] - else: - return orig - - - - - -if __name__ == "__main__": - #Parse command line options - parser = argparse.ArgumentParser(description="Generate .nix templates from RPM spec files") - parser.add_argument("specs", metavar="SPEC", nargs="+", help="spec file") - parser.add_argument("-o", "--output", metavar="OUT_DIR", required=True, help="output directory") - parser.add_argument("-b", "--buildRoot", metavar="BUILDROOT_DIR", default=None, help="buildroot output directory") - parser.add_argument("-i", "--inputSources", metavar="IN_DIR", default=None, help="sources input directory") - parser.add_argument("-m", "--maintainer", metavar="MAINTAINER", default="__NIX_MAINTAINER__", help="package maintainer") - parser.add_argument("-r", "--repository", metavar="REP_DIR", default=None, help="nix repository to compare output against") - parser.add_argument("-t", "--translate", metavar="TRANSLATE_TABLE", default=None, help="path of translation table for name and path") - parser.add_argument("-u", "--translateOut", metavar="TRANSLATE_OUT", default=None, help="output path for updated translation table") - parser.add_argument("-a", "--allPackages", metavar="ALL_PACKAGES", default=None, help="top level dir to call packages from") - args = parser.parse_args() - - allPackagesDir = os.path.normpath( os.path.dirname(args.allPackages) ) - if not os.path.exists(allPackagesDir): - os.makedirs(allPackagesDir) - - buildRootContent = {} - nameMap = {} - - newTable = TranslationTable() - if args.translate is not None: - table = TranslationTable() - table.readTable(args.translate) - newTable.readTable(args.translate) - else: - table = None - - for specPath in args.specs: - try: - sys.stderr.write("INFO: generate nix file from: %s\n" % specPath) - - spec = SPECTemplate(specPath, args.output, args.inputSources, args.buildRoot, table, args.repository, allPackagesDir, args.maintainer) - if args.repository is not None: - if os.path.exists(os.path.join(spec.potential_repository_dir,'default.nix')): - nixTemplate = NixTemplate(os.path.join(spec.potential_repository_dir,'default.nix')) - nixTemplate.loadUpdate(spec.facts) - if not os.path.exists(spec.final_output_dir): - os.makedirs(spec.final_output_dir) - nixTemplate.generateUpdated(os.path.join(spec.final_output_dir,'default.nix')) - else: - sys.stderr.write("WARNING: Repository does not contain template: %s\n" % os.path.join(spec.potential_repository_dir,'default.nix')) - if args.buildRoot is None: - spec.generateCombined() - else: - buildRootContent[spec.key] = spec.generateSplit() - else: - if args.buildRoot is None: - spec.generateCombined() - else: - buildRootContent[spec.key] = spec.generateSplit() - - newTable.update(spec.key,spec.relOutputDir,spec.getSelf()) - nameMap[spec.getSelf()] = spec - - except Exception, e: - sys.stderr.write("ERROR: %s failed with:\n%s\n%s\n" % (specPath,e.message,traceback.format_exc())) - - if args.translateOut is not None: - if not os.path.exists(os.path.dirname(os.path.normpath(args.translateOut))): - os.makedirs(os.path.dirname(os.path.normpath(args.translateOut))) - newTable.writeTable(args.translateOut) - - graph = {} - for k, v in nameMap.items(): - graph[k] = set(v.getBuildInputs("ALL")) - - sortedSpecs = toposort.toposort_flatten(graph) - sortedSpecs = filter( lambda x: x in nameMap.keys(), sortedSpecs) - - allPackagesFile = open(os.path.normpath( args.allPackages ), 'w') - allPackagesFile.write( '\n\n'.join(map(lambda x: x.callPackage(), map(lambda x: nameMap[x], sortedSpecs))) ) - allPackagesFile.close() - - if args.buildRoot is not None: - buildRootFilename = os.path.normpath( args.buildRoot ) - if not os.path.exists(os.path.dirname(buildRootFilename)): - os.makedirs(os.path.dirname(buildRootFilename)) - buildRootFile = open(buildRootFilename, 'w') - buildRootFile.write( "{ fetchurl, buildRoot }: {\n\n" ) - keys = buildRootContent.keys() - keys.sort() - for k in keys: - buildRootFile.write( buildRootContent[k] + '\n' ) - buildRootFile.write( "}\n" ) - buildRootFile.close() - - diff --git a/pkgs/by-name/cg/cgl/package.nix b/pkgs/by-name/cg/cgl/package.nix new file mode 100644 index 000000000000..e21029637181 --- /dev/null +++ b/pkgs/by-name/cg/cgl/package.nix @@ -0,0 +1,38 @@ +{ lib +, stdenv +, fetchFromGitHub +, pkg-config +, clp +, coin-utils +, osi +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "cgl"; + version = "0.60.8"; + + src = fetchFromGitHub { + owner = "coin-or"; + repo = "Cgl"; + rev = "releases/${finalAttrs.version}"; + hash = "sha256-nyqrHC6UOKp1wn6Yvk+53oBn60wUqSWEPUrcNTuPN04="; + }; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + clp + coin-utils + osi + ]; + + meta = with lib; { + description = "Cut Generator Library"; + homepage = "https://github.com/coin-or/Cgl"; + license = licenses.epl20; + maintainers = with maintainers; [ wegank ]; + platforms = platforms.unix; + }; +}) diff --git a/pkgs/by-name/pe/perl-debug-adapter/package.nix b/pkgs/by-name/pe/perl-debug-adapter/package.nix new file mode 100644 index 000000000000..4b1dd4e09ee6 --- /dev/null +++ b/pkgs/by-name/pe/perl-debug-adapter/package.nix @@ -0,0 +1,45 @@ +{ lib +, buildNpmPackage +, fetchFromGitHub +, fetchpatch +, makeWrapper +, perl +# Needed if you want to use it for a perl script with dependencies. +, extraPerlPackages ? [] +}: + +let + perlInterpreter = perl.withPackages(ps: [ + ps.PadWalker + ] ++ extraPerlPackages); +in buildNpmPackage rec { + pname = "perl-debug-adapter"; + version = "1.0.6"; + + src = fetchFromGitHub { + owner = "Nihilus118"; + repo = "perl-debug-adapter"; + rev = version; + hash = "sha256-IXXKhk4rzsWSPA0RT0L3CZuKlgTWtweZ4dQtruTigRs="; + }; + + npmDepsHash = "sha256-iw7+YC4qkrTVEJuZ9lnjNlUopTCp+fMNoIjFLutmrMw="; + + npmBuildScript = "compile"; + + makeWrapperArgs = [ + "--prefix" "PATH" ":" (lib.makeBinPath [ perlInterpreter ]) + ]; + passthru = { + inherit perlInterpreter; + }; + + meta = { + description = "Debug adapter, invokes perl -d and handles communication with VS Code or other editors"; + homepage = "https://github.com/Nihilus118/perl-debug-adapter"; + changelog = "https://github.com/Nihilus118/perl-debug-adapter/blob/${version}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ doronbehar ]; + mainProgram = "perl-debug-adapter"; + }; +} diff --git a/pkgs/by-name/pr/prettypst/Cargo.lock b/pkgs/by-name/pr/prettypst/Cargo.lock new file mode 100644 index 000000000000..3bda3573ab4f --- /dev/null +++ b/pkgs/by-name/pr/prettypst/Cargo.lock @@ -0,0 +1,471 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "anstream" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44" +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.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "317b9a89c1868f5ea6ff1d9539a69f45dffc21ce321ac1fd1160dfa48c8e2140" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" +dependencies = [ + "windows-sys", +] + +[[package]] +name = "anstyle-wincon" +version = "3.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628" +dependencies = [ + "anstyle", + "windows-sys", +] + +[[package]] +name = "clap" +version = "4.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2275f18819641850fa26c89acc84d465c1bf91ce57bc2748b28c420473352f64" +dependencies = [ + "clap_builder", + "clap_derive", +] + +[[package]] +name = "clap_builder" +version = "4.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07cdf1b148b25c1e1f7a42225e30a0d99a615cd4637eae7365548dd4529b95bc" +dependencies = [ + "anstream", + "anstyle", + "clap_lex", + "strsim", +] + +[[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.39", +] + +[[package]] +name = "clap_lex" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" + +[[package]] +name = "colorchoice" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" + +[[package]] +name = "comemo" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28a097f142aeb5b03af73595536cd55f5d649fca4d656379aac86b3af133cf92" +dependencies = [ + "comemo-macros", + "siphasher", +] + +[[package]] +name = "comemo-macros" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "168cc09917f6a014a4cf6ed166d1b541a20a768c60f9cc348f25203ee8312940" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "ecow" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6ea5e3f9cda726431da9d1a8d5a29785d544b31e98e1ca7a210906244002e02" +dependencies = [ + "serde", +] + +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + +[[package]] +name = "hashbrown" +version = "0.14.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156" + +[[package]] +name = "heck" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" + +[[package]] +name = "indexmap" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" +dependencies = [ + "equivalent", + "hashbrown", +] + +[[package]] +name = "memchr" +version = "2.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" + +[[package]] +name = "once_cell" +version = "1.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" + +[[package]] +name = "pin-project-lite" +version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" + +[[package]] +name = "prettypst" +version = "1.0.0" +dependencies = [ + "clap", + "serde", + "thiserror", + "toml", + "typst-syntax", +] + +[[package]] +name = "proc-macro2" +version = "1.0.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quote" +version = "1.0.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +dependencies = [ + "proc-macro2", +] + +[[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.39", +] + +[[package]] +name = "serde_spanned" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12022b835073e5b11e90a14f86838ceb1c8fb0325b72416845c487ac0fa95e80" +dependencies = [ + "serde", +] + +[[package]] +name = "siphasher" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" + +[[package]] +name = "strsim" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + +[[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.39" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "thiserror" +version = "1.0.50" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.50" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[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", + "serde", + "serde_spanned", + "toml_datetime", + "winnow", +] + +[[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.39", +] + +[[package]] +name = "tracing-core" +version = "0.1.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +dependencies = [ + "once_cell", +] + +[[package]] +name = "typst-syntax" +version = "0.9.0" +source = "git+https://github.com/typst/typst.git?tag=v0.9.0#7bb4f6df44086b4c1120b227f7ae963e6c2ad5ab" +dependencies = [ + "comemo", + "ecow", + "once_cell", + "serde", + "tracing", + "unicode-ident", + "unicode-math-class", + "unicode-segmentation", + "unscanny", +] + +[[package]] +name = "unicode-ident" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" + +[[package]] +name = "unicode-math-class" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d246cf599d5fae3c8d56e04b20eb519adb89a8af8d0b0fbcded369aa3647d65" + +[[package]] +name = "unicode-segmentation" +version = "1.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" + +[[package]] +name = "unscanny" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e9df2af067a7953e9c3831320f35c1cc0600c30d44d9f7a12b01db1cd88d6b47" + +[[package]] +name = "utf8parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-targets" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", +] + +[[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_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[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_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[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_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "winnow" +version = "0.5.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "829846f3e3db426d4cee4510841b71a8e58aa2a76b1132579487ae430ccd9c7b" +dependencies = [ + "memchr", +] diff --git a/pkgs/by-name/pr/prettypst/package.nix b/pkgs/by-name/pr/prettypst/package.nix new file mode 100644 index 000000000000..52529f1846b9 --- /dev/null +++ b/pkgs/by-name/pr/prettypst/package.nix @@ -0,0 +1,31 @@ +{ lib +, rustPlatform +, fetchFromGitHub +}: + +rustPlatform.buildRustPackage { + pname = "prettypst"; + version = "unstable-2023-11-27"; + + src = fetchFromGitHub { + owner = "antonWetzel"; + repo = "prettypst"; + rev = "0bf6aa013efa2b059d8c7dcae3441a6004b02fa1"; + hash = "sha256-8rAF7tzs+0qGphmanTvx6MXhYOSG6igAMY4ZLkljRp8="; + }; + + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "typst-syntax-0.9.0" = "sha256-LwRB/AQE8TZZyHEQ7kKB10itzEgYjg4R/k+YFqmutDc="; + }; + }; + + meta = { + description = "Formatter for Typst"; + homepage = "https://github.com/antonWetzel/prettypst"; + license = lib.licenses.mit; + mainProgram = "prettypst"; + maintainers = with lib.maintainers; [ drupol ]; + }; +} diff --git a/pkgs/tools/typesetting/typst/Cargo.lock b/pkgs/by-name/ty/typst/Cargo.lock index ae81d73200a3..b5a869b62793 100644 --- a/pkgs/tools/typesetting/typst/Cargo.lock +++ b/pkgs/by-name/ty/typst/Cargo.lock @@ -9,28 +9,6 @@ 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 = "ahash" -version = "0.7.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a824f2aa7e75a0c98c5a504fceb80649e9c35265d44525b5f94de4771a395cd" -dependencies = [ - "getrandom", - "once_cell", - "version_check", -] - -[[package]] name = "ahash" version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -155,16 +133,10 @@ 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 = "biblatex" -version = "0.8.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e41df82f0d1c4919d946bb0c7c3d179b6071246243d308a1bdee6cfecee3bc7" +checksum = "88be3c837773ba281f5fd6674c1c82565c62726abe3d76707da6fb9d434cc392" dependencies = [ "numerals", "paste", @@ -225,43 +197,12 @@ dependencies = [ ] [[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 = "bumpalo" version = "3.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" [[package]] -name = "bytecheck" -version = "0.6.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b6372023ac861f6e6dc89c8344a8f398fb42aaba2b5dbc649ca0c0e9dbcb627" -dependencies = [ - "bytecheck_derive", - "ptr_meta", - "simdutf8", -] - -[[package]] -name = "bytecheck_derive" -version = "0.6.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7ec4c6f261935ad534c0c22dbef2201b45918860eb1c574b972bd213a76af61" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] name = "bytemuck" version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -274,33 +215,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] -name = "bzip2" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdb116a6ef3f6c3698828873ad02c3014b3c85cadb88496095628e3ef1e347f8" -dependencies = [ - "bzip2-sys", - "libc", -] - -[[package]] -name = "bzip2-sys" -version = "0.1.11+1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "736a955f3fa7875102d57c82b8cac37ec45224a07fd32d58f9f7a186b6cd4cdc" -dependencies = [ - "cc", - "libc", - "pkg-config", -] - -[[package]] name = "cc" version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" dependencies = [ - "jobserver", "libc", ] @@ -324,9 +243,9 @@ dependencies = [ [[package]] name = "chinese-variant" -version = "1.0.9" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aeea139b89efab957972956e5d3e4efb66a6c261f726abf6911040cc8ef700f7" +checksum = "17df2e16b0704fc5413214165d1bfdd619f18b1044d5991d5c5351b05fee852e" [[package]] name = "chrono" @@ -368,20 +287,10 @@ dependencies = [ ] [[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 = "citationberg" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c857faf24e89710f105b623c174508070a9e11e056a749f251ca4c56f59ad88" +checksum = "c15a0bf8014b266d11f20451dc9202d8d26180ffd8b094d73ecbe74d821f01fb" dependencies = [ "quick-xml 0.28.2", "serde", @@ -389,9 +298,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.4.7" +version = "4.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac495e00dcec98c83465d5ad66c5c4fabd652fd6686e7c6269b117e729a6f17b" +checksum = "2275f18819641850fa26c89acc84d465c1bf91ce57bc2748b28c420473352f64" dependencies = [ "clap_builder", "clap_derive", @@ -399,9 +308,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.4.7" +version = "4.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c77ed9a32a62e6ca27175d00d29d05ca32e396ea1eb5fb01d8256b669cec7663" +checksum = "07cdf1b148b25c1e1f7a42225e30a0d99a615cd4637eae7365548dd4529b95bc" dependencies = [ "anstream", "anstyle", @@ -427,7 +336,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -476,32 +385,26 @@ checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" [[package]] name = "comemo" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28a097f142aeb5b03af73595536cd55f5d649fca4d656379aac86b3af133cf92" +checksum = "bf5705468fa80602ee6a5f9318306e6c428bffd53e43209a78bc05e6e667c6f4" dependencies = [ "comemo-macros", - "siphasher", + "siphasher 1.0.0", ] [[package]] name = "comemo-macros" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "168cc09917f6a014a4cf6ed166d1b541a20a768c60f9cc348f25203ee8312940" +checksum = "54af6ac68ada2d161fa9cc1ab52676228e340866d094d6542107e74b82acc095" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.39", ] [[package]] -name = "constant_time_eq" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" - -[[package]] name = "core-foundation-sys" version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -517,15 +420,6 @@ dependencies = [ ] [[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" @@ -578,16 +472,6 @@ dependencies = [ ] [[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 = "csv" version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -615,7 +499,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" dependencies = [ "cfg-if", - "hashbrown 0.14.2", + "hashbrown 0.14.3", "lock_api", "once_cell", "parking_lot_core", @@ -623,29 +507,9 @@ dependencies = [ [[package]] name = "data-url" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41b319d1b62ffbd002e057f36bebd1f42b9f97927c9577461d855f3513c4289f" - -[[package]] -name = "deranged" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f32d04922c60427da6f9fef14d042d9edddef64cb9d4ce0d64d0685fbeb1fd3" -dependencies = [ - "powerfmt", -] - -[[package]] -name = "digest" -version = "0.10.7" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" -dependencies = [ - "block-buffer", - "crypto-common", - "subtle", -] +checksum = "5c297a1c74b71ae29df00c3e22dd9534821d60eb9af5a0192823fa2acea70c2a" [[package]] name = "dirs" @@ -676,7 +540,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -716,14 +580,14 @@ dependencies = [ "num-traits", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] name = "env_logger" -version = "0.10.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" +checksum = "95b3f3e67048839cb0d0781f445682a35113da7121f7c949db0e2be96a4fbece" dependencies = [ "log", ] @@ -746,9 +610,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.5" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860" +checksum = "f258a7194e7f7c2a7837a8913aeab7fd8c383457034fa20ce4dd3dcb813e8eb8" dependencies = [ "libc", "windows-sys", @@ -787,9 +651,9 @@ checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" [[package]] name = "fdeflate" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d329bdeac514ee06249dabc27877490f17f5d371ec693360768b838e19f3ae10" +checksum = "64d6dafc854908ff5da46ff3f8f473c6984119a2876a383a860246dd7841a868" dependencies = [ "simd-adler32", ] @@ -853,9 +717,9 @@ dependencies = [ [[package]] name = "form_urlencoded" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" dependencies = [ "percent-encoding", ] @@ -876,16 +740,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" [[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 = "getopts" version = "0.2.21" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -896,9 +750,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.10" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" +checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" dependencies = [ "cfg-if", "libc", @@ -926,29 +780,25 @@ name = "hashbrown" version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" -dependencies = [ - "ahash 0.7.7", -] [[package]] name = "hashbrown" -version = "0.14.2" +version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156" +checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" [[package]] name = "hayagriva" -version = "0.4.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5af3d464a6b5ae882f15fe1da4e696fd96b77fee78ded933e0ad81d1d87cbc5" +checksum = "f9f97c07366b7f686741521ca63cc14baf18cea53c39b0c09873cd1d4a1b2b8c" dependencies = [ "biblatex", "ciborium", "citationberg", - "indexmap 2.0.2", + "indexmap 2.1.0", "numerals", "paste", - "rkyv", "serde", "serde_yaml 0.9.27", "thiserror", @@ -971,15 +821,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" [[package]] -name = "hmac" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" -dependencies = [ - "digest", -] - -[[package]] name = "hypher" version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -988,7 +829,7 @@ checksum = "94bf16dd62ea2bec617a6f8a3e1ba03107311783069a647787ac689d1f35321e" [[package]] name = "iai" version = "0.1.1" -source = "git+https://github.com/typst/iai#3f0f92736408ebce6545808b98e0cb2aea89b7dd" +source = "git+https://github.com/typst/iai?rev=3f0f927#3f0f92736408ebce6545808b98e0cb2aea89b7dd" dependencies = [ "cfg-if", ] @@ -1018,9 +859,9 @@ dependencies = [ [[package]] name = "icu_collections" -version = "1.3.2" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3907b2246e8dd5a29ead8a965e7c0c8a90e9b928e614a4279257d45c5e553e91" +checksum = "137d96353afc8544d437e8a99eceb10ab291352699573b0de5b08bda38c78c60" dependencies = [ "displaydoc", "serde", @@ -1031,9 +872,9 @@ dependencies = [ [[package]] name = "icu_locid" -version = "1.3.2" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f284eb342dc49d3e9d9f3b188489d76b5d22dfb1d1a5e0d1941811253bac625c" +checksum = "5c0aa2536adc14c07e2a521e95512b75ed8ef832f0fdf9299d4a0a45d2be2a9d" dependencies = [ "displaydoc", "litemap", @@ -1044,9 +885,9 @@ dependencies = [ [[package]] name = "icu_locid_transform" -version = "1.3.2" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6551daf80882d8e68eee186cc19e132d8bde1b1f059a79b93384a5ca0e8fc5e7" +checksum = "57c17d8f6524fdca4471101dd71f0a132eb6382b5d6d7f2970441cb25f6f435a" dependencies = [ "displaydoc", "icu_locid", @@ -1058,15 +899,15 @@ dependencies = [ [[package]] name = "icu_locid_transform_data" -version = "1.3.2" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a741eba5431f75eb2f1f9022d3cffabcadda6771e54fb4e77c8ba8653e4da44" +checksum = "545c6c3e8bf9580e2dafee8de6f9ec14826aaf359787789c7724f1f85f47d3dc" [[package]] name = "icu_properties" -version = "1.3.2" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3477ae70f8ca8dc08ff7574b5398ed0a2f2e4e6b66bdff2558a92ed67e262be1" +checksum = "976e296217453af983efa25f287a4c1da04b9a63bf1ed63719455068e4453eb5" dependencies = [ "displaydoc", "icu_collections", @@ -1080,15 +921,15 @@ dependencies = [ [[package]] name = "icu_properties_data" -version = "1.3.4" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98507b488098f45eb95ef495612a2012e4d8ad6095dda86cb2f1728aa2204a60" +checksum = "f6a86c0e384532b06b6c104814f9c1b13bcd5b64409001c0d05713a1f3529d99" [[package]] name = "icu_provider" -version = "1.3.2" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68acdef80034b5e35d8524e9817479d389a4f9774f3f0cbe1bf3884d80fd5934" +checksum = "ba58e782287eb6950247abbf11719f83f5d4e4a5c1f2cd490d30a334bc47c2f4" dependencies = [ "displaydoc", "icu_locid", @@ -1105,9 +946,9 @@ dependencies = [ [[package]] name = "icu_provider_adapters" -version = "1.3.2" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36b380ef2d3d93b015cd0563d7e0d005cc07f82a5503716dbc191798d0079e1d" +checksum = "a229f978260da7c3aabb68cb7dc7316589936680570fe55e50fdd3f97711a4dd" dependencies = [ "icu_locid", "icu_locid_transform", @@ -1118,33 +959,34 @@ dependencies = [ [[package]] name = "icu_provider_blob" -version = "1.3.2" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c31326d28c7f95a964a4f0ee86c24002da5f6db907e3bcb079949b4ff103b6a9" +checksum = "4a7202cddda672db167c6352719959e9b01cb1ca576d32fa79103f61b5a73601" dependencies = [ "icu_provider", "postcard", "serde", "writeable", + "zerotrie", "zerovec", ] [[package]] name = "icu_provider_macros" -version = "1.3.2" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2060258edfcfe32ca7058849bf0f146cb5c59aadbedf480333c0d0002f97bc99" +checksum = "d2abdd3a62551e8337af119c5899e600ca0c88ec8f23a46c60ba216c803dcf1a" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] name = "icu_segmenter" -version = "1.3.2" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcb3c1981ce2187a745f391a741cb14e77453325acb3b2e014b05da51c0a39f2" +checksum = "b2dc1e8f4ba33a6a4956770ac5c08570f255d6605519fb3a859a0c0a270a2f8f" dependencies = [ "core_maths", "displaydoc", @@ -1159,15 +1001,15 @@ dependencies = [ [[package]] name = "icu_segmenter_data" -version = "1.3.2" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9703f6713044d1c0a1335a6d78ffece4c9380582416ace6feeb608e84d279fc7" +checksum = "3673d6698dcffce08cfe8fc5da3c11c3f2c663d5d6137fd58ab2cbf44235ab46" [[package]] name = "idna" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" dependencies = [ "unicode-bidi", "unicode-normalization", @@ -1232,12 +1074,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.0.2" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897" +checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" dependencies = [ "equivalent", - "hashbrown 0.14.2", + "hashbrown 0.14.3", "rayon", "serde", ] @@ -1250,17 +1092,17 @@ checksum = "8e04e2fd2b8188ea827b32ef11de88377086d690286ab35747ef7f9bf3ccb590" [[package]] name = "inferno" -version = "0.11.17" +version = "0.11.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c50453ec3a6555fad17b1cd1a80d16af5bc7cb35094f64e429fd46549018c6a3" +checksum = "321f0f839cd44a4686e9504b0a62b4d69a50b62072144c71c68f5873c167b8d9" dependencies = [ - "ahash 0.8.6", + "ahash", "clap", "crossbeam-channel", "crossbeam-utils", "dashmap", "env_logger", - "indexmap 2.0.2", + "indexmap 2.1.0", "is-terminal", "itoa", "log", @@ -1292,15 +1134,6 @@ dependencies = [ ] [[package]] -name = "inout" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" -dependencies = [ - "generic-array", -] - -[[package]] name = "instant" version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1346,15 +1179,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" [[package]] -name = "jobserver" -version = "0.1.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d" -dependencies = [ - "libc", -] - -[[package]] name = "jpeg-decoder" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1362,9 +1186,9 @@ checksum = "bc0000e42512c92e31c2252315bda326620a4e034105e900c98ec492fa077b3e" [[package]] name = "js-sys" -version = "0.3.64" +version = "0.3.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" +checksum = "cee9c64da59eae3b50095c18d3e74f8b73c0b86d2792824ff01bbce68ba229ca" dependencies = [ "wasm-bindgen", ] @@ -1406,24 +1230,24 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.149" +version = "0.2.150" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" +checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" [[package]] name = "libdeflate-sys" -version = "0.14.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "012437ac39c1e7d7ba12af3aceceb5c93149779aa17c2b1c483f33954957ddc8" +checksum = "67921a7f85100c1559efc3d1c7c472091b7da05f304b4bbd5356f075e97f1cc2" dependencies = [ "cc", ] [[package]] name = "libdeflater" -version = "0.14.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58b30f982ddb14aae2a24a7ed7b3d512d687c2483493f95de7a6d167942a19c3" +checksum = "3a31b22f662350ec294b13859f935aea772ba7b2bc8776269f4a5627308eab7d" dependencies = [ "libdeflate-sys", ] @@ -1435,6 +1259,17 @@ 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 0.4.1", +] + +[[package]] name = "line-wrap" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1451,9 +1286,9 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" [[package]] name = "linux-raw-sys" -version = "0.4.10" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f" +checksum = "969488b55f8ac402214f3f5fd243ebb7206cf82de60d3172994707a4bcc2b829" [[package]] name = "lipsum" @@ -1467,9 +1302,12 @@ dependencies = [ [[package]] name = "litemap" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77a1a2647d5b7134127971a6de0d533c49de2159167e7f259c427195f87168a1" +checksum = "f9d642685b028806386b2b6e75685faadd3eb65a85fff7df711ce18446a422da" +dependencies = [ + "serde", +] [[package]] name = "lock_api" @@ -1638,9 +1476,9 @@ checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] name = "open" -version = "5.0.0" +version = "5.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfabf1927dce4d6fdf563d63328a0a506101ced3ec780ca2135747336c98cef8" +checksum = "90878fb664448b54c4e592455ad02831e23a3f7e157374a8b95654731aac7349" dependencies = [ "is-wsl", "libc", @@ -1661,13 +1499,14 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" [[package]] name = "oxipng" -version = "8.0.0" -source = "git+https://github.com/typst/oxipng?rev=b8ec65b#b8ec65b3ca42dde33c85149b6e402e891527f802" +version = "9.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28e5c341ef78a228e47a551bfd15ff885d8c501af49f953358763a538c01f14d" dependencies = [ "bitvec", "crossbeam-channel", "filetime", - "indexmap 2.0.2", + "indexmap 2.1.0", "libdeflater", "log", "rayon", @@ -1697,7 +1536,7 @@ checksum = "b7db010ec5ff3d4385e4f133916faacd9dad0f6a09394c92d825b3aed310fa0a" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -1714,17 +1553,6 @@ dependencies = [ ] [[package]] -name = "password-hash" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7676374caaee8a325c9e7a2ae557f216c5563a171d6997b0ef8a65af35147700" -dependencies = [ - "base64ct", - "rand_core", - "subtle", -] - -[[package]] name = "paste" version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1737,22 +1565,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" [[package]] -name = "pbkdf2" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917" -dependencies = [ - "digest", - "hmac", - "password-hash", - "sha2", -] - -[[package]] name = "pdf-writer" -version = "0.9.1" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "690874e8cf95d36ddffbdbdaad6ef8714c88bf8085996b673559389a04e38a02" +checksum = "644b654f2de28457bf1e25a4905a76a563d1128a33ce60cf042f721f6818feaf" dependencies = [ "bitflags 1.3.2", "itoa", @@ -1762,9 +1578,47 @@ dependencies = [ [[package]] name = "percent-encoding" -version = "2.3.0" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" + +[[package]] +name = "phf" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" +dependencies = [ + "phf_shared", +] + +[[package]] +name = "phf_codegen" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8d39688d359e6b34654d328e262234662d16cc0f60ec8dcbe5e718709342a5a" +dependencies = [ + "phf_generator", + "phf_shared", +] + +[[package]] +name = "phf_generator" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" +dependencies = [ + "phf_shared", + "rand", +] + +[[package]] +name = "phf_shared" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" +checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" +dependencies = [ + "siphasher 0.3.11", +] [[package]] name = "pico-args" @@ -1832,12 +1686,6 @@ dependencies = [ ] [[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" @@ -1845,9 +1693,9 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "proc-macro2" -version = "1.0.69" +version = "1.0.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" +checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b" dependencies = [ "unicode-ident", ] @@ -1862,26 +1710,6 @@ dependencies = [ ] [[package]] -name = "ptr_meta" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0738ccf7ea06b608c10564b31debd4f5bc5e197fc8bfe088f68ae5ce81e7a4f1" -dependencies = [ - "ptr_meta_derive", -] - -[[package]] -name = "ptr_meta_derive" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16b845dbfca988fa33db069c0e230574d15a3088f147a87b64c7589eb662c9ac" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] name = "pulldown-cmark" version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1942,6 +1770,8 @@ version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ + "libc", + "rand_chacha", "rand_core", ] @@ -1960,6 +1790,9 @@ name = "rand_core" version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom", +] [[package]] name = "rayon" @@ -1989,15 +1822,6 @@ checksum = "3b42e27ef78c35d3998403c1d26f3efd9e135d3e5121b0a4845cc5cc27547f4f" [[package]] name = "redox_syscall" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" -dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "redox_syscall" version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" @@ -2016,12 +1840,12 @@ dependencies = [ [[package]] name = "redox_users" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" +checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" dependencies = [ "getrandom", - "redox_syscall 0.2.16", + "libredox", "thiserror", ] @@ -2061,15 +1885,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] -name = "rend" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2571463863a6bd50c32f94402933f03457a3fbaf697a707c5be741e459f08fd" -dependencies = [ - "bytecheck", -] - -[[package]] name = "resvg" version = "0.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2110,34 +1925,6 @@ dependencies = [ ] [[package]] -name = "rkyv" -version = "0.7.42" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0200c8230b013893c0b2d6213d6ec64ed2b9be2e0e016682b7224ff82cff5c58" -dependencies = [ - "bitvec", - "bytecheck", - "hashbrown 0.12.3", - "ptr_meta", - "rend", - "rkyv_derive", - "seahash", - "tinyvec", - "uuid", -] - -[[package]] -name = "rkyv_derive" -version = "0.7.42" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2e06b915b5c230a17d7a736d1e2e63ee753c256a8614ef3f5147b13a4f5541d" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] name = "roff" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2169,9 +1956,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.21" +version = "0.38.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b426b0506e5d50a7d8dafcf2e81471400deb602392c7dd110815afb4eaf02a3" +checksum = "dc99bc2d4f1fed22595588a013687477aedf3cdcfb26558c559edb67b4d9b22e" dependencies = [ "bitflags 2.4.1", "errno", @@ -2182,9 +1969,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.21.8" +version = "0.21.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "446e14c5cda4f3f30fe71863c34ec70f5ac79d6087097ad0bb433e1be5edf04c" +checksum = "629648aced5775d558af50b2b4c7b02983a04b312126d45eeead26e7caa498b9" dependencies = [ "log", "ring", @@ -2194,9 +1981,9 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" +checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" dependencies = [ "base64", ] @@ -2271,15 +2058,10 @@ dependencies = [ ] [[package]] -name = "seahash" -version = "4.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" - -[[package]] name = "self-replace" -version = "1.3.5" -source = "git+https://github.com/typst/self-replace#2e6d5e4808bba73b713fd85cf5616b7d846143c2" +version = "1.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "525db198616b2bcd0f245daf7bfd8130222f7ee6af9ff9984c19a61bf1160c55" dependencies = [ "fastrand 1.9.0", "tempfile", @@ -2294,22 +2076,22 @@ checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" [[package]] name = "serde" -version = "1.0.190" +version = "1.0.193" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91d3c334ca1ee894a2c6f6ad698fe8c435b76d504b13d436f0685d648d6d96f7" +checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.190" +version = "1.0.193" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67c5609f394e5c2bd7fc51efda478004ea80ef42fee983d5c67a65e34f32c0e3" +checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -2350,7 +2132,7 @@ version = "0.9.27" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3cc7a1570e38322cfe4154732e5110f887ea57e22b76f4bfd32b5bdd3368666c" dependencies = [ - "indexmap 2.0.2", + "indexmap 2.1.0", "itoa", "ryu", "serde", @@ -2358,28 +2140,6 @@ dependencies = [ ] [[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" @@ -2395,12 +2155,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" [[package]] -name = "simdutf8" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f27f6278552951f1f2b8cf9da965d10969b2efdea95a6ec47987ab46edfe263a" - -[[package]] name = "simplecss" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2416,6 +2170,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" [[package]] +name = "siphasher" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54ac45299ccbd390721be55b412d41931911f654fa99e2cb8bfb57184b2061fe" + +[[package]] name = "slotmap" version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2426,9 +2186,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.1" +version = "1.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a" +checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" [[package]] name = "spin" @@ -2505,19 +2265,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09eab8a83bff89ba2200bd4c59be45c7c787f988431b936099a5a266c957f2f9" [[package]] -name = "subtle" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" - -[[package]] name = "svg2pdf" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "363c5346967da04bf3ebb3d8bafa7f52c53c810167047904df1960eac3fc08b7" +checksum = "a81da66842e426278f20062cd249779565e13f9ab4bfe0ac9e94eb476bc3a0f3" dependencies = [ "image", "miniz_oxide", + "once_cell", "pdf-writer", "usvg", ] @@ -2529,7 +2284,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d71499ff2d42f59d26edb21369a308ede691421f79ebc0f001e2b1fd3a7c9e52" dependencies = [ "kurbo", - "siphasher", + "siphasher 0.3.11", ] [[package]] @@ -2545,9 +2300,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.38" +version = "2.0.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b" +checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a" dependencies = [ "proc-macro2", "quote", @@ -2562,7 +2317,7 @@ checksum = "285ba80e733fac80aa4270fbcdf83772a79b80aa35c97075320abfee4a915b06" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", "unicode-xid", ] @@ -2619,9 +2374,9 @@ dependencies = [ [[package]] name = "termcolor" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6093bad37da69aab9d123a8091e4be0aa4a03e4d601ec641c327398315f62b64" +checksum = "ff1bc3d3f05aff0403e8ac0d92ced918ec05b666a43f83297ccef5bea8a3d449" dependencies = [ "winapi-util", ] @@ -2643,7 +2398,7 @@ checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -2658,13 +2413,11 @@ dependencies = [ [[package]] name = "time" -version = "0.3.30" +version = "0.3.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5" +checksum = "cd0cbfecb4d19b5ea75bb31ad904eb5b9fa13f21079c3b92017ebdf4999a5890" dependencies = [ - "deranged", "itoa", - "powerfmt", "serde", "time-core", "time-macros", @@ -2672,15 +2425,15 @@ dependencies = [ [[package]] name = "time-core" -version = "0.1.2" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" +checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd" [[package]] name = "time-macros" -version = "0.2.15" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20" +checksum = "fd80a657e71da814b8e5d60d3374fc6d35045062245d80224748ae522dd76f36" dependencies = [ "time-core", ] @@ -2713,9 +2466,9 @@ dependencies = [ [[package]] name = "tinystr" -version = "0.7.4" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5d0e245e80bdc9b4e5356fc45a72184abbc3861992603f515270e9340f5a219" +checksum = "83c02bf3c538ab32ba913408224323915f4ef9a6d61c0e85d493f355921c0ece" dependencies = [ "displaydoc", "serde", @@ -2739,9 +2492,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "toml" -version = "0.8.6" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ff9e3abce27ee2c9a37f9ad37238c1bdd4e789c84ba37df76aa4d528f5072cc" +checksum = "a1a195ec8c9da26928f773888e0742ca3ca1040c6cd859c919c9f59c1954ab35" dependencies = [ "serde", "serde_spanned", @@ -2760,11 +2513,11 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.20.7" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81" +checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03" dependencies = [ - "indexmap 2.0.2", + "indexmap 2.1.0", "serde", "serde_spanned", "toml_datetime", @@ -2790,7 +2543,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -2826,9 +2579,9 @@ dependencies = [ [[package]] name = "tracing-log" -version = "0.1.4" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f751112709b4e791d8ce53e32c4ed2d353565a795ce84da2285393f41557bdf2" +checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" dependencies = [ "log", "once_cell", @@ -2837,9 +2590,9 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.3.17" +version = "0.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77" +checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" dependencies = [ "nu-ansi-term", "sharded-slab", @@ -2862,62 +2615,60 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6af6ae20167a9ece4bcb41af5b80f8a1f1df981f6391189ce00fd257af04126a" [[package]] -name = "typenum" -version = "1.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" - -[[package]] name = "typst" -version = "0.9.0" +version = "0.10.0" dependencies = [ - "base64", + "az", "bitflags 2.4.1", - "bytemuck", + "chinese-number", + "ciborium", "comemo", + "csv", "ecow", - "flate2", "fontdb", + "hayagriva", + "hypher", + "icu_properties", + "icu_provider", + "icu_provider_adapters", + "icu_provider_blob", + "icu_segmenter", "image", - "indexmap 2.0.2", + "indexmap 2.1.0", "kurbo", + "lipsum", "log", - "miniz_oxide", "once_cell", "palette", - "pdf-writer", - "pixglyph", + "rayon", "regex", - "resvg", "roxmltree", "rustybuzz", "serde", - "siphasher", + "serde_json", + "serde_yaml 0.9.27", + "siphasher 1.0.0", + "smallvec", "stacker", - "subsetter", - "svg2pdf", + "syntect", "time", - "tiny-skia", "toml", "tracing", "ttf-parser", + "typed-arena", "typst-macros", "typst-syntax", - "unicode-ident", + "unicode-bidi", "unicode-math-class", - "unicode-properties", + "unicode-script", "unicode-segmentation", - "unscanny", "usvg", "wasmi", - "xmlparser", - "xmlwriter", - "xmp-writer", ] [[package]] name = "typst-cli" -version = "0.9.0" +version = "0.10.0" dependencies = [ "chrono", "clap", @@ -2928,7 +2679,6 @@ dependencies = [ "dirs", "ecow", "env_proxy", - "filetime", "flate2", "fontdb", "inferno", @@ -2944,7 +2694,7 @@ dependencies = [ "serde", "serde_json", "serde_yaml 0.9.27", - "siphasher", + "siphasher 1.0.0", "tar", "tempfile", "tracing", @@ -2952,7 +2702,9 @@ dependencies = [ "tracing-flame", "tracing-subscriber", "typst", - "typst-library", + "typst-pdf", + "typst-render", + "typst-svg", "ureq", "xz2", "zip", @@ -2960,7 +2712,7 @@ dependencies = [ [[package]] name = "typst-docs" -version = "0.9.0" +version = "0.10.0" dependencies = [ "comemo", "ecow", @@ -2973,7 +2725,6 @@ dependencies = [ "syntect", "typed-arena", "typst", - "typst-library", "unicode_names2", "unscanny", "yaml-front-matter", @@ -2981,7 +2732,7 @@ dependencies = [ [[package]] name = "typst-ide" -version = "0.9.0" +version = "0.10.0" dependencies = [ "comemo", "ecow", @@ -2993,58 +2744,72 @@ dependencies = [ ] [[package]] -name = "typst-library" -version = "0.9.0" +name = "typst-macros" +version = "0.10.0" dependencies = [ - "az", - "chinese-number", - "ciborium", + "heck", + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[package]] +name = "typst-pdf" +version = "0.10.0" +dependencies = [ + "base64", + "bytemuck", "comemo", - "csv", "ecow", - "hayagriva", - "hypher", - "icu_properties", - "icu_provider", - "icu_provider_adapters", - "icu_provider_blob", - "icu_segmenter", - "indexmap 2.0.2", - "kurbo", - "lipsum", - "log", + "image", + "miniz_oxide", "once_cell", - "roxmltree", - "rustybuzz", - "serde_json", - "serde_yaml 0.9.27", - "smallvec", - "syntect", - "time", - "toml", + "pdf-writer", + "subsetter", + "svg2pdf", "tracing", "ttf-parser", - "typed-arena", "typst", - "unicode-bidi", - "unicode-math-class", - "unicode-script", - "unicode-segmentation", + "unicode-properties", + "unscanny", + "xmp-writer", ] [[package]] -name = "typst-macros" -version = "0.9.0" +name = "typst-render" +version = "0.10.0" dependencies = [ - "heck", - "proc-macro2", - "quote", - "syn 2.0.38", + "bytemuck", + "comemo", + "flate2", + "image", + "pixglyph", + "resvg", + "roxmltree", + "tiny-skia", + "ttf-parser", + "typst", + "usvg", +] + +[[package]] +name = "typst-svg" +version = "0.10.0" +dependencies = [ + "base64", + "comemo", + "ecow", + "flate2", + "tracing", + "ttf-parser", + "typst", + "xmlparser", + "xmlwriter", ] [[package]] name = "typst-syntax" -version = "0.9.0" +version = "0.10.0" dependencies = [ "comemo", "ecow", @@ -3053,13 +2818,14 @@ dependencies = [ "tracing", "unicode-ident", "unicode-math-class", + "unicode-script", "unicode-segmentation", "unscanny", ] [[package]] name = "typst-tests" -version = "0.9.0" +version = "0.10.0" dependencies = [ "clap", "comemo", @@ -3071,7 +2837,9 @@ dependencies = [ "tiny-skia", "ttf-parser", "typst", - "typst-library", + "typst-pdf", + "typst-render", + "typst-svg", "unscanny", "walkdir", ] @@ -3181,9 +2949,26 @@ checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" [[package]] name = "unicode_names2" -version = "0.6.0" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d5506ae2c3c1ccbdf468e52fc5ef536c2ccd981f01273a4cb81aa61021f3a5f" +dependencies = [ + "phf", + "unicode_names2_generator", +] + +[[package]] +name = "unicode_names2_generator" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "446c96c6dd42604779487f0a981060717156648c1706aa1f464677f03c6cc059" +checksum = "b6dfc680313e95bc6637fa278cd7a22390c3c2cd7b8b2bd28755bc6c0fc811e7" +dependencies = [ + "getopts", + "log", + "phf_codegen", + "rand", + "time", +] [[package]] name = "unsafe-libyaml" @@ -3205,9 +2990,9 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "ureq" -version = "2.8.0" +version = "2.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5ccd538d4a604753ebc2f17cd9946e89b77bf87f6a8e2309667c6f2e87855e3" +checksum = "f8cdd25c339e200129fe4de81451814e5228c9b771d57378817d6117cc2b3f97" dependencies = [ "base64", "flate2", @@ -3223,9 +3008,9 @@ dependencies = [ [[package]] name = "url" -version = "2.4.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" +checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" dependencies = [ "form_urlencoded", "idna", @@ -3261,7 +3046,7 @@ dependencies = [ "log", "roxmltree", "simplecss", - "siphasher", + "siphasher 0.3.11", "svgtypes", "usvg-tree", ] @@ -3307,12 +3092,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] -name = "uuid" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88ad59a7560b41a70d191093a945f0b87bc1deeda46fb237479708a1d6b6cdfc" - -[[package]] name = "valuable" version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3342,9 +3121,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.87" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" +checksum = "0ed0d4f68a3015cc185aff4db9506a015f4b96f95303897bfa23f846db54064e" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -3352,24 +3131,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.87" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" +checksum = "1b56f625e64f3a1084ded111c4d5f477df9f8c92df113852fa5a374dbda78826" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-macro" -version = "0.2.87" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" +checksum = "0162dbf37223cd2afce98f3d0785506dcb8d266223983e4b5b525859e6e182b2" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -3377,22 +3156,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.87" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" +checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.87" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" +checksum = "7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f" [[package]] name = "wasmi" @@ -3436,9 +3215,9 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.25.2" +version = "0.25.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc" +checksum = "1778a42e8b3b90bff8d0f5032bf22250792889a5cdc752aa0020c84abe3aaf10" [[package]] name = "weezl" @@ -3554,18 +3333,18 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "winnow" -version = "0.5.18" +version = "0.5.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "176b6138793677221d420fd2f0aeeced263f197688b36484660da767bca2fa32" +checksum = "829846f3e3db426d4cee4510841b71a8e58aa2a76b1132579487ae430ccd9c7b" dependencies = [ "memchr", ] [[package]] name = "writeable" -version = "0.5.3" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0af0c3d13faebf8dda0b5256fa7096a2d5ccb662f7b9f54a40fe201077ab1c2" +checksum = "dad7bb64b8ef9c0aa27b6da38b452b0ee9fd82beaf276a87dd796fb55cbae14e" [[package]] name = "wyz" @@ -3633,9 +3412,9 @@ dependencies = [ [[package]] name = "yoke" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61e38c508604d6bbbd292dadb3c02559aa7fff6b654a078a36217cad871636e4" +checksum = "65e71b2e4f287f467794c671e2b8f8a5f3716b3c829079a1c44740148eff07e4" dependencies = [ "serde", "stable_deref_trait", @@ -3645,34 +3424,34 @@ dependencies = [ [[package]] name = "yoke-derive" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5e19fb6ed40002bab5403ffa37e53e0e56f914a4450c8765f533018db1db35f" +checksum = "9e6936f0cce458098a201c245a11bef556c6a0181129c7034d10d76d1ec3a2b8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", "synstructure", ] [[package]] name = "zerocopy" -version = "0.7.20" +version = "0.7.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd66a62464e3ffd4e37bd09950c2b9dd6c4f8767380fabba0d523f9a775bc85a" +checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.20" +version = "0.7.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "255c4596d41e6916ced49cfafea18727b24d67878fa180ddfd69b9df34fd1726" +checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -3692,15 +3471,27 @@ checksum = "e6a647510471d372f2e6c2e6b7219e44d8c574d24fdc11c610a61455782f18c3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", "synstructure", ] [[package]] +name = "zerotrie" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0594125a0574fb93059c92c588ab209cc036a23d1baeb3410fa9181bea551a0" +dependencies = [ + "displaydoc", + "litemap", + "serde", + "zerovec", +] + +[[package]] name = "zerovec" -version = "0.10.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1194130c5b155bf8ae50ab16c86ab758cd695cf9ad176d2f870b744cbdbb572e" +checksum = "eff4439ae91fb5c72b8abc12f3f2dbf51bd27e6eadb9f8a5bc8898dddb0e27ea" dependencies = [ "serde", "yoke", @@ -3710,13 +3501,13 @@ dependencies = [ [[package]] name = "zerovec-derive" -version = "0.10.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acabf549809064225ff8878baedc4ce3732ac3b07e7c7ce6e5c2ccdbc485c324" +checksum = "7b4e5997cbf58990550ef1f0e5124a05e47e1ebd33a84af25739be6031a62c20" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -3725,57 +3516,20 @@ version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261" dependencies = [ - "aes", "byteorder", - "bzip2", - "constant_time_eq", "crc32fast", "crossbeam-utils", "flate2", - "hmac", - "pbkdf2", - "sha1", - "time", - "zstd", ] [[package]] name = "zopfli" -version = "0.7.4" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e0650ae6a051326d798eb099b632f1afb0d323d25ee4ec82ffb0779512084d5" +checksum = "5c1f48f3508a3a3f2faee01629564400bc12260f6214a056d06a3aaaa6ef0736" dependencies = [ "crc32fast", "log", "simd-adler32", "typed-arena", ] - -[[package]] -name = "zstd" -version = "0.11.2+zstd.1.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20cc960326ece64f010d2d2107537f26dc589a6573a316bd5b1dba685fa5fde4" -dependencies = [ - "zstd-safe", -] - -[[package]] -name = "zstd-safe" -version = "5.0.2+zstd.1.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2a5585e04f9eea4b2a3d1eca508c4dee9592a89ef6f450c11719da0726f4db" -dependencies = [ - "libc", - "zstd-sys", -] - -[[package]] -name = "zstd-sys" -version = "2.0.9+zstd.1.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e16efa8a874a0481a574084d34cc26fdb3b99627480f785888deb6386506656" -dependencies = [ - "cc", - "pkg-config", -] diff --git a/pkgs/tools/typesetting/typst/default.nix b/pkgs/by-name/ty/typst/package.nix index eeb25fa30bde..24d333f669cc 100644 --- a/pkgs/tools/typesetting/typst/default.nix +++ b/pkgs/by-name/ty/typst/package.nix @@ -8,21 +8,19 @@ rustPlatform.buildRustPackage rec { pname = "typst"; - version = "0.9.0"; + version = "0.10.0"; src = fetchFromGitHub { owner = "typst"; repo = "typst"; rev = "v${version}"; - hash = "sha256-LwRB/AQE8TZZyHEQ7kKB10itzEgYjg4R/k+YFqmutDc="; + hash = "sha256-qiskc0G/ZdLRZjTicoKIOztRFem59TM4ki23Rl55y9s="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { "iai-0.1.1" = "sha256-EdNzCPht5chg7uF9O8CtPWR/bzSYyfYIXNdLltqdlR0="; - "oxipng-8.0.0" = "sha256-KIbSsQEjwJ12DxYpBTUD1g9CqJqCfSAmnFcSTiGIoio="; - "self-replace-1.3.5" = "sha256-N57nmLHgxhVR1CDtkgjYwpo1ypdGyVpjJY7vzuncxDc="; }; }; @@ -45,12 +43,12 @@ rustPlatform.buildRustPackage rec { --zsh crates/typst-cli/artifacts/_typst ''; - meta = with lib; { - description = "A new markup-based typesetting system that is powerful and easy to learn"; - homepage = "https://typst.app"; + meta = { changelog = "https://github.com/typst/typst/releases/tag/${src.rev}"; - license = licenses.asl20; - maintainers = with maintainers; [ drupol figsoda kanashimia ]; + description = "A new markup-based typesetting system that is powerful and easy to learn"; + homepage = "https://github.com/typst/typst"; + license = lib.licenses.asl20; mainProgram = "typst"; + maintainers = with lib.maintainers; [ drupol figsoda kanashimia ]; }; } diff --git a/pkgs/desktops/plasma-5/3rdparty/addons/bismuth/0001-esbuild-config.patch b/pkgs/desktops/plasma-5/3rdparty/addons/bismuth/0001-esbuild-config.patch new file mode 100644 index 000000000000..8ec7a34d9760 --- /dev/null +++ b/pkgs/desktops/plasma-5/3rdparty/addons/bismuth/0001-esbuild-config.patch @@ -0,0 +1,13 @@ +diff --git a/src/kwinscript/CMakeLists.txt b/src/kwinscript/CMakeLists.txt +index 9e2f7054..ed607027 100644 +--- a/src/kwinscript/CMakeLists.txt ++++ b/src/kwinscript/CMakeLists.txt +@@ -39,7 +39,7 @@ endif() + set(ESBUILD_COMMAND + "esbuild" "--bundle" "${CMAKE_CURRENT_SOURCE_DIR}/index.ts" + "--outfile=${CMAKE_CURRENT_BINARY_DIR}/bismuth/contents/code/index.mjs" +- "--format=esm" "--platform=neutral") ++ "--format=esm" "--platform=neutral" "--target=es6") + if(USE_NPM) + list(PREPEND ESBUILD_COMMAND "npx") + endif() diff --git a/pkgs/desktops/plasma-5/3rdparty/addons/bismuth/default.nix b/pkgs/desktops/plasma-5/3rdparty/addons/bismuth/default.nix index ee43f98fda20..ca54ff888780 100644 --- a/pkgs/desktops/plasma-5/3rdparty/addons/bismuth/default.nix +++ b/pkgs/desktops/plasma-5/3rdparty/addons/bismuth/default.nix @@ -21,6 +21,10 @@ mkDerivation rec { sha256 = "sha256-c13OFEw6E/I8j/mqeLnuc9Chi6pc3+AgwAMPpCzh974="; }; + patches = [ + ./0001-esbuild-config.patch + ]; + cmakeFlags = [ "-DUSE_TSC=OFF" "-DUSE_NPM=OFF" diff --git a/pkgs/development/interpreters/elixir/generic-builder.nix b/pkgs/development/interpreters/elixir/generic-builder.nix index 348d054a6c77..e87328e49b45 100644 --- a/pkgs/development/interpreters/elixir/generic-builder.nix +++ b/pkgs/development/interpreters/elixir/generic-builder.nix @@ -12,6 +12,7 @@ { baseName ? "elixir" , version +, erlangPackage ? erlang , minimumOTPVersion , sha256 ? null , rev ? "v${version}" @@ -23,7 +24,7 @@ let inherit (lib) getVersion versionAtLeast optional concatStringsSep; in -assert versionAtLeast (getVersion erlang) minimumOTPVersion; +assert versionAtLeast (getVersion erlangPackage) minimumOTPVersion; stdenv.mkDerivation ({ pname = "${baseName}"; @@ -31,7 +32,7 @@ stdenv.mkDerivation ({ inherit src version debugInfo; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ erlang ]; + buildInputs = [ erlangPackage ]; LANG = "C.UTF-8"; LC_TYPE = "C.UTF-8"; diff --git a/pkgs/development/interpreters/guile/3.0.nix b/pkgs/development/interpreters/guile/3.0.nix index a09afadf5271..002ce4fa97ff 100644 --- a/pkgs/development/interpreters/guile/3.0.nix +++ b/pkgs/development/interpreters/guile/3.0.nix @@ -74,6 +74,7 @@ builder rec { patches = [ ./eai_system.patch + ./guile-hurd-posix-spawn.patch ] ++ lib.optional (coverageAnalysis != null) ./gcov-file-name.patch ++ lib.optional stdenv.isDarwin (fetchpatch { diff --git a/pkgs/development/interpreters/guile/guile-hurd-posix-spawn.patch b/pkgs/development/interpreters/guile/guile-hurd-posix-spawn.patch new file mode 100644 index 000000000000..7cf600b4c2aa --- /dev/null +++ b/pkgs/development/interpreters/guile/guile-hurd-posix-spawn.patch @@ -0,0 +1,44 @@ +Fix <https://issues.guix.gnu.org/61095>, which affects GNU/Hurd. + +diff --git a/libguile/posix.c b/libguile/posix.c +index 3a8be94e4..f5fdc544c 100644 +--- a/libguile/posix.c ++++ b/libguile/posix.c +@@ -1326,7 +1326,14 @@ static void + close_inherited_fds_slow (posix_spawn_file_actions_t *actions, int max_fd) + { + while (--max_fd > 2) +- posix_spawn_file_actions_addclose (actions, max_fd); ++ { ++ /* Adding invalid file descriptors to an 'addclose' action leads ++ to 'posix_spawn' failures on some operating systems: ++ <https://bugs.gnu.org/61095>. Hence the extra check. */ ++ int flags = fcntl (max_fd, F_GETFD, NULL); ++ if ((flags >= 0) && ((flags & FD_CLOEXEC) == 0)) ++ posix_spawn_file_actions_addclose (actions, max_fd); ++ } + } + + static void + +Fix <https://issues.guix.gnu.org/62501>. + +diff --git a/test-suite/tests/posix.test b/test-suite/tests/posix.test +index f20e04453..d5cf47cda 100644 +--- a/test-suite/tests/posix.test ++++ b/test-suite/tests/posix.test +@@ -431,7 +431,13 @@ + (let ((str (get-string-all (car input+output)))) + (close-port (car input+output)) + (waitpid pid) +- str))) ++ ++ ;; On GNU/Hurd, the exec server prepends 'LD_ORIGIN_PATH' for ++ ;; every program: <https://bugs.gnu.org/62501>. Strip it. ++ (if (and (string=? "GNU" (utsname:sysname (uname))) ++ (string-prefix? "LD_ORIGIN_PATH=" str)) ++ (string-drop str (+ 1 (string-index str #\newline))) ++ str)))) + + (pass-if-equal "ls /proc/self/fd" + "0\n1\n2\n3\n" ;fourth FD is for /proc/self/fd diff --git a/pkgs/development/libraries/science/chemistry/openmm/default.nix b/pkgs/development/libraries/science/chemistry/openmm/default.nix index 349c3be82b96..94a88bbf819a 100644 --- a/pkgs/development/libraries/science/chemistry/openmm/default.nix +++ b/pkgs/development/libraries/science/chemistry/openmm/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "openmm"; - version = "8.0.0"; + version = "8.1.0"; src = fetchFromGitHub { owner = "openmm"; repo = pname; rev = version; - hash = "sha256-89ngeZHdjyL/OoGuQ+F5eaXE1/od0EEfIgw9eKdLtL8="; + hash = "sha256-uNAqjklgBWM2v2z6qu17ZMFO4gn3fsnYPxyGO++UtTw="; }; # "This test is stochastic and may occassionally fail". It does. @@ -49,6 +49,7 @@ stdenv.mkDerivation rec { ++ lib.optional enableCuda cudaPackages.cudatoolkit; propagatedBuildInputs = lib.optionals enablePython (with python3Packages; [ + setuptools python numpy cython @@ -85,6 +86,7 @@ stdenv.mkDerivation rec { cd python ${python3Packages.python.pythonOnBuildForHost.interpreter} setup.py build ${python3Packages.python.pythonOnBuildForHost.interpreter} setup.py install --prefix=$out + mv $out/lib/python*/site-packages/OpenMM*.egg/{openmm,simtk} $out/lib/python*/site-packages/. ''; postFixup = '' diff --git a/pkgs/development/libraries/xsimd/disable-exp10-test.patch b/pkgs/development/libraries/xsimd/disable-exp10-test.patch index 62e24e18c6b7..8d2940c3b080 100644 --- a/pkgs/development/libraries/xsimd/disable-exp10-test.patch +++ b/pkgs/development/libraries/xsimd/disable-exp10-test.patch @@ -4,23 +4,25 @@ Date: Tue Aug 1 13:26:04 2023 +0300 Darwin & Musl: Disable failing exp10 test -diff --git a/test/test_xsimd_api.cpp b/test/test_xsimd_api.cpp -index 84b4b0b..1b29742 100644 --- a/test/test_xsimd_api.cpp +++ b/test/test_xsimd_api.cpp -@@ -515,11 +515,6 @@ struct xsimd_api_float_types_functions +@@ -515,15 +515,6 @@ struct xsimd_api_float_types_functions value_type val(2); CHECK_EQ(extract(xsimd::exp(T(val))), std::exp(val)); } - void test_exp10() - { - value_type val(2); +-#ifdef EMSCRIPTEN +- CHECK_EQ(extract(xsimd::exp10(T(val))), doctest::Approx(std::pow(value_type(10), val))); +-#else - CHECK_EQ(extract(xsimd::exp10(T(val))), std::pow(value_type(10), val)); +-#endif - } void test_exp2() { value_type val(2); -@@ -804,11 +799,6 @@ TEST_CASE_TEMPLATE("[xsimd api | float types functions]", B, FLOAT_TYPES) +@@ -813,11 +804,6 @@ TEST_CASE_TEMPLATE("[xsimd api | float types functions]", B, FLOAT_TYPES) Test.test_exp(); } diff --git a/pkgs/development/libraries/xsimd/disable-polar-test.patch b/pkgs/development/libraries/xsimd/disable-polar-test.patch index cbb7c0313c6d..91128f43c2d5 100644 --- a/pkgs/development/libraries/xsimd/disable-polar-test.patch +++ b/pkgs/development/libraries/xsimd/disable-polar-test.patch @@ -4,11 +4,9 @@ Date: Tue Aug 1 13:29:16 2023 +0300 aarch64-Darwin: Disable failing polar test -diff --git a/test/test_xsimd_api.cpp b/test/test_xsimd_api.cpp -index 1b29742..03c6b4b 100644 --- a/test/test_xsimd_api.cpp +++ b/test/test_xsimd_api.cpp -@@ -652,12 +652,6 @@ struct xsimd_api_float_types_functions +@@ -661,17 +661,6 @@ struct xsimd_api_float_types_functions value_type val1(4); CHECK_EQ(extract(xsimd::nextafter(T(val0), T(val1))), std::nextafter(val0, val1)); } @@ -16,12 +14,17 @@ index 1b29742..03c6b4b 100644 - { - value_type val0(3); - value_type val1(4); +-#ifndef EMSCRIPTEN - CHECK_EQ(extract(xsimd::polar(T(val0), T(val1))), std::polar(val0, val1)); +-#else +- CHECK_EQ(std::real(extract(xsimd::polar(T(val0), T(val1)))), doctest::Approx(std::real(std::polar(val0, val1)))); +- CHECK_EQ(std::imag(extract(xsimd::polar(T(val0), T(val1)))), doctest::Approx(std::imag(std::polar(val0, val1)))); +-#endif - } void test_pow() { value_type val0(2); -@@ -912,11 +906,6 @@ TEST_CASE_TEMPLATE("[xsimd api | float types functions]", B, FLOAT_TYPES) +@@ -931,11 +920,6 @@ TEST_CASE_TEMPLATE("[xsimd api | float types functions]", B, FLOAT_TYPES) Test.test_nextafter(); } diff --git a/pkgs/development/node-packages/overrides.nix b/pkgs/development/node-packages/overrides.nix index ad6a9cd1371e..9b7f2f743226 100644 --- a/pkgs/development/node-packages/overrides.nix +++ b/pkgs/development/node-packages/overrides.nix @@ -429,5 +429,15 @@ final: prev: { # patch elf is trying to patch binary for sunos rm -r $out/lib/node_modules/wrangler/node_modules/@esbuild/sunos-x64 ''; + dependencies = oldAttrs.dependencies ++ lib.optional stdenv.isLinux ({ + name = "_at_cloudflare_slash_workerd-linux-64"; + packageName = "@cloudflare/workerd-linux-64"; + # Should be same version as workerd + version = "1.20231030.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@cloudflare/workerd-linux-64/-/workerd-linux-64-1.20231030.0.tgz"; + sha512 = "2HUeRTvoCC17fxE0qdBeR7J9dO8j4A8ZbdcvY8pZxdk+zERU6+N03RTbk/dQMU488PwiDvcC3zZqS4gwLfVT8g=="; + }; + }); }); } diff --git a/pkgs/development/ocaml-modules/eliom/default.nix b/pkgs/development/ocaml-modules/eliom/default.nix index 5be5f09d1965..fac5789dcdd1 100644 --- a/pkgs/development/ocaml-modules/eliom/default.nix +++ b/pkgs/development/ocaml-modules/eliom/default.nix @@ -1,15 +1,11 @@ -{ stdenv +{ buildDunePackage , lib , fetchFromGitHub , which , ocsigen_server -, ocaml , lwt_react -, opaline -, ocamlbuild , ppx_deriving , ppx_optcomp -, findlib , js_of_ocaml-ocamlbuild , js_of_ocaml-ppx , js_of_ocaml-ppx_deriving_json @@ -20,23 +16,19 @@ , ocsipersist }: -stdenv.mkDerivation rec { +buildDunePackage rec { pname = "eliom"; - version = "10.1.0"; + version = "10.1.2"; src = fetchFromGitHub { owner = "ocsigen"; repo = "eliom"; rev = version; - hash = "sha256-nzrLl8adaRW6c+IQfJ7s+7KtFT8uU27Umyrv0aWXuxw="; + hash = "sha256-Cxwp534ADUO7AHnxZnGsrqxGDkhcJ314M5wytO4e8/0="; }; nativeBuildInputs = [ - ocaml which - findlib - opaline - ocamlbuild ]; buildInputs = [ js_of_ocaml-ocamlbuild @@ -58,12 +50,6 @@ stdenv.mkDerivation rec { strictDeps = true; - installPhase = '' - runHook preInstall - opaline -prefix $out -libdir $OCAMLFIND_DESTDIR - runHook postInstall - ''; - setupHook = [ ./setup-hook.sh ]; meta = { diff --git a/pkgs/development/python-modules/bluetooth-data-tools/default.nix b/pkgs/development/python-modules/bluetooth-data-tools/default.nix index ca4f1a540bbb..370dd50d41f7 100644 --- a/pkgs/development/python-modules/bluetooth-data-tools/default.nix +++ b/pkgs/development/python-modules/bluetooth-data-tools/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "bluetooth-data-tools"; - version = "1.15.0"; + version = "1.17.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-8Gbw2vXqKvWo30QKExrmH7lUkZBg7zd3o2xWEqGxSBM="; + hash = "sha256-CJyTWNBtBk3YpoaiL1/P+aUE4ttthQDTdDuKBYEXrBg="; }; # The project can build both an optimized cython version and an unoptimized diff --git a/pkgs/development/python-modules/cheetah3/default.nix b/pkgs/development/python-modules/cheetah3/default.nix index 24e3194d80c0..b85870572a4c 100644 --- a/pkgs/development/python-modules/cheetah3/default.nix +++ b/pkgs/development/python-modules/cheetah3/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { pname = "cheetah3"; - version = "3.3.2"; + version = "3.3.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "CheetahTemplate3"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-okQz1wM3k43okKcZDRgHAnn5ScL0Pe1OtUvDBScEamY="; + hash = "sha256-7L3SBMgNOOLAFvQST8I0gFlrya/6Lwp/umzolfJx3t4="; }; doCheck = false; # Circular dependency diff --git a/pkgs/development/python-modules/cirq-core/default.nix b/pkgs/development/python-modules/cirq-core/default.nix index fe6a04480f66..31077bd109e4 100644 --- a/pkgs/development/python-modules/cirq-core/default.nix +++ b/pkgs/development/python-modules/cirq-core/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , buildPythonPackage -, pythonAtLeast , pythonOlder , fetchFromGitHub , duet @@ -84,17 +83,9 @@ buildPythonPackage rec { "cirq/_version_test.py" ]; - disabledTests = [ - # Tries to import flynt, which isn't in Nixpkgs - "test_metadata_search_path" - # Fails due pandas MultiIndex. Maybe issue with pandas version in nix? - "test_benchmark_2q_xeb_fidelities" - # https://github.com/quantumlib/Cirq/pull/5991 - "test_json_and_repr_data" - # Tests for some changed error handling behavior in SymPy 1.12 - "test_custom_value_not_implemented" - # Calibration issue - "test_xeb_to_calibration_layer" + disabledTests = lib.optionals stdenv.isAarch64 [ + # https://github.com/quantumlib/Cirq/issues/5924 + "test_prepare_two_qubit_state_using_sqrt_iswap" ]; meta = with lib; { @@ -103,6 +94,5 @@ buildPythonPackage rec { changelog = "https://github.com/quantumlib/Cirq/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ drewrisinger fab ]; - broken = (stdenv.isLinux && stdenv.isAarch64); }; } diff --git a/pkgs/development/python-modules/evohome-async/default.nix b/pkgs/development/python-modules/evohome-async/default.nix index 17d4a688130b..440492e1e860 100644 --- a/pkgs/development/python-modules/evohome-async/default.nix +++ b/pkgs/development/python-modules/evohome-async/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "evohome-async"; - version = "0.4.11"; + version = "0.4.13"; pyproject = true; disabled = pythonOlder "3.11"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "zxdavb"; repo = "evohome-async"; rev = "refs/tags/${version}"; - hash = "sha256-mx4nBEgXeBxcN1pYZfTKPGbNhvSz8l38MyRRpL82lf0="; + hash = "sha256-Fa6OYI1oEG4oUkLaPgWmvNHtK6Iwal/4nBf9b54Ue+g="; }; nativeBuildInputs = [ @@ -44,5 +44,6 @@ buildPythonPackage rec { homepage = "https://github.com/zxdavb/evohome-async"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; + mainProgram = "evo-client"; }; } diff --git a/pkgs/development/python-modules/habluetooth/default.nix b/pkgs/development/python-modules/habluetooth/default.nix new file mode 100644 index 000000000000..f42d8413dd32 --- /dev/null +++ b/pkgs/development/python-modules/habluetooth/default.nix @@ -0,0 +1,68 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, cython +, poetry-core +, setuptools +, wheel +, bleak +, pytestCheckHook +, bleak-retry-connector +, bluetooth-adapters +, bluetooth-auto-recovery +, bluetooth-data-tools +, home-assistant-bluetooth +, pythonOlder +}: + +buildPythonPackage rec { + pname = "habluetooth"; + version = "0.5.1"; + pyproject = true; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "Bluetooth-Devices"; + repo = "habluetooth"; + rev = "refs/tags/v${version}"; + hash = "sha256-olR900l/xJug5DeXb8CR0vQBzjzegdiCLCp6AIQu7Tg="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace " --cov=habluetooth --cov-report=term-missing:skip-covered" "" + ''; + + nativeBuildInputs = [ + cython + poetry-core + setuptools + wheel + ]; + + propagatedBuildInputs = [ + bleak + bleak-retry-connector + bluetooth-adapters + bluetooth-auto-recovery + bluetooth-data-tools + home-assistant-bluetooth + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "habluetooth" + ]; + + meta = with lib; { + description = "Library for high availability Bluetooth"; + homepage = "https://github.com/Bluetooth-Devices/habluetooth"; + changelog = "https://github.com/Bluetooth-Devices/habluetooth/blob/${version}/CHANGELOG.md"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/opower/default.nix b/pkgs/development/python-modules/opower/default.nix index 72e83c216699..df8bc234e2af 100644 --- a/pkgs/development/python-modules/opower/default.nix +++ b/pkgs/development/python-modules/opower/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "opower"; - version = "0.0.39"; + version = "0.0.40"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "tronikos"; repo = "opower"; rev = "refs/tags/v${version}"; - hash = "sha256-5JcediHl2TeMhYa6OJqoW5K0SlAjdIrMwj2IHh3qW7I="; + hash = "sha256-0vk8LGqU3rOgjC8zXkijmIZG8inxwTw2IDneFfy5eQw="; }; pythonRemoveDeps = [ diff --git a/pkgs/development/python-modules/particle/default.nix b/pkgs/development/python-modules/particle/default.nix index 69eabb7cf57f..9a271ccb55df 100644 --- a/pkgs/development/python-modules/particle/default.nix +++ b/pkgs/development/python-modules/particle/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "particle"; - version = "0.23.0"; + version = "0.23.1"; format = "pyproject"; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-2BD4/CfeuOf9ZBdAF9lgfVBSIknAlzoACOWA+T2xF1A="; + hash = "sha256-7uKLDoRr/qTf1w6exf/jJEYT2wi2tqm3c/VaQxB1L6s="; }; postPatch = '' diff --git a/pkgs/development/python-modules/peaqevcore/default.nix b/pkgs/development/python-modules/peaqevcore/default.nix index d9c344e6e72c..6fd4cd98debc 100644 --- a/pkgs/development/python-modules/peaqevcore/default.nix +++ b/pkgs/development/python-modules/peaqevcore/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "peaqevcore"; - version = "19.5.20"; + version = "19.5.21"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-atrrPU9aQvpbI3JYdsnGkdRpq3SRuBJpezF1qc1USB0="; + hash = "sha256-MR+dPGap7IgdWV+bKLUU3E3lzoG+RaaspjqedMQMk5Y="; }; postPatch = '' diff --git a/pkgs/development/python-modules/podman/default.nix b/pkgs/development/python-modules/podman/default.nix index b3ba05351ea2..9624f322a74e 100644 --- a/pkgs/development/python-modules/podman/default.nix +++ b/pkgs/development/python-modules/podman/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "podman"; - version = "4.8.0"; + version = "4.8.0.post1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "containers"; repo = "podman-py"; rev = "refs/tags/v${version}"; - hash = "sha256-lw8ZW1Uh6pbL5Z15NBBgKFm1143rEyFdecBHsSwBYVo="; + hash = "sha256-d7rNXqYeeDHilzNc1jcIWq7rNcYZCvlf9ipu1m3oFfw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/policyuniverse/default.nix b/pkgs/development/python-modules/policyuniverse/default.nix index 082fe4ec1965..e324813c6a58 100644 --- a/pkgs/development/python-modules/policyuniverse/default.nix +++ b/pkgs/development/python-modules/policyuniverse/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "policyuniverse"; - version = "1.5.1.20230817"; + version = "1.5.1.20231109"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-eSCJYZWvFjIwY18aXO4JWPVgA++MQh+AXsgfE0+ApXw="; + hash = "sha256-dOVtQQVgkVwsUTLjYbATDkv/4xKi9FIw6sUNfAlLxAo="; }; # Tests are not shipped and there are no GitHub tags diff --git a/pkgs/development/python-modules/pygeos/default.nix b/pkgs/development/python-modules/pygeos/default.nix index a31725a1002b..22f76d36c46d 100644 --- a/pkgs/development/python-modules/pygeos/default.nix +++ b/pkgs/development/python-modules/pygeos/default.nix @@ -47,6 +47,6 @@ buildPythonPackage rec { homepage = "https://github.com/pygeos/pygeos"; changelog = "https://github.com/pygeos/pygeos/blob/${version}/CHANGELOG.rst"; license = licenses.bsd3; - maintainers = with maintainers; [ nialov ]; + maintainers = teams.geospatial.members; }; } diff --git a/pkgs/development/python-modules/pyngrok/default.nix b/pkgs/development/python-modules/pyngrok/default.nix index bd3931e4f1dc..0038db89f6cc 100644 --- a/pkgs/development/python-modules/pyngrok/default.nix +++ b/pkgs/development/python-modules/pyngrok/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pyngrok"; - version = "7.0.1"; + version = "7.0.3"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-wTK0DnsZBbB9nHMe8hUQjMl3sbv0RaFGiU4NSJshPrY="; + hash = "sha256-RNi0ivQKsLb/JD9+vdJYGf5HDC6BmeNdseR2OU8v1uY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pysnmp-pysmi/default.nix b/pkgs/development/python-modules/pysnmp-pysmi/default.nix index 1a9cab98915d..788a267d347b 100644 --- a/pkgs/development/python-modules/pysnmp-pysmi/default.nix +++ b/pkgs/development/python-modules/pysnmp-pysmi/default.nix @@ -9,8 +9,8 @@ buildPythonPackage rec { pname = "pysnmp-pysmi"; - version = "1.1.10"; - format = "pyproject"; + version = "1.1.11"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "pysnmp"; repo = "pysmi"; rev = "refs/tags/v${version}"; - hash = "sha256-ZfN0nU9IurBEjSZijC2E4UoLIM54mBFgv7rcI1v/a4Q="; + hash = "sha256-qe99nLOyUvE6LJagtQ9whPF4zwIWiM7g5zn40QsmrmA="; }; nativeBuildInputs = [ @@ -40,6 +40,7 @@ buildPythonPackage rec { meta = with lib; { description = "SNMP MIB parser"; homepage = "https://github.com/pysnmp/pysmi"; + changelog = "https://github.com/pysnmp/pysmi/releases/tag/v${version}"; license = licenses.bsd2; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/python-google-nest/default.nix b/pkgs/development/python-modules/python-google-nest/default.nix index 3d086fa2684e..060ee10805c0 100644 --- a/pkgs/development/python-modules/python-google-nest/default.nix +++ b/pkgs/development/python-modules/python-google-nest/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "python-google-nest"; - version = "5.1.1"; + version = "5.2.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-y3BOhorVkJ3rFPifNOopLMqk6y1fHX5vxHGiqWvWHhE="; + hash = "sha256-k7cOOyUqgh7Y/MIBgBTVgCZexXLVkvAaHz6irXGLdgA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/subliminal/default.nix b/pkgs/development/python-modules/subliminal/default.nix index 0b6d801c8ed0..b72d8e0311cc 100644 --- a/pkgs/development/python-modules/subliminal/default.nix +++ b/pkgs/development/python-modules/subliminal/default.nix @@ -90,6 +90,11 @@ buildPythonPackage rec { homepage = "https://github.com/Diaoul/subliminal"; changelog = "https://github.com/Diaoul/subliminal/blob/${version}/HISTORY.rst"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ doronbehar ]; + # Too many tests fail ever since a certain python-updates merge, see: + # https://github.com/Diaoul/subliminal/issues/1062 . Disabling tests + # alltogether may produce a not completly failing executable, but that + # executable apparently isn't able to download subtitles at all. + broken = true; }; } diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index f7bbe7a4650b..59e761aa44d3 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "checkov"; - version = "3.1.20"; + version = "3.1.21"; pyproject = true; src = fetchFromGitHub { owner = "bridgecrewio"; repo = "checkov"; rev = "refs/tags/${version}"; - hash = "sha256-begNKHGFTxlDIG3+PNG+/zCw59dU8gvJcjrVsfaPPaE="; + hash = "sha256-R0O0C8IElTjAF+0QRWII6V1Zj/9df7pCxSzfKCKZ0OQ="; }; patches = [ diff --git a/pkgs/development/tools/yq-go/default.nix b/pkgs/development/tools/yq-go/default.nix index 35066727de98..ada98eb33b47 100644 --- a/pkgs/development/tools/yq-go/default.nix +++ b/pkgs/development/tools/yq-go/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "yq-go"; - version = "4.40.3"; + version = "4.40.4"; src = fetchFromGitHub { owner = "mikefarah"; repo = "yq"; rev = "v${version}"; - hash = "sha256-id8KhHOOpRruANLGxdHIvs86ZEIDzhdbXtgXqWtl5Tc="; + hash = "sha256-cEOOaQAduL9a+EwWigzPDN1ABM6wEjEc8dV4ESFkMXA="; }; - vendorHash = "sha256-9gLtVO4HFra1FaFjTwE02x8q1MkrI/Vo/mYZ2iIa7cU="; + vendorHash = "sha256-kFDW8HrBhSuflAbuC6Zs/61OLXPsfPQfYU7Laa7eK9c="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/package-management/nix-doc/default.nix b/pkgs/tools/package-management/nix-doc/default.nix index b5cc15704c32..8a4e523e98b5 100644 --- a/pkgs/tools/package-management/nix-doc/default.nix +++ b/pkgs/tools/package-management/nix-doc/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "nix-doc"; - version = "0.6.2"; + version = "0.6.4"; src = fetchFromGitHub { rev = "v${version}"; owner = "lf-"; repo = "nix-doc"; - sha256 = "sha256-H81U0gR/7oWjP1z7JC8tTek+tqzTwyJWgaJQOSyNn5M="; + sha256 = "sha256-yL0oG0NiQ7OdGQ/kZxQbSbNphKapu5HBFNP5E2fVe+Y="; }; doCheck = true; @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { RUSTFLAGS = "-Z relro-level=partial"; }; - cargoSha256 = "sha256-yYVDToPLhGUYLrPNyyKwsYXe3QOTR26wtl3SCw4Za5s="; + cargoSha256 = "sha256-4bzLZt45ZLTZyZPZ4Nkvz7mNe4oqOIoaZUbCbNWBKG0="; meta = with lib; { description = "An interactive Nix documentation tool"; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 0f96b21a5463..e033a5c3a65c 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -626,6 +626,7 @@ mapAliases ({ nitrokey-udev-rules = libnitrokey; # Added 2023-03-25 nix-direnv-flakes = nix-direnv; nix-review = throw "'nix-review' has been renamed to/replaced by 'nixpkgs-review'"; # Converted to throw 2023-09-10 + nix-template-rpm = throw "'nix-template-rpm' has been removed as it is broken and unmaintained" ; # Added 2023-11-20 nixFlakes = nixVersions.stable; # Added 2021-05-21 nixStable = nixVersions.stable; # Added 2022-01-24 nixUnstable = nixVersions.unstable; # Added 2022-01-26 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4228100cae49..76969d71fac1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14252,8 +14252,6 @@ with pkgs; typos = callPackage ../development/tools/typos { }; - typst = callPackage ../tools/typesetting/typst { }; - typstfmt = callPackage ../tools/typesetting/typstfmt { }; typst-live = callPackage ../tools/typesetting/typst-live { }; @@ -34114,8 +34112,7 @@ with pkgs; open-policy-agent = callPackage ../development/tools/open-policy-agent { }; openmm = callPackage ../development/libraries/science/chemistry/openmm { - stdenv = gcc11Stdenv; - gfortran = gfortran11; + swig = swig4; }; openshift = callPackage ../applications/networking/cluster/openshift { }; @@ -40768,8 +40765,6 @@ with pkgs; nix-script = callPackage ../tools/nix/nix-script { }; - nix-template-rpm = callPackage ../build-support/templaterpm { inherit (python2Packages) python toposort; }; - nix-top = callPackage ../tools/package-management/nix-top { }; nix-tree = haskell.lib.compose.justStaticExecutables (haskellPackages.nix-tree); diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ebf97327f53f..e965fe2441f2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4951,6 +4951,8 @@ self: super: with self; { habanero = callPackage ../development/python-modules/habanero { }; + habluetooth = callPackage ../development/python-modules/habluetooth { }; + habitipy = callPackage ../development/python-modules/habitipy { }; hachoir = callPackage ../development/python-modules/hachoir { }; |