setcap-wrapper: Merging with upstream master and resolving conflicts
This commit is contained in:
Parnell Springmeyer
26
pkgs/tools/admin/awslogs/default.nix
Normal file
26
pkgs/tools/admin/awslogs/default.nix
Normal file
@@ -0,0 +1,26 @@
|
||||
{ stdenv, fetchFromGitHub, pythonPackages }:
|
||||
|
||||
pythonPackages.buildPythonApplication rec {
|
||||
name = "awslogs-${version}";
|
||||
version = "0.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jorgebastida";
|
||||
repo = "awslogs";
|
||||
rev = "${version}";
|
||||
sha256 = "0dqf26h595l1fcnagxi8zsdarsxg3smsihxaqrvnki8fshhfdqsm";
|
||||
};
|
||||
|
||||
doCheck = false;
|
||||
|
||||
propagatedBuildInputs = with pythonPackages; [
|
||||
boto3 termcolor dateutil docutils
|
||||
];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = https://github.com/jorgebastida/awslogs;
|
||||
description = "AWS CloudWatch logs for Humans";
|
||||
maintainers = with maintainers; [ dbrock ];
|
||||
license = licenses.bsd3;
|
||||
};
|
||||
}
|
||||
@@ -1,17 +1,19 @@
|
||||
{ stdenv, pythonPackages, fetchFromGitHub, dialog }:
|
||||
{ stdenv, python2Packages, fetchFromGitHub, dialog }:
|
||||
|
||||
pythonPackages.buildPythonApplication rec {
|
||||
# Latest version of certbot supports python3 and python3 version of pythondialog
|
||||
|
||||
python2Packages.buildPythonApplication rec {
|
||||
name = "certbot-${version}";
|
||||
version = "0.6.0";
|
||||
version = "0.9.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "certbot";
|
||||
repo = "certbot";
|
||||
rev = "v${version}";
|
||||
sha256 = "1x0prlldkgg0hxmya4m5h3k3c872wr0jylmzpr3m04mk339yiw0c";
|
||||
sha256 = "03yfr8vlq62l0h14qk03flrkbvbv9mc5cf6rmh37naj8jwpl8cic";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with pythonPackages; [
|
||||
propagatedBuildInputs = with python2Packages; [
|
||||
ConfigArgParse
|
||||
acme
|
||||
configobj
|
||||
@@ -26,11 +28,11 @@ pythonPackages.buildPythonApplication rec {
|
||||
zope_component
|
||||
zope_interface
|
||||
];
|
||||
buildInputs = [ dialog ] ++ (with pythonPackages; [ nose mock gnureadline ]);
|
||||
buildInputs = [ dialog ] ++ (with python2Packages; [ nose mock gnureadline ]);
|
||||
|
||||
patchPhase = ''
|
||||
substituteInPlace certbot/notify.py --replace "/usr/sbin/sendmail" "/var/permissions-wrappers/sendmail"
|
||||
substituteInPlace certbot/le_util.py --replace "sw_vers" "/usr/bin/sw_vers"
|
||||
substituteInPlace certbot/util.py --replace "sw_vers" "/usr/bin/sw_vers"
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
|
||||
@@ -1,8 +1,7 @@
|
||||
{ lib, buildPythonApplication, pythonPackages, fetchurl }:
|
||||
{ lib, python2Packages, fetchurl }:
|
||||
|
||||
buildPythonApplication rec {
|
||||
python2Packages.buildPythonApplication rec {
|
||||
name = "cli53-${version}";
|
||||
namePrefix = ""; # Suppress "python27-" name prefix
|
||||
version = "0.4.4";
|
||||
|
||||
src = fetchurl {
|
||||
@@ -10,7 +9,7 @@ buildPythonApplication rec {
|
||||
sha256 = "0s9jzigq6a16m2c3qklssx2lz16cf13g5zh80vh24kxazaxqzbig";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with pythonPackages; [
|
||||
propagatedBuildInputs = with python2Packages; [
|
||||
argparse
|
||||
boto
|
||||
dns
|
||||
|
||||
31
pkgs/tools/admin/dehydrated/default.nix
Normal file
31
pkgs/tools/admin/dehydrated/default.nix
Normal file
@@ -0,0 +1,31 @@
|
||||
{ stdenv, bash, coreutils, curl, diffutils, gawk, gnugrep, gnused, openssl, makeWrapper, fetchFromGitHub }:
|
||||
let
|
||||
pkgName = "dehydrated";
|
||||
version = "0.3.1";
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
name = pkgName + "-" + version;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lukas2511";
|
||||
repo = "dehydrated";
|
||||
rev = "v${version}";
|
||||
sha256 = "0prg940ykbsfb4w48bc03j5abycg8v7f9rg9x3kcva37y8ml0jsp";
|
||||
};
|
||||
|
||||
buildInputs = [ makeWrapper ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
cp -a dehydrated $out/bin
|
||||
wrapProgram "$out/bin/dehydrated" --prefix PATH : "${stdenv.lib.makeBinPath [ openssl coreutils gnused gnugrep diffutils curl gawk ]}"
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
inherit (src.meta) homepage;
|
||||
description = "Letsencrypt/acme client implemented as a shell-script";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.all;
|
||||
maintainers = [ maintainers.pstn ];
|
||||
};
|
||||
}
|
||||
@@ -2,20 +2,23 @@
|
||||
|
||||
with python27Packages;
|
||||
|
||||
# other systems not supported yet
|
||||
assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "google-cloud-sdk-${version}";
|
||||
version = "122.0.0";
|
||||
version = "138.0.0";
|
||||
|
||||
src =
|
||||
if stdenv.system == "i686-linux" then
|
||||
fetchurl {
|
||||
url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/${name}-linux-x86.tar.gz";
|
||||
sha256 = "0nx348yx1avbb34bpj316fb7jzyzkylscyx8kv183rg4s1q2f798";
|
||||
sha256 = "1z2v4bg743qkdlmyyy0z2j5s0g10vbc1643gxrhyz491sk6sp616";
|
||||
}
|
||||
else
|
||||
fetchurl {
|
||||
url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/${name}-linux-x86_64.tar.gz";
|
||||
sha256 = "0jhw8yv2kv0fs64rzvddx3szzpn74nqnd3rbd9wx2vi6nmffkrwv";
|
||||
sha256 = "1y64bx9vj6rrapffr7zwxbxxbqlddx91n82kr99mwv19n11hydyw";
|
||||
};
|
||||
|
||||
buildInputs = [python27 makeWrapper];
|
||||
|
||||
@@ -1,34 +1,32 @@
|
||||
{ stdenv, fetchurl, gobjectIntrospection
|
||||
, python, gtk, pygtk, gnutls, cairo, libtool, glib, pkgconfig, libtasn1
|
||||
, gnutls, cairo, libtool, glib, pkgconfig, libtasn1
|
||||
, libffi, cyrus_sasl, intltool, perl, perlPackages, libpulseaudio
|
||||
, kbproto, libX11, libXext, xextproto, pygobject, libgcrypt, gtk3, vala_0_23
|
||||
, pygobject3, libogg, enableGTK3 ? false, libgpgerror }:
|
||||
, kbproto, libX11, libXext, xextproto, libgcrypt, gtk3, vala_0_32
|
||||
, libogg, libgpgerror, pythonPackages }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
let
|
||||
inherit (pythonPackages) pygobject3 python;
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "gtk-vnc-${version}";
|
||||
version = "0.5.3";
|
||||
version = "0.6.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gtk-vnc/0.5/${name}.tar.xz";
|
||||
sha256 = "1bww2ihxb3zzvifdrcsy1lifr664pvikq17hmr1hsm8fyk4ad46l";
|
||||
url = "mirror://gnome/sources/gtk-vnc/0.6/${name}.tar.xz";
|
||||
sha256 = "9559348805e64d130dae569fee466930175dbe150d2649bb868b5c095f130433";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
python gnutls cairo libtool pkgconfig glib libffi libgcrypt
|
||||
intltool cyrus_sasl libpulseaudio perl perlPackages.TextCSV
|
||||
gobjectIntrospection libogg libgpgerror
|
||||
] ++ (if enableGTK3 then [ gtk3 vala_0_23 pygobject3 ] else [ gtk pygtk pygobject ]);
|
||||
gtk3 vala_0_32 pygobject3 ];
|
||||
|
||||
NIX_CFLAGS_COMPILE = "-fstack-protector-all";
|
||||
configureFlags = [
|
||||
"--with-python"
|
||||
"--with-examples"
|
||||
(if enableGTK3 then "--with-gtk=3.0" else "--with-gtk=2.0")
|
||||
];
|
||||
|
||||
makeFlags = stdenv.lib.optionalString (!enableGTK3)
|
||||
"CODEGENDIR=${pygobject}/share/pygobject/2.0/codegen/ DEFSDIR=${pygtk}/share/pygtk/2.0/defs/";
|
||||
|
||||
# Fix broken .la files
|
||||
preFixup = ''
|
||||
sed 's,-lgpg-error,-L${libgpgerror.out}/lib -lgpg-error,' -i $out/lib/*.la
|
||||
|
||||
@@ -14,7 +14,7 @@ buildGoPackage rec {
|
||||
sha256 = "1rs9g1snjymg6pjz5bj77zk5wbs0w8xmrfxzqs32w6zr1dxhf9hs";
|
||||
};
|
||||
|
||||
goDeps = ./deps.json;
|
||||
goDeps = ./deps.nix;
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
buildInputs = [ lxc ];
|
||||
|
||||
@@ -1,173 +0,0 @@
|
||||
[
|
||||
{
|
||||
"goPackagePath": "gopkg.in/yaml.v2",
|
||||
"fetch": {
|
||||
"type": "git",
|
||||
"url": "https://gopkg.in/yaml.v2",
|
||||
"rev": "a83829b6f1293c91addabc89d0571c246397bbf4",
|
||||
"sha256": "1m4dsmk90sbi17571h6pld44zxz7jc4lrnl4f27dpd1l8g5xvjhh"
|
||||
}
|
||||
},
|
||||
{
|
||||
"goPackagePath": "golang.org/x/crypto",
|
||||
"fetch": {
|
||||
"type": "git",
|
||||
"url": "https://go.googlesource.com/crypto",
|
||||
"rev": "575fdbe86e5dd89229707ebec0575ce7d088a4a6",
|
||||
"sha256": "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa"
|
||||
}
|
||||
},
|
||||
{
|
||||
"goPackagePath": "github.com/golang/protobuf",
|
||||
"fetch": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/golang/protobuf",
|
||||
"rev": "59b73b37c1e45995477aae817e4a653c89a858db",
|
||||
"sha256": "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa"
|
||||
}
|
||||
},
|
||||
{
|
||||
"goPackagePath": "gopkg.in/tomb.v2",
|
||||
"fetch": {
|
||||
"type": "git",
|
||||
"url": "https://gopkg.in/tomb.v2",
|
||||
"rev": "14b3d72120e8d10ea6e6b7f87f7175734b1faab8",
|
||||
"sha256": "1nza31jvkpka5431c4bdbirvjdy36b1b55sbzljqhqih25jrcjx5"
|
||||
}
|
||||
},
|
||||
{
|
||||
"goPackagePath": "github.com/gorilla/websocket",
|
||||
"fetch": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/gorilla/websocket",
|
||||
"rev": "a622679ebd7a3b813862379232f645f8e690e43f",
|
||||
"sha256": "1nc9jbcmgya1i6dmf6sbcqsnxi9hbjg6dz1z0k7zmc6xdwlq0y4q"
|
||||
}
|
||||
},
|
||||
{
|
||||
"goPackagePath": "github.com/syndtr/gocapability",
|
||||
"fetch": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/syndtr/gocapability",
|
||||
"rev": "2c00daeb6c3b45114c80ac44119e7b8801fdd852",
|
||||
"sha256": "1x7jdcg2r5pakjf20q7bdiidfmv7vcjiyg682186rkp2wz0yws0l"
|
||||
}
|
||||
},
|
||||
{
|
||||
"goPackagePath": "gopkg.in/inconshreveable/log15.v2",
|
||||
"fetch": {
|
||||
"type": "git",
|
||||
"url": "https://gopkg.in/inconshreveable/log15.v2",
|
||||
"rev": "b105bd37f74e5d9dc7b6ad7806715c7a2b83fd3f",
|
||||
"sha256": "18rldvi60i7b3lljfrsqgcc24gdkw2pcixxydznyggaqhh96l6a8"
|
||||
}
|
||||
},
|
||||
{
|
||||
"goPackagePath": "github.com/gorilla/mux",
|
||||
"fetch": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/gorilla/mux",
|
||||
"rev": "8096f47503459bcc74d1f4c487b7e6e42e5746b5",
|
||||
"sha256": "0163fm9jsh54df471mx9kfhdg0070klqhw9ja0qwdzqibxq791b9"
|
||||
}
|
||||
},
|
||||
{
|
||||
"goPackagePath": "github.com/pborman/uuid",
|
||||
"fetch": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/pborman/uuid",
|
||||
"rev": "ca53cad383cad2479bbba7f7a1a05797ec1386e4",
|
||||
"sha256": "0rcx669bbjkkwdlw81spnra4ffgzd4rbpywnrj3w41m9vq6mk1gn"
|
||||
}
|
||||
},
|
||||
{
|
||||
"goPackagePath": "gopkg.in/flosch/pongo2.v3",
|
||||
"fetch": {
|
||||
"type": "git",
|
||||
"url": "https://gopkg.in/flosch/pongo2.v3",
|
||||
"rev": "5e81b817a0c48c1c57cdf1a9056cf76bdee02ca9",
|
||||
"sha256": "0fd7d79644zmcirsb1gvhmh0l5vb5nyxmkzkvqpmzzcg6yfczph8"
|
||||
}
|
||||
},
|
||||
{
|
||||
"goPackagePath": "github.com/olekukonko/tablewriter",
|
||||
"fetch": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/olekukonko/tablewriter",
|
||||
"rev": "cca8bbc0798408af109aaaa239cbd2634846b340",
|
||||
"sha256": "0f9ph3z7lh6p6gihbl1461j9yq5qiaqxr9mzdkp512n18v89ml48"
|
||||
}
|
||||
},
|
||||
{
|
||||
"goPackagePath": "github.com/mattn/go-sqlite3",
|
||||
"fetch": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/mattn/go-sqlite3",
|
||||
"rev": "b4142c444a8941d0d92b0b7103a24df9cd815e42",
|
||||
"sha256": "0xq2y4am8dz9w9aaq24s1npg1sn8pf2gn4nki73ylz2fpjwq9vla"
|
||||
}
|
||||
},
|
||||
{
|
||||
"goPackagePath": "gopkg.in/lxc/go-lxc.v2",
|
||||
"fetch": {
|
||||
"type": "git",
|
||||
"url": "https://gopkg.in/lxc/go-lxc.v2",
|
||||
"rev": "8f9e220b36393c03854c2d224c5a55644b13e205",
|
||||
"sha256": "1dc1n2561k3pxbm2zzh3qwlh30bcb2k9v22ghvr7ps2j9lmhs0ip"
|
||||
}
|
||||
},
|
||||
{
|
||||
"goPackagePath": "github.com/mattn/go-runewidth",
|
||||
"fetch": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/mattn/go-runewidth",
|
||||
"rev": "d6bea18f789704b5f83375793155289da36a3c7f",
|
||||
"sha256": "1hnigpn7rjbwd1ircxkyx9hvi0xmxr32b2jdy2jzw6b3jmcnz1fs"
|
||||
}
|
||||
},
|
||||
{
|
||||
"goPackagePath": "github.com/coreos/go-systemd",
|
||||
"fetch": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/coreos/go-systemd",
|
||||
"rev": "a606a1e936df81b70d85448221c7b1c6d8a74ef1",
|
||||
"sha256": "0fhan564swp982dnzzspb6jzfdl453489c0qavh65g3shy5x8x28"
|
||||
}
|
||||
},
|
||||
{
|
||||
"goPackagePath": "github.com/dustinkirkland/golang-petname",
|
||||
"fetch": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/dustinkirkland/golang-petname",
|
||||
"rev": "2182cecef7f257230fc998bc351a08a5505f5e6c",
|
||||
"sha256": "1xagj34y5rxl7rykhil8iqxlls9rbgcxgdvgfp7kg39pinw83arl"
|
||||
}
|
||||
},
|
||||
{
|
||||
"goPackagePath": "github.com/gorilla/context",
|
||||
"fetch": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/gorilla/context",
|
||||
"rev": "215affda49addc4c8ef7e2534915df2c8c35c6cd",
|
||||
"sha256": "1ybvjknncyx1f112mv28870n0l7yrymsr0861vzw10gc4yn1h97g"
|
||||
}
|
||||
},
|
||||
{
|
||||
"goPackagePath": "github.com/mattn/go-colorable",
|
||||
"fetch": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/mattn/go-colorable",
|
||||
"rev": "3dac7b4f76f6e17fb39b768b89e3783d16e237fe",
|
||||
"sha256": "08680mba8hh2rghymqbzd4m40r9k765w5kbzvrif9ngd6h85qnw6"
|
||||
}
|
||||
},
|
||||
{
|
||||
"goPackagePath": "github.com/gosexy/gettext",
|
||||
"fetch": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/gosexy/gettext",
|
||||
"rev": "305f360aee30243660f32600b87c3c1eaa947187",
|
||||
"sha256": "0sm7ziv56ms0lrk30ipbl6i17azar3a44dd2xvr011442zs5ym09"
|
||||
}
|
||||
}
|
||||
]
|
||||
173
pkgs/tools/admin/lxd/deps.nix
Normal file
173
pkgs/tools/admin/lxd/deps.nix
Normal file
@@ -0,0 +1,173 @@
|
||||
[
|
||||
{
|
||||
goPackagePath = "gopkg.in/yaml.v2";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://gopkg.in/yaml.v2";
|
||||
rev = "a83829b6f1293c91addabc89d0571c246397bbf4";
|
||||
sha256 = "1m4dsmk90sbi17571h6pld44zxz7jc4lrnl4f27dpd1l8g5xvjhh";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "golang.org/x/crypto";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://go.googlesource.com/crypto";
|
||||
rev = "575fdbe86e5dd89229707ebec0575ce7d088a4a6";
|
||||
sha256 = "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/golang/protobuf";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/golang/protobuf";
|
||||
rev = "59b73b37c1e45995477aae817e4a653c89a858db";
|
||||
sha256 = "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "gopkg.in/tomb.v2";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://gopkg.in/tomb.v2";
|
||||
rev = "14b3d72120e8d10ea6e6b7f87f7175734b1faab8";
|
||||
sha256 = "1nza31jvkpka5431c4bdbirvjdy36b1b55sbzljqhqih25jrcjx5";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/gorilla/websocket";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/gorilla/websocket";
|
||||
rev = "a622679ebd7a3b813862379232f645f8e690e43f";
|
||||
sha256 = "1nc9jbcmgya1i6dmf6sbcqsnxi9hbjg6dz1z0k7zmc6xdwlq0y4q";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/syndtr/gocapability";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/syndtr/gocapability";
|
||||
rev = "2c00daeb6c3b45114c80ac44119e7b8801fdd852";
|
||||
sha256 = "1x7jdcg2r5pakjf20q7bdiidfmv7vcjiyg682186rkp2wz0yws0l";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "gopkg.in/inconshreveable/log15.v2";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://gopkg.in/inconshreveable/log15.v2";
|
||||
rev = "b105bd37f74e5d9dc7b6ad7806715c7a2b83fd3f";
|
||||
sha256 = "18rldvi60i7b3lljfrsqgcc24gdkw2pcixxydznyggaqhh96l6a8";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/gorilla/mux";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/gorilla/mux";
|
||||
rev = "8096f47503459bcc74d1f4c487b7e6e42e5746b5";
|
||||
sha256 = "0163fm9jsh54df471mx9kfhdg0070klqhw9ja0qwdzqibxq791b9";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/pborman/uuid";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/pborman/uuid";
|
||||
rev = "ca53cad383cad2479bbba7f7a1a05797ec1386e4";
|
||||
sha256 = "0rcx669bbjkkwdlw81spnra4ffgzd4rbpywnrj3w41m9vq6mk1gn";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "gopkg.in/flosch/pongo2.v3";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://gopkg.in/flosch/pongo2.v3";
|
||||
rev = "5e81b817a0c48c1c57cdf1a9056cf76bdee02ca9";
|
||||
sha256 = "0fd7d79644zmcirsb1gvhmh0l5vb5nyxmkzkvqpmzzcg6yfczph8";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/olekukonko/tablewriter";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/olekukonko/tablewriter";
|
||||
rev = "cca8bbc0798408af109aaaa239cbd2634846b340";
|
||||
sha256 = "0f9ph3z7lh6p6gihbl1461j9yq5qiaqxr9mzdkp512n18v89ml48";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/mattn/go-sqlite3";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/mattn/go-sqlite3";
|
||||
rev = "b4142c444a8941d0d92b0b7103a24df9cd815e42";
|
||||
sha256 = "0xq2y4am8dz9w9aaq24s1npg1sn8pf2gn4nki73ylz2fpjwq9vla";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "gopkg.in/lxc/go-lxc.v2";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://gopkg.in/lxc/go-lxc.v2";
|
||||
rev = "8f9e220b36393c03854c2d224c5a55644b13e205";
|
||||
sha256 = "1dc1n2561k3pxbm2zzh3qwlh30bcb2k9v22ghvr7ps2j9lmhs0ip";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/mattn/go-runewidth";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/mattn/go-runewidth";
|
||||
rev = "d6bea18f789704b5f83375793155289da36a3c7f";
|
||||
sha256 = "1hnigpn7rjbwd1ircxkyx9hvi0xmxr32b2jdy2jzw6b3jmcnz1fs";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/coreos/go-systemd";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/coreos/go-systemd";
|
||||
rev = "a606a1e936df81b70d85448221c7b1c6d8a74ef1";
|
||||
sha256 = "0fhan564swp982dnzzspb6jzfdl453489c0qavh65g3shy5x8x28";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/dustinkirkland/golang-petname";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/dustinkirkland/golang-petname";
|
||||
rev = "2182cecef7f257230fc998bc351a08a5505f5e6c";
|
||||
sha256 = "1xagj34y5rxl7rykhil8iqxlls9rbgcxgdvgfp7kg39pinw83arl";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/gorilla/context";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/gorilla/context";
|
||||
rev = "215affda49addc4c8ef7e2534915df2c8c35c6cd";
|
||||
sha256 = "1ybvjknncyx1f112mv28870n0l7yrymsr0861vzw10gc4yn1h97g";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/mattn/go-colorable";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/mattn/go-colorable";
|
||||
rev = "3dac7b4f76f6e17fb39b768b89e3783d16e237fe";
|
||||
sha256 = "08680mba8hh2rghymqbzd4m40r9k765w5kbzvrif9ngd6h85qnw6";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/gosexy/gettext";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/gosexy/gettext";
|
||||
rev = "305f360aee30243660f32600b87c3c1eaa947187";
|
||||
sha256 = "0sm7ziv56ms0lrk30ipbl6i17azar3a44dd2xvr011442zs5ym09";
|
||||
};
|
||||
}
|
||||
]
|
||||
@@ -1,23 +1,21 @@
|
||||
{
|
||||
stdenv, fetchurl, pythonPackages, openssl,
|
||||
stdenv, fetchurl, python2Packages, openssl,
|
||||
|
||||
# Many Salt modules require various Python modules to be installed,
|
||||
# passing them in this array enables Salt to find them.
|
||||
extraInputs ? []
|
||||
}:
|
||||
|
||||
pythonPackages.buildPythonApplication rec {
|
||||
python2Packages.buildPythonApplication rec {
|
||||
name = "salt-${version}";
|
||||
version = "2015.8.8";
|
||||
|
||||
disabled = pythonPackages.isPy3k;
|
||||
version = "2016.3.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://pypi/s/salt/${name}.tar.gz";
|
||||
sha256 = "1xcfcs50pyammb60myph4f8bi2r6iwkxwsnnhrjwvkv2ymxwxv5j";
|
||||
sha256 = "1djjglnh6203y8dirziz5w6zh2lgszxp8ivi86nb7fgijj2h61jr";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with pythonPackages; [
|
||||
propagatedBuildInputs = with python2Packages; [
|
||||
futures
|
||||
jinja2
|
||||
markupsafe
|
||||
@@ -26,7 +24,6 @@ pythonPackages.buildPythonApplication rec {
|
||||
pyyaml
|
||||
pyzmq
|
||||
requests
|
||||
salttesting
|
||||
tornado
|
||||
] ++ extraInputs;
|
||||
|
||||
|
||||
@@ -2,10 +2,10 @@ diff --git a/salt/utils/rsax931.py b/salt/utils/rsax931.py
|
||||
index 9eb1f4a..d764f7a 100644
|
||||
--- a/salt/utils/rsax931.py
|
||||
+++ b/salt/utils/rsax931.py
|
||||
@@ -36,7 +36,7 @@ def _load_libcrypto():
|
||||
@@ -36,7 +36,6 @@ def _load_libcrypto():
|
||||
'libcrypto.so*'))
|
||||
lib = lib[0] if len(lib) > 0 else None
|
||||
if lib:
|
||||
- if lib:
|
||||
- return cdll.LoadLibrary(lib)
|
||||
+ return cdll.LoadLibrary('@libcrypto@')
|
||||
+ return cdll.LoadLibrary('@libcrypto@')
|
||||
raise OSError('Cannot locate OpenSSL libcrypto')
|
||||
|
||||
@@ -1,24 +0,0 @@
|
||||
{ stdenv, fetchurl, pythonPackages }:
|
||||
|
||||
pythonPackages.buildPythonApplication rec {
|
||||
name = "SaltTesting-${version}";
|
||||
version = "2015.7.10";
|
||||
|
||||
disabled = pythonPackages.isPy3k;
|
||||
|
||||
propagatedBuildInputs = with pythonPackages; [
|
||||
six
|
||||
];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://pypi/S/SaltTesting/${name}.tar.gz";
|
||||
sha256 = "0p0y8kb77pis18rcig1kf9dnns4bnfa3mr91q40lq4mw63l1b34h";
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = https://github.com/saltstack/salt-testing;
|
||||
description = "Common testing tools used in the Salt Stack projects";
|
||||
maintainers = with maintainers; [ aneeshusa ];
|
||||
license = licenses.asl20;
|
||||
};
|
||||
}
|
||||
@@ -1,23 +1,17 @@
|
||||
{ stdenv, fetchFromGitHub, fetchpatch, pythonPackages }:
|
||||
|
||||
pythonPackages.buildPythonApplication rec {
|
||||
name = "simp_le-2016-04-17";
|
||||
name = "simp_le-2016-12-16";
|
||||
|
||||
# kuba/simp_le seems unmaintained
|
||||
src = fetchFromGitHub {
|
||||
owner = "kuba";
|
||||
owner = "zenhack";
|
||||
repo = "simp_le";
|
||||
rev = "3a103b76f933f9aef782a47401dd2eff5057a6f7";
|
||||
sha256 = "0x8gqazn09m30bn1l7xnf8snhbb7yz7sb09imciqmm4jqdvn797z";
|
||||
rev = "63a43b8547cd9fbc87db6bcd9497c6e37f73abef";
|
||||
sha256 = "04dr8lvcpi797722lsy06nxhlihrxdqgdy187pg3hl1ki2iq3ixx";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/kuba/simp_le/commit/4bc788fdd611c4118c3f86b5f546779723aca5a7.patch";
|
||||
sha256 = "0036p11qn3plydv5s5z6i28r6ihy1ipjl0y8la0izpkiq273byfc";
|
||||
})
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with pythonPackages; [ acme_0_5_0 ];
|
||||
propagatedBuildInputs = with pythonPackages; [ acme ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
inherit (src.meta) homepage;
|
||||
|
||||
@@ -7,20 +7,19 @@
|
||||
with stdenv.lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.6.0";
|
||||
version = "1.7.0";
|
||||
name = "tigervnc-${version}";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://github.com/TigerVNC/tigervnc/";
|
||||
sha256 = "1plljv1cxsax88kv52g02n8c1hzwgp6j1p8z1aqhskw36shg4pij";
|
||||
rev = "5a727f25990d05c9a1f85457b45d6aed66409cb3";
|
||||
sha256 = "1b6n2gq6078x8dwz471a68jrkgpcxmbiivmlsakr42vrndm7niz3";
|
||||
rev = "e25272fc74ef09987ccaa33b9bf1736397c76fdf";
|
||||
};
|
||||
|
||||
inherit fontDirectories;
|
||||
|
||||
patchPhase = ''
|
||||
sed -i -e 's,$(includedir)/pixman-1,${if stdenv ? cross then pixman.crossDrv else pixman}/include/pixman-1,' unix/xserver/hw/vnc/Makefile.am
|
||||
sed -i -e '/^$pidFile/a$ENV{XKB_BINDIR}="${if stdenv ? cross then xorg.xkbcomp.crossDrv else xorg.xkbcomp}/bin";' unix/vncserver
|
||||
sed -i -e '/^\$cmd \.= " -pn";/a$cmd .= " -xkbdir ${if stdenv ? cross then xkeyboard_config.crossDrv else xkeyboard_config}/etc/X11/xkb";' unix/vncserver
|
||||
fontPath=
|
||||
for i in $fontDirectories; do
|
||||
@@ -40,9 +39,20 @@ stdenv.mkDerivation rec {
|
||||
tar xf ${xorg.xorgserver.src}
|
||||
cp -R xorg*/* unix/xserver
|
||||
pushd unix/xserver
|
||||
version=$(echo ${xorg.xorgserver.name} | sed 's/.*-\([0-9]\+\).\([0-9]\+\).*/\1\2/g')
|
||||
patch -p1 < ${src}/unix/xserver$version.patch
|
||||
autoreconf -vfi
|
||||
./configure $configureFlags --disable-devel-docs --disable-docs --disable-xinerama --disable-xvfb --disable-xnest \
|
||||
--disable-xorg --disable-dmx --disable-dri --disable-dri2 --disable-glx \
|
||||
./configure $configureFlags --disable-devel-docs --disable-docs \
|
||||
--disable-xorg --disable-xnest --disable-xvfb --disable-dmx \
|
||||
--disable-xwin --disable-xephyr --disable-kdrive --with-pic \
|
||||
--disable-xorgcfg --disable-xprint --disable-static \
|
||||
--disable-composite --disable-xtrap --enable-xcsecurity \
|
||||
--disable-{a,c,m}fb \
|
||||
--disable-xwayland \
|
||||
--disable-config-dbus --disable-config-udev --disable-config-hal \
|
||||
--disable-xevie \
|
||||
--disable-dri --disable-dri2 --disable-dri3 --enable-glx \
|
||||
--enable-install-libxf86config \
|
||||
--prefix="$out" --disable-unit-tests \
|
||||
--with-xkb-path=${xkeyboard_config}/share/X11/xkb \
|
||||
--with-xkb-bin-directory=${xorg.xkbcomp}/bin \
|
||||
@@ -50,9 +60,9 @@ stdenv.mkDerivation rec {
|
||||
make TIGERVNC_SRCDIR=`pwd`/../..
|
||||
popd
|
||||
'';
|
||||
|
||||
|
||||
postInstall = ''
|
||||
pushd unix/xserver
|
||||
pushd unix/xserver/hw/vnc
|
||||
make TIGERVNC_SRCDIR=`pwd`/../.. install
|
||||
popd
|
||||
rm -f $out/lib/xorg/protocol.txt
|
||||
|
||||
Reference in New Issue
Block a user