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

Merge staging into staging-next

Browse Source
This commit is contained in:
Frederik Rietdijk 2018-10-18 11:44:43 +02:00
commit 4c774f24ac
508 changed files with 9812 additions and 6722 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
maintainers/maintainer-list.nix
View File

@ -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";

24
nixos/modules/config/pulseaudio.nix
View File

@ -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;
})

12
nixos/modules/hardware/video/nvidia.nix
View File

@ -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 ];

4
nixos/modules/services/hardware/lirc.nix
View File

@ -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} \

18
nixos/modules/services/mail/postfix.nix
View File

@ -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";

4
nixos/modules/services/misc/weechat.nix
View File

@ -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;

2
nixos/modules/services/misc/weechat.xml
View File

@ -54,7 +54,7 @@
</programlisting>
Now, the session can be re-attached like this:
<programlisting>
screen -r weechat-screen
screen -x weechat/weechat-screen
</programlisting>
</para>

6
nixos/modules/services/networking/hostapd.nix
View File

@ -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}";

10
pkgs/applications/altcoins/monero-gui/default.nix
View File

@ -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 = [

7
pkgs/applications/altcoins/monero/default.nix
View File

@ -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 = [

4
pkgs/applications/audio/bs1770gain/default.nix
View File

@ -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 ];

5
pkgs/applications/audio/clementine/default.nix
View File

@ -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

6
pkgs/applications/audio/gtkpod/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, wrapGAppsHook, intltool, libgpod, curl, flac,
gnome3, gtk3, gettext, perl, perlXMLParser, flex, libid3tag,
gnome3, gtk3, gettext, perlPackages, flex, libid3tag,
libvorbis, gdk_pixbuf }:
stdenv.mkDerivation rec {
@ -13,10 +13,10 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig wrapGAppsHook intltool ];
buildInputs = [
curl gettext perl perlXMLParser
curl gettext
flex libgpod libid3tag flac libvorbis gtk3 gdk_pixbuf
gnome3.gdl gnome3.defaultIconTheme gnome3.anjuta
];
] ++ (with perlPackages; [ perl XMLParser ]);
patchPhase = ''
sed -i 's/which/type -P/' scripts/*.sh

8
pkgs/applications/audio/jamin/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, fftwFloat, gtk2, ladspaPlugins, libjack2, liblo, libxml2
, makeWrapper, pkgconfig, perl, perlXMLParser
, makeWrapper, pkgconfig, perlPackages
}:
stdenv.mkDerivation {
@ -11,10 +11,8 @@ stdenv.mkDerivation {
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [
fftwFloat gtk2 ladspaPlugins libjack2 liblo libxml2 perl
perlXMLParser makeWrapper
];
buildInputs = [ fftwFloat gtk2 ladspaPlugins libjack2 liblo libxml2 makeWrapper ]
++ (with perlPackages; [ perl XMLParser ]);
postInstall = ''
wrapProgram $out/bin/jamin --set LADSPA_PATH ${ladspaPlugins}/lib/ladspa

37
pkgs/applications/audio/pulseaudio-modules-bt/default.nix
View File

@ -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; {

11
pkgs/applications/audio/pulseaudio-modules-bt/fix-install-path.patch Normal file
View File

@ -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/)

8
pkgs/applications/graphics/cinepaint/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, cmake, pkgconfig, gtk2, freetype, fontconfig, lcms,
flex, libtiff, libjpeg, libpng, libexif, zlib, perl, libX11,
perlXMLParser, pythonPackages, gettext, intltool, babl, gegl,
flex, libtiff, libjpeg, libpng, libexif, zlib, perlPackages, libX11,
pythonPackages, gettext, intltool, babl, gegl,
glib, makedepend, xf86vidmodeproto, xineramaproto, libXmu, openexr,
libGLU_combined, libXext, libXpm, libXau, libXxf86vm, pixman, libpthreadstubs, fltk } :
@ -15,10 +15,10 @@ in stdenv.mkDerivation rec {
};
buildInputs = [ libpng gtk2 freetype fontconfig lcms flex libtiff libjpeg
libexif zlib perl libX11 perlXMLParser python pygtk gettext intltool babl
libexif zlib libX11 python pygtk gettext intltool babl
gegl glib makedepend xf86vidmodeproto xineramaproto libXmu openexr libGLU_combined
libXext libXpm libXau libXxf86vm pixman libpthreadstubs fltk
];
] ++ (with perlPackages; [ perl XMLParser ]);
hardeningDisable = [ "format" ];

9
pkgs/applications/graphics/dia/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchgit, autoconf, automake, libtool, gtk2, pkgconfig, perl,
perlXMLParser, libxml2, gettext, python, libxml2Python, docbook5, docbook_xsl,
{ stdenv, fetchgit, autoconf, automake, libtool, gtk2, pkgconfig, perlPackages,
libxml2, gettext, python, libxml2Python, docbook5, docbook_xsl,
libxslt, intltool, libart_lgpl, withGNOME ? false, libgnomeui, hicolor-icon-theme,
gtk-mac-integration-gtk2 }:
@ -14,12 +14,13 @@ stdenv.mkDerivation rec {
};
buildInputs =
[ gtk2 perlXMLParser libxml2 gettext python libxml2Python docbook5
[ gtk2 libxml2 gettext python libxml2Python docbook5
libxslt docbook_xsl libart_lgpl hicolor-icon-theme ]
++ stdenv.lib.optional withGNOME libgnomeui
++ stdenv.lib.optional stdenv.isDarwin gtk-mac-integration-gtk2;
nativeBuildInputs = [ autoconf automake libtool pkgconfig intltool perl ];
nativeBuildInputs = [ autoconf automake libtool pkgconfig intltool ]
++ (with perlPackages; [ perl XMLParser ]);
preConfigure = ''
NOCONFIGURE=1 ./autogen.sh # autoreconfHook is not enough

5
pkgs/applications/graphics/gcolor2/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, gtk2, perl, perlXMLParser, pkgconfig } :
{stdenv, fetchurl, gtk2, perlPackages, pkgconfig } :
let version = "0.4"; in
stdenv.mkDerivation {
@ -21,7 +21,8 @@ stdenv.mkDerivation {
[ ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ gtk2 perl perlXMLParser ];
buildInputs = [ gtk2 ]
++ (with perlPackages; [ perl XMLParser ]);
meta = {
description = "Simple GTK+2 color selector";

5
pkgs/applications/graphics/inkscape/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, perl, perlXMLParser, libXft
{ stdenv, fetchurl, pkgconfig, perlPackages, libXft
, libpng, zlib, popt, boehmgc, libxml2, libxslt, glib, gtkmm2
, glibmm, libsigcxx, lcms, boost, gettext, makeWrapper
, gsl, python2, poppler, imagemagick, libwpg, librevenge
@ -39,7 +39,8 @@ stdenv.mkDerivation rec {
--replace '"python-interpreter", "python"' '"python-interpreter", "${python2Env}/bin/python"'
'';
nativeBuildInputs = [ pkgconfig cmake makeWrapper python2Env perl perlXMLParser ];
nativeBuildInputs = [ pkgconfig cmake makeWrapper python2Env ]
++ (with perlPackages; [ perl XMLParser ]);
buildInputs = [
libXft libpng zlib popt boehmgc
libxml2 libxslt glib gtkmm2 glibmm libsigcxx lcms boost gettext

4
pkgs/applications/misc/get_iplayer/default.nix
View File

@ -1,8 +1,8 @@
{stdenv, fetchFromGitHub, atomicparsley, flvstreamer, ffmpeg, makeWrapper, perl, buildPerlPackage, perlPackages, rtmpdump}:
{stdenv, fetchFromGitHub, atomicparsley, flvstreamer, ffmpeg, makeWrapper, perl, perlPackages, rtmpdump}:
with stdenv.lib;
buildPerlPackage rec {
perlPackages.buildPerlPackage rec {
name = "get_iplayer-${version}";
version = "2.99";

4
pkgs/applications/misc/gpa/default.nix
View File

@ -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 ];

4
pkgs/applications/misc/pdfpc/default.nix
View File

@ -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 = [

4
pkgs/applications/misc/xmr-stak/default.nix
View File

@ -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";

8
pkgs/applications/networking/browsers/chromium/common.nix
View File

@ -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;

7
pkgs/applications/networking/instant-messengers/ekiga/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, glib, fetchurl, fetchpatch, cyrus_sasl, gettext, openldap, ptlib, opal, libXv, rarian, intltool
, perl, perlXMLParser, evolution-data-server, gnome-doc-utils, avahi, autoreconfHook
, perlPackages, evolution-data-server, gnome-doc-utils, avahi, autoreconfHook
, libsigcxx, gtk, dbus-glib, libnotify, libXext, xextproto, gnome3, boost, libsecret
, pkgconfig, libxml2, videoproto, unixODBC, db, nspr, nss, zlib
, libXrandr, randrproto, which, libxslt, libtasn1, gmp, nettle, sqlite, makeWrapper }:
@ -13,12 +13,13 @@ stdenv.mkDerivation rec {
};
buildInputs = [ cyrus_sasl gettext openldap ptlib opal libXv rarian intltool
perl perlXMLParser evolution-data-server gnome-doc-utils avahi
evolution-data-server gnome-doc-utils avahi
libsigcxx gtk dbus-glib libnotify libXext xextproto sqlite
gnome3.libsoup glib gnome3.defaultIconTheme boost
autoreconfHook pkgconfig libxml2 videoproto unixODBC db nspr
nss zlib libsecret libXrandr randrproto which libxslt libtasn1
gmp nettle makeWrapper ];
gmp nettle makeWrapper ]
++ (with perlPackages; [ perl XMLParser ]);
preAutoreconf = ''
substituteInPlace configure.ac --replace AM_GCONF_SOURCE_2 ""

7
pkgs/applications/networking/instant-messengers/pidgin/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, makeWrapper, pkgconfig, gtk2, gtkspell2, aspell
, gst_all_1, startupnotification, gettext
, perl, perlXMLParser, libxml2, nss, nspr, farstream
, perlPackages, libxml2, nss, nspr, farstream
, libXScrnSaver, ncurses, avahi, dbus, dbus-glib, intltool, libidn
, lib, python, libICE, libXext, libSM
, cyrus_sasl ? null
@ -40,9 +40,8 @@ let unwrapped = stdenv.mkDerivation rec {
++ (lib.optional (gnutls != null) gnutls)
++ (lib.optional (libgcrypt != null) libgcrypt);
propagatedBuildInputs = [
pkgconfig gtk2 perl perlXMLParser gettext
];
propagatedBuildInputs = [ pkgconfig gtk2 gettext ]
++ (with perlPackages; [ perl XMLParser ]);
patches = [ ./pidgin-makefile.patch ./add-search-path.patch ];

28
pkgs/applications/networking/instant-messengers/poezio/default.nix Normal file
View File

@ -0,0 +1,28 @@
{ lib, buildPythonApplication, fetchurl, pythonOlder
, pytest, aiodns, slixmpp, pyinotify, potr, mpd2, cffi, pkgconfig }:
buildPythonApplication rec {
name = "poezio-${version}";
version = "0.12";
disabled = pythonOlder "3.4";
buildInputs = [ pytest ];
propagatedBuildInputs = [ aiodns slixmpp pyinotify potr mpd2 cffi ];
nativeBuildInputs = [ pkgconfig ];
src = fetchurl {
url = "http://dev.louiz.org/attachments/download/129/${name}.tar.gz";
sha256 = "11n9x82xyjwbqk28lsfnvqwn8qc9flv6w2c64camh6j3148ykpvz";
};
checkPhase = ''
py.test
'';
meta = with lib; {
description = "Free console XMPP client";
homepage = https://poez.io;
license = licenses.mit;
maintainers = [ maintainers.lsix ];
};
}

2
pkgs/applications/networking/instant-messengers/rambox/bare.nix
View File

@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
inherit src;
nodejs = nodejs-8_x;
sha256 = "0mg1ilz65qyxgh5zg1f8fhx7ygz10w8ifamflpwbk8mrvqpkjlvr";
sha256 = "0hbw47653wh159c34f0rlj3p7xy0lvsyp0wh2hl35kv3fnsfbbm0";
};
patches = [ ./isDev.patch ];

2
pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
View File

@ -13,6 +13,8 @@ let
in {
stable = mkTelegram stableVersion;
preview = mkTelegram (stableVersion // {
version = "1.4.4";
sha256Hash = "1m1j485r3vzpglzfn8l4cqskysvkx8l3pqaw3fgp66jfajbxynf0";
stable = false;
});
}

6
pkgs/applications/office/gnumeric/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, intltool, perl, perlXMLParser
{ stdenv, fetchurl, pkgconfig, intltool, perlPackages
, goffice, gnome3, makeWrapper, gtk3, bison, pythonPackages
, itstool
}:
@ -29,10 +29,10 @@ in stdenv.mkDerivation rec {
# ToDo: optional libgda, introspection?
buildInputs = [
intltool perl perlXMLParser bison
intltool bison
goffice gtk3 makeWrapper gnome3.defaultIconTheme
python pygobject3 itstool
];
] ++ (with perlPackages; [ perl XMLParser ]);
enableParallelBuilding = true;

4
pkgs/applications/science/math/gmsh/default.nix
View File

@ -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

4
pkgs/applications/version-management/git-and-tools/git-recent/default.nix
View File

@ -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 ];

4
pkgs/applications/version-management/git-review/default.nix
View File

@ -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 ];

5
pkgs/applications/video/kino/default.nix
View File

@ -51,7 +51,7 @@
#AMR-WB IF2 support no
{ stdenv, fetchurl, gtk2, libglade, libxml2, libraw1394, libsamplerate, libdv
, pkgconfig, perl, perlXMLParser, libavc1394, libiec61883, libXv, gettext
, pkgconfig, perlPackages, libavc1394, libiec61883, libXv, gettext
, libX11, glib, cairo, intltool, ffmpeg, libv4l
}:
@ -64,7 +64,8 @@ stdenv.mkDerivation {
};
buildInputs = [ gtk2 libglade libxml2 libraw1394 libsamplerate libdv
pkgconfig perl perlXMLParser libavc1394 libiec61883 intltool libXv gettext libX11 glib cairo ffmpeg libv4l ]; # TODOoptional packages
pkgconfig libavc1394 libiec61883 intltool libXv gettext libX11 glib cairo ffmpeg libv4l ] # TODOoptional packages
++ (with perlPackages; [ perl XMLParser ]);
configureFlags = [ "--enable-local-ffmpeg=no" ];

4
pkgs/applications/video/wxcam/default.nix
View File

@ -4,7 +4,7 @@
, libX11, libXv, libSM
, gtk, libglade
, wxGTK
, perlXMLParser
, perlPackages
, xvidcore
, mjpegtools
, alsaLib
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
};
buildInputs = with stdenv.lib;
[ pkgconfig intltool libX11 libXv libSM gtk libglade wxGTK perlXMLParser xvidcore mjpegtools alsaLib libv4l cimg ];
[ pkgconfig intltool libX11 libXv libSM gtk libglade wxGTK perlPackages.XMLParser xvidcore mjpegtools alsaLib libv4l cimg ];
NIX_CFLAGS_COMPILE="-I ${cimg}/include/cimg";

6
pkgs/applications/video/xvidcap/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, perl, perlXMLParser, pkgconfig, gtk2
{ stdenv, fetchurl, perlPackages, pkgconfig, gtk2
, scrollkeeper, libglade, libXmu, libX11, libXext, gettext
, lame, libXfixes, libXdamage }:
@ -14,9 +14,9 @@ stdenv.mkDerivation {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [
perl perlXMLParser gtk2 scrollkeeper
gtk2 scrollkeeper
libglade libXmu gettext lame libXdamage libXfixes libXext libX11
];
] ++ (with perlPackages; [ perl XMLParser ]);
# !!! don't know why this is necessary
NIX_LDFLAGS = "-lXext -lX11 -lz -lgcc_s";

2
pkgs/build-support/fetchmavenartifact/default.nix
View File

@ -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.

7
pkgs/data/misc/shared-mime-info/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, pkgconfig, gettext, perl, perlXMLParser, intltool
{stdenv, fetchurl, pkgconfig, gettext, perlPackages, intltool
, libxml2, glib}:
let version = "1.10"; in
@ -10,9 +10,8 @@ stdenv.mkDerivation rec {
sha256 = "1gxyvwym3xgpmp262gfn8jg5sla6k5hy6m6dmy6grgiq90xsh9f6";
};
nativeBuildInputs = [
pkgconfig gettext intltool perl perlXMLParser libxml2 glib
];
nativeBuildInputs = [ pkgconfig gettext intltool ] ++ (with perlPackages; [ perl XMLParser ]);
buildInputs = [ libxml2 glib ];
meta = with stdenv.lib; {
inherit version;

45
pkgs/desktops/deepin/deepin-desktop-base/default.nix Normal file
View File

@ -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 ];
};
}

1
pkgs/desktops/deepin/default.nix
View File

@ -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 { };

5
pkgs/desktops/gnome-2/desktop/scrollkeeper/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, pkgconfig, perl, perlXMLParser, libxml2, libxslt, docbook_xml_dtd_42, automake, gettext}:
{stdenv, fetchurl, pkgconfig, perlPackages, libxml2, libxslt, docbook_xml_dtd_42, automake, gettext}:
stdenv.mkDerivation {
name = "scrollkeeper-0.3.14";
@ -14,6 +14,7 @@ stdenv.mkDerivation {
";
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ perl perlXMLParser libxml2 libxslt gettext];
buildInputs = [ libxml2 libxslt gettext ]
++ (with perlPackages; [ perl XMLParser ]);
configureFlags = [ "--with-xml-catalog=${docbook_xml_dtd_42}/xml/dtd/docbook/catalog.xml" ];
}

6
pkgs/development/compilers/nextpnr/default.nix
View File

@ -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 ];

10
pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix
View File

@ -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";

10
pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix
View File

@ -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";

6
pkgs/development/compilers/yosys/default.nix
View File

@ -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";
})

16
pkgs/development/haskell-modules/make-package-set.nix
View File

@ -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);

4
pkgs/development/interpreters/python/wrapper.nix
View File

@ -4,6 +4,8 @@
, postBuild ? ""
, ignoreCollisions ? false
, requiredPythonModules
# Wrap executables with the given argument.
, makeWrapperArgs ? []
, }:
# Create a python executable that knows about additional packages.
@ -32,7 +34,7 @@ let
if [ -f "$prg" ]; then
rm -f "$out/bin/$prg"
if [ -x "$prg" ]; then
makeWrapper "$path/bin/$prg" "$out/bin/$prg" --set PYTHONHOME "$out" --set PYTHONNOUSERSITE "true"
makeWrapper "$path/bin/$prg" "$out/bin/$prg" --set PYTHONHOME "$out" --set PYTHONNOUSERSITE "true" ${stdenv.lib.concatStringsSep " " makeWrapperArgs}
fi
fi
done

5
pkgs/development/libraries/avahi/default.nix
View File

@ -1,4 +1,4 @@
{ fetchurl, stdenv, pkgconfig, libdaemon, dbus, perl, perlXMLParser
{ fetchurl, stdenv, pkgconfig, libdaemon, dbus, perlPackages
, expat, gettext, intltool, glib, libiconv
, qt4 ? null
, qt4Support ? false
@ -17,7 +17,8 @@ stdenv.mkDerivation rec {
patches = [ ./no-mkdir-localstatedir.patch ];
buildInputs = [ libdaemon dbus perl perlXMLParser glib expat libiconv ]
buildInputs = [ libdaemon dbus glib expat libiconv ]
++ (with perlPackages; [ perl XMLParser ])
++ (stdenv.lib.optional qt4Support qt4);
nativeBuildInputs = [ pkgconfig gettext intltool glib ];

4
pkgs/development/libraries/freetype/default.nix
View File

@ -1,4 +1,5 @@
{ stdenv, fetchurl
, buildPackages
, pkgconfig, which, makeWrapper
, zlib, bzip2, libpng, gnumake, glib
@ -50,6 +51,9 @@ in stdenv.mkDerivation rec {
configureFlags = [ "--disable-static" "--bindir=$(dev)/bin" ];
# native compiler to generate building tool
CC_BUILD = "${buildPackages.stdenv.cc}/bin/cc";
# The asm for armel is written with the 'asm' keyword.
CFLAGS = optionalString stdenv.isAarch32 "-std=gnu99";

7
pkgs/development/libraries/lesstif/default.nix
View File

@ -19,7 +19,10 @@ stdenv.mkDerivation rec {
./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 ];
};
}

7
pkgs/development/libraries/libHX/default.nix
View File

@ -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 ];
};
}

6
pkgs/development/libraries/libaccounts-glib/default.nix
View File

@ -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;
};
}

1
pkgs/development/libraries/libaom/default.nix
View File

@ -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;
};
}

7
pkgs/development/libraries/libbap/default.nix
View File

@ -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;
};
}

2
pkgs/development/libraries/libdbusmenu-qt/default.nix
View File

@ -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;
};
}

1
pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix
View File

@ -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;
};
}

5
pkgs/development/libraries/libexttextcat/default.nix
View File

@ -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;
};
}

7
pkgs/development/libraries/libgdiplus/default.nix
View File

@ -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;
};
}

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

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, wrapGAppsHook, gtk2, gnome2, gnome3,
libstartup_notification, libgtop, perl, perlXMLParser,
libstartup_notification, libgtop, perlPackages,
autoreconfHook, intltool, docbook_xsl, xauth
}:
@ -19,8 +19,8 @@ stdenv.mkDerivation rec {
buildInputs = [
gtk2 gnome2.GConf libstartup_notification
gnome3.libgnome-keyring libgtop gnome2.libglade perl perlXMLParser
];
gnome3.libgnome-keyring libgtop gnome2.libglade
] ++ (with perlPackages; [ perl XMLParser ]);
enableParallelBuilding = true;

1
pkgs/development/libraries/libgnome-keyring/default.nix
View File

@ -16,5 +16,6 @@ stdenv.mkDerivation {
meta = {
inherit (glib.meta) platforms maintainers;
license = stdenv.lib.licenses.gpl2;
};
}

1
pkgs/development/libraries/libgnurl/default.nix
View File

@ -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 ];
};
}

7
pkgs/development/libraries/libgpod/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, lib, fetchurl, gettext, perl, perlXMLParser, intltool, pkgconfig, glib,
{stdenv, lib, fetchurl, gettext, perlPackages, intltool, pkgconfig, glib,
libxml2, sqlite, zlib, sg3_utils, gdk_pixbuf, taglib,
libimobiledevice, pythonPackages, mutagen,
monoSupport ? true, mono, gtk-sharp-2_0
@ -25,8 +25,9 @@ in stdenv.mkDerivation rec {
propagatedBuildInputs = [ glib libxml2 sqlite zlib sg3_utils
gdk_pixbuf taglib libimobiledevice python pygobject2 mutagen ];
nativeBuildInputs = [ gettext perlXMLParser intltool pkgconfig perl] ++
lib.optionals monoSupport [ mono gtk-sharp-2_0 ];
nativeBuildInputs = [ gettext intltool pkgconfig ]
++ (with perlPackages; [ perl XMLParser ])
++ lib.optionals monoSupport [ mono gtk-sharp-2_0 ];
meta = {
homepage = http://gtkpod.sourceforge.net/;

7
pkgs/development/libraries/libicns/default.nix
View File

@ -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;
};
}

5
pkgs/development/libraries/libiodbc/default.nix
View File

@ -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;
};
}

1
pkgs/development/libraries/libite/default.nix
View File

@ -31,6 +31,7 @@ stdenv.mkDerivation rec {
'';
platforms = platforms.unix;
maintainers = with maintainers; [ fpletz ];
license = with licenses; [ mit isc ];
};
}

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

@ -1,5 +1,5 @@
{ stdenv, lib, fetchurl, fetchpatch
, zlib, xz, python2, findXMLCatalogs
, zlib, xz, python2, ncurses, findXMLCatalogs
, pythonSupport ? stdenv.buildPlatform == stdenv.hostPlatform
, icuSupport ? false, icu ? null
, enableShared ? stdenv.hostPlatform.libc != "msvcrt"
@ -37,6 +37,7 @@ in stdenv.mkDerivation rec {
propagatedBuildOutputs = "out bin" + lib.optionalString pythonSupport " py";
buildInputs = lib.optional pythonSupport python
++ lib.optional (pythonSupport && python?isPy3 && python.isPy3) ncurses
# Libxml2 has an optional dependency on liblzma. However, on impure
# platforms, it may end up using that from /usr/lib, and thus lack a
# RUNPATH for that, leading to undefined references for its users.

20
pkgs/development/libraries/lirc/default.nix
View File

@ -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 = [

14
pkgs/development/libraries/protobuf/generic-v3.nix
View File

@ -1,11 +1,12 @@
{ stdenv
, fetchFromGitHub
, autoreconfHook, zlib, gmock
, autoreconfHook, zlib, gmock, which, buildPackages
, version, sha256
, ...
}:
stdenv.mkDerivation rec {
let
mkProtobufDerivation = buildProtobuf: stdenv: stdenv.mkDerivation rec {
name = "protobuf-${version}";
# make sure you test also -A pythonPackages.protobuf
@ -28,8 +29,10 @@ stdenv.mkDerivation rec {
--replace 'tmpnam(b)' '"'$TMPDIR'/foo"'
'';
nativeBuildInputs = [ autoreconfHook ];
nativeBuildInputs = [ autoreconfHook buildPackages.which buildPackages.stdenv.cc buildProtobuf ];
buildInputs = [ zlib ];
configureFlags = if buildProtobuf == null then [] else [ "--with-protoc=${buildProtobuf}/bin/protoc" ];
enableParallelBuilding = true;
@ -54,4 +57,7 @@ stdenv.mkDerivation rec {
};
passthru.version = version;
}
};
in mkProtobufDerivation(if (stdenv.buildPlatform != stdenv.hostPlatform)
then (mkProtobufDerivation null buildPackages.stdenv)
else null) stdenv

5
pkgs/development/libraries/rarian/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, pkgconfig, perl, perlXMLParser, libxml2, libxslt, docbook_xml_dtd_42, gnome3}:
{stdenv, fetchurl, pkgconfig, perlPackages, libxml2, libxslt, docbook_xml_dtd_42, gnome3}:
let
pname = "rarian";
version = "0.8.1";
@ -11,7 +11,8 @@ in stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ perl perlXMLParser libxml2 libxslt];
buildInputs = [ libxml2 libxslt ]
++ (with perlPackages; [ perl XMLParser ]);
configureFlags = [ "--with-xml-catalog=${docbook_xml_dtd_42}/xml/dtd/docbook/docbook.cat" ];
passthru = {

13
pkgs/development/python-modules/Cython/default.nix
View File

@ -25,11 +25,11 @@ let
in buildPythonPackage rec {
pname = "Cython";
version = "0.28.3";
version = "0.28.5";
src = fetchPypi {
inherit pname version;
sha256 = "1aae6d6e9858888144cea147eb5e677830f45faaff3d305d77378c3cba55f526";
sha256 = "b64575241f64f6ec005a4d4137339fb0ba5e156e826db2fdb5f458060d9979e0";
};
nativeBuildInputs = [
@ -50,15 +50,6 @@ in buildPythonPackage rec {
doCheck = !stdenv.isDarwin;
patches = [
# The following is in GitHub in 0.28.3 but not in the `sdist`.
# https://github.com/cython/cython/issues/2319
(fetchpatch {
url = https://github.com/cython/cython/commit/c485b1b77264c3c75d090a3c526de24966830d42.patch;
sha256 = "1p6jj9rb097kqvhs5j5127sj5zy18l7x9v0p478cjyzh41khh9r0";
})
];
meta = {
description = "An optimising static compiler for both the Python programming language and the extended Cython programming language";
homepage = http://cython.org;

36
pkgs/development/python-modules/Fabric/default.nix Normal file
View File

@ -0,0 +1,36 @@
{ pkgs
, buildPythonPackage
, fetchPypi
, invoke
, paramiko
, cryptography
, pytest
, mock
, pytest-relaxed
}:
buildPythonPackage rec {
pname = "fabric";
version = "2.4.0";
src = fetchPypi {
inherit pname version;
sha256 = "93684ceaac92e0b78faae551297e29c48370cede12ff0f853cdebf67d4b87068";
};
propagatedBuildInputs = [ invoke paramiko cryptography ];
checkInputs = [ pytest mock pytest-relaxed ];
# ignore subprocess main errors (1) due to hardcoded /bin/bash
checkPhase = ''
rm tests/main.py
pytest tests
'';
meta = with pkgs.lib; {
description = "Pythonic remote execution";
homepage = https://www.fabfile.org/;
license = licenses.bsd2;
maintainers = [ maintainers.costrouc ];
};
}

4
pkgs/development/python-modules/Theano/default.nix
View File

@ -45,13 +45,13 @@ let
in buildPythonPackage rec {
pname = "Theano";
version = "1.0.2";
version = "1.0.3";
disabled = isPyPy || pythonOlder "2.6" || (isPy3k && pythonOlder "3.3");
src = fetchPypi {
inherit pname version;
sha256 = "6768e003d328a17011e6fca9126fbb8a6ffd3bb13cb21c450f3e724cca29abde";
sha256 = "637f3b34d40ef5e0d54dd4c40618475aaa085c26d2491e925c98e2ad4bc2115a";
};
postPatch = ''

4
pkgs/development/python-modules/alabaster/default.nix
View File

@ -3,11 +3,11 @@
buildPythonPackage rec {
pname = "alabaster";
version = "0.7.11";
version = "0.7.12";
src = fetchPypi {
inherit pname version;
sha256 = "b63b1f4dc77c074d386752ec4a8a7517600f6c0db8cd42980cae17ab7b3275d7";
sha256 = "a661d72d58e6ea8a57f7a86e37d86716863ee5e92788398526d58b26a4e4dc02";
};
propagatedBuildInputs = [ pygments ];

4
pkgs/development/python-modules/autobahn/default.nix
View File

@ -4,11 +4,11 @@
}:
buildPythonPackage rec {
pname = "autobahn";
version = "18.8.1";
version = "18.8.2";
src = fetchPypi {
inherit pname version;
sha256 = "b69858e0be4bff8437b0bd82a0db1cbef7405e16bd9354ba587c043d6d5e1ad9";
sha256 = "448df2e241011ea2948799918930042d81e63d26b01912c472f5a9a37f42f319";
};
propagatedBuildInputs = [ six txaio twisted zope_interface cffi ] ++

35
pkgs/development/python-modules/backports_os/default.nix Normal file
View File

@ -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 ];
};
}

4
pkgs/development/python-modules/beancount/default.nix
View File

@ -4,14 +4,14 @@
, nose, requests }:
buildPythonPackage rec {
version = "2.1.2";
version = "2.1.3";
pname = "beancount";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
sha256 = "d0d5f7088cb6b699cc4d030dad42d20b8228232cdb445bb1330d4ef5e3581f52";
sha256 = "4b7b0d3633c82ca88d3cb3d31ad2fd2e45a42401cfa94eaa1cb938ffece34f22";
};
checkInputs = [ nose ];

42
pkgs/development/python-modules/bedup/default.nix Normal file
View File

@ -0,0 +1,42 @@
{ stdenv
, buildPythonPackage
, fetchFromGitHub
, btrfs-progs
, contextlib2
, pyxdg
, pycparser
, alembic
, cffi
, pythonOlder
, isPyPy
}:
buildPythonPackage rec {
version = "0.10.1";
pname = "bedup";
disabled = pythonOlder "3.3";
src = fetchFromGitHub {
owner = "g2p";
repo = "bedup";
rev = "v${version}";
sha256 = "0sp8pmjkxcqq0alianfp41mwq7qj10rk1qy31pjjp9kiph1rn0x6";
};
buildInputs = [ btrfs-progs ];
propagatedBuildInputs = [ contextlib2 pyxdg pycparser alembic ]
++ stdenv.lib.optionals (!isPyPy) [ cffi ];
meta = with stdenv.lib; {
description = "Deduplication for Btrfs";
longDescription = ''
Deduplication for Btrfs. bedup looks for new and changed files,
making sure that multiple copies of identical files share space
on disk. It integrates deeply with btrfs so that scans are
incremental and low-impact.
'';
homepage = https://github.com/g2p/bedup;
license = licenses.gpl2;
maintainers = with maintainers; [ bluescreen303 ];
};
}

37
pkgs/development/python-modules/binwalk/default.nix Normal file
View File

@ -0,0 +1,37 @@
{ stdenv
, buildPythonPackage
, fetchFromGitHub
, zlib
, xz
, ncompress
, gzip
, bzip2
, gnutar
, p7zip
, cabextract
, lzma
, pycrypto
, pyqtgraph ? null }:
let visualizationSupport = (pyqtgraph != null);
in
buildPythonPackage rec {
name = "binwalk-${version}";
version = "2.1.1";
src = fetchFromGitHub {
owner = "devttys0";
repo = "binwalk";
rev = "291a03595d17f848c73b74cb6ca508da782cd8f7";
sha256 = "0grid93yz6i6jb2zggrqncp5awdf7qi88j5y2k7dq0k9r6b8zydw";
};
propagatedBuildInputs = [ zlib xz ncompress gzip bzip2 gnutar p7zip cabextract lzma pycrypto ]
++ stdenv.lib.optional visualizationSupport pyqtgraph;
meta = with stdenv.lib; {
homepage = "http://binwalk.org";
description = "A tool for searching a given binary image for embedded files";
maintainers = [ maintainers.koral ];
};
}

12
pkgs/development/python-modules/bootstrapped-pip/default.nix
View File

@ -3,26 +3,26 @@
let
wheel_source = fetchPypi {
pname = "wheel";
version = "0.31.1";
version = "0.32.1";
format = "wheel";
sha256 = "80044e51ec5bbf6c894ba0bc48d26a8c20a9ba629f4ca19ea26ecfcf87685f5f";
sha256 = "15hizylh761jcaz8zfdc3wg30jf33izaakyv1p82ppx2y5rgg8cz";
};
setuptools_source = fetchPypi {
pname = "setuptools";
version = "40.2.0";
version = "40.4.3";
format = "wheel";
sha256 = "ea3796a48a207b46ea36a9d26de4d0cc87c953a683a7b314ea65d666930ea8e6";
sha256 = "1zzryv1fqx4nk7hzv4afxpl8k7f60lc0qkhxlc8sqjs4igakfhff";
};
in stdenv.mkDerivation rec {
pname = "pip";
version = "18.0";
version = "18.1";
name = "${python.libPrefix}-bootstrapped-${pname}-${version}";
src = fetchPypi {
inherit pname version;
format = "wheel";
sha256 = "070e4bf493c7c2c9f6a08dd797dd3c066d64074c38e9e8a0fb4e6541f266d96c";
sha256 = "7909d0a0932e88ea53a7014dfd14522ffef91a464daaaf5c573343852ef98550";
};
unpackPhase = ''

37
pkgs/development/python-modules/box2d/default.nix Normal file
View File

@ -0,0 +1,37 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, swig2
, pkgs-box2d
, isPy3k
}:
buildPythonPackage rec {
pname = "Box2D";
version = "2.3.2";
disabled = isPy3k;
src = fetchPypi {
inherit pname version;
sha256 = "d1557dffdf9c1d6c796ec5df53e3d93227bb026c14b8411d22c295edaa2fb225";
};
postPatch = ''
sed -i "s/'Box2D.tests' : 'tests'//" setup.py
'';
buildInputs = [ swig2 pkgs-box2d ];
# tests not included with pypi release
doCheck = false;
meta = with stdenv.lib; {
homepage = https://github.com/pybox2d/pybox2d;
description = ''
A 2D game physics library for Python under
the very liberal zlib license
'';
license = licenses.zlib;
maintainers = with maintainers; [ sepi ];
};
}

14
pkgs/development/python-modules/box2d/disable-test.patch
View File

@ -1,14 +0,0 @@
Common subdirectories: Box2D-2.3b0/Box2D and Box2D-2.3b0.new/Box2D
Common subdirectories: Box2D-2.3b0/examples and Box2D-2.3b0.new/examples
Common subdirectories: Box2D-2.3b0/library and Box2D-2.3b0.new/library
diff -u Box2D-2.3b0/setup.py Box2D-2.3b0.new/setup.py
--- Box2D-2.3b0/setup.py 2013-02-02 18:09:34.000000000 +0100
+++ Box2D-2.3b0.new/setup.py 2014-10-25 13:32:07.136922343 +0200
@@ -176,7 +176,6 @@
package_dir = {'Box2D': library_path,
'Box2D.b2': os.path.join(library_path, 'b2'),
'Box2D.tests' : 'tests'},
- test_suite = 'tests',
options = { 'build_ext': { 'swig_opts' : swig_arguments },
'egg_info' : { 'egg_base' : library_base },
},

38
pkgs/development/python-modules/bsddb3/default.nix Normal file
View File

@ -0,0 +1,38 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, pkgs
, isPy3k
}:
buildPythonPackage rec {
pname = "bsddb3";
version = "6.2.6";
disabled = isPy3k;
src = fetchPypi {
inherit pname version;
sha256 = "42d621f4037425afcb16b67d5600c4556271a071a9a7f7f2c2b1ba65bc582d05";
};
buildInputs = [ pkgs.db ];
# Judging from SyntaxError in test
doCheck = false; # test suite breaks python3 compatibility
# Path to database need to be set.
# Somehow the setup.py flag is not propagated.
#setupPyBuildFlags = [ "--berkeley-db=${pkgs.db}" ];
# We can also use a variable
preConfigure = ''
export BERKELEYDB_DIR=${pkgs.db.dev};
'';
meta = with stdenv.lib; {
description = "Python bindings for Oracle Berkeley DB";
homepage = https://www.jcea.es/programacion/pybsddb.htm;
license = with licenses; [ agpl3 ]; # License changed from bsd3 to agpl3 since 6.x
maintainers = [ maintainers.costrouc ];
};
}

26
pkgs/development/python-modules/bugz/default.nix Normal file
View File

@ -0,0 +1,26 @@
{ stdenv
, buildPythonPackage
, fetchFromGitHub
}:
buildPythonPackage rec {
pname = "bugz-0.9.3";
version = "0.13";
src = fetchFromGitHub {
owner = "williamh";
repo = "pybugz";
rev = "0.13";
sha256 = "1nw07q7r078dp82rcrhvvnhmnaqjx6f8a6cdjgrsiy6fryrx9dwz";
};
doCheck = false;
meta = with stdenv.lib; {
homepage = http://www.liquidx.net/pybugz/;
description = "Command line interface for Bugzilla";
license = licenses.gpl2;
maintainers = [ maintainers.costrouc ];
};
}

4
pkgs/development/python-modules/buildout-nix/default.nix
View File

@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "zc.buildout";
version = "2.12.1";
version = "2.12.2";
src = fetchPypi {
inherit pname version;
sha256 = "1e180b62fd129a68cb3a9ec8eb0ef457e18921269a93e87ef2cc34519415332d";
sha256 = "ff5d7e8a1361da8dfe1025d35ef6ce55e929dd8518d2a811a1cf2c948950a043";
};
patches = [ ./nix.patch ];

4
pkgs/development/python-modules/buildout/default.nix
View File

@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "zc.buildout";
version = "2.12.1";
version = "2.12.2";
src = fetchPypi {
inherit pname version;
sha256 = "1e180b62fd129a68cb3a9ec8eb0ef457e18921269a93e87ef2cc34519415332d";
sha256 = "ff5d7e8a1361da8dfe1025d35ef6ce55e929dd8518d2a811a1cf2c948950a043";
};
meta = with stdenv.lib; {

4
pkgs/development/python-modules/bumps/default.nix
View File

@ -2,7 +2,7 @@
buildPythonPackage rec {
pname = "bumps";
version = "0.7.10";
version = "0.7.11";
propagatedBuildInputs = [six];
@ -12,7 +12,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
sha256 = "07917abf7e598f2a42456ca4f704c6da2a5489eaea0b9a7c61ed8a26506737c8";
sha256 = "16d24a7f965592d9b02f96e68e6aa70d6fb59abe4db37bb14c4b60c509a3c2ef";
};
meta = with stdenv.lib; {

35
pkgs/development/python-modules/caldavclientlibrary-asynk/default.nix Normal file
View File

@ -0,0 +1,35 @@
{ stdenv
, buildPythonPackage
, fetchgit
, isPy3k
}:
buildPythonPackage rec {
version = "asynkdev";
pname = "caldavclientlibrary-asynk";
src = fetchgit {
url = "https://github.com/skarra/CalDAVClientLibrary.git";
rev = "06699b08190d50cc2636b921a654d67db0a967d1";
sha256 = "157q32251ac9x3gdshgrjwsy48nq74vrzviswvph56h9wa8ksnnk";
};
disabled = isPy3k;
meta = with stdenv.lib; {
description = "A Python library and tool for CalDAV";
longDescription = ''
CalDAVCLientLibrary is a Python library and tool for CalDAV.
This package is the unofficial CalDAVCLientLibrary Python
library maintained by the author of Asynk and is needed for
that package.
'';
homepage = https://github.com/skarra/CalDAVClientLibrary/tree/asynkdev/;
maintainers = with maintainers; [ pjones ];
broken = true; # 2018-04-11
};
}

38
pkgs/development/python-modules/capstone/default.nix Normal file
View File

@ -0,0 +1,38 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, fetchpatch
}:
buildPythonPackage rec {
pname = "capstone";
version = "3.0.4";
src = fetchPypi {
inherit pname version;
sha256 = "945d3b8c3646a1c3914824c416439e2cf2df8969dd722c8979cdcc23b40ad225";
};
patches = [
(fetchpatch {
stripLen = 2;
url = "https://patch-diff.githubusercontent.com/raw/aquynh/capstone/pull/783/commits/23fe9f36622573c747e2bab6119ff245437bf276.patch";
sha256 = "0yizqrdlxqxn16873593kdx2vrr7gvvilhgcf9xy6hr0603d3m5r";
})
];
postPatch = ''
patchShebangs src/make.sh
'';
preCheck = ''
mv src/libcapstone.so capstone
'';
meta = with stdenv.lib; {
homepage = "http://www.capstone-engine.org/";
license = licenses.bsdOriginal;
description = "Capstone disassembly engine";
maintainers = with maintainers; [ bennofs ];
};
}

4
pkgs/development/python-modules/carbon/default.nix
View File

@ -4,13 +4,13 @@
buildPythonPackage rec {
pname = "carbon";
version = "1.1.3";
version = "1.1.4";
disabled = isPy3k;
src = fetchPypi {
inherit pname version;
sha256 = "1s7327p30w4l9ak4gc7m5ga521233179n2lr3j0ggfbmfhd6blky";
sha256 = "1b70e34ac0f0bd32a03ee14eaf1ed2c857e208984fc9761f59a95c21c5264513";
};
propagatedBuildInputs = [ twisted whisper txamqp cachetools urllib3 ];

55
pkgs/development/python-modules/cassandra-driver/default.nix Normal file
View File

@ -0,0 +1,55 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, pkgs
, cython
, futures
, six
, python
, scales
, eventlet
, twisted
, mock
, gevent
, nose
, pytz
, pyyaml
, sure
, pythonOlder
}:
buildPythonPackage rec {
pname = "cassandra-driver";
version = "3.6.0";
src = fetchPypi {
inherit pname version;
sha256 = "1aqmy3psn12lxgp659d0zsxkirxzy5lnbnzxf9xjq1a93s3qm704";
};
buildInputs = [ pkgs.libev cython ];
propagatedBuildInputs = [ six ]
++ stdenv.lib.optionals (pythonOlder "3.4") [ futures ];
postPatch = ''
sed -i "s/<=1.0.1//" setup.py
'';
checkPhase = ''
${python.interpreter} setup.py gevent_nosetests
${python.interpreter} setup.py eventlet_nosetests
'';
checkInputs = [ scales eventlet twisted mock gevent nose pytz pyyaml sure ];
# Could not get tests running
doCheck = false;
meta = with stdenv.lib; {
homepage = http://datastax.github.io/python-driver/;
description = "A Python client driver for Apache Cassandra";
license = licenses.asl20;
};
}

24
pkgs/development/python-modules/cddb/default.nix Normal file
View File

@ -0,0 +1,24 @@
{ stdenv
, buildPythonPackage
, pkgs
, isPy3k
}:
buildPythonPackage rec {
name = "CDDB-1.4";
disabled = isPy3k;
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ pkgs.darwin.apple_sdk.frameworks.IOKit ];
src = pkgs.fetchurl {
url = "http://cddb-py.sourceforge.net/${name}.tar.gz";
sha256 = "098xhd575ibvdx7i3dny3lwi851yxhjg2hn5jbbgrwj833rg5l5w";
};
meta = with stdenv.lib; {
homepage = http://cddb-py.sourceforge.net/;
description = "CDDB and FreeDB audio CD track info access";
license = licenses.gpl2Plus;
};
}

22
pkgs/development/python-modules/chameleon/default.nix Normal file
View File

@ -0,0 +1,22 @@
{ stdenv
, buildPythonPackage
, fetchPypi
}:
buildPythonPackage rec {
pname = "Chameleon";
version = "2.25";
src = fetchPypi {
inherit pname version;
sha256 = "0va95cml7wfjpvgj3dc9xdn8psyjh3zbk6v51b0hcqv2fzh409vb";
};
meta = with stdenv.lib; {
homepage = https://chameleon.readthedocs.io/;
description = "Fast HTML/XML Template Compiler";
license = licenses.bsd0;
maintainers = with maintainers; [ garbas domenkozar ];
};
}

4
pkgs/development/python-modules/click-plugins/default.nix
View File

@ -4,11 +4,11 @@
buildPythonPackage rec {
pname = "click-plugins";
version = "1.0.3";
version = "1.0.4";
src = fetchPypi {
inherit pname version;
sha256 = "1ifphgaw5mmcdnqd0qfnmrbm62q3k6p573aff4cxgpyjxmz5xk3s";
sha256 = "dfed74b5063546a137de99baaaf742b4de4337ad2b3e1df5ec7c8a256adc0847";
};
propagatedBuildInputs = [

33
pkgs/development/python-modules/closure-linter/default.nix Normal file
View File

@ -0,0 +1,33 @@
{ stdenv
, buildPythonPackage
, fetchgit
, isPy3k
, gflags
}:
/* There is a project called "closure-linter" on PyPI that is the
same as this, but it does not appear to be owned by Google.
So we're pulling from Google's GitHub repo instead. */
buildPythonPackage rec {
pname = "closure-linter";
version = "2.3.19";
/* This project has no Python 3 support, as noted by
https://github.com/google/closure-linter/issues/81 */
disabled = isPy3k;
src = fetchgit {
url = "https://github.com/google/closure-linter";
rev = "5c27529075bb88bdc45e73008f496dec8438d658";
sha256 = "076c7q7pr7akfvq5y8lxr1ab81wwps07gw00igdkcxnc5k9dzxwc";
};
propagatedBuildInputs = [ gflags ];
meta = with stdenv.lib; {
description = "Checks JavaScript files against Google's style guide.";
homepage = "https://developers.google.com/closure/utilities/";
license = with licenses; [ asl20 ];
};
}

4
pkgs/development/python-modules/cloudpickle/default.nix
View File

@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "cloudpickle";
version = "0.5.5";
version = "0.5.6";
src = fetchPypi {
inherit pname version;
sha256 = "6ea4b548f61a4f616b065182716318c7dced8c053517f35ac59cec22802daf3d";
sha256 = "0390ecb3731ac035d74c34651460f4a683e9ef7443861712b8d56c20c2f92113";
};
buildInputs = [ pytest mock ];

38
pkgs/development/python-modules/cntk/default.nix Normal file
View File

@ -0,0 +1,38 @@
{ stdenv
, buildPythonPackage
, pkgs
, numpy
, scipy
, enum34
, protobuf
, pip
, python
}:
buildPythonPackage rec {
inherit (pkgs.cntk) name version src meta;
buildInputs = [ pkgs.cntk pkgs.swig pkgs.openmpi ];
propagatedBuildInputs = [ numpy scipy enum34 protobuf pip ];
CNTK_LIB_PATH = "${pkgs.cntk}/lib";
CNTK_COMPONENT_VERSION = pkgs.cntk.version;
postPatch = ''
cd bindings/python
sed -i 's,"libmpi.so.12","${pkgs.openmpi}/lib/libmpi.so",g' cntk/train/distributed.py
'';
postInstall = ''
rm -rf $out/${python.sitePackages}/cntk/libs
ln -s ${pkgs.cntk}/lib $out/${python.sitePackages}/cntk/libs
# It's not installed for some reason.
cp cntk/cntk_py.py $out/${python.sitePackages}/cntk
'';
# Actual tests are broken.
checkPhase = ''
cd $NIX_BUILD_TOP
${python.interpreter} -c "import cntk"
'';
}

35
pkgs/development/python-modules/colanderalchemy/default.nix Normal file
View File

@ -0,0 +1,35 @@
{ stdenv
, buildPythonPackage
, fetchpatch
, fetchPypi
, unittest2
, colander
, sqlalchemy
}:
buildPythonPackage rec {
pname = "ColanderAlchemy";
version = "0.3.3";
src = fetchPypi {
inherit pname version;
sha256 = "11wcni2xmfmy001rj62q2pwf305vvngkrfm5c4zlwvgbvlsrvnnw";
};
patches = [
(fetchpatch {
url = "https://github.com/stefanofontanelli/ColanderAlchemy/commit/b45fe35f2936a5ccb705e9344075191e550af6c9.patch";
sha256 = "1kf278wjq49zd6fhpp55vdcawzdd107767shzfck522sv8gr6qvx";
})
];
buildInputs = [ unittest2 ];
propagatedBuildInputs = [ colander sqlalchemy ];
meta = with stdenv.lib; {
description = "Autogenerate Colander schemas based on SQLAlchemy models";
homepage = https://github.com/stefanofontanelli/ColanderAlchemy;
license = licenses.mit;
};
}

24
pkgs/development/python-modules/colored/default.nix Normal file
View File

@ -0,0 +1,24 @@
{ stdenv
, buildPythonPackage
, fetchPypi
}:
buildPythonPackage rec {
pname = "colored";
version = "1.1.5";
src = fetchPypi {
inherit pname version;
sha256 = "1r1vsypk8v7az82d66bidbxlndx1h7xd4m43hpg1a6hsjr30wrm3";
};
# No proper test suite
doCheck = false;
meta = with stdenv.lib; {
homepage = https://gitlab.com/dslackw/colored;
description = "Simple library for color and formatting to terminal";
license = licenses.mit;
};
}

31
pkgs/development/python-modules/cornice/default.nix Normal file
View File

@ -0,0 +1,31 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, pyramid
, simplejson
, six
, venusian
}:
buildPythonPackage rec {
pname = "cornice";
version = "3.4.1";
src = fetchPypi {
inherit pname version;
sha256 = "a7f8db903ba06c2584c7db4474459de3565d90b5e4ae4b97c687840e11d5b7fd";
};
propagatedBuildInputs = [ pyramid simplejson six venusian ];
# tests not packaged with pypi release
doCheck = false;
meta = with stdenv.lib; {
homepage = https://github.com/mozilla-services/cornice;
description = "Build Web Services with Pyramid";
license = licenses.mpl20;
maintainers = [ maintainers.costrouc ];
};
}

Some files were not shown because too many files have changed in this diff Show More