Fix merge conflicts with main

This commit is contained in:
Luc Perkins 2023-07-13 17:18:17 -07:00
commit 7e121d224d
No known key found for this signature in database
GPG key ID: CED8419FB058467A
4 changed files with 17 additions and 18 deletions

View file

@ -1,7 +1,6 @@
{ {
description = "A Nix-flake-based Python development environment"; description = "A Nix-flake-based Python development environment";
inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
outputs = { self, nixpkgs }: outputs = { self, nixpkgs }: