From 0cb058fd38d27d05321baa9be46ebf8412162c22 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Sat, 2 Jul 2016 13:29:18 +0200
Subject: pkgs/nixops: Update to latest upstream master

This also fixes our hack for libxslt.bin, because it has been fixed
upstream at NixOS/nixops@3e823357f3f4825cd24c3361e511a234f6726105.

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

(limited to 'pkgs/nixops')

diff --git a/pkgs/nixops/default.nix b/pkgs/nixops/default.nix
index 85c3b6ae..ed9a3d54 100644
--- a/pkgs/nixops/default.nix
+++ b/pkgs/nixops/default.nix
@@ -1,8 +1,8 @@
 { stdenv, fetchFromGitHub, fetchpatch, git }:
 
 let
-  rev = "7c4659663722c05959f74db45e85073759a0b5ee";
-  sha256 = "026jsp34fw199saqcfrixhcv53wkpc5y0vn57qx9wdyygjasibf8";
+  rev = "e6f012a95988e52cc6555c04242056d319478b24";
+  sha256 = "0xz1nz3a49vwhzkjb0b9c7c83iwfpkpvsnq5bpgm2w3qii75vhkj";
 
   master = stdenv.mkDerivation rec {
     name = "nixops-upstream-patched";
@@ -18,9 +18,6 @@ let
     postPatch = ''
       sed -i -re 's!<nixpkgs([^>]*)>!${import ../../nixpkgs-path.nix}\1!g' \
         release.nix doc/manual/default.nix doc/manual/resource.nix
-      # XXX: Hack to get it to build for now.
-      sed -i -e 's/pkgs\.libxslt/pkgs.libxslt.bin/g' \
-        doc/manual/default.nix doc/manual/resource.nix
     '';
 
     installPhase = ''
-- 
cgit 1.4.1