diff options
| author | Alyssa Ross <hi@alyssa.is> | 2019-07-14 15:50:11 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2019-08-14 00:01:17 +0000 |
| commit | 69a15dd2dc85051ba1436613805f9286850e0596 (patch) | |
| tree | d53cec2bb5b8d07df1d1919b212cb2deb3628cd6 /nixpkgs/pkgs/development/python-modules/buildbot | |
| parent | 6941276da135c3eb3b50e0be33d92e7d01ccba9a (diff) | |
| parent | beff2f8d75ef2c65017fb25e251337c6bb2e950d (diff) | |
| download | nixlib-69a15dd2dc85051ba1436613805f9286850e0596.tar nixlib-69a15dd2dc85051ba1436613805f9286850e0596.tar.gz nixlib-69a15dd2dc85051ba1436613805f9286850e0596.tar.bz2 nixlib-69a15dd2dc85051ba1436613805f9286850e0596.tar.lz nixlib-69a15dd2dc85051ba1436613805f9286850e0596.tar.xz nixlib-69a15dd2dc85051ba1436613805f9286850e0596.tar.zst nixlib-69a15dd2dc85051ba1436613805f9286850e0596.zip | |
Merge commit 'beff2f8d75ef2c65017fb25e251337c6bb2e950d'
v# modified: nixpkgs/pkgs/tools/networking/dhcpcd/default.nix
Diffstat (limited to 'nixpkgs/pkgs/development/python-modules/buildbot')
4 files changed, 12 insertions, 10 deletions
diff --git a/nixpkgs/pkgs/development/python-modules/buildbot/default.nix b/nixpkgs/pkgs/development/python-modules/buildbot/default.nix index 6f3e6f17e147..7459fc6f981b 100644 --- a/nixpkgs/pkgs/development/python-modules/buildbot/default.nix +++ b/nixpkgs/pkgs/development/python-modules/buildbot/default.nix @@ -29,7 +29,7 @@ let src = fetchPypi { inherit pname version; - sha256 = "cf35d2a87b11aba29c59e47e843deba1be9649114e792e830252ed8f7c35f963"; + sha256 = "0qzr6my8zvaj0a1jwyaf254rdgm1xcyq8zp4b6fa5aqigfld4dfg"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/buildbot/pkg.nix b/nixpkgs/pkgs/development/python-modules/buildbot/pkg.nix index c1903b7b10fc..8de1572b48c0 100644 --- a/nixpkgs/pkgs/development/python-modules/buildbot/pkg.nix +++ b/nixpkgs/pkgs/development/python-modules/buildbot/pkg.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "25968ace0c62cb773ed85d4ddbe07fd5aee68f4455909243ffb3ac12608cf82e"; + sha256 = "0bpqiih15b5kzx1r542m8j7ydbnmgzhdnkaxv0z7gjv21k78m5i5"; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/buildbot/plugins.nix b/nixpkgs/pkgs/development/python-modules/buildbot/plugins.nix index d15b33912aed..e03524ea5ada 100644 --- a/nixpkgs/pkgs/development/python-modules/buildbot/plugins.nix +++ b/nixpkgs/pkgs/development/python-modules/buildbot/plugins.nix @@ -11,7 +11,7 @@ src = fetchPypi { inherit pname version format; python = "py3"; - sha256 = "134b8y498bq5fp4863hj9058wr7mcw0xgl74br0f1dy9n7jdcl39"; + sha256 = "1ii01py78wkda9x4lqm0bxqmb4dhvbdmmz7sncm1lw7bhmhqh84w"; }; meta = with lib; { @@ -28,7 +28,7 @@ src = fetchPypi { inherit pname version; - sha256 = "1yh8xij3wizz0f88chjpdijm7i35ql87g84ph3f76sqyr6aj6ckw"; + sha256 = "1y523hadw3398jwfpmi2f4g0s6dp9y191qzycrsbvbj147dp0qra"; }; propagatedBuildInputs = [ buildbot-pkg ]; @@ -48,7 +48,7 @@ src = fetchPypi { inherit pname version; - sha256 = "04iihy1s9r4n5jlk57pdjy3yvp6zym2iv2bgqjhw6fy0hff5j8ys"; + sha256 = "1prfr03igcmagydvxqhrh6k6wz16vk6fwgrm143jh3xmml6f16ll"; }; propagatedBuildInputs = [ buildbot-pkg ]; @@ -68,7 +68,7 @@ src = fetchPypi { inherit pname version; - sha256 = "0bcilhcz9xnr8799d5j4sm6qz8pdjlckdck7a282nfs64liajsrh"; + sha256 = "1xkqiwxjppyns2s0239zzvbnr8b7vdakypj95mca89mmnyniflxj"; }; propagatedBuildInputs = [ buildbot-pkg ]; @@ -88,7 +88,7 @@ src = fetchPypi { inherit pname version; - sha256 = "13lr7lzi9sv0s6xrfalq0dkcys6fp7hn0787rjhnz9gc7x83aqjv"; + sha256 = "1jhvq61x0bzh03nd2ac11swdjn0ndnx3ac7x9v3m3v0pgr08rc28"; }; propagatedBuildInputs = [ buildbot-pkg ]; diff --git a/nixpkgs/pkgs/development/python-modules/buildbot/worker.nix b/nixpkgs/pkgs/development/python-modules/buildbot/worker.nix index 006f20a52c68..0ca2570496a0 100644 --- a/nixpkgs/pkgs/development/python-modules/buildbot/worker.nix +++ b/nixpkgs/pkgs/development/python-modules/buildbot/worker.nix @@ -1,4 +1,5 @@ -{ lib, buildPythonPackage, fetchPypi, setuptoolsTrial, mock, twisted, future }: +{ lib, buildPythonPackage, fetchPypi, setuptoolsTrial, mock, twisted, future, + coreutils }: buildPythonPackage (rec { pname = "buildbot-worker"; @@ -6,7 +7,7 @@ buildPythonPackage (rec { src = fetchPypi { inherit pname version; - sha256 = "a26c68debb70f15abee307aff7b225e91a2eedca9c8d571212c391e615c36f53"; + sha256 = "0lvgqcayd4f32895g3cwrbnjw6p94nrggbq7wfz5mwbhpgg6hv52"; }; propagatedBuildInputs = [ twisted future ]; @@ -14,7 +15,8 @@ buildPythonPackage (rec { checkInputs = [ setuptoolsTrial mock ]; postPatch = '' - substituteInPlace buildbot_worker/scripts/logwatcher.py --replace '/usr/bin/tail' "$(type -P tail)" + substituteInPlace buildbot_worker/scripts/logwatcher.py \ + --replace /usr/bin/tail "${coreutils}/bin/tail" ''; meta = with lib; { |