diff options
| author | Vladimír Čunát <v@cunat.cz> | 2020-07-04 09:10:10 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2020-07-04 09:15:27 +0200 |
| commit | e1206a21290c4bd4aa3c2ac76bd7a850ab990344 (patch) | |
| tree | f80b0a8594b5adca0ce53e1b1032ad9bbb89079f /pkgs/tools/filesystems | |
| parent | deb78151a9438fb202842d9dbe348365cfd767e0 (diff) | |
| parent | 9f93642b79ad4f6ac95300522dd690dac02f0066 (diff) | |
| download | nixpkgs-e1206a21290c4bd4aa3c2ac76bd7a850ab990344.tar nixpkgs-e1206a21290c4bd4aa3c2ac76bd7a850ab990344.tar.gz nixpkgs-e1206a21290c4bd4aa3c2ac76bd7a850ab990344.tar.bz2 nixpkgs-e1206a21290c4bd4aa3c2ac76bd7a850ab990344.tar.lz nixpkgs-e1206a21290c4bd4aa3c2ac76bd7a850ab990344.tar.xz nixpkgs-e1206a21290c4bd4aa3c2ac76bd7a850ab990344.tar.zst nixpkgs-e1206a21290c4bd4aa3c2ac76bd7a850ab990344.zip | |
Merge master into staging-next
This brings thousands of rebuilds. Hydra nixpkgs: ?compare=1597944
Diffstat (limited to 'pkgs/tools/filesystems')
| -rw-r--r-- | pkgs/tools/filesystems/bashmount/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/filesystems/btrfs-heatmap/default.nix | 46 |
2 files changed, 48 insertions, 2 deletions
diff --git a/pkgs/tools/filesystems/bashmount/default.nix b/pkgs/tools/filesystems/bashmount/default.nix index 2d66dfcee9b..206e68ce1c2 100644 --- a/pkgs/tools/filesystems/bashmount/default.nix +++ b/pkgs/tools/filesystems/bashmount/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "bashmount"; - version = "4.2.5"; + version = "4.3.0"; src = fetchFromGitHub { owner = "jamielinux"; repo = "bashmount"; rev = version; - sha256 = "1gvi2562vng887ba33s774lhhkacl8yl7d8b0yaxylzx0ap2y7l0"; + sha256 = "1idjyl5dr8a72w3lg15qx03wgc5mj2ga2v2jkyb8v9gi5ahl03mn"; }; installPhase = '' diff --git a/pkgs/tools/filesystems/btrfs-heatmap/default.nix b/pkgs/tools/filesystems/btrfs-heatmap/default.nix new file mode 100644 index 00000000000..04d74d78cfd --- /dev/null +++ b/pkgs/tools/filesystems/btrfs-heatmap/default.nix @@ -0,0 +1,46 @@ +{ stdenv, lib +, fetchFromGitHub +, python3 +, installShellFiles +, fetchurl +}: + +stdenv.mkDerivation rec { + pname = "btrfs-heatmap"; + version = "8"; + + src = fetchFromGitHub { + owner = "knorrie"; + repo = "btrfs-heatmap"; + rev = "v${version}"; + sha256 = "035frvk3s7g18y81srssvm550nfq7jylr7w60nvixidxvrc0yrnh"; + }; + + # man page is currently only in the debian branch + # https://github.com/knorrie/btrfs-heatmap/issues/11 + msrc = fetchurl { + url = "https://raw.githubusercontent.com/knorrie/btrfs-heatmap/45d844e12d7f5842ebb99e65d7b968a5e1a89066/debian/man/btrfs-heatmap.8"; + sha256 = "1md7xc426sc8lq4w29gjd6gv7vjqhcwrqqcr6z39kihvi04d5f6q"; + }; + + buildInputs = [ python3 ]; + nativeBuildInputs = [ python3.pkgs.wrapPython installShellFiles ]; + + outputs = [ "out" "man" ]; + + installPhase = '' + install -Dm 0755 heatmap.py $out/sbin/btrfs-heatmap + installManPage ${msrc} + + buildPythonPath ${python3.pkgs.btrfs} + patchPythonScript $out/sbin/btrfs-heatmap + ''; + + meta = with lib; { + description = "Visualize the layout of a mounted btrfs"; + homepage = "https://github.com/knorrie/btrfs-heatmap"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = [ maintainers.evils ]; + }; +} |