dblsaiko/nix-plugin-pijul - Change U5AKEHEQWHBOVXMTTQFBJA4M4VJ7OWSJJVYYB6FLTJB7NCFPYVRQC

Fix build for Nix 2.19 to 2.21

Created by dblsaiko on March 19, 2024

U5AKEHEQWHBOVXMTTQFBJA4M4VJ7OWSJJVYYB6FLTJB7NCFPYVRQC

Dependencies

[2] 3KEFKH5FYGFUIWMIW6NY3K4FYSLE7LEXR4ZSF6WN52PCC3TVDZBAC

In channels

main

In discussions

#2 Incompatibility with nix version 2.21.0

Change contents

Insertion in src/fetcher.cpp at line 7 [2.53]

[2.169]


#if NIX_VERSION >= 0x021900
#include <processes.hh>
#endif

Insertion in src/fetcher.cpp at line 12 [2.53]

[2.170]

#if NIX_VERSION >= 0x022000
#include <posix-source-accessor.hh>
#endif
#if NIX_VERSION >= 0x022100
#include <fs-input-accessor.hh>
#endif

Insertion in src/fetcher.cpp at line 88 [2.53]
[2.1933]
[2.1933]
```
#if NIX_VERSION < 0x021900
```
Insertion in src/fetcher.cpp at line 94 [2.53]
[2.2231]
[2.2231]
```
#endif
```
Insertion in src/fetcher.cpp at line 101 [2.53]
[2.2328]
[2.2328]
```
#if NIX_VERSION < 0x022100
```
Insertion in src/fetcher.cpp at line 105 [2.53]
[2.2467]
[2.2467]
```
#endif
```
Insertion in src/fetcher.cpp at line 110 [2.53]
[2.2497]
[2.2497]
```
#if NIX_VERSION < 0x021900
```
Insertion in src/fetcher.cpp at line 115 [2.53]
[2.2651]
[2.2651]
```
#endif
```

Insertion in src/fetcher.cpp at line 136 [2.53]

[2.3215]

#if NIX_VERSION >= 0x022100
    std::pair<StorePath, Input> fetchToStore(ref<Store> store, const Input &_input) const
#else

Insertion in src/fetcher.cpp at line 140 [2.53]
[2.3301]
[2.3301]
```
#endif
```

Insertion in src/fetcher.cpp at line 153 [2.53]

[2.3662]

#if NIX_VERSION >= 0x021900
    std::optional<Path> getSourcePath(const Input &input) const override
#else

Insertion in src/fetcher.cpp at line 157 [2.53]
[2.3729]
[2.3729]
```
#endif
```

Insertion in src/fetcher.cpp at line 167 [2.53]

[2.3936]


#if NIX_VERSION >= 0x021900
    void putFile(const Input &input, const CanonPath &path, std::string_view contents, std::optional<std::string> commitMsg) const override
    {
        auto root = getSourcePath(input);
        assert(root);
#if NIX_VERSION >= 0x022100
        writeFile((CanonPath(*root) / path).abs(), contents);
#else
        writeFile((CanonPath(*root) + path).abs(), contents);
#endif
        runPijul({"add", "--", std::string(path.rel())}, root);

Insertion in src/fetcher.cpp at line 182 [2.53]

[2.3937]

        if (commitMsg)
            runPijul({"record", std::string(path.rel()), "-m", *commitMsg}, root, {}, true);
    }
#else

Replacement in src/fetcher.cpp at line 188 [2.53]

B:BD[2.4058] → [2.4058:4134]

        auto sourcePath = getSourcePath(input);
        assert(sourcePath);

[2.4058]

[2.4134]

        auto root = getSourcePath(input);
        assert(root);

Replacement in src/fetcher.cpp at line 191 [2.53]

B:BD[2.4135] → [2.4135:4199]

        runPijul({"add", "--", std::string(file)}, sourcePath);

[2.4135]

[2.4199]

        runPijul({"add", "--", std::string(file)}, root);

Replacement in src/fetcher.cpp at line 194 [2.53]

B:BD[2.4223] → [2.4223:4316]

            runPijul({"record", std::string(file), "-m", *commitMsg}, sourcePath, {}, true);

[2.4223]

[2.4316]

            runPijul({"record", std::string(file), "-m", *commitMsg}, root, {}, true);
    }
#endif
#if NIX_VERSION >= 0x021900
    std::string_view schemeName() const override
    {
        return "pijul"sv;
    }
    StringSet allowedAttrs() const override
    {
        return {"url"s, "channel"s, "state"s, "narHash"s, "lastModified"s};
    }
#endif
#if NIX_VERSION >= 0x022100
    bool isLocked(const Input &input) const override
    {
        return maybeGetStrAttr(input.attrs, "channel") && maybeGetStrAttr(input.attrs, "state");
    }
    std::pair<ref<InputAccessor>, Input> getAccessor(ref<Store> store, const Input &_input) const override
    {
        Input input(_input);
        auto [storePath, _] = fetchToStore(store, input);
        return {makeStorePathAccessor(store, storePath), input};

Insertion in src/fetcher.cpp at line 224 [2.53]
[2.4322]
[2.4322]
```
#endif
```

Replacement in src/fetcher.cpp at line 233 [2.53]

B:BD[2.4451] → [2.4451:4543]

    static std::pair<StorePath, Attrs> doFetch(const ref<Store> &store, const Input &input)

[2.4451]

[2.4543]

    static std::pair<StorePath, Attrs> doFetch(const ref<Store> &_store, const Input &input)

Insertion in src/fetcher.cpp at line 235 [2.53]

[2.4549]

#if NIX_VERSION >= 0x022000
        Store &store = *_store;
#else
        const auto &store = _store;
#endif

Replacement in src/fetcher.cpp at line 281 [2.53]

B:BD[2.5825] → [2.5825:5903]

        auto [storePath, rs] = doFetch(store, name, repoUrl, channel, state);

[2.5825]

[2.5903]

        auto [storePath, rs] = doFetch(_store, name, repoUrl, channel, state);

Insertion in src/fetcher.cpp at line 350 [2.53]

[2.7976]

#if NIX_VERSION >= 0x022100
        auto [accessor, canonPath] = PosixSourceAccessor::createAtRoot(repoDir);
        auto storePath = store->addToStore(inputName, accessor, canonPath);
#elif NIX_VERSION >= 0x022000
        PosixSourceAccessor accessor;
        auto storePath = store->addToStore(inputName, accessor, CanonPath::fromCwd(repoDir));
#else

Insertion in src/fetcher.cpp at line 358 [2.53]
[2.8040]
[2.8040]
```
#endif
```

Insertion in src/fetcher.cpp at line 413 [2.53]

[2.9697]

#if NIX_VERSION >= 0x022000
        PosixSourceAccessor accessor;
        auto storePath = store->addToStore(input.getName(), accessor, CanonPath{actualPath}, FileIngestionMethod::Recursive, HashAlgorithm::SHA256, {}, filter);
#else

Insertion in src/fetcher.cpp at line 418 [2.53]
[2.9820]
[2.9820]
```
#endif
```

Fix build for Nix 2.19 to 2.21

Dependencies

In channels

In discussions

Change contents

Insertion in src/fetcher.cpp at line 7 [2.53]

Insertion in src/fetcher.cpp at line 12 [2.53]

Insertion in src/fetcher.cpp at line 88 [2.53]

Insertion in src/fetcher.cpp at line 94 [2.53]

Insertion in src/fetcher.cpp at line 101 [2.53]

Insertion in src/fetcher.cpp at line 105 [2.53]

Insertion in src/fetcher.cpp at line 110 [2.53]

Insertion in src/fetcher.cpp at line 115 [2.53]