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

Merge 'staging' into master

Browse Source
This commit is contained in:
Vladimír Čunát
2014-08-08 20:13:23 +02:00
parent 629f7d055a 777617f987
commit 52d9c93abe
220 changed files with 611 additions and 2164 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/os-specific/linux/apparmor/default.nix
View File

@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
make
make check
make install
ensureDir $out/lib/perl5/site_perl/
mkdir -p $out/lib/perl5/site_perl/
cp swig/perl/LibAppArmor.pm $out/lib/perl5/site_perl/
cp swig/perl/LibAppArmor.bs $out/lib/perl5/site_perl/
# this is automatically copied elsewhere....

4
pkgs/os-specific/linux/bbswitch/default.nix
View File

@@ -22,10 +22,10 @@ stdenv.mkDerivation {
'';
installPhase = ''
ensureDir $out/lib/modules/${kernel.modDirVersion}/misc
mkdir -p $out/lib/modules/${kernel.modDirVersion}/misc
cp bbswitch.ko $out/lib/modules/${kernel.modDirVersion}/misc
ensureDir $out/bin
mkdir -p $out/bin
tee $out/bin/discrete_vga_poweroff << EOF
#!/bin/sh

4
pkgs/os-specific/linux/frandom/default.nix
View File

@@ -20,10 +20,10 @@ stdenv.mkDerivation rec {
installPhase = ''
kernelVersion=${kernel.modDirVersion}
ensureDir $out/lib/modules/$kernelVersion/misc
mkdir -p $out/lib/modules/$kernelVersion/misc
cp frandom.ko $out/lib/modules/$kernelVersion/misc
ensureDir $out/lib/udev/rules.d
mkdir -p $out/lib/udev/rules.d
tee $out/lib/udev/rules.d/10-frandom.rules <<-EOF
#
# These are the rules for the frandom devices. In theory, we could let

2
pkgs/os-specific/linux/gogoclient/default.nix
View File

@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
buildInputs = [openssl];
preFixup = ''
ensureDir $out/share/${name}
mkdir -p $out/share/${name}
chmod 444 $out/bin/gogoc.conf
mv $out/bin/gogoc.conf $out/share/${name}/gogoc.conf.sample
rm $out/bin/gogoc.conf.sample

2
pkgs/os-specific/linux/google-authenticator/default.nix
View File

@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
'';
installPhase = ''
ensureDir $out/bin $out/lib/security
mkdir -p $out/bin $out/lib/security
cp pam_google_authenticator.so $out/lib/security
cp google-authenticator $out/bin
'';

2
pkgs/os-specific/linux/i7z/default.nix
View File

@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
'';
installPhase = ''
ensureDir $out/sbin
mkdir -p $out/sbin
make install prefix=$out
install -Dm755 GUI/i7z_GUI $out/sbin/i7z-gui
'';

4
pkgs/os-specific/linux/iomelt/default.nix
View File

@@ -9,8 +9,8 @@ in stdenv.mkDerivation {
};
preBuild = ''
ensureDir $out/bin
ensureDir $out/share/man/man1
mkdir -p $out/bin
mkdir -p $out/share/man/man1
substituteInPlace Makefile \
--replace /usr $out

2
pkgs/os-specific/linux/mcelog/default.nix
View File

@@ -26,7 +26,7 @@ in stdenv.mkDerivation {
makeFlags = "prefix=$(out) etcprefix=$(out) DOCDIR=$(out)/share/doc";
preInstall = ''
ensureDir $out/share/doc
mkdir -p $out/share/doc
'';
meta = {

2
pkgs/os-specific/linux/microcode/converter.nix
View File

@@ -18,7 +18,7 @@ stdenv.mkDerivation {
'';
installPhase = ''
ensureDir "$out/bin"
mkdir -p "$out/bin"
cp intel-microcode2ucode "$out/bin/"
'';

4
pkgs/os-specific/linux/netatop/default.nix
View File

@@ -22,8 +22,8 @@ stdenv.mkDerivation {
'';
preInstall = ''
ensureDir $out/bin $out/sbin $out/share/man/man{4,8}
ensureDir $out/lib/modules/${kernel.modDirVersion}/extra
mkdir -p $out/bin $out/sbin $out/share/man/man{4,8}
mkdir -p $out/lib/modules/${kernel.modDirVersion}/extra
'';
meta = {

2
pkgs/os-specific/linux/otpw/default.nix
View File

@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
'';
installPhase = ''
ensureDir $out/bin $out/lib/security $out/share/man/man{1,8}
mkdir -p $out/bin $out/lib/security $out/share/man/man{1,8}
cp pam_*.so $out/lib/security
cp otpw-gen $out/bin
cp *.1 $out/share/man/man1

4
pkgs/os-specific/linux/rfkill/udev.nix
View File

@@ -31,12 +31,12 @@ stdenv.mkDerivation {
dontBuild = true;
installPhase = ''
ensureDir "$out/etc/udev/rules.d/";
mkdir -p "$out/etc/udev/rules.d/";
cat > "$out/etc/udev/rules.d/90-rfkill.rules" << EOF
SUBSYSTEM=="rfkill", ATTR{type}=="wlan", RUN+="$out/bin/rfkill-hook.sh"
EOF
ensureDir "$out/bin/";
mkdir -p "$out/bin/";
cp ${./rfkill-hook.sh} "$out/bin/rfkill-hook.sh"
chmod +x "$out/bin/rfkill-hook.sh";
'';

4
pkgs/os-specific/linux/util-linux/default.nix
View File

@@ -1,11 +1,11 @@
{ stdenv, fetchurl, zlib, ncurses ? null, perl ? null, pam }:
stdenv.mkDerivation rec {
name = "util-linux-2.24.1";
name = "util-linux-2.24.2";
src = fetchurl {
url = "http://www.kernel.org/pub/linux/utils/util-linux/v2.24/${name}.tar.xz";
sha256 = "0444xhfm9525v3aagyfbp38mp7xsw2fn9zg4ya713c7s5hivcpl3";
sha256 = "1w0g8q5aj5pjdf8l52g0mxyvlk62f4dch51q9jm3hnqwgz0dchqj";
};
crossAttrs = {

2
pkgs/os-specific/linux/x86info/default.nix
View File

@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
buildInputs = [ pciutils python ];
installPhase = ''
ensureDir $out/bin
mkdir -p $out/bin
cp x86info lsmsr $out/bin
'';