diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2016-02-19 13:12:11 +0100 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2016-02-19 13:16:41 +0100 |
commit | 4d06bf70f4580d5cb907278dd3c384c305f95c74 (patch) | |
tree | b1161e1ea077813651f45616e453e3ff494ecaff /pkgs/tools/filesystems | |
parent | dda9f0ba2308a11cdc0694145d0f2caedd8a8f6a (diff) |
buildPythonApplication: use new function for Python applications
Diffstat (limited to 'pkgs/tools/filesystems')
-rw-r--r-- | pkgs/tools/filesystems/gitfs/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/filesystems/nixpart/0.4/blivet.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/filesystems/nixpart/0.4/default.nix | 10 | ||||
-rw-r--r-- | pkgs/tools/filesystems/nixpart/0.4/pykickstart.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/filesystems/nixpart/0.4/pyparted.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/filesystems/nixpart/default.nix | 4 |
6 files changed, 15 insertions, 15 deletions
diff --git a/pkgs/tools/filesystems/gitfs/default.nix b/pkgs/tools/filesystems/gitfs/default.nix index cd79f5db85b3..9c44394697f7 100644 --- a/pkgs/tools/filesystems/gitfs/default.nix +++ b/pkgs/tools/filesystems/gitfs/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, python, buildPythonPackage, pythonPackages }: +{ stdenv, fetchFromGitHub, python, buildPythonApplication, pythonPackages }: -buildPythonPackage rec { +buildPythonApplication rec { name = "gitfs-0.2.5"; src = fetchFromGitHub { diff --git a/pkgs/tools/filesystems/nixpart/0.4/blivet.nix b/pkgs/tools/filesystems/nixpart/0.4/blivet.nix index d4129f4d390a..d3b3b716ffa0 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/blivet.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/blivet.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, buildPythonPackage, pykickstart, pyparted, pyblock +{ stdenv, fetchurl, buildPythonApplication, pykickstart, pyparted, pyblock , libselinux, cryptsetup, multipath_tools, lsof, utillinux , useNixUdev ? true, udev ? null }: assert useNixUdev -> udev != null; -buildPythonPackage rec { +buildPythonApplication rec { name = "blivet-${version}"; version = "0.17-1"; diff --git a/pkgs/tools/filesystems/nixpart/0.4/default.nix b/pkgs/tools/filesystems/nixpart/0.4/default.nix index 01a3caafc5dd..1d9838168952 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/default.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/default.nix @@ -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 udev; @@ -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"; diff --git a/pkgs/tools/filesystems/nixpart/0.4/pykickstart.nix b/pkgs/tools/filesystems/nixpart/0.4/pykickstart.nix index 7bc3f54c2363..86479126d393 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/pykickstart.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/pykickstart.nix @@ -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"; diff --git a/pkgs/tools/filesystems/nixpart/0.4/pyparted.nix b/pkgs/tools/filesystems/nixpart/0.4/pyparted.nix index 67f318c863e1..721e5185be3f 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/pyparted.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/pyparted.nix @@ -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"; diff --git a/pkgs/tools/filesystems/nixpart/default.nix b/pkgs/tools/filesystems/nixpart/default.nix index 895ae99c3093..ce00367c771c 100644 --- a/pkgs/tools/filesystems/nixpart/default.nix +++ b/pkgs/tools/filesystems/nixpart/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, buildPythonPackage, blivet }: +{ stdenv, fetchurl, buildPythonApplication, blivet }: -buildPythonPackage rec { +buildPythonApplication rec { name = "nixpart-${version}"; version = "1.0.0"; |