Merge remote-tracking branch 'origin/master' into hardened-stdenv
This commit is contained in:
Franz Pletz
@@ -23,6 +23,6 @@ stdenv.mkDerivation rec {
|
||||
license = "GPL";
|
||||
|
||||
platforms = stdenv.lib.platforms.unix;
|
||||
maintainers = [ stdenv.lib.maintainers.simons ];
|
||||
maintainers = [ stdenv.lib.maintainers.peti ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -23,9 +23,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
outputs = if (!interactive) # conditional to avoid mass rebuild ATM
|
||||
then [ "out" "doc" ]
|
||||
else [ "out" "doc" "info" ];
|
||||
outputs = [ "out" "doc" "info" ];
|
||||
|
||||
# the man pages are small and useful enough
|
||||
outputMan = if interactive then "out" else null;
|
||||
@@ -111,7 +109,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
platforms = platforms.all;
|
||||
|
||||
maintainers = [ maintainers.simons ];
|
||||
maintainers = [ maintainers.peti ];
|
||||
};
|
||||
|
||||
passthru = {
|
||||
|
||||
@@ -0,0 +1,82 @@
|
||||
# CAVEATS:
|
||||
# - Have only tested this with rsync, scp, and sftp. cvs support should work, but chroot integration is unlikely to function without further work
|
||||
# - It is compiled without rdist support because rdist is ludicrously ancient (and not already in nixpkgs)
|
||||
|
||||
{ stdenv, fetchurl, openssh, rsync, cvs }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "rssh-${version}";
|
||||
version = "2.3.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/rssh/rssh/${version}/${name}.tar.gz";
|
||||
sha256 = "f30c6a760918a0ed39cf9e49a49a76cb309d7ef1c25a66e77a41e2b1d0b40cd9";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./fix-config-path.patch
|
||||
|
||||
# Patches from AUR
|
||||
(fetchurl {
|
||||
url = https://aur.archlinux.org/cgit/aur.git/plain/0001-fail-logging.patch?h=rssh;
|
||||
name = "0001-fail-logging.patch";
|
||||
sha256 = "d30f2f4fdb1b57f94773f5b0968a4da3356b14a040efe69ec1e976c615035c65";
|
||||
})
|
||||
(fetchurl {
|
||||
url = https://aur.archlinux.org/cgit/aur.git/plain/0002-info-to-debug.patch?h=rssh;
|
||||
name = "0002-info-to-debug.patch";
|
||||
sha256 = "86f6ecf34f62415b0d6204d4cbebc47322dc2ec71732d06aa27758e35d688fcd";
|
||||
})
|
||||
(fetchurl {
|
||||
url = https://aur.archlinux.org/cgit/aur.git/plain/0003-man-page-spelling.patch?h=rssh;
|
||||
name = "0003-man-page-spelling.patch";
|
||||
sha256 = "455b3bbccddf1493999d00c2cd46e62930ef4fd8211e0b7d3a89d8010d6a5431";
|
||||
})
|
||||
(fetchurl {
|
||||
url = https://aur.archlinux.org/cgit/aur.git/plain/0004-mkchroot.patch?h=rssh;
|
||||
name = "0004-mkchroot.patch";
|
||||
sha256 = "f7fd8723d2aa94e64e037c13c2f263a52104af680ab52bfcaea73dfa836457c2";
|
||||
})
|
||||
(fetchurl {
|
||||
url = https://aur.archlinux.org/cgit/aur.git/plain/0005-mkchroot-arch.patch?h=rssh;
|
||||
name = "0005-mkchroot-arch.patch";
|
||||
sha256 = "ac8894c4087a063ae8267d2fdfcde69c2fe6b67a8ff5917e4518b8f73f08ba3f";
|
||||
})
|
||||
(fetchurl {
|
||||
url = https://aur.archlinux.org/cgit/aur.git/plain/0006-mkchroot-symlink.patch?h=rssh;
|
||||
name = "0006-mkchroot-symlink.patch";
|
||||
sha256 = "bce98728cb9b55c92182d4901c5f9adf49376a07c5603514b0004e3d1c85e9c7";
|
||||
})
|
||||
(fetchurl {
|
||||
url = https://aur.archlinux.org/cgit/aur.git/plain/0007-destdir.patch?h=rssh;
|
||||
name = "0007-destdir.patch";
|
||||
sha256 = "7fa03644f81dc37d77cc7e2cad994f17f91b2b8a49b1a74e41030a4ac764385e";
|
||||
})
|
||||
(fetchurl {
|
||||
url = https://aur.archlinux.org/cgit/aur.git/plain/0008-rsync-protocol.patch?h=rssh;
|
||||
name = "0008-rsync-protocol.patch";
|
||||
sha256 = "0c772afe9088eeded129ead86775ef18e58c318bbc58fc3e2585e7ff09cc5e91";
|
||||
})
|
||||
];
|
||||
|
||||
buildInputs = [ openssh rsync cvs ];
|
||||
|
||||
configureFlags = [
|
||||
"--with-sftp-server=${openssh}/libexec/sftp-server"
|
||||
"--with-scp=${openssh}/bin/scp"
|
||||
"--with-rsync=${rsync}/bin/rsync"
|
||||
"--with-cvs=${cvs}/bin/cvs"
|
||||
];
|
||||
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A restricted shell for use with OpenSSH, allowing only scp and/or sftp";
|
||||
longDescription = ''
|
||||
rssh also includes support for rsync and cvs. For example, if you have a server which you only want to allow users to copy files off of via scp, without providing shell access, you can use rssh to do that.
|
||||
'';
|
||||
homepage = "http://www.pizzashack.org/rssh/";
|
||||
license = licenses.bsd2;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ arobyn ];
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,12 @@
|
||||
diff -Naur rssh-2.3.4/Makefile.in rssh-2.3.4-fixed/Makefile.in
|
||||
--- rssh-2.3.4/Makefile.in 2012-11-27 11:19:34.000000000 +1100
|
||||
+++ rssh-2.3.4-fixed/Makefile.in 2015-11-11 21:13:58.516651742 +1100
|
||||
@@ -186,7 +186,7 @@
|
||||
sysconfdir = @sysconfdir@
|
||||
target_alias = @target_alias@
|
||||
AUTOMAKE_OPTIONS = nostdinc
|
||||
-ourdefs = -DPATH_RSSH_CONFIG=\"@sysconfdir@/rssh.conf\" -DPATH_CHROOT_HELPER=\"@libexecdir@/rssh_chroot_helper\"
|
||||
+ourdefs = -DPATH_RSSH_CONFIG=\"/etc/rssh.conf\" -DPATH_CHROOT_HELPER=\"@libexecdir@/rssh_chroot_helper\"
|
||||
ourflags = @defcflags@ @static@
|
||||
AM_CFLAGS = $(ourflags)
|
||||
nodist_rssh_SOURCES = main.c pathnames.h config.h
|
||||
@@ -1,8 +1,8 @@
|
||||
{stdenv, fetchFromGitHub, python3Packages}:
|
||||
{stdenv, fetchurl, python3Packages}:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
name = "xonsh-${version}";
|
||||
version = "0.1.3";
|
||||
version = "0.2.7";
|
||||
|
||||
# The logo xonsh prints during build contains unicode characters, and this
|
||||
# fails because locales have not been set up in the build environment.
|
||||
@@ -16,11 +16,9 @@ python3Packages.buildPythonApplication rec {
|
||||
|
||||
propagatedBuildInputs = [ python3Packages.ply ];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "scopatz";
|
||||
repo = "xonsh";
|
||||
rev = version;
|
||||
sha256 = "04qnjqpz5y38g22irpph13j2a4hy7mk9pqvqz1mfimaf8zgmyh1n";
|
||||
src = fetchurl {
|
||||
url = "mirror://pypi/x/xonsh/${name}.tar.gz";
|
||||
sha256= "10pglgmzj6l0l8mb3r2rxnbigqigcqn9njcgdcrg7s1b409cq4md";
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
||||
@@ -0,0 +1,45 @@
|
||||
{ stdenv, fetchurl, fetchgit, fetchFromGitHub }:
|
||||
|
||||
let
|
||||
# https://github.com/spwhitt/nix-zsh-completions/pull/2
|
||||
nix-zsh-completions = fetchFromGitHub {
|
||||
owner = "garbas";
|
||||
repo = "nix-zsh-completions";
|
||||
rev = "9b7d216ec095ccee541ebfa5f04249aa2964d054";
|
||||
sha256 = "1pvmfcqdvdi3nc1jm72f54mwf06yrmlq31pqw6b5fczawcz02jrz";
|
||||
};
|
||||
in stdenv.mkDerivation rec {
|
||||
rev = "4f19700919c8ebbaf75755fc0d03716d13183f49";
|
||||
name = "zsh-prezto-2015-03-03_rev${builtins.substring 0 7 rev}";
|
||||
src = fetchgit {
|
||||
url = "https://github.com/sorin-ionescu/prezto";
|
||||
inherit rev;
|
||||
sha256 = "1q137r2vv16cq962n0f2hyn8m04d3phvh72gz737zv99jcrqg821";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
patches = [
|
||||
(fetchurl {
|
||||
url = "https://github.com/sorin-ionescu/prezto/pull/1028.patch";
|
||||
sha256 = "0n2s7kfp9ljrq8lw5iibv0vyv66awrkzkqbyvy7hlcl06d8aykjv";
|
||||
})
|
||||
];
|
||||
buildPhase = ''
|
||||
sed -i -e "s|\''${ZDOTDIR:\-\$HOME}/.zpreztorc|/etc/zpreztorc|g" init.zsh
|
||||
sed -i -e "s|\''${ZDOTDIR:\-\$HOME}/.zprezto/|$out/|g" init.zsh
|
||||
for i in runcoms/*; do
|
||||
sed -i -e "s|\''${ZDOTDIR:\-\$HOME}/.zprezto/|$out/|g" $i
|
||||
done
|
||||
sed -i -e "s|\''${0:h}/cache.zsh|\''${ZDOTDIR:\-\$HOME}/.zfasd_cache|g" modules/fasd/init.zsh
|
||||
'';
|
||||
installPhase = ''
|
||||
mkdir -p $out/modules/nix
|
||||
cp ${nix-zsh-completions}/* $out/modules/nix -R
|
||||
cp ./* $out/ -R
|
||||
'';
|
||||
meta = with stdenv.lib; {
|
||||
description = "Prezto is the configuration framework for Zsh; it enriches the command line interface environment with sane defaults, aliases, functions, auto completion, and prompt themes.";
|
||||
homepage = "https://github.com/sorin-ionescu/prezto";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ garbas ];
|
||||
};
|
||||
}
|
||||
Reference in New Issue
Block a user