427689ec3c
Merge pull request #40988 from lsix/django-1.11.13
...
pythonPackages.django: 1.11.12 -> 1.11.13
2018-05-23 18:36:13 +02:00
9c2b4e53fa
hackage-packages.nix: automatic Haskell package set update
...
This update was generated by hackage2nix v2.9.2-13-gd8bc043 from Hackage revision
9866f7be16
2018-05-23 18:21:13 +02:00
f9524a48f3
LTS Haskell 11.10
2018-05-23 18:21:13 +02:00
ba47d40db9
hackage-packages.nix: automatic Haskell package set update
...
This update was generated by hackage2nix v2.9.2-13-gd8bc043 from Hackage revision
4e1741ad6f
2018-05-23 18:21:13 +02:00
e7abee1939
hackage2nix: disable failing builds on Hydra
2018-05-23 18:21:12 +02:00
e28a586f94
sqlite{,-analyzer}: use the same src ( #40945 )
2018-05-23 19:06:46 +03:00
5efdf73832
sc-im: available on the other Unix-like platforms ( #40986 )
2018-05-23 17:49:02 +02:00
11fe14b2aa
Merge branch 'ios-mini-staging' into staging
2018-05-23 11:46:49 -04:00
895fef2b19
clang3.4: still needs libedit
...
https://hydra.nixos.org/build/72965931/nixlog/1
(cherry picked from commit 2d90138b3b
2018-05-23 11:46:40 -04:00
ee9dc37e04
Merge pull request #40933 from obsidiansystems/linux-to-darwin
...
stdenv, binutils: Build cctools targeting macOS on Linux without pointless rebuilds
2018-05-23 11:37:43 -04:00
273c882f53
Merge pull request #39214 from seppeljordan/add-nix-prefetch-github
...
Add nix-prefetch-github
2018-05-23 16:33:03 +01:00
6ea941d3fd
gmsh: gfortran -> nativeBuildInputs ( fix #40976 ) ( #40984 )
2018-05-23 17:32:43 +02:00
be7b42f49f
elixir: 1.6.4 -> 1.6.5
2018-05-23 11:27:41 -04:00
b86aa55408
pythonPackages.pylibconfig2: 0.2.4 -> 0.2.5 ( #40985 )
2018-05-23 17:25:44 +02:00
96c81d2fdd
beegfs/module: Fix a typo in meta.conf generation ( #40979 )
...
This typo places mgtmd.extraConf in meta.conf
leading to meta.extraConf being ignored.
2018-05-23 17:23:58 +02:00
4bf6889876
strace: fix libunwind detection by fixing use of lib.optional ( #40994 )
2018-05-23 17:15:05 +02:00
d6b9e625d5
Merge pull request #40977 from Mic92/radare2
...
radare2: 2.5.0 -> 2.6.0
2018-05-23 16:12:35 +01:00
9416f29800
llvm: remove libedit from clang
...
clang should never need libedit. From what I understand this is only
needed by LLDB.
https://github.com/llvm-mirror/clang/search?q=libedit
(cherry picked from commit 9ee69c27c9
2018-05-23 11:09:12 -04:00
d417ada9a6
clang: only link if LLVMgold exists
...
buildEnv now errors with broken symlinks. Lots of things like this
still exist.
Discussion in #39038 .
(cherry picked from commit 7b73c7f49a
2018-05-23 11:09:05 -04:00
63df0613d6
Merge branch 'ios-mini-staging' into staging
2018-05-23 10:58:54 -04:00
aac8be76f5
Merge pull request #40992 from obsidiansystems/stdenv-darwin-persist
...
darwin stdenv: Properly compose overrides
2018-05-23 10:56:11 -04:00
e87bfe08b6
radare2: 2.5.0 -> 2.6.0
2018-05-23 15:45:56 +01:00
2009c76a66
nixos/ipfs: Improve behavior of localDiscovery option
...
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.
2018-05-23 16:44:31 +02:00
fe1eec9e24
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-23 10:41:17 -04:00
c7458ded5c
ghc 8.4.2, head: Adjust enableShared enableTerminfo for windows
2018-05-23 10:41:17 -04:00
10b76a4cab
ghc: paxmark all unwraped executables across the board
...
Shell glob works even as the exact set of executable (filenames) varries
beween configuations. Need to skip non ELFs (e.g. shell scripts),
however.
2018-05-23 10:41:15 -04:00
1e225e6481
Merge pull request #40993 from obsidiansystems/tiny-haskell-builder
...
haskell generic-builder: Tiny changes that preserve hases
2018-05-23 16:32:49 +02:00
1978115c3b
ghc: Handle flavors better
2018-05-23 10:27:42 -04:00
9ce15ea60c
ghc: Normalize derivations
2018-05-23 10:27:42 -04:00
63e5b3ce71
used stdenv.targetPlatform.isDarwin and not stdenv.isDarwin.
2018-05-23 10:27:42 -04:00
87afa66a63
haskell infra: Adds buildFlags logic
2018-05-23 10:27:42 -04:00
affeb0cb80
haskell generic builder: Do the `links` dance only if shared is enabled.
2018-05-23 10:27:41 -04:00
a4d5dbd45d
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-23 10:27:41 -04:00
38fbdcc726
haskell generic builder: Use setup package database for setup-depends
...
Adapted from b69f420121
2018-05-23 10:27:41 -04:00
e1b9419dec
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 8a8f0408cde69c7f5641
2018-05-23 10:27:39 -04:00
513cd3de0e
haskell-generic-builder: Add extra framework dirs
...
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.
2018-05-23 10:26:57 -04:00
3394c96655
haskell generic-builder: Tiny changes that preserve hases
...
These bring us closer to staging at no cost
2018-05-23 10:23:06 -04:00
446cb32ea1
haskell generic-builder: Remove merge conflict
...
I forgot this in 17316643fd
2018-05-23 10:11:03 -04:00
4ffa8b6125
binutils: Do not needless redownload sources cascading more rebuilds
...
Unfortunately this is a crude hack that we use the same binutils source
everywhere in the bootstrap chain.
2018-05-23 10:06:08 -04:00
983e74ae4e
stdenv: Avoid targetPlatform.isDarwin causing a mass rebuild
...
We want `buildPackages` to be almost the same as
`buildPackages.buildPackges`, but that is only true if most packages
don't care about the target platform. The commented code however made
them all care about whether the target platform was Darwin.
2018-05-23 10:06:08 -04:00
25f4f06c2e
Merge branch 'stdenv-darwin-persist' into ios-mini-staging
2018-05-23 10:04:55 -04:00
17316643fd
Merge remote-tracking branch 'upstream/master' into staging
2018-05-23 09:59:57 -04:00
f567a851a1
darwin stdenv: Properly compose overrides
...
`super` usage was very suspect.
2018-05-23 09:59:29 -04:00
e3f35d1491
Merge pull request #40991 from obsidiansystems/stdenv-darwin-persist
...
darwin stdenv: Persist `darwin.binutils-unwrapped`
2018-05-23 09:58:47 -04:00
64c90e53e7
darwin stdenv: Persist `darwin.binutils-unwrapped`
...
binutils-unwrapped was added in ef3db7d14c
2018-05-23 09:51:16 -04:00
c641a74bd6
Merge remote-tracking branch 'upstream/master' into ios-mini-staging
2018-05-23 09:45:25 -04:00
18742471af
Merge remote-tracking branch 'upstream/master' into staging
...
Use newer vagrant from master
2018-05-23 09:40:37 -04:00
bbcaf78350
Merge pull request #40989 from obsidiansystems/cctools-linux
...
cctools: Remove a bunch of stuff no longer needed for Linux
2018-05-23 09:29:41 -04:00
8733a3b932
pythonPackages.django: 1.11.12 -> 1.11.13
...
See https://docs.djangoproject.com/en/1.11/releases/1.11.13/ for release
information
2018-05-23 15:24:32 +02:00
266adab32d
cctools: Remove a bunch of stuff no longer needed for Linux
2018-05-23 09:22:19 -04:00
Frederik Rietdijk
Peter Simons
Yegor Timoshenko
Mitsuhiro Nakamura
John Ericson
Matthew Justin Bauer
John Ericson
Jörg Thalheim
Sarah Brofeldt
Justin Wood
Lancelot SIX
markuskowa
Will Dietz
Jörg Thalheim
Sebastian Jordan
Moritz Angermann
Lancelot SIX