mirror of
https://github.com/buckley310/nixos-config.git
synced 2024-12-21 19:24:15 +00:00
remove 21.05 compat
This commit is contained in:
parent
6c260a405a
commit
1704ca62fa
2 changed files with 3 additions and 12 deletions
10
flake.nix
10
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
|
||||
|
|
|
@ -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
|
||||
];
|
||||
})
|
||||
|
||||
|
|
Loading…
Reference in a new issue