From eaa54df054dd531dbc7f8a6ae7a1304c13075cfe Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Tue, 1 Mar 2016 04:57:32 +0100
Subject: pkgs/nixops: Update to latest upstream master

Actually, it's the latest upstream master plus one pull request by me
(NixOS/nixops#407), which fixes the build of the manual.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/nixops/default.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/nixops/default.nix b/pkgs/nixops/default.nix
index e1dddb72..231fa794 100644
--- a/pkgs/nixops/default.nix
+++ b/pkgs/nixops/default.nix
@@ -1,8 +1,8 @@
 { stdenv, fetchFromGitHub, fetchpatch, git }:
 
 let
-  rev = "b66db0aa1c2bea64fe821ff67d51555c85943572";
-  sha256 = "15wwhah9ghwn7w3nq0jj0vqyz2al76w3vwfnl4aklbffmj2jbzwy";
+  rev = "7c4659663722c05959f74db45e85073759a0b5ee";
+  sha256 = "026jsp34fw199saqcfrixhcv53wkpc5y0vn57qx9wdyygjasibf8";
 
   master = stdenv.mkDerivation rec {
     name = "nixops-upstream-patched";
@@ -15,6 +15,11 @@ let
 
     phases = [ "unpackPhase" "patchPhase" "installPhase" ];
 
+    patches = stdenv.lib.singleton (fetchpatch {
+      url = "https://github.com/NixOS/nixops/pull/407.patch";
+      sha256 = "1md58nivjcvcw76ci1gnjn1yhbkxrqwacs9ia709x8xf67kn19kk";
+    });
+
     postPatch = ''
       sed -i -re 's!<nixpkgs([^>]*)>!${import ../../nixpkgs-path.nix}\1!g' \
         release.nix doc/manual/default.nix doc/manual/resource.nix
-- 
cgit 1.4.1