diff --git a/flake.lock b/flake.lock index eb6115c..fdabd63 100644 --- a/flake.lock +++ b/flake.lock @@ -25,7 +25,9 @@ "anikki": { "inputs": { "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs_2" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { "lastModified": 1766470910, @@ -198,7 +200,9 @@ }, "game-of-life": { "inputs": { - "nixpkgs": "nixpkgs_3" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { "lastModified": 1728511087, @@ -243,11 +247,11 @@ ] }, "locked": { - "lastModified": 1766682973, - "narHash": "sha256-GKO35onS711ThCxwWcfuvbIBKXwriahGqs+WZuJ3v9E=", + "lastModified": 1768434960, + "narHash": "sha256-cJbFn17oyg6qAraLr+NVeNJrXsrzJdrudkzI4H2iTcg=", "owner": "nix-community", "repo": "home-manager", - "rev": "91cdb0e2d574c64fae80d221f4bf09d5592e9ec2", + "rev": "b4d88c9ac42ae1a745283f6547701da43b6e9f9b", "type": "github" }, "original": { @@ -264,11 +268,11 @@ ] }, "locked": { - "lastModified": 1765682243, - "narHash": "sha256-yeCxFV/905Wr91yKt5zrVvK6O2CVXWRMSrxqlAZnLp0=", + "lastModified": 1767104570, + "narHash": "sha256-GKgwu5//R+cLdKysZjGqvUEEOGXXLdt93sNXeb2M/Lk=", "owner": "nix-community", "repo": "home-manager", - "rev": "58bf3ecb2d0bba7bdf363fc8a6c4d49b4d509d03", + "rev": "e4e78a2cbeaddd07ab7238971b16468cc1d14daf", "type": "github" }, "original": { @@ -327,14 +331,16 @@ "nixos-wsl": { "inputs": { "flake-compat": "flake-compat_3", - "nixpkgs": "nixpkgs_4" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { - "lastModified": 1765841014, - "narHash": "sha256-55V0AJ36V5Egh4kMhWtDh117eE3GOjwq5LhwxDn9eHg=", + "lastModified": 1768404695, + "narHash": "sha256-eT3dNE2CQYcPDHaeRZAEFrZ0BmMq2wLxMp7hCmzOZBA=", "owner": "nix-community", "repo": "NixOS-WSL", - "rev": "be4af8042e7a61fa12fda58fe9a3b3babdefe17b", + "rev": "d0d3636b9d174c4558e3bbb18e194d970505fed8", "type": "github" }, "original": { @@ -362,11 +368,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1766309749, - "narHash": "sha256-3xY8CZ4rSnQ0NqGhMKAy5vgC+2IVK0NoVEzDoOh4DA4=", + "lastModified": 1768305791, + "narHash": "sha256-AIdl6WAn9aymeaH/NvBj0H9qM+XuAuYbGMZaP0zcXAQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a6531044f6d0bef691ea18d4d4ce44d0daa6e816", + "rev": "1412caf7bf9e660f2f962917c14b1ea1c3bc695e", "type": "github" }, "original": { @@ -376,70 +382,6 @@ "type": "github" } }, - "nixpkgs_3": { - "locked": { - "lastModified": 1717179513, - "narHash": "sha256-vboIEwIQojofItm2xGCdZCzW96U85l9nDW3ifMuAIdM=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "63dacb46bf939521bdc93981b4cbb7ecb58427a0", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "24.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_4": { - "locked": { - "lastModified": 1765472234, - "narHash": "sha256-9VvC20PJPsleGMewwcWYKGzDIyjckEz8uWmT0vCDYK0=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "2fbfb1d73d239d2402a8fe03963e37aab15abe8b", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_5": { - "locked": { - "lastModified": 1766651565, - "narHash": "sha256-QEhk0eXgyIqTpJ/ehZKg9IKS7EtlWxF3N7DXy42zPfU=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "3e2499d5539c16d0d173ba53552a4ff8547f4539", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_6": { - "locked": { - "lastModified": 1765472234, - "narHash": "sha256-9VvC20PJPsleGMewwcWYKGzDIyjckEz8uWmT0vCDYK0=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "2fbfb1d73d239d2402a8fe03963e37aab15abe8b", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "pre-commit-hooks-nix": { "inputs": { "flake-compat": [ @@ -475,7 +417,7 @@ "kwin-effects-forceblur": "kwin-effects-forceblur", "lanzaboote": "lanzaboote", "nixos-wsl": "nixos-wsl", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_2", "snowfall-lib": "snowfall-lib", "sops-nix": "sops-nix", "trilium-next-pr": "trilium-next-pr", @@ -550,11 +492,11 @@ ] }, "locked": { - "lastModified": 1766289575, - "narHash": "sha256-BOKCwOQQIP4p9z8DasT5r+qjri3x7sPCOq+FTjY8Z+o=", + "lastModified": 1768481291, + "narHash": "sha256-NjKtkJraCZEnLHAJxLTI+BfdU//9coAz9p5TqveZwPU=", "owner": "mic92", "repo": "sops-nix", - "rev": "9836912e37aef546029e48c8749834735a6b9dad", + "rev": "e085e303dfcce21adcb5fec535d65aacb066f101", "type": "github" }, "original": { @@ -645,14 +587,16 @@ "zen-browser": { "inputs": { "home-manager": "home-manager_2", - "nixpkgs": "nixpkgs_6" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { - "lastModified": 1766697593, - "narHash": "sha256-mGZBEN67mxeOsBhplBRLm6L+y++8jU46EEUYgemG1aQ=", + "lastModified": 1768379550, + "narHash": "sha256-z94S29l5V86h11LZbPIMbHTJyksDG63aqISsZkTTuJY=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "98d8f48ba80a4b6e3b56addad850d57132301075", + "rev": "06f61b4e4f4f6ba8027c96a5611c63dc0db12b90", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index f0254e4..89acf01 100644 --- a/flake.nix +++ b/flake.nix @@ -3,30 +3,43 @@ inputs = { # nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05"; - nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; - nixos-wsl.url = "github:nix-community/NixOS-WSL/main"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; # Use nixos-unstable for latest kernel and packages + nixos-wsl = { + url = "github:nix-community/NixOS-WSL/main"; + inputs.nixpkgs.follows = "nixpkgs"; + }; # Snowfallorg's Flake utility snowfall-lib = { url = "github:snowfallorg/lib"; inputs.nixpkgs.follows = "nixpkgs"; }; - game-of-life.url = "github:local-interloper/game-of-life"; + game-of-life = { + url = "github:local-interloper/game-of-life"; + inputs.nixpkgs.follows = "nixpkgs"; + }; # Add sops-nix for secrets management sops-nix = { url = "github:mic92/sops-nix"; inputs.nixpkgs.follows = "nixpkgs"; }; - zen-browser.url = "github:0xc000022070/zen-browser-flake"; + zen-browser = { + url = "github:0xc000022070/zen-browser-flake"; + inputs.nixpkgs.follows = "nixpkgs"; + }; home-manager = { url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; }; - trilium-next-pr.url = "github:FliegendeWurst/nixpkgs/trilium-next"; - anikki.url = "github:Hion-V/Anikki-flake"; + trilium-next-pr = { + url = "github:FliegendeWurst/nixpkgs/trilium-next"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + anikki = { + url = "github:Hion-V/Anikki-flake"; + inputs.nixpkgs.follows = "nixpkgs"; + }; lanzaboote = { url = "github:nix-community/lanzaboote/v0.4.3"; - - # Optional but recommended to limit the size of your system closure. inputs.nixpkgs.follows = "nixpkgs"; }; kwin-effects-forceblur = { diff --git a/overlays/mbedtls-fix/default.nix b/overlays/mbedtls-fix/default.nix new file mode 100644 index 0000000..3693ef2 --- /dev/null +++ b/overlays/mbedtls-fix/default.nix @@ -0,0 +1,11 @@ +{ ... }: + +final: prev: { + mbedtls_2 = prev.mbedtls_2.overrideAttrs (oldAttrs: { + doCheck = false; # Skip failing PSA crypto tests + }); + + haxe = prev.haxe.overrideAttrs (oldAttrs: { + buildInputs = (oldAttrs.buildInputs or []) ++ [ final.mbedtls_2 ]; + }); +} diff --git a/overlays/synergy-fix/default.nix b/overlays/synergy-fix/default.nix new file mode 100644 index 0000000..704b183 --- /dev/null +++ b/overlays/synergy-fix/default.nix @@ -0,0 +1,17 @@ +{ ... }: + +final: prev: { + synergy = prev.synergy.overrideAttrs (oldAttrs: { + postPatch = (oldAttrs.postPatch or "") + '' + # Fix deprecated Qt endl usage in QTextStream contexts only + # Don't touch cerr/cout which use std::endl + find . -name "*.cpp" -type f -exec sed -i \ + 's/\(outStream.*<<.*\)endl/\1Qt::endl/g; s/\(QTextStream.*<<.*\)endl/\1Qt::endl/g' {} + + find . -name "*.h" -type f -exec sed -i \ + 's/\(outStream.*<<.*\)endl/\1Qt::endl/g; s/\(QTextStream.*<<.*\)endl/\1Qt::endl/g' {} + + + # Fix missing SIZE_MAX include + sed -i '/#include /a#include ' src/lib/server/InputFilter.cpp + ''; + }); +}