Commit Graph

72 Commits

Author SHA1 Message Date
Vladimír Čunát
09af15654f Merge master into closure-size
The kde-5 stuff still didn't merge well.
I hand-fixed what I saw, but there may be more problems.
2016-03-08 09:58:19 +01:00
Frederik Rietdijk
4d06bf70f4 buildPythonApplication: use new function for Python applications 2016-02-19 13:16:41 +01:00
Vladimír Čunát
ae74c356d9 Merge recent 'staging' into closure-size
Let's get rid of those merge conflicts.
2016-02-03 16:57:19 +01:00
aszlig
24ae34c0d7
nixpart0: Fix race condition in formatting devices
This adds a backport of rhinstaller/blivet#39 to the pinned blivet
version 0.17, it's addressing the following upstream bug:

https://bugzilla.redhat.com/show_bug.cgi?id=1196397

It has been reported at aszlig/nixpart#7 and tested by @manveru (the
issue reporter), thanks a lot.

Thanks also to @domenkozar for finding the upstream issue.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Reported-by: Michael Fellinger <m.fellinger@gmail.com>
Fixes: aszlig/nixpart#7
2016-01-22 13:30:43 +01:00
Vladimír Čunát
333d69a5f0 Merge staging into closure-size
The most complex problems were from dealing with switches reverted in
the meantime (gcc5, gmp6, ncurses6).
It's likely that darwin is (still) broken nontrivially.
2015-11-20 14:32:58 +01:00
aszlig
3bf3d19759
nixpart0: Don't search for libudev using SO major.
The SO major is going to change in the upcoming update of the Hetzner
rescue system, which will cause NixOps to break because it's statically
using the SO major 0 while the new rescue system will have the major
number 1.

I'm still keeping the udevSoMajor attribute to retain backwards-
compatibility with older NixOps versions.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-10-21 17:15:17 +02:00
Vladimír Čunát
b44d846990 udev: complete rework
- systemd puts all into one output now (except for man),
  because I wasn't able to fix all systemd/udev refernces
  for NixOS to work well
- libudev is now by default *copied* into another path,
  which is what most packages will use as build input :-)
- pkgs.udev = [ libudev.out libudev.dev ]; because there are too many
  references that just put `udev` into build inputs (to rewrite them all),
  also this made "${udev}/foo" fail at *evaluation* time
  so it's easier to catch and change to something more specific
2015-10-04 10:03:53 +02:00
Vladimír Čunát
5227fb1dd5 Merge commit staging+systemd into closure-size
Many non-conflict problems weren't (fully) resolved in this commit yet.
2015-10-03 13:33:37 +02:00
Tobias Geerinckx-Rice
b2d7f4b1ba Use common licence attributes from lib/licenses.nix
Many (less easily automatically converted) old-style strings
remain.

Where there was any possible ambiguity about the exact version or
variant intended, nothing was changed. IANAL, nor a search robot.

Use `with stdenv.lib` wherever it makes sense.
2015-05-27 22:00:06 +02:00
Vladimír Čunát
b7c3c25218 fix ${udev} references (and a few others) 2015-05-05 11:52:08 +02:00
Ludovic Courtès
41b53577a8 unmaintain a bunch of packages 2015-01-13 22:33:49 +01: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
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
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
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
Eelco Dolstra
2147a07938 Fix a bunch of Hydra evaluation errors 2013-10-07 17:36:47 +02:00
aszlig
1362d479cb
nixpart: Update to bugfix version 0.4.1.
Contains the following fix:

  - Fix mounting btrfs when mount_only (-m) is used.

I would like to update blivet as well, but at the moment it breaks for
nixpart, so let's retry later when we're at 0.5.x or even 1.x :-)

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-08-02 07:36:08 +02:00
aszlig
b47e2c2ab6
nixpart: New upstream version 0.4.0.
Changes are:

 - Properly detect GPT disklabels and create proper BIOS boot partitions
   if necessary.
 - Return exit code 100 if reboot is required due to the kernel not
   picking up the new partition table.
 - Don't include BIOS boot partition in GRUB devices.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-07-12 18:41:11 +02:00
aszlig
f75f7e793b
nixpart: New upstream version 0.3.0.
This fixes two issues:

 - Don't _always_ print out NixOS configuration, only when explicitly
   requested with -p.
 - Add GRUB boot devices to NixOS configuration output.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-07-11 16:05:59 +02:00
aszlig
6fcc6816e7
nixpart: Update to new version 0.2.1.
This is a minor bugfix release and only corrects "type" in fileSystems output to
"fsType".

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-07-08 14:27:44 +02:00
aszlig
b2311fbf3a
python-nixpart: Propagate overrides of blivet.
This allows for easy overriding of blivets udev dependency using only
nixpart.override.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-07-08 14:27:43 +02:00
aszlig
513de0ff57
python-nixpart: Move into tools/filesystems/.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-07-08 14:27:42 +02:00