3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

41871 commits

Author SHA1 Message Date
aszlig 5dd14a1059
nixos/phpfpm: Add option to set PHP package.
This allows to easily override the used PHP package, especially for
example if you want to use PHP 5.5 or if you want to override the
derivation.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-04-10 07:52:26 +02:00
Shea Levy 9dcffe951d Merge branch 'cjdns' of git://github.com/ehmry/nixpkgs
cjdns: update to 20130303
2014-04-09 20:34:32 -04:00
Domen Kožar d912cdf264 gstreamer-1.0: use different function name for env hook than gstreamer-0.10 2014-04-09 23:04:57 +00:00
Ricardo M. Correia 5dfc6584a5 grsecurity: Update stable patch from 3.0-3.2.56-201404062126 -> 3.0-3.2.57-201404091758 2014-04-10 00:37:33 +02:00
Ricardo M. Correia c50abd0e13 linux: Update to 3.2.57 2014-04-10 00:37:33 +02:00
Ricardo M. Correia 76551abef2 icedtea7_web: Fix configure phase not finding bash 2014-04-10 00:15:53 +02:00
Ricardo M. Correia f6799983bd icedtea7_web: Update from 1.4.2 -> 1.5
Fixes CVE-2012-4540.
2014-04-10 00:15:53 +02:00
Ricardo M. Correia 442e1bbaab icedtea7: Fix building v2.4.6 by backporting fix
See http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1726
2014-04-10 00:15:47 +02:00
Ricardo M. Correia a644b7ba60 icedtea7: Update from 2.4.5 -> 2.4.6 2014-04-10 00:14:44 +02:00
Ricardo M. Correia 8fdf8984d2 chromium: Update stable channel from 33.0.1750.152 -> 34.0.1847.116 2014-04-10 00:14:44 +02:00
Bjørn Forsman e856584e1a nixos/jenkins-service: fix 'group' option documentation
Both for master and slave.
2014-04-09 21:52:46 +02:00
Rob Vermaas 1e9dee1854 Merge pull request #2193 from aristidb/master
add back old version of flex for grub2
2014-04-09 20:53:55 +02:00
Aristid Breitkreuz 5d12cbf1c2 add back old version of flex for grub2 2014-04-09 20:42:08 +02:00
Domen Kožar d54a805281 gnome3: downgrade 3.12 packages to 3.10 2014-04-09 18:56:54 +02:00
Emery Hemingway 316e809ff8 cjdns: update to 20130303
build system is now nodejs based
new nixos module to start cjdns
2014-04-09 10:30:57 -04:00
Domen Kožar e5e27cfd64 Merge pull request #2153 from lethalman/gnome3
accounts-daemon service, fix gnome-shell, add libgnomekbd, musicbrainz5, sushi, gnome-contacts
2014-04-09 15:01:17 +02:00
Peter Simons 1bf2bd612c haskell-HTF: update to version 0.11.3.0 2014-04-09 13:33:30 +02:00
Peter Simons 011f22e49b haskell-yesod-core: update to version 1.2.11.1 2014-04-09 13:33:30 +02:00
Peter Simons a138d54df2 haskell-websockets: update to version 0.8.2.1 2014-04-09 13:33:30 +02:00
Peter Simons cde2e2839a haskell-warp: update to version 2.1.4 2014-04-09 13:33:30 +02:00
Peter Simons b67feb0990 haskell-warp-tls: update to version 2.0.3.3 2014-04-09 13:33:30 +02:00
Peter Simons 0a74f6d3e7 haskell-wai: update to version 2.1.0.2 2014-04-09 13:33:30 +02:00
Peter Simons 2986e7cb24 haskell-streaming-commons: update to version 0.1.1 2014-04-09 13:33:30 +02:00
Peter Simons f063e5e592 haskell-network-simple: update to version 0.3.1 2014-04-09 13:33:30 +02:00
Peter Simons 7fdd6b1880 haskell-monad-logger: update to version 0.3.5.1 2014-04-09 13:33:30 +02:00
Peter Simons b34cc2cd2e haskell-mime-types: update to version 0.1.0.4 2014-04-09 13:33:30 +02:00
Peter Simons 346f6037c0 haskell-hashed-storage: update to version 0.5.11 2014-04-09 13:33:29 +02:00
Peter Simons 51c6724fa3 haskell-esqueleto: update to version 1.3.10 2014-04-09 13:33:29 +02:00
Peter Simons 7ff62b5ddc haskell-direct-sqlite: update to version 2.3.12 2014-04-09 13:33:29 +02:00
Peter Simons 8cd9a5145b haskell-scotty: update to version 0.7.2 2014-04-09 13:33:29 +02:00
Oliver Charles 18039f52bb Merge pull request #2181 from fmap/stuff
Derivations for HandsomeSoup and hxt-xpath (Haskell.)
2014-04-09 12:04:55 +01:00
Peter Simons fd9ea0f639 ltrace: fix build with latest gcc (by disabling -Werror) 2014-04-09 12:41:11 +02:00
Peter Simons 2d4919dbb4 apacheHttpd_2_4: update from 2.4.7 to 2.4.9 2014-04-09 12:41:11 +02:00
Peter Simons 740c502a77 swiProlog: update from 6.6.2 to 6.6.3 2014-04-09 12:41:11 +02:00
Peter Simons 2cc462eb11 lxc: update from 1.0.1 to 1.0.3 2014-04-09 12:41:10 +02:00
Peter Simons b7d0a9a614 ltrace: update from 0.5.3 to 0.7.3 2014-04-09 12:41:10 +02:00
Peter Simons 9def193598 libsigcxx: update from 2.2.11 to 2.3.1 2014-04-09 12:41:10 +02:00
Peter Simons 1682bde4e0 gitAndTools.svn2git: update from 2.2.2 to 2.2.5 2014-04-09 12:41:10 +02:00
Peter Simons c244d6e1b8 gitAndTools.stgit: update from 0.16 to 0.17.1 2014-04-09 12:41:10 +02:00
Peter Simons 44e8fe67d0 flex: update from 2.5.35 to 2.5.39 2014-04-09 12:41:10 +02:00
Peter Simons 37f327acfd fail2ban: update from 0.8.12 to 0.8.13 2014-04-09 12:41:10 +02:00
Peter Simons 715a61ad7a docbook5_xsl: update from 1.75.2 to 1.78.1 2014-04-09 12:41:10 +02:00
Peter Simons 30aa995a42 busybox: update from 1.21.1 to 1.22.1 2014-04-09 12:41:10 +02:00
Peter Simons cf5ac3bded zsh: update from 5.0.2 to 5.0.5 2014-04-09 12:41:10 +02:00
vi 09e245b3ab Derivations for HandsomeSoup and hxt-xpath (Haskell.) 2014-04-09 18:36:49 +08:00
Peter Simons 9b4e914dac Merge pull request #2171 from ocharles/remove-lens-aeson
Remove haskellPackages.lensAeson
2014-04-09 11:53:07 +02:00
Domen Kožar d2efe82eaa munin: 2.0.19 -> 2.0.20 2014-04-09 11:29:47 +02:00
Mathijs Kwik fccf059216 Merge pull request #2159 from lethalman/gst-no-faac
gst-plugins-bad: disable faac by default because it's unfree
2014-04-09 06:47:16 +02:00
Austin Seipp 29c0d0047f luajit: adopt, upgrade, optimize
- Build the 'amalgamation' by default - more RAM needed to build, but
   better overall performance
 - Upgrade to version 2.0.3
 - Adopt as maintainer

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-04-08 21:16:33 -05:00
Austin Seipp 692ee73af1 libseccomp: version 2.1.1
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-04-08 19:37:47 -05:00