diff options
| -rw-r--r-- | modules/by-name/ni/nix/module.nix | 9 | ||||
| -rw-r--r-- | modules/by-name/ni/nixos-shell/module.nix | 4 | ||||
| -rw-r--r-- | modules/by-name/ve/version/module.nix | 4 |
3 files changed, 8 insertions, 9 deletions
diff --git a/modules/by-name/ni/nix/module.nix b/modules/by-name/ni/nix/module.nix index 11b2d7e4..f094d291 100644 --- a/modules/by-name/ni/nix/module.nix +++ b/modules/by-name/ni/nix/module.nix @@ -16,10 +16,9 @@ sources, self, system, - externalDependencies, ... }: let - inherit (sources) nixpkgs; + inherit (sources) nixpkgs-unstable; lix = pkgs.lixPackageSets.latest.lix; @@ -67,9 +66,9 @@ in { channel.enable = false; registry = { - nixpkgs.flake = nixpkgs; + nixpkgs.flake = nixpkgs-unstable; n.flake = - nixpkgs + nixpkgs-unstable // { # Otherwise nixpkgs's config and overlays are not available: @@ -78,7 +77,7 @@ in { legacyPackages."${system}" = pkgs; }; - t.flake = externalDependencies.templates; + t.flake = sources.templates; my_flake.flake = self; m.flake = self; diff --git a/modules/by-name/ni/nixos-shell/module.nix b/modules/by-name/ni/nixos-shell/module.nix index 1a0190c8..13896b55 100644 --- a/modules/by-name/ni/nixos-shell/module.nix +++ b/modules/by-name/ni/nixos-shell/module.nix @@ -15,7 +15,7 @@ ... }: let cfg = config.soispha.nixos-shell; - inherit (sources) nixpkgs; + inherit (sources) nixpkgs-unstable; in { options.soispha.nixos-shell = { enable = lib.mkEnableOption "nixos-shell"; @@ -86,7 +86,7 @@ in { }; config = let - vmSystem = nixpkgs.lib.nixosSystem { + vmSystem = nixpkgs-unstable.lib.nixosSystem { inherit (cfg.configuration) specialArgs; modules = [ diff --git a/modules/by-name/ve/version/module.nix b/modules/by-name/ve/version/module.nix index d666695d..83c548eb 100644 --- a/modules/by-name/ve/version/module.nix +++ b/modules/by-name/ve/version/module.nix @@ -15,14 +15,14 @@ }: let cfg = config.soispha.version; - inherit (sources) nixpkgs; + inherit (sources) nixpkgs-unstable; in { options.soispha.version = { enable = lib.mkEnableOption "storing the git revision in /etc/nixpkgs-git-revision"; }; config = lib.mkIf cfg.enable { environment.etc.nixpkgs-git-revision = { - source = "${nixpkgs}/.git-revision"; + source = "${nixpkgs-unstable}/.git-revision"; }; }; } |