nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-23 14:13:35 +00:00
Code Issues Packages Projects Releases Wiki Activity
40,815 Commits 199 Branches 125 Tags 8.4 GiB
4a6d30c2e7
Commit Graph

34636 Commits

Author SHA1 Message Date
Austin Seipp
d5799cd64f scrypt: adopt package 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-03-20 13:38:02 -05:00
Austin Seipp
0c3bb487c3 ssdeep: version 2.10 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-03-20 13:18:51 -05:00
Peter Simons
042f85cdd0 nbd: update to version 3.8 2014-03-20 18:07:23 +01:00
Peter Simons
d7d0532bb0 Merge pull request #1991 from linquize/git-1.9.1 
git: Update to 1.9.1
 2014-03-20 17:20:04 +01:00
Oliver Charles
bb09cfc2fc haskellPackages.timezoneOlson: Update to 0.1.4 2014-03-20 15:14:14 +00:00
Lluís Batlle i Rossell
29dae7ef33 Trying to fix GNU readline 6.3 build on Darwin 
I copied the stdenv override used for readline 6.2.

Peter Simons notified me of the failure:
http://hydra.nixos.org/build/9672338
 2014-03-20 16:12:30 +01:00
Linquize
4e385c272c git: Update to 1.9.1 2014-03-20 15:44:25 +01:00
Oliver Charles
1bb8d12d2f haskellPackages.dbmigrations: Jailbreak now HDBC has been updated 2014-03-20 14:36:34 +00:00
Marco Maggesi
42b070527c Update ocamlnet to version 3.7.3 
Also remove dependency to lablgkt which is not used and prevent
building on darwin.
 2014-03-20 14:54:54 +01:00
Lluís Batlle i Rossell
a4c4129477 Adding GNU readline 6.3 apart 
I set bashInteractive to use it, as it has many relevant fixes.
 2014-03-20 13:00:46 +01:00
Lluís Batlle i Rossell
b9163ab332 Revert "Updating GNU readline to 6.3." 
This reverts commit dbaa07b8ef.

vcunat reported on IRC that the update breaks python and parted at least.
http://hydra.nixos.org/build/9661091/nixlog/1/tail-reload
 2014-03-20 12:53:20 +01:00
Eelco Dolstra
d9f9bb1ab2 openssh: Update to 6.6p1 
CVE-2014-2532

Note that this CVE only affects people who use AcceptEnv with
wildcards.
 2014-03-20 12:39:00 +01:00
Evgeny Egorochkin
06097489a6 youtubeDL: update from 2014.03.12 to 2014.03.18.1 2014-03-20 13:32:29 +02:00
Evgeny Egorochkin
76f7ea6e39 add repositories.git to several packages 2014-03-20 13:32:29 +02:00
Sander van der Burg
31fb83444f python-suds: Add new package 2014-03-20 12:22:38 +01:00
Lluís Batlle i Rossell
ae3a1519e4 gdb: adding a patch to handle well the edit cmd + SIGWINCH. 
It's reported to upstream since two years ago, through
their patches mailing list.
 2014-03-20 11:09:39 +01:00
Lluís Batlle i Rossell
d4bf329dde Updating gdb to 7.7. 2014-03-20 10:47:36 +01:00
Lluís Batlle i Rossell
dbaa07b8ef Updating GNU readline to 6.3. 
I remove all 6.2 patches manually, but I keep the logic to add later patches.
 2014-03-20 10:47:36 +01:00
Shea Levy
608f436da3 Add ngircd IRC server 2014-03-19 21:03:19 -04:00
Shea Levy
789cbfdced Merge branch 'ekho' of git://github.com/iyzsong/nixpkgs 
add ekho 5.8.2, a Chinese TTS software
 2014-03-19 18:26:18 -04:00
Shea Levy
d574c34e0a Merge branch 'master' of git://github.com/madjar/nixpkgs 
silver-searcher: avoid -lgcc_s on darwin
 2014-03-19 18:18:08 -04:00
Shea Levy
506924c6c2 Merge branch 'kdevelop46' of git://github.com/ambrop72/nixpkgs 
kdevelop: Update to 4.6.
 2014-03-19 18:11:35 -04:00
Shea Levy
a1fff61e4d Merge branch 'u/vimrc' of git://github.com/wizeman/nixpkgs 
vimHugeX: also add wrapper for system-wide vimrc
 2014-03-19 18:07:04 -04:00
Vladimír Čunát
8a8ae81e40 acpid: update from 2.0.21 to 2.0.22 2014-03-19 21:56:48 +01:00
Vladimír Čunát
5bb0803254 fix evaluation (shotwell license) 2014-03-19 21:10:43 +01:00
Vladimír Čunát
3cf4029981 Merge pull request #1972 from vcunat/p/procps 
procps-ng: make it the default procps (name and attr)
 2014-03-19 17:54:30 +01:00
Domen Kožar
2a50098657 easy-rsa: don't include directory when wrapping 2014-03-19 12:23:08 +01:00
Shea Levy
4216e42ca8 Merge branch 'openafs' of git://github.com/errge/nixpkgs 
Openafs fixes
 2014-03-19 05:21:28 -04:00
Shea Levy
e0b8a00607 Merge branch 'fix-ocaml-facile' of git://github.com/maggesi/nixpkgs 
Fix compilation of ocaml-facile with OCaml 4.xx
 2014-03-19 03:56:20 -04:00
Marco Maggesi
94a690a41a Fix compilation of ocaml-facile with OCaml 4.xx 2014-03-19 08:46:17 +01:00
aszlig
ab7a8abd58
python-hetzner: Update to new version 0.7.0. 
This introduces the following changes:

 - hetznerctl: Fix UnicodeEncodeError in server product name.
 - Support rebooting of vServers.
 - Server now has a new attribute is_vserver.
 - Add a README.md with examples.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2014-03-18 18:45:22 +01:00
Domen Kožar
d4b1250b6c remove prefix for kazam 2014-03-18 18:23:13 +01:00
Domen Kozar
902b059967 Add shotwell 1.15.1 2014-03-18 18:23:13 +01:00
Eelco Dolstra
26a868139e kdf: Disable parallel building 
http://hydra.nixos.org/build/9595928
 2014-03-18 17:30:57 +01:00
Ricardo M. Correia
cc69228119 grsecurity: Update stable and test patches 
stable: 3.0-3.2.55-201403142107 -> 3.0-3.2.55-201403172027
test:   3.0-3.13.6-201403142112 -> 3.0-3.13.6-201403172032
 2014-03-18 16:51:25 +01:00
Eelco Dolstra
f73ff0529e runInLinuxVM: Set the clock properly 2014-03-18 15:02:09 +01:00
William A. Kennington III
b6d3526c53 qemu: Update 1.5.2 -> 1.7.0 2014-03-18 14:24:46 +01:00
Peter Simons
5e7608e226 Merge pull request #1932 from wkennington/master.sup 
sup: Push sup to the latest git commit
 2014-03-18 12:09:20 +01:00
Peter Simons
869fb5298d Merge pull request #1976 from madjar/python 
Update to python 3.4.0
 2014-03-18 11:52:21 +01:00
Peter Simons
a42374ff66 Merge pull request #1979 from larkery/update-isync 
Update isync version to 1.1.0 (doesn't need recursive listing patch any ...
 2014-03-18 11:47:21 +01:00
Tom Hinton
7b9485145d Add missing sha256sum to autorandr derivation 2014-03-18 10:15:59 +00:00
Tom Hinton
cf0f710b13 Update isync version to 1.1.0 (doesn't need recursive listing patch any more) 2014-03-18 10:14:52 +00:00
Vladimír Čunát
cca592b455 liferea: minor update 2014-03-18 10:24:00 +01:00
Vladimír Čunát
da4fca4ce4 ffmpeg (0.10): minor update 
(cherry picked from commit 9951478c40)

Conflicts:
	pkgs/development/libraries/ffmpeg/0.10.nix
 2014-03-17 22:56:19 +01:00
Peter Simons
f202729d53 haskell-dbus: disable test suite 
The tests need access to the Internet to succeed.
 2014-03-17 18:33:55 +01:00
Peter Simons
dd701b4c51 haskell-options: we cannot easily run the test suite because it requires 'chell', which requires 'options' 2014-03-17 18:33:55 +01:00
Peter Simons
d17eb6576d haskell-haskell-names: update to version 0.3.3 2014-03-17 18:33:55 +01:00
Peter Simons
745a35c130 haskell-hlint: update to version 1.8.59 2014-03-17 18:33:55 +01:00
Peter Simons
8dfc2e1e4f haskell-th-desugar: update to version 1.3.0 2014-03-17 18:33:55 +01:00
Peter Simons
7548ed77fb haskell-tasty: update to version 0.8.0.2 2014-03-17 18:33:55 +01:00
Peter Simons
d56ff5cf60 haskell-tagged: update to version 0.7.1 2014-03-17 18:33:55 +01:00
Peter Simons
10fde8fe5c haskell-snap-core: update to version 0.9.6.1 2014-03-17 18:33:55 +01:00
Peter Simons
b9a837c26c haskell-sample-frame: update to version 0.0.3 2014-03-17 18:33:55 +01:00
Peter Simons
165ada34b9 haskell-numeric-prelude: update to version 0.4.1 2014-03-17 18:33:55 +01:00
Peter Simons
dbd61dbdae haskell-midi: update to version 0.2.1.1 2014-03-17 18:33:55 +01:00
Peter Simons
e31bd9e6ee haskell-ltk: update to version 0.13.1.0 2014-03-17 18:33:55 +01:00
Peter Simons
e63062ed9d haskell-linear: update to version 1.9.1 2014-03-17 18:33:55 +01:00
Peter Simons
b976817bd7 haskell-lens: update to version 4.0.7 2014-03-17 18:33:55 +01:00
Peter Simons
7e83f3b703 haskell-gnuplot: update to version 0.5.2.1 2014-03-17 18:33:55 +01:00
Peter Simons
34b4e5c97a haskell-ghc-mod: update to version 3.1.7 2014-03-17 18:33:55 +01:00
Peter Simons
00b17087f7 haskell-fay: update to version 0.19.1 2014-03-17 18:33:55 +01:00
Peter Simons
ac5fdeb00f haskell-fay-base: update to version 0.19.1 2014-03-17 18:33:55 +01:00
Peter Simons
b34768db9b haskell-doctest: update to version 0.9.10.2 2014-03-17 18:33:54 +01:00
Peter Simons
0a326a51a6 haskell-dbus: update to version 0.10.7 2014-03-17 18:33:54 +01:00
Peter Simons
703fae7101 haskell-data-accessor: update to version 0.2.2.5 2014-03-17 18:33:54 +01:00
Peter Simons
8818350aba haskell-data-accessor-template: update to version 0.2.1.11 2014-03-17 18:33:54 +01:00
Peter Simons
4d53562910 haskell-convertible: update to version 1.1.0.0 2014-03-17 18:33:54 +01:00
Peter Simons
02dfc27b58 haskell-constraints: update to version 0.3.5 2014-03-17 18:33:54 +01:00
Peter Simons
64fb48f9e2 haskell-cipher-aes: update to version 0.2.7 2014-03-17 18:33:54 +01:00
Peter Simons
34fad84658 haskell-alsa-pcm: update to version 0.6.0.1 2014-03-17 18:33:54 +01:00
Peter Simons
a7e71295fc haskell-HDBC: update to version 2.4.0.0 2014-03-17 18:33:54 +01:00
Peter Simons
bfa2466d71 haskell-xmobar: update to version 0.20.1 2014-03-17 18:33:54 +01:00
Peter Simons
84872fe15d haskell-options: add version 1.0 2014-03-17 18:33:54 +01:00
Peter Simons
f5e1190036 haskell-chell-quickcheck: add version 0.2.2 2014-03-17 18:33:54 +01:00
Peter Simons
d03aa6a13f haskell-chell: add version 0.3.3 2014-03-17 18:33:54 +01:00
William A. Kennington III
4a112f46b1 sup: Push sup to the latest git commit 
ncursesw was also pushed forward from 1.3.1.2 -> 1.4.6 as the packaging
was changed for the latest version of sup
 2014-03-17 12:04:31 -05:00
Georges Dubus
24e9c676d2 python: update 3.4.0 to stable release 2014-03-17 17:07:20 +01:00
Bjørn Forsman
062363c001 thrift: make it useable with the python wrapper 
The python wrapper discards derivations that lack the 'pythonPath'
attribute, so provide a (dummy) pythonPath attribute to make this work:

  pythonFull.override { extraLibs = [ thrift ]; }
 2014-03-17 16:20:55 +01:00
Domen Kožar
4b23a50ebb Merge pull request #1975 from iyzsong/gstreamer 
gstreamer: add/update packages and improve meta
 2014-03-17 16:11:28 +01:00
宋文武
d847b5851f gst-python: update to 1.2.0 2014-03-17 22:09:51 +08:00
宋文武
c3ffcb1cfe add gst-editing-services 1.2.0 2014-03-17 22:06:32 +08:00
宋文武
7d3eb6307b add gnonlin 1.2.0 2014-03-17 22:02:48 +08:00
宋文武
1b3899b040 gst-plugins-ugly: add description 2014-03-17 21:47:58 +08:00
宋文武
b45a294038 gst-plugins-good: add description and set license correctly 2014-03-17 21:43:10 +08:00
宋文武
e67f3a38cf gst-plugins-bad: add description and set license correctly 2014-03-17 21:31:45 +08:00
Arseniy Seroka
edf1c8ce0f dsp: add haskell pkg 2014-03-17 15:27:08 +04:00
Eelco Dolstra
14af15dbff Explicitly require Nix 1.6 
People using Nix < 1.6 previously got an unhelpful "infinite
recursion" error.
 2014-03-17 11:33:36 +01:00
Eelco Dolstra
c0f3f6e396 linux: Update to 3.4.83 2014-03-17 11:25:48 +01:00
Eelco Dolstra
ea1cd70128 geoip: Convert to mkDerivation 
Also, drop unused zlib dependency and add some meta attributes.
 2014-03-17 11:23:59 +01:00
Mathijs Kwik
779a959982 add haskell-lzma-enumerator 2014-03-17 07:30:26 +01:00
Domen Kozar
11874b9e3b add Planetary Annihilation: next-generation RTS that takes the genre to a planetary scale 2014-03-16 23:31:08 +01:00
mornfall
fe995cdedc Merge pull request #1775 from thoughtpolice/duo_unix 
Duo Security module and uid/gid support for /etc files
 2014-03-16 23:06:01 +01:00
mornfall
ec353692ad Merge pull request #1849 from thoughtpolice/criu 
criu: version 1.2
 2014-03-16 22:58:54 +01:00
Austin Seipp
4c04474c27 nmap: add myself to maintainers, add homepage/description 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-03-16 16:53:08 -05:00
Vladimír Čunát
ca09a878d0 procps-ng: make it the default procps (name and attr) 2014-03-16 19:07:38 +01:00
Vladimír Čunát
9363303922 pfstools: update from 1.8.3 to 1.8.5 2014-03-16 17:46:39 +01:00
Vladimír Čunát
3caa572a8e xfce4-task-manager: minor update 1.0.0 -> .1 2014-03-16 17:46:16 +01:00
Vladimír Čunát
607678341d xfce.tumbler: minor update 0.1.29 -> .30 2014-03-16 17:46:16 +01:00
Vladimír Čunát
ab05fa29eb xfce.gigolo: minor update 0.4.1 -> .2 
It no longer uses Waf.
 2014-03-16 17:46:15 +01:00
Vladimír Čunát
76822ea4d5 libav: minor updates of both branches 2014-03-16 17:45:48 +01:00
Vladimír Čunát
8de867c958 qt_gstreamer: update from 0.10.2 to 0.10.3 2014-03-16 17:45:07 +01:00
Vladimír Čunát
d4da7e5e4f man-pages-posix: update 2003a -> 2013-a 2014-03-16 17:39:50 +01:00
Matej Cotman
af16343504 deluge: add curses module for deluge-console 2014-03-16 16:01:42 +01:00
Ricardo M. Correia
a16e1e2133 chromium: Update stable and beta channels 
stable: 33.0.1750.149 -> 33.0.1750.152
beta:   34.0.1847.45  -> 34.0.1847.60
 2014-03-16 13:26:01 +01:00
Austin Seipp
47b35d5e80 criu: version 1.2 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-03-16 07:16:34 -05:00
Christoph Hrdinka
26d5d506c9 conky: add config options 2014-03-16 12:30:15 +01:00
Cillian de Róiste
b57ee8c331 nixpkgs-lint: add the platforms meta attr for most of my packages 2014-03-16 12:08:26 +01:00
Domen Kozar
37c42c16a4 networkmanagerapplet: fix crash while connecting to protected wifis 2014-03-16 11:49:13 +01:00
Cillian de Róiste
1661501465 ardour: make ardour3 the default and remove ardour 2, it doesn't build 2014-03-16 11:32:56 +01:00
Bjørn Forsman
2ce7902059 gpsd: fix build in chroot 
Fixes this when building with nix.useChroot = true in configuration.nix:

  sh: ./test_maidenhead.py: /usr/bin/env: bad interpreter: No such file or directory
  scons: *** [maidenhead-locator-regress] Error 126
  scons: building terminated because of errors.
 2014-03-16 00:05:58 +01:00
Vladimír Čunát
7ca8bd6d4f Merge pull request #1965 from ambrop72/ktorrent-4.3.1 
KTorrent: update to 4.3.1.
 2014-03-15 23:13:50 +01:00
ambrop7@gmail.com
24f4957d50 KTorrent: Fix URLs. 2014-03-15 21:31:58 +01:00
Shea Levy
3c8f5c2471 Merge branch 'fasd' of https://github.com/ellis/nixpkgs 
Create package for 'fasd'
 2014-03-15 15:52:41 -04:00
Ellis Whitehead
44b6766f5d Create package for 'fasd' 2014-03-15 20:33:10 +01:00
ambrop7@gmail.com
732760bb50 Update KTorrent to 4.3.1. 2014-03-15 20:22:03 +01:00
Shea Levy
3c4be425db Merge branch 'master.rpm' of git://github.com/wkennington/nixpkgs 
rpm: Upgrade from 4.7.2 -> 4.11.2
 2014-03-15 13:25:43 -04:00
Shea Levy
dddb4f45e9 Merge branch 'pr-wqy' of git://github.com/PkmX/nixpkgs 
Bump wqy-zenhei font to the latest version and add wqy-microhei
 2014-03-15 13:22:31 -04:00
Shea Levy
80ed0ff85f Merge branch 'ocaml-oasis' of git://github.com/maggesi/nixpkgs 
Ocaml oasis
 2014-03-15 13:14:14 -04:00
Shea Levy
edb14763ad Merge branch 'ocaml-extlib' of git://github.com/maggesi/nixpkgs 
Update OCaml ExtLib to version 1.6.1
 2014-03-15 13:08:38 -04:00
Shea Levy
389c3951a8 Merge branch 'coq' of git://github.com/thoughtpolice/nixpkgs 
coq: 8.4pl2 -> 8.4pl3
 2014-03-15 13:03:10 -04:00
Ricardo M. Correia
e76c059b23 grsecurity: Fix grsec-path.patch to apply with newest patches 2014-03-15 18:01:47 +01:00
Shea Levy
7f39579931 Merge branch 'master.ccid' of git://github.com/wkennington/nixpkgs 
ccid: Update from 1.4.14 -> 1.4.15
 2014-03-15 12:40:46 -04:00
Bjørn Forsman
395618890b gpsd: update meta attributes 
* Don't repeat package name in description
* longDescription re-copied from homepage (gpsd now supports AIS...)
* The homepage has moved
* Add platforms and maintainers
 2014-03-15 17:35:55 +01:00
Bjørn Forsman
c54b9b7b60 gpsd: update 2.95 -> 3.10 
Build system is changed, gpsd uses scons now.

The expressions needs some more work, TODO comments added. (xgps didn't
work before this change either.)

I added an option for the gpsd group, which is set to upstream default:
"dialout". Note that our default gpsd user is "gpsd", while upstream
uses "nobody" by default.
 2014-03-15 17:35:55 +01:00
Shea Levy
da184a455f Merge branch 'vmpk' of git://github.com/iyzsong/nixpkgs 
add vmpk 0.5.1, a virtual midi piano keyboard
 2014-03-15 12:22:18 -04:00
Shea Levy
291b6bd7cd Merge branch 'patch-1' of git://github.com/msackman/nixpkgs 
Update serfdom to 0.5.0
 2014-03-15 12:13:29 -04:00
Anders Claesson
2985f31b1c Add haskell library terminal-size. 2014-03-15 16:05:02 +00:00
Vladimír Čunát
6246fad9c7 liferea: fix crash when opening file dialogs 
The same schema issue as always in gtk3 dialogs.
 2014-03-15 15:09:03 +01:00
Shea Levy
a330e244ad Revert "Merge branch 'nix-run' of git://github.com/rickynils/nixpkgs" 
nix-run's functionality is subsumed by nix-shell -p.

This reverts commit 3cc2b243c7, reversing
changes made to 4d5d6aed29.
 2014-03-15 08:15:22 -04:00
Matthew Sackman
89f0c9a8b6 Update serfdom to 0.5.0. 2014-03-15 10:57:27 +00:00
Vladimír Čunát
ec0116f99d xfce4-power-manager: put patch into nixpkgs 
It's generated by cgit, which adds cgit version to the end,
and I see no way to avoid that silly behavior.
 2014-03-15 11:48:49 +01:00
Peter Simons
f1a30454f6 Merge pull request #1942 from thoughtpolice/fixups 
Trivial fixes for my packages
 2014-03-15 09:35:35 +01:00
Peter Simons
189fe46ab1 haskell-snowball: re-generate with cabal2nix 2014-03-15 09:15:52 +01:00
Peter Simons
728f3872a3 haskell-wai-middleware-static: re-generate with cabal2nix 2014-03-15 09:15:41 +01:00
Thomas Bereknyei
9dd6e2adef happstack-fastcgi: add version 0.1.5 2014-03-15 09:13:15 +01:00
Peter Simons
4d03052c9c ghc: update HEAD snapshot to 7.9.20140313 2014-03-15 09:11:47 +01:00
宋文武
9ce62a1ae6 add vmpk 0.5.1, a virtual midi piano keyboard 2014-03-15 13:13:25 +08:00
William A. Kennington III
9d42f2e5fc ccid: Update from 1.4.14 -> 1.4.15 2014-03-14 23:45:48 -05:00
Ricardo M. Correia
ceec014020 grsecurity: Update stable and test patches 
stable: 3.0-3.2.55-201403122114 -> 3.0-3.2.55-201403142107
test:   3.0-3.13.6-201403122116 -> 3.0-3.13.6-201403142112
 2014-03-15 04:15:28 +01:00
Ricardo M. Correia
3c97fdc7a8 spl, zfs: Add myself as a maintainer 2014-03-15 02:01:57 +01:00
Shea Levy
5f0f47994a Merge branch 'pyserial' of git://github.com/ambrop72/nixpkgs 
Update pyserial to 2.7
 2014-03-14 20:20:07 -04:00
Shea Levy
d1e88c4625 Unconditionally compile itk with shared libs 2014-03-14 20:18:17 -04:00
ambrop7@gmail.com
0f7efa31d5 Update pyserial to 2.7. 2014-03-15 01:14:43 +01:00
Shea Levy
645d54c35d Merge branch 'itk-shared' of git://github.com/jacobhinkle/nixpkgs 
Added sharedLibs option to ITK
 2014-03-14 20:11:33 -04:00
Shea Levy
f2930e661a Merge branch 'haskell-scrypt' of git://github.com/hrdinka/nixpkgs 
haskell-scrypt: add version 0.5.0
 2014-03-14 20:10:25 -04:00
Shea Levy
e742265234 Merge branch 'haskell-snowball' of git://github.com/hrdinka/nixpkgs 
haskell-snowball: add version 1.0.0.1
 2014-03-14 20:08:58 -04:00
Shea Levy
ad3d9755a9 Merge branch 'master' of git://github.com/hrdinka/nixpkgs 
haskell-wai-websockets: add version 2.1.0

and

haskell-leveldb-haskell: add version 0.3.0
 2014-03-14 20:05:46 -04:00
Shea Levy
7939ca1e99 Merge branch 'update-java7' of git://github.com/bennofs/nixpkgs 
oraclejdk7: add missing dependencies
 2014-03-14 20:04:22 -04:00
Shea Levy
04fe6405e4 Merge branch 'ocaml-updates' of git://github.com/maggesi/nixpkgs 
Make OCaml 4.01.0 the default version of OCaml
 2014-03-14 19:58:02 -04:00
Shea Levy
6da2d89016 Merge branch 'postgresql93-ossp-uuid-clean' of git://github.com/basvandijk/nixpkgs 
Configure postgresql-9.3 with support for the ossp-uuid module

Conflicts:
	pkgs/servers/sql/postgresql/9.3.x.nix
 2014-03-14 19:52:43 -04:00