Commit graph

52256 commits

Author SHA1 Message Date
Matthew Bauer b300dddae1 xcbuild: only override version with 1 arg
sometimes we want the "SDK" version from xcbuild so we do something
like:

$ xcbuild -version -sdk MacOSX10.10
SDKSettings.plist - MacOSX10.10 (MacOSX10.10)
SDKVersion: 10.10
Path: /nix/store/6k7crm1n4drf09ga0dwvbmb59x4zl2i2-SDKs/MacOSX10.10.sdk
PlatformPath: /nix/store/vhfwb1znfy65s2xs27j8xribk6mp6lbw-Platforms/MacOSX.platform
ProductName: Mac OS X
ProductVersion: 10.10

This was previously overriden by the current xcode version so you
would get:

Xcode 9.4.1
Build version 17E189

This should fix the other usage of -version in nodejs 6.x.
2018-08-20 13:16:37 -05:00
John Ericson cfa4e0ac14
openjdk: Fix a cross problem
38eea804e6 dropped the C and C++ compiler prefixes. Probably more work is needed to make cross work, but this at least helps preserve/establish the pattern.
2018-08-20 10:16:17 +02:00
Vladimír Čunát 153a19df05
Merge branch 'master' into staging-next
Hydra: ?compare=1474536
2018-08-20 09:15:33 +02:00
Peter Hoeg 0c2b33da4b
Merge pull request #44947 from bkchr/kde_frameworks_5_49
kde-frameworks: 5.48 -> 5.49
2018-08-20 14:14:58 +08:00
Mitsuhiro Nakamura 5e42a081a3 r-jqr: fix build (#45333) 2018-08-20 00:08:28 +02:00
xeji 08f69510e5
Merge pull request #45341 from flokli/sqldeveloper-18.2
sqldeveloper_18: init at 18.2.0.183.1748
2018-08-19 23:44:39 +02:00
Susan Potter 8ac25594e4 rubygems: use official HTTPS src location 2018-08-19 17:23:51 -04:00
Susan Potter dda639bf86 rubygems: 2.7.6 -> 2.7.7 2018-08-19 17:23:51 -04:00
R. RyanTM e137f0e837 libdwarf: 20180527 -> 20180809 (#45194)
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/libdwarf/versions.
2018-08-19 23:20:29 +02:00
R. RyanTM 91ece32e56 libgit2_0_27: 0.27.3 -> 0.27.4 (#45200)
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/libgit2/versions.
2018-08-19 23:04:39 +02:00
R. RyanTM 83b6a28908 libwps: 0.4.9 -> 0.4.10 (#44749)
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/libwps/versions.
2018-08-19 22:58:29 +02:00
R. RyanTM 8bc6b4101d libguestfs: 1.38.3 -> 1.38.4 (#45198)
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/libguestfs/versions.
2018-08-19 22:57:58 +02:00
R. RyanTM 70f63b6411 librelp: 1.2.16 -> 1.2.17 (#44753)
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/librelp/versions.
2018-08-19 22:38:38 +02:00
Silvan Mosberger 99c593a8a3
Merge pull request #45334 from uskudnik/fix-backblaze-autocompletion-issue
Fix backblaze CLI bash autocomplete issue
2018-08-19 22:24:02 +02:00
Urban Skudnik af5511659c backblaze-b2: Fix backblaze bash autocomplete issue
Backblaze's CLI tool is relying on `have` function which is
deprecated[1] and gets dereferenced[2] at the end of `bash-completion`.

This causes issues for NixOS because those bash completions are
run after bash-completion[3] has already run and unset the
`have` function.

[1] 4d88339928/bash_completion (L114)
[2] 4d88339928/bash_completion (L2103)
[3] 80b6513fbf/nixos/modules/programs/bash/bash.nix (L22)
2018-08-19 22:13:42 +02:00
Daiderd Jordan 98579944cd
Merge pull request #45324 from teto/libvirt_fix2
libvirt: darwin/linux fix dlopen("libjansson.so.4")
2018-08-19 21:21:27 +02:00
Vladimír Čunát 38eea804e6
openjdk: fixup build after #44767 2018-08-19 20:10:07 +02:00
Vladimír Čunát 01fc00cc81
Revert "Merge #43190: libyaml: 0.1.7 -> 0.2.1"
This reverts commit 0f57d85522, reversing
changes made to 65af43026a.

I'm missing human time to solve errors or verify that they're harmless...
2018-08-19 19:57:36 +02:00
Jake Waksbaum b99b7c5ef8 linbox: Add darwin support 2018-08-19 13:55:48 -04:00
Florian Klink 3edf605622 sqldeveloper: add flokli to maintainers 2018-08-19 17:32:10 +02:00
Maximilian Bosch 5354e99401 sqldeveloper_18: init at 18.2.0.183.1748 2018-08-19 17:32:10 +02:00
Timo Kaufmann 8014c7f186
Merge pull request #45013 from jbaum98/fflas-ffpack_darwin
fflas-ffpack: Add darwin support
2018-08-19 16:24:52 +02:00
Jörg Thalheim 035906ce66
Merge pull request #45278 from veprbl/pr/arrow-cpp_0.10.0_bump
arrow-cpp: 0.9.0 -> 0.10.0
2018-08-19 14:49:26 +01:00
Matthieu Coudron 929a53f281 libvirt: fix dlopen("libjansson.so.4")
Commit 59027e2 broke libvirt broke libvirt/nixops on linux.
Use ${targetPlatform.extensions.sharedLibrary} to accomodate both linux and darwin.
2018-08-19 22:33:06 +09:00
Peter Simons 08f48236d2 cabal2nix: update hpack override to the new version 2018-08-19 13:36:20 +02:00
Peter Simons 782e96e7d4 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.11 from Hackage revision
d5c89ad106.
2018-08-19 13:36:14 +02:00
Peter Simons 87ae21cd12 LTS Haskell 12.6 2018-08-19 13:34:59 +02:00
Daiderd Jordan ac95ddb008
gtk3: propagate Cocoa on darwin
Generally frameworks should not be propagated, but in this case it's
always needed so we propagate (only) Cocoa.
2018-08-19 13:09:25 +02:00
Joachim F 90b991625b
Merge pull request #45072 from fgaz/lmdbxx
lmdbxx: init at 0.9.14.0
2018-08-19 10:27:41 +00:00
Joachim F f1c5054d78
Merge pull request #45002 from q3k/q3k/diamond
diamond: init at 3.10
2018-08-19 10:09:56 +00:00
Joachim F ed7b0f6f4f
Merge pull request #44977 from alyssais/puppet-lint
puppet-lint: init at 2.3.6
2018-08-19 09:54:47 +00:00
Jörg Thalheim 96b9d77dd8
Merge pull request #45282 from markuskowa/lics-2
Add licenses
2018-08-19 09:03:31 +01:00
Peter Simons 8546be38e5 hackage-packages: avoid broken reference to gnome2.gnome-keyring
Fixes https://github.com/NixOS/nixpkgs/issues/44996.
2018-08-19 09:38:40 +02:00
Vladimír Čunát 11f1893291
Merge #44625: libgit2* updates (security) 2018-08-19 09:23:01 +02:00
Vladimír Čunát ef6b76ca7d
ntl: use a more "stable" fix for clang platforms
Always passing the configuration option should be simple and reliable.
See comments on https://github.com/NixOS/nixpkgs/commit/1bfbe76772b731
2018-08-19 09:15:45 +02:00
Jörg Thalheim cfe738baf9
Merge pull request #45284 from orivej/msgpack
msgpack: rename from libmsgpack
2018-08-19 07:54:31 +01:00
Timo Kaufmann 6954dd26d3
Merge pull request #45301 from timokau/ntl-11.3.0
ntl: 11.2.1 -> 11.3.0
2018-08-19 01:56:52 +02:00
Orivej Desh 65663f883c msgpack: rename from libmsgpack
The project does not use the name "libmsgpack". It variously uses "msgpack" and
"msgpack-c", and "msgpackc" for the name of the library.
2018-08-18 23:19:54 +00:00
Markus Kowalewski 2521f7cbdc
perl: set license to artistic 2018-08-18 23:11:55 +02:00
Jake Waksbaum 8374400cec fflas-ffpack: Add darwin support 2018-08-18 20:28:06 +00:00
Daiderd Jordan abe2ab1581
at-spi2-core: fix darwin dylib install_name 2018-08-18 21:37:27 +02:00
Daiderd Jordan a71a9eab8c
at-spi2-atk: fix darwin dylib install_name 2018-08-18 21:37:26 +02:00
Daiderd Jordan 2286655abd
gtk3: add x11Support for darwin 2018-08-18 21:37:25 +02:00
Jörg Thalheim 92ce64d54a
Merge pull request #45293 from thefloweringash/libqmatrixclient-darwin
libqmatrixclient: enable Darwin platform
2018-08-18 18:07:47 +01:00
Jörg Thalheim 5b3637dbe6
Merge pull request #45283 from orivej/libmsgpack
libmsgpack: 2.1.5 -> 3.0.1
2018-08-18 18:01:48 +01:00
Silvan Mosberger e8145704e5
Merge pull request #45292 from bhipple/add/ecos
ecos: init at 2.0.6
2018-08-18 18:33:48 +02:00
Benjamin Hipple 65bb0b23b9 Add platforms.all 2018-08-18 12:11:06 -04:00
Daiderd Jordan 3c5c50488d
Merge pull request #45157 from mikemckibben/fix/oracle-instantclient-dylib
oracle-instantclient: fixes dylib rpath on macos
2018-08-18 18:06:20 +02:00
Michael Raskin c92766fec8 mono514: init at 5.14.0.177 2018-08-18 17:01:02 +03:00
Michael McKibben 0aa26ae766 oracle-instantclient: fixes dylib rpath on macos 2018-08-18 06:24:11 -06:00