diff --git a/pkgs/by-name/gr/gram/package.nix b/pkgs/by-name/gr/gram/package.nix index 48a4664be6fd..5ff5ef2d9d67 100644 --- a/pkgs/by-name/gr/gram/package.nix +++ b/pkgs/by-name/gr/gram/package.nix @@ -6,7 +6,6 @@ pkg-config, protobuf, fontconfig, - libgit2, openssl, sqlite, zlib, @@ -31,7 +30,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "gram"; - version = "2.2.0"; + version = "3.0.1"; outputs = [ "out" @@ -44,7 +43,7 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "GramEditor"; repo = "gram"; tag = finalAttrs.version; - hash = "sha256-w0uZ2qAc3Tt6QVRAX97LWW9aOs02fG1SEYCDhpUhinE="; + hash = "sha256-B3RmY1h0+D0aawNzevdt9f+gzozckjInhoz+t9taf8o="; }; postPatch = '' @@ -54,7 +53,7 @@ rustPlatform.buildRustPackage (finalAttrs: { --replace-fail '$CARGO_ABOUT_VERSION' '${cargo-about.version}' ''; - cargoHash = "sha256-+lmDbawAIRllC7LzGJ9qPMtHXPd5aMoul47YOA7nfXA="; + cargoHash = "sha256-pK0rUuPtWejXitbDQqh9fvdEv3aza0ZEg1XWnCmY4eE="; __structuredAttrs = true; @@ -71,7 +70,6 @@ rustPlatform.buildRustPackage (finalAttrs: { dontUseCmakeConfigure = true; buildInputs = [ - (libgit2.override { withExperimentalSha256 = true; }) openssl sqlite zlib @@ -89,16 +87,13 @@ rustPlatform.buildRustPackage (finalAttrs: { ] ++ lib.optionals buildRemoteServer [ "--package=remote_server" ]; - # Required on darwin because we don't have access to the proprietary Metal shader compiler. - buildFeatures = lib.optionals stdenv.hostPlatform.isDarwin [ "gpui/runtime_shaders" ]; - env = { ALLOW_MISSING_LICENSES = true; OPENSSL_NO_VENDOR = true; - LIBGIT2_NO_VENDOR = true; LIBSQLITE3_SYS_USE_PKG_CONFIG = true; ZSTD_SYS_USE_PKG_CONFIG = true; RELEASE_VERSION = finalAttrs.version; + GRAM_UPDATE_EXPLANATION = "Updates are handled by nixpkgs"; }; preBuild = ''