Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixos-channel-scripts
base: 90fcc7be84ba
Choose a base ref
...
head repository: NixOS/nixos-channel-scripts
compare: d7a903d1c2f1
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jan 31, 2019

  1. file-cache: use the right exception type for parse error 

    ```
error: [json.exception.parse_error.101] parse error at 195: syntax error - invalid string: ill-formed UTF-8 byte; last read: '"bokml'; expected string literal
```

This is most probably caused by the upgrade in nixos-org-configurations/1b74e019b166d37a1510a99aeea86a0fa656854a
that, in turn, caused nlohmann_json to go from 2.1.0 -> 3.2.0

I haven't found concrete evidence in the changelog as to a change
changing the exception type. Though, the timing for failures matches
with this update.

Furthermore, once this fix is applied, launching the update locally
works fine.
    @samueldr
    samueldr committed Jan 31, 2019
    Copy the full SHA
    0effeee View commit details
    Browse the repository at this point in the history

  2. Merge pull request #23 from samueldr/fix/json-error-handling 

    file-cache: use the right exception type for parse error
    @grahamc
    grahamc committed Jan 31, 2019
    Copy the full SHA
    d7a903d View commit details
    Browse the repository at this point in the history