diff options
Diffstat (limited to 'overrides/default.nix')
-rw-r--r-- | overrides/default.nix | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/overrides/default.nix b/overrides/default.nix index 787047bd..0d93fc1a 100644 --- a/overrides/default.nix +++ b/overrides/default.nix @@ -97,10 +97,18 @@ let build = getAttr o.stdenv.system release.build; in with everything; build.drvAttrs // { name = "nixops-1.3git"; - patches = (build.drvAttrs.patches or []) ++ singleton (fetchpatch { - url = "https://github.com/NixOS/nixops/pull/201.diff"; - sha256 = "1i5yycqayxggg3l1i6wk8lp64lqlxw5nmfya9fcrgmck8ls0rxid"; - }); + patches = (build.drvAttrs.patches or []) ++ [ + (fetchpatch { + url = "https://github.com/NixOS/nixops/pull/201.diff"; + sha256 = "1i5yycqayxggg3l1i6wk8lp64lqlxw5nmfya9fcrgmck8ls0rxid"; + }) + (fetchpatch rec { + name = "read-write-by-default.diff"; + url = "https://github.com/aszlig/nixops/compare/" + + "NixOS:master...aszlig:${name}"; + sha256 = "0a1jcqrqfi7dfvlha5r0609bzvin7p7nj523xxcrvwpgp6ag0zsa"; + }) + ]; patchFlags = "--merge -p1"; }; }; |