From 15618dadc097e5e60d28e7202ceea4f2b7fd26f8 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Tue, 18 Nov 2014 19:40:40 +0100
Subject: nixops: Move from overrides into own package.

We now no longer override the package included in <nixpkgs>, but build
it completely from the upstream Git repository and do our patches right
after the fetchgit.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 overrides/default.nix | 27 ---------------------------
 1 file changed, 27 deletions(-)

(limited to 'overrides')

diff --git a/overrides/default.nix b/overrides/default.nix
index a3aa3b44..9ffd43c1 100644
--- a/overrides/default.nix
+++ b/overrides/default.nix
@@ -85,33 +85,6 @@ let
       '';
     };
 
-    nixops = o: let
-      master = everything.fetchgit {
-        url = "git://github.com/NixOS/nixops.git";
-        rev = "260af26504027b7ad11a6e38e02e0e4d7a820505";
-        sha256 = "0nai6nkccl7qxq1756qip0zy14d68inj60ai7gnn1gd97pxn7yq0";
-      };
-      release = import "${master}/release.nix" {
-        officialRelease = true;
-      };
-      build = getAttr o.stdenv.system release.build;
-    in with everything; build.drvAttrs // {
-      name = "nixops-1.3git";
-      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";
-    };
-
     zsh = o: {
       postConfigure = (o.postConfigure or "") + ''
         sed -i -e '/^name=zsh\/newuser/d' config.modules
-- 
cgit 1.4.1