diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2022-11-03 16:13:22 +0100 |
|---|---|---|
| committer | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2022-11-03 16:13:22 +0100 |
| commit | 521e2f50891aac193068cda685f1352c01d06e28 (patch) | |
| tree | ad945f4eec3f4ee4ce5885275e5e5c47e0e3610c /pkgs/os-specific/linux/prl-tools | |
| parent | 3db0fa106dc4dc66e1c6922260844a615c41b365 (diff) | |
| download | nixpkgs-521e2f50891aac193068cda685f1352c01d06e28.tar nixpkgs-521e2f50891aac193068cda685f1352c01d06e28.tar.gz nixpkgs-521e2f50891aac193068cda685f1352c01d06e28.tar.bz2 nixpkgs-521e2f50891aac193068cda685f1352c01d06e28.tar.lz nixpkgs-521e2f50891aac193068cda685f1352c01d06e28.tar.xz nixpkgs-521e2f50891aac193068cda685f1352c01d06e28.tar.zst nixpkgs-521e2f50891aac193068cda685f1352c01d06e28.zip | |
prl-tools: 18.0.3-53079 -> 18.1.0-53311
Diffstat (limited to 'pkgs/os-specific/linux/prl-tools')
| -rw-r--r-- | pkgs/os-specific/linux/prl-tools/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/prl-tools/prl-tools-6.0.patch | 13 |
2 files changed, 3 insertions, 20 deletions
diff --git a/pkgs/os-specific/linux/prl-tools/default.nix b/pkgs/os-specific/linux/prl-tools/default.nix index 97c72750ebd..e3d70f04675 100644 --- a/pkgs/os-specific/linux/prl-tools/default.nix +++ b/pkgs/os-specific/linux/prl-tools/default.nix @@ -24,20 +24,16 @@ assert (!libsOnly) -> kernel != null; stdenv.mkDerivation rec { - version = "18.0.3-53079"; + version = "18.1.0-53311"; pname = "prl-tools"; # We download the full distribution to extract prl-tools-lin.iso from # => ${dmg}/Parallels\ Desktop.app/Contents/Resources/Tools/prl-tools-lin.iso src = fetchurl { url = "https://download.parallels.com/desktop/v${lib.versions.major version}/${version}/ParallelsDesktop-${version}.dmg"; - sha256 = "sha256-z9B2nhcTSZr3L30fa54zYi6WnonQ2wezHoneT2tQWAc="; + sha256 = "sha256-2ROPFIDoV2/sMVsVhcSyn0m1QVMCNb399WzKd/cozws="; }; - patches = lib.optionals (lib.versionAtLeast kernel.version "6.0") [ - ./prl-tools-6.0.patch - ]; - hardeningDisable = [ "pic" "format" ]; nativeBuildInputs = [ p7zip undmg perl bbe autoPatchelfHook ] @@ -51,7 +47,7 @@ stdenv.mkDerivation rec { inherit libsOnly; unpackPhase = '' - undmg "${src}" + undmg $src export sourceRoot=prl-tools-build 7z x "Parallels Desktop.app/Contents/Resources/Tools/prl-tools-lin${lib.optionalString stdenv.isAarch64 "-arm"}.iso" -o$sourceRoot if test -z "$libsOnly"; then diff --git a/pkgs/os-specific/linux/prl-tools/prl-tools-6.0.patch b/pkgs/os-specific/linux/prl-tools/prl-tools-6.0.patch deleted file mode 100644 index f0bd00d24e0..00000000000 --- a/pkgs/os-specific/linux/prl-tools/prl-tools-6.0.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/kmods/prl_fs_freeze/Snapshot/Guest/Linux/prl_freeze/prl_fs_freeze.c b/kmods/prl_fs_freeze/Snapshot/Guest/Linux/prl_freeze/prl_fs_freeze.c -index baa8a19..6788791 100644 ---- a/kmods/prl_fs_freeze/Snapshot/Guest/Linux/prl_freeze/prl_fs_freeze.c -+++ b/kmods/prl_fs_freeze/Snapshot/Guest/Linux/prl_freeze/prl_fs_freeze.c -@@ -306,7 +306,7 @@ int seq_show(struct seq_file *file, void *data) - char buf[BDEVNAME_SIZE]; - - fsb = list_entry((struct list_head*)data, struct frozen_sb, list); -- bdevname(fsb->sb->s_bdev, buf); -+ snprintf(buf, sizeof(buf), "%pg", fsb->sb->s_bdev); - seq_printf(file, "%s\n", buf); - return 0; - } |