nixpkgs: Update submodule to latest master #44
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
nh2
force-pushed
the
nixpkgs-master-2019-08-10
branch
5 times, most recently
from
7f14bc3 to
1a62682
Compare
This removes the need to detect HerculesCI specifically, because it simply doesn't have the submodule present.
Also use stack2nix version that's * not marked as broken (the case in current nixpkgs master) * new enough to have the fix for the `stack2nix-output.nix: commitBuffer: invalid argument (invalid character)` problem, see channable/vaultenv#43 (comment)
Using `pkgs.python27` instead of `previous.python27` was totally wrong, that stops overlays from working correctly. Not sure what I was thinking when I wrote that. Fixes `pkgs.fontforge` failing to link with weird glibc error via python as shown in NixOS/nixpkgs#66598.
Our submodule now includes the fix from NixOS/nixpkgs#66490 which makes this unnecessary.
Linking Haskell programs doesn't generally need zlib. Now that (with the previous commits) the system `zlib` library has `.a` files, we can just override the Haskell `zlib` library to use those. Then the library paths will automatically be propagated.
Update static-stack Hackage snapshot to get the packages it needs.
nh2
force-pushed
the
nixpkgs-master-2019-08-10
branch
from
1a62682 to
0428602
Compare
|
I force-reset this branch to the one built on top of it called It built nicely on CI: https://buildkite.com/nh2/static-haskell-nix/builds/66 |
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.
See #6 (comment)