joplin-plugin-inline-todo 1.7.1 → 1.7.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. package/.direnv/bin/nix-direnv-reload +17 -6
  2. package/.direnv/{nix-profile-.5286.ddcd7598b218.rc → nix-profile-.714486.0b73e36b1962.rc} +285 -142
  3. package/README.md +8 -3
  4. package/package.json +4 -1
  5. package/publish/plugin.calebjohn.todo.jpl +0 -0
  6. package/publish/plugin.calebjohn.todo.json +7 -3
package/.direnv/bin/nix-direnv-reload CHANGED
@@ -1,8 +1,19 @@
1
1
  #!/usr/bin/env bash
2
- dir="$(realpath $(dirname ${BASH_SOURCE[0]})/../..)"
3
- _nix_direnv_force_reload=1 direnv exec "$dir" true
4
- direnv reload
5
- # direnv reload updates the mtime of .envrc. Also update the timestamp of the
6
- # profile_rc file to keep track that we actually are up to date.
7
- touch $dir/.direnv/{nix,flake}-profile-*.rc
2
+ set -e
3
+ if [[ ! -d "/home/caleb/programming/joplin-inline-todo" ]]; then
4
+ echo "Cannot find source directory; Did you move it?"
5
+ echo "(Looking for "/home/caleb/programming/joplin-inline-todo")"
6
+ echo 'Cannot force reload with this script - use "direnv reload" manually and then try again'
7
+ exit 1
8
+ fi
8
9
 
10
+ # rebuild the cache forcefully
11
+ _nix_direnv_force_reload=1 direnv exec "/home/caleb/programming/joplin-inline-todo" true
12
+
13
+ # Update the mtime for .envrc.
14
+ # This will cause direnv to reload again - but without re-building.
15
+ touch "/home/caleb/programming/joplin-inline-todo/.envrc"
16
+
17
+ # Also update the timestamp of whatever profile_rc we have.
18
+ # This makes sure that we know we are up to date.
19
+ touch -r "/home/caleb/programming/joplin-inline-todo/.envrc" "/home/caleb/programming/joplin-inline-todo/.direnv"/*.rc
package/.direnv/{nix-profile-.5286.ddcd7598b218.rc → nix-profile-.714486.0b73e36b1962.rc} RENAMED
@@ -7,15 +7,15 @@ AR='ar'
7
7
  export AR
8
8
  AS='as'
9
9
  export AS
10
- BASH='/nix/store/r9h133c9m8f6jnlsqzwf89zg9w0w78s8-bash-5.2-p15/bin/bash'
10
+ BASH='/nix/store/gwgqdl0242ymlikq9s9s62gkp5cvyal3-bash-5.2p37/bin/bash'
11
11
  CC='gcc'
12
12
  export CC
13
- CONFIG_SHELL='/nix/store/r9h133c9m8f6jnlsqzwf89zg9w0w78s8-bash-5.2-p15/bin/bash'
13
+ CONFIG_SHELL='/nix/store/gwgqdl0242ymlikq9s9s62gkp5cvyal3-bash-5.2p37/bin/bash'
14
14
  export CONFIG_SHELL
15
15
  CXX='g++'
16
16
  export CXX
17
17
  HOSTTYPE='x86_64'
18
- HOST_PATH='/nix/store/wnbxah2y943l73hdmq5r7lb92lsa5f8z-nodejs-18.19.1/bin:/nix/store/y6qmvzv799sfrrcllpdsbsxxlx6lxrwd-webpack-5.89.0/bin:/nix/store/2lrishrbb8y6ghr9rqndaxmfpwr125y1-webpack-cli-5.1.4/bin:/nix/store/rk067yylvhyb7a360n8k1ps4lb4xsbl3-coreutils-9.3/bin:/nix/store/q7x6rjg6ya1gsg068fxj1sgf1k2n144n-findutils-4.9.0/bin:/nix/store/r9jlsp2szh2c1ns2milpc0qynqq28hq8-diffutils-3.10/bin:/nix/store/29w8hg0fis0pl3j4d3v0p02aicyw10lv-gnused-4.9/bin:/nix/store/r1lp9kxlrc6h7vrba90gm6i94s31xvvx-gnugrep-3.11/bin:/nix/store/r9w7hwj3ahip499dlr3zzk6601x2v9kf-gawk-5.2.2/bin:/nix/store/0ybz4c399fq3wiqc1ni0yylcxhs1x1hc-gnutar-1.35/bin:/nix/store/hcrf95x3r60kw71wgwbdybjfcq0ipkpj-gzip-1.13/bin:/nix/store/gfs0a87fzs9msav9ckdnciw3fappzgg2-bzip2-1.0.8-bin/bin:/nix/store/5vyb54sgl2x1ihrdfvj46vi2w1acv9nn-gnumake-4.4.1/bin:/nix/store/r9h133c9m8f6jnlsqzwf89zg9w0w78s8-bash-5.2-p15/bin:/nix/store/dp0pd2rljai6jlp7jb254vmbmyzik4nc-patch-2.7.6/bin:/nix/store/gvdfpnyr6smc7g9wy9fjp44j41j73f4b-xz-5.4.4-bin/bin:/nix/store/g0kc0z0wzs2s4kl377zssyxmmk5z9vim-file-5.45/bin'
18
+ HOST_PATH='/nix/store/sxw7i3pyw8v1ycw2sph0zq2byh1prrwm-nodejs-20.18.1/bin:/nix/store/8d3b7hcss6cckjd35c9msdxnq13gglqh-webpack-5.94.0/bin:/nix/store/frmq3b1x91nh7544n4cym84g1rl5kxrn-webpack-cli-5.1.4/bin:/nix/store/6wgd8c9vq93mqxzc7jhkl86mv6qbc360-coreutils-9.5/bin:/nix/store/r99d2m4swgmrv9jvm4l9di40hvanq1aq-findutils-4.10.0/bin:/nix/store/3sln66ij8pg114apkd8p6nr04y37q5z2-diffutils-3.10/bin:/nix/store/yq39xdwm4z0fhx7dsm8mlpgvcz3vbfg3-gnused-4.9/bin:/nix/store/vniy1y5n8g28c55y7788npwc4h09fh7c-gnugrep-3.11/bin:/nix/store/scgfwh3z1s3l2vhvyjsgfgx5ql552sls-gawk-5.3.1/bin:/nix/store/0wqn2k3v5xzrc9rwinijdyr2ywwl82x4-gnutar-1.35/bin:/nix/store/5y240z436gf3rwmkwbhn1a17pqw509w4-gzip-1.13/bin:/nix/store/1yyryxp7mh7zsciapi8f1n0mnxkigmf8-bzip2-1.0.8-bin/bin:/nix/store/hbzw8k8ygv6bfzvsvnd4gb8qmm8xjbvn-gnumake-4.4.1/bin:/nix/store/gwgqdl0242ymlikq9s9s62gkp5cvyal3-bash-5.2p37/bin:/nix/store/rfrjws98w6scfx7m63grb0m6sg925ahd-patch-2.7.6/bin:/nix/store/4i4mjaf7z6gddspar487grxk5k1j4dcd-xz-5.6.3-bin/bin:/nix/store/9wbpsj6ksd16x1qdqs29xli1dpz3fnl0-file-5.45/bin'
19
19
  export HOST_PATH
20
20
  IFS='
21
21
  '
@@ -25,21 +25,21 @@ LD='ld'
25
25
  export LD
26
26
  LINENO='76'
27
27
  MACHTYPE='x86_64-pc-linux-gnu'
28
- NIX_BINTOOLS='/nix/store/0fp4c5pbk6lmlk59bv4hhxch3py2dq6h-binutils-wrapper-2.40'
28
+ NIX_BINTOOLS='/nix/store/qlzvmgr8w9prdlyys7irqf86p7bndf5b-binutils-wrapper-2.43.1'
29
29
  export NIX_BINTOOLS
30
30
  NIX_BINTOOLS_WRAPPER_TARGET_HOST_x86_64_unknown_linux_gnu='1'
31
31
  export NIX_BINTOOLS_WRAPPER_TARGET_HOST_x86_64_unknown_linux_gnu
32
32
  NIX_BUILD_CORES='16'
33
33
  export NIX_BUILD_CORES
34
- NIX_CC='/nix/store/ihhhd1r1a2wb4ndm24rnm83rfnjw5n0z-gcc-wrapper-12.3.0'
34
+ NIX_CC='/nix/store/888bkaqdpfpx72dd8bdc69qsqlgbhcvf-gcc-wrapper-13.3.0'
35
35
  export NIX_CC
36
36
  NIX_CC_WRAPPER_TARGET_HOST_x86_64_unknown_linux_gnu='1'
37
37
  export NIX_CC_WRAPPER_TARGET_HOST_x86_64_unknown_linux_gnu
38
- NIX_CFLAGS_COMPILE=' -frandom-seed=h87aicg9ws -isystem /nix/store/wnbxah2y943l73hdmq5r7lb92lsa5f8z-nodejs-18.19.1/include -isystem /nix/store/wnbxah2y943l73hdmq5r7lb92lsa5f8z-nodejs-18.19.1/include'
38
+ NIX_CFLAGS_COMPILE=' -frandom-seed=8nv9mbcr5s -isystem /nix/store/sxw7i3pyw8v1ycw2sph0zq2byh1prrwm-nodejs-20.18.1/include -isystem /nix/store/sxw7i3pyw8v1ycw2sph0zq2byh1prrwm-nodejs-20.18.1/include'
39
39
  export NIX_CFLAGS_COMPILE
40
40
  NIX_ENFORCE_NO_NATIVE='1'
41
41
  export NIX_ENFORCE_NO_NATIVE
42
- NIX_HARDENING_ENABLE='fortify fortify3 stackprotector pic strictoverflow format relro bindnow'
42
+ NIX_HARDENING_ENABLE='bindnow format fortify fortify3 pic relro stackprotector strictoverflow zerocallusedregs'
43
43
  export NIX_HARDENING_ENABLE
44
44
  NIX_LDFLAGS='-rpath /home/caleb/programming/joplin-inline-todo/outputs/out/lib '
45
45
  export NIX_LDFLAGS
@@ -50,7 +50,7 @@ NM='nm'
50
50
  export NM
51
51
  NODE_OPTIONS='--openssl-legacy-provider'
52
52
  export NODE_OPTIONS
53
- NODE_PATH='/nix/store/wnbxah2y943l73hdmq5r7lb92lsa5f8z-nodejs-18.19.1/lib/node_modules:/nix/store/y6qmvzv799sfrrcllpdsbsxxlx6lxrwd-webpack-5.89.0/lib/node_modules:/nix/store/2lrishrbb8y6ghr9rqndaxmfpwr125y1-webpack-cli-5.1.4/lib/node_modules'
53
+ NODE_PATH='/nix/store/sxw7i3pyw8v1ycw2sph0zq2byh1prrwm-nodejs-20.18.1/lib/node_modules:/nix/store/8d3b7hcss6cckjd35c9msdxnq13gglqh-webpack-5.94.0/lib/node_modules:/nix/store/frmq3b1x91nh7544n4cym84g1rl5kxrn-webpack-cli-5.1.4/lib/node_modules'
54
54
  export NODE_PATH
55
55
  OBJCOPY='objcopy'
56
56
  export OBJCOPY
@@ -60,13 +60,15 @@ OLDPWD=''
60
60
  export OLDPWD
61
61
  OPTERR='1'
62
62
  OSTYPE='linux-gnu'
63
- PATH='/nix/store/7ywggws38m4788rm8fvbcsmyddnq0q3m-patchelf-0.15.0/bin:/nix/store/ihhhd1r1a2wb4ndm24rnm83rfnjw5n0z-gcc-wrapper-12.3.0/bin:/nix/store/fdiknsmnnczx6brsbppyljcs9hqckawk-gcc-12.3.0/bin:/nix/store/vzkw8fka84r02bawr1c7jhw0j1lhzq85-glibc-2.38-44-bin/bin:/nix/store/rk067yylvhyb7a360n8k1ps4lb4xsbl3-coreutils-9.3/bin:/nix/store/0fp4c5pbk6lmlk59bv4hhxch3py2dq6h-binutils-wrapper-2.40/bin:/nix/store/3z013mdl9cvpgvavpj19rbilihz4clvi-binutils-2.40/bin:/nix/store/wnbxah2y943l73hdmq5r7lb92lsa5f8z-nodejs-18.19.1/bin:/nix/store/y6qmvzv799sfrrcllpdsbsxxlx6lxrwd-webpack-5.89.0/bin:/nix/store/2lrishrbb8y6ghr9rqndaxmfpwr125y1-webpack-cli-5.1.4/bin:/nix/store/rk067yylvhyb7a360n8k1ps4lb4xsbl3-coreutils-9.3/bin:/nix/store/q7x6rjg6ya1gsg068fxj1sgf1k2n144n-findutils-4.9.0/bin:/nix/store/r9jlsp2szh2c1ns2milpc0qynqq28hq8-diffutils-3.10/bin:/nix/store/29w8hg0fis0pl3j4d3v0p02aicyw10lv-gnused-4.9/bin:/nix/store/r1lp9kxlrc6h7vrba90gm6i94s31xvvx-gnugrep-3.11/bin:/nix/store/r9w7hwj3ahip499dlr3zzk6601x2v9kf-gawk-5.2.2/bin:/nix/store/0ybz4c399fq3wiqc1ni0yylcxhs1x1hc-gnutar-1.35/bin:/nix/store/hcrf95x3r60kw71wgwbdybjfcq0ipkpj-gzip-1.13/bin:/nix/store/gfs0a87fzs9msav9ckdnciw3fappzgg2-bzip2-1.0.8-bin/bin:/nix/store/5vyb54sgl2x1ihrdfvj46vi2w1acv9nn-gnumake-4.4.1/bin:/nix/store/r9h133c9m8f6jnlsqzwf89zg9w0w78s8-bash-5.2-p15/bin:/nix/store/dp0pd2rljai6jlp7jb254vmbmyzik4nc-patch-2.7.6/bin:/nix/store/gvdfpnyr6smc7g9wy9fjp44j41j73f4b-xz-5.4.4-bin/bin:/nix/store/g0kc0z0wzs2s4kl377zssyxmmk5z9vim-file-5.45/bin'
63
+ PATH='/nix/store/wnl9qpnhayry14lhcbdafhadsjwsdr6p-patchelf-0.15.0/bin:/nix/store/888bkaqdpfpx72dd8bdc69qsqlgbhcvf-gcc-wrapper-13.3.0/bin:/nix/store/62qjb50708fdhb4f2y7zxyqr1afir4fk-gcc-13.3.0/bin:/nix/store/29mb4q8b5306f4gk2wh38h0c1akb0n97-glibc-2.40-36-bin/bin:/nix/store/6wgd8c9vq93mqxzc7jhkl86mv6qbc360-coreutils-9.5/bin:/nix/store/qlzvmgr8w9prdlyys7irqf86p7bndf5b-binutils-wrapper-2.43.1/bin:/nix/store/vk4mlknqk9yjbqa68a7rvpfxfdw3rad7-binutils-2.43.1/bin:/nix/store/sxw7i3pyw8v1ycw2sph0zq2byh1prrwm-nodejs-20.18.1/bin:/nix/store/8d3b7hcss6cckjd35c9msdxnq13gglqh-webpack-5.94.0/bin:/nix/store/frmq3b1x91nh7544n4cym84g1rl5kxrn-webpack-cli-5.1.4/bin:/nix/store/6wgd8c9vq93mqxzc7jhkl86mv6qbc360-coreutils-9.5/bin:/nix/store/r99d2m4swgmrv9jvm4l9di40hvanq1aq-findutils-4.10.0/bin:/nix/store/3sln66ij8pg114apkd8p6nr04y37q5z2-diffutils-3.10/bin:/nix/store/yq39xdwm4z0fhx7dsm8mlpgvcz3vbfg3-gnused-4.9/bin:/nix/store/vniy1y5n8g28c55y7788npwc4h09fh7c-gnugrep-3.11/bin:/nix/store/scgfwh3z1s3l2vhvyjsgfgx5ql552sls-gawk-5.3.1/bin:/nix/store/0wqn2k3v5xzrc9rwinijdyr2ywwl82x4-gnutar-1.35/bin:/nix/store/5y240z436gf3rwmkwbhn1a17pqw509w4-gzip-1.13/bin:/nix/store/1yyryxp7mh7zsciapi8f1n0mnxkigmf8-bzip2-1.0.8-bin/bin:/nix/store/hbzw8k8ygv6bfzvsvnd4gb8qmm8xjbvn-gnumake-4.4.1/bin:/nix/store/gwgqdl0242ymlikq9s9s62gkp5cvyal3-bash-5.2p37/bin:/nix/store/rfrjws98w6scfx7m63grb0m6sg925ahd-patch-2.7.6/bin:/nix/store/4i4mjaf7z6gddspar487grxk5k1j4dcd-xz-5.6.3-bin/bin:/nix/store/9wbpsj6ksd16x1qdqs29xli1dpz3fnl0-file-5.45/bin'
64
64
  export PATH
65
65
  PS4='+ '
66
66
  RANLIB='ranlib'
67
67
  export RANLIB
68
68
  READELF='readelf'
69
69
  export READELF
70
+ SHELL='/nix/store/gwgqdl0242ymlikq9s9s62gkp5cvyal3-bash-5.2p37/bin/bash'
71
+ export SHELL
70
72
  SIZE='size'
71
73
  export SIZE
72
74
  SOURCE_DATE_EPOCH='315532800'
@@ -75,11 +77,12 @@ STRINGS='strings'
75
77
  export STRINGS
76
78
  STRIP='strip'
77
79
  export STRIP
78
- XDG_DATA_DIRS='/nix/store/7ywggws38m4788rm8fvbcsmyddnq0q3m-patchelf-0.15.0/share'
80
+ XDG_DATA_DIRS='/nix/store/wnl9qpnhayry14lhcbdafhadsjwsdr6p-patchelf-0.15.0/share'
79
81
  export XDG_DATA_DIRS
80
82
  __structuredAttrs=''
81
83
  export __structuredAttrs
82
- buildInputs='/nix/store/wnbxah2y943l73hdmq5r7lb92lsa5f8z-nodejs-18.19.1 /nix/store/y6qmvzv799sfrrcllpdsbsxxlx6lxrwd-webpack-5.89.0 /nix/store/2lrishrbb8y6ghr9rqndaxmfpwr125y1-webpack-cli-5.1.4'
84
+ _substituteStream_has_warned_replace_deprecation='false'
85
+ buildInputs='/nix/store/sxw7i3pyw8v1ycw2sph0zq2byh1prrwm-nodejs-20.18.1 /nix/store/8d3b7hcss6cckjd35c9msdxnq13gglqh-webpack-5.94.0 /nix/store/frmq3b1x91nh7544n4cym84g1rl5kxrn-webpack-cli-5.1.4'
83
86
  export buildInputs
84
87
  buildPhase='{ echo "------------------------------------------------------------";
85
88
  echo " WARNING: the existence of this path is not guaranteed.";
@@ -91,14 +94,14 @@ buildPhase='{ echo "------------------------------------------------------------
91
94
  } >> "$out"
92
95
  '
93
96
  export buildPhase
94
- builder='/nix/store/r9h133c9m8f6jnlsqzwf89zg9w0w78s8-bash-5.2-p15/bin/bash'
97
+ builder='/nix/store/gwgqdl0242ymlikq9s9s62gkp5cvyal3-bash-5.2p37/bin/bash'
95
98
  export builder
96
99
  cmakeFlags=''
97
100
  export cmakeFlags
98
101
  configureFlags=''
99
102
  export configureFlags
100
103
  defaultBuildInputs=''
101
- defaultNativeBuildInputs='/nix/store/7ywggws38m4788rm8fvbcsmyddnq0q3m-patchelf-0.15.0 /nix/store/lfldnv3apxsd59g1jl65kw6xfkmv5w27-update-autotools-gnu-config-scripts-hook /nix/store/h9lc1dpi14z7is86ffhl3ld569138595-audit-tmpdir.sh /nix/store/m54bmrhj6fqz8nds5zcj97w9s9bckc9v-compress-man-pages.sh /nix/store/wgrbkkaldkrlrni33ccvm3b6vbxzb656-make-symlinks-relative.sh /nix/store/5yzw0vhkyszf2d179m0qfkgxmp5wjjx4-move-docs.sh /nix/store/fyaryjvghbkpfnsyw97hb3lyb37s1pd6-move-lib64.sh /nix/store/kd4xwxjpjxi71jkm6ka0np72if9rm3y0-move-sbin.sh /nix/store/pag6l61paj1dc9sv15l7bm5c17xn5kyk-move-systemd-user-units.sh /nix/store/jivxp510zxakaaic7qkrb7v1dd2rdbw9-multiple-outputs.sh /nix/store/wzdsbnv2ba3nj91aql8jjdddfmkkdh7h-patch-shebangs.sh /nix/store/cickvswrvann041nqxb0rxilc46svw1n-prune-libtool-files.sh /nix/store/xyff06pkhki3qy1ls77w10s0v79c9il0-reproducible-builds.sh /nix/store/ngg1cv31c8c7bcm2n8ww4g06nq7s4zhm-set-source-date-epoch-to-latest.sh /nix/store/wmknncrif06fqxa16hpdldhixk95nds0-strip.sh /nix/store/ihhhd1r1a2wb4ndm24rnm83rfnjw5n0z-gcc-wrapper-12.3.0'
104
+ defaultNativeBuildInputs='/nix/store/wnl9qpnhayry14lhcbdafhadsjwsdr6p-patchelf-0.15.0 /nix/store/ap724yhgv28mpsi1mmqcwypj4rrfhqmg-update-autotools-gnu-config-scripts-hook /nix/store/h9lc1dpi14z7is86ffhl3ld569138595-audit-tmpdir.sh /nix/store/m54bmrhj6fqz8nds5zcj97w9s9bckc9v-compress-man-pages.sh /nix/store/wgrbkkaldkrlrni33ccvm3b6vbxzb656-make-symlinks-relative.sh /nix/store/5yzw0vhkyszf2d179m0qfkgxmp5wjjx4-move-docs.sh /nix/store/fyaryjvghbkpfnsyw97hb3lyb37s1pd6-move-lib64.sh /nix/store/kd4xwxjpjxi71jkm6ka0np72if9rm3y0-move-sbin.sh /nix/store/pag6l61paj1dc9sv15l7bm5c17xn5kyk-move-systemd-user-units.sh /nix/store/jivxp510zxakaaic7qkrb7v1dd2rdbw9-multiple-outputs.sh /nix/store/12lvf0c7xric9cny7slvf9cmhypl1p67-patch-shebangs.sh /nix/store/cickvswrvann041nqxb0rxilc46svw1n-prune-libtool-files.sh /nix/store/xyff06pkhki3qy1ls77w10s0v79c9il0-reproducible-builds.sh /nix/store/aazf105snicrlvyzzbdj85sx4179rpfp-set-source-date-epoch-to-latest.sh /nix/store/gps9qrh99j7g02840wv5x78ykmz30byp-strip.sh /nix/store/888bkaqdpfpx72dd8bdc69qsqlgbhcvf-gcc-wrapper-13.3.0'
102
105
  depsBuildBuild=''
103
106
  export depsBuildBuild
104
107
  depsBuildBuildPropagated=''
@@ -129,7 +132,7 @@ declare -a envHostTargetHooks=('ccWrapper_addCVars' 'bintoolsWrapper_addLDVars'
129
132
  declare -a envTargetTargetHooks=()
130
133
  declare -a fixupOutputHooks=('if [ -z "${dontPatchELF-}" ]; then patchELF "$prefix"; fi' 'if [[ -z "${noAuditTmpdir-}" && -e "$prefix" ]]; then auditTmpdir "$prefix"; fi' 'if [ -z "${dontGzipMan-}" ]; then compressManPages "$prefix"; fi' '_moveLib64' '_moveSbin' '_moveSystemdUserUnits' 'patchShebangsAuto' '_pruneLibtoolFiles' '_doStrip' )
131
134
  guess='16'
132
- initialPath='/nix/store/rk067yylvhyb7a360n8k1ps4lb4xsbl3-coreutils-9.3 /nix/store/q7x6rjg6ya1gsg068fxj1sgf1k2n144n-findutils-4.9.0 /nix/store/r9jlsp2szh2c1ns2milpc0qynqq28hq8-diffutils-3.10 /nix/store/29w8hg0fis0pl3j4d3v0p02aicyw10lv-gnused-4.9 /nix/store/r1lp9kxlrc6h7vrba90gm6i94s31xvvx-gnugrep-3.11 /nix/store/r9w7hwj3ahip499dlr3zzk6601x2v9kf-gawk-5.2.2 /nix/store/0ybz4c399fq3wiqc1ni0yylcxhs1x1hc-gnutar-1.35 /nix/store/hcrf95x3r60kw71wgwbdybjfcq0ipkpj-gzip-1.13 /nix/store/gfs0a87fzs9msav9ckdnciw3fappzgg2-bzip2-1.0.8-bin /nix/store/5vyb54sgl2x1ihrdfvj46vi2w1acv9nn-gnumake-4.4.1 /nix/store/r9h133c9m8f6jnlsqzwf89zg9w0w78s8-bash-5.2-p15 /nix/store/dp0pd2rljai6jlp7jb254vmbmyzik4nc-patch-2.7.6 /nix/store/gvdfpnyr6smc7g9wy9fjp44j41j73f4b-xz-5.4.4-bin /nix/store/g0kc0z0wzs2s4kl377zssyxmmk5z9vim-file-5.45'
135
+ initialPath='/nix/store/6wgd8c9vq93mqxzc7jhkl86mv6qbc360-coreutils-9.5 /nix/store/r99d2m4swgmrv9jvm4l9di40hvanq1aq-findutils-4.10.0 /nix/store/3sln66ij8pg114apkd8p6nr04y37q5z2-diffutils-3.10 /nix/store/yq39xdwm4z0fhx7dsm8mlpgvcz3vbfg3-gnused-4.9 /nix/store/vniy1y5n8g28c55y7788npwc4h09fh7c-gnugrep-3.11 /nix/store/scgfwh3z1s3l2vhvyjsgfgx5ql552sls-gawk-5.3.1 /nix/store/0wqn2k3v5xzrc9rwinijdyr2ywwl82x4-gnutar-1.35 /nix/store/5y240z436gf3rwmkwbhn1a17pqw509w4-gzip-1.13 /nix/store/1yyryxp7mh7zsciapi8f1n0mnxkigmf8-bzip2-1.0.8-bin /nix/store/hbzw8k8ygv6bfzvsvnd4gb8qmm8xjbvn-gnumake-4.4.1 /nix/store/gwgqdl0242ymlikq9s9s62gkp5cvyal3-bash-5.2p37 /nix/store/rfrjws98w6scfx7m63grb0m6sg925ahd-patch-2.7.6 /nix/store/4i4mjaf7z6gddspar487grxk5k1j4dcd-xz-5.6.3-bin /nix/store/9wbpsj6ksd16x1qdqs29xli1dpz3fnl0-file-5.45'
133
136
  mesonFlags=''
134
137
  export mesonFlags
135
138
  name='nodejs-env'
@@ -153,12 +156,12 @@ patches=''
153
156
  export patches
154
157
  phases='buildPhase'
155
158
  export phases
156
- pkg='/nix/store/ihhhd1r1a2wb4ndm24rnm83rfnjw5n0z-gcc-wrapper-12.3.0'
159
+ pkg='/nix/store/888bkaqdpfpx72dd8bdc69qsqlgbhcvf-gcc-wrapper-13.3.0'
157
160
  declare -a pkgsBuildBuild=()
158
- declare -a pkgsBuildHost=('/nix/store/7ywggws38m4788rm8fvbcsmyddnq0q3m-patchelf-0.15.0' '/nix/store/lfldnv3apxsd59g1jl65kw6xfkmv5w27-update-autotools-gnu-config-scripts-hook' '/nix/store/h9lc1dpi14z7is86ffhl3ld569138595-audit-tmpdir.sh' '/nix/store/m54bmrhj6fqz8nds5zcj97w9s9bckc9v-compress-man-pages.sh' '/nix/store/wgrbkkaldkrlrni33ccvm3b6vbxzb656-make-symlinks-relative.sh' '/nix/store/5yzw0vhkyszf2d179m0qfkgxmp5wjjx4-move-docs.sh' '/nix/store/fyaryjvghbkpfnsyw97hb3lyb37s1pd6-move-lib64.sh' '/nix/store/kd4xwxjpjxi71jkm6ka0np72if9rm3y0-move-sbin.sh' '/nix/store/pag6l61paj1dc9sv15l7bm5c17xn5kyk-move-systemd-user-units.sh' '/nix/store/jivxp510zxakaaic7qkrb7v1dd2rdbw9-multiple-outputs.sh' '/nix/store/wzdsbnv2ba3nj91aql8jjdddfmkkdh7h-patch-shebangs.sh' '/nix/store/cickvswrvann041nqxb0rxilc46svw1n-prune-libtool-files.sh' '/nix/store/xyff06pkhki3qy1ls77w10s0v79c9il0-reproducible-builds.sh' '/nix/store/ngg1cv31c8c7bcm2n8ww4g06nq7s4zhm-set-source-date-epoch-to-latest.sh' '/nix/store/wmknncrif06fqxa16hpdldhixk95nds0-strip.sh' '/nix/store/ihhhd1r1a2wb4ndm24rnm83rfnjw5n0z-gcc-wrapper-12.3.0' '/nix/store/0fp4c5pbk6lmlk59bv4hhxch3py2dq6h-binutils-wrapper-2.40' )
161
+ declare -a pkgsBuildHost=('/nix/store/wnl9qpnhayry14lhcbdafhadsjwsdr6p-patchelf-0.15.0' '/nix/store/ap724yhgv28mpsi1mmqcwypj4rrfhqmg-update-autotools-gnu-config-scripts-hook' '/nix/store/h9lc1dpi14z7is86ffhl3ld569138595-audit-tmpdir.sh' '/nix/store/m54bmrhj6fqz8nds5zcj97w9s9bckc9v-compress-man-pages.sh' '/nix/store/wgrbkkaldkrlrni33ccvm3b6vbxzb656-make-symlinks-relative.sh' '/nix/store/5yzw0vhkyszf2d179m0qfkgxmp5wjjx4-move-docs.sh' '/nix/store/fyaryjvghbkpfnsyw97hb3lyb37s1pd6-move-lib64.sh' '/nix/store/kd4xwxjpjxi71jkm6ka0np72if9rm3y0-move-sbin.sh' '/nix/store/pag6l61paj1dc9sv15l7bm5c17xn5kyk-move-systemd-user-units.sh' '/nix/store/jivxp510zxakaaic7qkrb7v1dd2rdbw9-multiple-outputs.sh' '/nix/store/12lvf0c7xric9cny7slvf9cmhypl1p67-patch-shebangs.sh' '/nix/store/cickvswrvann041nqxb0rxilc46svw1n-prune-libtool-files.sh' '/nix/store/xyff06pkhki3qy1ls77w10s0v79c9il0-reproducible-builds.sh' '/nix/store/aazf105snicrlvyzzbdj85sx4179rpfp-set-source-date-epoch-to-latest.sh' '/nix/store/gps9qrh99j7g02840wv5x78ykmz30byp-strip.sh' '/nix/store/888bkaqdpfpx72dd8bdc69qsqlgbhcvf-gcc-wrapper-13.3.0' '/nix/store/qlzvmgr8w9prdlyys7irqf86p7bndf5b-binutils-wrapper-2.43.1' )
159
162
  declare -a pkgsBuildTarget=()
160
163
  declare -a pkgsHostHost=()
161
- declare -a pkgsHostTarget=('/nix/store/wnbxah2y943l73hdmq5r7lb92lsa5f8z-nodejs-18.19.1' '/nix/store/y6qmvzv799sfrrcllpdsbsxxlx6lxrwd-webpack-5.89.0' '/nix/store/2lrishrbb8y6ghr9rqndaxmfpwr125y1-webpack-cli-5.1.4' )
164
+ declare -a pkgsHostTarget=('/nix/store/sxw7i3pyw8v1ycw2sph0zq2byh1prrwm-nodejs-20.18.1' '/nix/store/8d3b7hcss6cckjd35c9msdxnq13gglqh-webpack-5.94.0' '/nix/store/frmq3b1x91nh7544n4cym84g1rl5kxrn-webpack-cli-5.1.4' )
162
165
  declare -a pkgsTargetTarget=()
163
166
  declare -a postFixupHooks=('_makeSymlinksRelativeInAllOutputs' '_multioutPropagateDev' )
164
167
  declare -a postUnpackHooks=('_updateSourceDateEpochFromSourceRoot' )
@@ -175,42 +178,17 @@ declare -a propagatedHostDepFiles=('propagated-host-host-deps' 'propagated-build
175
178
  propagatedNativeBuildInputs=''
176
179
  export propagatedNativeBuildInputs
177
180
  declare -a propagatedTargetDepFiles=('propagated-target-target-deps' )
178
- shell='/nix/store/r9h133c9m8f6jnlsqzwf89zg9w0w78s8-bash-5.2-p15/bin/bash'
181
+ shell='/nix/store/gwgqdl0242ymlikq9s9s62gkp5cvyal3-bash-5.2p37/bin/bash'
179
182
  export shell
180
183
  shellHook=''
181
184
  export shellHook
182
- stdenv='/nix/store/10i1kjjq5szjn1gp6418x8bc1hswqc90-stdenv-linux'
185
+ stdenv='/nix/store/lzrs17sc8bhi87nb1y1q1bas73j6q10y-stdenv-linux'
183
186
  export stdenv
184
187
  strictDeps=''
185
188
  export strictDeps
186
189
  system='x86_64-linux'
187
190
  export system
188
191
  declare -a unpackCmdHooks=('_defaultUnpack' )
189
- _accumFlagsArray ()
190
- {
191
-
192
- local name;
193
- if [ -n "$__structuredAttrs" ]; then
194
- for name in "$@";
195
- do
196
- local -n nameref="$name";
197
- flagsArray+=(${nameref+"${nameref[@]}"});
198
- done;
199
- else
200
- for name in "$@";
201
- do
202
- local -n nameref="$name";
203
- case "$name" in
204
- *Array)
205
- flagsArray+=(${nameref+"${nameref[@]}"})
206
- ;;
207
- *)
208
- flagsArray+=(${nameref-})
209
- ;;
210
- esac;
211
- done;
212
- fi
213
- }
214
192
  _activatePkgs ()
215
193
  {
216
194
 
@@ -276,13 +254,10 @@ _allFlags ()
276
254
  {
277
255
 
278
256
  export system pname name version;
279
- for varName in $(awk 'BEGIN { for (v in ENVIRON) if (v ~ /^[a-z][a-zA-Z0-9_]*$/) print v }');
280
- do
281
- if (( "${NIX_DEBUG:-0}" >= 1 )); then
282
- printf "@%s@ -> %q\n" "${varName}" "${!varName}" 1>&2;
283
- fi;
257
+ while IFS='' read -r varName; do
258
+ nixTalkativeLog "@${varName}@ -> ${!varName}";
284
259
  args+=("--subst-var" "$varName");
285
- done
260
+ done < <(awk 'BEGIN { for (v in ENVIRON) if (v ~ /^[a-z][a-zA-Z0-9_]*$/) print v }')
286
261
  }
287
262
  _assignFirst ()
288
263
  {
@@ -318,12 +293,15 @@ _callImplicitHook ()
318
293
  local def="$1";
319
294
  local hookName="$2";
320
295
  if declare -F "$hookName" > /dev/null; then
296
+ nixTalkativeLog "calling implicit '$hookName' function hook";
321
297
  "$hookName";
322
298
  else
323
299
  if type -p "$hookName" > /dev/null; then
300
+ nixTalkativeLog "sourcing implicit '$hookName' script hook";
324
301
  source "$hookName";
325
302
  else
326
303
  if [ -n "${!hookName:-}" ]; then
304
+ nixTalkativeLog "evaling implicit '$hookName' string hook";
327
305
  eval "${!hookName}";
328
306
  else
329
307
  return "$def";
@@ -347,11 +325,11 @@ _defaultUnpack ()
347
325
  else
348
326
  case "$fn" in
349
327
  *.tar.xz | *.tar.lzma | *.txz)
350
- ( xz -d < "$fn";
351
- true ) | tar xf - --warning=no-timestamp
328
+ ( XZ_OPT="--threads=$NIX_BUILD_CORES" xz -d < "$fn";
329
+ true ) | tar xf - --mode=+w --warning=no-timestamp
352
330
  ;;
353
331
  *.tar | *.tar.* | *.tgz | *.tbz2 | *.tbz)
354
- tar xf "$fn" --warning=no-timestamp
332
+ tar xf "$fn" --mode=+w --warning=no-timestamp
355
333
  ;;
356
334
  *)
357
335
  return 1
@@ -395,6 +373,40 @@ _eval ()
395
373
  eval "$1";
396
374
  fi
397
375
  }
376
+ _logHook ()
377
+ {
378
+
379
+ if [[ -z ${NIX_LOG_FD-} ]]; then
380
+ return;
381
+ fi;
382
+ local hookKind="$1";
383
+ local hookExpr="$2";
384
+ shift 2;
385
+ if declare -F "$hookExpr" > /dev/null 2>&1; then
386
+ nixTalkativeLog "calling '$hookKind' function hook '$hookExpr'" "$@";
387
+ else
388
+ if type -p "$hookExpr" > /dev/null; then
389
+ nixTalkativeLog "sourcing '$hookKind' script hook '$hookExpr'";
390
+ else
391
+ if [[ "$hookExpr" != "_callImplicitHook"* ]]; then
392
+ local exprToOutput;
393
+ if [[ ${NIX_DEBUG:-0} -ge 5 ]]; then
394
+ exprToOutput="$hookExpr";
395
+ else
396
+ local hookExprLine;
397
+ while IFS= read -r hookExprLine; do
398
+ hookExprLine="${hookExprLine#"${hookExprLine%%[![:space:]]*}"}";
399
+ if [[ -n "$hookExprLine" ]]; then
400
+ exprToOutput+="$hookExprLine\\n ";
401
+ fi;
402
+ done <<< "$hookExpr";
403
+ exprToOutput="${exprToOutput%%\\n }";
404
+ fi;
405
+ nixTalkativeLog "evaling '$hookKind' string hook '$exprToOutput'";
406
+ fi;
407
+ fi;
408
+ fi
409
+ }
398
410
  _makeSymlinksRelative ()
399
411
  {
400
412
 
@@ -619,6 +631,7 @@ activatePackage ()
619
631
  local -r targetOffset="$3";
620
632
  (( hostOffset <= targetOffset )) || exit 1;
621
633
  if [ -f "$pkg" ]; then
634
+ nixTalkativeLog "sourcing setup hook '$pkg'";
622
635
  source "$pkg";
623
636
  fi;
624
637
  if [[ -z "${strictDeps-}" || "$hostOffset" -le -1 ]]; then
@@ -631,6 +644,7 @@ activatePackage ()
631
644
  addToSearchPath _HOST_PATH "$pkg/bin";
632
645
  fi;
633
646
  if [[ -f "$pkg/nix-support/setup-hook" ]]; then
647
+ nixTalkativeLog "sourcing setup hook '$pkg/nix-support/setup-hook'";
634
648
  source "$pkg/nix-support/setup-hook";
635
649
  fi
636
650
  }
@@ -676,18 +690,19 @@ appendToVar ()
676
690
  else
677
691
  useArray=false;
678
692
  fi;
679
- if declare -p "$1" 2> /dev/null | grep -q '^'; then
680
- type="$(declare -p "$1")";
681
- if [[ "$type" =~ "declare -A" ]]; then
682
- echo "appendToVar(): ERROR: trying to use appendToVar on an associative array, use variable+=([\"X\"]=\"Y\") instead." 1>&2;
683
- return 1;
684
- else
685
- if [[ "$type" =~ "declare -a" ]]; then
686
- useArray=true;
687
- else
688
- useArray=false;
689
- fi;
690
- fi;
693
+ if type=$(declare -p "$1" 2> /dev/null); then
694
+ case "${type#* }" in
695
+ -A*)
696
+ echo "appendToVar(): ERROR: trying to use appendToVar on an associative array, use variable+=([\"X\"]=\"Y\") instead." 1>&2;
697
+ return 1
698
+ ;;
699
+ -a*)
700
+ useArray=true
701
+ ;;
702
+ *)
703
+ useArray=false
704
+ ;;
705
+ esac;
691
706
  fi;
692
707
  shift;
693
708
  if $useArray; then
@@ -749,8 +764,8 @@ buildPhase ()
749
764
  echo "no Makefile or custom buildPhase, doing nothing";
750
765
  else
751
766
  foundMakefile=1;
752
- local flagsArray=(${enableParallelBuilding:+-j${NIX_BUILD_CORES}} SHELL=$SHELL);
753
- _accumFlagsArray makeFlags makeFlagsArray buildFlags buildFlagsArray;
767
+ local flagsArray=(${enableParallelBuilding:+-j${NIX_BUILD_CORES}} SHELL="$SHELL");
768
+ concatTo flagsArray makeFlags makeFlagsArray buildFlags buildFlagsArray;
754
769
  echoCmd 'build flags' "${flagsArray[@]}";
755
770
  make ${makefile:+-f $makefile} "${flagsArray[@]}";
756
771
  unset flagsArray;
@@ -780,25 +795,18 @@ checkPhase ()
780
795
  fi;
781
796
  if [[ -z "${checkTarget:-}" ]]; then
782
797
  if make -n ${makefile:+-f $makefile} check > /dev/null 2>&1; then
783
- checkTarget=check;
798
+ checkTarget="check";
784
799
  else
785
800
  if make -n ${makefile:+-f $makefile} test > /dev/null 2>&1; then
786
- checkTarget=test;
801
+ checkTarget="test";
787
802
  fi;
788
803
  fi;
789
804
  fi;
790
805
  if [[ -z "${checkTarget:-}" ]]; then
791
806
  echo "no check/test target in ${makefile:-Makefile}, doing nothing";
792
807
  else
793
- local flagsArray=(${enableParallelChecking:+-j${NIX_BUILD_CORES}} SHELL=$SHELL);
794
- _accumFlagsArray makeFlags makeFlagsArray;
795
- if [ -n "$__structuredAttrs" ]; then
796
- flagsArray+=("${checkFlags[@]:-VERBOSE=y}");
797
- else
798
- flagsArray+=(${checkFlags:-VERBOSE=y});
799
- fi;
800
- _accumFlagsArray checkFlagsArray;
801
- flagsArray+=(${checkTarget});
808
+ local flagsArray=(${enableParallelChecking:+-j${NIX_BUILD_CORES}} SHELL="$SHELL");
809
+ concatTo flagsArray makeFlags makeFlagsArray checkFlags=VERBOSE=y checkFlagsArray checkTarget;
802
810
  echoCmd 'check flags' "${flagsArray[@]}";
803
811
  make ${makefile:+-f $makefile} "${flagsArray[@]}";
804
812
  unset flagsArray;
@@ -828,6 +836,66 @@ compressManPages ()
828
836
  fi;
829
837
  done
830
838
  }
839
+ concatStringsSep ()
840
+ {
841
+
842
+ local sep="$1";
843
+ local name="$2";
844
+ local type oldifs;
845
+ if type=$(declare -p "$name" 2> /dev/null); then
846
+ local -n nameref="$name";
847
+ case "${type#* }" in
848
+ -A*)
849
+ echo "concatStringsSep(): ERROR: trying to use concatStringsSep on an associative array." 1>&2;
850
+ return 1
851
+ ;;
852
+ -a*)
853
+ local IFS="$sep";
854
+ echo -n "${nameref[*]}"
855
+ ;;
856
+ *)
857
+ echo -n "${nameref// /"${sep}"}"
858
+ ;;
859
+ esac;
860
+ fi
861
+ }
862
+ concatTo ()
863
+ {
864
+
865
+ local -;
866
+ set -o noglob;
867
+ local -n targetref="$1";
868
+ shift;
869
+ local arg default name type;
870
+ for arg in "$@";
871
+ do
872
+ IFS="=" read -r name default <<< "$arg";
873
+ local -n nameref="$name";
874
+ if [[ -z "${nameref[*]}" && -n "$default" ]]; then
875
+ targetref+=("$default");
876
+ else
877
+ if type=$(declare -p "$name" 2> /dev/null); then
878
+ case "${type#* }" in
879
+ -A*)
880
+ echo "concatTo(): ERROR: trying to use concatTo on an associative array." 1>&2;
881
+ return 1
882
+ ;;
883
+ -a*)
884
+ targetref+=("${nameref[@]}")
885
+ ;;
886
+ *)
887
+ if [[ "$name" = *"Array" ]]; then
888
+ nixErrorLog "concatTo(): $name is not declared as array, treating as a singleton. This will become an error in future";
889
+ targetref+=(${nameref+"${nameref[@]}"});
890
+ else
891
+ targetref+=(${nameref-});
892
+ fi
893
+ ;;
894
+ esac;
895
+ fi;
896
+ fi;
897
+ done
898
+ }
831
899
  configurePhase ()
832
900
  {
833
901
 
@@ -861,10 +929,13 @@ configurePhase ()
861
929
  prependToVar configureFlags --disable-static;
862
930
  fi;
863
931
  fi;
932
+ if [ -z "${dontPatchShebangsInConfigure:-}" ]; then
933
+ patchShebangs --build "$configureScript";
934
+ fi;
864
935
  fi;
865
936
  if [ -n "$configureScript" ]; then
866
937
  local -a flagsArray;
867
- _accumFlagsArray configureFlags configureFlagsArray;
938
+ concatTo flagsArray configureFlags configureFlagsArray;
868
939
  echoCmd 'configure flags' "${flagsArray[@]}";
869
940
  $configureScript "${flagsArray[@]}";
870
941
  unset flagsArray;
@@ -886,8 +957,7 @@ distPhase ()
886
957
 
887
958
  runHook preDist;
888
959
  local flagsArray=();
889
- _accumFlagsArray distFlags distFlagsArray;
890
- flagsArray+=(${distTarget:-dist});
960
+ concatTo flagsArray distFlags distFlagsArray distTarget=dist;
891
961
  echo 'dist flags: %q' "${flagsArray[@]}";
892
962
  make ${makefile:+-f $makefile} "${flagsArray[@]}";
893
963
  if [ "${dontCopyDist:-0}" != 1 ]; then
@@ -900,7 +970,9 @@ dumpVars ()
900
970
  {
901
971
 
902
972
  if [ "${noDumpEnvVars:-0}" != 1 ]; then
903
- export 2> /dev/null >| "$NIX_BUILD_TOP/env-vars" || true;
973
+ {
974
+ install -m 0600 /dev/null "$NIX_BUILD_TOP/env-vars" && export 2> /dev/null >| "$NIX_BUILD_TOP/env-vars"
975
+ } || true;
904
976
  fi
905
977
  }
906
978
  echoCmd ()
@@ -1018,7 +1090,7 @@ fixupPhase ()
1018
1090
  for output in $(getAllOutputNames);
1019
1091
  do
1020
1092
  if [ -e "${!output}" ]; then
1021
- chmod -R u+w "${!output}";
1093
+ chmod -R u+w,u-s,g-s "${!output}";
1022
1094
  fi;
1023
1095
  done;
1024
1096
  runHook preFixup;
@@ -1103,7 +1175,7 @@ getRole ()
1103
1175
  role_post='_FOR_TARGET'
1104
1176
  ;;
1105
1177
  *)
1106
- echo "binutils-wrapper-2.40: used as improper sort of dependency" 1>&2;
1178
+ echo "binutils-wrapper-2.43.1: used as improper sort of dependency" 1>&2;
1107
1179
  return 1
1108
1180
  ;;
1109
1181
  esac
@@ -1132,7 +1204,7 @@ getTargetRoleWrapper ()
1132
1204
  export NIX_BINTOOLS_WRAPPER_TARGET_TARGET_x86_64_unknown_linux_gnu=1
1133
1205
  ;;
1134
1206
  *)
1135
- echo "binutils-wrapper-2.40: used as improper sort of dependency" 1>&2;
1207
+ echo "binutils-wrapper-2.43.1: used as improper sort of dependency" 1>&2;
1136
1208
  return 1
1137
1209
  ;;
1138
1210
  esac
@@ -1147,9 +1219,8 @@ installCheckPhase ()
1147
1219
  if [[ -z "${installCheckTarget:-}" ]] && ! make -n ${makefile:+-f $makefile} "${installCheckTarget:-installcheck}" > /dev/null 2>&1; then
1148
1220
  echo "no installcheck target in ${makefile:-Makefile}, doing nothing";
1149
1221
  else
1150
- local flagsArray=(${enableParallelChecking:+-j${NIX_BUILD_CORES}} SHELL=$SHELL);
1151
- _accumFlagsArray makeFlags makeFlagsArray installCheckFlags installCheckFlagsArray;
1152
- flagsArray+=(${installCheckTarget:-installcheck});
1222
+ local flagsArray=(${enableParallelChecking:+-j${NIX_BUILD_CORES}} SHELL="$SHELL");
1223
+ concatTo flagsArray makeFlags makeFlagsArray installCheckFlags installCheckFlagsArray installCheckTarget=installcheck;
1153
1224
  echoCmd 'installcheck flags' "${flagsArray[@]}";
1154
1225
  make ${makefile:+-f $makefile} "${flagsArray[@]}";
1155
1226
  unset flagsArray;
@@ -1171,13 +1242,8 @@ installPhase ()
1171
1242
  if [ -n "$prefix" ]; then
1172
1243
  mkdir -p "$prefix";
1173
1244
  fi;
1174
- local flagsArray=(${enableParallelInstalling:+-j${NIX_BUILD_CORES}} SHELL=$SHELL);
1175
- _accumFlagsArray makeFlags makeFlagsArray installFlags installFlagsArray;
1176
- if [ -n "$__structuredAttrs" ]; then
1177
- flagsArray+=("${installTargets[@]:-install}");
1178
- else
1179
- flagsArray+=(${installTargets:-install});
1180
- fi;
1245
+ local flagsArray=(${enableParallelInstalling:+-j${NIX_BUILD_CORES}} SHELL="$SHELL");
1246
+ concatTo flagsArray makeFlags makeFlagsArray installFlags installFlagsArray installTargets=install;
1181
1247
  echoCmd 'install flags' "${flagsArray[@]}";
1182
1248
  make ${makefile:+-f $makefile} "${flagsArray[@]}";
1183
1249
  unset flagsArray;
@@ -1289,6 +1355,70 @@ moveToOutput ()
1289
1355
  done;
1290
1356
  done
1291
1357
  }
1358
+ nixChattyLog ()
1359
+ {
1360
+
1361
+ if [[ -z ${NIX_LOG_FD-} ]] || [[ ${NIX_DEBUG:-0} -lt 5 ]]; then
1362
+ return;
1363
+ fi;
1364
+ printf "%s\n" "$*" >&"$NIX_LOG_FD"
1365
+ }
1366
+ nixDebugLog ()
1367
+ {
1368
+
1369
+ if [[ -z ${NIX_LOG_FD-} ]] || [[ ${NIX_DEBUG:-0} -lt 6 ]]; then
1370
+ return;
1371
+ fi;
1372
+ printf "%s\n" "$*" >&"$NIX_LOG_FD"
1373
+ }
1374
+ nixErrorLog ()
1375
+ {
1376
+
1377
+ if [[ -z ${NIX_LOG_FD-} ]] || [[ ${NIX_DEBUG:-0} -lt 0 ]]; then
1378
+ return;
1379
+ fi;
1380
+ printf "%s\n" "$*" >&"$NIX_LOG_FD"
1381
+ }
1382
+ nixInfoLog ()
1383
+ {
1384
+
1385
+ if [[ -z ${NIX_LOG_FD-} ]] || [[ ${NIX_DEBUG:-0} -lt 3 ]]; then
1386
+ return;
1387
+ fi;
1388
+ printf "%s\n" "$*" >&"$NIX_LOG_FD"
1389
+ }
1390
+ nixNoticeLog ()
1391
+ {
1392
+
1393
+ if [[ -z ${NIX_LOG_FD-} ]] || [[ ${NIX_DEBUG:-0} -lt 2 ]]; then
1394
+ return;
1395
+ fi;
1396
+ printf "%s\n" "$*" >&"$NIX_LOG_FD"
1397
+ }
1398
+ nixTalkativeLog ()
1399
+ {
1400
+
1401
+ if [[ -z ${NIX_LOG_FD-} ]] || [[ ${NIX_DEBUG:-0} -lt 4 ]]; then
1402
+ return;
1403
+ fi;
1404
+ printf "%s\n" "$*" >&"$NIX_LOG_FD"
1405
+ }
1406
+ nixVomitLog ()
1407
+ {
1408
+
1409
+ if [[ -z ${NIX_LOG_FD-} ]] || [[ ${NIX_DEBUG:-0} -lt 7 ]]; then
1410
+ return;
1411
+ fi;
1412
+ printf "%s\n" "$*" >&"$NIX_LOG_FD"
1413
+ }
1414
+ nixWarnLog ()
1415
+ {
1416
+
1417
+ if [[ -z ${NIX_LOG_FD-} ]] || [[ ${NIX_DEBUG:-0} -lt 1 ]]; then
1418
+ return;
1419
+ fi;
1420
+ printf "%s\n" "$*" >&"$NIX_LOG_FD"
1421
+ }
1292
1422
  patchELF ()
1293
1423
  {
1294
1424
 
@@ -1312,11 +1442,7 @@ patchPhase ()
1312
1442
 
1313
1443
  runHook prePatch;
1314
1444
  local -a patchesArray;
1315
- if [ -n "$__structuredAttrs" ]; then
1316
- patchesArray=(${patches:+"${patches[@]}"});
1317
- else
1318
- patchesArray=(${patches:-});
1319
- fi;
1445
+ concatTo patchesArray patches;
1320
1446
  for i in "${patchesArray[@]}";
1321
1447
  do
1322
1448
  echo "applying patch $i";
@@ -1336,11 +1462,7 @@ patchPhase ()
1336
1462
  ;;
1337
1463
  esac;
1338
1464
  local -a flagsArray;
1339
- if [ -n "$__structuredAttrs" ]; then
1340
- flagsArray=("${patchFlags[@]:--p1}");
1341
- else
1342
- flagsArray=(${patchFlags:--p1});
1343
- fi;
1465
+ concatTo flagsArray patchFlags=-p1;
1344
1466
  $uncompress < "$i" 2>&1 | patch "${flagsArray[@]}";
1345
1467
  done;
1346
1468
  runHook postPatch
@@ -1392,7 +1514,7 @@ patchShebangs ()
1392
1514
  local f;
1393
1515
  while IFS= read -r -d '' f; do
1394
1516
  isScript "$f" || continue;
1395
- read -r oldInterpreterLine < "$f";
1517
+ read -r oldInterpreterLine < "$f" || [ "$oldInterpreterLine" ];
1396
1518
  read -r oldPath arg0 args <<< "${oldInterpreterLine:2}";
1397
1519
  if [[ -z "${pathName:-}" ]]; then
1398
1520
  if [[ -n $strictDeps && $f == "$NIX_STORE"* ]]; then
@@ -1405,21 +1527,21 @@ patchShebangs ()
1405
1527
  if [[ $arg0 == "-S" ]]; then
1406
1528
  arg0=${args%% *};
1407
1529
  args=${args#* };
1408
- newPath="$(PATH="${!pathName}" command -v "env" || true)";
1409
- args="-S $(PATH="${!pathName}" command -v "$arg0" || true) $args";
1530
+ newPath="$(PATH="${!pathName}" type -P "env" || true)";
1531
+ args="-S $(PATH="${!pathName}" type -P "$arg0" || true) $args";
1410
1532
  else
1411
1533
  if [[ $arg0 == "-"* || $arg0 == *"="* ]]; then
1412
1534
  echo "$f: unsupported interpreter directive \"$oldInterpreterLine\" (set dontPatchShebangs=1 and handle shebang patching yourself)" 1>&2;
1413
1535
  exit 1;
1414
1536
  else
1415
- newPath="$(PATH="${!pathName}" command -v "$arg0" || true)";
1537
+ newPath="$(PATH="${!pathName}" type -P "$arg0" || true)";
1416
1538
  fi;
1417
1539
  fi;
1418
1540
  else
1419
1541
  if [[ -z $oldPath ]]; then
1420
1542
  oldPath="/bin/sh";
1421
1543
  fi;
1422
- newPath="$(PATH="${!pathName}" command -v "$(basename "$oldPath")" || true)";
1544
+ newPath="$(PATH="${!pathName}" type -P "$(basename "$oldPath")" || true)";
1423
1545
  args="$arg0 $args";
1424
1546
  fi;
1425
1547
  newInterpreterLine="$newPath $args";
@@ -1456,18 +1578,19 @@ prependToVar ()
1456
1578
  else
1457
1579
  useArray=false;
1458
1580
  fi;
1459
- if declare -p "$1" 2> /dev/null | grep -q '^'; then
1460
- type="$(declare -p "$1")";
1461
- if [[ "$type" =~ "declare -A" ]]; then
1462
- echo "prependToVar(): ERROR: trying to use prependToVar on an associative array." 1>&2;
1463
- return 1;
1464
- else
1465
- if [[ "$type" =~ "declare -a" ]]; then
1466
- useArray=true;
1467
- else
1468
- useArray=false;
1469
- fi;
1470
- fi;
1581
+ if type=$(declare -p "$1" 2> /dev/null); then
1582
+ case "${type#* }" in
1583
+ -A*)
1584
+ echo "prependToVar(): ERROR: trying to use prependToVar on an associative array." 1>&2;
1585
+ return 1
1586
+ ;;
1587
+ -a*)
1588
+ useArray=true
1589
+ ;;
1590
+ *)
1591
+ useArray=false
1592
+ ;;
1593
+ esac;
1471
1594
  fi;
1472
1595
  shift;
1473
1596
  if $useArray; then
@@ -1512,6 +1635,7 @@ runHook ()
1512
1635
  local hook;
1513
1636
  for hook in "_callImplicitHook 0 $hookName" ${!hooksSlice+"${!hooksSlice}"};
1514
1637
  do
1638
+ _logHook "$hookName" "$hook" "$@";
1515
1639
  _eval "$hook" "$@";
1516
1640
  done;
1517
1641
  return 0
@@ -1525,6 +1649,7 @@ runOneHook ()
1525
1649
  local hook ret=1;
1526
1650
  for hook in "_callImplicitHook 1 $hookName" ${!hooksSlice+"${!hooksSlice}"};
1527
1651
  do
1652
+ _logHook "$hookName" "$hook" "$@";
1528
1653
  if _eval "$hook" "$@"; then
1529
1654
  ret=0;
1530
1655
  break;
@@ -1563,18 +1688,16 @@ runPhase ()
1563
1688
  if [[ "$curPhase" = distPhase && -z "${doDist:-}" ]]; then
1564
1689
  return;
1565
1690
  fi;
1566
- if [[ -n $NIX_LOG_FD ]]; then
1567
- echo "@nix { \"action\": \"setPhase\", \"phase\": \"$curPhase\" }" >&"$NIX_LOG_FD";
1568
- fi;
1569
1691
  showPhaseHeader "$curPhase";
1570
1692
  dumpVars;
1571
- local startTime=$(date +"%s");
1693
+ local startTime endTime;
1694
+ startTime=$(date +"%s");
1572
1695
  eval "${!curPhase:-$curPhase}";
1573
- local endTime=$(date +"%s");
1696
+ endTime=$(date +"%s");
1574
1697
  showPhaseFooter "$curPhase" "$startTime" "$endTime";
1575
1698
  if [ "$curPhase" = unpackPhase ]; then
1576
- [ -n "${sourceRoot:-}" ] && chmod +x "${sourceRoot}";
1577
- cd "${sourceRoot:-.}";
1699
+ [ -n "${sourceRoot:-}" ] && chmod +x -- "${sourceRoot}";
1700
+ cd -- "${sourceRoot:-.}";
1578
1701
  fi
1579
1702
  }
1580
1703
  showPhaseFooter ()
@@ -1597,7 +1720,11 @@ showPhaseHeader ()
1597
1720
  {
1598
1721
 
1599
1722
  local phase="$1";
1600
- echo "Running phase: $phase"
1723
+ echo "Running phase: $phase";
1724
+ if [[ -z ${NIX_LOG_FD-} ]]; then
1725
+ return;
1726
+ fi;
1727
+ printf "@nix { \"action\": \"setPhase\", \"phase\": \"%s\" }\n" "$phase" >&"$NIX_LOG_FD"
1601
1728
  }
1602
1729
  stripDirs ()
1603
1730
  {
@@ -1629,7 +1756,7 @@ stripDirs ()
1629
1756
  echo "stripping (with command $cmd and flags $stripFlags) in $paths";
1630
1757
  local striperr;
1631
1758
  striperr="$(mktemp --tmpdir="$TMPDIR" 'striperr.XXXXXX')";
1632
- find $paths -type f "${excludeFlags[@]}" -a '!' -path "$prefix/lib/debug/*" -print0 | xargs -r -0 -n1 -- realpath -z | sort -u -z | xargs -r -0 -n1 -P "$NIX_BUILD_CORES" -- $cmd $stripFlags 2> "$striperr" || exit_code=$?;
1759
+ find $paths -type f "${excludeFlags[@]}" -a '!' -path "$prefix/lib/debug/*" -printf '%D-%i,%p\0' | sort -t, -k1,1 -u -z | cut -d, -f2- -z | xargs -r -0 -n1 -P "$NIX_BUILD_CORES" -- $cmd $stripFlags 2> "$striperr" || exit_code=$?;
1633
1760
  [[ "$exit_code" = 123 || -z "$exit_code" ]] || ( cat "$striperr" 1>&2 && exit 1 );
1634
1761
  rm "$striperr";
1635
1762
  find $paths -name '*.a' -type f -exec $ranlibCmd '{}' \; 2> /dev/null;
@@ -1703,6 +1830,10 @@ substituteInPlace ()
1703
1830
  fileNames+=("$arg");
1704
1831
  shift;
1705
1832
  done;
1833
+ if ! [[ "${#fileNames[@]}" -gt 0 ]]; then
1834
+ echo "substituteInPlace called without any files to operate on (files must come before options!)" 1>&2;
1835
+ return 1;
1836
+ fi;
1706
1837
  for file in "${fileNames[@]}";
1707
1838
  do
1708
1839
  substitute "$file" "$file" "$@";
@@ -1715,8 +1846,16 @@ substituteStream ()
1715
1846
  local description=$2;
1716
1847
  shift 2;
1717
1848
  while (( "$#" )); do
1849
+ local replace_mode="$1";
1718
1850
  case "$1" in
1719
1851
  --replace)
1852
+ if ! "$_substituteStream_has_warned_replace_deprecation"; then
1853
+ echo "substituteStream() in derivation $name: WARNING: '--replace' is deprecated, use --replace-{fail,warn,quiet}. ($description)" 1>&2;
1854
+ _substituteStream_has_warned_replace_deprecation=true;
1855
+ fi;
1856
+ replace_mode='--replace-warn'
1857
+ ;&
1858
+ --replace-quiet | --replace-warn | --replace-fail)
1720
1859
  pattern="$2";
1721
1860
  replacement="$3";
1722
1861
  shift 3;
@@ -1725,7 +1864,14 @@ substituteStream ()
1725
1864
  eval "$var"'=${'"$var"'//"$pattern"/"$replacement"}';
1726
1865
  if [ "$pattern" != "$replacement" ]; then
1727
1866
  if [ "${!var}" == "$savedvar" ]; then
1728
- echo "substituteStream(): WARNING: pattern '$pattern' doesn't match anything in $description" 1>&2;
1867
+ if [ "$replace_mode" == --replace-warn ]; then
1868
+ printf "substituteStream() in derivation $name: WARNING: pattern %q doesn't match anything in %s\n" "$pattern" "$description" 1>&2;
1869
+ else
1870
+ if [ "$replace_mode" == --replace-fail ]; then
1871
+ printf "substituteStream() in derivation $name: ERROR: pattern %q doesn't match anything in %s\n" "$pattern" "$description" 1>&2;
1872
+ return 1;
1873
+ fi;
1874
+ fi;
1729
1875
  fi;
1730
1876
  fi
1731
1877
  ;;
@@ -1733,11 +1879,11 @@ substituteStream ()
1733
1879
  local varName="$2";
1734
1880
  shift 2;
1735
1881
  if ! [[ "$varName" =~ ^[a-zA-Z_][a-zA-Z0-9_]*$ ]]; then
1736
- echo "substituteStream(): ERROR: substitution variables must be valid Bash names, \"$varName\" isn't." 1>&2;
1882
+ echo "substituteStream() in derivation $name: ERROR: substitution variables must be valid Bash names, \"$varName\" isn't." 1>&2;
1737
1883
  return 1;
1738
1884
  fi;
1739
1885
  if [ -z ${!varName+x} ]; then
1740
- echo "substituteStream(): ERROR: variable \$$varName is unset" 1>&2;
1886
+ echo "substituteStream() in derivation $name: ERROR: variable \$$varName is unset" 1>&2;
1741
1887
  return 1;
1742
1888
  fi;
1743
1889
  pattern="@$varName@";
@@ -1751,7 +1897,7 @@ substituteStream ()
1751
1897
  shift 3
1752
1898
  ;;
1753
1899
  *)
1754
- echo "substituteStream(): ERROR: Invalid command line argument: $1" 1>&2;
1900
+ echo "substituteStream() in derivation $name: ERROR: Invalid command line argument: $1" 1>&2;
1755
1901
  return 1
1756
1902
  ;;
1757
1903
  esac;
@@ -1780,11 +1926,7 @@ unpackPhase ()
1780
1926
  srcs="$src";
1781
1927
  fi;
1782
1928
  local -a srcsArray;
1783
- if [ -n "$__structuredAttrs" ]; then
1784
- srcsArray=("${srcs[@]}");
1785
- else
1786
- srcsArray=($srcs);
1787
- fi;
1929
+ concatTo srcsArray srcs;
1788
1930
  local dirsBefore="";
1789
1931
  for i in *;
1790
1932
  do
@@ -1841,7 +1983,7 @@ updateAutotoolsGnuConfigScriptsPhase ()
1841
1983
  for f in $(find . -type f -name "$script");
1842
1984
  do
1843
1985
  echo "Updating Autotools / GNU config script to a newer upstream version: $f";
1844
- cp -f "/nix/store/7n1vikpxsl1gs5h8f0f8zqfj2mcdy1ii-gnu-config-2023-09-19/$script" "$f";
1986
+ cp -f "/nix/store/0yl1wf4jim6830k2m3c3v5kyp2l9z8ay-gnu-config-2024-01-01/$script" "$f";
1845
1987
  done;
1846
1988
  done
1847
1989
  }
@@ -1849,6 +1991,7 @@ updateSourceDateEpoch ()
1849
1991
  {
1850
1992
 
1851
1993
  local path="$1";
1994
+ [[ $path == -* ]] && path="./$path";
1852
1995
  local -a res=($(find "$path" -type f -not -newer "$NIX_BUILD_TOP/.." -printf '%T@ %p\0' | sort -n --zero-terminated | tail -n1 --zero-terminated | head -c -1));
1853
1996
  local time="${res[0]//\.[0-9]*/}";
1854
1997
  local newestFile="${res[1]}";
@@ -1868,4 +2011,4 @@ export TMP="$NIX_BUILD_TOP"
1868
2011
  export TMPDIR="$NIX_BUILD_TOP"
1869
2012
  export TEMP="$NIX_BUILD_TOP"
1870
2013
  export TEMPDIR="$NIX_BUILD_TOP"
1871
- eval "$shellHook"
2014
+ eval "${shellHook:-}"
package/README.md CHANGED
@@ -21,12 +21,17 @@ The basic function of this plugin is to have a single note where you can view al
21
21
 
22
22
 
23
23
  # Configuration
24
+
25
+ - Tools -> Options -> Inline TODO (Windows/Linux)
26
+ - Joplin -> Preferences (macOS))
27
+
24
28
  ## TODO Types
25
29
  ### Confluence Style
26
- Inspired by [this post](https://discourse.joplinapp.org/t/create-a-task-report-plugin-for-a-joplin-note-taking-app/21177) on the Joplin forum. This is the preferred style because it uses the markdown checkbox format (making it trivial to check the box and hide the TODO from the summary).
30
+ Inspired by [this post](https://discourse.joplinapp.org/t/create-a-task-report-plugin-for-a-joplin-note-taking-app/21177) on the Joplin forum. This is the preferred style because it uses the markdown checkbox format (plus some special syntax), making it trivial to check the box and hide the TODO from the summary.
27
31
 
28
- The basic form is a checkbox, followed any (or all) of: @assignee (this is a primary filtering field, so there can only be one), //date, +tags, and finally the TODO content.
32
+ The basic form is a checkbox, followed any (or all) of: @assignee (this is a primary filtering field, so there can only be one), //date, +tags, and finally the TODO content. Having at least on of these special fields is required for the todo to be picked up by the plugin, without them it is just a plain checkbox.
29
33
 
34
+ @assignee does not need to be a person, it can also be viewed as a category. It will sometimes affect the rendering of the content by grouping assignees.
30
35
  ```
31
36
  I take a lot of notes about various things. It can be helpful to
32
37
  keep my TODOs together with the content they pertain to.
@@ -103,7 +108,7 @@ This style is meant for personal use, the table method (below) is recommended fo
103
108
  ```
104
109
 
105
110
  ### Table
106
- This is particularly powerful when combined with hieuthi's [table sorting plugin](https://discourse.joplinapp.org/t/plugin-markdown-table-sortable/21846). (warning: if you use the "apply sorting" feature, the sort will be overwritten when a new summary is written, don't rely on it!)
111
+ This is particularly powerful when combined with hieuthi's [table sorting plugin](https://discourse.joplinapp.org/t/plugin-markdown-table-sortable/21846). (warning: if you use the "apply sorting" feature, the sort will be overwritten when a new summary is written, don't rely on it!).
107
112
 
108
113
  ```
109
114
  | Task | Assignee | Due | Tags | Notebook | Note |
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "joplin-plugin-inline-todo",
3
- "version": "1.7.1",
3
+ "version": "1.7.3",
4
4
  "scripts": {
5
5
  "dist": "webpack --joplin-plugin-config buildMain && webpack --joplin-plugin-config buildExtraScripts && webpack --joplin-plugin-config createArchive",
6
6
  "prepare": "npm run dist",
@@ -28,5 +28,8 @@
28
28
  "webpack": "^4.43.0",
29
29
  "webpack-cli": "^3.3.11",
30
30
  "yargs": "^16.2.0"
31
+ },
32
+ "dependencies": {
33
+ "ics": "^3.8.1"
31
34
  }
32
35
  }
package/publish/plugin.calebjohn.todo.jpl CHANGED
Binary file
package/publish/plugin.calebjohn.todo.json CHANGED
@@ -2,7 +2,7 @@
2
2
  "manifest_version": 1,
3
3
  "id": "plugin.calebjohn.todo",
4
4
  "app_min_version": "2.7",
5
- "version": "1.7.1",
5
+ "version": "1.7.3",
6
6
  "name": "Inline TODO",
7
7
  "description": "Write TODOs *everywhere* and view them in one place.",
8
8
  "author": "Caleb John",
@@ -17,12 +17,16 @@
17
17
  "productivity",
18
18
  "personal knowledge management"
19
19
  ],
20
+ "platforms": [
21
+ "desktop",
22
+ "mobile"
23
+ ],
20
24
  "icons": {
21
25
  "16": "icons/16.png",
22
26
  "32": "icons/32.png",
23
27
  "48": "icons/48.png",
24
28
  "128": "icons/128.png"
25
29
  },
26
- "_publish_hash": "sha256:2b1ca0cc10a12379a98939351288f92a008c714f99f692b0bfd193d803ebe123",
27
- "_publish_commit": "master:130cfc33757e01da2c2d636d9bbde4f05dd1a4b5"
30
+ "_publish_hash": "sha256:e20e484363b0a15863d30c9534942d870f40b810bf6c3ceecb1107d8897f124b",
31
+ "_publish_commit": "master:dc355d16cd8faa0e28adab8b99f444f0fc69eac7"
28
32
  }