Commit Graph

141048 Commits

Author SHA1 Message Date
John Ericson ae62436793
Merge pull request #40642 from angerman/feature/clean-ghc
ghc, haskell-infra: Improve cross-compilation
2018-05-21 18:01:17 -04:00
John Ericson d6ecbbe921
Merge branch 'staging' into feature/clean-ghc 2018-05-21 17:43:30 -04:00
Moritz Angermann 4b48094285 ghc 8.4.2, head: Drop `libiconv` on windows.
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.
2018-05-21 15:11:12 -04:00
John Ericson 03602f8162 ghc 8.4.2, head: Adjust enableShared enableTerminfo for windows 2018-05-21 15:11:12 -04:00
Moritz Angermann 6af0c192d1 ghc: paxmark all unwraped executables across the board
Shell glob works even as the exact set of executable (filenames) varries
beween configuations.
2018-05-21 15:11:12 -04:00
John Ericson 8d2ce113d5 ghc: Handle flavors better 2018-05-21 15:11:12 -04:00
John Ericson 6f2f081b90 ghc: Normalize derivations 2018-05-21 15:11:12 -04:00
Moritz Angermann f914fdd960 used stdenv.targetPlatform.isDarwin and not stdenv.isDarwin. 2018-05-21 15:11:11 -04:00
Moritz Angermann 82a847a04b haskell infra: Adds buildFlags logic 2018-05-21 15:11:11 -04:00
Moritz Angermann 5e589a4049 haskell generic builder: Do the `links` dance only if shared is enabled. 2018-05-21 15:11:11 -04:00
Moritz Angermann 4ea33def46 haskell generic builder: Disable static libs on Windows because no -staticlib
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.
2018-05-21 15:11:11 -04:00
Moritz Angermann 15759df660 haskell generic builder: Use setup package database for setup-depends
Adapted from b69f420121 by @Ericson2314
2018-05-21 15:11:10 -04:00
John Ericson 900862ea3b haskell generic builder: `setupHaskellDepends` should be `nativeBuildInputs
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 8a8f0408cd, but
reverted in e69c7f5641 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.
2018-05-21 15:09:51 -04:00
Jörg Thalheim 99c1d03096
Merge pull request #40470 from teto/libnl_python
[RFC] pythonPackages.libnl: init+bump at 3.4.0
2018-05-21 13:11:08 +01:00
Thomas Tuegel f47021aa62
Merge pull request #40800 from ttuegel/feature/staging/cmake-3.11.2
cmake: 3.10.2 -> 3.11.2
2018-05-21 06:59:35 -05:00
Matthieu Coudron 0d17a57afa pythonPackages.libnl-python: init at 3.4.0
Netlink is the userspace <-> kernelspace communication protocol.
2018-05-21 18:52:16 +09:00
Matthieu Coudron d9dadce758 libnl: 3.3.0 -> 3.4.0 2018-05-21 18:51:34 +09:00
Vladimír Čunát b33e666b0a
Merge #40796: pciutils: build with dns query support 2018-05-20 13:25:33 +02:00
Vladimír Čunát 392e6de7d0
Merge branch 'master' into staging 2018-05-20 13:20:53 +02:00
adisbladis 68cdc9c09e
firefox-beta-bin: 61.0b5 -> 61.0b6 2018-05-20 19:17:09 +08:00
adisbladis 1544960054
firefox-devedition-bin: 61.0b5 -> 61.0b6 2018-05-20 19:17:01 +08:00
Jörg Thalheim 9d3693bde6
Merge pull request #40808 from Mic92/rust-curl-sys
cargo-vendor: fix build
2018-05-20 11:53:09 +01:00
Jörg Thalheim 8ac7c7fcc7
Merge pull request #40802 from knedlsepp/fix-git-dit-on-darwin
gitAndTools.git-dit: Fix darwin build
2018-05-20 11:32:23 +01:00
Jörg Thalheim f814d8ffb4
Merge pull request #40799 from lopsided98/tmon-lib-gcc-s
tmon: fix missing libgcc_s.so required by pthreads
2018-05-20 11:31:50 +01:00
P-E-Meunier aa1d7961e7 curl-sys: fix linking against zlib 2018-05-20 11:30:06 +01:00
P-E-Meunier c0e2f7bbbe buildRustCrate: add extraLinkFlags parameter
This is useful when build scripts do not apply linking flags
2018-05-20 11:29:34 +01:00
adisbladis 4810776809
Merge pull request #40721 from lheckemann/konquest
kdeApplications.konquest: init at 2.4
2018-05-20 13:32:43 +08:00
Josef Kemetmüller 3575b82e67 gitAndTools.git-dit: Fix darwin build 2018-05-20 04:09:04 +02:00
Samuel Leathers be5e8faafc
Merge pull request #40742 from worldofpeace/antibody
antibody: init at 3.4.6
2018-05-19 21:39:40 -04:00
Samuel Leathers caa1414482
Merge pull request #40770 from mnacamura/gauche
gauche: init at 0.9.5
2018-05-19 21:38:39 -04:00
Samuel Leathers 9a1fac43e6
Merge pull request #40769 from mnacamura/slib
slib: 3b2 -> 3b5
2018-05-19 21:37:12 -04:00
Samuel Leathers 582beb0f3a
Merge pull request #40741 from xeji/prometheus
prometheus_1: 1.8.1 -> 1.8.2, fix build
2018-05-19 21:31:05 -04:00
Samuel Leathers e01a5b1aa8
Merge pull request #40750 from veprbl/pr/vim8.1
vim: 8.0.1655 -> 8.1.0001
2018-05-19 21:30:26 -04:00
Samuel Leathers fef6b9ac0c
Merge pull request #40801 from xeji/test/dnscrypt-proxy
nixos/dnscrypt-proxy: fix apparmor profile and test
2018-05-19 21:11:17 -04:00
Uli Baum 8dbd8f4d69 nixos/dnscrypt-proxy: fix apparmor profile and test
Test failed because of an incomplete apparmor profile.
- fix apparmor profile
- improve test timing, prevent non-deterministic failure
2018-05-20 02:25:42 +02:00
Thomas Tuegel 75e78eda1f
cmake: 3.10.2 -> 3.11.2
Fixes #40751.
2018-05-19 18:28:01 -05:00
xeji f4ec18aaac
nixos/cjdns: fix service for i686 (#40740)
service failed to start because of MemoryDenyWriteExecute = true,
which seems not to work on i686
2018-05-20 01:01:42 +02:00
Ben Wolsieffer 6e222ef496 tmon: fix missing libgcc_s.so required by pthreads 2018-05-19 18:27:19 -04:00
Benjamin Staffin e385ca7ede
pciutils: build with dns query support
This enables `lspci -q` to look up unknown PCI IDs via DNS queries
without needing the `update-pciids` script that the derivation doesn't
include.
2018-05-19 17:51:51 -04:00
Jörg Thalheim 8bcec815bd
Merge pull request #40744 from kirelagin/wireguard-darwin
WireGuard: Make tools available on other platforms
2018-05-19 22:49:54 +01:00
averelld b998139b85 x2goclient: 4.1.0.0 -> 4.1.1.1 (#40793) 2018-05-19 23:46:26 +02:00
Silvan Mosberger c8a8ecb5b3 blockhash: init at 0.3 (#40737) 2018-05-19 23:33:09 +02:00
Pascal Bach 548417c209 riot-web: 0.14.2 -> 0.15.3 (#40792) 2018-05-19 23:26:54 +02:00
Silvan Mosberger bf629981a6 nms: init at 0.3.3 (#40707) 2018-05-19 23:26:06 +02:00
José Romildo Malaquias bf049151a7 materia-theme: 20180321 -> 20180519 (#40790)
- Update to version 20180519

- Do not unset the environment variable 'name' anymore before running
install.sh. It has been renamed to '_name' in upstream.
2018-05-19 23:19:22 +02:00
Vincent Laporte 0d319657ef ocamlPackages.earley: init at 1.0.2 (#40755) 2018-05-19 23:01:40 +02:00
Jack Cummings 2fe842a200 fix ghc bootstrap on non-nixos nonstd-storepath
Something goes amiss in the configurePhase and binaries start picking up
system binaries and everything falls apart. Patch the configure script
to use a bourne shell out of the store, and things are happier.

Closes https://github.com/NixOS/nixpkgs/pull/40691.
2018-05-19 22:24:31 +02:00
Peter Simons 49fc5f0044 git-annex: update sha256 hash for the new version 2018-05-19 22:24:31 +02:00
Peter Simons c2dd77c440 haskell-vector-sized: update override for the latest version 2018-05-19 22:24:30 +02:00
Peter Simons b558e43753 haskell-hspec: use version 2.5.1 for ghc-8.4.x 2018-05-19 22:24:30 +02:00