From 992c80c02e1fc883008ce15cc51acd522748011d Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Fri, 8 Nov 2024 02:42:31 +0900 Subject: [PATCH 1/2] ox: 0.6.7 -> 0.6.10 --- pkgs/by-name/ox/ox/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ox/ox/package.nix b/pkgs/by-name/ox/ox/package.nix index ff4551ba0b35..4fd998b576bf 100644 --- a/pkgs/by-name/ox/ox/package.nix +++ b/pkgs/by-name/ox/ox/package.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "ox"; - version = "0.6.7"; + version = "0.6.10"; src = fetchFromGitHub { owner = "curlpipe"; repo = pname; rev = version; - hash = "sha256-UFNOW/INV/65C6UysKi9lGw+PIj2NXF6ejG5UY702/I="; + hash = "sha256-7PaAcVatm/gqeZRuzCjoF6ZGDP6mIjDTuhmJQ5wt7x8="; }; - cargoHash = "sha256-sy/RNMXJn5k9qw0ghCQA7PqZokpDw0xns4abwa938Gk="; + cargoHash = "sha256-2Jk8uDiTGUQqLOOQVlYm5R7qQXIqP0PkFvv5E5qTzT0="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit ]; From 96e67743abd9c95ddea96a4be83f151df334808a Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Sat, 9 Nov 2024 09:16:57 +0900 Subject: [PATCH 2/2] ox: switch to the new darwin sdk pattern https://discourse.nixos.org/t/the-darwin-sdks-have-been-updated/55295 Co-authored-by: Nick Cao --- pkgs/by-name/ox/ox/package.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/by-name/ox/ox/package.nix b/pkgs/by-name/ox/ox/package.nix index 4fd998b576bf..a9b15a7380e5 100644 --- a/pkgs/by-name/ox/ox/package.nix +++ b/pkgs/by-name/ox/ox/package.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, darwin }: +{ lib, stdenv, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { pname = "ox"; @@ -13,8 +13,6 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-2Jk8uDiTGUQqLOOQVlYm5R7qQXIqP0PkFvv5E5qTzT0="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit ]; - meta = with lib; { description = "Independent Rust text editor that runs in your terminal"; homepage = "https://github.com/curlpipe/ox";