3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

51341 commits

Author SHA1 Message Date
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
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
aszlig 16371fce91
nixpart: Bump version to 1.0.0 and mark as broken.
We don't want Hydra to even try and build this, because we're going to
fill in the right sha256 as soon as the the new nixpart version is
released.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-10-22 08:22:57 +02:00
aszlig 23160383e3
nixos: Add a filesystem module for JFS.
I'm not using JFS, but this is to mainly make jfsutils available if you
have defined a JFS filesystem in your configuration.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-10-22 08:22:57 +02:00
aszlig cb2c34f1bb
blivet: Update to new upstream version 0.67.
Put a copy of old version 0.17 expression into 0.17.nix and update the
pointers from nixpart0 accordingly.

This also means, that plain nixpart is now way more broken than
nixpart0 (we might want to temporarily fix 0.4 anyway).

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-10-22 08:22:57 +02:00
Peter Simons 8953fb5e7d haskell-ihaskell: set hydraPlatforms to none to avoid evaluation errors 2014-10-22 08:12:42 +02:00
aszlig 7deadbb55f
nixpart: Copy package expression to 0.4.nix.
Update the nixpart0 pointer to point to this version, because we're
going to update blivet as well and NixOps still points to nixpart0.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-10-22 01:54:48 +02:00
aszlig 34ae3b7f77
parted: Update to new upstream version 3.2.
In order to properly run tests, we need to fix the unicode tests and
after some search, I have found that Ludo (who is also the <nixpkgs>
maintainer of parted) already reported this upstream and also provided a
solution:

http://lists.gnu.org/archive/html/bug-parted/2014-08/msg00003.html

I'm updating parted to 3.2, because the latest blivet implementation
relies on it for device geometry calculations.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-10-22 01:54:47 +02:00
aszlig 6553845afc
pyparted: Add patch to fix tests for parted 3.2.
See this message for the patch and details:

https://www.redhat.com/archives/pyparted-devel/2014-April/msg00000.html

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-10-22 01:54:47 +02:00
Peter Simons bddf342631 Patch 7a20d76 failed when the Haskell expression lacked a meta attribute. This commit fixes that issue. 2014-10-22 00:23:12 +02:00
Peter Simons 7a20d76482 Disable all Haskell builds for Darwin on Hydra.
Hydra generates a GHC closure for Darwin that for no apparent reason
contains an ancient, broken Haddock binary -- probably because of an
impurity in the build system. That bug makes those GHC binaries
unusable: <https://github.com/NixOS/nixpkgs/issues/2689>.
2014-10-21 23:54:51 +02:00
Mateusz Kowalczyk 917c1638bf emacs-magit: fix URL (hopefully) 2014-10-21 22:40:28 +01:00
Pascal Wittmann 1a4523ba8d lessc: update from 1.4.2 to 1.7.5 2014-10-21 23:07:06 +02:00
Peter Simons 5e03d07621 ihaskell: broken by the recent classy-prelude update
@edwtjo: http://hydra.cryp.to/build/208767/nixlog/1/raw
2014-10-21 23:04:40 +02:00
Peter Simons 6b73aaed7f haskell-keter: update to version 1.3.5 2014-10-21 23:04:40 +02:00
Peter Simons 1c14aa4fc9 haskell-yesod-form: update to version 1.4.1 2014-10-21 23:04:40 +02:00
Peter Simons 661b9e7531 haskell-yesod-core: update to version 1.4.3 2014-10-21 23:04:40 +02:00
Peter Simons a85ffa1bf0 haskell-yesod-bin: update to version 1.4.0.4 2014-10-21 23:04:40 +02:00
Peter Simons 63fe24d523 haskell-wai-app-static: update to version 3.0.0.2 2014-10-21 23:04:40 +02:00
Peter Simons d24a592d81 haskell-tls: update to version 1.2.13 2014-10-21 23:04:40 +02:00
Peter Simons c296d406b1 haskell-th-lift-instances: update to version 0.1.4 2014-10-21 23:04:40 +02:00
Peter Simons fcd2231cb9 haskell-tasty-th: update to version 0.1.3 2014-10-21 23:04:40 +02:00
Peter Simons 9e61b64c31 haskell-hxt-regex-xmlschema: update to version 9.2.0 2014-10-21 23:04:40 +02:00
Peter Simons 2b2bfb7dc2 haskell-hspec2: update to version 0.5.1 2014-10-21 23:04:40 +02:00
Peter Simons 51f01e63b5 haskell-hspec: update to version 1.12.1 2014-10-21 23:04:40 +02:00
Peter Simons c15e0592eb haskell-hspec-meta: update to version 1.12.1 2014-10-21 23:04:39 +02:00
Peter Simons 94bc815c87 haskell-hcltest: update to version 0.3.6 2014-10-21 23:04:39 +02:00
Peter Simons 0c80f224fc haskell-haskell-generate: update to version 0.2.2 2014-10-21 23:04:39 +02:00
Peter Simons b866c4d36a haskell-fb: update to version 1.0.7 2014-10-21 23:04:39 +02:00
Peter Simons 575ddc19cb haskell-fay: update to version 0.21.0.2 2014-10-21 23:04:39 +02:00
Peter Simons eedf2610dd haskell-extra: update to version 0.3.1 2014-10-21 23:04:39 +02:00
Peter Simons f7c75a5063 haskell-ekg: update to version 0.4.0.4 2014-10-21 23:04:39 +02:00
Peter Simons 0beec5a972 haskell-classy-prelude: update to version 0.10.1 2014-10-21 23:04:39 +02:00
Peter Simons e4cdce1213 haskell-classy-prelude-conduit: update to version 0.10.1 2014-10-21 23:04:39 +02:00
Peter Simons c28b225a6a haskell-binary-conduit: update to version 1.2.3 2014-10-21 23:04:39 +02:00
Peter Simons 53f788b421 haskell-basic-prelude: update to version 0.3.10 2014-10-21 23:04:39 +02:00
Pascal Wittmann c5fd7f3b69 twitter-bootstrap: use fetchFromGitHub 2014-10-21 22:35:30 +02:00
Domen Kožar 3514fad7cd lttng-modules: disable on 3.12 kernel 2014-10-21 21:46:34 +02:00
Mateusz Kowalczyk b41f2cdeb8 structured-haskell-mode: actually fix 2014-10-21 20:32:04 +01:00
Domen Kožar f86ef02678 lttng-modules: update to 2.6.0-rc1 2014-10-21 21:24:02 +02:00
Mateusz Kowalczyk 2026054746 emacs-magit: update to 1.2.1 2014-10-21 20:21:11 +01:00
Mateusz Kowalczyk c9dd0b1a12 structured-haskell-mode: use haskell-src-exts 1.15 2014-10-21 20:19:03 +01:00
Georges Dubus 7eadfc01b3 Merge pull request #4607 from k0ral/safe-rm
New package: safe-rm-0.11
2014-10-21 20:57:18 +02:00
John Wiegley 0fdd8b312e emacs24Macport: 23.4-mac-4.8 -> 24.4-mac-5.0 2014-10-21 13:40:53 -05:00