diff options
-rw-r--r-- | pkgs/nixops/default.nix | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/pkgs/nixops/default.nix b/pkgs/nixops/default.nix index bc6f66fa..88bb5cd6 100644 --- a/pkgs/nixops/default.nix +++ b/pkgs/nixops/default.nix @@ -1,35 +1,20 @@ { stdenv, fetchFromGitHub, fetchpatch, git }: let - rev = "ac1182c3ccfa77b7c1f46e6c1c9e812c76c50ff0"; - sha256 = "02271pvc458vpn6a1qjn2amrk1k3z62lrgghjnmyhgqihhbckf72"; + rev = "85439475872a2fc0336b5dcb02711293f611e004"; + sha256 = "007jmf0x06bk1jfhgdlaamdnwpda57rpab12xisy7sxmfvafgp4j"; master = stdenv.mkDerivation rec { name = "nixops-upstream-patched"; src = fetchFromGitHub { - owner = "NixOS"; + owner = "aszlig"; repo = "nixops"; inherit rev sha256; }; phases = [ "unpackPhase" "patchPhase" "installPhase" ]; - patches = [ - (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"; - postPatch = '' sed -i -re 's!<nixpkgs([^>]*)>!${import ../../nixpkgs-path.nix}\1!g' \ release.nix doc/manual/default.nix doc/manual/resource.nix |