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

Merge branch 'master' into staging-next

Browse Source
This commit is contained in:
Jan Tojnar
2020-03-31 21:32:15 +02:00
parent a803f716bd a8811cb82b
commit 3e0f4e202f
359 changed files with 9618 additions and 2647 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "bubblewrap";
version = "0.4.0";
version = "0.4.1";
src = fetchurl {
url = "https://github.com/projectatomic/bubblewrap/releases/download/v${version}/${pname}-${version}.tar.xz";
sha256 = "08r0f4c3fjkb4zjrb4kkax1zfcgcgic702vb62sjjw5xfhppvzp5";
url = "https://github.com/containers/bubblewrap/releases/download/v${version}/${pname}-${version}.tar.xz";
sha256 = "00ycgi6q2yngh06bnz50wkvar6r2jnjf3j158grhi9k13jdrpimr";
};
nativeBuildInputs = [ libxslt docbook_xsl ];
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Unprivileged sandboxing tool";
homepage = https://github.com/projectatomic/bubblewrap;
homepage = "https://github.com/containers/bubblewrap";
license = licenses.lgpl2Plus;
maintainers = with maintainers; [ ];
};

6
pkgs/tools/admin/swiftclient/default.nix
View File

@@ -2,11 +2,11 @@
buildPythonApplication rec {
pname = "python-swiftclient";
version = "3.6.0";
version = "3.9.0";
src = fetchPypi {
inherit pname version;
sha256 = "0sv6z72zdwzwdjng0djk3l2maryn9pz3khf69yq5ig2ycz8hh0qv";
sha256 = "0xx3v5kk8jp352rydy3jxndy1b9kl2zmkj1gi14fjxjc5r4rf82g";
};
propagatedBuildInputs = [ requests six pbr setuptools ];
@@ -24,7 +24,7 @@ buildPythonApplication rec {
doCheck = false;
meta = with lib; {
homepage = https://github.com/openstack/python-swiftclient;
homepage = "https://github.com/openstack/python-swiftclient";
description = "Python bindings to the OpenStack Object Storage API";
license = licenses.asl20;
maintainers = with maintainers; [ c0deaddict ];