From 73e7919437a29a0ad25ae95b13c38c5eb2c5e4d4 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sun, 27 Apr 2025 20:57:20 +0200 Subject: [PATCH] abracadabra: 3.1.0 -> 3.2.0 --- pkgs/by-name/ab/abracadabra/package.nix | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/pkgs/by-name/ab/abracadabra/package.nix b/pkgs/by-name/ab/abracadabra/package.nix index e79cfc8f87a3..08fac458cdb1 100644 --- a/pkgs/by-name/ab/abracadabra/package.nix +++ b/pkgs/by-name/ab/abracadabra/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, cmake, qt6, faad2, @@ -16,29 +15,15 @@ stdenv.mkDerivation rec { pname = "abracadabra"; - version = "3.1.0"; + version = "3.2.0"; src = fetchFromGitHub { owner = "KejPi"; repo = "AbracaDABra"; rev = "v${version}"; - hash = "sha256-kH84xDK1873ekxIYlOw6M3kVH+Sm/Sofb3AAbs4XzE0="; + hash = "sha256-4M/LrM1Edu9isvpKPArir7UwPJ0u0Yjl4ttFtxcqYtM="; }; - patches = [ - # upstream patches, remove with next upgrade - (fetchpatch { - name = "no-qcustomplot"; - url = "https://github.com/KejPi/AbracaDABra/commit/b0800cfe7abebf79f1edb915b3cf55fe96129017.patch"; - hash = "sha256-8FiXix/riLvkxd2uTJCoUESInPiCsF6B+qaxRGbeUcs="; - }) - (fetchpatch { - name = "fix-missing-include"; - url = "https://github.com/KejPi/AbracaDABra/commit/8f88a3351fccea93c3c83bbfa94e98fb0823b0ae.patch"; - hash = "sha256-9AloBgpUuewUBGM/NTHYUqd0uctJ17QJ0GA5RJN1GLQ="; - }) - ]; - nativeBuildInputs = [ cmake qt6.wrapQtAppsHook