From 45e0da0e28be06cad7c5041b9c86a98218763c21 Mon Sep 17 00:00:00 2001
From: Jens Nolte <git@queezle.net>
Date: Wed, 10 Feb 2021 12:22:50 +0100
Subject: [PATCH] Rename nixpkgs-unstable to nixpkgs
---
flake.nix | 12 +++++++++++-
machine-manager.nix | 4 ++--
2 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/flake.nix b/flake.nix
index 6d3d734..963b492 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,5 +1,15 @@
{
- inputs.nixpkgs.url = github:nixos/nixpkgs/nixpkgs-unstable;
+ inputs = {
+ nixpkgs.url = github:nixos/nixpkgs/nixos-unstable;
+ #homemanager = {
+ # url = github:nix-community/home-manager;
+ # inputs.nixpkgs.follows = "nixpkgs";
+ #};
+ #qauth = {
+ # url = gitlab:jens/qauth?host=git.c3pb.de;
+ # inputs.nixpkgs.follows = "nixpkgs";
+ #};
+ };
outputs = { ... }: {
overlay = import ./pkgs;
};
diff --git a/machine-manager.nix b/machine-manager.nix
index 32a7acb..7f35df8 100644
--- a/machine-manager.nix
+++ b/machine-manager.nix
@@ -18,7 +18,7 @@ let
# allChannels :: { *: path (channel) }
#allChannels = with helpers; keysToAttrs loadChannel (readFilterDir (filterAnd [(not filterDirHidden) filterDirDirs]) channelsDir);
# getMachineChannel :: string -> path
- getMachineChannel = _: flakeInputs.nixpkgs-unstable;
+ getMachineChannel = _: flakeInputs.nixpkgs;
#getMachineChannel = { name, path }:
# let
# channelFile = path + "/channel.nix";
@@ -35,7 +35,7 @@ let
evaluateConfig = pkgs: args: (import "${pkgs}/nixos/lib/eval-config.nix" args).config;
mkNixosSystemDerivation = { name, path }:
let
- channel = flakeInputs.nixpkgs-unstable;
+ channel = flakeInputs.nixpkgs;
system = "x86_64-linux";
mkMachineConfig = { name, path, isIso }: {
imports = [
--
GitLab