From f22982132e8252be65cd69df7f059429124028ce Mon Sep 17 00:00:00 2001 From: Alessandro Candido Date: Wed, 28 Feb 2024 09:59:56 +0100 Subject: [PATCH] chore: Move Flake to NixOS unstable, upgrade shell to py3.12 --- flake.lock | 8 ++++---- flake.nix | 26 ++++---------------------- 2 files changed, 8 insertions(+), 26 deletions(-) diff --git a/flake.lock b/flake.lock index a591fcaeb5..ac51b1137a 100644 --- a/flake.lock +++ b/flake.lock @@ -220,16 +220,16 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1696374741, - "narHash": "sha256-gt8B3G0ryizT9HSB4cCO8QoxdbsHnrQH+/BdKxOwqF0=", + "lastModified": 1708984720, + "narHash": "sha256-gJctErLbXx4QZBBbGp78PxtOOzsDaQ+yw1ylNQBuSUY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8a4c17493e5c39769f79117937c79e1c88de6729", + "rev": "13aff9b34cc32e59d35c62ac9356e4a41198a538", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-23.05", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index d73827ceb5..13f85eaeb1 100644 --- a/flake.nix +++ b/flake.nix @@ -1,6 +1,6 @@ { inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; systems.url = "github:nix-systems/default"; devenv.url = "github:cachix/devenv"; nixpkgs-python.url = "github:cachix/nixpkgs-python"; @@ -35,26 +35,8 @@ { packages = with pkgs; [ pre-commit - (python3Packages.buildPythonPackage - (let - pname = "poethepoet"; - version = "0.24.1"; - in { - inherit pname version; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-OvpEtPxzJ98N2RLtoBJgSgcq8rtNJD+w5B6Oyo2r+e0="; - python = "py3"; - dist = "py3"; - format = "wheel"; - }; - format = "wheel"; - propagatedBuildInputs = [ - # Specify dependencies - pkgs.python3Packages.pastel - pkgs.python3Packages.tomli - ]; - })) + poethepoet + stdenv.cc.cc.lib ]; languages.python = { @@ -65,7 +47,7 @@ install.allExtras = true; install.groups = ["dev"]; }; - version = "3.11"; + version = "3.12"; }; } ];