Merge branch 'master' into staging

* master: (39 commits)
  python.pkgs.pybfd: move to python-modules
  documentation: python 2.6 is no more
  documentation: python3Packages is python36Packages
  wireguard: 0.0.20171101 -> 0.0.20171111
  php_excel: init at 1.0.2
  libxl: init at 3.8.1
  matrix-synapse: 0.24.1 -> 0.25.1
  grafana: 4.6.1 -> 4.6.2
  linux: 4.4.98 -> 4.4.99
  linux: 4.9.62 -> 4.9.63
  linux: 4.13.13 -> 4.13.14
  nixos/zsh: add the type for enableAutosuggestions option
  zsh-powerlevel9k: init at 2017-11-10
  fio: 3.1 -> 3.2
  filebench: rehash source
  nano: 2.8.7 -> 2.9.0
  bonnie: replace dead source link
  less: 520 -> 529
  strace: 4.19 -> 4.20
  iperf: 3.2 -> 3.3
  ...
This commit is contained in:
Orivej Desh 2017-11-19 08:30:14 +00:00
commit b089c21506
41 changed files with 496 additions and 187 deletions

View File

@ -661,8 +661,6 @@ src = fetchFromGitHub {
</section>
<section xml:id="sec-patches"><title>Patches</title>
<para>Only patches that are unique to <literal>nixpkgs</literal> should be
included in <literal>nixpkgs</literal> source.</para>
<para>Patches available online should be retrieved using
<literal>fetchpatch</literal>.</para>
<para>
@ -676,5 +674,30 @@ patches = [
];
</programlisting>
</para>
<para>Otherwise, you can add a <literal>.patch</literal> file to the
<literal>nixpkgs</literal> repository. In the interest of keeping our
maintenance burden to a minimum, only patches that are unique
to <literal>nixpkgs</literal> should be added in this way.</para>
<para><programlisting>
patches = [ ./0001-changes.patch ];
</programlisting></para>
<para>If you do need to do create this sort of patch file,
one way to do so is with git:
<orderedlist>
<listitem><para>Move to the root directory of the source code
you're patching.<screen>
$ cd the/program/source</screen></para></listitem>
<listitem><para>If a git repository is not already present,
create one and stage all of the source files.<screen>
$ git init
$ git add .</screen></para></listitem>
<listitem><para>Edit some files to make whatever changes need
to be included in the patch.</para></listitem>
<listitem><para>Use git to create a diff, and pipe the output
to a patch file:<screen>
$ git diff > nixpkgs/pkgs/the/package/0001-changes.patch</screen>
</para></listitem>
</orderedlist></para>
</section>
</chapter>

View File

@ -530,7 +530,6 @@ Based on the packages defined in `pkgs/top-level/python-packages.nix` an
attribute set is created for each available Python interpreter. The available
sets are
* `pkgs.python26Packages`
* `pkgs.python27Packages`
* `pkgs.python34Packages`
* `pkgs.python35Packages`
@ -540,7 +539,7 @@ sets are
and the aliases
* `pkgs.python2Packages` pointing to `pkgs.python27Packages`
* `pkgs.python3Packages` pointing to `pkgs.python35Packages`
* `pkgs.python3Packages` pointing to `pkgs.python36Packages`
* `pkgs.pythonPackages` pointing to `pkgs.python2Packages`
#### `buildPythonPackage` function

View File

@ -497,6 +497,7 @@
Phlogistique = "Noé Rubinstein <noe.rubinstein@gmail.com>";
phreedom = "Evgeny Egorochkin <phreedom@yandex.ru>";
phunehehe = "Hoang Xuan Phu <phunehehe@gmail.com>";
pierrechevalier83 = "Pierre Chevalier <pierrechevalier83@gmail.com>";
pierrer = "Pierre Radermecker <pierrer@pi3r.be>";
pierron = "Nicolas B. Pierron <nixos@nbp.name>";
piotr = "Piotr Pietraszkiewicz <ppietrasa@gmail.com>";

View File

@ -40,16 +40,6 @@ in
sdImage = {
populateBootCommands = let
# Contains a couple of fixes for booting a Linux kernel, will hopefully appear upstream soon.
patchedUboot = pkgs.ubootRaspberryPi3_64bit.overrideAttrs (oldAttrs: {
src = pkgs.fetchFromGitHub {
owner = "dezgeg";
repo = "u-boot";
rev = "baab53ec244fe44def01948a0f10e67342d401e6";
sha256 = "0r5j2pc42ws3w3im0a9c6bh01czz5kapqrqp0ik9ra823cw73lxr";
};
});
configTxt = pkgs.writeText "config.txt" ''
kernel=u-boot-rpi3.bin
arm_control=0x200
@ -57,7 +47,7 @@ in
'';
in ''
(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 ${pkgs.ubootRaspberryPi3_64bit}/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
'';

View File

@ -89,8 +89,8 @@ in
description = ''
Enable zsh-autosuggestions
'';
type = types.bool;
};
};
};

View File

@ -195,7 +195,12 @@ in
boot.plymouth = {
theme = mkDefault "breeze";
themePackages = mkDefault [ pkgs.breeze-plymouth ];
themePackages = mkDefault [
(pkgs.breeze-plymouth.override {
nixosBranding = true;
nixosVersion = config.system.nixosRelease;
})
];
};
security.pam.services.kde = { allowNullPassword = true; };

View File

@ -20,11 +20,11 @@ let
in stdenv.mkDerivation rec {
name = "nano-${version}";
version = "2.8.7";
version = "2.9.0";
src = fetchurl {
url = "mirror://gnu/nano/${name}.tar.xz";
sha256 = "0nhns59smd43mad2w6lnaxqnj4h6ifnlivi6cwydg646jm31gqzv";
sha256 = "17hjgvig59a2ha2b0494bprrci3d33sayjqvxjhsnlzgr8whrlyj";
};
nativeBuildInputs = [ texinfo ] ++ optional enableNls gettext;

View File

@ -2,7 +2,7 @@
buildGoPackage rec {
name = "ipfs-${version}";
version = "0.4.11";
version = "0.4.13";
rev = "v${version}";
goPackagePath = "github.com/ipfs/go-ipfs";
@ -10,7 +10,7 @@ buildGoPackage rec {
extraSrcPaths = [
(fetchgx {
inherit name src;
sha256 = "1n8xr9xg23wm255zjm7nxd761xapmsv11a0giks2gaibh4nps1jl";
sha256 = "150lhf5999jz0nck5s0fs0fp3pgaj85s7dndh68h9caw1fwpwb4f";
})
];
@ -18,7 +18,7 @@ buildGoPackage rec {
owner = "ipfs";
repo = "go-ipfs";
inherit rev;
sha256 = "1qi87sq490xpj4mip1d30x4v77gkacnw4idm0mwla92pg44v6wh9";
sha256 = "103mlsnqfnnqxh4phr192haaiv98d1bwpvca1sqrxz1216r5x0ik";
};
meta = with stdenv.lib; {

View File

@ -45,6 +45,8 @@ in stdenv.mkDerivation rec {
substitute scripts/msmtpq/msmtp-queue $out/bin/msmtp-queue \
--replace @msmtpq@ $out/bin/msmtpq
ln -s msmtp $out/bin/sendmail
chmod +x $out/bin/*
'';

View File

@ -1,6 +1,7 @@
{ stdenv, lib, fetchurl, makeWrapper
{ stdenv, lib, fetchFromGitHub, fetchurl, autoconf, automake, libtool, makeWrapper
, pkgconfig, cmake, gnumake, yasm, python2
, boost, avahi, libdvdcss, libdvdnav, libdvdread, lame, autoreconfHook
, libgcrypt, libgpgerror, libunistring
, boost, avahi, lame, autoreconfHook
, gettext, pcre-cpp, yajl, fribidi, which
, openssl, gperf, tinyxml2, taglib, libssh, swig, jre
, libX11, xproto, inputproto, libxml2
@ -16,133 +17,194 @@
, sqlite, mysql, nasm, gnutls, libva, wayland
, curl, bzip2, zip, unzip, glxinfo, xdpyinfo
, libcec, libcec_platform, dcadec, libuuid
, libcrossguid
, dbus_libs ? null, dbusSupport ? true
, udev, udevSupport ? true
, libusb ? null, usbSupport ? false
, samba ? null, sambaSupport ? true
, libmicrohttpd, bash
# TODO: would be nice to have nfsSupport (needs libnfs library)
, rtmpdump ? null, rtmpSupport ? true
, libvdpau ? null, vdpauSupport ? true
, libpulseaudio ? null, pulseSupport ? true
, joystickSupport ? true
, libcrossguid, libmicrohttpd
, bluez, doxygen, giflib, glib, harfbuzz, lcms2, libidn, libpthreadstubs, libtasn1, libXdmcp
, libplist, p11_kit, zlib
, dbusSupport ? true, dbus_libs ? null
, joystickSupport ? true, cwiid ? null
, nfsSupport ? true, libnfs ? null
, pulseSupport ? true, libpulseaudio ? null
, rtmpSupport ? true, rtmpdump ? null
, sambaSupport ? true, samba ? null
, udevSupport ? true, udev ? null
, usbSupport ? false, libusb ? null
, vdpauSupport ? true, libvdpau ? null
}:
assert dbusSupport -> dbus_libs != null;
assert udevSupport -> udev != null;
assert usbSupport -> libusb != null && ! udevSupport; # libusb won't be used if udev is avaliable
assert sambaSupport -> samba != null;
assert vdpauSupport -> libvdpau != null;
assert nfsSupport -> libnfs != null;
assert pulseSupport -> libpulseaudio != null;
assert rtmpSupport -> rtmpdump != null;
assert sambaSupport -> samba != null;
assert udevSupport -> udev != null;
assert usbSupport -> libusb != null && ! udevSupport; # libusb won't be used if udev is avaliable
assert vdpauSupport -> libvdpau != null;
# TODO for Kodi 18.0
# - cmake is no longer in project/cmake
# - maybe we can remove auto{conf,make} and libtool from inputs
# - check if dbus support PR has been merged and add dbus as a buildInput
let
kodi_version = "17.4";
kodiReleaseDate = "20171115";
kodiVersion = "17.6";
rel = "Krypton";
ffmpeg_3_1_9 = fetchurl {
url = "https://github.com/xbmc/FFmpeg/archive/3.1.9-${rel}-${kodi_version}.tar.gz";
sha256 = "0rhjz505ljfg2jqbm3rd7qbcjq4vnp8h9a8vad8rjf84v3alglpa";
};
# Usage of kodi fork of libdvdnav and libdvdread is necessary for functional dvd playback:
libdvdnav_src = fetchurl {
url = "https://github.com/xbmc/libdvdnav/archive/981488f.tar.gz";
sha256 = "312b3d15bc448d24e92f4b2e7248409525eccc4e75776026d805478e51c5ef3d";
};
libdvdread_src = fetchurl {
url = "https://github.com/xbmc/libdvdread/archive/17d99db.tar.gz";
sha256 = "e7179b2054163652596a56301c9f025515cb08c6d6310b42b897c3ad11c0199b";
};
in stdenv.mkDerivation rec {
version = kodi_version;
name = "kodi-${version}";
src = fetchurl {
url = "https://github.com/xbmc/xbmc/archive/${version}-${rel}.tar.gz";
sha256 = "1p1lxkapynjbd85ns7m4jybl4k35kxzv7105xkh03hlz8kkqc23b";
};
kodi_src = fetchFromGitHub {
owner = "xbmc";
repo = "xbmc";
rev = "${kodiVersion}-${rel}";
sha256 = "1pwmmbry7dajwdpmc1mdygjvxna4kl38h32d71g10yf3mdm5wmz3";
};
kodiDependency = { name, version, rev, sha256, ... } @attrs:
let
attrs' = builtins.removeAttrs attrs ["name" "version" "rev" "sha256"];
in stdenv.mkDerivation ({
name = "kodi-${lib.toLower name}-${version}";
src = fetchFromGitHub {
owner = "xbmc";
repo = name;
inherit rev sha256;
};
enableParallelBuilding = true;
} // attrs');
ffmpeg = kodiDependency rec {
name = "FFmpeg";
version = "3.1.11";
rev = "${version}-${rel}-17.5"; # TODO: change 17.5 back to ${kodiVersion}
sha256 = "0nc4sb6v1g3l11v9h5l9n44a8r40186rcbp2xg5c7vg6wcpjid13";
preConfigure = ''
cp ${kodi_src}/tools/depends/target/ffmpeg/{CMakeLists.txt,*.cmake} .
'';
buildInputs = [ gnutls libidn libtasn1 p11_kit zlib ];
nativeBuildInputs = [ cmake nasm pkgconfig ];
};
# we should be able to build these externally and have kodi reference them as buildInputs.
# Doesn't work ATM though so we just use them for the src
libdvdcss = kodiDependency {
name = "libdvdcss";
version = "20160215";
rev = "2f12236bc1c92f73c21e973363f79eb300de603f";
sha256 = "198r0q73i55ga1dvyqq9nfcri0zq08b94hy8671lg14i3izx44dd";
buildInputs = [ libdvdread ];
nativeBuildInputs = [ autoreconfHook pkgconfig ];
};
libdvdnav = kodiDependency {
name = "libdvdnav";
version = "20170217";
rev = "981488f7f27554b103cca10c1fbeba027396c94a";
sha256 = "089pswc51l3avh95zl4cpsh7gh1innh7b2y4xgx840mcmy46ycr8";
buildInputs = [ libdvdread ];
nativeBuildInputs = [ autoreconfHook pkgconfig ];
};
libdvdread = kodiDependency {
name = "libdvdread";
version = "20160221";
rev = "17d99db97e7b8f23077b342369d3c22a6250affd";
sha256 = "1gr5aq1cjr3as9mnwrw29cxn4m6f6pfrxdahkdcjy70q3ldg90sl";
nativeBuildInputs = [ autoreconfHook pkgconfig ];
};
in stdenv.mkDerivation rec {
name = "kodi-${kodiVersion}";
src = kodi_src;
buildInputs = [
libxml2 gnutls yasm python2
gnutls libidn libtasn1 nasm p11_kit
libxml2 yasm python2
boost libmicrohttpd
gettext pcre-cpp yajl fribidi libva
openssl gperf tinyxml2 taglib libssh swig jre
libX11 xproto inputproto which
libXt libXmu libXext xextproto
libXinerama libXrandr randrproto
libXtst libXfixes fixesproto
libX11 xproto inputproto libXt libXmu libXext xextproto
libXinerama libXrandr randrproto libXtst libXfixes fixesproto
SDL SDL_image SDL_mixer alsaLib
mesa glew fontconfig freetype ftgl
libjpeg jasper libpng libtiff wayland
libjpeg jasper libpng libtiff libva wayland
libmpeg2 libsamplerate libmad
libogg libvorbis flac libxslt systemd
lzo libcdio libmodplug libass libbluray
sqlite mysql.lib nasm avahi libdvdcss lame
sqlite mysql.lib avahi lame
curl bzip2 zip unzip glxinfo xdpyinfo
libcec libcec_platform dcadec libuuid
libcrossguid
libgcrypt libgpgerror libunistring
libcrossguid cwiid libplist
bluez giflib glib harfbuzz lcms2 libpthreadstubs libXdmcp
ffmpeg
# libdvdcss libdvdnav libdvdread
]
++ lib.optional dbusSupport dbus_libs
++ lib.optional udevSupport udev
++ lib.optional usbSupport libusb
++ lib.optional sambaSupport samba
++ lib.optional vdpauSupport libvdpau
++ lib.optional pulseSupport libpulseaudio
++ lib.optional rtmpSupport rtmpdump
++ lib.optional joystickSupport SDL2;
++ lib.optional dbusSupport dbus_libs
++ lib.optionals joystickSupport [ cwiid SDL2 ]
++ lib.optional nfsSupport libnfs
++ lib.optional pulseSupport libpulseaudio
++ lib.optional rtmpSupport rtmpdump
++ lib.optional sambaSupport samba
++ lib.optional udevSupport udev
++ lib.optional usbSupport libusb
++ lib.optional vdpauSupport libvdpau;
nativeBuildInputs = [
autoreconfHook cmake gnumake makeWrapper pkgconfig
cmake
doxygen
makeWrapper
which
pkgconfig gnumake
autoconf automake libtool # still needed for some components. Check if that is the case with 18.0
];
dontUseCmakeConfigure = true;
cmakeFlags = [
"-Dlibdvdcss_URL=${libdvdcss.src}"
"-Dlibdvdnav_URL=${libdvdnav.src}"
"-Dlibdvdread_URL=${libdvdread.src}"
"-DGIT_VERSION=${kodiReleaseDate}"
"-DENABLE_EVENTCLIENTS=ON"
"-DENABLE_INTERNAL_CROSSGUID=OFF"
"-DENABLE_OPTICAL=ON"
"-DLIRC_DEVICE=/run/lirc/lircd"
];
enableParallelBuilding = true;
# 14 tests fail but the biggest issue is that every test takes 30 seconds -
# I'm guessing there is a thing waiting to time out
doCheck = false;
postPatch = ''
substituteInPlace xbmc/linux/LinuxTimezone.cpp \
--replace 'usr/share/zoneinfo' 'etc/zoneinfo'
substituteInPlace tools/depends/target/ffmpeg/autobuild.sh \
--replace "/bin/bash" "${bash}/bin/bash -ex"
cp ${ffmpeg_3_1_9} tools/depends/target/ffmpeg/ffmpeg-3.1.9-${rel}-${version}.tar.gz
ln -s ${libdvdcss.src} tools/depends/target/libdvdcss/libdvdcss-master.tar.gz
cp ${libdvdnav_src} tools/depends/target/libdvdnav/libdvdnav-master.tar.gz
cp ${libdvdread_src} tools/depends/target/libdvdread/libdvdread-master.tar.gz
'';
preConfigure = ''
patchShebangs .
./bootstrap
# tests here fail
sed -i '/TestSystemInfo.cpp/d' xbmc/utils/test/{Makefile,CMakeLists.txt}
# tests here trigger a segfault in kodi.bin
sed -i '/TestWebServer.cpp/d' xbmc/network/test/{Makefile,CMakeLists.txt}
cd project/cmake
'';
enableParallelBuilding = true;
doCheck = true;
configureFlags = [ "--enable-libcec" ]
++ lib.optional (!sambaSupport) "--disable-samba"
++ lib.optional vdpauSupport "--enable-vdpau"
++ lib.optional pulseSupport "--enable-pulse"
++ lib.optional rtmpSupport "--enable-rtmp"
++ lib.optional joystickSupport "--enable-joystick";
postInstall = ''
for p in $(ls $out/bin/) ; do
wrapProgram $out/bin/$p \
--prefix PATH ":" "${lib.makeBinPath
[ python2 glxinfo xdpyinfo ]}" \
--prefix PATH ":" "${lib.makeBinPath [ python2 glxinfo xdpyinfo ]}" \
--prefix LD_LIBRARY_PATH ":" "${lib.makeLibraryPath
[ curl systemd libmad libvdpau libcec libcec_platform rtmpdump libass SDL2 ]}"
done
substituteInPlace $out/share/xsessions/kodi.desktop \
--replace kodi-standalone $out/bin/kodi-standalone
'';
doInstallCheck = true;
installCheckPhase = "$out/bin/kodi --version";
meta = with stdenv.lib; {
homepage = https://kodi.tv/;
description = "Media center";
license = licenses.gpl2;
platforms = platforms.linux;
maintainers = with maintainers; [ domenkozar titanous edwtjo ];
homepage = https://kodi.tv/;
license = licenses.gpl2;
platforms = platforms.linux;
maintainers = with maintainers; [ domenkozar titanous edwtjo peterhoeg ];
};
}

View File

@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
version = "2017-09-17";
version = "2017-11-18";
package-name = "numix-icon-theme";
@ -10,8 +10,8 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "numixproject";
repo = package-name;
rev = "d0e7da93520e521bf7df7cffa3620c10a8400a7f";
sha256 = "1my43kv9yz9vdn51zhd13c8zavba17cqrmxkmhpx0c8xldjqfp3i";
rev = "ea7f2069ca1f6190494e96aa2febcadf6248c5b4";
sha256 = "1nk0mc2qycwmjqdlrsfgar5m83pyj3hf6f66pywf9706nn2yz8fv";
};
dontBuild = true;

View File

@ -0,0 +1,32 @@
{ stdenv, fetchurl, pkgconfig, intltool, gtk3 }:
stdenv.mkDerivation rec {
name = "lxtask-${version}";
version = "0.1.8";
src = fetchurl {
url = "mirror://sourceforge/lxde/${name}.tar.xz";
sha256 = "0h7g1fdngv939z1d05nzs86dplww5a3bpm0isxd7p1bjby047d6z";
};
nativeBuildInputs = [ pkgconfig intltool ];
buildInputs = [ gtk3 ];
configureFlags = [ "--enable-gtk3" ];
meta = {
description = "Lightweight and desktop independent task manager";
longDescription = ''
LXTask is a lightweight task manager derived from xfce4 task manager
with all xfce4 dependencies removed, some bugs fixed, and some
improvement of UI. Although being part of LXDE, the Lightweight X11
Desktop Environment, it's totally desktop independent and only
requires pure gtk+.
'';
homepage = https://wiki.lxde.org/en/LXTask;
license = stdenv.lib.licenses.gpl2Plus;
platforms = stdenv.lib.platforms.unix;
maintainers = [ stdenv.lib.maintainers.romildo ];
};
}

View File

@ -1,15 +1,44 @@
{
mkDerivation, lib, copyPathsToStore,
mkDerivation,
lib,
copyPathsToStore,
extra-cmake-modules,
plymouth
plymouth,
nixos-icons,
imagemagick,
netpbm,
perl,
# these will typically need to be set via an override
# in a NixOS context
nixosBranding ? false,
nixosName ? "NixOS",
nixosVersion ? "",
topColor ? "black",
bottomColor ? "black"
}:
let
logoName = "nixos";
in
mkDerivation {
name = "breeze-plymouth";
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ plymouth ];
buildInputs = [ plymouth ] ++ lib.optionals nixosBranding [ imagemagick netpbm perl ];
patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
cmakeFlags = lib.optionals nixosBranding [
"-DDISTRO_NAME=${nixosName}"
"-DDISTRO_VERSION=${nixosVersion}"
"-DDISTRO_LOGO=${logoName}"
"-DBACKGROUND_TOP_COLOR=${topColor}"
"-DBACKGROUND_BOTTOM_COLOR=${bottomColor}"
];
postPatch = ''
substituteInPlace cmake/FindPlymouth.cmake --subst-var out
'' + lib.optionalString nixosBranding ''
cp ${nixos-icons}/share/icons/hicolor/128x128/apps/nix-snowflake.png breeze/images/${logoName}.logo.png
# conversion for 16bit taken from the breeze-plymouth readme
convert ${nixos-icons}/share/icons/hicolor/128x128/apps/nix-snowflake.png -alpha Background -background "#000000" -fill "#000000" -flatten tmp.png
pngtopnm tmp.png | pnmquant 16 | pnmtopng > breeze/images/16bit/${logoName}.logo.png
'';
}

View File

@ -1,18 +1,35 @@
{ stdenv, fetchgit, flex, bison }:
{ stdenv, fetchgit, fetchpatch, flex, bison, pkgconfig, python2, swig, which }:
stdenv.mkDerivation rec {
name = "dtc-${version}";
version = "1.4.4";
version = "1.4.5";
src = fetchgit {
url = "git://git.kernel.org/pub/scm/utils/dtc/dtc.git";
rev = "refs/tags/v${version}";
sha256 = "1pxp7700b3za7q4fnsnxx6i8v66rnr8p6lyi7jf684y1hq5ynlnf";
sha256 = "10y5pbkcj5gkijcgnlvrh6q2prpnvsgihb9asz3zfp66mcjwzsy3";
};
nativeBuildInputs = [ flex bison ];
nativeBuildInputs = [ flex bison pkgconfig swig which ];
buildInputs = [ python2 ];
installFlags = [ "INSTALL=install" "PREFIX=$(out)" ];
patches = [
# Fix 32-bit build
(fetchpatch {
url = "https://git.kernel.org/pub/scm/utils/dtc/dtc.git/patch/?id=497432fd2131967f349e69dc5d259072151cc4b4";
sha256 = "1hrvhvz0qkck53mhacrc4rxjrvp34d8dkw7xb5lr4gpg32grvkpq";
})
# Fix setup.py
(fetchpatch {
url = "https://github.com/dezgeg/dtc/commit/d94a745148ba5c9198143ccc0f7d877fe498ab73.patch";
sha256 = "0hpryx04j1swvmjisrfhvss08zzz4nxz9iv72lp4jdgg6vg0argl";
})
];
postPatch = ''
patchShebangs pylibfdt/
'';
installFlags = [ "INSTALL=install" "PREFIX=$(out)" "SETUP_PREFIX=$(out)" ];
meta = with stdenv.lib; {
description = "Device Tree Compiler";

View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "catch-${version}";
version = "1.9.6";
version = "1.11.0";
src = fetchFromGitHub {
owner = "philsquared";
owner = "catchorg";
repo = "Catch";
rev = "v${version}";
sha256 = "0nqnyw6haa2771748ycag4hhjb8ni32cv4f7w3h0pji212542xan";
sha256 = "0v9yw7ydvhydp78hh7cmaif4h73k5qxqpm1g7xn8i882i3s84s2s";
};
nativeBuildInputs = [ cmake ];

View File

@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
-DCMAKE_BUILD_TYPE=Release
'';
installPhase = ''
installPhase = ''
mkdir -p $out
function fixRunPath {
@ -56,6 +56,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ cmake jsoncpp argtable curl libmicrohttpd doxygen catch ];
enableParallelBuilding = true;
meta = with stdenv.lib; {
description = "C++ framework for json-rpc (json remote procedure call)";
homepage = https://github.com/cinemast/libjson-rpc-cpp;

View File

@ -0,0 +1,26 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "libxl";
version = "3.8.1";
src = fetchurl {
url = "http://www.libxl.com/download/${name}-lin-${version}.tar.gz";
sha256 = "1zdbahhyhr70s8hygwp43j9z4zmglyrr782hkcm1078yvkr2f2fm";
};
phases = [ "unpackPhase" "installPhase" "fixupPhase" ];
installPhase = ''
mkdir $out
cp -rva include_c include_cpp license.txt $out/
cp -rva lib64 $out/lib
'';
meta = with stdenv.lib; {
description = "A lbrary for parsing excel files";
license = licenses.unfree;
platforms = platforms.linux;
maintainers = with maintainers; [ ];
};
}

View File

@ -1,15 +1,20 @@
{ stdenv, fetchurl }:
{ stdenv, fetchurl, python2 }:
stdenv.mkDerivation rec {
name = "fastjet-${version}";
version = "3.2.0";
version = "3.3.0";
src = fetchurl {
url = "http://fastjet.fr/repo/fastjet-${version}.tar.gz";
sha256 = "1qvmab7l4ps5xd1wvmblgpzyhkbs2gff41qgyg7r7b9nlgqjgacn";
sha256 = "03x75mmnlw2m0a7669k82rf9a7dgjwygf8wjbk8cdgnb82c5pnp9";
};
configureFlags = "--enable-allcxxplugins";
buildInputs = [ python2 ];
configureFlags = [
"--enable-allcxxplugins"
"--enable-pyext"
];
enableParallelBuilding = true;

View File

@ -0,0 +1,25 @@
{ lib, buildPythonPackage, isPyPy, isPy3k, fetchurl, gdb, libbfd }:
buildPythonPackage rec {
name = "pybfd-0.1.1";
disabled = isPyPy || isPy3k;
src = fetchurl {
url = "mirror://pypi/p/pybfd/${name}.tar.gz";
sha256 = "d99b32ad077e704ddddc0b488c83cae851c14919e5cbc51715d00464a1932df4";
};
preConfigure = ''
substituteInPlace setup.py \
--replace '"/usr/include"' '"${gdb}/include"' \
--replace '"/usr/lib"' '"${libbfd}/lib"'
'';
meta = {
homepage = https://github.com/Groundworkstech/pybfd;
description = "A Python interface to the GNU Binary File Descriptor (BFD) library";
license = lib.licenses.gpl2;
platforms = lib.platforms.linux;
};
}

View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "strace-${version}";
version = "4.19";
version = "4.20";
src = fetchurl {
url = "mirror://sourceforge/strace/${name}.tar.xz";
sha256 = "10bjh2mrkvx41fk60b2iqv5b5k4r7a3qdsx04iyg904jqb3fp4vw";
sha256 = "08y5b07vb8jc7ak5xc3x2kx1ly6xiwv1gnppcqjs81kks66i9wsv";
};
nativeBuildInputs = [ perl ];

View File

@ -3,17 +3,19 @@
stdenv.mkDerivation rec {
name = "${product}-${version}";
product = "uncrustify";
version = "0.64";
version = "0.66";
src = fetchFromGitHub {
owner = product;
repo = product;
rev = name;
sha256 = "0gvgv44aqrh7cmj4ji8dpbhp47cklvajlc3s9d9z24x96dhp2v97";
sha256 = "156y71yf2xxskvikbn6yjfv8xgnsrrjij08irv21z0n7nx35jgmm";
};
nativeBuildInputs = [ cmake ];
enableParallelBuilding = true;
meta = with stdenv.lib; {
description = "Source code beautifier for C, C++, C#, ObjectiveC, D, Java, Pawn and VALA";
homepage = http://uncrustify.sourceforge.net/;

View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, bc, dtc, python2
{ stdenv, fetchurl, fetchpatch, bc, dtc, python2
, hostPlatform
}:
@ -12,20 +12,37 @@ let
stdenv.mkDerivation (rec {
name = "uboot-${defconfig}-${version}";
version = "2017.03";
version = "2017.11";
src = fetchurl {
url = "ftp://ftp.denx.de/pub/u-boot/u-boot-${version}.tar.bz2";
sha256 = "0gqihplap05dlpwdb971wsqyv01nz2vabwq5g5649gr5jczsyjzm";
sha256 = "01bcsah5imy6m3fbjwhqywxg0pfk5fl8ks9ylb7kv3zmrb9qy0ba";
};
patches = [
(fetchpatch {
url = https://github.com/dezgeg/u-boot/commit/rpi-2017-11-patch1.patch;
sha256 = "067yq55vv1slv4xy346px7h329pi14abdn04chg6s1s6hmf6c1x9";
})
(fetchpatch {
url = https://github.com/dezgeg/u-boot/commit/rpi-2017-11-patch2.patch;
sha256 = "0bbw0q027xvzvdxxvpzjajg4rm30a8mb7z74b6ma9q0l7y7bi0c4";
})
(fetchpatch {
url = https://github.com/dezgeg/u-boot/commit/pythonpath-2017-11.patch;
sha256 = "162b2lglp307pzxsf9m7nnmzwxqd7xkwp5j85bm6bg1a38ngpl9v";
})
];
postPatch = ''
patchShebangs tools
'';
nativeBuildInputs = [ bc dtc python2 ];
hardeningDisable = [ "all" ];
postPatch = ''
patchShebangs tools
'';
makeFlags = [ "DTC=dtc" ];
configurePhase = ''
make ${defconfig}

View File

@ -42,6 +42,7 @@ let
adv_cmds = "163";
file_cmds = "264.1.1";
shell_cmds = "187";
system_cmds = "550.6";
};
"osx-10.11.5" = {
Libc = "1082.50.1"; # 10.11.6 still unreleased :/
@ -240,6 +241,7 @@ let
network_cmds = applePackage "network_cmds" "osx-10.11.6" "0lhi9wz84qr1r2ab3fb4nvmdg9gxn817n5ldg7zw9gnf3wwn42kw" {};
file_cmds = applePackage "file_cmds" "osx-10.11.6" "1zfxbmasps529pnfdjvc13p7ws2cfx8pidkplypkswyff0nff4wp" {};
shell_cmds = applePackage "shell_cmds" "osx-10.11.6" "0084k271v66h4jqp7q7rmjvv7w4mvhx3aq860qs8jbd30canm86n" {};
system_cmds = applePackage "system_cmds" "osx-10.11.6" "1h46j2c5v02pkv5d9fyv6cpgyg0lczvwicrx6r9s210cl03l77jl" {};
libsecurity_apple_csp = libsecPackage "libsecurity_apple_csp" "osx-10.7.5" "1ngyn1ik27n4x981px3kfd1z1n8zx7r5w812b6qfjpy5nw4h746w" {};
libsecurity_apple_cspdl = libsecPackage "libsecurity_apple_cspdl" "osx-10.7.5" "1svqa5fhw7p7njzf8bzg7zgc5776aqjhdbnlhpwmr5hmz5i0x8r7" {};

View File

@ -0,0 +1,37 @@
{ stdenv, appleDerivation, xcbuild }:
appleDerivation rec {
# xcbuild fails with:
# /nix/store/fc0rz62dh8vr648qi7hnqyik6zi5sqx8-xcbuild-wrapper/nix-support/setup-hook: line 1: 9083 Segmentation fault: 11 xcodebuild OTHER_CFLAGS="$NIX_CFLAGS_COMPILE" OTHER_CPLUSPLUSFLAGS="$NIX_CFLAGS_COMPILE" OTHER_LDFLAGS="$NIX_LDFLAGS" build
# buildInputs = [ xcbuild ];
# # temporary install phase until xcodebuild has "install" support
# installPhase = ''
# mkdir -p $out/bin/
# install system_cmds-*/Build/Products/Release/* $out/bin/
# for n in 1 5 8; do
# mkdir -p $out/share/man/man$n
# install */*.$n $out/share/man/man$n
# done
# '';
# For now we just build sysctl because that's all I need... Please open a
# PR if you need any other utils before we fix the xcodebuild.
buildPhase = "cc sysctl.tproj/sysctl.c -o sysctl";
installPhase =
''
mkdir -p $out/bin
install sysctl $out/bin
for n in 5 8; do
mkdir -p $out/share/man/man$n
install sysctl.tproj/*.$n $out/share/man/man$n
done
'';
meta = {
platforms = stdenv.lib.platforms.darwin;
maintainers = with stdenv.lib.maintainers; [ shlevy ];
};
}

View File

@ -1,11 +1,11 @@
{ stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
import ./generic.nix (args // rec {
version = "4.13.13";
version = "4.13.14";
extraMeta.branch = "4.13";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "0izyma1b9bh4hfp00ph91n91zqkbwjnkdifvr4h8ipmxm0y8ig0m";
sha256 = "10rjrh5yg6mdfg44xnyd5r4fc91c3b0hqf2yy7qzy7z1kr22lixs";
};
} // (args.argsOverride or {}))

View File

@ -1,11 +1,11 @@
{ stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
import ./generic.nix (args // rec {
version = "4.4.98";
version = "4.4.99";
extraMeta.branch = "4.4";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "1mvk6vw6fjqnl01bx78viydkalgj33v2ynz4gi4yk1d357l54yar";
sha256 = "0mkyipq1l0lh04shavanx61z75c5r66xh33x47pswvhr2j6mjqxf";
};
} // (args.argsOverride or {}))

View File

@ -1,11 +1,11 @@
{ stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
import ./generic.nix (args // rec {
version = "4.9.62";
version = "4.9.63";
extraMeta.branch = "4.9";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "0cpxhj40dxm0i9yg4hg5hwlhq4083l7i5jc3psfr6zcy5k7c5ph2";
sha256 = "18rfvzsxgjr9223r3lznbrj6fh533d68nizpcz556d7x6dpkij91";
};
} // (args.argsOverride or {}))

View File

@ -6,11 +6,11 @@ assert kernel != null -> stdenv.lib.versionAtLeast kernel.version "3.10";
let
name = "wireguard-${version}";
version = "0.0.20171101";
version = "0.0.20171111";
src = fetchurl {
url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz";
sha256 = "0983aivw7wc5qq8didh4bdbdxcmddbpganf0z1xnqmjyls168sq9";
sha256 = "0mqix3v4qqwwa7hcd0h5rcwhc7yvm9jcl8b3v1vc4sj0m637fd6r";
};
meta = with stdenv.lib; {

View File

@ -24,13 +24,13 @@ let
};
in pythonPackages.buildPythonApplication rec {
name = "matrix-synapse-${version}";
version = "0.24.1";
version = "0.25.1";
src = fetchFromGitHub {
owner = "matrix-org";
repo = "synapse";
rev = "v${version}";
sha256 = "08w8sawq0nj28dzi9wc4rsg9z2qv528djj4zbcs5c4yc3mylq1nq";
sha256 = "110558l147n1dqpylzrdzp8spj36nack88c5kknsxn69gr8yb7j2";
};
patches = [ ./matrix-synapse.patch ];

View File

@ -2,7 +2,7 @@
buildGoPackage rec {
name = "mattermost-${version}";
version = "4.4.0";
version = "4.4.1";
src = fetchFromGitHub {
owner = "mattermost";
@ -13,7 +13,7 @@ buildGoPackage rec {
webApp = fetchurl {
url = "https://releases.mattermost.com/${version}/mattermost-team-${version}-linux-amd64.tar.gz";
sha256 = "1ifxx17sm24c6sihg38lzpnb5x24m04bk25nn5hrw9iwc37lfzlp";
sha256 = "1gnzv9xkqawi36z7v9xsy1gk16x71qf0kn8r059qvyarjlyp7888";
};
goPackagePath = "github.com/mattermost/mattermost-server";
@ -38,7 +38,7 @@ buildGoPackage rec {
description = "Open-Source, self-hosted Slack-alternative";
homepage = https://www.mattermost.org;
license = with licenses; [ agpl3 asl20 ];
maintainers = with maintainers; [ fpletz ];
maintainers = with maintainers; [ fpletz ryantm ];
platforms = platforms.unix;
};
}

View File

@ -1,7 +1,7 @@
{ lib, buildGoPackage, fetchurl, fetchFromGitHub, phantomjs2 }:
buildGoPackage rec {
version = "4.6.1";
version = "4.6.2";
name = "grafana-v${version}";
goPackagePath = "github.com/grafana/grafana";
@ -9,12 +9,12 @@ buildGoPackage rec {
rev = "v${version}";
owner = "grafana";
repo = "grafana";
sha256 = "1l606dbx3rfbqbr30iirsc2lkzqa2kc6160g2sn0205mdz8b31zj";
sha256 = "0awf00n3rrxjyiza3mga496k1k9c4fkg6rxn9azdab1qvdkzh513";
};
srcStatic = fetchurl {
url = "https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-${version}.linux-x64.tar.gz";
sha256 = "04756ry3b8fyk91lzacsixha6l4q1g532krxz759d17sfrnbaz2q";
sha256 = "08svlg190h5nvv701lcl3a2iak2xdmslpdwjv2w5fcdfyp7bd6ld";
};
preBuild = "export GOPATH=$GOPATH:$NIX_BUILD_TOP/go/src/${goPackagePath}/Godeps/_workspace";

View File

@ -0,0 +1,29 @@
{ stdenv, fetchFromGitHub, zsh }:
# To make use of this derivation, use
# `programs.zsh.promptInit = "source ${pkgs.zsh-powerlevel9k}/share/zsh-powerlevel9k/powerlevel9k.zsh-theme";`
stdenv.mkDerivation rec {
name = "powerlevel9k-${version}";
version = "2017-11-10";
src = fetchFromGitHub {
owner = "bhilburn";
repo = "powerlevel9k";
rev = "87acc51acab3ed4fd33cda2386abed6f98c80720";
sha256 = "0v1dqg9hvycdkcvklg2njff97xwr8rah0nyldv4xm39r77f4yfvq";
};
installPhase= ''
install -D powerlevel9k.zsh-theme --target-directory=$out/share/zsh-powerlevel9k
install -D functions/* --target-directory=$out/share/zsh-powerlevel9k/functions
'';
meta = {
description = "A beautiful theme for zsh";
homepage = https://github.com/bhilburn/powerlevel9k;
license = stdenv.lib.licenses.mit;
platforms = stdenv.lib.platforms.unix;
maintainers = [ stdenv.lib.maintainers.pierrechevalier83 ];
};
}

View File

@ -3,7 +3,7 @@
stdenv.mkDerivation rec {
name = "bonnie++-1.97.3";
src = fetchurl {
url = "http://www.coker.com.au/bonnie++/experimental/${name}.tgz";
url = "https://fossies.org/linux/privat/${name}.tgz";
sha256 = "0vkl42rsrsy95fc1ykc6g8rsdbnpxayvdaihnnkly1fww1m3hyz2";
};

View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl }:
{ stdenv, fetchurl, autoreconfHook, bison, flex }:
stdenv.mkDerivation rec {
name = "filebench-${version}";
@ -6,9 +6,11 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://sourceforge/filebench/${name}.tar.gz";
sha256 = "0y06f9mp4xry6j1jamqprzn963l0krqayv14yv66pm51hdh53ld1";
sha256 = "13hmx67lsz367sn8lrvz1780mfczlbiz8v80gig9kpkpf009yksc";
};
nativeBuildInputs = [ autoreconfHook bison flex ];
meta = with stdenv.lib; {
description = "File system and storage benchmark that can generate both micro and macro workloads";
homepage = https://sourceforge.net/projects/filebench/;

View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl, ncurses, lessSecure ? false }:
stdenv.mkDerivation rec {
name = "less-520";
name = "less-529";
src = fetchurl {
url = "http://www.greenwoodsoftware.com/less/${name}.tar.gz";
sha256 = "12wh0j07971j53v7irfcv0vkb7wpi7f83jll4mwjy92wc27fm2bv";
sha256 = "02wspzv90cki8936m50qxk0vrribvwwqlva21nyvfx41qga2r96v";
};
configureFlags = [ "--sysconfdir=/etc" ] # Look for sysless in /etc.

View File

@ -1,13 +1,15 @@
{ stdenv, fetchurl }:
{ stdenv, fetchurl, openssl }:
stdenv.mkDerivation rec {
name = "iperf-3.2";
name = "iperf-3.3";
src = fetchurl {
url = "http://downloads.es.net/pub/iperf/${name}.tar.gz";
sha256 = "07cwrl9q5pmfjlh6ilpk7hm25lpkcaf917zhpmfq918lhrpv61zj";
sha256 = "1n442bjkm1dvzmcj8z1i99yrmba489yz3f5v27ybymhh4mqn4nbg";
};
buildInputs = [ openssl ];
postInstall = ''
ln -s iperf3 $out/bin/iperf
'';

View File

@ -1,8 +1,8 @@
{ stdenv, fetchFromGitHub, libaio, python, zlib }:
let
version = "3.1";
sha256 = "09rsfhzpi089cwpg07c8kgvs4d2n77a7mn1vj8iwjjzacs3fbllx";
version = "3.2";
sha256 = "1sp83lxhrwg4627bma3pkcfg8yd1w3r6p02rdldv083962ljkinm";
in
stdenv.mkDerivation rec {

View File

@ -3175,6 +3175,8 @@ with pkgs;
libxcomp = callPackage ../development/libraries/libxcomp { };
libxl = callPackage ../development/libraries/libxl {};
libx86emu = callPackage ../development/libraries/libx86emu { };
libzmf = callPackage ../development/libraries/libzmf {};
@ -5318,6 +5320,8 @@ with pkgs;
zsh-autosuggestions = callPackage ../shells/zsh-autosuggestions { };
zsh-powerlevel9k = callPackage ../shells/zsh-powerlevel9k { };
zstd = callPackage ../tools/compression/zstd { };
zstdmt = callPackage ../tools/compression/zstdmt { };
@ -6489,6 +6493,8 @@ with pkgs;
gtk2 = gtk2-x11;
};
lxtask = callPackage ../desktops/lxde/core/lxtask { };
kona = callPackage ../development/interpreters/kona {};
lolcode = callPackage ../development/interpreters/lolcode { };
@ -6634,6 +6640,7 @@ with pkgs;
# Python interpreters. All standard library modules are included except for tkinter, which is
# available as `pythonPackages.tkinter` and can be used as any other Python package.
# When switching these sets, please update docs at ../../doc/languages-frameworks/python.md
python = python2;
python2 = python27;
python3 = python36;

View File

@ -9172,10 +9172,10 @@ let self = _self // overrides; _self = with self; {
};
Moo = buildPerlPackage rec {
name = "Moo-2.003000";
name = "Moo-2.003003";
src = fetchurl {
url = "mirror://cpan/authors/id/H/HA/HAARG/${name}.tar.gz";
sha256 = "ccab84b1377e52922026b24b2ed51d83c439757f2b0783fffa73ac22b4fb3dd2";
sha256 = "6d858dcb376186533cfb63e45963d0464ac12832cc06fc6ed8ae796bdd8d5504";
};
buildInputs = [ TestFatal ];
propagatedBuildInputs = [ ClassMethodModifiers DevelGlobalDestruction ModuleRuntime RoleTiny SubQuote ];

View File

@ -73,6 +73,21 @@ let
];
};
php_excel = assert isPhp7; buildPecl rec {
name = "php_excel";
version = "1.0.2";
phpVersion = "php7";
buildInputs = [ pkgs.libxl ];
src = pkgs.fetchurl {
url = "https://github.com/iliaal/${name}/releases/download/Excel-1.0.2-PHP7/excel-${version}-${phpVersion}.tgz";
sha256 = "0dpvih9gpiyh1ml22zi7hi6kslkilzby00z1p8x248idylldzs2n";
};
configureFlags = [ "--with-excel" "--with-libxl-incdir=${pkgs.libxl}/include_c" "--with-libxl-libdir=${pkgs.libxl}/lib" ];
};
igbinary = buildPecl {
name = "igbinary-2.0.4";

View File

@ -15206,29 +15206,7 @@ in {
};
});
pybfd = buildPythonPackage rec {
name = "pybfd-0.1.1";
disabled = isPyPy || isPy3k;
src = pkgs.fetchurl {
url = "mirror://pypi/p/pybfd/${name}.tar.gz";
sha256 = "d99b32ad077e704ddddc0b488c83cae851c14919e5cbc51715d00464a1932df4";
};
preConfigure = ''
substituteInPlace setup.py \
--replace '"/usr/include"' '"${pkgs.gdb}/include"' \
--replace '"/usr/lib"' '"${pkgs.libbfd}/lib"'
'';
meta = {
homepage = https://github.com/Groundworkstech/pybfd;
description = "A Python interface to the GNU Binary File Descriptor (BFD) library";
license = licenses.gpl2;
platforms = platforms.linux;
};
};
pybfd = callPackage ../development/python-modules/pybfd { };
pyblock = stdenv.mkDerivation rec {
name = "pyblock-${version}";