ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-22 04:57:56 +03:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into staging

Browse Source
This commit is contained in:
Vladimír Čunát 2017-02-11 12:11:22 +01:00
commit 2ce45fbf0d
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
13 changed files with 64 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nixos/modules/installer/cd-dvd/sd-image-aarch64.nix
View File

@ -52,9 +52,7 @@ in
enable_uart=1
'';
in ''
for f in bootcode.bin fixup.dat start.elf; do
cp ${pkgs.raspberrypifw}/share/raspberrypi/boot/$f boot/
done
(cd ${pkgs.raspberrypifw}/share/raspberrypi/boot && cp bootcode.bin fixup*.dat start*.elf $NIX_BUILD_TOP/boot/)
cp ${patchedUboot}/u-boot.bin boot/u-boot-rpi3.bin
cp ${configTxt} boot/config.txt
${extlinux-conf-builder} -t 3 -c ${config.system.build.toplevel} -d ./boot

4
nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix
View File

@ -44,9 +44,7 @@ in
enable_uart=1
'';
in ''
for f in bootcode.bin fixup.dat start.elf; do
cp ${pkgs.raspberrypifw}/share/raspberrypi/boot/$f boot/
done
(cd ${pkgs.raspberrypifw}/share/raspberrypi/boot && cp bootcode.bin fixup*.dat start*.elf $NIX_BUILD_TOP/boot/)
cp ${pkgs.ubootRaspberryPi2}/u-boot.bin boot/u-boot-rpi2.bin
cp ${pkgs.ubootRaspberryPi3_32bit}/u-boot.bin boot/u-boot-rpi3.bin
cp ${configTxt} boot/config.txt

4
nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix
View File

@ -34,9 +34,7 @@ in
sdImage = {
populateBootCommands = ''
for f in bootcode.bin fixup.dat start.elf; do
cp ${pkgs.raspberrypifw}/share/raspberrypi/boot/$f boot/
done
(cd ${pkgs.raspberrypifw}/share/raspberrypi/boot && cp bootcode.bin fixup*.dat start*.elf $NIX_BUILD_TOP/boot/)
cp ${pkgs.ubootRaspberryPi}/u-boot.bin boot/u-boot-rpi.bin
echo 'kernel u-boot-rpi.bin' > boot/config.txt
${extlinux-conf-builder} -t 3 -c ${config.system.build.toplevel} -d ./boot

4
pkgs/applications/networking/cluster/terragrunt/default.nix
View File

@ -2,7 +2,7 @@
buildGoPackage rec {
name = "terragrunt-${version}";
version = "0.9.9";
version = "0.10.0";
goPackagePath = "github.com/gruntwork-io/terragrunt";
@ -10,7 +10,7 @@ buildGoPackage rec {
rev = "v${version}";
owner = "gruntwork-io";
repo = "terragrunt";
sha256 = "08rygmcjlcdj4g575cpx2lfdq69r450ri5q2dngvnhbvzk8nvnr0";
sha256 = "1cdhl7rqd2jslvp1ia1gph1lg0sjzsnvj7dj6lg85jfdcffafygj";
};
goDeps = ./deps.nix;

8
pkgs/applications/networking/cluster/terragrunt/deps.nix
View File

@ -5,8 +5,8 @@
fetch = {
type = "git";
url = "https://github.com/aws/aws-sdk-go";
rev = "4590e9b51cd6698144a025a75608fa7a90752d5d";
sha256 = "13hczsimaanfmbhj8aki8zib7fi161f7p7cjm7z9x8hwwa9q4nld";
rev = "63102d196e0996a2910839857c3584f62be907cc";
sha256 = "0n207g4bf5fjq23f63nkhh14shj7kjdrr4qn6h28d7x2vqfb9pss";
};
}
{
@ -32,8 +32,8 @@
fetch = {
type = "git";
url = "https://github.com/hashicorp/go-getter";
rev = "cc80f38c726badeae53775d179755e1c4953d6cf";
sha256 = "1xbflbgg3gfh3zy5ibfzxv4gbzg62rkzr4l2i9igvz8m7sxgyy1f";
rev = "c3d66e76678dce180a7b452653472f949aedfbcd";
sha256 = "0ykpkiszcwp3hnvnnyl95zdrsziwrzr989ynyvbfkgpnkqfdhfy7";
};
}
{

5
pkgs/applications/networking/syncthing/inotify-deps.nix
View File

@ -1,3 +1,4 @@
# This file was generated by go2nix.
[
{
goPackagePath = "github.com/cenkalti/backoff";
@ -13,8 +14,8 @@
fetch = {
type = "git";
url = "https://github.com/syncthing/syncthing";
rev = "7fba8cf759a3b48cfc1507a8c32355865500a571";
sha256 = "1s8l528fqq661ks70cna5cx1bawpv7szcx88z33bs4gkaq2fbws5";
rev = "fb6d453c74d8420af847460e42e05779e90311b6";
sha256 = "18fya44i80ij5wqpwg0bff2hp058rh87b9zld2rpw0z8r04bnsv0";
};
}
{

10
pkgs/applications/networking/syncthing/inotify.nix
View File

@ -2,15 +2,15 @@
buildGoPackage rec {
name = "syncthing-inotify-${version}";
version = "0.8.4";
version = "0.8.5";
goPackagePath = "github.com/syncthing/syncthing-inotify";
src = fetchFromGitHub {
owner = "syncthing";
repo = "syncthing-inotify";
rev = "v${version}";
sha256 = "0iix4gd5zh2ydn429jmcf0pr1pxxd1wq1vp5ciq9bavhvnim9clw";
owner = "syncthing";
repo = "syncthing-inotify";
rev = "v${version}";
sha256 = "13qfppwlqrx3fs44ghnffdp9x0hs7mn1gal2316p7jb0klkcpfzh";
};
goDeps = ./inotify-deps.nix;

2
pkgs/build-support/setup-hooks/update-autotools-gnu-config-scripts.sh
View File

@ -4,7 +4,7 @@ updateAutotoolsGnuConfigScriptsPhase() {
if [ -n "$dontUpdateAutotoolsGnuConfigScripts" ]; then return; fi
for script in config.sub config.guess; do
for f in $(find . -name "$script"); do
for f in $(find . -type f -name "$script"); do
echo "Updating Autotools / GNU config script to a newer upstream version: $f"
cp -f "@gnu_config@/$script" "$f"
done

6
pkgs/development/libraries/glew/default.nix
View File

@ -3,11 +3,11 @@
with stdenv.lib;
stdenv.mkDerivation rec {
name = "glew-1.13.0";
name = "glew-2.0.0";
src = fetchurl {
url = "mirror://sourceforge/glew/${name}.tgz";
sha256 = "1iwb2a6wfhkzv6fa7zx2gz1lkwa0iwnd9ka1im5vdc44xm4dq9da";
sha256 = "0r37fg2s1f0jrvwh6c8cz5x6v4wqmhq42qm15cs9qs349q5c6wn5";
};
outputs = [ "bin" "out" "dev" "doc" ];
@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
mkdir -pv $out/share/doc/glew
mkdir -p $out/lib/pkgconfig
cp glew*.pc $out/lib/pkgconfig
cp -r README.txt LICENSE.txt doc $out/share/doc/glew
cp -r README.md LICENSE.txt doc $out/share/doc/glew
rm $out/lib/*.a
'';

13
pkgs/development/libraries/libxml2/default.nix
View File

@ -1,8 +1,11 @@
{ stdenv, lib, fetchurl, zlib, xz, python2, findXMLCatalogs, libiconv, fetchpatch
, pythonSupport ? (! stdenv ? cross) }:
{ stdenv, lib, fetchurl, fetchpatch
, zlib, xz, python2, findXMLCatalogs, libiconv
, pythonSupport ? (! stdenv ? cross)
, icuSupport ? false, icu ? null }:
let
python = python2;
in stdenv.mkDerivation rec {
name = "libxml2-${version}";
version = "2.9.4";
@ -37,9 +40,11 @@ in stdenv.mkDerivation rec {
# RUNPATH for that, leading to undefined references for its users.
++ lib.optional stdenv.isFreeBSD xz;
propagatedBuildInputs = [ zlib findXMLCatalogs ];
propagatedBuildInputs = [ zlib findXMLCatalogs ] ++ lib.optional icuSupport icu;
configureFlags = lib.optional pythonSupport "--with-python=${python}"
configureFlags =
lib.optional pythonSupport "--with-python=${python}"
++ lib.optional icuSupport "--with-icu"
++ [ "--exec_prefix=$dev" ];
enableParallelBuilding = true;

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

@ -80,7 +80,10 @@ stdenv.mkDerivation rec {
./patches/kernel-4.6-page_cache_release-put_page.patch ]
++ optionals ( kernel != null &&
(lib.versionAtLeast kernel.version "4.7") )
[ ./patches/4.7-arch-cpu_has_pge-v2.patch ];
[ ./patches/4.7-arch-cpu_has_pge-v2.patch ]
++ optionals ( kernel != null &&
(lib.versionAtLeast kernel.version "4.9") )
[ ./patches/4.9-get_user_pages.patch ];
buildInputs =
[ xorg.libXrender xorg.libXext xorg.libX11 xorg.libXinerama xorg.libSM

28
pkgs/os-specific/linux/ati-drivers/patches/4.9-get_user_pages.patch Normal file
View File

@ -0,0 +1,28 @@
commit b3e4353fc68a6a024dcb95e2d61aa0afd7370233
Author: Matt McHenry <matt@mchenryfamily.org>
Date: Fri Feb 3 20:19:41 2017
patch for 4.9 only
diff --git a/common/lib/modules/fglrx/build_mod/firegl_public.c b/common/lib/modules/fglrx/build_mod/firegl_public.c
index 4ce095f..3b591e1 100755
--- a/common/lib/modules/fglrx/build_mod/firegl_public.c
+++ b/common/lib/modules/fglrx/build_mod/firegl_public.c
@@ -3224,7 +3224,7 @@ int ATI_API_CALL KCL_LockUserPages(unsigned long vaddr, unsigned long* page_list
int ret;
down_read(&current->mm->mmap_sem);
- ret = get_user_pages(vaddr, page_cnt, 1, 0, (struct page **)page_list, NULL);
+ ret = get_user_pages(vaddr, page_cnt, 1, (struct page **)page_list, NULL);
up_read(&current->mm->mmap_sem);
return ret;
@@ -3242,7 +3242,7 @@ int ATI_API_CALL KCL_LockReadOnlyUserPages(unsigned long vaddr, unsigned long* p
int ret;
down_read(&current->mm->mmap_sem);
- ret = get_user_pages(vaddr, page_cnt, 0, 0, (struct page **)page_list, NULL);
+ ret = get_user_pages(vaddr, page_cnt, 0, (struct page **)page_list, NULL);
up_read(&current->mm->mmap_sem);
return ret;

4
pkgs/tools/misc/hakuneko/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "hakuneko-${version}";
version = "1.4.1";
version = "1.4.2";
src = fetchurl {
url = "mirror://sourceforge/hakuneko/hakuneko_${version}_src.tar.gz";
sha256 = "d7e066e3157445f273ccf14172c05077759da036ffe700a28a409fde862b69a7";
sha256 = "76a63fa05e91b082cb5a70a8abacef005354e99978ff8b1369f7aa0af7615d52";
};
preConfigure = ''