mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-16 23:03:40 +01:00
Merge branch 'master' into staging
Evaluation was blocked on Hydra; this should fix it.
This commit is contained in:
Vladimír Čunát
commit
0be2928ac9
26 changed files with 637 additions and 483 deletions
|
|
@ -3,7 +3,6 @@
|
|||
with lib;
|
||||
|
||||
let
|
||||
pkg = pkgs.softether;
|
||||
cfg = config.services.softether;
|
||||
|
||||
in
|
||||
|
|
@ -17,6 +16,15 @@ in
|
|||
|
||||
enable = mkEnableOption "SoftEther VPN services";
|
||||
|
||||
package = mkOption {
|
||||
type = types.package;
|
||||
default = pkgs.softether;
|
||||
defaultText = "pkgs.softether";
|
||||
description = ''
|
||||
softether derivation to use.
|
||||
'';
|
||||
};
|
||||
|
||||
vpnserver.enable = mkEnableOption "SoftEther VPN Server";
|
||||
|
||||
vpnbridge.enable = mkEnableOption "SoftEther VPN Bridge";
|
||||
|
|
@ -41,7 +49,7 @@ in
|
|||
|
||||
dataDir = mkOption {
|
||||
type = types.string;
|
||||
default = "${pkg.dataDir}";
|
||||
default = "${cfg.package.dataDir}";
|
||||
description = ''
|
||||
Data directory for SoftEther VPN.
|
||||
'';
|
||||
|
|
@ -57,12 +65,13 @@ in
|
|||
|
||||
mkMerge [{
|
||||
environment.systemPackages = [
|
||||
(pkgs.lib.overrideDerivation pkg (attrs: {
|
||||
(pkgs.lib.overrideDerivation cfg.package (attrs: {
|
||||
dataDir = cfg.dataDir;
|
||||
}))
|
||||
];
|
||||
systemd.services."softether-init" = {
|
||||
description = "SoftEther VPN services initial task";
|
||||
wantedBy = [ "network.target" ];
|
||||
serviceConfig = {
|
||||
Type = "oneshot";
|
||||
RemainAfterExit = false;
|
||||
|
|
@ -71,11 +80,11 @@ in
|
|||
for d in vpnserver vpnbridge vpnclient vpncmd; do
|
||||
if ! test -e ${cfg.dataDir}/$d; then
|
||||
${pkgs.coreutils}/bin/mkdir -m0700 -p ${cfg.dataDir}/$d
|
||||
install -m0600 ${pkg}${cfg.dataDir}/$d/hamcore.se2 ${cfg.dataDir}/$d/hamcore.se2
|
||||
install -m0600 ${cfg.package}${cfg.dataDir}/$d/hamcore.se2 ${cfg.dataDir}/$d/hamcore.se2
|
||||
fi
|
||||
done
|
||||
rm -rf ${cfg.dataDir}/vpncmd/vpncmd
|
||||
ln -s ${pkg}${cfg.dataDir}/vpncmd/vpncmd ${cfg.dataDir}/vpncmd/vpncmd
|
||||
ln -s ${cfg.package}${cfg.dataDir}/vpncmd/vpncmd ${cfg.dataDir}/vpncmd/vpncmd
|
||||
'';
|
||||
};
|
||||
}
|
||||
|
|
@ -83,17 +92,17 @@ in
|
|||
(mkIf (cfg.vpnserver.enable) {
|
||||
systemd.services.vpnserver = {
|
||||
description = "SoftEther VPN Server";
|
||||
after = [ "softether-init.service" "network.target" ];
|
||||
wants = [ "softether-init.service" ];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
after = [ "softether-init.service" ];
|
||||
requires = [ "softether-init.service" ];
|
||||
wantedBy = [ "network.target" ];
|
||||
serviceConfig = {
|
||||
Type = "forking";
|
||||
ExecStart = "${pkg}/bin/vpnserver start";
|
||||
ExecStop = "${pkg}/bin/vpnserver stop";
|
||||
ExecStart = "${cfg.package}/bin/vpnserver start";
|
||||
ExecStop = "${cfg.package}/bin/vpnserver stop";
|
||||
};
|
||||
preStart = ''
|
||||
rm -rf ${cfg.dataDir}/vpnserver/vpnserver
|
||||
ln -s ${pkg}${cfg.dataDir}/vpnserver/vpnserver ${cfg.dataDir}/vpnserver/vpnserver
|
||||
ln -s ${cfg.package}${cfg.dataDir}/vpnserver/vpnserver ${cfg.dataDir}/vpnserver/vpnserver
|
||||
'';
|
||||
postStop = ''
|
||||
rm -rf ${cfg.dataDir}/vpnserver/vpnserver
|
||||
|
|
@ -104,17 +113,17 @@ in
|
|||
(mkIf (cfg.vpnbridge.enable) {
|
||||
systemd.services.vpnbridge = {
|
||||
description = "SoftEther VPN Bridge";
|
||||
after = [ "softether-init.service" "network.target" ];
|
||||
wants = [ "softether-init.service" ];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
after = [ "softether-init.service" ];
|
||||
requires = [ "softether-init.service" ];
|
||||
wantedBy = [ "network.target" ];
|
||||
serviceConfig = {
|
||||
Type = "forking";
|
||||
ExecStart = "${pkg}/bin/vpnbridge start";
|
||||
ExecStop = "${pkg}/bin/vpnbridge stop";
|
||||
ExecStart = "${cfg.package}/bin/vpnbridge start";
|
||||
ExecStop = "${cfg.package}/bin/vpnbridge stop";
|
||||
};
|
||||
preStart = ''
|
||||
rm -rf ${cfg.dataDir}/vpnbridge/vpnbridge
|
||||
ln -s ${pkg}${cfg.dataDir}/vpnbridge/vpnbridge ${cfg.dataDir}/vpnbridge/vpnbridge
|
||||
ln -s ${cfg.package}${cfg.dataDir}/vpnbridge/vpnbridge ${cfg.dataDir}/vpnbridge/vpnbridge
|
||||
'';
|
||||
postStop = ''
|
||||
rm -rf ${cfg.dataDir}/vpnbridge/vpnbridge
|
||||
|
|
@ -125,17 +134,17 @@ in
|
|||
(mkIf (cfg.vpnclient.enable) {
|
||||
systemd.services.vpnclient = {
|
||||
description = "SoftEther VPN Client";
|
||||
after = [ "softether-init.service" "network.target" ];
|
||||
wants = [ "softether-init.service" ];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
after = [ "softether-init.service" ];
|
||||
requires = [ "softether-init.service" ];
|
||||
wantedBy = [ "network.target" ];
|
||||
serviceConfig = {
|
||||
Type = "forking";
|
||||
ExecStart = "${pkg}/bin/vpnclient start";
|
||||
ExecStop = "${pkg}/bin/vpnclient stop";
|
||||
ExecStart = "${cfg.package}/bin/vpnclient start";
|
||||
ExecStop = "${cfg.package}/bin/vpnclient stop";
|
||||
};
|
||||
preStart = ''
|
||||
rm -rf ${cfg.dataDir}/vpnclient/vpnclient
|
||||
ln -s ${pkg}${cfg.dataDir}/vpnclient/vpnclient ${cfg.dataDir}/vpnclient/vpnclient
|
||||
ln -s ${cfg.package}${cfg.dataDir}/vpnclient/vpnclient ${cfg.dataDir}/vpnclient/vpnclient
|
||||
'';
|
||||
postStart = ''
|
||||
sleep 1
|
||||
|
|
|
|||
|
|
@ -3,11 +3,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "chirp-daily-${version}";
|
||||
version = "20170311";
|
||||
version = "20170714";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://trac.chirp.danplanet.com/chirp_daily/daily-${version}/${name}.tar.gz";
|
||||
sha256 = "0mvj650vm3bfk94b174gl99fj4jigrx38f1iciz1cp3gn8hcrcpj";
|
||||
sha256 = "1pglsmc0pf50w7df4vv30z5hmdxy4aqjl3qrv8kfiax7rld21gcy";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -25,13 +25,13 @@ in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "go-${version}";
|
||||
version = "1.8.3";
|
||||
version = "1.8.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "golang";
|
||||
repo = "go";
|
||||
rev = "go${version}";
|
||||
sha256 = "0g83xm9gb872rsqzwqr1zw5szq69xhynljj2nglg4yyfi7dm2r1c";
|
||||
sha256 = "0p0m63y39pja3fkj43sdq0qv8kqljkz7d58bf9jbw0rjw2c9ml4a";
|
||||
};
|
||||
|
||||
# perl is used for testing go vet
|
||||
|
|
|
|||
|
|
@ -25,13 +25,13 @@ in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "go-${version}";
|
||||
version = "1.9";
|
||||
version = "1.9.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "golang";
|
||||
repo = "go";
|
||||
rev = "go${version}";
|
||||
sha256 = "06k66x387r93m7d3bd5yzwdm8f8xc43cdjfamqldfc1v8ngak0y9";
|
||||
sha256 = "1p226lgsmiwgcvmiakac9i08304cq5ick23vmsk1vjcsh6dvz9i3";
|
||||
};
|
||||
|
||||
# perl is used for testing go vet
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{ stdenv, fetchurl, which, ocsigen_server, ocsigen_deriving, ocaml,
|
||||
js_of_ocaml, ocaml_react, lwt, calendar, cryptokit, tyxml,
|
||||
js_of_ocaml, react, lwt, calendar, cryptokit, tyxml,
|
||||
ipaddr, ocamlnet, ocaml_ssl, ocaml_pcre, ocaml_optcomp,
|
||||
reactivedata, opam, ppx_tools, ppx_deriving, findlib
|
||||
, ocamlbuild
|
||||
|
|
@ -24,7 +24,7 @@ stdenv.mkDerivation rec
|
|||
|
||||
propagatedBuildInputs = [ lwt reactivedata tyxml ipaddr ocsigen_server ppx_deriving
|
||||
ocsigen_deriving js_of_ocaml
|
||||
calendar cryptokit ocamlnet ocaml_react ocaml_ssl ocaml_pcre ];
|
||||
calendar cryptokit ocamlnet react ocaml_ssl ocaml_pcre ];
|
||||
|
||||
installPhase = "opam-installer -i --prefix=$out --libdir=$OCAMLFIND_DESTDIR";
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchurl, libev, ocaml, findlib, ocamlbuild, lwt, ocaml_react, zed, camlp4 }:
|
||||
{ stdenv, fetchurl, libev, ocaml, findlib, ocamlbuild, lwt, react, zed, camlp4 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.6";
|
||||
|
|
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "1rhfixdgpylxznf6sa9wr31wb4pjzpfn5mxhxqpbchmpl2afwa09";
|
||||
};
|
||||
|
||||
buildInputs = [ libev ocaml findlib ocamlbuild lwt ocaml_react ];
|
||||
buildInputs = [ libev ocaml findlib ocamlbuild lwt react ];
|
||||
|
||||
propagatedBuildInputs = [ camlp4 zed ];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{ stdenv, buildOcaml, fetchzip, which, cryptopp, ocaml, findlib, ocamlbuild, camlp4
|
||||
, ocaml_react, ocaml_ssl, libev, pkgconfig, ncurses, ocaml_oasis, glib
|
||||
, react, ocaml_ssl, libev, pkgconfig, ncurses, ocaml_oasis, glib
|
||||
, ppx_tools, result, cppo
|
||||
, ppxSupport ? stdenv.lib.versionAtLeast ocaml.version "4.02"
|
||||
, version ? if stdenv.lib.versionAtLeast ocaml.version "4.02" then "2.7.1" else "2.6.0"
|
||||
|
|
@ -31,7 +31,7 @@ buildOcaml rec {
|
|||
++ stdenv.lib.optional ppxSupport ppx_tools;
|
||||
|
||||
propagatedBuildInputs = [ result ]
|
||||
++ optionals [ ocaml_react ocaml_ssl ]
|
||||
++ optionals [ react ocaml_ssl ]
|
||||
++ [ libev ];
|
||||
|
||||
configureScript = "ocaml setup.ml -configure";
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, lwt, ocaml_react }:
|
||||
{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, lwt, react }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.0.1";
|
||||
|
|
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
buildInputs = [ ocaml findlib ocamlbuild ];
|
||||
|
||||
propagatedBuildInputs = [ lwt ocaml_react ];
|
||||
propagatedBuildInputs = [ lwt react ];
|
||||
|
||||
createFindlibDestdir = true;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{stdenv, fetchurl, ocaml, findlib, which, ocaml_react, ocaml_ssl,
|
||||
{stdenv, fetchurl, ocaml, findlib, which, react, ocaml_ssl,
|
||||
lwt, ocamlnet, ocaml_pcre, cryptokit, tyxml, ipaddr, zlib,
|
||||
libev, openssl, ocaml_sqlite3, tree, uutf, makeWrapper, camlp4
|
||||
, camlzip, pgocaml
|
||||
|
|
@ -17,7 +17,7 @@ stdenv.mkDerivation {
|
|||
sha256 = "1v44qv2ixd7i1qinyhlzzqiffawsdl7xhhh6ysd7lf93kh46d5sy";
|
||||
};
|
||||
|
||||
buildInputs = [ocaml which findlib ocaml_react ocaml_ssl lwt
|
||||
buildInputs = [ocaml which findlib react ocaml_ssl lwt
|
||||
ocamlnet ocaml_pcre cryptokit tyxml ipaddr zlib libev openssl
|
||||
ocaml_sqlite3 tree uutf makeWrapper camlp4 pgocaml camlzip ];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchgit, ocaml, findlib, ocamlbuild, js_of_ocaml, js_of_ocaml-camlp4, camlp4, lwt3, ocaml_react }:
|
||||
{ stdenv, fetchgit, ocaml, findlib, ocamlbuild, js_of_ocaml, js_of_ocaml-camlp4, camlp4, lwt3, react }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.1";
|
||||
|
|
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
buildInputs = [ ocaml findlib ocamlbuild js_of_ocaml-camlp4 camlp4 ];
|
||||
propagatedBuildInputs = [ js_of_ocaml lwt3 ocaml_react ];
|
||||
propagatedBuildInputs = [ js_of_ocaml lwt3 react ];
|
||||
|
||||
createFindlibDestdir = true;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,29 +1,19 @@
|
|||
{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam }:
|
||||
{ stdenv, fetchurl, ocaml, findlib, topkg, ocamlbuild, opam }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "ocaml-react-1.2.0";
|
||||
name = "ocaml-react-1.2.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = http://erratique.ch/software/react/releases/react-1.2.0.tbz;
|
||||
sha256 = "0knhgbngphv5sp1yskfd97crf169qhpc0igr6w7vqw0q36lswyl8";
|
||||
url = http://erratique.ch/software/react/releases/react-1.2.1.tbz;
|
||||
sha256 = "1aj8w79gdd9xnrbz7s5p8glcb4pmimi8jp9f439dqnf6ih3mqb3v";
|
||||
};
|
||||
|
||||
unpackCmd = "tar xjf $src";
|
||||
buildInputs = [ ocaml findlib ocamlbuild opam ];
|
||||
buildInputs = [ ocaml findlib topkg ocamlbuild opam ];
|
||||
|
||||
createFindlibDestdir = true;
|
||||
|
||||
configurePhase = "ocaml pkg/git.ml";
|
||||
buildPhase = "ocaml pkg/build.ml native=true native-dynlink=true";
|
||||
|
||||
installPhase =
|
||||
let ocamlVersion = (builtins.parseDrvName (ocaml.name)).version;
|
||||
in
|
||||
''
|
||||
opam-installer --script --prefix=$out react.install > install.sh
|
||||
sed -i s!lib/react!lib/ocaml/${ocamlVersion}/site-lib/react! install.sh
|
||||
sh install.sh
|
||||
'';
|
||||
inherit (topkg) buildPhase installPhase;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = http://erratique.ch/software/react;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, ocaml_react, opam }:
|
||||
{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, react, opam }:
|
||||
|
||||
assert stdenv.lib.versionAtLeast ocaml.version "3.11";
|
||||
|
||||
|
|
@ -10,7 +10,7 @@ stdenv.mkDerivation {
|
|||
};
|
||||
|
||||
buildInputs = [ ocaml findlib ocamlbuild opam ];
|
||||
propagatedBuildInputs = [ocaml_react];
|
||||
propagatedBuildInputs = [ react ];
|
||||
|
||||
buildPhase = "ocaml pkg/build.ml native=true native-dynlink=true";
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, camomile, ocaml_react }:
|
||||
{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, camomile, react }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.4";
|
||||
|
|
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "0d8qfy0qiydrrqi8qc9rcwgjigql6vx9gl4zp62jfz1lmjgb2a3w";
|
||||
};
|
||||
|
||||
buildInputs = [ ocaml findlib ocamlbuild ocaml_react ];
|
||||
buildInputs = [ ocaml findlib ocamlbuild react ];
|
||||
|
||||
propagatedBuildInputs = [ camomile ];
|
||||
|
||||
|
|
|
|||
26
pkgs/development/python-modules/devpi-common/default.nix
Normal file
26
pkgs/development/python-modules/devpi-common/default.nix
Normal file
|
|
@ -0,0 +1,26 @@
|
|||
{ stdenv, pythonPackages }:
|
||||
|
||||
with pythonPackages;buildPythonPackage rec {
|
||||
pname = "devpi-common";
|
||||
version = "3.2.0rc1";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1ws35g1r0j2xccsna4r6fc9a08przfi28kf9hciq3rmd6ndbr9c9";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ requests py ];
|
||||
checkInputs = [ pytest ];
|
||||
|
||||
checkPhase = ''
|
||||
py.test
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = https://github.com/devpi/devpi;
|
||||
description = "Utilities jointly used by devpi-server and devpi-client";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ lewo makefu ];
|
||||
};
|
||||
}
|
||||
|
|
@ -6,13 +6,13 @@ assert qtbase != null -> qt4 == null;
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "snowman-${version}";
|
||||
version = "2017-07-22";
|
||||
version = "2017-08-13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "yegord";
|
||||
repo = "snowman";
|
||||
rev = "6c4d9cceb56bf2fd0f650313131a2240579d1bea";
|
||||
sha256 = "1d0abh0fg637jksk7nl4yl54b4cadinj93qqvsm138zyx7h57xqf";
|
||||
rev = "cd9edcddf873fc40d7bcb1bb1eae815faedd3a03";
|
||||
sha256 = "10f3kd5m5xw7hqh92ba7dcczwbznxvk1qxg0yycqz7y9mfr2282n";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
|
|||
|
|
@ -1,20 +1,22 @@
|
|||
{ stdenv, fetchurl, pythonPackages, glibcLocales} :
|
||||
{ stdenv, pythonPackages, glibcLocales} :
|
||||
|
||||
pythonPackages.buildPythonApplication rec {
|
||||
name = "devpi-client-${version}";
|
||||
version = "2.7.0";
|
||||
name = "${pname}-${version}";
|
||||
pname = "devpi-client";
|
||||
version = "3.1.0rc1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://pypi/d/devpi-client/${name}.tar.gz";
|
||||
sha256 = "0z7vaf0a66n82mz0vx122pbynjvkhp2mjf9lskgyv09y3bxzzpj3";
|
||||
src = pythonPackages.fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0kfyva886k9zxmilqb2yviwqzyvs3n36if3s56y4clbvw9hr2lc3";
|
||||
};
|
||||
|
||||
doCheck = false;
|
||||
# requires devpi-server which is currently not packaged
|
||||
doCheck = true;
|
||||
checkInputs = with pythonPackages; [ pytest webtest mock ];
|
||||
checkPhase = "py.test";
|
||||
|
||||
LC_ALL = "en_US.UTF-8";
|
||||
buildInputs = with pythonPackages; [ glibcLocales tox check-manifest pkginfo ];
|
||||
|
||||
propagatedBuildInputs = with pythonPackages; [ py devpi-common ];
|
||||
buildInputs = with pythonPackages; [ glibcLocales pkginfo tox check-manifest ];
|
||||
propagatedBuildInputs = with pythonPackages; [ py devpi-common pluggy ];
|
||||
|
||||
meta = {
|
||||
homepage = http://doc.devpi.net;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchurl, bash, ocaml, findlib, ocamlbuild, camlp4, ocaml_react
|
||||
{ stdenv, fetchurl, bash, ocaml, findlib, ocamlbuild, camlp4
|
||||
, lambdaTerm, ocaml_lwt, camomile, zed, cppo, ppx_tools, makeWrapper
|
||||
}:
|
||||
|
||||
|
|
|
|||
53
pkgs/servers/softether/4.20.nix
Normal file
53
pkgs/servers/softether/4.20.nix
Normal file
|
|
@ -0,0 +1,53 @@
|
|||
{ stdenv, fetchurl
|
||||
, openssl, readline, ncurses, zlib }:
|
||||
|
||||
let
|
||||
os = if stdenv.isLinux then "1"
|
||||
else if stdenv.isFreeBSD then "2"
|
||||
else if stdenv.isSunOS then "3"
|
||||
else if stdenv.isDarwin then "4"
|
||||
else if stdenv.isOpenBSD then "5"
|
||||
else "";
|
||||
cpuBits = if stdenv.is64bit then "2" else "1";
|
||||
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "softether-${version}";
|
||||
version = "4.20";
|
||||
build = "9608";
|
||||
compiledDate = "2016.04.17";
|
||||
dataDir = "/var/lib/softether";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.softether-download.com/files/softether/v${version}-${build}-rtm-${compiledDate}-tree/Source_Code/softether-src-v${version}-${build}-rtm.tar.gz";
|
||||
sha256 = "e559644e34ec6feba43d99f4083f77f9b082dd0574d0bb1e416a65f32ccbc51e";
|
||||
};
|
||||
|
||||
buildInputs = [ openssl readline ncurses zlib ];
|
||||
|
||||
preConfigure = ''
|
||||
echo "${os}
|
||||
${cpuBits}
|
||||
" | ./configure
|
||||
rm configure
|
||||
'';
|
||||
|
||||
buildPhase = ''
|
||||
mkdir -p $out/bin
|
||||
sed -i \
|
||||
-e "/INSTALL_BINDIR=/s|/usr/bin|/bin|g" \
|
||||
-e "/_DIR=/s|/usr|${dataDir}|g" \
|
||||
-e "s|\$(INSTALL|$out/\$(INSTALL|g" \
|
||||
-e "/echo/s|echo $out/|echo |g" \
|
||||
Makefile
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "An Open-Source Free Cross-platform Multi-protocol VPN Program";
|
||||
homepage = https://www.softether.org/;
|
||||
license = licenses.gpl2;
|
||||
maintainers = [ maintainers.rick68 ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
24
pkgs/tools/networking/goklp/default.nix
Normal file
24
pkgs/tools/networking/goklp/default.nix
Normal file
|
|
@ -0,0 +1,24 @@
|
|||
{ stdenv, buildGoPackage, fetchFromGitHub }:
|
||||
|
||||
buildGoPackage rec {
|
||||
name = "goklp-${version}";
|
||||
version = "1.6";
|
||||
|
||||
goPackagePath = "github.com/AppliedTrust/goklp";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AppliedTrust";
|
||||
repo = "goklp";
|
||||
rev = "v${version}";
|
||||
sha256 = "054qmwfaih8qbvdyy4rqbb1ip3jpnm547n390hgab8yc3bdd840c";
|
||||
};
|
||||
|
||||
goDeps = ./deps.nix;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Golang OpenSSH Keys Ldap Provider for AuthorizedKeysCommand";
|
||||
homepage = https://github.com/AppliedTrust/goklp;
|
||||
maintainers = with maintainers; [ disassembler ];
|
||||
license = licenses.bsd2;
|
||||
};
|
||||
}
|
||||
56
pkgs/tools/networking/goklp/deps.nix
Normal file
56
pkgs/tools/networking/goklp/deps.nix
Normal file
|
|
@ -0,0 +1,56 @@
|
|||
[
|
||||
{
|
||||
goPackagePath = "github.com/asaskevich/govalidator";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/asaskevich/govalidator";
|
||||
rev = "ca5f9e638c83bac66bfac70ded5bded1503135a7";
|
||||
sha256 = "0lk4irlf4a4q8qharwjxl71y1s2cf5bjpg9cv5jlyp574331pn1w";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/docopt/docopt-go";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/docopt/docopt-go";
|
||||
rev = "784ddc588536785e7299f7272f39101f7faccc3f";
|
||||
sha256 = "0wwz48jl9fvl1iknvn9dqr4gfy1qs03gxaikrxxp9gry6773v3sj";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/kardianos/osext";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/kardianos/osext";
|
||||
rev = "ae77be60afb1dcacde03767a8c37337fad28ac14";
|
||||
sha256 = "056dkgxrqjj5r18bnc3knlpgdz5p3yvp12y4y978hnsfhwaqvbjz";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/vaughan0/go-ini";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/vaughan0/go-ini";
|
||||
rev = "a98ad7ee00ec53921f08832bc06ecf7fd600e6a1";
|
||||
sha256 = "1l1isi3czis009d9k5awsj4xdxgbxn4n9yqjc1ac7f724x6jacfa";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "gopkg.in/asn1-ber.v1";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://gopkg.in/asn1-ber.v1";
|
||||
rev = "379148ca0225df7a432012b8df0355c2a2063ac0";
|
||||
sha256 = "1y8bvzbxpw0lfnn7pbcdwzqj4l90qj6xf88dvv9pxd9yl5g6cskx";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "gopkg.in/ldap.v2";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://gopkg.in/ldap.v2";
|
||||
rev = "8168ee085ee43257585e50c6441aadf54ecb2c9f";
|
||||
sha256 = "1w0993i8bl8sap01gwm1v6hjp0rsanj2mbpyabwcwnns2g79n895";
|
||||
};
|
||||
}
|
||||
]
|
||||
|
|
@ -1,4 +1,5 @@
|
|||
{ stdenv, fetchFromGitHub, talloc, docutils
|
||||
{ stdenv, fetchFromGitHub, fetchpatch
|
||||
, talloc, docutils
|
||||
, enableStatic ? false }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -17,6 +18,13 @@ stdenv.mkDerivation rec {
|
|||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
patches = [
|
||||
(fetchpatch { # debian patch for aarch64 build
|
||||
sha256 = "18milpzjkbfy5ab789ia3m4pyjyr9mfzbw6kbjhkj4vx9jc39svv";
|
||||
url = "https://sources.debian.net/data/main/p/proot/5.1.0-1.2/debian/patches/arm64.patch";
|
||||
})
|
||||
];
|
||||
|
||||
preBuild = stdenv.lib.optionalString enableStatic ''
|
||||
export LDFLAGS="-static"
|
||||
'';
|
||||
|
|
@ -38,6 +46,6 @@ stdenv.mkDerivation rec {
|
|||
description = "User-space implementation of chroot, mount --bind and binfmt_misc";
|
||||
platforms = platforms.linux;
|
||||
license = licenses.gpl2;
|
||||
maintainers = with maintainers; [ ianwookim nckx ];
|
||||
maintainers = with maintainers; [ ianwookim nckx makefu ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2310,6 +2310,8 @@ with pkgs;
|
|||
|
||||
godot = callPackage ../development/tools/godot {};
|
||||
|
||||
goklp = callPackage ../tools/networking/goklp {};
|
||||
|
||||
go-mtpfs = callPackage ../tools/filesystems/go-mtpfs { };
|
||||
|
||||
go-pup = callPackage ../development/tools/pup { };
|
||||
|
|
@ -11730,7 +11732,8 @@ with pkgs;
|
|||
oracleXE = callPackage ../servers/sql/oracle-xe { };
|
||||
|
||||
softether_4_18 = callPackage ../servers/softether/4.18.nix { };
|
||||
softether = softether_4_18;
|
||||
softether_4_20 = callPackage ../servers/softether/4.20.nix { };
|
||||
softether = softether_4_20;
|
||||
|
||||
qboot = callPackage ../applications/virtualization/qboot { stdenv = stdenv_32bit; };
|
||||
|
||||
|
|
|
|||
|
|
@ -433,9 +433,6 @@ let
|
|||
|
||||
pgocaml = callPackage ../development/ocaml-modules/pgocaml {};
|
||||
|
||||
ocaml_react = callPackage ../development/ocaml-modules/react { };
|
||||
reactivedata = callPackage ../development/ocaml-modules/reactivedata {};
|
||||
|
||||
ocamlscript = callPackage ../development/tools/ocaml/ocamlscript { };
|
||||
|
||||
ocamlsdl= callPackage ../development/ocaml-modules/ocamlsdl { };
|
||||
|
|
@ -593,6 +590,10 @@ let
|
|||
|
||||
re = callPackage ../development/ocaml-modules/re { };
|
||||
|
||||
react = callPackage ../development/ocaml-modules/react { };
|
||||
|
||||
reactivedata = callPackage ../development/ocaml-modules/reactivedata {};
|
||||
|
||||
reason = callPackage ../development/compilers/reason { };
|
||||
|
||||
rope = callPackage ../development/ocaml-modules/rope { };
|
||||
|
|
|
|||
|
|
@ -12862,7 +12862,7 @@ let self = _self // overrides; _self = with self; {
|
|||
name = "TAP-Parser-SourceHandler-pgTAP-3.33";
|
||||
src = fetchurl {
|
||||
url = "mirror://cpan/authors/id/D/DW/DWHEELER/${name}.tar.gz";
|
||||
sha256 = "35q46y2hbp2ij5n9ir76lmspqj3n8gb0z9l5ipb5g7q90l160m4k";
|
||||
sha256 = "15q46y2hbp2ij5n9ir76lmspqj3n8gb0z9l5ipb5g7q90l160m4k";
|
||||
};
|
||||
meta = {
|
||||
homepage = http://search.cpan.org/dist/Tap-Parser-Sourcehandler-pgTAP/;
|
||||
|
|
|
|||
|
|
@ -2355,25 +2355,7 @@ in {
|
|||
};
|
||||
};
|
||||
|
||||
devpi-common = buildPythonPackage rec {
|
||||
name = "devpi-common";
|
||||
version = "3.0.1";
|
||||
|
||||
src = pkgs.fetchurl {
|
||||
url = "mirror://pypi/d/devpi-common/devpi-common-${version}.tar.gz";
|
||||
sha256 = "0l3a7iyk596x6pvzg7604lzzi012qszr804fqn6f517zcy1xz23j";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ self.requests self.py ];
|
||||
|
||||
meta = {
|
||||
homepage = https://bitbucket.org/hpk42/devpi;
|
||||
description = "Utilities jointly used by devpi-server and devpi-client";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ lewo makefu ];
|
||||
};
|
||||
};
|
||||
|
||||
devpi-common = callPackage ../development/python-modules/devpi-common { };
|
||||
# A patched version of buildout, useful for buildout based development on Nix
|
||||
zc_buildout_nix = callPackage ../development/python-modules/buildout-nix { };
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue