diff --git a/flake.lock b/flake.lock index ba243e20c8429d9e43ffd780ae6860f75db9cdb3..466497734f0b63c9e9ee86b3102a7f8779d154f1 100644 --- a/flake.lock +++ b/flake.lock @@ -115,22 +115,6 @@ "repo": "nixpkgs", "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, @@ -169,7 +153,6 @@ "flake-utils": "flake-utils", "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 733b8532980769e1b0724f4e4edac312a3422c16..8471cd1726d66c37179d65e97156adc954ed0f66 100644 --- a/flake.nix +++ b/flake.nix @@ -14,8 +14,6 @@ flake-utils.url = "github:numtide/flake-utils"; nur.url = "github:nix-community/nur"; jolheiser-nur.url = "git+https://git.jojodev.com/jolheiser/nur"; - - nixpkgs-py36.url = "github:nixos/nixpkgs/34f85de51bbc74595e63b22ee089adbb31f7c7a2"; }; outputs = { @@ -24,7 +22,6 @@ nixpkgs, home-manager, agenix, jolheiser-nur, - nixpkgs-py36, ... } @ inputs: let overlays = final: prev: { @@ -76,13 +73,6 @@ agenix.nixosModules.default ./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 ccbd57aab21902d38a392c210c9ac2a1bf1b4899..257a1fb9eff0a97bdd75baec2c45726305e6f8eb 100644 --- a/machines/chai/default.nix +++ b/machines/chai/default.nix @@ -51,10 +51,6 @@ jetbrains.idea-ultimate jetbrains.datagrip libxcrypt imports = [./hardware.nix ../common]; -{pkgs, ...}: let - py36.python36Packages.virtualenv - py36.python36Packages.psycopg2 - imports = [./hardware.nix ../common]; imports = [./hardware.nix ../common]; teams-for-linux xorg.xauth