From 8c6a42368425835bd691ceb9a4d7879354e20385 Mon Sep 17 00:00:00 2001 From: ulic-youthlic Date: Fri, 30 Jan 2026 22:20:02 +0800 Subject: [PATCH] chore: Update system flake inputs --- flake.lock | 197 ++++++++++-------- flake.nix | 6 + overlays/modifications/default.nix | 3 + overlays/modifications/fix-ffmpeg_7-full.nix | 14 ++ .../fix-kdePackages.kdenlive.nix | 9 + 5 files changed, 139 insertions(+), 90 deletions(-) create mode 100644 overlays/modifications/fix-ffmpeg_7-full.nix create mode 100644 overlays/modifications/fix-kdePackages.kdenlive.nix diff --git a/flake.lock b/flake.lock index fe7e126..f4a4145 100644 --- a/flake.lock +++ b/flake.lock @@ -137,11 +137,11 @@ ] }, "locked": { - "lastModified": 1766150702, - "narHash": "sha256-P0kM+5o+DKnB6raXgFEk3azw8Wqg5FL6wyl9jD+G5a4=", + "lastModified": 1769524058, + "narHash": "sha256-zygdD6X1PcVNR2PsyK4ptzrVEiAdbMqLos7utrMDEWE=", "owner": "nix-community", "repo": "disko", - "rev": "916506443ecd0d0b4a0f4cf9d40a3c22ce39b378", + "rev": "71a3fc97d80881e91710fe721f1158d3b96ae14d", "type": "github" }, "original": { @@ -153,11 +153,11 @@ "doomemacs": { "flake": false, "locked": { - "lastModified": 1767773143, - "narHash": "sha256-QL/t9v2kFNxBDyNJb/s411o3mxujan+QX5IZglTdpTk=", + "lastModified": 1768984347, + "narHash": "sha256-VvC4rgAAaFnYLCdcUoz7dTE3kuBNuHIc+GlXOrPCxpg=", "owner": "doomemacs", "repo": "doomemacs", - "rev": "3e15fb36d7f94f0a218bda977be4d3f5da983a71", + "rev": "57818a6da90fbef39ff80d62fab2cd319496c3b9", "type": "github" }, "original": { @@ -172,11 +172,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1768703823, - "narHash": "sha256-oonTamz3/eaJ9QqJWUWKpIXI3PtxP3j5rTGqSKscREo=", + "lastModified": 1769824510, + "narHash": "sha256-eR1c/iKIHUXYW/PthilPJPO4/DnHQcVp2IpdIkgHJaw=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "42822bddba89071d6a3f0c17644ada71de09fbbd", + "rev": "656fc2edb2d52e7cc547290df5e955325a80c0f8", "type": "github" }, "original": { @@ -195,11 +195,11 @@ ] }, "locked": { - "lastModified": 1768616209, - "narHash": "sha256-X5A9sNji2KkCKTHWScqxSbePKuw02G1uRiYTgAmY4ZY=", + "lastModified": 1769676024, + "narHash": "sha256-OT08V+jMGDsIOW13IFnnobCp05uMv5e+tHNUG+dBBZo=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "9105cf487aead6b5960a08153610c87936c88e36", + "rev": "18760112ac0d63955060cddbe99881d18a94a23d", "type": "github" }, "original": { @@ -342,11 +342,11 @@ ] }, "locked": { - "lastModified": 1765835352, - "narHash": "sha256-XswHlK/Qtjasvhd1nOa1e8MgZ8GS//jBoTqWtrS1Giw=", + "lastModified": 1768135262, + "narHash": "sha256-PVvu7OqHBGWN16zSi6tEmPwwHQ4rLPU9Plvs8/1TUBY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "a34fae9c08a15ad73f295041fec82323541400a9", + "rev": "80daad04eddbbf5a4d883996a73f3f542fa437ac", "type": "github" }, "original": { @@ -490,11 +490,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1768367261, - "narHash": "sha256-fRFNRmMcf0pZyE5nGCSkr/8l1bT1YOhCLGgpUMQlQ+E=", + "lastModified": 1769721111, + "narHash": "sha256-mwB7UaBiIY7trRH3rJXAMHOrjtcXRAEnp2LGoKzsc34=", "owner": "helix-editor", "repo": "helix", - "rev": "594b5655aa496c6c2539509eb00d5abd082ce89e", + "rev": "476ae24cc40b5a81522cbf37efe848860b44f434", "type": "github" }, "original": { @@ -511,11 +511,11 @@ ] }, "locked": { - "lastModified": 1768707181, - "narHash": "sha256-GdwFfnwdUgABFpc4sAmX7GYx8eQs6cEjOPo6nBJ0YaI=", + "lastModified": 1769813945, + "narHash": "sha256-9ABv9Lo9t6MrFjlnRnU8Zw1C6LVj2+R8PipQ/rxGLHk=", "owner": "nix-community", "repo": "home-manager", - "rev": "83bcb17377f0242376a327e742e9404e9a528647", + "rev": "475921375def3eb930e1f8883f619ff8609accb6", "type": "github" }, "original": { @@ -608,11 +608,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1768694683, - "narHash": "sha256-pB512IZ8jDu8BQ45gv3UoVCwLUoPDM82Tg5wIBb93bo=", + "lastModified": 1769731486, + "narHash": "sha256-FubWXQX1k1qyVKWiGNVSw2bQ2TD739PRqRsLXS/b2y0=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "0dc0043f996b3583a21011765a53109db5a9d016", + "rev": "0d454d45604a3215057806757beda9bc7390d59e", "type": "github" }, "original": { @@ -624,11 +624,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1768656175, - "narHash": "sha256-qnBvj3GvyF757Z8qJLjcVk/NW5p1wldeLHLdQPbehOM=", + "lastModified": 1769723720, + "narHash": "sha256-gmlHBj1nGfOBaCMEfgHdy/4sbuBXDaVIWNGJVPP+vNw=", "owner": "neovim", "repo": "neovim", - "rev": "a5e5ec8910ea35ebb86dcba7f58333d9d4caca47", + "rev": "52cd9dcff260decda860cf154873b298d10c1208", "type": "github" }, "original": { @@ -649,11 +649,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1768684335, - "narHash": "sha256-YLjGGcSNE2lK+TUqDFEX6IBjPZNjLaoxAXji3mmZbvs=", + "lastModified": 1769714858, + "narHash": "sha256-IHHAKi8yMonZZmVHUQxew1V9UfLBG8Um9PLbNPx3OA4=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "c133a45b02dba5fd229532067d6a22d5209436d6", + "rev": "dfbb02586582d5332d0c06653583b9d743bce081", "type": "github" }, "original": { @@ -682,11 +682,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1768678265, - "narHash": "sha256-Ub8eed4DsfIDWyg30xEe+8bSxL/z5Af/gCjmvJ0V/Hs=", + "lastModified": 1769577126, + "narHash": "sha256-v9vz9Rj4MGwPuhGELdvpRKl2HH+xvkgat6VwL0L86Fg=", "owner": "YaLTeR", "repo": "niri", - "rev": "d7184a04b904e07113f4623610775ae78d32394c", + "rev": "f30db163b5748e8cf95c05aba77d0d3736f40543", "type": "github" }, "original": { @@ -705,11 +705,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1768639397, - "narHash": "sha256-DhdY6FeC/5vBM+Q4f/m1dAdl6DmN69ZzLipD7aiUPjs=", + "lastModified": 1769677259, + "narHash": "sha256-On/Ue/+X9Ikg5vti1gnOFqP1PsOjlJgrrM6HIrngiL0=", "owner": "marienz", "repo": "nix-doom-emacs-unstraightened", - "rev": "5eb4d7f1c031043a77b34c9a5c95e500f080ecaa", + "rev": "446cdd1a7c065865f79135745d835ccc04e6197e", "type": "github" }, "original": { @@ -724,11 +724,11 @@ "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1768702158, - "narHash": "sha256-k9OVfn2Osw5wBvCazstlzjGY8zC82RvTlcmeGFZ5uak=", + "lastModified": 1769826495, + "narHash": "sha256-jyfGSLu7TjgwaZb7wgUJnAEtcoksqG4f0LORh4JBcdM=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "88f03a8a5685eca1c645372ebd1767b9b228d60c", + "rev": "84471e0ca212961bd297a2b9017582041c903ddd", "type": "github" }, "original": { @@ -748,11 +748,11 @@ ] }, "locked": { - "lastModified": 1768710268, - "narHash": "sha256-45Whm5k/sNiBzGJWKJvz50Z9NQVycXmM2bb0YBzsT9U=", + "lastModified": 1769832438, + "narHash": "sha256-Z2ARPCjrrylnXnC0zZDj81e137Vtfa11v57NZl+rBEU=", "owner": "nix-community", "repo": "nix4nvchad", - "rev": "25267531fec57db1b3c55e6646c1ea8c9721bac6", + "rev": "c117d404536f6f35c709eed79687b615b96eb4d0", "type": "github" }, "original": { @@ -763,11 +763,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1768584846, - "narHash": "sha256-IRPmIOV2tPwxbhP/I9M5AmwhTC0lMPtoPStC+8T6xl0=", + "lastModified": 1769302137, + "narHash": "sha256-QEDtctEkOsbx8nlFh4yqPEOtr4tif6KTqWwJ37IM2ds=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "cce68f4a54fa4e3d633358364477f5cc1d782440", + "rev": "a351494b0e35fd7c0b7a1aae82f0afddf4907aa8", "type": "github" }, "original": { @@ -779,11 +779,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1768564909, - "narHash": "sha256-Kell/SpJYVkHWMvnhqJz/8DqQg2b6PguxVWOuadbHCc=", + "lastModified": 1769461804, + "narHash": "sha256-msG8SU5WsBUfVVa/9RPLaymvi5bI8edTavbIq3vRlhI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e4bae1bd10c9c57b2cf517953ab70060a828ee6f", + "rev": "bfc1b8a4574108ceef22f02bafcf6611380c100d", "type": "github" }, "original": { @@ -793,6 +793,22 @@ "type": "github" } }, + "nixpkgs-485356": { + "locked": { + "lastModified": 1769787892, + "narHash": "sha256-mvKmjiiNOTooYiE1vTGLJRsASPB+v1P0cyU1T56w0oI=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "c90394bd7b97bf48a653d3483c33c3ac2748489d", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "refs/pull/485356/head", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs-lib": { "locked": { "lastModified": 1765674936, @@ -841,11 +857,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1768621446, - "narHash": "sha256-6YwHV1cjv6arXdF/PQc365h1j+Qje3Pydk501Rm4Q+4=", + "lastModified": 1769598131, + "narHash": "sha256-e7VO/kGLgRMbWtpBqdWl0uFg8Y2XWFMdz0uUJvlML8o=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "72ac591e737060deab2b86d6952babd1f896d7c5", + "rev": "fa83fd837f3098e3e678e6cf017b2b36102c7211", "type": "github" }, "original": { @@ -889,11 +905,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1768569498, - "narHash": "sha256-bB6Nt99Cj8Nu5nIUq0GLmpiErIT5KFshMQJGMZwgqUo=", + "lastModified": 1769527094, + "narHash": "sha256-xV20Alb7ZGN7qujnsi5lG1NckSUmpIb05H2Xar73TDc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "be5afa0fcb31f0a96bf9ecba05a516c66fcd8114", + "rev": "afce96367b2e37fc29afb5543573cd49db3357b7", "type": "github" }, "original": { @@ -905,11 +921,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1768569498, - "narHash": "sha256-bB6Nt99Cj8Nu5nIUq0GLmpiErIT5KFshMQJGMZwgqUo=", + "lastModified": 1769268028, + "narHash": "sha256-mAdJpV0e5IGZjnE4f/8uf0E4hQR7ptRP00gnZKUOdMo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "be5afa0fcb31f0a96bf9ecba05a516c66fcd8114", + "rev": "ab9fbbcf4858bd6d40ba2bbec37ceb4ab6e1f562", "type": "github" }, "original": { @@ -921,11 +937,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1768564909, - "narHash": "sha256-Kell/SpJYVkHWMvnhqJz/8DqQg2b6PguxVWOuadbHCc=", + "lastModified": 1769461804, + "narHash": "sha256-msG8SU5WsBUfVVa/9RPLaymvi5bI8edTavbIq3vRlhI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e4bae1bd10c9c57b2cf517953ab70060a828ee6f", + "rev": "bfc1b8a4574108ceef22f02bafcf6611380c100d", "type": "github" }, "original": { @@ -937,11 +953,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1767026758, - "narHash": "sha256-7fsac/f7nh/VaKJ/qm3I338+wAJa/3J57cOGpXi0Sbg=", + "lastModified": 1768875095, + "narHash": "sha256-dYP3DjiL7oIiiq3H65tGIXXIT1Waiadmv93JS0sS+8A=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "346dd96ad74dc4457a9db9de4f4f57dab2e5731d", + "rev": "ed142ab1b3a092c4d149245d0c4126a5d7ea00b0", "type": "github" }, "original": { @@ -953,11 +969,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1768564909, - "narHash": "sha256-Kell/SpJYVkHWMvnhqJz/8DqQg2b6PguxVWOuadbHCc=", + "lastModified": 1769461804, + "narHash": "sha256-msG8SU5WsBUfVVa/9RPLaymvi5bI8edTavbIq3vRlhI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e4bae1bd10c9c57b2cf517953ab70060a828ee6f", + "rev": "bfc1b8a4574108ceef22f02bafcf6611380c100d", "type": "github" }, "original": { @@ -990,11 +1006,11 @@ "systems": "systems_5" }, "locked": { - "lastModified": 1768486009, - "narHash": "sha256-I7ymDe6UQooHy9I9wrafKCCDnRbox/EMWAgJgpm7fGs=", + "lastModified": 1769644746, + "narHash": "sha256-1X9o0GjCzku03magX4pM+1OZXA0aUTN7KvEReZ9t3OU=", "owner": "nix-community", "repo": "nixvim", - "rev": "03a638205b5cb04ba9c2ed6c604e137b15f07fa1", + "rev": "3c27e1b35ca0fee6a89bfc20840654361ffe888d", "type": "github" }, "original": { @@ -1010,11 +1026,11 @@ ] }, "locked": { - "lastModified": 1768713905, - "narHash": "sha256-qbJ1JclkDhgmCPaKxFSigt0l8+Y6LUC957jLB4YiR1o=", + "lastModified": 1769831457, + "narHash": "sha256-UCHlDVBQe0QGmcra1Oq9yX4LqLGkEPV7I6XvR4eq+oc=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "c8f1cbb79e13ce97b50728dbf146fe25c113eb31", + "rev": "131740dcc01af2d0372e169b060984bfe8afaa7a", "type": "github" }, "original": { @@ -1029,11 +1045,11 @@ "nixpkgs": "nixpkgs_8" }, "locked": { - "lastModified": 1768724691, - "narHash": "sha256-ly/K9UboM6PfSP3/F8/MZlv6ig0+NvZqklmST1kHRxQ=", + "lastModified": 1769834069, + "narHash": "sha256-GjeN/5TdWev/L/Izem3XScV6i/55Z+n+GfjKa1srBcU=", "owner": "nix-community", "repo": "NUR", - "rev": "d1e6f67d595140006df9aff2a83e49a64932895d", + "rev": "2db81de33100ef4d86ebc80dc4bc30df1fe97c5d", "type": "github" }, "original": { @@ -1125,6 +1141,7 @@ "nix4nvchad": "nix4nvchad", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_6", + "nixpkgs-485356": "nixpkgs-485356", "nixvim": "nixvim", "noctalia": "noctalia", "nur": "nur", @@ -1185,11 +1202,11 @@ ] }, "locked": { - "lastModified": 1768709255, - "narHash": "sha256-aigyBfxI20FRtqajVMYXHtj5gHXENY2gLAXEhfJ8/WM=", + "lastModified": 1769469829, + "narHash": "sha256-wFcr32ZqspCxk4+FvIxIL0AZktRs6DuF8oOsLt59YBU=", "owner": "Mic92", "repo": "sops-nix", - "rev": "5e8fae80726b66e9fec023d21cd3b3e638597aa9", + "rev": "c5eebd4eb2e3372fe12a8d70a248a6ee9dd02eff", "type": "github" }, "original": { @@ -1237,11 +1254,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1768603455, - "narHash": "sha256-ih6dYNhX1oSg0emfSAvf3iRcgsJtMmS6RUaoCX8kNoU=", + "lastModified": 1769819994, + "narHash": "sha256-AJB2hcg1OgocLGuVdot9HyCD+Kv+a6znhY2i3XqcZYU=", "owner": "nix-community", "repo": "stylix", - "rev": "590e5c68c4d5e8c766420473c0185d75113f653b", + "rev": "8b14679c0e1570b0e137f0f7997717be0fdf2cf2", "type": "github" }, "original": { @@ -1426,11 +1443,11 @@ "nixpkgs": "nixpkgs_9" }, "locked": { - "lastModified": 1768158989, - "narHash": "sha256-67vyT1+xClLldnumAzCTBvU0jLZ1YBcf4vANRWP3+Ak=", + "lastModified": 1769691507, + "narHash": "sha256-8aAYwyVzSSwIhP2glDhw/G0i5+wOrren3v6WmxkVonM=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "e96d59dff5c0d7fddb9d113ba108f03c3ef99eca", + "rev": "28b19c5844cc6e2257801d43f2772a4b4c050a1b", "type": "github" }, "original": { @@ -1459,11 +1476,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1768106915, - "narHash": "sha256-HlLo9zH4ULRXlmlIK948cHmdVhxyHgTHxGaoCRlW4k8=", + "lastModified": 1769713942, + "narHash": "sha256-0BtCSO2qzYK/akRDsERqRVLknCYD3FYErc+szreSHUo=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "72245e108f3b03c3c4474d2de9de2d1830849603", + "rev": "37ec78ee26e158b71f42e113e0e7dd9d5eb6bdb0", "type": "github" }, "original": { @@ -1482,11 +1499,11 @@ ] }, "locked": { - "lastModified": 1768711359, - "narHash": "sha256-3n2ixvAMWij1ZOh/KMJJqizX+sRU083wFR8pa6+IkyU=", + "lastModified": 1769748063, + "narHash": "sha256-H5XCtJMS3RQKHeaS+axX7CAJ0WwuTUYGy4uzLFSm0Xc=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "8c9e9425946f290fa60e0e6fd7b1464cbcdbc53e", + "rev": "efdd1e683da9412f515b9bd42c37861978c2fd3a", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index f11162e..bfcf8a5 100644 --- a/flake.nix +++ b/flake.nix @@ -49,6 +49,12 @@ nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; # nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable-small"; # nixpkgs.url = "github:NixOS/nixpkgs/master"; + nixpkgs-485356 = { + type = "github"; + owner = "nixos"; + repo = "nixpkgs"; + ref = "refs/pull/485356/head"; + }; lix-module = { url = "git+https://git.lix.systems/lix-project/nixos-module?ref=release-2.93"; diff --git a/overlays/modifications/default.nix b/overlays/modifications/default.nix index 55bcd91..c6e342c 100644 --- a/overlays/modifications/default.nix +++ b/overlays/modifications/default.nix @@ -16,6 +16,9 @@ in ./vim.nix ./prismlauncher.nix + ./fix-ffmpeg_7-full.nix + ./fix-kdePackages.kdenlive.nix + # Nur ./nur.nix ] diff --git a/overlays/modifications/fix-ffmpeg_7-full.nix b/overlays/modifications/fix-ffmpeg_7-full.nix new file mode 100644 index 0000000..0528464 --- /dev/null +++ b/overlays/modifications/fix-ffmpeg_7-full.nix @@ -0,0 +1,14 @@ +{inputs, ...}: _final: prev: let + inherit (prev.stdenv.hostPlatform) system; + pkgs = import inputs.nixpkgs-485356 { + localSystem = { + inherit system; + }; + config = { + allowUnfree = true; + cudaSupport = true; + }; + }; +in { + ffmpeg_7-full = pkgs.ffmpeg_7-full; +} diff --git a/overlays/modifications/fix-kdePackages.kdenlive.nix b/overlays/modifications/fix-kdePackages.kdenlive.nix new file mode 100644 index 0000000..b742843 --- /dev/null +++ b/overlays/modifications/fix-kdePackages.kdenlive.nix @@ -0,0 +1,9 @@ +{...}: final: prev: { + kdePackages = + prev.kdePackages + // { + kdenlive = prev.kdePackages.kdenlive.override { + ffmpeg-full = final.ffmpeg_7-full; + }; + }; +}