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

Merge branch 'master' into staging

Browse Source 
* master: (153 commits)
  coqPackages.contribs.aac-tactics: enable for Coq 8.7 and 8.8 (#41351)
  haskell.packages.ghcjs.terminfo: Bump version (#41337)
  nixos/mpd: allow services.mpd.dbFile to be null
  prometheus-snmp-exporter: 0.9.0 -> 0.11.0 (#41363)
  tdesktopPackages.preview: 1.2.24 -> 1.3.0
  signal-desktop: Refactor the package description
  rrootage: init at 0.23a
  bulletml: init at 0.0.6
  signal-desktop: Fix a possible crash when saving an attachment
  linux_rpi: More downstream device tree name fixups
  nixos/sd-image-raspberrypi: Support Raspberry Pi Zero
  U-Boot: Add ubootRaspberryPiZero variant
  U-Boot: 2018.03 -> 2018.05
  linux_rpi: 1.20171029 -> 1.20180417
  raspberrypifw: 1.20180328 -> 1.20180417
  scite: 3.7.5 -> 4.0.5 (#41345)
  neo4j: 3.3.4 -> 3.4.0 (#41338)
  bat: 0.3.0 -> 0.4.1 (#41348)
  perlPackages.Git: init at 0.42
  nodePackages_8_x.pnpm: wrap nodejs.passthru.python
  ...
This commit is contained in:
Orivej Desh
2018-06-01 17:44:35 +00:00
parent fd9cfc4db5 bc069622dd
commit 4b2735fd9f
226 changed files with 5200 additions and 3754 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
pkgs/os-specific/bsd/netbsd/compat.patch Normal file
View File

@@ -0,0 +1,18 @@
diff -u -r1.35.2.1 nbtool_config.h.in
--- a/nbtool_config.h.in 22 Apr 2015 07:18:58 -0000 1.35.2.1
+++ b/nbtool_config.h.in 31 May 2018 01:46:53 -0000
@@ -680,5 +680,14 @@
/* Define if you have u_int8_t, but not uint8_t. */
#undef uint8_t
+#ifdef __cplusplus
+extern "C" {
+#endif
+
#include "compat_defs.h"
+
+#ifdef __cplusplus
+}
+#endif
+
#endif /* !__NETBSD_NBTOOL_CONFIG_H__ */

10
pkgs/os-specific/bsd/netbsd/default.nix
View File

@@ -162,7 +162,7 @@ let
extraPaths = [ make.src ] ++ make.extraPaths;
};
compat = netBSDDerivation {
compat = netBSDDerivation rec {
path = "tools/compat";
sha256 = "17phkfafybxwhzng44k5bhmag6i55br53ky1nwcmw583kg2fa86z";
version = "7.1.2";
@@ -182,6 +182,8 @@ let
installFlags = [];
RENAME = "-D";
patches = [ ./compat.patch ];
postInstall = ''
mv $out/include/compat/* $out/include
rmdir $out/include/compat
@@ -203,6 +205,12 @@ let
install -D $NETBSDSRCDIR/include/rpc/types.h $out/include/rpc/types.h
install -D $NETBSDSRCDIR/include/utmpx.h $out/include/utmpx.h
install -D $NETBSDSRCDIR/include/tzfile.h $out/include/tzfile.h
install -D $NETBSDSRCDIR/sys/sys/tree.h $out/include/sys/tree.h
mkdir -p $out/lib/pkgconfig
substitute ${./libbsd-overlay.pc} $out/lib/pkgconfig/libbsd-overlay.pc \
--subst-var-by out $out \
--subst-var-by version ${version}
# Remove lingering /usr references
if [ -d $out/usr ]; then

11
pkgs/os-specific/bsd/netbsd/libbsd-overlay.pc Normal file
View File

@@ -0,0 +1,11 @@
prefix=@out@
exec_prefix=${prefix}
libdir=${exec_prefix}/lib
includedir=${prefix}/include
Name: nbcompat
Description: NetBSD compatibility framework
Version: @version@
URL: https://www.netbsd.org/
Libs: -L${libdir} -lnbcompat
Cflags: -I${includedir} -DHAVE_NBTOOL_CONFIG_H -include nbtool_config.h

9
pkgs/os-specific/darwin/apple-source-releases/PowerManagement/default.nix Normal file
View File

@@ -0,0 +1,9 @@
{ appleDerivation, xcbuild, IOKit }:
appleDerivation {
buildInputs = [ xcbuild IOKit ];
xcbuildFlags = "-target caffeinate";
installPhase = ''
install -D Products/Deployment/caffeinate $out/bin/caffeinate
'';
}

10
pkgs/os-specific/darwin/apple-source-releases/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, fetchzip, pkgs, fetchurlBoot }:
{ stdenv, buildPackages, fetchurl, fetchzip, pkgs, fetchurlBoot }:
let
# This attrset can in theory be computed automatically, but for that to work nicely we need
@@ -7,6 +7,7 @@ let
# now it's staying here.
versions = {
"osx-10.11.6" = {
PowerManagement = "572.50.1";
SmartCardServices = "55111";
dtrace = "168";
xnu = "3248.60.10";
@@ -212,7 +213,11 @@ let
dtrace-xcode = applePackage "dtrace/xcode.nix" "osx-10.11.6" "04mi0jy8gy0w59rk9i9dqznysv6fzz1v5mq779s41cp308yi0h1c" {};
dyld = applePackage "dyld" "osx-10.11.6" "0qkjmjazm2zpgvwqizhandybr9cm3gz9pckx8rmf0py03faafc08" {};
eap8021x = applePackage "eap8021x" "osx-10.11.6" "0iw0qdib59hihyx2275rwq507bq2a06gaj8db4a8z1rkaj1frskh" {};
ICU = applePackage "ICU" "osx-10.10.5" "1qihlp42n5g4dl0sn0f9pc0bkxy1452dxzf0vr6y5gqpshlzy03p" {};
# Splicing is currently broken in Nixpkgs
# cctools need to be specified manually here to handle this
ICU = applePackage "ICU" "osx-10.10.5" "1qihlp42n5g4dl0sn0f9pc0bkxy1452dxzf0vr6y5gqpshlzy03p" { inherit (buildPackages.darwin) cctools; };
IOKit = applePackage "IOKit" "osx-10.11.6" "0kcbrlyxcyirvg5p95hjd9k8a01k161zg0bsfgfhkb90kh2s8x00" { inherit IOKitSrcs; };
launchd = applePackage "launchd" "osx-10.9.5" "0w30hvwqq8j5n90s3qyp0fccxflvrmmjnicjri4i1vd2g196jdgj" {};
libauto = applePackage "libauto" "osx-10.9.5" "17z27yq5d7zfkwr49r7f0vn9pxvj95884sd2k6lq6rfaz9gxqhy3" {};
@@ -253,6 +258,7 @@ let
system_cmds = applePackage "system_cmds" "osx-10.11.6" "1h46j2c5v02pkv5d9fyv6cpgyg0lczvwicrx6r9s210cl03l77jl" {};
text_cmds = applePackage "text_cmds" "osx-10.11.6" "1f93m7dd0ghqb2hwh905mjhzblyfr7dwffw98xhgmv1mfdnigxg0" {};
top = applePackage "top" "osx-10.11.6" "0i9120rfwapgwdvjbfg0ya143i29s1m8zbddsxh39pdc59xnsg5l" {};
PowerManagement = applePackage "PowerManagement" "osx-10.11.6" "1llimhvp0gjffd47322lnjq7cqwinx0c5z7ikli04ad5srpa68mh" {};
security_systemkeychain = applePackage "security_systemkeychain" "osx-10.10.5" "0xviskdgxsail15npi0billyiysvljlmg38mmhnr7qi4ymnnjr90" {};

2
pkgs/os-specific/darwin/xcode/default.nix
View File

@@ -23,7 +23,7 @@ let requireXcode = version: sha256:
message = ''
Unfortunately, we cannot download ${name} automatically.
Please go to ${url}
to download it yourself, and add it to the Nix store by running the following commands."
to download it yourself, and add it to the Nix store by running the following commands.
Note: download (~ 5GB), extraction and storing of Xcode will take a while
${unxip}

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

@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "raspberrypi-firmware-${version}";
version = "1.20180328";
version = "1.20180417";
src = fetchFromGitHub {
owner = "raspberrypi";
repo = "firmware";
rev = version;
sha256 = "19h4lv11idy268pyrq21c5gsff77d5xr9xjkpmzfpcq34gjh3x21";
sha256 = "17mnnhni0wgdnc3mw60nfhcj9v6p5dwcqkwnbpvzczab3r2hziji";
};
installPhase = ''

5
pkgs/os-specific/linux/kernel/generic.nix
View File

@@ -12,6 +12,9 @@
, # The kernel version.
version
, # Allows overriding the default defconfig
defconfig ? null
, # Overrides to the kernel config.
extraConfig ? ""
@@ -85,7 +88,7 @@ let
platformName = hostPlatform.platform.name;
# e.g. "defconfig"
kernelBaseConfig = hostPlatform.platform.kernelBaseConfig;
kernelBaseConfig = if defconfig != null then defconfig else hostPlatform.platform.kernelBaseConfig;
# e.g. "bzImage"
kernelTarget = hostPlatform.platform.kernelTarget;

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

@@ -3,13 +3,13 @@
with stdenv.lib;
buildLinux (args // rec {
version = "4.14.46";
version = "4.14.47";
# branchVersion needs to be x.y
extraMeta.branch = concatStrings (intersperse "." (take 2 (splitString "." version)));
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "0cpnfsxf2ici3yfn1bxix6219fri2s3ld19hpf00z9im8x91px4h";
sha256 = "06c8kl9f0s5qmqh9l16y1q7r44ld56kd0a00722c3aivddm3nav7";
};
} // (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.134";
version = "4.4.135";
extraMeta.branch = "4.4";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "14gvkpdm3wbdfifnkrlk8b3i2isb439prqrzzlvjh88h582x4y20";
sha256 = "1p41fz1jhcrzcmvhbl8di1660bv0w2wpcmi4hfgksdjfh84b1k03";
};
} // (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.104";
version = "4.9.105";
extraMeta.branch = "4.9";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "13f30b7z9sp9h1kwjahla194k7ji46z3pr706caapn71npn55abv";
sha256 = "1i3dv7lvh7b08943iw45j0x99878wia83fribbgxn7xcwcld51fh";
};
} // (args.argsOverride or {}))

27
pkgs/os-specific/linux/kernel/linux-rpi.nix
View File

@@ -1,8 +1,8 @@
{ stdenv, buildPackages, hostPlatform, fetchFromGitHub, perl, buildLinux, ... } @ args:
let
modDirVersion = "4.9.59";
tag = "1.20171029";
modDirVersion = "4.14.34";
tag = "1.20180417";
in
stdenv.lib.overrideDerivation (buildLinux (args // rec {
version = "${modDirVersion}-${tag}";
@@ -12,9 +12,14 @@ stdenv.lib.overrideDerivation (buildLinux (args // rec {
owner = "raspberrypi";
repo = "linux";
rev = "raspberrypi-kernel_${tag}-1";
sha256 = "19lb1gxz21x1d5zdznzqfq60kxg7iqmyl6l0mb9qg2vrl8fcgnxk";
sha256 = "1xgisvmcq50lpnd4rpqhaw52399n0rx2n8mp6k0bf8qm1g3vnza2";
};
defconfig = {
"armv6l-linux" = "bcmrpi_defconfig";
"armv7l-linux" = "bcm2709_defconfig";
}.${stdenv.system} or (throw "linux_rpi not supported on '${stdenv.system}'");
features = {
efiBootStub = false;
} // (args.features or {});
@@ -27,16 +32,15 @@ stdenv.lib.overrideDerivation (buildLinux (args // rec {
'';
postFixup = ''
# Make copies of the DTBs so that U-Boot finds them, as it is looking for the upstream names.
# This is ugly as heck.
# Make copies of the DTBs named after the upstream names so that U-Boot finds them.
# This is ugly as heck, but I don't know a better solution so far.
rm $out/dtbs/bcm283*.dtb
copyDTB() {
if [ -f "$out/dtbs/$1" ]; then
cp -v "$out/dtbs/$1" "$out/dtbs/$2"
fi
cp -v "$out/dtbs/$1" "$out/dtbs/$2"
}
# I am not sure if all of these are correct...
copyDTB bcm2708-rpi-0-w.dts bcm2835-rpi-zero.dtb
copyDTB bcm2708-rpi-0-w.dtb bcm2835-rpi-zero.dtb
copyDTB bcm2708-rpi-0-w.dtb bcm2835-rpi-zero-w.dtb
copyDTB bcm2708-rpi-b.dtb bcm2835-rpi-a.dtb
copyDTB bcm2708-rpi-b.dtb bcm2835-rpi-b.dtb
copyDTB bcm2708-rpi-b.dtb bcm2835-rpi-b-rev2.dtb
@@ -46,6 +50,7 @@ stdenv.lib.overrideDerivation (buildLinux (args // rec {
copyDTB bcm2708-rpi-cm.dtb bcm2835-rpi-cm.dtb
copyDTB bcm2709-rpi-2-b.dtb bcm2836-rpi-2-b.dtb
copyDTB bcm2710-rpi-3-b.dtb bcm2837-rpi-3-b.dtb
# bcm2710-rpi-cm3.dts is yet unknown.
copyDTB bcm2710-rpi-3-b-plus.dtb bcm2837-rpi-3-b-plus.dtb
copyDTB bcm2710-rpi-cm3.dtb bcm2837-rpi-cm3.dtb
'';
})

7
pkgs/os-specific/linux/libselinux/default.nix
View File

@@ -1,6 +1,6 @@
{ stdenv, fetchurl, pcre, pkgconfig, libsepol
, enablePython ? true, swig ? null, python ? null
, musl-fts
, fts
}:
assert enablePython -> swig != null && python != null;
@@ -18,9 +18,8 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ libsepol pcre ]
++ optionals enablePython [ swig python ]
++ optional stdenv.hostPlatform.isMusl musl-fts;
buildInputs = [ libsepol pcre fts ]
++ optionals enablePython [ swig python ];
# drop fortify here since package uses it by default, leading to compile error:
# command-line>:0:0: error: "_FORTIFY_SOURCE" redefined [-Werror]

4
pkgs/os-specific/linux/musl/fts-setup-hook.sh
View File

@@ -1,4 +0,0 @@
# See pkgs/build-support/setup-hooks/role.bash
getHostRole
export NIX_${role_pre}LDFLAGS+=" -lfts"

19
pkgs/os-specific/linux/musl/fts.nix
View File

@@ -1,19 +0,0 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig }:
stdenv.mkDerivation rec {
name = "musl-fts-${version}";
version = "2017-01-13";
src = fetchFromGitHub {
owner = "pullmoll";
repo = "musl-fts";
rev = "0bde52df588e8969879a2cae51c3a4774ec62472";
sha256 = "1q8cpzisziysrs08b89wj0rm4p6dsyl177cclpfa0f7spjm3jg03";
};
nativeBuildInputs = [ autoreconfHook pkgconfig ];
setupHooks = [
../../../build-support/setup-hooks/role.bash
./fts-setup-hook.sh
];
}

19
pkgs/os-specific/linux/musl/getconf.nix
View File

@@ -1,19 +0,0 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation {
name = "musl-getconf";
src = fetchurl {
url = "https://raw.githubusercontent.com/alpinelinux/aports/48b16204aeeda5bc1f87e49c6b8e23d9abb07c73/main/musl/getconf.c";
sha256 = "0z14ml5343p5gapxw9fnbn2r72r7v2gk8662iifjrblh6sxhqzfq";
};
unpackPhase = ":";
buildPhase = ''$CC $src -o getconf'';
installPhase = ''
mkdir -p $out/bin
cp getconf $out/bin/
'';
}

18
pkgs/os-specific/linux/musl/getent.nix
View File

@@ -1,18 +0,0 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation {
name = "musl-getent";
src = fetchurl {
url = "https://raw.githubusercontent.com/alpinelinux/aports/89a718d88ec7466e721f3bbe9ede5ffe58061d78/main/musl/getent.c";
sha256 = "0b4jqnsmv1hjgcz7db3vd61k682aphl59c3yhwya2q7mkc6g48xk";
};
unpackPhase = ":";
buildPhase = ''$CC $src -o getent'';
installPhase = ''
mkdir -p $out/bin
cp getent $out/bin/
'';
}