Remove workarounds for open nixpkgs PRs

[?]

Apr 1, 2023, 12:44 PM

FDN24OK3TVL3CI44BKC2F3EJBOEFJZGXZUVT5F3YYXVJN5SQT72QC

Dependencies

[2] DBSDTDTD Keep nixpkgs source(s) as gcroots
[3] W2MX3YW4 Add CMake and cross example
[4] P34QQPLU Pin shellcheck / pygmentize
[5] JGZ7GBCL Add linting
[6] W2G433QU Refactor libdemo and flakeref for nix run commands
[7] 4A2DSMIM Clean up nix-container-demo-helper.sh
[8] TEQJC3HX Add 03-nix-container
[9] VMUKZQZR Work on 02-nix-build
[10] HCY72TQR Improve linting
[*] M5U5PAX7 Add wrapper script, improve libdemo

Change contents

replacement in demo-full.sh at line 17

[3.222]→[2.6:110](∅→∅)

__nix_make_gcroot "$(nix flake metadata "${NIXPKGS_FLAKEREF}" | grep 'Path' | awk '{ print $2; }')"

[3.222]

[3.376]

if [ "${WRAP_NIX_MAKE_GCROOTS:-0}" = 1 ]; then
__nix_make_gcroot "$(nix flake metadata "${NIXPKGS_FLAKEREF}" | grep 'Path' | awk '{ print $2; }')"
fi
replacement in bash/nix-container-demo-helper.sh at line 8

[3.578]→[3.578:668](∅→∅)

export NIXPKGS_FLAKEREF=github:nixos/nixpkgs/008ce261a7e3c532e792cb8e39482f2cc1b192f5

[3.578]

[3.668]

export NIXPKGS_FLAKEREF=github:nixos/nixpkgs/b1581c36189e5063163acb24822ed8a343bf6a8f
replacement in bash/nix-container-demo-helper.sh at line 12

[3.726]→[3.13:266](∅→∅),[3.266]→[2.118:256](∅→∅)

# 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 -- "$@"
__nix_make_gcroot "$(nix flake metadata "github:sfrijters/nixpkgs/pygments-mainprogram" | grep 'Path' | awk '{ print $2; }')"

[3.726]

[3.1244]

COLORTERM="" TERM="" nix run "${NIXPKGS_FLAKEREF}#python3Packages.pygments" -- "$@"
replacement in bash/nix-container-demo-helper.sh at line 23

[3.1420]→[3.267:451](∅→∅),[3.451]→[2.257:390](∅→∅)

# Hack around missing imagemagick
# TODO: use nixpkgs_flakeref when this fix is merged
nix run github:sfrijters/nixpkgs/tiv-add-wrapper#tiv -- "$@"
__nix_make_gcroot "$(nix flake metadata "github:sfrijters/nixpkgs/tiv-add-wrapper" | grep 'Path' | awk '{ print $2; }')"

[3.1420]

[3.1828]

nix run "${NIXPKGS_FLAKEREF}#tiv" -- "$@"
replacement in 04-cmake-and-cross/flake.lock at line 20

[3.5421]→[3.5421:5531](∅→∅)

"lastModified": 1679396235,
"narHash": "sha256-RjmNVFuZQ2e6u35B98JcY9IzVDtZb3d4QcbtfLtNWkE=",

[3.5421]

[3.5531]

"lastModified": 1680348971,
"narHash": "sha256-4npuc2iZz8kH6r0IwTwVUvz1iD9PhCJH5YPgKUM1hNY=",
replacement in 04-cmake-and-cross/flake.lock at line 24

[3.5584]→[3.5584:5643](∅→∅)

"rev": "008ce261a7e3c532e792cb8e39482f2cc1b192f5",

[3.5584]

[3.5643]

"rev": "b1581c36189e5063163acb24822ed8a343bf6a8f",
replacement in 03-nix-container/flake.lock at line 5

[3.4562]→[3.4562:4672](∅→∅)

"lastModified": 1679396235,
"narHash": "sha256-RjmNVFuZQ2e6u35B98JcY9IzVDtZb3d4QcbtfLtNWkE=",

[3.4562]

[3.4672]

"lastModified": 1680348971,
"narHash": "sha256-4npuc2iZz8kH6r0IwTwVUvz1iD9PhCJH5YPgKUM1hNY=",
replacement in 03-nix-container/flake.lock at line 9

[3.4725]→[3.4725:4784](∅→∅)

"rev": "008ce261a7e3c532e792cb8e39482f2cc1b192f5",

[3.4725]

[3.4784]

"rev": "b1581c36189e5063163acb24822ed8a343bf6a8f",
replacement in 02-nix-build/flake.lock at line 5

[3.3589]→[3.3589:3699](∅→∅)

"lastModified": 1679396235,
"narHash": "sha256-RjmNVFuZQ2e6u35B98JcY9IzVDtZb3d4QcbtfLtNWkE=",

[3.3589]

[3.3699]

"lastModified": 1680348971,
"narHash": "sha256-4npuc2iZz8kH6r0IwTwVUvz1iD9PhCJH5YPgKUM1hNY=",
replacement in 02-nix-build/flake.lock at line 9

[3.3752]→[3.3752:3811](∅→∅)

"rev": "008ce261a7e3c532e792cb8e39482f2cc1b192f5",

[3.3752]

[3.3811]

"rev": "b1581c36189e5063163acb24822ed8a343bf6a8f",