diff --git a/blusky/.direnv/bin/nix-direnv-reload b/non-nix/blusky/.direnv/bin/nix-direnv-reload similarity index 100% rename from blusky/.direnv/bin/nix-direnv-reload rename to non-nix/blusky/.direnv/bin/nix-direnv-reload diff --git a/blusky/.direnv/nix-profile-24.05-rfq6hpk4a4ki1q18.rc b/non-nix/blusky/.direnv/nix-profile-24.05-rfq6hpk4a4ki1q18.rc similarity index 100% rename from blusky/.direnv/nix-profile-24.05-rfq6hpk4a4ki1q18.rc rename to non-nix/blusky/.direnv/nix-profile-24.05-rfq6hpk4a4ki1q18.rc diff --git a/blusky/.envrc b/non-nix/blusky/.envrc similarity index 100% rename from blusky/.envrc rename to non-nix/blusky/.envrc diff --git a/blusky/feed-jawz.py b/non-nix/blusky/feed-jawz.py similarity index 100% rename from blusky/feed-jawz.py rename to non-nix/blusky/feed-jawz.py diff --git a/blusky/shell.nix b/non-nix/blusky/shell.nix similarity index 100% rename from blusky/shell.nix rename to non-nix/blusky/shell.nix diff --git a/clean-cloud.sh b/non-nix/clean-cloud.sh similarity index 100% rename from clean-cloud.sh rename to non-nix/clean-cloud.sh diff --git a/clean-watch.sh b/non-nix/clean-watch.sh similarity index 100% rename from clean-watch.sh rename to non-nix/clean-watch.sh diff --git a/deprecated-rewrite/Windows/Windows/Other/Bat to Exe/Bat_To_Exe_Converter.exe b/non-nix/deprecated-rewrite/Windows/Windows/Other/Bat to Exe/Bat_To_Exe_Converter.exe similarity index 100% rename from deprecated-rewrite/Windows/Windows/Other/Bat to Exe/Bat_To_Exe_Converter.exe rename to non-nix/deprecated-rewrite/Windows/Windows/Other/Bat to Exe/Bat_To_Exe_Converter.exe diff --git a/deprecated-rewrite/Windows/Windows/Other/Bat to Exe/Bat_To_Exe_Converter_(x64).exe b/non-nix/deprecated-rewrite/Windows/Windows/Other/Bat to Exe/Bat_To_Exe_Converter_(x64).exe similarity index 100% rename from deprecated-rewrite/Windows/Windows/Other/Bat to Exe/Bat_To_Exe_Converter_(x64).exe rename to non-nix/deprecated-rewrite/Windows/Windows/Other/Bat to Exe/Bat_To_Exe_Converter_(x64).exe diff --git a/deprecated-rewrite/Windows/Windows/Other/Bat to Exe/settings b/non-nix/deprecated-rewrite/Windows/Windows/Other/Bat to Exe/settings similarity index 100% rename from deprecated-rewrite/Windows/Windows/Other/Bat to Exe/settings rename to non-nix/deprecated-rewrite/Windows/Windows/Other/Bat to Exe/settings diff --git a/deprecated-rewrite/Windows/Windows/Other/RazerChromaSampleApplication.exe b/non-nix/deprecated-rewrite/Windows/Windows/Other/RazerChromaSampleApplication.exe similarity index 100% rename from deprecated-rewrite/Windows/Windows/Other/RazerChromaSampleApplication.exe rename to non-nix/deprecated-rewrite/Windows/Windows/Other/RazerChromaSampleApplication.exe diff --git a/deprecated-rewrite/Windows/Windows/Other/SyncSettings.ffs_gui b/non-nix/deprecated-rewrite/Windows/Windows/Other/SyncSettings.ffs_gui similarity index 100% rename from deprecated-rewrite/Windows/Windows/Other/SyncSettings.ffs_gui rename to non-nix/deprecated-rewrite/Windows/Windows/Other/SyncSettings.ffs_gui diff --git a/deprecated-rewrite/Windows/Windows/Other/Thumbnail me.ini b/non-nix/deprecated-rewrite/Windows/Windows/Other/Thumbnail me.ini similarity index 100% rename from deprecated-rewrite/Windows/Windows/Other/Thumbnail me.ini rename to non-nix/deprecated-rewrite/Windows/Windows/Other/Thumbnail me.ini diff --git a/deprecated-rewrite/Windows/Windows/Other/bulkfilechanger-x64/BulkFileChanger.cfg b/non-nix/deprecated-rewrite/Windows/Windows/Other/bulkfilechanger-x64/BulkFileChanger.cfg similarity index 100% rename from deprecated-rewrite/Windows/Windows/Other/bulkfilechanger-x64/BulkFileChanger.cfg rename to non-nix/deprecated-rewrite/Windows/Windows/Other/bulkfilechanger-x64/BulkFileChanger.cfg diff --git a/deprecated-rewrite/Windows/Windows/Other/bulkfilechanger-x64/BulkFileChanger.chm b/non-nix/deprecated-rewrite/Windows/Windows/Other/bulkfilechanger-x64/BulkFileChanger.chm similarity index 100% rename from deprecated-rewrite/Windows/Windows/Other/bulkfilechanger-x64/BulkFileChanger.chm rename to non-nix/deprecated-rewrite/Windows/Windows/Other/bulkfilechanger-x64/BulkFileChanger.chm diff --git a/deprecated-rewrite/Windows/Windows/Other/bulkfilechanger-x64/BulkFileChanger.exe b/non-nix/deprecated-rewrite/Windows/Windows/Other/bulkfilechanger-x64/BulkFileChanger.exe similarity index 100% rename from deprecated-rewrite/Windows/Windows/Other/bulkfilechanger-x64/BulkFileChanger.exe rename to non-nix/deprecated-rewrite/Windows/Windows/Other/bulkfilechanger-x64/BulkFileChanger.exe diff --git a/deprecated-rewrite/Windows/Windows/Other/bulkfilechanger-x64/readme.txt b/non-nix/deprecated-rewrite/Windows/Windows/Other/bulkfilechanger-x64/readme.txt similarity index 100% rename from deprecated-rewrite/Windows/Windows/Other/bulkfilechanger-x64/readme.txt rename to non-nix/deprecated-rewrite/Windows/Windows/Other/bulkfilechanger-x64/readme.txt diff --git a/deprecated-rewrite/Windows/Windows/Other/cmder.xml b/non-nix/deprecated-rewrite/Windows/Windows/Other/cmder.xml similarity index 100% rename from deprecated-rewrite/Windows/Windows/Other/cmder.xml rename to non-nix/deprecated-rewrite/Windows/Windows/Other/cmder.xml diff --git a/deprecated-rewrite/Windows/Windows/Other/config.xlaunch b/non-nix/deprecated-rewrite/Windows/Windows/Other/config.xlaunch similarity index 100% rename from deprecated-rewrite/Windows/Windows/Other/config.xlaunch rename to non-nix/deprecated-rewrite/Windows/Windows/Other/config.xlaunch diff --git a/deprecated-rewrite/Windows/Windows/Other/md5c_x64.exe b/non-nix/deprecated-rewrite/Windows/Windows/Other/md5c_x64.exe similarity index 100% rename from deprecated-rewrite/Windows/Windows/Other/md5c_x64.exe rename to non-nix/deprecated-rewrite/Windows/Windows/Other/md5c_x64.exe diff --git a/deprecated-rewrite/Windows/Windows/Other/new settings.touchmouseptr_setting b/non-nix/deprecated-rewrite/Windows/Windows/Other/new settings.touchmouseptr_setting similarity index 100% rename from deprecated-rewrite/Windows/Windows/Other/new settings.touchmouseptr_setting rename to non-nix/deprecated-rewrite/Windows/Windows/Other/new settings.touchmouseptr_setting diff --git a/deprecated-rewrite/Windows/Windows/Other/tabletpro.touchmouseptr_setting b/non-nix/deprecated-rewrite/Windows/Windows/Other/tabletpro.touchmouseptr_setting similarity index 100% rename from deprecated-rewrite/Windows/Windows/Other/tabletpro.touchmouseptr_setting rename to non-nix/deprecated-rewrite/Windows/Windows/Other/tabletpro.touchmouseptr_setting diff --git a/deprecated-rewrite/Windows/Windows/TabProBG - Pink.png b/non-nix/deprecated-rewrite/Windows/Windows/TabProBG - Pink.png similarity index 100% rename from deprecated-rewrite/Windows/Windows/TabProBG - Pink.png rename to non-nix/deprecated-rewrite/Windows/Windows/TabProBG - Pink.png diff --git a/deprecated-rewrite/Windows/Windows/TabProBG.png b/non-nix/deprecated-rewrite/Windows/Windows/TabProBG.png similarity index 100% rename from deprecated-rewrite/Windows/Windows/TabProBG.png rename to non-nix/deprecated-rewrite/Windows/Windows/TabProBG.png diff --git a/deprecated-rewrite/Windows/Windows/TabProBlur.png b/non-nix/deprecated-rewrite/Windows/Windows/TabProBlur.png similarity index 100% rename from deprecated-rewrite/Windows/Windows/TabProBlur.png rename to non-nix/deprecated-rewrite/Windows/Windows/TabProBlur.png diff --git a/deprecated-rewrite/Windows/Windows/Touch settings.ini b/non-nix/deprecated-rewrite/Windows/Windows/Touch settings.ini similarity index 100% rename from deprecated-rewrite/Windows/Windows/Touch settings.ini rename to non-nix/deprecated-rewrite/Windows/Windows/Touch settings.ini diff --git a/deprecated-rewrite/Windows/Windows/Touch settings.ini.tabletpro b/non-nix/deprecated-rewrite/Windows/Windows/Touch settings.ini.tabletpro similarity index 100% rename from deprecated-rewrite/Windows/Windows/Touch settings.ini.tabletpro rename to non-nix/deprecated-rewrite/Windows/Windows/Touch settings.ini.tabletpro diff --git a/deprecated-rewrite/Windows/Windows/onenote purple.ini b/non-nix/deprecated-rewrite/Windows/Windows/onenote purple.ini similarity index 100% rename from deprecated-rewrite/Windows/Windows/onenote purple.ini rename to non-nix/deprecated-rewrite/Windows/Windows/onenote purple.ini diff --git a/deprecated-rewrite/Windows/Windows/onenote purple.ini.tabletpro b/non-nix/deprecated-rewrite/Windows/Windows/onenote purple.ini.tabletpro similarity index 100% rename from deprecated-rewrite/Windows/Windows/onenote purple.ini.tabletpro rename to non-nix/deprecated-rewrite/Windows/Windows/onenote purple.ini.tabletpro diff --git a/deprecated-rewrite/Windows/color.ps1 b/non-nix/deprecated-rewrite/Windows/color.ps1 similarity index 100% rename from deprecated-rewrite/Windows/color.ps1 rename to non-nix/deprecated-rewrite/Windows/color.ps1 diff --git a/deprecated-rewrite/Windows/create.ps1 b/non-nix/deprecated-rewrite/Windows/create.ps1 similarity index 100% rename from deprecated-rewrite/Windows/create.ps1 rename to non-nix/deprecated-rewrite/Windows/create.ps1 diff --git a/deprecated-rewrite/Windows/library scripts/download.ps1 b/non-nix/deprecated-rewrite/Windows/library scripts/download.ps1 similarity index 100% rename from deprecated-rewrite/Windows/library scripts/download.ps1 rename to non-nix/deprecated-rewrite/Windows/library scripts/download.ps1 diff --git a/deprecated-rewrite/Windows/library scripts/fix.ps1 b/non-nix/deprecated-rewrite/Windows/library scripts/fix.ps1 similarity index 100% rename from deprecated-rewrite/Windows/library scripts/fix.ps1 rename to non-nix/deprecated-rewrite/Windows/library scripts/fix.ps1 diff --git a/deprecated-rewrite/Windows/library scripts/fix2.ps1 b/non-nix/deprecated-rewrite/Windows/library scripts/fix2.ps1 similarity index 100% rename from deprecated-rewrite/Windows/library scripts/fix2.ps1 rename to non-nix/deprecated-rewrite/Windows/library scripts/fix2.ps1 diff --git a/deprecated-rewrite/Windows/library scripts/manga.ps1 b/non-nix/deprecated-rewrite/Windows/library scripts/manga.ps1 similarity index 100% rename from deprecated-rewrite/Windows/library scripts/manga.ps1 rename to non-nix/deprecated-rewrite/Windows/library scripts/manga.ps1 diff --git a/deprecated-rewrite/Windows/remove-emtpy.ps1 b/non-nix/deprecated-rewrite/Windows/remove-emtpy.ps1 similarity index 100% rename from deprecated-rewrite/Windows/remove-emtpy.ps1 rename to non-nix/deprecated-rewrite/Windows/remove-emtpy.ps1 diff --git a/deprecated-rewrite/backups b/non-nix/deprecated-rewrite/backups similarity index 100% rename from deprecated-rewrite/backups rename to non-nix/deprecated-rewrite/backups diff --git a/deprecated-rewrite/discord_chatlogs b/non-nix/deprecated-rewrite/discord_chatlogs similarity index 100% rename from deprecated-rewrite/discord_chatlogs rename to non-nix/deprecated-rewrite/discord_chatlogs diff --git a/deprecated-rewrite/doasedit b/non-nix/deprecated-rewrite/doasedit similarity index 100% rename from deprecated-rewrite/doasedit rename to non-nix/deprecated-rewrite/doasedit diff --git a/deprecated-rewrite/exporg_cal.fish b/non-nix/deprecated-rewrite/exporg_cal.fish similarity index 100% rename from deprecated-rewrite/exporg_cal.fish rename to non-nix/deprecated-rewrite/exporg_cal.fish diff --git a/deprecated-rewrite/kemono.py b/non-nix/deprecated-rewrite/kemono.py similarity index 100% rename from deprecated-rewrite/kemono.py rename to non-nix/deprecated-rewrite/kemono.py diff --git a/deprecated-rewrite/manage_music.fish b/non-nix/deprecated-rewrite/manage_music.fish similarity index 100% rename from deprecated-rewrite/manage_music.fish rename to non-nix/deprecated-rewrite/manage_music.fish diff --git a/deprecated-rewrite/moviezip b/non-nix/deprecated-rewrite/moviezip similarity index 100% rename from deprecated-rewrite/moviezip rename to non-nix/deprecated-rewrite/moviezip diff --git a/deprecated-rewrite/pywal.fish b/non-nix/deprecated-rewrite/pywal.fish similarity index 100% rename from deprecated-rewrite/pywal.fish rename to non-nix/deprecated-rewrite/pywal.fish diff --git a/deprecated-rewrite/rnm.fish b/non-nix/deprecated-rewrite/rnm.fish similarity index 100% rename from deprecated-rewrite/rnm.fish rename to non-nix/deprecated-rewrite/rnm.fish diff --git a/deprecated-rewrite/syncphone b/non-nix/deprecated-rewrite/syncphone similarity index 100% rename from deprecated-rewrite/syncphone rename to non-nix/deprecated-rewrite/syncphone diff --git a/download_hs/.direnv/bin/nix-direnv-reload b/non-nix/download_hs/.direnv/bin/nix-direnv-reload similarity index 100% rename from download_hs/.direnv/bin/nix-direnv-reload rename to non-nix/download_hs/.direnv/bin/nix-direnv-reload diff --git a/download_hs/.direnv/nix-profile-.928.50aa30a13c4a b/non-nix/download_hs/.direnv/nix-profile-.928.50aa30a13c4a similarity index 100% rename from download_hs/.direnv/nix-profile-.928.50aa30a13c4a rename to non-nix/download_hs/.direnv/nix-profile-.928.50aa30a13c4a diff --git a/download_hs/.direnv/nix-profile-.928.50aa30a13c4a.rc b/non-nix/download_hs/.direnv/nix-profile-.928.50aa30a13c4a.rc similarity index 100% rename from download_hs/.direnv/nix-profile-.928.50aa30a13c4a.rc rename to non-nix/download_hs/.direnv/nix-profile-.928.50aa30a13c4a.rc diff --git a/download_hs/.envrc b/non-nix/download_hs/.envrc similarity index 100% rename from download_hs/.envrc rename to non-nix/download_hs/.envrc diff --git a/download_hs/CHANGELOG.md b/non-nix/download_hs/CHANGELOG.md similarity index 100% rename from download_hs/CHANGELOG.md rename to non-nix/download_hs/CHANGELOG.md diff --git a/download_hs/LICENSE b/non-nix/download_hs/LICENSE similarity index 100% rename from download_hs/LICENSE rename to non-nix/download_hs/LICENSE diff --git a/download_hs/app/Main.hs b/non-nix/download_hs/app/Main.hs similarity index 100% rename from download_hs/app/Main.hs rename to non-nix/download_hs/app/Main.hs diff --git a/download_hs/app/test.txt b/non-nix/download_hs/app/test.txt similarity index 100% rename from download_hs/app/test.txt rename to non-nix/download_hs/app/test.txt diff --git a/download_hs/default.nix b/non-nix/download_hs/default.nix similarity index 100% rename from download_hs/default.nix rename to non-nix/download_hs/default.nix diff --git a/download_hs/dist-newstyle/cache/compiler b/non-nix/download_hs/dist-newstyle/cache/compiler similarity index 100% rename from download_hs/dist-newstyle/cache/compiler rename to non-nix/download_hs/dist-newstyle/cache/compiler diff --git a/download_hs/dist-newstyle/cache/config b/non-nix/download_hs/dist-newstyle/cache/config similarity index 100% rename from download_hs/dist-newstyle/cache/config rename to non-nix/download_hs/dist-newstyle/cache/config diff --git a/download_hs/dist-newstyle/cache/elaborated-plan b/non-nix/download_hs/dist-newstyle/cache/elaborated-plan similarity index 100% rename from download_hs/dist-newstyle/cache/elaborated-plan rename to non-nix/download_hs/dist-newstyle/cache/elaborated-plan diff --git a/download_hs/dist-newstyle/cache/improved-plan b/non-nix/download_hs/dist-newstyle/cache/improved-plan similarity index 100% rename from download_hs/dist-newstyle/cache/improved-plan rename to non-nix/download_hs/dist-newstyle/cache/improved-plan diff --git a/download_hs/dist-newstyle/cache/plan.json b/non-nix/download_hs/dist-newstyle/cache/plan.json similarity index 100% rename from download_hs/dist-newstyle/cache/plan.json rename to non-nix/download_hs/dist-newstyle/cache/plan.json diff --git a/download_hs/dist-newstyle/cache/solver-plan b/non-nix/download_hs/dist-newstyle/cache/solver-plan similarity index 100% rename from download_hs/dist-newstyle/cache/solver-plan rename to non-nix/download_hs/dist-newstyle/cache/solver-plan diff --git a/download_hs/dist-newstyle/cache/source-hashes b/non-nix/download_hs/dist-newstyle/cache/source-hashes similarity index 100% rename from download_hs/dist-newstyle/cache/source-hashes rename to non-nix/download_hs/dist-newstyle/cache/source-hashes diff --git a/download_hs/dist-newstyle/cache/up-to-date b/non-nix/download_hs/dist-newstyle/cache/up-to-date similarity index 100% rename from download_hs/dist-newstyle/cache/up-to-date rename to non-nix/download_hs/dist-newstyle/cache/up-to-date diff --git a/download_hs/download-hs.cabal b/non-nix/download_hs/download-hs.cabal similarity index 100% rename from download_hs/download-hs.cabal rename to non-nix/download_hs/download-hs.cabal diff --git a/tweepy/.direnv/bin/nix-direnv-reload b/non-nix/find_tweet_user/.direnv/bin/nix-direnv-reload similarity index 100% rename from tweepy/.direnv/bin/nix-direnv-reload rename to non-nix/find_tweet_user/.direnv/bin/nix-direnv-reload diff --git a/non-nix/find_tweet_user/.direnv/nix-profile-24.11-wb6agba4kfsxpbnb b/non-nix/find_tweet_user/.direnv/nix-profile-24.11-wb6agba4kfsxpbnb new file mode 120000 index 0000000..3b7872e --- /dev/null +++ b/non-nix/find_tweet_user/.direnv/nix-profile-24.11-wb6agba4kfsxpbnb @@ -0,0 +1 @@ +/nix/store/f2kzjjcz6kxhqkm2755mrw4ylhv1ba6q-nix-shell-env \ No newline at end of file diff --git a/tweepy/.direnv/nix-profile-24.05-qszplw617r895nbc.rc b/non-nix/find_tweet_user/.direnv/nix-profile-24.11-wb6agba4kfsxpbnb.rc similarity index 80% rename from tweepy/.direnv/nix-profile-24.05-qszplw617r895nbc.rc rename to non-nix/find_tweet_user/.direnv/nix-profile-24.11-wb6agba4kfsxpbnb.rc index cabb663..25309ed 100644 --- a/tweepy/.direnv/nix-profile-24.05-qszplw617r895nbc.rc +++ b/non-nix/find_tweet_user/.direnv/nix-profile-24.11-wb6agba4kfsxpbnb.rc @@ -7,15 +7,15 @@ AR='ar' export AR AS='as' export AS -BASH='/nix/store/5jw69mbaj5dg4l2bj58acg3gxywfszpj-bash-5.2p26/bin/bash' +BASH='/nix/store/717iy55ncqs0wmhdkwc5fg2vci5wbmq8-bash-5.2p32/bin/bash' CC='gcc' export CC -CONFIG_SHELL='/nix/store/5jw69mbaj5dg4l2bj58acg3gxywfszpj-bash-5.2p26/bin/bash' +CONFIG_SHELL='/nix/store/717iy55ncqs0wmhdkwc5fg2vci5wbmq8-bash-5.2p32/bin/bash' export CONFIG_SHELL CXX='g++' export CXX HOSTTYPE='x86_64' -HOST_PATH='/nix/store/ysqx2xfzygv2rxl7nxnw48276z5ckppn-coreutils-9.5/bin:/nix/store/36rvynxwln7iz0qq3k1v3r1mna8bma8s-findutils-4.9.0/bin:/nix/store/0fw4a3z849azkhyjxnpxbygj4g5qhd0v-diffutils-3.10/bin:/nix/store/7xwbkzfrs6flyvjyvd23m8r2mlnycinq-gnused-4.9/bin:/nix/store/d9xr7s3z0r8rf0ba22q6ilqv68agymdb-gnugrep-3.11/bin:/nix/store/9fklixgxv2a9xxpbn504mpifnbz94rb5-gawk-5.2.2/bin:/nix/store/iz0gv4jb2b8bkb9krmha68b00b24p3rl-gnutar-1.35/bin:/nix/store/g14bdsvp1lqqhiyd9g88nyjhp16hs9wj-gzip-1.13/bin:/nix/store/fmk8lz57yy64hvz9rp58krlzb3q9df70-bzip2-1.0.8-bin/bin:/nix/store/3hnf34qxi3h6c62dw95crgxdxvibasml-gnumake-4.4.1/bin:/nix/store/5jw69mbaj5dg4l2bj58acg3gxywfszpj-bash-5.2p26/bin:/nix/store/f46k9pgiq88v6yh76wxb3dv1ggpn6fml-patch-2.7.6/bin:/nix/store/5srqwq17md7w5ln001iaxhxpd0839d8r-xz-5.4.7-bin/bin:/nix/store/j4aja22d2ngbpmi4vdpdd2dvp1hm7dvr-file-5.45/bin' +HOST_PATH='/nix/store/ph44jcx3ddmlwh394mh1wb7f1qigxqb1-coreutils-9.5/bin:/nix/store/yb8icljkwhk5lla4nci3myndq2m4ywly-findutils-4.10.0/bin:/nix/store/phqahkhjsk8sl2jjiid1d47l2s4wy33h-diffutils-3.10/bin:/nix/store/yd9vbyhbxx62j0cyhd6v0iacz11nxpvc-gnused-4.9/bin:/nix/store/lvnwdmnjm7nvaq0a3vhvvn46iy4ql7gr-gnugrep-3.11/bin:/nix/store/0np7q7np75csai2cwzx57n332vn9ig4i-gawk-5.2.2/bin:/nix/store/zvn9bvrl2g516d2hfnanljiw24qa6w8l-gnutar-1.35/bin:/nix/store/db379c3zrmncmbv5khqxpk6ggbhxjw61-gzip-1.13/bin:/nix/store/girfp68w14pxfii52ak8gcs212y4q2s2-bzip2-1.0.8-bin/bin:/nix/store/21y3gqgm2a3w94m0wcrz1xxshks80z7p-gnumake-4.4.1/bin:/nix/store/717iy55ncqs0wmhdkwc5fg2vci5wbmq8-bash-5.2p32/bin:/nix/store/91ixz3zw9ipc5j93gybir9fp5mzisq8w-patch-2.7.6/bin:/nix/store/6v73xwg2c7p5ap29ckyg18ng87pzlnxs-xz-5.6.2-bin/bin:/nix/store/a6nsbir3y5ni3wwkw933aqvcmyyywnnz-file-5.45/bin' export HOST_PATH IFS=' ' @@ -25,23 +25,23 @@ LD='ld' export LD LINENO='76' MACHTYPE='x86_64-pc-linux-gnu' -NIX_BINTOOLS='/nix/store/bl7gf4crmr480jfm8raswv9xn2v1qwiw-binutils-wrapper-2.41' +NIX_BINTOOLS='/nix/store/l7n97992gd5piaw8phkxzsz176gfk1yj-binutils-wrapper-2.43.1' export NIX_BINTOOLS NIX_BINTOOLS_WRAPPER_TARGET_HOST_x86_64_unknown_linux_gnu='1' export NIX_BINTOOLS_WRAPPER_TARGET_HOST_x86_64_unknown_linux_gnu NIX_BUILD_CORES='16' export NIX_BUILD_CORES -NIX_CC='/nix/store/r73z9i18vbjcph7k2f3isrysxzx6sqjx-gcc-wrapper-13.2.0' +NIX_CC='/nix/store/vh9fsdhgxcnab2qk7vdp2palkkn6j3cp-gcc-wrapper-13.3.0' export NIX_CC NIX_CC_WRAPPER_TARGET_HOST_x86_64_unknown_linux_gnu='1' export NIX_CC_WRAPPER_TARGET_HOST_x86_64_unknown_linux_gnu -NIX_CFLAGS_COMPILE=' -frandom-seed=pkk5ygslqs -isystem /nix/store/md1xamk1v0im0pj2vzfvfgq8js3llbc4-python3-3.11.9-env/include -isystem /nix/store/md1xamk1v0im0pj2vzfvfgq8js3llbc4-python3-3.11.9-env/include' +NIX_CFLAGS_COMPILE=' -frandom-seed=f2kzjjcz6k -isystem /nix/store/cf0wrnd193zz8lvgx18zlx14rsg02gwc-python3-3.12.6-env/include -isystem /nix/store/cf0wrnd193zz8lvgx18zlx14rsg02gwc-python3-3.12.6-env/include' export NIX_CFLAGS_COMPILE NIX_ENFORCE_NO_NATIVE='1' export NIX_ENFORCE_NO_NATIVE -NIX_HARDENING_ENABLE='bindnow format fortify fortify3 pic relro stackprotector strictoverflow' +NIX_HARDENING_ENABLE='bindnow format fortify fortify3 pic relro stackprotector strictoverflow zerocallusedregs' export NIX_HARDENING_ENABLE -NIX_LDFLAGS='-rpath /home/jawz/Development/Scripts/tweepy/outputs/out/lib -L/nix/store/md1xamk1v0im0pj2vzfvfgq8js3llbc4-python3-3.11.9-env/lib -L/nix/store/md1xamk1v0im0pj2vzfvfgq8js3llbc4-python3-3.11.9-env/lib' +NIX_LDFLAGS='-rpath /home/jawz/Development/Scripts/tweepy/outputs/out/lib -L/nix/store/cf0wrnd193zz8lvgx18zlx14rsg02gwc-python3-3.12.6-env/lib -L/nix/store/cf0wrnd193zz8lvgx18zlx14rsg02gwc-python3-3.12.6-env/lib' export NIX_LDFLAGS NIX_NO_SELF_RPATH='1' NIX_STORE='/nix/store' @@ -56,13 +56,15 @@ OLDPWD='' export OLDPWD OPTERR='1' OSTYPE='linux-gnu' -PATH='/nix/store/ijaass24a5a7d12q9m03vvqwi5kjwrl5-geckodriver-0.34.0/bin:/nix/store/md1xamk1v0im0pj2vzfvfgq8js3llbc4-python3-3.11.9-env/bin:/nix/store/cy6j2yii4y9jlbqr10k190v0b3jdbwl3-patchelf-0.15.0/bin:/nix/store/r73z9i18vbjcph7k2f3isrysxzx6sqjx-gcc-wrapper-13.2.0/bin:/nix/store/llmjvk4i2yncv8xqdvs4382wr3kgdmvp-gcc-13.2.0/bin:/nix/store/z5gvbj7p7dr89k42ncrl2mlv5v3ymjlp-glibc-2.39-52-bin/bin:/nix/store/ysqx2xfzygv2rxl7nxnw48276z5ckppn-coreutils-9.5/bin:/nix/store/bl7gf4crmr480jfm8raswv9xn2v1qwiw-binutils-wrapper-2.41/bin:/nix/store/7v7g86ml0ri171gfcrs1d442px5bi1p3-binutils-2.41/bin:/nix/store/ysqx2xfzygv2rxl7nxnw48276z5ckppn-coreutils-9.5/bin:/nix/store/36rvynxwln7iz0qq3k1v3r1mna8bma8s-findutils-4.9.0/bin:/nix/store/0fw4a3z849azkhyjxnpxbygj4g5qhd0v-diffutils-3.10/bin:/nix/store/7xwbkzfrs6flyvjyvd23m8r2mlnycinq-gnused-4.9/bin:/nix/store/d9xr7s3z0r8rf0ba22q6ilqv68agymdb-gnugrep-3.11/bin:/nix/store/9fklixgxv2a9xxpbn504mpifnbz94rb5-gawk-5.2.2/bin:/nix/store/iz0gv4jb2b8bkb9krmha68b00b24p3rl-gnutar-1.35/bin:/nix/store/g14bdsvp1lqqhiyd9g88nyjhp16hs9wj-gzip-1.13/bin:/nix/store/fmk8lz57yy64hvz9rp58krlzb3q9df70-bzip2-1.0.8-bin/bin:/nix/store/3hnf34qxi3h6c62dw95crgxdxvibasml-gnumake-4.4.1/bin:/nix/store/5jw69mbaj5dg4l2bj58acg3gxywfszpj-bash-5.2p26/bin:/nix/store/f46k9pgiq88v6yh76wxb3dv1ggpn6fml-patch-2.7.6/bin:/nix/store/5srqwq17md7w5ln001iaxhxpd0839d8r-xz-5.4.7-bin/bin:/nix/store/j4aja22d2ngbpmi4vdpdd2dvp1hm7dvr-file-5.45/bin' +PATH='/nix/store/nk5ncijygravaa05zv2l38smyx7j5l5v-geckodriver-0.35.0/bin:/nix/store/cf0wrnd193zz8lvgx18zlx14rsg02gwc-python3-3.12.6-env/bin:/nix/store/dvfb5mrpfhg5211v6pl0a3fmz9idg6w7-patchelf-0.15.0/bin:/nix/store/vh9fsdhgxcnab2qk7vdp2palkkn6j3cp-gcc-wrapper-13.3.0/bin:/nix/store/0vsyw5bhwmisszyfd1a0sdnwvnf4qa5a-gcc-13.3.0/bin:/nix/store/vpsla1ivhavzd4fmi95yzmgb4g9rd072-glibc-2.40-36-bin/bin:/nix/store/ph44jcx3ddmlwh394mh1wb7f1qigxqb1-coreutils-9.5/bin:/nix/store/l7n97992gd5piaw8phkxzsz176gfk1yj-binutils-wrapper-2.43.1/bin:/nix/store/vcvhwiilizhijk7ywyn58p9l005n9sbn-binutils-2.43.1/bin:/nix/store/ph44jcx3ddmlwh394mh1wb7f1qigxqb1-coreutils-9.5/bin:/nix/store/yb8icljkwhk5lla4nci3myndq2m4ywly-findutils-4.10.0/bin:/nix/store/phqahkhjsk8sl2jjiid1d47l2s4wy33h-diffutils-3.10/bin:/nix/store/yd9vbyhbxx62j0cyhd6v0iacz11nxpvc-gnused-4.9/bin:/nix/store/lvnwdmnjm7nvaq0a3vhvvn46iy4ql7gr-gnugrep-3.11/bin:/nix/store/0np7q7np75csai2cwzx57n332vn9ig4i-gawk-5.2.2/bin:/nix/store/zvn9bvrl2g516d2hfnanljiw24qa6w8l-gnutar-1.35/bin:/nix/store/db379c3zrmncmbv5khqxpk6ggbhxjw61-gzip-1.13/bin:/nix/store/girfp68w14pxfii52ak8gcs212y4q2s2-bzip2-1.0.8-bin/bin:/nix/store/21y3gqgm2a3w94m0wcrz1xxshks80z7p-gnumake-4.4.1/bin:/nix/store/717iy55ncqs0wmhdkwc5fg2vci5wbmq8-bash-5.2p32/bin:/nix/store/91ixz3zw9ipc5j93gybir9fp5mzisq8w-patch-2.7.6/bin:/nix/store/6v73xwg2c7p5ap29ckyg18ng87pzlnxs-xz-5.6.2-bin/bin:/nix/store/a6nsbir3y5ni3wwkw933aqvcmyyywnnz-file-5.45/bin' export PATH PS4='+ ' RANLIB='ranlib' export RANLIB READELF='readelf' export READELF +SHELL='/nix/store/717iy55ncqs0wmhdkwc5fg2vci5wbmq8-bash-5.2p32/bin/bash' +export SHELL SIZE='size' export SIZE SOURCE_DATE_EPOCH='315532800' @@ -71,7 +73,7 @@ STRINGS='strings' export STRINGS STRIP='strip' export STRIP -XDG_DATA_DIRS='/nix/store/md1xamk1v0im0pj2vzfvfgq8js3llbc4-python3-3.11.9-env/share:/nix/store/cy6j2yii4y9jlbqr10k190v0b3jdbwl3-patchelf-0.15.0/share' +XDG_DATA_DIRS='/nix/store/cf0wrnd193zz8lvgx18zlx14rsg02gwc-python3-3.12.6-env/share:/nix/store/dvfb5mrpfhg5211v6pl0a3fmz9idg6w7-patchelf-0.15.0/share' export XDG_DATA_DIRS __structuredAttrs='' export __structuredAttrs @@ -88,14 +90,14 @@ buildPhase='{ echo "------------------------------------------------------------ } >> "$out" ' export buildPhase -builder='/nix/store/5jw69mbaj5dg4l2bj58acg3gxywfszpj-bash-5.2p26/bin/bash' +builder='/nix/store/717iy55ncqs0wmhdkwc5fg2vci5wbmq8-bash-5.2p32/bin/bash' export builder cmakeFlags='' export cmakeFlags configureFlags='' export configureFlags defaultBuildInputs='' -defaultNativeBuildInputs='/nix/store/cy6j2yii4y9jlbqr10k190v0b3jdbwl3-patchelf-0.15.0 /nix/store/l4sqcq84ibmissf3427f34mjlzx28h20-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/ilaf1w22bxi6jsi45alhmvvdgy4ly3zs-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/gps9qrh99j7g02840wv5x78ykmz30byp-strip.sh /nix/store/r73z9i18vbjcph7k2f3isrysxzx6sqjx-gcc-wrapper-13.2.0' +defaultNativeBuildInputs='/nix/store/dvfb5mrpfhg5211v6pl0a3fmz9idg6w7-patchelf-0.15.0 /nix/store/n9iajmgf6z1rvwrdxy3fp8q9xa16j7x7-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/vh9fsdhgxcnab2qk7vdp2palkkn6j3cp-gcc-wrapper-13.3.0' depsBuildBuild='' export depsBuildBuild depsBuildBuildPropagated='' @@ -125,12 +127,12 @@ declare -a envHostHostHooks=('ccWrapper_addCVars' 'bintoolsWrapper_addLDVars' ) declare -a envHostTargetHooks=('ccWrapper_addCVars' 'bintoolsWrapper_addLDVars' ) declare -a envTargetTargetHooks=() 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' ) -initialPath='/nix/store/ysqx2xfzygv2rxl7nxnw48276z5ckppn-coreutils-9.5 /nix/store/36rvynxwln7iz0qq3k1v3r1mna8bma8s-findutils-4.9.0 /nix/store/0fw4a3z849azkhyjxnpxbygj4g5qhd0v-diffutils-3.10 /nix/store/7xwbkzfrs6flyvjyvd23m8r2mlnycinq-gnused-4.9 /nix/store/d9xr7s3z0r8rf0ba22q6ilqv68agymdb-gnugrep-3.11 /nix/store/9fklixgxv2a9xxpbn504mpifnbz94rb5-gawk-5.2.2 /nix/store/iz0gv4jb2b8bkb9krmha68b00b24p3rl-gnutar-1.35 /nix/store/g14bdsvp1lqqhiyd9g88nyjhp16hs9wj-gzip-1.13 /nix/store/fmk8lz57yy64hvz9rp58krlzb3q9df70-bzip2-1.0.8-bin /nix/store/3hnf34qxi3h6c62dw95crgxdxvibasml-gnumake-4.4.1 /nix/store/5jw69mbaj5dg4l2bj58acg3gxywfszpj-bash-5.2p26 /nix/store/f46k9pgiq88v6yh76wxb3dv1ggpn6fml-patch-2.7.6 /nix/store/5srqwq17md7w5ln001iaxhxpd0839d8r-xz-5.4.7-bin /nix/store/j4aja22d2ngbpmi4vdpdd2dvp1hm7dvr-file-5.45' +initialPath='/nix/store/ph44jcx3ddmlwh394mh1wb7f1qigxqb1-coreutils-9.5 /nix/store/yb8icljkwhk5lla4nci3myndq2m4ywly-findutils-4.10.0 /nix/store/phqahkhjsk8sl2jjiid1d47l2s4wy33h-diffutils-3.10 /nix/store/yd9vbyhbxx62j0cyhd6v0iacz11nxpvc-gnused-4.9 /nix/store/lvnwdmnjm7nvaq0a3vhvvn46iy4ql7gr-gnugrep-3.11 /nix/store/0np7q7np75csai2cwzx57n332vn9ig4i-gawk-5.2.2 /nix/store/zvn9bvrl2g516d2hfnanljiw24qa6w8l-gnutar-1.35 /nix/store/db379c3zrmncmbv5khqxpk6ggbhxjw61-gzip-1.13 /nix/store/girfp68w14pxfii52ak8gcs212y4q2s2-bzip2-1.0.8-bin /nix/store/21y3gqgm2a3w94m0wcrz1xxshks80z7p-gnumake-4.4.1 /nix/store/717iy55ncqs0wmhdkwc5fg2vci5wbmq8-bash-5.2p32 /nix/store/91ixz3zw9ipc5j93gybir9fp5mzisq8w-patch-2.7.6 /nix/store/6v73xwg2c7p5ap29ckyg18ng87pzlnxs-xz-5.6.2-bin /nix/store/a6nsbir3y5ni3wwkw933aqvcmyyywnnz-file-5.45' mesonFlags='' export mesonFlags name='nix-shell-env' export name -nativeBuildInputs='/nix/store/ijaass24a5a7d12q9m03vvqwi5kjwrl5-geckodriver-0.34.0 /nix/store/md1xamk1v0im0pj2vzfvfgq8js3llbc4-python3-3.11.9-env' +nativeBuildInputs='/nix/store/nk5ncijygravaa05zv2l38smyx7j5l5v-geckodriver-0.35.0 /nix/store/cf0wrnd193zz8lvgx18zlx14rsg02gwc-python3-3.12.6-env' export nativeBuildInputs out='/home/jawz/Development/Scripts/tweepy/outputs/out' export out @@ -149,9 +151,9 @@ patches='' export patches phases='buildPhase' export phases -pkg='/nix/store/r73z9i18vbjcph7k2f3isrysxzx6sqjx-gcc-wrapper-13.2.0' +pkg='/nix/store/vh9fsdhgxcnab2qk7vdp2palkkn6j3cp-gcc-wrapper-13.3.0' declare -a pkgsBuildBuild=() -declare -a pkgsBuildHost=('/nix/store/ijaass24a5a7d12q9m03vvqwi5kjwrl5-geckodriver-0.34.0' '/nix/store/md1xamk1v0im0pj2vzfvfgq8js3llbc4-python3-3.11.9-env' '/nix/store/cy6j2yii4y9jlbqr10k190v0b3jdbwl3-patchelf-0.15.0' '/nix/store/l4sqcq84ibmissf3427f34mjlzx28h20-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/ilaf1w22bxi6jsi45alhmvvdgy4ly3zs-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/gps9qrh99j7g02840wv5x78ykmz30byp-strip.sh' '/nix/store/r73z9i18vbjcph7k2f3isrysxzx6sqjx-gcc-wrapper-13.2.0' '/nix/store/bl7gf4crmr480jfm8raswv9xn2v1qwiw-binutils-wrapper-2.41' ) +declare -a pkgsBuildHost=('/nix/store/nk5ncijygravaa05zv2l38smyx7j5l5v-geckodriver-0.35.0' '/nix/store/cf0wrnd193zz8lvgx18zlx14rsg02gwc-python3-3.12.6-env' '/nix/store/dvfb5mrpfhg5211v6pl0a3fmz9idg6w7-patchelf-0.15.0' '/nix/store/n9iajmgf6z1rvwrdxy3fp8q9xa16j7x7-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/vh9fsdhgxcnab2qk7vdp2palkkn6j3cp-gcc-wrapper-13.3.0' '/nix/store/l7n97992gd5piaw8phkxzsz176gfk1yj-binutils-wrapper-2.43.1' ) declare -a pkgsBuildTarget=() declare -a pkgsHostHost=() declare -a pkgsHostTarget=() @@ -171,42 +173,17 @@ declare -a propagatedHostDepFiles=('propagated-host-host-deps' 'propagated-build propagatedNativeBuildInputs='' export propagatedNativeBuildInputs declare -a propagatedTargetDepFiles=('propagated-target-target-deps' ) -shell='/nix/store/5jw69mbaj5dg4l2bj58acg3gxywfszpj-bash-5.2p26/bin/bash' +shell='/nix/store/717iy55ncqs0wmhdkwc5fg2vci5wbmq8-bash-5.2p32/bin/bash' export shell shellHook='' export shellHook -stdenv='/nix/store/dd7nxjnni7nzm0846fq5xrm89ais5lwz-stdenv-linux' +stdenv='/nix/store/ncv68hjnidcd2bm5abkhklrijhn0cgn6-stdenv-linux' export stdenv strictDeps='' export strictDeps system='x86_64-linux' export system declare -a unpackCmdHooks=('_defaultUnpack' ) -_accumFlagsArray () -{ - - local name; - if [ -n "$__structuredAttrs" ]; then - for name in "$@"; - do - local -n nameref="$name"; - flagsArray+=(${nameref+"${nameref[@]}"}); - done; - else - for name in "$@"; - do - local -n nameref="$name"; - case "$name" in - *Array) - flagsArray+=(${nameref+"${nameref[@]}"}) - ;; - *) - flagsArray+=(${nameref-}) - ;; - esac; - done; - fi -} _activatePkgs () { @@ -272,13 +249,10 @@ _allFlags () { export system pname name version; - for varName in $(awk 'BEGIN { for (v in ENVIRON) if (v ~ /^[a-z][a-zA-Z0-9_]*$/) print v }'); - do - if (( "${NIX_DEBUG:-0}" >= 1 )); then - printf "@%s@ -> %q\n" "${varName}" "${!varName}" 1>&2; - fi; + while IFS='' read -r varName; do + nixTalkativeLog "@${varName}@ -> ${!varName}"; args+=("--subst-var" "$varName"); - done + done < <(awk 'BEGIN { for (v in ENVIRON) if (v ~ /^[a-z][a-zA-Z0-9_]*$/) print v }') } _assignFirst () { @@ -314,12 +288,15 @@ _callImplicitHook () local def="$1"; local hookName="$2"; if declare -F "$hookName" > /dev/null; then + nixTalkativeLog "calling implicit '$hookName' function hook"; "$hookName"; else if type -p "$hookName" > /dev/null; then + nixTalkativeLog "sourcing implicit '$hookName' script hook"; source "$hookName"; else if [ -n "${!hookName:-}" ]; then + nixTalkativeLog "evaling implicit '$hookName' string hook"; eval "${!hookName}"; else return "$def"; @@ -391,6 +368,40 @@ _eval () eval "$1"; fi } +_logHook () +{ + + if [[ -z ${NIX_LOG_FD-} ]]; then + return; + fi; + local hookKind="$1"; + local hookExpr="$2"; + shift 2; + if declare -F "$hookExpr" > /dev/null 2>&1; then + nixTalkativeLog "calling '$hookKind' function hook '$hookExpr'" "$@"; + else + if type -p "$hookExpr" > /dev/null; then + nixTalkativeLog "sourcing '$hookKind' script hook '$hookExpr'"; + else + if [[ "$hookExpr" != "_callImplicitHook"* ]]; then + local exprToOutput; + if [[ ${NIX_DEBUG:-0} -ge 5 ]]; then + exprToOutput="$hookExpr"; + else + local hookExprLine; + while IFS= read -r hookExprLine; do + hookExprLine="${hookExprLine#"${hookExprLine%%[![:space:]]*}"}"; + if [[ -n "$hookExprLine" ]]; then + exprToOutput+="$hookExprLine\\n "; + fi; + done <<< "$hookExpr"; + exprToOutput="${exprToOutput%%\\n }"; + fi; + nixTalkativeLog "evaling '$hookKind' string hook '$exprToOutput'"; + fi; + fi; + fi +} _makeSymlinksRelative () { @@ -615,6 +626,7 @@ activatePackage () local -r targetOffset="$3"; (( hostOffset <= targetOffset )) || exit 1; if [ -f "$pkg" ]; then + nixTalkativeLog "sourcing setup hook '$pkg'"; source "$pkg"; fi; if [[ -z "${strictDeps-}" || "$hostOffset" -le -1 ]]; then @@ -627,6 +639,7 @@ activatePackage () addToSearchPath _HOST_PATH "$pkg/bin"; fi; if [[ -f "$pkg/nix-support/setup-hook" ]]; then + nixTalkativeLog "sourcing setup hook '$pkg/nix-support/setup-hook'"; source "$pkg/nix-support/setup-hook"; fi } @@ -667,18 +680,19 @@ appendToVar () else useArray=false; fi; - if declare -p "$1" 2> /dev/null | grep -q '^'; then - type="$(declare -p "$1")"; - if [[ "$type" =~ "declare -A" ]]; then - echo "appendToVar(): ERROR: trying to use appendToVar on an associative array, use variable+=([\"X\"]=\"Y\") instead." 1>&2; - return 1; - else - if [[ "$type" =~ "declare -a" ]]; then - useArray=true; - else - useArray=false; - fi; - fi; + if type=$(declare -p "$1" 2> /dev/null); then + case "${type#* }" in + -A*) + echo "appendToVar(): ERROR: trying to use appendToVar on an associative array, use variable+=([\"X\"]=\"Y\") instead." 1>&2; + return 1 + ;; + -a*) + useArray=true + ;; + *) + useArray=false + ;; + esac; fi; shift; if $useArray; then @@ -740,8 +754,8 @@ buildPhase () echo "no Makefile or custom buildPhase, doing nothing"; else foundMakefile=1; - local flagsArray=(${enableParallelBuilding:+-j${NIX_BUILD_CORES}} SHELL=$SHELL); - _accumFlagsArray makeFlags makeFlagsArray buildFlags buildFlagsArray; + local flagsArray=(${enableParallelBuilding:+-j${NIX_BUILD_CORES}} SHELL="$SHELL"); + concatTo flagsArray makeFlags makeFlagsArray buildFlags buildFlagsArray; echoCmd 'build flags' "${flagsArray[@]}"; make ${makefile:+-f $makefile} "${flagsArray[@]}"; unset flagsArray; @@ -771,25 +785,18 @@ checkPhase () fi; if [[ -z "${checkTarget:-}" ]]; then if make -n ${makefile:+-f $makefile} check > /dev/null 2>&1; then - checkTarget=check; + checkTarget="check"; else if make -n ${makefile:+-f $makefile} test > /dev/null 2>&1; then - checkTarget=test; + checkTarget="test"; fi; fi; fi; if [[ -z "${checkTarget:-}" ]]; then echo "no check/test target in ${makefile:-Makefile}, doing nothing"; else - local flagsArray=(${enableParallelChecking:+-j${NIX_BUILD_CORES}} SHELL=$SHELL); - _accumFlagsArray makeFlags makeFlagsArray; - if [ -n "$__structuredAttrs" ]; then - flagsArray+=("${checkFlags[@]:-VERBOSE=y}"); - else - flagsArray+=(${checkFlags:-VERBOSE=y}); - fi; - _accumFlagsArray checkFlagsArray; - flagsArray+=(${checkTarget}); + local flagsArray=(${enableParallelChecking:+-j${NIX_BUILD_CORES}} SHELL="$SHELL"); + concatTo flagsArray makeFlags makeFlagsArray checkFlags=VERBOSE=y checkFlagsArray checkTarget; echoCmd 'check flags' "${flagsArray[@]}"; make ${makefile:+-f $makefile} "${flagsArray[@]}"; unset flagsArray; @@ -819,6 +826,66 @@ compressManPages () fi; done } +concatStringsSep () +{ + + local sep="$1"; + local name="$2"; + local type oldifs; + if type=$(declare -p "$name" 2> /dev/null); then + local -n nameref="$name"; + case "${type#* }" in + -A*) + echo "concatStringsSep(): ERROR: trying to use concatStringsSep on an associative array." 1>&2; + return 1 + ;; + -a*) + local IFS="$sep"; + echo -n "${nameref[*]}" + ;; + *) + echo -n "${nameref// /"${sep}"}" + ;; + esac; + fi +} +concatTo () +{ + + local -; + set -o noglob; + local -n targetref="$1"; + shift; + local arg default name type; + for arg in "$@"; + do + IFS="=" read -r name default <<< "$arg"; + local -n nameref="$name"; + if [[ ! -n "${nameref[@]}" && -n "$default" ]]; then + targetref+=("$default"); + else + if type=$(declare -p "$name" 2> /dev/null); then + case "${type#* }" in + -A*) + echo "concatTo(): ERROR: trying to use concatTo on an associative array." 1>&2; + return 1 + ;; + -a*) + targetref+=("${nameref[@]}") + ;; + *) + if [[ "$name" = *"Array" ]]; then + nixErrorLog "concatTo(): $name is not declared as array, treating as a singleton. This will become an error in future"; + targetref+=(${nameref+"${nameref[@]}"}); + else + targetref+=(${nameref-}); + fi + ;; + esac; + fi; + fi; + done +} configurePhase () { @@ -858,7 +925,7 @@ configurePhase () fi; if [ -n "$configureScript" ]; then local -a flagsArray; - _accumFlagsArray configureFlags configureFlagsArray; + concatTo flagsArray configureFlags configureFlagsArray; echoCmd 'configure flags' "${flagsArray[@]}"; $configureScript "${flagsArray[@]}"; unset flagsArray; @@ -880,8 +947,7 @@ distPhase () runHook preDist; local flagsArray=(); - _accumFlagsArray distFlags distFlagsArray; - flagsArray+=(${distTarget:-dist}); + concatTo flagsArray distFlags distFlagsArray distTarget=dist; echo 'dist flags: %q' "${flagsArray[@]}"; make ${makefile:+-f $makefile} "${flagsArray[@]}"; if [ "${dontCopyDist:-0}" != 1 ]; then @@ -894,7 +960,9 @@ dumpVars () { if [ "${noDumpEnvVars:-0}" != 1 ]; then - export 2> /dev/null >| "$NIX_BUILD_TOP/env-vars" || true; + { + install -m 0600 /dev/null "$NIX_BUILD_TOP/env-vars" && export 2> /dev/null >| "$NIX_BUILD_TOP/env-vars" + } || true; fi } echoCmd () @@ -1097,7 +1165,7 @@ getRole () role_post='_FOR_TARGET' ;; *) - echo "binutils-wrapper-2.41: used as improper sort of dependency" 1>&2; + echo "binutils-wrapper-2.43.1: used as improper sort of dependency" 1>&2; return 1 ;; esac @@ -1126,7 +1194,7 @@ getTargetRoleWrapper () export NIX_BINTOOLS_WRAPPER_TARGET_TARGET_x86_64_unknown_linux_gnu=1 ;; *) - echo "binutils-wrapper-2.41: used as improper sort of dependency" 1>&2; + echo "binutils-wrapper-2.43.1: used as improper sort of dependency" 1>&2; return 1 ;; esac @@ -1141,9 +1209,8 @@ installCheckPhase () if [[ -z "${installCheckTarget:-}" ]] && ! make -n ${makefile:+-f $makefile} "${installCheckTarget:-installcheck}" > /dev/null 2>&1; then echo "no installcheck target in ${makefile:-Makefile}, doing nothing"; else - local flagsArray=(${enableParallelChecking:+-j${NIX_BUILD_CORES}} SHELL=$SHELL); - _accumFlagsArray makeFlags makeFlagsArray installCheckFlags installCheckFlagsArray; - flagsArray+=(${installCheckTarget:-installcheck}); + local flagsArray=(${enableParallelChecking:+-j${NIX_BUILD_CORES}} SHELL="$SHELL"); + concatTo flagsArray makeFlags makeFlagsArray installCheckFlags installCheckFlagsArray installCheckTarget=installcheck; echoCmd 'installcheck flags' "${flagsArray[@]}"; make ${makefile:+-f $makefile} "${flagsArray[@]}"; unset flagsArray; @@ -1165,13 +1232,8 @@ installPhase () if [ -n "$prefix" ]; then mkdir -p "$prefix"; fi; - local flagsArray=(${enableParallelInstalling:+-j${NIX_BUILD_CORES}} SHELL=$SHELL); - _accumFlagsArray makeFlags makeFlagsArray installFlags installFlagsArray; - if [ -n "$__structuredAttrs" ]; then - flagsArray+=("${installTargets[@]:-install}"); - else - flagsArray+=(${installTargets:-install}); - fi; + local flagsArray=(${enableParallelInstalling:+-j${NIX_BUILD_CORES}} SHELL="$SHELL"); + concatTo flagsArray makeFlags makeFlagsArray installFlags installFlagsArray installTargets=install; echoCmd 'install flags' "${flagsArray[@]}"; make ${makefile:+-f $makefile} "${flagsArray[@]}"; unset flagsArray; @@ -1283,6 +1345,70 @@ moveToOutput () done; done } +nixChattyLog () +{ + + if [[ -z ${NIX_LOG_FD-} ]] || [[ ${NIX_DEBUG:-0} -lt 5 ]]; then + return; + fi; + printf "%s\n" "$*" >&"$NIX_LOG_FD" +} +nixDebugLog () +{ + + if [[ -z ${NIX_LOG_FD-} ]] || [[ ${NIX_DEBUG:-0} -lt 6 ]]; then + return; + fi; + printf "%s\n" "$*" >&"$NIX_LOG_FD" +} +nixErrorLog () +{ + + if [[ -z ${NIX_LOG_FD-} ]] || [[ ${NIX_DEBUG:-0} -lt 0 ]]; then + return; + fi; + printf "%s\n" "$*" >&"$NIX_LOG_FD" +} +nixInfoLog () +{ + + if [[ -z ${NIX_LOG_FD-} ]] || [[ ${NIX_DEBUG:-0} -lt 3 ]]; then + return; + fi; + printf "%s\n" "$*" >&"$NIX_LOG_FD" +} +nixNoticeLog () +{ + + if [[ -z ${NIX_LOG_FD-} ]] || [[ ${NIX_DEBUG:-0} -lt 2 ]]; then + return; + fi; + printf "%s\n" "$*" >&"$NIX_LOG_FD" +} +nixTalkativeLog () +{ + + if [[ -z ${NIX_LOG_FD-} ]] || [[ ${NIX_DEBUG:-0} -lt 4 ]]; then + return; + fi; + printf "%s\n" "$*" >&"$NIX_LOG_FD" +} +nixVomitLog () +{ + + if [[ -z ${NIX_LOG_FD-} ]] || [[ ${NIX_DEBUG:-0} -lt 7 ]]; then + return; + fi; + printf "%s\n" "$*" >&"$NIX_LOG_FD" +} +nixWarnLog () +{ + + if [[ -z ${NIX_LOG_FD-} ]] || [[ ${NIX_DEBUG:-0} -lt 1 ]]; then + return; + fi; + printf "%s\n" "$*" >&"$NIX_LOG_FD" +} patchELF () { @@ -1306,11 +1432,7 @@ patchPhase () runHook prePatch; local -a patchesArray; - if [ -n "$__structuredAttrs" ]; then - patchesArray=(${patches:+"${patches[@]}"}); - else - patchesArray=(${patches:-}); - fi; + concatTo patchesArray patches; for i in "${patchesArray[@]}"; do echo "applying patch $i"; @@ -1330,11 +1452,7 @@ patchPhase () ;; esac; local -a flagsArray; - if [ -n "$__structuredAttrs" ]; then - flagsArray=("${patchFlags[@]:--p1}"); - else - flagsArray=(${patchFlags:--p1}); - fi; + concatTo flagsArray patchFlags=-p1; $uncompress < "$i" 2>&1 | patch "${flagsArray[@]}"; done; runHook postPatch @@ -1399,21 +1517,21 @@ patchShebangs () if [[ $arg0 == "-S" ]]; then arg0=${args%% *}; args=${args#* }; - newPath="$(PATH="${!pathName}" command -v "env" || true)"; - args="-S $(PATH="${!pathName}" command -v "$arg0" || true) $args"; + newPath="$(PATH="${!pathName}" type -P "env" || true)"; + args="-S $(PATH="${!pathName}" type -P "$arg0" || true) $args"; else if [[ $arg0 == "-"* || $arg0 == *"="* ]]; then echo "$f: unsupported interpreter directive \"$oldInterpreterLine\" (set dontPatchShebangs=1 and handle shebang patching yourself)" 1>&2; exit 1; else - newPath="$(PATH="${!pathName}" command -v "$arg0" || true)"; + newPath="$(PATH="${!pathName}" type -P "$arg0" || true)"; fi; fi; else if [[ -z $oldPath ]]; then oldPath="/bin/sh"; fi; - newPath="$(PATH="${!pathName}" command -v "$(basename "$oldPath")" || true)"; + newPath="$(PATH="${!pathName}" type -P "$(basename "$oldPath")" || true)"; args="$arg0 $args"; fi; newInterpreterLine="$newPath $args"; @@ -1450,18 +1568,19 @@ prependToVar () else useArray=false; fi; - if declare -p "$1" 2> /dev/null | grep -q '^'; then - type="$(declare -p "$1")"; - if [[ "$type" =~ "declare -A" ]]; then - echo "prependToVar(): ERROR: trying to use prependToVar on an associative array." 1>&2; - return 1; - else - if [[ "$type" =~ "declare -a" ]]; then - useArray=true; - else - useArray=false; - fi; - fi; + if type=$(declare -p "$1" 2> /dev/null); then + case "${type#* }" in + -A*) + echo "prependToVar(): ERROR: trying to use prependToVar on an associative array." 1>&2; + return 1 + ;; + -a*) + useArray=true + ;; + *) + useArray=false + ;; + esac; fi; shift; if $useArray; then @@ -1506,6 +1625,7 @@ runHook () local hook; for hook in "_callImplicitHook 0 $hookName" ${!hooksSlice+"${!hooksSlice}"}; do + _logHook "$hookName" "$hook" "$@"; _eval "$hook" "$@"; done; return 0 @@ -1519,6 +1639,7 @@ runOneHook () local hook ret=1; for hook in "_callImplicitHook 1 $hookName" ${!hooksSlice+"${!hooksSlice}"}; do + _logHook "$hookName" "$hook" "$@"; if _eval "$hook" "$@"; then ret=0; break; @@ -1557,18 +1678,16 @@ runPhase () if [[ "$curPhase" = distPhase && -z "${doDist:-}" ]]; then return; fi; - if [[ -n $NIX_LOG_FD ]]; then - echo "@nix { \"action\": \"setPhase\", \"phase\": \"$curPhase\" }" >&"$NIX_LOG_FD"; - fi; showPhaseHeader "$curPhase"; dumpVars; - local startTime=$(date +"%s"); + local startTime endTime; + startTime=$(date +"%s"); eval "${!curPhase:-$curPhase}"; - local endTime=$(date +"%s"); + endTime=$(date +"%s"); showPhaseFooter "$curPhase" "$startTime" "$endTime"; if [ "$curPhase" = unpackPhase ]; then - [ -n "${sourceRoot:-}" ] && chmod +x "${sourceRoot}"; - cd "${sourceRoot:-.}"; + [ -n "${sourceRoot:-}" ] && chmod +x -- "${sourceRoot}"; + cd -- "${sourceRoot:-.}"; fi } showPhaseFooter () @@ -1591,7 +1710,11 @@ showPhaseHeader () { local phase="$1"; - echo "Running phase: $phase" + echo "Running phase: $phase"; + if [[ -z ${NIX_LOG_FD-} ]]; then + return; + fi; + printf "@nix { \"action\": \"setPhase\", \"phase\": \"%s\" }\n" "$phase" >&"$NIX_LOG_FD" } stripDirs () { @@ -1789,11 +1912,7 @@ unpackPhase () srcs="$src"; fi; local -a srcsArray; - if [ -n "$__structuredAttrs" ]; then - srcsArray=("${srcs[@]}"); - else - srcsArray=($srcs); - fi; + concatTo srcsArray srcs; local dirsBefore=""; for i in *; do @@ -1850,7 +1969,7 @@ updateAutotoolsGnuConfigScriptsPhase () for f in $(find . -type f -name "$script"); do echo "Updating Autotools / GNU config script to a newer upstream version: $f"; - cp -f "/nix/store/pqjr4bpaykb34bp13m1gc5sin1gzb1a8-gnu-config-2024-01-01/$script" "$f"; + cp -f "/nix/store/ga0gqnv6qyzvg08jqw0pc2fkyzlv1qrv-gnu-config-2024-01-01/$script" "$f"; done; done } @@ -1858,6 +1977,7 @@ updateSourceDateEpoch () { local path="$1"; + [[ $path == -* ]] && path="./$path"; 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)); local time="${res[0]//\.[0-9]*/}"; local newestFile="${res[1]}"; @@ -1877,4 +1997,4 @@ export TMP="$NIX_BUILD_TOP" export TMPDIR="$NIX_BUILD_TOP" export TEMP="$NIX_BUILD_TOP" export TEMPDIR="$NIX_BUILD_TOP" -eval "$shellHook" +eval "${shellHook:-}" diff --git a/tweepy/.envrc b/non-nix/find_tweet_user/.envrc similarity index 100% rename from tweepy/.envrc rename to non-nix/find_tweet_user/.envrc diff --git a/tweepy/find_tweet_user.py b/non-nix/find_tweet_user/find_tweet_user.py similarity index 100% rename from tweepy/find_tweet_user.py rename to non-nix/find_tweet_user/find_tweet_user.py diff --git a/tweepy/shell.nix b/non-nix/find_tweet_user/shell.nix similarity index 100% rename from tweepy/shell.nix rename to non-nix/find_tweet_user/shell.nix diff --git a/gdl/gdl_log_report b/non-nix/gdl/gdl_log_report similarity index 100% rename from gdl/gdl_log_report rename to non-nix/gdl/gdl_log_report diff --git a/gdl/gdl_log_report.sh b/non-nix/gdl/gdl_log_report.sh similarity index 100% rename from gdl/gdl_log_report.sh rename to non-nix/gdl/gdl_log_report.sh diff --git a/gdl/gdl_mv b/non-nix/gdl/gdl_mv similarity index 100% rename from gdl/gdl_mv rename to non-nix/gdl/gdl_mv diff --git a/gdl/gdl_mv.sh b/non-nix/gdl/gdl_mv.sh similarity index 100% rename from gdl/gdl_mv.sh rename to non-nix/gdl/gdl_mv.sh diff --git a/gdl/track_files.fish b/non-nix/gdl/track_files.fish similarity index 100% rename from gdl/track_files.fish rename to non-nix/gdl/track_files.fish diff --git a/photos-metadata.sh b/non-nix/photos-metadata.sh similarity index 100% rename from photos-metadata.sh rename to non-nix/photos-metadata.sh diff --git a/xhamster.py b/non-nix/xhamster.py similarity index 100% rename from xhamster.py rename to non-nix/xhamster.py