colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #299379 from khaneliman/btrfs

Browse Source 
btrfs-assistant: 1.9 -> 2.0
This commit is contained in:
a-n-n-a-l-e-e 2024-04-05 22:25:13 -07:00 committed by GitHub
commit 6cc8dbb009
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkgs/tools/misc/btrfs-assistant/default.nix
View File

@ -7,25 +7,22 @@
, coreutils , coreutils
, git , git
, pkg-config , pkg-config
, qtbase , qt6
, qtsvg
, qttools
, snapper , snapper
, util-linux , util-linux
, wrapQtAppsHook
, enableSnapper ? true , enableSnapper ? true
, nix-update-script , nix-update-script
}: }:
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "btrfs-assistant"; pname = "btrfs-assistant";
version = "1.9"; version = "2.0";
src = fetchFromGitLab { src = fetchFromGitLab {
owner = "btrfs-assistant"; owner = "btrfs-assistant";
repo = "btrfs-assistant"; repo = "btrfs-assistant";
rev = finalAttrs.version; rev = finalAttrs.version;
hash = "sha256-a854WI8f9/G/BRU5rn1FKC6WRZyXNYsUL4p258C8ppw="; hash = "sha256-nE8Vsc0leXWhbrjMgJDef6jl9MqdojRniGcvUmrQNUQ=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -36,12 +33,13 @@ stdenv.mkDerivation (finalAttrs: {
buildInputs = [ buildInputs = [
btrfs-progs btrfs-progs
qtbase qt6.qtbase
qtsvg qt6.qtsvg
qttools qt6.qttools
qt6.qtwayland
]; ];
propagatedBuildInputs = [ wrapQtAppsHook ]; propagatedBuildInputs = [ qt6.wrapQtAppsHook ];
prePatch = '' prePatch = ''
substituteInPlace src/util/System.cpp \ substituteInPlace src/util/System.cpp \

2
pkgs/top-level/all-packages.nix
View File

@ -3563,7 +3563,7 @@ with pkgs;
boulder = callPackage ../tools/admin/boulder { }; boulder = callPackage ../tools/admin/boulder { };
btrfs-assistant = libsForQt5.callPackage ../tools/misc/btrfs-assistant { }; btrfs-assistant = qt6.callPackage ../tools/misc/btrfs-assistant { };
btrfs-heatmap = callPackage ../tools/filesystems/btrfs-heatmap { }; btrfs-heatmap = callPackage ../tools/filesystems/btrfs-heatmap { };