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

50606 commits

Author SHA1 Message Date
Aristid Breitkreuz 2fe1aac1e4 Merge pull request #4463 from vbgl/oasis
ocaml 4.02: makes dependency to campl4 explicit
2014-10-10 18:32:59 +02:00
Vincent Laporte 977f172fee ocaml-lablgl: adds missing dependency to camlp4 2014-10-10 17:00:30 +01:00
Vincent Laporte 35c92ec1ac ocaml-http: adds missing dependency to camlp4 2014-10-10 17:00:30 +01:00
Vincent Laporte 4f0bc8e060 ocaml-oasis: adds missing dependency to caml4 2014-10-10 17:00:30 +01:00
Vincent Laporte 7bfe6144c6 ocaml-data-notation: adds missing dependency to camlp4 2014-10-10 17:00:29 +01:00
Shea Levy af4455d853 Merge branch 'master' of github.com:ip1981/nixpkgs
Fixes for atool & sysstat
2014-10-10 11:40:00 -04:00
Eelco Dolstra 058bf4ccc4 Create a udev rule for /dev/root
In the installation CD, this ensures that systemd will see a proper
udev node for /dev/root.

Fixes #4399.

Borrowed from

  http://lists.freedesktop.org/archives/systemd-devel/2014-July/020988.html
2014-10-10 17:18:04 +02:00
Lluís Batlle i Rossell bd19f65ebf Making A/V disabled in tox for ARM. 2014-10-10 17:12:51 +02:00
Lluís Batlle i Rossell 704fc40bd8 Fix ARM/Arm typo. 2014-10-10 17:12:50 +02:00
Lluís Batlle i Rossell 372b0cda52 Making spidermonkey_185 build on ARM, and so also polkit. 2014-10-10 17:12:49 +02:00
Lluís Batlle i Rossell 82b6d7ff9a Updating inadyn to 1.99.10.
(I wnated the cache-dir option)
2014-10-10 17:07:17 +02:00
Lluís Batlle i Rossell eb21ef2bc7 Updating go from 1.3.2 to 1.3.3. 2014-10-10 17:07:16 +02:00
Pascal Wittmann b168a8c118 Merge pull request #4457 from DamienCassou/gpaste-3.12.3.1
gpaste 3.12.3 -> 3.12.3.1
2014-10-10 15:39:55 +02:00
Damien Cassou 45ad3e09fd gpaste 3.12.3 -> 3.12.3.1 2014-10-10 12:55:56 +02:00
Austin Seipp b0588c2788 Merge pull request #4447 from nathanielbaxter/dev/pysocks
pysocks: Fix license typo
2014-10-09 18:47:29 -05:00
Nathaniel Baxter 309bfdd8a0 pysocks: Fix license typo 2014-10-10 10:42:19 +11:00
Austin Seipp 7ac2be3fab rainbowstream: 0.9.5 -> 1.1.6
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-10-09 17:23:37 -05:00
Austin Seipp cf58933a9b pythonPackages: add pysocks 1.5.0
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-10-09 17:23:36 -05:00
Austin Seipp a1dba856f1 pythonPackages.twitter: 0.14.3 -> 0.15.0
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-10-09 17:14:52 -05:00
Austin Seipp 27d95c25e8 pythonPackages.pyfiglet: 0.7.1 -> 0.7.2
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-10-09 17:14:30 -05:00
Austin Seipp 849bfc88f5 concurrencykit: 0.4.3 -> 0.4.4
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-10-09 17:10:58 -05:00
Austin Seipp 2241ce448e stunnel: 5.03 -> 5.04
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-10-09 17:09:31 -05:00
Austin Seipp c98592f200 re2c: 0.13.7.4 -> 0.13.7.5
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-10-09 17:08:28 -05:00
Austin Seipp 9b391aadce ssdeep: 2.10 -> 2.11
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-10-09 17:06:17 -05:00
Austin Seipp 37b9a2bad5 mariadb: 10.0.13 -> 10.0.14
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-10-09 17:01:06 -05:00
Austin Seipp 5c805fe266 p0f: 3.06b -> 3.07b
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-10-09 17:00:25 -05:00
Austin Seipp df4c8d85ae lockdep: 3.16.1 -> 3.17
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-10-09 16:59:14 -05:00
John Wiegley e73aefcf93 coq_HEAD: Update 2014-10-09 14:52:35 -05:00
Aristid Breitkreuz c7a06fa51a Merge pull request #4412 from wavewave/proot
proot: remove self.stdenv.lib
2014-10-09 20:50:12 +02:00
codyopel 2986ca34d6 rtorrent-git: new package 2014-10-09 20:47:27 +02:00
Aristid Breitkreuz bf1dd8e931 Merge pull request #4423 from FlorentBecker/svg2tikz
new package: svg2tikz
2014-10-09 20:39:06 +02:00
Aristid Breitkreuz ab1f89a161 Merge pull request #4439 from DamienCassou/pharo-vm-with-cairo
pharo-vm: Add dependency to cairo
2014-10-09 20:36:00 +02:00
Aristid Breitkreuz 78b8a7794c Merge pull request #4443 from flazz/master
jq & thrift build on darwin
2014-10-09 20:35:41 +02:00
Aristid Breitkreuz afe8b54b49 Merge pull request #4381 from khumba/claws-mail
New packages: claws-mail-3.10.1, libetpan-1.5.
2014-10-09 20:31:01 +02:00
Aristid Breitkreuz 85f1889466 asio: update from 1.10.2 to 1.10.4 2014-10-09 20:17:24 +02:00
Aristid Breitkreuz 8c615a656d apg: update from 2.2.3 to 2.3.0b 2014-10-09 20:16:03 +02:00
Aristid Breitkreuz 352c310be9 ansible: update from 1.7.1 to 1.7.2 2014-10-09 20:14:38 +02:00
Igor Pashev c5f4d996fc Fixed buidling sysstat
https://github.com/NixOS/nixpkgs/issues/4441
2014-10-09 21:59:53 +04:00
Igor Pashev 0635f1640f atool's configure script uses bashizm
if test "${startperl:0:1}" = "#" ; then
  startperl="\\$startperl"
fi

This results in an error:
checking for perl... /nix/store/6qvjjaywj6qf8jn9splpiz9qap01w36w-perl-5.16.3/bin/perl
./configure: 2264: ./configure.lineno: Bad substitution
builder for ‘/nix/store/nk9y51xlzsbkhswc5cpl3hkryg2xw85g-atool-0.39.0.drv’ failed with exit code 2
2014-10-09 21:59:46 +04:00
Francesco Lazzarino 9db29d7e5b jq builds on darwin 2014-10-09 12:00:34 -05:00
Francesco Lazzarino b007ae3d08 thrift builds on darwin 2014-10-09 11:57:18 -05:00
Eelco Dolstra a97e1ee52d Add a Hydra job to track the size of the initrd 2014-10-09 18:40:37 +02:00
Eelco Dolstra 666cf992f0 Revert "mdadm: update from 3.3 to 3.3.2"
This reverts commit 1faf6106c3. It
causes the size of the initrd to explode from ~6 MB to 19 MB:

  http://hydra.nixos.org/build/15728196

The reason is that mdadm now contains a self-reference:

  $ strings ./result/sbin/mdadm  | grep /nix/store
  ...
  ACTION=="add", SUBSYSTEM=="block", ENV{DEVTYPE}=="%s", ENV{ID_PATH}=="%s", RUN+="/nix/store/y1ap6va0av6jhxf7ddnr8vdwxd7b44gd-mdadm-3.3.2/sbin/mdadm --incremental $env{DEVNAME}"
  ACTION=="add", SUBSYSTEM=="block", ENV{ID_PATH}=="%s", RUN+="/nix/store/y1ap6va0av6jhxf7ddnr8vdwxd7b44gd-mdadm-3.3.2/sbin/mdadm --incremental $env{DEVNAME}"
/nix/store/y1ap6va0av6jhxf7ddnr8vdwxd7b44gd-mdadm-3.3.2/sbin/mdmon

(Previously, it referred to /sbin/mdadm.) This causes mdadm, glibc and
linux-headers to be added to the initrd.
2014-10-09 18:34:37 +02:00
Georges Dubus a172b4b1f8 Merge pull request #4436 from madjar/kde414
Switch to kde 4.14 and remove 4.12
2014-10-09 17:42:19 +02:00
Damien Cassou a365f5080a pharo-vm: Add dependency to cairo 2014-10-09 16:56:54 +02:00
Georges Dubus 205c550e54 Removed kde4_next, because kde 4.14 will be the last kde4 2014-10-09 16:36:40 +02:00
Eelco Dolstra 5614b000ed Add some more stuff to the small channel
(cherry picked from commit 8cf5281744)
2014-10-09 16:35:34 +02:00
Eelco Dolstra 93ff0d5496 Add an entire NixOS build to the channel
This causes some cruft to be uploaded (such as unit files) but it
ensures that every package used by the base system ends up in the
channel, not just environment.systemPackages.

(cherry picked from commit 4dfca8e14a)
2014-10-09 16:35:28 +02:00
Eelco Dolstra c7a1944ad9 Remove missing attribute
(cherry picked from commit f963f57b62)
2014-10-09 16:35:13 +02:00
Eelco Dolstra a0fd8e8066 Add a jobset for a "nixos-small" channel
This channel only builds a small subset of Nixpkgs, mostly suitable
for servers. Since the channel update doesn't require thousands of
packages to be built first, it should provide much faster turnaround
in case of security updates.

(cherry picked from commit 2c7acc6731)
2014-10-09 16:34:50 +02:00