From 98417f039492c7cc84649455ec86814bdfb4daf8 Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Tue, 11 Oct 2022 22:07:05 +0200
Subject: Use only unstable nixpkgs

---
 flake.nix | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

(limited to 'flake.nix')

diff --git a/flake.nix b/flake.nix
index f5314a26..eb5eecd8 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,29 +1,31 @@
 {
   inputs = {
-    nixos.url = github:NixOS/nixpkgs/nixos-22.05;
-    nixos-unstable.url = github:NixOS/nixpkgs/nixos-unstable;
-    nixpkgs-unstable.url = github:NixOS/nixpkgs;
+    nixpkgs.url = github:NixOS/nixpkgs/nixos-unstable;
     nixos-hardware.url = github:NixOS/nixos-hardware;
     darwin.url = github:lnl7/nix-darwin/master;
-    darwin.inputs.nixpkgs.follows = "nixpkgs-unstable";
+    darwin.inputs.nixpkgs.follows = "nixpkgs";
     home-manager.url = github:nix-community/home-manager;
-    home-manager.inputs.nixpkgs.follows = "nixpkgs-unstable";
+    home-manager.inputs.nixpkgs.follows = "nixpkgs";
   };
 
-  outputs = { self, darwin, home-manager, nixos-unstable, ... }@attrs: {
-    nixosConfigurations.prefect = nixos-unstable.lib.nixosSystem {
+  outputs = { self, darwin, home-manager, nixpkgs, ... }@attrs:
+  let
+    darwinSystem =
+      "x86_64-darwin"; # aarch64 is still failing on some compiler-rt derivation
+      darwinPkgs = nixpkgs.legacyPackages.${darwinSystem};
+  in {
+    nixosConfigurations.prefect = nixpkgs.lib.nixosSystem {
       system = "x86_64-linux";
       specialArgs = attrs;
       modules = [ ./system/prefect.nix ];
     };
     darwinConfigurations.mba = darwin.lib.darwinSystem {
-      system = "x86_64-darwin"; # aarch64 is still failing on some compiler-rt derivation
+      system = darwinSystem;
       specialArgs = attrs;
       modules = [ ./system/mba.nix ];
     };
     homeConfigurations.mba = home-manager.lib.homeManagerConfiguration {
-      system = "x86_64-darwin";
-      specialArgs = attrs;
+      pkgs = darwinPkgs;
       modules = [ ./user/mba.nix ];
     };
   };
-- 
cgit 1.4.1