diff --git a/pkgs/applications/editors/xed-editor/default.nix b/pkgs/applications/editors/xed-editor/default.nix index 9034b2eb375c..d44b07292ca0 100644 --- a/pkgs/applications/editors/xed-editor/default.nix +++ b/pkgs/applications/editors/xed-editor/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "xed-editor"; - version = "3.6.1"; + version = "3.6.2"; src = fetchFromGitHub { owner = "linuxmint"; repo = "xed"; rev = version; - sha256 = "sha256-RFauTXwiaSd+J8zoJQmib4bKNR4NC/LSCCqCHv8Hdr8="; + sha256 = "sha256-+yY+vzDMeS4AMMAklzADD4/LAQgav3clM2CCK6xh47Q="; }; patches = [ diff --git a/pkgs/applications/misc/sticky/default.nix b/pkgs/applications/misc/sticky/default.nix index 66b4897e3038..62c3c8394b6a 100644 --- a/pkgs/applications/misc/sticky/default.nix +++ b/pkgs/applications/misc/sticky/default.nix @@ -15,17 +15,16 @@ stdenv.mkDerivation rec { pname = "sticky"; - version = "1.19"; + version = "1.20"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-nvnft62vZ9ivijYnQGULW7ff2aAVJiIx9xq09My2NxE="; + hash = "sha256-HzTXaJgDu72pWM0mGNNBy2yFB0u0rqATFK9JzyOw8oE="; }; postPatch = '' - sed -i -e "s|/usr/bin|$out/bin|" data/org.x.sticky.service sed -i -e "s|/usr/lib|$out/lib|" usr/bin/sticky sed -i -e "s|/usr/share|$out/share|" usr/lib/sticky/*.py ''; @@ -51,20 +50,11 @@ stdenv.mkDerivation rec { xapp ]; - postInstall = '' - # https://github.com/linuxmint/sticky/pull/118 - cp -r ../etc $out - cp -r ../usr/* $out - - glib-compile-schemas $out/share/glib-2.0/schemas - ''; - dontWrapGApps = true; preFixup = '' buildPythonPath "$out $pythonPath" - chmod +x $out/bin/sticky wrapProgram $out/bin/sticky \ --prefix PYTHONPATH : "$program_PYTHONPATH" \ ''${gappsWrapperArgs[@]} diff --git a/pkgs/desktops/cinnamon/warpinator/default.nix b/pkgs/desktops/cinnamon/warpinator/default.nix index 6f9a7e5a24d3..ca93799f5800 100644 --- a/pkgs/desktops/cinnamon/warpinator/default.nix +++ b/pkgs/desktops/cinnamon/warpinator/default.nix @@ -36,13 +36,13 @@ let in stdenv.mkDerivation rec { pname = "warpinator"; - version = "1.8.3"; + version = "1.8.4"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-qtz8/vO6LJ19NcuFf9p3DWNy41kkoBWlgZGChlnTOvI="; + hash = "sha256-T1boMqzAGMjUD62ZAlWNOe3xUx5H5ZwpR7MNipy/LKA="; }; nativeBuildInputs = [ @@ -78,9 +78,9 @@ stdenv.mkDerivation rec { # We make bubblewrap mode always available since # landlock mode is not supported in old kernels. substituteInPlace src/warpinator-launch.py \ - --replace '"/bin/python3"' '"${pythonEnv.interpreter}"' \ - --replace "/bin/bwrap" "${bubblewrap}/bin/bwrap" \ - --replace 'GLib.find_program_in_path("bwrap")' "True" + --replace-fail '"/usr/bin/python3"' '"${pythonEnv.interpreter}"' \ + --replace-fail "/usr/bin/bwrap" "${bubblewrap}/bin/bwrap" \ + --replace-fail 'GLib.find_program_in_path("bwrap")' "True" ''; passthru.updateScript = gitUpdater {