backport keybase from unstable #51264
Merged
+49
−28
Conversation
This file contains hidden or 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
kalbasit
added
2.status: work-in-progress
|
I'm currently testing the PR on my NixOS and Darwin machines and will remove the label |
kalbasit
added a commit
to kalbasit/shabka
that referenced
this pull request
Nov 30, 2018
kalbasit
added a commit
to kalbasit/shabka
that referenced
this pull request
Nov 30, 2018
…ith-nix-darwin * origin/master: (62 commits) external/home-manager: update to 40b279e3a33fd47b7e65e0303fcb9be621aeb7d3 overlays: import NixOS/nixpkgs#51264 home: i3: s for opening Studio with obs-studio in a floating workspace home: i3: m for opening Mail with Astroid home: i3: clean up obsolete and t for TaskWarrior through ptask network-manager: 1.12.2 -> 1.14.4 hosts/zeus: update Plex to 1.13.9.5456 home: workstation: setup SSH config from private network-secrets external/home-manager: update to 67ebe16b406950651de09448cd5afdb437545be6 README: extract congruent definition to doc/congruent.md (#61) README: extract the documentation to doc/modules.md (#60) hosts/zeus: iscsid-nas: login only when a session does not already exist hosts/zeus: update the win10 XML hosts/zeus: iscsid-nas.service should be a oneshot service and remains after exit hosts/zeus: sshd: wait 5 seconds before restarting hosts/zeus: the sshd service should depend on network-addresses-ifcadmin.service hosts/zeus: load the iscsi_tcp kernel module required for iSCSI hosts/zeus: automate the creation and the starting of the Windows server. (#59) hosts/zeus: enable libvirtd and iscsid to host a Windows machine (#58) hosts/hades: remove Publica support from my personal workstation ...
|
I completed the round of tests on Darwin and I'm comfortable with the backport. This PR is now ready for review. |
Mic92
approved these changes
Dec 2, 2018
|
@GrahamcOfBorg build keybase keybase-gui |
|
The |
(cherry picked from commit 68ad1f8)
- Use `autoPatchelfHook` - Don't explicitly set phases - Part of NixOS#28910 - Correct `version` by hoisting out the suffix (cherry picked from commit 02e9d06)
(cherry picked from commit 468d41d)
Undefined symbols for architecture x86_64:
"_OBJC_CLASS_$_NSData", referenced from:
objc-class-ref in _x002.o
"_OBJC_CLASS_$_NSDictionary", referenced from:
objc-class-ref in _x002.o
"_OBJC_CLASS_$_NSURL", referenced from:
objc-class-ref in _x002.o
ld: symbol(s) not found for architecture x86_64
(cherry picked from commit be9fc0d)
(cherry picked from commit 3fdbd98)
(cherry picked from commit 254c5a0)
(cherry picked from commit b49ed49)
kalbasit
force-pushed
the
nixpkgs_update-keybase
branch
from
68a54ac to
9678418
Compare
|
@c0bw3b you're right, I missed that one. @GrahamcOfBorg build keybase keybase-gui kbfs |
c0bw3b
approved these changes
Dec 2, 2018
kalbasit
added a commit
to kalbasit/shabka
that referenced
this pull request
Dec 9, 2018
This reverts commit 3e8f1a0.
kalbasit
added a commit
to kalbasit/shabka
that referenced
this pull request
Dec 9, 2018
…leci * origin/master: Revert "overlays: import NixOS/nixpkgs#51264"
10 tasks
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.
Motivation for this change
I received an email from Keybase that the version 2.6.0 that's currently on 18.09 has reach EOL and will no longer be maintained soon.
Fixes #50999
Things done
sandboxinnix.confon non-NixOS)nix-shell -p nox --run "nox-review wip"./result/bin/)nix path-info -Sbefore and after)cc @carlsverre @np @rvolosatovs @puffnfresh