Commit Graph
100 Commits
Author SHA1 Message Date
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 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 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
Matthew Bauer 09ff7707ae llvm3.{8,9}: use old CMAKE_INSTALL_NAME_DIR value
adcf4aa524 broke these two. The old way
seems to work and might still avoid the original lldb issues.
2019-01-06 22:11:38 -06:00
Matthew Bauer 751c03e8fd Merge pull request #47665 from erikarvstedt/initrd-improvements
Minor initrd improvements
2019-01-06 21:48:26 -06:00
Matthew Bauer d9707792b5 mesa: make sure $drivers output gets created
Not all installs will have a $drivers output, so we just create an
empty one here.
2019-01-04 23:26:57 -06:00
Matthew Bauer 1a7d28e31f Merge pull request #53201 from Izorkin/zsh-command-time
zsh-command-time: enable work with options customPkgs
2019-01-04 10:35:54 -06:00
Matthew Bauer 030f66400d darwin.adv_cmds: fix build 2019-01-04 10:28:22 -06:00
Matthew Bauer 8cb2d35760 darwin: fix typos in install scripts
fixes some issues in my commits in:

- basic_cmds
- network_cmds

(cherry picked from commit f283145308aec6aa9a8c3c6cbd4864718ccb7c53)
2019-01-03 15:20:26 -06:00
Matthew Bauer 8505e710e7 Revert "darwin 10.12 commits"
Reverts commits bumping to macOS stuff to 10.12:

commit ec1f78d1cb.
commit d0dc91d24f.
commit a1d297374d.
commit 425112151d.
commit e6f7f2928f.
2019-01-03 15:20:26 -06:00
Matthew Bauer 74312c7ef5 Merge pull request #52760 from akru/master
lib/make-ext4-fs: more efficient store maker
2019-01-03 15:07:27 -06:00
Matthew Bauer 82f679c269 Merge pull request #53219 from andrew-d/andrew/add-missing-argument
stdenv/native: add missing argument to fix build failure
2019-01-02 13:44:35 -06:00
Matthew Bauer 7e5fd3653a Merge pull request #53089 from matthewbauer/more-blocking-jobs
release: add more unstable release-critical jobs
2018-12-31 10:59:15 -06:00
Matthew Bauer 77c88b2585 Merge pull request #53090 from matthewbauer/dont-expose-static-libs
arrow-cpp: don’t expose gtest_static
2018-12-30 19:50:38 -06:00
Matthew Bauer 62b54d5893 arrow-cpp: don’t expose gtest_static 2018-12-30 16:56:51 -06:00
Matthew Bauer dc34d82a28 release: add more unstable release-critical jobs
Adds a few new blocking jobs:

- pandoc.x86_64-linux
- unar.x86_64-linux
- re-enable gimp.x86_64-darwin for darwin-tested
2018-12-30 16:55:09 -06:00
Matthew Bauer ec1f78d1cb darwin.libunwind: fix hash 2018-12-30 00:00:30 -06:00
Matthew Bauer 4f522648cb darwin: fix *_cmds installation
These just copy commands from Products/Release/. But with #52256 we
now build .dsym directories that somehow wind up in Products/Release/.
This makes things more exact by just copying the files in Products/Release/.
2018-12-29 23:58:10 -06:00
Matthew Bauer d0dc91d24f darwin: bump apple_sdks to 10.12
(cherry picked from commit 0b468bf0335eaa606fccfe98d4a36c3efbe83f2a)
2018-12-29 20:17:05 -06:00
Matthew Bauer a1d297374d darwin.hfs: put headers in hfs/ directory
This is where they are supposed to go. My mistake in the original
commit.
2018-12-27 11:18:28 -06:00
Matthew Bauer 9d9a993b73 Merge pull request #52867 from matthewbauer/emacs-mac-7.4
emacs-mac: 7.2 → 7.4
2018-12-26 17:49:00 -06:00
Matthew Bauer 7a2f45fe1a emacs-mac: 7.2 → 7.4 2018-12-25 15:24:03 -06:00
Matthew Bauer badc0a05f9 Merge pull request #52747 from marsam/init-guff
guff: init at 0.1.0
2018-12-24 08:26:41 -06:00
Matthew Bauer b3ad548f0b Merge pull request #52604 from volth/patch-296
CODEOWNERS: add @volth to Perl
2018-12-20 21:44:05 -06:00
Matthew Bauer 425112151d darwin: remove missing symbols
these symbols are not needed apparently
2018-12-19 23:46:06 -06:00
Matthew Bauer a16a9fc4e5 Merge pull request #52540 from hedning/cherry-pick-valgrind
valgrind: fix build on darwin
2018-12-19 15:12:28 -06:00
Matthew Bauer df90fdf62b Merge pull request #51301 from timor/libretro-dolphin-dep-fix
libretro.dolphin: add missing dependencies to fix build
2018-12-19 12:05:03 -06:00
Matthew Bauer b2e71e942d Merge pull request #51754 from r-ryantm/auto-update/v4l-utils
libv4l: 1.16.0 -> 1.16.2
2018-12-19 11:07:49 -06:00
Matthew Bauer 8f9bd40d41 Merge pull request #51313 from Enzime/update/llpp
llpp: 2018-03-02 -> 30
2018-12-19 11:05:57 -06:00
Matthew Bauer e261fbe6c1 Merge pull request #51404 from fusion809/patch-7
openra: adding individual executables for each mod
2018-12-19 11:04:21 -06:00
Matthew Bauer 92840ab944 Merge pull request #51600 from eburimu/fix/cross-extlinux-conf-builder
extlinux-conf: fix cross compilation
2018-12-19 11:01:31 -06:00
Matthew Bauer 762c3d730f Merge pull request #52011 from r-ryantm/auto-update/snes9x-gtk
snes9x-gtk: 1.56.2 -> 1.57
2018-12-19 11:00:02 -06:00
Matthew Bauer 2af689bf47 Merge pull request #52495 from frlan/Geany/Maintainer
Geany: Taking over maintainership
2018-12-18 13:02:58 -06:00
Matthew Bauer a6050ab9d0 Merge pull request #52448 from jabranham/fix-emacs
Emacs site-start: Use correct feature name
2018-12-18 11:10:20 -06:00
Matthew Bauer 59ec6b559d Merge pull request #52256 from matthewbauer/52148-fix
Provide real dsymutil to darwin stdenv
2018-12-18 10:00:24 -06:00
Matthew Bauer c6aaeb3cc1 Merge pull request #52254 from matthewbauer/47886-fix
fix lldb on macOS
2018-12-18 10:00:10 -06:00
Matthew Bauer d1dfc92187 Merge pull request #47678 from matthewbauer/landmarks
Update macOS frameworks to 10.12
2018-12-18 09:59:44 -06:00
Matthew Bauer dbd0a78e5a Merge pull request #51854 from pmahoney/freeswitch
Freeswitch
2018-12-17 23:43:25 -06:00
Matthew Bauer 27d0d6d1ce Merge pull request #51899 from yrashk/luigi-boto3
luigi: include boto3
2018-12-17 23:41:54 -06:00
Matthew Bauer 657220349d Merge pull request #51422 from hlolli/csoundqt
Csoundqt init 0.9.6-beta2 and python-qt init 3.2
2018-12-17 23:39:12 -06:00
Matthew Bauer 06bf67d7dd Merge pull request #51018 from plchldr/rtl8821a
rtl8821a: init at 5.1.5
2018-12-17 23:36:36 -06:00
Matthew Bauer a456a54c18 Merge pull request #52251 from Ericson2314/fix-darwin-bootstrap-cmds
treewide: Use "buildPackages" darwin for bootstrap_cmds
2018-12-17 22:53:14 -06:00
Matthew Bauer b0ccd8be8e Merge pull request #52449 from TomSmeets/gamecube-tools
gamecube-tools: init at v1.0.2
2018-12-17 20:26:04 -06:00
Matthew Bauer 5708fd7671 Merge pull request #52450 from TomSmeets/wiiload-1
wiiload: init at v0.5.1
2018-12-17 20:25:22 -06:00
Matthew Bauer 71594e277c Merge pull request #52455 from aij/fix-gnustep-base
gnustep.base: Add explicit dependency on libbfd
2018-12-17 16:45:26 -06:00
Matthew Bauer e6f7f2928f darwin: 10.11 → 10.12
Lots of stuff has gotten moved around. Many security libraries have been merged
into the Security monorepo. I’ve cleared them out for now, we will
need to modify Security to build them!

This also moves some things around to more clearly separate
bootstrapping the stdenv from everything else. We want the “normal”
mode to be the non-bootstrapped version. When you ask for “Security”,
you want the actual built software, not a crippled one.

- Add TARGET_OS_OSX to darwin.libSystem. Looks like something
  introduced in 10.12. TARGET_OS_MAC is only set when building for
  desktop (iOS will have TARGET_OS_MAC set)
- Bump darwin.dtrace
- Bump darwin.libpthread
- Remove SmartCardServices, libsecurity*, etc.
- Install some more headers for darling.
2018-12-17 00:07:09 -06:00
Matthew Bauer 78cabc3ca9 libffado: refactor lib-prefixed package 2018-12-15 14:43:57 -06:00
Matthew Bauer e422585c0d Merge pull request #52146 from matthewbauer/readd-gcc-arm-embedded
Revert "gcc-arm-embedded: remove"
2018-12-15 14:22:34 -06:00
Matthew Bauer 676b840172 Merge pull request #50837 from bkchr/android_ndk_18_b
androidndk: 17c -> 18b
2018-12-15 13:35:12 -06:00
Matthew Bauer adcf4aa524 lldb: use provided INSTALL_NAME_DIR
Fixes #47886

We don’t want llvm to set the install name for us. It should be the
one given to us.
2018-12-15 13:27:02 -06:00
Matthew Bauer 1d6b0eb7dd lldb: add cf-private on darwin
This is necessary to avoid objc errors like:

    "_OBJC_CLASS_$_NSDictionary", referenced from:
        objc-class-ref in liblldbHost.a(HostInfoMacOSX.mm.o)
        objc-class-ref in liblldbPluginPlatformMacOSX.a(PlatformiOSSimulatorCoreSimulatorSupport.mm.o)
  ld: symbol(s) not found for architecture x86_64
2018-12-15 13:27:01 -06:00
Matthew Bauer 4c9bbf01ef Revert "gcc-arm-embedded: remove"
This reverts commit c327df544a.
2018-12-15 12:32:12 -06:00
Matthew Bauer 0a996c8ef3 darwin: use llvm’s dsymutil instead of dummy version
We were previously using a dummy wrapper for dsymutil. This meant that
debug symbols were not getting generated when dsymutil was otherwise
available. This should fix that issue & provide a real dsymutil from
llvm.

Fixes #52148.
2018-12-15 12:26:11 -06:00
Matthew Bauer dd78e629aa treewide: use "buildPackages" darwin for bootstrap_cmds
These are almost always from buildPackages. Another issue where
splicing doesn’t seem to pick them up correctly.

(cherry picked from commit 9ab67898f7)
2018-12-15 12:44:12 -05:00
Matthew Bauer ac22b8db09 Merge pull request #51598 from AndersonTorres/upload/tecoc
tecoc: add BSD and Darwin/OSX support
2018-12-14 22:21:58 -06:00
Matthew Bauer 9a06f08d85 Merge pull request #51847 from plapadoo/fix-epsxe
epsxe: add libGLU_combined to buildInputs
2018-12-14 22:19:45 -06:00
Matthew Bauer 6f78e300a1 Merge pull request #51881 from matthewbauer/static-fixes
pkgsStatic fix for macOS
2018-12-14 21:08:35 -06:00
Matthew Bauer ca00533887 Merge pull request #51966 from Twey/automatic-static-glibc
makeStaticBinaries: add a static glibc when performing a mkDerivation
2018-12-14 19:03:37 -06:00
Matthew Bauer af2cebe78f stdenv/darwin: fix portable libsystem hook
Some packages don’t have /bin directories. We should only run
install_name_tool if that directory exists.

(cherry picked from commit 0b8574540b)
2018-12-13 17:49:18 -05:00
Matthew Bauer 3c36dccd7c top-level/stage.nix: add static overlay
Adds the static overlay that can be used to build Nixpkgs statically.
Can be used like:

  nix build pkgsStatic.hello

Not all packages build, as some rely on dynamic linking.

(cherry picked from commit 6d90a8b894)
2018-12-13 14:04:34 -05:00
Matthew Bauer 3170d617ef ncurses: make shared linking optinoal
when enableShared = false, we set --without-shared flag.

(cherry picked from commit 53a67891ab)
2018-12-13 14:04:34 -05:00
Matthew Bauer a8e0694993 zlib: clean up static/shared distincion
This is kind of a mess, but basically:

- static=true, shared=true means to build statically but move it to
  the static output
- static=true, shared=false means to build statically and leave it in
  the main output
- static=false, shared=true means to not build static at all

Confusingly, the old default was static=true, shared=true even though
static=false? Still can’t figure out what was meant by that.

(cherry picked from commit e999def159)
2018-12-13 14:04:34 -05:00
Matthew Bauer f11d5341aa darwin/libiconv: fix static/shared logic
The conditional was incorrect - postInstall script should only hsppen
when enableShared = true.

(cherry picked from commit 5e06294276)
2018-12-13 14:04:33 -05:00
Matthew Bauer 7fcbc52d7d stdenv/adapters.nix: fixup makeStaticBinaries
- makeStaticBinaries don’t work on Darwin (no stable ABI!)
- Need to make sure NIX_CFLAGS_LINK appends
- isStatic is not used anymore

(cherry picked from commit 8726f6a558)
2018-12-13 14:04:33 -05:00
Matthew Bauer e84255296f stdenv: implement crossOverlays
crossOverlays only apply to the packages being built, not the build
packages. It is useful when you don’t care what is used to build your
packages, just what is being built. The idea relies heavily on the
cross compiling infrastructure. Using this implies that we need to
create a cross stdenv.

(cherry picked from commit a3a6ad7a01)
2018-12-13 14:04:33 -05:00
Matthew Bauer 465a5e1d97 Merge pull request #51880 from matthewbauer/simavr-mac
simavr: work on macOS
2018-12-11 20:36:58 -06:00
Matthew Bauer 79e886a61b simavr: work on macOS 2018-12-11 14:40:48 -06:00
Matthew Bauer 9ab67898f7 treewide: use "buildPackages" darwin for bootstrap_cmds
These are almost always from buildPackages. Another issue where
splicing doesn’t seem to pick them up correctly.
2018-12-10 18:22:03 -06:00
Matthew Bauer 9564b8ed9e cctools: don’t depend on clang at runtime
--disable-clang-as flag disables the use of clang by cctools-port
2018-12-10 17:31:47 -06:00
Matthew Bauer a27c51f71f premake3: use premake3 -> premake
premake3 only has the "premake" executable. This is a little confusing
because premake4 and premake5 both have the version suffix.

Fixes #51744
2018-12-08 14:47:13 -06:00
Matthew Bauer ab22183941 Merge pull request #51469 from matthewbauer/gimp-fix
gimp: fix on darwin
2018-12-05 13:43:40 -06:00
Matthew Bauer 69e898eb36 Merge pull request #51455 from matthewbauer/fix-46814
ghc: don’t add libiconv automatically
2018-12-05 13:33:54 -06:00
Matthew Bauer 73a87b57a6 gimp: fix on darwin
Fixes #41071
2018-12-05 13:20:14 -06:00
Matthew Bauer 7a00e80329 ghc: don’t add libiconv automatically
ghc needs it to fail to correctly detect it for later.
2018-12-05 13:17:40 -06:00
Matthew Bauer 0b8574540b stdenv/darwin: fix portable libsystem hook
Some packages don’t have /bin directories. We should only run
install_name_tool if that directory exists.
2018-12-05 12:56:12 -06:00
Matthew Bauer ceee97c038 Merge pull request #48803 from matthewbauer/crossOverlays
Adding pkgsStatic: a fully static overlay
2018-12-04 22:16:31 -06:00
Matthew Bauer 6d90a8b894 top-level/stage.nix: add static overlay
Adds the static overlay that can be used to build Nixpkgs statically.
Can be used like:

  nix build pkgsStatic.hello

Not all packages build, as some rely on dynamic linking.
2018-12-04 21:56:03 -06:00
Matthew Bauer 53a67891ab ncurses: make shared linking optinoal
when enableShared = false, we set --without-shared flag.
2018-12-04 21:16:43 -06:00
Matthew Bauer e999def159 zlib: clean up static/shared distincion
This is kind of a mess, but basically:

- static=true, shared=true means to build statically but move it to
  the static output
- static=true, shared=false means to build statically and leave it in
  the main output
- static=false, shared=true means to not build static at all

Confusingly, the old default was static=true, shared=true even though
static=false? Still can’t figure out what was meant by that.
2018-12-04 21:14:41 -06:00
Matthew Bauer 5e06294276 darwin/libiconv: fix static/shared logic
The conditional was incorrect - postInstall script should only hsppen
when enableShared = true.
2018-12-04 21:13:24 -06:00
Matthew Bauer 8726f6a558 stdenv/adapters.nix: fixup makeStaticBinaries
- makeStaticBinaries don’t work on Darwin (no stable ABI!)
- Need to make sure NIX_CFLAGS_LINK appends
- isStatic is not used anymore
2018-12-04 21:12:17 -06:00
Matthew Bauer b966d3c583 treewide: remove static packages
Nixpkgs is meant to link everything dynamically. We don’t want to
expose static packages at the top level. If some package needs
statically built binaries, it should use a custom override.
2018-12-04 21:10:45 -06:00
Matthew Bauer a3a6ad7a01 stdenv: implement crossOverlays
crossOverlays only apply to the packages being built, not the build
packages. It is useful when you don’t care what is used to build your
packages, just what is being built. The idea relies heavily on the
cross compiling infrastructure. Using this implies that we need to
create a cross stdenv.
2018-12-04 21:06:46 -06:00
Matthew Bauer 9d8de9ffaa c-ares: don’t set configure flags
These aren’t needed with dontDisableStatic
2018-12-04 20:58:19 -06:00
Matthew Bauer 357732e6a3 Merge pull request #50936 from tathougies/travis/dhcpcd-runtime-shell
dhcpcd: Use runtimeShell in dhcpcd-run-hooks
2018-12-03 09:48:38 -06:00
Matthew Bauer f1a111bbc5 Merge pull request #51408 from matthewbauer/disable-subsecond-gnumake
gnumake: disable subsecond mtime on darwin
2018-12-03 08:32:59 -06:00
Matthew Bauer 26de2d1780 gnumake: disable subsecond mtime on darwin
gnumake can support subsecond mtimes if it is available. But Darwin
doesn’t support setting subsecond mtimes until 10.13! So we can just
disable this check to avoid the issue where most of our built tools
use seconds but make uses nanoseconds. Might fix some parallel issues
along the way.

Fixes #51221
2018-12-03 08:31:57 -06:00
Matthew Bauer 3b32c920d5 systems/parse.nix: support eabihf
eabihf is an abi that can be used with ARM architectures that support
the “hard float”. It should probably only be used with ARM32 when you
are absolutely sure your binaries will run on ARM systems with a FPU.

Also, add an example "armhf-embedded" to match the preexisting
arm-embedded system. qmk_firmware needs hard float in a few places, so
add them here to get that to work.

Fixes #51184
2018-12-02 19:49:36 -06:00
Matthew Bauer 808f05808b kmod: avoid mass rebuild
elf-header shouldn’t be needed on linux
2018-12-02 19:34:55 -06:00
Matthew Bauer 973781444a Merge branch 'darwin-fixes2' 2018-12-02 14:15:05 -06:00