SFrijters/nix-container-demo - Change W2G433QU3JDG72JL6GYR6E5HMAHFP3OF2DLFB3O42245XTE6VGZQC

Refactor libdemo and flakeref for nix run commands

Created by Stefan Frijters on March 23, 2023

W2G433QU3JDG72JL6GYR6E5HMAHFP3OF2DLFB3O42245XTE6VGZQC

Dependencies

In channels

main

Change contents

Deletion in libdemo/libdemo.sh at line 206 [9.22]

B:BD[7.465] → [8.2333:2359]

B:BD[8.2359] → [2.1221:1259]

∅:D[2.1259] → [10.7:120]

B:BD[8.2387] → [10.7:120]

B:BD[10.120] → [6.5:126]

∅:D[6.126] → [10.253:303]

∅:D[11.191] → [10.253:303]

B:BD[10.253] → [10.253:303]

B:BD[10.303] → [2.1260:1313]

∅:D[2.1313] → [10.335:444]

B:BD[10.335] → [10.335:444]

∅:D[10.444] → [8.2584:2597]

B:BD[8.2584] → [8.2584:2597]

B:BD[8.2597] → [12.271:345]

∅:D[12.345] → [8.2597:2618]

B:BD[8.2597] → [8.2597:2618]

B:BD[8.2618] → [12.346:357]

    }
    pygmentize() {
        if __libdemo_use_colour; then
            if type nix >/dev/null; then
                # Hack around missing mainProgram attribute in pygments
                COLORTERM="" TERM="" nix run github:sfrijters/nixpkgs/pygments-mainprogram#python3Packages.pygments "$@"
            elif type pygmentize >/dev/null; then
                COLORTERM="" TERM="" pygmentize "$@"
            else
                echo "pygmentize command not found"
                return 1
            fi
        else
            while [ $# -gt 1 ]; do
                shift
            done
            cat "$@"
        fi

Deletion in libdemo/libdemo.sh at line 207 [9.22]

B:BD[9.3605] → [13.4:17]

B:BD[13.17] → [2.1314:1352]

∅:D[2.1352] → [13.45:334]

B:BD[13.45] → [13.45:334]

B:BD[13.334] → [3.224:306]

∅:D[3.306] → [13.334:351]

B:BD[13.334] → [13.334:351]


    tiv() {
        if __libdemo_use_colour; then
            if type nix > /dev/null; then
                nix run github:sfrijters/nixpkgs/tiv-add-wrapper#tiv -- "$@"
            elif type tiv >/dev/null; then
                tiv "$@"
            else
                echo "tiv command not found"
                return 1
            fi
        else
            echo "no colour output available, use your imagination!"
        fi
    }

Replacement in demo-full.sh at line 5 [7.1]

B:BD[7.43] → [14.60:119]

source "$(dirname "${BASH_SOURCE[0]}")/libdemo/libdemo.sh"

[7.43]

[7.99]

source "$(dirname "${BASH_SOURCE[0]}")/bash/nix-container-demo-helper.sh"

Replacement in demo-full.sh at line 8 [7.1]

B:BD[15.10] → [11.193:319]

    local -r shellcheck_cmd="nix run github:nixos/nixpkgs/008ce261a7e3c532e792cb8e39482f2cc1b192f5#shellcheck -- -S style -x"

[15.10]

[16.1]

    local -r shellcheck_cmd="nix run ${NIXPKGS_FLAKEREF}#shellcheck -- -S style -x"

Replacement in demo-full.sh at line 11 [7.1]

∅:D[11.374] → [14.120:181]

B:BD[16.108] → [14.120:181]

B:BD[14.181] → [11.375:461]

    echo "$(dirname "${BASH_SOURCE[0]}")/libdemo/libdemo.sh"
    ${shellcheck_cmd} "$(dirname "${BASH_SOURCE[0]}")/libdemo/libdemo.sh" || return 1

[11.374]

[16.273]

    echo "$(dirname "${BASH_SOURCE[0]}")/bash/nix-container-demo-helper.sh"
    ${shellcheck_cmd} "$(dirname "${BASH_SOURCE[0]}")/bash/nix-container-demo-helper.sh" || return 1

File addition: bash (d--x------)
[9.2]

File addition: nix-container-demo-helper.sh (----------)

[0.350]

# -*- sh-shell: bash -*-
# shellcheck shell=bash
if [ -z ${_NIX_CONTAINER_DEMO_HELPER_INC+x} ]; then
    _NIX_CONTAINER_DEMO_HELPER_INC=true
    source "$(dirname "${BASH_SOURCE[0]}")/../libdemo/libdemo.sh"
    export NIXPKGS_FLAKEREF=github:nixos/nixpkgs/008ce261a7e3c532e792cb8e39482f2cc1b192f5
    pygmentize() {
        if __libdemo_use_colour; then
            if type nix >/dev/null; then
                # Hack around missing mainProgram attribute in pygments
                # TODO: use nixpkgs_flakeref when this fix is merged
                COLORTERM="" TERM="" nix run github:sfrijters/nixpkgs/pygments-mainprogram#python3Packages.pygments -- "$@"
            elif type pygmentize >/dev/null; then
                COLORTERM="" TERM="" pygmentize "$@"
            else
                echo "pygmentize command not found"
                return 1
            fi
        else
            while [ $# -gt 1 ]; do
                shift
            done
            cat "$@"
        fi
    }
    tiv() {
        if __libdemo_use_colour; then
            if type nix > /dev/null; then
                # Hack around missing imagemagick
                # TODO: use nixpkgs_flakeref when this fix is merged
                nix run github:sfrijters/nixpkgs/tiv-add-wrapper#tiv -- "$@"
            elif type tiv >/dev/null; then
                tiv "$@"
            else
                echo "tiv command not found"
                return 1
            fi
        else
            echo "no colour output available, use your imagination!"
        fi
    }
    file() {
        if type nix > /dev/null; then
            nix run "${NIXPKGS_FLAKEREF}#file" -- "$@"
        elif type file >/dev/null; then
            file "$@"
        else
            echo "file command not found"
            return 1
        fi
    }
fi

Replacement in 06-windows-wine/demo.sh at line 7 [5.413432]
B:BD[5.413583] → [5.413583:413621]
```
source "${dir}/../libdemo/libdemo.sh"
```
[5.413583]
[5.413621]
```
source "${dir}/../bash/nix-container-demo-helper.sh"
```
Deletion in 06-windows-wine/demo.sh at line 9 [5.413432]
B:BD[5.413622] → [5.413622:413709]
```
file_cmd="nix run github:nixos/nixpkgs/008ce261a7e3c532e792cb8e39482f2cc1b192f5#file"
```
Replacement in 06-windows-wine/demo.sh at line 22 [5.413432]
B:BD[5.414333] → [5.414333:414366]
```
x nix build "${dir}#mingwW64" -L
```
[5.414333]
[5.414366]
```
x nix build "${dir}#mingwW64"
```
Replacement in 06-windows-wine/demo.sh at line 25 [5.413432]
B:BD[5.414401] → [5.414401:414445]
```
x "${file_cmd}" ./result/bin/wttr-delft.exe
```
[5.414401]
[5.414445]
```
x file ./result/bin/wttr-delft.exe
```

Replacement in 06-windows-wine/demo.sh at line 28 [5.413432]

B:BD[5.414475] → [5.414475:414633]

x "WINEPREFIX=$(readlink -f "${dir}/wttr-delft") nix run github:nixos/nixpkgs/008ce261a7e3c532e792cb8e39482f2cc1b192f5#wine64 -- ./result/bin/wttr-delft.exe"

[5.414475]

x "WINEPREFIX=$(readlink -f "${dir}/wttr-delft") nix run ${NIXPKGS_FLAKEREF}#wine64 -- ./result/bin/wttr-delft.exe"

Replacement in 05-static-container/demo.sh at line 7 [17.5649]
B:BD[17.5763] → [17.5763:5801]
```
source "${dir}/../libdemo/libdemo.sh"
```
[17.5763]
[17.5801]
```
source "${dir}/../bash/nix-container-demo-helper.sh"
```
Replacement in 05-static-container/demo-inside-nix-develop.sh at line 7 [17.6208]
B:BD[17.6315] → [17.6315:6353]
```
source "${dir}/../libdemo/libdemo.sh"
```
[17.6315]
[17.6353]
```
source "${dir}/../bash/nix-container-demo-helper.sh"
```
Deletion in 04-cmake-and-cross/demo.sh at line 6 [18.750]
∅:D[4.979] → [18.863:902]
B:BD[18.863] → [18.863:902]
```
source "${dir}/../libdemo/libdemo.sh"
```

Replacement in 04-cmake-and-cross/demo.sh at line 7 [18.750]

B:BD[19.17] → [19.17:103]

file_cmd="nix run github:nixos/nixpkgs/008ce261a7e3c532e792cb8e39482f2cc1b192f5#file"

[19.17]

[18.902]

source "${dir}/../bash/nix-container-demo-helper.sh"

Replacement in 04-cmake-and-cross/demo.sh at line 26 [18.750]
∅:D[4.1621] → [20.511:551]
B:BD[20.511] → [20.511:551]
```
x "${file_cmd}" ./result/bin/wttr-delft
```
[4.1621]
[18.1610]
```
x file ./result/bin/wttr-delft
```
Replacement in 04-cmake-and-cross/demo.sh at line 36 [18.750]
∅:D[4.1908] → [20.711:751]
B:BD[20.711] → [20.711:751]
```
x "${file_cmd}" ./result/bin/wttr-delft
```
[4.1908]
[20.751]
```
x file ./result/bin/wttr-delft
```
Replacement in 04-cmake-and-cross/demo.sh at line 42 [18.750]
∅:D[4.2019] → [21.1102:1142]
B:BD[21.1102] → [21.1102:1142]
```
x "${file_cmd}" ./result/bin/wttr-delft
```
[4.2019]
[21.1142]
```
x file ./result/bin/wttr-delft
```
Replacement in 04-cmake-and-cross/demo.sh at line 48 [18.750]
B:BD[21.1346] → [21.1346:1386]
```
x "${file_cmd}" ./result/bin/wttr-delft
```
[21.1346]
[21.1386]
```
x file ./result/bin/wttr-delft
```
Replacement in 04-cmake-and-cross/demo.sh at line 59 [18.750]
B:BD[18.2107] → [19.145:185]
```
x "${file_cmd}" ./result/bin/wttr-delft
```
[18.2107]
[18.2138]
```
x file ./result/bin/wttr-delft
```
Replacement in 03-nix-container/demo.sh at line 7 [22.5083]
B:BD[22.5197] → [22.5197:5235]
```
source "${dir}/../libdemo/libdemo.sh"
```
[22.5197]
[22.5235]
```
source "${dir}/../bash/nix-container-demo-helper.sh"
```
Replacement in 03-nix-container/demo-inside-nix-develop.sh at line 7 [22.5738]
B:BD[22.5817] → [22.5817:5855]
```
source "${dir}/../libdemo/libdemo.sh"
```
[22.5817]
[22.5855]
```
source "${dir}/../bash/nix-container-demo-helper.sh"
```
Replacement in 02-nix-build/demo.sh at line 7 [8.4110]
B:BD[8.4179] → [14.523:561]
```
source "${dir}/../libdemo/libdemo.sh"
```
[8.4179]
[8.4238]
```
source "${dir}/../bash/nix-container-demo-helper.sh"
```
Replacement in 02-nix-build/demo-inside-nix-develop.sh at line 7 [23.419]
B:BD[12.865] → [14.563:601]
```
source "${dir}/../libdemo/libdemo.sh"
```
[12.865]
[23.547]
```
source "${dir}/../bash/nix-container-demo-helper.sh"
```
Replacement in 01-nix-run/demo.sh at line 7 [9.3788]
B:BD[12.1025] → [14.903:941]
```
source "${dir}/../libdemo/libdemo.sh"
```
[12.1025]
[9.3888]
```
source "${dir}/../bash/nix-container-demo-helper.sh"
```
Replacement in 01-nix-run/demo.sh at line 12 [9.3788]
∅:D[4.5918] → [12.1061:1101]
B:BD[7.565] → [12.1061:1101]
```
i nix run nixpkgs#curl -- wttr.in/Delft
```
[4.5918]
[24.147]
```
i "nix run nixpkgs#curl -- wttr.in/Delft"
```
Replacement in 01-nix-run/demo.sh at line 17 [9.3788]
∅:D[4.6048] → [9.4132:4144]
B:BD[9.4132] → [9.4132:4144]
```
x type curl
```
[4.6048]
[9.4144]
```
x "type curl"
```

Replacement in 01-nix-run/demo.sh at line 20 [9.3788]

∅:D[4.6131] → [9.4178:4192]

B:BD[9.4178] → [9.4178:4192]

B:BD[9.4192] → [24.227:322]

f type cowsay
x nix run github:nixos/nixpkgs/008ce261a7e3c532e792cb8e39482f2cc1b192f5#cowsay -- -f tux hello

[4.6131]

[24.322]

f "type cowsay"
x "nix run ${NIXPKGS_FLAKEREF}#cowsay -- -f tux hello"

Refactor libdemo and flakeref for nix run commands

Dependencies

In channels

Change contents

Deletion in libdemo/libdemo.sh at line 206 [9.22]

Deletion in libdemo/libdemo.sh at line 207 [9.22]

Replacement in demo-full.sh at line 5 [7.1]

Replacement in demo-full.sh at line 8 [7.1]

Replacement in demo-full.sh at line 11 [7.1]

File addition: bash (d--x------)

File addition: nix-container-demo-helper.sh (----------)

Replacement in 06-windows-wine/demo.sh at line 7 [5.413432]

Deletion in 06-windows-wine/demo.sh at line 9 [5.413432]

Replacement in 06-windows-wine/demo.sh at line 22 [5.413432]

Replacement in 06-windows-wine/demo.sh at line 25 [5.413432]

Replacement in 06-windows-wine/demo.sh at line 28 [5.413432]

Replacement in 05-static-container/demo.sh at line 7 [17.5649]

Replacement in 05-static-container/demo-inside-nix-develop.sh at line 7 [17.6208]

Deletion in 04-cmake-and-cross/demo.sh at line 6 [18.750]

Replacement in 04-cmake-and-cross/demo.sh at line 7 [18.750]

Replacement in 04-cmake-and-cross/demo.sh at line 26 [18.750]

Replacement in 04-cmake-and-cross/demo.sh at line 36 [18.750]

Replacement in 04-cmake-and-cross/demo.sh at line 42 [18.750]

Replacement in 04-cmake-and-cross/demo.sh at line 48 [18.750]

Replacement in 04-cmake-and-cross/demo.sh at line 59 [18.750]

Replacement in 03-nix-container/demo.sh at line 7 [22.5083]

Replacement in 03-nix-container/demo-inside-nix-develop.sh at line 7 [22.5738]

Replacement in 02-nix-build/demo.sh at line 7 [8.4110]

Replacement in 02-nix-build/demo-inside-nix-develop.sh at line 7 [23.419]

Replacement in 01-nix-run/demo.sh at line 7 [9.3788]

Replacement in 01-nix-run/demo.sh at line 12 [9.3788]

Replacement in 01-nix-run/demo.sh at line 17 [9.3788]

Replacement in 01-nix-run/demo.sh at line 20 [9.3788]