diff options
author | aszlig <aszlig@redmoonstudios.org> | 2015-05-12 10:07:31 +0200 |
---|---|---|
committer | aszlig <aszlig@redmoonstudios.org> | 2015-05-12 10:07:31 +0200 |
commit | 2a0fea264e08b77b0ae0d5b198ac40db4940e28c (patch) | |
tree | 8099f9ec7d6ba37879ee9e5fab91be31020d5593 /pkgs/nixops/default.nix | |
parent | 97cd6fc95dba762d646d7693953b396e1b057f41 (diff) |
nixops: Update to latest upstream master.
Drop patch for NixOS/nixops#280 because it has been applied upstream. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Diffstat (limited to 'pkgs/nixops/default.nix')
-rw-r--r-- | pkgs/nixops/default.nix | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/pkgs/nixops/default.nix b/pkgs/nixops/default.nix index 7aa00be2..ec18d80a 100644 --- a/pkgs/nixops/default.nix +++ b/pkgs/nixops/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchFromGitHub, fetchpatch, git }: let - rev = "372333a9e243c1dc58280ba08c5c1ade3ae86a59"; - sha256 = "03rbqbvfrj0ghkhvfnn8ksgy6wr4gwdmf77j00l3098nfgv9rjg6"; + rev = "a932a9ecec15336a55f2aa2c2a20f08264adb837"; + sha256 = "1gyaammwzl4jvi00wg7bis9v9grviiqc59ayf39ap1xmp4767zdj"; master = stdenv.mkDerivation rec { name = "nixops-upstream-patched"; @@ -26,10 +26,6 @@ let + "NixOS:master...aszlig:${name}"; sha256 = "0a1jcqrqfi7dfvlha5r0609bzvin7p7nj523xxcrvwpgp6ag0zsa"; }) - (fetchpatch { - url = "https://github.com/NixOS/nixops/pull/280.diff"; - sha256 = "0h0q6a1ljwiqh1j0dzamx9h1x339wzc5pfghzd8rprkpi027ny4i"; - }) ]; patchFlags = "--merge -p1"; |