SFrijters/nix-container-demo - Change FDN24OK3TVL3CI44BKC2F3EJBOEFJZGXZUVT5F3YYXVJN5SQT72QC

Remove workarounds for open nixpkgs PRs

Created by Stefan Frijters on April 1, 2023

FDN24OK3TVL3CI44BKC2F3EJBOEFJZGXZUVT5F3YYXVJN5SQT72QC

Dependencies

In channels

main

Change contents

Replacement in demo-full.sh at line 17 [4.1]

B:BD[3.222] → [2.6:110]

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

[3.222]

[5.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 [6.368]

B:BD[6.578] → [6.578:668]

    export NIXPKGS_FLAKEREF=github:nixos/nixpkgs/008ce261a7e3c532e792cb8e39482f2cc1b192f5

[6.578]

[6.668]

    export NIXPKGS_FLAKEREF=github:nixos/nixpkgs/b1581c36189e5063163acb24822ed8a343bf6a8f

Replacement in bash/nix-container-demo-helper.sh at line 12 [6.368]

B:BD[6.726] → [7.13:266]

B:BD[7.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; }')"

[6.726]

[6.1244]

            COLORTERM="" TERM="" nix run "${NIXPKGS_FLAKEREF}#python3Packages.pygments" -- "$@"

Replacement in bash/nix-container-demo-helper.sh at line 23 [6.368]

B:BD[6.1420] → [7.267:451]

B:BD[7.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; }')"

[6.1420]

[6.1828]

            nix run "${NIXPKGS_FLAKEREF}#tiv" -- "$@"

Replacement in 04-cmake-and-cross/flake.lock at line 20 [8.4950]

B:BD[8.5421] → [8.5421:5531]

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

[8.5421]

[8.5531]

        "lastModified": 1680348971,
        "narHash": "sha256-4npuc2iZz8kH6r0IwTwVUvz1iD9PhCJH5YPgKUM1hNY=",

Replacement in 04-cmake-and-cross/flake.lock at line 24 [8.4950]

B:BD[8.5584] → [8.5584:5643]

        "rev": "008ce261a7e3c532e792cb8e39482f2cc1b192f5",

[8.5584]

[8.5643]

        "rev": "b1581c36189e5063163acb24822ed8a343bf6a8f",

Replacement in 03-nix-container/flake.lock at line 5 [9.4511]

B:BD[9.4562] → [9.4562:4672]

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

[9.4562]

[9.4672]

        "lastModified": 1680348971,
        "narHash": "sha256-4npuc2iZz8kH6r0IwTwVUvz1iD9PhCJH5YPgKUM1hNY=",

Replacement in 03-nix-container/flake.lock at line 9 [9.4511]

B:BD[9.4725] → [9.4725:4784]

        "rev": "008ce261a7e3c532e792cb8e39482f2cc1b192f5",

[9.4725]

[9.4784]

        "rev": "b1581c36189e5063163acb24822ed8a343bf6a8f",

Replacement in 02-nix-build/flake.lock at line 5 [10.3538]

B:BD[10.3589] → [10.3589:3699]

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

[10.3589]

[10.3699]

        "lastModified": 1680348971,
        "narHash": "sha256-4npuc2iZz8kH6r0IwTwVUvz1iD9PhCJH5YPgKUM1hNY=",

Replacement in 02-nix-build/flake.lock at line 9 [10.3538]

B:BD[10.3752] → [10.3752:3811]

        "rev": "008ce261a7e3c532e792cb8e39482f2cc1b192f5",

[10.3752]

[10.3811]

        "rev": "b1581c36189e5063163acb24822ed8a343bf6a8f",