diff --git a/pkgs/by-name/ca/carburetor/package.nix b/pkgs/by-name/ca/carburetor/package.nix index 9df7fcaa6f5a..c7d96c44cede 100644 --- a/pkgs/by-name/ca/carburetor/package.nix +++ b/pkgs/by-name/ca/carburetor/package.nix @@ -14,7 +14,7 @@ }: let # This package should be updated together with pkgs/by-name/tr/tractor/package.nix - version = "5.0.0"; + version = "5.1.1"; in python3Packages.buildPythonApplication { @@ -28,16 +28,9 @@ python3Packages.buildPythonApplication { owner = "tractor"; repo = "carburetor"; tag = version; - hash = "sha256-Z67bqjogPz5sz6JwM68z1jsaqvRBAOMDeBLcyLo+QLY="; + hash = "sha256-mHuD9fxHTmTfEdAsiqTtFVzxXEjD8VIDNDKF2RjcAUg="; }; - patches = [ - (fetchpatch2 { - url = "https://framagit.org/tractor/carburetor/-/commit/620b70288942497abc20ad26c043b593f66e9e3b.diff"; - hash = "sha256-oFKLjvu+fwgyU4FIUb2K8jwXOP34P3pEazOhofwveJw="; - }) - ]; - build-system = [ meson python3Packages.meson-python @@ -62,6 +55,8 @@ python3Packages.buildPythonApplication { dontWrapGApps = true; preFixup = '' + substituteInPlace $out/share/applications/io.frama.tractor.carburetor.desktop \ + --replace-fail "Exec=gapplication launch io.frama.tractor.carburetor" "Exec=$out/bin/carburetor" makeWrapperArgs+=("''${gappsWrapperArgs[@]}") ''; diff --git a/pkgs/by-name/tr/tractor/package.nix b/pkgs/by-name/tr/tractor/package.nix index f25021b58ffe..c05e8da59838 100644 --- a/pkgs/by-name/tr/tractor/package.nix +++ b/pkgs/by-name/tr/tractor/package.nix @@ -17,7 +17,7 @@ let # This package should be updated together with pkgs/by-name/ca/carburetor/package.nix - version = "5.0.0"; + version = "5.1.0"; in python3Packages.buildPythonApplication { pname = "tractor"; @@ -30,7 +30,7 @@ python3Packages.buildPythonApplication { owner = "tractor"; repo = "tractor"; tag = version; - hash = "sha256-KyVL3dFofoi2TRtZo557X9P/RD16v94VuWdtdAskZk4="; + hash = "sha256-pyGDxHOpaZutUhXRwGAN77fGNn68EWIGgWu80avkuSI="; }; patches = [ ./fix-gsettings-schema.patch ];