diff --git a/flake.lock b/flake.lock index 1be488a8..1e3ffdb3 100644 --- a/flake.lock +++ b/flake.lock @@ -102,21 +102,6 @@ "type": "indirect" } }, - "nixpkgs-stable": { - "locked": { - "lastModified": 1612995862, - "narHash": "sha256-VJPQtC8WDPvQVQGolJqp2i43Yr9bvbyqGK3oWMa5+8g=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "2394284537b89471c87065b040d3dedd8b5907fe", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "ref": "nixos-20.09", - "type": "indirect" - } - }, "nixpkgs-unstable": { "locked": { "lastModified": 1613226215, diff --git a/flake.nix b/flake.nix index 48316269..284e3b6c 100644 --- a/flake.nix +++ b/flake.nix @@ -15,7 +15,6 @@ # Core dependencies. nixpkgs.url = "nixpkgs/nixos-unstable"; # primary nixpkgs nixpkgs-unstable.url = "nixpkgs/master"; # for packages on the edge - nixpkgs-stable.url = "nixpkgs/nixos-20.09"; # for stable packages home-manager.url = "github:rycee/home-manager/master"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; agenix.url = "github:ryantm/agenix"; @@ -26,7 +25,7 @@ nixos-hardware.url = "github:nixos/nixos-hardware"; }; - outputs = inputs @ { self, nixpkgs, nixpkgs-unstable, nixpkgs-stable, ... }: + outputs = inputs @ { self, nixpkgs, nixpkgs-unstable, ... }: let inherit (lib.my) mapModules mapModulesRec mapHosts; @@ -38,8 +37,7 @@ overlays = extraOverlays ++ (lib.attrValues self.overlays); }; pkgs = mkPkgs nixpkgs [ self.overlay ]; - pkgsUnstable = mkPkgs nixpkgs-unstable []; - pkgsStable = mkPkgs nixpkgs-stable []; + pkgs' = mkPkgs nixpkgs-unstable []; lib = nixpkgs.lib.extend (self: super: { my = import ./lib { inherit pkgs inputs; lib = self; }; }); @@ -48,8 +46,7 @@ overlay = final: prev: { - unstable = pkgsUnstable; - stable = pkgsStable; + unstable = pkgs'; my = self.packages."${system}"; };