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

Merge remote-tracking branch 'upstream/master' into staging

Browse Source 
Conflicts:
	pkgs/applications/networking/browsers/vivaldi/default.nix
	pkgs/misc/emulators/wine/base.nix
This commit is contained in:
Tuomas Tynkkynen
2016-05-03 23:12:48 +03:00
parent 2362891dc8 e7d3166656
commit aadaa91379
506 changed files with 31436 additions and 5404 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/os-specific/linux/acpid/default.nix
View File

@@ -1,21 +1,18 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "acpid-2.0.25";
name = "acpid-2.0.27";
src = fetchurl {
url = "mirror://sourceforge/acpid2/${name}.tar.xz";
sha256 = "0s2wg84x6pnrkf7i7lpzw2rilq4mj50vwb7p2b2n5hdyfa00lw0b";
sha256 = "05m6scbdzi2fb8zzi01c11a10pr0qb1gzccz4bbxj4fcacz24342";
};
preBuild = ''
makeFlagsArray=(BINDIR=$out/bin SBINDIR=$out/sbin MAN8DIR=$out/share/man/man8)
'';
meta = {
meta = with stdenv.lib; {
homepage = http://tedfelix.com/linux/acpid-netlink.html;
description = "A daemon for delivering ACPI events to userspace programs";
license = stdenv.lib.licenses.gpl2Plus;
platforms = stdenv.lib.platforms.linux;
license = licenses.gpl2Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ nckx ];
};
}

6
pkgs/os-specific/linux/android-udev-rules/default.nix
View File

@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "android-udev-rules-${version}";
version = "2016-03-03";
version = "2016-04-26";
src = fetchFromGitHub {
owner = "M0Rf30";
repo = "android-udev-rules";
rev = "a6ec1239173bfbe2082211261528e834af9fbb64";
sha256 = "11g7m8jjxxzyrbsd9g7cbk6bwy3c4f76pdy4lvdx68xrbsl2rvmj";
rev = "9af6e552016392db35191142b599a5199cf8a9fa";
sha256 = "1lvh7md6qz91q8jy9phnfxlb19s104lvsk75a5r07d8bjc4w9pxb";
};
installPhase = ''

23
pkgs/os-specific/linux/blktrace/default.nix Normal file
View File

@@ -0,0 +1,23 @@
{ stdenv, fetchurl, libaio }:
stdenv.mkDerivation {
name = "blktrace-1.1.0";
# Official source
# "git://git.kernel.org/pub/scm/linux/kernel/git/axboe/blktrace.git"
src = fetchurl {
url = "http://brick.kernel.dk/snaps/blktrace-1.1.0.tar.bz2";
sha256 = "15cj9aki7z5i5y6bnchqry6yp40r4lmgmam6ar5gslnx0smgm8jl";
};
buildInputs = [ libaio ];
preConfigure = ''
sed s,/usr/local,$out, -i Makefile
'';
meta = {
description = "Block layer IO tracing mechanism";
license = stdenv.lib.licenses.gpl2;
};
}

5
pkgs/os-specific/linux/consoletools/default.nix
View File

@@ -10,14 +10,17 @@ stdenv.mkDerivation rec {
};
buildInputs = [ SDL ];
makeFlags = [ "DESTDIR=$(out)"];
installFlags = ''PREFIX=""'';
meta = with stdenv.lib; {
homepage = https://sourceforge.net/projects/linuxconsole/;
description = "A set of tools for joysticks and serial peripherals";
license = licenses.gpl2Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ pSub ];
maintainers = with maintainers; [ pSub ebzzry ];
longDescription = ''
The included tools are:

13
pkgs/os-specific/linux/fatrace/default.nix
View File

@@ -2,22 +2,13 @@
stdenv.mkDerivation rec {
name = "fatrace-${version}";
version = "0.11";
version = "0.12";
src = fetchurl {
url = "http://launchpad.net/fatrace/trunk/${version}/+download/${name}.tar.bz2";
sha256 = "1f77v222nlfbf8fv7d28cnpm7x8xz0mhxavgz19c2jc51pjlv84s";
sha256 = "0szn86rbbvmjcw192vjhhgc3v99s5lm2kg93gk1yzm6ay831grsh";
};
patchFlags = "-p0";
patches = [
(fetchpatch {
sha256 = "0gym1zg42vb4czpbkz4shnc7z3lskn1ny6dpx10ykwf145xyf9m2";
name = "fatrace-fix-crash-when-using-p-option.patch";
url = "http://bazaar.launchpad.net/~pitti/fatrace/trunk/diff/67?context=3";
})
];
buildInputs = [ python3 which ];
postPatch = ''

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

@@ -1,11 +1,11 @@
{stdenv, fetchurl, libnl, pkgconfig}:
stdenv.mkDerivation rec {
name = "iw-4.1";
name = "iw-4.3";
src = fetchurl {
url = "https://www.kernel.org/pub/software/network/iw/${name}.tar.xz";
sha256 = "0jx3s5wdvm2qxd3h883fnyjsb1c29qcsz1r19bc029g8v2nalr2i";
sha256 = "085jyvrxzarvn5jl0fk618jjxy50nqx7ifngszc4jxk6a4ddibd6";
};
buildInputs = [ libnl pkgconfig ];

3
pkgs/os-specific/linux/kernel/common-config.nix
View File

@@ -496,6 +496,9 @@ with stdenv.lib;
BINFMT_SCRIPT y
''}
# For systemd-binfmt
BINFMT_MISC? y
# Enable the 9P cache to speed up NixOS VM tests.
9P_FSCACHE? y
9P_FS_POSIX_ACL? y

14
pkgs/os-specific/linux/kernel/grsecurity-path-4.5.patch Normal file
View File

@@ -0,0 +1,14 @@
diff -ru a/kernel/kmod.c b/kernel/kmod.c
--- a/kernel/kmod.c 2016-04-21 17:06:09.882281660 +0200
+++ b/kernel/kmod.c 2016-04-21 17:08:17.458949309 +0200
@@ -294,7 +294,9 @@
strncmp(sub_info->path, "/lib/", 5) && strncmp(sub_info->path, "/lib64/", 7) &&
strncmp(sub_info->path, "/usr/libexec/", 13) && strncmp(sub_info->path, "/usr/bin/", 9) &&
strncmp(sub_info->path, "/usr/sbin/", 10) && strcmp(sub_info->path, "/bin/false") &&
- strcmp(sub_info->path, "/usr/share/apport/apport")) || strstr(sub_info->path, "..")) {
+ strcmp(sub_info->path, "/usr/share/apport/apport") &&
+ strncmp(sub_info->path, "/nix/store/", 11) &&
+ strncmp(sub_info->path, "/run/current-system/systemd/lib/", 32)) || strstr(sub_info->path, "..")) {
printk(KERN_ALERT "grsec: denied exec of usermode helper binary %.950s located outside of permitted system paths\n", sub_info->path);
retval = -EPERM;
goto out;

6
pkgs/os-specific/linux/kernel/linux-grsecurity-4.1.nix → pkgs/os-specific/linux/kernel/linux-grsecurity-4.5.nix
View File

@@ -1,12 +1,12 @@
{ stdenv, fetchurl, perl, buildLinux, ... } @ args:
import ./generic.nix (args // rec {
version = "4.1.7";
extraMeta.branch = "4.1";
version = "4.5.2";
extraMeta.branch = "4.5";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "0g1dnvak0pd03d4miy1025bw64wq71w29a058dzspdr6jcf9qwbn";
sha256 = "17r063zx880ka3ayv9cf1yjfilvxlifhja1rhw5z3w35hgdkj8z3";
};
kernelPatches = args.kernelPatches;

6
pkgs/os-specific/linux/kernel/linux-testing.nix
View File

@@ -1,13 +1,13 @@
{ stdenv, fetchurl, perl, buildLinux, ... } @ args:
import ./generic.nix (args // rec {
version = "4.6-rc4";
modDirVersion = "4.6.0-rc4";
version = "4.6-rc6";
modDirVersion = "4.6.0-rc6";
extraMeta.branch = "4.6";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/testing/linux-${version}.tar.xz";
sha256 = "1c6y6ry8nll8mab0xwwkmpwzp2k4rbp7jl3f4ihi7g2kv2678cbp";
sha256 = "040sk87zdgqsbma5sk1hk4graga8yafh4rn89vkznkwzdlwa3gyx";
};
features.iwlwifi = true;

23
pkgs/os-specific/linux/kernel/patches.nix
View File

@@ -96,14 +96,6 @@ rec {
sha256 = "1sp1gwa7ahzflq7ayb51bg52abrn5zx1hb3pff3axpjqq7vfai6f";
};
grsecurity_4_1 = grsecPatch
{ kernel = pkgs.grsecurity_base_linux_4_1;
patches = [ grsecurity_fix_path_3_14 ];
kversion = "4.1.7";
revision = "201509201149";
sha256 = "1agv8c3c4vmh5algbzmrq2f6vwk72rikrlcbm4h7jbrb9js6fxk4";
};
grsecurity_4_4 = grsecPatch
{ kernel = pkgs.grsecurity_base_linux_4_4;
patches = [ grsecurity_fix_path_4_4 ];
@@ -112,7 +104,15 @@ rec {
sha256 = "04k4nhshl6r5n41ha5620s7cd70dmmmvyf9mnn5359jr1720kxpf";
};
grsecurity_latest = grsecurity_4_4;
grsecurity_4_5 = grsecPatch
{ kernel = pkgs.grsecurity_base_linux_4_5;
patches = [ grsecurity_fix_path_4_5 ];
kversion = "4.5.2";
revision = "201604290633";
sha256 = "0qrs4fk6lyqngq3fnsmrv0y3yp1lrbiwadfc6v7hy4lyv77wz107";
};
grsecurity_latest = grsecurity_4_5;
grsecurity_fix_path_3_14 =
{ name = "grsecurity-fix-path-3.14";
@@ -124,6 +124,11 @@ rec {
patch = ./grsecurity-path-4.4.patch;
};
grsecurity_fix_path_4_5 =
{ name = "grsecurity-fix-path-4.5";
patch = ./grsecurity-path-4.5.patch;
};
crc_regression =
{ name = "crc-backport-regression";
patch = ./crc-regression.patch;

6
pkgs/os-specific/linux/libnl/default.nix
View File

@@ -1,12 +1,12 @@
{ stdenv, fetchFromGitHub, autoreconfHook, bison, flex, pkgconfig }:
let version = "3.2.26"; in
let version = "3.2.27"; in
stdenv.mkDerivation {
name = "libnl-${version}";
src = fetchFromGitHub {
sha256 = "1cbqdhirn6hxmv8xkm8xp3n6ayyxw7sbi15fym167rdz0h9rkhmm";
rev = "libnl3_2_26";
sha256 = "1rc8plgl2ijq2pwlzinpfr06kiggjyx71r3lw505m6rvxvdac82r";
rev = "libnl3_2_27";
repo = "libnl";
owner = "thom311";
};

36
pkgs/os-specific/linux/open-iscsi/default.nix
View File

@@ -1,36 +1,36 @@
{ stdenv, fetchurl, nukeReferences }:
let
pname = "open-iscsi-2.0-873";
in stdenv.mkDerivation {
name = pname;
outputs = [ "out" "iscsistart" ];
{ stdenv, fetchFromGitHub, automake, autoconf, libtool, gettext, utillinux, openisns, openssl, kmod }:
stdenv.mkDerivation rec {
name = "open-iscsi-${version}";
version = "2.0-873-${stdenv.lib.substring 0 7 src.rev}";
buildInputs = [ nukeReferences ];
buildInputs = [ automake autoconf libtool gettext utillinux openisns.lib openssl kmod ];
src = fetchurl {
urls = [
"http://www.open-iscsi.org/bits/${pname}.tar.gz"
"http://pkgs.fedoraproject.org/repo/pkgs/iscsi-initiator-utils/${pname}.tar.gz/8b8316d7c9469149a6cc6234478347f7/${pname}.tar.gz"
];
sha256 = "1nbwmj48xzy45h52917jbvyqpsfg9zm49nm8941mc5x4gpwz5nbx";
src = fetchFromGitHub {
owner = "open-iscsi";
repo = "open-iscsi";
rev = "4c1f2d90ef1c73e33d9f1e4ae9c206ffe015a8f9";
sha256 = "0h030zk4zih3l8z5662b3kcifdxlakbwwkz1afb7yf0cicds7va8";
};
DESTDIR = "$(out)";
NIX_LDFLAGS = "-lkmod";
NIX_CFLAGS_COMPILE = "-DUSE_KMOD";
preConfigure = ''
sed -i 's|/usr/|/|' Makefile
sed -i 's|/usr|/|' Makefile
'';
postInstall = ''
mkdir -pv $iscsistart/bin/
cp -v usr/iscsistart $iscsistart/bin/
nuke-refs $iscsistart/bin/iscsistart
cp usr/iscsistart $out/sbin/
$out/sbin/iscsistart -v
'';
meta = with stdenv.lib; {
description = "A high performance, transport independent, multi-platform implementation of RFC3720";
license = licenses.gpl2Plus;
homepage = http://www.open-iscsi.org;
homepage = http://www.open-iscsi.com;
platforms = platforms.linux;
maintainers = with maintainers; [ cleverca22 ];
};
}

25
pkgs/os-specific/linux/open-isns/default.nix Normal file
View File

@@ -0,0 +1,25 @@
{ stdenv, openssl, fetchFromGitHub }:
stdenv.mkDerivation rec {
name = "open-isns-${version}";
version = "0.95";
src = fetchFromGitHub {
owner = "gonzoleeman";
repo = "open-isns";
rev = "v${version}";
sha256 = "1c2x3yf9806gbjsw4xi805rfhyxk353a3whqvpccz8dwas6jajwh";
};
propagatedBuildInputs = [ openssl ];
outputs = ["out" "lib" ];
outputInclude = "lib";
installFlags = "etcdir=$(out)/etc vardir=$(out)/var/lib/isns";
installTargets = "install install_hdrs install_lib";
meta = {
description = "iSNS server and client for Linux";
license = stdenv.lib.licenses.lgpl21;
homepage = https://github.com/gonzoleeman/open-isns;
};
}

9
pkgs/os-specific/linux/sdparm/default.nix
View File

@@ -1,11 +1,12 @@
{stdenv, fetchurl}:
stdenv.mkDerivation {
name = "sdparm-1.09";
stdenv.mkDerivation rec {
name = "sdparm-${version}";
version = "1.10";
src = fetchurl {
url = http://sg.danny.cz/sg/p/sdparm-1.09.tar.xz;
sha256 = "0jakqyjwi72zqjzss04bally0xl0lc4710mx8da08vpmir1hfphg";
url = "http://sg.danny.cz/sg/p/${name}.tar.xz";
sha256 = "1jjq3lzgfy4r76rc26q02lv4wm5cb4dx5nh913h489zjrr4f3jbx";
};
meta = with stdenv.lib; {