From 702e30df4ac9baa8bd305024c3905e1f8a946e12 Mon Sep 17 00:00:00 2001 From: Yuxuan Shui Date: Mon, 22 Jan 2024 16:51:41 +0000 Subject: [PATCH] Update nix flake Signed-off-by: Yuxuan Shui --- flake.lock | 23 ++++++++++++----------- flake.nix | 9 +++++++-- 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/flake.lock b/flake.lock index 6afc8e3e..4e570b88 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1689068808, - "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", + "lastModified": 1705309234, + "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", "owner": "numtide", "repo": "flake-utils", - "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", + "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", "type": "github" }, "original": { @@ -25,11 +25,11 @@ ] }, "locked": { - "lastModified": 1660459072, - "narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=", + "lastModified": 1703887061, + "narHash": "sha256-gGPa9qWNc6eCXT/+Z5/zMkyYOuRZqeFZBDbopNZQkuY=", "owner": "hercules-ci", "repo": "gitignore.nix", - "rev": "a20de23b925fd8264fd7fad6454652e142fd7f73", + "rev": "43e1aa1308018f37118e34d3a9cb4f5e75dc11d5", "type": "github" }, "original": { @@ -41,11 +41,12 @@ }, "nixpkgs": { "locked": { - "lastModified": 1691186842, - "narHash": "sha256-wxBVCvZUwq+XS4N4t9NqsHV4E64cPVqQ2fdDISpjcw0=", - "path": "/nix/store/d42v5grfq77vr10r336kks0qjp0wij8d-source", - "rev": "18036c0be90f4e308ae3ebcab0e14aae0336fe42", - "type": "path" + "lastModified": 1705856552, + "narHash": "sha256-JXfnuEf5Yd6bhMs/uvM67/joxYKoysyE3M2k6T3eWbg=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "612f97239e2cc474c13c9dafa0df378058c5ad8d", + "type": "github" }, "original": { "id": "nixpkgs", diff --git a/flake.nix b/flake.nix index 76c0db06..324498e0 100644 --- a/flake.nix +++ b/flake.nix @@ -24,11 +24,16 @@ overlays = [ overlay ]; in rec { inherit overlay overlays; - defaultPackage = pkgs.picom; + defaultPackage = pkgs.picom.overrideAttrs { + version = "11"; + src = ./.; + }; devShell = defaultPackage.overrideAttrs { buildInputs = defaultPackage.buildInputs ++ [ - pkgs.clang-tools + pkgs.clang-tools_17 + pkgs.llvmPackages_17.clang-unwrapped.python ]; + hardeningDisable = [ "fortify" ]; }; }); }