Commit Graph
100 Commits
Author SHA1 Message Date
Matthew Bauer b703c4d998 plasma5: fix typo from pr #57037
Thanks @Yarny0
2019-03-14 14:09:13 -04:00
Matthew Bauer 92ec809473 Merge pull request #56686 from r-ryantm/auto-update/gorm
gnustep.gorm: 1.2.23 -> 1.2.24
2019-03-14 00:18:28 -04:00
Matthew Bauer 7890494813 Merge pull request #57037 from matthewbauer/remove-xdg-desktop-menu-dummy
plasma: handle kbuildsycoca5 better
2019-03-11 22:58:40 -04:00
Matthew Bauer 1e7bac9401 xcode-sdk-pkgs: add sdk to extraPackages
this gives you access to libraries like Foundation.
2019-03-09 18:12:25 -05:00
Matthew Bauer ca6e93155b Merge pull request #56661 from matthewbauer/stack-hook-fixup
stack-hook: deduplicate better
2019-03-09 18:08:47 -05:00
Matthew Bauer a923a5bbdc ova: remove stateVersion
This is undefined in the default configuration.nix template.
2019-03-09 14:25:05 -05:00
Matthew Bauer 393b359f13 plasma: handle ksycoca5 better
- Remove xdg-desktop-menu-dummy.menu kbuildsycoca5. Not sure why we
  need it but it is a pretty big failure if it exists.
  See issue #56176.

- plasma: clear ksycoca cache before building

  This is needed to pick up on software removed since the last cache
  update. Otherwise it hangs around as zombies forever (or until the
  cache is cleared).

- Add the above + the icon cache cleanup to plasmaSetup

  This will be run for the logged in user on each nixos-rebuild.
  Unfortunately this only works if you are managing software through
  nixos-rebuild (nix-env users need to run this manually, otherwise
  log out and log back in).
2019-03-07 15:11:04 -05:00
Matthew Bauer 5bc72b87b1 Merge pull request #52714 from furrycatherder/gitea-pam
gogs, gitea: add PAM support
2019-03-06 10:05:11 -05:00
Matthew Bauer 1f212565d2 ghc863: dont add extra libs
Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself.

Merged in pull request #56795 from @matthewbauer.
2019-03-05 11:13:52 +01:00
Matthew Bauer 71704e8129 Merge pull request #55081 from moyamo/fix-subdirs.el
Link subdirs.el into emacs-packages-deps site-lisp
2019-03-04 16:12:41 -05:00
Matthew Bauer 7874ca5b61 Merge pull request #56645 from matthewbauer/llvm-8
llvm8: init
2019-03-03 21:00:36 -05:00
Matthew Bauer b0799b4219 Merge pull request #56115 from matthewbauer/nixos-rebuild-upgrade-nix
nixos-rebuild: try to get Nix fallback from new channel first
2019-03-02 18:48:28 -05:00
Matthew Bauer 71f189f26f stack-hook: deduplicate better
No need to check for duplicates as it is now handled by setup.sh
deduplication. Also should use targetOffset here instead of hostOffset
because we are using stack-hook natively.
2019-03-02 02:21:32 -05:00
Matthew Bauer 52cb072562 llvm8: init 2019-03-01 23:42:10 -05:00
Matthew Bauer 9edb851308 Merge pull request #51628 from ju1m/arm
stdenv: add armv7a-linux system
2019-03-01 15:36:07 -05:00
Matthew Bauer 5dee926eb9 nixos/no-x-libs.nix: override pinentry directly
This is more specific and we avoid having gtk or qt libraries come in at all.
2019-02-27 23:53:50 -05:00
Matthew Bauer fa5ab50753 Merge pull request #56502 from delroth/llvm7-compiler-rt
llvm/7/compiler-rt: define CMAKE_*_COMPILER_TARGET unconditionally
2019-02-27 22:49:28 -05:00
Matthew Bauer ee35de1861 llvm7: build with gcc6 on 32-bit linux
Need to use buildPackages.stdenv.cc.isGNU to avoid infinite recursion.
We probably need a better way to handle this.

Fixes #56457
2019-02-27 10:21:37 -05:00
Matthew Bauer 3a4d497a6f Merge pull request #55750 from matthewbauer/llvm-cross
Allow using LLVM for cross compilation toolchain
2019-02-26 21:53:19 -05:00
Matthew Bauer 8e25da0beb cross/tests: add llvm-based tests 2019-02-26 19:46:24 -05:00
Matthew Bauer b86e62d30d llvm: support cross compilation with useLLVM flag
You can build (partially) with LLVM toolchain using the useLLVM flag.
This works like so:

  nix-build -A hello --arg crossSystem '{ system =
    "aarch64-unknown-linux-musl"; useLLVM = true }'

also don’t separate debug info in lldClang

It doesn’t work currently with that setup hook. Missing build-id?
2019-02-26 19:45:35 -05:00
Matthew Bauer 77d7d60d8c libpfm: use hostPlatform
(cherry picked from commit 08f5b419b9efc77db044f8c1d725632552617966)
2019-02-26 19:45:35 -05:00
Matthew Bauer ead13a3aca llvm: don’t use targetPlatform
LLVM should be target independent because it will work with all
machine types. This is different from GCC where it needs to know what
target to build ahead of time.
2019-02-26 19:45:35 -05:00
Matthew Bauer dd94b0724c Merge pull request #56421 from Ericson2314/pinenty-dedup
pinentry: Use lib.string.{enable,with}Feature to avoid duplication
2019-02-26 17:31:03 -05:00
Matthew Bauer 0436f72733 Merge pull request #56436 from asymmetric/patch-4
doc/cross-compilation: fix typo
2019-02-26 16:58:20 -05:00
Matthew Bauer 3c8b75f536 Merge pull request #56393 from matthewbauer/is-compatible
systems: add isCompatible handling
2019-02-26 16:39:08 -05:00
Matthew Bauer 20a4bbe23b systems: add “emultator” for wasm
v8 can run any wasm bytecode
2019-02-25 20:07:43 -05:00
Matthew Bauer 55fc5b54ee vagrant: only use libvirt on linux
Fixes #55751
2019-02-25 16:50:54 -05:00
Matthew Bauer ad2585e350 harfbuzz-icu: disable error for cast-align 2019-02-23 23:26:54 -05:00
Matthew Bauer f455a07f13 systems: add isCompatible handling 2019-02-21 22:17:51 -05:00
Matthew Bauer 475c8aa018 nixos-rebuild: get Nix from channel
If our old Nix can’t evaluate the Nixpkgs channel, try the fallback
from the new channel /first/. That way we can upgrade Nix to a newer
version and support breaking changes to Nix (like seen in the upgrade
o Nix 2.0).

This change should be backported to older NixOS versions!
2019-02-20 20:02:20 -05:00
Matthew Bauer c9b14043f0 Merge pull request #54993 from yorickvP/patch-2
wayland: separateDebugInfo = true
2019-02-19 23:21:18 -05:00
Matthew Bauer 55757a0d44 Merge pull request #54402 from lopsided98/boehm-gc-cross-fix
beohm-gc: fix cross build of dependent packages
2019-02-19 22:51:00 -05:00
Matthew Bauer d6d5795ed9 Merge pull request #54916 from pbogdan/emacs-xcursor
emacs: link libXcursor when using lucid toolkit
2019-02-19 22:50:30 -05:00
Matthew Bauer 7e78ddbf03 Merge pull request #55950 from LnL7/darwin-ubiquity
darwin: remove references to Ubiquity.framework
2019-02-19 22:43:20 -05:00
Matthew Bauer 8724819d94 Merge pull request #55910 from veprbl/pr/qt5_qtconnectivity_darwin_fix
qt5.qtconnectivity: fix darwin build
2019-02-19 22:37:15 -05:00
Matthew Bauer 4141fdaa3f Merge pull request #55956 from mroi/patch-1
glibc: enable cross builds on Darwin
2019-02-19 22:35:30 -05:00
Matthew Bauer ae3e8355ab Merge pull request #56021 from illegalprime/fix/cmake-cross
cmake: add ability to cross-compile cmake
2019-02-19 22:34:15 -05:00
Matthew Bauer 5d0b0bbf30 Merge pull request #56030 from matthewbauer/revert-72e176
Revert "libcxx: add linker scripts for libc++.a to ensure libc++abi.a…
2019-02-19 11:45:37 -05:00
Matthew Bauer e3ca9d954e Merge pull request #56029 from matthewbauer/revert-cctools-bump
Revert cctools bump
2019-02-19 11:44:17 -05:00
Matthew Bauer 9584d16fc1 Merge pull request #56051 from P-E-Meunier/revealjs
nodePackages.reveal: init at 3.7.0
2019-02-19 09:35:25 -06:00
Matthew Bauer 8cb7ea7dae Revert "libcxx: add linker scripts for libc++.a to ensure libc++abi.a is properly linked"
This reverts commit 72e1764199.

This causes the GHC panic reported in issue #55848.
2019-02-18 20:52:08 -05:00
Matthew Bauer 5464dbe40a cctools: add myself as maintainer 2019-02-18 20:45:35 -05:00
Matthew Bauer 0e78f2bd10 Revert "cctools: bump to latest commit"
This reverts commit ac682e362c.

This broke iOS building on master. Even Xcode 8.2 comes with TAPI
librarises. We need these patches to support those .tbd files.
Eventually we will move to using libtapi directly, but I have not
finished work on this right now.

Unfortunately, this will not have my changes for building cctools with
manpages. We will have to do this update at some later time.
2019-02-18 20:44:19 -05:00
Matthew Bauer b1bbd94bb6 Merge remote-tracking branch 'NixOS/master' into staging 2019-02-18 20:36:48 -05:00
Matthew Bauer 87ebfc9953 Merge pull request #55868 from bhipple/u/gcc-mirrors
mirrors.nix: add https and http mirrors for gcc
2019-02-16 14:12:21 -05:00
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