From fca0ea1e3902928c748262db6ec12fd21831ead8 Mon Sep 17 00:00:00 2001 From: Andreas Zweili Date: Thu, 17 Nov 2022 12:02:34 +0100 Subject: [PATCH] Update flake --- flake.lock | 51 +-------------------------------------------------- flake.nix | 6 ++++-- 2 files changed, 5 insertions(+), 52 deletions(-) diff --git a/flake.lock b/flake.lock index 61299bf..5e92b39 100644 --- a/flake.lock +++ b/flake.lock @@ -15,21 +15,6 @@ "type": "github" } }, - "flake-utils_2": { - "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "nixpkgs": { "locked": { "lastModified": 1668189330, @@ -46,44 +31,10 @@ "type": "github" } }, - "nixpkgs_2": { - "locked": { - "lastModified": 1668629939, - "narHash": "sha256-MEh5T0wZ1oaoUn84odShFvIObwSIbZ+NEZ5Q2ff83nc=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "b85c2a060f6223e869493a8397ca47223ee2458a", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nixpkgs", - "type": "github" - } - }, - "poetry2nix": { - "inputs": { - "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs_2" - }, - "locked": { - "lastModified": 1668394823, - "narHash": "sha256-UJqW+Zp1boVhTKfWel2WTi7Qn0R9hfpVeSRdJYPJwXQ=", - "owner": "nix-community", - "repo": "poetry2nix", - "rev": "3cc82ca6ccca2a06dbb05cb0b74efd5d50e60d48", - "type": "github" - }, - "original": { - "id": "poetry2nix", - "type": "indirect" - } - }, "root": { "inputs": { "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs", - "poetry2nix": "poetry2nix" + "nixpkgs": "nixpkgs" } } }, diff --git a/flake.nix b/flake.nix index 69abba8..b14dcf8 100644 --- a/flake.nix +++ b/flake.nix @@ -4,7 +4,7 @@ nixpkgs.url = github:NixOS/nixpkgs/nixos-22.05; flake-utils.url = github:numtide/flake-utils; }; - outputs = { self, nixpkgs, flake-utils, poetry2nix }: + outputs = { self, nixpkgs, flake-utils }: flake-utils.lib.eachDefaultSystem (system: let pkgs = nixpkgs.legacyPackages.${system}; @@ -13,7 +13,9 @@ devShell = pkgs.mkShell { buildInputs = [ pkgs.gnumake - pkgs.python39 + (pkgs.poetry2nix.mkPoetryEnv { + projectDir = ./.; + }) pkgs.python39Packages.poetry ]; };