diff options
author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2019-05-02 02:17:28 +0200 |
---|---|---|
committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2019-05-02 02:17:28 +0200 |
commit | c1b6f97a72e0b4897ce11414df28259d4ea3c5ab (patch) | |
tree | f0fb690030fd261b32798f5084220a7f83a3fe61 /nixops/modules/buildbot | |
parent | 5010032101ed3bceaa40fb0a631066e8098c1d7e (diff) | |
download | Nix-c1b6f97a72e0b4897ce11414df28259d4ea3c5ab.tar.gz Nix-c1b6f97a72e0b4897ce11414df28259d4ea3c5ab.tar.zst Nix-c1b6f97a72e0b4897ce11414df28259d4ea3c5ab.zip |
Move some overlays to parent directory
Diffstat (limited to 'nixops/modules/buildbot')
-rw-r--r-- | nixops/modules/buildbot/apprise.json | 15 | ||||
-rw-r--r-- | nixops/modules/buildbot/default.nix | 27 |
2 files changed, 0 insertions, 42 deletions
diff --git a/nixops/modules/buildbot/apprise.json b/nixops/modules/buildbot/apprise.json deleted file mode 100644 index b408ea4..0000000 --- a/nixops/modules/buildbot/apprise.json +++ /dev/null | |||
@@ -1,15 +0,0 @@ | |||
1 | { | ||
2 | "tag": "c9b957c-master", | ||
3 | "meta": { | ||
4 | "name": "apprise", | ||
5 | "url": "https://github.com/caronc/apprise", | ||
6 | "branch": "master" | ||
7 | }, | ||
8 | "github": { | ||
9 | "owner": "caronc", | ||
10 | "repo": "apprise", | ||
11 | "rev": "c9b957c4341e7d43e5be6463bd317a7401d083d9", | ||
12 | "sha256": "01zz4mh3xvplrm5xalzrcncnh0jq5y51pmdxkr4hdd6dz9wx0mbg", | ||
13 | "fetchSubmodules": true | ||
14 | } | ||
15 | } | ||
diff --git a/nixops/modules/buildbot/default.nix b/nixops/modules/buildbot/default.nix index 1c37e05..7632602 100644 --- a/nixops/modules/buildbot/default.nix +++ b/nixops/modules/buildbot/default.nix | |||
@@ -62,33 +62,6 @@ in | |||
62 | }; | 62 | }; |
63 | 63 | ||
64 | config = lib.mkIf config.services.buildbot.enable { | 64 | config = lib.mkIf config.services.buildbot.enable { |
65 | nixpkgs.overlays = [ (self: super: rec { | ||
66 | python3 = super.python3.override { | ||
67 | packageOverrides = python-self: python-super: { | ||
68 | wokkel = python-self.buildPythonPackage rec { | ||
69 | pname = "wokkel"; | ||
70 | version = "18.0.0"; | ||
71 | src = python-self.fetchPypi { | ||
72 | inherit pname version; | ||
73 | sha256 = "1spq44gg8gsviqx1dvlmjpgfc0wk0jpyx4ap01y2pad1ai9cw016"; | ||
74 | }; | ||
75 | propagatedBuildInputs = with python-self; [ twisted.extras.tls twisted incremental dateutil ]; | ||
76 | doChecks = false; | ||
77 | }; | ||
78 | apprise = python-self.buildPythonPackage rec { | ||
79 | pname = "apprise"; | ||
80 | version = "0.7.4"; | ||
81 | src = (mylibs.fetchedGithub ./apprise.json).src; | ||
82 | propagatedBuildInputs = with python-self; [ decorator | ||
83 | requests requests_oauthlib oauthlib urllib3 six click | ||
84 | markdown pyyaml sleekxmpp | ||
85 | ]; | ||
86 | doChecks = false; | ||
87 | }; | ||
88 | }; | ||
89 | }; | ||
90 | }) ]; | ||
91 | |||
92 | ids.uids.buildbot = myconfig.env.buildbot.user.uid; | 65 | ids.uids.buildbot = myconfig.env.buildbot.user.uid; |
93 | ids.gids.buildbot = myconfig.env.buildbot.user.gid; | 66 | ids.gids.buildbot = myconfig.env.buildbot.user.gid; |
94 | 67 | ||