From e2db4ebfd5386cbc930838ca5c181b228eb1d939 Mon Sep 17 00:00:00 2001 From: Minijackson Date: Wed, 7 Jun 2023 09:12:28 +0200 Subject: [PATCH 1/2] carla: 2.5.4 -> 2.5.5 --- pkgs/applications/audio/carla/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/carla/default.nix b/pkgs/applications/audio/carla/default.nix index 4ee3aab2a79d..41698a8eec02 100644 --- a/pkgs/applications/audio/carla/default.nix +++ b/pkgs/applications/audio/carla/default.nix @@ -26,13 +26,13 @@ assert withQt -> wrapQtAppsHook != null; stdenv.mkDerivation rec { pname = "carla"; - version = "2.5.4"; + version = "2.5.5"; src = fetchFromGitHub { owner = "falkTX"; repo = pname; rev = "v${version}"; - hash = "sha256-St0+avF9/UzQj8T1eZq5HSmxnaK9+BXSuufyX0NJYbU="; + hash = "sha256-kXQ0dv4KrwvfxdP73zimof9XKpAz5E6hQrFOjLG4hKU="; }; nativeBuildInputs = [ From c0db854816aaffd0b374e667465c6e3023dc39d6 Mon Sep 17 00:00:00 2001 From: Minijackson Date: Wed, 7 Jun 2023 20:29:16 +0200 Subject: [PATCH 2/2] carla: switch to finalAttrs --- pkgs/applications/audio/carla/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/audio/carla/default.nix b/pkgs/applications/audio/carla/default.nix index 41698a8eec02..fdb3ea1e7149 100644 --- a/pkgs/applications/audio/carla/default.nix +++ b/pkgs/applications/audio/carla/default.nix @@ -24,14 +24,14 @@ assert withQt -> qtbase != null; assert withQt -> wrapQtAppsHook != null; -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "carla"; version = "2.5.5"; src = fetchFromGitHub { owner = "falkTX"; - repo = pname; - rev = "v${version}"; + repo = finalAttrs.pname; + rev = "v${finalAttrs.version}"; hash = "sha256-kXQ0dv4KrwvfxdP73zimof9XKpAz5E6hQrFOjLG4hKU="; }; @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { ++ lib.optional withGtk2 gtk2 ++ lib.optional withGtk3 gtk3; - propagatedBuildInputs = pythonPath; + propagatedBuildInputs = finalAttrs.pythonPath; enableParallelBuilding = true; @@ -100,4 +100,4 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.minijackson ]; platforms = platforms.linux; }; -} +})