diff options
Diffstat (limited to 'pkgs/applications/editors')
4 files changed, 27 insertions, 12 deletions
diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-packages.nix index 9550969adbbe2..192320fab674d 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-packages.nix @@ -66,7 +66,7 @@ self: let org = super.org.overrideAttrs (old: { dontUnpack = false; - patches = old.patches or [ ] ++ [ + patches = old.patches or [ ] ++ lib.optionals (lib.versionOlder old.version "9.7.5") [ # security fix backported from 9.7.5 (pkgs.fetchpatch { url = "https://git.savannah.gnu.org/cgit/emacs/org-mode.git/patch/?id=f4cc61636947b5c2f0afc67174dd369fe3277aa8"; diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix index a3d729b636eee..3e8ab4625fec2 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix @@ -143,7 +143,7 @@ self: let org = super.org.overrideAttrs (old: { dontUnpack = false; - patches = old.patches or [ ] ++ [ + patches = old.patches or [ ] ++ lib.optionals (lib.versionOlder old.version "9.7.5") [ # security fix backported from 9.7.5 (pkgs.fetchpatch { url = "https://git.savannah.gnu.org/cgit/emacs/org-mode.git/patch/?id=f4cc61636947b5c2f0afc67174dd369fe3277aa8"; diff --git a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix index bb45c383487cc..1e9a8191b3f16 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix @@ -508,14 +508,29 @@ let rime = super.rime.overrideAttrs (old: { buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.librime ]; - preBuild = (old.preBuild or "") + '' + preBuild = (old.preBuild or "") + + (if pkgs.stdenv.isDarwin then + '' + export MODULE_FILE_SUFFIX=".dylib" + make lib + mkdir -p /tmp/build/rime-lib + cp *.dylib /tmp/build/rime-lib + '' + else + '' make lib mkdir -p /build/rime-lib cp *.so /build/rime-lib - ''; - postInstall = (old.postInstall or "") + '' + ''); + postInstall = (old.postInstall or "") + + (if pkgs.stdenv.isDarwin then + '' + install -m444 -t $out/share/emacs/site-lisp/elpa/rime-* /tmp/build/rime-lib/*.dylib + '' + else + '' install -m444 -t $out/share/emacs/site-lisp/elpa/rime-* /build/rime-lib/*.so - ''; + ''); }); shm = super.shm.overrideAttrs (attrs: { diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index 3461744ec6ebf..c1f275b6911e6 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -15,11 +15,11 @@ let archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "1r76ikfikagg9v278pgiqhnjsv7pqn0xi372y1l0wsashlxl7kb0"; - x86_64-darwin = "156604xzazmb54p0rdkv5wy9livg0xz2jviycdizablmvsxybs57"; - aarch64-linux = "0cp120pcjpgf9qvmks9f8l2caxqlvnqvmxa7fh9mf83zpkdmnsnl"; - aarch64-darwin = "1k06648jx64irshs0v4qy6xlkd9mk514xf21dlfhvic4aj89kcx9"; - armv7l-linux = "0jy8hkbxh1969kskggg2y86cphly9l9gs7y4plj90jmlvlzjjjxm"; + x86_64-linux = "01riva442l78d8dyh0wb9iqhjfa1bd48bpc7zfvd4zpz6fwhlkqr"; + x86_64-darwin = "1pmvjxagbfrp25i4s66j892xiskrld5z25mkvlsdkddqlvnhanc9"; + aarch64-linux = "1lk1p45ibph3arbb5vgkgxlip2jafgmpq40ldpfrh55k6v83zd2q"; + aarch64-darwin = "17cd0grmplvk8s5wrcd1v172irrddjcc9drfp7qpvszd3kiy09a7"; + armv7l-linux = "1636i9b4fxh2jvakjag38ij6kmj1cf0nlfzyk5rfl06i06gfd6jr"; }.${system} or throwSystem; sourceRoot = lib.optionalString (!stdenv.isDarwin) "."; @@ -29,7 +29,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.90.1.24165"; + version = "1.90.2.24171"; pname = "vscodium"; executableName = "codium"; |