fix: nixpkgs for darwin

This commit is contained in:
Ryan Yin
2024-06-02 12:59:13 +08:00
parent 9adf87aaf5
commit f37588df64
4 changed files with 9 additions and 26 deletions

19
flake.lock generated
View File

@@ -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",

View File

@@ -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";

View File

@@ -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;};
})
]
++ (

View File

@@ -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.