From c0828b43413aa1048a95187c5d2a9c4ca777c309 Mon Sep 17 00:00:00 2001 From: jolheiser Date: Tue, 15 Aug 2023 15:40:39 -0500 Subject: [PATCH] feat: py36 chai Signed-off-by: jolheiser --- flake.lock | 17 +++++++++++++++++ flake.nix | 10 ++++++++++ machines/chai/default.nix | 3 +++ 3 files changed, 30 insertions(+) diff --git a/flake.lock b/flake.lock index 4664977..ba243e2 100644 --- a/flake.lock +++ b/flake.lock @@ -115,6 +115,22 @@ "type": "github" } }, + "nixpkgs-py36": { + "locked": { + "lastModified": 1616701903, + "narHash": "sha256-zYjmZqdfetp6XNbJcznCGGR8YkjcZ45c3Zy+Q0GrhMw=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "34f85de51bbc74595e63b22ee089adbb31f7c7a2", + "type": "github" + }, + "original": { + "owner": "nixos", + "repo": "nixpkgs", + "rev": "34f85de51bbc74595e63b22ee089adbb31f7c7a2", + "type": "github" + } + }, "nixpkgs_2": { "locked": { "lastModified": 1691464053, @@ -153,6 +169,7 @@ "home-manager": "home-manager_2", "jolheiser-nur": "jolheiser-nur", "nixpkgs": "nixpkgs_2", + "nixpkgs-py36": "nixpkgs-py36", "nur": "nur" } }, diff --git a/flake.nix b/flake.nix index 8471cd1..733b853 100644 --- a/flake.nix +++ b/flake.nix @@ -14,6 +14,8 @@ nur.url = "github:nix-community/nur"; jolheiser-nur.url = "git+https://git.jojodev.com/jolheiser/nur"; + + nixpkgs-py36.url = "github:nixos/nixpkgs/34f85de51bbc74595e63b22ee089adbb31f7c7a2"; }; outputs = { @@ -22,6 +24,7 @@ home-manager, agenix, jolheiser-nur, + nixpkgs-py36, ... } @ inputs: let overlays = final: prev: { @@ -73,6 +76,13 @@ ./machines/common ./machines/chai commonConfig + ({pkgs, ...}: { + config.nixpkgs.overlays = [ + (_: _: { + py36 = import nixpkgs-py36 {inherit (pkgs) system;}; + }) + ]; + }) ({pkgs, ...}: { home-manager.users.${username}.programs = { git.package = pkgs.gitSVN; diff --git a/machines/chai/default.nix b/machines/chai/default.nix index 257a1fb..ccbd57a 100644 --- a/machines/chai/default.nix +++ b/machines/chai/default.nix @@ -50,6 +50,9 @@ in { jetbrains.idea-ultimate jetbrains.datagrip libxcrypt + py36.python36 + py36.python36Packages.virtualenv + py36.python36Packages.psycopg2 subversion teams-for-linux xorg.xauth