From 028fb6380679a82e7fe3b9bd385742fd066f47db Mon Sep 17 00:00:00 2001 From: natsukium Date: Tue, 30 May 2023 00:26:42 +0900 Subject: [PATCH 1/6] python3Packages.filterpy: 1.4.5 -> unstable-2022-08-23 Diff: https://github.com/rlabbe/filterpy/compare/1.4.5...3b51149ebcff0401ff1e10bf08ffca7b6bbc4a33 (cherry picked from commit 111e3a55a6b047234b64cbf073dff07549c7f0fa) --- .../python-modules/filterpy/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/filterpy/default.nix b/pkgs/development/python-modules/filterpy/default.nix index 877bd02ed31b..04304913eb5e 100644 --- a/pkgs/development/python-modules/filterpy/default.nix +++ b/pkgs/development/python-modules/filterpy/default.nix @@ -1,6 +1,6 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , numpy , scipy , matplotlib @@ -8,15 +8,16 @@ , isPy3k }: -buildPythonPackage rec { - version = "1.4.5"; +buildPythonPackage { + version = "unstable-2022-08-23"; pname = "filterpy"; disabled = !isPy3k; - src = fetchPypi { - inherit pname version; - extension = "zip"; - sha256 = "4f2a4d39e4ea601b9ab42b2db08b5918a9538c168cff1c6895ae26646f3d73b1"; + src = fetchFromGitHub { + owner = "rlabbe"; + repo = "filterpy"; + rev = "3b51149ebcff0401ff1e10bf08ffca7b6bbc4a33"; + hash = "sha256-KuuVu0tqrmQuNKYmDmdy+TU6BnnhDxh4G8n9BGzjGag="; }; nativeCheckInputs = [ pytest ]; From 51e8d0d14905b30030e3c5149b323525d3420776 Mon Sep 17 00:00:00 2001 From: natsukium Date: Tue, 30 May 2023 00:29:42 +0900 Subject: [PATCH 2/6] python3Packages.filterpy: fix formatting - add format - use pytestCheckHook - enable all tests (cherry picked from commit 46a649030ab875e645dcd3d6935a3bc225574cd9) --- .../python-modules/filterpy/default.nix | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/filterpy/default.nix b/pkgs/development/python-modules/filterpy/default.nix index 04304913eb5e..86ea56f33347 100644 --- a/pkgs/development/python-modules/filterpy/default.nix +++ b/pkgs/development/python-modules/filterpy/default.nix @@ -4,13 +4,15 @@ , numpy , scipy , matplotlib -, pytest +, pytestCheckHook , isPy3k }: buildPythonPackage { - version = "unstable-2022-08-23"; pname = "filterpy"; + version = "unstable-2022-08-23"; + format = "setuptools"; + disabled = !isPy3k; src = fetchFromGitHub { @@ -20,14 +22,15 @@ buildPythonPackage { hash = "sha256-KuuVu0tqrmQuNKYmDmdy+TU6BnnhDxh4G8n9BGzjGag="; }; - nativeCheckInputs = [ pytest ]; - propagatedBuildInputs = [ numpy scipy matplotlib ]; + nativeCheckInputs = [ + pytestCheckHook + ]; - # single test fails (even on master branch of repository) - # project does not use CI - checkPhase = '' - pytest --ignore=filterpy/common/tests/test_discretization.py - ''; + propagatedBuildInputs = [ + numpy + scipy + matplotlib + ]; meta = with lib; { homepage = "https://github.com/rlabbe/filterpy"; From 2e61ca83ec26e954224d1390348c6021f11cb2b3 Mon Sep 17 00:00:00 2001 From: "Alexander V. Nikolaev" Date: Mon, 19 Jun 2023 17:44:57 +0300 Subject: [PATCH 3/6] clang: fix crosscompilation for 16.x (cherry picked from commit cef1efea156c2796003956d27c56997cc3ee73af) --- pkgs/development/compilers/llvm/16/clang/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/llvm/16/clang/default.nix b/pkgs/development/compilers/llvm/16/clang/default.nix index d558bf70acfb..2a2656df5fe1 100644 --- a/pkgs/development/compilers/llvm/16/clang/default.nix +++ b/pkgs/development/compilers/llvm/16/clang/default.nix @@ -36,9 +36,14 @@ let "-DSPHINX_OUTPUT_MAN=ON" "-DSPHINX_OUTPUT_HTML=OFF" "-DSPHINX_WARNINGS_AS_ERRORS=OFF" - ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ "-DLLVM_TABLEGEN_EXE=${buildLlvmTools.llvm}/bin/llvm-tblgen" "-DCLANG_TABLEGEN=${buildLlvmTools.libclang.dev}/bin/clang-tblgen" + # Added in LLVM15: + # `clang-tidy-confusable-chars-gen`: https://github.com/llvm/llvm-project/commit/c3574ef739fbfcc59d405985a3a4fa6f4619ecdb + # `clang-pseudo-gen`: https://github.com/llvm/llvm-project/commit/cd2292ef824591cc34cc299910a3098545c840c7 + "-DCLANG_TIDY_CONFUSABLE_CHARS_GEN=${buildLlvmTools.libclang.dev}/bin/clang-tidy-confusable-chars-gen" + "-DCLANG_PSEUDO_GEN=${buildLlvmTools.libclang.dev}/bin/clang-pseudo-gen" ]; patches = [ @@ -81,7 +86,7 @@ let patchShebangs $python/bin mkdir -p $dev/bin - cp bin/clang-tblgen $dev/bin + cp bin/{clang-tblgen,clang-tidy-confusable-chars-gen,clang-pseudo-gen} $dev/bin ''; passthru = { From 23a462aadbe813a125e4593e0aa4c8eb5896da16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 5 Jul 2023 15:29:54 +0200 Subject: [PATCH 4/6] matrix-synapse: 1.86.0 -> 1.87.0 Diff: https://github.com/matrix-org/synapse/compare/v1.86.0...v1.87.0 (cherry picked from commit 53098560136f0702bead0681f9df08235d06efba) --- pkgs/servers/matrix-synapse/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 78458382c7e4..425a949dfac1 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -12,20 +12,20 @@ in with python3.pkgs; buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.86.0"; + version = "1.87.0"; format = "pyproject"; src = fetchFromGitHub { owner = "matrix-org"; repo = "synapse"; rev = "v${version}"; - hash = "sha256-vSNAISWTTT3IAeA8hxQhQNp9T3soey4vgh7v+BxI+K0="; + hash = "sha256-QBg0aIYIncKDCcgjj1cSAugNtLMb83F7MCijTCcn8YM="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-lPLhh5FkxpBUQ5UH6eAfUIyGvHIcZHmbYBT5QUW/W4k="; + hash = "sha256-+QFa3NrzDrCniHpbP+pFWImMh9FHERFTRzbEiP4p/7Y="; }; postPatch = '' From 657f658398d3fc3028093bd249b957d863f3f692 Mon Sep 17 00:00:00 2001 From: Jamie Magee Date: Sat, 10 Jun 2023 17:33:53 -0700 Subject: [PATCH 5/6] deploy-rs: unstable-2023-05-05 -> unstable-2023-06-04 (cherry picked from commit fc9619c48882d5d6242e0f735833a81d01258e5d) --- pkgs/tools/package-management/deploy-rs/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/package-management/deploy-rs/default.nix b/pkgs/tools/package-management/deploy-rs/default.nix index 1a646204bda1..86c0963db178 100644 --- a/pkgs/tools/package-management/deploy-rs/default.nix +++ b/pkgs/tools/package-management/deploy-rs/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage { pname = "deploy-rs"; - version = "unstable-2023-05-05"; + version = "unstable-2023-06-04"; src = fetchFromGitHub { owner = "serokell"; repo = "deploy-rs"; - rev = "6b0b6a1c2527e8b1ef370a308b6ef8903004ac47"; - hash = "sha256-UUxpb5PMkFfP2JGoPMEUvKbxv+wCkTWy4uZs1MyyCes="; + rev = "65211db63ba1199f09b4c9f27e5eba5ec50d76ac"; + hash = "sha256-1FldJ059so0X/rScdbIiOlQbjjSNCCTdj2cUr5pHU4A="; }; - cargoHash = "sha256-6/VSfCNBstr+fQPdpMl5b2MwNxRjSJvTDuTGKySPGsk="; + cargoHash = "sha256-iUYtLH01YGxsDQbSnQrs4jw2eJxsOn2v3HOIfhsZbdQ="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices From 09061db1fb9bcf39b13dcd070e70a99c7224a8fd Mon Sep 17 00:00:00 2001 From: Sophie Tauchert Date: Thu, 6 Jul 2023 15:27:14 +0200 Subject: [PATCH 6/6] mastodon: 4.1.2 -> 4.1.3 --- pkgs/servers/mastodon/gemset.nix | 96 +++++++++++++++---------------- pkgs/servers/mastodon/source.nix | 11 ++-- pkgs/servers/mastodon/version.nix | 2 +- 3 files changed, 55 insertions(+), 54 deletions(-) diff --git a/pkgs/servers/mastodon/gemset.nix b/pkgs/servers/mastodon/gemset.nix index 3e1632860b56..faefc611fce4 100644 --- a/pkgs/servers/mastodon/gemset.nix +++ b/pkgs/servers/mastodon/gemset.nix @@ -5,10 +5,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1y9lj7ra9xf4q4mryydmd498grsndqmz1zwasb4ai9gv62igvw3s"; + sha256 = "10y18l67i6ry7v9w0qwh26477g4gm0qrjjpa87pa5a42hzkglnc7"; type = "gem"; }; - version = "6.1.7.2"; + version = "6.1.7.4"; }; actionmailbox = { dependencies = ["actionpack" "activejob" "activerecord" "activestorage" "activesupport" "mail"]; @@ -16,10 +16,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bzacsr93sxv90nljv3ajw54nmyz1v9k2v2wx1pxsi0jasqg5fvn"; + sha256 = "1ihayijdgasf0rp10x6h335k3y1hgqr6c9s8lxqmhm4gpczajaac"; type = "gem"; }; - version = "6.1.7.2"; + version = "6.1.7.4"; }; actionmailer = { dependencies = ["actionpack" "actionview" "activejob" "activesupport" "mail" "rails-dom-testing"]; @@ -27,10 +27,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1rjddp1a5l4amsbibhnf7g2rb69qvq0nc0a2dvr6r57bpkf82hj4"; + sha256 = "03557cskby5alpncnhgm1j1kq43xqq75sdd6r2x22q3j2jv68pj5"; type = "gem"; }; - version = "6.1.7.2"; + version = "6.1.7.4"; }; actionpack = { dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"]; @@ -38,10 +38,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0c2y6sqpan68lrx78pvhbxb2917m75s808r6cg1kyygwvg31niza"; + sha256 = "1x7ffyan8sbv4ywjghiyiv077vfxyf6i6y0h4k0mfpdmf76l0i86"; type = "gem"; }; - version = "6.1.7.2"; + version = "6.1.7.4"; }; actiontext = { dependencies = ["actionpack" "activerecord" "activestorage" "activesupport" "nokogiri"]; @@ -49,10 +49,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1jx8wi961i34v7x0j3h4wjw3qbyx9bkzb598vg42kidzk2f90dyj"; + sha256 = "0g5gw9ywirw7814wn8cdnnv1df58x5gplgpb15gaw5gzkw9cgvd8"; type = "gem"; }; - version = "6.1.7.2"; + version = "6.1.7.4"; }; actionview = { dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"]; @@ -60,10 +60,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10g5gk8h4mfhvgqylzbf591fqf5p78ca35cb97p9bclpv9jfy0za"; + sha256 = "0cmzc2c00lsdr5hpmsgs8axs5pbhv5xyqiyi69wf81pqypd2cy3l"; type = "gem"; }; - version = "6.1.7.2"; + version = "6.1.7.4"; }; active_model_serializers = { dependencies = ["actionpack" "activemodel" "case_transform" "jsonapi-renderer"]; @@ -92,10 +92,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ililjwy4x52a6x5fidh1iyllf6vx49nz93fd2hxypc5bpryx9mz"; + sha256 = "153z9lmkip3v243xxa5rcc8am82ma73ar46q4vxbmzi850a5yjj2"; type = "gem"; }; - version = "6.1.7.2"; + version = "6.1.7.4"; }; activemodel = { dependencies = ["activesupport"]; @@ -103,10 +103,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0nn17y72fhsynwn11bqg75bazqp6r1g8mpwwyv64harwvh3fh5qj"; + sha256 = "1bpr0zspih2rf2ppzjxaw8sq6gfqg9vss5h0fs4r85p03579swin"; type = "gem"; }; - version = "6.1.7.2"; + version = "6.1.7.4"; }; activerecord = { dependencies = ["activemodel" "activesupport"]; @@ -114,10 +114,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1k69m3b0lb4jx20jx8vsvdqm1ki1r6riq9haabyddkcpvmgz1wh7"; + sha256 = "06403rkjnyr80yj4g05lb5hn04yfzipa7bm0gplbqrrykr3hvh5r"; type = "gem"; }; - version = "6.1.7.2"; + version = "6.1.7.4"; }; activestorage = { dependencies = ["actionpack" "activejob" "activerecord" "activesupport" "marcel" "mini_mime"]; @@ -125,10 +125,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0c3cvc01azfkccg5hsl96wafsxb5hf1nva3cn8rif2mlwx17p8n3"; + sha256 = "094kvh8bp792xccql54kky8prmvqvfzwwv9xas2pnh8s4v3avbzl"; type = "gem"; }; - version = "6.1.7.2"; + version = "6.1.7.4"; }; activesupport = { dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"]; @@ -136,10 +136,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "14pjq2k761qaywaznpqq8ziivjk2ks1ma2cjwdflkxqgndxjmsr2"; + sha256 = "0s465919p6fcgcsqin8w8hay2m598dvnzks490hbsb0p68sdz69m"; type = "gem"; }; - version = "6.1.7.2"; + version = "6.1.7.4"; }; addressable = { dependencies = ["public_suffix"]; @@ -609,10 +609,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qnsflsbjj38im8xq35g0vihlz96h09wjn2dad5g543l3vvrkrx5"; + sha256 = "0krcwb6mn0iklajwngwsg850nk8k9b35dhmc2qkbdqvmifdi2y9q"; type = "gem"; }; - version = "1.2.0"; + version = "1.2.2"; }; connection_pool = { groups = ["default" "test"]; @@ -768,10 +768,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0fxrvqv3l5w9p20s129rg41zc6agf1n4yrmganancnvykbkygki2"; + sha256 = "1q2pywgyn6cbnm0fh3dln5z1qgd1g8hvb4x8rppjc1bpfxnfhi13"; type = "gem"; }; - version = "5.6.4"; + version = "5.6.6"; }; dotenv = { groups = ["default"]; @@ -1566,10 +1566,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0n0pijrc465zzrv5flxc41375zwaz9yfc2n0r80zjwarc1ixkdx1"; + sha256 = "1bf9pysw1jfgynv692hhaycfxa8ckay1gjw5hz3madrbrynryfzc"; type = "gem"; }; - version = "2.8.0.1"; + version = "2.8.1"; }; makara = { dependencies = ["activerecord"]; @@ -1669,10 +1669,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1af4yarhbbx62f7qsmgg5fynrik0s36wjy3difkawy536xg343mp"; + sha256 = "0z7f38iq37h376n9xbl4gajdrnwzq284c9v1py4imw3gri2d5cj6"; type = "gem"; }; - version = "2.8.1"; + version = "2.8.2"; }; minitest = { groups = ["default" "development" "pam_authentication" "production" "test"]; @@ -1720,10 +1720,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1d996zf3g8xz244791b0qsl9vr7zg4lqnnmf9k2kshr9lki5jam8"; + sha256 = "1k1qyjr9lkk5y3483k6wk6d9h1jx4v5hzby1mf0pj3b4kr2arxbm"; type = "gem"; }; - version = "0.3.4"; + version = "0.3.6"; }; net-ldap = { groups = ["default"]; @@ -1794,10 +1794,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xk64wghkscs6bv2n22853k2nh39d131c6rfpnlw12mbjnnv9v1v"; + sha256 = "0w9978zwjf1qhy3amkivab0f9syz6a7k0xgydjidaf7xc831d78f"; type = "gem"; }; - version = "2.5.8"; + version = "2.5.9"; }; nokogiri = { dependencies = ["mini_portile2" "racc"]; @@ -1805,10 +1805,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qr6psd9qgv83pklpw7cpmshkcasnv8d777ksmvwsacwfvvkmnxj"; + sha256 = "1g6wvxab4qwnbny983n9bckc0afy6y6s3g5v3csdbsp8n7g9vxi3"; type = "gem"; }; - version = "1.14.1"; + version = "1.14.5"; }; nsa = { dependencies = ["activesupport" "concurrent-ruby" "sidekiq" "statsd-ruby"]; @@ -2132,10 +2132,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qvp6h2abmlsl4sqjsvac03cr2mxq6143gbx4kq52rpazp021qsb"; + sha256 = "16w217k9z02c4hqizym8dkj6bqmmzx4qdvqpnskgzf174a5pwdxk"; type = "gem"; }; - version = "2.2.6.2"; + version = "2.2.7"; }; rack-attack = { dependencies = ["rack"]; @@ -2198,10 +2198,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1b7ggchi3d7pwzmj8jn9fhbazr5fr4dy304f0hz7kqbg23s9c1ym"; + sha256 = "17ympjpkhz06xqsay18hskpbs64nh05hzrsckx8va6ikrxhs2ksq"; type = "gem"; }; - version = "6.1.7.2"; + version = "6.1.7.4"; }; rails-controller-testing = { dependencies = ["actionpack" "actionview" "activesupport"]; @@ -2264,10 +2264,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0mm3nf3y715ln6v8k6g4351ggkr1bcwc5637vr979yw8vsmdi42k"; + sha256 = "0g92if3cxxysl9h6x6ibs7y9dsbcniiwgcldvg00kib02b3pxkbb"; type = "gem"; }; - version = "6.1.7.2"; + version = "6.1.7.4"; }; rainbow = { groups = ["default" "development" "test"]; @@ -2893,10 +2893,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0inl77jh4ia03jw3iqm5ipr76ghal3hyjrd6r8zqsswwvi9j2xdi"; + sha256 = "0k7j2wn14h1pl4smibasw0bp66kg626drxb59z7rzflch99cd4rg"; type = "gem"; }; - version = "1.2.1"; + version = "1.2.2"; }; tilt = { groups = ["default"]; @@ -2913,10 +2913,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lnh0kr7f43m1cjzc2jvggfsl1rzsaj2rd3pn6vp7mcqliymzaza"; + sha256 = "1pfddf51n5fnj4f9ggwj3wbf23ynj0nbxlxqpz12y1gvl9g7d6r6"; type = "gem"; }; - version = "0.3.1"; + version = "0.3.2"; }; tpm-key_attestation = { dependencies = ["bindata" "openssl" "openssl-signature_algorithm"]; @@ -3202,10 +3202,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09pqhdi6q4sqv0p1gnjpbcy4az0yv8hrpykjngdgh9qiqd87nfdv"; + sha256 = "0ck6bj7wa73dkdh13735jl06k6cfny98glxjkas82aivlmyzqqbk"; type = "gem"; }; - version = "2.6.6"; + version = "2.6.8"; }; } diff --git a/pkgs/servers/mastodon/source.nix b/pkgs/servers/mastodon/source.nix index 1daa150d8456..f8b37d94cfa0 100644 --- a/pkgs/servers/mastodon/source.nix +++ b/pkgs/servers/mastodon/source.nix @@ -1,9 +1,10 @@ # This file was generated by pkgs.mastodon.updateScript. -{ fetchgit, applyPatches }: let - src = fetchgit { - url = "https://github.com/mastodon/mastodon.git"; - rev = "v4.1.2"; - sha256 = "18yzpc2rz9sa04y2sdxzsfkndbqqsfqvji47imwc3yj40l8hciws"; +{ fetchFromGitHub, applyPatches }: let + src = fetchFromGitHub { + owner = "mastodon"; + repo = "mastodon"; + rev = "v4.1.3"; + sha256 = "F+cpL+ZFfe52f82qtJxuxRCILW3zr6K5OMrvaOgWe58="; }; in applyPatches { inherit src; diff --git a/pkgs/servers/mastodon/version.nix b/pkgs/servers/mastodon/version.nix index d80cafca6d6d..309d01fc75af 100644 --- a/pkgs/servers/mastodon/version.nix +++ b/pkgs/servers/mastodon/version.nix @@ -1 +1 @@ -"4.1.2" +"4.1.3"