diff options
Diffstat (limited to 'pkgs')
26 files changed, 438 insertions, 199 deletions
diff --git a/pkgs/applications/video/gnome-mpv/default.nix b/pkgs/applications/video/gnome-mpv/default.nix new file mode 100644 index 000000000000..c93510cb1a70 --- /dev/null +++ b/pkgs/applications/video/gnome-mpv/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchurl +, intltool, pkgconfig, wrapGAppsHook +, appstream-glib, epoxy, glib, gtk3, mpv +}: + +stdenv.mkDerivation rec { + name = "gnome-mpv-${version}"; + version = "0.9"; + + src = fetchurl { + sha256 = "06pgxl6f3kkgxv8nlmyl7gy3pg55sqf8vgr8m6426mlpm4p3qdn0"; + url = "https://github.com/gnome-mpv/gnome-mpv/releases/download/v${version}/${name}.tar.xz"; + }; + + nativeBuildInputs = [ intltool pkgconfig wrapGAppsHook ]; + buildInputs = [ appstream-glib epoxy glib.dev gtk3 mpv ]; + + NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; + + enableParallelBuilding = true; + + doCheck = true; + + meta = with stdenv.lib; { + description = "Simple GTK+ frontend for the mpv video player"; + longDescription = '' + GNOME MPV interacts with mpv via the client API exported by libmpv, + allowing access to mpv's powerful playback capabilities through an + easy-to-use user interface. + ''; + homepage = https://github.com/gnome-mpv/gnome-mpv; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ nckx ]; + }; +} diff --git a/pkgs/data/misc/geolite-legacy/default.nix b/pkgs/data/misc/geolite-legacy/default.nix index 617ad8e9099b..d3b5405c509e 100644 --- a/pkgs/data/misc/geolite-legacy/default.nix +++ b/pkgs/data/misc/geolite-legacy/default.nix @@ -8,7 +8,7 @@ let in stdenv.mkDerivation rec { name = "geolite-legacy-${version}"; - version = "2016-05-16"; + version = "2016-05-23"; srcGeoIP = fetchDB "GeoLiteCountry/GeoIP.dat.gz" "GeoIP.dat.gz" @@ -24,10 +24,10 @@ stdenv.mkDerivation rec { "1v8wdqh6yjicb7bdcxp7v5dimlrny1fiynf4wr6wh65vr738csy2"; srcGeoIPASNum = fetchDB "asnum/GeoIPASNum.dat.gz" "GeoIPASNum.dat.gz" - "1nplklc88jn0iqla9ar5vgcq4wvkqkd5pbgvn89757466dl1igiw"; + "0jx4rg2zxpcwhc27ph8hbbl0vdjpdd6d8c7ifxfxrz9jdjvzz6q5"; srcGeoIPASNumv6 = fetchDB "asnum/GeoIPASNumv6.dat.gz" "GeoIPASNumv6.dat.gz" - "06wmjr4frc83v68abpnad8z9xy4fsjsvwild6bw7816w9rdvdqzw"; + "0wax1z8fnldmkv0mh35ad738daqdcszs90cabzg472d1iys937av"; meta = with stdenv.lib; { description = "GeoLite Legacy IP geolocation databases"; diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix index b7195ac60c7c..88de8356da8b 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix @@ -161,4 +161,6 @@ self: super: { buildDepends = [ primitive ]; license = pkgs.stdenv.lib.licenses.bsd3; }) {}; + + MonadCatchIO-transformers = doJailbreak super.MonadCatchIO-transformers; } diff --git a/pkgs/development/libraries/gd/default.nix b/pkgs/development/libraries/gd/default.nix index bf3b63db399b..bb06893e712e 100644 --- a/pkgs/development/libraries/gd/default.nix +++ b/pkgs/development/libraries/gd/default.nix @@ -25,6 +25,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ zlib fontconfig freetype libjpeg libpng libtiff libXpm ]; + outputs = [ "dev" "out" "bin" ]; + + postFixup = ''moveToOutput "bin/gdlib-config" $dev''; + meta = with stdenv.lib; { homepage = https://libgd.github.io/; description = "A dynamic image creation library"; diff --git a/pkgs/development/libraries/libpsl/default.nix b/pkgs/development/libraries/libpsl/default.nix index 8540eccf2da4..ea4db82c510d 100644 --- a/pkgs/development/libraries/libpsl/default.nix +++ b/pkgs/development/libraries/libpsl/default.nix @@ -3,10 +3,10 @@ let - listVersion = "2016-05-10"; + listVersion = "2016-05-23"; listSources = fetchFromGitHub { - sha256 = "1bpdli2q5ap677yg0w0v7q5qmaxnm2y17wakzmc0k6k7m7xfyzw0"; - rev = "2226f9cc92213d0d68a74ecb535b15b3af00388a"; + sha256 = "1sld9s9d9g3fnppyvvn5w0xw50g1gq43d7yyk9yb710268kh31jc"; + rev = "05f7a0a82e2fea5afb8ba3736db3c294db270849"; repo = "list"; owner = "publicsuffix"; }; diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index 16a4498f54ca..d409d20a7697 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -4,7 +4,7 @@ , iproute, iptables, readline, lvm2, utillinux, systemd, libpciaccess, gettext , libtasn1, ebtables, libgcrypt, yajl, pmutils, libcap_ng , dnsmasq, libnl, libpcap, libxslt, xhtml1, numad, numactl, perlPackages -, curl, libiconv, gmp, xen +, curl, libiconv, gmp, xen, zfs }: # if you update, also bump pythonPackages.libvirt or it will break stdenv.mkDerivation rec { @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { libxslt xhtml1 perlPackages.XMLXPath curl libpcap ] ++ stdenv.lib.optionals stdenv.isLinux [ libpciaccess devicemapper lvm2 utillinux systemd.udev.lib libcap_ng - libnl numad numactl xen + libnl numad numactl xen zfs ] ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv gmp ]; @@ -52,6 +52,7 @@ stdenv.mkDerivation rec { "--with-macvtap" "--with-virtualport" "--with-init-script=redhat" + "--with-storage-zfs" ] ++ stdenv.lib.optionals stdenv.isDarwin [ "--with-init-script=none" ]; diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 6ac8acebfe87..2fe27ac087b8 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -45,6 +45,7 @@ stdenv.mkDerivation { patches = [ ./glx_ro_text_segm.patch # fix for grsecurity/PaX + ./symlink-drivers.patch # TODO: revive ./dricore-gallium.patch when it gets ported (from Ubuntu), # as it saved ~35 MB in $drivers; watch https://launchpad.net/ubuntu/+source/mesa/+changelog ] ++ optional stdenv.isLinux diff --git a/pkgs/development/libraries/mesa/symlink-drivers.patch b/pkgs/development/libraries/mesa/symlink-drivers.patch new file mode 100644 index 000000000000..6c800e5dfce6 --- /dev/null +++ b/pkgs/development/libraries/mesa/symlink-drivers.patch @@ -0,0 +1,72 @@ +diff -ru -x '*~' mesa-11.1.4-orig/src/gallium/targets/dri/Makefile.am mesa-11.1.4/src/gallium/targets/dri/Makefile.am +--- mesa-11.1.4-orig/src/gallium/targets/dri/Makefile.am 2016-05-09 14:20:52.000000000 +0200 ++++ mesa-11.1.4/src/gallium/targets/dri/Makefile.am 2016-05-22 17:56:03.396185082 +0200 +@@ -126,14 +126,13 @@ + done; + endif + +-# hardlink each megadriver instance, but don't actually have +-# gallium_dri.so in the set of final installed files. ++# symlink each megadriver instance. + install-data-hook: + for i in $(TARGET_DRIVERS); do \ +- ln -f $(DESTDIR)$(dridir)/gallium_dri.so \ ++ ln -sf $(DESTDIR)$(dridir)/gallium_dri.so \ + $(DESTDIR)$(dridir)/$${i}_dri.so; \ + done; \ +- $(RM) $(DESTDIR)$(dridir)/gallium_dri.* ++ $(RM) $(DESTDIR)$(dridir)/gallium_dri.la + + uninstall-hook: + for i in $(TARGET_DRIVERS); do \ +diff -ru -x '*~' mesa-11.1.4-orig/src/gallium/targets/vdpau/Makefile.am mesa-11.1.4/src/gallium/targets/vdpau/Makefile.am +--- mesa-11.1.4-orig/src/gallium/targets/vdpau/Makefile.am 2016-01-29 13:21:30.000000000 +0100 ++++ mesa-11.1.4/src/gallium/targets/vdpau/Makefile.am 2016-05-22 20:54:12.722358242 +0200 +@@ -103,15 +103,14 @@ + done; + endif + +-# hardlink each megadriver instance, but don't actually have +-# libvdpau_gallium.so in the set of final installed files. ++# symlink each megadriver instance. + install-data-hook: + $(AM_V_GEN)dest_dir=$(DESTDIR)/$(vdpaudir); \ + for i in $(TARGET_DRIVERS); do \ + j=libvdpau_gallium.$(LIB_EXT); \ + k=libvdpau_$${i}.$(LIB_EXT); \ + l=$${k}.$(VDPAU_MAJOR).$(VDPAU_MINOR).0; \ +- ln -f $${dest_dir}/$${j}.$(VDPAU_MAJOR).$(VDPAU_MINOR).0 \ ++ ln -sf $${dest_dir}/$${j}.$(VDPAU_MAJOR).$(VDPAU_MINOR).0 \ + $${dest_dir}/$${l}; \ + ln -sf $${l} \ + $${dest_dir}/$${k}.$(VDPAU_MAJOR).$(VDPAU_MINOR); \ +@@ -120,7 +119,7 @@ + ln -sf $${l} \ + $${dest_dir}/$${k}; \ + done; \ +- $(RM) $${dest_dir}/libvdpau_gallium.* ++ $(RM) $${dest_dir}/libvdpau_gallium.la + + uninstall-hook: + for i in $(TARGET_DRIVERS); do \ +diff -ru -x '*~' mesa-11.1.4-orig/src/mesa/drivers/dri/Makefile.am mesa-11.1.4/src/mesa/drivers/dri/Makefile.am +--- mesa-11.1.4-orig/src/mesa/drivers/dri/Makefile.am 2016-01-18 08:39:26.000000000 +0100 ++++ mesa-11.1.4/src/mesa/drivers/dri/Makefile.am 2016-05-22 17:55:46.251244940 +0200 +@@ -86,14 +86,13 @@ + done; + endif + +-# hardlink each megadriver instance, but don't actually have +-# mesa_dri_drivers.so in the set of final installed files. ++# symink each megadriver instance. + install-data-hook: + for i in $(MEGADRIVERS); do \ +- ln -f $(DESTDIR)$(dridir)/mesa_dri_drivers.so \ ++ ln -sf $(DESTDIR)$(dridir)/mesa_dri_drivers.so \ + $(DESTDIR)$(dridir)/$$i; \ + done; +- $(RM) $(DESTDIR)$(dridir)/mesa_dri_drivers.* ++ $(RM) $(DESTDIR)$(dridir)/mesa_dri_drivers.la + + uninstall-hook: + for i in $(MEGADRIVERS); do \ diff --git a/pkgs/development/python-modules/pygame/default.nix b/pkgs/development/python-modules/pygame/default.nix index 0928fa6ae7d1..226b613a8b4b 100644 --- a/pkgs/development/python-modules/pygame/default.nix +++ b/pkgs/development/python-modules/pygame/default.nix @@ -1,9 +1,10 @@ -{ stdenv, fetchurl, buildPythonPackage, pkgconfig, smpeg, libX11 +{ stdenv, lib, fetchurl, buildPythonPackage, python, smpeg, libX11 , SDL, SDL_image, SDL_mixer, SDL_ttf, libpng, libjpeg, portmidi, isPy3k, }: -buildPythonPackage { - name = "pygame-1.9.1"; +buildPythonPackage rec { + name = "pygame-${version}"; + version = "1.9.1"; src = fetchurl { url = "http://www.pygame.org/ftp/pygame-1.9.1release.tar.gz"; @@ -11,11 +12,11 @@ buildPythonPackage { }; buildInputs = [ - pkgconfig SDL SDL_image SDL_mixer SDL_ttf libpng libjpeg + SDL SDL_image SDL_mixer SDL_ttf libpng libjpeg smpeg portmidi libX11 ]; - # /nix/store/94kswjlwqnc0k2bnwgx7ckx0w2kqzaxj-stdenv/setup: line 73: python: command not found + # http://ubuntuforums.org/showthread.php?t=1960262 disabled = isPy3k; # Tests fail because of no audio device and display. @@ -23,18 +24,26 @@ buildPythonPackage { patches = [ ./pygame-v4l.patch ]; - preConfigure = stdenv.lib.concatMapStrings (dep: '' + preConfigure = '' sed \ - -e "/origincdirs =/a'${dep.dev or dep.out}/include'," \ - -e "/origlibdirs =/aoriglibdirs += '${dep.lib or dep.out}/lib'," \ + -e "s/^origincdirs = .*/origincdirs = []/" \ + -e "s/^origlibdirs = .*/origlibdirs = []/" \ + -e "/\/include\/smpeg/d" \ -i config_unix.py - '') [ SDL_image SDL_mixer SDL_ttf libpng libjpeg portmidi libX11 ] + '' - LOCALBASE=/ python config.py + ${lib.concatMapStrings (dep: '' + sed \ + -e "/^origincdirs =/aorigincdirs += ['${lib.getDev dep}/include']" \ + -e "/^origlibdirs =/aoriglibdirs += ['${lib.getLib dep}/lib']" \ + -i config_unix.py + '') buildInputs + } + LOCALBASE=/ ${python.interpreter} config.py ''; - meta = { + meta = with stdenv.lib; { description = "Python library for games"; homepage = "http://www.pygame.org/"; - license = stdenv.lib.licenses.lgpl21Plus; + license = licenses.lgpl21Plus; + platforms = platforms.linux; }; } diff --git a/pkgs/development/python-modules/pygame/git.nix b/pkgs/development/python-modules/pygame/git.nix new file mode 100644 index 000000000000..7f815454713d --- /dev/null +++ b/pkgs/development/python-modules/pygame/git.nix @@ -0,0 +1,45 @@ +{ stdenv, lib, fetchFromBitbucket, buildPythonPackage, python, smpeg, libX11 +, SDL, SDL_image, SDL_mixer, SDL_ttf, libpng, libjpeg, portmidi +}: + +buildPythonPackage rec { + name = "pygame-${version}"; + version = "2016-05-17"; + + src = fetchFromBitbucket { + owner = "pygame"; + repo = "pygame"; + rev = "575c7a74d85a37db7c645421c02cf0b6b78a889f"; + sha256 = "1i5xqmw93kfidcji2wacgkm5y4mcnbksy8iimih0729k19rbhznc"; + }; + + buildInputs = [ + SDL SDL_image SDL_mixer SDL_ttf libpng libjpeg + smpeg portmidi libX11 + ]; + + # Tests fail because of no audio device and display. + doCheck = false; + + preConfigure = '' + sed \ + -e "s/^origincdirs = .*/origincdirs = []/" \ + -e "s/^origlibdirs = .*/origlibdirs = []/" \ + -i config_unix.py + ${lib.concatMapStrings (dep: '' + sed \ + -e "/^origincdirs =/aorigincdirs += ['${lib.getDev dep}/include']" \ + -e "/^origlibdirs =/aoriglibdirs += ['${lib.getLib dep}/lib']" \ + -i config_unix.py + '') buildInputs + } + LOCALBASE=/ ${python.interpreter} config.py + ''; + + meta = with stdenv.lib; { + description = "Python library for games"; + homepage = "http://www.pygame.org/"; + license = licenses.lgpl21Plus; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/tools/build-managers/dub/default.nix b/pkgs/development/tools/build-managers/dub/default.nix index 5394829a8308..3693a27ac23e 100644 --- a/pkgs/development/tools/build-managers/dub/default.nix +++ b/pkgs/development/tools/build-managers/dub/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchFromGitHub, curl, dmd, gcc }: -let version = "0.9.24"; in -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "dub-${version}"; + version = "0.9.25"; src = fetchFromGitHub { - sha256 = "1j2cs2mvaj6bjjicabq6lh97nx0v4b2k6pj4cmywki7hf3i1p8yy"; + sha256 = "0cb4kx72fvk6vfqkk0mrp6fvv512xhw03dq2dn9lng0daydvdcim"; rev = "v${version}"; repo = "dub"; owner = "D-Programming-Language"; @@ -15,16 +15,17 @@ stdenv.mkDerivation { propagatedBuildInputs = [ gcc dmd ]; buildPhase = '' - # Avoid that the version file is overwritten - substituteInPlace build.sh \ - --replace source/dub/version_.d /dev/null - ./build.sh + # Avoid that the version file is overwritten + substituteInPlace build.sh \ + --replace source/dub/version_.d /dev/null + patchShebangs ./build.sh + ./build.sh ''; installPhase = '' - mkdir $out - mkdir $out/bin - cp bin/dub $out/bin + mkdir $out + mkdir $out/bin + cp bin/dub $out/bin ''; meta = with stdenv.lib; { diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index bd7c7f636f87..e89a53d21bfc 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.4.10"; + version = "4.4.11"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1kpjvvd9q9wwr3314q5ymvxii4dv2d27295bzly225wlc552xhja"; + sha256 = "1c0lqk2q4hf8jx6myhcqgh2509d36wx87l5k5cl3xfsnrzrpclrs"; }; kernelPatches = args.kernelPatches; diff --git a/pkgs/os-specific/linux/lxc/default.nix b/pkgs/os-specific/linux/lxc/default.nix index 275f325b84ab..82ea72af1605 100644 --- a/pkgs/os-specific/linux/lxc/default.nix +++ b/pkgs/os-specific/linux/lxc/default.nix @@ -12,11 +12,11 @@ in with stdenv.lib; stdenv.mkDerivation rec { name = "lxc-${version}"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { url = "https://linuxcontainers.org/downloads/lxc/lxc-${version}.tar.gz"; - sha256 = "1r0hgk91n3frrmla1681l74ag5sngbbkdagvjfqzxwcf9l8pwwsv"; + sha256 = "0l4fs6ckvip5akfa0vbjfk34ddvcv0c84mmpj9yrcfl67qwn31z9"; }; nativeBuildInputs = [ diff --git a/pkgs/servers/mail/opensmtpd/default.nix b/pkgs/servers/mail/opensmtpd/default.nix index 94bc9f2bfe98..4edee78898e4 100644 --- a/pkgs/servers/mail/opensmtpd/default.nix +++ b/pkgs/servers/mail/opensmtpd/default.nix @@ -1,17 +1,17 @@ { stdenv, fetchurl, autoconf, automake, libtool, bison -, libasr, libevent, zlib, openssl, db, pam, cacert +, libasr, libevent, zlib, openssl, db, pam }: stdenv.mkDerivation rec { name = "opensmtpd-${version}"; - version = "5.7.3p2"; + version = "5.9.2p1"; nativeBuildInputs = [ autoconf automake libtool bison ]; buildInputs = [ libasr libevent zlib openssl db pam ]; src = fetchurl { url = "http://www.opensmtpd.org/archives/${name}.tar.gz"; - sha256 = "0d2973008d0f66bebb84bed516be6c32617735241cc54dd26643529281a8e52b"; + sha256 = "07d7f1m5sxyz6mkk228rcm7fsf7350994ayvmhgph333q5rz48im"; }; patches = [ ./proc_path.diff ]; @@ -23,8 +23,9 @@ stdenv.mkDerivation rec { "--with-pam" "--without-bsd-auth" "--with-sock-dir=/run" - "--with-privsep-user=smtpd" - "--with-queue-user=smtpq" + "--with-user-smtpd=smtpd" + "--with-user-queue=smtpq" + "--with-group-queue=smtpq" "--with-ca-file=/etc/ssl/certs/ca-certificates.crt" "--with-libevent-dir=${libevent.dev}" "--enable-table-db" @@ -35,14 +36,14 @@ stdenv.mkDerivation rec { "localstatedir=\${TMPDIR}" ]; - meta = { + meta = with stdenv.lib; { homepage = https://www.opensmtpd.org/; description = '' A free implementation of the server-side SMTP protocol as defined by RFC 5321, with some additional standard extensions ''; - license = stdenv.lib.licenses.isc; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.rickynils ]; + license = licenses.isc; + platforms = platforms.linux; + maintainers = with maintainers; [ rickynils obadz ]; }; } diff --git a/pkgs/servers/mail/opensmtpd/proc_path.diff b/pkgs/servers/mail/opensmtpd/proc_path.diff index 0e8eac0bb83b..9306685e365e 100644 --- a/pkgs/servers/mail/opensmtpd/proc_path.diff +++ b/pkgs/servers/mail/opensmtpd/proc_path.diff @@ -1,11 +1,12 @@ -diff -Naur opensmtpd-5.7.1p1/smtpd/parse.y opensmtpd-5.7.1p1.patched/smtpd/parse.y ---- opensmtpd-5.7.1p1/smtpd/parse.y 2015-06-30 10:13:34.000000000 +0200 -+++ opensmtpd-5.7.1p1.patched/smtpd/parse.y 2015-09-26 08:41:17.012472516 +0200 -@@ -2519,13 +2519,19 @@ +diff --git a/smtpd/parse.y b/smtpd/parse.y +index ab02719..c1c77d9 100644 +--- a/smtpd/parse.y ++++ b/smtpd/parse.y +@@ -2534,13 +2534,19 @@ create_filter_proc(char *name, char *prog) { struct filter_conf *f; char *path; -+ const char *proc_path; ++ const char *proc_path; if (dict_get(&conf->sc_filters, name)) { yyerror("filter \"%s\" already defined", name); @@ -13,64 +14,71 @@ diff -Naur opensmtpd-5.7.1p1/smtpd/parse.y opensmtpd-5.7.1p1.patched/smtpd/parse } - if (asprintf(&path, "%s/filter-%s", PATH_LIBEXEC, prog) == -1) { -+ proc_path = getenv("OPENSMTPD_PROC_PATH"); -+ if (proc_path == NULL) { -+ proc_path = PATH_LIBEXEC; -+ } ++ proc_path = getenv("OPENSMTPD_PROC_PATH"); ++ if (proc_path == NULL) { ++ proc_path = PATH_LIBEXEC; ++ } + + if (asprintf(&path, "%s/filter-%s", proc_path, prog) == -1) { yyerror("filter \"%s\" asprintf failed", name); return (0); } -diff -Naur opensmtpd-5.7.1p1/smtpd/smtpd.c opensmtpd-5.7.1p1.patched/smtpd/smtpd.c ---- opensmtpd-5.7.1p1/smtpd/smtpd.c 2015-06-30 10:13:34.000000000 +0200 -+++ opensmtpd-5.7.1p1.patched/smtpd/smtpd.c 2015-09-26 08:41:16.998472557 +0200 -@@ -854,6 +854,7 @@ +diff --git a/smtpd/smtpd.c b/smtpd/smtpd.c +index afc8891..9b0a80f 100644 +--- a/smtpd/smtpd.c ++++ b/smtpd/smtpd.c +@@ -795,6 +795,7 @@ fork_proc_backend(const char *key, const char *conf, const char *procname) char path[PATH_MAX]; char name[PATH_MAX]; char *arg; -+ char *proc_path; ++ char *proc_path; if (strlcpy(name, conf, sizeof(name)) >= sizeof(name)) { log_warnx("warn: %s-proc: conf too long", key); -@@ -864,7 +865,12 @@ +@@ -805,7 +806,12 @@ fork_proc_backend(const char *key, const char *conf, const char *procname) if (arg) *arg++ = '\0'; - if (snprintf(path, sizeof(path), PATH_LIBEXEC "/%s-%s", key, name) >= -+ proc_path = getenv("OPENSMTPD_PROC_PATH"); -+ if (proc_path == NULL) { -+ proc_path = PATH_LIBEXEC; -+ } ++ proc_path = getenv("OPENSMTPD_PROC_PATH"); ++ if (proc_path == NULL) { ++ proc_path = PATH_LIBEXEC; ++ } + + if (snprintf(path, sizeof(path), "%s/%s-%s", proc_path, key, name) >= (ssize_t)sizeof(path)) { log_warn("warn: %s-proc: exec path too long", key); return (-1); -diff -Naur opensmtpd-5.7.1p1/smtpd/table.c opensmtpd-5.7.1p1.patched/smtpd/table.c ---- opensmtpd-5.7.1p1/smtpd/table.c 2015-06-30 10:13:34.000000000 +0200 -+++ opensmtpd-5.7.1p1.patched/smtpd/table.c 2015-09-26 08:41:17.005472536 +0200 -@@ -201,6 +201,7 @@ +diff --git a/smtpd/table.c b/smtpd/table.c +index 21ee237..95b5164 100644 +--- a/smtpd/table.c ++++ b/smtpd/table.c +@@ -193,6 +193,7 @@ table_create(const char *backend, const char *name, const char *tag, struct table_backend *tb; char buf[LINE_MAX]; char path[LINE_MAX]; -+ const char *proc_path; ++ const char *proc_path; size_t n; struct stat sb; -@@ -215,8 +216,14 @@ +@@ -207,11 +208,16 @@ table_create(const char *backend, const char *name, const char *tag, if (name && table_find(name, NULL)) fatalx("table_create: table \"%s\" already defined", name); -+ proc_path = getenv("OPENSMTPD_PROC_PATH"); -+ if (proc_path == NULL) { -+ proc_path = PATH_LIBEXEC; -+ } ++ proc_path = getenv("OPENSMTPD_PROC_PATH"); ++ if (proc_path == NULL) { ++ proc_path = PATH_LIBEXEC; ++ } + if ((tb = table_backend_lookup(backend)) == NULL) { -- if ((size_t)snprintf(path, sizeof(path), PATH_LIBEXEC "/table-%s", +- if ((size_t)snprintf(path, sizeof(path), PATH_LIBEXEC"/table-%s", +- backend) >= sizeof(path)) { +- fatalx("table_create: path too long \"" +- PATH_LIBEXEC"/table-%s\"", backend); + if ((size_t)snprintf(path, sizeof(path), "%s/table-%s", -+ proc_path, - backend) >= sizeof(path)) { - fatalx("table_create: path too long \"" - PATH_LIBEXEC "/table-%s\"", backend); ++ proc_path, backend) >= sizeof(path)) { ++ fatalx("table_create: path too long \"%s/table-%s\"", ++ proc_path, backend); + } + if (stat(path, &sb) == 0) { + tb = table_backend_lookup("proc"); diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 45c01d74cdb3..7f17e2632a74 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1810,11 +1810,11 @@ let }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; xf86videointel = (mkDerivation "xf86videointel" { - name = "xf86-video-intel-2015-11-14"; + name = "xf86-video-intel-2016-05-22"; builder = ./builder.sh; src = fetchurl { - url = http://cgit.freedesktop.org/xorg/driver/xf86-video-intel/snapshot/0340718366d7cb168a46930eb7be22f2d88354d8.tar.gz; - sha256 = "0x11dig1wmpjz5n35sh30zs58ar8q8836w3zrkwkvgxj6q6smvvr"; + url = http://cgit.freedesktop.org/xorg/driver/xf86-video-intel/snapshot/8477615ae1bd284aca1221185ffefe0630d3f7ab.tar.gz; + sha256 = "1fnwcsg2kr32nv9x6z671g6amwcyhba2392d63kjl2avjyhjad79"; }; buildInputs = [pkgconfig dri2proto dri3proto fontsproto libdrm libpng udev libpciaccess presentproto randrproto renderproto libX11 xcbutil libxcb libXcursor libXdamage libXext xextproto xf86driproto libXfixes xorgserver xproto libXrandr libXrender libxshmfence libXtst libXvMC ]; meta.platforms = stdenv.lib.platforms.unix; @@ -1842,17 +1842,6 @@ let meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;}; - xf86videomodesetting = (mkDerivation "xf86videomodesetting" { - name = "xf86-video-modesetting-0.9.0"; - builder = ./builder.sh; - src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-modesetting-0.9.0.tar.bz2; - sha256 = "0p6pjn5bnd2wr3lmas4b12zcq12d9ilvssga93fzlg90fdahikwh"; - }; - buildInputs = [pkgconfig fontsproto libdrm udev libpciaccess randrproto libX11 xextproto xorgserver xproto ]; - meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit fontsproto libdrm udev libpciaccess randrproto libX11 xextproto xorgserver xproto ;}; - xf86videoneomagic = (mkDerivation "xf86videoneomagic" { name = "xf86-video-neomagic-1.2.9"; builder = ./builder.sh; @@ -2238,11 +2227,11 @@ let }) // {inherit inputproto libX11 libXaw xproto libXt ;}; xkeyboardconfig = (mkDerivation "xkeyboardconfig" { - name = "xkeyboard-config-2.16"; + name = "xkeyboard-config-2.17"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.16.tar.bz2; - sha256 = "0n0xinsljc5mww1qw7dfp8knv0f1r9hs6pdhl0fggdwn5hhiz2hy"; + url = mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.17.tar.bz2; + sha256 = "00878f1v3034ki78pjpf2db0bh7jsmszsnxr3bf5qxripm2bxiny"; }; buildInputs = [pkgconfig libX11 xproto ]; meta.platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index d0a812e45d6a..6110b1b571ad 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -144,7 +144,6 @@ mirror://xorg/individual/driver/xf86-video-i740-1.3.5.tar.bz2 mirror://xorg/individual/driver/xf86-video-intel-2.99.917.tar.bz2 mirror://xorg/individual/driver/xf86-video-mach64-6.9.5.tar.bz2 mirror://xorg/individual/driver/xf86-video-mga-1.6.4.tar.bz2 -mirror://xorg/individual/driver/xf86-video-modesetting-0.9.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-qxl-0.1.3.tar.bz2 mirror://xorg/individual/driver/xf86-video-neomagic-1.2.9.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86-video-newport-0.2.4.tar.bz2 @@ -176,7 +175,7 @@ mirror://xorg/individual/app/xinput-1.6.2.tar.bz2 mirror://xorg/individual/app/xkbcomp-1.3.1.tar.bz2 mirror://xorg/individual/app/xkbevd-1.1.4.tar.bz2 mirror://xorg/individual/app/xkbutils-1.0.4.tar.bz2 -mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.16.tar.bz2 +mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.17.tar.bz2 mirror://xorg/individual/app/xkill-1.0.4.tar.bz2 mirror://xorg/individual/app/xlsatoms-1.1.2.tar.bz2 mirror://xorg/individual/app/xlsclients-1.1.3.tar.bz2 diff --git a/pkgs/tools/admin/simp_le/default.nix b/pkgs/tools/admin/simp_le/default.nix index fdb531736d05..8925610bebfb 100644 --- a/pkgs/tools/admin/simp_le/default.nix +++ b/pkgs/tools/admin/simp_le/default.nix @@ -10,7 +10,7 @@ pythonPackages.buildPythonApplication rec { sha256 = "0x8gqazn09m30bn1l7xnf8snhbb7yz7sb09imciqmm4jqdvn797z"; }; - propagatedBuildInputs = with pythonPackages; [ acme ]; + propagatedBuildInputs = with pythonPackages; [ acme_0_5_0 ]; meta = with stdenv.lib; { inherit (src.meta) homepage; diff --git a/pkgs/tools/inputmethods/fcitx/fcitx-qt5-ecm.patch b/pkgs/tools/inputmethods/fcitx/fcitx-qt5-ecm.patch new file mode 100644 index 000000000000..8fe100dd3b24 --- /dev/null +++ b/pkgs/tools/inputmethods/fcitx/fcitx-qt5-ecm.patch @@ -0,0 +1,29 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b8e729a..ebd3603 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -5,9 +5,7 @@ project(fcitx-qt5) + set(FcitxQt5_VERSION 1.0.0) + set(REQUIRED_QT_VERSION 5.1.0) + +-find_package(ECM 1.4.0 REQUIRED NO_MODULE) +- +-set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/cmake) ++set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake) + + include(GNUInstallDirs) + include(FeatureSummary) +diff --git a/cmake/FindXKBCommon.cmake b/cmake/FindXKBCommon.cmake +index a645584..de0007d 100644 +--- a/cmake/FindXKBCommon.cmake ++++ b/cmake/FindXKBCommon.cmake +@@ -1,5 +1,5 @@ + +-include(ECMFindModuleHelpersStub) ++include(ECMFindModuleHelpers) + + ecm_find_package_version_check(XKBCommon) + +-- +2.8.0 + diff --git a/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix b/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix index ab139bdb5a76..fc9dd1e6a253 100644 --- a/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix +++ b/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, fcitx, extra-cmake-modules, qtbase }: +{ stdenv, lib, fetchurl, cmake, fcitx, pkgconfig, qtbase, kde5 }: stdenv.mkDerivation rec { name = "fcitx-qt5-${version}"; @@ -9,7 +9,19 @@ stdenv.mkDerivation rec { sha256 = "1pj1b04n8r4kl7jh1qdv0xshgzb3zrmizfa3g5h3yk589h191vwc"; }; - buildInputs = [ cmake fcitx extra-cmake-modules qtbase ]; + # The following is to not have a dependency on kde5 so the plugin can be part of qt5LibsFun + postUnpack = '' + ${lib.concatMapStrings (f: '' + ln -s ${kde5.extra-cmake-modules}/share/ECM/modules/${f} $sourceRoot/cmake/ + '') + [ "ECMFindModuleHelpers.cmake" "ECMGenerateHeaders.cmake" + "ECMPackageConfigHelpers.cmake" "ECMQueryQmake.cmake" + "ECMSetupVersion.cmake" "ECMVersionHeader.h.in" ]} + ''; + + patches = [ ./fcitx-qt5-ecm.patch ]; + + buildInputs = [ cmake fcitx pkgconfig qtbase ]; preInstall = '' substituteInPlace platforminputcontext/cmake_install.cmake \ diff --git a/pkgs/tools/inputmethods/fcitx/wrapper.nix b/pkgs/tools/inputmethods/fcitx/wrapper.nix index 96423cf46e6d..8e086f7386f5 100644 --- a/pkgs/tools/inputmethods/fcitx/wrapper.nix +++ b/pkgs/tools/inputmethods/fcitx/wrapper.nix @@ -1,9 +1,9 @@ -{ stdenv, symlinkJoin, fcitx, fcitx-configtool, makeWrapper, plugins, kde5 }: +{ stdenv, symlinkJoin, fcitx, fcitx-configtool, makeWrapper, plugins, qt55 }: symlinkJoin { name = "fcitx-with-plugins-${fcitx.version}"; - paths = [ fcitx fcitx-configtool kde5.fcitx-qt5 ] ++ plugins; + paths = [ fcitx fcitx-configtool qt55.fcitx-qt5 ] ++ plugins; buildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/system/pciutils/default.nix b/pkgs/tools/system/pciutils/default.nix index 7c2365885444..622f5fc6ceae 100644 --- a/pkgs/tools/system/pciutils/default.nix +++ b/pkgs/tools/system/pciutils/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, zlib, kmod, which }: stdenv.mkDerivation rec { - name = "pciutils-3.4.1"; # with database from 2016-01 + name = "pciutils-3.5.1"; # with database from 2016-05 src = fetchurl { url = "mirror://kernel/software/utils/pciutils/${name}.tar.xz"; - sha256 = "0am8hiv435h2dayclnkdk8qjlpj08m4djf6sv15n9l84av658mc6"; + sha256 = "0byl2f897w5lhs4bvr6p7qwcz9bllj2zyfv7nywbcbsnb9ha9wrb"; }; buildInputs = [ pkgconfig zlib kmod which ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bc994fb33492..46f7856eb829 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8766,6 +8766,8 @@ in accounts-qt = callPackage ../development/libraries/accounts-qt { }; + fcitx-qt5 = callPackage ../tools/inputmethods/fcitx/fcitx-qt5.nix { }; + grantlee = callPackage ../development/libraries/grantlee/5.x.nix { }; libcommuni = callPackage ../development/libraries/libcommuni { }; @@ -12844,6 +12846,8 @@ in inherit (gnome) GConf; }; + gnome-mpv = callPackage ../applications/video/gnome-mpv { }; + gollum = callPackage ../applications/misc/gollum { }; google-chrome = callPackage ../applications/networking/browsers/google-chrome { gconf = gnome.GConf; }; @@ -15738,8 +15742,6 @@ in dfilemanager = callPackage ../applications/misc/dfilemanager { }; - fcitx-qt5 = callPackage ../tools/inputmethods/fcitx/fcitx-qt5.nix { }; - k9copy = callPackage ../applications/video/k9copy {}; kdeconnect = callPackage ../applications/misc/kdeconnect { }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index cce5182e992f..e606932f969c 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -887,11 +887,15 @@ let self = _self // overrides; _self = with self; { CatalystActionRenderView = buildPerlPackage rec { name = "Catalyst-Action-RenderView-0.16"; src = fetchurl { - url = "mirror://cpan/modules/by-module/Catalyst/${name}.tar.gz"; - sha256 = "0j1rrld13cjk7ks92b5hv3xw4rfm2lvmksb4rlzd8mx0a0wj0rc5"; + url = "mirror://cpan/authors/id/B/BO/BOBTFISH/${name}.tar.gz"; + sha256 = "8565203950a057d43ecd64e9593715d565c2fbd8b02c91f43c53b2111acd3948"; + }; + buildInputs = [ HTTPRequestAsCGI ]; + propagatedBuildInputs = [ CatalystRuntime DataVisitor MROCompat ]; + meta = { + description = "Sensible default end action"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; - propagatedBuildInputs = - [ CatalystRuntime HTTPRequestAsCGI DataVisitor MROCompat ]; }; CatalystActionREST = buildPerlPackage rec { @@ -989,19 +993,19 @@ let self = _self // overrides; _self = with self; { }; }; - CatalystDevel = buildPerlPackage { + CatalystDevel = buildPerlPackage rec { name = "Catalyst-Devel-1.39"; src = fetchurl { - url = mirror://cpan/authors/id/I/IL/ILMARI/Catalyst-Devel-1.39.tar.gz; - sha256 = "12m50bbkggjmpxihv3wnvr0g2qng0zwhlzi5ygppjz8wh2x73qxw"; + url = "mirror://cpan/authors/id/I/IL/ILMARI/${name}.tar.gz"; + sha256 = "bce371ba801c7d79eff3257e0af907cf62f140de968f0d63bf55be37d702a58a"; }; buildInputs = [ TestFatal ]; - propagatedBuildInputs = [ CatalystRuntime CatalystActionRenderView CatalystPluginConfigLoader CatalystPluginStaticSimple ConfigGeneral FileChangeNotify FileCopyRecursive FileShareDir ModuleInstall Moose MooseXDaemonize MooseXEmulateClassAccessorFast namespaceautoclean namespaceclean PathClass Starman TemplateToolkit ]; + propagatedBuildInputs = [ CatalystActionRenderView CatalystPluginConfigLoader CatalystPluginStaticSimple CatalystRuntime ConfigGeneral FileChangeNotify FileCopyRecursive FileShareDir ModuleInstall Moose MooseXDaemonize MooseXEmulateClassAccessorFast PathClass TemplateToolkit Starman namespaceautoclean namespaceclean ]; meta = { homepage = http://dev.catalyst.perl.org/; description = "Catalyst Development Tools"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.all; }; }; @@ -1069,34 +1073,33 @@ let self = _self // overrides; _self = with self; { }; }; - CatalystRuntime = buildPerlPackage { - name = "Catalyst-Runtime-5.90085"; + CatalystRuntime = buildPerlPackage rec { + name = "Catalyst-Runtime-5.90104"; src = fetchurl { - url = mirror://cpan/authors/id/J/JJ/JJNAPIORK/Catalyst-Runtime-5.90085.tar.gz; - sha256 = "17wfcawvj8nxs2wq7r094m6dff37s6i2d2z49lxz2n8c489d9nk1"; + url = "mirror://cpan/authors/id/J/JJ/JJNAPIORK/${name}.tar.gz"; + sha256 = "91d551944beb3a0ae8635c78d5f2e1583ef1e7873d5c8ee407e2f64380ad870b"; }; - buildInputs = [ DataDump HTTPMessage IOstringy JSONMaybeXS TestFatal ]; - propagatedBuildInputs = [ CGISimple CGIStruct ClassC3AdoptNEXT ClassDataInheritable ClassLoad DataDump DataOptList Encode HTMLParser HTTPBody HTTPMessage HTTPRequestAsCGI HashMultiValue JSONMaybeXS LWP ListMoreUtils MROCompat ModulePluggable Moose MooseXEmulateClassAccessorFast MooseXGetopt MooseXMethodAttributes MooseXRoleWithOverloading PathClass Plack PlackMiddlewareFixMissingBodyInRedirect PlackMiddlewareMethodOverride PlackMiddlewareRemoveRedundantBody PlackMiddlewareReverseProxy PlackTestExternalServer SafeIsa StreamBuffered StringRewritePrefix SubExporter TaskWeaken TermSizeAny TextSimpleTable TreeSimple TreeSimpleVisitorFactory TryTiny URI URIws namespaceautoclean namespaceclean ]; + buildInputs = [ DataDump HTTPMessage IOstringy JSONMaybeXS TestFatal TypeTiny ]; + propagatedBuildInputs = [ CGISimple CGIStruct ClassC3AdoptNEXT ClassDataInheritable ClassLoad DataDump DataOptList HTMLParser HTTPBody HTTPMessage HTTPRequestAsCGI HashMultiValue JSONMaybeXS LWP ListMoreUtils MROCompat ModulePluggable Moose MooseXEmulateClassAccessorFast MooseXGetopt MooseXMethodAttributes MooseXRoleWithOverloading PathClass Plack PlackMiddlewareFixMissingBodyInRedirect PlackMiddlewareMethodOverride PlackMiddlewareRemoveRedundantBody PlackMiddlewareReverseProxy PlackTestExternalServer SafeIsa StreamBuffered StringRewritePrefix SubExporter TaskWeaken TextSimpleTable TreeSimple TreeSimpleVisitorFactory TryTiny URI URIws namespaceautoclean namespaceclean ]; meta = { homepage = http://dev.catalyst.perl.org/; description = "The Catalyst Framework Runtime"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.all; }; }; - CatalystPluginAccessLog = buildPerlPackage { - name = "Catalyst-Plugin-AccessLog-1.05"; + CatalystPluginAccessLog = buildPerlPackage rec { + name = "Catalyst-Plugin-AccessLog-1.10"; src = fetchurl { - url = mirror://cpan/authors/id/A/AR/ARODLAND/Catalyst-Plugin-AccessLog-1.05.tar.gz; - sha256 = "0hqvckaw91q5yc25a33bp0d4qqxlgkp7rxlvi8n8svxd1406r55s"; + url = "mirror://cpan/authors/id/A/AR/ARODLAND/${name}.tar.gz"; + sha256 = "873db8e4e72a994e3e17aeb53d2b837e6d524b4b8b0f3539f262135c88cc2120"; }; propagatedBuildInputs = [ CatalystRuntime DateTime Moose namespaceautoclean ]; - doCheck = false; meta = { + homepage = http://metacpan.org/release/Catalyst-Plugin-AccessLog; description = "Request logging from within Catalyst"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - platforms = stdenv.lib.platforms.linux; }; }; @@ -3532,13 +3535,15 @@ let self = _self // overrides; _self = with self; { }; DBIxClassCandy = buildPerlPackage rec { - name = "DBIx-Class-Candy-0.005000"; + name = "DBIx-Class-Candy-0.005002"; src = fetchurl { url = "mirror://cpan/authors/id/F/FR/FREW/${name}.tar.gz"; - sha256 = "1gnc88ych9wc9x76y4305z8b06bw76a81d6v024mfalwy35kcfvw"; + sha256 = "fb109e765674a52e9eac03f52403bb3cf717254b8b9fa46f06a6f205392f987d"; }; - propagatedBuildInputs = [ TestDeep TestFatal DBIxClass LinguaENInflect StringCamelCase ]; + buildInputs = [ TestDeep TestFatal ]; + propagatedBuildInputs = [ DBIxClass LinguaENInflect MROCompat StringCamelCase SubExporter namespaceclean ]; meta = { + homepage = https://github.com/frioux/DBIx-Class-Candy; description = "Sugar for your favorite ORM, DBIx::Class"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -3568,24 +3573,25 @@ let self = _self // overrides; _self = with self; { }; DBIxClassHelpers = buildPerlPackage rec { - name = "DBIx-Class-Helpers-2.031000"; + name = "DBIx-Class-Helpers-2.032001"; src = fetchurl { url = "mirror://cpan/authors/id/F/FR/FREW/${name}.tar.gz"; - sha256 = "0vbq3jk8j5akivdpc1g07knx47id1ynb7bvk8a1ki8j1w4siq35i"; + sha256 = "c7af96d17e11f0957b7187bb6002341a7b130bb79b61f6d91b39178ef000eff5"; }; - propagatedBuildInputs = [ aliased DBIxIntrospector DBIxClassCandy TestDeep - CarpClan DBDSQLite SafeIsa TextBrew DateTime DateTimeFormatSQLite ]; + buildInputs = [ DBDSQLite DateTimeFormatSQLite TestDeep TestFatal TestRoo aliased ]; + propagatedBuildInputs = [ CarpClan DBIxClass DBIxClassCandy DBIxIntrospector LinguaENInflect ModuleRuntime Moo SafeIsa StringCamelCase SubExporterProgressive TextBrew TryTiny namespaceclean ]; meta = { + homepage = https://github.com/frioux/DBIx-Class-Helpers; description = "Simplify the common case stuff for DBIx::Class"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; - DBIxClassIntrospectableM2M = buildPerlPackage { - name = "DBIx-Class-IntrospectableM2M-0.001001"; + DBIxClassIntrospectableM2M = buildPerlPackage rec { + name = "DBIx-Class-IntrospectableM2M-0.001002"; src = fetchurl { - url = mirror://cpan/authors/id/G/GR/GRODITI/DBIx-Class-IntrospectableM2M-0.001001.tar.gz; - sha256 = "0p9zx1yc1f6jg583l206wilsni2v8mlngc2vf2q8yn10pmy4y6wm"; + url = "mirror://cpan/authors/id/I/IL/ILMARI/${name}.tar.gz"; + sha256 = "c6baafb4241693fdb34b29ebd906993add364bf31aafa4462f3e062204cc87f0"; }; propagatedBuildInputs = [ DBIxClass ]; meta = { @@ -4364,13 +4370,13 @@ let self = _self // overrides; _self = with self; { }; EmailSender = buildPerlPackage rec { - name = "Email-Sender-1.300021"; + name = "Email-Sender-1.300028"; src = fetchurl { url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz"; - sha256 = "f565ef5805ff54c5a77400b0a512709137092d247321bbe5065f265e2a7b4fed"; + sha256 = "4a1cb9386a6b58b589b3183c807e533547a28e596fb15aa4cfd614947ad8ad30"; }; buildInputs = [ CaptureTiny ]; - propagatedBuildInputs = [ EmailAbstract EmailAddress EmailSimple ListMoreUtils Moo MooXTypesMooseLike SubExporterUtil Throwable ]; + propagatedBuildInputs = [ libnet EmailAbstract EmailAddress EmailSimple ListMoreUtils ModuleRuntime Moo MooXTypesMooseLike SubExporter Throwable TryTiny ]; meta = { homepage = https://github.com/rjbs/Email-Sender; description = "A library for sending email"; @@ -4380,10 +4386,10 @@ let self = _self // overrides; _self = with self; { }; EmailSimple = buildPerlPackage rec { - name = "Email-Simple-2.208"; + name = "Email-Simple-2.210"; src = fetchurl { url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz"; - sha256 = "f13a83ecc41b4e72023066d865fc70dfbd85158d4e7722dca8249f54e0ec5be1"; + sha256 = "c8633fa462538967c036e3077617de9e5e8f6acc68d25546ba1d5bb1e12bd319"; }; propagatedBuildInputs = [ EmailDateFormat ]; meta = { @@ -5129,11 +5135,11 @@ let self = _self // overrides; _self = with self; { }; }; - FilePath = buildPerlPackage { - name = "File-Path-2.11"; + FilePath = buildPerlPackage rec { + name = "File-Path-2.12"; src = fetchurl { - url = mirror://cpan/authors/id/R/RI/RICHE/File-Path-2.11.tar.gz; - sha256 = "d94492c072d08bdbbd40fd75a1010ff279e99333b63b4308b1f818fe6309dd0f"; + url = "mirror://cpan/authors/id/R/RI/RICHE/${name}.tar.gz"; + sha256 = "bbf61a0d37c135c694e80f4ea344932bdc5474c213025ae307ea52cb6886d17e"; }; meta = { description = "Create or remove directory trees"; @@ -5263,7 +5269,11 @@ let self = _self // overrides; _self = with self; { name = "File-Slurp-Tiny-0.004"; src = fetchurl { url = "mirror://cpan/authors/id/L/LE/LEONT/${name}.tar.gz"; - sha256 = "07kzfmibl43dq4c803f022g2rcfv4nkjgipxclz943mzxaz9aaa5"; + sha256 = "452995beeabf0e923e65fdc627a725dbb12c9e10c00d8018c16d10ba62757f1e"; + }; + meta = { + description = "A simple, sane and efficient file slurper [DISCOURAGED]"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -6785,11 +6795,11 @@ let self = _self // overrides; _self = with self; { }; }; - libnet = buildPerlPackage { - name = "libnet-3.07"; + libnet = buildPerlPackage rec { + name = "libnet-3.08"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHAY/libnet-3.07.tar.gz; - sha256 = "d9a23d8907e681e788a6f1a71915b1d37d057091e88049e5a4064c99ca2c9cd7"; + url = "mirror://cpan/authors/id/S/SH/SHAY/${name}.tar.gz"; + sha256 = "21ebae642b53336576c370989d238cbe74378944079aca6f97665158c9f1750b"; }; meta = { description = "Collection of network protocol modules"; @@ -6820,30 +6830,36 @@ let self = _self // overrides; _self = with self; { }; }; - LinguaENInflect = buildPerlPackage { - name = "Lingua-EN-Inflect-1.895"; + LinguaENInflect = buildPerlPackage rec { + name = "Lingua-EN-Inflect-1.899"; src = fetchurl { - url = mirror://cpan/authors/id/D/DC/DCONWAY/Lingua-EN-Inflect-1.895.tar.gz; - sha256 = "0drzg9a2dkjxgf00n6jg0jzhd8972bh3j4wdnmdxpqi3zmfqhwcy"; + url = "mirror://cpan/authors/id/D/DC/DCONWAY/${name}.tar.gz"; + sha256 = "1599a93020a2fdc0de8db14eea721df8fd772f78dedaf81081081fc93aa6a257"; }; meta = { - description = "Convert singular to plural"; + description = "Convert singular to plural. Select 'a' or 'an'"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; LinguaENInflectNumber = buildPerlPackage rec { - name = "Lingua-EN-Inflect-Number-1.1"; + name = "Lingua-EN-Inflect-Number-1.12"; src = fetchurl { - url = "mirror://cpan/modules/by-module/Lingua/${name}.tar.gz"; - sha256 = "13hlr1srp9cd9mcc78snkng9il8iavvylfyh81iadvn2y7wikwfy"; + url = "mirror://cpan/authors/id/N/NE/NEILB/${name}.tar.gz"; + sha256 = "66fb33838512746f5c597e80264fea66643f7f26570ec2f9205b6135ad67acbf"; }; propagatedBuildInputs = [ LinguaENInflect ]; + meta = { + homepage = https://github.com/neilbowers/Lingua-EN-Inflect-Number; + description = "Force number of words to singular or plural"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; }; - LinguaENInflectPhrase = buildPerlPackage { + LinguaENInflectPhrase = buildPerlPackage rec { name = "Lingua-EN-Inflect-Phrase-0.18"; src = fetchurl { - url = mirror://cpan/authors/id/R/RK/RKITOVER/Lingua-EN-Inflect-Phrase-0.18.tar.gz; + url = "mirror://cpan/authors/id/R/RK/RKITOVER/${name}.tar.gz"; sha256 = "290a5b8fc2be28d6d479517655027a90e944476cb3552f10cbf6db37af79f9a6"; }; buildInputs = [ TestNoWarnings ]; @@ -9718,11 +9734,11 @@ let self = _self // overrides; _self = with self; { }; }; - PerlIOutf8_strict = buildPerlModule { - name = "PerlIO-utf8_strict-0.005"; + PerlIOutf8_strict = buildPerlPackage rec { + name = "PerlIO-utf8_strict-0.006"; src = fetchurl { - url = mirror://cpan/authors/id/L/LE/LEONT/PerlIO-utf8_strict-0.005.tar.gz; - sha256 = "8956064ac2bf1f79bac868a9db93a44aade77df4d3e8b07ce31a40f987ef2e0e"; + url = "mirror://cpan/authors/id/L/LE/LEONT/${name}.tar.gz"; + sha256 = "980010e624c43be0a2aac8e1fe5db3fe43035940def75ca70401bb1ca98bd562"; }; buildInputs = [ TestException ]; meta = { @@ -9949,11 +9965,11 @@ let self = _self // overrides; _self = with self; { }; }; - PPIxRegexp = buildPerlPackage { - name = "PPIx-Regexp-0.036"; + PPIxRegexp = buildPerlPackage rec { + name = "PPIx-Regexp-0.050"; src = fetchurl { - url = mirror://cpan/authors/id/W/WY/WYANT/PPIx-Regexp-0.036.tar.gz; - sha256 = "1nnaxf1dmywacdgh8f1s2ki8jkrf2vi6bfhk70p1r9k1001idlfk"; + url = "mirror://cpan/authors/id/W/WY/WYANT/${name}.tar.gz"; + sha256 = "fd095fb90826efa3f9b28bf018a099dc51f1d7c7d34ed2f193a28f1087635125"; }; propagatedBuildInputs = [ ListMoreUtils PPI TaskWeaken ]; meta = { @@ -10056,28 +10072,28 @@ let self = _self // overrides; _self = with self; { }; }; - PerlPrereqScanner = buildPerlPackage { - name = "Perl-PrereqScanner-1.019"; + PerlPrereqScanner = buildPerlPackage rec { + name = "Perl-PrereqScanner-1.023"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Perl-PrereqScanner-1.019.tar.gz; - sha256 = "1ndgq2c7s1042c3zxjsmjfpf4lnwfg6w36hmvhh3yk9qihcprbgj"; + url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz"; + sha256 = "280a1c4710390865fb9f310a861a34720b28b4cbe50609c841af5cf2d3a2bced"; }; buildInputs = [ PPI TryTiny ]; propagatedBuildInputs = [ GetoptLongDescriptive ListMoreUtils ModulePath Moose PPI ParamsUtil StringRewritePrefix namespaceautoclean ]; meta = { - homepage = https://github.com/rjbs/perl-prereqscanner; + homepage = https://github.com/rjbs/Perl-PrereqScanner; description = "A tool to scan your Perl code for its prerequisites"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; - PerlVersion = buildPerlPackage { - name = "Perl-Version-1.011"; + PerlVersion = buildPerlPackage rec { + name = "Perl-Version-1.013"; src = fetchurl { - url = mirror://cpan/authors/id/A/AN/ANDYA/Perl-Version-1.011.tar.gz; - sha256 = "12ede8a87a12574fcd525c1d23d8a5b2fa2918ff5b78eb56cf701251a81af19b"; + url = "mirror://cpan/authors/id/B/BD/BDFOY/${name}.tar.gz"; + sha256 = "1887414d1c8689d864c840114101e043e99d7dd5b9cca69369a60e821e3ad0f7"; }; - propagatedBuildInputs = [ FileSlurp ]; + propagatedBuildInputs = [ FileSlurpTiny ]; meta = { description = "Parse and manipulate Perl version strings"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -11473,24 +11489,14 @@ let self = _self // overrides; _self = with self; { name = "Task-Catalyst-Tutorial-0.06"; src = fetchurl { url = "mirror://cpan/authors/id/M/MR/MRAMBERG/${name}.tar.gz"; - sha256 = "07nn8a30n3qylpnf7s4ma6w462g31pywwikib117hr2mc7cv5cbm"; + sha256 = "75b1b2d96155647842587146cefd0de30943b85195e8e3eca51e0f0b8642d61e"; }; - propagatedBuildInputs = [ - CatalystManual CatalystRuntime CatalystDevel - CatalystPluginSession CatalystPluginAuthentication - CatalystAuthenticationStoreDBIxClass - CatalystPluginAuthorizationRoles - CatalystPluginSessionStateCookie - CatalystPluginAuthorizationACL - CatalystPluginHTMLWidget - CatalystPluginSessionStoreFastMmap - CatalystPluginStackTrace - CatalystViewTT - DBIxClass DBIxClassHTMLWidget - CatalystControllerHTMLFormFu - ]; buildInputs = [TestPodCoverage]; - meta.platforms = stdenv.lib.platforms.linux; + propagatedBuildInputs = [ CatalystAuthenticationStoreDBIxClass CatalystControllerHTMLFormFu CatalystDevel CatalystManual CatalystModelDBICSchema CatalystPluginAuthentication CatalystPluginAuthorizationACL CatalystPluginAuthorizationRoles CatalystPluginSession CatalystPluginSessionStateCookie CatalystPluginSessionStoreFastMmap CatalystPluginStackTrace CatalystRuntime CatalystViewTT DBIxClass ]; + meta = { + description = "Everything you need to follow the Catalyst Tutorial"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; }; TaskPlack = buildPerlModule rec { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0d0642331bb0..40d9da652485 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -247,6 +247,8 @@ in modules // { pygame = callPackage ../development/python-modules/pygame { }; + pygame-git = callPackage ../development/python-modules/pygame/git.nix { }; + pygobject = callPackage ../development/python-modules/pygobject { }; pygobject3 = callPackage ../development/python-modules/pygobject/3.nix { }; @@ -370,6 +372,27 @@ in modules // { }; }; + acme_0_5_0 = buildPythonPackage rec { + version = "0.5.0"; + name = "acme-${version}"; + + src = pkgs.fetchFromGitHub { + owner = "letsencrypt"; + repo = "letsencrypt"; + rev = "v${version}"; + sha256 = "0x098cdyfgqvh7x5d3sz56qjpjyg5b4fl82086sm43d8mbz0h5rm"; + }; + + propagatedBuildInputs = with self; [ + cryptography pyasn1 pyopenssl pyRFC3339 pytz requests2 six werkzeug mock + ndg-httpsclient + ]; + + buildInputs = with self; [ nose ]; + + sourceRoot = "letsencrypt-v${version}-src/acme"; + }; + acme = buildPythonPackage rec { inherit (pkgs.certbot) src version; @@ -13222,7 +13245,7 @@ in modules // { name = "slixmpp-${version}"; version = "1.1"; - disabled = (!isPy34); + disabled = pythonOlder "3.4"; src = pkgs.fetchurl { url = "mirror://pypi/s/slixmpp/${name}.tar.gz"; @@ -26385,7 +26408,7 @@ in modules // { version = "0.9"; namePrefix = ""; - disabled = (!isPy34); + disabled = pythonOlder "3.4"; buildInputs = with self; [ pytest ]; propagatedBuildInputs = with self ; [ aiodns slixmpp pyinotify potr ]; diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 83bbf3b96e8e..2211241ed3dd 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -298,7 +298,6 @@ let xf86videonv = linux; xf86videovesa = linux; xf86videovmware = linux; - xf86videomodesetting = linux; xfs = linux ++ darwin; xinput = linux ++ darwin; xkbcomp = linux ++ darwin; |