diff options
| author | Robert Schütz <rschuetz17@gmail.com> | 2018-08-30 16:33:53 +0200 |
|---|---|---|
| committer | xeji <36407913+xeji@users.noreply.github.com> | 2018-08-30 16:33:53 +0200 |
| commit | 4b4c871401345e9c4a679a6d3700409acc05858d (patch) | |
| tree | 5cb866fab8096feff2dbcfef2f871579a1f16bcc | |
| parent | c410519ae2803c2e80bb4b78257c7c57f66085d6 (diff) | |
| download | nixlib-4b4c871401345e9c4a679a6d3700409acc05858d.tar nixlib-4b4c871401345e9c4a679a6d3700409acc05858d.tar.gz nixlib-4b4c871401345e9c4a679a6d3700409acc05858d.tar.bz2 nixlib-4b4c871401345e9c4a679a6d3700409acc05858d.tar.lz nixlib-4b4c871401345e9c4a679a6d3700409acc05858d.tar.xz nixlib-4b4c871401345e9c4a679a6d3700409acc05858d.tar.zst nixlib-4b4c871401345e9c4a679a6d3700409acc05858d.zip | |
buttersink: move out of pythonPackages (#45783)
| -rw-r--r-- | pkgs/tools/filesystems/buttersink/default.nix (renamed from pkgs/development/python-modules/buttersink/default.nix) | 16 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 2 |
3 files changed, 11 insertions, 9 deletions
diff --git a/pkgs/development/python-modules/buttersink/default.nix b/pkgs/tools/filesystems/buttersink/default.nix index b13251e1ca75..791d59b7ac27 100644 --- a/pkgs/development/python-modules/buttersink/default.nix +++ b/pkgs/tools/filesystems/buttersink/default.nix @@ -1,18 +1,20 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPy3k, boto, crcmod, psutil }: +{ lib, python2 }: -buildPythonPackage rec { +python2.pkgs.buildPythonApplication rec { pname = "buttersink"; version = "0.6.9"; - disabled = isPy3k; - src = fetchPypi { + src = python2.pkgs.fetchPypi { inherit pname version; - sha256 = "c9c05982c44fbb85f17b7ef0e8bee11f375c03d89bcba50cbc2520013512107a"; + sha256 = "a797b6e92ad2acdf41e033c1368ab365aa268f4d8458b396a5770fa6c2bc3f54"; }; - propagatedBuildInputs = [ boto crcmod psutil ]; + propagatedBuildInputs = with python2.pkgs; [ boto crcmod psutil ]; - meta = with stdenv.lib; { + # No tests implemented + doCheck = false; + + meta = with lib; { description = "Synchronise btrfs snapshots"; longDescription = '' ButterSink is like rsync, but for btrfs subvolumes instead of files, diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c0877bcf66ad..97bf41a107b0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -973,6 +973,8 @@ with pkgs; bustle = haskellPackages.bustle; + buttersink = callPackage ../tools/filesystems/buttersink { }; + bwm_ng = callPackage ../tools/networking/bwm-ng { }; byobu = callPackage ../tools/misc/byobu { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 33a96e7e857d..58ae6fdcc386 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1068,8 +1068,6 @@ in { bumps = callPackage ../development/python-modules/bumps {}; - buttersink = callPackage ../development/python-modules/buttersink {}; - cached-property = callPackage ../development/python-modules/cached-property { }; caffe = pkgs.caffe.override { |