markuskowa
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
Will Dietz
4bf6889876
strace: fix libunwind detection by fixing use of lib.optional ( #40994 )
2018-05-23 17:15:05 +02:00
Jörg Thalheim
d6b9e625d5
Merge pull request #40977 from Mic92/radare2
...
radare2: 2.5.0 -> 2.6.0
2018-05-23 16:12:35 +01:00
Matthew Bauer
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
Matthew Bauer
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
John Ericson
63df0613d6
Merge branch 'ios-mini-staging' into staging
2018-05-23 10:58:54 -04:00
John Ericson
aac8be76f5
Merge pull request #40992 from obsidiansystems/stdenv-darwin-persist
...
darwin stdenv: Properly compose overrides
2018-05-23 10:56:11 -04:00
Jörg Thalheim
e87bfe08b6
radare2: 2.5.0 -> 2.6.0
2018-05-23 15:45:56 +01:00
Sebastian Jordan
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
Moritz Angermann
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
John Ericson
c7458ded5c
ghc 8.4.2, head: Adjust enableShared enableTerminfo for windows
2018-05-23 10:41:17 -04:00
Moritz Angermann
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
Peter Simons
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
John Ericson
1978115c3b
ghc: Handle flavors better
2018-05-23 10:27:42 -04:00
John Ericson
9ce15ea60c
ghc: Normalize derivations
2018-05-23 10:27:42 -04:00
Moritz Angermann
63e5b3ce71
used stdenv.targetPlatform.isDarwin and not stdenv.isDarwin.
2018-05-23 10:27:42 -04:00
Moritz Angermann
87afa66a63
haskell infra: Adds buildFlags logic
2018-05-23 10:27:42 -04:00
Moritz Angermann
affeb0cb80
haskell generic builder: Do the links
dance only if shared is enabled.
2018-05-23 10:27:41 -04:00
Moritz Angermann
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
Moritz Angermann
38fbdcc726
haskell generic builder: Use setup package database for setup-depends
...
Adapted from b69f420121
by @Ericson2314
2018-05-23 10:27:41 -04:00
John Ericson
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 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-23 10:27:39 -04:00
John Ericson
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
John Ericson
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
John Ericson
446cb32ea1
haskell generic-builder: Remove merge conflict
...
I forgot this in 17316643fd
2018-05-23 10:11:03 -04:00
John Ericson
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
John Ericson
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
John Ericson
25f4f06c2e
Merge branch 'stdenv-darwin-persist' into ios-mini-staging
2018-05-23 10:04:55 -04:00
John Ericson
17316643fd
Merge remote-tracking branch 'upstream/master' into staging
2018-05-23 09:59:57 -04:00
John Ericson
f567a851a1
darwin stdenv: Properly compose overrides
...
`super` usage was very suspect.
2018-05-23 09:59:29 -04:00
John Ericson
e3f35d1491
Merge pull request #40991 from obsidiansystems/stdenv-darwin-persist
...
darwin stdenv: Persist `darwin.binutils-unwrapped`
2018-05-23 09:58:47 -04:00
John Ericson
64c90e53e7
darwin stdenv: Persist darwin.binutils-unwrapped
...
binutils-unwrapped was added in ef3db7d14c
and needs a corresponding `persisted` attr in the Darwin stdenv.
2018-05-23 09:51:16 -04:00
John Ericson
c641a74bd6
Merge remote-tracking branch 'upstream/master' into ios-mini-staging
2018-05-23 09:45:25 -04:00
John Ericson
18742471af
Merge remote-tracking branch 'upstream/master' into staging
...
Use newer vagrant from master
2018-05-23 09:40:37 -04:00
John Ericson
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
Lancelot SIX
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
John Ericson
266adab32d
cctools: Remove a bunch of stuff no longer needed for Linux
2018-05-23 09:22:19 -04:00
John Ericson
5f1ec8e6d9
Merge pull request #40961 from obsidiansystems/hash-preserving-llvm-cleanup
...
llvm, top-level: Baby steps towards cross support
2018-05-23 09:15:00 -04:00
Yegor Timoshenko
c9d18a235c
Merge pull request #40972 from aneeshusa/update-vagrant-to-2.1.1
...
vagrant: 2.0.2 -> 2.1.1
2018-05-23 14:50:35 +03:00
Sarah Brofeldt
a23cf33223
Merge pull request #40778 from phile314/slimserver-fix
...
nixos/slimserver: Fix media scanning & transcoding
2018-05-23 13:03:59 +02:00
Pascal Wittmann
22d03ba02c
vimpc: use git tag instead of commit hash
2018-05-23 12:31:59 +02:00
Philipp Hausmann
308638c0ca
nixos/slimserver: Fix transcoding
2018-05-23 12:31:50 +02:00
Philipp Hausmann
32bad1b636
nixos/slimserver: Disable broken image/video support ( #40589 )
2018-05-23 12:31:44 +02:00
Peter Simons
8f96324584
haskell-lambdabot-core: apply patch from @int-e to fix GHC 8.4.x build
2018-05-23 12:24:31 +02:00
Yegor Timoshenko
2e831da76d
Merge pull request #40967 from aneeshusa/update-openssh-to-7.7p1
...
openssh: 7.6p1 -> 7.7p1
2018-05-23 13:24:27 +03:00
R. RyanTM
31f76cde3e
zsh-autosuggestions: 0.4.2 -> 0.4.3 ( #40949 )
...
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.
This update was made based on information from https://repology.org/metapackage/zsh-autosuggestions/versions .
These checks were done:
- built on NixOS
- 0 of 0 passed binary check by having a zero exit code.
- 0 of 0 passed binary check by having the new version present in output.
- found 0.4.3 with grep in /nix/store/dvwkp03wvr20n7yf3738hxsl9h1ab02i-zsh-autosuggestions-0.4.3
- directory tree listing: https://gist.github.com/dd361ac28a6f251b013a1fafa71c394e
- du listing: https://gist.github.com/cb334bbb9559eb43e36794d276a97db9
2018-05-23 11:54:14 +02:00
Jörg Thalheim
454edcd6c0
radare2: add myself as maintainer
2018-05-23 10:36:26 +01:00
Jörg Thalheim
fe2b50badb
radare2: add myself as maintainer
2018-05-23 10:33:07 +01:00
Yegor Timoshenko
8377b6e22f
Merge pull request #40951 from r-ryantm/auto-update/simplescreenrecorder
...
simplescreenrecorder: 0.3.10 -> 0.3.11
2018-05-23 12:26:06 +03:00
Yegor Timoshenko
9ce7d28cea
Merge pull request #40954 from r-ryantm/auto-update/qsynth
...
qsynth: 0.5.0 -> 0.5.1
2018-05-23 12:25:32 +03:00
Yegor Timoshenko
94b9ede523
Merge pull request #40806 from Mic92/nixos-ids
...
nixos/ids: information when to use static uids/gids
2018-05-23 12:24:59 +03:00