git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #119753 from evils/btrfs-heatmap
commit34463b2e3875fade97b61180b7676654ddad49fe authorSandro <sandro.jaeckel@gmail.com> dateMon 26 Apr 2021, 05:30 (6 years ago) parent298035ae49b28b
2 files changed+19−17
pkgs/development/python-modules/btrfs/default.nix+11−5 pkgs/tools/filesystems/btrfs-heatmap/default.nix+8−12
pkgs/development/python-modules/btrfs/default.nix+11−5
@@ -1,17 +1,23 @@
11{ lib
22, buildPythonPackage
3−, fetchPypi
3+, fetchFromGitHub
44}:
55
66buildPythonPackage rec {
77 pname = "btrfs";
8− version = "11";
8+ version = "12";
99
10− src = fetchPypi {
11− inherit pname version;
12− sha256 = "1w92sj47wy53ygz725xr613k32pk5khi0g9lrpp6img871241hrx";
10+ src = fetchFromGitHub {
11+ owner = "knorrie";
12+ repo = "python-btrfs";
13+ rev = "v${version}";
14+ sha256 = "sha256-ZQSp+pbHABgBTrCwC2YsUUXAf/StP4ny7MEhBgCRqgE=";
1315 };
1416
17+ # no tests (in v12)
18+ doCheck = false;
19+ pythonImportsCheck = [ "btrfs" ];
20+
1521 meta = with lib; {
1622 description = "Inspect btrfs filesystems";
1723 homepage = "https://github.com/knorrie/python-btrfs";
pkgs/tools/filesystems/btrfs-heatmap/default.nix+8−12
@@ -2,25 +2,17 @@
22, fetchFromGitHub
33, python3
44, installShellFiles
5−, fetchurl
65}:
76
87stdenv.mkDerivation rec {
98 pname = "btrfs-heatmap";
10− version = "8";
9+ version = "9";
1110
1211 src = fetchFromGitHub {
1312 owner = "knorrie";
1413 repo = "btrfs-heatmap";
1514 rev = "v${version}";
16− sha256 = "035frvk3s7g18y81srssvm550nfq7jylr7w60nvixidxvrc0yrnh";
17− };
18−
19− # man page is currently only in the debian branch
20− # https://github.com/knorrie/btrfs-heatmap/issues/11
21− msrc = fetchurl {
22− url = "https://raw.githubusercontent.com/knorrie/btrfs-heatmap/45d844e12d7f5842ebb99e65d7b968a5e1a89066/debian/man/btrfs-heatmap.8";
23− sha256 = "1md7xc426sc8lq4w29gjd6gv7vjqhcwrqqcr6z39kihvi04d5f6q";
15+ sha256 = "sha256-yCkuZqWwxrs2eS7EXY6pAOVVVSq7dAMxJtf581gX8vg=";
2416 };
2517
2618 buildInputs = [ python3 ];
@@ -29,11 +21,15 @@ stdenv.mkDerivation rec {
2921 outputs = [ "out" "man" ];
3022
3123 installPhase = ''
32− install -Dm 0755 heatmap.py $out/sbin/btrfs-heatmap
33− installManPage ${msrc}
24+ runHook preInstall
25+
26+ install -Dm 0755 btrfs-heatmap $out/sbin/btrfs-heatmap
27+ installManPage man/btrfs-heatmap.1
3428
3529 buildPythonPath ${python3.pkgs.btrfs}
3630 patchPythonScript $out/sbin/btrfs-heatmap
31+
32+ runHook postInstall
3733 '';
3834
3935 meta = with lib; {