1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-28 16:42:09 +00:00
Commit graph

58494 commits

Author SHA1 Message Date
Peter Simons d6c295e469 Merge remote-tracking branch 'origin/master' into staging. 2015-02-25 20:18:28 +01:00
Peter Simons 3021f2f529 haskell-generic-builder: update and jailbreak cabal files before patchPhase is run
The updated and jailbroken Cabal file must be in place before the
'patchPhase' hook is run, otherwise we cannot use that hook to patch the
Cabal file! Resolves https://github.com/NixOS/nixpkgs/issues/5922.

As an added bonus, this change makes the "jailbreakPhase" obsolete.
2015-02-25 20:15:26 +01:00
Peter Simons d732039ecc haskell-generic-builder: set LOCALE_ARCHIVE only on Linux 2015-02-25 19:49:39 +01:00
Peter Simons 5ea3b3e36f haskell-generic-builder.nix: don't add lib64 directories to the search path
Packages that provide 32 and 64-bit libraries in the same store path are rare
and usually require manual overrides anyway. It seems pointless to try and
guess proper settings for them. The effect is that we'll end up with bogus
settings that take more effort to correct that it takes to configure proper
settings in the first place. Point in case: haskell-cuda and it's configuration
for "cudatools".

Fixes https://github.com/NixOS/nixpkgs/issues/6564.
2015-02-25 19:42:42 +01:00
Eelco Dolstra 9788cbb2de Re-enable Darwin builds 2015-02-25 19:27:30 +01:00
William A. Kennington III f27fa79aa9 nixos/dnsmasq: Fix service name typo 2015-02-25 09:22:16 -08:00
Peter Simons aaf09cd216 haskell-cuda: jump through hoops to make this build succeed
The package has undeclared dependencies on 'nvidia_x11' and 'cudatoolkit', the
latter of which also comes with a non-standard directory layout that our
builder cannot handle without help. Last but not least, the build hard-codes
impure search paths like /usr/local/cuda that need to be patched out.

Resolves https://github.com/NixOS/nixpkgs/issues/6562.
2015-02-25 16:52:02 +01:00
Tobias Geerinckx-Rice d3156d3ca2 bully: switch to working Lrs121 mirror + fetchFromGitHub 2015-02-25 16:27:03 +01:00
Tobias Geerinckx-Rice 04b8bd0d50 stress-ng 0.03.18 -> 0.03.19 2015-02-25 16:27:02 +01:00
Eelco Dolstra 586b9d9525 tzdata: Update to 2015a 2015-02-25 15:24:53 +01:00
Domen Kožar 61c3aa5047 python: 3.4.2 -> 3.4.3 2015-02-25 15:21:14 +01:00
vbgl 8db9bd23fa Merge pull request #6423 from DamienCassou/update-requests2
requests2 2.4.3 -> 2.5.1
2015-02-25 14:59:47 +01:00
Austin Seipp 0d266b2392 nixpkgs: afl 1.21b -> 1.49b
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-02-25 07:54:15 -06:00
Austin Seipp 62fdc5f94d nixpkgs: btsync 1.4.106 -> 1.4.110
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-02-25 07:54:15 -06:00
Eelco Dolstra c863acb3af Merge pull request #6563 from taku0/firefox-bin-36.0
firefox-bin: update to version 36.0; thunderbird-bin: update to version 31.5.0
2015-02-25 14:51:50 +01:00
taku0 2e8f2d6477 firefox-bin: update to version 36.0; thunderbird-bin: update to version 31.5.0 2015-02-25 22:42:05 +09:00
Eelco Dolstra 36d0f367de ssh-agent: Fix asking for confirmation via $SSH_ASKPASS
This was lost back in
ffedee6ed5. Getting this to work is
slightly tricky because ssh-agent runs as a user unit, and so doesn't
know the user's $DISPLAY.
2015-02-25 14:31:17 +01:00
Eelco Dolstra 93902ea108 nsswitch.conf: Omit ldap unless ldap is enabled
This prevents programs from trying to find nss_ldap.
2015-02-25 14:31:13 +01:00
Peter Simons 2ce047165a hackage-packages.nix: re-generate from Hackage 2015-02-25T12:26:26+0100 2015-02-25 14:11:17 +01:00
Eelco Dolstra 9e9e446880 sudo: Fix incorrect runtime path 2015-02-25 12:39:06 +01:00
vbgl 5f5ebcd74f Merge pull request #6556 from ts468/freerdp
FreeRDP: build server as well
2015-02-25 11:59:08 +01:00
Jaka Hudoklin 89e928e0c1 Merge pull request #6559 from jasonMoggridge/urbanTerrorUpdate
Update the urbanTerror client.
2015-02-25 11:10:42 +01:00
vbgl 5db0a40bfa Merge pull request #6537 from arno01/cherrytree
cherrytree: update to 0.35.7
2015-02-25 09:55:35 +01:00
Domen Kožar f4acbf30f2 Revert "Fix eval"
This reverts commit 6afc1907c8.

Not needed anymore after revert at
b653e3f661
2015-02-25 09:43:25 +01:00
Domen Kožar 6919be40bd Merge pull request #6549 from desiderius/python-sphinx-contrib
python-packages: update sphinxcontrib
2015-02-25 09:29:15 +01:00
Domen Kožar 9214859fd2 Revert "Mark many packages (mostly python) broken because of broken dependencies."
This reverts commit bf86758a42.

See 71a9aa10ca25f5659a657d8910e11f36c3439a36
2015-02-25 09:23:31 +01:00
Domen Kožar 67f9edc98e Revert "python-packages.nix: updated 'disabled' attributes to reduce the number of evaluation errors in http://hydra.nixos.org/jobset/nixpkgs/trunk#tabs-errors"
This reverts commit a250e9b908.

See 71a9aa10ca25f5659a657d8910e11f36c3439a36
2015-02-25 09:23:31 +01:00
Domen Kožar b653e3f661 Revert "python-generic: set meta.broken for disabled packages instead of raising an error during evaluation"
This reverts commit 79a5fec9c0.

meta.broken uses 'throw' under the hood so it can not improve the
current situation. Reverting to previous behaviour gives us correct
error message to the user indicating that interpreter is not supported.

Correcting Hydra output is out of scope of Python packaging.
2015-02-25 09:23:31 +01:00
Vincent Laporte b6d8d57905 libharu: update from 2.2.1 to 2.3.0 2015-02-25 08:46:57 +01:00
Jason Moggridge 2aa2d8ac76 Update the sources to the latest version and added one new dependency 2015-02-25 00:25:14 -05:00
William A. Kennington III 9240070334 consul: Update to 0.5.0 and consul_template: 0.7.0 2015-02-24 18:32:58 -08:00
Mateusz Kowalczyk cc4a5073e2 Resurrect openjpeg 2.0.x and use it for mupdf
mupdf doesn't compile with 2.1 due to API changes

cc @codyopel who made the openjpeg update
2015-02-25 01:50:06 +00:00
Arseniy Seroka ae8eb54c8b Merge pull request #6499 from avnik/xkbcomp-fix
Proper default path for XKB config files
2015-02-25 04:46:59 +03:00
Thomas Strobel 45856c9bde FreeRDP: build server as well 2015-02-25 00:43:15 +01:00
Peter Simons 7cc7e9b64a haskell-haxr has been fixed. 2015-02-24 23:29:58 +01:00
Peter Simons 27e37a11d1 haskell-ng: update Cabal to version 1.22.1.1 and binary to version 0.7.4.0 2015-02-24 23:29:58 +01:00
Peter Simons 475097ace1 hackage-packages: re-generate from Hackage 2015-02-24T12:08:55+0100 2015-02-24 23:29:58 +01:00
William A. Kennington III f08e87a01e zfs_git: Update 2015-02-24 14:16:18 -08:00
William A. Kennington III 4bbc026594 linux-firmware-nonfree: Update 2015-02-24 14:14:34 -08:00
Bjørn Forsman 06f5651ef5 nix-prefetch-git: print commit date (close #6522)
The commit date can be used as a version number in packages that don't
have proper releases.
2015-02-24 23:02:59 +01:00
Thomas Tuegel 030eed8307 Merge branch 'dropbox' 2015-02-24 15:59:14 -06:00
vbgl 8300898f98 Merge pull request #6533 from michelk/gdal_1.11.2
gdal: update to 1.11.2
2015-02-24 22:45:50 +01:00
William A. Kennington III e453f99446 nixos/networkd: Add an assertion for unsupported rstp 2015-02-24 13:09:34 -08:00
Rok Garbas d378324166 pythonPackages.py3status: new package, status bar for i3 window manager 2015-02-24 22:05:05 +01:00
Vladimír Čunát 46b48b0b43 Revert "vimPlugins: update" due to bad hashes
This reverts commit 57a0c44c2c.
https://github.com/NixOS/nixpkgs/commit/f799749442489#commitcomment-9901870
2015-02-24 21:59:41 +01:00
Vladimír Čunát f799749442 vimPlugins.Syntastic: fix fetchgit hash
I've got no idea why the hash was wrong. I hope the hashes aren't unstable.
Reported on http://unix.stackexchange.com/questions/186519/unable-to-install-vim-plugins
2015-02-24 21:21:05 +01:00
William A. Kennington III 51b7fe53fa libinput: 0.10 -> 0.11 2015-02-24 11:52:19 -08:00
William A. Kennington III dbaf941212 Merge pull request #6422 from codyopel/libinput
libinput: refactor & add optional dependencies
2015-02-24 11:47:45 -08:00
Alexander V. Nikolaev 279d5af119 Proper default path for XKB config files 2015-02-24 21:38:30 +02:00
Alexander V. Nikolaev a1ca3dbd08 Fix build for perl-Alien-Wx and friends
This should fix at least one problem, preventing build master on
Travis-CI.
2015-02-24 21:38:29 +02:00