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.
This commit is contained in:
@@ -1,6 +1,8 @@
|
||||
{ stdenv, fetchurl, python, buildPythonPackage
|
||||
# Propagated to blivet
|
||||
, useNixUdev ? true, udevSoMajor ? null
|
||||
, useNixUdev ? true
|
||||
# No longer needed, but kept for backwards-compatibility with older NixOps.
|
||||
, udevSoMajor ? null
|
||||
# Propagated dependencies
|
||||
, pkgs, urlgrabber
|
||||
}:
|
||||
@@ -9,7 +11,7 @@ let
|
||||
blivet = import ./blivet.nix {
|
||||
inherit stdenv fetchurl buildPythonPackage;
|
||||
inherit pykickstart pyparted pyblock cryptsetup multipath_tools;
|
||||
inherit useNixUdev udevSoMajor;
|
||||
inherit useNixUdev;
|
||||
inherit (pkgs) lsof utillinux libudev;
|
||||
libselinux = pkgs.libselinux.override { enablePython = true; };
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user