From 883920c7d327c9cf49c7a80797d8e81c8ec783e4 Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Sun, 4 Dec 2022 04:24:37 +0000 Subject: [PATCH] nix/pkgs/django-tailwind: fix build --- nix/pkgs/django-tailwind.nix | 4 ++-- third_party/default.nix | 12 +----------- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/nix/pkgs/django-tailwind.nix b/nix/pkgs/django-tailwind.nix index b4472f2ace..c99d93547a 100644 --- a/nix/pkgs/django-tailwind.nix +++ b/nix/pkgs/django-tailwind.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, django, poetry, cookiecutter }: +{ lib, buildPythonPackage, fetchPypi, django, poetry-core, cookiecutter }: buildPythonPackage rec { pname = "django-tailwind"; @@ -14,7 +14,7 @@ buildPythonPackage rec { --replace 'cookiecutter = "^1.7.2"' 'cookiecutter = ">=1.7.2"' ''; - nativeBuildInputs = [ poetry ]; + nativeBuildInputs = [ poetry-core ]; propagatedBuildInputs = [ django cookiecutter ]; format = "pyproject"; diff --git a/third_party/default.nix b/third_party/default.nix index b672b8b3a8..2c1c71297d 100644 --- a/third_party/default.nix +++ b/third_party/default.nix @@ -36,21 +36,11 @@ let rev = "e0fe990b478a66178a58c69cf53daec0478ca6f9"; sha256 = "sha256:0qjyfmw5v7s6ynjns4a61vlyj9cghj7vbpgrp9147ngb1f8krz2c"; }; - nixpkgsOldSrc = nixpkgs.fetchFromGitHub { - owner = "nixos"; - repo = "nixpkgs"; - rev = "ae1dc133ea5f1538d035af41e5ddbc2ebcb67b90"; - sha256 = "0dq22dagzk76x2ws4dz88w018i6byamd6rnzqizx68bzimg6g7xn"; - }; - nixpkgsOld = import "${nixpkgsOldSrc}" { - inherit system; - config = nixpkgsConfig; - }; tvlDepot = import ./tvl { nixpkgsBisectPath = ./nixpkgs; inherit nixpkgsConfig; }; in rec { - inherit nixpkgsConfig nixpkgs nixpkgsOld; + inherit nixpkgsConfig nixpkgs; nixos = import ./nixpkgs/nixos; nixeval = import ./nixpkgs/nixos/lib/eval-config.nix; buildGo =