From 1d61db65f0a3092e62b3fe225b0361593b5efe29 Mon Sep 17 00:00:00 2001 From: Andreas Zweili Date: Wed, 12 Jul 2023 21:23:18 +0200 Subject: [PATCH] Update execnet overrides in upstream --- flake.lock | 11 ++++++----- flake.nix | 11 +---------- 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index 83cf979..fc3d7c6 100644 --- a/flake.lock +++ b/flake.lock @@ -60,15 +60,16 @@ ] }, "locked": { - "lastModified": 1688992084, - "narHash": "sha256-pKOcnbTT0zAybza8Wz94ezG+5ghzXoHQxXahtsc2Yrw=", - "owner": "nix-community", + "lastModified": 1689189561, + "narHash": "sha256-tKBRS2boaGWcDQ0J4sh8jNMgmTJAdqLYp7UKozs+NPc=", + "owner": "Nebucatnetzer", "repo": "poetry2nix", - "rev": "77a4f59685053a77644fd35fc2063751af63aca7", + "rev": "2f53cf3c1b98680abb02b776dbb7ebb2fd8343b6", "type": "github" }, "original": { - "owner": "nix-community", + "owner": "Nebucatnetzer", + "ref": "execnet-overrides", "repo": "poetry2nix", "type": "github" } diff --git a/flake.nix b/flake.nix index 9248a5b..a235ec1 100644 --- a/flake.nix +++ b/flake.nix @@ -4,7 +4,7 @@ nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; flake-utils.url = "github:numtide/flake-utils"; poetry2nix = { - url = "github:nix-community/poetry2nix"; + url = "github:Nebucatnetzer/poetry2nix/execnet-overrides"; inputs.nixpkgs.follows = "nixpkgs"; }; @@ -18,15 +18,6 @@ { projectDir = ./.; groups = [ "main" "dev" ]; - overrides = poetry2nix.defaultPoetryOverrides.extend - (self: super: { - execnet = super.execnet.overridePythonAttrs - ( - old: { - buildInputs = (old.buildInputs or [ ]) ++ [ super.hatchling ]; - } - ); - }); }; inventoryPackage = prev.poetry2nix.mkPoetryApplication { projectDir = ./.;