From c1fc59a7956543a0ab93be816595987981faae30 Mon Sep 17 00:00:00 2001 From: "Yang, Bo" Date: Wed, 29 Jun 2022 13:52:21 -0700 Subject: [PATCH 01/26] libdwarf_0_4: 0.4.0 -> 0.4.1 This commit should fix #177227 --- pkgs/development/libraries/libdwarf/0.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libdwarf/0.4.nix b/pkgs/development/libraries/libdwarf/0.4.nix index 5d8634bc25b3..bbe93ddbdcc0 100644 --- a/pkgs/development/libraries/libdwarf/0.4.nix +++ b/pkgs/development/libraries/libdwarf/0.4.nix @@ -1,7 +1,7 @@ { callPackage, zlib }: callPackage ./common.nix rec { - version = "0.4.0"; + version = "0.4.1"; url = "https://www.prevanders.net/libdwarf-${version}.tar.xz"; - sha512 = "30e5c6c1fc95aa28a014007a45199160e1d9ba870b196d6f98e6dd21a349e9bb31bba1bd6817f8ef9a89303bed0562182a7d46fcbb36aedded76c2f1e0052e1e"; + sha512 = "793fe487de80fe6878f022b90f49ec334a0d7db071ff22a11902db5e3457cc7f3f853945a9ac74de2c40f7f388277f21c5b2e62745bca92d2bb55c51e9577693"; buildInputs = [ zlib ]; } From f452ce73961cd7217208b07d6de5477630b239d8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 3 Jul 2022 01:46:30 +0000 Subject: [PATCH 02/26] cudatext: 1.166.2 -> 1.166.5 --- pkgs/applications/editors/cudatext/default.nix | 4 ++-- pkgs/applications/editors/cudatext/deps.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/editors/cudatext/default.nix b/pkgs/applications/editors/cudatext/default.nix index 1a5c82c344fa..d966db2027aa 100644 --- a/pkgs/applications/editors/cudatext/default.nix +++ b/pkgs/applications/editors/cudatext/default.nix @@ -38,13 +38,13 @@ let in stdenv.mkDerivation rec { pname = "cudatext"; - version = "1.166.2"; + version = "1.166.5"; src = fetchFromGitHub { owner = "Alexey-T"; repo = "CudaText"; rev = version; - sha256 = "sha256-kJ1UpVff6FS/gk3Ecz+GEDFYeu2CmXG5ehFEawk+/yg="; + sha256 = "sha256-mFSVYC6a9iAiUcWZOlxuVxFwuwIgH8eQmh8YKaMw2Wg="; }; postPatch = '' diff --git a/pkgs/applications/editors/cudatext/deps.json b/pkgs/applications/editors/cudatext/deps.json index 840d39c66c2d..89e6a0f79cec 100644 --- a/pkgs/applications/editors/cudatext/deps.json +++ b/pkgs/applications/editors/cudatext/deps.json @@ -16,8 +16,8 @@ }, "ATSynEdit": { "owner": "Alexey-T", - "rev": "2022.06.14", - "sha256": "sha256-rS4hO4jm9k6raspPzX7z7HF8cdTqcwcD2DDRvQFQjLk=" + "rev": "2022.07.01", + "sha256": "sha256-Il8NMBoShJtY5itDr9EBJ8NpfiPux/pNzs9LUc/nn30=" }, "ATSynEdit_Cmp": { "owner": "Alexey-T", From 432bd70f7db8558b44cf52d713eb1de8bba6fac8 Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Sun, 3 Jul 2022 15:45:16 +0200 Subject: [PATCH 03/26] jdt-language-server: 1.8.0 -> 1.13.0 --- pkgs/development/tools/jdt-language-server/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/jdt-language-server/default.nix b/pkgs/development/tools/jdt-language-server/default.nix index 7111aebf74ea..00a9945c9fb7 100644 --- a/pkgs/development/tools/jdt-language-server/default.nix +++ b/pkgs/development/tools/jdt-language-server/default.nix @@ -7,12 +7,12 @@ stdenv.mkDerivation rec { pname = "jdt-language-server"; - version = "1.8.0"; - timestamp = "202201261434"; + version = "1.13.0"; + timestamp = "202206301721"; src = fetchurl { url = "https://download.eclipse.org/jdtls/milestones/${version}/jdt-language-server-${version}-${timestamp}.tar.gz"; - sha256 = "0wlnsr72hncdqrbpgfl9hgwqw9d9rppq4iymnjmgfn51rjcqadv8"; + sha256 = "WimtKNdl9AgQaoexR7I5aWlCoR8i+VDFLcNxdvzpz8k="; }; sourceRoot = "."; @@ -101,4 +101,3 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ matt-snider ]; }; } - From 4ed794f1bc5183df62f436be0230e8b4b1eb7767 Mon Sep 17 00:00:00 2001 From: Ashish SHUKLA Date: Mon, 4 Jul 2022 21:01:56 +0530 Subject: [PATCH 04/26] got: 0.70 -> 0.73 --- pkgs/applications/version-management/got/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/got/default.nix b/pkgs/applications/version-management/got/default.nix index fc0de31d4713..cc00794ba7ad 100644 --- a/pkgs/applications/version-management/got/default.nix +++ b/pkgs/applications/version-management/got/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "got"; - version = "0.70"; + version = "0.73"; src = fetchurl { url = "https://gameoftrees.org/releases/portable/got-portable-${version}.tar.gz"; - sha256 = "0kh7idgbiil58l043lkyjy9lz81yj03b6b3d7ra62jkrkzc4wlrf"; + sha256 = "0x583h9f6jnqfwy48b43s1myrgbngn128m4ivmf9gcsvfiz3lxgh"; }; nativeBuildInputs = [ pkg-config ]; From 576a97a0d0574af262e89ff2f3332a8493977d09 Mon Sep 17 00:00:00 2001 From: ash Date: Sun, 26 Jun 2022 14:50:43 +0100 Subject: [PATCH 05/26] xcftools: patch CVE-2019-5086 and CVE-2019-5087 --- pkgs/tools/graphics/xcftools/default.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/xcftools/default.nix b/pkgs/tools/graphics/xcftools/default.nix index e83e3c13ae3f..7b3d45421291 100644 --- a/pkgs/tools/graphics/xcftools/default.nix +++ b/pkgs/tools/graphics/xcftools/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, libpng, perl, gettext }: +{lib, stdenv, fetchpatch, fetchurl, libpng, perl, gettext }: stdenv.mkDerivation rec { pname = "xcftools"; @@ -11,7 +11,15 @@ stdenv.mkDerivation rec { buildInputs = [ libpng perl gettext ]; - patchPhase = '' + patches = [ + (fetchpatch { + name = "CVE-2019-5086.CVE-2019-5087.patch"; + url = "https://github.com/gladk/xcftools/commit/59c38e3e45b9112c2bcb4392bccf56e297854f8a.patch"; + sha256 = "sha256-a1Biv6viXzTSaLDzinOyu0HdDTUPsKITsdKu9B9Y8GE="; + }) + ]; + + postPatch = '' # Required if building with libpng-1.6, innocuous otherwise substituteInPlace xcf2png.c \ --replace png_voidp_NULL NULL \ From 01660583c015a330a77e0dde4f5609db60af8cb7 Mon Sep 17 00:00:00 2001 From: XYenon Date: Sat, 2 Jul 2022 16:42:35 +0800 Subject: [PATCH 06/26] topgrade: fix build on darwin --- .../misc/topgrade/darwin-cargo-lock.patch | 921 ++++++++++++++++++ pkgs/tools/misc/topgrade/default.nix | 6 +- 2 files changed, 924 insertions(+), 3 deletions(-) create mode 100644 pkgs/tools/misc/topgrade/darwin-cargo-lock.patch diff --git a/pkgs/tools/misc/topgrade/darwin-cargo-lock.patch b/pkgs/tools/misc/topgrade/darwin-cargo-lock.patch new file mode 100644 index 000000000000..bbe27c53fa9b --- /dev/null +++ b/pkgs/tools/misc/topgrade/darwin-cargo-lock.patch @@ -0,0 +1,921 @@ +diff --git a/Cargo.lock b/Cargo.lock +index d91d01a..bade540 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -14,7 +14,7 @@ version = "0.7.6" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" + dependencies = [ +- "getrandom", ++ "getrandom 0.2.6", + "once_cell", + "version_check", + ] +@@ -35,41 +35,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "08f9b8508dccb7687a1d6c4ce66b2b0ecef467c94667de27d8d7fe1f8d2a9cdc" + + [[package]] +-name = "async-broadcast" +-version = "0.4.0" ++name = "arrayref" ++version = "0.3.6" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "1bbd92a9bd0e9c1298118ecf8a2f825e86b12c3ec9e411573e34aaf3a0c03cdd" +-dependencies = [ +- "easy-parallel", +- "event-listener", +- "futures-core", +- "parking_lot", +-] ++checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544" + + [[package]] +-name = "async-channel" +-version = "1.6.1" ++name = "arrayvec" ++version = "0.5.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "2114d64672151c0c5eaa5e131ec84a74f06e1e559830dabba01ca30605d66319" +-dependencies = [ +- "concurrent-queue", +- "event-listener", +- "futures-core", +-] +- +-[[package]] +-name = "async-executor" +-version = "1.4.1" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "871f9bb5e0a22eeb7e8cf16641feb87c9dc67032ccf8ff49e772eb9941d3a965" +-dependencies = [ +- "async-task", +- "concurrent-queue", +- "fastrand", +- "futures-lite", +- "once_cell", +- "slab", +-] ++checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" + + [[package]] + name = "async-io" +@@ -90,43 +65,6 @@ dependencies = [ + "winapi", + ] + +-[[package]] +-name = "async-lock" +-version = "2.5.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "e97a171d191782fba31bb902b14ad94e24a68145032b7eedf871ab0bc0d077b6" +-dependencies = [ +- "event-listener", +-] +- +-[[package]] +-name = "async-recursion" +-version = "0.3.2" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d7d78656ba01f1b93024b7c3a0467f1608e4be67d725749fdcd7d2c7678fd7a2" +-dependencies = [ +- "proc-macro2", +- "quote", +- "syn", +-] +- +-[[package]] +-name = "async-task" +-version = "4.2.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "30696a84d817107fc028e049980e09d5e140e8da8f1caeb17e8e950658a3cea9" +- +-[[package]] +-name = "async-trait" +-version = "0.1.53" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "ed6aa3524a2dfcf9fe180c51eae2b58738348d819517ceadf95789c51fff7600" +-dependencies = [ +- "proc-macro2", +- "quote", +- "syn", +-] +- + [[package]] + name = "atty" + version = "0.2.14" +@@ -156,6 +94,17 @@ version = "1.3.2" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + ++[[package]] ++name = "blake2b_simd" ++version = "0.5.11" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "afa748e348ad3be8263be728124b24a24f268266f6f5d58af9d75f6a40b5c587" ++dependencies = [ ++ "arrayref", ++ "arrayvec", ++ "constant_time_eq", ++] ++ + [[package]] + name = "block" + version = "0.1.6" +@@ -192,6 +141,12 @@ version = "1.0.73" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11" + ++[[package]] ++name = "cfg-if" ++version = "0.1.10" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" ++ + [[package]] + name = "cfg-if" + version = "1.0.0" +@@ -274,13 +229,19 @@ dependencies = [ + "winapi", + ] + ++[[package]] ++name = "constant_time_eq" ++version = "0.1.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" ++ + [[package]] + name = "crc32fast" + version = "1.3.2" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" + dependencies = [ +- "cfg-if", ++ "cfg-if 1.0.0", + ] + + [[package]] +@@ -289,7 +250,7 @@ version = "0.8.8" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "0bf124c720b7686e3c2663cf54062ab0f68a88af2fb6a030e87e30bf721fcb38" + dependencies = [ +- "cfg-if", ++ "cfg-if 1.0.0", + "lazy_static", + ] + +@@ -313,13 +274,24 @@ dependencies = [ + "dirs-sys", + ] + ++[[package]] ++name = "dirs" ++version = "1.0.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3fd78930633bd1c6e35c4b42b1df7b0cbc6bc191146e512bb3bedf243fcc3901" ++dependencies = [ ++ "libc", ++ "redox_users 0.3.5", ++ "winapi", ++] ++ + [[package]] + name = "dirs-next" + version = "2.0.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" + dependencies = [ +- "cfg-if", ++ "cfg-if 1.0.0", + "dirs-sys-next", + ] + +@@ -330,7 +302,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" + dependencies = [ + "libc", +- "redox_users", ++ "redox_users 0.4.3", + "winapi", + ] + +@@ -341,7 +313,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" + dependencies = [ + "libc", +- "redox_users", ++ "redox_users 0.4.3", + "winapi", + ] + +@@ -351,12 +323,6 @@ version = "0.3.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "0688c2a7f92e427f44895cd63841bff7b29f8d7a1648b9e7e07a4a365b2e1257" + +-[[package]] +-name = "easy-parallel" +-version = "3.2.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "6907e25393cdcc1f4f3f513d9aac1e840eb1cc341a0fccb01171f7d14d10b946" +- + [[package]] + name = "either" + version = "1.6.1" +@@ -375,14 +341,14 @@ version = "0.8.31" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "9852635589dc9f9ea1b6fe9f05b50ef208c85c834a562f0c6abb1c475736ec2b" + dependencies = [ +- "cfg-if", ++ "cfg-if 1.0.0", + ] + + [[package]] + name = "enumflags2" +-version = "0.7.5" ++version = "0.6.4" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "e75d4cd21b95383444831539909fbb14b9dc3fdceb2a6f5d36577329a1f55ccb" ++checksum = "83c8d82922337cd23a15f88b70d8e4ef5f11da38dd7cdb55e84dd5de99695da0" + dependencies = [ + "enumflags2_derive", + "serde", +@@ -390,9 +356,9 @@ dependencies = [ + + [[package]] + name = "enumflags2_derive" +-version = "0.7.4" ++version = "0.6.4" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f58dc3c5e468259f19f2d46304a6b28f1c3d034442e14b322d2b850e36f6d5ae" ++checksum = "946ee94e3dbf58fdd324f9ce245c7b238d46a66f00e86a020b71996349e46cce" + dependencies = [ + "proc-macro2", + "quote", +@@ -412,12 +378,6 @@ dependencies = [ + "termcolor", + ] + +-[[package]] +-name = "event-listener" +-version = "2.5.2" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "77f3309417938f28bf8228fcff79a4a37103981e3e186d2ccd19c74b38f4eb71" +- + [[package]] + name = "fastrand" + version = "1.7.0" +@@ -433,9 +393,9 @@ version = "0.2.16" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "c0408e2626025178a6a7f7ffc05a25bc47103229f19c113755de7bf63816290c" + dependencies = [ +- "cfg-if", ++ "cfg-if 1.0.0", + "libc", +- "redox_syscall", ++ "redox_syscall 0.2.13", + "winapi", + ] + +@@ -445,7 +405,7 @@ version = "1.0.23" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "b39522e96686d38f4bc984b9198e3a0613264abaebaff2c5c918bfa6b6da09af" + dependencies = [ +- "cfg-if", ++ "cfg-if 1.0.0", + "crc32fast", + "libc", + "miniz_oxide", +@@ -467,12 +427,6 @@ dependencies = [ + "percent-encoding", + ] + +-[[package]] +-name = "fuchsia-cprng" +-version = "0.1.1" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" +- + [[package]] + name = "futures" + version = "0.3.21" +@@ -577,13 +531,24 @@ dependencies = [ + "slab", + ] + ++[[package]] ++name = "getrandom" ++version = "0.1.16" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" ++dependencies = [ ++ "cfg-if 1.0.0", ++ "libc", ++ "wasi 0.9.0+wasi-snapshot-preview1", ++] ++ + [[package]] + name = "getrandom" + version = "0.2.6" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "9be70c98951c83b8d2f8f60d7065fa6d5146873094452a1008da8c2f1e4205ad" + dependencies = [ +- "cfg-if", ++ "cfg-if 1.0.0", + "libc", + "wasi 0.10.0+wasi-snapshot-preview1", + ] +@@ -652,12 +617,6 @@ dependencies = [ + "libc", + ] + +-[[package]] +-name = "hex" +-version = "0.4.3" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" +- + [[package]] + name = "http" + version = "0.2.7" +@@ -777,7 +736,7 @@ version = "0.1.12" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" + dependencies = [ +- "cfg-if", ++ "cfg-if 1.0.0", + ] + + [[package]] +@@ -813,36 +772,25 @@ version = "0.2.125" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "5916d2ae698f6de9bfb891ad7a8d65c09d232dc58cc4ac433c7da3b2fd84bc2b" + +-[[package]] +-name = "lock_api" +-version = "0.4.7" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "327fa5b6a6940e4699ec49a9beae1ea4845c6bab9314e4f84ac68742139d8c53" +-dependencies = [ +- "autocfg", +- "scopeguard", +-] +- + [[package]] + name = "log" + version = "0.4.17" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" + dependencies = [ +- "cfg-if", ++ "cfg-if 1.0.0", + ] + + [[package]] + name = "mac-notification-sys" +-version = "0.5.0" ++version = "0.3.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "297c13fc8ff9fa8b2d0e53850f80e0aa962628e865d447031ce58cdb062e5b29" ++checksum = "3dfb6b71a9a89cd38b395d994214297447e8e63b1ba5708a9a2b0b1048ceda76" + dependencies = [ + "cc", +- "dirs-next", ++ "chrono", ++ "dirs", + "objc-foundation", +- "objc_id", +- "time 0.3.9", + ] + + [[package]] +@@ -902,17 +850,27 @@ dependencies = [ + "windows-sys", + ] + ++[[package]] ++name = "nb-connect" ++version = "1.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b1bb540dc6ef51cfe1916ec038ce7a620daf3a111e2502d745197cd53d6bca15" ++dependencies = [ ++ "libc", ++ "socket2", ++] ++ + [[package]] + name = "nix" +-version = "0.23.1" ++version = "0.17.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "9f866317acbd3a240710c63f065ffb1e4fd466259045ccb504130b7f668f35c6" ++checksum = "50e4785f2c3b7589a0d0c1dd60285e1188adac4006e8abd6dd578e1567027363" + dependencies = [ + "bitflags", + "cc", +- "cfg-if", ++ "cfg-if 0.1.10", + "libc", +- "memoffset", ++ "void", + ] + + [[package]] +@@ -922,16 +880,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "8f17df307904acd05aa8e32e97bb20f2a0df1728bbc2d771ae8f9a90463441e9" + dependencies = [ + "bitflags", +- "cfg-if", ++ "cfg-if 1.0.0", + "libc", + "memoffset", + ] + + [[package]] + name = "notify-rust" +-version = "4.5.8" ++version = "4.5.5" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a995a3d2834cefa389218e7a35156e8ce544bc95f836900da01ee0b26a07e9d4" ++checksum = "ca6ebab865e67efdd7182a88d76cadbdd2a8d02d1c7a4e16bb7c234016a12cac" + dependencies = [ + "mac-notification-sys", + "serde", +@@ -1030,16 +988,6 @@ dependencies = [ + "hashbrown 0.12.1", + ] + +-[[package]] +-name = "ordered-stream" +-version = "0.0.1" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "44630c059eacfd6e08bdaa51b1db2ce33119caa4ddc1235e923109aa5f25ccb1" +-dependencies = [ +- "futures-core", +- "pin-project-lite", +-] +- + [[package]] + name = "os_str_bytes" + version = "6.0.1" +@@ -1052,31 +1000,6 @@ version = "2.0.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "427c3892f9e783d91cc128285287e70a59e206ca452770ece88a76f7a3eddd72" + +-[[package]] +-name = "parking_lot" +-version = "0.11.2" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" +-dependencies = [ +- "instant", +- "lock_api", +- "parking_lot_core", +-] +- +-[[package]] +-name = "parking_lot_core" +-version = "0.8.5" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d76e8e1493bcac0d2766c42737f34458f1c8c50c0d23bcb24ea953affb273216" +-dependencies = [ +- "cfg-if", +- "instant", +- "libc", +- "redox_syscall", +- "smallvec", +- "winapi", +-] +- + [[package]] + name = "parselnk" + version = "0.1.1" +@@ -1114,19 +1037,13 @@ version = "2.2.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "685404d509889fade3e86fe3a5803bca2ec09b0c0778d5ada6ec8bf7a8de5259" + dependencies = [ +- "cfg-if", ++ "cfg-if 1.0.0", + "libc", + "log", + "wepoll-ffi", + "winapi", + ] + +-[[package]] +-name = "ppv-lite86" +-version = "0.2.16" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872" +- + [[package]] + name = "pretty_env_logger" + version = "0.4.0" +@@ -1137,6 +1054,15 @@ dependencies = [ + "log", + ] + ++[[package]] ++name = "proc-macro-crate" ++version = "0.1.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1d6ea3c4595b96363c13943497db34af4460fb474a95c43f4446ad341b8c9785" ++dependencies = [ ++ "toml", ++] ++ + [[package]] + name = "proc-macro-crate" + version = "1.1.3" +@@ -1205,79 +1131,29 @@ dependencies = [ + ] + + [[package]] +-name = "rand" +-version = "0.4.6" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293" +-dependencies = [ +- "fuchsia-cprng", +- "libc", +- "rand_core 0.3.1", +- "rdrand", +- "winapi", +-] +- +-[[package]] +-name = "rand" +-version = "0.8.5" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +-dependencies = [ +- "libc", +- "rand_chacha", +- "rand_core 0.6.3", +-] +- +-[[package]] +-name = "rand_chacha" +-version = "0.3.1" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +-dependencies = [ +- "ppv-lite86", +- "rand_core 0.6.3", +-] +- +-[[package]] +-name = "rand_core" +-version = "0.3.1" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b" +-dependencies = [ +- "rand_core 0.4.2", +-] +- +-[[package]] +-name = "rand_core" +-version = "0.4.2" ++name = "redox_syscall" ++version = "0.1.57" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc" ++checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce" + + [[package]] +-name = "rand_core" +-version = "0.6.3" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7" +-dependencies = [ +- "getrandom", +-] +- +-[[package]] +-name = "rdrand" +-version = "0.4.0" ++name = "redox_syscall" ++version = "0.2.13" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2" ++checksum = "62f25bc4c7e55e0b0b7a1d43fb893f4fa1361d0abe38b9ce4f323c2adfe6ef42" + dependencies = [ +- "rand_core 0.3.1", ++ "bitflags", + ] + + [[package]] +-name = "redox_syscall" +-version = "0.2.13" ++name = "redox_users" ++version = "0.3.5" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "62f25bc4c7e55e0b0b7a1d43fb893f4fa1361d0abe38b9ce4f323c2adfe6ef42" ++checksum = "de0737333e7a9502c789a36d7c7fa6092a49895d4faa31ca5df163857ded2e9d" + dependencies = [ +- "bitflags", ++ "getrandom 0.1.16", ++ "redox_syscall 0.1.57", ++ "rust-argon2", + ] + + [[package]] +@@ -1286,8 +1162,8 @@ version = "0.4.3" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" + dependencies = [ +- "getrandom", +- "redox_syscall", ++ "getrandom 0.2.6", ++ "redox_syscall 0.2.13", + "thiserror", + ] + +@@ -1370,13 +1246,25 @@ dependencies = [ + "winapi", + ] + ++[[package]] ++name = "rust-argon2" ++version = "0.8.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4b18820d944b33caa75a71378964ac46f58517c92b6ae5f762636247c09e78fb" ++dependencies = [ ++ "base64", ++ "blake2b_simd", ++ "constant_time_eq", ++ "crossbeam-utils", ++] ++ + [[package]] + name = "rust-ini" + version = "0.18.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "f6d5f2436026b4f6e79dc829837d467cc7e9a55ee40e750d716713540715a2df" + dependencies = [ +- "cfg-if", ++ "cfg-if 1.0.0", + "ordered-multimap", + ] + +@@ -1423,10 +1311,10 @@ dependencies = [ + ] + + [[package]] +-name = "scopeguard" +-version = "1.1.0" ++name = "scoped-tls" ++version = "1.0.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" ++checksum = "ea6a9290e3c9cf0f18145ef7ffa62d68ee0bf5fcd651017e586dc7fd5da448c2" + + [[package]] + name = "sct" +@@ -1519,21 +1407,6 @@ dependencies = [ + "serde", + ] + +-[[package]] +-name = "sha1" +-version = "0.6.1" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c1da05c97445caa12d05e848c4a4fcbbea29e748ac28f7e80e9b010392063770" +-dependencies = [ +- "sha1_smol", +-] +- +-[[package]] +-name = "sha1_smol" +-version = "1.0.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012" +- + [[package]] + name = "shellexpand" + version = "2.1.0" +@@ -1558,12 +1431,6 @@ version = "0.4.6" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "eb703cfe953bccee95685111adeedb76fabe4e97549a58d16f03ea7b9367bb32" + +-[[package]] +-name = "smallvec" +-version = "1.8.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f2dd574626839106c320a323308629dcb1acfc96e32a8cba364ddc61ac23ee83" +- + [[package]] + name = "socket2" + version = "0.4.4" +@@ -1667,26 +1534,16 @@ dependencies = [ + "xattr", + ] + +-[[package]] +-name = "tempdir" +-version = "0.3.7" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "15f2b5fb00ccdf689e0149d1b1b3c03fead81c2b37735d812fa8bddbbf41b6d8" +-dependencies = [ +- "rand 0.4.6", +- "remove_dir_all", +-] +- + [[package]] + name = "tempfile" + version = "3.3.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4" + dependencies = [ +- "cfg-if", ++ "cfg-if 1.0.0", + "fastrand", + "libc", +- "redox_syscall", ++ "redox_syscall 0.2.13", + "remove_dir_all", + "winapi", + ] +@@ -1837,7 +1694,7 @@ name = "topgrade" + version = "9.0.1" + dependencies = [ + "anyhow", +- "cfg-if", ++ "cfg-if 1.0.0", + "chrono", + "clap", + "console", +@@ -1879,7 +1736,7 @@ version = "0.1.34" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "5d0ecdcb44a79f0fe9844f0c4f33a342cbcbb5117de8001e6ba0dc2351327d09" + dependencies = [ +- "cfg-if", ++ "cfg-if 1.0.0", + "pin-project-lite", + "tracing-attributes", + "tracing-core", +@@ -1911,16 +1768,6 @@ version = "0.2.3" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" + +-[[package]] +-name = "uds_windows" +-version = "1.0.1" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "486992108df0fe0160680af1941fe856c521be931d5a5ecccefe0de86dc47e4a" +-dependencies = [ +- "tempdir", +- "winapi", +-] +- + [[package]] + name = "unicode-bidi" + version = "0.3.8" +@@ -1978,6 +1825,12 @@ version = "0.9.4" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + ++[[package]] ++name = "void" ++version = "1.0.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" ++ + [[package]] + name = "waker-fn" + version = "1.1.0" +@@ -2005,6 +1858,12 @@ dependencies = [ + "try-lock", + ] + ++[[package]] ++name = "wasi" ++version = "0.9.0+wasi-snapshot-preview1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" ++ + [[package]] + name = "wasi" + version = "0.10.0+wasi-snapshot-preview1" +@@ -2023,7 +1882,7 @@ version = "0.2.80" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "27370197c907c55e3f1a9fbe26f44e937fe6451368324e009cba39e139dc08ad" + dependencies = [ +- "cfg-if", ++ "cfg-if 1.0.0", + "wasm-bindgen-macro", + ] + +@@ -2048,7 +1907,7 @@ version = "0.4.30" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "6f741de44b75e14c35df886aff5f1eb73aa114fa5d4d00dcd37b5e01259bf3b2" + dependencies = [ +- "cfg-if", ++ "cfg-if 1.0.0", + "js-sys", + "wasm-bindgen", + "web-sys", +@@ -2285,66 +2144,39 @@ checksum = "d2d7d3948613f75c98fd9328cfdcc45acc4d360655289d0a7d4ec931392200a3" + + [[package]] + name = "zbus" +-version = "2.2.0" ++version = "1.9.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "53819092b9db813b2c6168b097b4b13ad284d81c9f2b0165a0a1b190e505a1f3" ++checksum = "2326acc379a3ac4e34b794089f5bdb17086bf29a5fdf619b7b4cc772dc2e9dad" + dependencies = [ +- "async-broadcast", +- "async-channel", +- "async-executor", + "async-io", +- "async-lock", +- "async-recursion", +- "async-task", +- "async-trait", + "byteorder", + "derivative", + "enumflags2", +- "event-listener", +- "futures-core", +- "futures-sink", +- "futures-util", +- "hex", +- "lazy_static", +- "nix 0.23.1", ++ "fastrand", ++ "futures", ++ "nb-connect", ++ "nix 0.17.0", + "once_cell", +- "ordered-stream", +- "rand 0.8.5", ++ "polling", ++ "scoped-tls", + "serde", + "serde_repr", +- "sha1", +- "static_assertions", +- "uds_windows", +- "winapi", + "zbus_macros", +- "zbus_names", + "zvariant", + ] + + [[package]] + name = "zbus_macros" +-version = "2.2.0" ++version = "1.9.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c7174ebe6722c280d6d132d694bb5664ce50a788cb70eeb518e7fc1ca095a114" ++checksum = "a482c56029e48681b89b92b5db3c446db0915e8dd1052c0328a574eda38d5f93" + dependencies = [ +- "proc-macro-crate", ++ "proc-macro-crate 0.1.5", + "proc-macro2", + "quote", +- "regex", + "syn", + ] + +-[[package]] +-name = "zbus_names" +-version = "2.1.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "45dfcdcf87b71dad505d30cc27b1b7b88a64b6d1c435648f48f9dbc1fdc4b7e1" +-dependencies = [ +- "serde", +- "static_assertions", +- "zvariant", +-] +- + [[package]] + name = "zip" + version = "0.6.2" +@@ -2360,9 +2192,9 @@ dependencies = [ + + [[package]] + name = "zvariant" +-version = "3.2.1" ++version = "2.10.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "cbd1abd8bc2c855412b9c8af9fc11c0d695c73c732ad5a1a1be10f3fd4bf19b2" ++checksum = "a68c7b55f2074489b7e8e07d2d0a6ee6b4f233867a653c664d8020ba53692525" + dependencies = [ + "byteorder", + "enumflags2", +@@ -2374,11 +2206,11 @@ dependencies = [ + + [[package]] + name = "zvariant_derive" +-version = "3.2.1" ++version = "2.10.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "abebd57382dfacf3e7bbdd7b7c3d162d6ed0687a78f046263ddef4ddabc275ae" ++checksum = "e4ca5e22593eb4212382d60d26350065bf2a02c34b85bc850474a74b589a3de9" + dependencies = [ +- "proc-macro-crate", ++ "proc-macro-crate 1.1.3", + "proc-macro2", + "quote", + "syn", diff --git a/pkgs/tools/misc/topgrade/default.nix b/pkgs/tools/misc/topgrade/default.nix index 98f13bc7524a..9d4287427fbc 100644 --- a/pkgs/tools/misc/topgrade/default.nix +++ b/pkgs/tools/misc/topgrade/default.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-9zP+rWhaK4fC2Qhd0oq9WVvCkvryooYo09k7016Rbxw="; }; - cargoSha256 = "sha256-otn0XvZ0wufD+4mCGSM0hevKM+wWSvFVCKtTu/5m1uA="; + cargoPatches = [ ./darwin-cargo-lock.patch ]; + cargoSha256 = "sha256-rkcEF/INNVn9K4p0/1M++l6lnjtZp1Srx57gkaqcKek="; buildInputs = lib.optionals stdenv.isDarwin [ Cocoa Foundation ]; @@ -32,7 +33,6 @@ rustPlatform.buildRustPackage rec { description = "Upgrade all the things"; homepage = "https://github.com/r-darwish/topgrade"; license = licenses.gpl3Only; - maintainers = with maintainers; [ SuperSandro2000 ]; - broken = stdenv.isDarwin; + maintainers = with maintainers; [ SuperSandro2000 xyenon ]; }; } From 70dc91a415ab21cdaacb431abbfdfe313300f211 Mon Sep 17 00:00:00 2001 From: Martino Fontana Date: Tue, 5 Jul 2022 15:24:51 +0200 Subject: [PATCH 07/26] libsForQt5.bismuth: 3.1.1 -> 3.1.2 --- pkgs/desktops/plasma-5/3rdparty/addons/bismuth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/plasma-5/3rdparty/addons/bismuth/default.nix b/pkgs/desktops/plasma-5/3rdparty/addons/bismuth/default.nix index bf46029356ea..507b13896fcb 100644 --- a/pkgs/desktops/plasma-5/3rdparty/addons/bismuth/default.nix +++ b/pkgs/desktops/plasma-5/3rdparty/addons/bismuth/default.nix @@ -12,13 +12,13 @@ mkDerivation rec { pname = "bismuth"; - version = "3.1.1"; + version = "3.1.2"; src = fetchFromGitHub { owner = "Bismuth-Forge"; repo = pname; rev = "v${version}"; - sha256 = "sha256-SGeqTmU603gKlzCUJ6AMaG7++9JvMw5EpSATwJEqNq8="; + sha256 = "sha256-sYehZ9f+V7xeqYaw5p6BCm2XWsC/mpmsak6pUFIWAbI="; }; cmakeFlags = [ From 75ec318b8000e5adfe27015607afffab346d72b5 Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 5 Jul 2022 16:30:29 +0300 Subject: [PATCH 08/26] wireplumber: 0.4.10 -> 0.4.11 --- pkgs/development/libraries/pipewire/wireplumber.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/pipewire/wireplumber.nix b/pkgs/development/libraries/pipewire/wireplumber.nix index f7b26d2809ad..6600e50f25ad 100644 --- a/pkgs/development/libraries/pipewire/wireplumber.nix +++ b/pkgs/development/libraries/pipewire/wireplumber.nix @@ -26,7 +26,7 @@ let in stdenv.mkDerivation rec { pname = "wireplumber"; - version = "0.4.10"; + version = "0.4.11"; outputs = [ "out" "dev" ] ++ lib.optional enableDocs "doc"; @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { owner = "pipewire"; repo = "wireplumber"; rev = version; - sha256 = "sha256-Z5Uqjw05SdEU9bGLuhdS+hDv7Fgqx4oW92k4AG1p3Ug="; + sha256 = "sha256-3NrzOsL0MekxMMXCFubEkazzSWFNsjUsX8n2ECcr7yY="; }; nativeBuildInputs = [ From df23b42a9aca5ef4abbd50b53cdfd5a301f9a489 Mon Sep 17 00:00:00 2001 From: kilianar Date: Tue, 5 Jul 2022 15:08:53 +0200 Subject: [PATCH 09/26] udocker: fix build failure use_2to3 was removed from setuptools with version 58.0.0. There is an upstream issue for this error (https://github.com/indigo-dc/udocker/issues/358) and has been resolved with commit https://github.com/indigo-dc/udocker/commit/9f7d6c5f9a3925bf87d000603c5b306d73bb0fa3. We apply this commit as a patch. Disable test_02__load_structure because it fails with a unittest.mock.InvalidSpecError. --- pkgs/tools/virtualization/udocker/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/tools/virtualization/udocker/default.nix b/pkgs/tools/virtualization/udocker/default.nix index 6584c5bee5c6..a20998477670 100644 --- a/pkgs/tools/virtualization/udocker/default.nix +++ b/pkgs/tools/virtualization/udocker/default.nix @@ -2,6 +2,7 @@ , fetchFromGitHub , singularity , python3Packages +, fetchpatch }: python3Packages.buildPythonApplication rec { @@ -24,11 +25,19 @@ python3Packages.buildPythonApplication rec { pycurl ]); + patches = [ + (fetchpatch { + url = "https://github.com/indigo-dc/udocker/commit/9f7d6c5f9a3925bf87d000603c5b306d73bb0fa3.patch"; + sha256 = "sha256-fiqvVqfdVIlILbSs6oDWmbWU9piZEI2oiAKUcmecx9Q="; + }) + ]; + checkInputs = with python3Packages; [ pytestCheckHook ]; disabledTests = [ + "test_02__load_structure" "test_05__get_volume_bindings" ]; From 5139952befe5f8f90b88e69f8dd3fe4592d758ac Mon Sep 17 00:00:00 2001 From: Sumner Evans Date: Tue, 5 Jul 2022 07:44:37 -0600 Subject: [PATCH 10/26] matrix-common: 1.1.0 -> 1.2.1 Signed-off-by: Sumner Evans --- pkgs/development/python-modules/matrix-common/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/matrix-common/default.nix b/pkgs/development/python-modules/matrix-common/default.nix index b1dd247987cf..324b3a2df06c 100644 --- a/pkgs/development/python-modules/matrix-common/default.nix +++ b/pkgs/development/python-modules/matrix-common/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "matrix_common"; - version = "1.1.0"; + version = "1.2.1"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-qCOHSK/Cs3B5gYNn/tUVbzVXcbB8j/ChdZNPR+D/MnY="; + sha256 = "sha256-qZ3PAqa9lbJKWmGzVIiKKskr8rS4OccnuN2dos36OFM="; }; propagatedBuildInputs = [ attrs ]; From 8c5079ef3e3d77692d0f127b3ae8b8a120ed71d0 Mon Sep 17 00:00:00 2001 From: Sumner Evans Date: Tue, 5 Jul 2022 07:41:03 -0600 Subject: [PATCH 11/26] matrix-synapse: 1.61.1 -> 1.62.0 Signed-off-by: Sumner Evans --- pkgs/servers/matrix-synapse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 438b370475c6..d719916e8a67 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -11,11 +11,11 @@ in with python3.pkgs; buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.61.1"; + version = "1.62.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-IB7YIqmWIJMxZVFWIF6HggVgjkCSok3YYMykV72p4us="; + sha256 = "sha256-14aHO13FCUEq3pwLUDvrI1au6i8Wykhc5d5C3tLpE3g="; }; buildInputs = [ openssl ]; From a264a86d935fae69558f363881d65a19a4f4d735 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Tue, 5 Jul 2022 10:32:11 -0300 Subject: [PATCH 12/26] nixos/qt5: add qt5ct as a possible platform theme --- nixos/modules/config/qt5.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/nixos/modules/config/qt5.nix b/nixos/modules/config/qt5.nix index eabba9ad95f0..f0ea6825db10 100644 --- a/nixos/modules/config/qt5.nix +++ b/nixos/modules/config/qt5.nix @@ -8,9 +8,11 @@ let isQGnome = cfg.platformTheme == "gnome" && builtins.elem cfg.style ["adwaita" "adwaita-dark"]; isQtStyle = cfg.platformTheme == "gtk2" && !(builtins.elem cfg.style ["adwaita" "adwaita-dark"]); + isQt5ct = cfg.platformTheme == "qt5ct"; packages = if isQGnome then [ pkgs.qgnomeplatform pkgs.adwaita-qt ] else if isQtStyle then [ pkgs.libsForQt5.qtstyleplugins ] + else if isQt5ct then [ pkgs.libsForQt5.qt5ct ] else throw "`qt5.platformTheme` ${cfg.platformTheme} and `qt5.style` ${cfg.style} are not compatible."; in @@ -26,11 +28,13 @@ in type = types.enum [ "gtk2" "gnome" + "qt5ct" ]; example = "gnome"; relatedPackages = [ "qgnomeplatform" ["libsForQt5" "qtstyleplugins"] + ["libsForQt5" "qt5ct"] ]; description = '' Selects the platform theme to use for Qt5 applications. @@ -48,6 +52,13 @@ in qgnomeplatform + + qt5ct + Use Qt style set using the + qt5ct + application. + + ''; }; @@ -96,7 +107,7 @@ in environment.variables.QT_QPA_PLATFORMTHEME = cfg.platformTheme; - environment.variables.QT_STYLE_OVERRIDE = cfg.style; + environment.variables.QT_STYLE_OVERRIDE = mkIf (! isQt5ct) cfg.style; environment.systemPackages = packages; From a71115488920ce212479a012ba241200826faaeb Mon Sep 17 00:00:00 2001 From: Benno Zeeman Date: Tue, 5 Jul 2022 16:54:44 +0200 Subject: [PATCH 13/26] blueman: 2.2.5 -> 2.3 Removed libappindicator dependency, which according to their changelog has been replaced with a "DBus StatusNotifierItem" --- pkgs/tools/bluetooth/blueman/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/bluetooth/blueman/default.nix b/pkgs/tools/bluetooth/blueman/default.nix index 2f59d14902bb..4b675c646f31 100644 --- a/pkgs/tools/bluetooth/blueman/default.nix +++ b/pkgs/tools/bluetooth/blueman/default.nix @@ -9,11 +9,11 @@ let in stdenv.mkDerivation rec { pname = "blueman"; - version = "2.2.5"; + version = "2.3"; src = fetchurl { url = "https://github.com/blueman-project/blueman/releases/download/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-yfPAqU3HyAvTIwS7Jf3tIU/jC3AY6e9Gsvy9HYA8fHw="; + sha256 = "sha256-M7pgl9M08XmJwIlPeCRrXgHTFJn5CoZOuTtc5WJv2uo="; }; nativeBuildInputs = [ @@ -23,7 +23,7 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ bluez gtk3 pythonPackages.python librsvg - gnome.adwaita-icon-theme iproute2 libappindicator networkmanager ] + gnome.adwaita-icon-theme iproute2 networkmanager ] ++ pythonPath ++ lib.optional withPulseAudio libpulseaudio; From 4b3793e092a0cb181b71c619d2968097e8077446 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 5 Jul 2022 13:56:58 +0000 Subject: [PATCH 14/26] python310Packages.rflink: 0.0.62 -> 0.0.63 --- pkgs/development/python-modules/rflink/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/rflink/default.nix b/pkgs/development/python-modules/rflink/default.nix index fa6f44ef616e..f966b7ccba9b 100644 --- a/pkgs/development/python-modules/rflink/default.nix +++ b/pkgs/development/python-modules/rflink/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "rflink"; - version = "0.0.62"; + version = "0.0.63"; format = "setuptools"; src = fetchFromGitHub { owner = "aequitas"; repo = "python-rflink"; - rev = version; - sha256 = "sha256-dEzkYE8xtUzvdsnPaSiQR8960WLOEcr/QhwDiQlobcs="; + rev = "refs/tags/${version}"; + sha256 = "sha256-BNKcXtsBB90KQe4HXmfJ7H3yepk1dEkozSEy5v8KSAA="; }; propagatedBuildInputs = [ From b28aebf8bbdbc5ea135683c17d064488565bf58b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 2 Jul 2022 13:23:11 +0000 Subject: [PATCH 15/26] python310Packages.splinter: 0.18.0 -> 0.18.1 --- pkgs/development/python-modules/splinter/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/splinter/default.nix b/pkgs/development/python-modules/splinter/default.nix index 2b4cef2e30f8..d4fef974fc01 100644 --- a/pkgs/development/python-modules/splinter/default.nix +++ b/pkgs/development/python-modules/splinter/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "splinter"; - version = "0.18.0"; + version = "0.18.1"; disabled = isPy27; @@ -22,8 +22,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "cobrateam"; repo = "splinter"; - rev = version; - hash = "sha256-kJ5S/fBesaxTbxCQ0yBR30+CfCV6U5jgbfDZA7eF6ac="; + rev = "refs/tags/${version}"; + hash = "sha256-5d39e9omc223ugBfVMIsMZh8+NPVxc6q7p2gwZ0fF0o="; }; propagatedBuildInputs = [ From 11c38f0a6bdc5baebadd903049f43b76c7b3b953 Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Tue, 5 Jul 2022 17:47:02 +0200 Subject: [PATCH 16/26] _1password-gui: 8.7.1 -> 8.7.3 --- pkgs/applications/misc/1password-gui/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/1password-gui/default.nix b/pkgs/applications/misc/1password-gui/default.nix index e39450e5bef0..0bae8412b247 100644 --- a/pkgs/applications/misc/1password-gui/default.nix +++ b/pkgs/applications/misc/1password-gui/default.nix @@ -44,11 +44,11 @@ let in stdenv.mkDerivation rec { pname = "1password"; - version = "8.7.1"; + version = "8.7.3"; src = fetchurl { url = "https://downloads.1password.com/linux/tar/stable/x86_64/1password-${version}.x64.tar.gz"; - sha256 = "sha256-ykD2reAL5spSoCpfGTFOE/yERdooYUsWmo45rpRe/Fw="; + sha256 = "sha256-1JMSUKbeqcyz5SJLrPD9kaqSlPI0pZVMXFjRuMIvwqo="; }; nativeBuildInputs = [ makeWrapper ]; From 04d6b89bcc7b21f06259b040659b60d918a5df70 Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Tue, 5 Jul 2022 17:47:25 +0200 Subject: [PATCH 17/26] _1password-gui-beta: 8.8.0-119.BETA -> 8.8.0-165.BETA --- pkgs/applications/misc/1password-gui/beta.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/1password-gui/beta.nix b/pkgs/applications/misc/1password-gui/beta.nix index 9f0d9d62e053..871f07440e83 100644 --- a/pkgs/applications/misc/1password-gui/beta.nix +++ b/pkgs/applications/misc/1password-gui/beta.nix @@ -44,11 +44,11 @@ let in stdenv.mkDerivation rec { pname = "1password"; - version = "8.8.0-119.BETA"; + version = "8.8.0-165.BETA"; src = fetchurl { url = "https://downloads.1password.com/linux/tar/beta/x86_64/1password-${version}.x64.tar.gz"; - sha256 = "sha256-MnfO41r86jLGI9R30trCPR+BwXVKACyrB3dWSbPbBIA="; + sha256 = "sha256-ZpKAkuIMeHEFdz/od/sKDh8VXoWOZYO8GjvMiho3D4A="; }; nativeBuildInputs = [ makeWrapper ]; From 47ba8cdcc7096242bd98f9d9631fa9dd4974cf53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Tue, 5 Jul 2022 13:33:37 -0300 Subject: [PATCH 18/26] nixos/qt5: add maintainer --- nixos/modules/config/qt5.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/config/qt5.nix b/nixos/modules/config/qt5.nix index f0ea6825db10..542a96ba6b06 100644 --- a/nixos/modules/config/qt5.nix +++ b/nixos/modules/config/qt5.nix @@ -18,6 +18,7 @@ let in { + meta.maintainers = [ maintainers.romildo ]; options = { qt5 = { From 2f19bff1b14cf94472c871a164b10123c1d5115e Mon Sep 17 00:00:00 2001 From: kilianar Date: Tue, 5 Jul 2022 17:17:01 +0200 Subject: [PATCH 19/26] kopia: 0.11.0 -> 0.11.1 https://github.com/kopia/kopia/releases/tag/v0.11.1 --- pkgs/tools/backup/kopia/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/backup/kopia/default.nix b/pkgs/tools/backup/kopia/default.nix index e75a09e70cf2..879f85a9406c 100644 --- a/pkgs/tools/backup/kopia/default.nix +++ b/pkgs/tools/backup/kopia/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kopia"; - version = "0.11.0"; + version = "0.11.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-iTtqo5uP6sCGGqy/yguTxUo/svILRYSq75WlnieSceU="; + sha256 = "sha256-Az3l11J2IhgugPHP3cMT7b2iwQ/TCbdjYKvmHG3c7II="; }; vendorSha256 = "sha256-phQ39li/iCoZFwmaKel6r4bRV8NZXbQhNgWdJbyqdIo="; From 097b70ec5c3aede047a2c3322933bf3c2fb075f5 Mon Sep 17 00:00:00 2001 From: Claudio Bley Date: Tue, 5 Jul 2022 17:31:00 +0200 Subject: [PATCH 20/26] wtf: Set `meta.mainProgram` to "wtfutil" This allows one to `nix run nixpkgs#wtf`. --- pkgs/applications/misc/wtf/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/misc/wtf/default.nix b/pkgs/applications/misc/wtf/default.nix index e29d58039a04..0ba8c5a97ad9 100644 --- a/pkgs/applications/misc/wtf/default.nix +++ b/pkgs/applications/misc/wtf/default.nix @@ -38,6 +38,7 @@ buildGoModule rec { changelog = "https://github.com/wtfutil/wtf/raw/v${version}/CHANGELOG.md"; license = licenses.mpl20; maintainers = with maintainers; [ kalbasit ]; + mainProgram = "wtfutil"; platforms = platforms.linux ++ platforms.darwin; broken = stdenv.isDarwin; }; From 68cc57cce147e52f382802c8b257c8f319aac173 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Tue, 5 Jul 2022 10:32:54 -0300 Subject: [PATCH 21/26] nixos/qt5ct: remove enable option and suggests qt5.platformTheme This module should be removed after a nixos release cycle --- nixos/modules/programs/qt5ct.nix | 30 ++++-------------------------- 1 file changed, 4 insertions(+), 26 deletions(-) diff --git a/nixos/modules/programs/qt5ct.nix b/nixos/modules/programs/qt5ct.nix index 88e861bf4031..3ff47b355915 100644 --- a/nixos/modules/programs/qt5ct.nix +++ b/nixos/modules/programs/qt5ct.nix @@ -1,31 +1,9 @@ -{ config, lib, pkgs, ... }: +{ lib, ... }: with lib; { - meta.maintainers = [ maintainers.romildo ]; - - ###### interface - options = { - programs.qt5ct = { - enable = mkOption { - default = false; - type = types.bool; - description = '' - Whether to enable the Qt5 Configuration Tool (qt5ct), a - program that allows users to configure Qt5 settings (theme, - font, icons, etc.) under desktop environments or window - manager without Qt integration. - - Official home page: https://sourceforge.net/projects/qt5ct/ - ''; - }; - }; - }; - - ###### implementation - config = mkIf config.programs.qt5ct.enable { - environment.variables.QT_QPA_PLATFORMTHEME = "qt5ct"; - environment.systemPackages = with pkgs; [ libsForQt5.qt5ct ]; - }; + imports = [ + (mkRemovedOptionModule [ "programs" "qt5ct" "enable" ] "Use qt5.platformTheme = \"qt5ct\" instead.") + ]; } From 2a478c942a672d588e33daef7c5ae4d9a7b83265 Mon Sep 17 00:00:00 2001 From: kilianar Date: Tue, 5 Jul 2022 16:32:05 +0200 Subject: [PATCH 22/26] broot: 1.13.3 -> 1.14.0 https://github.com/Canop/broot/releases/tag/v1.14.0 --- pkgs/tools/misc/broot/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/broot/default.nix b/pkgs/tools/misc/broot/default.nix index dc7a92c4bef0..dadfa61e3cdd 100644 --- a/pkgs/tools/misc/broot/default.nix +++ b/pkgs/tools/misc/broot/default.nix @@ -15,14 +15,14 @@ rustPlatform.buildRustPackage rec { pname = "broot"; - version = "1.13.3"; + version = "1.14.0"; src = fetchCrate { inherit pname version; - sha256 = "sha256-OiBmgXGyxEIS7rkRmJbEZdoWPk27j+QD5I+mqJSSxH0="; + sha256 = "sha256-1QL2EUq/lAev1HiXmPZ8n9sCYjWUTd5aWmmyCR6UsDw="; }; - cargoHash = "sha256-qc68n8bxKuzqnhwS+d33hC4PWZJG1UQMytQUGyJd1bc="; + cargoHash = "sha256-pw4eWIwAtrNvCumcjxR7TVdo2Imm+sM1elkUKYVQSkQ="; nativeBuildInputs = [ installShellFiles From 89100132771105e851d4f9e43207ef8f59dcb9b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 5 Jul 2022 09:26:44 +0200 Subject: [PATCH 23/26] dendrite: 0.8.8 -> 0.8.9 --- pkgs/servers/dendrite/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/dendrite/default.nix b/pkgs/servers/dendrite/default.nix index 9ea9aceb117e..eaf4c9ed1bb0 100644 --- a/pkgs/servers/dendrite/default.nix +++ b/pkgs/servers/dendrite/default.nix @@ -3,16 +3,16 @@ buildGoModule rec { pname = "matrix-dendrite"; - version = "0.8.8"; + version = "0.8.9"; src = fetchFromGitHub { owner = "matrix-org"; repo = "dendrite"; rev = "v${version}"; - sha256 = "sha256-kQSzTFqmxcLi0BNxrd8a9TVBh3IfkHfZgPvafO9I++8="; + sha256 = "sha256-+B7+hstJfkRnzu/u3afRImhzeFrFkth1MMGdAiV3vN8="; }; - vendorSha256 = "sha256-axR+tZH8kwqEIZm0899umTsEkzNKSbi6NdbUv8o+80A="; + vendorSha256 = "sha256-tKvXM+pnhoysucBRLMSbm1bR2SIQmTZjVZbJ0lnLaMw="; checkInputs = [ postgresqlTestHook From d10999d7335191ec644cf89ba81624a73300f893 Mon Sep 17 00:00:00 2001 From: "Yang, Bo" Date: Tue, 5 Jul 2022 17:08:02 +0000 Subject: [PATCH 24/26] Add knownVulnerabilities to libdwarf --- pkgs/development/libraries/libdwarf/0.4.nix | 1 + pkgs/development/libraries/libdwarf/common.nix | 3 ++- pkgs/development/libraries/libdwarf/default.nix | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libdwarf/0.4.nix b/pkgs/development/libraries/libdwarf/0.4.nix index bbe93ddbdcc0..c5b14f5a05ef 100644 --- a/pkgs/development/libraries/libdwarf/0.4.nix +++ b/pkgs/development/libraries/libdwarf/0.4.nix @@ -4,4 +4,5 @@ callPackage ./common.nix rec { url = "https://www.prevanders.net/libdwarf-${version}.tar.xz"; sha512 = "793fe487de80fe6878f022b90f49ec334a0d7db071ff22a11902db5e3457cc7f3f853945a9ac74de2c40f7f388277f21c5b2e62745bca92d2bb55c51e9577693"; buildInputs = [ zlib ]; + knownVulnerabilities = []; } diff --git a/pkgs/development/libraries/libdwarf/common.nix b/pkgs/development/libraries/libdwarf/common.nix index 7087e833c0ed..32dc6eaa6e4e 100644 --- a/pkgs/development/libraries/libdwarf/common.nix +++ b/pkgs/development/libraries/libdwarf/common.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, buildInputs, sha512, version, libelf, url }: +{ lib, stdenv, fetchurl, buildInputs, sha512, version, libelf, url, knownVulnerabilities }: stdenv.mkDerivation rec { pname = "libdwarf"; @@ -19,5 +19,6 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; license = lib.licenses.lgpl21Plus; maintainers = [ lib.maintainers.atry ]; + inherit knownVulnerabilities; }; } diff --git a/pkgs/development/libraries/libdwarf/default.nix b/pkgs/development/libraries/libdwarf/default.nix index 2b105027bd16..5bb2d6aa6f72 100644 --- a/pkgs/development/libraries/libdwarf/default.nix +++ b/pkgs/development/libraries/libdwarf/default.nix @@ -4,4 +4,5 @@ callPackage ./common.nix rec { url = "https://www.prevanders.net/libdwarf-${version}.tar.gz"; sha512 = "e0f9c88554053ee6c1b1333960891189e7820c4a4ddc302b7e63754a4cdcfc2acb1b4b6083a722d1204a75e994fff3401ecc251b8c3b24090f8cb4046d90f870"; buildInputs = [ zlib libelf ]; + knownVulnerabilities = [ "CVE-2022-32200" ]; } From eded0d654ceffd5d29113c396af268bcbfea0b8d Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Sun, 3 Jul 2022 17:53:45 -0400 Subject: [PATCH 25/26] octomap: 1.9.7 -> 1.9.8 --- pkgs/development/libraries/octomap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/octomap/default.nix b/pkgs/development/libraries/octomap/default.nix index e35a0df79f08..9b1635511ec6 100644 --- a/pkgs/development/libraries/octomap/default.nix +++ b/pkgs/development/libraries/octomap/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "octomap"; - version = "1.9.7"; + version = "1.9.8"; src = fetchFromGitHub { owner = "OctoMap"; repo = pname; rev = "v${version}"; - sha256 = "1pb58w6vka7wzs533lcy7i6y5nwjfrzy6b35fhrb1dhq2mgszc79"; + hash = "sha256-qE5i4dGugm7tR5tgDCpbla/R7hYR/PI8BzrZQ4y6Yz8="; }; sourceRoot = "source/octomap"; From 0c564ffe7876338179c32ff9a6b63c36eb0c6a25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Tue, 5 Jul 2022 19:27:16 +0200 Subject: [PATCH 26/26] python3Packages.pyuv: backport python3.10 build fix (There's no upstream issue about it yet, but pyuv fails to build against python3.11, so keep the "disabled" attribute for that.) Fixes https://github.com/NixOS/nixpkgs/issues/179857. --- pkgs/development/python-modules/pyuv/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pyuv/default.nix b/pkgs/development/python-modules/pyuv/default.nix index 2f1870dd1c85..fc5b04417a4f 100644 --- a/pkgs/development/python-modules/pyuv/default.nix +++ b/pkgs/development/python-modules/pyuv/default.nix @@ -2,13 +2,14 @@ , buildPythonPackage , pythonAtLeast , fetchFromGitHub +, fetchpatch , libuv }: buildPythonPackage rec { pname = "pyuv"; version = "1.4.0"; - disabled = pythonAtLeast "3.10"; # https://github.com/saghul/pyuv/issues/273 + disabled = pythonAtLeast "3.11"; src = fetchFromGitHub { owner = "saghul"; @@ -17,6 +18,14 @@ buildPythonPackage rec { sha256 = "1wiwwdylz66lfsjh6p4iv7pfhzvnhwjk332625njizfhz3gq9fwr"; }; + patches = [ + (fetchpatch { + name = "fix-build-with-python3.10.patch"; + url = "https://github.com/saghul/pyuv/commit/8bddcc27052017b5b9cb89c24dbfdf06737b0dd3.patch"; + sha256 = "sha256-J/3ky64Ff+gYpN3ksFLNuZ5xgPbBkyOl4LTY6fiHAgk="; + }) + ]; + setupPyBuildFlags = [ "--use-system-libuv" ]; buildInputs = [ libuv ];