public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into closure-size

Browse Source 
The kde-5 stuff still didn't merge well.
I hand-fixed what I saw, but there may be more problems.
This commit is contained in:
Vladimír Čunát
2016-03-08 09:58:19 +01:00
parent f306e67e15 0ee75214f3
commit 09af15654f
1276 changed files with 78548 additions and 29166 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/filesystems/nixpart/0.4/blivet.nix
+2 -2
View File
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, buildPythonPackage, pykickstart, pyparted, pyblock
{ stdenv, fetchurl, buildPythonApplication, pykickstart, pyparted, pyblock
, libselinux, cryptsetup, multipath_tools, lsof, utillinux
, useNixUdev ? true, libudev ? null
}:
assert useNixUdev -> libudev != null;
buildPythonPackage rec {
buildPythonApplication rec {
name = "blivet-${version}";
version = "0.17-1";
pkgs/tools/filesystems/nixpart/0.4/default.nix
+5 -5
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, python, buildPythonPackage
{ stdenv, fetchurl, python, buildPythonApplication
# Propagated to blivet
, useNixUdev ? true
# No longer needed, but kept for backwards-compatibility with older NixOps.
@@ -9,7 +9,7 @@
let
blivet = import ./blivet.nix {
inherit stdenv fetchurl buildPythonPackage;
inherit stdenv fetchurl buildPythonApplication;
inherit pykickstart pyparted pyblock cryptsetup multipath_tools;
inherit useNixUdev;
inherit (pkgs) lsof utillinux libudev;
@@ -48,15 +48,15 @@ let
};
pykickstart = import ./pykickstart.nix {
inherit stdenv fetchurl python buildPythonPackage urlgrabber;
inherit stdenv fetchurl python buildPythonApplication urlgrabber;
};
pyparted = import ./pyparted.nix {
inherit stdenv fetchurl python buildPythonPackage parted;
inherit stdenv fetchurl python buildPythonApplication parted;
inherit (pkgs) pkgconfig e2fsprogs;
};
in buildPythonPackage rec {
in buildPythonApplication rec {
name = "nixpart-${version}";
version = "0.4.1";
pkgs/tools/filesystems/nixpart/0.4/pykickstart.nix
+2 -2
View File
@@ -1,6 +1,6 @@
{ stdenv, python, buildPythonPackage, fetchurl, urlgrabber }:
{ stdenv, python, buildPythonApplication, fetchurl, urlgrabber }:
buildPythonPackage rec {
buildPythonApplication rec {
name = "pykickstart-${version}";
version = "1.99.39";
pkgs/tools/filesystems/nixpart/0.4/pyparted.nix
+2 -2
View File
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig, python, buildPythonPackage, parted, e2fsprogs }:
{ stdenv, fetchurl, pkgconfig, python, buildPythonApplication, parted, e2fsprogs }:
buildPythonPackage rec {
buildPythonApplication rec {
name = "pyparted-${version}";
version = "3.10";