Commit graph

141668 commits

Author SHA1 Message Date
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
Yegor Timoshenko ead3698a7a
Merge pull request #40955 from r-ryantm/auto-update/redshift
redshift: 1.11 -> 1.12
2018-05-23 12:19:19 +03:00
Aneesh Agrawal 2e2cbda290 openssh: 7.6p1 -> 7.7p1
Release notes at https://www.openssh.com/txt/release-7.7;
primarily bugfixes.

Update ssh-hpn as well.

Switch to salsa.debian.org (from anonscm.debian.org).
2018-05-23 12:18:15 +03:00
Yegor Timoshenko b86f976dfe
Merge pull request #40960 from r-ryantm/auto-update/pg_repack
pg_repack: 1.4.2 -> 1.4.3
2018-05-23 12:11:19 +03:00
Yegor Timoshenko 3210c69c36
Merge pull request #40970 from r-ryantm/auto-update/folly
folly: 2018.04.23.00 -> 2018.05.21.00
2018-05-23 12:07:53 +03:00
Yegor Timoshenko ae27dd2122
Merge pull request #40974 from r-ryantm/auto-update/debootstrap
debootstrap: 1.0.99 -> 1.0.100
2018-05-23 12:04:21 +03:00
Vincent Laporte cc2ac8a39e ocamlPackages.imagelib: init at 20171028 (#40910) 2018-05-23 10:33:26 +02:00
Guthrie McAfee Armstrong ca556c4def Remove "free and secure" from Discord description (#40968)
* Remove "free and secure" from Discord description

Changed Discord package description to remove "free and secure". We can't vouch for its security, but it's definitely not "free" in the sense that most users would read this description. ;)

* Add "cross-platform" to Discord description
2018-05-23 10:27:08 +02:00
Jörg Thalheim be4b3e89e5
Merge pull request #39603 from Scriptkiddi/master
gams: init at 25.02
2018-05-23 09:26:49 +01:00
xeji 4aa04d185c
Merge pull request #40228 from ThomasMader/dlang-update
dmd,dtools,dub: 2.079.0 -> 2.079.1 and wrap ldc2 binary with $CC
2018-05-23 10:25:39 +02:00
R. RyanTM 742a5e040f debootstrap: 1.0.99 -> 1.0.100
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/debootstrap/versions.

These checks were done:

- built on NixOS
- /nix/store/g8j2xv68jlpcggliz2as8814pnlls6x5-debootstrap-1.0.100/bin/debootstrap passed the binary check.
- 1 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 1.0.100 with grep in /nix/store/g8j2xv68jlpcggliz2as8814pnlls6x5-debootstrap-1.0.100
- directory tree listing: https://gist.github.com/70fb3fb65a686979e6e2524ca19aabeb
- du listing: https://gist.github.com/e292e6056ab90b1742bed2ca6569a506
2018-05-23 00:48:22 -07:00
Peter Simons 83baf1e977
Merge pull request #40973 from NixOS/revert-40929-cross-ghc-for-master
Revert "ghc, haskell infra: #40642 direct to master"
2018-05-23 09:40:20 +02:00
Peter Simons 5db3a9df5e
Revert "ghc, haskell infra: #40642 direct to master" 2018-05-23 09:36:16 +02:00
Aneesh Agrawal cde4ea79f8 vagrant: 2.0.2 -> 2.1.1 2018-05-23 00:22:39 -07:00
R. RyanTM 23dce527d8 folly: 2018.04.23.00 -> 2018.05.21.00
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/folly/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 2018.05.21.00 with grep in /nix/store/n4qdpjqixmlcly3al00c5a2ivp6lh74f-folly-2018.05.21.00
- directory tree listing: https://gist.github.com/80adf61ca8bb6b1020e7b48cae590a9c
- du listing: https://gist.github.com/dc5d5cb97ea76a087a50b733c659ebe5
2018-05-22 23:59:15 -07:00