about summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authoraszlig <aszlig@nix.build>2018-04-02 19:18:22 +0200
committeraszlig <aszlig@nix.build>2018-04-02 19:18:22 +0200
commit94e4aa0e8b05532da8b988ba4e7212b93270ae1e (patch)
treea84f12d8b76a1a6b7f7b446d212bfa00b25fed00 /pkgs
parente22360351ac6ca73605ee782a4fa3926a490eeda (diff)
profiles/workstations: Use NixOps from nixpkgs
This one is an old leftover from where I ran patched versions of NixOps,
but nowadays it is already in <nixpkgs>, so no need to keep it around.

Other than that, with Hydra now running in restricted eval mode it will
run into an eval error.

Signed-off-by: aszlig <aszlig@nix.build>
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/aszlig/default.nix1
-rw-r--r--pkgs/aszlig/nixops/default.nix37
2 files changed, 0 insertions, 38 deletions
diff --git a/pkgs/aszlig/default.nix b/pkgs/aszlig/default.nix
index 867f9098..acc2256b 100644
--- a/pkgs/aszlig/default.nix
+++ b/pkgs/aszlig/default.nix
@@ -6,7 +6,6 @@
   gajim = callPackage ./gajim { inherit gajim; };
   git-detach = callPackage ./git-detach { };
   grandpa = callPackage ./grandpa { };
-  nixops = callPackage ./nixops { };
   librxtx_java = callPackage ./librxtx-java { };
   lockdev = callPackage ./lockdev { };
   pvolctrl = callPackage ./pvolctrl { };
diff --git a/pkgs/aszlig/nixops/default.nix b/pkgs/aszlig/nixops/default.nix
deleted file mode 100644
index e496b539..00000000
--- a/pkgs/aszlig/nixops/default.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{ stdenv, fetchFromGitHub, fetchpatch, git }:
-
-let
-  rev = "eb6d25688a35de5560c91a3d0698ede509367349";
-  sha256 = "1x1wi6x8lp2rpxmgf8jx0v9g6p39r8j9xpzwkqbmpbbrrjkaha49";
-
-  master = stdenv.mkDerivation rec {
-    name = "nixops-upstream-patched";
-
-    src = fetchFromGitHub {
-      owner = "NixOS";
-      repo = "nixops";
-      inherit rev sha256;
-    };
-
-    phases = [ "unpackPhase" "patchPhase" "installPhase" ];
-
-    postPatch = ''
-      sed -i -re 's!<nixpkgs([^>]*)>!${import ../../../nixpkgs-path.nix}\1!g' \
-        release.nix doc/manual/default.nix doc/manual/resource.nix
-    '';
-
-    installPhase = ''
-      cp -a . "$out"
-    '';
-  };
-
-  release = import "${master}/release.nix" {
-    nixopsSrc = {
-      outPath = master;
-      inherit rev;
-      revCount = 0;
-      shortRev = builtins.substring 0 7 rev;
-    };
-    officialRelease = false;
-  };
-in stdenv.lib.getAttr stdenv.system release.build