From 3fe1e52b0058d2e903597733520c361f92fd6ca3 Mon Sep 17 00:00:00 2001 From: Samuel Grayson Date: Thu, 4 Jun 2026 14:52:38 -0500 Subject: [PATCH 1/2] Upgrade Python 3.12 -> 3.14 --- .envrc | 2 +- flake.lock | 6 +++--- flake.nix | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.envrc b/.envrc index ba52aa49..83cd8f11 100644 --- a/.envrc +++ b/.envrc @@ -1,2 +1,2 @@ -watch_file ./cli-wrapper/flake.nix ./setup_devshell.sh +watch_file ./cli-wrapper/flake.nix ./setup_devshell.sh ./flake.lock use_flake diff --git a/flake.lock b/flake.lock index 46bea942..5690cd3d 100644 --- a/flake.lock +++ b/flake.lock @@ -96,11 +96,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1774273680, - "narHash": "sha256-a++tZ1RQsDb1I0NHrFwdGuRlR5TORvCEUksM459wKUA=", + "lastModified": 1780365719, + "narHash": "sha256-QfWfccTN+70ZQ4m2qlU9PiKfz2Yppq94058iJyARNwc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fdc7b8f7b30fdbedec91b71ed82f36e1637483ed", + "rev": "ffa10e26ae11d676b2db836259889f1f571cb14f", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 8e093ade..94199f09 100644 --- a/flake.nix +++ b/flake.nix @@ -47,7 +47,7 @@ ( system: let pkgs = nixpkgs.legacyPackages.${system}; - python = pkgs.python312; + python = pkgs.python314; cli-wrapper-pkgs = cli-wrapper.packages."${system}"; # IF flake = false, we need to do this instead old-pkgs = import old-nixpkgs {inherit system;}; From ff4b9c814f1c99a72d269a56e1401fe752c0af63 Mon Sep 17 00:00:00 2001 From: Samuel Grayson Date: Thu, 4 Jun 2026 14:59:55 -0500 Subject: [PATCH 2/2] Fixes --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 94199f09..37805e8a 100644 --- a/flake.nix +++ b/flake.nix @@ -61,7 +61,7 @@ }; }; old-stdenv = pkgs.overrideCC pkgs.stdenv new-clang-old-glibc; - charmonium-time-block-pkg = charmonium-time-block.packages."${system}".py312; + charmonium-time-block-pkg = charmonium-time-block.packages."${system}".py314; in rec { packages = rec { types-networkx = python.pkgs.buildPythonPackage rec {