From 1704ca62fa75cd4abbfadbe784bd9dd00dfc348a Mon Sep 17 00:00:00 2001 From: Sean Buckley Date: Tue, 9 Nov 2021 11:02:28 -0500 Subject: [PATCH] remove 21.05 compat --- flake.nix | 10 +--------- modules/profiles/desktop.nix | 5 ++--- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/flake.nix b/flake.nix index ab30646..defcbdf 100644 --- a/flake.nix +++ b/flake.nix @@ -4,15 +4,7 @@ outputs = { self, nixpkgs, impermanence, ... }: let - mypkgs = import ./pkgs; - - # polyfill. 21.05 doesn't have `systems.supported` - supportedSystems = - if builtins.elem "supported" (builtins.attrNames nixpkgs.lib.systems) - then (with nixpkgs.lib.systems.supported; tier1 ++ tier2) - else [ "x86_64-linux" ]; - in { nixosModules = @@ -40,7 +32,7 @@ morphHosts = import lib/morph.nix; forAllSystems = f: builtins.listToAttrs (map (name: { inherit name; value = f name; }) - (supportedSystems)); + (with nixpkgs.lib.systems.supported; tier1 ++ tier2)); }; packages = self.lib.forAllSystems diff --git a/modules/profiles/desktop.nix b/modules/profiles/desktop.nix index b36b440..ce4c198 100644 --- a/modules/profiles/desktop.nix +++ b/modules/profiles/desktop.nix @@ -39,11 +39,10 @@ with lib; (vscode-with-extensions.override { vscode = vscodium; vscodeExtensions = with pkgs.vscode-extensions; [ - # package was renamed from "Nix" to "nix" between 21.05 and 21.11 - (if (builtins.elem "nix" (builtins.attrNames bbenoist)) then bbenoist.nix else bbenoist.Nix) + bbenoist.nix + ms-azuretools.vscode-docker ms-python.python ms-vscode.cpptools - ms-azuretools.vscode-docker ]; })