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/nix
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 4989c04dd279
Choose a base ref
...
head repository: NixOS/nix
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 4ba4c7ff66c9
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Mar 30, 2020

  1. Fix segfault

    @edolstra
    edolstra committed Mar 30, 2020
    Copy the full SHA
    2287cc6 View commit details

  2. flake.lock: Update 

    Flake input changes:

* Updated 'nixpkgs': 'github:NixOS/nixpkgs/81fa5f4501372671b464fe0104fe47f5327b46fe' -> 'github:NixOS/nixpkgs/b88ff468e9850410070d4e0ccd68c7011f15b2be'
    @edolstra
    edolstra committed Mar 30, 2020
    Copy the full SHA
    4ba4c7f View commit details
Showing with 12 additions and 7 deletions.
  1. +11 −6 flake.lock
  2. +1 −1 src/libstore/fetchers/tarball.cc
17 changes: 11 additions & 6 deletions flake.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/libstore/fetchers/tarball.cc
View file
Original file line number Diff line number Diff line change
@@ -207,7 +207,7 @@ struct TarballInput : Input
Attrs attrs;
attrs.emplace("url", url.to_string());
if (narHash)
attrs.emplace("narHash", hash->to_string(SRI));
attrs.emplace("narHash", narHash->to_string(SRI));
else if (hash)
attrs.emplace("hash", hash->to_string(SRI));
return attrs;