1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-26 15:41:40 +00:00
Commit graph

35278 commits

Author SHA1 Message Date
Ricardo M. Correia 407a6857c6 grsecurity: Update stable and test patches
stable: 3.0-3.2.55-201403252026 -> 3.0-3.2.55-201403300851
test:   3.0-3.13.7-201403252047 -> 3.0-3.13.8-201404011912
2014-04-02 02:16:59 +02:00
Domen Kožar 75fb34eb6d add pythonPackages.gunicorn 2014-04-01 13:44:37 +00:00
Luca Bruno db2f743156 gnome-screenshot: new package
Utility used in the GNOME desktop environment for taking screenshots

http://en.wikipedia.org/wiki/GNOME_Screenshot
2014-04-01 14:48:00 +02:00
Domen Kožar 886320136e bittorrentSync: use versioned url for download 2014-04-01 13:25:48 +02:00
Vladimír Čunát 0fd5a3af0c libyaml: minor update to fix CVE-2014-2525 2014-04-01 11:30:16 +02:00
Austin Seipp 19bc051ca1 kernel: stable/longterm updates
- longterm: 3.4.83  -> 3.4.85
 - longterm: 3.10.33 -> 3.10.35
 - longterm: 3.12.14 -> 3.12.15
 - stable:   3.13.7  -> 3.13.8

NOTE: This will break the testing grsec kernel at the moment (there's
not a 3.13.8 patch yet), but it's destined to be upgraded to 3.14 soon
anyway.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-04-01 11:11:10 +02:00
Vladimír Čunát 44f4862041 xorg.xtrans: maintenance update 2014-04-01 10:53:34 +02:00
Austin Seipp 010688a763 btsync: 1.2.91 -> 1.3.77
This also does some various cleanup on the build process. In particular,
patchelf was not properly setting the rpath so e.g. librt and libm did
not point into glibc inside the Nix store on my Ubuntu system. This
properly sets the library paths on installation.

Also, the download URL for BitTorrent Sync changed, which is incredibly
annoying, because the URL doesn't encode version information. So maybe
this will fail later. :(

(A final note: this also changes the package name from 'btsync-bin' to
just 'btsync', and cleans up some meta attributes.)

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-04-01 03:52:43 -05:00
Vladimír Čunát 6445ac90ad Merge master into x-updates 2014-04-01 10:49:31 +02:00
Austin Seipp 7288f25bd1 kernel: stable/longterm updates
- longterm: 3.4.83  -> 3.4.85
 - longterm: 3.10.33 -> 3.10.35
 - longterm: 3.12.14 -> 3.12.15
 - stable:   3.13.7  -> 3.13.8

NOTE: This will break the testing grsec kernel at the moment (there's
not a 3.18.8 patch yet), but it's destined to be upgraded to 3.14 soon
anyway.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-04-01 03:03:00 -05:00
Austin Seipp 4202a9315a grsecurity: add myself to maintainer list
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-04-01 02:59:53 -05:00
Austin Seipp 1459896be1 kernel: add myself to maintainer list
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-04-01 02:59:20 -05:00
aszlig 51e449aabb
chromium: Fix build of beta and dev channels.
Okay, now this time we really broke beta and dev, because python_arch no
longer is in build/common.gypi anymore.

This just adds chrome/chrome_tests.gypi to the list of files to be
changed by sed.

Also, this time I did test at least whether gyp is running fine and
interrupted after the first 1000 build targets, so all channels *should*
now build fine.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-04-01 09:33:04 +02:00
Austin Seipp bdff718c5b kernel: add lockdep expression
Lockdep is the kernel's locking validation/debugging tool and has seen
heavy pro-active usage and development. In Linux 3.14, it's now
available directly to userspace for the same purpose. It comes with a
convenient utility to LD_PRELOAD a shared library for validation, or a
user-space API to link to directly.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-04-01 01:20:46 -05:00
Austin Seipp 9493159017 kernel: remove 3.11 series (EOL)
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-04-01 00:56:23 -05:00
aszlig 1ae4db3a80
chromium: Fix build of stable channel.
Build failure on Hydra:

https://hydra.nixos.org/build/9823160

This was caused by the update of file in 5885709.

As file seems to be used for only one substition in the gyp files, we
can now drop the build dependency on file and patch out the substition
expression, as it is done before actually testing if the value has been
set by -D (gyp, y u no have lazy eval!?).

PS: Proudly untested against beta and dev channels, redeployed my own
Hydra and building on my workstation here really is ... annoying (lavg
41 on a system with nproc 8, less than 8 GB RAM and you probably will
have as much "fun" as I just had writing this commit mess...a....g

FUCK^H^H^H^H^H^H...e).

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-04-01 04:01:58 +02:00
Shea Levy 304fd16d95 Merge branch 'concurrencykit' of git://github.com/thoughtpolice/nixpkgs
concurrencykit: version 0.4.1
2014-03-31 21:50:42 -04:00
Austin Seipp 92192847fc concurrencykit: version 0.4.1
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-03-31 20:49:50 -05:00
Shea Levy b86d946631 Merge branch 'ccid' of git://github.com/ambrop72/nixpkgs
ccid: Bump to 1.4.16.
2014-03-31 21:00:15 -04:00
Shea Levy 2d4ce25b5b Add linux 3.14 2014-03-31 20:54:47 -04:00
Sander van der Burg 073eab850a slasp: Add nodejs package + update other nodejs packages 2014-04-01 00:28:23 +02:00
ambrop7@gmail.com e1c55a346a ccid: Bump to 1.4.16. 2014-04-01 00:08:57 +02:00
Peter Simons f06bcd84bf Merge pull request #2082 from cpages/update
Updates for maintained packages
2014-03-31 23:13:38 +02:00
Peter Simons 69b53c990a structured-haskell-mode: re-generate with latest cabal2nix 2014-03-31 23:10:56 +02:00
Peter Simons a20d5da92e Merge pull request #2084 from thoughtpolice/security
Add tools: p0f & hashcat
2014-03-31 23:06:10 +02:00
Peter Simons 61fb503eb7 haskell-http-types: jailbreak to fix build with recent case-insensitive 2014-03-31 22:46:41 +02:00
Karn Kallio 5d68efd230 aldor: update to 1.2.0 version in development. 2014-03-31 21:41:20 +02:00
Karn Kallio db21a0da97 pakcs: update hash for 1.11.3 release, which was updated without a version change. 2014-03-31 21:40:50 +02:00
Peter Simons 68409a0981 haskell-cake3: update to version 0.4.0.0 2014-03-31 21:39:27 +02:00
Peter Simons 80fd70f759 haskell-xss-sanitize: update to version 0.3.5.2 2014-03-31 21:39:27 +02:00
Peter Simons 1cd1c489a8 haskell-type-level-natural-number: update to version 2.0 2014-03-31 21:39:27 +02:00
Peter Simons dd6092c5e5 haskell-stm-chans: update to version 3.0.0.2 2014-03-31 21:39:26 +02:00
Peter Simons d46048907e haskell-smtps-gmail: update to version 1.1.0 2014-03-31 21:39:26 +02:00
Peter Simons 0560805bdf haskell-process-conduit: update to version 1.0.0.2 2014-03-31 21:39:26 +02:00
Peter Simons e4ee9e3f8f haskell-hastache: update to version 0.6.0 2014-03-31 21:39:26 +02:00
Peter Simons 2ec626f196 haskell-digestive-functors: update to version 0.7.1.0 2014-03-31 21:39:26 +02:00
Peter Simons d10dea86e4 haskell-bytestring-lexing: update to version 0.4.3.2 2014-03-31 21:39:26 +02:00
Peter Simons 0a150f97c8 haskell-conduit-extra: this package doesn't contain any modules, so we cannot have documentation
Apparently, Michael Snoyman made all his code depend on an empty package
just in case it turns out that the extra dependency might come in useful
in the future. Go figure.
2014-03-31 21:39:26 +02:00
Peter Simons a5c678110b haskell-yesod: update to version 1.2.5.2 2014-03-31 21:39:26 +02:00
Peter Simons 6c72ef973c haskell-yesod-test: update to version 1.2.1.2 2014-03-31 21:39:26 +02:00
Peter Simons a540080b0c haskell-yesod-static: update to version 1.2.2.4 2014-03-31 21:39:26 +02:00
Peter Simons 03d2b99537 haskell-yesod-form: update to version 1.3.8.1 2014-03-31 21:39:26 +02:00
Peter Simons 11679b331a haskell-yesod-core: update to version 1.2.9.2 2014-03-31 21:39:26 +02:00
Peter Simons 564f192d33 haskell-yesod-bin: update to version 1.2.7.4 2014-03-31 21:39:26 +02:00
Peter Simons 900abbfa21 haskell-yesod-auth: update to version 1.3.0.2 2014-03-31 21:39:26 +02:00
Peter Simons ab6453c483 haskell-yaml: update to version 0.8.8.1 2014-03-31 21:39:26 +02:00
Peter Simons bc9140a608 haskell-xml-conduit: update to version 1.2.0.1 2014-03-31 21:39:26 +02:00
Peter Simons cb81cfeaa9 haskell-warp: update to version 2.1.3.3 2014-03-31 21:39:26 +02:00
Peter Simons 3e2eb89cb6 haskell-warp-tls: update to version 2.0.3.2 2014-03-31 21:39:26 +02:00
Peter Simons 12ec59aa77 haskell-wai: update to version 2.1.0.1 2014-03-31 21:39:26 +02:00
Peter Simons d16e52b872 haskell-wai-websockets: update to version 2.1.0.1 2014-03-31 21:39:25 +02:00
Peter Simons b217dfc617 haskell-wai-test: update to version 2.0.1.1 2014-03-31 21:39:25 +02:00
Peter Simons f312041fc4 haskell-wai-handler-launch: update to version 2.0.1.2 2014-03-31 21:39:25 +02:00
Peter Simons 4c8d2419b5 haskell-wai-extra: update to version 2.1.1.1 2014-03-31 21:39:25 +02:00
Peter Simons a893fa5b75 haskell-system-filepath: update to version 0.4.10 2014-03-31 21:39:25 +02:00
Peter Simons eaa032aa92 haskell-snap-server: update to version 0.9.4.1 2014-03-31 21:39:25 +02:00
Peter Simons df7e61047d haskell-snap-core: update to version 0.9.6.2 2014-03-31 21:39:25 +02:00
Peter Simons 3d534a268e haskell-resourcet: update to version 0.4.10.2 2014-03-31 21:39:25 +02:00
Peter Simons 429e248af7 haskell-project-template: update to version 0.1.4.1 2014-03-31 21:39:25 +02:00
Peter Simons 20395fd9d3 haskell-postgresql-simple: update to version 0.4.2.1 2014-03-31 21:39:25 +02:00
Peter Simons 9b61153ce3 haskell-pool-conduit: update to version 0.1.2.2 2014-03-31 21:39:25 +02:00
Peter Simons 48600834ca haskell-persistent: update to version 1.3.0.6 2014-03-31 21:39:25 +02:00
Peter Simons a7828e9cc5 haskell-persistent-template: update to version 1.3.1.3 2014-03-31 21:39:25 +02:00
Peter Simons d819420709 haskell-persistent-sqlite: update to version 1.3.0.5 2014-03-31 21:39:25 +02:00
Peter Simons 818bf53040 haskell-persistent-postgresql: update to version 1.3.0.5 2014-03-31 21:39:25 +02:00
Peter Simons 7448e13d57 haskell-mono-traversable: update to version 0.4.0.4 2014-03-31 21:39:25 +02:00
Peter Simons 1139e22b09 haskell-monad-logger: update to version 0.3.4.1 2014-03-31 21:39:25 +02:00
Peter Simons fb4ae347f1 haskell-language-c: update to version 0.4.3 2014-03-31 21:39:25 +02:00
Peter Simons a839273d87 haskell-http-reverse-proxy: update to version 0.3.1.4 2014-03-31 21:39:25 +02:00
Peter Simons 896df7da5a haskell-html-conduit: update to version 1.1.0.4 2014-03-31 21:39:24 +02:00
Peter Simons 5996a836a6 haskell-cryptohash-conduit: update to version 0.1.1 2014-03-31 21:39:24 +02:00
Peter Simons b0b0d8603c haskell-classy-prelude: update to version 0.8.2 2014-03-31 21:39:24 +02:00
Peter Simons 4d8821a7c5 haskell-basic-prelude: update to version 0.3.7 2014-03-31 21:39:24 +02:00
Peter Simons 9af5b2d370 haskell-authenticate: update to version 1.3.2.8 2014-03-31 21:39:24 +02:00
Peter Simons 3bb288859b haskell-HList: update to version 0.3.4.1 2014-03-31 21:39:24 +02:00
Peter Simons c6da40c42f haskell-haddock: add version 2.14.1 2014-03-31 21:39:24 +02:00
Peter Simons 305531cbd9 haskell-case-insensitive: add version 1.2.0.0 2014-03-31 21:39:24 +02:00
Peter Simons 98b82062b0 haskell-stm: add version 2.4.3 2014-03-31 21:39:24 +02:00
Peter Simons 372e6f7f83 haskell-conduit-extra: add version 1.0.0 2014-03-31 21:39:24 +02:00
Peter Simons 9109cff1a1 haskell-streaming-commons: add version 0.1.0.2 2014-03-31 21:39:24 +02:00
Peter Simons 4a70bdf5e4 haskell-mtl: update to version 2.1.3.1 2014-03-31 21:39:24 +02:00
Domen Kožar c6ebbd29e5 add v4l2loopback: a kernel module to create V4L2 loopback devices 2014-03-31 20:02:53 +02:00
Austin Seipp 3ef0a880cb p0f: version 3.06b
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-03-31 11:22:50 -05:00
Austin Seipp cff179f829 hashcat: version 0.47
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-03-31 10:56:02 -05:00
Oliver Charles 8d965e3a47 haskellPackages.thDesugar: Update to 1.3.1 2014-03-31 11:55:17 +01:00
Eelco Dolstra 6167da54ea gpsd: Disable the tests
They bind to TCP ports and fail randomly:

http://hydra.nixos.org/build/9905518
2014-03-31 11:23:44 +02:00
Vladimir Kirillov f733eb899a remove the unbreak-syntax-highlight hack 2014-03-31 15:52:44 +08:00
Vladimir Kirillov 46ef4f6910 import thumbor and dependencies:
derpconf, backports_ssl_match_hostname_3_4_0_2, thumborPexif,
upgrade tornado to 3.2 (that contains security fixes)
2014-03-31 15:41:55 +08:00
Shea Levy 46e44ae7c4 haskell-mime-mail: Update, set sendmail to be found in PATH
See snoyberg/mime-mail#23
2014-03-31 03:35:13 -04:00
Shea Levy 4dd4f85430 Revert "haskell-smtps-gmail: update to version 1.1.0"
The smtps-gmail upgrade causes a build failure:

/nix/store/8h8mravvbcm09rhybxq7hi4459lkssg8-stdenv/setup: line 937: ./Setup: No such file or directory

This reverts commit a7c80c11e5.
2014-03-31 02:51:14 -04:00
Sander van der Burg a4684466a3 Merge pull request #2078 from chrisfarms/disnix/hydrasourceurls
Fix disnix related sources that were referencing dead hydra tarball
2014-03-31 00:48:20 +02:00
Peter Simons e825c6ac38 haskell-cake3: add version 0.3.0.1 2014-03-30 23:26:21 +02:00
Peter Simons aa86cc8a7c haskell-monadloc: add version 0.7.1 2014-03-30 23:26:11 +02:00
Chris Farmiloe 5c2ef1353c Update disnix related sources that were referencing dead hydra tarball builds 2014-03-30 21:38:49 +02:00
Carles Pagès 048a7e9d9c minecraft: update to latest launcher
I changed the versioning scheme to the latest launcher date, which is
independent of minecraft version and is actually what the expression gets.
2014-03-30 19:34:33 +02:00
Eelco Dolstra 0fdd641b21 Ensure that slim's theme applies to slimlock 2014-03-30 19:33:28 +02:00
Carles Pagès 5d098e8206 qpid-cpp: update to 0.26
Also, remove a workaround that's no longer needed.
2014-03-30 19:23:01 +02:00
Carles Pagès b372ce598a SDL2: update to 2.0.3 2014-03-30 18:32:22 +02:00
Carles Pagès 66d8a9c725 yafc: update to 1.3.2 2014-03-30 18:32:14 +02:00
Evgeny Egorochkin d084be9965 perlPackages.HTMLTiny: update from 1.03 to 1.05 2014-03-30 19:29:17 +03:00
Evgeny Egorochkin c53ae9b462 spaceFM: update from 0.9.2 to 0.9.4 2014-03-30 19:27:19 +03:00
Evgeny Egorochkin 6f4a62e9e4 youtubeDL: update from 2014.03.25.1 to 2014.03.30.1 2014-03-30 19:24:21 +03:00
Eelco Dolstra aaf01268ff Revert "slim: remove duplicate code"
This reverts commit f7d5e83abb.  It
breaks the Firefox and Xfce tests:

  in job ‘tests.firefox.x86_64-linux’:
  cannot coerce a boolean to a string

  in job ‘tests.xfce.x86_64-linux’:
  infinite recursion encountered
2014-03-30 17:06:01 +02:00
Peter Simons c394d4079d xmonad: fix build with ghc 7.8.1 2014-03-30 16:46:02 +02:00
Joachim Schiele b894dfffb3 added mtpfs to mount MTP devices via usb using FUSE 2014-03-30 13:00:25 +02:00
Vladimir Kirillov bad9de86b6 buildLocalCabal: do not set LANG/LOCALE_ARCHIVE on non-linux machines 2014-03-30 14:51:36 +08:00
Vladimir Kirillov 9186f0b5dd haskell: import persistent-mysql 1.3.0.2 2014-03-30 14:51:36 +08:00
Vladimir Kirillov 390a4b9164 haskell: import git-date 0.2.1 2014-03-30 14:51:36 +08:00
Shea Levy 7612159c06 Merge branch 'mps-fix' of git://github.com/thoughtpolice/nixpkgs
mps: broken on Darwin unfortunately
2014-03-29 22:46:07 -04:00
Rickard Nilsson 61ecf919e1 New package: wal-e
A Postgres WAL-shipping disaster recovery and replication toolkit
2014-03-30 04:34:38 +02:00
Shea Levy fd5d6044c0 Merge branch 'printrun' of git://github.com/ambrop72/nixpkgs
Add Printrun.
2014-03-29 22:19:29 -04:00
Shea Levy 96c3279263 Merge branch 'nvidia-fix' of git://github.com/ambrop72/nixpkgs
nvidia-x11: Fix build with kernel 3.13
2014-03-29 22:17:23 -04:00
Shea Levy 0553bdd148 Merge branch 'cb1cat' of git://github.com/thoughtpolice/nixpkgs
cb0cat is now cb1cat
2014-03-29 22:16:14 -04:00
Shea Levy 84788e75ca Merge branch 'ssdeep' of git://github.com/thoughtpolice/nixpkgs
ssdeep: Fix darwin build
2014-03-29 22:15:26 -04:00
Austin Seipp c038133721 fsharp: fix missing --replace argument
This should fix the Hydra build.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-03-29 19:55:12 -05:00
Austin Seipp c234740115 mps: broken on Darwin unfortunately
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-03-29 19:30:13 -05:00
Austin Seipp 81b4248d8d ssdeep: Fix darwin build
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-03-29 19:28:39 -05:00
Austin Seipp 925cce304f cb0cat is now cb1cat
Submissions for CAESAR are now over, so CBEAMr0 has become CBEAMr1 with
some minor alterations.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-03-29 18:48:16 -05:00
ambrop7@gmail.com bc2984d77d nvidia-x11: Fix build with kernel 3.13. 2014-03-29 23:35:14 +01:00
ambrop7@gmail.com 9a2758f98d Add Printrun. 2014-03-29 23:17:56 +01:00
ambrop7@gmail.com 090ee41e6b gvfs: Fix build with lightWeight=false (close #2068)
Needed for SMB backend.
2014-03-29 21:51:16 +01:00
Emery Hemingway 6c77690b28 rippled: initial pkg and module expressions
rippled is the Ripple P2P payment network reference server
https://ripple.com
2014-03-29 15:31:37 -04:00
Vladimír Čunát e50a76a469 openssh: fix CVE-2014-2653 by a Debian patch 2014-03-29 20:24:13 +01:00
Vladimír Čunát 22c04a2fe1 shishi: minor update to fix build with new libtasn1 2014-03-29 19:44:30 +01:00
Vladimír Čunát a7980953d2 libtasn1: major update 2.14 -> 3.4 2014-03-29 18:38:46 +01:00
Vladimír Čunát 5d26659bb9 nixUnstable: update to avoid the funny --c||es bug :-) 2014-03-29 18:38:46 +01:00
宋文武 5668a70a49 widelands: update to build-18 (close #2062)
@vcunat enabled parallelBuilding.
2014-03-29 18:38:46 +01:00
Bjørn Forsman b5bd583bb8 gcc-arm-embedded: add meta attributes 2014-03-29 18:28:41 +01:00
Shea Levy ee65278d54 Merge branch 'add_n-djbdns' of git://github.com/msackman/nixpkgs
Add New-DJBDNS
2014-03-29 13:06:08 -04:00
Shea Levy 1406226e46 Merge branch 'virtualbox' of git://github.com/Calrama/nixpkgs
Update Virtualbox and Guest Additions to 4.3.10, Oracle Extensions to
93012
2014-03-29 13:01:41 -04:00
ambrop7@gmail.com 8b94e22f33 Add gcc-arm-embedded.
These are packages for precompiled ARM microcontroller compilers from
https://launchpad.net/gcc-arm-embedded.

[Bjørn: modify commit message (add paragraph).]
2014-03-29 17:57:45 +01:00
Shea Levy ac68dc6dc6 Merge branch 'minecraft-server' of git://github.com/thoughtpolice/nixpkgs
nixpkgs: add Minecraft Server & a service module
2014-03-29 12:51:49 -04:00
Matthew Sackman be6a16ccbc Add New-DJBDNS 2014-03-29 16:47:23 +00:00
Vladimír Čunát 71982ab708 gtkmm3: update to fix build with gtk-3.12 2014-03-29 16:45:37 +01:00
Vladimír Čunát bd1abb36dd xorg: minor updates of xrandr and util-macros 2014-03-29 16:15:13 +01:00
Maxim Ivanov f949a71aac add libmsgpack C/C++ library (close #2059) 2014-03-29 14:38:53 +01:00
Moritz Maxeiner 99d639d750 Update Virtualbox and Guest Additions to 4.3.10, Oracle Extensions to 93012 2014-03-29 13:44:50 +01:00
Austin Seipp d60af7f34d minecraft-server: version 1.7.5
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-03-29 05:31:24 -05:00
Shea Levy f6ca125548 buildLocalCabal: Jailbreak by default.
buildLocalCabal is for local convenience anyway
2014-03-29 05:01:50 -04:00
Shea Levy 1eddec9f9b webkitgtk: Fix build with chroot 2014-03-29 05:00:12 -04:00
Michael Raskin 1eb42d9d79 Merge pull request #2048 from echaozh/master
add julia 0.2.1 release
2014-03-28 23:03:04 -07:00
Shea Levy 1d0eb1ae47 Merge branch 'pitivi' of git://github.com/iyzsong/nixpkgs
add pitivi, gstreamer powered non-linear video editor
2014-03-29 00:43:36 -04:00
Shea Levy 4428ed66a2 Merge branch 'webkit' of git://github.com/iyzsong/nixpkgs
webkit: update to 2.4.0, add gtk2 version
2014-03-29 00:41:34 -04:00
Shea Levy 1aa5589eef Merge branch 'virtualbox' of git://github.com/Calrama/nixpkgs
Update VirtualBox (and implicitly VirtualBox Guest Additions) to 4.3.6
and Oracle VM VirtualBox Extension Pack to 91406

Conflicts due to minor upgrade in the mean time

Conflicts:
	nixos/modules/virtualisation/virtualbox-guest.nix
	pkgs/applications/virtualization/virtualbox/default.nix
	pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
2014-03-29 00:23:54 -04:00
Shea Levy 63f97fe9db Merge branch 'slim_fix' of git://github.com/jagajaga/nixpkgs
add normal theme support for slim and slimlock
2014-03-29 00:17:52 -04:00
Shea Levy a0a135d5ef Merge branch 'z3' of git://github.com/thoughtpolice/nixpkgs
z3: version 4.3.1
2014-03-28 23:54:43 -04:00
Shea Levy 7cebcb995d Merge branch 'cache.pcscd' of git://github.com/wkennington/nixpkgs
Update Smartcard Utils + Fix Daemon Expression
2014-03-28 23:45:00 -04:00
Shea Levy fff798b018 Revert "ccid: Update from 1.4.14 -> 1.4.15"
ccid was already updated in master

This reverts commit a7077973a5.
2014-03-28 23:43:37 -04:00
Shea Levy 701cb6b099 Merge branch 'nixos/containers/fix1' of git://github.com/offlinehacker/nixpkgs
nixos: fix linux containers (systemd-nspawn, lxc, lxc-libvirt)
2014-03-28 23:39:01 -04:00
Shea Levy f3e9e3dea5 Merge branch 'u/icedtea' of git://github.com/wizeman/nixpkgs
icedtea7, icedtea7_web: New packages
2014-03-28 23:25:25 -04:00
Shea Levy e0341475dc Merge branch 'master' of git://github.com/fmap/nixpkgs
Add Mnemosyne 2.2.1
2014-03-28 23:09:25 -04:00
Shea Levy 269dc17329 Merge branch 'bsdiff' of git://github.com/thoughtpolice/nixpkgs
bsdiff: adopt and clean up
2014-03-28 23:08:32 -04:00
Shea Levy 8a15cfdaec Merge branch 'mps' of git://github.com/thoughtpolice/nixpkgs
Add mps 1.113.0, fix usage of Sleepycat license
2014-03-28 23:03:20 -04:00
Shea Levy 35165063a7 Merge branch 'clang-fix-fsanitize' of git://github.com/redbaron/nixpkgs
Fix -fsanitize=... options for clang
2014-03-28 21:58:56 -04:00
Shea Levy b574394d70 Merge branch 'dwb-update' of git://github.com/pSub/nixpkgs
Updated dwb to latest revision
2014-03-28 21:42:51 -04:00
Shea Levy 23fee1cd78 Merge branch 'shellinabox-fix' of git://github.com/grwlf/nixpkgs
shellinabox: unhardcode /bin/login, apply vt100 '-' fixup
2014-03-28 21:38:30 -04:00
Shea Levy 1927e59308 Merge branch 'texlive-bump' of git://github.com/jacobhinkle/nixpkgs
Bump texlive download versions *0215->*0314
2014-03-28 21:36:25 -04:00
Shea Levy e1a72c00ce Merge branch 'mysql-5.5.37' of git://github.com/proger/nixpkgs
mysql upgrade to 5.5.37
2014-03-28 21:13:38 -04:00
Austin Seipp 960690e931 bsdiff: adopt and clean up
Bonus: simpler build, and should fix the build of bsdiff for Darwin
(patch taken from homebrew).

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-03-28 18:52:37 -05:00
Jacob Hinkle 65727f92e4 Bump texlive download versions *0215->*0314 2014-03-28 15:56:56 -06:00
Eelco Dolstra 98c3caed93 nvidia-x11: Update to 331.49 2014-03-28 16:43:56 +01:00
Sander van der Burg 7c2d4be437 deepmerge: Add nodejs package 2014-03-28 15:17:17 +01:00
Sergey Mironov 0f2d7fa6f6 shellinabox: unhardcode /bin/login, apply vt100 '-' fixup 2014-03-28 14:58:10 +04:00
Zhang Yichao 10511b4712 add julia 0.2.1 release 2014-03-28 18:39:26 +08:00
Pascal Wittmann df2e5fc47a Updated dwb to latest revision 2014-03-28 10:30:36 +01:00
Vladimir Kirillov 1aabffdea2 mysql upgrade to 5.5.37 2014-03-28 11:12:20 +08:00
Peter Simons 812ece044a haskell-DAV: jailbreak to fix build with recent versions of xml-conduit 2014-03-27 23:23:22 +01:00
Peter Simons feed777cf2 haskell-language-javascript: remove pre-generated lexer and parsers to fix the build with GHC 7.8.1
https://github.com/alanz/language-javascript/issues/26
2014-03-27 23:23:22 +01:00
Peter Simons 4c8ea71d64 haskell-zlib-bindings: update to version 0.1.1.5 2014-03-27 23:23:22 +01:00
Peter Simons 3c7eb54a80 haskell-yesod: update to version 1.2.5.1 2014-03-27 23:23:22 +01:00
Peter Simons 17d4b3da50 haskell-yesod-static: update to version 1.2.2.3 2014-03-27 23:23:22 +01:00
Peter Simons cbca108acd haskell-yesod-core: update to version 1.2.9.1 2014-03-27 23:23:22 +01:00
Peter Simons a69ae620dc haskell-yesod-auth: update to version 1.3.0.1 2014-03-27 23:23:21 +01:00
Peter Simons 3de1945481 haskell-xml-hamlet: update to version 0.4.0.7 2014-03-27 23:23:21 +01:00
Peter Simons cb55852ff2 haskell-xml-conduit: update to version 1.2.0 2014-03-27 23:23:21 +01:00
Peter Simons 487a6f0971 haskell-wai-app-static: update to version 2.0.1 2014-03-27 23:23:21 +01:00
Peter Simons 0af0e1f5d6 haskell-unbounded-delays: update to version 0.1.0.7 2014-03-27 23:23:21 +01:00
Peter Simons c5d967f781 haskell-text-stream-decode: update to version 0.1.0.5 2014-03-27 23:23:21 +01:00
Peter Simons a7c80c11e5 haskell-smtps-gmail: update to version 1.1.0 2014-03-27 23:23:21 +01:00
Peter Simons 94fe963dd3 haskell-recaptcha: update to version 0.1.0.2 2014-03-27 23:23:21 +01:00
Peter Simons 8470a695ed haskell-project-template: update to version 0.1.4 2014-03-27 23:23:21 +01:00
Peter Simons 14bb8fae6d haskell-profunctors: update to version 4.0.3 2014-03-27 23:23:21 +01:00
Peter Simons 3d00b619ca haskell-linear: update to version 1.10 2014-03-27 23:23:21 +01:00
Peter Simons f0e51dd0d6 haskell-language-c-quote: update to version 0.7.7 2014-03-27 23:23:21 +01:00
Peter Simons bc1bfe32e3 haskell-http-reverse-proxy: update to version 0.3.1.2 2014-03-27 23:23:21 +01:00
Peter Simons ef9d804a32 haskell-http-client: update to version 0.2.2.4 2014-03-27 23:23:21 +01:00
Peter Simons 29bb48bc28 haskell-html-conduit: update to version 1.1.0.3 2014-03-27 23:23:21 +01:00
Peter Simons b4742af957 haskell-hakyll: update to version 4.5.0.0 2014-03-27 23:23:21 +01:00
Peter Simons 9541f82ccc haskell-failure: update to version 0.2.0.2 2014-03-27 23:23:21 +01:00
Peter Simons a330950b00 haskell-cryptohash: update to version 0.11.4 2014-03-27 23:23:21 +01:00
Peter Simons 43de5f42c7 haskell-conduit-combinators: update to version 0.2.3.1 2014-03-27 23:23:21 +01:00
Peter Simons 135c27d70a haskell-authenticate: update to version 1.3.2.7 2014-03-27 23:23:20 +01:00
Peter Simons d5a5c32775 haskell-attempt: update to version 0.4.0.1 2014-03-27 23:23:20 +01:00
Peter Simons aaebdb7b1e haskell-keter: update to version 1.2.1 2014-03-27 23:23:20 +01:00
Vladimír Čunát 835f9e5f19 libgsf: maintenance update to fix build with new glib 2014-03-27 22:47:29 +01:00
Thomas Tuegel 5554d9c688 Add zotero 4.0.19 (close #2043)
@vcunat simplied the expression a little.
2014-03-27 22:42:47 +01:00
Vladimír Čunát 9ddc57cbea xorg.xf86-video-vmware: minor update
Patch no longer needed to build.
2014-03-27 22:14:51 +01:00
Vladimír Čunát 576e9289dd Merge master into x-updates 2014-03-27 21:34:06 +01:00
Vladimír Čunát 9bde84a75d fix evaluation since 34301c8 2014-03-27 21:33:25 +01:00
Vladimír Čunát abda7ec36f liferea: maintenance update 2014-03-27 21:33:25 +01:00
Vladimír Čunát 151ac5ab9e gtk+3 core stack: update to 3.12 2014-03-27 20:53:50 +01:00
Georges Dubus b13a33550a silver-searcher: update to 0.21.0 2014-03-27 17:57:02 +01:00
Ricardo M. Correia a541350cb3 libvirt: Assume maintainership 2014-03-27 14:39:05 +01:00
Ricardo M. Correia 3078cf3e75 libvirt: Add git repository to meta attributes 2014-03-27 14:39:05 +01:00
Ricardo M. Correia 56adfd34fc libvirt: Add support for macvtap and VEPA 2014-03-27 14:39:04 +01:00
Peter Simons 61efc76a63 haskell-c2hs: jailbreak to fix build with recent versions of 'shelly'
Also, disable the test suite because of <https://github.com/haskell/c2hs/issues/67>.
2014-03-27 13:13:14 +01:00
Peter Simons 93c973f45f haskell-temporary: jailbreak to fix build with recent versions of 'exceptions' 2014-03-27 13:13:14 +01:00
Peter Simons e5725d35c1 haskell-bmp: require a recent version of 'binary' 2014-03-27 13:13:14 +01:00
Peter Simons 088a652eb4 haskell-ghc-events: jailbreak to fix build with GHC 7.8.1 2014-03-27 13:13:08 +01:00
Peter Simons 4a4439fd14 haskell-filestore: jailbreak to fix build with GHC 7.8.1 2014-03-27 13:12:54 +01:00
Peter Simons a46352aad1 haskell-bmp: use version 1.2.5.2 on all platforms 2014-03-27 13:12:54 +01:00
Peter Simons ae2cb475c9 haskell-cpphs: update to version 1.18.4 2014-03-27 13:12:54 +01:00
Peter Simons b692096f9d haskell-timeplot: update to version 1.0.24 2014-03-27 13:12:54 +01:00
Peter Simons b27ddc3d05 haskell-HaRe: update to version 0.7.2.0 2014-03-27 13:12:54 +01:00
Peter Simons 0312c15071 haskell-zlib-bindings: update to version 0.1.1.4 2014-03-27 13:12:54 +01:00
Peter Simons 29187bc16a haskell-wxdirect: update to version 0.90.1.1 2014-03-27 13:12:54 +01:00
Peter Simons c53463dcee haskell-wxcore: update to version 0.90.1.1 2014-03-27 13:12:53 +01:00
Peter Simons bbcf732015 haskell-wxc: update to version 0.90.1.1 2014-03-27 13:12:53 +01:00
Peter Simons d1fc054b02 haskell-warp: update to version 2.1.3 2014-03-27 13:12:53 +01:00
Peter Simons 4246511556 haskell-wai-middleware-static: update to version 0.5.0.0 2014-03-27 13:12:53 +01:00
Peter Simons c8b03742d5 haskell-stm-conduit: update to version 2.3.0 2014-03-27 13:12:53 +01:00
Peter Simons a566d81b41 haskell-shelly: update to version 1.5.2 2014-03-27 13:12:53 +01:00
Peter Simons 94f0403692 haskell-shakespeare-css: update to version 1.0.7.3 2014-03-27 13:12:53 +01:00
Peter Simons 0f0755da8c haskell-semigroupoids: update to version 4.0.1 2014-03-27 13:12:53 +01:00
Peter Simons 1aa1cee4f4 haskell-lens: update to version 4.1.2 2014-03-27 13:12:53 +01:00
Peter Simons db09633e7b haskell-intervals: update to version 0.4.2 2014-03-27 13:12:53 +01:00
Peter Simons 8282fb8327 haskell-hybrid-vectors: update to version 0.1.2 2014-03-27 13:12:53 +01:00
Peter Simons b1cbcea6d2 haskell-hsimport: update to version 0.3 2014-03-27 13:12:53 +01:00
Peter Simons e61c57686b haskell-hoogle: update to version 4.2.30 2014-03-27 13:12:53 +01:00
Peter Simons a1060da394 haskell-ghcjs-dom: update to version 0.0.7 2014-03-27 13:12:53 +01:00
Peter Simons 45625d48a1 haskell-generic-deriving: update to version 1.6.3 2014-03-27 13:12:52 +01:00
Peter Simons 11dc7a8e2c haskell-free: update to version 4.6.1 2014-03-27 13:12:52 +01:00
Peter Simons 76cf6b026a haskell-doctest: update to version 0.9.11 2014-03-27 13:12:52 +01:00
Peter Simons 0a6e61033a haskell-dlist: update to version 0.7.0.1 2014-03-27 13:12:52 +01:00
Peter Simons 81f596a32b haskell-distributive: update to version 0.4.1 2014-03-27 13:12:52 +01:00
Peter Simons e3309447a9 haskell-data-lens-template: update to version 2.1.8 2014-03-27 13:12:52 +01:00
Peter Simons 426f03d965 haskell-conduit: update to version 1.0.17.1 2014-03-27 13:12:52 +01:00
Peter Simons 5b726ef6ba haskell-comonad: update to version 4.0.1 2014-03-27 13:12:52 +01:00
Peter Simons dcc028ba74 haskell-c2hs: update to version 0.16.6 2014-03-27 13:12:52 +01:00
Peter Simons c72248808c haskell-adjunctions: update to version 4.0.3 2014-03-27 13:12:52 +01:00
Peter Simons 5569741808 haskell-JuicyPixels: update to version 3.1.5 2014-03-27 13:12:52 +01:00
Peter Simons 0f86e37b6c haskell-Elm: update to version 0.12 2014-03-27 13:12:52 +01:00
Peter Simons 27ebc33d65 haskell-elm-server: update to version 0.11 2014-03-27 13:12:52 +01:00
Peter Simons 7f9558896f haskell-tls: update to version 1.2.6 2014-03-27 13:12:51 +01:00
Peter Simons da7fe3fe8a haskell-QuickCheck: update to version 2.7.3 2014-03-27 13:12:51 +01:00
Peter Simons 3551e2ee06 haskell-quickcheck-instances: re-generate with cabal2nix 2014-03-27 13:12:51 +01:00
Ricardo M. Correia 342fc9c207 go: Add myself as maintainer to receive Hydra notifications 2014-03-27 12:37:18 +01:00
Ricardo M. Correia e39b70dd79 go: Update to 1.2.1 2014-03-27 12:37:18 +01:00
Mathijs Kwik 5943227a26 neoload: fix for the new jdk/jre location 2014-03-27 11:29:26 +01:00
Peter Simons 284ea5859b BNFC: fix build with GHC 7.8.1 2014-03-27 10:48:32 +01:00