Merge pull request #239616 from COLAMAroro/submit/update-pulsar-1.106.0

pulsar: 1.105.0 -> 1.106.0
This commit is contained in:
Felix Bühler 2023-06-25 09:57:32 +02:00 committed by GitHub
commit d3d6498c25
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 20 deletions

View file

@ -1,27 +1,11 @@
--- a/resources/pulsar.sh 2023-03-16 04:11:14.000000000 +0100
+++ b/resources/pulsar.sh 2023-03-24 14:37:13.468813964 +0100
@@ -123,22 +123,9 @@
@@ -123,7 +123,7 @@
elif [ $OS == 'Linux' ]; then
SCRIPT=$(readlink -f "$0")
- PULSAR_PATH="/opt/Pulsar/pulsar"
+ # PULSAR_PATH is set-up via `wrapProgram` in the postFixup phase
- #Will allow user to get context menu on cinnamon desktop enviroment
- #Add a check to make sure that DESKTOP_SESSION is set before attempting to grep it
- #expr substr is expecting 3 arguments string, index, length
- #If grep doesnt find anything is provides an empty string which causes the expr: syntax error: missing argument after '8' error - see pulsar-edit/pulsar#174
- #Im also not quite sure why they used grep instead of simply [ "${DESKTOP_SESSION}" == "cinnamon" ]
- if [ -n "${DESKTOP_SESSION}" ] && [ "$(expr substr $(printenv | grep 'DESKTOP_SESSION=') 17 8)" == "cinnamon" ]; then
- #This local path is almost assuredly wrong as it shouldnt exist in a standard install
- ACTION_PATH="resources/linux/desktopenviroment/cinnamon/pulsar.nemo_action"
-
- #Validate the file exists before attempting to copy it
- if [ -f "${ACTION_PATH}" ]; then
- cp "${$ACTION_PATH}" "/usr/share/nemo/actions/pulsar.nemo_action"
- fi
- fi
+ # We remove the nemo integration. It is handled by the postFixup phase
#Set tmpdir only if tmpdir is unset
: ${TMPDIR:=/tmp}

View file

@ -23,13 +23,13 @@
let
pname = "pulsar";
version = "1.105.0";
version = "1.106.0";
sourcesPath = {
x86_64-linux.tarname = "Linux.${pname}-${version}.tar.gz";
x86_64-linux.hash = "sha256-j2d83m8B6lt1eRAwOOTEq4o+CNe8I+6rkz9qyux55Qw=";
x86_64-linux.hash = "sha256-Wd0z6kHd6qZgrgZBxZQjwVC1dDqYtJ94L7aAnbuJoO8=";
aarch64-linux.tarname = "ARM.Linux.${pname}-${version}-arm64.tar.gz";
aarch64-linux.hash = "sha256-iZVE1R30Tynyn/cAwNIiGrsCMTkWKFUforOkGXSzMsw=";
aarch64-linux.hash = "sha256-Xadjqw8PRrq0ksif6te0gxn8xeYTCYnJcsrezfl2SYs=";
}.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
additionalLibs = lib.makeLibraryPath [