diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index cce31b6a537..e60280f30eb 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -3115,6 +3115,11 @@
github = "olynch";
name = "Owen Lynch";
};
+ OPNA2608 = {
+ email = "christoph.neidahl@gmail.com";
+ github = "OPNA2608";
+ name = "Christoph Neidahl";
+ };
orbekk = {
email = "kjetil.orbekk@gmail.com";
github = "orbekk";
diff --git a/nixos/modules/config/pulseaudio.nix b/nixos/modules/config/pulseaudio.nix
index e16a021ec20..d4aa5950629 100644
--- a/nixos/modules/config/pulseaudio.nix
+++ b/nixos/modules/config/pulseaudio.nix
@@ -154,6 +154,18 @@ in {
'';
};
+ extraModules = mkOption {
+ type = types.listOf types.package;
+ default = [];
+ example = literalExample "[ pkgs.pulseaudio-modules-bt ]";
+ description = ''
+ Extra pulseaudio modules to use. This is intended for out-of-tree
+ pulseaudio modules like extra bluetooth codecs.
+
+ Extra modules take precedence over built-in pulseaudio modules.
+ '';
+ };
+
daemon = {
logLevel = mkOption {
type = types.str;
@@ -236,6 +248,18 @@ in {
systemd.packages = [ overriddenPackage ];
})
+ (mkIf (cfg.extraModules != []) {
+ hardware.pulseaudio.daemon.config.dl-search-path = let
+ overriddenModules = builtins.map
+ (drv: drv.override { pulseaudio = overriddenPackage; })
+ cfg.extraModules;
+ modulePaths = builtins.map
+ (drv: "${drv}/lib/pulse-${overriddenPackage.version}/modules")
+ # User-provided extra modules take precedence
+ (overriddenModules ++ [ overriddenPackage ]);
+ in lib.concatStringsSep ":" modulePaths;
+ })
+
(mkIf hasZeroconf {
services.avahi.enable = true;
})
diff --git a/nixos/modules/hardware/video/nvidia.nix b/nixos/modules/hardware/video/nvidia.nix
index 6944d1a4f76..f8524ab99e8 100644
--- a/nixos/modules/hardware/video/nvidia.nix
+++ b/nixos/modules/hardware/video/nvidia.nix
@@ -1,6 +1,6 @@
# This module provides the proprietary NVIDIA X11 / OpenGL drivers.
-{ config, lib, pkgs, pkgs_i686, ... }:
+{ stdenv, config, lib, pkgs, pkgs_i686, ... }:
with lib;
@@ -23,7 +23,11 @@ let
else null;
nvidia_x11 = nvidiaForKernel config.boot.kernelPackages;
- nvidia_libs32 = (nvidiaForKernel pkgs_i686.linuxPackages).override { libsOnly = true; kernel = null; };
+ nvidia_libs32 =
+ if versionOlder nvidia_x11.version "391" then
+ ((nvidiaForKernel pkgs_i686.linuxPackages).override { libsOnly = true; kernel = null; }).out
+ else
+ (nvidiaForKernel config.boot.kernelPackages).lib32;
enabled = nvidia_x11 != null;
@@ -98,7 +102,7 @@ in
assertions = [
{
assertion = config.services.xserver.displayManager.gdm.wayland;
- message = "NVidia drivers don't support wayland";
+ message = "NVIDIA drivers don't support wayland";
}
{
assertion = !optimusCfg.enable ||
@@ -161,7 +165,7 @@ in
};
hardware.opengl.package = nvidia_x11.out;
- hardware.opengl.package32 = nvidia_libs32.out;
+ hardware.opengl.package32 = nvidia_libs32;
environment.systemPackages = [ nvidia_x11.bin nvidia_x11.settings ]
++ lib.filter (p: p != null) [ nvidia_x11.persistenced ];
diff --git a/nixos/modules/services/hardware/lirc.nix b/nixos/modules/services/hardware/lirc.nix
index a66a7fbf495..5635d6f0971 100644
--- a/nixos/modules/services/hardware/lirc.nix
+++ b/nixos/modules/services/hardware/lirc.nix
@@ -65,6 +65,10 @@ in {
serviceConfig = {
RuntimeDirectory = "lirc";
+
+ # socket lives in runtime directory; we have to keep is available
+ RuntimeDirectoryPreserve = true;
+
ExecStart = ''
${pkgs.lirc}/bin/lircd --nodaemon \
${escapeShellArgs cfg.extraArguments} \
diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix
index 33249aa3e55..d43733484ff 100644
--- a/nixos/modules/services/mail/postfix.nix
+++ b/nixos/modules/services/mail/postfix.nix
@@ -602,7 +602,7 @@ in
target = "postfix";
};
- # This makes comfortable for root to run 'postqueue' for example.
+ # This makes it comfortable to run 'postqueue/postdrop' for example.
systemPackages = [ pkgs.postfix ];
};
@@ -616,6 +616,22 @@ in
setgid = true;
};
+ security.wrappers.postqueue = {
+ program = "postqueue";
+ source = "${pkgs.postfix}/bin/postqueue";
+ group = setgidGroup;
+ setuid = false;
+ setgid = true;
+ };
+
+ security.wrappers.postdrop = {
+ program = "postdrop";
+ source = "${pkgs.postfix}/bin/postdrop";
+ group = setgidGroup;
+ setuid = false;
+ setgid = true;
+ };
+
users.users = optional (user == "postfix")
{ name = "postfix";
description = "Postfix mail server user";
diff --git a/nixos/modules/services/misc/weechat.nix b/nixos/modules/services/misc/weechat.nix
index 1fcfb440485..c6ff540ea12 100644
--- a/nixos/modules/services/misc/weechat.nix
+++ b/nixos/modules/services/misc/weechat.nix
@@ -46,10 +46,12 @@ in
Group = "weechat";
RemainAfterExit = "yes";
};
- script = "exec ${pkgs.screen}/bin/screen -Dm -S ${cfg.sessionName} ${cfg.binary}";
+ script = "exec ${config.security.wrapperDir}/screen -Dm -S ${cfg.sessionName} ${cfg.binary}";
wantedBy = [ "multi-user.target" ];
wants = [ "network.target" ];
};
+
+ security.wrappers.screen.source = "${pkgs.screen}/bin/screen";
};
meta.doc = ./weechat.xml;
diff --git a/nixos/modules/services/misc/weechat.xml b/nixos/modules/services/misc/weechat.xml
index 9c9ee0448c9..b7f755bbc5c 100644
--- a/nixos/modules/services/misc/weechat.xml
+++ b/nixos/modules/services/misc/weechat.xml
@@ -54,7 +54,7 @@
Now, the session can be re-attached like this:
-screen -r weechat-screen
+screen -x weechat/weechat-screen
diff --git a/nixos/modules/services/networking/hostapd.nix b/nixos/modules/services/networking/hostapd.nix
index 3af0441a89d..9f74e496329 100644
--- a/nixos/modules/services/networking/hostapd.nix
+++ b/nixos/modules/services/networking/hostapd.nix
@@ -157,9 +157,9 @@ in
{ description = "hostapd wireless AP";
path = [ pkgs.hostapd ];
- wantedBy = [ "network.target" ];
-
- after = [ "${cfg.interface}-cfg.service" "nat.service" "bind.service" "dhcpd.service" "sys-subsystem-net-devices-${cfg.interface}.device" ];
+ after = [ "sys-subsystem-net-devices-${cfg.interface}.device" ];
+ bindsTo = [ "sys-subsystem-net-devices-${cfg.interface}.device" ];
+ requiredBy = [ "network-link-${cfg.interface}.service" ];
serviceConfig =
{ ExecStart = "${pkgs.hostapd}/bin/hostapd ${configFile}";
diff --git a/pkgs/applications/altcoins/monero-gui/default.nix b/pkgs/applications/altcoins/monero-gui/default.nix
index 49b8db51bcc..46e317a3b12 100644
--- a/pkgs/applications/altcoins/monero-gui/default.nix
+++ b/pkgs/applications/altcoins/monero-gui/default.nix
@@ -5,20 +5,20 @@
, qtlocation, qtquickcontrols2, qtwebchannel
, qtwebengine, qtx11extras, qtxmlpatterns
, monero, unbound, readline, boost, libunwind
-, pcsclite, zeromq, cppzmq, pkgconfig
+, libsodium, pcsclite, zeromq, cppzmq, pkgconfig
}:
with stdenv.lib;
stdenv.mkDerivation rec {
name = "monero-gui-${version}";
- version = "0.12.3.0";
+ version = "0.13.0.3";
src = fetchFromGitHub {
owner = "monero-project";
repo = "monero-gui";
rev = "v${version}";
- sha256 = "1ry0455cgirkc6n46qnlv5p49axjllil78xmx6469nbp3a2r3z7i";
+ sha256 = "1rvxwz7p1yw9c817n07m60xvmv2p97s82sfzwkg2x880fpxb0gj9";
};
nativeBuildInputs = [ qmake pkgconfig ];
@@ -28,8 +28,8 @@ stdenv.mkDerivation rec {
qtdeclarative qtlocation qtquickcontrols2
qtwebchannel qtwebengine qtx11extras
qtxmlpatterns monero unbound readline
- boost libunwind pcsclite zeromq cppzmq
- makeWrapper
+ boost libunwind libsodium pcsclite zeromq
+ cppzmq makeWrapper
];
patches = [
diff --git a/pkgs/applications/altcoins/monero/default.nix b/pkgs/applications/altcoins/monero/default.nix
index a4a884707a9..e344f4d94ba 100644
--- a/pkgs/applications/altcoins/monero/default.nix
+++ b/pkgs/applications/altcoins/monero/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchgit
, cmake, pkgconfig, git
, boost, miniupnpc, openssl, unbound, cppzmq
-, zeromq, pcsclite, readline
+, zeromq, pcsclite, readline, libsodium
, CoreData, IOKit, PCSC
}:
@@ -11,12 +11,12 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "monero-${version}";
- version = "0.12.3.0";
+ version = "0.13.0.3";
src = fetchgit {
url = "https://github.com/monero-project/monero.git";
rev = "v${version}";
- sha256 = "1609k1qn9xx37a92ai36rajds9cmdjlkqyka95hks5xjr3l5ca8i";
+ sha256 = "03qx8y74zxnmabdi5r3a274pp8zvm3xhkdwi1xf5sb40vf4sfmwb";
};
nativeBuildInputs = [ cmake pkgconfig git ];
@@ -24,6 +24,7 @@ stdenv.mkDerivation rec {
buildInputs = [
boost miniupnpc openssl unbound
cppzmq zeromq pcsclite readline
+ libsodium
] ++ optionals stdenv.isDarwin [ IOKit CoreData PCSC ];
cmakeFlags = [
diff --git a/pkgs/applications/audio/bs1770gain/default.nix b/pkgs/applications/audio/bs1770gain/default.nix
index 2401a610156..edf7a313ff5 100644
--- a/pkgs/applications/audio/bs1770gain/default.nix
+++ b/pkgs/applications/audio/bs1770gain/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "bs1770gain-${version}";
- version = "0.4.12";
+ version = "0.5.0";
src = fetchurl {
url = "mirror://sourceforge/bs1770gain/${name}.tar.gz";
- sha256 = "0n9skdap1vnl6w52fx0gsrjlk7w3xgdwi62ycyf96h29rx059z6a";
+ sha256 = "0vd7320k7s2zcn2vganclxbr1vav18ghld27rcwskvcc3dm8prii";
};
buildInputs = [ ffmpeg sox ];
diff --git a/pkgs/applications/audio/clementine/default.nix b/pkgs/applications/audio/clementine/default.nix
index 611828753e4..a28125d24d4 100644
--- a/pkgs/applications/audio/clementine/default.nix
+++ b/pkgs/applications/audio/clementine/default.nix
@@ -69,7 +69,8 @@ let
name = "clementine-free-${version}";
inherit src patches nativeBuildInputs postPatch;
- buildInputs = buildInputs ++ [ makeWrapper ];
+ # gst_plugins needed for setup-hooks
+ buildInputs = buildInputs ++ [ makeWrapper gst_plugins ];
cmakeFlags = [ "-DUSE_SYSTEM_PROJECTM=ON" ];
@@ -101,7 +102,7 @@ let
./clementine-spotify-blob.patch
];
- buildInputs = buildInputs ++ [ libspotify makeWrapper gst_plugins ];
+ buildInputs = buildInputs ++ [ libspotify makeWrapper ];
# Only build and install the Spotify blob
preBuild = ''
cd ext/clementine-spotifyblob
diff --git a/pkgs/applications/audio/pulseaudio-modules-bt/default.nix b/pkgs/applications/audio/pulseaudio-modules-bt/default.nix
index e3d07fcc245..b377db65c0c 100644
--- a/pkgs/applications/audio/pulseaudio-modules-bt/default.nix
+++ b/pkgs/applications/audio/pulseaudio-modules-bt/default.nix
@@ -1,14 +1,16 @@
{ stdenv
, runCommand
, fetchFromGitHub
-, libpulseaudio
, pulseaudio
, pkgconfig
+, ffmpeg_4
+, patchelf
, libtool
, cmake
, bluez
, dbus
, sbc
+, lib
}:
let
@@ -20,37 +22,52 @@ let
in stdenv.mkDerivation rec {
name = "pulseaudio-modules-bt-${version}";
- version = "unstable-2018-09-11";
+ version = "unstable-2018-10-16";
src = fetchFromGitHub {
owner = "EHfive";
repo = "pulseaudio-modules-bt";
- rev = "9c6ad75382f3855916ad2feaa6b40e37356d80cc";
- sha256 = "1iz4m3y6arsvwcyvqc429w252dl3apnhvl1zhyvfxlbg00d2ii0h";
+ rev = "552c2b48c0cc7dd44d0746b261f7c7d5559e8e30";
+ sha256 = "052jb1hjx1in7bafx4zpn78s7r6f2y7djriwi36dzqy9wmalmyjy";
fetchSubmodules = true;
};
+ patches = [
+ ./fix-install-path.patch
+ ];
+
nativeBuildInputs = [
pkgconfig
+ patchelf
cmake
];
buildInputs = [
- libpulseaudio
pulseaudio
+ ffmpeg_4
libtool
bluez
dbus
sbc
];
- NIX_CFLAGS_COMPILE = [
- "-L${pulseaudio}/lib/pulseaudio"
- ];
-
- prePatch = ''
+ postPatch = ''
+ # Upstream bundles pulseaudio as a submodule
rm -r pa
ln -s ${pulseSources} pa
+
+ # Pulseaudio version is detected with a -rebootstrapped suffix which build system assumptions
+ substituteInPlace config.h.in --replace PulseAudio_VERSION ${pulseaudio.version}
+ substituteInPlace CMakeLists.txt --replace '${"\${PulseAudio_VERSION}"}' ${pulseaudio.version}
+ '';
+
+ postFixup = ''
+ for so in $out/lib/pulse-${pulseaudio.version}/modules/*.so; do
+ orig_rpath=$(patchelf --print-rpath "$so")
+ patchelf \
+ --set-rpath "${lib.getLib ffmpeg_4}/lib:$out/lib/pulse-${pulseaudio.version}/modules:$orig_rpath" \
+ "$so"
+ done
'';
meta = with stdenv.lib; {
diff --git a/pkgs/applications/audio/pulseaudio-modules-bt/fix-install-path.patch b/pkgs/applications/audio/pulseaudio-modules-bt/fix-install-path.patch
new file mode 100644
index 00000000000..2b4ff86ab71
--- /dev/null
+++ b/pkgs/applications/audio/pulseaudio-modules-bt/fix-install-path.patch
@@ -0,0 +1,11 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 0f5baa0..1f35cce 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -122,5 +121,4 @@ INSTALL(TARGETS
+ module-bluez5-device
+ module-bluetooth-discover
+ module-bluetooth-policy
+- LIBRARY DESTINATION ${PulseAudio_modlibexecdir})
+-
++ LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/pulse-${PulseAudio_VERSION}/modules/)
diff --git a/pkgs/applications/misc/gpa/default.nix b/pkgs/applications/misc/gpa/default.nix
index 149092c70d3..a4889014412 100644
--- a/pkgs/applications/misc/gpa/default.nix
+++ b/pkgs/applications/misc/gpa/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, intltool, pkgconfig, gtk2, gpgme, libgpgerror, libassuan }:
stdenv.mkDerivation rec {
- name = "gpa-0.9.10";
+ name = "gpa-0.10.0";
src = fetchurl {
url = "mirror://gnupg/gpa/${name}.tar.bz2";
- sha256 = "09xphbi2456qynwqq5n0yh0zdmdi2ggrj3wk4hsyh5lrzlvcrff3";
+ sha256 = "1cbpc45f8qbdkd62p12s3q2rdq6fa5xdzwmcwd3xrj55bzkspnwm";
};
nativeBuildInputs = [ intltool pkgconfig ];
diff --git a/pkgs/applications/misc/pdfpc/default.nix b/pkgs/applications/misc/pdfpc/default.nix
index e61613a4b30..adfd9fa7eac 100644
--- a/pkgs/applications/misc/pdfpc/default.nix
+++ b/pkgs/applications/misc/pdfpc/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
name = "${product}-${version}";
product = "pdfpc";
- version = "4.1.2";
+ version = "4.2.1";
src = fetchFromGitHub {
repo = "pdfpc";
owner = "pdfpc";
rev = "v${version}";
- sha256 = "01c2bswvxqk4biidpfj3hzf0kdk69i56ibk2wfi8v50qm105psli";
+ sha256 = "1rmsrpf5vlqhnyyrhq8apndny88ld2qvfjx6258653pqbimv7mx5";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/misc/xmr-stak/default.nix b/pkgs/applications/misc/xmr-stak/default.nix
index b98d10efdee..877a25fe662 100644
--- a/pkgs/applications/misc/xmr-stak/default.nix
+++ b/pkgs/applications/misc/xmr-stak/default.nix
@@ -12,13 +12,13 @@ in
stdenv'.mkDerivation rec {
name = "xmr-stak-${version}";
- version = "2.4.7";
+ version = "2.5.0";
src = fetchFromGitHub {
owner = "fireice-uk";
repo = "xmr-stak";
rev = "${version}";
- sha256 = "072gapchmd05ir5ygrvbgdhpjhm7pdjyl61n1ykxzvnvi81z6817";
+ sha256 = "1qls0rai9c1cszcqqqmhcdvcsmm23w1jxzlq2b035apkz7ywbxjl";
};
NIX_CFLAGS_COMPILE = "-O3";
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index acd3493fe7c..c18f77f8f99 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -14,7 +14,7 @@
, glib, gtk2, gtk3, dbus-glib
, libXScrnSaver, libXcursor, libXtst, libGLU_combined
, protobuf, speechd, libXdamage, cups
-, ffmpeg, libxslt, libxml2
+, ffmpeg, libxslt, libxml2, at-spi2-core
# optional dependencies
, libgcrypt ? null # gnomeSupport || cupsSupport
@@ -129,7 +129,8 @@ let
] ++ optional gnomeKeyringSupport libgnome-keyring3
++ optionals gnomeSupport [ gnome.GConf libgcrypt ]
++ optionals cupsSupport [ libgcrypt cups ]
- ++ optional pulseSupport libpulseaudio;
+ ++ optional pulseSupport libpulseaudio
+ ++ optional (versionAtLeast version "71") at-spi2-core;
patches = [
# As major versions are added, you can trawl the gentoo and arch repos at
@@ -232,7 +233,6 @@ let
is_clang = false;
clang_use_chrome_plugins = false;
remove_webcore_debug_symbols = true;
- use_gtk3 = true;
enable_swiftshader = false;
fieldtrial_testing_like_official_build = true;
@@ -243,6 +243,8 @@ let
google_api_key = "AIzaSyDGi15Zwl11UNe6Y-5XW_upsfyw31qwZPI";
google_default_client_id = "404761575300.apps.googleusercontent.com";
google_default_client_secret = "9rIFQjfnkykEmqb6FfjJQD1D";
+ } // optionalAttrs (versionRange "60" "70") {
+ use_gtk3 = true;
} // optionalAttrs proprietaryCodecs {
# enable support for the H.264 codec
proprietary_codecs = true;
diff --git a/pkgs/applications/networking/instant-messengers/rambox/bare.nix b/pkgs/applications/networking/instant-messengers/rambox/bare.nix
index 2a80349c4e6..e08fdad50fb 100644
--- a/pkgs/applications/networking/instant-messengers/rambox/bare.nix
+++ b/pkgs/applications/networking/instant-messengers/rambox/bare.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
inherit src;
nodejs = nodejs-8_x;
- sha256 = "0mg1ilz65qyxgh5zg1f8fhx7ygz10w8ifamflpwbk8mrvqpkjlvr";
+ sha256 = "0hbw47653wh159c34f0rlj3p7xy0lvsyp0wh2hl35kv3fnsfbbm0";
};
patches = [ ./isDev.patch ];
diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
index 03a99aea400..1e8080fd9c9 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
@@ -13,6 +13,8 @@ let
in {
stable = mkTelegram stableVersion;
preview = mkTelegram (stableVersion // {
+ version = "1.4.4";
+ sha256Hash = "1m1j485r3vzpglzfn8l4cqskysvkx8l3pqaw3fgp66jfajbxynf0";
stable = false;
});
}
diff --git a/pkgs/applications/science/math/gmsh/default.nix b/pkgs/applications/science/math/gmsh/default.nix
index 7973fa8b3ef..525fc5f1dc2 100644
--- a/pkgs/applications/science/math/gmsh/default.nix
+++ b/pkgs/applications/science/math/gmsh/default.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchurl, cmake, blas, liblapack, gfortran, gmm, fltk, libjpeg
, zlib, libGLU_combined, libGLU, xorg }:
-let version = "4.0.1"; in
+let version = "4.0.2"; in
stdenv.mkDerivation {
name = "gmsh-${version}";
src = fetchurl {
url = "http://gmsh.info/src/gmsh-${version}-source.tgz";
- sha256 = "0s9pay32kci03qx3dlpf9h2n3hihf8zpidjnn8p9vmhnn0vav7rz";
+ sha256 = "03aw3sbz4x998rk29az7mgm0mrdb6614aqnppg81p5jkh5097jgk";
};
# The original CMakeLists tries to use some version of the Lapack lib
diff --git a/pkgs/applications/version-management/git-and-tools/git-recent/default.nix b/pkgs/applications/version-management/git-and-tools/git-recent/default.nix
index 82bcbf74a9e..c52a78ff007 100644
--- a/pkgs/applications/version-management/git-and-tools/git-recent/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-recent/default.nix
@@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
name = "git-recent-${version}";
- version = "1.0.4";
+ version = "1.1.0";
src = fetchFromGitHub {
owner = "paulirish";
repo = "git-recent";
rev = "v${version}";
- sha256 = "0dbnm5b2v04fy0jgzphm3xvz9scx0n4p10fw8wjd0cy56308h79k";
+ sha256 = "06r1jzmzdv3d4vxdh5qyf5g5rgavxfmh2rpbs7a7byg3k7d77hpn";
};
buildInputs = [ makeWrapper ];
diff --git a/pkgs/applications/version-management/git-review/default.nix b/pkgs/applications/version-management/git-review/default.nix
index 7b81c28c375..101770da888 100644
--- a/pkgs/applications/version-management/git-review/default.nix
+++ b/pkgs/applications/version-management/git-review/default.nix
@@ -2,7 +2,7 @@
pythonPackages.buildPythonApplication rec {
name = "git-review-${version}";
- version = "1.26.0";
+ version = "1.27.0";
# Manually set version because prb wants to get it from the git
# upstream repository (and we are installing from tarball instead)
@@ -14,7 +14,7 @@ pythonPackages.buildPythonApplication rec {
src = fetchurl rec {
url = "https://github.com/openstack-infra/git-review/archive/${version}.tar.gz";
- sha256 = "106nk6p7byf5vi68b2fvmwma5nk7qrv39nfj9p1bfxmb1gjdixhc";
+ sha256 = "0smdkps9avnj58izyfc5m0amq8nafgs9iqlyaf7ncrlvypia1f3q";
};
propagatedBuildInputs = with pythonPackages; [ pbr requests setuptools ];
diff --git a/pkgs/build-support/fetchmavenartifact/default.nix b/pkgs/build-support/fetchmavenartifact/default.nix
index a9c53249ae8..dc48a312fb3 100644
--- a/pkgs/build-support/fetchmavenartifact/default.nix
+++ b/pkgs/build-support/fetchmavenartifact/default.nix
@@ -67,7 +67,7 @@ in
# packages packages that mention this derivation in their buildInputs.
installPhase = ''
mkdir -p $out/share/java
- ln -s ${jar} $out/share/java
+ ln -s ${jar} $out/share/java/${artifactId}-${version}.jar
'';
# We also add a `jar` attribute that can be used to easily obtain the path
# to the downloaded jar file.
diff --git a/pkgs/desktops/deepin/deepin-desktop-base/default.nix b/pkgs/desktops/deepin/deepin-desktop-base/default.nix
new file mode 100644
index 00000000000..5b96e335c67
--- /dev/null
+++ b/pkgs/desktops/deepin/deepin-desktop-base/default.nix
@@ -0,0 +1,45 @@
+{ stdenv, fetchFromGitHub, deepin-wallpapers }:
+
+stdenv.mkDerivation rec {
+ name = "${pname}-${version}";
+ pname = "deepin-desktop-base";
+ version = "2018.7.23";
+
+ src = fetchFromGitHub {
+ owner = "linuxdeepin";
+ repo = pname;
+ rev = version;
+ sha256 = "1n1bjkvhgq138jcg3zkwg55r41056x91mh191mirlpvpic574ydc";
+ };
+
+ buildInputs = [ deepin-wallpapers ];
+
+ postPatch = ''
+ sed -i Makefile -e "s:/usr:$out:" -e "s:/etc:$out/etc:"
+ '';
+
+ postInstall = ''
+ # Remove Deepin distro's lsb-release
+ rm $out/etc/lsb-release
+
+ # Don't override systemd timeouts
+ rm -r $out/etc/systemd
+
+ # Remove apt-specific templates
+ rm -r $out/share/python-apt
+
+ # Remove empty backgrounds directory
+ rm -r $out/share/backgrounds
+
+ # Make a symlink for deepin-version
+ ln -s ../lib/deepin/desktop-version $out/etc/deepin-version
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Base assets and definitions for Deepin Desktop Environment";
+ homepage = https://github.com/linuxdeepin/deepin-desktop-base;
+ license = licenses.gpl3;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ romildo ];
+ };
+}
diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix
index 291aa8c11be..4e6530c2d18 100644
--- a/pkgs/desktops/deepin/default.nix
+++ b/pkgs/desktops/deepin/default.nix
@@ -7,6 +7,7 @@ let
dde-api = callPackage ./dde-api { };
dde-calendar = callPackage ./dde-calendar { };
dde-qt-dbus-factory = callPackage ./dde-qt-dbus-factory { };
+ deepin-desktop-base = callPackage ./deepin-desktop-base { };
deepin-desktop-schemas = callPackage ./deepin-desktop-schemas { };
deepin-gettext-tools = callPackage ./deepin-gettext-tools { };
deepin-gtk-theme = callPackage ./deepin-gtk-theme { };
diff --git a/pkgs/development/compilers/nextpnr/default.nix b/pkgs/development/compilers/nextpnr/default.nix
index 5ec3b5f59d8..d6dd0601e62 100644
--- a/pkgs/development/compilers/nextpnr/default.nix
+++ b/pkgs/development/compilers/nextpnr/default.nix
@@ -7,13 +7,13 @@ let
in
stdenv.mkDerivation rec {
name = "nextpnr-${version}";
- version = "2018.08.09";
+ version = "2018.10.17";
src = fetchFromGitHub {
owner = "yosyshq";
repo = "nextpnr";
- rev = "2e02f2d6166c75b1fcec73d268e97e407071a372";
- sha256 = "1f98mkailn75gz5fvhjhnyr0gwa0r8mm3f2sbvgl0yvys8qi08wr";
+ rev = "529a595157a2eef24f8529b0de0c504a40ed503b";
+ sha256 = "06yp89rpvb2s4zc1qkbcp76kqwkk9s8j2ckblqw547dy5ah2cl7h";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix b/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix
index 55faf277b15..48304b6af26 100644
--- a/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix
+++ b/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix
@@ -1,11 +1,11 @@
import ./jdk-linux-base.nix {
productVersion = "8";
- patchVersion = "181";
+ patchVersion = "191";
downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html;
- sha256.i686-linux = "0159q5wrlp24v8rc6m1cr3kq8nddpdjdprj3vsmf8z7vpwx052np";
- sha256.x86_64-linux = "1lwiz44vlxn4hc5b43r9arad15lpjfbr7l6h5vafpgxzjmq5ci8q";
- sha256.armv7l-linux = "0zpgb1hqf9zazic66c7nim036ac6ld3dhnsanx4ijlrl7kd3fbn7";
- sha256.aarch64-linux = "191r926501cm6mz8p93ljdfxi0dgzw7ljjsrzsbmmxn4k0q2j0ad";
+ sha256.i686-linux = "1dmnv3x28l0rdi92gpmcp38gpy3lf4pl441bijvjhi7j97kk60v4";
+ sha256.x86_64-linux = "0r8dvb0hahfybvf9wiv7904rn22n93bfc9x6pgypynj0w83rbhjk";
+ sha256.armv7l-linux = "0wgdr9ainzc2yc5qp6ncflnsdygpgrmv2af522djkc83skp5g70v";
+ sha256.aarch64-linux = "1rgwf0i9ikcjqbxkvr4x94y62m1kklfdhgqscxil479d5mg6akqz";
jceName = "jce_policy-8.zip";
jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html;
sha256JCE = "0n8b6b8qmwb14lllk2lk1q1ahd3za9fnjigz5xn65mpg48whl0pk";
diff --git a/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix b/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix
index 55faf277b15..48304b6af26 100644
--- a/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix
+++ b/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix
@@ -1,11 +1,11 @@
import ./jdk-linux-base.nix {
productVersion = "8";
- patchVersion = "181";
+ patchVersion = "191";
downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html;
- sha256.i686-linux = "0159q5wrlp24v8rc6m1cr3kq8nddpdjdprj3vsmf8z7vpwx052np";
- sha256.x86_64-linux = "1lwiz44vlxn4hc5b43r9arad15lpjfbr7l6h5vafpgxzjmq5ci8q";
- sha256.armv7l-linux = "0zpgb1hqf9zazic66c7nim036ac6ld3dhnsanx4ijlrl7kd3fbn7";
- sha256.aarch64-linux = "191r926501cm6mz8p93ljdfxi0dgzw7ljjsrzsbmmxn4k0q2j0ad";
+ sha256.i686-linux = "1dmnv3x28l0rdi92gpmcp38gpy3lf4pl441bijvjhi7j97kk60v4";
+ sha256.x86_64-linux = "0r8dvb0hahfybvf9wiv7904rn22n93bfc9x6pgypynj0w83rbhjk";
+ sha256.armv7l-linux = "0wgdr9ainzc2yc5qp6ncflnsdygpgrmv2af522djkc83skp5g70v";
+ sha256.aarch64-linux = "1rgwf0i9ikcjqbxkvr4x94y62m1kklfdhgqscxil479d5mg6akqz";
jceName = "jce_policy-8.zip";
jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html;
sha256JCE = "0n8b6b8qmwb14lllk2lk1q1ahd3za9fnjigz5xn65mpg48whl0pk";
diff --git a/pkgs/development/compilers/yosys/default.nix b/pkgs/development/compilers/yosys/default.nix
index 314fbf354e1..275a25c8495 100644
--- a/pkgs/development/compilers/yosys/default.nix
+++ b/pkgs/development/compilers/yosys/default.nix
@@ -8,14 +8,14 @@ with builtins;
stdenv.mkDerivation rec {
name = "yosys-${version}";
- version = "2018.09.30";
+ version = "2018.10.17";
srcs = [
(fetchFromGitHub {
owner = "yosyshq";
repo = "yosys";
- rev = "4d2917447cc14c590b4fee5ba36948fb4ee6884b";
- sha256 = "0b9mmzq2jhx8x8b58nk97fzh70nbhlc3lcfln5facxddv4mp2gl1";
+ rev = "yosys-0.8";
+ sha256 = "1qwbp8gynlklawzvpa4gdn2x0hs8zln0s3kxjqkhfcjfxffdcpvv";
name = "yosys";
})
diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix
index ef2c33c1091..5803e2946bf 100644
--- a/pkgs/development/haskell-modules/make-package-set.nix
+++ b/pkgs/development/haskell-modules/make-package-set.nix
@@ -194,19 +194,21 @@ in package-set { inherit pkgs stdenv callPackage; } self // {
callCabal2nix = name: src: args: self.callCabal2nixWithOptions name src "" args;
# : { root : Path
+ # , name : Defaulted String
# , source-overrides : Defaulted (Either Path VersionNumber)
# , overrides : Defaulted (HaskellPackageOverrideSet)
# , modifier : Defaulted
# , returnShellEnv : Defaulted
# } -> NixShellAwareDerivation
- # Given a path to a haskell package directory whose cabal file is
- # named the same as the directory name, an optional set of
- # source overrides as appropriate for the 'packageSourceOverrides'
- # function, an optional set of arbitrary overrides, and an optional
- # haskell package modifier, return a derivation appropriate
- # for nix-build or nix-shell to build that package.
+ # Given a path to a haskell package directory, an optional package name
+ # which defaults to the base name of the path, an optional set of source
+ # overrides as appropriate for the 'packageSourceOverrides' function, an
+ # optional set of arbitrary overrides, and an optional haskell package
+ # modifier, return a derivation appropriate for nix-build or nix-shell to
+ # build that package.
developPackage =
{ root
+ , name ? builtins.baseNameOf root
, source-overrides ? {}
, overrides ? self: super: {}
, modifier ? drv: drv
@@ -216,7 +218,7 @@ in package-set { inherit pkgs stdenv callPackage; } self // {
(pkgs.lib.composeExtensions
(self.packageSourceOverrides source-overrides)
overrides))
- .callCabal2nix (builtins.baseNameOf root) root {};
+ .callCabal2nix name root {};
in if returnShellEnv then (modifier drv).env else modifier drv;
ghcWithPackages = selectFrom: withPackages (selectFrom self);
diff --git a/pkgs/development/libraries/lesstif/default.nix b/pkgs/development/libraries/lesstif/default.nix
index 04e8eab4d28..b678a089386 100644
--- a/pkgs/development/libraries/lesstif/default.nix
+++ b/pkgs/development/libraries/lesstif/default.nix
@@ -14,12 +14,15 @@ stdenv.mkDerivation rec {
# in Debian, so we assume they have been sent upstream.
#
patches = [
- ./c-missing_xm_h.patch
- ./c-render_table_crash.patch
+ ./c-missing_xm_h.patch
+ ./c-render_table_crash.patch
./c-xpmpipethrough.patch
];
- meta = {
- platforms = stdenv.lib.platforms.unix;
+ meta = with stdenv.lib; {
+ description = "An open source clone of the Motif widget set";
+ homepage = http://lesstif.sourceforge.net;
+ platforms = platforms.unix;
+ license = with licenses; [ gpl2 lgpl2 ];
};
}
diff --git a/pkgs/development/libraries/libHX/default.nix b/pkgs/development/libraries/libHX/default.nix
index 7de72ed73a6..39f493d821c 100644
--- a/pkgs/development/libraries/libHX/default.nix
+++ b/pkgs/development/libraries/libHX/default.nix
@@ -16,14 +16,15 @@ stdenv.mkDerivation rec {
sh autogen.sh
'';
- meta = {
+ meta = with stdenv.lib; {
homepage = http://libhx.sourceforge.net/;
longDescription = ''
libHX is a C library (with some C++ bindings available) that provides data structures
and functions commonly needed, such as maps, deques, linked lists, string formatting
and autoresizing, option and config file parsing, type checking casts and more.
'';
- maintainers = [ stdenv.lib.maintainers.tstrobel ];
- platforms = stdenv.lib.platforms.linux;
+ maintainers = [ maintainers.tstrobel ];
+ platforms = platforms.linux;
+ license = with licenses; [ gpl3 lgpl21Plus wtfpl ];
};
}
diff --git a/pkgs/development/libraries/libaccounts-glib/default.nix b/pkgs/development/libraries/libaccounts-glib/default.nix
index 4bb806b91d8..16e9f213ed4 100644
--- a/pkgs/development/libraries/libaccounts-glib/default.nix
+++ b/pkgs/development/libraries/libaccounts-glib/default.nix
@@ -25,7 +25,9 @@ stdenv.mkDerivation rec {
NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; # since glib-2.46
- meta = {
- platforms = stdenv.lib.platforms.linux;
+ meta = with stdenv.lib; {
+ description = "Library for managing accounts which can be used from GLib applications";
+ platforms = platforms.linux;
+ license = licenses.lgpl21;
};
}
diff --git a/pkgs/development/libraries/libaom/default.nix b/pkgs/development/libraries/libaom/default.nix
index b94c845479a..a08a1e33523 100644
--- a/pkgs/development/libraries/libaom/default.nix
+++ b/pkgs/development/libraries/libaom/default.nix
@@ -18,5 +18,6 @@ stdenv.mkDerivation rec {
homepage = https://aomedia.org/av1-features/get-started/;
maintainers = with maintainers; [ kiloreux ];
platforms = platforms.all;
+ license = licenses.bsd2;
};
}
diff --git a/pkgs/development/libraries/libbap/default.nix b/pkgs/development/libraries/libbap/default.nix
index 54fb89df045..5153b63e91c 100644
--- a/pkgs/development/libraries/libbap/default.nix
+++ b/pkgs/development/libraries/libbap/default.nix
@@ -20,10 +20,11 @@ stdenv.mkDerivation rec {
mkdir -p $out/include
'';
- meta = {
+ meta = with stdenv.lib; {
homepage = https://github.com/binaryanalysisplatform/bap-bindings;
description = "A C library for interacting with BAP";
- maintainers = [ stdenv.lib.maintainers.maurer ];
- platforms = stdenv.lib.platforms.unix;
+ maintainers = [ maintainers.maurer ];
+ platforms = platforms.unix;
+ license = licenses.mit;
};
}
diff --git a/pkgs/development/libraries/libdbusmenu-qt/default.nix b/pkgs/development/libraries/libdbusmenu-qt/default.nix
index 1342ee6773f..501341d202b 100644
--- a/pkgs/development/libraries/libdbusmenu-qt/default.nix
+++ b/pkgs/development/libraries/libdbusmenu-qt/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
meta = with stdenv.lib; {
description = "Provides a Qt implementation of the DBusMenu spec";
inherit homepage;
- maintainers = [ ];
inherit (qt4.meta) platforms;
+ license = licenses.gpl2;
};
}
diff --git a/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix b/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix
index 9c25757efb0..e8651de2b34 100644
--- a/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix
+++ b/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix
@@ -19,5 +19,6 @@ stdenv.mkDerivation {
description = "Provides a Qt implementation of the DBusMenu spec";
maintainers = [ maintainers.ttuegel ];
inherit (qtbase.meta) platforms;
+ license = licenses.gpl2;
};
}
diff --git a/pkgs/development/libraries/libexttextcat/default.nix b/pkgs/development/libraries/libexttextcat/default.nix
index 8d264c929a5..7b3df42c24c 100644
--- a/pkgs/development/libraries/libexttextcat/default.nix
+++ b/pkgs/development/libraries/libexttextcat/default.nix
@@ -8,9 +8,10 @@ stdenv.mkDerivation rec {
sha256 = "1j6sjwkyhqvsgyw938bxxfwkzzi1mahk66g5342lv6j89jfvrz8k";
};
- meta = {
+ meta = with stdenv.lib; {
description = "An N-Gram-Based Text Categorization library primarily intended for language guessing";
homepage = https://wiki.documentfoundation.org/Libexttextcat;
- platforms = stdenv.lib.platforms.all;
+ platforms = platforms.all;
+ license = licenses.bsd3;
};
}
diff --git a/pkgs/development/libraries/libgdiplus/default.nix b/pkgs/development/libraries/libgdiplus/default.nix
index 5e94d00dcdb..d54f9203d23 100644
--- a/pkgs/development/libraries/libgdiplus/default.nix
+++ b/pkgs/development/libraries/libgdiplus/default.nix
@@ -34,7 +34,10 @@ stdenv.mkDerivation rec {
ln -s $out/lib/libgdiplus.0.dylib $out/lib/libgdiplus.so
'';
- meta = {
- platforms = stdenv.lib.platforms.unix;
+ meta = with stdenv.lib; {
+ description = "Mono library that provides a GDI+-compatible API on non-Windows operating systems";
+ homepage = https://www.mono-project.com/docs/gui/libgdiplus/;
+ platforms = platforms.unix;
+ license = licenses.mit;
};
}
diff --git a/pkgs/development/libraries/libgnome-keyring/default.nix b/pkgs/development/libraries/libgnome-keyring/default.nix
index e7157afbaee..0b496ff593b 100644
--- a/pkgs/development/libraries/libgnome-keyring/default.nix
+++ b/pkgs/development/libraries/libgnome-keyring/default.nix
@@ -16,5 +16,6 @@ stdenv.mkDerivation {
meta = {
inherit (glib.meta) platforms maintainers;
+ license = stdenv.lib.licenses.gpl2;
};
}
diff --git a/pkgs/development/libraries/libgnurl/default.nix b/pkgs/development/libraries/libgnurl/default.nix
index 33276b424e7..752d2ce5a1e 100644
--- a/pkgs/development/libraries/libgnurl/default.nix
+++ b/pkgs/development/libraries/libgnurl/default.nix
@@ -33,5 +33,6 @@ stdenv.mkDerivation rec {
homepage = https://gnunet.org/gnurl;
maintainers = with maintainers; [ falsifian vrthra ];
platforms = platforms.linux;
+ license = with licenses; [ bsdOriginal mit ];
};
}
diff --git a/pkgs/development/libraries/libicns/default.nix b/pkgs/development/libraries/libicns/default.nix
index 08d80bcf985..298d6124505 100644
--- a/pkgs/development/libraries/libicns/default.nix
+++ b/pkgs/development/libraries/libicns/default.nix
@@ -10,7 +10,10 @@ stdenv.mkDerivation rec {
buildInputs = [ libpng jasper ];
- meta = {
- platforms = stdenv.lib.platforms.unix;
+ meta = with stdenv.lib; {
+ description = "Library for manipulation of the Mac OS icns resource format";
+ homepage = https://icns.sourceforge.io;
+ license = with licenses; [ gpl2 lgpl2 lgpl21 ];
+ platforms = platforms.unix;
};
}
diff --git a/pkgs/development/libraries/libiodbc/default.nix b/pkgs/development/libraries/libiodbc/default.nix
index 45649f944f5..faa070b3468 100644
--- a/pkgs/development/libraries/libiodbc/default.nix
+++ b/pkgs/development/libraries/libiodbc/default.nix
@@ -17,9 +17,10 @@ stdenv.mkDerivation rec {
export NIX_LDFLAGS_BEFORE="-rpath $out/lib"
'';
- meta = {
+ meta = with stdenv.lib; {
description = "iODBC driver manager";
homepage = http://www.iodbc.org;
- platforms = stdenv.lib.platforms.unix;
+ platforms = platforms.unix;
+ license = licenses.bsd3;
};
}
diff --git a/pkgs/development/libraries/libite/default.nix b/pkgs/development/libraries/libite/default.nix
index 7580c1b092e..1616aa1e0cc 100644
--- a/pkgs/development/libraries/libite/default.nix
+++ b/pkgs/development/libraries/libite/default.nix
@@ -31,6 +31,7 @@ stdenv.mkDerivation rec {
'';
platforms = platforms.unix;
maintainers = with maintainers; [ fpletz ];
+ license = with licenses; [ mit isc ];
};
}
diff --git a/pkgs/development/libraries/lirc/default.nix b/pkgs/development/libraries/lirc/default.nix
index ad6d2df1d8b..13fbe2b55b6 100644
--- a/pkgs/development/libraries/lirc/default.nix
+++ b/pkgs/development/libraries/lirc/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, alsaLib, help2man, pkgconfig, xlibsWrapper, python3
-, libxslt, systemd, libusb, libftdi1 }:
+{ stdenv, fetchurl, fetchpatch, autoreconfHook, pkgconfig, help2man, python3,
+ alsaLib, xlibsWrapper, libxslt, systemd, libusb, libftdi1 }:
stdenv.mkDerivation rec {
name = "lirc-0.10.1";
@@ -9,6 +9,12 @@ stdenv.mkDerivation rec {
sha256 = "1whlyifvvc7w04ahq07nnk1h18wc8j7c6wnvlb6mszravxh3qxcb";
};
+ # Fix installation of Python bindings
+ patches = [ (fetchpatch {
+ url = "https://sourceforge.net/p/lirc/tickets/339/attachment/0001-Fix-Python-bindings.patch";
+ sha256 = "088a39x8c1qd81qwvbiqd6crb2lk777wmrs8rdh1ga06lglyvbly";
+ }) ];
+
postPatch = ''
patchShebangs .
@@ -24,17 +30,17 @@ stdenv.mkDerivation rec {
touch lib/lirc/input_map.inc
'';
- nativeBuildInputs = [ pkgconfig help2man ];
+ nativeBuildInputs = [ autoreconfHook pkgconfig help2man
+ (python3.withPackages (p: with p; [ pyyaml setuptools ])) ];
- buildInputs = [ alsaLib xlibsWrapper libxslt systemd libusb libftdi1 ]
- ++ (with python3.pkgs; [ python pyyaml setuptools ]);
+ buildInputs = [ alsaLib xlibsWrapper libxslt systemd libusb libftdi1 ];
configureFlags = [
"--sysconfdir=/etc"
"--localstatedir=/var"
"--with-systemdsystemunitdir=$(out)/lib/systemd/system"
- "--enable-uinput" # explicite activation because build env has no uinput
- "--enable-devinput" # explicite activation because build env has not /dev/input
+ "--enable-uinput" # explicit activation because build env has no uinput
+ "--enable-devinput" # explicit activation because build env has no /dev/input
];
installFlags = [
diff --git a/pkgs/development/python-modules/backports_os/default.nix b/pkgs/development/python-modules/backports_os/default.nix
new file mode 100644
index 00000000000..9d0ddc2cad9
--- /dev/null
+++ b/pkgs/development/python-modules/backports_os/default.nix
@@ -0,0 +1,35 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, setuptools_scm
+, future
+, isPy3k
+, python
+, hypothesis
+}:
+
+buildPythonPackage rec {
+ version = "0.1.1";
+ pname = "backports.os";
+ disabled = isPy3k;
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "b472c4933094306ca08ec90b2a8cbb50c34f1fb2767775169a1c1650b7b74630";
+ };
+
+ buildInputs = [ setuptools_scm ];
+ checkInputs = [ hypothesis ];
+ propagatedBuildInputs = [ future ];
+
+ checkPhase = ''
+ ${python.interpreter} -m unittest discover tests
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = https://github.com/pjdelport/backports.os;
+ description = "Backport of new features in Python's os module";
+ license = licenses.mit;
+ maintainers = [ maintainers.costrouc ];
+ };
+}
diff --git a/pkgs/development/python-modules/fs/default.nix b/pkgs/development/python-modules/fs/default.nix
new file mode 100644
index 00000000000..9d5de0c73ea
--- /dev/null
+++ b/pkgs/development/python-modules/fs/default.nix
@@ -0,0 +1,53 @@
+{ pkgs
+, buildPythonPackage
+, fetchPypi
+, six
+, nose
+, appdirs
+, scandir
+, backports_os
+, typing
+, pytz
+, enum34
+, pyftpdlib
+, psutil
+, mock
+, pythonAtLeast
+, isPy3k
+}:
+
+buildPythonPackage rec {
+ pname = "fs";
+ version = "2.1.1";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "b20a4aeac9079b194f0160957d4265bb6c99ce68f1b12e980b0fb96f74aafb70";
+ };
+
+ buildInputs = [ pkgs.glibcLocales ];
+ checkInputs = [ nose pyftpdlib mock psutil ];
+ propagatedBuildInputs = [ six appdirs pytz ]
+ ++ pkgs.lib.optionals (!isPy3k) [ backports_os ]
+ ++ pkgs.lib.optionals (!pythonAtLeast "3.6") [ typing ]
+ ++ pkgs.lib.optionals (!pythonAtLeast "3.5") [ scandir ]
+ ++ pkgs.lib.optionals (!pythonAtLeast "3.5") [ enum34 ];
+
+ postPatch = ''
+ # required for installation
+ touch LICENSE
+ # tests modify home directory results in (4 tests failing) / 1600
+ rm tests/test_appfs.py tests/test_opener.py
+ '';
+
+ LC_ALL="en_US.utf-8";
+
+ meta = with pkgs.lib; {
+ description = "Filesystem abstraction";
+ homepage = https://github.com/PyFilesystem/pyfilesystem2;
+ license = licenses.bsd3;
+ maintainers = with maintainers; [ lovek323 ];
+ platforms = platforms.unix;
+ };
+
+}
diff --git a/pkgs/development/python-modules/pathlib2/default.nix b/pkgs/development/python-modules/pathlib2/default.nix
index 412186e6075..c85b29eac85 100644
--- a/pkgs/development/python-modules/pathlib2/default.nix
+++ b/pkgs/development/python-modules/pathlib2/default.nix
@@ -8,7 +8,7 @@
, mock
}:
-if !(pythonOlder "3.4") then null else buildPythonPackage rec {
+buildPythonPackage rec {
pname = "pathlib2";
version = "2.3.2";
diff --git a/pkgs/development/python-modules/pvlib/default.nix b/pkgs/development/python-modules/pvlib/default.nix
index 296b20fac4a..34134546f56 100644
--- a/pkgs/development/python-modules/pvlib/default.nix
+++ b/pkgs/development/python-modules/pvlib/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "pvlib";
- version = "0.5.2";
+ version = "0.6.0";
src = fetchPypi {
inherit pname version;
- sha256 = "1897v9qq97nk5n0hfm9089yz8pffd42795mnhcyq48g9bsyap1xi";
+ sha256 = "1j2p6w41hv7k604jbcpxvs5f04y8dsfdvd3d202l60ks0fc0agyj";
};
checkInputs = [ pytest ];
diff --git a/pkgs/development/python-modules/pyftpdlib/default.nix b/pkgs/development/python-modules/pyftpdlib/default.nix
new file mode 100644
index 00000000000..b8f483d3a1d
--- /dev/null
+++ b/pkgs/development/python-modules/pyftpdlib/default.nix
@@ -0,0 +1,33 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, mock
+, psutil
+, pyopenssl
+, pysendfile
+, python
+}:
+
+buildPythonPackage rec {
+ version = "1.5.4";
+ pname = "pyftpdlib";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "e5fca613978743d41c3bfc68e25a811d646a3b8a9eee9eb07021daca89646a0f";
+ };
+
+ checkInputs = [ mock psutil ];
+ propagatedBuildInputs = [ pyopenssl pysendfile ];
+
+ checkPhase = ''
+ ${python.interpreter} pyftpdlib/test/runner.py
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = https://github.com/giampaolo/pyftpdlib/;
+ description = "Very fast asynchronous FTP server library";
+ license = licenses.mit;
+ maintainers = [ maintainers.costrouc ];
+ };
+}
diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix
index deb9cbdb7d0..cdfdb8a64c9 100644
--- a/pkgs/development/python-modules/pytest/default.nix
+++ b/pkgs/development/python-modules/pytest/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, attrs, hypothesis, py
+{ stdenv, buildPythonPackage, pythonOlder, fetchPypi, attrs, hypothesis, py
, setuptools_scm, setuptools, six, pluggy, funcsigs, isPy3k, more-itertools
, atomicwrites, mock, writeText, pathlib2
}:
@@ -19,7 +19,8 @@ buildPythonPackage rec {
checkInputs = [ hypothesis mock ];
buildInputs = [ setuptools_scm ];
propagatedBuildInputs = [ attrs py setuptools six pluggy more-itertools atomicwrites]
- ++ stdenv.lib.optionals (!isPy3k) [ funcsigs pathlib2 ];
+ ++ stdenv.lib.optionals (!isPy3k) [ funcsigs ]
+ ++ stdenv.lib.optionals (pythonOlder "3.6") [ pathlib2 ];
checkPhase = ''
runHook preCheck
diff --git a/pkgs/development/python-modules/python-ldap-test/default.nix b/pkgs/development/python-modules/python-ldap-test/default.nix
new file mode 100644
index 00000000000..3ba81cacfd4
--- /dev/null
+++ b/pkgs/development/python-modules/python-ldap-test/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, buildPythonPackage, fetchPypi, py4j }:
+
+buildPythonPackage rec {
+ pname = "python-ldap-test";
+ version = "0.3.1";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1qh9x3lncaldnw79fgpqbayichs8pbz8abr6pxb5qxbs7zrnyrwf";
+ };
+
+ propagatedBuildInputs = [ py4j ];
+
+ # Tests needs java to be present in path
+ doCheck = false;
+
+ meta = with stdenv.lib; {
+ description = "Tool for testing code speaking with LDAP server";
+ homepage = https://github.com/zoldar/python-ldap-test;
+ license = licenses.mit;
+ maintainers = with maintainers; [ psyanticy ];
+ };
+}
+
diff --git a/pkgs/development/python-modules/python-packer/default.nix b/pkgs/development/python-modules/python-packer/default.nix
new file mode 100644
index 00000000000..3f0c1f8138f
--- /dev/null
+++ b/pkgs/development/python-modules/python-packer/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, buildPythonPackage, fetchPypi, sh }:
+
+buildPythonPackage rec {
+ pname = "python-packer";
+ version = "0.1.2";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "fd363dae9bd2efd447739bbf7a4f29c1e4741596ae7b02d252fe525b2b4176e7";
+ };
+
+ propagatedBuildInputs = [ sh ];
+
+ # Tests requires network connections
+ doCheck = false;
+
+ meta = with stdenv.lib; {
+ description = "An interface for packer.io";
+ homepage = https://github.com/nir0s/python-packer;
+ license = licenses.asl20;
+ maintainers = with maintainers; [ psyanticy ];
+ };
+}
+
diff --git a/pkgs/development/python-modules/speedtest-cli/default.nix b/pkgs/development/python-modules/speedtest-cli/default.nix
new file mode 100644
index 00000000000..f2c38a3414b
--- /dev/null
+++ b/pkgs/development/python-modules/speedtest-cli/default.nix
@@ -0,0 +1,26 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+}:
+
+# cannot be built as pythonApplication because the library functions are
+# required for home-assistant
+buildPythonPackage rec {
+ pname = "speedtest-cli";
+ version = "2.0.2";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "2f3d5aa1086d9b367c03b99db6e3207525af174772d877c6b982289b8d2bdefe";
+ };
+
+ # tests require working internet connection
+ doCheck = false;
+
+ meta = with lib; {
+ description = "Command line interface for testing internet bandwidth using speedtest.net";
+ homepage = https://github.com/sivel/speedtest-cli;
+ license = licenses.asl20;
+ maintainers = with maintainers; [ makefu domenkozar ndowens ];
+ };
+}
diff --git a/pkgs/development/ruby-modules/bundler/default.nix b/pkgs/development/ruby-modules/bundler/default.nix
index 7f89d1ffa87..65cde981502 100644
--- a/pkgs/development/ruby-modules/bundler/default.nix
+++ b/pkgs/development/ruby-modules/bundler/default.nix
@@ -4,8 +4,8 @@ buildRubyGem rec {
inherit ruby;
name = "${gemName}-${version}";
gemName = "bundler";
- version = "1.16.3";
- source.sha256 = "0spddjiq6yscl4sywwcj5zrjk3lq02zacigrz2fh78yfdzyi34fq";
+ version = "1.16.4";
+ source.sha256 = "15zrxqv817w4vawc23lx3miigir36ba59wkykkr6l1nkf0iy013d";
dontPatchShebangs = true;
postFixup = ''
diff --git a/pkgs/development/tools/analysis/radare2/cutter.nix b/pkgs/development/tools/analysis/radare2/cutter.nix
index 659d6a94f5e..25c6d6d5879 100644
--- a/pkgs/development/tools/analysis/radare2/cutter.nix
+++ b/pkgs/development/tools/analysis/radare2/cutter.nix
@@ -8,7 +8,7 @@
, python3 }:
let
- version = "1.7.1";
+ version = "1.7.2";
in
stdenv.mkDerivation rec {
name = "radare2-cutter-${version}";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
owner = "radareorg";
repo = "cutter";
rev = "v${version}";
- sha256 = "0dfi6f016jnh3swppvks5qkvmk0j2hvggh9sd1f40kg9pg5p08hy";
+ sha256 = "09cqfz66r3830jkz1rwyfqw1xl1jfj6xg4pcccd2ml456kddh9dn";
};
postUnpack = "export sourceRoot=$sourceRoot/src";
diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix
index f10b820a73e..2f0878da8c6 100644
--- a/pkgs/development/tools/analysis/radare2/default.nix
+++ b/pkgs/development/tools/analysis/radare2/default.nix
@@ -2,6 +2,7 @@
, callPackage
, ninja, meson , pkgconfig
, libusb, readline, libewf, perl, zlib, openssl
+, libuv
, gtk2 ? null, vte ? null, gtkdialog ? null
, python ? null
, ruby ? null
@@ -62,12 +63,15 @@ let
"-Dr2_gittip=${gittip}"
# 2.8.0 expects this, but later it becomes an option with default=false.
"-Dcapstone_in_builddir=true"
+
+ "-Duse_sys_openssl=true"
+ "-Duse_sys_zlib=true"
];
enableParallelBuilding = true;
nativeBuildInputs = [ pkgconfig ninja meson ];
- buildInputs = [ readline libusb libewf perl zlib openssl]
+ buildInputs = [ readline libusb libewf perl zlib openssl libuv ]
++ optional useX11 [gtkdialog vte gtk2]
++ optional rubyBindings [ruby]
++ optional pythonBindings [python]
@@ -86,24 +90,24 @@ in {
#
# DO NOT EDIT! Automatically generated by ./update.py
radare2 = generic {
- version_commit = "19349";
- gittap = "2.9.0";
- gittip = "d5e9539ec8068ca2ab4759dc3b0697781ded4cc8";
- rev = "2.9.0";
- version = "2.9.0";
- sha256 = "0zz6337p9095picfvjrcnqaxdi2a2b68h9my523ilnw8ynwfhdzw";
- cs_tip = "782ea67e17a391ca0d3faafdc365b335a1a8930a";
- cs_sha256 = "1maww4ir78a193pm3f8lr2kdkizi7rywn68ffa65ipyr7j4pl6i4";
+ version_commit = "19720";
+ gittap = "3.0.0";
+ gittip = "13e3ebd2aa6653eb5b6bdd65a93dcddf3550fcfa";
+ rev = "3.0.0";
+ version = "3.0.0";
+ sha256 = "0awbk9v7qjkarscaqzyly310f04dxgndxvxwxbjrsswqlp206b40";
+ cs_tip = "e2c1cd46c06744beaceff42dd882de3a90f0a37c";
+ cs_sha256 = "1czzqj8zdjgh7h2ixi26ij3mm4bgm4xw2slin6fv73nic8yaw722";
};
r2-for-cutter = generic {
- version_commit = "19349";
- gittap = "2.8.0-189-gf82b28982";
- gittip = "f82b289822825e4c7403734f3b95dfd7f5e4f725";
- rev = "f82b289822825e4c7403734f3b95dfd7f5e4f725";
- version = "2018-08-14";
- sha256 = "0zc2a09xmwbxphxd1b0ia0zm8323wfcmxwwx6k239681jj9qwgr1";
- cs_tip = "782ea67e17a391ca0d3faafdc365b335a1a8930a";
- cs_sha256 = "1maww4ir78a193pm3f8lr2kdkizi7rywn68ffa65ipyr7j4pl6i4";
+ version_commit = "19720";
+ gittap = "2.9.0-310-gcb62c376b";
+ gittip = "cb62c376bef6c7427019a7c28910c33c364436dd";
+ rev = "cb62c376bef6c7427019a7c28910c33c364436dd";
+ version = "2018-10-07";
+ sha256 = "0z4nr1d2ca8ibq34441j15pj22wh46brcbr00j5hcqvn8y2lh96l";
+ cs_tip = "e2c1cd46c06744beaceff42dd882de3a90f0a37c";
+ cs_sha256 = "1czzqj8zdjgh7h2ixi26ij3mm4bgm4xw2slin6fv73nic8yaw722";
};
#
}
diff --git a/pkgs/development/tools/analysis/radare2/update.py b/pkgs/development/tools/analysis/radare2/update.py
index 45920fd1e4b..684d70bc0bc 100755
--- a/pkgs/development/tools/analysis/radare2/update.py
+++ b/pkgs/development/tools/analysis/radare2/update.py
@@ -38,10 +38,9 @@ def get_radare2_rev() -> str:
def get_cutter_version() -> str:
version_expr = """
-(with import {}; (builtins.parseDrvName (qt5.callPackage ./cutter.nix {}).name).version)
+(with import {}; (builtins.parseDrvName (qt5.callPackage {}).name).version)
"""
- with SCRIPT_DIR:
- return sh("nix", "eval", "--raw", version_expr.strip())
+ return sh("nix", "eval", "--raw", version_expr.strip(), "-I", "radare2={0}".format(SCRIPT_DIR))
def get_r2_cutter_rev() -> str:
@@ -109,7 +108,7 @@ def main() -> None:
"https://github.com/radare/radare2",
".",
)
- nix_file = str(Path(__file__).parent.joinpath("default.nix"))
+ nix_file = str(SCRIPT_DIR.joinpath("default.nix"))
radare2_info = get_repo_info(dirname, radare2_rev)
diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix
index e9f005f7991..19836b412c0 100644
--- a/pkgs/development/tools/build-managers/bazel/default.nix
+++ b/pkgs/development/tools/build-managers/bazel/default.nix
@@ -13,8 +13,8 @@
let
srcDeps = lib.singleton (
fetchurl {
- url = "https://github.com/google/desugar_jdk_libs/archive/f5e6d80c6b4ec6b0a46603f72b015d45cf3c11cd.zip";
- sha256 = "c80f3f3d442d8a6ca7adc83f90ecd638c3864087fdd6787ffac070b6f1cc8f9b";
+ url = "https://github.com/google/desugar_jdk_libs/archive/fd937f4180c1b557805219af4482f1a27eb0ff2b.zip";
+ sha256 = "04hs399340xfwcdajbbcpywnb2syp6z5ydwg966if3hqdb2zrf23";
}
);
@@ -28,7 +28,7 @@ let
in
stdenv.mkDerivation rec {
- version = "0.17.1";
+ version = "0.18.0";
meta = with lib; {
homepage = "https://github.com/bazelbuild/bazel/";
@@ -42,19 +42,13 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip";
- sha256 = "081z40vsxvw6ndiinik4pn09gxmv140k6l9zv93dgjr86qf2ir13";
+ sha256 = "0mbi4n4wp1x73l8qksg4vyh2sba52xh9hfl2m518gv41g0pnvs6h";
};
sourceRoot = ".";
patches =
- lib.optional enableNixHacks ./nix-hacks.patch
- # patch perl out of the bash completions
- # should land in 0.18
- ++ [(fetchpatch {
- url = "https://github.com/bazelbuild/bazel/commit/27be70979b54d7510bf401d9581fb4075737ef34.patch";
- sha256 = "04rip46lnibrsdyzjpi29wf444b49cbwb1xjcbrr3kdqsdj4d8h5";
- })];
+ lib.optional enableNixHacks ./nix-hacks.patch;
# Bazel expects several utils to be available in Bash even without PATH. Hence this hack.
@@ -137,10 +131,10 @@ stdenv.mkDerivation rec {
echo "build --host_copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt=\"/g')\"" >> .bazelrc
echo "build --linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt=\"-Wl,/g')\"" >> .bazelrc
echo "build --host_linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt=\"-Wl,/g')\"" >> .bazelrc
- sed -i -e "362 a --copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --copt=\"/g')\" \\\\" scripts/bootstrap/compile.sh
- sed -i -e "362 a --host_copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt=\"/g')\" \\\\" scripts/bootstrap/compile.sh
- sed -i -e "362 a --linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt=\"-Wl,/g')\" \\\\" scripts/bootstrap/compile.sh
- sed -i -e "362 a --host_linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt=\"-Wl,/g')\" \\\\" scripts/bootstrap/compile.sh
+ sed -i -e "378 a --copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --copt=\"/g')\" \\\\" scripts/bootstrap/compile.sh
+ sed -i -e "378 a --host_copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt=\"/g')\" \\\\" scripts/bootstrap/compile.sh
+ sed -i -e "378 a --linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt=\"-Wl,/g')\" \\\\" scripts/bootstrap/compile.sh
+ sed -i -e "378 a --host_linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt=\"-Wl,/g')\" \\\\" scripts/bootstrap/compile.sh
# --experimental_strict_action_env (which will soon become the
# default, see bazelbuild/bazel#2574) hardcodes the default
diff --git a/pkgs/development/tools/build-managers/sbt/default.nix b/pkgs/development/tools/build-managers/sbt/default.nix
index 60f342db12a..dce19a1d839 100644
--- a/pkgs/development/tools/build-managers/sbt/default.nix
+++ b/pkgs/development/tools/build-managers/sbt/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
name = "sbt-${version}";
- version = "1.2.4";
+ version = "1.2.6";
src = fetchurl {
urls = [
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
"https://github.com/sbt/sbt/releases/download/v${version}/sbt-${version}.tgz"
"https://cocl.us/sbt-${version}.tgz"
];
- sha256 = "06zv1mm4rhl0h6qa7m4w5lbwjcyqp43r183q36q9zlyip965mnrn";
+ sha256 = "1nv8r3j2vhp38qbb123n86wfhb6mvwz7vgrrsjp344zg211psncn";
};
patchPhase = ''
diff --git a/pkgs/games/gzdoom/default.nix b/pkgs/games/gzdoom/default.nix
index 0f95fa9aaf7..5563e7836cc 100644
--- a/pkgs/games/gzdoom/default.nix
+++ b/pkgs/games/gzdoom/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
name = "gzdoom-${version}";
- version = "3.5.1";
+ version = "3.6.0";
src = fetchFromGitHub {
owner = "coelckers";
repo = "gzdoom";
rev = "g${version}";
- sha256 = "109qmjkafr1xghpn0k1a8a0zgladc8r6hyw99v8r51ryjf5qf9sd";
+ sha256 = "03yklhdppncaswy6l3fcvy8l8v1icfnm9f0jlszvibcm5ba7z0j1";
};
nativeBuildInputs = [ cmake makeWrapper ];
diff --git a/pkgs/misc/seafile-shared/default.nix b/pkgs/misc/seafile-shared/default.nix
index 6fba977e008..bccc55914fe 100644
--- a/pkgs/misc/seafile-shared/default.nix
+++ b/pkgs/misc/seafile-shared/default.nix
@@ -1,14 +1,14 @@
{stdenv, fetchFromGitHub, which, autoreconfHook, pkgconfig, curl, vala, python, intltool, fuse, ccnet}:
stdenv.mkDerivation rec {
- version = "6.2.4";
+ version = "6.2.5";
name = "seafile-shared-${version}";
src = fetchFromGitHub {
owner = "haiwen";
repo = "seafile";
rev = "v${version}";
- sha256 = "0v6wvw8x3zfcapi0lk71mg89gy3gw2qmdiq6mhw6qbbrzvqprlmr";
+ sha256 = "1s8cqh5wfll81d060f4zknxhmwwqckci6dadmslbvbvx55lgyspa";
};
nativeBuildInputs = [ pkgconfig which autoreconfHook vala intltool ];
diff --git a/pkgs/misc/themes/adapta/default.nix b/pkgs/misc/themes/adapta/default.nix
index 37e7af95a91..0c144b56741 100644
--- a/pkgs/misc/themes/adapta/default.nix
+++ b/pkgs/misc/themes/adapta/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "adapta-gtk-theme-${version}";
- version = "3.94.0.149";
+ version = "3.95.0.1";
src = fetchFromGitHub {
owner = "adapta-project";
repo = "adapta-gtk-theme";
rev = version;
- sha256 = "1rb07yv4iz4yp6cnigzy690mw3w6fcf7szlcbbna6wnjaf1rbf2i";
+ sha256 = "0hc3ar55wjg51qf8c7h0nix0lyqs16mk1d4hhxyv102zq4l5fz97";
};
preferLocalBuild = true;
diff --git a/pkgs/misc/themes/obsidian2/default.nix b/pkgs/misc/themes/obsidian2/default.nix
index 61f7d1debcc..571639a9901 100644
--- a/pkgs/misc/themes/obsidian2/default.nix
+++ b/pkgs/misc/themes/obsidian2/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "theme-obsidian2-${version}";
- version = "2.6";
+ version = "2.7";
src = fetchFromGitHub {
owner = "madmaxms";
repo = "theme-obsidian-2";
rev = "v${version}";
- sha256 = "1bb629y11j79h0rxi36iszki6m6l59iwlcraygr472gf44a2xp11";
+ sha256 = "0my3q7xvi6m257x489wync0y5n8n1kig4xg5gfrb905avhxj5frs";
};
propagatedUserEnvPkgs = [ gtk-engine-murrine ];
diff --git a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix
index f58ab5c95cc..b4df3b7b33e 100644
--- a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix
+++ b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix
@@ -1,13 +1,13 @@
{ stdenv, buildPackages, fetchgit, perl, buildLinux, ... } @ args:
buildLinux (args // rec {
- version = "4.18.2018.09.21";
+ version = "4.18.2018.10.12";
modDirVersion = "4.18.0";
src = fetchgit {
url = "https://evilpiepirate.org/git/bcachefs.git";
- rev = "2fe17e38d355271a8212a8123a9281e2f9df811f";
- sha256 = "1p35qf7fdwpr8sz4alblmbq6rmhd87rwrrwk6xpgxsfkkhmf36d6";
+ rev = "d7f6da1d60ec24266301231538ff6f09716537ed";
+ sha256 = "05d7dh41nc35www8vmrn47wlf2mr2b8i4rm15vq3zgm32d0xv3lk";
};
extraConfig = "BCACHEFS_FS m";
diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh
index 15c3e10e119..8882ffdd45e 100755
--- a/pkgs/os-specific/linux/nvidia-x11/builder.sh
+++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh
@@ -26,32 +26,44 @@ buildPhase() {
fi
}
-
+
installPhase() {
# Install libGL and friends.
+
+ # since version 391, 32bit libraries are bundled in the 32/ sub-directory
+ if [ "$i686bundled" = "1" ]; then
+ mkdir -p "$lib32/lib"
+ cp -prd 32/*.so.* 32/tls "$lib32/lib/"
+ fi
+
mkdir -p "$out/lib"
cp -prd *.so.* tls "$out/lib/"
- rm $out/lib/lib{glx,nvidia-wfb}.so.* # handled separately
- rm -f $out/lib/libnvidia-gtk* # built from source
- if [ "$useGLVND" = "1" ]; then
- # Pre-built libglvnd
- rm $out/lib/lib{GL,GLX,EGL,GLESv1_CM,GLESv2,OpenGL,GLdispatch}.so.*
- fi
- # Use ocl-icd instead
- rm $out/lib/libOpenCL.so*
- # Move VDPAU libraries to their place
- mkdir $out/lib/vdpau
- mv $out/lib/libvdpau* $out/lib/vdpau
- # Install ICDs.
- install -Dm644 nvidia.icd $out/etc/OpenCL/vendors/nvidia.icd
- if [ -e nvidia_icd.json.template ]; then
- sed "s#__NV_VK_ICD__#libGLX_nvidia.so#" nvidia_icd.json.template > nvidia_icd.json
- install -Dm644 nvidia_icd.json $out/share/vulkan/icd.d/nvidia.json
- fi
- if [ "$useGLVND" = "1" ]; then
- install -Dm644 10_nvidia.json $out/share/glvnd/egl_vendor.d/nvidia.json
- fi
+ for i in $lib32 $out; do
+ rm -f $i/lib/lib{glx,nvidia-wfb}.so.* # handled separately
+ rm -f $i/lib/libnvidia-gtk* # built from source
+ if [ "$useGLVND" = "1" ]; then
+ # Pre-built libglvnd
+ rm $i/lib/lib{GL,GLX,EGL,GLESv1_CM,GLESv2,OpenGL,GLdispatch}.so.*
+ fi
+ # Use ocl-icd instead
+ rm -f $i/lib/libOpenCL.so*
+ # Move VDPAU libraries to their place
+ mkdir $i/lib/vdpau
+ mv $i/lib/libvdpau* $i/lib/vdpau
+
+ # Install ICDs.
+ install -Dm644 nvidia.icd $i/etc/OpenCL/vendors/nvidia.icd
+ if [ -e nvidia_icd.json.template ]; then
+ sed "s#__NV_VK_ICD__#libGLX_nvidia.so#" nvidia_icd.json.template > nvidia_icd.json
+ install -Dm644 nvidia_icd.json $i/share/vulkan/icd.d/nvidia.json
+ fi
+ if [ "$useGLVND" = "1" ]; then
+ install -Dm644 10_nvidia.json $i/share/glvnd/egl_vendor.d/nvidia.json
+ fi
+
+ done
+
if [ -n "$bin" ]; then
# Install the X drivers.
@@ -60,7 +72,7 @@ installPhase() {
mkdir -p $bin/lib/xorg/modules/drivers
cp -p nvidia_drv.so $bin/lib/xorg/modules/drivers
mkdir -p $bin/lib/xorg/modules/extensions
- cp -p libglx.so.* $bin/lib/xorg/modules/extensions
+ cp -p libglx*.so* $bin/lib/xorg/modules/extensions
# Install the kernel module.
mkdir -p $bin/lib/modules/$kernelVersion/misc
@@ -78,7 +90,7 @@ installPhase() {
fi
# All libs except GUI-only are installed now, so fixup them.
- for libname in `find "$out/lib/" -name '*.so.*'` `test -z "$bin" || find "$bin/lib/" -name '*.so.*'`
+ for libname in $(find "$out/lib/" $(test -n "$lib32" && echo "$lib32/lib/") $(test -n "$bin" && echo "$bin/lib/") -name '*.so.*')
do
# I'm lazy to differentiate needed libs per-library, as the closure is the same.
# Unfortunately --shrink-rpath would strip too much.
diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix
index d9ff157e142..492b268610f 100644
--- a/pkgs/os-specific/linux/nvidia-x11/default.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/default.nix
@@ -26,8 +26,12 @@ rec {
patches = lib.optional (kernel.meta.branch == "4.19") ./drm_mode_connector.patch;
};
- beta = stable; # not enough interest to maintain beta ATM
-
+ beta = generic {
+ version = "410.57";
+ sha256_64bit = "08534rv3wcmzslbwq11kd3s7cxm72p48dia6540c0586xwgjwg2w";
+ settingsSha256 = "1phhhzlc8n3rqdhrn757mnlqmsp616d079a6h1qjpa6jba9z9915";
+ persistencedSha256 = "1z7c1ff0y486yp9i5w0siwh9dnprml22x2avarbjfgqwm4f652lw";
+ };
legacy_340 = generic {
version = "340.104";
diff --git a/pkgs/os-specific/linux/nvidia-x11/generic.nix b/pkgs/os-specific/linux/nvidia-x11/generic.nix
index 090fce3a485..a40a6434493 100644
--- a/pkgs/os-specific/linux/nvidia-x11/generic.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/generic.nix
@@ -1,5 +1,5 @@
{ version
-, sha256_32bit
+, sha256_32bit ? null
, sha256_64bit
, settingsSha256
, persistencedSha256
@@ -22,11 +22,15 @@
with stdenv.lib;
-assert (!libsOnly) -> kernel != null;
+assert !libsOnly -> kernel != null;
+assert versionOlder version "391" -> sha256_32bit != null;
+assert ! versionOlder version "391" -> stdenv.hostPlatform.system == "x86_64-linux";
let
nameSuffix = optionalString (!libsOnly) "-${kernel.version}";
pkgSuffix = optionalString (versionOlder version "304") "-pkg0";
+ i686bundled = versionAtLeast version "391";
+
self = stdenv.mkDerivation {
name = "nvidia-x11-${version}${nameSuffix}";
@@ -34,24 +38,27 @@ let
builder = ./builder.sh;
src =
- if stdenv.hostPlatform.system == "i686-linux" then
- fetchurl {
- url = "https://download.nvidia.com/XFree86/Linux-x86/${version}/NVIDIA-Linux-x86-${version}${pkgSuffix}.run";
- sha256 = sha256_32bit;
- }
- else if stdenv.hostPlatform.system == "x86_64-linux" then
+ if stdenv.hostPlatform.system == "x86_64-linux" then
fetchurl {
url = "https://download.nvidia.com/XFree86/Linux-x86_64/${version}/NVIDIA-Linux-x86_64-${version}${pkgSuffix}.run";
sha256 = sha256_64bit;
}
+ else if stdenv.hostPlatform.system == "i686-linux" then
+ fetchurl {
+ url = "https://download.nvidia.com/XFree86/Linux-x86/${version}/NVIDIA-Linux-x86-${version}${pkgSuffix}.run";
+ sha256 = sha256_32bit;
+ }
else throw "nvidia-x11 does not support platform ${stdenv.hostPlatform.system}";
patches = if libsOnly then null else patches;
inherit prePatch;
inherit version useGLVND useProfiles;
inherit (stdenv.hostPlatform) system;
+ inherit i686bundled;
- outputs = [ "out" ] ++ optional (!libsOnly) "bin";
+ outputs = [ "out" ]
+ ++ optional i686bundled "lib32"
+ ++ optional (!libsOnly) "bin";
outputDev = if libsOnly then null else "bin";
kernel = if libsOnly then null else kernel.dev;
diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index a67de2dab1a..c1b35946d68 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -998,7 +998,7 @@
"sensor.sochain" = ps: with ps; [ ];
"sensor.socialblade" = ps: with ps; [ ];
"sensor.sonarr" = ps: with ps; [ ];
- "sensor.speedtest" = ps: with ps; [ ];
+ "sensor.speedtest" = ps: with ps; [ speedtest-cli ];
"sensor.spotcrime" = ps: with ps; [ ];
"sensor.sql" = ps: with ps; [ sqlalchemy ];
"sensor.startca" = ps: with ps; [ xmltodict ];
diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix
index e795d74fe98..b3a31d2d1ba 100644
--- a/pkgs/servers/monitoring/grafana/default.nix
+++ b/pkgs/servers/monitoring/grafana/default.nix
@@ -1,7 +1,7 @@
{ lib, buildGoPackage, fetchurl, fetchFromGitHub, phantomjs2 }:
buildGoPackage rec {
- version = "5.2.4";
+ version = "5.3.1";
name = "grafana-${version}";
goPackagePath = "github.com/grafana/grafana";
@@ -9,12 +9,12 @@ buildGoPackage rec {
rev = "v${version}";
owner = "grafana";
repo = "grafana";
- sha256 = "15w935i22ddx6ff32ynypjh3q670vnrj74qw0vdkxdmrlwk3q7wc";
+ sha256 = "0k4jsqgk0wbp1xc159vrs855d42kcdc4d38v498imp6a90idniyp";
};
srcStatic = fetchurl {
url = "https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-${version}.linux-amd64.tar.gz";
- sha256 = "187dqjahz1z1gkcx9pxnf2hri6g3b5j3ppadwfahz0rwsqj4v2lf";
+ sha256 = "133ckn5f4l6vqy65y1z3mzhzhy8xcyq65nqb34mwn2zsi7pzvssz";
};
postPatch = ''
diff --git a/pkgs/servers/uhub/default.nix b/pkgs/servers/uhub/default.nix
index 87d0a0ee455..52866784faa 100644
--- a/pkgs/servers/uhub/default.nix
+++ b/pkgs/servers/uhub/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, openssl, sqlite, pkgconfig, systemd
+{ stdenv, fetchpatch, fetchFromGitHub, cmake, openssl, sqlite, pkgconfig, systemd
, tlsSupport ? false }:
assert tlsSupport -> openssl != null;
@@ -7,9 +7,11 @@ stdenv.mkDerivation rec {
name = "uhub-${version}";
version = "0.5.0";
- src = fetchurl {
- url = "https://www.extatic.org/downloads/uhub/uhub-${version}-src.tar.bz2";
- sha256 = "1xcqjz20lxikzn96f4f69mqyl9y985h9g0gyc9f7ckj18q22b5j5";
+ src = fetchFromGitHub {
+ owner = "janvidar";
+ repo = "uhub";
+ rev = version;
+ sha256 = "0zdbxfvw7apmfhqgsfkfp4pn9iflzwdn0zwvzymm5inswfc00pxg";
};
nativeBuildInputs = [ pkgconfig ];
@@ -20,6 +22,7 @@ stdenv.mkDerivation rec {
"mod_welcome"
"mod_logging"
"mod_auth_simple"
+ "mod_auth_sqlite"
"mod_chat_history"
"mod_chat_only"
"mod_topic"
@@ -28,9 +31,14 @@ stdenv.mkDerivation rec {
patches = [
./plugin-dir.patch
+ # fix aarch64 build: https://github.com/janvidar/uhub/issues/46
+ (fetchpatch {
+ url = "https://github.com/janvidar/uhub/pull/47.patch";
+ sha256 = "07yik6za89ar5bxm7m2183i7f6hfbawbxvd4vs02n1zr2fgfxmiq";
+ })
# Fixed compilation on systemd > 210
- (fetchurl {
+ (fetchpatch {
url = "https://github.com/janvidar/uhub/commit/70f2a43f676cdda5961950a8d9a21e12d34993f8.diff";
sha256 = "1jp8fvw6f9jh0sdjml9mahkk6p6b96p6rzg2y601mnnbcdj8y8xp";
})
diff --git a/pkgs/servers/uhub/plugin-dir.patch b/pkgs/servers/uhub/plugin-dir.patch
index 01cbcbb31cf..d29d600425f 100644
--- a/pkgs/servers/uhub/plugin-dir.patch
+++ b/pkgs/servers/uhub/plugin-dir.patch
@@ -7,7 +7,7 @@
- install( TARGETS mod_example mod_welcome mod_logging mod_auth_simple mod_auth_sqlite mod_chat_history mod_chat_history_sqlite mod_chat_only mod_topic mod_no_guest_downloads DESTINATION /usr/lib/uhub/ OPTIONAL )
- install( FILES ${CMAKE_SOURCE_DIR}/doc/uhub.conf ${CMAKE_SOURCE_DIR}/doc/plugins.conf ${CMAKE_SOURCE_DIR}/doc/rules.txt ${CMAKE_SOURCE_DIR}/doc/motd.txt DESTINATION /etc/uhub OPTIONAL )
+
-+ set( PLUGINS mod_example mod_welcome mod_logging mod_auth_simple mod_chat_history mod_chat_only mod_topic mod_no_guest_downloads )
++ set( PLUGINS mod_example mod_welcome mod_logging mod_auth_simple mod_auth_sqlite mod_chat_history mod_chat_only mod_topic mod_no_guest_downloads )
+
+ foreach( PLUGIN ${PLUGINS} )
+ install( TARGETS ${PLUGIN} DESTINATION $ENV{${PLUGIN}} OPTIONAL )
diff --git a/pkgs/servers/unifi/default.nix b/pkgs/servers/unifi/default.nix
index ae7dd980577..fd1787d4c99 100644
--- a/pkgs/servers/unifi/default.nix
+++ b/pkgs/servers/unifi/default.nix
@@ -49,13 +49,9 @@ in rec {
};
unifiStable = generic {
- version = "5.8.30";
- sha256 = "051cx1y51xmhvd3s8zbmknrcjdi46mj4yf1rlnngzr77rj77sqvi";
- };
-
- unifiTesting = generic {
version = "5.9.29";
- suffix = "-04b5d20997";
sha256 = "0djdjh7lwaa5nvhvz2yh6dn07iad5nq4jpab7rc909sljl6wvwvx";
};
+
+ unifiTesting = unifiStable;
}
diff --git a/pkgs/tools/X11/x11vnc/default.nix b/pkgs/tools/X11/x11vnc/default.nix
index 2dc6d8ffd78..6dc785621b5 100644
--- a/pkgs/tools/X11/x11vnc/default.nix
+++ b/pkgs/tools/X11/x11vnc/default.nix
@@ -1,35 +1,49 @@
-{ stdenv, fetchurl, openssl, zlib, libjpeg, xorg, coreutils }:
+{ stdenv, fetchFromGitHub,
+ openssl, zlib, libjpeg, xorg, coreutils, libvncserver,
+ autoreconfHook, pkgconfig }:
stdenv.mkDerivation rec {
- name = "x11vnc-0.9.13";
+ name = "x11vnc-${version}";
+ version = "0.9.15";
- src = fetchurl {
- url = "mirror://sourceforge/libvncserver/${name}.tar.gz";
- sha256 = "0fzib5xb1vbs8kdprr4z94v0fshj2c5hhaz69llaarwnc8p9z0pn";
+ src = fetchFromGitHub {
+ owner = "LibVNC";
+ repo = "x11vnc";
+ rev = version;
+ sha256 = "1a1b65k1hsy4nhg2sx1yrpaz3vx6s7rmrx8nwygpaam8wpdlkh8p";
};
+ nativeBuildInputs = [ autoreconfHook pkgconfig ];
+
buildInputs =
[ xorg.libXfixes xorg.fixesproto openssl xorg.libXdamage
xorg.damageproto zlib xorg.libX11 xorg.xproto libjpeg
xorg.libXtst xorg.libXinerama xorg.xineramaproto xorg.libXrandr
xorg.randrproto xorg.libXext xorg.xextproto xorg.inputproto
xorg.recordproto xorg.libXi xorg.libXrender xorg.renderproto
+ libvncserver
];
- preConfigure = ''
- configureFlags="--mandir=$out/share/man"
-
- substituteInPlace x11vnc/unixpw.c \
+ postPatch = ''
+ substituteInPlace src/unixpw.c \
--replace '"/bin/su"' '"/run/wrappers/bin/su"' \
--replace '"/bin/true"' '"${coreutils}/bin/true"'
- sed -i -e '/#!\/bin\/sh/a"PATH=${xorg.xdpyinfo}\/bin:${xorg.xauth}\/bin:$PATH\\n"' -e 's|/bin/su|/run/wrappers/bin/su|g' x11vnc/ssltools.h
+ sed -i -e '/#!\/bin\/sh/a"PATH=${xorg.xdpyinfo}\/bin:${xorg.xauth}\/bin:$PATH\\n"' -e 's|/bin/su|/run/wrappers/bin/su|g' src/ssltools.h
+
+ # Xdummy script is currently broken, so we avoid building it. This removes everything Xdummy-related from the affected Makefile
+ sed -i -e '/^\tXdummy.c\ \\$/,$d' -e 's/\tx11vnc_loop\ \\/\tx11vnc_loop/' misc/Makefile.am
+ '';
+
+ preConfigure = ''
+ configureFlags="--mandir=$out/share/man"
'';
meta = with stdenv.lib; {
description = "A VNC server connected to a real X11 screen";
- homepage = http://www.karlrunge.com/x11vnc/;
+ homepage = https://github.com/LibVNC/x11vnc/;
platforms = platforms.linux;
license = licenses.gpl2;
+ maintainers = with maintainers; [ OPNA2608 ];
};
}
diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix
index 3e4d49108b7..7f1552f9197 100644
--- a/pkgs/tools/X11/xpra/default.nix
+++ b/pkgs/tools/X11/xpra/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, lib, fetchurl, callPackage, python2Packages, pkgconfig
-, xorg, gtk2, glib, pango, cairo, gdk_pixbuf, atk
-, makeWrapper, xorgserver, getopt, xauth, utillinux, which
+{ stdenv, lib, fetchurl, callPackage, substituteAll, python3, pkgconfig
+, xorg, gtk3, glib, pango, cairo, gdk_pixbuf, atk
+, wrapGAppsHook, xorgserver, getopt, xauth, utillinux, which
, ffmpeg, x264, libvpx, libwebp
, libfakeXinerama
, gst_all_1, pulseaudio, gobjectIntrospection
@@ -9,7 +9,7 @@
with lib;
let
- inherit (python2Packages) cython buildPythonApplication;
+ inherit (python3.pkgs) cython buildPythonApplication;
xf86videodummy = callPackage ./xf86videodummy { };
in buildPythonApplication rec {
@@ -21,7 +21,14 @@ in buildPythonApplication rec {
sha256 = "0wa3kx54himy3i1b2801hlzfilh3cf4kjk40k1cjl0ds28m5hija";
};
- nativeBuildInputs = [ pkgconfig ];
+ patches = [
+ (substituteAll {
+ src = ./fix-paths.patch;
+ inherit (xorg) xkeyboardconfig;
+ })
+ ];
+
+ nativeBuildInputs = [ pkgconfig gobjectIntrospection wrapGAppsHook ];
buildInputs = [
cython
@@ -30,11 +37,10 @@ in buildPythonApplication rec {
xorg.xproto xorg.fixesproto xorg.libXtst xorg.libXfixes xorg.libXcomposite xorg.libXdamage
xorg.libXrandr xorg.libxkbfile
- pango cairo gdk_pixbuf atk gtk2 glib
+ pango cairo gdk_pixbuf atk gtk3 glib
ffmpeg libvpx x264 libwebp
- gobjectIntrospection
gst_all_1.gstreamer
gst_all_1.gst-plugins-base
gst_all_1.gst-plugins-good
@@ -42,38 +48,34 @@ in buildPythonApplication rec {
gst_all_1.gst-libav
pam
-
- makeWrapper
];
- propagatedBuildInputs = with python2Packages; [
- pillow pygtk pygobject2 rencode pycrypto cryptography pycups lz4 dbus-python
- netifaces numpy websockify pygobject3 gst-python pam
+ propagatedBuildInputs = with python3.pkgs; [
+ pillow rencode pycrypto cryptography pycups lz4 dbus-python
+ netifaces numpy websockify pygobject3 pycairo gst-python pam
];
- preBuild = ''
- export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags gtk+-2.0) $(pkg-config --cflags pygtk-2.0) $(pkg-config --cflags xtst)"
- substituteInPlace xpra/server/auth/pam_auth.py --replace "/lib/libpam.so.1" "${pam}/lib/libpam.so"
- substituteInPlace xpra/x11/bindings/keyboard_bindings.pyx --replace "/usr/share/X11/xkb" "${xorg.xkeyboardconfig}/share/X11/xkb"
- '';
- setupPyBuildFlags = ["--with-Xdummy" "--without-strict"];
+ NIX_CFLAGS_COMPILE = [
+ # error: 'import_cairo' defined but not used
+ "-Wno-error=unused-function"
+ ];
- postInstall = ''
- wrapProgram $out/bin/xpra \
- --set XPRA_INSTALL_PREFIX "$out" \
- --set GI_TYPELIB_PATH "$GI_TYPELIB_PATH" \
- --set GST_PLUGIN_SYSTEM_PATH_1_0 "$GST_PLUGIN_SYSTEM_PATH_1_0" \
- --prefix LD_LIBRARY_PATH : ${libfakeXinerama}/lib \
+ setupPyBuildFlags = [
+ "--with-Xdummy"
+ "--without-strict"
+ "--with-gtk3"
+ "--without-gtk2"
+ ];
+
+ preFixup = ''
+ gappsWrapperArgs+=(
+ --set XPRA_INSTALL_PREFIX "$out"
+ --prefix LD_LIBRARY_PATH : ${libfakeXinerama}/lib
--prefix PATH : ${stdenv.lib.makeBinPath [ getopt xorgserver xauth which utillinux pulseaudio ]}
+ )
'';
- preCheck = "exit 0";
-
- #TODO: replace postInstall with postFixup to avoid double wrapping of xpra; needs more work though
- #postFixup = ''
- # sed -i '3iexport FONTCONFIG_FILE="${fontsConf}"' $out/bin/xpra
- # sed -i '4iexport PATH=${stdenv.lib.makeBinPath [ getopt xorgserver xauth which utillinux ]}\${PATH:+:}\$PATH' $out/bin/xpra
- #'';
+ doCheck = false;
passthru = { inherit xf86videodummy; };
diff --git a/pkgs/tools/X11/xpra/fix-paths.patch b/pkgs/tools/X11/xpra/fix-paths.patch
new file mode 100644
index 00000000000..c50ec28c35e
--- /dev/null
+++ b/pkgs/tools/X11/xpra/fix-paths.patch
@@ -0,0 +1,33 @@
+--- a/setup.py
++++ b/setup.py
+@@ -1885,7 +1885,7 @@
+ if OSX:
+ pycairo = "py3cairo"
+ else:
+- pycairo = "pycairo"
++ pycairo = "py3cairo"
+ cython_add(Extension("xpra.client.gtk3.cairo_workaround",
+ ["xpra/client/gtk3/cairo_workaround.pyx"],
+ **pkgconfig(pycairo)
+--- a/xpra/client/gtk3/cairo_workaround.pyx
++++ b/xpra/client/gtk3/cairo_workaround.pyx
+@@ -65,7 +65,7 @@
+ void cairo_surface_flush (cairo_surface_t *surface)
+ void cairo_surface_mark_dirty (cairo_surface_t *surface)
+
+-cdef extern from "pycairo/pycairo.h":
++cdef extern from "py3cairo.h":
+ ctypedef struct Pycairo_CAPI_t:
+ pass
+ ctypedef struct PycairoSurface:
+--- a/xpra/x11/bindings/keyboard_bindings.pyx
++++ b/xpra/x11/bindings/keyboard_bindings.pyx
+@@ -19,7 +19,7 @@
+
+ DEF PATH_MAX = 1024
+ DEF DFLT_XKB_RULES_FILE = "base"
+-DEF DFLT_XKB_CONFIG_ROOT = "/usr/share/X11/xkb"
++DEF DFLT_XKB_CONFIG_ROOT = "@xkeyboardconfig@/share/X11/xkb"
+
+ ###################################
+ # Headers, python magic
diff --git a/pkgs/tools/X11/xpra/gtk3.nix b/pkgs/tools/X11/xpra/gtk3.nix
deleted file mode 100644
index ceba4269e80..00000000000
--- a/pkgs/tools/X11/xpra/gtk3.nix
+++ /dev/null
@@ -1,79 +0,0 @@
-{ stdenv, fetchurl, buildPythonApplication
-, python, cython, pkgconfig
-, xorg, gtk3, glib, pango, cairo, gdk_pixbuf, atk, pygobject3, pycairo, gobjectIntrospection
-, makeWrapper, xorgserver, getopt, xauth, utillinux, which, fontsConf
-, ffmpeg, x264, libvpx, libwebp
-, libfakeXinerama, pam }:
-
-buildPythonApplication rec {
- name = "xpra-${version}";
- version = "2.2.5";
-
- src = fetchurl {
- url = "https://xpra.org/src/${name}.tar.xz";
- sha256 = "1q2l00nc3bgwlhjzkbk4a8x2l8z9w1799yn31icsx5hrgh98a1js";
- };
-
- patchPhase = ''
- substituteInPlace setup.py --replace 'pycairo' 'py3cairo'
- substituteInPlace xpra/client/gtk3/cairo_workaround.pyx --replace 'pycairo/pycairo.h' 'py3cairo.h'
- '';
-
- nativeBuildInputs = [ pkgconfig ];
- buildInputs = [
- xorg.libX11 xorg.renderproto xorg.libXrender xorg.libXi xorg.inputproto xorg.kbproto
- xorg.randrproto xorg.damageproto xorg.compositeproto xorg.xextproto xorg.recordproto
- xorg.xproto xorg.fixesproto xorg.libXtst xorg.libXfixes xorg.libXcomposite xorg.libXdamage
- xorg.libXrandr xorg.libxkbfile
-
- pango cairo gdk_pixbuf atk gtk3 glib gobjectIntrospection
-
- ffmpeg libvpx x264 libwebp
-
- makeWrapper
-
- pam
- ];
-
- propagatedBuildInputs = [
- pygobject3 pycairo cython
- ];
-
- preBuild = ''
- export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags gtk+-3.0) $(pkg-config --cflags xtst)"
- substituteInPlace xpra/server/auth/pam_auth.py --replace "/lib/libpam.so.1" "${pam}/lib/libpam.so"
- '';
- setupPyBuildFlags = [ "--without-strict" "--with-gtk3" "--without-gtk2" "--with-Xdummy" ];
-
- preInstall = ''
- # see https://bitbucket.org/pypa/setuptools/issue/130/install_data-doesnt-respect-prefix
- ${python}/bin/${python.executable} setup.py install_data --install-dir=$out --root=$out
- sed -i '/ = data_files/d' setup.py
- '';
-
- postInstall = ''
- wrapProgram $out/bin/xpra \
- --set FONTCONFIG_FILE "${fontsConf}" \
- --prefix LD_LIBRARY_PATH : ${libfakeXinerama}/lib \
- --prefix PATH : ${stdenv.lib.makeBinPath [ getopt xorgserver xauth which utillinux ]}
- '';
-
- preCheck = "exit 0";
- doInstallCheck = false;
-
- #TODO: replace postInstall with postFixup to avoid double wrapping of xpra; needs more work though
- #postFixup = ''
- # sed -i '3iexport FONTCONFIG_FILE="${fontsConf}"' $out/bin/xpra
- # sed -i '4iexport PATH=${stdenv.lib.makeBinPath [ getopt xorgserver xauth which utillinux ]}\${PATH:+:}\$PATH' $out/bin/xpra
- #'';
-
-
- meta = with stdenv.lib; {
- homepage = http://xpra.org/;
- downloadPage = "https://xpra.org/src/";
- downloadURLRegexp = "xpra-.*[.]tar[.]xz$";
- description = "Persistent remote applications for X";
- platforms = platforms.linux;
- license = licenses.gpl2;
- };
-}
diff --git a/pkgs/tools/audio/abcm2ps/default.nix b/pkgs/tools/audio/abcm2ps/default.nix
index 023d03f0414..5d3050108b8 100644
--- a/pkgs/tools/audio/abcm2ps/default.nix
+++ b/pkgs/tools/audio/abcm2ps/default.nix
@@ -1,14 +1,14 @@
-{ stdenv, fetchFromGitHub, pkgconfig, which, freetype, pango }:
+{ stdenv, fetchFromGitHub, pkgconfig, which, docutils, freetype, pango }:
stdenv.mkDerivation rec {
name = "abcm2ps-${version}";
- version = "8.13.24";
+ version = "8.14.0";
src = fetchFromGitHub {
owner = "leesavide";
repo = "abcm2ps";
rev = "v${version}";
- sha256 = "0xb0gdxbagy6bzrh61s667svab43r06d6yi20gw52dh022mj99ag";
+ sha256 = "1nlvq2cfdy5pghll3aprws7yx5p14gcrhz10q9fa6myrd8ad4if1";
};
prePatch = ''
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
"CC=${stdenv.cc}/bin/cc"
];
- nativeBuildInputs = [ which pkgconfig ];
+ nativeBuildInputs = [ which pkgconfig docutils ];
buildInputs = [ freetype pango ];
diff --git a/pkgs/tools/filesystems/bcachefs-tools/default.nix b/pkgs/tools/filesystems/bcachefs-tools/default.nix
index ee1ee2e6178..75737e2da7f 100644
--- a/pkgs/tools/filesystems/bcachefs-tools/default.nix
+++ b/pkgs/tools/filesystems/bcachefs-tools/default.nix
@@ -2,12 +2,12 @@
, liburcu, zlib, libaio, zstd, lz4 }:
stdenv.mkDerivation rec {
- name = "bcachefs-tools-unstable-2018-08-22";
+ name = "bcachefs-tools-unstable-2018-10-12";
src = fetchgit {
url = "https://evilpiepirate.org/git/bcachefs-tools.git";
- rev = "ebf97e8e01a8e76ff4bec23f29106430852c3081";
- sha256 = "0f2ycin0gmi1a4fm7qln0c10zn451gljfbc2piy1fm768xqqrmld";
+ rev = "55fbb25501330038e1714905b9ddeb25d875c11c";
+ sha256 = "0cwzbyf133jc0fkc8nmjcvv3wmglqhyxda1hh10hgxrbq5vm39wx";
};
enableParallelBuilding = true;
diff --git a/pkgs/tools/misc/esptool/default.nix b/pkgs/tools/misc/esptool/default.nix
index abb0b4edc17..fe574b4f8d4 100644
--- a/pkgs/tools/misc/esptool/default.nix
+++ b/pkgs/tools/misc/esptool/default.nix
@@ -2,13 +2,13 @@
python3.pkgs.buildPythonApplication rec {
pname = "esptool";
- version = "2.5.0";
+ version = "2.5.1";
src = fetchFromGitHub {
owner = "espressif";
repo = "esptool";
rev = "v${version}";
- sha256 = "0cvxapcln1xcz8hy0hidw6g8q61s5j3q03j3wrviagbh0zip8jdx";
+ sha256 = "19l3b1fqg1n3ch484dcibbi5a3nbmjq086has5pwqn348h4k57mh";
};
checkInputs = with python3.pkgs; [ flake8 flake8-future-import flake8-import-order ];
diff --git a/pkgs/tools/networking/speedtest-cli/default.nix b/pkgs/tools/networking/speedtest-cli/default.nix
deleted file mode 100644
index eedea841356..00000000000
--- a/pkgs/tools/networking/speedtest-cli/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv, fetchFromGitHub, python3Packages }:
-
-python3Packages.buildPythonApplication rec {
- name = "speedtest-cli-${version}";
- version = "2.0.2";
-
- src = fetchFromGitHub {
- owner = "sivel";
- repo = "speedtest-cli";
- rev = "v${version}";
- sha256 = "0vv2z37g2kgm2dzkfa4bhri92hs0d1acxi8z66gznsl5148q7sdi";
- };
-
- meta = with stdenv.lib; {
- homepage = https://github.com/sivel/speedtest-cli;
- description = "Command line interface for testing internet bandwidth using speedtest.net";
- platforms = platforms.all;
- license = licenses.asl20;
- maintainers = with maintainers; [ domenkozar ndowens ];
- };
-}
diff --git a/pkgs/tools/package-management/appimage-run/default.nix b/pkgs/tools/package-management/appimage-run/default.nix
index 8e236aa426f..e744b897f46 100644
--- a/pkgs/tools/package-management/appimage-run/default.nix
+++ b/pkgs/tools/package-management/appimage-run/default.nix
@@ -134,7 +134,8 @@ buildFHSUserEnv {
if ${file}/bin/file --mime-type --brief --keep-going "$APPIMAGE" | grep -q iso; then
# is type-1 appimage
- ${libarchive}/bin/bsdtar -x -C "$SQUASHFS_ROOT" -f "$APPIMAGE"
+ mkdir "$APPDIR"
+ ${libarchive}/bin/bsdtar -x -C "$APPDIR" -f "$APPIMAGE"
else
# is type-2 appimage
"$APPIMAGE" --appimage-extract 2>/dev/null
diff --git a/pkgs/tools/security/monkeysphere/default.nix b/pkgs/tools/security/monkeysphere/default.nix
index f4def72b728..228695878dc 100644
--- a/pkgs/tools/security/monkeysphere/default.nix
+++ b/pkgs/tools/security/monkeysphere/default.nix
@@ -1,27 +1,44 @@
{ stdenv, fetchurl, makeWrapper
, perl, libassuan, libgcrypt
, perlPackages, lockfileProgs, gnupg
+# For the tests:
+, bash, openssh, which, socat, cpio, hexdump
}:
stdenv.mkDerivation rec {
name = "monkeysphere-${version}";
- version = "0.41";
+ version = "0.42";
src = fetchurl {
url = "http://archive.monkeysphere.info/debian/pool/monkeysphere/m/monkeysphere/monkeysphere_${version}.orig.tar.gz";
- sha256 = "0jz7kwkwgylqprnl8bwvl084s5gjrilza77ln18i3f6x48b2y6li";
+ sha256 = "1haqgjxm8v2xnhc652lx79p2cqggb9gxgaf19w9l9akar2qmdjf1";
};
patches = [ ./monkeysphere.patch ];
nativeBuildInputs = [ makeWrapper ];
- buildInputs = [ perl libassuan libgcrypt ];
+ buildInputs = [ perl libassuan libgcrypt ]
+ ++ stdenv.lib.optional doCheck
+ ([ gnupg openssh which socat cpio hexdump ] ++
+ (with perlPackages; [ CryptOpenSSLRSA CryptOpenSSLBignum ]));
makeFlags = ''
PREFIX=/
DESTDIR=$(out)
'';
+ # Not all checks pass yet (NixOS specific problems) and the tests "drain"
+ # entropy (apparently GnuPG still uses /dev/random).
+ doCheck = false;
+ preCheck = ''
+ patchShebangs tests/keytrans
+ patchShebangs src/share/keytrans
+ patchShebangs src/share/checkperms
+ sed -i "s,/usr/bin/env\ bash,${bash}/bin/bash," tests/basic
+ sed -i "s,/usr/sbin/sshd,${openssh}/bin/sshd," tests/basic
+ sed -i "s/<(hd/<(hexdump/" tests/keytrans
+ '';
+
postFixup =
let wrapperArgs = runtimeDeps:
"--prefix PERL5LIB : "
diff --git a/pkgs/tools/system/fio/default.nix b/pkgs/tools/system/fio/default.nix
index 41016dc49fa..c0210127d9f 100644
--- a/pkgs/tools/system/fio/default.nix
+++ b/pkgs/tools/system/fio/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
name = "fio-${version}";
- version = "3.10";
+ version = "3.11";
src = fetchFromGitHub {
owner = "axboe";
repo = "fio";
rev = "fio-${version}";
- sha256 = "0cg6knaja32g46j1vlf0qw4q8yng7hrnnvh6b768pbjdxpn3wvi0";
+ sha256 = "0k5hja50qmz6qwm8h7z00zdgxhf1vg1g168jinqzn1521fihvlvz";
};
buildInputs = [ python zlib ]
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index b9ee19d2af3..0f243df540d 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -319,6 +319,7 @@ mapAliases ({
xmonad_log_applet_gnome3 = xmonad_log_applet; # added 2018-05-01
xf86_video_nouveau = xorg.xf86videonouveau; # added 2015-09
xlibs = xorg; # added 2015-09
+ xpraGtk3 = xpra; # added 2018-09-13
youtubeDL = youtube-dl; # added 2014-10-26
# added 2017-05-27
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bea9cb81ffa..af8fded2d4e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6968,14 +6968,12 @@ with pkgs;
(lib.addMetaAttrs { outputsToInstall = [ "jre" ]; }
((openjdk8.override { minimal = true; }).jre // { outputs = [ "jre" ]; }));
- jdk10 = if stdenv.isAarch32 || stdenv.isAarch64 then oraclejdk10 else openjdk10 // { outputs = [ "out" ]; };
- jre10 = if stdenv.isAarch32 || stdenv.isAarch64 then oraclejre10 else lib.setName "openjre-${lib.getVersion pkgs.openjdk10.jre}"
+ jdk10 = openjdk10 // { outputs = [ "out" ]; };
+ jre10 = lib.setName "openjre-${lib.getVersion pkgs.openjdk10.jre}"
(lib.addMetaAttrs { outputsToInstall = [ "jre" ]; }
(openjdk10.jre // { outputs = [ "jre" ]; }));
jre10_headless =
- if stdenv.isAarch32 || stdenv.isAarch64 then
- oraclejre10
- else if stdenv.isDarwin then
+ if stdenv.isDarwin then
jre10
else
lib.setName "openjre-${lib.getVersion pkgs.openjdk10.jre}-headless"
@@ -8849,7 +8847,7 @@ with pkgs;
sparse = callPackage ../development/tools/analysis/sparse { };
- speedtest-cli = callPackage ../tools/networking/speedtest-cli { };
+ speedtest-cli = with python3Packages; toPythonApplication speedtest-cli;
spin = callPackage ../development/tools/analysis/spin { };
@@ -15820,9 +15818,7 @@ with pkgs;
bristol = callPackage ../applications/audio/bristol { };
- bs1770gain = callPackage ../applications/audio/bs1770gain {
- ffmpeg = ffmpeg_2;
- };
+ bs1770gain = callPackage ../applications/audio/bs1770gain { };
bspwm = callPackage ../applications/window-managers/bspwm { };
@@ -19787,8 +19783,6 @@ with pkgs;
xpra = callPackage ../tools/X11/xpra { };
libfakeXinerama = callPackage ../tools/X11/xpra/libfakeXinerama.nix { };
- #TODO: 'pil' is not available for python3, yet
- xpraGtk3 = callPackage ../tools/X11/xpra/gtk3.nix { inherit (texFunctions) fontsConf; inherit (python3Packages) buildPythonApplication python cython pygobject3 pycairo; };
xrectsel = callPackage ../tools/X11/xrectsel { };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8ac69021525..56fa061f8a5 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -577,6 +577,8 @@ in {
python-lz4 = callPackage ../development/python-modules/python-lz4 { };
+ python-ldap-test = callPackage ../development/python-modules/python-ldap-test { };
+
python-igraph = callPackage ../development/python-modules/python-igraph {
pkgconfig = pkgs.pkgconfig;
igraph = pkgs.igraph;
@@ -584,6 +586,8 @@ in {
python3-openid = callPackage ../development/python-modules/python3-openid { };
+ python-packer = callPackage ../development/python-modules/python-packer { };
+
python-periphery = callPackage ../development/python-modules/python-periphery { };
python-prctl = callPackage ../development/python-modules/python-prctl { };
@@ -827,6 +831,8 @@ in {
backports_functools_lru_cache = callPackage ../development/python-modules/backports_functools_lru_cache { };
+ backports_os = callPackage ../development/python-modules/backports_os { };
+
backports_shutil_get_terminal_size = callPackage ../development/python-modules/backports_shutil_get_terminal_size { };
backports_ssl_match_hostname = if !(pythonOlder "3.5") then null else
@@ -1850,6 +1856,10 @@ in {
pycassa = callPackage ../development/python-modules/pycassa { };
+ lirc = disabledIf isPy27 (toPythonModule (pkgs.lirc.override {
+ python3 = python;
+ }));
+
pyblake2 = callPackage ../development/python-modules/pyblake2 { };
pybluez = callPackage ../development/python-modules/pybluez { };
@@ -2164,6 +2174,8 @@ in {
docker_compose = callPackage ../development/python-modules/docker_compose {};
+ pyftpdlib = callPackage ../development/python-modules/pyftpdlib { };
+
fdroidserver = callPackage ../development/python-modules/fdroidserver { };
filebrowser_safe = callPackage ../development/python-modules/filebrowser_safe { };
@@ -2307,38 +2319,6 @@ in {
forbiddenfruit = callPackage ../development/python-modules/forbiddenfruit { };
- fs = buildPythonPackage rec {
- name = "fs-0.5.4";
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/f/fs/${name}.tar.gz";
- sha256 = "ba2cca8773435a7c86059d57cb4b8ea30fda40f8610941f7822d1ce3ffd36197";
- };
-
- LC_ALL = "en_US.UTF-8";
- buildInputs = [ pkgs.glibcLocales ];
- propagatedBuildInputs = [ self.six ];
-
- checkPhase = ''
- ${python.interpreter} -m unittest discover
- '';
-
- # Because 2to3 is used the tests in $out need to be run.
- # Both when using unittest and pytest this resulted in many errors,
- # some Python byte/str errors, and others specific to resources tested.
- # Failing tests due to the latter is to be expected with this type of package.
- # Tests are therefore disabled.
- doCheck = false;
-
- meta = {
- description = "Filesystem abstraction";
- homepage = https://pypi.python.org/pypi/fs;
- license = licenses.bsd3;
- maintainers = with maintainers; [ lovek323 ];
- platforms = platforms.unix;
- };
- };
-
fusepy = callPackage ../development/python-modules/fusepy { };
future = callPackage ../development/python-modules/future { };
@@ -2616,6 +2596,8 @@ in {
python-Levenshtein = callPackage ../development/python-modules/python-levenshtein { };
+ fs = callPackage ../development/python-modules/fs { };
+
libcloud = callPackage ../development/python-modules/libcloud { };
libgpuarray = callPackage ../development/python-modules/libgpuarray {
@@ -9456,6 +9438,8 @@ EOF
};
};
+ speedtest-cli = callPackage ../development/python-modules/speedtest-cli { };
+
pushbullet = callPackage ../development/python-modules/pushbullet { };
power = buildPythonPackage rec {