1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-09-11 15:08:33 +01:00
Commit graph

21904 commits

Author SHA1 Message Date
Tomas Hlavaty c2306a2ff4 libpst: 0.6.68 -> 0.6.70 2017-04-21 00:12:34 +02:00
Daiderd Jordan 8402585c39 Merge pull request #25044 from obsidiansystems/libiconv-bump
libiconv: 1.14 -> 1.15
2017-04-20 19:48:37 +02:00
John Ericson 8bd1a6c0b2 libiconv: 1.14 -> 1.15 2017-04-19 18:13:39 -04:00
Benno Fünfstück 042e268612 Revert "aspell: only set ASPELL_CONF from NIX_PROFILES in wrapper if unset"
This reverts commit 399065f226.

I am blind, this was already checked above. Thanks @bjornfor for noticing.
2017-04-19 20:21:36 +02:00
Benno Fünfstück 399065f226 aspell: only set ASPELL_CONF from NIX_PROFILES in wrapper if unset 2017-04-19 17:14:51 +02:00
Benno Fünfstück 792135a218 Merge pull request #24425 from lpenz/aspellconf
Set aspell's data-dir through ASPELL_CONF in a wrapper
2017-04-19 17:11:53 +02:00
Jaka Hudoklin e0b0a07a74 Merge pull request #23073 from volth/libguestfs-1.34
libguestfs: 1.29.5 -> 1.36.3
2017-04-19 02:01:54 +02:00
John Ericson 37e5e71fdf Merge pull request #24974 from Ericson2314/mapNullable
Introduce `mapNullable` into lib and use it in a few places
2017-04-17 17:12:14 -04:00
John Ericson 85aa5005af Introduce mapNullable into lib and use it in a few places
Also simply some configure flag logic my grep also alerted me too.
2017-04-17 17:04:04 -04:00
jraygauthier 383706f36d digikam: add video support through libqtav (#24866)
* libqtav: init at unstable-2017-03-30

* digikam: add video support through `libqtav` dependency

Issue #24426.
2017-04-17 22:28:20 +02:00
Vladimír Čunát 98777646f9
wxGTK*: avoid the mesa attribute
Tested building all wxGTK* and execution of codeblocks.
2017-04-16 13:03:32 +02:00
Michael Raskin b454dcd0e0 safefile: init at 1.0.5 2017-04-15 10:59:16 +02:00
Benjamin Staffin cdbcaa56b6 Merge pull request #24822 from techhazard/add-disk-storage-to-libvirt
add disk type storage to libvirt
2017-04-14 19:12:33 -04:00
Vladimír Čunát 2090aa4f65
Merge: fixup a bad merge
For details see:
https://github.com/NixOS/nixpkgs/commit/24444513fb5#commitcomment-21767916
2017-04-14 19:11:17 +02:00
Vladimír Čunát 6617c8bd87
A fixed version of commit eb750f9a7b
For detailed explanation see:
https://github.com/NixOS/nixpkgs/commit/24444513fb5#commitcomment-21767916
2017-04-14 18:59:36 +02:00
Eelco Dolstra 7f09c06c58
usbredir: Use dev output 2017-04-14 11:22:28 +02:00
Vladimír Čunát 24444513fb
Merge branch 'staging' 2017-04-14 10:32:13 +02:00
Volth dc0e338e01 libguestfs: 1.34.6 -> 1.36.3 2017-04-13 15:55:23 +00:00
Volth 94753af68c libguestfs: 1.34.4 -> 1.34.6 2017-04-13 15:55:20 +00:00
Volth cf68f546b1 libguestfs: 1.29.5 -> 1.34.4 2017-04-13 15:54:11 +00:00
Vladimír Čunát 42fd72091e
gnutls: use 3.5.10 on Darwin for now
This contains a revert of d6454e6a1.
2017-04-13 09:39:02 +02:00
Daniel Peebles f21a6940da Merge pull request #24838 from matthewbauer/ibtool
pinentry_mac: use xcbuild
2017-04-12 22:20:57 -04:00
Matthew Bauer 9e5fe7738a
xib2nib: add meta
also:
- NSPlist
- PlistCpp
2017-04-12 20:07:55 -05:00
Joachim Fasting 13a0ad3108
opal: NIX_CFLAGS -> NIX_CFLAGS_COMPILE
Seeing as the build already passes, I suspect this is strictly redundant
...

Tested with nix-build -A opal
2017-04-12 19:27:06 +02:00
Joachim Fasting 540a6412e3
suitesparse_4_4: NIX_CFLAGS -> NIX_CFLAGS_COMPILE
Tested with nix-build -A suitesparse_4_4
2017-04-12 19:27:03 +02:00
Joachim Fasting a883581ddb
suitesparse_4_2: remove bogus NIX_CFLAGS
NIX_CFLAGS should be NIX_CFLAGS_COMPILE; since pic is the default, we
simply remove the bogus declaration.

Tested with nix-build -A suitesparse_4_2
2017-04-12 19:26:58 +02:00
Daiderd Jordan 5ba445752b Merge pull request #24700 from hamishmack/fixes-for-macos
gtk fixes for macos
2017-04-12 19:26:32 +02:00
Matthew Bauer 1781ec934f
xib2nib: move nsplist, plistcpp to own folder
These libraries could be used by other packages so list them in
all-packages.nix as well.
2017-04-12 03:28:33 -05:00
Franz Pletz 29ed67faea
libressl_2_5: 2.5.1 -> 2.5.3 2017-04-11 19:41:01 +02:00
Vince van Oosten 00c3bd1561 add parted to build inputs 2017-04-11 16:05:07 +02:00
Vince v. Oosten 39e95aa159 add disk storage to libvirt 2017-04-11 13:03:02 +02:00
Tuomas Tynkkynen e4b48c7186 libsigsegv: Remove aarch64 patch, enable tests
The aarch64 patch has been applied upstream. Let's hope that the new
release fixes the tests as well.
2017-04-11 14:01:34 +03:00
Tuomas Tynkkynen 8eb25e1245 lzo: 2.09 -> 2.10 2017-04-11 13:00:56 +03:00
Tuomas Tynkkynen 72b2cbe3b7 libsigsegv: 2.10 -> 2.11 2017-04-11 13:00:56 +03:00
Tuomas Tynkkynen 5de624e437 gmp: 6.1.1 -> 6.1.2 2017-04-11 13:00:56 +03:00
Tuomas Tynkkynen 52797fc600 Merge remote-tracking branch 'upstream/master' into staging 2017-04-11 12:58:43 +03:00
Hamish Mackenzie 4d5ed187d3 gtk-mac-integration: fix gtk3 version
Include a Gtk3 version of gtk-mac-integration.
Add gobjectIntrospection to gtk-mac-integration.
Use propagatedBuildInputs for gtk.
2017-04-10 23:42:04 -07:00
Hamish Mackenzie da1d13bc07 webkgitgtk: fix 2.14 on macOS
Includes the patches from macports and fixes an issue with the
`otool -L` output that was causing g-ir-scanner to fail.
The paths in the macports patches have been modified so that they
will work with `patches` in nix (an extra directory level was
added).
2017-04-10 23:11:16 -07:00
Matthew Bauer f1fdc98884
pugixml: fixup darwin 2017-04-11 01:03:11 -05:00
Vladimír Čunát d6454e6a15
gnutls: try to fix build on Darwin, after update 2017-04-11 03:39:47 +02:00
aszlig 42bb63f803
leptonica: 1.72 -> 1.74.1
The changes are a bit too big to include it here in the commit message,
so if you want the details of what changed, please visit this URL:

http://leptonica.org/source/version-notes.html

I have also provided openjpeg, giflib and libwebp as dependencies so
that Leptonica is able to read/write those file formats.

Additionally I've added a patch that uses pkgconfig to resolve all
dependencies (except giflib), because unlike AC_CHECK_LIB() the
PKG_CHECK_MODULES() macro defines *_LIBS variables to include the linker
search path.

Unfortunately that patch alone is not enough, because the *_LIBS
variable are substituted by the upstream configure.ac to *not* include
the linker search paths, so we need to remove the AC_SUBST() calls
within PKG_CHECK_MODULES().

The only dependency that's not yet using PKG_CHECK_MODULES() is giflib,
because giflib doesn't have a pkg-config description file, therefore
we're using substituteInPlace to insert the linker search path after the
lept.pc file was generated by configure.

Another thing that we no longer need is the dependency on libpng version
1.2, because Leptonica now also works with more recent libpng versions.

Tested by building the package itself and also the following packages
that immediately depend on leptonica:

 * k2pdfopt
 * tesseract
 * jbig2enc

All of these packages succeeded to build on x86_64-linux.

The main reason why I'm bumping Leptonica to version 1.74.1 is that we
need at least version 1.74 to bump Tesseract to the latest upstream
version.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2017-04-11 03:21:29 +02:00
Leandro Lisboa Penz ce6b5b8673 aspell: set default aspell data-dir if ASPELL_CONF is not set
if the user didn't set ASPELL_CONF, use it to point to the dictionary
location by first looking at NIX_PROFILE directories and then using
$HOME/.nix-profile.

See NixOS/nixpkgs#1000
2017-04-10 22:14:29 +01:00
Vladimír Čunát 6d1374238f
gnutls: bugfix 3.5.10 -> 3.5.11 2017-04-10 17:53:54 +02:00
Vladimír Čunát c714f8241a
libdrm: 2.4.76 -> 2.4.79 2017-04-10 16:27:29 +02:00
Frederik Rietdijk 767e459200 Merge pull request #22726 from matthewbauer/openblas-closure-size
openblas: disable static libs
2017-04-10 16:11:19 +02:00
Franz Pletz b4c7979363
libgit2: 0.24.6 -> 0.25.1 2017-04-10 14:31:26 +02:00
Vladimír Čunát e47ac55a21
glibc: apply the i686 patch only on i686
... to reduce rebuilding. /cc #23177.
2017-04-10 11:18:50 +02:00
Vladimír Čunát c30b12b9a5
glibc: fix i686 crashes via an upstream patch
Fixes #23177.
2017-04-10 11:13:00 +02:00
Nikolay Amiantov ef1e28f5f6 qt56.qtwebengine: patch more library paths
Backport 040b86a96e.
2017-04-10 11:35:00 +03:00
Daiderd Jordan f8230518a2 Merge pull request #24762 from matthewbauer/darwin-misc-fixes
darwin: miscellaneous fixes
2017-04-10 08:50:15 +02:00