Skip to content

Commit

Permalink
Merge pull request #57 from isabelroses/chore-drop-fu
Browse files Browse the repository at this point in the history
chore: drop flake-utils
  • Loading branch information
zhaofengli authored Jan 5, 2025
2 parents ac3945e + 77d8887 commit a6d99cc
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 45 deletions.
34 changes: 0 additions & 34 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

27 changes: 16 additions & 11 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -4,35 +4,40 @@
inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
nix-darwin.url = "github:LnL7/nix-darwin";
flake-utils.url = "github:numtide/flake-utils";
brew-src = {
url = "github:Homebrew/brew/4.4.5";
flake = false;
};
};

outputs = { self, nixpkgs, nix-darwin, flake-utils, brew-src, ... } @ inputs: let
outputs = { self, nixpkgs, nix-darwin, brew-src, ... } @ inputs: let
# System types to support.
supportedSystems = [ "x86_64-darwin" "aarch64-darwin" ];

flakeLock = builtins.fromJSON (builtins.readFile ./flake.lock);
brewVersion = flakeLock.nodes.brew-src.original.ref;
in flake-utils.lib.eachSystem supportedSystems (system: let
pkgs = nixpkgs.legacyPackages.${system};

forAllSystems =
function:
nixpkgs.lib.genAttrs supportedSystems (
system: function nixpkgs.legacyPackages.${system}
);
in {
packages = pkgs.callPackage ./pkgs {
packages = forAllSystems (pkgs: pkgs.callPackage ./pkgs {
inherit inputs;
};
devShell = pkgs.mkShell {
});

devShell = forAllSystems (pkgs: pkgs.mkShell {
nativeBuildInputs = with pkgs; [
];

BREW_SRC = brew-src;
};
ci = import ./ci (inputs // {
inherit pkgs;
});
}) // {

ci = forAllSystems (pkgs: import ./ci (inputs // {
inherit pkgs;
}));

darwinModules = {
nix-homebrew = { lib, ... }: {
imports = [
Expand Down

0 comments on commit a6d99cc

Please sign in to comment.