summary refs log tree commit diff
path: root/pkgs/tools/filesystems
diff options
context:
space:
mode:
authoraszlig <aszlig@redmoonstudios.org>2014-10-22 01:37:32 +0200
committeraszlig <aszlig@redmoonstudios.org>2014-10-22 08:22:57 +0200
commitcb2c34f1bb8245a4460cef9f82301a76ab60441c (patch)
tree0f6fe7ee6d7f561155cf019c1c9a612bd1a5081e /pkgs/tools/filesystems
parent7deadbb55f327dd9fffd397c72e13e4b95e15c61 (diff)
downloadnixpkgs-cb2c34f1bb8245a4460cef9f82301a76ab60441c.tar
nixpkgs-cb2c34f1bb8245a4460cef9f82301a76ab60441c.tar.gz
nixpkgs-cb2c34f1bb8245a4460cef9f82301a76ab60441c.tar.bz2
nixpkgs-cb2c34f1bb8245a4460cef9f82301a76ab60441c.tar.lz
nixpkgs-cb2c34f1bb8245a4460cef9f82301a76ab60441c.tar.xz
nixpkgs-cb2c34f1bb8245a4460cef9f82301a76ab60441c.tar.zst
nixpkgs-cb2c34f1bb8245a4460cef9f82301a76ab60441c.zip
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>
Diffstat (limited to 'pkgs/tools/filesystems')
-rw-r--r--pkgs/tools/filesystems/nixpart/default.nix13
1 files changed, 3 insertions, 10 deletions
diff --git a/pkgs/tools/filesystems/nixpart/default.nix b/pkgs/tools/filesystems/nixpart/default.nix
index 633f04320c3..f0c580b7990 100644
--- a/pkgs/tools/filesystems/nixpart/default.nix
+++ b/pkgs/tools/filesystems/nixpart/default.nix
@@ -1,13 +1,6 @@
-{ stdenv, fetchurl, buildPythonPackage, blivet
-# Propagated to blivet
-, useNixUdev ? null, udevSoMajor ? null
-}:
+{ stdenv, fetchurl, buildPythonPackage, blivet }:
 
-let
-  blivetOverrides = stdenv.lib.filterAttrs (k: v: v != null) {
-    inherit useNixUdev udevSoMajor;
-  };
-in buildPythonPackage rec {
+buildPythonPackage rec {
   name = "nixpart-${version}";
   version = "0.4.1";
 
@@ -16,7 +9,7 @@ in buildPythonPackage rec {
     sha256 = "0avwd8p47xy9cydlbjxk8pj8q75zyl68gw2w6fnkk78dcb1a3swp";
   };
 
-  propagatedBuildInputs = [ (blivet.override blivetOverrides) ];
+  propagatedBuildInputs = [ blivet ];
 
   doCheck = false;