Skip to content

Commit

Permalink
Merge #127: Fix release.nix.patch for our nixops
Browse files Browse the repository at this point in the history
6ba4a43 Fix release.nix.patch for our nixops (Jonas Nick)

Pull request description:

  Otherwise nix-shell doesn't start up:

  ```
  building '/nix/store/c03b0sb0b822m7n1j0rhg8bfbmqv2vv2-src.drv'...
  patching file release.nix
  Hunk #3 FAILED at 83.
  1 out of 3 hunks FAILED -- saving rejects to file release.nix.rej
  builder for '/nix/store/c03b0sb0b822m7n1j0rhg8bfbmqv2vv2-src.drv' failed with exit code 1
  error: build of '/nix/store/c03b0sb0b822m7n1j0rhg8bfbmqv2vv2-src.drv' failed
  (use '--show-trace' to show detailed location information)
  ```
  CC @erikarvstedt

Top commit has no ACKs.

Tree-SHA512: fd92325f9cf6f44592a0733131efc147669140402fb87a9efb6e407520048b8e84a58ccbf12c9c3a637a24f3d381cfaa54a34e2341e6542eb1e3769447de0f8f
  • Loading branch information
jonasnick committed Nov 11, 2019
2 parents a47f1e1 + 6ba4a43 commit 903ab4a
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion pkgs/nixops/release.nix.patch
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
};
srcDrv = v: (fetch v) + "/release.nix";
in self: let
@@ -83,4 +83,4 @@
@@ -83,7 +83,7 @@
# Remove annoying debug message that's shown in nix-shell while evaluating this file
pysqlite
typing
Expand Down

0 comments on commit 903ab4a

Please sign in to comment.