feat: move to unstable linux builder; move flake template to unstable

konradmalik · Jun 8, 2024 · 4ec2ce2 · 4ec2ce2
1 parent 4bb2296
commit 4ec2ce2
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 15 deletions.
diff --git a/hosts/common/global/docker/darwin.nix b/hosts/common/global/docker/darwin.nix
@@ -5,7 +5,7 @@
   virtualisation.docker = {
     enable = false;
     ephemeral = true;
-    package = pkgs.stable.darwin.linux-builder;
+    package = pkgs.darwin.linux-builder;
     config = import ./linux.nix;
   };
 }
diff --git a/hosts/common/global/nix/darwin.nix b/hosts/common/global/nix/darwin.nix
@@ -14,7 +14,7 @@
     linux-builder = {
       enable = false;
       ephemeral = true;
-      package = pkgs.stable.darwin.linux-builder;
+      package = pkgs.darwin.linux-builder;
     };
   };
   services.nix-daemon.enable = true;

diff --git a/templates/default/flake.nix b/templates/default/flake.nix
@@ -2,22 +2,12 @@
   description = "Development environment for this project";
 
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11";
-    nixpkgs-unstable.url = "github:nixos/nixpkgs/nixpkgs-unstable";
+    nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
   };
 
   outputs =
     { ... }@inputs:
     let
-      mkOverlay =
-        input: name:
-        (final: prev: {
-          "${name}" = import input {
-            system = final.system;
-            config = final.config;
-          };
-        });
-
       forAllSystems =
         function:
         inputs.nixpkgs.lib.genAttrs
@@ -33,7 +23,6 @@
               import inputs.nixpkgs {
                 inherit system;
                 config.allowUnfree = true;
-                overlays = [ (mkOverlay inputs.nixpkgs-unstable "unstable") ];
               }
             )
           );
@@ -42,7 +31,6 @@
       devShells = forAllSystems (pkgs: {
         default = pkgs.mkShell {
           name = "Shell for this project";
-
           packages = [ ];
         };
       });