Skip to content

Commit 9f1a22a

Browse files
committed
chore(pkgs): remove support for x86_64-darwin
1 parent c589ea1 commit 9f1a22a

File tree

14 files changed

+13
-29
lines changed

14 files changed

+13
-29
lines changed

flake.lock

Lines changed: 4 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
url = "github:hercules-ci/flake-parts";
2727
inputs.nixpkgs-lib.follows = "nixpkgs";
2828
};
29-
systems.url = "github:nix-systems/default";
3029
nixos-hardware.url = "github:nixos/nixos-hardware";
3130
determinate.url = "github:determinatesystems/determinate";
3231
treefmt-nix = {
@@ -57,7 +56,6 @@
5756
inputs = {
5857
nixpkgs.follows = "nixpkgs";
5958
flake-parts.follows = "flake-parts";
60-
systems.follows = "systems";
6159
};
6260
};
6361
quadlet-nix = {
@@ -123,7 +121,7 @@
123121
};
124122

125123
outputs =
126-
inputs@{ flake-parts, systems, ... }:
124+
inputs@{ flake-parts, ... }:
127125
flake-parts.lib.mkFlake
128126
{
129127
inherit inputs;
@@ -132,7 +130,11 @@
132130
};
133131
}
134132
{
135-
systems = import systems;
133+
systems = [
134+
"x86_64-linux"
135+
"aarch64-linux"
136+
"aarch64-darwin"
137+
];
136138
imports = [ ./flake-modules ];
137139
};
138140
}

pkgs/derivations/claude-code-bin/package.nix

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ let
1717
platforms = {
1818
x86_64-linux = "linux-x64";
1919
aarch64-linux = "linux-arm64";
20-
x86_64-darwin = "darwin-x64";
2120
aarch64-darwin = "darwin-arm64";
2221
};
2322
platform = platforms.${stdenvNoCC.hostPlatform.system};

pkgs/derivations/codex-bin/package.nix

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ let
1010
platforms = {
1111
x86_64-linux = "x86_64-unknown-linux-gnu";
1212
aarch64-linux = "aarch64-unknown-linux-gnu";
13-
x86_64-darwin = "x86_64-apple-darwin";
1413
aarch64-darwin = "aarch64-apple-darwin";
1514
};
1615
in

pkgs/derivations/copilot-language-server/package.nix

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ let
1111
platforms = {
1212
x86_64-linux = "linux-x64";
1313
aarch64-linux = "linux-arm64";
14-
x86_64-darwin = "darwin-x64";
1514
aarch64-darwin = "darwin-arm64";
1615
};
1716
ghBin = mkGitHubBinary {

pkgs/derivations/gitui-bin/package.nix

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ let
88
platforms = {
99
x86_64-linux = "linux-x86_64";
1010
aarch64-linux = "linux-aarch64";
11-
x86_64-darwin = "mac-x86";
1211
aarch64-darwin = "mac";
1312
};
1413
in
@@ -17,7 +16,7 @@ mkGitHubBinary {
1716
repo = "gitui";
1817
file = ./release.json;
1918
getAsset = { system, ... }: "gitui-${platforms.${system}}.tar.gz";
20-
pattern = ''^gitui-(linux-aarch64|linux-x86_64|mac-x86|mac)\\.tar\\.gz$'';
19+
pattern = ''^gitui-(linux-aarch64|linux-x86_64|mac)\\.tar\\.gz$'';
2120
versionPrefix = "v";
2221

2322
sourceRoot = ".";

pkgs/derivations/goneovim-bin/package.nix

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
}:
66
let
77
platforms = {
8-
x86_64-darwin = "macos-x86_64";
98
aarch64-darwin = "macos-arm64";
109
};
1110
ghBin = mkGitHubBinary {
@@ -14,7 +13,7 @@ let
1413
file = ./release.json;
1514
getAsset = { system, version }: "goneovim-v${version}-${platforms.${system}}.tar.bz2";
1615
versionPrefix = "v";
17-
pattern = ''^goneovim-\($release.tag_name)-(?<platform>macos-(arm64|x86_64))\\.tar\\.bz2$'';
16+
pattern = ''^goneovim-\($release.tag_name)-macos-arm64\\.tar\\.bz2$'';
1817
};
1918
in
2019
mkApp (finalAttrs: {

pkgs/derivations/hkknx-bin/package.nix

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ let
77
platforms = {
88
x86_64-linux = "linux_amd64";
99
aarch64-linux = "linux_arm64";
10-
x86_64-darwin = "darwin_amd64";
1110
aarch64-darwin = "darwin_arm64";
1211
};
1312
in

pkgs/derivations/ruff-bin/package.nix

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ let
88
platforms = {
99
x86_64-linux = "x86_64-unknown-linux-gnu";
1010
aarch64-linux = "aarch64-unknown-linux-gnu";
11-
x86_64-darwin = "x86_64-apple-darwin";
1211
aarch64-darwin = "aarch64-apple-darwin";
1312
};
1413
in

pkgs/derivations/sioyek-bin/package.nix

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
}:
88
let
99
platforms = {
10-
x86_64-darwin = "mac";
1110
aarch64-darwin = "mac-arm";
1211
};
1312
ghBin = mkGitHubBinary {
@@ -16,7 +15,7 @@ let
1615
file = ./release.json;
1716
getAsset = { system, ... }: "sioyek-release-${platforms.${system}}.zip";
1817
versionPrefix = "sioyek";
19-
pattern = ''^sioyek-release-mac.*?\\.zip$'';
18+
pattern = ''^sioyek-release-mac-arm\\.zip$'';
2019
allowPrereleases = true;
2120
};
2221
in

0 commit comments

Comments
 (0)