mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-24 14:41:17 +00:00
Code Issues Wiki Activity
45974 commits 233 branches 124 tags 7 GiB
Commit graph

39233 commits

Author SHA1 Message Date
Paul Colomiets f12633c628 my-env: Support for running command directly by load-env-xxx script 
First I don't think there is a reason to run shell as a child of
load-env-xxx script and not to just exec into it.

Also it's often useful to just run a command inside the environment
load-env-xxx command --args

Closes #3254
 2014-07-16 23:09:49 +02:00
Eelco Dolstra 94db68d283 Move jdk -> oraclejdk 2014-07-16 18:35:35 +02:00
Eelco Dolstra c39bee0c0f oraclejdk: Export the same setup hooks as openjdk 2014-07-16 18:34:14 +02:00
Eelco Dolstra 3c58261c67 Fix setting $JAVA_HOME 2014-07-16 18:34:14 +02:00
Eelco Dolstra 63e2ec2bb8 oraclejdk: Make version consistent with openjdk 2014-07-16 18:34:14 +02:00
Eelco Dolstra 0681742627 oraclejdk: Include "oracle" in name 2014-07-16 18:34:14 +02:00
Peter Simons 75bbad8abe Merge pull request #3285 from ehmry/polipo 
Polipo
 2014-07-16 18:29:11 +02:00
Eelco Dolstra 396a55ac18 oraclejdk: Update to 7u65 2014-07-16 17:52:46 +02:00
Peter Simons 29c8fdc941 Re-generate Haskell expressions with cabal2nix. 2014-07-16 12:54:59 +02:00
Peter Simons 58d52c5f76 Re-generate Haskell expressions with cabal2nix. 2014-07-16 12:51:43 +02:00
Peter Simons ea4767221f haskell-cabal2nix: update to version 1.66 2014-07-16 12:51:43 +02:00
Bjørn Forsman 28cb0f58c4 linux: only enable CONFIG_NFS_SWAP for v3.6+ kernels 
Linux v3.6 is the earliest version with CONFIG_NFS_SWAP support. This
change unbreaks NixOS tests for older kernels.
 2014-07-16 12:13:06 +02:00
Peter Simons 9d457ec228 Merge pull request #3282 from aycanirican/jmacro 
Added haskelPackages.jmacro-*
 2014-07-16 12:10:51 +02:00
Peter Simons f0de2bd4a1 Re-generate Haskell expressions with cabal2nix. 2014-07-16 12:10:10 +02:00
Ian-Woo Kim 02d6445409 update hoodle-types 0.2.2 -> 0.3, hoodle-builder 0.2.2.0 -> 0.3, hoodle-parser 0.2.2 -> 0.3, hoodle-render 0.3.2 -> 0.4, hoodle-core 0.13.0.0 -> 0.14, and hoodle 0.2.2.1 -> 0.3 2014-07-16 12:10:10 +02:00
Ian-Woo Kim e8effb9c26 update coroutine-object 0.2 -> 0.3, xournal-parser 0.5.0.2 -> 0.5.0.3 2014-07-16 12:10:10 +02:00
Peter Simons 93464d88b0 Merge pull request #3293 from codygman/blaze-from-html 
blaze-from-html: add version 0.3.2.1
 2014-07-16 12:07:42 +02:00
Peter Simons 5ae5d00d18 Merge pull request #3294 from nilcons/haskellfixes 
Fix various Haskell packages for 7.8
 2014-07-16 12:07:14 +02:00
Peter Simons dde46a1445 Merge pull request #3297 from soenkehahn/master 
update haskell-taggy-lens to version 0.1.2
 2014-07-16 12:04:12 +02:00
Peter Simons 06e38776d4 Merge pull request #3298 from MP2E/hi_import 
Import the cabal new project template creator, "hi"
 2014-07-16 12:03:07 +02:00
Peter Simons 09af8c8afd Re-generate Haskell expressions with cabal2nix. 2014-07-16 11:58:51 +02:00
Rok Garbas dd6f29f88c Revert "Update titanium node package and others" 
This reverts commit 7dce55d0fd.
 2014-07-16 10:46:04 +01:00
Vladimír Čunát 18de3952b8 wpa_supplicant: update 2.1 -> 2.2, drop a patch 
Fixes #3238.
 2014-07-16 10:30:38 +02:00
Cray Elliott 90392f6233 Import the haskell cabal template creator, "hi" from Hackage 
note: depends on template
 2014-07-16 01:13:09 -07:00
Cray Elliott 0e3f66d051 import Haskell template library from Hackage 2014-07-16 01:12:58 -07:00
Oliver Charles 952f3f6e8b haskellPackages.ekgCarbon: New expression 2014-07-16 08:20:27 +01:00
Sönke Hahn 5d28cd9b18 update haskell-taggy-lens to version 0.1.2 2014-07-16 14:39:12 +08:00
John Wiegley 57e3fc341f haskell-djinn: corrections for darwin 2014-07-16 01:27:39 -05:00
John Wiegley d24df6e334 haskell-git-annex: corrections for darwin 2014-07-16 01:27:29 -05:00
Gergely Risko 51ef9caae5 Fix various Haskell packages for 7.8 2014-07-16 03:43:13 +02:00
Shea Levy e33525a139 Update haskell-simple-conduit 2014-07-15 21:36:36 -04:00
Cody Goodman 5ba2e544d2 blaze-from-html: add version 0.3.2.1 2014-07-15 20:16:31 -05:00
Shea Levy 9087d03190 Add haskell-simple-conduit 2014-07-15 20:41:58 -04:00
Eelco Dolstra 327c2061d1 blender: Don't use system openjpeg 
It was ignored anyway (instead using the internal openjpeg copy).
 2014-07-15 23:34:34 +02:00
Eelco Dolstra 12fb52b08a blender: Enable ocean modifier 2014-07-15 23:34:24 +02:00
Eelco Dolstra 457e539048 blender: Fix jackaudio dependency 2014-07-15 23:33:09 +02:00
Eelco Dolstra ae129f0ff5 fftw: Update to 3.3.4 2014-07-15 23:32:00 +02:00
Eelco Dolstra 2d8e880c82 blender: Update to 2.71 2014-07-15 23:31:55 +02:00
Pascal Wittmann 889b3f5f83 Merge pull request #3286 from wjlroe/elasticsearch-1.2.2 
elasticsearch: update to 1.2.2
 2014-07-15 20:13:50 +02:00
Pascal Wittmann 0aa6a9876f Merge pull request #3244 from ehmry/xscreensaver 
xscreensaver: update from 5.26 to 5.29
 2014-07-15 20:00:41 +02:00
Eelco Dolstra 6c0002ec8d nvidia-x11: Update to 340.24 2014-07-15 19:53:39 +02:00
Pascal Wittmann 96f5affca9 bgs: update from 0.5 to 0.6 2014-07-15 19:50:29 +02:00
William Roe 3af919fb08 elasticsearch: update to 1.2.2 2014-07-15 16:57:16 +01:00
Sander van der Burg a8e4abaf6f titaniumsdk: add version 3.3 SDK and update kitchensink example 2014-07-15 16:46:59 +02:00
Eelco Dolstra 1dc5e5fb8c dhcpcd: Update to 6.4.2 2014-07-15 16:23:47 +02:00
Emery Hemingway 0d781369c0 polipo: update to 1.1.1 2014-07-15 10:10:28 -04:00
Sander van der Burg bce5f2cf56 titaniumsdk: Bump to version 3.2.3 2014-07-15 16:05:25 +02:00
Sander van der Burg 7dce55d0fd Update titanium node package and others 2014-07-15 15:59:57 +02:00
Oliver Charles 0ee223e786 haskellPackages.engineIO: Update to 1.0.1 2014-07-15 14:58:31 +01:00
Ricardo M. Correia 85e444f4f8 linux: Enable NFSv4.1, v4.2 clients and swap on NFS 
I'm only enabling for kernels >= 3.11 to be conservative, because clients and
servers automatically negotiate and use the highest mutually supported version
by default, but only in kernel 3.11 server NFSv4.1 support actually became RFC
compliant.

I'm also adding support for swap on NFS, which is enabled by default on
Ubuntu kernels.
 2014-07-15 15:07:25 +02:00
Paul Colomiets ab2c7cfff7 vim: Add syntax on and set nocompatible by default 
Its what everybody wants in 2014. They are enabled by default both in
ubuntu and archlinux.
 2014-07-15 14:59:16 +02:00
Paul Colomiets e376e9731d vim: Update vim to 7.4.335 2014-07-15 14:59:16 +02:00
Paul Colomiets 5e99b0553c vim: Implement sourcing /etc/vimrc and /etc/vim/vimrc 2014-07-15 14:59:16 +02:00
Paul Colomiets abf19df497 Remove wrapVim 
I don't see a reason for having wrapVim function and vimWrapper and
vimHugeXWrapper packages. If you need a system vimrc, whats wrong with
``environment.etc."vimrc".text`` ?

Also strictly speaking ``vimHugeXWrapper`` didn't wrap, X-version
properly. I.e. running ``gvim`` have console vim version.
 2014-07-15 14:59:16 +02:00
Paul Colomiets 8d9ff87c14 Add several vim plugins 
Added are:
* ctrlp
* vim-a
* colorsamplerpack
* yankring
 2014-07-15 14:59:15 +02:00
Paul Colomiets 496d12958e Add automatic plugin activation for vim 2014-07-15 14:59:15 +02:00
Paul Colomiets 0ffcb718a2 Allow nix-env recurse into vimPlugins 2014-07-15 14:59:15 +02:00
Vladimír Čunát 0ef81572d8 Merge pull request #3263 from cstrahan/finalterm 
finalterm: New package
 2014-07-15 14:50:25 +02:00
Bjørn Forsman 4da81ca4f6 collectd: update meta attributes 
Don't repeat package name in description, add maintainer, ...
 2014-07-15 14:07:29 +02:00
Bjørn Forsman 3ba150db2f collectd: enable a bunch of plugins (by adding more deps) 
These are plugins that are internal to collectd; they are bundled in the
source archive. Without this, many of the collectd plugins advertised on
their homepage don't actually work, so I think we should add this.

This change increases the closure size from 129 MiB to 621 MiB. The size
of the collectd store path itself goes from 2 MiB to 2.9 MiB.

Users wanting a smaller closure size can set some (or all) of the
optional inputs to "null" using ".override".

List of new plugins:

  amqp
  apache
  ascent
  bind
  curl
  curl_json
  curl_xml
  dbi
  dns
  iptables
  libvirt
  lvm
  memcachec
  modbus
  mysql
  nginx
  notify_desktop
  pinba
  ping
  postgresql
  redis
  rrdcached
  rrdtool
  sensors
  sigrok
  varnish
  write_http
  write_redis
  write_riemann
 2014-07-15 14:07:29 +02:00
Bjørn Forsman 95636ec752 libmemcached: set meta.platforms 
And a more precise license (BSD => 3-clause BSD).
 2014-07-15 14:07:29 +02:00
Bjørn Forsman 7c951ede31 libmemcached: fix linking with libpthread 
Add patch to fix linking against libpthread (from Fedora).

https://bugzilla.redhat.com/show_bug.cgi?id=1037707
https://bugs.launchpad.net/libmemcached/+bug/1281907

This fixes (upcoming) libmemcached use in collectd, which currently
doesn't work because of link failure caused by missing "pthread_once"
symbol.
 2014-07-15 14:07:28 +02:00
Bjørn Forsman 9ff20ca43f libcredis: new package 
libcredis is a client library for Redis (key-value database).

(libcredis is an optional dependency of collectd.)

Homepage: https://code.google.com/p/credis/
 2014-07-15 14:07:28 +02:00
Eelco Dolstra ad477c77ff Revert "Set default kernel to 3.14" 
Go back to 3.12 pending resolution of #3214.

This reverts commit 8f33899dd2.
 2014-07-15 12:14:02 +02:00
Aycan iRiCAN b46fb708b7 Added jmacro-* 2014-07-15 13:08:39 +03:00
Oliver Charles 36dd91f0ab haskellPackages.digestiveFunctorsAeson: Update to 1.1.10 2014-07-15 10:57:16 +01:00
Eelco Dolstra 45d327a346 jdiskreport: Update to 1.4.1 2014-07-15 11:52:20 +02:00
Oliver Charles b4a6e873f6 Add expressions for Haskell engine-io, engine-io-snap and socket-io 2014-07-15 10:47:00 +01:00
Attila Sztupak 84939f1d14 vagrant: upgrade to 1.6.3 2014-07-15 01:53:07 +01:00
Aycan iRiCAN c0fe93fdb6 Added more rest packages. 2014-07-15 03:04:59 +03:00
Pascal Wittmann 5df645dd28 spin: update from 5.1.7 to 6.3.2, clean up and fetch sources as a different user agent (the default curl agent string is blocked) 2014-07-14 19:57:33 +02:00
William Roe a5783a977e Install all dirs for logstash 
Also only patch shebangs in bin/ directory
 2014-07-14 17:54:20 +01:00
Peter Simons 6a8ee6ad5c haskell-cabal2nix: update to version 1.65 2014-07-14 17:39:15 +02:00
Peter Simons f0103715a4 haskell-data-fix: re-generate with cabal2nix 2014-07-14 17:39:15 +02:00
Peter Simons 3bc0caaceb haskelld-shellish: re-generate with cabal2nix 2014-07-14 17:39:15 +02:00
Eelco Dolstra c49afcc84a nixUnstable: Update to 1.8pre3666_5bcb982 2014-07-14 17:34:40 +02:00
Peter Simons c521f3c4d6 haskell-imm: drop non-build related patches so that we ship the same API as Hackage does 2014-07-14 17:33:52 +02:00
Peter Simons 5bfb58a8a2 Re-generate Haskell packages with cabal2nix. 2014-07-14 17:33:52 +02:00
Peter Simons ccdfa99cc8 haskell-arithmoi: re-generate with cabal2nix 2014-07-14 17:33:52 +02:00
Peter Simons a840ff2029 haskell-force-layout: jailbreak to fix build with recent versions of lens 2014-07-14 17:33:52 +02:00
Peter Simons 58a084dd4c haskell-snap-server: jailbreak to fix build with HsOpenSSL 0.11 2014-07-14 17:33:52 +02:00
Peter Simons ab00da7caf Add "please don't edit" comment at the top of every auto-generated Haskell file. 2014-07-14 17:33:52 +02:00
Peter Simons 2b223c1349 haskell-scientific: update to version 0.3.3.0 2014-07-14 17:33:51 +02:00
Peter Simons 72c4fe7de2 haskell-unordered-containers: add version 0.2.5.0 2014-07-14 17:33:51 +02:00
Peter Simons b85bd47e9e haskell-cabal-bounds: update to version 0.7 2014-07-14 17:33:51 +02:00
Peter Simons 456596724d haskell-ghc-mod: update to version 4.1.5 2014-07-14 17:33:51 +02:00
Peter Simons 212037c3ca haskell-fclabels: update to version 2.0.2 2014-07-14 17:33:51 +02:00
Peter Simons 8131814430 haskell-esqueleto: update to version 1.4.4 2014-07-14 17:33:51 +02:00
Peter Simons e29a3fc8c1 haskell-encoding: update to version 0.7.0.2 2014-07-14 17:33:51 +02:00
Peter Simons c643150743 haskell-aws: update to version 0.9.1 2014-07-14 17:33:51 +02:00
Peter Simons a0c021bdc0 haskell-arithmoi: update to version 0.4.1.1 2014-07-14 17:33:51 +02:00
Peter Simons 2b902954ef haskell-MonadCatchIO-transformers: update to version 0.3.1.2 2014-07-14 17:33:51 +02:00
Peter Simons 0188d2150d haskell-HsOpenSSL: update to version 0.11 2014-07-14 17:33:51 +02:00
Peter Simons 56c569a9cd haskell-github-backup: update to version 1.20140707 2014-07-14 17:33:51 +02:00
Peter Simons af88d71b55 haskell-git-annex: update to version 5.20140709 2014-07-14 17:33:50 +02:00
Peter Simons 78c7ea2c8f haskell-ShellCheck: update to version 0.3.4 2014-07-14 17:33:50 +02:00
Peter Simons 64a19b6efa haskell-yesod: update to version 1.2.6.1 2014-07-14 17:33:50 +02:00
Peter Simons c8a7d72eac haskell-xml-hamlet: update to version 0.4.0.9 2014-07-14 17:33:50 +02:00
Peter Simons 65264cfb58 haskell-xml-conduit: update to version 1.2.0.3 2014-07-14 17:33:50 +02:00
Peter Simons fdd9577630 haskell-word8: update to version 0.1.0 2014-07-14 17:33:50 +02:00
Peter Simons 1fda72956b haskell-warp: update to version 3.0.0.4 2014-07-14 17:33:50 +02:00
Peter Simons d624214b02 haskell-wai-extra: update to version 3.0.1 2014-07-14 17:33:50 +02:00
Peter Simons 7322947f1b haskell-vector-algorithms: update to version 0.6.0.2 2014-07-14 17:33:50 +02:00
Peter Simons 241d660928 haskell-thyme: update to version 0.3.5.2 2014-07-14 17:33:50 +02:00
Peter Simons bd8330a921 haskell-th-desugar: update to version 1.4.2 2014-07-14 17:33:50 +02:00
Peter Simons 761af76574 haskell-streaming-commons: update to version 0.1.3.1 2014-07-14 17:33:50 +02:00
Peter Simons 6e03134d41 haskell-safe: update to version 0.3.6 2014-07-14 17:33:50 +02:00
Peter Simons 307763a835 haskell-postgresql-simple: update to version 0.4.3.0 2014-07-14 17:33:49 +02:00
Peter Simons 786f86e154 haskell-pipes-zlib: update to version 0.4.0.1 2014-07-14 17:33:49 +02:00
Peter Simons f4ec8b6b73 haskell-pipes-group: update to version 1.0.1 2014-07-14 17:33:49 +02:00
Peter Simons 470eb1008d haskell-pipes-aeson: update to version 0.4.1.1 2014-07-14 17:33:49 +02:00
Peter Simons 31c44be561 haskell-mono-traversable: update to version 0.6.0.4 2014-07-14 17:33:49 +02:00
Peter Simons 5a3d993f96 haskell-lens: update to version 4.3 2014-07-14 17:33:49 +02:00
Peter Simons 9207cd296f haskell-hspec: update to version 1.10.0.1 2014-07-14 17:33:49 +02:00
Peter Simons 889bf2b3ae haskell-hspec-expectations: update to version 0.6.0 2014-07-14 17:33:49 +02:00
Peter Simons 9013785c59 haskell-hoogle: update to version 4.2.34 2014-07-14 17:33:49 +02:00
Peter Simons d2c4ca1d5c haskell-hjsmin: update to version 0.1.4.7 2014-07-14 17:33:49 +02:00
Peter Simons 9a1496cc55 haskell-haskell-token-utils: update to version 0.0.0.3 2014-07-14 17:33:49 +02:00
Peter Simons 1a7e8597a9 haskell-gtk2hs-buildtools: update to version 0.13.0.0 2014-07-14 17:33:49 +02:00
Peter Simons be090a6372 happy: remove obsolete versions 1.18.8, 1.18.11, 1.19.2, and 1.19.3 2014-07-14 17:33:48 +02:00
Peter Simons b06e82fe7a haskell-defaults.nix: simplify references to the latest version of happy 2014-07-14 17:33:48 +02:00
Peter Simons 15d9034477 happy: update to version 1.19.4 2014-07-14 17:33:48 +02:00
Peter Simons f596ecbd70 Merge pull request #3271 from bennofs/haskell-data-fix 
haskell-data-fix: new package
 2014-07-14 17:27:51 +02:00
Peter Simons 714ee6f6a3 Merge pull request #3274 from MP2E/shellish_import 
Import the Haskell library shellish 0.1.3 from Cabal
 2014-07-14 17:26:03 +02:00
Shea Levy b57bc220cc Merge branch 'master' of git://github.com/ip1981/nixpkgs 
Added quilt-0.63
 2014-07-14 10:26:39 -04:00
Pascal Wittmann 8c94b943de dvtm: update from 0.11 to 0.12 2014-07-14 15:40:09 +02:00
Igor Pashev 26f47ba388 Fixed main Savannah mirror directory 2014-07-14 15:39:08 +02:00
Igor Pashev a95e65da60 Added quilt-0.63 2014-07-14 15:35:27 +02:00
Aycan iRiCAN d3f763696d Added Rest For Haskell and dependencies (rest-core, rest-types, rest-snap etc...) 2014-07-14 15:52:43 +03:00
Cray Elliott a1a9f3f14a nvidia legacy 304xx driver updated to .123 point release 
among other things, fixes compilation with Linux 3.14
 2014-07-14 14:50:01 +02:00
Ricardo M. Correia dd41c19ab1 flashplayer: Update from 11.2.202.378 -> 11.2.202.394 2014-07-14 14:36:35 +02:00
Eelco Dolstra 1245ca3ff7 debian: Update to 7.6 2014-07-14 14:35:09 +02:00
Cray Elliott 9f66dafa29 Import the Haskell library shellish 0.1.3 from Cabal 2014-07-14 05:01:54 -07:00
Peter Simons d2e731e111 Add "please don't edit" comment at the top of every auto-generated Haskell file. 2014-07-14 13:21:41 +02:00
Oliver Charles 7c81a3609e pythonPackages.logster: New expression 2014-07-14 11:03:51 +01:00
John Wiegley 312ff15b29 haskell-ghc-mod: revert a recent change I made 2014-07-14 02:48:32 -05:00
John Wiegley 7b0e242d49 haskell-zippers: new expression 2014-07-14 02:48:32 -05:00
aszlig e07e3a7591
conky: Link against GCC runtime library. 
This is needed for Conky to shut down cleanly, because it relies on
pthread_cancel() to work.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2014-07-14 09:35:24 +02:00
Charles Strahan cd8063c4b2 finalterm: Add package 2014-07-13 19:36:43 -04:00
John Wiegley d8a46149eb Merge pull request #3259 from MP2E/sbv31_update 
Update SBV to v3.1
 2014-07-13 17:50:49 -05:00
Peter Simons f264c638df Merge pull request #3232 from peti/haskell-updates 
Update default Haskell compiler to GHC 7.8.3 (and other stuff)
 2014-07-14 00:18:03 +02:00
aszlig 4086f7c978
twister: Add new package, version 0.9.22. 
This includes another source-only derivation for the web interface (and
patches the path into the twister binary), so there shouldn't be a need
to move it into ~/.twister/html separately.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2014-07-13 23:56:11 +02:00
Charles Strahan a9858101bc keybinder-3.0: Add package 
keybinder-3.0 is for GTK+ 3, whereas keybinder (already in nixpkgs) is
for GTK+ 2.

This adds version 0.3.0 of keybinder-3.0, which we named "keybinder3" in
nixpkgs to (hopefully) lessen the confusion about what is package name
and what is version number.

[Bjørn: extend commit message beyond summary line]
 2014-07-13 19:52:45 +02:00
Luca Bruno 3871005b7c gtksourceview 3.12: hard code data dirs to nix store path 2014-07-13 16:32:41 +02:00
Linquize 73028ef161 gbdfed: add package 1.6 2014-07-13 19:22:10 +08:00
Luca Bruno 6fb00303fb gitolite: fix aborted build due to non-deterministic fetchgit 2014-07-13 12:39:23 +02:00
John Wiegley 842fcdb4b4 texlive: update package paths, old versions no longer exist 2014-07-13 05:05:36 +00:00
John Wiegley 8983cb0917 httrack: upgrade 3.48.3 -> 3.48.17 2014-07-13 05:05:36 +00:00
Cray Elliott 69901813cf Update SBV to v3.1 2014-07-12 17:22:20 -07:00
Peter Simons 543a97e332 Merge pull request #3250 from hrdinka/update-lensfun 
lensfun: update to version 0.2.8
 2014-07-12 23:09:09 +02:00