seang96/nixos-config
1
0
Fork 0
mirror of https://github.com/buckley310/nixos-config.git synced 2024-12-21 19:24:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove 21.05 compat

Browse source
This commit is contained in:
Sean Buckley 2021-11-09 11:02:28 -05:00
parent 6c260a405a
commit 1704ca62fa
2 changed files with 3 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
flake.nix
View file

@ -4,15 +4,7 @@
outputs = { self, nixpkgs, impermanence, ... }: outputs = { self, nixpkgs, impermanence, ... }:
let let
mypkgs = import ./pkgs; 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 in
{ {
nixosModules = nixosModules =
@ -40,7 +32,7 @@
morphHosts = import lib/morph.nix; morphHosts = import lib/morph.nix;
forAllSystems = f: builtins.listToAttrs (map forAllSystems = f: builtins.listToAttrs (map
(name: { inherit name; value = f name; }) (name: { inherit name; value = f name; })
(supportedSystems)); (with nixpkgs.lib.systems.supported; tier1 ++ tier2));
}; };
packages = self.lib.forAllSystems packages = self.lib.forAllSystems

5
modules/profiles/desktop.nix
View file

@ -39,11 +39,10 @@ with lib;
(vscode-with-extensions.override { (vscode-with-extensions.override {
vscode = vscodium; vscode = vscodium;
vscodeExtensions = with pkgs.vscode-extensions; [ vscodeExtensions = with pkgs.vscode-extensions; [
# package was renamed from "Nix" to "nix" between 21.05 and 21.11 bbenoist.nix
(if (builtins.elem "nix" (builtins.attrNames bbenoist)) then bbenoist.nix else bbenoist.Nix) ms-azuretools.vscode-docker
ms-python.python ms-python.python
ms-vscode.cpptools ms-vscode.cpptools
ms-azuretools.vscode-docker
]; ];
}) })