Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions pkgs/applications/networking/cluster/nixops/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@ let
};

plugins = ps: _super: with ps; rec {
nixops-aws = callPackage ./plugins/nixops-aws.nix { };
nixops-digitalocean = callPackage ./plugins/nixops-digitalocean.nix { };
nixops-encrypted-links = callPackage ./plugins/nixops-encrypted-links.nix { };
nixops-hercules-ci = callPackage ./plugins/nixops-hercules-ci.nix { };
nixops-vbox = callPackage ./plugins/nixops-vbox.nix { };
nixos-modules-contrib = callPackage ./plugins/nixos-modules-contrib.nix { };

nixops-aws = throw "nixops-aws was broken and was removed from nixpkgs";
nixops-gce = throw "nixops-gce was broken and was removed from nixpkgs";
nixops-libvirtd = throw "nixops-libvirtd was broken and was removed from nixpkgs";
nixops-hetzner = throw "nixops-hetzner was broken and was removed from nixpkgs";
Expand All @@ -42,7 +42,7 @@ let
selectedPlugins = [];

# selector is a function mapping pythonPackages to a list of plugins
# e.g. nixops_unstable.withPlugins (ps: with ps; [ nixops-aws ])
# e.g. nixops_unstable.withPlugins (ps: with ps; [ nixops-digitalocean ])
withPlugins = selector:
this.extend (this: _old: {
selectedPlugins = selector this.availablePlugins;
Expand Down Expand Up @@ -109,8 +109,6 @@ in

# Not recommended; too fragile.
nixops_unstable_full = minimal.withPlugins (ps: [
# currently broken
# ps.nixops-aws
ps.nixops-digitalocean
ps.nixops-encrypted-links
ps.nixops-hercules-ci
Expand Down
59 changes: 0 additions & 59 deletions pkgs/applications/networking/cluster/nixops/plugins/nixops-aws.nix

This file was deleted.

90 changes: 0 additions & 90 deletions pkgs/applications/science/misc/toil/default.nix

This file was deleted.

This file was deleted.

This file was deleted.

66 changes: 0 additions & 66 deletions pkgs/development/python-modules/boto/default.nix

This file was deleted.

2 changes: 0 additions & 2 deletions pkgs/development/python-modules/flask-admin/default.nix
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
lib,
azure-storage-blob,
boto,
buildPythonPackage,
fetchpatch,
fetchFromGitHub,
Expand Down Expand Up @@ -53,7 +52,6 @@ buildPythonPackage rec {
];

optional-dependencies = {
aws = [ boto ];
azure = [ azure-storage-blob ];
};

Expand Down
Loading