Commit Graph

51384 Commits

Author SHA1 Message Date
Pascal Wittmann
773e804274 Merge pull request #4619 from aronasorman/update_elixir
update elixir to v1.0.2
2014-10-22 20:20:01 +02:00
Aron Fyodor Asor
758b937120 update elixir to v1.0.2 2014-10-22 10:55:43 -07:00
Mateusz Kowalczyk
7f7233b61d sxiv: use giflib 5.0
https://github.com/muennich/sxiv/issues/180
2014-10-22 18:42:35 +01:00
Mateusz Kowalczyk
a07b54ec38 Merge pull request #4610 from MP2E/chocolate_doom_update
update chocolateDoom to v2.1.0, chocolateDoomMaster removed
2014-10-22 17:33:42 +01:00
aszlig
eea4fce4a5
btrfsprogs: Revert update to version 3.17.
This reverts commit 249e417677.

Breaks snapper:

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

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-10-22 18:12:12 +02:00
Mathijs Kwik
98015ee5ba conkeror: upgrade to 141017 and use firefox for xulrunner 2014-10-22 18:08:46 +02:00
Sander van der Burg
cddc7382ef nodejs: disable usage of http-parser library on darwin, because it breaks the build 2014-10-22 17:51:24 +02:00
Domen Kožar
9a48f6f9ef Revert "chromium: update dev, beta, stable channels"
This reverts commit 32df2a0838.

See
32df2a0838 (commitcomment-8260774)
2014-10-22 17:42:29 +02:00
Sander van der Burg
c419b193a2 Updated nodejs packages 2014-10-22 17:03:21 +02:00
Ricardo M. Correia
10348a0f2c grsecurity: Update documentation to mention correct kernels 2014-10-22 16:50:36 +02:00
Ricardo M. Correia
f59afe3994 pax-utils: Update from 0.8.1 -> 0.9.1 2014-10-22 16:47:09 +02:00
Ricardo M. Correia
2838c2a7bc flashplayer: Update from 11.2.202.406 -> 11.2.202.411 2014-10-22 16:46:43 +02:00
Ricardo M. Correia
cb95ac1352 Merge pull request #4609 from alexanderkjeldaas/updated-grsec
Updated grsec.
2014-10-22 16:37:21 +02:00
Mathijs Kwik
6af6bd9b51 xulrunner: fix for building on i686 2014-10-22 16:20:43 +02:00
Mathijs Kwik
2140adf11f Revert "Revert "xulrunner: stick to firefox's src attribute""
This reverts commit f13b383449.
2014-10-22 16:20:43 +02:00
Eelco Dolstra
bb8500393b Disable Darwin builds until we get the Darwin machine back 2014-10-22 16:08:42 +02:00
Bjørn Forsman
34ec068a46 quilt: set meta.platforms = all
We'll reduce it if/when Hydra reports some broken platforms.
2014-10-22 16:07:37 +02:00
Domen Kožar
bdd50d597b Merge pull request #4616 from balajisivaraman/scala-2.11.2
scala: Bump up version from 2.11.1 to 2.11.2
2014-10-22 16:06:26 +02:00
Domen Kožar
1cd77b2de9 .version shouldn't include newline 2014-10-22 15:59:35 +02:00
Balaji Sivaraman
93fa6d456b scala: Bump up version from 2.11.1 to 2.11.2 2014-10-22 19:27:54 +05:30
Domen Kožar
5858ac57a8 next release will be 14.11 2014-10-22 15:41:30 +02:00
Rob Vermaas
6596dccfd9 zabbix.server: update from 1.8.20 to 1.8.21 2014-10-22 15:29:05 +02:00
Domen Kožar
32df2a0838 chromium: update dev, beta, stable channels 2014-10-22 15:06:05 +02:00
Domen Kožar
c01af09401 squashfs: -lgcc_s 2014-10-22 15:06:05 +02:00
Peter Simons
d1fd6c90f4 scala: Revert "update from 2.11.1 to 2.11.3".
This reverts commit 4507aeb200.
Scala 2.11.3 is broken:

  https://groups.google.com/forum/#!msg/scala-internals/SSD9BNJaFbU/rACBkHrs2JEJ.
2014-10-22 14:57:13 +02:00
Domen Kožar
b3a4c3c2d0 squashfs: 4.3 -> 4.4, hopefully fixes http://hydra.nixos.org/build/16422733 2014-10-22 14:36:56 +02:00
Peter Simons
b31ac058cc magit: don't install lisp files into a "magit" sub-directory
After this change, Emacs can load the magit-*.el files without further
configuration. Just add

    (require 'magit-autoloads)

to ~/.emacs, and run M-x magit-status or any other magit command.
2014-10-22 13:06:43 +02:00
Bjørn Forsman
97e0f851d9 quilt: set meta.platforms 2014-10-22 12:02:54 +02:00
Peter Simons
b0ea187001 ihaskell-wrapper: inherit the meta section from ihaskell 2014-10-22 11:47:08 +02:00
Peter Simons
1e5c45f18e haskell-network-simple: update to version 0.4.0.2 2014-10-22 11:47:08 +02:00
Peter Simons
433a2c56e5 haskell-mysql: update to version 0.1.1.7 2014-10-22 11:47:08 +02:00
Peter Simons
4d59d19143 haskell-focus: update to version 0.1.3 2014-10-22 11:47:07 +02:00
Peter Simons
a4ce7ccef3 haskell-fast-logger: update to version 2.2.3 2014-10-22 11:47:07 +02:00
Peter Simons
2c8a694706 haskell-extra: update to version 0.3.2 2014-10-22 11:47:07 +02:00
Peter Simons
84ed71cb03 haskell-dynamic-cabal: update to version 0.3.3 2014-10-22 11:47:07 +02:00
Peter Simons
1a7da2b3fd haskell-HTF: update to version 0.12.2.2 2014-10-22 11:47:07 +02:00
Peter Simons
eaf518c297 haskell-vty: update to version 5.2.4 (and remove obsolete version 4.x)
This change breaks vty-ui, which appears to be unmaintained by upstream.

https://github.com/jtdaugherty/vty-ui/issues/55
2014-10-22 11:47:07 +02:00
Peter Simons
dba01b2e77 magit: update to the latest release from Melpa 2014-10-22 11:46:56 +02:00
Peter Simons
3b4a72c3d6 git-modes: add git-modes package version 0.15.0-8-g4e10851 for Emacs
These files are required by the latest version of Magit.
2014-10-22 11:46:56 +02:00
Peter Simons
807e834742 Merge pull request #4612 from balajisivaraman/scala-2.11.3
scala: Bump up version from 2.11.1 to 2.11.3
2014-10-22 11:39:59 +02:00
Balaji Sivaraman
4507aeb200 scala: update from 2.11.1 to 2.11.3 2014-10-22 14:45:59 +05:30
Sander van der Burg
37c94eae5a Merge pull request #4611 from doublec/fhs-mount-fix
Fix build-fhs-chrootenv mount script
2014-10-22 10:48:31 +02:00
Chris Double
40791a4ec5 Fix build-fhs-chrootenv mount script 2014-10-22 10:39:17 +02:00
aszlig
0c968c9a0e
ihaskell/wrapper: Fix eval by marking as broken.
Introduced by 5e03d07621.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-10-22 09:21:53 +02:00
Cray Elliott
48e0a0a3c8 update chocolateDoom to v2.1.0, chocolateDoomMaster removed 2014-10-22 00:01:33 -07:00
aszlig
57aaf3d36e
Merge branch 'nixpart-1.0-preparations'.
Partially and temporarily addresses NixOS/nixops#228.

We now have an up-to-date version of Blivet and a bunch of its dependen-
cies as well as the old nixpart 0.4 with all its old and crappy
dependencies, which should fix _simple_ partitioning layouts for NixOps.

Also, nixpart 1.0 is now marked as broken, because it is not yet
released and this branch is more of a preparation and "damage control"
in case I shouldn't manage to finish nixpart + nixos-assimilate in time
for the next NixOS release.
2014-10-22 08:23:31 +02:00
aszlig
78ef5f9c14
nixpart: Move all 0.4 dependencies into one dir.
Once nixpart 1.0 is released we then only need to delete one single
directory rather than searching for needles in a haystack, that is, all
of <nixpkgs>. Also, it keeps my sanity at an almost healthy level.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-10-22 08:22:59 +02:00
aszlig
7676ff5973
nixpart: Bring back requirements for version 0.4.
Quite a mess but at least the mdraid tests succeed now. However, the
lvm2 tests are still failing, so we need to bring back a few more old
crap :-(

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-10-22 08:22:58 +02:00
aszlig
9d2e514f46
nixos/tests/partition: Fix typo in F2FS tests.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-10-22 08:22:58 +02:00
aszlig
cff26e2d38
nixos: Add VM test for blivet.
I'm really not sure whether these tests are actually run upstream,
because there are quite a few oddities which either are my fault by just
missing something important or upstream really doesn't bother to run
those tests.

One example of this are testDiskChunk1 and testDiskChunk2, which create
two non-existing partitions and tries to allocate them. Now, in
allocatePartitions(), the partedPartition attributes are reset to None
and shortly afterwards a for loop is expecting it to be NOT None.

So, for now I'm disabling these tests and will see if we stumble on them
during work on nixpart 1.0, so we're really sure whether it's my fault
or a real bug in blivet.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-10-22 08:22:58 +02:00