fix: nixpkgs-unstable -> nixos-unstable
This commit is contained in:
parent
a467cbe6dc
commit
a7b03d9b9a
14
flake.nix
14
flake.nix
@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
inputs = {
|
inputs = {
|
||||||
nixpkgs.url = "github:NixOS/nixpkgs/26d499fc9f1d567283d5d56fcf367edd815dba1d";
|
nixos-release.url = "github:NixOS/nixpkgs/26d499fc9f1d567283d5d56fcf367edd815dba1d";
|
||||||
nixpkgs-unstable.url = "github:NixOS/nixpkgs/ebe4301cbd8f81c4f8d3244b3632338bbeb6d49c";
|
nixos-unstable.url = "github:NixOS/nixpkgs/b024ced1aac25639f8ca8fdfc2f8c4fbd66c48ef";
|
||||||
nixpkgs-master.url = "github:NixOS/nixpkgs/master";
|
nixpkgs-master.url = "github:NixOS/nixpkgs/master";
|
||||||
local-unstable.url = "path:///home/giulio/dev/nixpkgs";
|
local-unstable.url = "path:///home/giulio/dev/nixpkgs";
|
||||||
pepeflake.url = "git+https://git.giugl.io/peperunas/pepeflake";
|
pepeflake.url = "git+https://git.giugl.io/peperunas/pepeflake";
|
||||||
@ -19,8 +19,8 @@
|
|||||||
|
|
||||||
outputs =
|
outputs =
|
||||||
{ self
|
{ self
|
||||||
, nixpkgs
|
, nixos-release
|
||||||
, nixpkgs-unstable
|
, nixos-unstable
|
||||||
, nixpkgs-master
|
, nixpkgs-master
|
||||||
, local-unstable
|
, local-unstable
|
||||||
, home-manager
|
, home-manager
|
||||||
@ -61,7 +61,7 @@
|
|||||||
overlays = extOverlays;
|
overlays = extOverlays;
|
||||||
};
|
};
|
||||||
|
|
||||||
unstablePkgs = importNixpkgs { flake = nixpkgs-unstable; };
|
unstablePkgs = importNixpkgs { flake = nixos-unstable; };
|
||||||
masterPkgs = importNixpkgs { flake = nixpkgs-master; };
|
masterPkgs = importNixpkgs { flake = nixpkgs-master; };
|
||||||
localPkgs = importNixpkgs { flake = local-unstable; };
|
localPkgs = importNixpkgs { flake = local-unstable; };
|
||||||
teslamatePkgs = importNixpkgs { flake = teslamate-flake; };
|
teslamatePkgs = importNixpkgs { flake = teslamate-flake; };
|
||||||
@ -77,7 +77,7 @@
|
|||||||
(final: prev: { inherit pepePkgs; })
|
(final: prev: { inherit pepePkgs; })
|
||||||
];
|
];
|
||||||
in
|
in
|
||||||
import nixpkgs {
|
import nixos-release {
|
||||||
inherit system config;
|
inherit system config;
|
||||||
overlays = additionalOverlays ++ extOverlays ++ [
|
overlays = additionalOverlays ++ extOverlays ++ [
|
||||||
(final: prev: {
|
(final: prev: {
|
||||||
@ -95,7 +95,7 @@
|
|||||||
inherit (pkgs) newScope;
|
inherit (pkgs) newScope;
|
||||||
in
|
in
|
||||||
makeScope newScope (self: rec {
|
makeScope newScope (self: rec {
|
||||||
inherit nixpkgs home-manager nixpkgs-unstable;
|
inherit nixos-release home-manager nixos-unstable;
|
||||||
inherit (self.callPackage ./lib/utils.nix { }) mkSysRole mkHomeRole;
|
inherit (self.callPackage ./lib/utils.nix { }) mkSysRole mkHomeRole;
|
||||||
inherit (user) mkUser;
|
inherit (user) mkUser;
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user