alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

autofs: 5.0.8 -> 5.1.1

Browse source
This commit is contained in:
Tobias Geerinckx-Rice 2015-09-18 04:57:51 +02:00
parent 7cfa918aac
commit 1e593edbf1
4 changed files with 13 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
pkgs/os-specific/linux/autofs/create-patches-v5.sh
View file

@ -1,19 +0,0 @@
#!/bin/sh
#
# Use this script with the upstream sorted list of patches
# curl ftp://ftp.kernel.org/pub/linux/daemons/autofs/v5/patches-5.0.{x+1}/patch_order-5.0.x |
# grep -v '^#' | sh create-patches-v5.sh
BASEURL=mirror://kernel/linux/daemons/autofs/v5/patches-5.0.9;
echo '# File created automatically' > patches-v5.nix
echo 'fetchurl :' >> patches-v5.nix
echo '[' >> patches-v5.nix
while read a; do
URL=$BASEURL/$a
HASH=`nix-prefetch-url $URL`
echo "(fetchurl { url = $URL; sha256 = \"$HASH\"; })" >> patches-v5.nix
done
echo ']' >> patches-v5.nix

25
pkgs/os-specific/linux/autofs/autofs-v5.nix → pkgs/os-specific/linux/autofs/default.nix
View file

@ -1,18 +1,16 @@
{stdenv, fetchurl, flex, bison, linuxHeaders}: { stdenv, fetchurl, flex, bison, linuxHeaders }:
let let
baseURL = mirror://kernel/linux/daemons/autofs/v5; version = "5.1.1";
in name = "autofs-${version}";
stdenv.mkDerivation { in stdenv.mkDerivation {
name = "autofs-5.0.8"; inherit name;
src = fetchurl { src = fetchurl {
url = "${baseURL}/autofs-5.0.8.tar.bz2"; url = "mirror://kernel/linux/daemons/autofs/v5/${name}.tar.xz";
sha256 = "0zczihrqdamj43401v2pczf7zi94f8qk20gc6l92nxmpak3443if"; sha256 = "1hr1f11wp538h7r298wpa5khfkhfs8va3p1kdixxhrgkkzpz13z0";
}; };
patches = import ./patches-v5.nix fetchurl;
preConfigure = '' preConfigure = ''
configureFlags="--disable-move-mount --with-path=$PATH" configureFlags="--disable-move-mount --with-path=$PATH"
export MOUNT=/var/run/current-system/sw/bin/mount export MOUNT=/var/run/current-system/sw/bin/mount
@ -31,11 +29,12 @@ stdenv.mkDerivation {
#make install SUBDIRS="samples" # impure! #make install SUBDIRS="samples" # impure!
''; '';
buildInputs = [flex bison linuxHeaders]; buildInputs = [ flex bison linuxHeaders ];
meta = { meta = {
description="Kernel based automounter"; inherit version;
homepage="http://www.linux-consulting.com/Amd_AutoFS/autofs.html"; description = "Kernel-based automounter";
homepage = http://www.linux-consulting.com/Amd_AutoFS/autofs.html;
license = stdenv.lib.licenses.gpl2; license = stdenv.lib.licenses.gpl2;
executables = [ "automount" ]; executables = [ "automount" ];
}; };

7
pkgs/os-specific/linux/autofs/patches-v5.nix
View file

@ -1,7 +0,0 @@
# File created automatically
fetchurl :
[
(fetchurl { url = mirror://kernel/linux/daemons/autofs/v5/patches-5.0.9/autofs-5.0.8-fix-undefined-authtype_requires_creds-err-if-ldap-en.patch; sha256 = "11v1a32rx57ylp8scswpk41jl9n4kfx55nvdlzhvfs4rhws18rpx"; })
(fetchurl { url = mirror://kernel/linux/daemons/autofs/v5/patches-5.0.9/autofs-5.0.8-fix-master-map-type-check.patch; sha256 = "1nkq0y6j7dc6214af3q9bxvy7pv9kak0q9chijxcj6zkhfzwrjy3"; })
(fetchurl { url = mirror://kernel/linux/daemons/autofs/v5/patches-5.0.9/autofs-5.0.8-fix-task-manager-not-getting-signaled.patch; sha256 = "17h06wk4x0rqiky6pm9dglbc5ycxxrd3438a9snnlysl4zzgrqhx"; })
]

2
pkgs/top-level/all-packages.nix
View file

@ -9262,7 +9262,7 @@ let
afuse = callPackage ../os-specific/linux/afuse { }; afuse = callPackage ../os-specific/linux/afuse { };
autofs5 = callPackage ../os-specific/linux/autofs/autofs-v5.nix { }; autofs5 = callPackage ../os-specific/linux/autofs { };
_915resolution = callPackage ../os-specific/linux/915resolution { }; _915resolution = callPackage ../os-specific/linux/915resolution { };