public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
Frederik Rietdijk
2019-04-16 18:54:15 +02:00
parent 48a941c5a3 741eaa2ede
commit bae32a9f5c
548 changed files with 16308 additions and 7742 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/tools/admin/analog/default.nix
View File

@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
'';
meta = {
homepage = http://www.c-amie.co.uk/software/analog/;
homepage = https://www.c-amie.co.uk/software/analog/;
license = stdenv.lib.licenses.gpl2;
description = "Powerful tool to generate web server statistics";
maintainers = [ stdenv.lib.maintainers.peti ];

8
pkgs/tools/admin/ansible/default.nix
View File

@@ -7,21 +7,21 @@
ansible_2_6 = with python3Packages; toPythonApplication (ansible.overridePythonAttrs(old: rec {
pname = "ansible";
version = "2.6.9";
version = "2.6.15";
src = fetchurl {
url = "https://releases.ansible.com/ansible/${pname}-${version}.tar.gz";
sha256 = "12mysvdavkypgmyms1wjq2974lk97w893k23i6khigxrjj6r85z1";
sha256 = "1l4ji9sryfn0l651hy6cf5zqq8fpwi956c7qzjm4sihz5ps6wyhd";
};
}));
ansible_2_5 = with python3Packages; toPythonApplication (ansible.overridePythonAttrs(old: rec {
pname = "ansible";
version = "2.5.14";
version = "2.5.15";
src = fetchurl {
url = "https://releases.ansible.com/ansible/${pname}-${version}.tar.gz";
sha256 = "0sd04h2k5qv4m48dn76jkjlwlqfdk15hzyagj9i71r8brvmwhnk9";
sha256 = "1w9wfv1s2jq6vkx1hm6n69zwxv2pgjj7nidyg452miwh684jpg7z";
};
}));
}