From 5db6f7711a28abd4b6bbe152c8a7de9d00b1e30d Mon Sep 17 00:00:00 2001 From: WilliButz Date: Sat, 4 Jan 2025 16:35:41 +0100 Subject: [PATCH] flake.lock: update nixpkgs + include fix for xmlsec build with gcc14 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/807e9154dcb16384b1b765ebe9cd2bba2ac287fd' (2024-10-29) → 'github:NixOS/nixpkgs/6df24922a1400241dae323af55f30e4318a6ca65' (2025-01-02) Co-authored-by: tuedel --- flake.lock | 6 +++--- poetry2nix-python-overrides.nix | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index bbb6b22..5d97752 100644 --- a/flake.lock +++ b/flake.lock @@ -118,11 +118,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1730200266, - "narHash": "sha256-l253w0XMT8nWHGXuXqyiIC/bMvh1VRszGXgdpQlfhvU=", + "lastModified": 1735834308, + "narHash": "sha256-dklw3AXr3OGO4/XT1Tu3Xz9n/we8GctZZ75ZWVqAVhk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "807e9154dcb16384b1b765ebe9cd2bba2ac287fd", + "rev": "6df24922a1400241dae323af55f30e4318a6ca65", "type": "github" }, "original": { diff --git a/poetry2nix-python-overrides.nix b/poetry2nix-python-overrides.nix index 02f24d9..9aa2b80 100644 --- a/poetry2nix-python-overrides.nix +++ b/poetry2nix-python-overrides.nix @@ -18,6 +18,7 @@ pkgs: xmlsec = prev.xmlsec.overridePythonAttrs (oA: { nativeBuildInputs = oA.nativeBuildInputs ++ [ final.setuptools final.pkgconfig ]; buildInputs = [ pkgs.xmlsec.dev pkgs.xmlsec pkgs.libxml2 pkgs.libtool ]; + env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types"; }); opencontainers = prev.opencontainers.overrideAttrs (oA: { nativeBuildInputs = oA.nativeBuildInputs ++ [