diff options
| author | Alyssa Ross <hi@alyssa.is> | 2024-03-22 16:41:59 +0100 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2024-03-22 16:41:59 +0100 |
| commit | 46a88117a05c3469af5d99433af140c3de8ca088 (patch) | |
| tree | d7f0557756d8f07a3081b3498c05ddc5a8ad429d /nixpkgs/pkgs/servers | |
| parent | e97457545cea0b2ca421da257c83d8f1ef451d85 (diff) | |
| parent | a343533bccc62400e8a9560423486a3b6c11a23b (diff) | |
| download | nixlib-46a88117a05c3469af5d99433af140c3de8ca088.tar nixlib-46a88117a05c3469af5d99433af140c3de8ca088.tar.gz nixlib-46a88117a05c3469af5d99433af140c3de8ca088.tar.bz2 nixlib-46a88117a05c3469af5d99433af140c3de8ca088.tar.lz nixlib-46a88117a05c3469af5d99433af140c3de8ca088.tar.xz nixlib-46a88117a05c3469af5d99433af140c3de8ca088.tar.zst nixlib-46a88117a05c3469af5d99433af140c3de8ca088.zip | |
Merge commit 'a343533bccc62400e8a9560423486a3b6c11a23b'
Diffstat (limited to 'nixpkgs/pkgs/servers')
118 files changed, 903 insertions, 1354 deletions
diff --git a/nixpkgs/pkgs/servers/akkoma/admin-fe/default.nix b/nixpkgs/pkgs/servers/akkoma/admin-fe/default.nix index f1a874b348bb..08da604bfbae 100644 --- a/nixpkgs/pkgs/servers/akkoma/admin-fe/default.nix +++ b/nixpkgs/pkgs/servers/akkoma/admin-fe/default.nix @@ -7,14 +7,14 @@ stdenv.mkDerivation rec { pname = "admin-fe"; - version = "unstable-2023-02-11"; + version = "unstable-2024-02-25"; src = fetchFromGitea { domain = "akkoma.dev"; owner = "AkkomaGang"; repo = "admin-fe"; - rev = "130c17808bc50269f8444612f4ab378a08cd5e43"; - hash = "sha256-+ZU8J4rOyRMSZP+CUyLeOhRI2fKiw2s31coTYAoReWM="; + rev = "2a1e175f7c2b02e66d728f808cb7e9449231a288"; + hash = "sha256-PLSJ+doZUZ2n4hWUahY299VoCvNq76Tm8qpdvOIHD9c="; }; patches = [ ./deps.patch ]; diff --git a/nixpkgs/pkgs/servers/akkoma/akkoma-fe/default.nix b/nixpkgs/pkgs/servers/akkoma/akkoma-fe/default.nix index 9024ad98c625..7cce84c2ab4f 100644 --- a/nixpkgs/pkgs/servers/akkoma/akkoma-fe/default.nix +++ b/nixpkgs/pkgs/servers/akkoma/akkoma-fe/default.nix @@ -7,14 +7,14 @@ stdenv.mkDerivation rec { pname = "akkoma-fe"; - version = "unstable-2023-08-05"; + version = "3.11.0"; src = fetchFromGitea { domain = "akkoma.dev"; owner = "AkkomaGang"; repo = "akkoma-fe"; - rev = "e7a558a533dd31de174791f130afdaa5b6893b74"; - hash = "sha256-BRmfppsC7NjDdcLxQHuLbQZmYGkj4DFPRtQOf/pRCpI="; + rev = "7cc6c3565466b330043e0a811a6e1e2db487ec8d"; + hash = "sha256-Z7psmIyOo8Rvwcip90JgxLhZ5SkkGB94QInEgm8UOjQ="; }; offlineCache = fetchYarnDeps { diff --git a/nixpkgs/pkgs/servers/akkoma/default.nix b/nixpkgs/pkgs/servers/akkoma/default.nix index fca88e6a3cdb..7aea0eaa2771 100644 --- a/nixpkgs/pkgs/servers/akkoma/default.nix +++ b/nixpkgs/pkgs/servers/akkoma/default.nix @@ -9,14 +9,14 @@ beamPackages.mixRelease rec { pname = "pleroma"; - version = "3.10.4"; + version = "3.11.0"; src = fetchFromGitea { domain = "akkoma.dev"; owner = "AkkomaGang"; repo = "akkoma"; rev = "v${version}"; - hash = "sha256-MPUZFcIxZ21fe3edwi+/Kt8qpwNBCh40wheC3QMqw2M="; + hash = "sha256-cVZx3pjbmDR4SwSLz1aSTIs3SS2oz5m43RJzRttFpPs="; }; postPatch = '' @@ -36,6 +36,7 @@ beamPackages.mixRelease rec { overrides = (final: prev: { # mix2nix does not support git dependencies yet, # so we need to add them manually + captcha = beamPackages.buildMix rec { name = "captcha"; version = "0.1.0"; @@ -45,13 +46,14 @@ beamPackages.mixRelease rec { group = "pleroma"; owner = "elixir-libraries"; repo = "elixir-captcha"; - rev = "3bbfa8b5ea13accc1b1c40579a380d8e5cfd6ad2"; - hash = "sha256-skZ0QwF46lUTfsgACMR0AR5ymY2F50BQy1AUBjWVdro="; + rev = "90f6ce7672f70f56708792a98d98bd05176c9176"; + hash = "sha256-s7EuAhmCsQA/4p2NJHJSWB/DZ5hA+7EelPsUOvKr2Po="; }; # the binary is not getting installed by default postInstall = "mv priv/* $out/lib/erlang/lib/${name}-${version}/priv/"; }; + concurrent_limiter = beamPackages.buildMix rec { name = "concurrent_limiter"; version = "0.1.1"; @@ -64,6 +66,7 @@ beamPackages.mixRelease rec { hash = "sha256-A7ucZnXks4K+JDVY5vV2cT5KfEOUOo/OHO4rga5mGys="; }; }; + elasticsearch = beamPackages.buildMix rec { name = "elasticsearch"; version = "1.0.1"; @@ -76,6 +79,33 @@ beamPackages.mixRelease rec { hash = "sha256-CtmQHVl+VTpemne+nxbkYGcErrgCo+t3ZBPbkFSpyF0="; }; }; + + file_ex = beamPackages.buildMix rec { + name = "file_ex"; + version = "0.1.0"; + + src = fetchFromGitea { + domain = "akkoma.dev"; + owner = "AkkomaGang"; + repo = "file_ex"; + rev = "cc7067c7d446c2526e9ecf91d40896b088851569"; + hash = "sha256-3sxfdOy0cpst4jiutoaabk72VFJ2USKiJN9ODN01Dco="; + }; + }; + + http_signatures = beamPackages.buildMix rec { + name = "http_signatures"; + version = "0.1.1"; + + src = fetchFromGitea { + domain = "akkoma.dev"; + owner = "AkkomaGang"; + repo = "http_signatures"; + rev = "6640ce7d24c783ac2ef56e27d00d12e8dc85f396"; + hash = "sha256-Q/IoVbM/TBgGCmx8AxiBHF2hARb0FbPml8N1HjN3CsE="; + }; + }; + linkify = beamPackages.buildMix rec { name = "linkify"; version = "0.5.2"; @@ -88,20 +118,38 @@ beamPackages.mixRelease rec { hash = "sha256-e3wzlbRuyw/UB5Tb7IozX/WR1T+sIBf9C/o5Thki9vg="; }; }; + + majic = beamPackages.buildMix rec { + name = "majic"; + version = "1.0.0"; + + src = fetchFromGitea { + domain = "akkoma.dev"; + owner = "AkkomaGang"; + repo = "majic"; + rev = "80540b36939ec83f48e76c61e5000e0fd67706f0"; + hash = "sha256-OMM9aDRvbqCOBIE+iPySU8ONRn1BqHDql22rRSmdW08="; + }; + + beamDeps = with final; [ elixir_make mime nimble_pool plug ]; + buildInputs = [ file ]; + }; + mfm_parser = beamPackages.buildMix rec { name = "mfm_parser"; - version = "0.1.1"; + version = "0.1.0"; src = fetchFromGitea { domain = "akkoma.dev"; owner = "AkkomaGang"; repo = "mfm-parser"; - rev = "912fba81152d4d572e457fd5427f9875b2bc3dbe"; - hash = "sha256-n3WmERxKK8VM8jFIBAPS6GkbT7/zjqi3AjjWbjOdMzs="; + rev = "b21ab7754024af096f2d14247574f55f0063295b"; + hash = "sha256-couG5jrAo0Fbk/WABd4n3vhXpDUp+9drxExKc5NM9CI="; }; beamDeps = with final; [ phoenix_view temple ]; }; + search_parser = beamPackages.buildMix rec { name = "search_parser"; version = "0.1.0"; @@ -115,6 +163,7 @@ beamPackages.mixRelease rec { beamDeps = with final; [ nimble_parsec ]; }; + temple = beamPackages.buildMix rec { name = "temple"; version = "0.9.0-rc.0"; @@ -137,14 +186,7 @@ beamPackages.mixRelease rec { nativeBuildInputs = [ cmake ]; dontUseCmakeConfigure = true; }; - http_signatures = prev.http_signatures.override { - patchPhase = '' - substituteInPlace mix.exs --replace ":logger" ":logger, :public_key" - ''; - }; - majic = prev.majic.override { - buildInputs = [ file ]; - }; + syslog = prev.syslog.override { buildPlugins = with beamPackages; [ pc ]; }; @@ -152,13 +194,18 @@ beamPackages.mixRelease rec { mime = prev.mime.override { patchPhase = let cfgFile = writeText "config.exs" '' - use Mix.Config + import Config + config :mime, :types, %{ - "application/activity+json" => ["activity+json"], - "application/jrd+json" => ["jrd+json"], - "application/ld+json" => ["activity+json"], "application/xml" => ["xml"], - "application/xrd+xml" => ["xrd+xml"] + "application/xrd+xml" => ["xrd+xml"], + "application/jrd+json" => ["jrd+json"], + "application/activity+json" => ["activity+json"], + "application/ld+json" => ["activity+json"] + } + + config :mime, :extensions, %{ + "activity+json" => "application/activity+json" } ''; in '' diff --git a/nixpkgs/pkgs/servers/akkoma/mix.nix b/nixpkgs/pkgs/servers/akkoma/mix.nix index 0cf4afeaf2a9..9eaa2a3d9526 100644 --- a/nixpkgs/pkgs/servers/akkoma/mix.nix +++ b/nixpkgs/pkgs/servers/akkoma/mix.nix @@ -10,12 +10,12 @@ let packages = with beamPackages; with self; { argon2_elixir = buildMix rec { name = "argon2_elixir"; - version = "3.1.0"; + version = "3.2.1"; src = fetchHex { - pkg = "${name}"; + pkg = "argon2_elixir"; version = "${version}"; - sha256 = "0wyxj4197jnz4z38611f00ym5n3w7hv06l4l3dfid4h2xvhfm3y0"; + sha256 = "a813b78217394530b5fcf4c8070feee43df03ffef938d044019169c766315690"; }; beamDeps = [ comeonin elixir_make ]; @@ -26,9 +26,9 @@ let version = "1.2.2"; src = fetchHex { - pkg = "${name}"; + pkg = "base62"; version = "${version}"; - sha256 = "1fvpygkdmd7l737lv7svir8n1vhk0m094i8ygwcvx9gam2ykc4yl"; + sha256 = "d41336bda8eaa5be197f1e4592400513ee60518e5b9f4dcf38f4b4dae6f377bb"; }; beamDeps = [ custom_base ]; @@ -39,9 +39,9 @@ let version = "0.2.0"; src = fetchHex { - pkg = "${name}"; + pkg = "bbcode_pleroma"; version = "${version}"; - sha256 = "1hyixcxhcf2j2gyavmmnvfslnl6z60dz1qa9xysfspws85s1118r"; + sha256 = "19851074419a5fedb4ef49e1f01b30df504bb5dbb6d6adfc135238063bebd1c3"; }; beamDeps = [ nimble_parsec ]; @@ -52,9 +52,9 @@ let version = "3.0.1"; src = fetchHex { - pkg = "${name}"; + pkg = "bcrypt_elixir"; version = "${version}"; - sha256 = "1kwnzcjf6v4af12nzw5b2fksk1m1fvbxvhclczy1wpb4zdgbjss8"; + sha256 = "486bb95efb645d1efc6794c1ddd776a186a9a713abf06f45708a6ce324fb96cf"; }; beamDeps = [ comeonin elixir_make ]; @@ -62,12 +62,12 @@ let benchee = buildMix rec { name = "benchee"; - version = "1.1.0"; + version = "1.2.0"; src = fetchHex { - pkg = "${name}"; + pkg = "benchee"; version = "${version}"; - sha256 = "14vdbvmkkqhcqvilq1w8zl895f4hpbv7fw2q5c0ml5h3a1a7v9bx"; + sha256 = "ee729e53217898b8fd30aaad3cce61973dab61574ae6f48229fe7ff42d5e4457"; }; beamDeps = [ deep_merge statistex ]; @@ -78,9 +78,9 @@ let version = "0.2.1"; src = fetchHex { - pkg = "${name}"; + pkg = "bunt"; version = "${version}"; - sha256 = "19bp6xh052ql3ha0v3r8999cvja5d2p6cph02mxphfaj4jsbyc53"; + sha256 = "a330bfb4245239787b15005e66ae6845c9cd524a288f0d141c148b02603777a5"; }; beamDeps = []; @@ -91,9 +91,9 @@ let version = "3.6.0"; src = fetchHex { - pkg = "${name}"; + pkg = "cachex"; version = "${version}"; - sha256 = "1qp2r1f4hvpybhgi547p33ci7bh2w6xn6jl9il68xg4370vlxwpb"; + sha256 = "ebf24e373883bc8e0c8d894a63bbe102ae13d918f790121f5cfe6e485cc8e2e2"; }; beamDeps = [ eternal jumper sleeplocks unsafe ]; @@ -104,9 +104,9 @@ let version = "1.0.0"; src = fetchHex { - pkg = "${name}"; + pkg = "calendar"; version = "${version}"; - sha256 = "0vqa1zpzsdgr6i3yx8j9b6qscvgrbvzn43p5bqm930hcja0ra3lr"; + sha256 = "990e9581920c82912a5ee50e62ff5ef96da6b15949a2ee4734f935fdef0f0a6f"; }; beamDeps = [ tzdata ]; @@ -114,12 +114,12 @@ let castore = buildMix rec { name = "castore"; - version = "1.0.3"; + version = "1.0.5"; src = fetchHex { - pkg = "${name}"; + pkg = "castore"; version = "${version}"; - sha256 = "02rrljx2f6zhmiwqwyk7al0gdf66qpx4jm59sqg1cnyiylgb02k8"; + sha256 = "8d7c597c3e4a64c395980882d4bca3cebb8d74197c590dc272cfd3b6a6310578"; }; beamDeps = []; @@ -127,12 +127,12 @@ let certifi = buildRebar3 rec { name = "certifi"; - version = "2.9.0"; + version = "2.12.0"; src = fetchHex { - pkg = "${name}"; + pkg = "certifi"; version = "${version}"; - sha256 = "0ha6vmf5p3xlbf5w1msa89frhvfk535rnyfybz9wdmh6vdms8v96"; + sha256 = "ee68d85df22e554040cdb4be100f33873ac6051387baf6a8f6ce82272340ff1c"; }; beamDeps = []; @@ -143,9 +143,9 @@ let version = "0.10.0"; src = fetchHex { - pkg = "${name}"; + pkg = "combine"; version = "${version}"; - sha256 = "06s5y8b0snr1s5ax9v3s7rc6c8xf5vj6878d1mc7cc07j0bvq78v"; + sha256 = "1b1dbc1790073076580d0d1d64e42eae2366583e7aecd455d1215b0d16f2451b"; }; beamDeps = []; @@ -153,12 +153,12 @@ let comeonin = buildMix rec { name = "comeonin"; - version = "5.3.3"; + version = "5.4.0"; src = fetchHex { - pkg = "${name}"; + pkg = "comeonin"; version = "${version}"; - sha256 = "1pw4rhhsh8mwj26dkbxz2niih9j8pc3qijlpcl8jh208rg1cjf1y"; + sha256 = "796393a9e50d01999d56b7b8420ab0481a7538d0caf80919da493b4a6e51faf1"; }; beamDeps = []; @@ -169,9 +169,9 @@ let version = "1.1.0"; src = fetchHex { - pkg = "${name}"; + pkg = "connection"; version = "${version}"; - sha256 = "1746n8ba11amp1xhwzp38yfii2h051za8ndxlwdykyqqljq1wb3j"; + sha256 = "722c1eb0a418fbe91ba7bd59a47e28008a189d47e37e0e7bb85585a016b2869c"; }; beamDeps = []; @@ -182,9 +182,9 @@ let version = "3.0.3"; src = fetchHex { - pkg = "${name}"; + pkg = "cors_plug"; version = "${version}"; - sha256 = "03c3vwp4bdk3sixica4mmg0vinmx8qdz2bmbby1x6bi7ijg7ab9z"; + sha256 = "3f2d759e8c272ed3835fab2ef11b46bddab8c1ab9528167bd463b6452edf830d"; }; beamDeps = [ plug ]; @@ -195,9 +195,9 @@ let version = "2.10.0"; src = fetchHex { - pkg = "${name}"; + pkg = "cowboy"; version = "${version}"; - sha256 = "0sqxqjdykxc2ai9cvkc0xjwkvr80z98wzlqlrd1z3iiw32vwrz9s"; + sha256 = "3afdccb7183cc6f143cb14d3cf51fa00e53db9ec80cdcd525482f5e99bc41d6b"; }; beamDeps = [ cowlib ranch ]; @@ -208,9 +208,9 @@ let version = "0.4.0"; src = fetchHex { - pkg = "${name}"; + pkg = "cowboy_telemetry"; version = "${version}"; - sha256 = "1pn90is3k9dq64wbijvzkqb6ldfqvwiqi7ymc8dx6ra5xv0vm63x"; + sha256 = "7d98bac1ee4565d31b62d59f8823dfd8356a169e7fcbb83831b8a5397404c9de"; }; beamDeps = [ cowboy telemetry ]; @@ -221,9 +221,9 @@ let version = "2.12.1"; src = fetchHex { - pkg = "${name}"; + pkg = "cowlib"; version = "${version}"; - sha256 = "1c4dgi8canscyjgddp22mjc69znvwy44wk3r7jrl2wvs6vv76fqn"; + sha256 = "163b73f6367a7341b33c794c4e88e7dbfe6498ac42dcd69ef44c5bc5507c8db0"; }; beamDeps = []; @@ -231,12 +231,12 @@ let credo = buildMix rec { name = "credo"; - version = "1.7.0"; + version = "1.7.1"; src = fetchHex { - pkg = "${name}"; + pkg = "credo"; version = "${version}"; - sha256 = "1mv9lyw6hgjn6hlnzfbs0x2dchvwlmj8bg0a8l7iq38z7pvgqfb8"; + sha256 = "e9871c6095a4c0381c89b6aa98bc6260a8ba6addccf7f6a53da8849c748a58a2"; }; beamDeps = [ bunt file_system jason ]; @@ -247,9 +247,9 @@ let version = "0.2.1"; src = fetchHex { - pkg = "${name}"; + pkg = "custom_base"; version = "${version}"; - sha256 = "0qx47d4w2mxa3rr6mrxdasgk7prxqwd0y9zpjhz61jayrkx1kw4d"; + sha256 = "8df019facc5ec9603e94f7270f1ac73ddf339f56ade76a721eaa57c1493ba463"; }; beamDeps = []; @@ -257,12 +257,12 @@ let db_connection = buildMix rec { name = "db_connection"; - version = "2.5.0"; + version = "2.6.0"; src = fetchHex { - pkg = "${name}"; + pkg = "db_connection"; version = "${version}"; - sha256 = "18jsnmabdjwj3i7ml43ljzrzzvfy1a3bnbaqywgsv7nndji5nbf9"; + sha256 = "c2f992d15725e721ec7fbc1189d4ecdb8afef76648c746a8e1cad35e3b8a35f3"; }; beamDeps = [ telemetry ]; @@ -273,9 +273,9 @@ let version = "2.1.1"; src = fetchHex { - pkg = "${name}"; + pkg = "decimal"; version = "${version}"; - sha256 = "1k7z418b6cj977wswpxsk5844xrxc1smaiqsmrqpf3pdjzsfbksk"; + sha256 = "53cfe5f497ed0e7771ae1a475575603d77425099ba5faef9394932b35020ffcc"; }; beamDeps = []; @@ -286,9 +286,9 @@ let version = "1.0.0"; src = fetchHex { - pkg = "${name}"; + pkg = "deep_merge"; version = "${version}"; - sha256 = "0c2li2a3hxcc05nwvy4kpsal0315yk900kxyybld972b15gqww6f"; + sha256 = "ce708e5f094b9cd4e8f2be4f00d2f4250c4095be93f8cd6d018c753894885430"; }; beamDeps = []; @@ -296,12 +296,12 @@ let dialyxir = buildMix rec { name = "dialyxir"; - version = "1.3.0"; + version = "1.4.2"; src = fetchHex { - pkg = "${name}"; + pkg = "dialyxir"; version = "${version}"; - sha256 = "0vv90jip2w362n3l7dkhqfdwlz97nwji535kn3fbk3dassya9ch0"; + sha256 = "516603d8067b2fd585319e4b13d3674ad4f314a5902ba8130cd97dc902ce6bbd"; }; beamDeps = [ erlex ]; @@ -309,25 +309,25 @@ let earmark = buildMix rec { name = "earmark"; - version = "1.4.39"; + version = "1.4.46"; src = fetchHex { - pkg = "${name}"; + pkg = "earmark"; version = "${version}"; - sha256 = "0h547ri1nbxyaisyx7jddg3wib7fpm3q4v914szwvv6bqf79sv0m"; + sha256 = "798d86db3d79964e759ddc0c077d5eb254968ed426399fbf5a62de2b5ff8910a"; }; - beamDeps = [ earmark_parser ]; + beamDeps = []; }; earmark_parser = buildMix rec { name = "earmark_parser"; - version = "1.4.33"; + version = "1.4.39"; src = fetchHex { - pkg = "${name}"; + pkg = "earmark_parser"; version = "${version}"; - sha256 = "13qvlqnii8g6bcz6cl330vjwaan7jy30g1app3yvjncvf8rnhlid"; + sha256 = "06553a88d1f1846da9ef066b87b57c6f605552cfbe40d20bd8d59cc6bde41944"; }; beamDeps = []; @@ -338,9 +338,9 @@ let version = "1.2.2"; src = fetchHex { - pkg = "${name}"; + pkg = "eblurhash"; version = "${version}"; - sha256 = "0k040pj8hlm8mwy0ra459hk35v9gfsvvgp596nl27q2dj00cl84c"; + sha256 = "8c20ca00904de023a835a9dcb7b7762fed32264c85a80c3cafa85288e405044c"; }; beamDeps = []; @@ -351,9 +351,9 @@ let version = "3.10.3"; src = fetchHex { - pkg = "${name}"; + pkg = "ecto"; version = "${version}"; - sha256 = "0crlrpl392pbkzl6ar4z6afna8h9d46wshky1zbr3m344d7cggj4"; + sha256 = "44bec74e2364d491d70f7e42cd0d690922659d329f6465e89feb8a34e8cd3433"; }; beamDeps = [ decimal jason telemetry ]; @@ -364,9 +364,9 @@ let version = "1.4.0"; src = fetchHex { - pkg = "${name}"; + pkg = "ecto_enum"; version = "${version}"; - sha256 = "1r2ffrr020fhfviqn21cv06sd3sp4bf1jra0xrgb3hl1f445rdcg"; + sha256 = "8fb55c087181c2b15eee406519dc22578fa60dd82c088be376d0010172764ee4"; }; beamDeps = [ ecto ecto_sql postgrex ]; @@ -374,12 +374,12 @@ let ecto_psql_extras = buildMix rec { name = "ecto_psql_extras"; - version = "0.7.12"; + version = "0.7.14"; src = fetchHex { - pkg = "${name}"; + pkg = "ecto_psql_extras"; version = "${version}"; - sha256 = "0k3iczvfj7m77170falil6h49r4hih1p54m952j37q2cnw81s7aa"; + sha256 = "22f5f98592dd597db9416fcef00effae0787669fdcb6faf447e982b553798e98"; }; beamDeps = [ ecto_sql postgrex table_rex ]; @@ -387,12 +387,12 @@ let ecto_sql = buildMix rec { name = "ecto_sql"; - version = "3.10.1"; + version = "3.10.2"; src = fetchHex { - pkg = "${name}"; + pkg = "ecto_sql"; version = "${version}"; - sha256 = "0sy5277akp828hvcg60yxhpfgj543y2z1bqy2z414pv9ppdmp8pn"; + sha256 = "68c018debca57cb9235e3889affdaec7a10616a4e3a80c99fa1d01fdafaa9007"; }; beamDeps = [ db_connection ecto postgrex telemetry ]; @@ -400,15 +400,28 @@ let elixir_make = buildMix rec { name = "elixir_make"; - version = "0.6.3"; + version = "0.7.7"; src = fetchHex { - pkg = "${name}"; + pkg = "elixir_make"; version = "${version}"; - sha256 = "05ppvbhqi5m9zk1c4xnrki814sqhxrc7d1dpvfmwm2v7qm8xdjzm"; + sha256 = "5bc19fff950fad52bbe5f211b12db9ec82c6b34a9647da0c2224b8b8464c7e6c"; }; - beamDeps = []; + beamDeps = [ castore ]; + }; + + elixir_xml_to_map = buildMix rec { + name = "elixir_xml_to_map"; + version = "3.0.0"; + + src = fetchHex { + pkg = "elixir_xml_to_map"; + version = "${version}"; + sha256 = "11222dd7f029f8db7a6662b41c992dbdb0e1c6e4fdea6a42056f9d27c847efbb"; + }; + + beamDeps = [ erlsom ]; }; erlex = buildMix rec { @@ -416,9 +429,22 @@ let version = "0.2.6"; src = fetchHex { - pkg = "${name}"; + pkg = "erlex"; version = "${version}"; - sha256 = "0x8c1j62y748ldvlh46sxzv5514rpzm809vxn594vd7y25by5lif"; + sha256 = "2ed2e25711feb44d52b17d2780eabf998452f6efda104877a3881c2f8c0c0c75"; + }; + + beamDeps = []; + }; + + erlsom = buildRebar3 rec { + name = "erlsom"; + version = "1.5.1"; + + src = fetchHex { + pkg = "erlsom"; + version = "${version}"; + sha256 = "7965485494c5844dd127656ac40f141aadfa174839ec1be1074e7edf5b4239eb"; }; beamDeps = []; @@ -429,9 +455,9 @@ let version = "1.2.2"; src = fetchHex { - pkg = "${name}"; + pkg = "eternal"; version = "${version}"; - sha256 = "10p7m6kv2z2c16gw36wgiwnkykss4lfkmm71llxp09ipkhmy77rc"; + sha256 = "2c9fe32b9c3726703ba5e1d43a1d255a4f3f2d8f8f9bc19f094c7cb1a7a9e782"; }; beamDeps = []; @@ -439,12 +465,12 @@ let ex_aws = buildMix rec { name = "ex_aws"; - version = "2.4.4"; + version = "2.5.0"; src = fetchHex { - pkg = "${name}"; + pkg = "ex_aws"; version = "${version}"; - sha256 = "1iqxr74m7wwqbjkrzrm6xs2ri9kshabh1wpk0jw6zcd2bi43xmm7"; + sha256 = "971b86e5495fc0ae1c318e35e23f389e74cf322f2c02d34037c6fc6d405006f1"; }; beamDeps = [ hackney jason mime sweet_xml telemetry ]; @@ -452,12 +478,12 @@ let ex_aws_s3 = buildMix rec { name = "ex_aws_s3"; - version = "2.4.0"; + version = "2.5.2"; src = fetchHex { - pkg = "${name}"; + pkg = "ex_aws_s3"; version = "${version}"; - sha256 = "1fsngrldq2g3i2f7y5m4d85sd7hx4jiwnfcxhs14bnalfziadpc5"; + sha256 = "cc5bd945a22a99eece4721d734ae2452d3717e81c357a781c8574663254df4a1"; }; beamDeps = [ ex_aws sweet_xml ]; @@ -468,9 +494,9 @@ let version = "0.2.4"; src = fetchHex { - pkg = "${name}"; + pkg = "ex_const"; version = "${version}"; - sha256 = "0rwppain0bd36krph1as0vxlxb42psc6mlkfi67jp6fc21k39zcn"; + sha256 = "96fd346610cc992b8f896ed26a98be82ac4efb065a0578f334a32d60a3ba9767"; }; beamDeps = []; @@ -478,12 +504,12 @@ let ex_doc = buildMix rec { name = "ex_doc"; - version = "0.30.3"; + version = "0.31.0"; src = fetchHex { - pkg = "${name}"; + pkg = "ex_doc"; version = "${version}"; - sha256 = "1dhqi5qx2fkphia0g7x2qg6pib08wsbn4dyyg7gmxln18qh71j7v"; + sha256 = "5350cafa6b7f77bdd107aa2199fe277acf29d739aba5aee7e865fc680c62a110"; }; beamDeps = [ earmark_parser makeup_elixir makeup_erlang ]; @@ -494,9 +520,9 @@ let version = "2.7.0"; src = fetchHex { - pkg = "${name}"; + pkg = "ex_machina"; version = "${version}"; - sha256 = "1y2v4j1zg1ji8q8di0fxpc3z3n2jmbnc85d6hx68j4fykfisg6j1"; + sha256 = "419aa7a39bde11894c87a615c4ecaa52d8f107bbdd81d810465186f783245bf8"; }; beamDeps = [ ecto ecto_sql ]; @@ -507,9 +533,9 @@ let version = "2.0.0"; src = fetchHex { - pkg = "${name}"; + pkg = "ex_syslogger"; version = "${version}"; - sha256 = "17h1p3l3a3icqlkyxglw4wwqxxhjb1indas9s7nfdsb42zkjyax5"; + sha256 = "a52b2fe71764e9e6ecd149ab66635812f68e39279cbeee27c52c0e35e8b8019e"; }; beamDeps = [ jason syslog ]; @@ -520,9 +546,9 @@ let version = "0.16.1"; src = fetchHex { - pkg = "${name}"; + pkg = "excoveralls"; version = "${version}"; - sha256 = "0f7i5gx1rpswbqmmqv133v3lpjwpkhjb2k56fmqcy210ir367rys"; + sha256 = "dae763468e2008cf7075a64cb1249c97cb4bc71e236c5c2b5e5cdf1cfa2bf138"; }; beamDeps = [ hackney jason ]; @@ -533,9 +559,9 @@ let version = "0.4.1"; src = fetchHex { - pkg = "${name}"; + pkg = "expo"; version = "${version}"; - sha256 = "0iyfl4vppfhmimfqaracjza9a6y8rgia03sm28y5934cg5xbmxrg"; + sha256 = "2ff7ba7a798c8c543c12550fa0e2cbc81b95d4974c65855d8d15ba7b37a1ce47"; }; beamDeps = []; @@ -546,9 +572,9 @@ let version = "2.2.0"; src = fetchHex { - pkg = "${name}"; + pkg = "fast_html"; version = "${version}"; - sha256 = "1bpvmqw4pcx8ssgmazvqn0dm6b3g0m5rij6shy8qy5m6nhilyk06"; + sha256 = "064c4f23b4a6168f9187dac8984b056f2c531bb0787f559fd6a8b34b38aefbae"; }; beamDeps = [ elixir_make nimble_pool ]; @@ -559,9 +585,9 @@ let version = "0.2.3"; src = fetchHex { - pkg = "${name}"; + pkg = "fast_sanitize"; version = "${version}"; - sha256 = "1qjnbs63q0d95dqhh2r9sz3zpg2y4hjy23kxsqanwf6h21njibg8"; + sha256 = "e8ad286d10d0386e15d67d0ee125245ebcfbc7d7290b08712ba9013c8c5e56e2"; }; beamDeps = [ fast_html plug ]; @@ -572,9 +598,9 @@ let version = "0.2.10"; src = fetchHex { - pkg = "${name}"; + pkg = "file_system"; version = "${version}"; - sha256 = "1p0myxmnjjds8bbg69dd6fvhk8q3n7lb78zd4qvmjajnzgdmw6a1"; + sha256 = "41195edbfb562a593726eda3b3e8b103a309b733ad25f3d642ba49696bf715dc"; }; beamDeps = []; @@ -585,9 +611,9 @@ let version = "0.16.0"; src = fetchHex { - pkg = "${name}"; + pkg = "finch"; version = "${version}"; - sha256 = "1iayffbjzb1rcy1p0wibzv6j5n7dc16ha5lhcbn5z7ji9m61fq7n"; + sha256 = "f660174c4d519e5fec629016054d60edd822cdfe2b7270836739ac2f97735ec5"; }; beamDeps = [ castore mime mint nimble_options nimble_pool telemetry ]; @@ -598,9 +624,9 @@ let version = "0.1.0"; src = fetchHex { - pkg = "${name}"; + pkg = "flake_id"; version = "${version}"; - sha256 = "09yq3dlqqrb7v4ysblwpz1al0q5qcmryldkwq1kx5b71zn881z1i"; + sha256 = "31fc8090fde1acd267c07c36ea7365b8604055f897d3a53dd967658c691bd827"; }; beamDeps = [ base62 ecto ]; @@ -608,12 +634,12 @@ let floki = buildMix rec { name = "floki"; - version = "0.34.3"; + version = "0.35.2"; src = fetchHex { - pkg = "${name}"; + pkg = "floki"; version = "${version}"; - sha256 = "0h936kfai562dh4qpcpri7jxrdmqyxaymizk9d5r55svx8748xwm"; + sha256 = "6b05289a8e9eac475f644f09c2e4ba7e19201fd002b89c28c1293e7bd16773d9"; }; beamDeps = []; @@ -624,9 +650,9 @@ let version = "1.2.0"; src = fetchHex { - pkg = "${name}"; + pkg = "gen_smtp"; version = "${version}"; - sha256 = "0yb7541zx0x76gzk0m1m8fkl6524jhl8rxc59l6g5a5wh1b3gq2y"; + sha256 = "5ee0375680bca8f20c4d85f58c2894441443a743355430ff33a783fe03296779"; }; beamDeps = [ ranch ]; @@ -637,9 +663,9 @@ let version = "0.22.3"; src = fetchHex { - pkg = "${name}"; + pkg = "gettext"; version = "${version}"; - sha256 = "1gb49f75apkgfa5ddg02x08w1i3qm31jifzicrl4m58kfx226pwk"; + sha256 = "935f23447713954a6866f1bb28c3a878c4c011e802bcd68a726f5e558e4b64bd"; }; beamDeps = [ expo ]; @@ -647,12 +673,12 @@ let hackney = buildRebar3 rec { name = "hackney"; - version = "1.18.1"; + version = "1.20.1"; src = fetchHex { - pkg = "${name}"; + pkg = "hackney"; version = "${version}"; - sha256 = "13hja14kig5jnzcizpdghj68i88f0yd9wjdfjic9nzi98kzxmv54"; + sha256 = "fe9094e5f1a2a2c0a7d10918fee36bfec0ec2a979994cff8cfe8058cd9af38e3"; }; beamDeps = [ certifi idna metrics mimerl parse_trans ssl_verify_fun unicode_util_compat ]; @@ -663,9 +689,9 @@ let version = "0.1.2"; src = fetchHex { - pkg = "${name}"; + pkg = "hpax"; version = "${version}"; - sha256 = "04wci9ifsfyd2pbcrnpgh2aq0a8fi1lpkrzb91kz3x93b8yq91rc"; + sha256 = "2c87843d5a23f5f16748ebe77969880e29809580efdaccd615cd3bed628a8c13"; }; beamDeps = []; @@ -676,22 +702,9 @@ let version = "0.5.2"; src = fetchHex { - pkg = "${name}"; + pkg = "html_entities"; version = "${version}"; - sha256 = "1k7xyj0q38ms3n5hbn782pa6w1vgd6biwlxr4db6319l828a6fy5"; - }; - - beamDeps = []; - }; - - http_signatures = buildMix rec { - name = "http_signatures"; - version = "0.1.1"; - - src = fetchHex { - pkg = "${name}"; - version = "${version}"; - sha256 = "18s2b5383xl2qjijkxag4mvwk2p5kv2fw58c9ii7pk12fc08lfyc"; + sha256 = "c53ba390403485615623b9531e97696f076ed415e8d8058b1dbaa28181f4fdcc"; }; beamDeps = []; @@ -702,9 +715,9 @@ let version = "1.8.2"; src = fetchHex { - pkg = "${name}"; + pkg = "httpoison"; version = "${version}"; - sha256 = "08crb48yz7r7w00pzw9gfk862g99z2ma2x6awab0rqvjd7951crb"; + sha256 = "2bb350d26972e30c96e2ca74a1aaf8293d61d0742ff17f01e0279fef11599921"; }; beamDeps = [ hackney ]; @@ -715,9 +728,9 @@ let version = "6.1.1"; src = fetchHex { - pkg = "${name}"; + pkg = "idna"; version = "${version}"; - sha256 = "1sjcjibl34sprpf1dgdmzfww24xlyy34lpj7mhcys4j4i6vnwdwj"; + sha256 = "92376eb7894412ed19ac475e4a86f7b413c1b9fbb5bd16dccd57934157944cea"; }; beamDeps = [ unicode_util_compat ]; @@ -728,9 +741,9 @@ let version = "1.0.4"; src = fetchHex { - pkg = "${name}"; + pkg = "inet_cidr"; version = "${version}"; - sha256 = "1g61i08cizr99ivy050lv8fmvnwia9zmipfvlwff8jkhi40x78k4"; + sha256 = "64a2d30189704ae41ca7dbdd587f5291db5d1dda1414e0774c29ffc81088c1bc"; }; beamDeps = []; @@ -741,9 +754,9 @@ let version = "1.4.1"; src = fetchHex { - pkg = "${name}"; + pkg = "jason"; version = "${version}"; - sha256 = "18d70i31bz11nr6vgsjn5prvhkvwqbyf3xq22ck5cnsnzp6ixc7v"; + sha256 = "fbb01ecdfd565b56261302f7e1fcc27c4fb8f32d56eab74db621fc154604a7a1"; }; beamDeps = [ decimal ]; @@ -754,9 +767,9 @@ let version = "2.6.0"; src = fetchHex { - pkg = "${name}"; + pkg = "joken"; version = "${version}"; - sha256 = "19xanmavc4n5zzypxyi4qd93m8l7sjqswy2ksfmm82ydf5db15as"; + sha256 = "5a95b05a71cd0b54abd35378aeb1d487a23a52c324fa7efdffc512b655b5aaa7"; }; beamDeps = [ jose ]; @@ -767,9 +780,9 @@ let version = "1.11.6"; src = fetchHex { - pkg = "${name}"; + pkg = "jose"; version = "${version}"; - sha256 = "0f4pzx8xdzjkkfjkl442w6lhajgfzsnp3dxcxrh1x72ga1swnxb2"; + sha256 = "6275cb75504f9c1e60eeacb771adfeee4905a9e182103aa59b53fed651ff9738"; }; beamDeps = []; @@ -777,12 +790,12 @@ let jumper = buildMix rec { name = "jumper"; - version = "1.0.1"; + version = "1.0.2"; src = fetchHex { - pkg = "${name}"; + pkg = "jumper"; version = "${version}"; - sha256 = "0cvlbfkapkvbwaijmjq3cxg5m6yv4rh69wvss9kfj862i83mk31i"; + sha256 = "9b7782409021e01ab3c08270e26f36eb62976a38c1aa64b2eaf6348422f165e1"; }; beamDeps = []; @@ -790,38 +803,25 @@ let mail = buildMix rec { name = "mail"; - version = "0.3.0"; + version = "0.3.1"; src = fetchHex { - pkg = "${name}"; + pkg = "mail"; version = "${version}"; - sha256 = "0v0i0xwhsqvdxxyacmcf25pqyda87yqkn7g49vf8gn1i485p0gaj"; + sha256 = "1db701e89865c1d5fa296b2b57b1cd587587cca8d8a1a22892b35ef5a8e352a6"; }; beamDeps = []; }; - majic = buildMix rec { - name = "majic"; - version = "1.0.0"; - - src = fetchHex { - pkg = "${name}"; - version = "${version}"; - sha256 = "17hab8kmqc6gsiqicfgsaik0rvmakb6mbshlbxllj3b5fs7qa1br"; - }; - - beamDeps = [ elixir_make mime nimble_pool plug ]; - }; - makeup = buildMix rec { name = "makeup"; - version = "1.1.0"; + version = "1.1.1"; src = fetchHex { - pkg = "${name}"; + pkg = "makeup"; version = "${version}"; - sha256 = "19jpprryixi452jwhws3bbks6ki3wni9kgzah3srg22a3x8fsi8a"; + sha256 = "5dc62fbdd0de44de194898b6710692490be74baa02d9d108bc29f007783b0b48"; }; beamDeps = [ nimble_parsec ]; @@ -832,9 +832,9 @@ let version = "0.16.1"; src = fetchHex { - pkg = "${name}"; + pkg = "makeup_elixir"; version = "${version}"; - sha256 = "1ik7qw0d5xyc7dv3n33qxl49jfk92l565lbv1zc9n80vmm0s69z1"; + sha256 = "e127a341ad1b209bd80f7bd1620a15693a9908ed780c3b763bccf7d200c767c6"; }; beamDeps = [ makeup nimble_parsec ]; @@ -842,12 +842,12 @@ let makeup_erlang = buildMix rec { name = "makeup_erlang"; - version = "0.1.2"; + version = "0.1.3"; src = fetchHex { - pkg = "${name}"; + pkg = "makeup_erlang"; version = "${version}"; - sha256 = "02411riqa713wzw8in582yva6n6spi4w1ndnj8nhjvnfjg5a3xgk"; + sha256 = "b78dc853d2e670ff6390b605d807263bf606da3c82be37f9d7f68635bd886fc9"; }; beamDeps = [ makeup ]; @@ -858,9 +858,9 @@ let version = "0.9.2"; src = fetchHex { - pkg = "${name}"; + pkg = "meck"; version = "${version}"; - sha256 = "09jq0jrsd3dwzjlnwqjv6m9r2rijgiv57yja6jl41p2p2db4yd41"; + sha256 = "81344f561357dc40a8344afa53767c32669153355b626ea9fcbc8da6b3045826"; }; beamDeps = []; @@ -871,9 +871,9 @@ let version = "1.0.1"; src = fetchHex { - pkg = "${name}"; + pkg = "metrics"; version = "${version}"; - sha256 = "05lz15piphyhvvm3d1ldjyw0zsrvz50d2m5f2q3s8x2gvkfrmc39"; + sha256 = "69b09adddc4f74a40716ae54d140f93beb0fb8978d8636eaded0c31b6f099f16"; }; beamDeps = []; @@ -881,12 +881,12 @@ let mime = buildMix rec { name = "mime"; - version = "1.6.0"; + version = "2.0.5"; src = fetchHex { - pkg = "${name}"; + pkg = "mime"; version = "${version}"; - sha256 = "19qrpnmaf3w8bblvkv6z5g82hzd10rhc7bqxvqyi88c37xhsi89i"; + sha256 = "da0d64a365c45bc9935cc5c8a7fc5e49a0e0f9932a761c55d6c52b142780a05c"; }; beamDeps = []; @@ -897,9 +897,9 @@ let version = "1.2.0"; src = fetchHex { - pkg = "${name}"; + pkg = "mimerl"; version = "${version}"; - sha256 = "08wkw73dy449n68ssrkz57gikfzqk3vfnf264s31jn5aa1b5hy7j"; + sha256 = "f278585650aa581986264638ebf698f8bb19df297f66ad91b18910dfc6e19323"; }; beamDeps = []; @@ -907,12 +907,12 @@ let mint = buildMix rec { name = "mint"; - version = "1.5.1"; + version = "1.5.2"; src = fetchHex { - pkg = "${name}"; + pkg = "mint"; version = "${version}"; - sha256 = "07jvgmggmv6bxhkmrskdjz1xvv0a1l53fby7sammcfbwdbky2qsa"; + sha256 = "d77d9e9ce4eb35941907f1d3df38d8f750c357865353e21d335bdcdf6d892a02"; }; beamDeps = [ castore hpax ]; @@ -923,9 +923,9 @@ let version = "0.3.8"; src = fetchHex { - pkg = "${name}"; + pkg = "mock"; version = "${version}"; - sha256 = "08i0zvk3wss217pjr4qczmdgxi607wcp2mfinydxf5vnr5j27a3z"; + sha256 = "7fa82364c97617d79bb7d15571193fc0c4fe5afd0c932cef09426b3ee6fe2022"; }; beamDeps = [ meck ]; @@ -936,9 +936,9 @@ let version = "0.9.3"; src = fetchHex { - pkg = "${name}"; + pkg = "mogrify"; version = "${version}"; - sha256 = "1rii2yjswnbivmdfnxljvqw3vlpgkhiqikz8k8mmyi97vvhv3281"; + sha256 = "0189b1e1de27455f2b9ae8cf88239cefd23d38de9276eb5add7159aea51731e6"; }; beamDeps = []; @@ -946,12 +946,12 @@ let mox = buildMix rec { name = "mox"; - version = "1.0.2"; + version = "1.1.0"; src = fetchHex { - pkg = "${name}"; + pkg = "mox"; version = "${version}"; - sha256 = "1wpyh6wp76lyx0q2cys23rpmci4gj1pqwnqvfk467xxanchlk1pr"; + sha256 = "d44474c50be02d5b72131070281a5d3895c0e7a95c780e90bc0cfe712f633a13"; }; beamDeps = []; @@ -959,12 +959,12 @@ let nimble_options = buildMix rec { name = "nimble_options"; - version = "1.0.2"; + version = "1.1.0"; src = fetchHex { - pkg = "${name}"; + pkg = "nimble_options"; version = "${version}"; - sha256 = "1f7ih1rnkvph0daf4lsv4rrp6dpccksjd7rh5bhnq0r143dsh4px"; + sha256 = "8bbbb3941af3ca9acc7835f5655ea062111c9c27bcac53e004460dfd19008a99"; }; beamDeps = []; @@ -972,12 +972,12 @@ let nimble_parsec = buildMix rec { name = "nimble_parsec"; - version = "1.3.1"; + version = "1.4.0"; src = fetchHex { - pkg = "${name}"; + pkg = "nimble_parsec"; version = "${version}"; - sha256 = "0rxiw6jzz77v0j460wmzcprhdgn71g1hrz3mcc6djn7bnb0f70i6"; + sha256 = "9c565862810fb383e9838c1dd2d7d2c437b3d13b267414ba6af33e50d2d1cf28"; }; beamDeps = []; @@ -985,12 +985,12 @@ let nimble_pool = buildMix rec { name = "nimble_pool"; - version = "0.2.6"; + version = "1.0.0"; src = fetchHex { - pkg = "${name}"; + pkg = "nimble_pool"; version = "${version}"; - sha256 = "0gv59waa505mz2gi956sj1aa6844c65w2dp2qh2jfgsx15am0w8w"; + sha256 = "80be3b882d2d351882256087078e1b1952a28bf98d0a287be87e4a24a710b67a"; }; beamDeps = []; @@ -998,12 +998,12 @@ let oban = buildMix rec { name = "oban"; - version = "2.15.2"; + version = "2.15.4"; src = fetchHex { - pkg = "${name}"; + pkg = "oban"; version = "${version}"; - sha256 = "1sgickk10b73pkddfhk5vhmi8vjn065wzyl41ng4iiwgljg5fjhg"; + sha256 = "5fce611fdfffb13e9148df883116e5201adf1e731eb302cc88cde0588510079c"; }; beamDeps = [ ecto_sql jason postgrex telemetry ]; @@ -1011,12 +1011,12 @@ let open_api_spex = buildMix rec { name = "open_api_spex"; - version = "3.17.3"; + version = "3.18.0"; src = fetchHex { - pkg = "${name}"; + pkg = "open_api_spex"; version = "${version}"; - sha256 = "1zphp59dd3l4l8279pjmhbddskimbgrr123wivycz0yahldb4p8n"; + sha256 = "37849887ab67efab052376401fac28c0974b273ffaecd98f4532455ca0886464"; }; beamDeps = [ jason plug poison ]; @@ -1024,12 +1024,12 @@ let parse_trans = buildRebar3 rec { name = "parse_trans"; - version = "3.3.1"; + version = "3.4.1"; src = fetchHex { - pkg = "${name}"; + pkg = "parse_trans"; version = "${version}"; - sha256 = "12w8ai6b5s6b4hnvkav7hwxd846zdd74r32f84nkcmjzi1vrbk87"; + sha256 = "620a406ce75dada827b82e453c19cf06776be266f5a67cff34e1ef2cbb60e49a"; }; beamDeps = []; @@ -1037,25 +1037,25 @@ let phoenix = buildMix rec { name = "phoenix"; - version = "1.6.16"; + version = "1.7.10"; src = fetchHex { - pkg = "${name}"; + pkg = "phoenix"; version = "${version}"; - sha256 = "0fdca3h6k9plv1qvch6zyl6wbnfhp8jisvggjmmsjw7n6kzqjng1"; + sha256 = "cf784932e010fd736d656d7fead6a584a4498efefe5b8227e9f383bf15bb79d0"; }; - beamDeps = [ castore jason phoenix_pubsub phoenix_view plug plug_cowboy plug_crypto telemetry ]; + beamDeps = [ castore jason phoenix_pubsub phoenix_template phoenix_view plug plug_cowboy plug_crypto telemetry websock_adapter ]; }; phoenix_ecto = buildMix rec { name = "phoenix_ecto"; - version = "4.4.2"; + version = "4.4.3"; src = fetchHex { - pkg = "${name}"; + pkg = "phoenix_ecto"; version = "${version}"; - sha256 = "0pcgrvj5lqjmsngrhl77kv0l8ik8gg7pw19v4xlhpm818vfjw93h"; + sha256 = "d36c401206f3011fefd63d04e8ef626ec8791975d9d107f9a0817d426f61ac07"; }; beamDeps = [ ecto phoenix_html plug ]; @@ -1063,12 +1063,12 @@ let phoenix_html = buildMix rec { name = "phoenix_html"; - version = "3.3.1"; + version = "3.3.3"; src = fetchHex { - pkg = "${name}"; + pkg = "phoenix_html"; version = "${version}"; - sha256 = "1lyhagjpg4lran6431csgkvf28g50mdvh4mlsxgs21j9vmp91ldy"; + sha256 = "923ebe6fec6e2e3b3e569dfbdc6560de932cd54b000ada0208b5f45024bdd76c"; }; beamDeps = [ plug ]; @@ -1079,9 +1079,9 @@ let version = "0.7.2"; src = fetchHex { - pkg = "${name}"; + pkg = "phoenix_live_dashboard"; version = "${version}"; - sha256 = "1dq5vj1a6fzclr3fwj7y8rg2xq3yigvgqc3aaq664fvs7h3dypqf"; + sha256 = "0e5fdf063c7a3b620c566a30fcf68b7ee02e5e46fe48ee46a6ec3ba382dc05b7"; }; beamDeps = [ ecto ecto_psql_extras mime phoenix_live_view telemetry_metrics ]; @@ -1092,9 +1092,9 @@ let version = "0.18.18"; src = fetchHex { - pkg = "${name}"; + pkg = "phoenix_live_view"; version = "${version}"; - sha256 = "052jv2kbc2nb4qs4ly4idcai6q8wyfkvv59adpg9w67kf820v0d5"; + sha256 = "a5810d0472f3189ede6d2a95bda7f31c6113156b91784a3426cb0ab6a6d85214"; }; beamDeps = [ jason phoenix phoenix_html phoenix_template phoenix_view telemetry ]; @@ -1105,9 +1105,9 @@ let version = "2.1.3"; src = fetchHex { - pkg = "${name}"; + pkg = "phoenix_pubsub"; version = "${version}"; - sha256 = "00p5dvizhawhqbia2cakdn4whaxsm2adq3lzfn3b137xvk0np85v"; + sha256 = "bba06bc1dcfd8cb086759f0edc94a8ba2bc8896d5331a1e2c2902bf8e36ee502"; }; beamDeps = []; @@ -1118,9 +1118,9 @@ let version = "1.2.0"; src = fetchHex { - pkg = "${name}"; + pkg = "phoenix_swoosh"; version = "${version}"; - sha256 = "1fhxh4sff7b3qz2lyryzgms9d6mrhxnmlh924awid6p8a5r133g8"; + sha256 = "e88d117251e89a16b92222415a6d87b99a96747ddf674fc5c7631de734811dba"; }; beamDeps = [ finch hackney phoenix phoenix_html phoenix_view swoosh ]; @@ -1131,9 +1131,9 @@ let version = "1.0.3"; src = fetchHex { - pkg = "${name}"; + pkg = "phoenix_template"; version = "${version}"; - sha256 = "0b4fbp9dhfii6njksm35z8xf4bp8lw5hr7bv0p6g6lj1i9cbdx0n"; + sha256 = "16f4b6588a4152f3cc057b9d0c0ba7e82ee23afa65543da535313ad8d25d8e2c"; }; beamDeps = [ phoenix_html ]; @@ -1141,12 +1141,12 @@ let phoenix_view = buildMix rec { name = "phoenix_view"; - version = "2.0.2"; + version = "2.0.3"; src = fetchHex { - pkg = "${name}"; + pkg = "phoenix_view"; version = "${version}"; - sha256 = "0vykabqxyk08gkfm45zy5dnlnzygwx6g9z4z2h7fxix51qiyfad9"; + sha256 = "cd34049af41be2c627df99cd4eaa71fc52a328c0c3d8e7d4aa28f880c30e7f64"; }; beamDeps = [ phoenix_html phoenix_template ]; @@ -1154,12 +1154,12 @@ let plug = buildMix rec { name = "plug"; - version = "1.14.2"; + version = "1.15.2"; src = fetchHex { - pkg = "${name}"; + pkg = "plug"; version = "${version}"; - sha256 = "04wdyv6nma74bj1m49vkm2bc5mjf8zclfg957fng8g71hw0wabw4"; + sha256 = "02731fa0c2dcb03d8d21a1d941bdbbe99c2946c0db098eee31008e04c6283615"; }; beamDeps = [ mime plug_crypto telemetry ]; @@ -1170,9 +1170,9 @@ let version = "2.6.1"; src = fetchHex { - pkg = "${name}"; + pkg = "plug_cowboy"; version = "${version}"; - sha256 = "04v6xc4v741dr2y38j66fmcc4xc037dnaxzkj2vih6j53yif2dny"; + sha256 = "de36e1a21f451a18b790f37765db198075c25875c64834bcc82d90b309eb6613"; }; beamDeps = [ cowboy cowboy_telemetry plug ]; @@ -1180,12 +1180,12 @@ let plug_crypto = buildMix rec { name = "plug_crypto"; - version = "1.2.5"; + version = "2.0.0"; src = fetchHex { - pkg = "${name}"; + pkg = "plug_crypto"; version = "${version}"; - sha256 = "0hnqgzc3zas7j7wycgnkkdhaji5farkqccy2n4p1gqj5ccfrlm16"; + sha256 = "53695bae57cc4e54566d993eb01074e4d894b65a3766f1c43e2c61a1b0f45ea9"; }; beamDeps = []; @@ -1196,9 +1196,9 @@ let version = "1.0.0"; src = fetchHex { - pkg = "${name}"; + pkg = "plug_static_index_html"; version = "${version}"; - sha256 = "1kxm1flxw3rnsj5jj24c2p23wq1wyblbl32n4rf6046i6k7lzzbr"; + sha256 = "79fd4fcf34d110605c26560cbae8f23c603ec4158c08298bd4360fdea90bb5cf"; }; beamDeps = [ plug ]; @@ -1209,9 +1209,9 @@ let version = "5.0.0"; src = fetchHex { - pkg = "${name}"; + pkg = "poison"; version = "${version}"; - sha256 = "1z6kv2s6w5nrq20446510nys30ir0hfr8ksrlxi0rf01qlbn3p0i"; + sha256 = "11dc6117c501b80c62a7594f941d043982a1bd05a1184280c0d9166eb4d8d3fc"; }; beamDeps = [ decimal ]; @@ -1222,9 +1222,9 @@ let version = "1.5.2"; src = fetchHex { - pkg = "${name}"; + pkg = "poolboy"; version = "${version}"; - sha256 = "1qq116314418jp4skxg8c6jx29fwp688a738lgaz6h2lrq29gmys"; + sha256 = "dad79704ce5440f3d5a3681c8590b9dc25d1a561e8f5a9c995281012860901e3"; }; beamDeps = []; @@ -1232,12 +1232,12 @@ let postgrex = buildMix rec { name = "postgrex"; - version = "0.17.2"; + version = "0.17.4"; src = fetchHex { - pkg = "${name}"; + pkg = "postgrex"; version = "${version}"; - sha256 = "036r3q250vrhj4nmyr4cc40krjgbyci18qkhppvkj7akx6liiac0"; + sha256 = "6458f7d5b70652bc81c3ea759f91736c16a31be000f306d3c64bcdfe9a18b3cc"; }; beamDeps = [ db_connection decimal jason ]; @@ -1248,9 +1248,9 @@ let version = "1.0.2"; src = fetchHex { - pkg = "${name}"; + pkg = "pot"; version = "${version}"; - sha256 = "1q62ascgjgddq0l42nvysfwkxmbvh9qsd8m5dsfr2psgb9zi5zkq"; + sha256 = "78fe127f5a4f5f919d6ea5a2a671827bd53eb9d37e5b4128c0ad3df99856c2e0"; }; beamDeps = []; @@ -1261,9 +1261,9 @@ let version = "1.8.0"; src = fetchHex { - pkg = "${name}"; + pkg = "ranch"; version = "${version}"; - sha256 = "1rfz5ld54pkd2w25jadyznia2vb7aw9bclck21fizargd39wzys9"; + sha256 = "49fbcfd3682fab1f5d109351b61257676da1a2fdbe295904176d5e521a2ddfe5"; }; beamDeps = []; @@ -1271,12 +1271,12 @@ let recon = buildMix rec { name = "recon"; - version = "2.5.3"; + version = "2.5.4"; src = fetchHex { - pkg = "${name}"; + pkg = "recon"; version = "${version}"; - sha256 = "1mwr6267lwl4p7f8jfk14s4cszxwra6zgf84hkcxz8fldzs86rkc"; + sha256 = "e9ab01ac7fc8572e41eb59385efeb3fb0ff5bf02103816535bacaedf327d0263"; }; beamDeps = []; @@ -1287,9 +1287,9 @@ let version = "1.1.0"; src = fetchHex { - pkg = "${name}"; + pkg = "remote_ip"; version = "${version}"; - sha256 = "0x7d086iik0h5gcwn2bvx6cjlznqxr1bznj6qlpsgmmadbvgsvv1"; + sha256 = "616ffdf66aaad6a72fc546dabf42eed87e2a99e97b09cbd92b10cc180d02ed74"; }; beamDeps = [ combine plug ]; @@ -1300,9 +1300,9 @@ let version = "1.1.2"; src = fetchHex { - pkg = "${name}"; + pkg = "sleeplocks"; version = "${version}"; - sha256 = "19argym7xifhsbrp21glkgs0dz1xpd00yfhsbhqdd0dpqm4d1rcz"; + sha256 = "9fe5d048c5b781d6305c1a3a0f40bb3dfc06f49bf40571f3d2d0c57eaa7f59a5"; }; beamDeps = []; @@ -1313,9 +1313,9 @@ let version = "1.1.7"; src = fetchHex { - pkg = "${name}"; + pkg = "ssl_verify_fun"; version = "${version}"; - sha256 = "1y37pj5q6gk1vrnwg1vraws9yihrv9g4133w2qq1sh1piw71jk7y"; + sha256 = "fe4c190e8f37401d30167c8c405eda19469f34577987c76dde613e838bbc67f8"; }; beamDeps = []; @@ -1326,9 +1326,9 @@ let version = "1.0.0"; src = fetchHex { - pkg = "${name}"; + pkg = "statistex"; version = "${version}"; - sha256 = "09vcm2sz2llv00cm7krkx3n5r8ra1b42zx9gfjs8l0imf3p8p7gz"; + sha256 = "ff9d8bee7035028ab4742ff52fc80a2aa35cece833cf5319009b52f1b5a86c27"; }; beamDeps = []; @@ -1336,12 +1336,12 @@ let sweet_xml = buildMix rec { name = "sweet_xml"; - version = "0.7.3"; + version = "0.7.4"; src = fetchHex { - pkg = "${name}"; + pkg = "sweet_xml"; version = "${version}"; - sha256 = "1fpmwhqgvakvdpbwmmyh31ays3hzhnm9766xqyzp9zmkl5kwh471"; + sha256 = "e7c4b0bdbf460c928234951def54fe87edf1a170f6896675443279e2dbeba167"; }; beamDeps = []; @@ -1349,15 +1349,15 @@ let swoosh = buildMix rec { name = "swoosh"; - version = "1.11.4"; + version = "1.14.2"; src = fetchHex { - pkg = "${name}"; + pkg = "swoosh"; version = "${version}"; - sha256 = "03rxj2jdrjg6pab05iz8myr0j9fi3d1v7z2bc3hnli9a08a0jffk"; + sha256 = "01d8fae72930a0b5c1bb9725df0408602ed8c5c3d59dc6e7a39c57b723cd1065"; }; - beamDeps = [ cowboy ex_aws finch gen_smtp hackney jason mail mime plug_cowboy telemetry ]; + beamDeps = [ cowboy ex_aws finch gen_smtp hackney jason mail mime plug plug_cowboy telemetry ]; }; syslog = buildRebar3 rec { @@ -1365,9 +1365,9 @@ let version = "1.1.0"; src = fetchHex { - pkg = "${name}"; + pkg = "syslog"; version = "${version}"; - sha256 = "1qarnqappln4xhlr700rhnhfnfvgvv9l3y1ywdxmh83y7hvl2sjc"; + sha256 = "4c6a41373c7e20587be33ef841d3de6f3beba08519809329ecc4d27b15b659e1"; }; beamDeps = []; @@ -1378,9 +1378,9 @@ let version = "3.1.1"; src = fetchHex { - pkg = "${name}"; + pkg = "table_rex"; version = "${version}"; - sha256 = "141404hwnwnpspvhs112j2la8dfnvkwr0xy14ff42w6nljmj72k7"; + sha256 = "678a23aba4d670419c23c17790f9dcd635a4a89022040df7d5d772cb21012490"; }; beamDeps = []; @@ -1391,9 +1391,9 @@ let version = "1.2.1"; src = fetchHex { - pkg = "${name}"; + pkg = "telemetry"; version = "${version}"; - sha256 = "1mgyx9zw92g6w8fp9pblm3b0bghwxwwcbslrixq23ipzisfwxnfs"; + sha256 = "dad9ce9d8effc621708f99eac538ef1cbe05d6a874dd741de2e689c47feafed5"; }; beamDeps = []; @@ -1404,9 +1404,9 @@ let version = "0.6.1"; src = fetchHex { - pkg = "${name}"; + pkg = "telemetry_metrics"; version = "${version}"; - sha256 = "1iilk2n75kn9i95fdp8mpxvn3rcn3ghln7p77cijqws13j3y1sbv"; + sha256 = "7be9e0871c41732c233be71e4be11b96e56177bf15dde64a8ac9ce72ac9834c6"; }; beamDeps = [ telemetry ]; @@ -1417,9 +1417,9 @@ let version = "1.1.0"; src = fetchHex { - pkg = "${name}"; + pkg = "telemetry_metrics_prometheus"; version = "${version}"; - sha256 = "09jdrv0ik5svi77djycva7a6a8sl05vp2nr7w17s8k94ndckcfyl"; + sha256 = "d43b3659b3244da44fe0275b717701542365d4519b79d9ce895b9719c1ce4d26"; }; beamDeps = [ plug_cowboy telemetry_metrics_prometheus_core ]; @@ -1430,9 +1430,9 @@ let version = "1.1.0"; src = fetchHex { - pkg = "${name}"; + pkg = "telemetry_metrics_prometheus_core"; version = "${version}"; - sha256 = "0sd0j7arhf22ickzdfmq656258dh14kzi61p0vgra007x1zhxl8d"; + sha256 = "0dd10e7fe8070095df063798f82709b0a1224c31b8baf6278b423898d591a069"; }; beamDeps = [ telemetry telemetry_metrics ]; @@ -1443,9 +1443,9 @@ let version = "1.0.0"; src = fetchHex { - pkg = "${name}"; + pkg = "telemetry_poller"; version = "${version}"; - sha256 = "0vjgxkxn9ll1gc6xd8jh4b0ldmg9l7fsfg7w63d44gvcssplx8mk"; + sha256 = "b3a24eafd66c3f42da30fc3ca7dda1e9d546c12250a2d60d7b81d264fbec4f6e"; }; beamDeps = [ telemetry ]; @@ -1453,12 +1453,12 @@ let tesla = buildMix rec { name = "tesla"; - version = "1.7.0"; + version = "1.8.0"; src = fetchHex { - pkg = "${name}"; + pkg = "tesla"; version = "${version}"; - sha256 = "04y31nq54j1wnzpi37779bzzq0sjwsh53ikvnh4n40nvpwgg0r1f"; + sha256 = "10501f360cd926a309501287470372af1a6e1cbed0f43949203a4c13300bc79f"; }; beamDeps = [ castore finch hackney jason mime mint poison telemetry ]; @@ -1469,9 +1469,9 @@ let version = "3.7.11"; src = fetchHex { - pkg = "${name}"; + pkg = "timex"; version = "${version}"; - sha256 = "1anijimbrb3ngdy6fdspr8c9hz6dip7nakx0gayzkfmsxzvj944b"; + sha256 = "8b9024f7efbabaf9bd7aa04f65cf8dcd7c9818ca5737677c7b76acbc6a94d1aa"; }; beamDeps = [ combine gettext tzdata ]; @@ -1482,9 +1482,9 @@ let version = "0.0.7"; src = fetchHex { - pkg = "${name}"; + pkg = "trailing_format_plug"; version = "${version}"; - sha256 = "0gv9z8m1kpfs5f5zcsh9m6vr36s88x1xc6g0k6lr7sgk2m6dwkxx"; + sha256 = "bd4fde4c15f3e993a999e019d64347489b91b7a9096af68b2bdadd192afa693f"; }; beamDeps = [ plug ]; @@ -1495,9 +1495,9 @@ let version = "1.1.1"; src = fetchHex { - pkg = "${name}"; + pkg = "tzdata"; version = "${version}"; - sha256 = "11wpm1mjla8hbkb5mssprg3gsq1v24s8m8nyk3hx5z7aaa1yr756"; + sha256 = "a69cec8352eafcd2e198dea28a34113b60fdc6cb57eb5ad65c10292a6ba89787"; }; beamDeps = [ hackney ]; @@ -1508,9 +1508,9 @@ let version = "0.10.5"; src = fetchHex { - pkg = "${name}"; + pkg = "ueberauth"; version = "${version}"; - sha256 = "1qf97azn8064ymawfm58p2bqpmrigipr4fs5xp3jb8chshqizz9y"; + sha256 = "3efd1f31d490a125c7ed453b926f7c31d78b97b8a854c755f5c40064bf3ac9e1"; }; beamDeps = [ plug ]; @@ -1521,9 +1521,9 @@ let version = "0.7.0"; src = fetchHex { - pkg = "${name}"; + pkg = "unicode_util_compat"; version = "${version}"; - sha256 = "08952lw8cjdw8w171lv8wqbrxc4rcmb3jhkrdb7n06gngpbfdvi5"; + sha256 = "25eee6d67df61960cf6a794239566599b09e17e668d3700247bc498638152521"; }; beamDeps = []; @@ -1531,12 +1531,12 @@ let unsafe = buildMix rec { name = "unsafe"; - version = "1.0.1"; + version = "1.0.2"; src = fetchHex { - pkg = "${name}"; + pkg = "unsafe"; version = "${version}"; - sha256 = "1rahpgz1lsd66r7ycns1ryz2qymamz1anrlps986900lsai2jxvc"; + sha256 = "b485231683c3ab01a9cd44cb4a79f152c6f3bb87358439c6f68791b85c2df675"; }; beamDeps = []; @@ -1544,12 +1544,12 @@ let vex = buildMix rec { name = "vex"; - version = "0.9.0"; + version = "0.9.1"; src = fetchHex { - pkg = "${name}"; + pkg = "vex"; version = "${version}"; - sha256 = "0zw51hj525xiiggjk9n5ciix6pdhr8fvl6z7mqgkzan8sm2gz7y6"; + sha256 = "a0f9f3959d127ad6a6a617c3f607ecfb1bc6f3c59f9c3614a901a46d1765bafe"; }; beamDeps = []; @@ -1560,22 +1560,48 @@ let version = "0.3.1"; src = fetchHex { - pkg = "${name}"; + pkg = "web_push_encryption"; version = "${version}"; - sha256 = "18p2f1gqkg209vf3nychjxy7xpxhgiwyhn4halvr7yr2fvjv50jg"; + sha256 = "4f82b2e57622fb9337559058e8797cb0df7e7c9790793bdc4e40bc895f70e2a2"; }; beamDeps = [ httpoison jose ]; }; + websock = buildMix rec { + name = "websock"; + version = "0.5.3"; + + src = fetchHex { + pkg = "websock"; + version = "${version}"; + sha256 = "6105453d7fac22c712ad66fab1d45abdf049868f253cf719b625151460b8b453"; + }; + + beamDeps = []; + }; + + websock_adapter = buildMix rec { + name = "websock_adapter"; + version = "0.5.5"; + + src = fetchHex { + pkg = "websock_adapter"; + version = "${version}"; + sha256 = "4b977ba4a01918acbf77045ff88de7f6972c2a009213c515a445c48f224ffce9"; + }; + + beamDeps = [ plug plug_cowboy websock ]; + }; + websockex = buildMix rec { name = "websockex"; version = "0.4.3"; src = fetchHex { - pkg = "${name}"; + pkg = "websockex"; version = "${version}"; - sha256 = "1r2kmi2pcmdzvgbd08ci9avy0g5p2lhx80jn736a98w55c3ygwlm"; + sha256 = "95f2e7072b85a3a4cc385602d42115b73ce0b74a9121d0d6dbbf557645ac53e4"; }; beamDeps = []; diff --git a/nixpkgs/pkgs/servers/bird-lg/default.nix b/nixpkgs/pkgs/servers/bird-lg/default.nix index b4ce72332d97..b459e0b304af 100644 --- a/nixpkgs/pkgs/servers/bird-lg/default.nix +++ b/nixpkgs/pkgs/servers/bird-lg/default.nix @@ -3,13 +3,13 @@ let generic = { modRoot, vendorHash }: buildGoModule rec { pname = "bird-lg-${modRoot}"; - version = "1.3.1"; + version = "1.3.5"; src = fetchFromGitHub { owner = "xddxdd"; repo = "bird-lg-go"; rev = "v${version}"; - hash = "sha256-ROMwgsKroxd9qkKX8ZoOuazBrnZytcTAPT9hR/v6a04="; + hash = "sha256-lWpTIuN+wCSDBHmpRIfVG8Z1Qx1s55MnJomQPjczB5k="; }; doDist = false; @@ -35,12 +35,12 @@ let bird-lg-frontend = generic { modRoot = "frontend"; - vendorHash = "sha256-yyH6McVzU0Qiod3yP5pGlF36fJQlf4g52wfDAem6KWs="; + vendorHash = "sha256-+M9Mlqck2E/ETW+NXsKwIeWlmZAaBU07fgDhKUU9PAI="; }; bird-lg-proxy = generic { modRoot = "proxy"; - vendorHash = "sha256-JfHvDIVKQ7jdPocuh6AOwSQmP+a0/hXYrt5Ap/pEjug="; + vendorHash = "sha256-nBTLQUX68f98D0RTlyX0gnvhQ+bu8d3Vv67J/YoXJxs="; }; in symlinkJoin { diff --git a/nixpkgs/pkgs/servers/computing/slurm/default.nix b/nixpkgs/pkgs/servers/computing/slurm/default.nix index d3ef5324db86..6a1afcf4adda 100644 --- a/nixpkgs/pkgs/servers/computing/slurm/default.nix +++ b/nixpkgs/pkgs/servers/computing/slurm/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { pname = "slurm"; - version = "23.11.3.1"; + version = "23.11.4.1"; # N.B. We use github release tags instead of https://www.schedmd.com/downloads.php # because the latter does not keep older releases. @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { repo = "slurm"; # The release tags use - instead of . rev = "${pname}-${builtins.replaceStrings ["."] ["-"] version}"; - hash = "sha256-fSw7LaIEyExsdVgJ9pfWEBhnBUsczdJl0coEPDdKVzA="; + hash = "sha256-oUkFLw1vgPubsA2htzsJ5SfsL7UA6J0ufwjl7vWoX+s="; }; outputs = [ "out" "dev" ]; diff --git a/nixpkgs/pkgs/servers/confluent-platform/default.nix b/nixpkgs/pkgs/servers/confluent-platform/default.nix index 2c4e1c5d4f47..5bc010663b0c 100644 --- a/nixpkgs/pkgs/servers/confluent-platform/default.nix +++ b/nixpkgs/pkgs/servers/confluent-platform/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "confluent-platform"; - version = "7.5.0"; + version = "7.6.0"; src = fetchurl { url = "https://packages.confluent.io/archive/${lib.versions.majorMinor finalAttrs.version}/confluent-${finalAttrs.version}.tar.gz"; - hash = "sha256-HaK3Do6oRGm6ovvNNGvZE34rYNRQnrmt1GKglTSZ9ls="; + hash = "sha256-bHT8VWSUqxiM/g7opRXZmEOAs2d61dWBTtuwwlzPgBc="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/servers/dcnnt/default.nix b/nixpkgs/pkgs/servers/dcnnt/default.nix index 6c55a28ae178..2279c9f116b1 100644 --- a/nixpkgs/pkgs/servers/dcnnt/default.nix +++ b/nixpkgs/pkgs/servers/dcnnt/default.nix @@ -2,11 +2,11 @@ buildPythonApplication rec { pname = "dcnnt"; - version = "0.9.2"; + version = "0.10.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-mPZlQllIU4fkGtmnhK7ovc8CrAxUcgF0KgO7/fQBrkk="; + sha256 = "sha256-73ZLgb5YcXlAOjbKLVv8oqgS6pstBdJxa7LFUgIHpUE="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/servers/dns/knot-dns/default.nix b/nixpkgs/pkgs/servers/dns/knot-dns/default.nix index 9e73c026b3f1..d939f4e375ed 100644 --- a/nixpkgs/pkgs/servers/dns/knot-dns/default.nix +++ b/nixpkgs/pkgs/servers/dns/knot-dns/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "knot-dns"; - version = "3.3.4"; + version = "3.3.5"; src = fetchurl { url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"; - sha256 = "2a771b43ce96b6b48d53b29f2086528732e6ac067bc71a3be934f859d1302fc0"; + sha256 = "0e0bf04319581280660e8e62ab04be64a7d632331e40fc9c87e76861305db3ad"; }; outputs = [ "bin" "out" "dev" ]; diff --git a/nixpkgs/pkgs/servers/etebase/default.nix b/nixpkgs/pkgs/servers/etebase/default.nix index f397b78eca0b..2a8233e5e0dc 100644 --- a/nixpkgs/pkgs/servers/etebase/default.nix +++ b/nixpkgs/pkgs/servers/etebase/default.nix @@ -1,24 +1,22 @@ { lib , fetchFromGitHub -, buildPythonPackage -, aiofiles -, django_3 -, fastapi -, msgpack -, pynacl -, redis -, typing-extensions , withLdap ? true -, python-ldap +, python3 , withPostgres ? true -, psycopg2 , nix-update-script +, nixosTests }: -buildPythonPackage rec { +let + python = python3.override { + packageOverrides = self: super: { + pydantic = super.pydantic_1; + }; + }; +in +python.pkgs.buildPythonPackage rec { pname = "etebase-server"; version = "0.11.0"; - format = "other"; src = fetchFromGitHub { owner = "etesync"; @@ -29,32 +27,46 @@ buildPythonPackage rec { patches = [ ./secret.patch ]; - propagatedBuildInputs = [ + doCheck = false; + + propagatedBuildInputs = with python.pkgs; [ aiofiles django_3 fastapi msgpack pynacl redis + uvicorn + websockets + watchfiles + uvloop + pyyaml + python-dotenv + httptools typing-extensions ] ++ lib.optional withLdap python-ldap ++ lib.optional withPostgres psycopg2; - installPhase = '' + postInstall = '' mkdir -p $out/bin $out/lib - cp -r . $out/lib/etebase-server - ln -s $out/lib/etebase-server/manage.py $out/bin/etebase-server + cp manage.py $out/bin/etebase-server wrapProgram $out/bin/etebase-server --prefix PYTHONPATH : "$PYTHONPATH" chmod +x $out/bin/etebase-server ''; passthru.updateScript = nix-update-script {}; + passthru.python = python; + # PYTHONPATH of all dependencies used by the package + passthru.pythonPath = python.pkgs.makePythonPath propagatedBuildInputs; + passthru.tests = { + nixosTest = nixosTests.etebase-server; + }; meta = with lib; { homepage = "https://github.com/etesync/server"; description = "An Etebase (EteSync 2.0) server so you can run your own"; changelog = "https://github.com/etesync/server/blob/${version}/ChangeLog.md"; license = licenses.agpl3Only; - maintainers = with maintainers; [ felschr ]; + maintainers = with maintainers; [ felschr phaer ]; }; } diff --git a/nixpkgs/pkgs/servers/geospatial/fit-trackee/default.nix b/nixpkgs/pkgs/servers/geospatial/fit-trackee/default.nix index 0e7377f1258c..b2f784649599 100644 --- a/nixpkgs/pkgs/servers/geospatial/fit-trackee/default.nix +++ b/nixpkgs/pkgs/servers/geospatial/fit-trackee/default.nix @@ -25,19 +25,22 @@ let in python.pkgs.buildPythonApplication rec { pname = "fit-trackee"; - version = "0.7.29"; + version = "0.7.31"; format = "pyproject"; src = fetchFromGitHub { owner = "SamR1"; repo = "FitTrackee"; rev = "v${version}"; - hash = "sha256-NWWQ+lPUMaeF3UPglllaLGJnNgF54SXo4DcF3VAQbO4="; + hash = "sha256-qKUdpuxslhS6k9EiWvbU/0hSXH1y9mjhXs02pugTF3g="; }; postPatch = '' - substituteInPlace pyproject.toml --replace psycopg2-binary psycopg2 \ - --replace 'flask = "^3.0.0"' 'flask = "*"' + substituteInPlace pyproject.toml \ + --replace-fail psycopg2-binary psycopg2 \ + --replace-fail 'flask = "^3.0.2"' 'flask = "*"' \ + --replace-fail 'pyopenssl = "^24.0.0"' 'pyopenssl = "*"' \ + --replace-fail 'sqlalchemy = "=1.4.51"' 'sqlalchemy = "*"' ''; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/servers/gortr/default.nix b/nixpkgs/pkgs/servers/gortr/default.nix index fb365342bd68..ef569eef53a4 100644 --- a/nixpkgs/pkgs/servers/gortr/default.nix +++ b/nixpkgs/pkgs/servers/gortr/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "gortr"; - version = "0.14.8"; + version = "0.15.0"; src = fetchFromGitHub { owner = "cloudflare"; repo = pname; rev = "v${version}"; - sha256 = "sha256-3aZf5HINoFIJrN+196kk1lt2S+fN9DlQakwGnkMU5U8="; + sha256 = "sha256-W6+zCLPcORGcRJF0F6/LRPap4SNVn/oKGs21T4nSNO0="; }; vendorHash = null; diff --git a/nixpkgs/pkgs/servers/home-assistant/component-packages.nix b/nixpkgs/pkgs/servers/home-assistant/component-packages.nix index 6cc484b64a59..b9fc857f211c 100644 --- a/nixpkgs/pkgs/servers/home-assistant/component-packages.nix +++ b/nixpkgs/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2024.2.5"; + version = "2024.3.0"; components = { "3_day_blinds" = ps: with ps; [ ]; @@ -19,6 +19,8 @@ "acmeda" = ps: with ps; [ aiopulse ]; + "acomax" = ps: with ps; [ + ]; "actiontec" = ps: with ps; [ ]; "adax" = ps: with ps; [ @@ -224,6 +226,8 @@ "apprise" = ps: with ps; [ apprise ]; + "aprilaire" = ps: with ps; [ + ]; # missing inputs: pyaprilaire "aprs" = ps: with ps; [ aprslib geopy @@ -568,8 +572,7 @@ "brel_home" = ps: with ps; [ ]; "bring" = ps: with ps; [ - python-bring-api - ]; + ]; # missing inputs: bring-api "broadlink" = ps: with ps; [ broadlink ]; @@ -831,6 +834,7 @@ "decora_wifi" = ps: with ps; [ ]; # missing inputs: decora-wifi "default_config" = ps: with ps; [ + aiodhcpwatcher aiodiscover aiohttp-cors aiohttp-fast-url-dispatcher @@ -862,7 +866,6 @@ python-matter-server pyturbojpeg pyudev - scapy securetar sqlalchemy webrtc-noise-gain @@ -929,9 +932,9 @@ pydexcom ]; "dhcp" = ps: with ps; [ + aiodhcpwatcher aiodiscover cached-ipaddress - scapy ]; "diagnostics" = ps: with ps; [ aiohttp-cors @@ -980,7 +983,6 @@ ifaddr psutil-home-assistant sqlalchemy - zeroconf ]; "dlna_dms" = ps: with ps; [ aiohttp-cors @@ -991,7 +993,6 @@ ifaddr psutil-home-assistant sqlalchemy - zeroconf ]; "dnsip" = ps: with ps; [ aiodns @@ -1080,6 +1081,8 @@ "duotecno" = ps: with ps; [ pyduotecno ]; + "duquesne_light" = ps: with ps; [ + ]; "dwd_weather_warnings" = ps: with ps; [ dwdwfsapi ]; @@ -2131,6 +2134,15 @@ ]; "hurrican_shutters_wholesale" = ps: with ps; [ ]; + "husqvarna_automower" = ps: with ps; [ + aioautomower + aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng + fnv-hash-fast + psutil-home-assistant + sqlalchemy + ]; "huum" = ps: with ps; [ huum ]; @@ -2418,7 +2430,6 @@ "joaoapps_join" = ps: with ps; [ ]; # missing inputs: python-join-api "juicenet" = ps: with ps; [ - python-juicenet ]; "justnimbus" = ps: with ps; [ justnimbus @@ -2557,6 +2568,8 @@ krakenex pykrakenapi ]; + "krispol" = ps: with ps; [ + ]; "kulersky" = ps: with ps; [ pykulersky ]; @@ -2854,6 +2867,8 @@ psutil-home-assistant sqlalchemy ]; + "madeco" = ps: with ps; [ + ]; "mailbox" = ps: with ps; [ aiohttp-cors aiohttp-fast-url-dispatcher @@ -3025,6 +3040,14 @@ ]; "mfi" = ps: with ps; [ ]; # missing inputs: mficlient + "microbees" = ps: with ps; [ + aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng + fnv-hash-fast + psutil-home-assistant + sqlalchemy + ]; # missing inputs: microBeesPy "microsoft" = ps: with ps; [ ]; # missing inputs: pycsspeechtts "microsoft_face" = ps: with ps; [ @@ -3396,10 +3419,10 @@ aiohttp-cors aiohttp-fast-url-dispatcher aiohttp-zlib-ng + aiooui fnv-hash-fast getmac ifaddr - mac-vendor-lookup netmap psutil-home-assistant sqlalchemy @@ -4263,6 +4286,8 @@ "saj" = ps: with ps; [ pysaj ]; + "samsam" = ps: with ps; [ + ]; "samsungtv" = ps: with ps; [ aiohttp-cors aiohttp-fast-url-dispatcher @@ -4276,7 +4301,6 @@ samsungtvws sqlalchemy wakeonlan - zeroconf ] ++ samsungctl.optional-dependencies.websocket ++ samsungtvws.optional-dependencies.async @@ -4727,7 +4751,6 @@ ifaddr psutil-home-assistant sqlalchemy - zeroconf ]; "starline" = ps: with ps; [ starline @@ -4899,6 +4922,7 @@ ]; "systemmonitor" = ps: with ps; [ psutil + psutil-home-assistant ]; "tado" = ps: with ps; [ python-tado @@ -5330,7 +5354,6 @@ ifaddr psutil-home-assistant sqlalchemy - zeroconf ]; "uprise_smart_shades" = ps: with ps; [ ]; @@ -5486,6 +5509,8 @@ "weatherflow" = ps: with ps; [ pyweatherflowudp ]; + "weatherflow_cloud" = ps: with ps; [ + ]; # missing inputs: weatherflow4py "weatherkit" = ps: with ps; [ apple-weatherkit ]; @@ -5494,6 +5519,8 @@ aiohttp-fast-url-dispatcher aiohttp-zlib-ng ]; + "webmin" = ps: with ps; [ + ]; # missing inputs: webmin-xmlrpc "webostv" = ps: with ps; [ aiowebostv ]; @@ -5555,7 +5582,7 @@ wled ]; "wolflink" = ps: with ps; [ - ]; # missing inputs: wolf-smartset + ]; # missing inputs: wolf-comm "workday" = ps: with ps; [ holidays ]; @@ -5693,7 +5720,6 @@ ifaddr psutil-home-assistant sqlalchemy - zeroconf ]; "yandex_transport" = ps: with ps; [ aioymaps @@ -5713,7 +5739,6 @@ psutil-home-assistant sqlalchemy yeelight - zeroconf ]; "yeelightsunflower" = ps: with ps; [ ]; # missing inputs: yeelightsunflower @@ -5797,6 +5822,8 @@ ]; # missing inputs: ziggo-mediabox-xl "zodiac" = ps: with ps; [ ]; + "zondergas" = ps: with ps; [ + ]; "zone" = ps: with ps; [ ]; "zoneminder" = ps: with ps; [ @@ -5874,6 +5901,7 @@ "arcam_fmj" "aseko_pool_live" "assist_pipeline" + "asterisk_mbox" "asuswrt" "atag" "august" @@ -5905,7 +5933,6 @@ "bond" "bosch_shc" "braviatv" - "bring" "broadlink" "brother" "brottsplatskartan" @@ -6124,6 +6151,7 @@ "huisbaasje" "humidifier" "hunterdouglas_powerview" + "husqvarna_automower" "huum" "hvv_departures" "hydrawise" @@ -6570,6 +6598,7 @@ "vallox" "valve" "velbus" + "velux" "venstar" "vera" "verisure" diff --git a/nixpkgs/pkgs/servers/home-assistant/custom-components/auth-header/default.nix b/nixpkgs/pkgs/servers/home-assistant/custom-components/auth-header/default.nix new file mode 100644 index 000000000000..9062b138590c --- /dev/null +++ b/nixpkgs/pkgs/servers/home-assistant/custom-components/auth-header/default.nix @@ -0,0 +1,27 @@ +{ lib +, buildHomeAssistantComponent +, fetchFromGitHub +}: + +buildHomeAssistantComponent rec { + owner = "BeryJu"; + domain = "auth_header"; + version = "1.10-unstable-2024-02-26"; + + src = fetchFromGitHub { + inherit owner; + repo = "hass-auth-header"; + rev = "5923cb33b57a9d3c23513d54cc74b02ebd243409"; + hash = "sha256-ZYd1EduzoljaY3OnpjsKEAwtf03435zJmZtgqzbdjjA="; + }; + + # build step just runs linter + dontBuild = true; + + meta = with lib; { + description = "Home Assistant custom component which allows you to delegate authentication to a reverse proxy"; + homepage = "https://github.com/BeryJu/hass-auth-header"; + maintainers = with maintainers; [ mjm ]; + license = licenses.gpl3; + }; +} diff --git a/nixpkgs/pkgs/servers/home-assistant/custom-components/better_thermostat/default.nix b/nixpkgs/pkgs/servers/home-assistant/custom-components/better_thermostat/default.nix new file mode 100644 index 000000000000..a4a514b2693c --- /dev/null +++ b/nixpkgs/pkgs/servers/home-assistant/custom-components/better_thermostat/default.nix @@ -0,0 +1,24 @@ +{ lib, fetchFromGitHub, buildHomeAssistantComponent }: + +buildHomeAssistantComponent rec { + owner = "KartoffelToby"; + domain = "better_thermostat"; + version = "1.5.0-beta7"; + + src = fetchFromGitHub { + owner = "KartoffelToby"; + repo = "better_thermostat"; + rev = "refs/tags/${version}"; + hash = "sha256-bJURpeBgoxXGR7C9MY/gmNY7OFvBxrJKz2cA61b5hNo="; + }; + + meta = with lib; { + changelog = + "https://github.com/KartoffelToby/better_thermostat/releases/tag/${version}"; + description = + "Smart TRV control integrates room-temp sensors, window/door sensors, weather forecasts, and ambient probes for efficient heating and calibration, enhancing energy savings and comfort."; + homepage = "https://better-thermostat.org/"; + maintainers = with maintainers; [ mguentner ]; + license = licenses.agpl3; + }; +} diff --git a/nixpkgs/pkgs/servers/home-assistant/custom-components/default.nix b/nixpkgs/pkgs/servers/home-assistant/custom-components/default.nix index 7a2cd3776a9a..81e708b637bc 100644 --- a/nixpkgs/pkgs/servers/home-assistant/custom-components/default.nix +++ b/nixpkgs/pkgs/servers/home-assistant/custom-components/default.nix @@ -4,6 +4,10 @@ { adaptive_lighting = callPackage ./adaptive_lighting {}; + auth-header = callPackage ./auth-header {}; + + better_thermostat = callPackage ./better_thermostat {}; + emporia_vue = callPackage ./emporia_vue {}; govee-lan = callPackage ./govee-lan {}; diff --git a/nixpkgs/pkgs/servers/home-assistant/custom-lovelace-modules/mushroom/default.nix b/nixpkgs/pkgs/servers/home-assistant/custom-lovelace-modules/mushroom/default.nix index 9515fac0792d..ad89a24b6603 100644 --- a/nixpkgs/pkgs/servers/home-assistant/custom-lovelace-modules/mushroom/default.nix +++ b/nixpkgs/pkgs/servers/home-assistant/custom-lovelace-modules/mushroom/default.nix @@ -5,16 +5,16 @@ buildNpmPackage rec { pname = "mushroom"; - version = "3.4.2"; + version = "3.5.2"; src = fetchFromGitHub { owner = "piitaya"; repo = "lovelace-mushroom"; rev = "v${version}"; - hash = "sha256-OUcOCBLEU8V+eadHuyA6F0uT8fJLRe1Xd9/X5ULCZVc="; + hash = "sha256-mVodC7IEk1Y9ppMdDRXK/8cxQkW+uaC2RzQFnMwNvTQ="; }; - npmDepsHash = "sha256-oIee6iJ18EBztje1aw4xzWa1wSIbgau4q0MyVx0T41I="; + npmDepsHash = "sha256-g8A8zm7GyASOpuoxuOYGcyUVa6RBc9LGoYLqcFcT64c="; installPhase = '' runHook preInstall diff --git a/nixpkgs/pkgs/servers/home-assistant/default.nix b/nixpkgs/pkgs/servers/home-assistant/default.nix index 1d0809edf320..1a41629d92c7 100644 --- a/nixpkgs/pkgs/servers/home-assistant/default.nix +++ b/nixpkgs/pkgs/servers/home-assistant/default.nix @@ -3,8 +3,7 @@ , callPackage , fetchFromGitHub , fetchPypi -, fetchpatch -, python311 +, python312 , substituteAll , ffmpeg-headless , inetutils @@ -31,15 +30,6 @@ let # Override the version of some packages pinned in Home Assistant's setup.py and requirements_all.txt (self: super: { - aemet-opendata = super.aemet-opendata.overridePythonAttrs (oldAttrs: rec { - version = "0.4.7"; - src = fetchFromGitHub { - inherit (oldAttrs.src) owner repo; - rev = "refs/tags/${version}"; - hash = "sha256-kmU2HtNyYhfwWQv6asOtDpLZ6+O+eEICzBNLxUhAwaY="; - }; - }); - aiogithubapi = super.aiogithubapi.overridePythonAttrs (oldAttrs: rec { version = "22.10.1"; src = fetchFromGitHub { @@ -55,23 +45,6 @@ let ]; }); - aionotion = super.aionotion.overridePythonAttrs (oldAttrs: rec { - version = "2023.05.5"; - src = fetchFromGitHub { - owner = "bachya"; - repo = "aionotion"; - rev = "refs/tags/${version}"; - hash = "sha256-/2sF8m5R8YXkP89bi5zR3h13r5LrFOl1OsixAcX0D4o="; - }; - patches = [ - (fetchpatch { - # clean up build dependencies; https://github.com/bachya/aionotion/commit/53c7285110d12810f9b43284295f71d052a81b83 - url = "https://github.com/bachya/aionotion/commit/53c7285110d12810f9b43284295f71d052a81b83.patch"; - hash = "sha256-RLRbHmaR2A8MNc96WHx0L8ccyygoBUaOulAuRJkFuUM="; - }) - ]; - }); - aiopurpleair = super.aiopurpleair.overridePythonAttrs (oldAttrs: rec { version = "2022.12.1"; src = fetchFromGitHub { @@ -87,16 +60,6 @@ let ''; }); - aiopvapi = super.aiopvapi.overridePythonAttrs (oldAttrs: rec { - version = "2.0.4"; - src = fetchFromGitHub { - owner = "sander76"; - repo = "aio-powerview-api"; - rev = "refs/tags/v${version}"; - hash = "sha256-cghfNi5T343/7GxNLDrE0iAewMlRMycQTP7SvDVpU2M="; - }; - }); - aioskybell = super.aioskybell.overridePythonAttrs (oldAttrs: rec { version = "22.7.0"; src = fetchFromGitHub { @@ -149,15 +112,6 @@ let ]; }); - brother = super.brother.overridePythonAttrs (oldAttrs: rec { - version = "3.0.0"; - src = fetchFromGitHub { - inherit (oldAttrs.src) owner repo; - rev = "refs/tags/${version}"; - hash = "sha256-rRzcWT9DcNTBUYxyYYC7WORBbrkgj0toCp2e8ADUN5s="; - }; - }); - debugpy = super.debugpy.overridePythonAttrs (oldAttrs: { # tests are deadlocking too often # https://github.com/NixOS/nixpkgs/issues/262000 @@ -348,16 +302,6 @@ let }; }); - python-slugify = super.python-slugify.overridePythonAttrs (oldAttrs: rec { - version = "8.0.1"; - src = fetchFromGitHub { - owner = "un33k"; - repo = "python-slugify"; - rev = "refs/tags/v${version}"; - hash = "sha256-MJac63XjgWdUQdyyEm8O7gAGVszmHxZzRF4frJtR0BU="; - }; - }); - pytradfri = super.pytradfri.overridePythonAttrs (oldAttrs: rec { version = "9.0.1"; src = fetchFromGitHub { @@ -375,6 +319,9 @@ let inherit version; hash = "sha256-6xjnunJoqIC/HM/pLlNOlqs04Dl/KNy8s/wNpPaltr0="; }; + pytestFlagsArray = [ + "-W" "ignore::DeprecationWarning" + ]; }); voluptuous = super.voluptuous.overridePythonAttrs (oldAttrs: rec { @@ -398,16 +345,6 @@ let }; }); - wyoming = super.wyoming.overridePythonAttrs (oldAttrs: rec { - version = "1.5.2"; - src = fetchFromGitHub { - owner = "rhasspy"; - repo = "wyoming"; - rev = "refs/tags/${version}"; - hash = "sha256-2bc5coKL5KlTeL9fdghPmRF66NXfimHOKGtE2yPXgrA="; - }; - }); - xbox-webapi = super.xbox-webapi.overridePythonAttrs (oldAttrs: rec { version = "2.0.11"; src = fetchFromGitHub { @@ -444,7 +381,7 @@ let }) ]; - python = python311.override { + python = python312.override { packageOverrides = lib.composeManyExtensions (defaultOverrides ++ [ packageOverrides ]); }; @@ -462,7 +399,7 @@ let extraBuildInputs = extraPackages python.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "2024.2.5"; + hassVersion = "2024.3.0"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -480,13 +417,13 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = "refs/tags/${version}"; - hash = "sha256-RRoxWNcubpxzmExzrifRKhgNm0IM5OuNZYHz6tp9zm8="; + hash = "sha256-/DCE2IHdS+oImpzwIaFgXotAsoiPPbe3X3HG7RXbv9g="; }; # Secondary source is pypi sdist for translations sdist = fetchPypi { inherit pname version; - hash = "sha256-qhUfOMSM4FKUQ9LdeoHLLrVm5cWFrlTER02s+tLVAMU="; + hash = "sha256-G9M1WV+s4zu9BY10RWmJ71ghafAOHMjnCR6BOlggguM="; }; nativeBuildInputs = with python.pkgs; [ @@ -496,7 +433,10 @@ in python.pkgs.buildPythonApplication rec { pythonRelaxDeps = [ "attrs" + "bcrypt" "ciso8601" + "cryptography" + "httpx" "orjson" "pyopenssl" "typing-extensions" @@ -534,7 +474,7 @@ in python.pkgs.buildPythonApplication rec { aiohttp-fast-url-dispatcher aiohttp-zlib-ng astral - async-timeout + async-interrupt atomicwrites-homeassistant attrs awesomeversion @@ -555,7 +495,9 @@ in python.pkgs.buildPythonApplication rec { python-slugify pyyaml requests + typing-extensions ulid-transform + urllib3 voluptuous voluptuous-serialize yarl @@ -563,7 +505,7 @@ in python.pkgs.buildPythonApplication rec { pyotp pyqrcode # Implicit dependency via homeassistant/requirements.py - setuptools + packaging ]; makeWrapperArgs = lib.optional skipPip "--add-flags --skip-pip"; @@ -593,7 +535,9 @@ in python.pkgs.buildPythonApplication rec { ] ++ lib.concatMap (component: getPackages component python.pkgs) [ # some components are needed even if tests in tests/components are disabled "default_config" + "debugpy" "hue" + "sentry" ]; pytestFlagsArray = [ diff --git a/nixpkgs/pkgs/servers/home-assistant/frontend.nix b/nixpkgs/pkgs/servers/home-assistant/frontend.nix index 24ee86b9b25f..1795e8daa7ba 100644 --- a/nixpkgs/pkgs/servers/home-assistant/frontend.nix +++ b/nixpkgs/pkgs/servers/home-assistant/frontend.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { # the frontend version corresponding to a specific home-assistant version can be found here # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json pname = "home-assistant-frontend"; - version = "20240207.1"; + version = "20240306.0"; format = "wheel"; src = fetchPypi { @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "home_assistant_frontend"; dist = "py3"; python = "py3"; - hash = "sha256-uGBVha7nJvYua1rZXlIJGhUzEm5wSrhazrOBUi3omJk="; + hash = "sha256-eDuJC23PJbjaKC9TBCLg5ML3XR6admKrT9RVgfUQCw8="; }; # there is nothing to strip in this package diff --git a/nixpkgs/pkgs/servers/home-assistant/intents.nix b/nixpkgs/pkgs/servers/home-assistant/intents.nix index 8bdd0542b926..ddb576795880 100644 --- a/nixpkgs/pkgs/servers/home-assistant/intents.nix +++ b/nixpkgs/pkgs/servers/home-assistant/intents.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "home-assistant-intents"; - version = "2024.2.2"; + version = "2024.2.28"; format = "pyproject"; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-Tb9ZZvs5Wyzm2TS5INUSua4Y3/2H+kHEhjpfYWJi+d0="; + hash = "sha256-EmnaYc+L1PHOv6M7odYDl+UBZkLJRtP86xPoqdbuOqU="; }; postPatch = '' diff --git a/nixpkgs/pkgs/servers/home-assistant/parse-requirements.py b/nixpkgs/pkgs/servers/home-assistant/parse-requirements.py index 436d1105b10d..5ff1510f2351 100755 --- a/nixpkgs/pkgs/servers/home-assistant/parse-requirements.py +++ b/nixpkgs/pkgs/servers/home-assistant/parse-requirements.py @@ -315,6 +315,6 @@ def main() -> None: if __name__ == "__main__": run_sync(["pyright", __file__]) - run_sync(["ruff", "--ignore=E501", __file__]) + run_sync(["ruff", "check", "--ignore=E501", __file__]) run_sync(["isort", __file__]) main() diff --git a/nixpkgs/pkgs/servers/home-assistant/patches/ffmpeg-path.patch b/nixpkgs/pkgs/servers/home-assistant/patches/ffmpeg-path.patch index 8a83618b1a4b..5417c64f13ea 100644 --- a/nixpkgs/pkgs/servers/home-assistant/patches/ffmpeg-path.patch +++ b/nixpkgs/pkgs/servers/home-assistant/patches/ffmpeg-path.patch @@ -1,8 +1,8 @@ diff --git a/homeassistant/components/ffmpeg/__init__.py b/homeassistant/components/ffmpeg/__init__.py -index a98766c78c..1c47bb1f80 100644 +index 4ab4ee32a0..0f04f037f6 100644 --- a/homeassistant/components/ffmpeg/__init__.py +++ b/homeassistant/components/ffmpeg/__init__.py -@@ -41,7 +41,7 @@ CONF_FFMPEG_BIN = "ffmpeg_bin" +@@ -46,7 +46,7 @@ CONF_FFMPEG_BIN = "ffmpeg_bin" CONF_EXTRA_ARGUMENTS = "extra_arguments" CONF_OUTPUT = "output" @@ -70,15 +70,15 @@ index 6eec115d6f..c55b4fb26c 100644 hass.bus.async_fire(EVENT_HOMEASSISTANT_START) diff --git a/tests/components/ffmpeg/test_init.py b/tests/components/ffmpeg/test_init.py -index 0c6ce300d0..ff74a5d7f7 100644 +index 452a818859..41ba776436 100644 --- a/tests/components/ffmpeg/test_init.py +++ b/tests/components/ffmpeg/test_init.py -@@ -91,7 +91,7 @@ class TestFFmpegSetup: +@@ -81,7 +81,7 @@ def test_setup_component(): with assert_setup_component(1): - setup_component(self.hass, ffmpeg.DOMAIN, {ffmpeg.DOMAIN: {}}) + setup_component(hass, ffmpeg.DOMAIN, {ffmpeg.DOMAIN: {}}) + +- assert hass.data[ffmpeg.DATA_FFMPEG].binary == "ffmpeg" ++ assert hass.data[ffmpeg.DATA_FFMPEG].binary == "@ffmpeg@" + hass.stop() -- assert self.hass.data[ffmpeg.DATA_FFMPEG].binary == "ffmpeg" -+ assert self.hass.data[ffmpeg.DATA_FFMPEG].binary == "@ffmpeg@" - def test_setup_component_test_service(self): - """Set up ffmpeg component test services.""" diff --git a/nixpkgs/pkgs/servers/home-assistant/stubs.nix b/nixpkgs/pkgs/servers/home-assistant/stubs.nix index 602e04aacdbc..dc9cbd9e8d3c 100644 --- a/nixpkgs/pkgs/servers/home-assistant/stubs.nix +++ b/nixpkgs/pkgs/servers/home-assistant/stubs.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "homeassistant-stubs"; - version = "2024.2.5"; + version = "2024.3.0"; format = "pyproject"; disabled = python.version != home-assistant.python.version; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "KapJI"; repo = "homeassistant-stubs"; rev = "refs/tags/${version}"; - hash = "sha256-izXAm9lK5mhjc8vVTRflDdxYQesqnkBJtFonOHoht9c="; + hash = "sha256-4K/JrmNcvRzso9NgFuh3fThcEQS+Ydk4II6xrWv2KdM="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/servers/home-assistant/tests.nix b/nixpkgs/pkgs/servers/home-assistant/tests.nix index 3cce799ec19a..989bfccb7236 100644 --- a/nixpkgs/pkgs/servers/home-assistant/tests.nix +++ b/nixpkgs/pkgs/servers/home-assistant/tests.nix @@ -82,6 +82,11 @@ let # aioserial mock produces wrong state "--deselect tests/components/modem_callerid/test_init.py::test_setup_entry" ]; + velux = [ + # uses unmocked sockets + "--deselect tests/components/velux/test_config_flow.py::test_user_success" + "--deselect tests/components/velux/test_config_flow.py::test_import_valid_config" + ]; }; in lib.listToAttrs (map (component: lib.nameValuePair component ( home-assistant.overridePythonAttrs (old: { diff --git a/nixpkgs/pkgs/servers/home-assistant/update.py b/nixpkgs/pkgs/servers/home-assistant/update.py index 30b371e0686d..c0c3cfdef993 100755 --- a/nixpkgs/pkgs/servers/home-assistant/update.py +++ b/nixpkgs/pkgs/servers/home-assistant/update.py @@ -258,6 +258,6 @@ async def main(): if __name__ == "__main__": run_sync(["pyright", __file__]) - run_sync(["ruff", "--ignore=E501", __file__]) + run_sync(["ruff", "check", "--ignore=E501", __file__]) run_sync(["isort", __file__]) asyncio.run(main()) diff --git a/nixpkgs/pkgs/servers/home-automation/evcc/default.nix b/nixpkgs/pkgs/servers/home-automation/evcc/default.nix index 7117859f2fb8..baf1c81c9854 100644 --- a/nixpkgs/pkgs/servers/home-automation/evcc/default.nix +++ b/nixpkgs/pkgs/servers/home-automation/evcc/default.nix @@ -21,16 +21,16 @@ in buildGoModule rec { pname = "evcc"; - version = "0.124.4"; + version = "0.124.6"; src = fetchFromGitHub { owner = "evcc-io"; repo = "evcc"; rev = version; - hash = "sha256-sSR0aRSIUPph1YGfY6ihUffKiyauSbO7eUSVa3jaY6s="; + hash = "sha256-mZSJ8RKO2olPsbxuVyAFCyvgxkth4XatRXwaQQ0z/Do="; }; - vendorHash = "sha256-1ZSMI6mz8CkibP3KwWJ3I05BMoBu9r+Fn8vLLDTpVfA="; + vendorHash = "sha256-tu1rV5TWAOHidnDvjsyqFady8TrnPOoAoEEDugYYwLM="; npmDeps = fetchNpmDeps { inherit src; diff --git a/nixpkgs/pkgs/servers/homepage-dashboard/default.nix b/nixpkgs/pkgs/servers/homepage-dashboard/default.nix index 7a28803df611..6f0a94500ef0 100644 --- a/nixpkgs/pkgs/servers/homepage-dashboard/default.nix +++ b/nixpkgs/pkgs/servers/homepage-dashboard/default.nix @@ -39,6 +39,20 @@ buildNpmPackage rec { npmDepsHash = "sha256-u15lDdXnV3xlXAC9WQQKLIeV/AgtRM1sFNsacw3j6kU="; + # This project is primarily designed to be consumed through Docker. + # By default it logs to stdout, and also to a directory. This makes + # little sense here where all the logs will be collated in the + # systemd journal anyway, so the patch removes the file logging. + # This patch has been suggested upstream, but the contribution won't + # be accepted until it gets at least 10 upvotes, per their policy: + # https://github.com/gethomepage/homepage/discussions/3067 + patches = [ + (fetchpatch { + url = "https://github.com/gethomepage/homepage/commit/3be28a2c8b68f2404e4083e7f32eebbccdc4d293.patch"; + hash = "sha256-5fUOXiHBZ4gdPeOHe1NIaBLaHJTDImsRjSwtueQOEXY="; + }) + ]; + preBuild = '' mkdir -p config ''; diff --git a/nixpkgs/pkgs/servers/honk/default.nix b/nixpkgs/pkgs/servers/honk/default.nix index 3dfbdeaaf8cd..92923c255e85 100644 --- a/nixpkgs/pkgs/servers/honk/default.nix +++ b/nixpkgs/pkgs/servers/honk/default.nix @@ -8,11 +8,11 @@ buildGoModule rec { pname = "honk"; - version = "1.2.1"; + version = "1.2.3"; src = fetchurl { url = "https://humungus.tedunangst.com/r/honk/d/honk-${version}.tgz"; - hash = "sha256-adBbJG45md7wUGzqYKA06RXzXul3Ltncrtz2eN4Ezqo="; + hash = "sha256-fexremJlsTfvvEDzihNk6P92mtEOAhUGgydHtA+tHsM="; }; vendorHash = null; diff --git a/nixpkgs/pkgs/servers/http/bozohttpd/default.nix b/nixpkgs/pkgs/servers/http/bozohttpd/default.nix index 038548bb16fa..0aad8168ffa8 100644 --- a/nixpkgs/pkgs/servers/http/bozohttpd/default.nix +++ b/nixpkgs/pkgs/servers/http/bozohttpd/default.nix @@ -22,13 +22,13 @@ let inherit (lib) optional optionals; in stdenv.mkDerivation rec { pname = "bozohttpd"; - version = "20220517"; + version = "20240126"; # bozohttpd is developed in-tree in pkgsrc, canonical hashes can be found at: # http://cvsweb.netbsd.org/bsdweb.cgi/pkgsrc/www/bozohttpd/distinfo src = fetchurl { url = "http://eterna23.net/${pname}/${pname}-${version}.tar.bz2"; - hash = "sha512-J1uPqzzy5sWXIWgsrpUtuV2lvTsfIGgCQMbPEClGNpP2/soEf77146PnUotAt7LoeypW/YALYS5nmhbySJDltg=="; + hash = "sha512-fr1PnyYAS3wkpmj/npRC3A87UL9LIXw4thlM4GfrtlJbuX5EkWGVJnHJW/EmYp7z+N91dcdRJgdO79l6WJsKpg=="; }; buildInputs = [ openssl libxcrypt ] ++ optional (luaSupport) lua; diff --git a/nixpkgs/pkgs/servers/http/darkhttpd/default.nix b/nixpkgs/pkgs/servers/http/darkhttpd/default.nix index 57e1f8f1635c..a0678299ac9c 100644 --- a/nixpkgs/pkgs/servers/http/darkhttpd/default.nix +++ b/nixpkgs/pkgs/servers/http/darkhttpd/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "darkhttpd"; - version = "1.15"; + version = "1.16"; src = fetchFromGitHub { owner = "emikulic"; repo = pname; rev = "v${version}"; - sha256 = "sha256-G1lh3nHo2iU/dkiBykl5+DSIC2c6SCqqv42Bw0Frz3A="; + sha256 = "sha256-dcNoGU08tu950PlwSghoZwGSaSbP8NJ5qhWUi3bAtZY="; }; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/servers/http/merecat/default.nix b/nixpkgs/pkgs/servers/http/merecat/default.nix index b655381a0819..6231fb9e2ad2 100644 --- a/nixpkgs/pkgs/servers/http/merecat/default.nix +++ b/nixpkgs/pkgs/servers/http/merecat/default.nix @@ -10,15 +10,15 @@ , nixosTests }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "merecat"; version = "2.31"; - # Or, already reconf'd: ftp://ftp.troglobit.com/merecat/merecat-${version}.tar.xz + # Or, already reconf'd: ftp://ftp.troglobit.com/merecat/merecat-${finalAttrs.version}.tar.xz src = fetchFromGitHub { owner = "troglobit"; repo = "merecat"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-oIzOXUnCFqd3HPyKp58r+enRRpaE7f9hqNITtxCCB7I="; }; @@ -49,4 +49,4 @@ stdenv.mkDerivation rec { # Strange header and/or linker errors broken = stdenv.isDarwin; }; -} +}) diff --git a/nixpkgs/pkgs/servers/http/unit/default.nix b/nixpkgs/pkgs/servers/http/unit/default.nix index 6f75352796cd..d6c17dfb885f 100644 --- a/nixpkgs/pkgs/servers/http/unit/default.nix +++ b/nixpkgs/pkgs/servers/http/unit/default.nix @@ -28,14 +28,14 @@ let php82-unit = php82.override phpConfig; in stdenv.mkDerivation rec { - version = "1.31.1"; + version = "1.32.0"; pname = "unit"; src = fetchFromGitHub { owner = "nginx"; repo = pname; rev = version; - sha256 = "sha256-6hecOCEC2MeJJieOOamEf8ytpEVAGs5mB0H16lJDciU="; + sha256 = "sha256-u693Q6Gp8lFm3DX1q5i6W021bxD962NGBGDRxUtvGrk="; }; nativeBuildInputs = [ which ]; diff --git a/nixpkgs/pkgs/servers/jackett/default.nix b/nixpkgs/pkgs/servers/jackett/default.nix index 4bf19dfa0731..d82f7fd1c9ec 100644 --- a/nixpkgs/pkgs/servers/jackett/default.nix +++ b/nixpkgs/pkgs/servers/jackett/default.nix @@ -9,13 +9,13 @@ buildDotnetModule rec { pname = "jackett"; - version = "0.21.1672"; + version = "0.21.1915"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha512-afXP02lZwCjL0XqLzapVM/N2qlE7rxdbfPrTaulN8N227jOPRgq3g96rnXr42crMv1IhThUbEFxN0E1vcMDm5w=="; + hash = "sha512-gqNtmLgAkanWjBIScic5yRCDeH0SF75H83xzpgdf0Xui1lylAPZEc6+FijoURXsDRH/H6taL3DFmO8tfzIpgGw=="; }; projectFile = "src/Jackett.Server/Jackett.Server.csproj"; diff --git a/nixpkgs/pkgs/servers/jackett/deps.nix b/nixpkgs/pkgs/servers/jackett/deps.nix index e1a701a1ad28..0690b30aeac2 100644 --- a/nixpkgs/pkgs/servers/jackett/deps.nix +++ b/nixpkgs/pkgs/servers/jackett/deps.nix @@ -11,7 +11,7 @@ (fetchNuGet { pname = "CommandLineParser"; version = "2.9.1"; sha256 = "1sldkj8lakggn4hnyabjj1fppqh50fkdrr1k99d4gswpbk5kv582"; }) (fetchNuGet { pname = "coverlet.msbuild"; version = "3.2.0"; sha256 = "0lyw70xgri3jqxzd06s077p8wymislljsyrsyn081pb0xc20vd00"; }) (fetchNuGet { pname = "DotNet4.SocksProxy"; version = "1.4.0.1"; sha256 = "1ig2a9ism041a6qrqkxa9xhvp19yxzcadlap5i1kz97f05a2msvb"; }) - (fetchNuGet { pname = "FlareSolverrSharp"; version = "3.0.5"; sha256 = "1pv07ka068mfvsx5vix0p4mm4950z94iqqdp1znq03j2zp03ja14"; }) + (fetchNuGet { pname = "FlareSolverrSharp"; version = "3.0.6"; sha256 = "1zciw2vahakiarkgrf2d63kb6krf0jffrwh29hj8i0l7mv522dcn"; }) (fetchNuGet { pname = "FluentAssertions"; version = "6.8.0"; sha256 = "102977059vkllkr1pg43kcmgvlf9jm1bpmdkq4hx4ljrn1wflwnb"; }) (fetchNuGet { pname = "Microsoft.AspNetCore"; version = "2.2.0"; sha256 = "0vsv7hcsmnsgqhs67zp207n7m9ix3dbwm1p2ch3dizkcdvz235f9"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.Antiforgery"; version = "2.2.0"; sha256 = "026wjdwjx0lgccqv0xi5gxylxzgz5ifgxf25p5pqakgrhkz0a59l"; }) diff --git a/nixpkgs/pkgs/servers/keycloak/default.nix b/nixpkgs/pkgs/servers/keycloak/default.nix index 96a8f4673e66..c0c93f2cf736 100644 --- a/nixpkgs/pkgs/servers/keycloak/default.nix +++ b/nixpkgs/pkgs/servers/keycloak/default.nix @@ -18,11 +18,11 @@ let ''; in stdenv.mkDerivation rec { pname = "keycloak"; - version = "23.0.7"; + version = "24.0.1"; src = fetchzip { url = "https://github.com/keycloak/keycloak/releases/download/${version}/keycloak-${version}.zip"; - hash = "sha256-9Hx7pX4m60u1UZAqXiafqEPMTvDVNdGLZfsSCktF84Q="; + hash = "sha256-d7bITeukqoLwEPQrUn01arXf8j7L8gM47wzHMsBvz2M="; }; nativeBuildInputs = [ makeWrapper jre ]; diff --git a/nixpkgs/pkgs/servers/keycloak/keycloak-discord/default.nix b/nixpkgs/pkgs/servers/keycloak/keycloak-discord/default.nix index 0605145ff96f..9f00a292aad4 100644 --- a/nixpkgs/pkgs/servers/keycloak/keycloak-discord/default.nix +++ b/nixpkgs/pkgs/servers/keycloak/keycloak-discord/default.nix @@ -5,19 +5,20 @@ stdenv.mkDerivation rec { pname = "keycloak-discord"; - version = "0.3.1"; + version = "0.5.0"; src = fetchurl { - url = "https://github.com/wadahiro/keycloak-discord/releases/download/v${version}/keycloak-discord-ear-${version}.ear"; - sha256 = "0fswhbnxc80dpfqf5y6j29dxk3vcnm4kki6qdk22qliasvpw5n9c"; + url = "https://github.com/wadahiro/keycloak-discord/releases/download/v${version}/keycloak-discord-${version}.jar"; + hash = "sha256-radvUu2a6t0lbo5f/ADqy7+I/ONXB7/8pk2d1BtYzQA="; }; dontUnpack = true; dontBuild = true; installPhase = '' - mkdir -p "$out" - install "$src" "$out/${pname}-ear-${version}.ear" + runHook preInstall + install -Dm444 "$src" "$out/keycloak-discord-$version.jar" + runHook postInstall ''; meta = with lib; { @@ -25,5 +26,6 @@ stdenv.mkDerivation rec { description = "Keycloak Social Login extension for Discord"; license = licenses.asl20; maintainers = with maintainers; [ mkg20001 ]; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; }; } diff --git a/nixpkgs/pkgs/servers/keycloak/keycloak-metrics-spi/default.nix b/nixpkgs/pkgs/servers/keycloak/keycloak-metrics-spi/default.nix index 4752e5fe08c9..3e2b6049b187 100644 --- a/nixpkgs/pkgs/servers/keycloak/keycloak-metrics-spi/default.nix +++ b/nixpkgs/pkgs/servers/keycloak/keycloak-metrics-spi/default.nix @@ -2,16 +2,16 @@ maven.buildMavenPackage rec { pname = "keycloak-metrics-spi"; - version = "4.0.0"; + version = "5.0.0"; src = fetchFromGitHub { owner = "aerogear"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-pacmx5w1VVWz3HmHO6sc2friNUpzo4zyJI1/TQgCXlc="; + hash = "sha256-iagXbsKsU4vNP9eg05bwXEo67iij3N2FF0BW50MjRGE="; }; - mvnHash = "sha256-RjERY434UL9z/gNZFV+wMTITCmTPGanwu61L8sEGaKY="; + mvnHash = "sha256-+ySBrQ9yQ5ZxuVUh/mnHNEmugru3n8x5VR/RYEDCLAo="; installPhase = '' runHook preInstall diff --git a/nixpkgs/pkgs/servers/keycloak/keycloak-restrict-client-auth/default.nix b/nixpkgs/pkgs/servers/keycloak/keycloak-restrict-client-auth/default.nix index bf5d38bca013..16d37617336c 100644 --- a/nixpkgs/pkgs/servers/keycloak/keycloak-restrict-client-auth/default.nix +++ b/nixpkgs/pkgs/servers/keycloak/keycloak-restrict-client-auth/default.nix @@ -2,16 +2,16 @@ maven.buildMavenPackage rec { pname = "keycloak-restrict-client-auth"; - version = "23.0.0"; + version = "24.0.0"; src = fetchFromGitHub { owner = "sventorben"; repo = "keycloak-restrict-client-auth"; rev = "v${version}"; - hash = "sha256-JA3DvLdBKyn2VE1pYSCcRV9Cl7ZAWsRG5MAp548Rl+g="; + hash = "sha256-Pk0tj8cTHSBwVIzINE7GLA5b/eI97wuOTvO7UoXBStM="; }; - mvnHash = "sha256-W1YvX1P/mshGYoTUO5XMlOcpu2KiujwLludaC3miak4="; + mvnHash = "sha256-Pk2yYuBqGs4k1KwaU06RQe1LpohZu0VI1pHEUBU3EUE="; installPhase = '' runHook preInstall diff --git a/nixpkgs/pkgs/servers/lidarr/default.nix b/nixpkgs/pkgs/servers/lidarr/default.nix index aba1c766ce50..06a51b450331 100644 --- a/nixpkgs/pkgs/servers/lidarr/default.nix +++ b/nixpkgs/pkgs/servers/lidarr/default.nix @@ -8,13 +8,13 @@ let x86_64-darwin = "x64"; }."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); hash = { - x64-linux_hash = "sha256-TqwVWV3kfBTqGYf6PT9H0E9YiG/AfLWEViKocVrhZuU="; - arm64-linux_hash = "sha256-aCaUZgnk4rnhEV3hDVZx1Bfz+PteefGeGvEdoKXGxxg="; - x64-osx_hash = "sha256-4O3H2gsH2Q3V9xY1fIMzkaU0qSEg3CF89chnrMdCmdk="; + x64-linux_hash = "sha256-njTaQIi15k0+8tnuIO+waRmSE+BAG46ln+qzesFfI0E="; + arm64-linux_hash = "sha256-dgX/G3eyWjtVmwptv0+Fbmt7/SjR26N5Ug+YXeC9fgU="; + x64-osx_hash = "sha256-kFliWQB1eQK1AoeWIZ3XaYj5mwSwRJWL2G8OwaLTFN4="; }."${arch}-${os}_hash"; in stdenv.mkDerivation rec { pname = "lidarr"; - version = "2.0.7.3849"; + version = "2.1.7.4030"; src = fetchurl { url = "https://github.com/lidarr/Lidarr/releases/download/v${version}/Lidarr.master.${version}.${os}-core-${arch}.tar.gz"; diff --git a/nixpkgs/pkgs/servers/mail/archiveopteryx/default.nix b/nixpkgs/pkgs/servers/mail/archiveopteryx/default.nix deleted file mode 100644 index 99e482323a46..000000000000 --- a/nixpkgs/pkgs/servers/mail/archiveopteryx/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ lib, stdenv, fetchurl, openssl, perl, zlib, jam }: -stdenv.mkDerivation rec { - version = "3.2.0"; - pname = "archiveopteryx"; - - src = fetchurl { - url = "http://archiveopteryx.org/download/${pname}-${version}.tar.bz2"; - sha256 = "0i0zg8di8nbh96qnyyr156ikwcsq1w9b2291bazm5whb351flmqx"; - }; - - nativeBuildInputs = [ jam ]; - buildInputs = [ openssl perl zlib ]; - - preConfigure = '' - export INSTALLROOT=installroot - sed -i 's:BINDIR = $(PREFIX)/bin:BINDIR = '$out'/bin:' ./Jamsettings - sed -i 's:SBINDIR = $(PREFIX)/sbin:SBINDIR = '$out'/bin:' ./Jamsettings - sed -i 's:LIBDIR = $(PREFIX)/lib:LIBDIR = '$out'/lib:' ./Jamsettings - sed -i 's:MANDIR = $(PREFIX)/man:MANDIR = '$out'/share/man:' ./Jamsettings - sed -i 's:READMEDIR = $(PREFIX):READMEDIR = '$out'/share/doc/archiveopteryx:' ./Jamsettings - ''; - - # fix build on gcc7+ and gcc11+ - env.NIX_CFLAGS_COMPILE = toString ([ - "-std=c++11" # c++17+ has errors - "-Wno-error=builtin-declaration-mismatch" - "-Wno-error=deprecated-copy" - "-Wno-error=implicit-fallthrough" - "-Wno-error=nonnull" - ] ++ lib.optionals (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "11") [ - "-Wno-error=mismatched-new-delete" - ]); - - buildPhase = ''jam "-j$NIX_BUILD_CORES" ''; - installPhase = '' - jam install - mv installroot/$out $out - ''; - - meta = with lib; { - homepage = "http://archiveopteryx.org/"; - description = "An advanced PostgreSQL-based IMAP/POP server"; - license = licenses.postgresql; - maintainers = [ maintainers.phunehehe ]; - platforms = platforms.linux; - }; -} diff --git a/nixpkgs/pkgs/servers/mail/dovecot/plugins/fts_xapian/default.nix b/nixpkgs/pkgs/servers/mail/dovecot/plugins/fts_xapian/default.nix index f330fd7c6cf3..59c306beedd9 100644 --- a/nixpkgs/pkgs/servers/mail/dovecot/plugins/fts_xapian/default.nix +++ b/nixpkgs/pkgs/servers/mail/dovecot/plugins/fts_xapian/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub, autoconf, automake, sqlite, pkg-config, dovecot, libtool, xapian, icu64 }: stdenv.mkDerivation rec { pname = "dovecot-fts-xapian"; - version = "1.6.5"; + version = "1.7.4"; src = fetchFromGitHub { owner = "grosjo"; repo = "fts-xapian"; rev = version; - sha256 = "sha256-jkQM5J3Yqjo2j4kXhw/woV0kID2bghCmpFMuxbdMHuk="; + sha256 = "sha256-Jc8rk/g+dzCpSWsn/Rt5qjhDr5nxO9wmi7rgfyyTSTU="; }; buildInputs = [ dovecot xapian icu64 sqlite ]; diff --git a/nixpkgs/pkgs/servers/mail/listmonk/default.nix b/nixpkgs/pkgs/servers/mail/listmonk/default.nix deleted file mode 100644 index 24f97afa348d..000000000000 --- a/nixpkgs/pkgs/servers/mail/listmonk/default.nix +++ /dev/null @@ -1,64 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub, callPackage, stuffbin, nixosTests, fetchpatch }: - -buildGoModule rec { - pname = "listmonk"; - version = "2.5.1"; - - src = fetchFromGitHub { - owner = "knadh"; - repo = "listmonk"; - rev = "v${version}"; - sha256 = "sha256-gCnIblc83CmG1auvYYxqW/xBl6Oy1KHGkqSY/3yIm3I="; - }; - - patches = [ - # Ensure that listmonk supports Go 1.20 - (fetchpatch { - url = "https://github.com/knadh/listmonk/commit/25513b81044803b104ada63c0be57a913960484e.patch"; - hash = "sha256-SYACM8r+NgeSWn9VJV4+wkm+6s/MhNGwn5zyc2tw7FU="; - }) - ]; - - vendorHash = "sha256-0sgC1+ueZTUCP+7JwI/OKLktfMHQq959GEk1mC0TQgE="; - - nativeBuildInputs = [ - stuffbin - ]; - - ldflags = [ "-s" "-w" "-X main.version=${version}" ]; - - postInstall = '' - mv $out/bin/cmd $out/bin/listmonk - ''; - - # Run stuffbin to stuff the frontend and the static in the binary. - postFixup = - let - vfsMappings = [ - "config.toml.sample" - "schema.sql" - "queries.sql" - "static/public:/public" - "static/email-templates" - "${passthru.frontend}:/admin" - "i18n:/i18n" - ]; - in - '' - stuffbin -a stuff -in $out/bin/listmonk -out $out/bin/listmonk \ - ${lib.concatStringsSep " " vfsMappings} - ''; - - passthru = { - frontend = callPackage ./frontend.nix { inherit meta; }; - tests = { inherit (nixosTests) listmonk; }; - }; - - meta = with lib; { - description = "High performance, self-hosted, newsletter and mailing list manager with a modern dashboard."; - homepage = "https://github.com/knadh/listmonk"; - changelog = "https://github.com/knadh/listmonk/releases/tag/v${version}"; - maintainers = with maintainers; [ raitobezarius ]; - license = licenses.agpl3; - }; -} diff --git a/nixpkgs/pkgs/servers/mail/listmonk/frontend.nix b/nixpkgs/pkgs/servers/mail/listmonk/frontend.nix deleted file mode 100644 index 647f5cfd9f6a..000000000000 --- a/nixpkgs/pkgs/servers/mail/listmonk/frontend.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ yarn2nix-moretea -, fetchFromGitHub -, fetchYarnDeps -, meta -}: - -yarn2nix-moretea.mkYarnPackage rec { - pname = "listmonk-frontend"; - version = "2.5.1"; - - src = fetchFromGitHub { - owner = "knadh"; - repo = "listmonk"; - rev = "v${version}"; - sha256 = "sha256-gCnIblc83CmG1auvYYxqW/xBl6Oy1KHGkqSY/3yIm3I="; - }; - - packageJSON = ./package.json; - yarnLock = "${src}/frontend/yarn.lock"; - - offlineCache = fetchYarnDeps { - inherit yarnLock; - hash = "sha256-KKNk4lrM7unMFClkY6F3nqhKx5xfx87Ac+rug9sOwvI="; - }; - - # For Node.js v17+, this is necessary. - NODE_OPTIONS = "--openssl-legacy-provider"; - - installPhase = '' - runHook preInstall - - cd deps/listmonk-frontend/frontend - npm run build - - mv dist $out - - runHook postInstall - ''; - - doDist = false; - - - inherit meta; -} diff --git a/nixpkgs/pkgs/servers/mail/listmonk/package.json b/nixpkgs/pkgs/servers/mail/listmonk/package.json deleted file mode 100644 index 6e981fefc8b3..000000000000 --- a/nixpkgs/pkgs/servers/mail/listmonk/package.json +++ /dev/null @@ -1,46 +0,0 @@ -{ - "name": "listmonk-frontend", - "version": "0.1.0", - "private": true, - "scripts": { - "serve": "vue-cli-service serve", - "build": "vue-cli-service build", - "build-report": "vue-cli-service build --report", - "lint": "vue-cli-service lint" - }, - "dependencies": { - "@tinymce/tinymce-vue": "^3", - "axios": "^0.27.2", - "buefy": "^0.9.10", - "c3": "^0.7.20", - "codeflask": "^1.4.1", - "core-js": "^3.12.1", - "dayjs": "^1.10.4", - "indent.js": "^0.3.5", - "qs": "^6.10.1", - "textversionjs": "^1.1.3", - "tinymce": "^5.10.7", - "turndown": "^7.0.0", - "vue": "^2.6.12", - "vue-i18n": "^8.22.2", - "vue-router": "^3.2.0", - "vuex": "^3.6.2" - }, - "devDependencies": { - "@vue/cli-plugin-babel": "~5.0.8", - "@vue/cli-plugin-eslint": "~5.0.8", - "@vue/cli-plugin-router": "~5.0.8", - "@vue/cli-plugin-vuex": "~5.0.8", - "@vue/cli-service": "~5.0.8", - "@vue/eslint-config-airbnb": "^5.3.0", - "babel-eslint": "^10.1.0", - "cypress": "10.10.0", - "cypress-file-upload": "^5.0.2", - "eslint": "^7.27.0", - "eslint-plugin-import": "^2.23.3", - "eslint-plugin-vue": "^7.9.0", - "sass": "^1.34.0", - "sass-loader": "^10.2.0", - "vue-template-compiler": "^2.6.12" - } -} diff --git a/nixpkgs/pkgs/servers/mail/listmonk/stuffbin.nix b/nixpkgs/pkgs/servers/mail/listmonk/stuffbin.nix deleted file mode 100644 index 2640ba8b8519..000000000000 --- a/nixpkgs/pkgs/servers/mail/listmonk/stuffbin.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "stuffbin"; - version = "1.1.0"; - - vendorHash = null; - - src = fetchFromGitHub { - owner = "knadh"; - repo = "stuffbin"; - rev = "v${version}"; - sha256 = "sha256-M72xNh7bKUMLzA+M8bJB++kJ5KCrkboQm1v8BasP3Yo="; - }; - - ldflags = [ "-s" "-w" "-X main.version=${version}" ]; - - meta = with lib; { - description = "Compress and embed static files and assets into Go binaries and access them with a virtual file system in production"; - homepage = "https://github.com/knadh/stuffbin"; - changelog = "https://github.com/knadh/stuffbin/releases/tag/v${version}"; - maintainers = with maintainers; [ raitobezarius ]; - license = licenses.mit; - }; -} diff --git a/nixpkgs/pkgs/servers/mail/postfix/default.nix b/nixpkgs/pkgs/servers/mail/postfix/default.nix index 61b69359d3c8..e40c30ff79fa 100644 --- a/nixpkgs/pkgs/servers/mail/postfix/default.nix +++ b/nixpkgs/pkgs/servers/mail/postfix/default.nix @@ -25,11 +25,11 @@ let in stdenv.mkDerivation rec { pname = "postfix"; - version = "3.8.5"; + version = "3.8.6"; src = fetchurl { - url = "https://de.postfix.org/ftpmirror/official/${pname}-${version}.tar.gz"; - hash = "sha256-8+gnorLkEDWa0l0xNBlwQ0qwfjYTn5ou+TmBsOxWTIU="; + url = "https://de.postfix.org/ftpmirror/official/postfix-${version}.tar.gz"; + hash = "sha256-S24XyCbMQ4zDAWqcClXqfnfGy6+6fdVyQdgbaQsOl3Q="; }; nativeBuildInputs = [ makeWrapper m4 ]; diff --git a/nixpkgs/pkgs/servers/matrix-synapse/default.nix b/nixpkgs/pkgs/servers/matrix-synapse/default.nix index 1cced1717ac9..2370dbc94349 100644 --- a/nixpkgs/pkgs/servers/matrix-synapse/default.nix +++ b/nixpkgs/pkgs/servers/matrix-synapse/default.nix @@ -17,20 +17,20 @@ let in python3.pkgs.buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.101.0"; + version = "1.102.0"; format = "pyproject"; src = fetchFromGitHub { owner = "element-hq"; repo = "synapse"; rev = "v${version}"; - hash = "sha256-yhOdIyKp+JM0qUl4dD1aMeYHNhE71DUDxrfCyRDP1VI="; + hash = "sha256-RJsuvNqqUiiVw6uKkG81rqo1ZoszUHK4UIJh8MReFqo="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-mWvcRNvCYf6WCKU/5LGJipOI032QFG90XpHTxFGs6TU="; + hash = "sha256-PoPJnSZ9QpcpVbqDMlqwgAqu0K8oornpihErLHXb6Gc="; }; postPatch = '' diff --git a/nixpkgs/pkgs/servers/metabase/default.nix b/nixpkgs/pkgs/servers/metabase/default.nix index 24636e19a4c2..42d776d79705 100644 --- a/nixpkgs/pkgs/servers/metabase/default.nix +++ b/nixpkgs/pkgs/servers/metabase/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "metabase"; - version = "0.48.4"; + version = "0.48.7"; src = fetchurl { url = "https://downloads.metabase.com/v${version}/metabase.jar"; - hash = "sha256-megPu4HGVdfMzWkJJyse87EBLSi50yXXHfg7WIk3U10="; + hash = "sha256-W0FP9c6vMLCfK93eaXPeF1mkBAI2KMjQ9EpGx7hbRg8="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/servers/minio/default.nix b/nixpkgs/pkgs/servers/minio/default.nix index 2936aa6a8736..3fb9ecc28f38 100644 --- a/nixpkgs/pkgs/servers/minio/default.nix +++ b/nixpkgs/pkgs/servers/minio/default.nix @@ -21,13 +21,13 @@ let in buildGoModule rec { pname = "minio"; - version = "2024-02-24T17-11-14Z"; + version = "2024-02-26T09-33-48Z"; src = fetchFromGitHub { owner = "minio"; repo = "minio"; rev = "RELEASE.${version}"; - hash = "sha256-LD32cNKvW0mfYeXHNOqgiWXAiHjWJrorRqbQkosjaNE="; + hash = "sha256-V5Pmp36YA0u1Z2SBNdJZAHQuA3PgVKHmIJlDElhS24s="; }; vendorHash = "sha256-0EymK7jQhr+NJDg1zgWpcniV5zZ33Av6zpq0IDuWw7M="; diff --git a/nixpkgs/pkgs/servers/misc/gobgpd/default.nix b/nixpkgs/pkgs/servers/misc/gobgpd/default.nix index a7b4b05b57cc..8d7a8f563ea8 100644 --- a/nixpkgs/pkgs/servers/misc/gobgpd/default.nix +++ b/nixpkgs/pkgs/servers/misc/gobgpd/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "gobgpd"; - version = "3.23.0"; + version = "3.24.0"; src = fetchFromGitHub { owner = "osrg"; repo = "gobgp"; rev = "refs/tags/v${version}"; - hash = "sha256-PUwYcwWgaV/DQl565fugppc+I/y7z7Ns3P4SspS88ts="; + hash = "sha256-JGgkhNSKprqaUBaW+m/5vYnuDri1Ibyf2Y6SMlscnIU="; }; vendorHash = "sha256-5eB3vFOo3LCsjMnWYFH0yq5+IunwKXp5C34x6NvpFZ8="; diff --git a/nixpkgs/pkgs/servers/misc/qremotecontrol-server/default.nix b/nixpkgs/pkgs/servers/misc/qremotecontrol-server/default.nix index 07094886b43b..31d66070d42f 100644 --- a/nixpkgs/pkgs/servers/misc/qremotecontrol-server/default.nix +++ b/nixpkgs/pkgs/servers/misc/qremotecontrol-server/default.nix @@ -7,7 +7,7 @@ , xorg }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "qremotecontrol-server"; version = "unstable-2014-11-05"; # basically 2.4.2 + qt5 diff --git a/nixpkgs/pkgs/servers/monitoring/grafana-dash-n-grab/default.nix b/nixpkgs/pkgs/servers/monitoring/grafana-dash-n-grab/default.nix index 52309195a419..089d2f4e4db1 100644 --- a/nixpkgs/pkgs/servers/monitoring/grafana-dash-n-grab/default.nix +++ b/nixpkgs/pkgs/servers/monitoring/grafana-dash-n-grab/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "grafana-dash-n-grab"; - version = "0.5.1"; + version = "0.5.2"; src = fetchFromGitHub { rev = "v${version}"; owner = "esnet"; repo = "gdg"; - sha256 = "sha256-OLMa5s3QoK+ZeU3v/mPW9tPXqKTS/f+90pPpT+nlWFU="; + sha256 = "sha256-EG1hLyoy75nvA1ZmSHSPVEzMwhq6d0PxmVUpQysjsRg="; }; - vendorHash = "sha256-y5eqG0kB3kGZ2X/VR6aVT+qCVZQd2MbFDqReoPwNtO4="; + vendorHash = "sha256-w0w6ac8sNxsVBEYps6ZhM7F4PFcIWKah0cnk/NBtA8M="; ldflags = [ "-s" diff --git a/nixpkgs/pkgs/servers/monitoring/laurel/default.nix b/nixpkgs/pkgs/servers/monitoring/laurel/default.nix index 8b26a04f2a05..a667d1d442b1 100644 --- a/nixpkgs/pkgs/servers/monitoring/laurel/default.nix +++ b/nixpkgs/pkgs/servers/monitoring/laurel/default.nix @@ -1,21 +1,33 @@ { acl , fetchFromGitHub +, fetchpatch , lib , rustPlatform }: rustPlatform.buildRustPackage rec { pname = "laurel"; - version = "0.5.6"; + version = "0.6.0"; src = fetchFromGitHub { owner = "threathunters-io"; - repo = pname; + repo = "laurel"; rev = "refs/tags/v${version}"; - hash = "sha256-IGmpNSHGlQGJn4cvcXXWbIOWqsXizzp1azfT41B4rm4="; + hash = "sha256-lWVrp0ytomrQBSDuQCMFJpSuAuwjSYPwoE4yh/WO2ls="; }; - cargoHash = "sha256-jm1AWybDnpc1E4SWieQcsVwn8mxkJ5damMsXqg54LI8="; + cargoHash = "sha256-GY7vpst+Epsy/x/ths6pwtGQgM6Bx0KI+NsCMFCBujE="; + + cargoPatches = [ + # Upstream forgot to bump the Cargo.lock before tagging the release. + # This patch is the first commit immediately after the tag fixing this mistake. + # Needs to be removed next release. + (fetchpatch { + name = "Cargo-lock-version-bump.patch"; + url = "https://github.com/threathunters-io/laurel/commit/f38393d1098e8f75394f83ad3da5c1160fb96652.patch"; + hash = "sha256-x+7p21X38KYqLclFtGnLO5nOHz819+XTaSPMvDbSo/I="; + }) + ]; nativeBuildInputs = [ rustPlatform.bindgenHook ]; buildInputs = [ acl ]; diff --git a/nixpkgs/pkgs/servers/monitoring/librenms/default.nix b/nixpkgs/pkgs/servers/monitoring/librenms/default.nix index 0fab1b334890..58b4e5619564 100644 --- a/nixpkgs/pkgs/servers/monitoring/librenms/default.nix +++ b/nixpkgs/pkgs/servers/monitoring/librenms/default.nix @@ -45,7 +45,7 @@ in phpPackage.buildComposerProject rec { redis setuptools psutil - command_runner + command-runner ])) ]; diff --git a/nixpkgs/pkgs/servers/monitoring/loki/default.nix b/nixpkgs/pkgs/servers/monitoring/loki/default.nix index 65f8c348b13c..2578bb5a0405 100644 --- a/nixpkgs/pkgs/servers/monitoring/loki/default.nix +++ b/nixpkgs/pkgs/servers/monitoring/loki/default.nix @@ -8,14 +8,14 @@ }: buildGoModule rec { - version = "2.9.4"; + version = "2.9.5"; pname = "grafana-loki"; src = fetchFromGitHub { owner = "grafana"; repo = "loki"; rev = "v${version}"; - hash = "sha256-uT3rMvSW1eTBhXboA71QeIvuYvc017TxoGG3z3G4K4Y="; + hash = "sha256-+X9ODzyIaeizLItUqorDdvgpIOPML+MzgwmyKbes9dA="; }; vendorHash = null; diff --git a/nixpkgs/pkgs/servers/monitoring/mackerel-agent/default.nix b/nixpkgs/pkgs/servers/monitoring/mackerel-agent/default.nix index 8d65f992432f..b99309fb05e5 100644 --- a/nixpkgs/pkgs/servers/monitoring/mackerel-agent/default.nix +++ b/nixpkgs/pkgs/servers/monitoring/mackerel-agent/default.nix @@ -2,20 +2,20 @@ buildGoModule rec { pname = "mackerel-agent"; - version = "0.78.3"; + version = "0.79.0"; src = fetchFromGitHub { owner = "mackerelio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-9PahaZlHtD4p3C8CvXF2ceNuSOqyApJaZWhFNffNlVA="; + sha256 = "sha256-UKSrNUKS7VYK/hcKdNetaq6HNPqZyK7VtlJZjoyxU6o="; }; nativeBuildInputs = [ makeWrapper ]; nativeCheckInputs = lib.optionals (!stdenv.isDarwin) [ nettools ]; buildInputs = lib.optionals (!stdenv.isDarwin) [ iproute2 ]; - vendorHash = "sha256-lcK1rofTKPpEu/tK8XpS9EhOA30R/8J3o57YlU1/+0k="; + vendorHash = "sha256-AnkjmgcFSI8RadfTdtCk+NCiAw+NecfaU/vc7WOgbuk="; subPackages = [ "." ]; diff --git a/nixpkgs/pkgs/servers/monitoring/nagios/default.nix b/nixpkgs/pkgs/servers/monitoring/nagios/default.nix index 442eed82478e..14e60891c08d 100644 --- a/nixpkgs/pkgs/servers/monitoring/nagios/default.nix +++ b/nixpkgs/pkgs/servers/monitoring/nagios/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "nagios"; - version = "4.5.0"; + version = "4.5.1"; src = fetchFromGitHub { owner = "NagiosEnterprises"; repo = "nagioscore"; rev = "refs/tags/nagios-${version}"; - hash = "sha256-km0vB/bopysS7eejDFDKaonXzTzBonIqiw1T+C2lKiQ="; + hash = "sha256-+U2k3w3Yr0qZjHwjRpKZVucB3a35PSZr1Sqa8k0ssq8="; }; patches = [ ./nagios.patch ]; diff --git a/nixpkgs/pkgs/servers/monitoring/prometheus/artifactory-exporter.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/artifactory-exporter.nix index f77257745872..54b5c8370bdf 100644 --- a/nixpkgs/pkgs/servers/monitoring/prometheus/artifactory-exporter.nix +++ b/nixpkgs/pkgs/servers/monitoring/prometheus/artifactory-exporter.nix @@ -6,17 +6,17 @@ buildGoModule rec { pname = "artifactory_exporter"; - version = "1.13.2"; + version = "1.14.0"; rev = "v${version}"; src = fetchFromGitHub { owner = "peimanja"; repo = pname; rev = rev; - hash = "sha256-m5ToXry1LgjWSTU9bjOtsgfVF8wKiKuTwCIC7jNGSKY="; + hash = "sha256-+CCUSI7Rh9fENzsg7rpI01Cm++kafd1nGgpyFRt20Ug="; }; - vendorHash = "sha256-ikWxTHmqHFWAReKMf6LFza/bhkcfxa4euXUixKPvcpQ="; + vendorHash = "sha256-CQ7JvXcutj63UzaYk/jbmd9G2whN48Xv1PCllaI9Nuo="; subPackages = [ "." ]; diff --git a/nixpkgs/pkgs/servers/monitoring/prometheus/exportarr/default.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/exportarr/default.nix index 821baf91417c..00b4690c5619 100644 --- a/nixpkgs/pkgs/servers/monitoring/prometheus/exportarr/default.nix +++ b/nixpkgs/pkgs/servers/monitoring/prometheus/exportarr/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "exportarr"; - version = "1.6.2"; + version = "2.0.0"; src = fetchFromGitHub { owner = "onedr0p"; repo = "exportarr"; rev = "v${version}"; - hash = "sha256-Eacu8NeAAQqztzVpBhW1UeKQU+FBEJcx5+mcaByQid8="; + hash = "sha256-hUgi50BFmtJfp/rNUA8QGYSflfSMANbelPndL7zV7v8="; }; - vendorHash = "sha256-lizPm/3hxKt7ZxKkhbwsj1nL8bWmE90QqRGxTqMSMAw="; + vendorHash = "sha256-Hy8OXFmGTxNlwbRjH05npD2p3avQfWk9k29R5sFKlNI="; subPackages = [ "cmd/exportarr" ]; diff --git a/nixpkgs/pkgs/servers/monitoring/prometheus/knot-exporter.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/knot-exporter.nix index d51d9bd3f79c..f15dc626e59f 100644 --- a/nixpkgs/pkgs/servers/monitoring/prometheus/knot-exporter.nix +++ b/nixpkgs/pkgs/servers/monitoring/prometheus/knot-exporter.nix @@ -6,13 +6,13 @@ python3.pkgs.buildPythonApplication rec { pname = "knot-exporter"; - version = "3.3.4"; + version = "3.3.5"; pyproject = true; src = fetchPypi { pname = "knot_exporter"; inherit version; - hash = "sha256-jZNNJiJxq3pNSZFwu2UEHhrA0odIDY0UO+d4PJII1ZI="; + hash = "sha256-7r4zXqomiszDrplMedEyw2ZQ2NwDTf54EOwnsLc5RJ0="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/servers/monitoring/telegraf/default.nix b/nixpkgs/pkgs/servers/monitoring/telegraf/default.nix index b7c8cb2fcb9e..1345b3acc1d2 100644 --- a/nixpkgs/pkgs/servers/monitoring/telegraf/default.nix +++ b/nixpkgs/pkgs/servers/monitoring/telegraf/default.nix @@ -8,7 +8,7 @@ buildGoModule rec { pname = "telegraf"; - version = "1.29.4"; + version = "1.29.5"; subPackages = [ "cmd/telegraf" ]; @@ -16,10 +16,10 @@ buildGoModule rec { owner = "influxdata"; repo = "telegraf"; rev = "v${version}"; - hash = "sha256-XhGP5q0LbXaTgClZvRFV1Zjpi1mizoyFrzI7vobVaUo="; + hash = "sha256-yVxpUKEmy7pllZQq6A0zIDekewh4BQX+/kaeLcZ2aLg="; }; - vendorHash = "sha256-DdE2r0M9/6aaq5c3m0AT82TNyIP2vBsaFCRP2um0hao="; + vendorHash = "sha256-amcI5X/xLOjItraG+twsv7sn5ei3mkZsclEd4TGiXwM="; proxyVendor = true; ldflags = [ diff --git a/nixpkgs/pkgs/servers/monitoring/vmagent/default.nix b/nixpkgs/pkgs/servers/monitoring/vmagent/default.nix index 875a28e0217b..74b2a2de096d 100644 --- a/nixpkgs/pkgs/servers/monitoring/vmagent/default.nix +++ b/nixpkgs/pkgs/servers/monitoring/vmagent/default.nix @@ -1,13 +1,13 @@ { lib, fetchFromGitHub, buildGoModule }: buildGoModule rec { pname = "vmagent"; - version = "1.96.0"; + version = "1.99.0"; src = fetchFromGitHub { owner = "VictoriaMetrics"; repo = "VictoriaMetrics"; rev = "v${version}"; - sha256 = "sha256-/YS0IDUdGIT3QuRbD+5c3VOqrzYvbcZefLSd+tYJ6dY="; + sha256 = "sha256-IHUmxdCOzvA2JL06k/ei6/OTVWHTL1TiKKYZB1hgqyA="; }; ldflags = [ "-s" "-w" "-X github.com/VictoriaMetrics/VictoriaMetrics/lib/buildinfo.Version=${version}" ]; diff --git a/nixpkgs/pkgs/servers/nextcloud/default.nix b/nixpkgs/pkgs/servers/nextcloud/default.nix index 63f7162fc5d6..6745fc87dda8 100644 --- a/nixpkgs/pkgs/servers/nextcloud/default.nix +++ b/nixpkgs/pkgs/servers/nextcloud/default.nix @@ -43,20 +43,20 @@ let }; in { nextcloud26 = generic { - version = "26.0.11"; - hash = "sha256-Vc0QCCy495oYeRnpWaYwc4Nf4D/ko4VsODoKcS7YADA="; + version = "26.0.12"; + hash = "sha256-fuTAIAJB9pRfMd0Ewh19FmY0Vj4MuH1iMkkS1BiTI0w="; packages = nextcloud26Packages; }; nextcloud27 = generic { - version = "27.1.6"; - hash = "sha256-rntyt/xSWsSXmMLeaml6TP8ls0ly1p1GmVmIXTNRvvo="; + version = "27.1.7"; + hash = "sha256-hEPi0bsojcQU+q0Kb+/i41uznt0359pcXzTexsDdG+s="; packages = nextcloud27Packages; }; nextcloud28 = generic { - version = "28.0.2"; - hash = "sha256-3jTWuvPszqz90TjoVSDNheHSzmeY2f+keKwX6x76HQg="; + version = "28.0.3"; + hash = "sha256-ntQTwN4W9bAzzu/8ypnA1h/GmNvrjbhRrJrfnu+VGQY="; packages = nextcloud28Packages; }; diff --git a/nixpkgs/pkgs/servers/nextcloud/packages/26.json b/nixpkgs/pkgs/servers/nextcloud/packages/26.json index 7bdbb87ffb68..99fd50c6bff5 100644 --- a/nixpkgs/pkgs/servers/nextcloud/packages/26.json +++ b/nixpkgs/pkgs/servers/nextcloud/packages/26.json @@ -10,9 +10,9 @@ ] }, "calendar": { - "sha256": "06blkrgc9jq8zizgchn8az2cj0s3yy8s05kyhiwj1nb1rx32682j", - "url": "https://github.com/nextcloud-releases/calendar/releases/download/v4.6.4/calendar-v4.6.4.tar.gz", - "version": "4.6.4", + "sha256": "18mi6ccq640jq21hmir35v2967h07bjv226072d9qz5qkzkmrhss", + "url": "https://github.com/nextcloud-releases/calendar/releases/download/v4.6.5/calendar-v4.6.5.tar.gz", + "version": "4.6.5", "description": "The Calendar app is a user interface for Nextcloud's CalDAV server. Easily sync events from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Contacts - more to come.\n* 🌐 **WebCal Support!** Want to see your favorite team’s matchdays in your calendar? No problem!\n* 🙋 **Attendees!** Invite people to your events\n* ⌚️ **Free/Busy!** See when your attendees are available to meet\n* ⏰ **Reminders!** Get alarms for events inside your browser and via email\n* 🔍 Search! Find your events at ease\n* ☑️ Tasks! See tasks with a due date directly in the calendar\n* 🙈 **We’re not reinventing the wheel!** Based on the great [c-dav library](https://github.com/nextcloud/cdav-library), [ical.js](https://github.com/mozilla-comm/ical.js) and [fullcalendar](https://github.com/fullcalendar/fullcalendar) libraries.", "homepage": "https://github.com/nextcloud/calendar/", "licenses": [ @@ -20,9 +20,9 @@ ] }, "contacts": { - "sha256": "1wq6xj9r1f2raqhpj222269y8dkn5zx9mnw7zrbxwpz8c67s3h6n", - "url": "https://github.com/nextcloud-releases/contacts/releases/download/v5.5.1/contacts-v5.5.1.tar.gz", - "version": "5.5.1", + "sha256": "0g6pbzm7bxllpkf9jqkrb3ys8xvbmayxc3rqwspalzckayjbz98m", + "url": "https://github.com/nextcloud-releases/contacts/releases/download/v5.5.2/contacts-v5.5.2.tar.gz", + "version": "5.5.2", "description": "The Nextcloud contacts app is a user interface for Nextcloud's CardDAV server. Easily sync contacts from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Mail and Calendar – more to come.\n* 🎉 **Never forget a birthday!** You can sync birthdays and other recurring events with your Nextcloud Calendar.\n* 👥 **Sharing of Adressbooks!** You want to share your contacts with your friends or coworkers? No problem!\n* 🙈 **We’re not reinventing the wheel!** Based on the great and open SabreDAV library.", "homepage": "https://github.com/nextcloud/contacts#readme", "licenses": [ @@ -50,9 +50,9 @@ ] }, "deck": { - "sha256": "1vf4vmwzfyj5ylb571h1wgh8f3aiivzla11y14ggikg5fj9lgyqi", - "url": "https://github.com/nextcloud-releases/deck/releases/download/v1.9.6/deck-v1.9.6.tar.gz", - "version": "1.9.6", + "sha256": "0b6glilrv1cyn9gfka093hdkq4cmln3p6fkz502y6lk8xa98giga", + "url": "https://github.com/nextcloud-releases/deck/releases/download/v1.9.7/deck-v1.9.7.tar.gz", + "version": "1.9.7", "description": "Deck is a kanban style organization tool aimed at personal planning and project organization for teams integrated with Nextcloud.\n\n\n- 📥 Add your tasks to cards and put them in order\n- 📄 Write down additional notes in Markdown\n- 🔖 Assign labels for even better organization\n- 👥 Share with your team, friends or family\n- 📎 Attach files and embed them in your Markdown description\n- 💬 Discuss with your team using comments\n- ⚡ Keep track of changes in the activity stream\n- 🚀 Get your project organized", "homepage": "https://github.com/nextcloud/deck", "licenses": [ @@ -90,9 +90,9 @@ ] }, "forms": { - "sha256": "143paalwm44vd9sa9ql30q986bm9z8kr39ky5hvcfai52w1ysrjq", - "url": "https://github.com/nextcloud-releases/forms/releases/download/v3.4.5/forms-v3.4.5.tar.gz", - "version": "3.4.5", + "sha256": "1nwsbl3lh0s4if4665b1z7nf7r62chazfb5g3fdrlffrrrqbdj4y", + "url": "https://github.com/nextcloud-releases/forms/releases/download/v3.4.6/forms-v3.4.6.tar.gz", + "version": "3.4.6", "description": "**Simple surveys and questionnaires, self-hosted!**\n\n- **📝 Simple design:** No mass of options, only the essentials. Works well on mobile of course.\n- **📊 View & export results:** Results are visualized and can also be exported as CSV in the same format used by Google Forms.\n- **🔒 Data under your control!** Unlike in Google Forms, Typeform, Doodle and others, the survey info and responses are kept private on your instance.\n- **🧑💻 Connect to your software:** Easily integrate Forms into your service with our full-fledged [REST-API](https://github.com/nextcloud/forms/blob/main/docs/API.md).\n- **🙋 Get involved!** We have lots of stuff planned like more question types, collaboration on forms, [and much more](https://github.com/nextcloud/forms/milestones)!", "homepage": "https://github.com/nextcloud/forms", "licenses": [ @@ -110,9 +110,9 @@ ] }, "groupfolders": { - "sha256": "00z9n3l3pd212x02zfnmf15fk67whf0a3j395pg68lg4b8w4lyly", - "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v14.0.6/groupfolders-v14.0.6.tar.gz", - "version": "14.0.6", + "sha256": "19j2iqn3fjlzcswgbxwvxggzqc3aili8br4vjpr8dd9h1rzm453y", + "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v14.0.7/groupfolders-v14.0.7.tar.gz", + "version": "14.0.7", "description": "Admin configured folders shared with everyone in a group.\n\nFolders can be configured from *Group folders* in the admin settings.\n\nAfter a folder is created, the admin can give access to the folder to one or more groups, control their write/sharing permissions and assign a quota for the folder.\n\nNote: Encrypting the contents of group folders is currently not supported.", "homepage": "https://github.com/nextcloud/groupfolders", "licenses": [ @@ -140,9 +140,9 @@ ] }, "mail": { - "sha256": "15268xavb4wpkc12anz6wiry87hvy55nf141lc660wr22iivy79r", - "url": "https://github.com/nextcloud-releases/mail/releases/download/v3.5.5/mail-v3.5.5.tar.gz", - "version": "3.5.5", + "sha256": "122qyz6d9771ivpl771g5wi3lxsd2g3v64n9cp5clm8p662msjfi", + "url": "https://github.com/nextcloud-releases/mail/releases/download/v3.5.7/mail-v3.5.7.tar.gz", + "version": "3.5.7", "description": "**💌 A mail app for Nextcloud**\n\n- **🚀 Integration with other Nextcloud apps!** Currently Contacts, Calendar & Files – more to come.\n- **📥 Multiple mail accounts!** Personal and company account? No problem, and a nice unified inbox. Connect any IMAP account.\n- **🔒 Send & receive encrypted mails!** Using the great [Mailvelope](https://mailvelope.com) browser extension.\n- **🙈 We’re not reinventing the wheel!** Based on the great [Horde](https://horde.org) libraries.\n- **📬 Want to host your own mail server?** We do not have to reimplement this as you could set up [Mail-in-a-Box](https://mailinabox.email)!\n\n## Ethical AI Rating\n\n### Priority Inbox\n\nPositive:\n* The software for training and inferencing of this model is open source.\n* The model is created and trained on-premises based on the user's own data.\n* The training data is accessible to the user, making it possible to check or correct for bias or optimise the performance and CO2 usage.\n\n### Thread Summaries (opt-in)\n\n**Rating:** 🟢/🟡/🟠/🔴\n\nThe rating depends on the installed text processing backend. See [the rating overview](https://docs.nextcloud.com/server/latest/admin_manual/ai/index.html) for details.\n\nLearn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud.com/blog/nextcloud-ethical-ai-rating/).", "homepage": "https://github.com/nextcloud/mail#readme", "licenses": [ @@ -270,9 +270,9 @@ ] }, "spreed": { - "sha256": "0da0c6a30pfwpn4ly4dczxs68v2jmi9kzmqhrpj4fvaalsk1wa7w", - "url": "https://github.com/nextcloud-releases/spreed/releases/download/v16.0.10/spreed-v16.0.10.tar.gz", - "version": "16.0.10", + "sha256": "1d04y6jjhk41ghykqwxca4vmjlpn8cwlabqd9hjsccr2845gksad", + "url": "https://github.com/nextcloud-releases/spreed/releases/download/v16.0.11/spreed-v16.0.11.tar.gz", + "version": "16.0.11", "description": "Chat, video & audio-conferencing using WebRTC\n\n* 💬 **Chat integration!** Nextcloud Talk comes with a simple text chat. Allowing you to share files from your Nextcloud and mentioning other participants.\n* 👥 **Private, group, public and password protected calls!** Just invite somebody, a whole group or send a public link to invite to a call.\n* 💻 **Screen sharing!** Share your screen with participants of your call. You just need to use Firefox version 66 (or newer), latest Edge or Chrome 72 (or newer, also possible using Chrome 49 with this [Chrome extension](https://chrome.google.com/webstore/detail/screensharing-for-nextclo/kepnpjhambipllfmgmbapncekcmabkol)).\n* 🚀 **Integration with other Nextcloud apps** like Files, Contacts and Deck. More to come.\n\nAnd in the works for the [coming versions](https://github.com/nextcloud/spreed/milestones/):\n* ✋ [Federated calls](https://github.com/nextcloud/spreed/issues/21), to call people on other Nextclouds", "homepage": "https://github.com/nextcloud/spreed", "licenses": [ @@ -320,9 +320,9 @@ ] }, "user_oidc": { - "sha256": "0iyd1lkzfl7nh2sy5k9a6p86mswm5p0cyqj3ia613sw2fm49sl1b", - "url": "https://github.com/nextcloud-releases/user_oidc/releases/download/v1.3.6/user_oidc-v1.3.6.tar.gz", - "version": "1.3.6", + "sha256": "06w6r1cmrahh9kr6rxc3nmy9q4m8fmf6afwgkvah3xixqnq04iwb", + "url": "https://github.com/nextcloud-releases/user_oidc/releases/download/v5.0.1/user_oidc-v5.0.1.tar.gz", + "version": "5.0.1", "description": "Allows flexible configuration of an OIDC server as Nextcloud login user backend.", "homepage": "https://github.com/nextcloud/user_oidc", "licenses": [ diff --git a/nixpkgs/pkgs/servers/nextcloud/packages/27.json b/nixpkgs/pkgs/servers/nextcloud/packages/27.json index 4e76a413fa1f..9d29448b9528 100644 --- a/nixpkgs/pkgs/servers/nextcloud/packages/27.json +++ b/nixpkgs/pkgs/servers/nextcloud/packages/27.json @@ -10,9 +10,9 @@ ] }, "calendar": { - "sha256": "06blkrgc9jq8zizgchn8az2cj0s3yy8s05kyhiwj1nb1rx32682j", - "url": "https://github.com/nextcloud-releases/calendar/releases/download/v4.6.4/calendar-v4.6.4.tar.gz", - "version": "4.6.4", + "sha256": "18mi6ccq640jq21hmir35v2967h07bjv226072d9qz5qkzkmrhss", + "url": "https://github.com/nextcloud-releases/calendar/releases/download/v4.6.5/calendar-v4.6.5.tar.gz", + "version": "4.6.5", "description": "The Calendar app is a user interface for Nextcloud's CalDAV server. Easily sync events from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Contacts - more to come.\n* 🌐 **WebCal Support!** Want to see your favorite team’s matchdays in your calendar? No problem!\n* 🙋 **Attendees!** Invite people to your events\n* ⌚️ **Free/Busy!** See when your attendees are available to meet\n* ⏰ **Reminders!** Get alarms for events inside your browser and via email\n* 🔍 Search! Find your events at ease\n* ☑️ Tasks! See tasks with a due date directly in the calendar\n* 🙈 **We’re not reinventing the wheel!** Based on the great [c-dav library](https://github.com/nextcloud/cdav-library), [ical.js](https://github.com/mozilla-comm/ical.js) and [fullcalendar](https://github.com/fullcalendar/fullcalendar) libraries.", "homepage": "https://github.com/nextcloud/calendar/", "licenses": [ @@ -20,9 +20,9 @@ ] }, "contacts": { - "sha256": "1wq6xj9r1f2raqhpj222269y8dkn5zx9mnw7zrbxwpz8c67s3h6n", - "url": "https://github.com/nextcloud-releases/contacts/releases/download/v5.5.1/contacts-v5.5.1.tar.gz", - "version": "5.5.1", + "sha256": "0g6pbzm7bxllpkf9jqkrb3ys8xvbmayxc3rqwspalzckayjbz98m", + "url": "https://github.com/nextcloud-releases/contacts/releases/download/v5.5.2/contacts-v5.5.2.tar.gz", + "version": "5.5.2", "description": "The Nextcloud contacts app is a user interface for Nextcloud's CardDAV server. Easily sync contacts from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Mail and Calendar – more to come.\n* 🎉 **Never forget a birthday!** You can sync birthdays and other recurring events with your Nextcloud Calendar.\n* 👥 **Sharing of Adressbooks!** You want to share your contacts with your friends or coworkers? No problem!\n* 🙈 **We’re not reinventing the wheel!** Based on the great and open SabreDAV library.", "homepage": "https://github.com/nextcloud/contacts#readme", "licenses": [ @@ -50,9 +50,9 @@ ] }, "deck": { - "sha256": "1bl7x3h91rcjd3xx8lq2rkx8khpw5f3n0kqi8mrs88hw0hin8sdi", - "url": "https://github.com/nextcloud-releases/deck/releases/download/v1.11.3/deck-v1.11.3.tar.gz", - "version": "1.11.3", + "sha256": "0h5dspj6cvhc5q69xqxp6y36c6h659nf7zk9zrhksc2fjvvdmzwz", + "url": "https://github.com/nextcloud-releases/deck/releases/download/v1.11.4/deck-v1.11.4.tar.gz", + "version": "1.11.4", "description": "Deck is a kanban style organization tool aimed at personal planning and project organization for teams integrated with Nextcloud.\n\n\n- 📥 Add your tasks to cards and put them in order\n- 📄 Write down additional notes in Markdown\n- 🔖 Assign labels for even better organization\n- 👥 Share with your team, friends or family\n- 📎 Attach files and embed them in your Markdown description\n- 💬 Discuss with your team using comments\n- ⚡ Keep track of changes in the activity stream\n- 🚀 Get your project organized", "homepage": "https://github.com/nextcloud/deck", "licenses": [ @@ -90,9 +90,9 @@ ] }, "forms": { - "sha256": "143paalwm44vd9sa9ql30q986bm9z8kr39ky5hvcfai52w1ysrjq", - "url": "https://github.com/nextcloud-releases/forms/releases/download/v3.4.5/forms-v3.4.5.tar.gz", - "version": "3.4.5", + "sha256": "1nwsbl3lh0s4if4665b1z7nf7r62chazfb5g3fdrlffrrrqbdj4y", + "url": "https://github.com/nextcloud-releases/forms/releases/download/v3.4.6/forms-v3.4.6.tar.gz", + "version": "3.4.6", "description": "**Simple surveys and questionnaires, self-hosted!**\n\n- **📝 Simple design:** No mass of options, only the essentials. Works well on mobile of course.\n- **📊 View & export results:** Results are visualized and can also be exported as CSV in the same format used by Google Forms.\n- **🔒 Data under your control!** Unlike in Google Forms, Typeform, Doodle and others, the survey info and responses are kept private on your instance.\n- **🧑💻 Connect to your software:** Easily integrate Forms into your service with our full-fledged [REST-API](https://github.com/nextcloud/forms/blob/main/docs/API.md).\n- **🙋 Get involved!** We have lots of stuff planned like more question types, collaboration on forms, [and much more](https://github.com/nextcloud/forms/milestones)!", "homepage": "https://github.com/nextcloud/forms", "licenses": [ @@ -110,9 +110,9 @@ ] }, "groupfolders": { - "sha256": "1sihhcai7i7gnkl0adq1injlsvk5ainvy71a2373iqmpmi167pyf", - "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v15.3.4/groupfolders-v15.3.4.tar.gz", - "version": "15.3.4", + "sha256": "0p3g19cmfjn1zql6cr3bv0cvfj078vh6ian024iwvc6ir8fmsni0", + "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v15.3.5/groupfolders-v15.3.5.tar.gz", + "version": "15.3.5", "description": "Admin configured folders shared with everyone in a group.\n\nFolders can be configured from *Group folders* in the admin settings.\n\nAfter a folder is created, the admin can give access to the folder to one or more groups, control their write/sharing permissions and assign a quota for the folder.\n\nNote: Encrypting the contents of group folders is currently not supported.", "homepage": "https://github.com/nextcloud/groupfolders", "licenses": [ @@ -140,9 +140,9 @@ ] }, "mail": { - "sha256": "15268xavb4wpkc12anz6wiry87hvy55nf141lc660wr22iivy79r", - "url": "https://github.com/nextcloud-releases/mail/releases/download/v3.5.5/mail-v3.5.5.tar.gz", - "version": "3.5.5", + "sha256": "122qyz6d9771ivpl771g5wi3lxsd2g3v64n9cp5clm8p662msjfi", + "url": "https://github.com/nextcloud-releases/mail/releases/download/v3.5.7/mail-v3.5.7.tar.gz", + "version": "3.5.7", "description": "**💌 A mail app for Nextcloud**\n\n- **🚀 Integration with other Nextcloud apps!** Currently Contacts, Calendar & Files – more to come.\n- **📥 Multiple mail accounts!** Personal and company account? No problem, and a nice unified inbox. Connect any IMAP account.\n- **🔒 Send & receive encrypted mails!** Using the great [Mailvelope](https://mailvelope.com) browser extension.\n- **🙈 We’re not reinventing the wheel!** Based on the great [Horde](https://horde.org) libraries.\n- **📬 Want to host your own mail server?** We do not have to reimplement this as you could set up [Mail-in-a-Box](https://mailinabox.email)!\n\n## Ethical AI Rating\n\n### Priority Inbox\n\nPositive:\n* The software for training and inferencing of this model is open source.\n* The model is created and trained on-premises based on the user's own data.\n* The training data is accessible to the user, making it possible to check or correct for bias or optimise the performance and CO2 usage.\n\n### Thread Summaries (opt-in)\n\n**Rating:** 🟢/🟡/🟠/🔴\n\nThe rating depends on the installed text processing backend. See [the rating overview](https://docs.nextcloud.com/server/latest/admin_manual/ai/index.html) for details.\n\nLearn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud.com/blog/nextcloud-ethical-ai-rating/).", "homepage": "https://github.com/nextcloud/mail#readme", "licenses": [ @@ -270,9 +270,9 @@ ] }, "spreed": { - "sha256": "0dpys4h9rn3sw46iiffghf3n10hda9jk7kz1vxy4jna1zczarw6j", - "url": "https://github.com/nextcloud-releases/spreed/releases/download/v17.1.5/spreed-v17.1.5.tar.gz", - "version": "17.1.5", + "sha256": "0vlmgiwjqk8bjvjkamca4b97lqs5wj1c4xsdz87gd1zjz3ja4332", + "url": "https://github.com/nextcloud-releases/spreed/releases/download/v17.1.6/spreed-v17.1.6.tar.gz", + "version": "17.1.6", "description": "Chat, video & audio-conferencing using WebRTC\n\n* 💬 **Chat integration!** Nextcloud Talk comes with a simple text chat. Allowing you to share files from your Nextcloud and mentioning other participants.\n* 👥 **Private, group, public and password protected calls!** Just invite somebody, a whole group or send a public link to invite to a call.\n* 💻 **Screen sharing!** Share your screen with participants of your call. You just need to use Firefox version 66 (or newer), latest Edge or Chrome 72 (or newer, also possible using Chrome 49 with this [Chrome extension](https://chrome.google.com/webstore/detail/screensharing-for-nextclo/kepnpjhambipllfmgmbapncekcmabkol)).\n* 🚀 **Integration with other Nextcloud apps** like Files, Contacts and Deck. More to come.\n\nAnd in the works for the [coming versions](https://github.com/nextcloud/spreed/milestones/):\n* ✋ [Federated calls](https://github.com/nextcloud/spreed/issues/21), to call people on other Nextclouds", "homepage": "https://github.com/nextcloud/spreed", "licenses": [ @@ -320,9 +320,9 @@ ] }, "user_oidc": { - "sha256": "0iyd1lkzfl7nh2sy5k9a6p86mswm5p0cyqj3ia613sw2fm49sl1b", - "url": "https://github.com/nextcloud-releases/user_oidc/releases/download/v1.3.6/user_oidc-v1.3.6.tar.gz", - "version": "1.3.6", + "sha256": "06w6r1cmrahh9kr6rxc3nmy9q4m8fmf6afwgkvah3xixqnq04iwb", + "url": "https://github.com/nextcloud-releases/user_oidc/releases/download/v5.0.1/user_oidc-v5.0.1.tar.gz", + "version": "5.0.1", "description": "Allows flexible configuration of an OIDC server as Nextcloud login user backend.", "homepage": "https://github.com/nextcloud/user_oidc", "licenses": [ diff --git a/nixpkgs/pkgs/servers/nextcloud/packages/28.json b/nixpkgs/pkgs/servers/nextcloud/packages/28.json index d7d5a780f919..3fba36b2d64c 100644 --- a/nixpkgs/pkgs/servers/nextcloud/packages/28.json +++ b/nixpkgs/pkgs/servers/nextcloud/packages/28.json @@ -10,9 +10,9 @@ ] }, "calendar": { - "sha256": "06blkrgc9jq8zizgchn8az2cj0s3yy8s05kyhiwj1nb1rx32682j", - "url": "https://github.com/nextcloud-releases/calendar/releases/download/v4.6.4/calendar-v4.6.4.tar.gz", - "version": "4.6.4", + "sha256": "18mi6ccq640jq21hmir35v2967h07bjv226072d9qz5qkzkmrhss", + "url": "https://github.com/nextcloud-releases/calendar/releases/download/v4.6.5/calendar-v4.6.5.tar.gz", + "version": "4.6.5", "description": "The Calendar app is a user interface for Nextcloud's CalDAV server. Easily sync events from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Contacts - more to come.\n* 🌐 **WebCal Support!** Want to see your favorite team’s matchdays in your calendar? No problem!\n* 🙋 **Attendees!** Invite people to your events\n* ⌚️ **Free/Busy!** See when your attendees are available to meet\n* ⏰ **Reminders!** Get alarms for events inside your browser and via email\n* 🔍 Search! Find your events at ease\n* ☑️ Tasks! See tasks with a due date directly in the calendar\n* 🙈 **We’re not reinventing the wheel!** Based on the great [c-dav library](https://github.com/nextcloud/cdav-library), [ical.js](https://github.com/mozilla-comm/ical.js) and [fullcalendar](https://github.com/fullcalendar/fullcalendar) libraries.", "homepage": "https://github.com/nextcloud/calendar/", "licenses": [ @@ -20,9 +20,9 @@ ] }, "contacts": { - "sha256": "1wq6xj9r1f2raqhpj222269y8dkn5zx9mnw7zrbxwpz8c67s3h6n", - "url": "https://github.com/nextcloud-releases/contacts/releases/download/v5.5.1/contacts-v5.5.1.tar.gz", - "version": "5.5.1", + "sha256": "0g6pbzm7bxllpkf9jqkrb3ys8xvbmayxc3rqwspalzckayjbz98m", + "url": "https://github.com/nextcloud-releases/contacts/releases/download/v5.5.2/contacts-v5.5.2.tar.gz", + "version": "5.5.2", "description": "The Nextcloud contacts app is a user interface for Nextcloud's CardDAV server. Easily sync contacts from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Mail and Calendar – more to come.\n* 🎉 **Never forget a birthday!** You can sync birthdays and other recurring events with your Nextcloud Calendar.\n* 👥 **Sharing of Adressbooks!** You want to share your contacts with your friends or coworkers? No problem!\n* 🙈 **We’re not reinventing the wheel!** Based on the great and open SabreDAV library.", "homepage": "https://github.com/nextcloud/contacts#readme", "licenses": [ @@ -50,9 +50,9 @@ ] }, "deck": { - "sha256": "08yxwrf5dx8fh70hcpr54ca5h6f2p2ck2hmjnxz5jymd6pnadsr6", - "url": "https://github.com/nextcloud-releases/deck/releases/download/v1.12.1/deck-v1.12.1.tar.gz", - "version": "1.12.1", + "sha256": "0s8zhmqj3h4ajiwvki5bdxrbzckq9l8pr04hz6vs7jx3hpanj22g", + "url": "https://github.com/nextcloud-releases/deck/releases/download/v1.12.2/deck-v1.12.2.tar.gz", + "version": "1.12.2", "description": "Deck is a kanban style organization tool aimed at personal planning and project organization for teams integrated with Nextcloud.\n\n\n- 📥 Add your tasks to cards and put them in order\n- 📄 Write down additional notes in Markdown\n- 🔖 Assign labels for even better organization\n- 👥 Share with your team, friends or family\n- 📎 Attach files and embed them in your Markdown description\n- 💬 Discuss with your team using comments\n- ⚡ Keep track of changes in the activity stream\n- 🚀 Get your project organized", "homepage": "https://github.com/nextcloud/deck", "licenses": [ @@ -70,9 +70,9 @@ ] }, "forms": { - "sha256": "1j0jmwvy6cqiqc20w66na5wzdf0ri60v4fc6cd90fxq9p93m41wi", - "url": "https://github.com/nextcloud-releases/forms/releases/download/v4.1.0/forms-v4.1.0.tar.gz", - "version": "4.1.0", + "sha256": "0iqkwnadhi6i1gnx7wiqny862g25kfiqi2mgkaf5cyiig3rispa0", + "url": "https://github.com/nextcloud-releases/forms/releases/download/v4.1.1/forms-v4.1.1.tar.gz", + "version": "4.1.1", "description": "**Simple surveys and questionnaires, self-hosted!**\n\n- **📝 Simple design:** No mass of options, only the essentials. Works well on mobile of course.\n- **📊 View & export results:** Results are visualized and can also be exported as CSV in the same format used by Google Forms.\n- **🔒 Data under your control!** Unlike in Google Forms, Typeform, Doodle and others, the survey info and responses are kept private on your instance.\n- **🧑💻 Connect to your software:** Easily integrate Forms into your service with our full-fledged [REST-API](https://github.com/nextcloud/forms/blob/main/docs/API.md).\n- **🙋 Get involved!** We have lots of stuff planned like more question types, collaboration on forms, [and much more](https://github.com/nextcloud/forms/milestones)!", "homepage": "https://github.com/nextcloud/forms", "licenses": [ @@ -90,9 +90,9 @@ ] }, "groupfolders": { - "sha256": "17v57z7fsbp2m3918x78zrm3ywnbm7vsrcb48x44v5pakdhca3gy", - "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v16.0.3/groupfolders-v16.0.3.tar.gz", - "version": "16.0.3", + "sha256": "00237wdfn7yj31mjpv6crnk0lrazy9iljfcpxjhy4g91d8sc3f5d", + "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v16.0.4/groupfolders-v16.0.4.tar.gz", + "version": "16.0.4", "description": "Admin configured folders shared with everyone in a group.\n\nFolders can be configured from *Group folders* in the admin settings.\n\nAfter a folder is created, the admin can give access to the folder to one or more groups, control their write/sharing permissions and assign a quota for the folder.\n\nNote: Encrypting the contents of group folders is currently not supported.", "homepage": "https://github.com/nextcloud/groupfolders", "licenses": [ @@ -120,9 +120,9 @@ ] }, "mail": { - "sha256": "15268xavb4wpkc12anz6wiry87hvy55nf141lc660wr22iivy79r", - "url": "https://github.com/nextcloud-releases/mail/releases/download/v3.5.5/mail-v3.5.5.tar.gz", - "version": "3.5.5", + "sha256": "122qyz6d9771ivpl771g5wi3lxsd2g3v64n9cp5clm8p662msjfi", + "url": "https://github.com/nextcloud-releases/mail/releases/download/v3.5.7/mail-v3.5.7.tar.gz", + "version": "3.5.7", "description": "**💌 A mail app for Nextcloud**\n\n- **🚀 Integration with other Nextcloud apps!** Currently Contacts, Calendar & Files – more to come.\n- **📥 Multiple mail accounts!** Personal and company account? No problem, and a nice unified inbox. Connect any IMAP account.\n- **🔒 Send & receive encrypted mails!** Using the great [Mailvelope](https://mailvelope.com) browser extension.\n- **🙈 We’re not reinventing the wheel!** Based on the great [Horde](https://horde.org) libraries.\n- **📬 Want to host your own mail server?** We do not have to reimplement this as you could set up [Mail-in-a-Box](https://mailinabox.email)!\n\n## Ethical AI Rating\n\n### Priority Inbox\n\nPositive:\n* The software for training and inferencing of this model is open source.\n* The model is created and trained on-premises based on the user's own data.\n* The training data is accessible to the user, making it possible to check or correct for bias or optimise the performance and CO2 usage.\n\n### Thread Summaries (opt-in)\n\n**Rating:** 🟢/🟡/🟠/🔴\n\nThe rating depends on the installed text processing backend. See [the rating overview](https://docs.nextcloud.com/server/latest/admin_manual/ai/index.html) for details.\n\nLearn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud.com/blog/nextcloud-ethical-ai-rating/).", "homepage": "https://github.com/nextcloud/mail#readme", "licenses": [ @@ -200,9 +200,9 @@ ] }, "polls": { - "sha256": "1jsxgnn6vvbn1v0x8k2zf95pdqlrg6pxrvn32sms8sfzgq3lbn7m", - "url": "https://github.com/nextcloud/polls/releases/download/v6.0.1/polls.tar.gz", - "version": "6.0.1", + "sha256": "1a5fyx1wvgwm2mjqmg5kah3x2y77zw8ly1zvcx6m4x50s113rkbi", + "url": "https://github.com/nextcloud/polls/releases/download/v6.1.6/polls.tar.gz", + "version": "6.1.6", "description": "A polls app, similar to Doodle/Dudle with the possibility to restrict access (members, certain groups/users, hidden and public).", "homepage": "https://github.com/nextcloud/polls", "licenses": [ @@ -240,9 +240,9 @@ ] }, "spreed": { - "sha256": "0nfjm8cjhgmkrr68gnnabma4z6v3rpc00c6yg22kq7shnk1cn6k1", - "url": "https://github.com/nextcloud-releases/spreed/releases/download/v18.0.3/spreed-v18.0.3.tar.gz", - "version": "18.0.3", + "sha256": "1kjlrjgclmz39a0zdjr6863cipv5i5fwaigasd2cfxx1r7zrd7sx", + "url": "https://github.com/nextcloud-releases/spreed/releases/download/v18.0.4/spreed-v18.0.4.tar.gz", + "version": "18.0.4", "description": "Chat, video & audio-conferencing using WebRTC\n\n* 💬 **Chat integration!** Nextcloud Talk comes with a simple text chat. Allowing you to share files from your Nextcloud and mentioning other participants.\n* 👥 **Private, group, public and password protected calls!** Just invite somebody, a whole group or send a public link to invite to a call.\n* 💻 **Screen sharing!** Share your screen with participants of your call. You just need to use Firefox version 66 (or newer), latest Edge or Chrome 72 (or newer, also possible using Chrome 49 with this [Chrome extension](https://chrome.google.com/webstore/detail/screensharing-for-nextclo/kepnpjhambipllfmgmbapncekcmabkol)).\n* 🚀 **Integration with other Nextcloud apps** like Files, Contacts and Deck. More to come.\n\nAnd in the works for the [coming versions](https://github.com/nextcloud/spreed/milestones/):\n* ✋ [Federated calls](https://github.com/nextcloud/spreed/issues/21), to call people on other Nextclouds", "homepage": "https://github.com/nextcloud/spreed", "licenses": [ @@ -280,9 +280,9 @@ ] }, "user_oidc": { - "sha256": "0iyd1lkzfl7nh2sy5k9a6p86mswm5p0cyqj3ia613sw2fm49sl1b", - "url": "https://github.com/nextcloud-releases/user_oidc/releases/download/v1.3.6/user_oidc-v1.3.6.tar.gz", - "version": "1.3.6", + "sha256": "06w6r1cmrahh9kr6rxc3nmy9q4m8fmf6afwgkvah3xixqnq04iwb", + "url": "https://github.com/nextcloud-releases/user_oidc/releases/download/v5.0.1/user_oidc-v5.0.1.tar.gz", + "version": "5.0.1", "description": "Allows flexible configuration of an OIDC server as Nextcloud login user backend.", "homepage": "https://github.com/nextcloud/user_oidc", "licenses": [ diff --git a/nixpkgs/pkgs/servers/nosql/aerospike/default.nix b/nixpkgs/pkgs/servers/nosql/aerospike/default.nix index 301cb7de1aac..dc2ed8c79ec1 100644 --- a/nixpkgs/pkgs/servers/nosql/aerospike/default.nix +++ b/nixpkgs/pkgs/servers/nosql/aerospike/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "aerospike-server"; - version = "7.0.0.3"; + version = "7.0.0.4"; src = fetchFromGitHub { owner = "aerospike"; repo = "aerospike-server"; rev = version; - hash = "sha256-qyVfoOnWIUY1np58HtpVrKNsgiXlvdgffyMGjk+G5qI="; + hash = "sha256-CyDGJ0fM9mDNOG1CV/noaSDIh8x/duM3NhgLTnANNKA="; fetchSubmodules = true; }; diff --git a/nixpkgs/pkgs/servers/nosql/victoriametrics/default.nix b/nixpkgs/pkgs/servers/nosql/victoriametrics/default.nix deleted file mode 100644 index f694aeef565d..000000000000 --- a/nixpkgs/pkgs/servers/nosql/victoriametrics/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub, nixosTests }: - -buildGoModule rec { - pname = "VictoriaMetrics"; - version = "1.97.1"; - - src = fetchFromGitHub { - owner = pname; - repo = pname; - rev = "v${version}"; - hash = "sha256-zaRXvktHqsM/pZd7DsCAXCSI2jaPZ3iKHLQqDILZ9pc="; - }; - - vendorHash = null; - - postPatch = '' - # main module (github.com/VictoriaMetrics/VictoriaMetrics) does not contain package - # github.com/VictoriaMetrics/VictoriaMetrics/app/vmui/packages/vmui/web - # - # This appears to be some kind of test server for development purposes only. - rm -f app/vmui/packages/vmui/web/{go.mod,main.go} - - # Increase timeouts in tests to prevent failure on heavily loaded builders - substituteInPlace lib/storage/storage_test.go \ - --replace "time.After(10 " "time.After(120 " \ - --replace "time.NewTimer(30 " "time.NewTimer(120 " \ - --replace "time.NewTimer(time.Second * 10)" "time.NewTimer(time.Second * 120)" \ - ''; - - ldflags = [ "-s" "-w" "-X github.com/VictoriaMetrics/VictoriaMetrics/lib/buildinfo.Version=${version}" ]; - - preCheck = '' - # `lib/querytracer/tracer_test.go` expects `buildinfo.Version` to be unset - export ldflags=''${ldflags//=${version}/=} - ''; - - __darwinAllowLocalNetworking = true; - - passthru.tests = { inherit (nixosTests) victoriametrics; }; - - meta = with lib; { - homepage = "https://victoriametrics.com/"; - description = "fast, cost-effective and scalable time series database, long-term remote storage for Prometheus"; - license = licenses.asl20; - maintainers = with maintainers; [ yorickvp ivan ]; - changelog = "https://github.com/VictoriaMetrics/VictoriaMetrics/releases/tag/v${version}"; - mainProgram = "victoria-metrics"; - }; -} diff --git a/nixpkgs/pkgs/servers/oauth2-proxy/default.nix b/nixpkgs/pkgs/servers/oauth2-proxy/default.nix index 152b3a31d85e..6b4baa8f11df 100644 --- a/nixpkgs/pkgs/servers/oauth2-proxy/default.nix +++ b/nixpkgs/pkgs/servers/oauth2-proxy/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "oauth2-proxy"; - version = "7.5.1"; + version = "7.6.0"; src = fetchFromGitHub { repo = pname; owner = "oauth2-proxy"; - sha256 = "sha256-zIw30pFf/IxruG3MYwrrLhANBPemLsYdYnPRO+EWNs0="; + sha256 = "sha256-7DmeXl/aDVFdwUiuljM79CttgjzdTVsSeAYrETuJG0M="; rev = "v${version}"; }; - vendorHash = "sha256-Z2yPfUkDb07db8T3/1v9onnNloaKEN5tdrMDNIy7QHo="; + vendorHash = "sha256-ihFNFtfiCGGyJqB2o4SMYleKdjGR4P5JewkynOsC1f0="; # Taken from https://github.com/oauth2-proxy/oauth2-proxy/blob/master/Makefile ldflags = [ "-X main.VERSION=${version}" ]; diff --git a/nixpkgs/pkgs/servers/owntracks-recorder/default.nix b/nixpkgs/pkgs/servers/owntracks-recorder/default.nix index 83ebe99c1129..c0c28fac254e 100644 --- a/nixpkgs/pkgs/servers/owntracks-recorder/default.nix +++ b/nixpkgs/pkgs/servers/owntracks-recorder/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "owntracks-recorder"; - version = "0.9.6"; + version = "0.9.7"; src = fetchFromGitHub { owner = "owntracks"; repo = "recorder"; rev = finalAttrs.version; - hash = "sha256-QpPZDh++WHIvIgml32UWtAe3tzh2x7lFUu2xdioNGW4="; + hash = "sha256-KDImoIUAkjCa4O++F9LdDN+i8VoC78g8644Rhbpy+mc="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/servers/photoprism/backend.nix b/nixpkgs/pkgs/servers/photoprism/backend.nix index f1f0bc4557ce..7403f4dc897f 100644 --- a/nixpkgs/pkgs/servers/photoprism/backend.nix +++ b/nixpkgs/pkgs/servers/photoprism/backend.nix @@ -19,7 +19,7 @@ buildGoModule rec { substituteInPlace internal/commands/passwd.go --replace '/bin/stty' "${coreutils}/bin/stty" ''; - vendorHash = "sha256-SJjq2O7efqzzsg8I7n7pVqzG+jK0SsPT4J4iDdsMY4c="; + vendorHash = "sha256-mt2L5vf57/MntjtfJVua799nF4CkRYI8payLoPc0oQA="; subPackages = [ "cmd/photoprism" ]; diff --git a/nixpkgs/pkgs/servers/photoprism/default.nix b/nixpkgs/pkgs/servers/photoprism/default.nix index 8ad37a8aa387..f2f7914394b8 100644 --- a/nixpkgs/pkgs/servers/photoprism/default.nix +++ b/nixpkgs/pkgs/servers/photoprism/default.nix @@ -1,14 +1,14 @@ { pkgs, lib, stdenv, fetchFromGitHub, fetchzip, darktable, rawtherapee, ffmpeg, libheif, exiftool, imagemagick, makeWrapper, testers }: let - version = "231011-63f708417"; + version = "231128-f48ff16ef"; pname = "photoprism"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - hash = "sha256-g/j+L++vb+wiE23d/lm6lga0MeaPrCotEojD9Sajkmg="; + hash = "sha256-gVxKa5JKGz5VSVCuJHat0DWCYaUH+9an6JsYUPe9muQ="; }; libtensorflow = pkgs.callPackage ./libtensorflow.nix { }; diff --git a/nixpkgs/pkgs/servers/photoprism/frontend.nix b/nixpkgs/pkgs/servers/photoprism/frontend.nix index 9793fa461ca5..782efb1d0d3d 100644 --- a/nixpkgs/pkgs/servers/photoprism/frontend.nix +++ b/nixpkgs/pkgs/servers/photoprism/frontend.nix @@ -8,7 +8,7 @@ buildNpmPackage { cd frontend ''; - npmDepsHash = "sha256-v7G06x/6MAFlOPbmkdh9Yt9/0BcMSYXI5EUmIHKiVFo="; + npmDepsHash = "sha256-4bAWSSy7kvG1ChzEb2iuxgWxnkjtJlr7Lm7USbgsmAw="; installPhase = '' runHook preInstall diff --git a/nixpkgs/pkgs/servers/piping-server-rust/default.nix b/nixpkgs/pkgs/servers/piping-server-rust/default.nix index f29cf359d4ee..f3cc1c5543c4 100644 --- a/nixpkgs/pkgs/servers/piping-server-rust/default.nix +++ b/nixpkgs/pkgs/servers/piping-server-rust/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "piping-server-rust"; - version = "0.16.0"; + version = "0.18.0"; src = fetchFromGitHub { owner = "nwtgck"; repo = pname; rev = "v${version}"; - sha256 = "sha256-cWBNO9V9DMbEhkjG8g/iswV04DeYh3tXv0+1hB/pf64="; + sha256 = "sha256-8kYaANVWmBOncTdhtjjbaYnEFQeuWjemdz/kTjwj2fw="; }; - cargoSha256 = "sha256-jZio6y2m14tVi3nTQqh+8W3hxft5PfAIWm2XpuyCKDU="; + cargoHash = "sha256-YSiClSnjgqFqT2IGJoatcy7j3NUKcff826AvJ/+RNNU="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices Security ]; diff --git a/nixpkgs/pkgs/servers/pocketbase/default.nix b/nixpkgs/pkgs/servers/pocketbase/default.nix index 1a77d0d6b820..9820fbab7dc2 100644 --- a/nixpkgs/pkgs/servers/pocketbase/default.nix +++ b/nixpkgs/pkgs/servers/pocketbase/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "pocketbase"; - version = "0.21.3"; + version = "0.22.2"; src = fetchFromGitHub { owner = "pocketbase"; repo = "pocketbase"; rev = "v${version}"; - hash = "sha256-M3wLx77Oidrwl0uzJE3NIFiA7GvN8X1xYRSnAFnINGM="; + hash = "sha256-y+8mBfMZI6FF8nzmlN0NaAP4Jbr69DYQnvle0TWt2kY="; }; - vendorHash = "sha256-u7VgZkv9Ajtra9ikeIxJRLZleH+rzs1g2SZO9zj/bes="; + vendorHash = "sha256-Q3DlOKaE3fUlRMSfi8Ta9ZyyOE+viiONVUO8x4JACDg="; # This is the released subpackage from upstream repo subPackages = [ "examples/base" ]; diff --git a/nixpkgs/pkgs/servers/pulseaudio/0001-Make-gio-2.0-optional-16.patch b/nixpkgs/pkgs/servers/pulseaudio/0001-Make-gio-2.0-optional-16.patch deleted file mode 100644 index 2a5ae040d9d4..000000000000 --- a/nixpkgs/pkgs/servers/pulseaudio/0001-Make-gio-2.0-optional-16.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 72f3fe059f031f24c5ad026cb2fc16318f227c09 Mon Sep 17 00:00:00 2001 -From: Andrew Childs <andrew.childs@bibo.com.ph> -Date: Tue, 19 Apr 2022 16:29:58 +0900 -Subject: [PATCH 1/8] Make gio-2.0 optional when gsettings is disabled - -Derived from https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/654 ---- - meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index c5135330f..340f58e17 100644 ---- a/meson.build -+++ b/meson.build -@@ -683,7 +683,7 @@ if get_option('daemon') - cdata.set('HAVE_ALSA_UCM', 1) - endif - -- gio_dep = dependency('gio-2.0', version : '>= 2.26.0') -+ gio_dep = dependency('gio-2.0', version : '>= 2.26.0', required : false) - if get_option('gsettings').enabled() - assert(gio_dep.found(), 'GSettings support needs glib I/O library (GIO)') - cdata.set('HAVE_GSETTINGS', 1) --- -2.35.1 - diff --git a/nixpkgs/pkgs/servers/pulseaudio/0002-Ignore-SCM_CREDS-on-darwin.patch b/nixpkgs/pkgs/servers/pulseaudio/0002-Ignore-SCM_CREDS-on-darwin.patch deleted file mode 100644 index 9196e205dc0c..000000000000 --- a/nixpkgs/pkgs/servers/pulseaudio/0002-Ignore-SCM_CREDS-on-darwin.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 39bef695f783614e6175477417298ddf37e2ac13 Mon Sep 17 00:00:00 2001 -From: Andrew Childs <andrew.childs@bibo.com.ph> -Date: Tue, 19 Apr 2022 16:58:43 +0900 -Subject: [PATCH 2/8] Ignore SCM_CREDS on macOS - -It was added for FreeBSD support, but also enables the -unsupported[citation needed] feature on macOS. ---- - src/pulsecore/creds.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/pulsecore/creds.h b/src/pulsecore/creds.h -index b599b569c..b5b1c9f37 100644 ---- a/src/pulsecore/creds.h -+++ b/src/pulsecore/creds.h -@@ -34,7 +34,7 @@ - typedef struct pa_creds pa_creds; - typedef struct pa_cmsg_ancil_data pa_cmsg_ancil_data; - --#if defined(SCM_CREDENTIALS) || defined(SCM_CREDS) -+#if defined(SCM_CREDENTIALS) || (defined(SCM_CREDS) && !defined(__APPLE__)) - - #define HAVE_CREDS 1 - --- -2.35.1 - diff --git a/nixpkgs/pkgs/servers/pulseaudio/0003-Ignore-HAVE_CPUID_H-on-aarch64-darwin.patch b/nixpkgs/pkgs/servers/pulseaudio/0003-Ignore-HAVE_CPUID_H-on-aarch64-darwin.patch deleted file mode 100644 index ce0df74f8771..000000000000 --- a/nixpkgs/pkgs/servers/pulseaudio/0003-Ignore-HAVE_CPUID_H-on-aarch64-darwin.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/src/pulsecore/core-util.c b/src/pulsecore/core-util.c -index c383a61c0..3d0a68c2e 100644 ---- a/src/pulsecore/core-util.c -+++ b/src/pulsecore/core-util.c -@@ -110,7 +110,7 @@ - #include <sys/personality.h> - #endif - --#ifdef HAVE_CPUID_H -+#if defined(HAVE_CPUID_H) && !(defined(__APPLE__) && defined(__aarch64__)) - #include <cpuid.h> - #endif - -diff --git a/src/pulsecore/cpu-x86.c b/src/pulsecore/cpu-x86.c -index 317a0101e..d1eb95d2b 100644 ---- a/src/pulsecore/cpu-x86.c -+++ b/src/pulsecore/cpu-x86.c -@@ -24,7 +24,7 @@ - - #include <stdint.h> - --#ifdef HAVE_CPUID_H -+#if defined(HAVE_CPUID_H) && !(defined(__APPLE__) && defined(__aarch64__)) - #include <cpuid.h> - #endif - diff --git a/nixpkgs/pkgs/servers/pulseaudio/0004-Prefer-HAVE_CLOCK_GETTIME-on-darwin.patch b/nixpkgs/pkgs/servers/pulseaudio/0004-Prefer-HAVE_CLOCK_GETTIME-on-darwin.patch deleted file mode 100644 index 0eeaf2a03a12..000000000000 --- a/nixpkgs/pkgs/servers/pulseaudio/0004-Prefer-HAVE_CLOCK_GETTIME-on-darwin.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/pulsecore/core-rtclock.c b/src/pulsecore/core-rtclock.c -index 2c2e28631..b946a3fb1 100644 ---- a/src/pulsecore/core-rtclock.c -+++ b/src/pulsecore/core-rtclock.c -@@ -65,7 +65,7 @@ pa_usec_t pa_rtclock_age(const struct timeval *tv) { - - struct timeval *pa_rtclock_get(struct timeval *tv) { - --#if defined(OS_IS_DARWIN) -+#if defined(OS_IS_DARWIN) && !defined(HAVE_CLOCK_GETTIME) - uint64_t val, abs_time = mach_absolute_time(); - Nanoseconds nanos; - diff --git a/nixpkgs/pkgs/servers/pulseaudio/0005-Enable-CoreAudio-on-darwin.patch b/nixpkgs/pkgs/servers/pulseaudio/0005-Enable-CoreAudio-on-darwin.patch deleted file mode 100644 index bdf5ff2b9ca3..000000000000 --- a/nixpkgs/pkgs/servers/pulseaudio/0005-Enable-CoreAudio-on-darwin.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/meson.build b/meson.build -index c5135330f..055567479 100644 ---- a/meson.build -+++ b/meson.build -@@ -185,6 +185,7 @@ endif - # rather than ending up in the config.h file? - if host_machine.system() == 'darwin' - cdata.set('OS_IS_DARWIN', 1) -+ cdata.set('HAVE_COREAUDIO', 1) - cdata.set('_DARWIN_C_SOURCE', '200112L') # Needed to get NSIG on Mac OS - elif host_machine.system() == 'windows' - cdata.set('OS_IS_WIN32', 1) -diff --git a/src/modules/meson.build b/src/modules/meson.build -index 1e12569dc..53a800927 100644 ---- a/src/modules/meson.build -+++ b/src/modules/meson.build -@@ -63,6 +63,14 @@ all_modules = [ - [ 'module-volume-restore', 'module-volume-restore.c' ], - ] - -+if host_machine.system() == 'darwin' -+ coreaudio_dep = dependency('appleframeworks', modules : ['AudioUnit', 'Cocoa', 'CoreServices', 'CoreAudio']) -+ all_modules += [ -+ [ 'module-coreaudio-detect', 'macosx/module-coreaudio-detect.c', [], [], [coreaudio_dep] ], -+ [ 'module-coreaudio-device', 'macosx/module-coreaudio-device.c', [], [], [coreaudio_dep] ], -+ ] -+endif -+ - if host_machine.system() == 'windows' - winmm_dep = meson.get_compiler('c').find_library('winmm') - ksuser_dep = meson.get_compiler('c').find_library('ksuser') diff --git a/nixpkgs/pkgs/servers/pulseaudio/0006-Fix-libpulsecommon-sources-on-darwin.patch b/nixpkgs/pkgs/servers/pulseaudio/0006-Fix-libpulsecommon-sources-on-darwin.patch deleted file mode 100644 index 67a21af46795..000000000000 --- a/nixpkgs/pkgs/servers/pulseaudio/0006-Fix-libpulsecommon-sources-on-darwin.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/src/meson.build b/src/meson.build -index 9efb561d8..d181f4867 100644 ---- a/src/meson.build -+++ b/src/meson.build -@@ -179,6 +179,13 @@ if host_machine.system() == 'windows' - 'pulsecore/semaphore-win32.c', - 'pulsecore/thread-win32.c', - ] -+elif host_machine.system() == 'darwin' -+ libpulsecommon_sources += [ -+ 'pulsecore/mutex-posix.c', -+ 'pulsecore/poll-posix.c', -+ 'pulsecore/semaphore-osx.c', -+ 'pulsecore/thread-posix.c' -+ ] - else - libpulsecommon_sources += [ - 'pulsecore/mutex-posix.c', diff --git a/nixpkgs/pkgs/servers/pulseaudio/0007-Fix-link-args-on-darwin.patch b/nixpkgs/pkgs/servers/pulseaudio/0007-Fix-link-args-on-darwin.patch deleted file mode 100644 index 30a11adca085..000000000000 --- a/nixpkgs/pkgs/servers/pulseaudio/0007-Fix-link-args-on-darwin.patch +++ /dev/null @@ -1,75 +0,0 @@ -diff --git a/meson.build b/meson.build -index c5135330f..1b66a1fc4 100644 ---- a/meson.build -+++ b/meson.build -@@ -424,7 +424,7 @@ cdata.set('MESON_BUILD', 1) - # so we request the nodelete flag to be enabled. - # On other systems, we don't really know how to do that, but it's welcome if somebody can tell. - # Windows doesn't support this flag. --if host_machine.system() != 'windows' -+if host_machine.system() not in ['windows', 'darwin'] - nodelete_link_args = ['-Wl,-z,nodelete'] - else - nodelete_link_args = [] -diff --git a/src/modules/echo-cancel/meson.build b/src/modules/echo-cancel/meson.build -index 641cd35e7..523bffac4 100644 ---- a/src/modules/echo-cancel/meson.build -+++ b/src/modules/echo-cancel/meson.build -@@ -10,12 +10,17 @@ libwebrtc_util_sources = [ - 'webrtc.cc' - ] - -+ignore_unresolved_symbols_link_args = ['-Wl,--unresolved-symbols=ignore-in-object-files'] -+if meson.get_compiler('c').get_linker_id() == 'ld64' -+ ignore_unresolved_symbols_link_args = [ '-Wl,-undefined,dynamic_lookup' ] -+endif -+ - libwebrtc_util = shared_library('webrtc-util', - libwebrtc_util_sources, - cpp_args : [pa_c_args, server_c_args], - include_directories : [configinc, topinc], - dependencies : [libpulse_dep, libpulsecommon_dep, libpulsecore_dep, libatomic_ops_dep, webrtc_dep, libintl_dep], -- link_args : [nodelete_link_args, '-Wl,--unresolved-symbols=ignore-in-object-files'], -+ link_args : [nodelete_link_args, ignore_unresolved_symbols_link_args], - install : true, - install_rpath : privlibdir, - install_dir : modlibexecdir, -diff --git a/src/modules/meson.build b/src/modules/meson.build -index 1e12569dc..66f3e46a4 100644 ---- a/src/modules/meson.build -+++ b/src/modules/meson.build -@@ -298,6 +298,11 @@ all_modules += [ - # FIXME: meson doesn't support multiple RPATH arguments currently - rpath_dirs = join_paths(privlibdir) + ':' + join_paths(modlibexecdir) - -+no_undefined_link_args = ['-Wl,--no-undefined'] -+if meson.get_compiler('c').get_linker_id() == 'ld64' -+ no_undefined_link_args = [ '-Wl,-undefined,error' ] -+endif -+ - foreach m : all_modules - name = m[0] - sources = m[1] -@@ -315,7 +320,7 @@ foreach m : all_modules - install_rpath : rpath_dirs, - install_dir : modlibexecdir, - dependencies : [thread_dep, libpulse_dep, libpulsecommon_dep, libpulsecore_dep, libintl_dep, platform_dep, platform_socket_dep] + extra_deps, -- link_args : [nodelete_link_args, '-Wl,--no-undefined' ], -+ link_args : [nodelete_link_args, no_undefined_link_args ], - link_with : extra_libs, - name_prefix : '', - implicit_include_directories : false) -diff --git a/src/pulse/meson.build b/src/pulse/meson.build -index 1b82c807c..938e4addd 100644 ---- a/src/pulse/meson.build -+++ b/src/pulse/meson.build -@@ -75,6 +75,9 @@ run_target('update-map-file', - [ libpulse_headers, 'simple.h', join_paths(meson.build_root(), 'src', 'pulse', 'version.h') ] ]) - - versioning_link_args = '-Wl,-version-script=' + join_paths(meson.source_root(), 'src', 'pulse', 'map-file') -+if meson.get_compiler('c').get_linker_id() == 'ld64' -+ versioning_link_args = [] -+endif - - libpulse = shared_library('pulse', - libpulse_sources, diff --git a/nixpkgs/pkgs/servers/pulseaudio/add-option-for-installation-sysconfdir.patch b/nixpkgs/pkgs/servers/pulseaudio/add-option-for-installation-sysconfdir.patch index bb56eb13e88a..920c2593d285 100644 --- a/nixpkgs/pkgs/servers/pulseaudio/add-option-for-installation-sysconfdir.patch +++ b/nixpkgs/pkgs/servers/pulseaudio/add-option-for-installation-sysconfdir.patch @@ -74,7 +74,7 @@ ) system_conf = configuration_data() -@@ -136,12 +136,12 @@ custom_target('system.pa', +@@ -136,6 +136,6 @@ custom_target('system.pa', command : [m4, '@INPUT@'], build_by_default : true, install : true, @@ -82,13 +82,6 @@ + install_dir : pulsesysconfdir_install, ) - if dbus_dep.found() - install_data('pulseaudio-system.conf', -- install_dir : join_paths(sysconfdir, 'dbus-1', 'system.d') -+ install_dir : join_paths(sysconfdir_install, 'dbus-1', 'system.d') - ) - endif - --- a/src/pulse/meson.build +++ b/src/pulse/meson.build @@ -134,5 +134,5 @@ client_conf_file = configure_file( diff --git a/nixpkgs/pkgs/servers/pulseaudio/default.nix b/nixpkgs/pkgs/servers/pulseaudio/default.nix index 6b62f066211d..5f078d2f6fcf 100644 --- a/nixpkgs/pkgs/servers/pulseaudio/default.nix +++ b/nixpkgs/pkgs/servers/pulseaudio/default.nix @@ -3,7 +3,7 @@ , xorg, libcap, alsa-lib, glib, dconf , avahi, libjack2, libasyncns, lirc, dbus , sbc, bluez5, udev, openssl, fftwFloat -, soxr, speexdsp, systemd, webrtc-audio-processing +, soxr, speexdsp, systemd, webrtc-audio-processing_1 , gst_all_1 , check, libintl, meson, ninja, m4, wrapGAppsHook @@ -37,26 +37,17 @@ stdenv.mkDerivation rec { pname = "${lib.optionalString libOnly "lib"}pulseaudio"; - version = "16.1"; + version = "17.0"; src = fetchurl { url = "http://freedesktop.org/software/pulseaudio/releases/pulseaudio-${version}.tar.xz"; - sha256 = "sha256-ju8yzpHUeXn5X9mpNec4zX63RjQw2rxyhjJRdR5QSuQ="; + hash = "sha256-BTeU1mcaPjl9hJ5HioC4KmPLnYyilr01tzMXu1zrh7U="; }; patches = [ # Install sysconfdir files inside of the nix store, # but use a conventional runtime sysconfdir outside the store ./add-option-for-installation-sysconfdir.patch - # https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/654 (merged) - ./0001-Make-gio-2.0-optional-16.patch - # https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/746 (merged) - ./0002-Ignore-SCM_CREDS-on-darwin.patch - ./0003-Ignore-HAVE_CPUID_H-on-aarch64-darwin.patch - ./0004-Prefer-HAVE_CLOCK_GETTIME-on-darwin.patch - ./0005-Enable-CoreAudio-on-darwin.patch - ./0006-Fix-libpulsecommon-sources-on-darwin.patch - ./0007-Fix-link-args-on-darwin.patch ]; outputs = [ "out" "dev" ]; @@ -74,7 +65,7 @@ stdenv.mkDerivation rec { ++ lib.optionals stdenv.isLinux [ glib dbus ] ++ lib.optionals stdenv.isDarwin [ AudioUnit Cocoa CoreServices CoreAudio libintl ] ++ lib.optionals (!libOnly) ( - [ libasyncns webrtc-audio-processing ] + [ libasyncns webrtc-audio-processing_1 ] ++ lib.optional jackaudioSupport libjack2 ++ lib.optionals x11Support [ xorg.libICE xorg.libSM xorg.libX11 xorg.libXi xorg.libXtst ] ++ lib.optional useSystemd systemd @@ -126,6 +117,7 @@ stdenv.mkDerivation rec { (lib.mesonOption "systemduserunitdir" "${placeholder "out"}/lib/systemd/user") ] ++ lib.optionals stdenv.isDarwin [ + (lib.mesonEnable "consolekit" false) (lib.mesonEnable "dbus" false) (lib.mesonEnable "glib" false) (lib.mesonEnable "oss-output" false) diff --git a/nixpkgs/pkgs/servers/readarr/default.nix b/nixpkgs/pkgs/servers/readarr/default.nix index 67f24ed9204b..2c80eb30e458 100644 --- a/nixpkgs/pkgs/servers/readarr/default.nix +++ b/nixpkgs/pkgs/servers/readarr/default.nix @@ -8,13 +8,13 @@ let x86_64-darwin = "x64"; }."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); hash = { - x64-linux_hash = "sha256-Li8q1JY9e7NkNUMly+hCLAHPibqIdVO9Eijcsc0YKEc="; - arm64-linux_hash = "sha256-kPZ5seqYzHjINzFzUbZm7L5Uh5saa+WDSwNpmcYnYX0="; - x64-osx_hash = "sha256-R2WZAAJs/XG8C0DTvSEZ2c9ao78FTS9B7lieOKkUWRs="; + x64-linux_hash = "sha256-uNZQizvOPygP+LVyBAGshBcfjC4rrX9mGtaqv8pBWKA="; + arm64-linux_hash = "sha256-6wXqUZ1D3E3LB+FlJDhQ0XVawHYQ2QtiAYOeJKZv/ek="; + x64-osx_hash = "sha256-JowEooaANOaMTlQCGuXwSp87EdULjbGmY+1RBfddcng="; }."${arch}-${os}_hash"; in stdenv.mkDerivation rec { pname = "readarr"; - version = "0.3.17.2409"; + version = "0.3.19.2437"; src = fetchurl { url = "https://github.com/Readarr/Readarr/releases/download/v${version}/Readarr.develop.${version}.${os}-core-${arch}.tar.gz"; diff --git a/nixpkgs/pkgs/servers/rippled/default.nix b/nixpkgs/pkgs/servers/rippled/default.nix index e1ad55a41d38..83ceee00f45f 100644 --- a/nixpkgs/pkgs/servers/rippled/default.nix +++ b/nixpkgs/pkgs/servers/rippled/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, fetchurl, git, cmake, pkg-config +{ lib, stdenv, fetchgit, fetchurl, fetchpatch, git, cmake, pkg-config , openssl, boost, grpc, protobuf, libnsl, rocksdb_6_23, snappy }: let @@ -100,6 +100,17 @@ in stdenv.mkDerivation rec { hash = "sha256-VW/VmnhtF2xyHfEud3D6b3n8uTE0a/nDW1GISs5QfwM="; }; + patches = [ + # Fix gcc-13 build due to missing <cstdint> includes: + # https://github.com/XRPLF/rippled/pull/4555 + (fetchpatch { + name = "gcc-13.patch"; + url = "https://github.com/XRPLF/rippled/commit/c9a586c2437bc8ffd22e946c82e1cbe906e1fc40.patch"; + hash = "sha256-+4BDTMFoQWUHljgwGB1gtczVPQH/U5MA0ojbnBykceg="; + excludes = [ "src/ripple/basics/StringUtilities.h" ]; + }) + ]; + hardeningDisable = ["format"]; cmakeFlags = ["-Dstatic=OFF" "-DBoost_NO_BOOST_CMAKE=ON" "-DSNAPPY_INCLUDE_DIR=${snappy}/include" ]; diff --git a/nixpkgs/pkgs/servers/routinator/default.nix b/nixpkgs/pkgs/servers/routinator/default.nix index b3cf4febb0fc..071d665de0fa 100644 --- a/nixpkgs/pkgs/servers/routinator/default.nix +++ b/nixpkgs/pkgs/servers/routinator/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , stdenv , Security +, SystemConfiguration }: rustPlatform.buildRustPackage rec { @@ -18,7 +19,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-X+pAvudfbxng6kMv0NO00v6mMBXUMaXvZb/L1OgWd38="; - buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; buildNoDefaultFeatures = true; buildFeatures = [ "socks" ]; diff --git a/nixpkgs/pkgs/servers/samba/4.x.nix b/nixpkgs/pkgs/servers/samba/4.x.nix index 9e4beaa0586b..b97313d9b354 100644 --- a/nixpkgs/pkgs/servers/samba/4.x.nix +++ b/nixpkgs/pkgs/servers/samba/4.x.nix @@ -61,11 +61,11 @@ let in stdenv.mkDerivation rec { pname = "samba"; - version = "4.19.4"; + version = "4.19.5"; src = fetchurl { url = "mirror://samba/pub/samba/stable/${pname}-${version}.tar.gz"; - hash = "sha256-QCbZO4ZtsZjIyhaFsPXVJ5P2XG5jyzZBY69mH9/wlow="; + hash = "sha256-DiQFtM7CnQRZYh9DQKGnSvdx7Hz/7f9DJQytfx+HYF4="; }; outputs = [ "out" "dev" "man" ]; diff --git a/nixpkgs/pkgs/servers/search/weaviate/default.nix b/nixpkgs/pkgs/servers/search/weaviate/default.nix index f8d91944aed2..fb3fbbbf30bd 100644 --- a/nixpkgs/pkgs/servers/search/weaviate/default.nix +++ b/nixpkgs/pkgs/servers/search/weaviate/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "weaviate"; - version = "1.23.10"; + version = "1.24.1"; src = fetchFromGitHub { owner = "weaviate"; repo = "weaviate"; rev = "v${version}"; - hash = "sha256-aPXPQO47HeYXqzD+wS+EAhvDy7D9g5Kh6YXB89M1d0c="; + hash = "sha256-9FA0GxLgzw3D329JdQ044QC/D9ncxsadmCHlppnf9fI="; }; - vendorHash = "sha256-UEdGoXKq7ewNszahgcomjjuO2uzRZpiwkvvnXyFc9Og="; + vendorHash = "sha256-G5ya2O5IY7+DE4UeXuH5lTT0jbjIc9W09ePLsJsjQ78="; subPackages = [ "cmd/weaviate-server" ]; diff --git a/nixpkgs/pkgs/servers/sickbeard/sickgear.nix b/nixpkgs/pkgs/servers/sickbeard/sickgear.nix index ffb5994269e9..d8f37b79b4d9 100644 --- a/nixpkgs/pkgs/servers/sickbeard/sickgear.nix +++ b/nixpkgs/pkgs/servers/sickbeard/sickgear.nix @@ -4,13 +4,13 @@ let pythonEnv = python3.withPackages(ps: with ps; [ cheetah3 lxml ]); in stdenv.mkDerivation rec { pname = "sickgear"; - version = "3.30.10"; + version = "3.30.13"; src = fetchFromGitHub { owner = "SickGear"; repo = "SickGear"; rev = "release_${version}"; - hash = "sha256-pTcetcZ62rHMcnplteTJQkuEIQrPUKdX+cSV5V4ZqA4="; + hash = "sha256-Ka2WYU2hU9aemEiTNwFZLraerfisfL8vK2ujx0wDcPo="; }; patches = [ diff --git a/nixpkgs/pkgs/servers/simple-http-server/default.nix b/nixpkgs/pkgs/servers/simple-http-server/default.nix index 401592742426..ff83e3f62d08 100644 --- a/nixpkgs/pkgs/servers/simple-http-server/default.nix +++ b/nixpkgs/pkgs/servers/simple-http-server/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "simple-http-server"; - version = "0.6.8"; + version = "0.6.9"; src = fetchFromGitHub { owner = "TheWaWaR"; repo = pname; rev = "v${version}"; - sha256 = "sha256-QVNHomav8k1HflrOoQ7Ub5ZSCExpikbe0iAaVlAJEEs="; + sha256 = "sha256-JY3j/SCBm485w4x3EDTjDQw/N+t+3FvQyY9b7SQKhak="; }; - cargoHash = "sha256-uDdzv0uPITE4DySoHPMFkJ0/wrPNZOao43Z7tOhRboI="; + cargoHash = "sha256-6Gg4CDqlMtiOHJSeMfg9rP0CgP57GGfnuoqAXFuL8jo="; nativeBuildInputs = [ pkg-config ]; diff --git a/nixpkgs/pkgs/servers/snac2/default.nix b/nixpkgs/pkgs/servers/snac2/default.nix index 3770a620b7a8..72a06dc0dfc2 100644 --- a/nixpkgs/pkgs/servers/snac2/default.nix +++ b/nixpkgs/pkgs/servers/snac2/default.nix @@ -10,14 +10,14 @@ stdenv.mkDerivation rec { pname = "snac2"; - version = "2.47"; + version = "2.49"; src = fetchFromGitea { domain = "codeberg.org"; owner = "grunfink"; repo = pname; rev = version; - hash = "sha256-zK8Ypdp8kP4E3p04BAkTjcMiKtCQTtdDWArK/f1QhJw="; + hash = "sha256-8hIwm/CCghzbLtHhCqnnc3HELJ8KYwFlICqBTKaUb6U="; }; buildInputs = [ curl openssl ]; diff --git a/nixpkgs/pkgs/servers/snappymail/default.nix b/nixpkgs/pkgs/servers/snappymail/default.nix index e8120224990e..4e65ed11c0e2 100644 --- a/nixpkgs/pkgs/servers/snappymail/default.nix +++ b/nixpkgs/pkgs/servers/snappymail/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "snappymail"; - version = "2.33.0"; + version = "2.35.2"; src = fetchurl { url = "https://github.com/the-djmaze/snappymail/releases/download/v${version}/snappymail-${version}.tar.gz"; - sha256 = "sha256-71JgCkser7pGMVeSbiw97R2AoxQI76A6nPC7cTa2eow="; + sha256 = "sha256-aEM1In7BmtiPy0xOgUV6sIvMnX6fac4mSErr7dB2gRU="; }; sourceRoot = "snappymail"; diff --git a/nixpkgs/pkgs/servers/spicedb/default.nix b/nixpkgs/pkgs/servers/spicedb/default.nix index 7d8b69f5e197..ca90f78acf4e 100644 --- a/nixpkgs/pkgs/servers/spicedb/default.nix +++ b/nixpkgs/pkgs/servers/spicedb/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "spicedb"; - version = "1.29.1"; + version = "1.29.5"; src = fetchFromGitHub { owner = "authzed"; repo = "spicedb"; rev = "v${version}"; - hash = "sha256-fUTJpdFFNf/r+NQYBU4y8sGdtEShF9Yi89aB0rU7Xd8="; + hash = "sha256-93+o2pLilHAad794Bae83spLsC+pdvOgS6WRNSWrei4="; }; - vendorHash = "sha256-wPQ6RjDldO2m4myKcLtGoe5LurX6FI7yLoWLZUkex4o="; + vendorHash = "sha256-MfpXYvgUjfNZkAA19FWM0X8A9mbDhcYCM5L9PLL4En0="; subPackages = [ "cmd/spicedb" ]; diff --git a/nixpkgs/pkgs/servers/sql/dolt/default.nix b/nixpkgs/pkgs/servers/sql/dolt/default.nix index 3b2b409191f7..fc725e6b084c 100644 --- a/nixpkgs/pkgs/servers/sql/dolt/default.nix +++ b/nixpkgs/pkgs/servers/sql/dolt/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "dolt"; - version = "1.34.3"; + version = "1.35.0"; src = fetchFromGitHub { owner = "dolthub"; repo = "dolt"; rev = "v${version}"; - sha256 = "sha256-/H3jOEMrmhpcuPorv7hebs7LdNftJNXh9aRzxlpmOEY="; + sha256 = "sha256-h1ypyhslsqGrYFXzAdhoviXQwy8ub31+CNQaXMjKSB0="; }; modRoot = "./go"; subPackages = [ "cmd/dolt" ]; - vendorHash = "sha256-xkqpdY/8zvRT09WQ5RajXtHIoe8MeQaJ8kQie9EFoZE="; + vendorHash = "sha256-kC/+zCuIVUZ7Fpq2WfjYa3tG0vYGkUibK926yh3DCp4="; proxyVendor = true; doCheck = false; diff --git a/nixpkgs/pkgs/servers/sql/mssql/jdbc/default.nix b/nixpkgs/pkgs/servers/sql/mssql/jdbc/default.nix index a4a6e869f9a3..c40de0cb219d 100644 --- a/nixpkgs/pkgs/servers/sql/mssql/jdbc/default.nix +++ b/nixpkgs/pkgs/servers/sql/mssql/jdbc/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mssql-jdbc"; - version = "12.4.2"; + version = "12.6.1"; src = fetchurl { url = "https://github.com/Microsoft/mssql-jdbc/releases/download/v${version}/mssql-jdbc-${version}.jre8.jar"; - sha256 = "sha256-JGt6SXg4Ok+czMwGpDk9xdVw/WSkNLeBxqghcM3WmRE="; + sha256 = "sha256-OtherTxRxxE57u20nl1sD7mpV6tcHD9qL/C1AJOm0Qw="; }; dontUnpack = true; diff --git a/nixpkgs/pkgs/servers/sql/percona-server/8.0.x.nix b/nixpkgs/pkgs/servers/sql/percona-server/8.0.x.nix index a868c9cff22a..a2f4dd1c04e0 100644 --- a/nixpkgs/pkgs/servers/sql/percona-server/8.0.x.nix +++ b/nixpkgs/pkgs/servers/sql/percona-server/8.0.x.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "percona-server"; - version = "8.0.35-27"; + version = "8.0.36-28"; src = fetchurl { url = "https://www.percona.com/downloads/Percona-Server-8.0/Percona-Server-${finalAttrs.version}/source/tarball/percona-server-${finalAttrs.version}.tar.gz"; - sha256 = "sha256-YxrZBj8SNe55OjW2AucSR2Yot7DMcTXdVIVtu1i0HUU"; + hash = "sha256-iktEvZz3mjjmJ16PX51OjSwwiFS3H9W/XRco//Q6aEQ="; }; nativeBuildInputs = [ bison cmake pkg-config ] diff --git a/nixpkgs/pkgs/servers/sql/pgbouncer/default.nix b/nixpkgs/pkgs/servers/sql/pgbouncer/default.nix index 83bfb3c839cc..3e330a2375c1 100644 --- a/nixpkgs/pkgs/servers/sql/pgbouncer/default.nix +++ b/nixpkgs/pkgs/servers/sql/pgbouncer/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "pgbouncer"; - version = "1.22.0"; + version = "1.22.1"; src = fetchurl { url = "https://www.pgbouncer.org/downloads/files/${version}/${pname}-${version}.tar.gz"; - hash = "sha256-xu43qNfdvrv4RC2PCOwHw9pGr7Kq45ZziMFIFpineFg="; + hash = "sha256-KwGKps5/WSyYkrueD9kCYkhOtzk3/Sr5KXcKRTc7ohU="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/nixpkgs/pkgs/servers/sql/pgpool/default.nix b/nixpkgs/pkgs/servers/sql/pgpool/default.nix index 3b2bd59d8c12..3c8be4b09f31 100644 --- a/nixpkgs/pkgs/servers/sql/pgpool/default.nix +++ b/nixpkgs/pkgs/servers/sql/pgpool/default.nix @@ -10,12 +10,12 @@ stdenv.mkDerivation rec { pname = "pgpool-II"; - version = "4.5.0"; + version = "4.5.1"; src = fetchurl { url = "https://www.pgpool.net/mediawiki/download.php?f=pgpool-II-${version}.tar.gz"; name = "pgpool-II-${version}.tar.gz"; - hash = "sha256-WYSuzfJSCHKQA1as7QyapullN8LoIpfGWT7ZAZEYRRo="; + hash = "sha256-jhSwVYoV2uh2fI4azuPy9sfAjr//2majWTZ+qqVsOTY="; }; buildInputs = [ diff --git a/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_ivm.nix b/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_ivm.nix index 2b2cf185955b..46c01251d503 100644 --- a/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_ivm.nix +++ b/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_ivm.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pg_ivm"; - version = "1.7"; + version = "1.8"; src = fetchFromGitHub { owner = "sraoss"; repo = pname; rev = "v${version}"; - hash = "sha256-uSYhNUfd4mw7mGGAcP43X/0v/bNp6SdZjPzktGONgaQ="; + hash = "sha256-HncWX3jx9sEvxGGMMZ9QT4tDQ4JYbkNrFw2aZHgCVE8="; }; buildInputs = [ postgresql ]; diff --git a/nixpkgs/pkgs/servers/sql/postgresql/ext/pgvector.nix b/nixpkgs/pkgs/servers/sql/postgresql/ext/pgvector.nix index f7754eb2377e..e30e59d9da93 100644 --- a/nixpkgs/pkgs/servers/sql/postgresql/ext/pgvector.nix +++ b/nixpkgs/pkgs/servers/sql/postgresql/ext/pgvector.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pgvector"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "pgvector"; repo = "pgvector"; rev = "v${version}"; - hash = "sha256-hXm+k0BZ9xZP1Tnek14jPoKCPQkA5ovscu9IX2mW7Kc="; + hash = "sha256-NS9iNgrVnoqmAIXd4sJFnPISQvYYl8YQ84bnLjpChx4="; }; buildInputs = [ postgresql ]; diff --git a/nixpkgs/pkgs/servers/sql/proxysql/default.nix b/nixpkgs/pkgs/servers/sql/proxysql/default.nix index f75defb333fd..891ee8e53134 100644 --- a/nixpkgs/pkgs/servers/sql/proxysql/default.nix +++ b/nixpkgs/pkgs/servers/sql/proxysql/default.nix @@ -17,7 +17,7 @@ , libev , libgcrypt , libinjection -, libmicrohttpd_0_9_69 +, libmicrohttpd , libuuid , lz4 , nlohmann_json @@ -32,13 +32,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "proxysql"; - version = "2.5.5"; + version = "2.6.0"; src = fetchFromGitHub { owner = "sysown"; repo = "proxysql"; rev = finalAttrs.version; - hash = "sha256-+3cOEM5b5HBQhuI+92meupvQnrUj8jgbedzPJqMoXc8="; + hash = "sha256-vFPTBSp5DPNRuhtSD34ah2074almS+jiYxBE1L9Pz6g="; }; patches = [ @@ -111,7 +111,7 @@ stdenv.mkDerivation (finalAttrs: { { f = "libdaemon"; p = libdaemon; } { f = "libev"; p = libev; } { f = "libinjection"; p = libinjection; } - { f = "libmicrohttpd"; p = libmicrohttpd_0_9_69; } + { f = "libmicrohttpd"; p = libmicrohttpd; } { f = "libssl"; p = openssl; } { f = "lz4"; p = lz4; } { f = "pcre"; p = pcre; } diff --git a/nixpkgs/pkgs/servers/sql/rqlite/default.nix b/nixpkgs/pkgs/servers/sql/rqlite/default.nix index 66f2ce9ad74e..d8bcadbb9df9 100644 --- a/nixpkgs/pkgs/servers/sql/rqlite/default.nix +++ b/nixpkgs/pkgs/servers/sql/rqlite/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "rqlite"; - version = "8.21.3"; + version = "8.22.1"; src = fetchFromGitHub { owner = "rqlite"; repo = pname; rev = "v${version}"; - sha256 = "sha256-YnCa0gv+loI+PeQHZWar7GpEhqvQo1AwIj5LGTol3k0="; + sha256 = "sha256-g5W+rHD4gUS82E+wFLQ3VTSwIWQUogwTutwPTtf+IdM="; }; vendorHash = "sha256-onR4n6ok6y9APRwGjBoMISbidGDVw19D48TkogRp1uM="; diff --git a/nixpkgs/pkgs/servers/squid/default.nix b/nixpkgs/pkgs/servers/squid/default.nix index 5968c7e1e340..d564f77f7a7c 100644 --- a/nixpkgs/pkgs/servers/squid/default.nix +++ b/nixpkgs/pkgs/servers/squid/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "squid"; - version = "6.6"; + version = "6.7"; src = fetchurl { url = "http://www.squid-cache.org/Versions/v6/${finalAttrs.pname}-${finalAttrs.version}.tar.xz"; - hash = "sha256-Vb1/n0iYFTFh6hIomYrLVRv4QIMrnluQ/I7NKUJCAxg="; + hash = "sha256-4U2qTq5Bkl0a4/COZEOaaqowEb3O1oZii43ml9WrhCg="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/nixpkgs/pkgs/servers/tracing/tempo/default.nix b/nixpkgs/pkgs/servers/tracing/tempo/default.nix index 59bd418860fa..0772e922fc7f 100644 --- a/nixpkgs/pkgs/servers/tracing/tempo/default.nix +++ b/nixpkgs/pkgs/servers/tracing/tempo/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "tempo"; - version = "2.3.1"; + version = "2.4.0"; src = fetchFromGitHub { owner = "grafana"; repo = "tempo"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-U4qn4bBaVCDRQArlxXUURwjz5iPQv7R8o2+xR3PQHGc="; + hash = "sha256-ory7UllnV6Qzjvk2dy5B9pell0Ezse2NAn2rQ1gDsGM="; }; vendorHash = null; diff --git a/nixpkgs/pkgs/servers/u9fs/default.nix b/nixpkgs/pkgs/servers/u9fs/default.nix index 9056b4791672..cb85a972e034 100644 --- a/nixpkgs/pkgs/servers/u9fs/default.nix +++ b/nixpkgs/pkgs/servers/u9fs/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Serve 9P from Unix"; homepage = "http://p9f.org/magic/man2html?man=u9fs§=4"; - license = licenses.free; + license = licenses.dtoa; maintainers = [ maintainers.ehmry ]; platforms = platforms.unix; mainProgram = "u9fs"; diff --git a/nixpkgs/pkgs/servers/web-apps/bookstack/default.nix b/nixpkgs/pkgs/servers/web-apps/bookstack/default.nix index 141656ebfa4a..c59b6dae131e 100644 --- a/nixpkgs/pkgs/servers/web-apps/bookstack/default.nix +++ b/nixpkgs/pkgs/servers/web-apps/bookstack/default.nix @@ -16,13 +16,13 @@ let in package.override rec { pname = "bookstack"; - version = "23.12.2"; + version = "24.02"; src = fetchFromGitHub { owner = "bookstackapp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ZS93Dk4uK2j55VHWV3d3uJtro3STtaWyuOwdXlXv9Ao="; + sha256 = "sha256-F1CNutWFtFaRXsT8InyMww7OR40TXnzVGA/6t0eLBIw="; }; meta = with lib; { diff --git a/nixpkgs/pkgs/servers/web-apps/netbox/default.nix b/nixpkgs/pkgs/servers/web-apps/netbox/default.nix index ea2981597496..494513648c9b 100644 --- a/nixpkgs/pkgs/servers/web-apps/netbox/default.nix +++ b/nixpkgs/pkgs/servers/web-apps/netbox/default.nix @@ -22,12 +22,11 @@ lib.fix (self: { }; netbox_3_7 = callPackage generic { - version = "3.7.1"; - hash = "sha256-hAwkrrjrV+XVIYe3C8f/342SPlllXUhiFuaAp+TLMUw="; + version = "3.7.3"; + hash = "sha256-8apjw3mO3RKT/IgJOG1+2GSjNwFhddZ9rIChdP26leE="; extraPatches = [ # Allow setting the STATIC_ROOT from within the configuration and setting a custom redis URL ./config.patch - ./fix-doc-link.patch ]; tests = { netbox = nixosTests.netbox_3_7; diff --git a/nixpkgs/pkgs/servers/web-apps/netbox/fix-doc-link.patch b/nixpkgs/pkgs/servers/web-apps/netbox/fix-doc-link.patch deleted file mode 100644 index 0be5aee957f3..000000000000 --- a/nixpkgs/pkgs/servers/web-apps/netbox/fix-doc-link.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff --git a/docs/plugins/development/data-backends.md b/docs/plugins/development/data-backends.md -index feffa5bed..8b7226a41 100644 ---- a/docs/plugins/development/data-backends.md -+++ b/docs/plugins/development/data-backends.md -@@ -20,4 +20,4 @@ backends = [MyDataBackend] - !!! tip - The path to the list of search indexes can be modified by setting `data_backends` in the PluginConfig instance. - --::: core.data_backends.DataBackend -+::: netbox.data_backends.DataBackend diff --git a/nixpkgs/pkgs/servers/web-apps/nifi/default.nix b/nixpkgs/pkgs/servers/web-apps/nifi/default.nix index 182b1fb22fd5..6711608e2f50 100644 --- a/nixpkgs/pkgs/servers/web-apps/nifi/default.nix +++ b/nixpkgs/pkgs/servers/web-apps/nifi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "nifi"; - version = "1.24.0"; + version = "1.25.0"; src = fetchzip { url = "mirror://apache/nifi/${version}/nifi-${version}-bin.zip"; - hash = "sha256-8S06E8RiH/EnfAa60eRzjmHmzMn+3UZbykJpvFFXEho="; + hash = "sha256-k8F4Zu1X/R2tv4ZsMT7K8VdXFKX3iLPIWG+gvyNjrf0="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/servers/web-apps/pict-rs/default.nix b/nixpkgs/pkgs/servers/web-apps/pict-rs/default.nix index 9d4db81a69a7..55437c7926db 100644 --- a/nixpkgs/pkgs/servers/web-apps/pict-rs/default.nix +++ b/nixpkgs/pkgs/servers/web-apps/pict-rs/default.nix @@ -13,24 +13,24 @@ rustPlatform.buildRustPackage rec { pname = "pict-rs"; - version = "0.5.6"; + version = "0.5.7"; src = fetchFromGitea { domain = "git.asonix.dog"; owner = "asonix"; repo = pname; rev = "v${version}"; - sha256 = "sha256-YK31z7tFRxLuf3C8ojDIV+mYHvK0dlV8zLHJoWjPzIU="; + sha256 = "sha256-MBV92+mu41ulT6wuzTGbobbspoQA0hNbRIiISol0n48="; }; - cargoHash = "sha256-W6pDWjalyBBqFmm4uZDDTRvTWiwogdOeXbdazz4uM3s="; + cargoHash = "sha256-p7s/gs+sMXR1l08C81tY4K3oV9fWgm07C0nRGspfoR8="; # needed for internal protobuf c wrapper library PROTOC = "${protobuf}/bin/protoc"; PROTOC_INCLUDE = "${protobuf}/include"; nativeBuildInputs = [ makeWrapper ]; - buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks ]; + buildInputs = lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; postInstall = '' wrapProgram "$out/bin/pict-rs" \ @@ -40,6 +40,7 @@ rustPlatform.buildRustPackage rec { passthru.tests = { inherit (nixosTests) pict-rs; }; meta = with lib; { + broken = stdenv.isDarwin; description = "A simple image hosting service"; homepage = "https://git.asonix.dog/asonix/pict-rs"; license = with licenses; [ agpl3Plus ]; diff --git a/nixpkgs/pkgs/servers/web-apps/pixelfed/default.nix b/nixpkgs/pkgs/servers/web-apps/pixelfed/default.nix index 537c4c626465..2b1f2e730206 100644 --- a/nixpkgs/pkgs/servers/web-apps/pixelfed/default.nix +++ b/nixpkgs/pkgs/servers/web-apps/pixelfed/default.nix @@ -10,18 +10,16 @@ php.buildComposerProject (finalAttrs: { pname = "pixelfed"; - version = "0.11.12"; + version = "0.11.13"; src = fetchFromGitHub { owner = "pixelfed"; repo = finalAttrs.pname; rev = "v${finalAttrs.version}"; - hash = "sha256-tHwNchnB5z21Q1I8qwKn2s5rfHFvMxRLAyPkUEhC6qQ="; + hash = "sha256-bEwKaC9fSOGLQbjsuPuIdMMbO3kzvzQxWQR8C2A4mQc="; }; - vendorHash = "sha256-nRCrmF1p+fZI+iyrM5I3bVCSwjQdn8BSW8Jj62lpn8E="; - # Needed because buzz/laravel-h-captcha is pinned to 1.0.4 in composer.json - composerStrictValidation = false; + vendorHash = "sha256-ahQsOq3qOMGt3b0Ebac4xex+MP9knTmjyCy0PSNE4W8="; postInstall = '' mv "$out/share/php/${finalAttrs.pname}"/* $out diff --git a/nixpkgs/pkgs/servers/web-apps/vikunja/api.nix b/nixpkgs/pkgs/servers/web-apps/vikunja/api.nix deleted file mode 100644 index f405391cf963..000000000000 --- a/nixpkgs/pkgs/servers/web-apps/vikunja/api.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub, mage, writeShellScriptBin, nixosTests }: - -buildGoModule rec { - pname = "vikunja-api"; - version = "0.22.1"; - - src = fetchFromGitHub { - owner = "go-vikunja"; - repo = "api"; - rev = "v${version}"; - hash = "sha256-tYhlAF1VuM/Xz4HP7DtI0hGsiNyYxzFiNIEbm8n9DC8="; - }; - - nativeBuildInputs = - let - fakeGit = writeShellScriptBin "git" '' - if [[ $@ = "describe --tags --always --abbrev=10" ]]; then - echo "${version}" - else - >&2 echo "Unknown command: $@" - exit 1 - fi - ''; - in - [ fakeGit mage ]; - - vendorHash = "sha256-OD/7RCCrRdlrsRW7CRT01cDUvNnedNdTZ8YgDFGaE4o="; - - # checks need to be disabled because of needed internet for some checks - doCheck = false; - - buildPhase = '' - runHook preBuild - - # Fixes "mkdir /homeless-shelter: permission denied" - "Error: error compiling magefiles" during build - export HOME=$(mktemp -d) - mage build:build - - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - install -Dt $out/bin vikunja - runHook postInstall - ''; - - passthru.tests.vikunja = nixosTests.vikunja; - - meta = { - changelog = "https://kolaente.dev/vikunja/api/src/tag/v${version}/CHANGELOG.md"; - description = "API of the Vikunja to-do list app"; - homepage = "https://vikunja.io/"; - license = lib.licenses.agpl3Plus; - maintainers = with lib.maintainers; [ leona ]; - mainProgram = "vikunja"; - platforms = lib.platforms.all; - }; -} diff --git a/nixpkgs/pkgs/servers/web-apps/vikunja/frontend.nix b/nixpkgs/pkgs/servers/web-apps/vikunja/frontend.nix deleted file mode 100644 index bf09d830c872..000000000000 --- a/nixpkgs/pkgs/servers/web-apps/vikunja/frontend.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ stdenv, lib, fetchurl, unzip, nixosTests, ... }: - -stdenv.mkDerivation rec { - pname = "vikunja-frontend"; - version = "0.22.1"; - - src = fetchurl { - url = "https://dl.vikunja.io/frontend/${pname}-${version}.zip"; - hash = "sha256-jkFF6sucLZWpWkPcovTdD9MOyJNPRWIBfK9388X5onc="; - }; - - nativeBuildInputs = [ unzip ]; - - sourceRoot = "."; - - installPhase = '' - runHook preInstall - - mkdir -p $out/ - cp -r * $out/ - - runHook postInstall - ''; - - passthru.tests.vikunja = nixosTests.vikunja; - - meta = { - changelog = "https://kolaente.dev/vikunja/frontend/src/tag/v${version}/CHANGELOG.md"; - description = "Frontend of the Vikunja to-do list app"; - homepage = "https://vikunja.io/"; - license = lib.licenses.agpl3Plus; - maintainers = with lib.maintainers; [ leona ]; - platforms = lib.platforms.all; - }; -} diff --git a/nixpkgs/pkgs/servers/x11/xorg/default.nix b/nixpkgs/pkgs/servers/x11/xorg/default.nix index 45be30799912..9be49dc4f0ef 100644 --- a/nixpkgs/pkgs/servers/x11/xorg/default.nix +++ b/nixpkgs/pkgs/servers/x11/xorg/default.nix @@ -1958,11 +1958,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! mkfontscale = callPackage ({ stdenv, pkg-config, fetchurl, libfontenc, freetype, xorgproto, zlib, testers }: stdenv.mkDerivation (finalAttrs: { pname = "mkfontscale"; - version = "1.2.2"; + version = "1.2.3"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/app/mkfontscale-1.2.2.tar.xz"; - sha256 = "1i6mw97r2s1rb6spjj8fbdsgw6197smaqq2haqgnwhz73xdzpqwa"; + url = "mirror://xorg/individual/app/mkfontscale-1.2.3.tar.xz"; + sha256 = "0pp7dyfrrkrqxslk9q8660k0h4swaqlixsnnph2fxb7i8k1ws899"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; @@ -2278,11 +2278,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xcbutilcursor = callPackage ({ stdenv, pkg-config, fetchurl, gperf, libxcb, xcbutilimage, xcbutilrenderutil, xorgproto, m4, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xcb-util-cursor"; - version = "0.1.4"; + version = "0.1.5"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/xcb/xcb-util-cursor-0.1.4.tar.xz"; - sha256 = "1yria9h0vqpblkgzqhpygk3rraijd3mmipg0mdhkayxbpj8gxp18"; + url = "mirror://xorg/individual/lib/xcb-util-cursor-0.1.5.tar.xz"; + sha256 = "0mrwcrm6djbd5zdvqb5v4wr87bzawnaacyqwwhfghw09ssq9kbqc"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; diff --git a/nixpkgs/pkgs/servers/x11/xorg/tarballs.list b/nixpkgs/pkgs/servers/x11/xorg/tarballs.list index 756cc80bb51b..d0516bd8669d 100644 --- a/nixpkgs/pkgs/servers/x11/xorg/tarballs.list +++ b/nixpkgs/pkgs/servers/x11/xorg/tarballs.list @@ -1,7 +1,6 @@ https://invisible-mirror.net/archives/luit/luit-20230201.tgz mirror://xorg/individual/xcb/libpthread-stubs-0.5.tar.xz mirror://xorg/individual/xcb/xcb-util-0.4.1.tar.xz -mirror://xorg/individual/xcb/xcb-util-cursor-0.1.4.tar.xz mirror://xorg/individual/xcb/xcb-util-errors-1.0.1.tar.xz mirror://xorg/individual/xcb/xcb-util-image-0.4.1.tar.xz mirror://xorg/individual/xcb/xcb-util-keysyms-0.4.1.tar.xz @@ -14,7 +13,7 @@ mirror://xorg/individual/app/fonttosfnt-1.2.3.tar.xz mirror://xorg/individual/app/iceauth-1.0.9.tar.xz mirror://xorg/individual/app/ico-1.0.6.tar.xz mirror://xorg/individual/app/listres-1.0.5.tar.xz -mirror://xorg/individual/app/mkfontscale-1.2.2.tar.xz +mirror://xorg/individual/app/mkfontscale-1.2.3.tar.xz mirror://xorg/individual/app/oclock-1.0.5.tar.xz mirror://xorg/individual/app/sessreg-1.1.3.tar.xz mirror://xorg/individual/app/setxkbmap-1.3.4.tar.xz @@ -208,6 +207,7 @@ mirror://xorg/individual/lib/libXvMC-1.0.14.tar.xz mirror://xorg/individual/lib/libXxf86dga-1.1.6.tar.xz mirror://xorg/individual/lib/libXxf86misc-1.0.4.tar.bz2 mirror://xorg/individual/lib/libXxf86vm-1.1.5.tar.xz +mirror://xorg/individual/lib/xcb-util-cursor-0.1.5.tar.xz mirror://xorg/individual/lib/xtrans-1.5.0.tar.xz mirror://xorg/individual/proto/xcb-proto-1.16.0.tar.xz mirror://xorg/individual/proto/xorgproto-2023.2.tar.xz diff --git a/nixpkgs/pkgs/servers/xinetd/default.nix b/nixpkgs/pkgs/servers/xinetd/default.nix index d7d1c94d9de2..9abef85bde29 100644 --- a/nixpkgs/pkgs/servers/xinetd/default.nix +++ b/nixpkgs/pkgs/servers/xinetd/default.nix @@ -5,12 +5,12 @@ , libtirpc }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xinetd"; version = "2.3.15.4"; src = fetchurl { - url = "https://github.com/openSUSE/xinetd/releases/download/${version}/xinetd-${version}.tar.xz"; + url = "https://github.com/openSUSE/xinetd/releases/download/${finalAttrs.version}/xinetd-${finalAttrs.version}.tar.xz"; hash = "sha256-K6pYEBC8cDYavfo38SHpKuucXOZ/mnGRPOvWk1nMllQ="; }; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { description = "Secure replacement for inetd"; platforms = lib.platforms.linux; homepage = "https://github.com/openSUSE/xinetd"; - license = lib.licenses.free; + license = lib.licenses.xinetd; maintainers = with lib.maintainers; [ fgaz ]; }; -} +}) diff --git a/nixpkgs/pkgs/servers/zigbee2mqtt/default.nix b/nixpkgs/pkgs/servers/zigbee2mqtt/default.nix index 0d24c3adce3d..c566ca090581 100644 --- a/nixpkgs/pkgs/servers/zigbee2mqtt/default.nix +++ b/nixpkgs/pkgs/servers/zigbee2mqtt/default.nix @@ -9,16 +9,16 @@ buildNpmPackage rec { pname = "zigbee2mqtt"; - version = "1.35.3"; + version = "1.36.0"; src = fetchFromGitHub { owner = "Koenkk"; repo = "zigbee2mqtt"; rev = version; - hash = "sha256-pj+8BiEcR8Z88J3xxEa4IRBlt9Lv7IoSrKAQ6Y5oydI="; + hash = "sha256-Eyp6VQAt0bd3rXovoaUvTuEY8E67cI5vFadpClhHcrA="; }; - npmDepsHash = "sha256-15aZyICTRq6DvW2arKtdT+jXDyGtVD7ncer8e4d+03E="; + npmDepsHash = "sha256-Kr2gjCMf7yRldvLImuU92sN7a4T2ARFcTshwGOWX+zw="; nodejs = nodejs_18; |