kakoune: 2019.01.20 -> 2019.07.01 #64255
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
alyssais
reviewed
Jul 3, 2019
pkgs/applications/editors/kakoune/revert-uncaught-exceptions.patch
Outdated
Show resolved
Hide resolved
|
This is a dupe of #64071, but seems to be a bit further along, so I’m going to close that one. |
10 tasks
eraserhd
force-pushed
the
kakoune-2019.07.01
branch
from
1570257
to
1dc03eb
Compare
|
@GrahamcOfBorg build kakoune
|
alyssais
reviewed
Jul 3, 2019
pkgs/applications/editors/kakoune/revert-uncaught-exceptions.patch
Outdated
Show resolved
Hide resolved
|
I have confirmed that the following patch allows this to build without the reverting commit. Of course, it took several hours to rebuild all the dependencies. What should we do? diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix
index f7a40bb0d0e..b6a488ed2f2 100644
--- a/pkgs/stdenv/darwin/default.nix
+++ b/pkgs/stdenv/darwin/default.nix
@@ -32,7 +32,7 @@ in rec {
export NIX_ENFORCE_NO_NATIVE="''${NIX_ENFORCE_NO_NATIVE-1}"
export NIX_IGNORE_LD_THROUGH_GCC=1
stripAllFlags=" " # the Darwin "strip" command doesn't know "-s"
- export MACOSX_DEPLOYMENT_TARGET=10.10
+ export MACOSX_DEPLOYMENT_TARGET=10.12
export SDKROOT=
export CMAKE_OSX_ARCHITECTURES=x86_64
# Workaround for https://openradar.appspot.com/22671534 on 10.11. |
|
cc @NixOS/darwin-maintainers |
|
We definitively can update it, I forgot to make a pr after noticing. |
10 tasks
10 tasks
eraserhd
force-pushed
the
kakoune-2019.07.01
branch
from
1dc03eb
to
affa58d
Compare
eraserhd
force-pushed
the
kakoune-2019.07.01
branch
from
affa58d
to
2eac754
Compare
|
Now that Rebuilt on NixOS and MacOS, and it's good. Please merge! |
|
@GrahamcOfBorg build kakoune |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
One commit is reverted for Mac OS, since std::uncaught_exceptions()
isn't allowed when pinning OS X version to 10.10.
Motivation for this change
New release
Things done
sandboxinnix.confon non-NixOS)nix-shell -p nix-review --run "nix-review wip"./result/bin/)nix path-info -Sbefore and after)Path size: 41,022,312 -> 41,221,984