diff --git a/flake.lock b/flake.lock index 0bf320f6..cdc66799 100644 --- a/flake.lock +++ b/flake.lock @@ -1159,22 +1159,6 @@ } }, "nixpkgs-stable_3": { - "locked": { - "lastModified": 1717144377, - "narHash": "sha256-F/TKWETwB5RaR8owkPPi+SPJh83AQsm6KrQAlJ8v/uA=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "805a384895c696f802a9bf5bf4720f37385df547", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-24.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable_4": { "locked": { "lastModified": 1710695816, "narHash": "sha256-3Eh7fhEID17pv9ZxrPwCLfqXnYP006RKzSs0JptsN84=", @@ -1503,7 +1487,7 @@ "nixpkgs": [ "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable_4" + "nixpkgs-stable": "nixpkgs-stable_3" }, "locked": { "lastModified": 1716213921, @@ -1541,7 +1525,6 @@ "nixos-rk3588": "nixos-rk3588", "nixpkgs": "nixpkgs_7", "nixpkgs-darwin": "nixpkgs-darwin", - "nixpkgs-stable": "nixpkgs-stable_3", "nixpkgs-unstable": "nixpkgs-unstable", "nuenv": "nuenv", "nur-ryan4yin": "nur-ryan4yin", diff --git a/flake.nix b/flake.nix index 41ba70c1..d5df5dd2 100644 --- a/flake.nix +++ b/flake.nix @@ -38,7 +38,7 @@ # Official NixOS package source, using nixos's unstable branch by default nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; - nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.05"; + # nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.05"; # for macos nixpkgs-darwin.url = "github:nixos/nixpkgs/nixpkgs-24.05-darwin"; diff --git a/lib/macosSystem.nix b/lib/macosSystem.nix index e69cb415..ef17b47a 100644 --- a/lib/macosSystem.nix +++ b/lib/macosSystem.nix @@ -9,7 +9,7 @@ specialArgs ? (genSpecialArgs system), ... }: let - inherit (inputs) nixpkgs home-manager nix-darwin; + inherit (inputs) nixpkgs-darwin home-manager nix-darwin; in nix-darwin.lib.darwinSystem { inherit system specialArgs; @@ -17,7 +17,7 @@ in darwin-modules ++ [ ({lib, ...}: { - nixpkgs.pkgs = import nixpkgs {inherit system;}; + nixpkgs.pkgs = import nixpkgs-darwin {inherit system;}; }) ] ++ ( diff --git a/outputs/default.nix b/outputs/default.nix index 195bbab6..4a6457c1 100644 --- a/outputs/default.nix +++ b/outputs/default.nix @@ -21,11 +21,11 @@ # To use chrome, we need to allow the installation of non-free software config.allowUnfree = true; }; - pkgs-stable = import inputs.nixpkgs-stable { - inherit system; - # To use chrome, we need to allow the installation of non-free software - config.allowUnfree = true; - }; + # pkgs-stable = import inputs.nixpkgs-stable { + # inherit system; + # # To use chrome, we need to allow the installation of non-free software + # config.allowUnfree = true; + # }; }; # This is the args for all the haumea modules in this folder.