nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-26 15:44:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
375,142 Commits 200 Branches 125 Tags 9.1 GiB
7ec5bd9ecb
Commit Graph

261 Commits

Author SHA1 Message Date
Brad Jensen
fa7bd53d0d Resolve symlinks before trying to recognize a lisp implementation 
The CCL package installs a symlink named "ccl" that points at the
actual implementation executable: lx86cl64 (or lx86cl for 32 bit).
When clwrapper is used with CCL as the backing implementation, this
script fails to recognize the implementation.  By resolving the
symlink, we are able to recognize which implementation we're actually
working with.
 2019-07-24 09:35:27 -07:00
R. RyanTM
bd31f06d87 asdf: 3.3.2 -> 3.3.3 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/asdf/versions
 2019-07-14 22:05:31 -07:00
Michael Raskin
83cb84ebc3 lispPackages.stumpwm: mimic Query-FS tricks for adding extra deps 2019-03-25 13:29:45 +01:00
Michael Raskin
19d817c5ec lispPackages.lfarm-*: init from Quicklisp 2019-03-03 13:54:08 +01:00
Michael Raskin
1cfa5a72e2 Add lparallel 2019-02-28 22:15:32 +01:00
Vladimír Čunát
8ba516664b
Merge branch 'staging-next' into staging 2019-02-01 09:42:53 +01:00
Michael Raskin
2e76049491 lispPackages.quicklisp.quicklispdist: 2018-08-31 -> 2019-01-07 2019-01-31 07:21:30 +01:00
rnhmjoj
bcf54ce5bb
treewide: use ${stdenv.shell} instead of /bin/sh where possible 2019-01-16 20:37:15 +01:00
Philippe
f03c9c25ac Add cl-jpeg, cl-pdf & cl-typesetting, no extra external deps 2018-12-05 07:01:40 +01:00
Michael Raskin
5048b0d1f9 lispPackages.quicklisp: 2018-04-30 -> 2018-08-31 ; regenerate packages 
Added a wrapper package that creates symlinks to OpenSSL libraries with
the actual versions, because we have 1.0.2 with .so-suffix .1.0.0 and
cl-async-ssl is unhappy because of that.

I continue to dislike cl-postgres and simple-date upstream packaging.
 2018-09-12 11:52:43 +03:00
Jörg Thalheim
218298b30f
Merge branch 'master' into unused5 2018-07-21 15:41:22 +01:00
volth
52f53c69ce pkgs/*: remove unreferenced function arguments 2018-07-21 02:48:04 +00:00
volth
dda95bae35 [bot] treewide: remove unused 'args@' in lambdas 2018-07-20 19:54:05 +00:00
volth
87f5930c3f [bot]: remove unreferenced code 2018-07-20 18:48:37 +00:00
Michael Raskin
cd7bfa6f48 lispPackages: drop pgloader that leads to a circular depedency 2018-05-30 23:42:33 +02:00
Michael Raskin
a4867b30d1 lispPackages.quicklisp: 2018-01-31 -> 2018-04-30; regenerate packages 2018-05-30 19:33:27 +02:00
R. RyanTM
1d58435501 asdf: 3.3.1 -> 3.3.2 
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/asdf/versions.

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 3.3.2 with grep in /nix/store/mcks1swd685sksr4yjrsyfhphzcrw9nk-asdf-3.3.2
- directory tree listing: https://gist.github.com/3a13d7343736c1454dc2701b3ea3009f
 2018-05-07 05:20:34 -07:00
xeji
a13945e1a2 lispPackages.postmodern: mark as broken 2018-04-12 23:04:01 +02:00
Michael Raskin
ea299bdca8 lispPackages.xembed: init 2018-02-26 11:17:36 +01:00
Michael Raskin
140b163602 lispPackages: add a few more, escape + 2018-02-25 18:10:58 +01:00
Michael Raskin
a035714be9 lispPackages: remove trailing colon from {NIX_LISP_,}LD_LIBRARY_PATH 2018-02-25 18:10:58 +01:00
Michael Raskin
0ac5af9f3a lispPackages.clwrapper: patching the second shebang, because source builtin is used 2018-02-17 22:31:18 +01:00
Michael Raskin
8de132f52d lispPackages.clwrapper: use bash as the wrapper shell to make sure arays are supported 2018-02-17 21:06:38 +01:00
Michael Raskin
fb8379cc76 lispPackages, lispPackages.quicklisp-to-nix: 2017-07-25 -> 2018-01-31 
* update Quicklisp distinfo
* regenerate packages
* add cl-html-parse and closure-html
* add proper mariadb library path to fix cl-mysql
* escape memoization filenames for systems
* lispPackages.cl-postgres: keep simple-date in the same package
 2018-02-12 20:45:33 +01:00
Michael Raskin
4c379dbbdd lispPackages.clwrapper: Fix a typo in dynamic-library-hack 2018-02-01 21:32:21 +01:00
Michael Raskin
8818546d48 lispPackages.clwrapper: recognise CCL in setup-hook 2018-02-01 19:07:19 +01:00
Michael Raskin
0a70f37275 lispPackages.clwrapper: build helper; saving dynamic library search path from NIX_LISP_ 2018-01-29 15:15:51 +01:00
Michael Raskin
32925f082b lispPackages: deduplicate dynamical library search path 2018-01-27 21:59:19 +01:00
John Ericson
4d2b763817
Merge pull request #26805 from obsidiansystems/cross-elegant 
Make cross compilation elegant
 2017-12-30 22:58:02 -05:00
John Ericson
046f091e0d treewide: Don't use envHook anymore 
This commits needs a MAJOR audit as I oftentimes just guessed which of
`$hostOffset`, `$targetOffset`, or a fixed offset should be used.
 2017-12-30 22:04:22 -05:00
Izorkin
2bbb4810f4 lisp-modules: mysql -> mysql.connector-c 2017-12-29 02:18:35 +01:00
Robin Gloster
572b2bda4e treewide: generalise for both mysql & mariadb 2017-12-29 02:18:35 +01:00
Robin Gloster
d75ae56f3f mariadb: replace to connector-c 2017-12-29 02:18:35 +01:00
Michael Raskin
1d7f90cba2 quicklisp-to-nix: update after fixes to our ASDF handling suggested by upstream 2017-12-19 17:55:22 +01:00
Michael Raskin
e618aad27e lispPackages.cl-fuse: compile the small wrapper library manually, because for some reason NIX_LDFLAGS get lost with the new binutils wrapper 2017-12-19 16:43:18 +01:00
Michael Raskin
4db842f465 lispPackages: A less aggressive way to manipulate ASDF search path, as suggested by Fare 2017-11-22 07:56:17 +01:00
Michael Raskin
0fe9606967 asdf: 3.3.0 -> 3.3.1 2017-11-20 10:46:05 +01:00
Michael Raskin
cd06d23ccb asdf: 3.2.0 -> 3.3.0 2017-11-11 15:31:43 +01:00
Michael Raskin
eafd703a63 lispPackages.clwrapper: make sure to patch shebangs in the scripts before using them 2017-11-04 12:46:56 +01:00
Brad Jensen
0a4704bd19 lispPackages.cl-protobufs: init at 20170403-git 2017-09-27 09:07:26 -07:00
Michael Raskin
8343a6c7a5 lispPackages.clsql-sqlite3: init 2017-09-07 11:40:06 +02:00
Michael Raskin
f01f86c5ca lispPackages.query-fs: Kill build-with-lisp.sh reference 2017-09-04 21:39:07 +02:00
Michael Raskin
674c3c6bdd lispPackages: add clsql-postgresql* 2017-09-04 21:39:07 +02:00
Michael Raskin
e0771b0a04 quicklisp-to-nix: make it possible to run with Nix sandboxing enabled 2017-09-04 21:39:07 +02:00
Brad Jensen
d1e11cd41e Regenerate quicklisp-to-nix 
Note: Changes to overrides were necessary
 2017-08-31 20:10:19 -07:00
Brad Jensen
acd05c506d Update the ql-to-nix readme 2017-08-31 20:10:19 -07:00
Brad Jensen
d11ab25060 Add ql-to-nix programs to the ql-to-nix shell.nix 2017-08-31 20:10:18 -07:00
Brad Jensen
8f03f38ab1 Move esrap-peg into the normally defined packages 2017-08-31 20:10:18 -07:00
Brad Jensen
ebb5d33e93 Move xkeyboard into the normally defined packages 2017-08-31 20:10:18 -07:00
Brad Jensen
f0c8027ae3 Overhaul quicklisp-to-nix 
1. Detect (and automatically handle) parasitic systems.
2. Each nix package has only one asd, and (almost) every parasitic
   package inside it builds.
3. Ensure that parasitic systems are compiled.
4. Remove unnecessary testnames lisp override mechanism (the
   testnae/testSystem is replaced by parasites/buildSystems).
5. Parasitic systems (if included in the system closure) become
   aliases to their host package.
6. Support caching fasl files in a known directory (for faster
   re-generation after modifying quicklisp-to-nix-system-info).
7. Eliminate unnecessary overrides.  We're going to determine ALL
   lisp dependencies correctly.
8. Don't try to "build" lisp packages with make.  lispPackages should
   be about bringing in a lisp library.
9. Eliminate the hand-maintained list of aliases.  Parasites should
   become aliases.  Everything else should be a real package.
 2017-08-31 20:10:18 -07:00
Michael Raskin
efc95339c0 Do an ASDF build of StumpWM in quicklisp-converted version 2017-08-18 02:22:04 +02:00
Michael Raskin
1ec12e2016 paper over more dependency issues 2017-08-17 21:49:39 +02:00
Michael Raskin
6694abdc31 Merge pull request #27829 from bradleyjensen/update-quicklisp 
Update quicklisp packages
 2017-08-17 21:37:29 +02:00
Michael Raskin
7326ab13a9 lispPackages: save more of the require cc-wrapper environment 2017-08-17 17:04:52 +02:00
Brad Jensen
e73e1aa64d Add some new packages and regenerate quicklisp-to-nix 2017-08-01 18:50:15 -07:00
Brad Jensen
85b57b524d Use a more recent version of quicklisp 2017-08-01 18:47:26 -07:00
Brad Jensen
adeaaf0f54 Work around quicklisp not knowing all dependencies 2017-08-01 18:47:25 -07:00
Michael Raskin
338be9dbd4 Fresh SBCL is not compatible with not-fresh iolib 2017-06-28 22:18:25 +02:00
Michael Raskin
744bdac78e Re-add iolib subsystems 2017-06-22 09:31:41 +02:00
Michael Raskin
bc47794ab5 quicklispPackages: update 
Escape things by default in derivation names (i.e. digit cannot be the
first character etc.)

Update Quicklisp (tracking upstream); list new missing dependencies

Add some minimal README about ql-to-nix
 2017-06-21 22:17:48 +02:00
Michael Raskin
851b584581 compile uiop/version with uiop, seems needed for monolithic bundles in some cases 2017-04-16 19:25:48 +02:00
Michael Raskin
f12bd6e9b6 lispPackage.iolib: missed one system 2017-04-10 10:09:22 +02:00
Michael Raskin
08abe4fe93 lispPackage.iolib: list the hidden systems to make sure bundles exist 2017-04-10 09:57:17 +02:00
Michael Raskin
58d6b50232 lispPackages: load precompiled asdf; support more implementations 2017-04-10 01:10:49 +02:00
Michael Raskin
917ecc2390 lispPackages.iolib: precompile iolib/os 2017-04-09 23:48:24 +02:00
Michael Raskin
365e8a7b6a quicklispPackages: update to fresh QuickLisp 
lispPackages: reduce environment-bombing
 2017-04-06 18:47:36 +02:00
Michael Raskin
623a469653 quicklispPackages, lispPackages: make all system-loads pass with precompilation 2017-04-01 08:08:22 +02:00
Michael Raskin
1e7bad5d51 clwrapper, buildLispPackage: compile fasls and store them for all systems 2017-03-31 22:46:49 +02:00
Michael Raskin
739ecca4b5 esrap-peg: 20131029 -> 20170320 2017-03-31 17:56:35 +02:00
Michael Raskin
02f58311ec lispPackages: migrate to quicklispPackages where possible 2017-03-31 12:06:46 +02:00
Michael Raskin
f10fc5a13c lispPackages.clwrapper: fix array expansion to produce no arguments when empty 2017-03-31 11:17:19 +02:00
Michael Raskin
0f69573731 quicklispPackages: add a basic set of packages, make sure that quicklispPackages_asdf_3_1 can be built completely 2017-03-30 22:55:26 +02:00
Michael Raskin
5032d477a0 quicklisp-to-nix: check that the package is loadable 2017-03-30 22:55:26 +02:00
Michael Raskin
6f904bd9ec clwrapper: setup-hook: correctly handle multiple additions to registry 2017-03-30 22:55:26 +02:00
Michael Raskin
5d83ef6a91 quicklispPackages.iolib: try loading the system 2017-03-30 13:01:30 +02:00
Michael Raskin
953fc6c0a0 clwrapper: better support for ensuring noninteractive execution 2017-03-30 13:00:43 +02:00
Michael Raskin
c1f922b0b5 asdf: add pinned versions 2.26, 3.1; provide quicklispPackages with ASDF 3.1 2017-03-30 12:59:40 +02:00
Michael Raskin
8641a0ace9 quicklisp-to-nix: support / in the system name 
Add some more packages
 2017-03-30 12:15:50 +02:00
Michael Raskin
1258bf9d2c lispPackages.clwrapper: allow to replace the code to load ASDF 2017-03-29 22:30:12 +02:00
Michael Raskin
1af70c331c Add a couple of quicklisp packages 2017-03-29 19:40:42 +02:00
Michael Raskin
13007957e5 quicklispPackages: init 
The idea is to have an almost-automatic conversion from QuickLisp, the
definitive Common Lisp package repository, to Nix. The benefit over just
using lispPackages.quicklisp is automatic installation of non-Lisp
dependencies from NixPkgs (and integration with Nix package management).
The benefit over lispPackages for normal Lisp packages is packaging just
a snapshot of QuickLisp which is known to be tested for version
compatibility between libraries.

There are some packages in lispPackages that are not from QuickLisp (for
example, the installable wrapper of QuickLisp itself). My hope is to
replace the rest with the expressions converted from QuickLisp.

Note that the current commit is a mere addition.
 2017-03-29 00:40:01 +02:00
Michael Raskin
64666a402f lispPackages.clx: git-20150117 -> git-20170201 2017-02-05 13:03:03 +01:00
Michael Raskin
68995874be asdf: 3.1.7 -> 3.2.0 2017-02-01 19:28:45 +01:00
Michael Raskin
eddd227465 asdf: 3.1.6 -> 3.1.7 2016-09-26 15:49:30 +02:00
Michael Raskin
b15b9b0ede clwrapper: build-with-lisp.sh: asdf/image package is now uiop/image 2016-09-26 15:49:29 +02:00
Michael Raskin
2615ef01a7 lispPackages.command-line-arguments: git-20141113 -> git-20151120 2016-09-26 15:49:29 +02:00
Vladimír Čunát
950feb70b2 treewide: fixup various mysql ocurrences after re-split 2016-08-07 20:46:37 +02:00
Bjørn Forsman
bd01fad0ed Captialize meta.description of all packages 
In line with the Nixpkgs manual.

A mechanical change, done with this command:

  find pkgs -name "*.nix" | \
      while read f; do \
          sed -e 's/description\s*=\s*"\([a-z]\)/description = "\u\1/' -i "$f"; \
      done

I manually skipped some:

* Descriptions starting with an abbreviation, a user name or package name
* Frequently generated expressions (haskell-packages.nix)
 2016-06-20 13:55:52 +02:00
Tuomas Tynkkynen
bac26e08db Fix lots of fetchgit hashes (fallout from #15469) 2016-06-03 17:17:08 +03:00
Michael Raskin
511ad5e5bf quicklisp (lispPackages.quicklisp): init 2016-03-25 17:58:05 +01:00
Michael Raskin
98e8696290 Do not default to SBCL for wrapped non-SBCL lisp implementation 2016-03-25 17:58:05 +01:00
Michael Raskin
4251a1aacb asdf: 3.1.5 -> 3.1.6 2016-01-01 12:30:17 +03:00
Tomas Hlavaty
4e66ba1a70 lisp-packages: git.b9.com moved to git.kpe.io 2015-09-30 23:41:01 +02:00
Michael Raskin
3e86c32254 ASDF: 3.1.4 -> 3.1.5 2015-08-08 21:01:31 +03:00
Michael Raskin
e6e02133d6 Fix version strings for switch from CVS 2015-07-15 23:52:44 +03:00
Michael Raskin
44c9eddd64 Update cl-smtp source 2015-07-15 23:52:44 +03:00
Michael Raskin
e431602983 Update cl-unification source 2015-07-15 23:52:44 +03:00
William A. Kennington III
ffd0539eba cacert: store ca-bundle.crt in $out/etc/ssl/certs instead of $out 2015-06-05 13:00:52 -07:00
Michael Raskin
7d2b98370f ca-bundle.crt is now in the root irectory of the cacert package 2015-05-31 19:37:30 +03:00
Michael Raskin
e75b6ac468 Add CLX-XKeayboard; fix downloads for darcs over https 2015-05-31 18:56:50 +03:00
William A. Kennington III
14c1e0fa1f Fix ca-bundle paths 2015-05-29 14:03:34 -07:00
Michael Raskin
6276ebafae Update Query-FS (and CL-Fuse-Meta-FS) 2015-05-23 22:42:37 +03:00
Michael Raskin
cd17e50bd9 Update CLSQL source and switch to a mirror 2015-05-14 18:50:53 +03:00
Joachim Fasting
bf7ad2d84f meta.description fixups 
Mostly scripted substitutions with a couple of subjective enhancements.
 2015-04-30 18:17:42 +02:00
Pascal Wittmann
f99d5cf2fc Fixed some descriptions 2015-04-28 10:55:20 +02:00
Michael Raskin
39d8b61a25 Apparently https:// is now required for iterate darcs 2015-04-26 20:58:05 +03:00
Michael Raskin
e86348fa66 Add md5 Lisp package 2015-04-15 02:48:54 +03:00
Michael Raskin
c9556bff3c Fix more common-lisp.net source 2015-04-14 12:48:54 +03:00
Michael Raskin
d4b5194ca6 Pass cacert to fetchdarcs in iterate source; maybe it is an isolated incident not worth fixing in fetchdarcs itself 2015-04-14 11:52:23 +03:00
Michael Raskin
43f227d577 Add default for ASDF in clwrapper 2015-04-14 11:52:23 +03:00
William A. Kennington III
b524480695 More mysql migrations 2015-04-01 16:50:47 -07:00
Michael Raskin
4a8feb5792 Update CLX 2015-01-18 01:58:20 +03:00
Michael Raskin
7d66259b3a Add CL-SMTP package 2014-11-16 19:57:12 +03:00
Michael Raskin
47ae07c56e Add ironclad 2014-11-16 19:57:12 +03:00
Michael Raskin
2f53f2ed16 An example build for the SBCL binary creation 2014-11-16 19:57:12 +03:00
Michael Raskin
12f35b6db7 Allow pre/post-Install 2014-11-16 19:57:12 +03:00
Michael Raskin
0f28ce0ad8 Update argument list after image restoreon SBCL 2014-11-16 19:57:12 +03:00
Michael Raskin
58e27a257e Fix SBCL binary building with saved library path 2014-11-16 19:57:12 +03:00
Michael Raskin
83999a0a84 Fix CLisp support in executable building 2014-11-15 15:40:45 +03:00
Michael Raskin
1bfe4e59c2 Install the builder script 2014-11-15 15:40:45 +03:00
Michael Raskin
82a4776bf9 Add support for creation of executables with SBCL — hacks are for shared libraries 2014-11-15 15:40:45 +03:00
Vladimír Čunát
b4af993c3f Merge branch 'master' into staging 
Conflicts (simple):
	pkgs/development/lisp-modules/clwrapper/setup-hook.sh
 2014-11-14 14:28:23 +01:00
Michael Raskin
5d97886a6a Add cl-html-parse lisp package 2014-11-13 14:19:42 +03:00
Michael Raskin
cd6bb77a9e Add some packages 2014-11-13 11:17:48 +03:00
Michael Raskin
da303bba58 Handle propagated library inputs for FFI 2014-11-13 11:17:48 +03:00
Michael Raskin
4beebeb6b3 Make LD_LIBRARY_PATH available during build like during later usage 2014-11-13 11:17:48 +03:00
Michael Raskin
def6028855 Update iterate lisp package 2014-11-13 11:17:48 +03:00
Michael Raskin
ed74293c01 Some git support for common-lisp.net 2014-11-13 11:17:47 +03:00
Michael Raskin
d541ef3ada Allow generate update expressions and support darcs 2014-11-13 11:17:47 +03:00
Michael Raskin
a54e032b2c Add some lisp packages, including clx-truetype 2014-11-12 16:58:22 +03:00
Michael Raskin
084426a8ed Support more quicklisp upstream source types 2014-11-12 16:58:22 +03:00
Michael Raskin
ce8f37430f Fix envHooks setting: don't kill previous hooks 2014-11-12 16:58:22 +03:00
Eelco Dolstra
f33fa1b66b Merge remote-tracking branch 'origin/master' into staging 
Conflicts:
	pkgs/development/libraries/boost/generic.nix
 2014-11-11 23:48:08 +01:00
Pascal Wittmann
8df0e0b151 Fixed many descriptions 2014-11-11 14:36:34 +01:00
Vladimír Čunát
52404a868d Merge recent master into staging 
Nixpkgs Hydra: ?compare=1157272

TODO: port e22889064f

Conflicts:
	nixos/tests/gnome3_10.nix (auto-solved)
	pkgs/applications/video/aegisub/default.nix
	pkgs/development/libraries/boost/1.55.nix
 2014-11-05 15:00:44 +01:00
Michael Raskin
bb5dd955e7 Update Lisp CLX 2014-11-03 12:12:24 +03:00
Michael Raskin
8ca56c816d Update ASDF 2014-11-02 23:51:57 +03:00
Eelco Dolstra
09dc132e04 Merge remote-tracking branch 'origin/master' into staging 
Conflicts:
	pkgs/development/libraries/poppler/default.nix
 2014-10-16 15:16:50 +02:00
_1126
7b81cd68b7 stumpwm: removed from lisp-packages. 2014-10-05 16:42:32 +02:00
Vladimír Čunát
82797f98f2 Merge branch 'staging' into modular-stdenv 
Conflicts:
	pkgs/development/interpreters/perl/5.10/setup-hook.sh
	pkgs/development/interpreters/perl/5.8/setup-hook.sh
	pkgs/stdenv/linux/default.nix
 2014-09-08 18:24:58 +02:00
Michael Raskin
9785c31c98 Update ASDF 2014-08-31 18:20:06 +04:00
Eelco Dolstra
e3f7dbbac8 Cleanup: Use += to append to envHooks 2014-08-09 12:47:05 +02:00
Benno Fünfstück
e10001042d fetchbzr, fetchdarcs, fetchhg: use rev attr 
This makes it match the behaviour of fetchgit and fetchsvn, so it's
easier to write scripts that support all of them.
 2014-06-28 21:06:10 +02:00
Michael Raskin
5c5bae9587 Updatign ASDF to 3.1.2 2014-05-28 01:33:28 +04:00
Vladimír Čunát
161d029d7d preferLocalBuild: set to true for wrappers and fetchers 2014-02-10 21:04:17 +01:00
Vladimír Čunát
a2c316288c Merge master into stdenv-updates 
Conflicts:
	pkgs/development/lisp-modules/stumpwm/default.nix (auto-solved)
	pkgs/top-level/all-packages.nix (trivial)
 2014-01-12 12:29:24 +01:00
Moritz Heidkamp
b10fe8ae3f stumpwm: Copy stumpish to bin/, add contrib/ directory. 2014-01-05 17:38:14 +00:00
Peter Simons
45e8de9a7d Merge branch 'origin/master' into stdenv-updates. 
Conflicts:
	pkgs/tools/misc/less/default.nix
 2013-12-16 21:13:24 +01:00
Moritz Ulrich
38a0e6dfd5 lispPackages: Fix Github URIs. 
Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
 2013-12-12 14:11:24 +01:00
Peter Simons
c32bf83301 Merge remote-tracking branch 'origin/master' into stdenv-updates. 
Conflicts:
	pkgs/development/interpreters/perl/5.16/default.nix
	pkgs/tools/networking/curl/default.nix
	pkgs/top-level/all-packages.nix
	pkgs/top-level/release-python.nix
	pkgs/top-level/release-small.nix
	pkgs/top-level/release.nix
 2013-12-04 18:33:52 +01:00