From b6795a6ae9ae06fa487e413cbbb23b696e018e66 Mon Sep 17 00:00:00 2001 From: sodiboo Date: Fri, 22 Nov 2024 13:08:54 +0100 Subject: [PATCH] update buncha shit: most notably Sharkey and kernel critical security fix for Sharkey; but first kernel must be upgraded because of https://github.com/NixOS/nixpkgs/issues/353709 which caused me pain for WEEKS. i had pnpm running for dozens of days! at one point, four instances at once! awful pain. thankfully fixed now i could just upgrade linux lol --- flake.lock | 191 ++++++++++++++++++++------------------------ sharkey/package.nix | 6 +- 2 files changed, 90 insertions(+), 107 deletions(-) diff --git a/flake.lock b/flake.lock index caec41f..853662a 100644 --- a/flake.lock +++ b/flake.lock @@ -28,11 +28,11 @@ "fromYaml": "fromYaml" }, "locked": { - "lastModified": 1708890466, - "narHash": "sha256-LlrC09LoPi8OPYOGPXegD72v+//VapgAqhbOFS3i8sc=", + "lastModified": 1732200724, + "narHash": "sha256-+R1BH5wHhfnycySb7Sy5KbYEaTJZWm1h+LW1OtyhiTs=", "owner": "SenchoPens", "repo": "base16.nix", - "rev": "665b3c6748534eb766c777298721cece9453fdae", + "rev": "153d52373b0fb2d343592871009a286ec8837aec", "type": "github" }, "original": { @@ -221,11 +221,11 @@ "rocksdb": "rocksdb" }, "locked": { - "lastModified": 1729828262, - "narHash": "sha256-tFA1obQW6AVHEdPG0YbOtccRcmo3Qg8ncFs9unVgGmY=", + "lastModified": 1732119245, + "narHash": "sha256-pc9mym6S6AmbL5RI0zFAG1EmswuEBWUY7V7QekKMFsU=", "owner": "girlbossceo", "repo": "conduwuit", - "rev": "16014e15946132160a40fa057387aadbea1550e4", + "rev": "ee3c58f78f88464c1ba8b01812c8bd7de7f1b29a", "type": "github" }, "original": { @@ -629,11 +629,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1726560853, - "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -700,11 +700,11 @@ "fromYaml": { "flake": false, "locked": { - "lastModified": 1689549921, - "narHash": "sha256-iX0pk/uB019TdBGlaJEWvBCfydT6sRq+eDcGPifVsCM=", + "lastModified": 1731966426, + "narHash": "sha256-lq95WydhbUTWig/JpqiB7oViTcHFP8Lv41IGtayokA8=", "owner": "SenchoPens", "repo": "fromYaml", - "rev": "11fbbbfb32e3289d3c631e0134a23854e7865c84", + "rev": "106af9e2f715e2d828df706c386a685698f3223b", "type": "github" }, "original": { @@ -789,11 +789,11 @@ ] }, "locked": { - "lastModified": 1731235328, - "narHash": "sha256-NjavpgE9/bMe/ABvZpyHIUeYF1mqR5lhaep3wB79ucs=", + "lastModified": 1732025103, + "narHash": "sha256-qjEI64RKvDxRyEarY0jTzrZMa8ebezh2DEZmJJrpVdo=", "owner": "nix-community", "repo": "home-manager", - "rev": "60bb110917844d354f3c18e05450606a435d2d10", + "rev": "a46e702093a5c46e192243edbd977d5749e7f294", "type": "github" }, "original": { @@ -810,11 +810,11 @@ ] }, "locked": { - "lastModified": 1724435763, - "narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=", + "lastModified": 1730837930, + "narHash": "sha256-0kZL4m+bKBJUBQse0HanewWO0g8hDdCvBhudzxgehqc=", "owner": "nix-community", "repo": "home-manager", - "rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be", + "rev": "2f607e07f3ac7e53541120536708e824acccfaa8", "type": "github" }, "original": { @@ -848,11 +848,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1731240728, - "narHash": "sha256-a0xQE3cwZLMsycd9NneFC3z29E+z1PSD/ozhISM7qYQ=", + "lastModified": 1731845570, + "narHash": "sha256-5reOtlm18XLnh3ezruPOg2wQO+MB7ztsFaIzSUAzeh8=", "owner": "nix-community", "repo": "lib-aggregate", - "rev": "807ab623e6d01e931269a28a07c59dcfd6474173", + "rev": "7a1d37b2b16f32536628df9cea6a2003d79a49f9", "type": "github" }, "original": { @@ -938,11 +938,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1731269425, - "narHash": "sha256-qgwdIlBWvSN+mThrvjfo6rRnkLVBThZggrCytDuzdM0=", + "lastModified": 1732261496, + "narHash": "sha256-GLPyY+OMmiTMPXUwwdFiM4GVwouOSh/hLoPg5D6X2bc=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "28e1701eda8eac4aa0da250cb50dfd1017235795", + "rev": "d4b0bc42a58a4cee1deb19d7d8350384e9aa4240", "type": "github" }, "original": { @@ -954,16 +954,16 @@ "niri-stable": { "flake": false, "locked": { - "lastModified": 1731164272, - "narHash": "sha256-ea15x8+AAm90aeU1zNWXzX7ZfenzQRUgORyjOdn4Uoc=", + "lastModified": 1731483594, + "narHash": "sha256-Qjf7alRbPPERfiZsM9EMKX+HwjESky1tieh5PJIkLwE=", "owner": "YaLTeR", "repo": "niri", - "rev": "9d8f640503819ff1905c9040d3c7910a50400bbd", + "rev": "75c79116a7e40cbc0e110ce0cdd500e896458679", "type": "github" }, "original": { "owner": "YaLTeR", - "ref": "v0.1.10", + "ref": "v0.1.10.1", "repo": "niri", "type": "github" } @@ -971,11 +971,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1731221223, - "narHash": "sha256-E9lhNv83Z4R+c2H+ymLgybHZ+KylU0QHzO7sh5IHD/E=", + "lastModified": 1732257446, + "narHash": "sha256-xTqbonT9ZJ1PkgDvftoyMYuDul8J4VJccOtsOeRorZM=", "owner": "YaLTeR", "repo": "niri", - "rev": "010a2368823bc3959c1468609cd05367e5b6d0b6", + "rev": "c239937fac836f308311eff5f5d5fc5262c6eb55", "type": "github" }, "original": { @@ -1039,11 +1039,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1731250407, - "narHash": "sha256-AwyDiazOqBZBUPp0vqYEzvBseZo3Eg16mfjAFvKv2lc=", + "lastModified": 1731682758, + "narHash": "sha256-o54e8oNPPNmU7zHm3uTvsbbQLi7EKX3S6EEndXFG594=", "owner": "nix-community", "repo": "nix-eval-jobs", - "rev": "96902c4573cd03ea7e533634cb49861148f49a7a", + "rev": "d926bcd5206c0b7afe47bed92557c8cd5e882b36", "type": "github" }, "original": { @@ -1125,11 +1125,11 @@ ] }, "locked": { - "lastModified": 1731209121, - "narHash": "sha256-BF7FBh1hIYPDihdUlImHGsQzaJZVLLfYqfDx41wjuF0=", + "lastModified": 1731814505, + "narHash": "sha256-l9ryrx1Twh08a+gxrMGM9O/aZKEimZfa6sZVyPCImgI=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "896019f04b22ce5db4c0ee4f89978694f44345c3", + "rev": "bdba246946fb079b87b4cada4df9b1cdf1c06132", "type": "github" }, "original": { @@ -1223,11 +1223,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1730919458, - "narHash": "sha256-yMO0T0QJlmT/x4HEyvrCyigGrdYfIXX3e5gWqB64wLg=", + "lastModified": 1731797098, + "narHash": "sha256-UhWmEZhwJZmVZ1jfHZFzCg+ZLO9Tb/v3Y6LC0UNyeTo=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "e1cc1f6483393634aee94514186d21a4871e78d7", + "rev": "672ac2ac86f7dff2f6f3406405bddecf960e0db6", "type": "github" }, "original": { @@ -1270,11 +1270,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1731200463, - "narHash": "sha256-qDaAweJjdFbVExqs8aG27urUgcgKufkIngHW3Rzustg=", + "lastModified": 1731805462, + "narHash": "sha256-yhEMW4MBi+IAyEJyiKbnFvY1uARyMKJpLUhkczI49wk=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "e04234d263750db01c78a412690363dc2226e68a", + "rev": "b9f04e3cf71c23bea21d2768051e6b3068d44734", "type": "github" }, "original": { @@ -1365,11 +1365,11 @@ }, "nixpkgs-stable_3": { "locked": { - "lastModified": 1730963269, - "narHash": "sha256-rz30HrFYCHiWEBCKHMffHbMdWJ35hEkcRVU0h7ms3x0=", + "lastModified": 1731797254, + "narHash": "sha256-df3dJApLPhd11AlueuoN0Q4fHo/hagP75LlM5K1sz9g=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "83fb6c028368e465cd19bb127b86f971a5e41ebc", + "rev": "e8c38b73aeb218e27163376a2d617e61a2ad9b59", "type": "github" }, "original": { @@ -1381,11 +1381,11 @@ }, "nixpkgs-stable_4": { "locked": { - "lastModified": 1730963269, - "narHash": "sha256-rz30HrFYCHiWEBCKHMffHbMdWJ35hEkcRVU0h7ms3x0=", + "lastModified": 1731797254, + "narHash": "sha256-df3dJApLPhd11AlueuoN0Q4fHo/hagP75LlM5K1sz9g=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "83fb6c028368e465cd19bb127b86f971a5e41ebc", + "rev": "e8c38b73aeb218e27163376a2d617e61a2ad9b59", "type": "github" }, "original": { @@ -1395,22 +1395,6 @@ "type": "github" } }, - "nixpkgs-stable_5": { - "locked": { - "lastModified": 1730602179, - "narHash": "sha256-efgLzQAWSzJuCLiCaQUCDu4NudNlHdg2NzGLX5GYaEY=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "3c2f1c4ca372622cb2f9de8016c9a0b1cbd0f37c", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "release-24.05", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs-wayland": { "inputs": { "flake-compat": "flake-compat_5", @@ -1419,11 +1403,11 @@ "nixpkgs": "nixpkgs_11" }, "locked": { - "lastModified": 1731274007, - "narHash": "sha256-ux6QEqZvDAkibypjz6cgd8mGVET6SV5Xocwd/mAfxZ4=", + "lastModified": 1732217673, + "narHash": "sha256-0STXOFhEKCp/WzZ2jZ1qQF/8Ry+vKD3gsWrRoq5i6pY=", "owner": "nix-community", "repo": "nixpkgs-wayland", - "rev": "158e6cfbd6fdabc0a03a7271c0d8e8563e1a95dc", + "rev": "e5856391c85581a74d3ee7bb53c8b3a9902a484e", "type": "github" }, "original": { @@ -1466,11 +1450,11 @@ }, "nixpkgs_11": { "locked": { - "lastModified": 1731139594, - "narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=", + "lastModified": 1732014248, + "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", "owner": "nixos", "repo": "nixpkgs", - "rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2", + "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367", "type": "github" }, "original": { @@ -1482,11 +1466,11 @@ }, "nixpkgs_12": { "locked": { - "lastModified": 1730272153, - "narHash": "sha256-B5WRZYsRlJgwVHIV6DvidFN7VX7Fg9uuwkRW9Ha8z+w=", + "lastModified": 1731763621, + "narHash": "sha256-ddcX4lQL0X05AYkrkV2LMFgGdRvgap7Ho8kgon3iWZk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2d2a9ddbe3f2c00747398f3dc9b05f7f2ebb0f53", + "rev": "c69a9bffbecde46b4b939465422ddc59493d3e4d", "type": "github" }, "original": { @@ -1498,11 +1482,11 @@ }, "nixpkgs_13": { "locked": { - "lastModified": 1725194671, - "narHash": "sha256-tLGCFEFTB5TaOKkpfw3iYT9dnk4awTP/q4w+ROpMfuw=", + "lastModified": 1731531548, + "narHash": "sha256-sz8/v17enkYmfpgeeuyzniGJU0QQBfmAjlemAUYhfy8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b833ff01a0d694b910daca6e2ff4a3f26dee478c", + "rev": "24f0d4acd634792badd6470134c387a3b039dace", "type": "github" }, "original": { @@ -1608,11 +1592,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1731139594, - "narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=", + "lastModified": 1732014248, + "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2", + "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367", "type": "github" }, "original": { @@ -1640,11 +1624,11 @@ }, "nixpkgs_9": { "locked": { - "lastModified": 1731139594, - "narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=", + "lastModified": 1732014248, + "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2", + "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367", "type": "github" }, "original": { @@ -1746,16 +1730,16 @@ "rocksdb": { "flake": false, "locked": { - "lastModified": 1729712930, - "narHash": "sha256-jlp4kPkRTpoJaUdobEoHd8rCGAQNBy4ZHZ6y5zL/ibw=", + "lastModified": 1731690620, + "narHash": "sha256-Xd4TJYqPERMJLXaGa6r6Ny1Wlw8Uy5Cyf/8q7nS58QM=", "owner": "girlbossceo", "repo": "rocksdb", - "rev": "871eda6953c3f399aae39808dcfccdd014885beb", + "rev": "292446aa2bc41699204d817a1e4b091679a886eb", "type": "github" }, "original": { "owner": "girlbossceo", - "ref": "v9.7.3", + "ref": "v9.7.4", "repo": "rocksdb", "type": "github" } @@ -1841,11 +1825,11 @@ }, "sodipkgs-stackblur-go": { "locked": { - "lastModified": 1716148251, - "narHash": "sha256-5xKr3rW2SgwZX006DwDskBemF03SRiW0qnvu+z57ejw=", + "lastModified": 1732213349, + "narHash": "sha256-rTH+2GCmvYBR9JddE/o11zLIt6DQ3j2vaNFFTQFwIrM=", "owner": "sodiboo", "repo": "nixpkgs", - "rev": "2e61428cedfaf1fc3deaa583c13160ec1a2ad856", + "rev": "c824630f080e5faaa7b45ba1893dfe12d5a1d3a1", "type": "github" }, "original": { @@ -1857,15 +1841,14 @@ }, "sops-nix": { "inputs": { - "nixpkgs": "nixpkgs_12", - "nixpkgs-stable": "nixpkgs-stable_5" + "nixpkgs": "nixpkgs_12" }, "locked": { - "lastModified": 1731213149, - "narHash": "sha256-jR8i6nFLmSmm0cIoeRQ8Q4EBARa3oGaAtEER/OMMxus=", + "lastModified": 1732186149, + "narHash": "sha256-N9JGWe/T8BC0Tss2Cv30plvZUYoiRmykP7ZdY2on2b0=", "owner": "Mic92", "repo": "sops-nix", - "rev": "f1675e3b0e1e663a4af49be67ecbc9e749f85eb7", + "rev": "53c853fb1a7e4f25f68805ee25c83d5de18dc699", "type": "github" }, "original": { @@ -1891,11 +1874,11 @@ "tinted-tmux": "tinted-tmux" }, "locked": { - "lastModified": 1731090365, - "narHash": "sha256-ti3gXhgVpIUL/7w6zDJuH+hOnyTZqxrIX/yYqALmiEI=", + "lastModified": 1732261424, + "narHash": "sha256-8uTKUHkaU980J5kRnLYrdwmjZYB88eBGUk1oVgIUHFE=", "owner": "danth", "repo": "stylix", - "rev": "6863412636c8f2cb3b7360f747fbd020fbfddf68", + "rev": "b667a340730dd3d0596083aa7c949eef01367c62", "type": "github" }, "original": { @@ -2090,11 +2073,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1731123454, - "narHash": "sha256-W1UUok7DPi4IXCYtc273FbVH1ifuCIcl+oO6CDqt8Dk=", + "lastModified": 1732233710, + "narHash": "sha256-gWf9dX6DVx0ssK2G3yrFG9yMT9UU0mDwyD51z/Q6FTA=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "3e6f892d20d918479e67d1e6c90c4be824a9d4ab", + "rev": "02f30546264ff8407cbb39528b3a3cc3045e53c1", "type": "github" }, "original": { @@ -2110,11 +2093,11 @@ ] }, "locked": { - "lastModified": 1731201824, - "narHash": "sha256-A1Kc1YwPMKWzNVqL3kL2MXpdM5fNp+wsHXoKuADas8A=", + "lastModified": 1732047915, + "narHash": "sha256-bSvczDRlTAZtjJeGTfglDjopCuvogwGkZlI/pxDiWkU=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "9346d7ad60c4bb155e3868385d7c8f974280ff25", + "rev": "e5f1e12791208a336e7d6d503719e47135443267", "type": "github" }, "original": { diff --git a/sharkey/package.nix b/sharkey/package.nix index 48fd72f..7f733e9 100644 --- a/sharkey/package.nix +++ b/sharkey/package.nix @@ -18,14 +18,14 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "sharkey"; - version = "2024.8.2"; + version = "2024.9.3"; src = fetchFromGitLab { owner = "TransFem-org"; repo = "Sharkey"; domain = "activitypub.software"; rev = finalAttrs.version; - hash = "sha256-2mxFo/gbiSLniqoGG5hoAYKHJHB4Zm5HEwMhMgDDK6Y="; + hash = "sha256-K1Q/sEjLEimfTwpmtGoNmlDs5dTPwHuHLBC+I9g7RrA="; fetchSubmodules = true; }; @@ -62,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: { dontBuild = true; outputHashMode = "recursive"; - outputHash = "sha256-tOXFTe/0DeWm3bWLfCJjpjcp+plDFsMJ4rqCmMsOxCw="; + outputHash = "sha256-PpXmNBO4pWj8AG0we4DpPhzfx/18rwDZHi86+esFghM="; }; nativeBuildInputs = [