dblsaiko/nix-plugin-pijul - Change HZA67MNO6Z6ODY3YFPZK5NRVSSUZ4RHX4MBXX6TXV5AJBBLQD7KQC

Fix build for Nix 2.24

Created by korrat on October 24, 2024

HZA67MNO6Z6ODY3YFPZK5NRVSSUZ4RHX4MBXX6TXV5AJBBLQD7KQC

Dependencies

In channels

main

In discussions

#5 Update nix

Change contents

Replacement in src/fetcher.cpp at line 40 [5.53]

B:BD[5.956] → [2.0:28]

#if NIX_VERSION >= 0x021800

[5.956]

[2.28]

#if NIX_VERSION >= 0x022400
    [[nodiscard]] std::optional<Input> inputFromURL(const Settings &settings, const ParsedURL &url, bool requireTree) const override
#elif NIX_VERSION >= 0x021800

Insertion in src/fetcher.cpp at line 71 [5.53]

[5.1702]

#if NIX_VERSION >= 0x022400
        return inputFromAttrs(settings, attrs);
#else

Insertion in src/fetcher.cpp at line 75 [5.53]
[5.1740]
[3.40]
```
#endif
```

Insertion in src/fetcher.cpp at line 80 [5.53]

[5.1747]

#if NIX_VERSION >= 0x022400
    [[nodiscard]] std::optional<Input> inputFromAttrs(const Settings &settings, const Attrs &attrs) const override
#else

Insertion in src/fetcher.cpp at line 84 [5.53]
[5.1836]
[5.1836]
```
#endif
```

Insertion in src/fetcher.cpp at line 102 [5.53]

[5.2277]

#if NIX_VERSION >= 0x022400
        Input input(settings);
#else

Insertion in src/fetcher.cpp at line 106 [5.53]
[5.2298]
[5.2298]
```
#endif
```

Replacement in src/fetcher.cpp at line 438 [5.53]

B:BD[5.8774] → [5.8774:8819]

            if (!fetchSettings.allowDirty) {

[5.8774]

[5.8819]

#if NIX_VERSION >= 0x022400
            auto settings = *input.settings;
#else
            auto settings = fetchSettings;
#endif
            if (!settings.allowDirty) {

Replacement in src/fetcher.cpp at line 448 [5.53]

B:BD[5.8897] → [5.8897:8940]

            if (fetchSettings.warnDirty) {

[5.8897]

[5.8940]

            if (settings.warnDirty) {

Replacement in src/fetcher.cpp at line 473 [5.53]

B:BD[5.9697] → [4.1922:1950]

#if NIX_VERSION >= 0x022300

[5.9697]

[4.1950]

#if NIX_VERSION >= 0x022400
        auto storePath = store->addToStore(input.getName(), {getFSSourceAccessor(), CanonPath(actualPath)}, ContentAddressMethod::Raw::NixArchive, HashAlgorithm::SHA256, {}, filter);
#elif NIX_VERSION >= 0x022300