1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-21 21:21:06 +00:00
Commit graph

44950 commits

Author SHA1 Message Date
ambrop7@gmail.com edcad57434 Add Gloox. 2014-06-19 18:02:12 +02:00
ambrop7@gmail.com 088bfaf826 Add nvidia-texture-tools. 2014-06-19 18:02:10 +02:00
Shea Levy e0de0bc470 Merge branch 'master' of git://github.com/soenkehahn/nixpkgs
Update haskell-wai and haskell-warp
2014-06-19 11:08:32 -04:00
Rok Garbas 870a8a0833 alsa-plugins: upgrade to 1.0.28
adding libogg as dependency should fix the build
2014-06-19 16:06:03 +01:00
Michael Raskin 2915999069 Add missing dependency to gtk-vnc 2014-06-19 18:23:14 +04:00
Rob Vermaas a975f6d8c5 Merge pull request #3016 from danielzinn/add_cuda_6
Added cuda6 compiler as package cudatoolkit6.
2014-06-19 14:10:36 +02:00
Daniel Zinn 01bbc61364 tweak 2014-06-19 04:53:03 -07:00
Mathijs Kwik 9ceeb77bd3 agda-stdlib: no need to jailbreak anymore 2014-06-19 13:38:54 +02:00
Mathijs Kwik 0a8455800c idris: fix dependency on older 'parsers' 2014-06-19 13:38:54 +02:00
Mathijs Kwik 46d6fc0c32 agda: fix dependency on more recent 'binary' 2014-06-19 13:38:54 +02:00
Daniel Zinn ca0de0f1f7 Added cuda6 compiler as package cudatoolkit6. 2014-06-19 04:24:21 -07:00
Oliver Charles e1c34ca676 haskellPackages.jsonAssertions: Update to 1.0.3 2014-06-19 11:32:39 +01:00
Oliver Charles 1b635150b5 Jailbreak haskellPackages.fb
This is necessary until https://github.com/meteficha/fb/issues/24 is
resolved.
2014-06-19 11:22:19 +01:00
Oliver Charles f67cf3e18d Jailbreak haskellPackages.websockets
This is needed until https://github.com/jaspervdj/websockets/issues/71
is resolved.
2014-06-19 11:17:01 +01:00
Oliver Charles 8a22affa24 haskellPackages.digestiveFunctorsAeson: Update to 1.1.9 2014-06-19 11:06:39 +01:00
Moritz Ulrich f85d3ad6d3 leiningen: Update to 2.4.2. 2014-06-19 12:04:33 +02:00
Moritz Ulrich bc41714d02 chicken: Update to 4.9.0.1. 2014-06-19 12:04:20 +02:00
Rob Vermaas 04e648f789 Change size of Amazon EC2 S3-backed images to 8GB (was 4GB).
(cherry picked from commit 05543ef6e0)
2014-06-19 11:28:06 +02:00
Rob Vermaas fe3a63b7d0 EC2: allow building S3-backed HVM ami's
(cherry picked from commit e007559e95)
2014-06-19 10:57:26 +02:00
Austin Seipp 499c2fdb99 Merge pull request #3012 from cpages/oxc
openxcom: update download link
2014-06-19 03:18:17 -05:00
Carles Pagès 950444bf77 openxcom: update download link 2014-06-19 10:12:40 +02:00
Sönke Hahn 540ce7e108 haskell-warp: update to 3.0.0.3 2014-06-19 15:35:48 +08:00
Sönke Hahn b39ade4ba5 haskell-wai: update to 3.0.0.2 2014-06-19 15:35:30 +08:00
aszlig 3ae3f3272f
chromium: Don't add sources as runtime dependency.
This is because of a single file that symlinks to the source output
path:

libexec/chromium/resources/extension/demo/library.js

Target within source output path:

chrome/browser/resources/extension_resource/demo/library.js

So we just need to ensure that the cp command follows symlinks during
installPhase and we should no longer have this unnecessary dependency.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-06-19 01:51:36 +02:00
aszlig 0c50978cb8
chromium: Hardcode dlopen() path for libexif.
This is needed for Chromium version 36 and higher.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-06-19 01:51:35 +02:00
aszlig 47214207b9
chromium/update: Fix fetching previous version.
After refactoring the updater we no longer did properly propagate the
exit code from the nix-prefetch-url call to the main script. So if the
newest version could not be fetched it didn't even bother to try the
previous release and we would end up with an empty hash.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-06-19 01:51:35 +02:00
aszlig 4cbedd7322
chromium: Update all channels to latest versions.
With this commit, the following new upstream versions are introduced:

stable: 35.0.1916.114 -> 35.0.1916.153
beta:   35.0.1916.86  -> 36.0.1985.67
dev:    36.0.1964.2   -> 37.0.2054.3

All builds successfully tested on my machine, however in order to update
the beta and dev channels, a few additional modifications were
necessary:

 * Update/rebase USER_NS sandbox patch for version 36 and higher.
 * Create address_input_strings.grdp before running gyp in version 37.
 * Remove an empty string leftover from 0517041.
 * Add patch for building bundled Angle for version 37.

The patch for Angle is to remove reliance on git being present during
build and is from https://chromium-review.googlesource.com/202048 but
with own modifications to remove/fix Windows-specific parts within the
patch file.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-06-19 01:51:34 +02:00
aszlig 3d665679c1
chromium: Properly implement mksnapshot target.
Let's ensure we do all architecture-dependant stuff inside
mkChromiumDerivation and not pass archInfo around, so we can properly
decouple it from the main function.

This partially reverts 8d54dc6d13.

The main reason for doing this is because the architecture information
is no longer required in Chromium 37, so let's uglify and XXX it in
common.nix and remove it once version 37 hits the stable channel.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-06-19 01:51:34 +02:00
aszlig 1580688490
gyp: Update to new upstream revision 1944.
This is mainly needed in order to build the new Chromium version 37.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-06-19 01:51:33 +02:00
aszlig 3e64126344
nixos/shadow: Add an example for defaultUserShell.
Thanks to @devhell for the suggestion.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-06-19 01:51:33 +02:00
Austin Seipp 72a0bcd49f Merge pull request #2957 from doublec/xpra
Change to xpra version 0.11.6 as 0.12.5 was not working
2014-06-18 16:25:44 -05:00
Austin Seipp 537dbfed78 Merge pull request #2898 from robberer/php/mssql
mssql support for php-5.4
2014-06-18 16:25:24 -05:00
Austin Seipp b9fc9bd760 Merge pull request #2992 from bluescreen303/agda
Agda: upgrade stdlib to 0.8, change defaults to latest version
2014-06-18 16:22:33 -05:00
Austin Seipp 85c70f642f Merge pull request #2977 from bluescreen303/emacs-org2blog
Emacs org2blog - bring up to date - now works with org-8.* again
2014-06-18 16:21:02 -05:00
Austin Seipp 1e3a53e44e Merge pull request #3001 from deepfire/aurulent-sans
aurulent-sans:  new expression
2014-06-18 16:20:18 -05:00
Austin Seipp 55fee4ffce Merge pull request #3004 from offlinehacker/pkgs/logstash/update_1_3_3
logstash: update to 1.3.3
2014-06-18 16:20:00 -05:00
Austin Seipp d349481e8b Merge pull request #2960 from third3ye/patch-2
Application.ini does not refer correctly
2014-06-18 16:18:54 -05:00
Austin Seipp ad0755e5d4 Merge pull request #2919 from ehmry/ogg-vorbis
libogg, libvorbis: update to 1.3.2, 1.3.4
2014-06-18 16:17:37 -05:00
Austin Seipp 15aee28fa1 Merge pull request #2990 from third3ye/patch-3
Minor logic fix
2014-06-18 16:16:58 -05:00
Austin Seipp 3a86ce32e4 Merge pull request #2937 from cpages/oxc
openxcom: add version 1.0.0
2014-06-18 16:16:07 -05:00
Austin Seipp e5023b1f45 Merge pull request #2974 from bluescreen303/samba
samba really requires its daemons
2014-06-18 16:15:50 -05:00
Austin Seipp 4eb7fdcc13 Merge pull request #2966 from wkennington/master.sudo
Update and fix sudo
2014-06-18 16:13:53 -05:00
Austin Seipp f72e9c1090 Merge pull request #2975 from bluescreen303/conkeror
conkeror: upgrade to latest snapshot
2014-06-18 16:09:52 -05:00
Austin Seipp fb24267670 Merge pull request #3002 from tomberek/haskell_tcacheAWS
Adds tcache-AWS
2014-06-18 16:09:35 -05:00
Austin Seipp ae8e54c64b Merge pull request #2989 from pwoolcoc/git-cacert-path
add OPENSSL_X509_CERT_FILE to the `git` command environment
2014-06-18 16:09:22 -05:00
Austin Seipp 1e23c251e7 Merge pull request #2995 from pSub/dwb-update
Updated dwb to latest revision.
2014-06-18 16:08:52 -05:00
Austin Seipp 91f1dda340 Merge pull request #2980 from bluescreen303/php-fpm
phpfpm: add option for setting php.ini file
2014-06-18 16:08:21 -05:00
John Wiegley 4643126d10 Merge pull request #2938 from pSub/org-mode
Org-mode 8.2.7 depends on texlive-cm-super.
2014-06-18 09:42:12 -07:00
Jaka Hudoklin d4506fd7eb logstash: update to 1.3.3 2014-06-18 13:29:26 +02:00
Peter Simons f7c7282964 Merge pull request #2979 from bluescreen303/idris
Idris: fix wrapper for llvm, upgrade emacs-idris-mode
2014-06-18 10:00:00 +02:00