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

Merge master into staging

Browse Source
This commit is contained in:
Frederik Rietdijk
2018-08-25 07:37:14 +02:00
parent f4745bef6c 7f8b1dd32f
commit 8fbe3a484a
165 changed files with 4542 additions and 1573 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/os-specific/linux/915resolution/default.nix
View File

@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
name = "915resolution-0.5.3";
src = fetchurl {
url = "http://915resolution.mango-lang.org/${name}.tar.gz";
sha256 = "0hmmy4kkz3x6yigz6hk99416ybznd67dpjaxap50nhay9f1snk5n";
@@ -15,5 +15,6 @@ stdenv.mkDerivation rec {
homepage = http://915resolution.mango-lang.org/;
description = "A tool to modify Intel 800/900 video BIOS";
platforms = [ "i686-linux" "x86_64-linux" ];
license = licenses.publicDomain;
};
}

1
pkgs/os-specific/linux/beegfs/kernel-module.nix
View File

@@ -41,5 +41,6 @@ in stdenv.mkDerivation {
platforms = [ "i686-linux" "x86_64-linux" ];
license = licenses.gpl2;
maintainers = with maintainers; [ markuskowa ];
broken = stdenv.lib.versionAtLeast kernel.version "4.18";
};
}

1
pkgs/os-specific/linux/exfat/default.nix
View File

@@ -33,5 +33,6 @@ stdenv.mkDerivation rec {
license = lib.licenses.gpl2;
maintainers = with lib.maintainers; [ makefu ];
platforms = lib.platforms.linux;
broken = stdenv.lib.versionAtLeast kernel.version "4.18";
};
}

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

@@ -6,7 +6,7 @@ let
version="1.7.0";
name="fbterm-1.7.0";
hash="0pciv5by989vzvjxsv1jsv4bdp4m8j0nfbl29jm5fwi12w4603vj";
url="http://fbterm.googlecode.com/files/fbterm-1.7.0.tar.gz";
url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/fbterm/fbterm-1.7.0.tar.gz";
sha256="0pciv5by989vzvjxsv1jsv4bdp4m8j0nfbl29jm5fwi12w4603vj";
};
buildInputs = [gpm freetype fontconfig ncurses]

3
pkgs/os-specific/linux/fbterm/default.upstream
View File

@@ -1,3 +0,0 @@
url http://code.google.com/p/fbterm/downloads/list
version_link '[.]tar[.][a-z0-9]+$'
process 'code[.]google[.]com//' ''

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

@@ -4,7 +4,7 @@
buildGoPackage rec {
name = "fscrypt-${version}";
version = "0.2.3";
version = "0.2.4";
goPackagePath = "github.com/google/fscrypt";
@@ -12,7 +12,7 @@ buildGoPackage rec {
owner = "google";
repo = "fscrypt";
rev = "v${version}";
sha256 = "126bbxim4nj56kplvyv528i88mfray50r2rc6ysblkmaw6x0fd9c";
sha256 = "10gbyqzgi30as1crvqbb4rc5p8zzbzk1q5j080h1gnz56qzwivr8";
};
buildInputs = [ pam ];

4
pkgs/os-specific/linux/kernel/linux-4.14.nix
View File

@@ -3,7 +3,7 @@
with stdenv.lib;
buildLinux (args // rec {
version = "4.14.66";
version = "4.14.67";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "04q48syzmz84s045bqwyzrr37wcria8waggb5fki2kc69k563053";
sha256 = "1fkha288nv5vk2l13dj0xj09c2pxvipysdaaga7sfcvjq9nhajrz";
};
} // (args.argsOverride or {}))

4
pkgs/os-specific/linux/kernel/linux-4.17.nix
View File

@@ -3,7 +3,7 @@
with stdenv.lib;
buildLinux (args // rec {
version = "4.17.18";
version = "4.17.19";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "03wvnw4xl48na08c29qq57a39kgvb67ayxfqqv4n06vpf8vmx2sd";
sha256 = "05wz76qq70bfhfwd1zwzfmzq4rlgz40jpi9plb31njx1y7vkx6xs";
};
} // (args.argsOverride or {}))

4
pkgs/os-specific/linux/kernel/linux-4.18.nix
View File

@@ -3,7 +3,7 @@
with stdenv.lib;
buildLinux (args // rec {
version = "4.18.4";
version = "4.18.5";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "0hm8id6nv3j2g7l1fzkl4vr9wfx43s8hdspg1yc4fz6vbdxwinqj";
sha256 = "1ga7ys6s5d9dk1ly9722sbik1y6kbc3w6nw9pw86zpzdh0v0l2gv";
};
} // (args.argsOverride or {}))

4
pkgs/os-specific/linux/kernel/linux-4.4.nix
View File

@@ -1,11 +1,11 @@
{ stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
buildLinux (args // rec {
version = "4.4.151";
version = "4.4.152";
extraMeta.branch = "4.4";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "1s49h2my2jysh1i38vygqlcj9bz8fzg6vsv9k3ln3pi6hqqqrsjz";
sha256 = "1jyky74cbaz76x5bpkgw3d45kim3y8brnjp854qkx8462s4pdvhv";
};
} // (args.argsOverride or {}))

4
pkgs/os-specific/linux/kernel/linux-4.9.nix
View File

@@ -1,11 +1,11 @@
{ stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
buildLinux (args // rec {
version = "4.9.123";
version = "4.9.124";
extraMeta.branch = "4.9";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "0wahbq08cixh63099n13wal3xkw48gnka6w8biax1gwckymww4ld";
sha256 = "04a3iqy6divkd9bamn60d0v8jkls2jbip7qn0m82dlcdikab19jw";
};
} // (args.argsOverride or {}))

1
pkgs/os-specific/linux/nss_ldap/default.nix
View File

@@ -11,6 +11,7 @@ stdenv.mkDerivation {
preConfigure = ''
patchShebangs ./vers_string
sed -i s,vers_string,./vers_string, Makefile*
substituteInPlace vers_string --replace "cvslib.pl" "./cvslib.pl"
'';
patches = [ ./crashes.patch ];

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

@@ -2,23 +2,18 @@
stdenv.mkDerivation rec {
name = "numactl-${version}";
version = "2.0.11";
version = "2.0.12";
src = fetchFromGitHub {
owner = "numactl";
repo = "numactl";
rev = "v${version}";
sha256 = "0bcffqawwbyrnza8np0whii25mfd0dria35zal9v3l55xcrya3j9";
sha256 = "0crhpxwakp0gvd7wwpbkfd3brnrdf89lkbf03axnbrs0b6kaygg2";
};
nativeBuildInputs = [ autoreconfHook ];
patches = [
(fetchpatch {
url = https://raw.githubusercontent.com/gentoo/gentoo/b64d15e731e3d6a7671f0ec6c34a20203cf2609d/sys-process/numactl/files/numactl-2.0.11-sysmacros.patch;
sha256 = "05277kv3x12n2xlh3fgnmxclxfc384mkwb0v9pd91046khj6h843";
})
] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl (fetchpatch {
patches = stdenv.lib.optional stdenv.hostPlatform.isMusl (fetchpatch {
url = https://git.alpinelinux.org/cgit/aports/plain/testing/numactl/musl.patch?id=0592b128c71c3e70d493bc7a13caed0d7fae91dd;
sha256 = "080b0sygmg7104qbbh1amh3b322yyiajwi2d3d0vayffgva0720v";
});
@@ -34,8 +29,8 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Library and tools for non-uniform memory access (NUMA) machines";
homepage = http://oss.sgi.com/projects/libnuma/;
license = licenses.gpl2;
homepage = https://github.com/numactl/numactl;
license = with licenses; [ gpl2 lgpl21 ]; # libnuma is lgpl21
platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" ];
maintainers = with maintainers; [ wkennington ];
};

1
pkgs/os-specific/linux/nvidia-x11/generic.nix
View File

@@ -84,6 +84,7 @@ let
platforms = [ "i686-linux" "x86_64-linux" ];
maintainers = [ maintainers.vcunat ];
priority = 4; # resolves collision with xorg-server's "lib/xorg/modules/extensions/libglx.so"
broken = stdenv.lib.versionAtLeast kernel.version "4.18";
};
};

1
pkgs/os-specific/linux/pam_ldap/default.nix
View File

@@ -10,6 +10,7 @@ stdenv.mkDerivation rec {
postPatch = ''
patchShebangs ./vers_string
substituteInPlace vers_string --replace "cvslib.pl" "./cvslib.pl"
'';
preInstall = "

1
pkgs/os-specific/linux/phc-intel/default.nix
View File

@@ -48,5 +48,6 @@ in stdenv.mkDerivation rec {
downloadPage = "http://www.linux-phc.org/forum/viewtopic.php?f=7&t=267";
license = licenses.gpl2;
platforms = [ "x86_64-linux" "i686-linux" ];
broken = stdenv.lib.versionAtLeast kernel.version "4.18";
};
}

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

@@ -10,11 +10,12 @@ assert kernel != null;
stdenv.mkDerivation rec {
name = "spl-${version}-${kernel.version}";
version = "0.7.9";
src = fetchFromGitHub {
owner = "zfsonlinux";
repo = "spl";
rev = "spl-0.7.9";
rev = "spl-${version}";
sha256 = "0540m1dv9jvrzk9kw61glg0h0cwj976mr9zb42y3nh17k47ywff0";
};
@@ -51,5 +52,6 @@ stdenv.mkDerivation rec {
platforms = platforms.linux;
license = licenses.gpl2Plus;
maintainers = with maintainers; [ jcumming wizeman wkennington fpletz globin ];
broken = stdenv.lib.versionAtLeast kernel.version "4.18";
};
}

1
pkgs/os-specific/linux/tbs/default.nix
View File

@@ -59,5 +59,6 @@ in stdenv.mkDerivation {
license = licenses.gpl2;
maintainers = with maintainers; [ ck3d ];
priority = -1;
broken = stdenv.lib.versionAtLeast kernel.version "4.18";
};
}