New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merge master into staging #41088
Merged
dezgeg
merged 125 commits into
NixOS:staging
from
oxij:merge/master-to-staging-20180526
May 26, 2018
Merged
Merge master into staging #41088
dezgeg
merged 125 commits into
NixOS:staging
from
oxij:merge/master-to-staging-20180526
May 26, 2018
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
GRUB 2.0 supports png, jpeg and tga. This will use the image's suffix to load the right module. As jpeg module is named jpeg, jpg is renamed jpeg. If the user uses wrong image suffix for an image, it wouldn't work anyway. This will leave up to two additional left-over files in /boot/ if user switches through all the supported file formats. The module already left the png image if the user disabled the splash image.
… derivations to new pullImage function signature
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/qjackctl/versions. These checks were done: - built on NixOS - Warning: no invocation of /nix/store/8v1gipr8vnyf6kx68xlxrfkdk226r65q-qjackctl-0.5.1/bin/qjackctl had a zero exit code or showed the expected version - 0 of 1 passed binary check by having a zero exit code. - 0 of 1 passed binary check by having the new version present in output. - found 0.5.1 with grep in /nix/store/8v1gipr8vnyf6kx68xlxrfkdk226r65q-qjackctl-0.5.1 - directory tree listing: https://gist.github.com/b33811366209a2de394b82f4c7cec003 - du listing: https://gist.github.com/5cef67561cc5293a1f1a78504bda18c1
Just like with the other `--extra-*` flags, cc/ld-wrapper already handles this, but we need to make Cabal aware so that the haskell builds have the correct metadata.
…Inputs This is because they are just for Setup.hs, so they are just used at build time and completely isolated from the normal components' dependencies. This was previous implemented in 8a8f040, but reverted in e69c7f5 because it broken setup-depends non-cross in haskell shell environments (custom Setup.hs in cross shell environments has never worked). This version adds a special native exception to avoid that breakage.
…taticlib The reason why this does not work is not that we can't built static objects, we can, but we can't use `-staticlib` on GHC on windows. `-staticlib` rolls all dependencies into a combined archive. While this would work on windows if we used gnu ar and MRI script, GHC can't rely on GNU ar, and as such has a quick archive concatenation module for GNU and BSD archives only.
Shell glob works even as the exact set of executable (filenames) varries beween configuations. Need to skip non ELFs (e.g. shell scripts), however.
nixpkgs#37012 and nixpkgs#37707 introduces the setup-hooks for libiconv, which inject `-liconv` into the `NIX_LDFLAGS`. This breaks horribly on windows where the linker end up having no idea how to linke `-liconv`. The configure.ac file specifically ignores libiconv on windows.
It is no longer required to change the config your ipfs repo manually if you change localDiscovery option in nixos configuration after ipfs repository initialization.
xbmcPlugins.osmc-skin: init at 17.0.4
Use requireFile for impure XCode dependency
python.pkgs.python-language-server: init at 0.18.0
kitty: 0.9.1 -> 0.10.1
ghc, haskell-infra: NixOS#40929 take 2
haskell generic-builder: Limit usage of --extra-framework-dirs on Darwin for compat
Fixed conflicts: - lib/systems/for-meta.nix: in favor of staging - pkgs/os-specific/darwin/xcode/default.nix: in favor of master
oxij
requested review from
Ericson2314,
FRidh,
nbp,
peti and
zimbatm
as code owners
May 26, 2018 00:22
Thanks for the conflict resolution. |
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.
Keeping stuff in sync.