Matthew Bauer
30c84f59dd
Merge pull request #55698 from tobim/compiler-rt-darwin
...
compiler-rt-7.0.1: Fix build on darwin
2019-02-13 23:52:37 -05:00
Matthew Bauer
2433c575f0
openblas: fix on linux
...
This reverse changes made cfc4313 which broke builds on linux. Still
not sure why this broke Linux, but we can investigate it later.
“buildPackages.stdenv.cc” shouldn’t be put in nativeBuildInputs in
general. Either way, this restores hashes to before that commit.
thanks to @jethrokuan
2019-02-10 20:16:16 -05:00
Matthew Bauer
cfc43138cb
openblas: fix on darwin
...
The openblas script relies on CC=clang for succesfully compiling on
Darwin systems. This seems like bad behavior, but we get things like
https://hydra.nixos.org/build/87657058 otherwise.
Fixes #55536 .
2019-02-10 18:49:04 -05:00
Matthew Bauer
57cb5fe1f2
Merge pull request #55519 from FlorianFranzen/staging
...
Staging
2019-02-10 09:29:10 -05:00
Matthew Bauer
73885bc675
Merge pull request #55489 from matthewbauer/fix-clang-7
...
llvmPackages_7.clang-unwrapped: don’t link to libatomic on darwin
2019-02-09 22:13:19 -05:00
Matthew Bauer
b60b8226d6
llvm7: don’t link to libatomic on darwin
2019-02-09 13:40:28 -05:00
Matthew Bauer
5c09d977c7
Merge remote-tracking branch 'origin/master' into staging
2019-02-09 12:14:06 -05:00
Matthew Bauer
29dc71c876
Merge pull request #53070 from rnhmjoj/scat-master
...
haskellPackages.scat: fix build
2019-02-09 10:22:36 -05:00
Matthew Bauer
54dcb0b137
Merge pull request #52622 from marsam/init-dive
...
dive: init at 0.5.0
2019-02-08 17:51:51 -05:00
Matthew Bauer
5dcf4d939b
Merge pull request #52653 from liclac/add/cardpeek
...
cardpeek: init at 0.8.4
2019-02-08 17:50:23 -05:00
Matthew Bauer
656f0b9fb1
Merge pull request #52819 from r-ryantm/auto-update/openvdb
...
openvdb: 5.2.0 -> 6.0.0
2019-02-08 17:48:48 -05:00
Matthew Bauer
8d642bb308
Merge pull request #52837 from r-ryantm/auto-update/mlt
...
libsForQt5.mlt: 6.10.0 -> 6.12.0
2019-02-08 17:48:27 -05:00
Matthew Bauer
0dd773265e
Merge pull request #53182 from ryanfitzsimon/vagrant-libvirt-utils
...
vagrant: Add vagrant-libvirt utility dependencies
2019-02-08 17:47:46 -05:00
Matthew Bauer
94d8b1f2b6
Merge pull request #53151 from symphorien/rls1.31
...
rls: init at 1.31.7
2019-02-08 17:47:06 -05:00
Matthew Bauer
e9c92029a9
Merge pull request #53135 from ivan/init-qolibri
...
qolibri: init at 2018-11-14
2019-02-08 17:46:27 -05:00
Matthew Bauer
1cfc4da3f3
Merge pull request #53098 from jnsaff/python/aws-sam-translator
...
aws-sam-translator: 1.8.0 > 1.9.0
2019-02-08 17:45:56 -05:00
Matthew Bauer
35ba3e9b05
Merge pull request #53257 from r-ryantm/auto-update/osinfo-db
...
osinfo-db: 20181203 -> 20181214
2019-02-08 17:45:24 -05:00
Matthew Bauer
8ab5ef0f64
Merge pull request #53306 from r-ryantm/auto-update/lsp-plugins
...
lsp-plugins: 1.1.4 -> 1.1.5
2019-02-08 17:44:59 -05:00
Matthew Bauer
93161051d8
Merge pull request #53763 from liff/emacs/tramp-process-fix
...
emacs: tramp: detect wrapped gvfsd-fuse daemon
2019-02-08 17:43:41 -05:00
Matthew Bauer
213220be4b
Merge pull request #53868 from jethrokuan/fix/emacsql-sqlite
...
emacsPackages.emacsql-sqlite: build sqlite binary
2019-02-08 17:42:54 -05:00
Matthew Bauer
08aaafa667
Merge pull request #54040 from r-ryantm/auto-update/libtoxcore
...
libtoxcore: 0.2.8 -> 0.2.9
2019-02-08 17:42:16 -05:00
Matthew Bauer
68cfed9660
Merge pull request #54026 from r-ryantm/auto-update/x42-plugins
...
x42-plugins: 20181103 -> 20190105
2019-02-08 17:41:42 -05:00
Matthew Bauer
03d2e5ae50
Merge pull request #54287 from marsam/update-node-v11
...
nodejs-11_x: 11.6.0 -> 11.7.0
2019-02-08 17:39:47 -05:00
Matthew Bauer
961fbc35e5
Merge pull request #54497 from asymmetric/solc-0.5.3
...
solc: 0.5.2 -> 0.5.3
2019-02-08 17:38:57 -05:00
Matthew Bauer
6dd1355120
Merge pull request #54748 from r-ryantm/auto-update/obs-linuxbrowser
...
obs-linuxbrowser: 0.5.2 -> 0.6.0
2019-02-08 17:35:35 -05:00
Matthew Bauer
8ec1953a4b
Merge pull request #54786 from r-ryantm/auto-update/lbdb
...
lbdb: 0.48 -> 0.48.1
2019-02-08 17:35:00 -05:00
Matthew Bauer
3e0616683d
Merge pull request #54853 from r-ryantm/auto-update/cvs-fast-export
...
cvs_fast_export: 1.32 -> 1.45
2019-02-08 17:34:07 -05:00
Matthew Bauer
8101cf8c23
Merge pull request #54989 from srhb/taffybar-unoverride
...
taffybar: Remove strictDeps and restore overrideAttrs
2019-02-08 17:33:19 -05:00
Matthew Bauer
1eb0d79c6d
Merge pull request #55324 from Moredread/crawl
...
crawl: A few improvements
2019-02-08 17:28:09 -05:00
Matthew Bauer
9d416b3954
Merge pull request #55457 from jslight90/raspberry-pi-64bit
...
nixos/boot: replace deprecated Raspberry Pi configuration option
2019-02-08 17:26:57 -05:00
Matthew Bauer
8d0fb48034
Merge pull request #55444 from tilpner/podman-docs
...
podman: install manpages
2019-02-08 17:24:48 -05:00
Matthew Bauer
878965731f
nixos/lib/testing.nix: config defaults to {}
...
Fixes #51858
56e12aae54 ends up passing config to pkgs. Unfortunately this might be null and pkgs/top-level/default.nix assumes it is an attrset. To fix this, we just make the default for config = {}. Thanks to @kristoff3r for tracking this down.
/cc @domenkozar
2019-02-06 20:04:24 -05:00
Matthew Bauer
81531046e8
qt511: add patch for macOS sdk
...
Unfortunately we don’t have access to NSWindowStyleMask. These patches
should go away once we switch to a newer SDK.
2019-02-05 20:50:52 -05:00
Matthew Bauer
72f8f89849
libvdpau: add -lX11 on darwin
...
Seems to be necessary for some reason. Otherwise we are missing
symbols.
2019-02-05 19:27:39 -05:00
Matthew Bauer
2c31b950e1
Merge pull request #55053 from vbgl/mkderivation-lazy-name
...
mkDerivation: cleaner handling of the `name` argument
2019-02-04 09:42:22 -05:00
Matthew Bauer
c6f8f8d98d
make-derivation: only modify name when name is given
...
This preserves Nix’s native error handling of missing name:
error: derivation name missing
2019-02-04 09:15:03 -05:00
Matthew Bauer
43bd6a318e
Merge pull request #52112 from eyJhb/arduino-mk
...
arduino-mk: init at 1.6.0
2019-02-03 11:29:00 -05:00
Matthew Bauer
830879d4c4
cc-wrapper: set priority to 10
2019-01-31 20:07:55 -05:00
Matthew Bauer
8020bd6869
Merge pull request #35884 from dtzWill/fix/man-in-outputsToInstall
...
default to including "man" in outputsToInstall
2019-01-31 14:55:12 -05:00
Matthew Bauer
a2b606f8e7
weechat: remove outputsToInstall from meta
2019-01-31 14:36:16 -05:00
Matthew Bauer
ab118f3847
Merge pull request #54801 from matthewbauer/fix-trace-pos
...
make-derivation: fix position in trace
2019-01-31 10:44:21 -05:00
Matthew Bauer
6182d28cab
Merge pull request #54915 from matthewbauer/rework-android-assert
...
androidenv: move licenseAccepted condition to androidsdk
2019-01-31 10:31:27 -05:00
Matthew Bauer
bdc7aabb2f
Merge pull request #54898 from matthewbauer/pyspark-fix
...
pyspark: 2.3.2 -> 2.4.0, fix version bounds
2019-01-30 13:30:34 -05:00
Matthew Bauer
c0f82700ee
pyspark: 2.3.2 -> 2.4.0, fix version bounds
...
py4j seems to work fine with this version
2019-01-30 13:29:29 -05:00
Matthew Bauer
9c770c4efa
androidenv: move licenseAccepted condition to androidsdk
...
The NDK can be built without accepting the license.
2019-01-29 21:13:41 -05:00
Matthew Bauer
e2fe4c2d49
make-derivation: fix ordering of conditionals
...
cross should have higher precedence
2019-01-28 11:38:30 -05:00
Matthew Bauer
febda2b127
Revert "mingw: use current package set for headers"
...
This reverts commit 0307203693 .
2019-01-28 10:42:04 -05:00
Matthew Bauer
9fd1c170cc
make-derivation: try to fix stdenv.cc == null conditional
...
sometimes this gets an infinite recursion error
2019-01-28 10:41:19 -05:00
Matthew Bauer
82a1153d6d
coq-modules: add default to fix eval
...
We don’t want these to not even evaluate, otherwise we won’t know why
they’re broken. For now, I’ve left these as the latest version for a
default. In the future, maybe we should be smarter about choosing these.
(cherry picked from commit e20b65156c )
2019-01-28 10:16:30 -05:00
Matthew Bauer
e20b65156c
coq-modules: add default to fix eval
...
We don’t want these to not even evaluate, otherwise we won’t know why
they’re broken. For now, I’ve left these as the latest version for a
default. In the future, maybe we should be smarter about choosing these.
2019-01-28 09:59:10 -05:00
Matthew Bauer
7e589e5594
make-derivation: fix position in trace
...
For a long time now, tracing has been broken in Nixpkgs. So when you
have an eval error you would get something like this:
error: while evaluating the attribute 'buildInputs' of the derivation 'hello-2.10' at /home/mbauer/nixpkgs/pkgs/stdenv/generic/make-derivation.nix:185:11:
while evaluating 'chooseDevOutputs' at /home/mbauer/nixpkgs/lib/attrsets.nix:474:22, called from undefined position:
while evaluating 'optionals' at /home/mbauer/nixpkgs/lib/lists.nix:257:5, called from /home/mbauer/nixpkgs/pkgs/stdenv/generic/make-derivation.nix:132:17:
This is coming from how Nix handles string context and how
make-derivation messes with the "name" attribute. This commit should
restore the old behavior so you get a nice line number like:
error: while evaluating the attribute 'buildInputs' of the derivation 'hello-2.10' at /home/mbauer/nixpkgs/pkgs/applications/misc/hello/default.nix:4:3:
while evaluating 'chooseDevOutputs' at /home/mbauer/nixpkgs/lib/attrsets.nix:474:22, called from undefined position:
while evaluating 'optionals' at /home/mbauer/nixpkgs/lib/lists.nix:257:5, called from /home/mbauer/nixpkgs/pkgs/stdenv/generic/make-derivation.nix:132:17:
NOTE: This will still be broken for cross compilation due to the
prefixes we are adding to name.
2019-01-28 09:25:47 -05:00
Matthew Bauer
d54fbbebbb
Merge pull request #49552 from matthewbauer/setup-dedupe
...
setup.sh: avoid running the same hook twice
2019-01-27 18:22:41 -05:00
Matthew Bauer
9172c1eee2
setup.sh: avoid running the same hook twice
...
In strictDeps=false, we don’t want the same package hook to be run
twice, otherwise we get duplicates in some flags.
Fixes #41340
2019-01-27 17:49:13 -05:00
Matthew Bauer
bf041c3f1d
systems/default.nix: wasm in platform.uname.system
...
This adds the "Wasm" system to platform.uname.system. This is used in CMake infrastructure.
2019-01-27 17:29:23 -05:00
Matthew Bauer
ae16dd1a15
stdenv/make-derivation: don't hide broken packages
...
This behavior ended up breaking the handleEvalIssue functionality by hiding those packages. So something like this:
$ nix-env -iA nixpkgs.zoom-us
would silently fail, without telling the user how to fix it! Regardless, this "bug" should be handled in Nix - not Nixpkgs.
Fixes #38952 .
2019-01-27 17:02:17 -05:00
Matthew Bauer
bd62ac6b88
Merge pull request #54652 from matthewbauer/shell-in-flags-array
...
setup.sh: put SHELL in flagsArray
2019-01-27 13:55:54 -05:00
Matthew Bauer
8f30e05ce6
Merge pull request #54614 from matthewbauer/libstdcxx
...
libstdcxx: don’t set stdlib automatically
2019-01-27 13:55:27 -05:00
Matthew Bauer
bb3683d778
Merge pull request #54624 from matthewbauer/libcxx
...
cc-wrapper: add libcxx for libcxxClang
2019-01-27 13:55:18 -05:00
Matthew Bauer
580c675ea9
Merge pull request #53618 from matthewbauer/fix-49206
...
haskell.buildStackProject: use setup hook
2019-01-27 13:54:40 -05:00
Matthew Bauer
14ecdbefd4
Merge pull request #54659 from matthewbauer/doc-fixes
...
Nixpkgs documentation additions for 19.03
2019-01-27 13:54:06 -05:00
Matthew Bauer
a376d62441
nixpkgs/manual: add one more fix for a missed review
2019-01-27 12:01:23 -05:00
Matthew Bauer
d7b62cb601
nixpkgs/manual: address review comments
...
Mostly taken from requested changes exactly as recommended.
2019-01-27 11:57:36 -05:00
Matthew Bauer
92f0f8dd68
Merge remote-tracking branch 'NixOS/master' into staging
2019-01-27 00:01:13 -05:00
Matthew Bauer
498a242bf4
nixpkgs/manual: add trivial builders section
...
Fixes #25507 .
2019-01-26 22:48:47 -05:00
Matthew Bauer
adb717a153
nixpkgs/manual: document default setup hooks
...
Fixes #34857 .
2019-01-26 22:48:47 -05:00
Matthew Bauer
17ec7f3a16
nixpkgs/manual: document fetcher functions
...
Fixes #32439 .
2019-01-26 22:48:47 -05:00
Matthew Bauer
6604240a4b
nixos/manual: use default bs value
...
Apparently this is a little slower but much safer & not prone to
potential argument errors.
2019-01-26 22:48:32 -05:00
Matthew Bauer
d16e0f8dc3
all-packages: move fetch* to pkgs/build-support/
2019-01-26 22:47:54 -05:00
Matthew Bauer
77550df8e6
cc-wrapper: add libcxx for libcxxClang
...
clang needs to find headers + libraries for compiling with libc++. We
need to add a libcxx argument to cc-wrapper. This means you do not
have to pass in c++ headers directly.
This resolves the last case remaining of #30670 . Darwin clang++ now
works properly.
Fixes #30670
2019-01-26 22:45:15 -05:00
Matthew Bauer
329913f733
setup.sh: put SHELL in flagsArray
...
We don’t want to modify makeFlags, that is given to us by our
environment. Adding to it could lead to duplicates after repeated use.
Fixes #27533
2019-01-26 21:14:36 -05:00
Matthew Bauer
319ebef3a3
Revert "Merge pull request #36948 from dtzWill/fix/glibc-libgcc_s"
...
This reverts commit 80ff19a45f , reversing
changes made to 43e867a226 .
2019-01-26 20:36:42 -05:00
Matthew Bauer
8babcc3d44
Merge branch 'master' into fix/man-in-outputsToInstall
2019-01-26 10:51:12 -05:00
Matthew Bauer
f9ed5e0089
libstdcxx: don’t set stdlib automatically
...
We don’t need to set -stdlib=libstdc++. This only works on Clang so it
is not good to set it globally. In addition, Clang knows to use
libstdc++ on Linux by default if no stdlib is set:
https://github.com/llvm-mirror/clang/blob/324f918438715b4a0d024af5930628c1674f4fcd/lib/Driver/ToolChains/Linux.cpp#L456
It’s a good policy to just leave off stdlib for now.
Fixes #29877 .
2019-01-26 01:55:57 -05:00
Matthew Bauer
5f106e8aae
darwin.xcode: update hashes
2019-01-25 16:37:37 -05:00
Matthew Bauer
cb14f1404a
fetchFromGitLab: replace ‘.’ with ‘%2E’
...
For some reason gitlab does not recognize the . correctly.
Fixes #53280
2019-01-24 22:45:50 -05:00
Matthew Bauer
8449cc5b11
Merge pull request #53805 from mroi/patch-1
...
synergy: fix compilation on macOS
2019-01-23 17:59:23 -05:00
Matthew Bauer
5629e9de9d
Merge pull request #54350 from vkleen/llvm-ppc
...
Support PowerPC in llvm
2019-01-23 17:19:07 -05:00
Matthew Bauer
80ff19a45f
Merge pull request #36948 from dtzWill/fix/glibc-libgcc_s
...
glibc: don't use bootstrap libgcc_s
2019-01-23 17:12:55 -05:00
Matthew Bauer
2ed8ee4b4d
Merge branch 'staging' into fix/glibc-libgcc_s
2019-01-23 16:52:54 -05:00
Matthew Bauer
d9332f2a71
unixtools.utillinux: add column
...
requested on IRC
2019-01-23 16:35:11 -05:00
Matthew Bauer
51d88f7d20
libglade: fix on darwin
...
Based on discussion in
https://github.com/Homebrew/legacy-homebrew/issues/11961
Closes #54448
Closes #54321
2019-01-22 11:33:30 -05:00
Matthew Bauer
1c02863317
busybox: give priority of 10
...
Lots of packages provide this. Usually we don't want the busybox version.
2019-01-18 18:16:37 -05:00
Matthew Bauer
1ff9a93e1c
nixos/doc: bs=1000000 for dd args ( #54280 )
...
Not all dd implementations take ‘bs=1m’. Better to just list it out
fully to reduce potential for problems.
Fixes #54181 .
2019-01-18 19:19:00 +02:00
Matthew Bauer
3956a8421f
Merge pull request #53996 from pmahoney/openfst-darwin
...
openfst: relax platform requirement to include darwin
2019-01-15 16:59:12 -05:00
Matthew Bauer
2000d62a50
Merge pull request #53605 from matthewbauer/fix-53587
...
mingw: use current package set for headers
2019-01-13 20:12:44 -05:00
Matthew Bauer
cd8c1a4053
Merge pull request #52643 from jabranham/ledger-info
...
ledger: Include info files
2019-01-08 16:03:56 -06:00
Matthew Bauer
5b40c0a21f
Merge pull request #53675 from jacereda/darwin-cmds-binpath
...
darwin: basic_cmds was installing binaries in the wrong path
2019-01-08 15:57:56 -06:00
Matthew Bauer
b94446c496
Merge pull request #53615 from matthewbauer/fix-53609
...
cups: use v2.2.6 on darwin
2019-01-08 12:26:40 -06:00
Matthew Bauer
0dabacae00
haskell.buildStackProject: use setup hook
...
This makes things easier and hopefully fixes the arg too long issue.
Fixes #49206 .
2019-01-07 21:28:53 -06:00
Matthew Bauer
bb874163fd
cups: use v2.2.6 on darwin
...
This is the last version known to build.
Fixes #53609 .
2019-01-07 19:41:12 -06:00
Matthew Bauer
04373fd3cc
Merge pull request #52594 from matthewbauer/fix-51025
...
make-disk-image: use filterSource instead of cleanSource
2019-01-07 16:29:58 -06:00
Matthew Bauer
f05d8f31ec
make-disk-image: use filterSource instead of cleanSource
...
cleanSource does not appear to work correctly in this case. The path
does not get coerced to a string, resulting in a dangling symlink
produced in channel.nix. Not sure why, but this
seems to fix it.
Fixes #51025 .
/cc @elvishjericco
2019-01-07 16:28:50 -06:00
Matthew Bauer
0307203693
mingw: use current package set for headers
...
gccCrossStageStatic should not need targetPackages.
Fixes #53587 .
2019-01-07 16:15:27 -06:00
Matthew Bauer
3cfdf8eb23
Merge pull request #53539 from matthewbauer/darwin-fixes4
...
Fixes for recent darwin changes
2019-01-07 15:44:21 -06:00
Matthew Bauer
d2e74263ac
Merge pull request #53072 from furrycatherder/fuse-overlayfs
...
fuse-overlayfs: init at 0.2
2019-01-07 12:41:21 -06:00
Matthew Bauer
de30f4e61d
Merge pull request #51570 from eonpatapon/cassandra-logging
...
cassandra: add option to configure logging
2019-01-07 12:41:07 -06:00
Matthew Bauer
7b207060f1
Merge pull request #52965 from danbst/squashfs-zstd
...
squashfs: 4.4dev -> 4.4dev-20180612
2019-01-06 22:37:37 -06:00
Matthew Bauer
ed6148726b
darwin: fix more *_cmds derivation
...
Doh
2019-01-06 22:34:19 -06:00
Matthew Bauer
d02bb3c197
darwin.make-bootstrap-tools: remove dsymutil
...
This hopefully is not needed for the bootstrap tools. Needs more testing.
2019-01-06 22:15:43 -06:00
Matthew Bauer
2bbec30c2e
darwin.diskdev_cmds: fix build with dsymutil
...
xcbuild doesn’t handle dsymutil correctly. fuser.pl does not contain
debug symbols, but xcbuild doesn’t handle this like xcodebuild does.
So, just disable the debug information. We probably should do this in
more places using xcbuild, but it requires some arbitrary patching.
2019-01-06 22:13:11 -06:00