From f7d88238cd4f471f7798782d133d008e4a236843 Mon Sep 17 00:00:00 2001 From: artuuge Date: Mon, 8 Feb 2016 14:21:39 +0100 Subject: epson-escpr: init at version 1.6.3 --- .../drivers/epson-escpr/cups-filter-ppd-dirs.patch | 62 ++++++++++++++++++++++ pkgs/misc/drivers/epson-escpr/default.nix | 36 +++++++++++++ 2 files changed, 98 insertions(+) create mode 100644 pkgs/misc/drivers/epson-escpr/cups-filter-ppd-dirs.patch create mode 100644 pkgs/misc/drivers/epson-escpr/default.nix (limited to 'pkgs/misc') diff --git a/pkgs/misc/drivers/epson-escpr/cups-filter-ppd-dirs.patch b/pkgs/misc/drivers/epson-escpr/cups-filter-ppd-dirs.patch new file mode 100644 index 000000000000..3065ed1a10f5 --- /dev/null +++ b/pkgs/misc/drivers/epson-escpr/cups-filter-ppd-dirs.patch @@ -0,0 +1,62 @@ +diff --git a/configure b/configure_new +index c3e7199..ccbf290 100755 +--- a/configure ++++ b/configure_new +@@ -11585,55 +11585,8 @@ else + $as_echo "no" >&6; } + fi + +- +- +-if test "xNONE" != "x${prefix}" ; then +- cups_default_prefix="${prefix}" +-else +- cups_default_prefix="${ac_default_prefix}" +-fi +- +- +-# Check whether --with-cupsfilterdir was given. +-if test "${with_cupsfilterdir+set}" = set; then : +- withval=$with_cupsfilterdir; +-else +- with_cupsfilterdir=no +-fi +- +-if test "xno" = "x${with_cupsfilterdir}"; then +- if test "xyes" = "x$have_cups_config" ; then +- CUPS_FILTER_DIR="${cups_default_prefix}`cups-config --serverbin | sed -e 's,^/[^/][^/]*,,'`/filter" +- else +- CUPS_FILTER_DIR="${cups_default_prefix}/lib/cups/filter" +- fi +-else +- CUPS_FILTER_DIR="${with_cupsfilterdir}" +-fi +- +- +-# Check whether --with-cupsppddir was given. +-if test "${with_cupsppddir+set}" = set; then : +- withval=$with_cupsppddir; +-else +- with_cupsppddir=no +-fi +- +-if test "xno" = "x${with_cupsppddir}"; then +- if test -d "${cups_default_prefix}/share/ppd" ; then +- CUPS_PPD_DIR="${cups_default_prefix}/share/ppd" +- elif test "xyes" = "x$have_cups_config" ; then +- CUPS_PPD_DIR="${cups_default_prefix}/`cups-config --datadir | sed -e 's,^/[^/][^/]*,,'`/model" +- else +- CUPS_PPD_DIR="${cups_default_prefix}/share/cups/model" +- fi +-else +- CUPS_PPD_DIR="${with_cupsppddir}" +-fi +- +- +- +- ++CUPS_FILTER_DIR="${prefix}/lib/cups/filter" ++CUPS_PPD_DIR="${prefix}/share/cups/model" + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 + $as_echo_n "checking for ANSI C header files... " >&6; } diff --git a/pkgs/misc/drivers/epson-escpr/default.nix b/pkgs/misc/drivers/epson-escpr/default.nix new file mode 100644 index 000000000000..1f403947acb5 --- /dev/null +++ b/pkgs/misc/drivers/epson-escpr/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchurl, cups }: + +let + version = "1.6.3"; +in + stdenv.mkDerivation { + + name = "epson-escpr-${version}"; + + src = fetchurl { + url = "https://download3.ebz.epson.net/dsc/f/03/00/04/33/53/0177a44361d3dfeacf7f15ff4a347cef373688da/epson-inkjet-printer-escpr-1.6.3-1lsb3.2.tar.gz"; + sha256 = "4988479ce7dd5513bfa1cce4a83f82348572d8d69d6aa3b2c6e154a58a04ad86"; + }; + + patches = [ ./cups-filter-ppd-dirs.patch ]; + + buildInputs = [ cups ]; + + meta = { + homepage = https://github.com/artuuge/NixOS-files/; + description = "ESC/P-R Driver (generic driver)"; + longDescription = '' + Epson Inkjet Printer Driver (ESC/P-R) for Linux and the + corresponding PPD files. The list of supported printers + can be found at http://www.openprinting.org/driver/epson-escpr/ . + + To use the driver adjust your configuration.nix file: + services.printing = { + enable = true; + drivers = [ pkgs.epson-escpr ]; + }; + ''; + license = stdenv.lib.licenses.gpl3Plus; + }; + + } -- cgit 1.4.1 From a9f8613dae32b10de3bdc8a86032dae43f80db32 Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Sat, 16 Jan 2016 16:16:04 +0100 Subject: splix: 2.0.0 -> svn-r315 r315 has been in use for several years, but was never officially released --- pkgs/misc/cups/drivers/splix/default.nix | 37 +++++++++++++++++++++----------- 1 file changed, 24 insertions(+), 13 deletions(-) (limited to 'pkgs/misc') diff --git a/pkgs/misc/cups/drivers/splix/default.nix b/pkgs/misc/cups/drivers/splix/default.nix index 532ef2a45d5d..8c58d41f0fa3 100644 --- a/pkgs/misc/cups/drivers/splix/default.nix +++ b/pkgs/misc/cups/drivers/splix/default.nix @@ -1,24 +1,35 @@ -{stdenv, fetchurl, cups, zlib}: - -stdenv.mkDerivation rec { - name = "splix-2.0.0"; - - src = fetchurl { - url = "mirror://sourceforge/splix/${name}.tar.bz2"; - sha256 = "0bwivrwwvh6hzvnycpzqs7a0capgycahc4s3v9ihx552fgy07xwp"; +{ stdenv, fetchsvn, fetchurl, cups, zlib }: +let rev = "r315"; in +stdenv.mkDerivation (rec { + name = "splix-svn-${rev}"; + src = fetchsvn { + # We build this from svn, because splix hasn't been in released in several years + # although the community has been adding some new printer models + # if you are having problems, please try the stable version below and report back + url = "svn://svn.code.sf.net/p/splix/code/splix"; + inherit rev; + sha256 = "16wbm4xnz35ca3mw2iggf5f4jaxpyna718ia190ka6y4ah932jxl"; }; - patches = [ ./splix-2.0.0-gcc45.patch ]; - - preBuild='' + preBuild = '' makeFlags="V=1 DISABLE_JBIG=1 CUPSFILTER=$out/lib/cups/filter CUPSPPD=$out/share/cups/model" ''; - buildInputs = [cups zlib]; + buildInputs = [ cups zlib ]; meta = { homepage = http://splix.sourceforge.net; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.simons ]; }; -} + +} /* // { # uncomment to build the stable version + + name = "splix-2.0.0"; + patches = [ ./splix-2.0.0-gcc45.patch ]; + src = fetchurl { + url = "mirror://sourceforge/splix/${name}.tar.bz2"; + sha256 = "0bwivrwwvh6hzvnycpzqs7a0capgycahc4s3v9ihx552fgy07xwp"; + }; + +} */) -- cgit 1.4.1 From 4d06bf70f4580d5cb907278dd3c384c305f95c74 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 19 Feb 2016 13:12:11 +0100 Subject: buildPythonApplication: use new function for Python applications --- pkgs/applications/audio/gpodder/default.nix | 4 ++-- pkgs/applications/audio/gtklick/default.nix | 2 +- pkgs/applications/audio/lastfmsubmitd/default.nix | 2 +- pkgs/applications/audio/lastwatch/default.nix | 2 +- pkgs/applications/audio/mimms/default.nix | 2 +- pkgs/applications/audio/mopidy-gmusic/default.nix | 2 +- pkgs/applications/audio/mopidy-moped/default.nix | 2 +- pkgs/applications/audio/mopidy-mopify/default.nix | 2 +- pkgs/applications/audio/mopidy-musicbox-webclient/default.nix | 2 +- pkgs/applications/audio/mopidy-soundcloud/default.nix | 2 +- pkgs/applications/audio/mopidy-spotify-tunigo/default.nix | 2 +- pkgs/applications/audio/mopidy-spotify/default.nix | 2 +- pkgs/applications/audio/mopidy-youtube/default.nix | 2 +- pkgs/applications/audio/mopidy/default.nix | 2 +- pkgs/applications/audio/picard/default.nix | 4 ++-- pkgs/applications/audio/pithos/default.nix | 2 +- pkgs/applications/audio/quodlibet/default.nix | 4 ++-- pkgs/applications/audio/sonata/default.nix | 4 ++-- pkgs/applications/editors/leo-editor/default.nix | 2 +- pkgs/applications/editors/nvpy/default.nix | 4 ++-- pkgs/applications/graphics/jbrout/default.nix | 4 ++-- pkgs/applications/graphics/mcomix/default.nix | 4 ++-- pkgs/applications/graphics/mirage/default.nix | 4 ++-- pkgs/applications/misc/bleachbit/default.nix | 2 +- pkgs/applications/misc/electrum-dash/default.nix | 4 ++-- pkgs/applications/misc/electrum/default.nix | 4 ++-- pkgs/applications/misc/gramps/default.nix | 4 ++-- pkgs/applications/misc/hamster-time-tracker/default.nix | 4 ++-- pkgs/applications/misc/khal/default.nix | 2 +- pkgs/applications/misc/khard/default.nix | 2 +- pkgs/applications/misc/loxodo/default.nix | 2 +- pkgs/applications/misc/ocropus/default.nix | 2 +- pkgs/applications/misc/octoprint/default.nix | 2 +- pkgs/applications/misc/octoprint/plugins.nix | 2 +- pkgs/applications/misc/pdfdiff/default.nix | 2 +- pkgs/applications/misc/pitz/default.nix | 4 ++-- pkgs/applications/misc/printrun/default.nix | 2 +- pkgs/applications/misc/pytrainer/default.nix | 2 +- pkgs/applications/misc/ranger/default.nix | 4 ++-- pkgs/applications/misc/rtv/default.nix | 2 +- pkgs/applications/misc/solaar/default.nix | 2 +- pkgs/applications/misc/zscroll/default.nix | 2 +- pkgs/applications/networking/browsers/qutebrowser/default.nix | 4 ++-- .../networking/feedreaders/canto-curses/default.nix | 2 +- .../networking/feedreaders/canto-daemon/default.nix | 2 +- pkgs/applications/networking/feedreaders/rawdog/default.nix | 2 +- .../networking/instant-messengers/blink/default.nix | 2 +- pkgs/applications/networking/mailreaders/mailnag/default.nix | 4 ++-- pkgs/applications/networking/mailreaders/mailpile/default.nix | 2 +- pkgs/applications/office/keepnote/default.nix | 4 ++-- pkgs/applications/office/zim/default.nix | 4 ++-- pkgs/applications/science/spyder/default.nix | 4 ++-- .../version-management/git-and-tools/git-cola/default.nix | 2 +- pkgs/applications/version-management/git-review/default.nix | 2 +- pkgs/applications/version-management/gitinspector/default.nix | 4 ++-- pkgs/applications/version-management/meld/default.nix | 4 ++-- pkgs/applications/version-management/peru/default.nix | 2 +- pkgs/applications/version-management/rabbitvcs/default.nix | 2 +- pkgs/applications/version-management/tailor/default.nix | 2 +- pkgs/applications/version-management/tortoisehg/default.nix | 2 +- pkgs/applications/video/devede/default.nix | 4 ++-- pkgs/applications/video/kazam/default.nix | 2 +- pkgs/applications/video/key-mon/default.nix | 4 ++-- pkgs/applications/video/miro/default.nix | 4 ++-- pkgs/applications/virtualization/openstack/glance.nix | 2 +- pkgs/applications/virtualization/openstack/keystone.nix | 2 +- pkgs/applications/virtualization/openstack/neutron.nix | 2 +- pkgs/applications/virtualization/openstack/nova.nix | 2 +- pkgs/applications/virtualization/virt-manager/default.nix | 2 +- pkgs/applications/window-managers/qtile/default.nix | 4 ++-- pkgs/development/arduino/ino/default.nix | 4 ++-- .../tools/build-managers/buildbot-slave/default.nix | 4 ++-- pkgs/development/tools/build-managers/buildbot/default.nix | 4 ++-- pkgs/development/tools/devpi-client/default.nix | 2 +- pkgs/development/tools/grabserial/default.nix | 4 ++-- pkgs/development/tools/misc/nixbang/default.nix | 2 +- pkgs/development/tools/misc/ycmd/default.nix | 2 +- pkgs/development/tools/profiling/gprof2dot/default.nix | 2 +- pkgs/development/tools/winpdb/default.nix | 4 ++-- pkgs/games/mnemosyne/default.nix | 4 ++-- pkgs/misc/frescobaldi/default.nix | 2 +- pkgs/os-specific/linux/iotop/default.nix | 4 ++-- pkgs/servers/matrix-synapse/default.nix | 6 +++--- pkgs/shells/xonsh/default.nix | 2 +- pkgs/tools/X11/arandr/default.nix | 2 +- pkgs/tools/X11/winswitch/default.nix | 4 ++-- pkgs/tools/X11/xpra/default.nix | 4 ++-- pkgs/tools/X11/xpra/gtk3.nix | 4 ++-- pkgs/tools/admin/cli53/default.nix | 4 ++-- pkgs/tools/admin/letsencrypt/default.nix | 2 +- pkgs/tools/admin/simp_le/default.nix | 2 +- pkgs/tools/audio/beets/alternatives-plugin.nix | 4 ++-- pkgs/tools/audio/beets/default.nix | 6 +++--- pkgs/tools/backup/attic/default.nix | 2 +- pkgs/tools/backup/borg/default.nix | 2 +- pkgs/tools/backup/obnam/default.nix | 2 +- pkgs/tools/backup/s3ql/default.nix | 2 +- pkgs/tools/backup/wal-e/default.nix | 2 +- pkgs/tools/compression/dtrx/default.nix | 2 +- pkgs/tools/filesystems/gitfs/default.nix | 4 ++-- pkgs/tools/filesystems/nixpart/0.4/blivet.nix | 4 ++-- pkgs/tools/filesystems/nixpart/0.4/default.nix | 10 +++++----- pkgs/tools/filesystems/nixpart/0.4/pykickstart.nix | 4 ++-- pkgs/tools/filesystems/nixpart/0.4/pyparted.nix | 4 ++-- pkgs/tools/filesystems/nixpart/default.nix | 4 ++-- pkgs/tools/misc/apt-offline/default.nix | 4 ++-- pkgs/tools/misc/diffoscope/default.nix | 2 +- pkgs/tools/misc/i3minator/default.nix | 4 ++-- pkgs/tools/misc/trash-cli/default.nix | 2 +- pkgs/tools/misc/vdirsyncer/default.nix | 2 +- pkgs/tools/misc/youtube-dl/default.nix | 4 ++-- pkgs/tools/networking/getmail/default.nix | 4 ++-- pkgs/tools/networking/gmvault/default.nix | 4 ++-- pkgs/tools/networking/httpie/default.nix | 2 +- pkgs/tools/networking/offlineimap/default.nix | 4 ++-- pkgs/tools/networking/p2p/tahoe-lafs/default.nix | 2 +- pkgs/tools/networking/s3cmd/default.nix | 2 +- pkgs/tools/networking/speedtest-cli/default.nix | 2 +- pkgs/tools/networking/urlwatch/default.nix | 2 +- pkgs/tools/package-management/nixops/generic.nix | 2 +- pkgs/tools/package-management/nox/default.nix | 2 +- pkgs/tools/package-management/python2nix/default.nix | 2 +- pkgs/tools/security/fail2ban/default.nix | 2 +- pkgs/tools/security/knockknock/default.nix | 4 ++-- pkgs/tools/security/sshuttle/default.nix | 2 +- pkgs/tools/security/volatility/default.nix | 4 ++-- pkgs/tools/system/honcho/default.nix | 4 ++-- pkgs/tools/text/grin/default.nix | 2 +- pkgs/tools/typesetting/odpdown/default.nix | 4 ++-- pkgs/tools/video/vnc2flv/default.nix | 2 +- pkgs/tools/virtualization/cloud-init/default.nix | 2 +- pkgs/tools/virtualization/euca2ools/default.nix | 2 +- pkgs/top-level/all-packages.nix | 6 +++--- 133 files changed, 195 insertions(+), 195 deletions(-) (limited to 'pkgs/misc') diff --git a/pkgs/applications/audio/gpodder/default.nix b/pkgs/applications/audio/gpodder/default.nix index 55337bf1d3ad..7b724ca3d019 100644 --- a/pkgs/applications/audio/gpodder/default.nix +++ b/pkgs/applications/audio/gpodder/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchurl, buildPythonPackage, pythonPackages, mygpoclient, intltool +{ stdenv, fetchurl, buildPythonApplication, pythonPackages, mygpoclient, intltool , ipodSupport ? true, libgpod , gnome3 }: -buildPythonPackage rec { +buildPythonApplication rec { name = "gpodder-${version}"; namePrefix = ""; diff --git a/pkgs/applications/audio/gtklick/default.nix b/pkgs/applications/audio/gtklick/default.nix index b11e1ac0fa79..c0a137d7de92 100644 --- a/pkgs/applications/audio/gtklick/default.nix +++ b/pkgs/applications/audio/gtklick/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pythonPackages, gettext, klick}: -pythonPackages.buildPythonPackage rec { +pythonPackages.buildPythonApplication rec { name = "gtklick-${version}"; namePrefix = ""; version = "0.6.4"; diff --git a/pkgs/applications/audio/lastfmsubmitd/default.nix b/pkgs/applications/audio/lastfmsubmitd/default.nix index 314361329c75..ea182d73a5ba 100644 --- a/pkgs/applications/audio/lastfmsubmitd/default.nix +++ b/pkgs/applications/audio/lastfmsubmitd/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pythonPackages }: -pythonPackages.buildPythonPackage rec { +pythonPackages.buildPythonApplication rec { name = "lastfmsubmitd-${version}"; namePrefix = ""; version = "1.0.6"; diff --git a/pkgs/applications/audio/lastwatch/default.nix b/pkgs/applications/audio/lastwatch/default.nix index 2cffb0ebacf4..168a67a53f00 100644 --- a/pkgs/applications/audio/lastwatch/default.nix +++ b/pkgs/applications/audio/lastwatch/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit, pythonPackages }: -pythonPackages.buildPythonPackage rec { +pythonPackages.buildPythonApplication rec { name = "lastwatch-${version}"; namePrefix = ""; version = "0.4.1"; diff --git a/pkgs/applications/audio/mimms/default.nix b/pkgs/applications/audio/mimms/default.nix index b337dbf6d821..cee3469e3f53 100644 --- a/pkgs/applications/audio/mimms/default.nix +++ b/pkgs/applications/audio/mimms/default.nix @@ -2,7 +2,7 @@ let version = "3.2"; in - pythonPackages.buildPythonPackage { + pythonPackages.buildPythonApplication { name = "mimms-${version}"; src = fetchurl { url = "http://download.savannah.gnu.org/releases/mimms/mimms-${version}.tar.bz2"; diff --git a/pkgs/applications/audio/mopidy-gmusic/default.nix b/pkgs/applications/audio/mopidy-gmusic/default.nix index 00468db767a2..6984593cd417 100644 --- a/pkgs/applications/audio/mopidy-gmusic/default.nix +++ b/pkgs/applications/audio/mopidy-gmusic/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pythonPackages, mopidy }: -pythonPackages.buildPythonPackage rec { +pythonPackages.buildPythonApplication rec { name = "mopidy-gmusic-${version}"; version = "1.0.0"; diff --git a/pkgs/applications/audio/mopidy-moped/default.nix b/pkgs/applications/audio/mopidy-moped/default.nix index 6bf73c021857..ee3134f5fd82 100644 --- a/pkgs/applications/audio/mopidy-moped/default.nix +++ b/pkgs/applications/audio/mopidy-moped/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pythonPackages, mopidy }: -pythonPackages.buildPythonPackage rec { +pythonPackages.buildPythonApplication rec { name = "mopidy-moped-${version}"; version = "0.6.0"; diff --git a/pkgs/applications/audio/mopidy-mopify/default.nix b/pkgs/applications/audio/mopidy-mopify/default.nix index b7a1fbf2f08c..abb9c50d71c5 100644 --- a/pkgs/applications/audio/mopidy-mopify/default.nix +++ b/pkgs/applications/audio/mopidy-mopify/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pythonPackages, mopidy }: -pythonPackages.buildPythonPackage rec { +pythonPackages.buildPythonApplication rec { name = "mopidy-mopify-${version}"; version = "1.5.8"; diff --git a/pkgs/applications/audio/mopidy-musicbox-webclient/default.nix b/pkgs/applications/audio/mopidy-musicbox-webclient/default.nix index e13a1a978fdc..b2bca838cee2 100644 --- a/pkgs/applications/audio/mopidy-musicbox-webclient/default.nix +++ b/pkgs/applications/audio/mopidy-musicbox-webclient/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, pythonPackages, mopidy }: -pythonPackages.buildPythonPackage rec { +pythonPackages.buildPythonApplication rec { name = "mopidy-musicbox-webclient-${version}"; version = "2.0.0"; diff --git a/pkgs/applications/audio/mopidy-soundcloud/default.nix b/pkgs/applications/audio/mopidy-soundcloud/default.nix index c81de3e0d062..098812961649 100644 --- a/pkgs/applications/audio/mopidy-soundcloud/default.nix +++ b/pkgs/applications/audio/mopidy-soundcloud/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, pythonPackages, mopidy }: -pythonPackages.buildPythonPackage rec { +pythonPackages.buildPythonApplication rec { name = "mopidy-soundcloud-${version}"; version = "2.0.2"; diff --git a/pkgs/applications/audio/mopidy-spotify-tunigo/default.nix b/pkgs/applications/audio/mopidy-spotify-tunigo/default.nix index ab07b0f1f68e..4d7c1cb73266 100644 --- a/pkgs/applications/audio/mopidy-spotify-tunigo/default.nix +++ b/pkgs/applications/audio/mopidy-spotify-tunigo/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, pythonPackages, mopidy, mopidy-spotify }: -pythonPackages.buildPythonPackage rec { +pythonPackages.buildPythonApplication rec { name = "mopidy-spotify-tunigo-${version}"; version = "0.2.1"; diff --git a/pkgs/applications/audio/mopidy-spotify/default.nix b/pkgs/applications/audio/mopidy-spotify/default.nix index f44f95be140c..3a717344aef5 100644 --- a/pkgs/applications/audio/mopidy-spotify/default.nix +++ b/pkgs/applications/audio/mopidy-spotify/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pythonPackages, mopidy }: -pythonPackages.buildPythonPackage rec { +pythonPackages.buildPythonApplication rec { name = "mopidy-spotify-${version}"; version = "2.3.1"; diff --git a/pkgs/applications/audio/mopidy-youtube/default.nix b/pkgs/applications/audio/mopidy-youtube/default.nix index efd1425e2554..2942cba95f0f 100644 --- a/pkgs/applications/audio/mopidy-youtube/default.nix +++ b/pkgs/applications/audio/mopidy-youtube/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, pythonPackages, mopidy }: -pythonPackages.buildPythonPackage rec { +pythonPackages.buildPythonApplication rec { name = "mopidy-youtube-${version}"; version = "2.0.1"; diff --git a/pkgs/applications/audio/mopidy/default.nix b/pkgs/applications/audio/mopidy/default.nix index ae53008d58c4..29426f43de13 100644 --- a/pkgs/applications/audio/mopidy/default.nix +++ b/pkgs/applications/audio/mopidy/default.nix @@ -2,7 +2,7 @@ , glib_networking, gst_plugins_good, gst_plugins_base, gst_plugins_ugly }: -pythonPackages.buildPythonPackage rec { +pythonPackages.buildPythonApplication rec { name = "mopidy-${version}"; version = "1.1.2"; diff --git a/pkgs/applications/audio/picard/default.nix b/pkgs/applications/audio/picard/default.nix index df76b8073b66..2373bbc549d5 100644 --- a/pkgs/applications/audio/picard/default.nix +++ b/pkgs/applications/audio/picard/default.nix @@ -1,10 +1,10 @@ -{ stdenv, buildPythonPackage, fetchurl, gettext +{ stdenv, buildPythonApplication, fetchurl, gettext , pkgconfig, libofa, ffmpeg, chromaprint , pyqt4, mutagen, python-libdiscid }: let version = "1.3.2"; in -buildPythonPackage { +buildPythonApplication { name = "picard-${version}"; namePrefix = ""; diff --git a/pkgs/applications/audio/pithos/default.nix b/pkgs/applications/audio/pithos/default.nix index 4095d672f828..1083f9434a94 100644 --- a/pkgs/applications/audio/pithos/default.nix +++ b/pkgs/applications/audio/pithos/default.nix @@ -1,7 +1,7 @@ { fetchFromGitHub, stdenv, pythonPackages, gtk3, gobjectIntrospection, libnotify , gst_all_1, wrapGAppsHook }: -pythonPackages.buildPythonPackage rec { +pythonPackages.buildPythonApplication rec { pname = "pithos"; version = "1.1.2"; name = "${pname}-${version}"; diff --git a/pkgs/applications/audio/quodlibet/default.nix b/pkgs/applications/audio/quodlibet/default.nix index 38c679d7a3e4..56ec04611023 100644 --- a/pkgs/applications/audio/quodlibet/default.nix +++ b/pkgs/applications/audio/quodlibet/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python, buildPythonPackage, mutagen, pygtk, pygobject, intltool +{ stdenv, fetchurl, python, buildPythonApplication, mutagen, pygtk, pygobject, intltool , pythonDBus, gst_python, withGstPlugins ? false, gst_plugins_base ? null , gst_plugins_good ? null, gst_plugins_ugly ? null, gst_plugins_bad ? null }: @@ -9,7 +9,7 @@ assert withGstPlugins -> gst_plugins_base != null let version = "2.6.3"; in -buildPythonPackage { +buildPythonApplication { # call the package quodlibet and just quodlibet name = "quodlibet-${version}" + stdenv.lib.optionalString withGstPlugins "-with-gst-plugins"; diff --git a/pkgs/applications/audio/sonata/default.nix b/pkgs/applications/audio/sonata/default.nix index 74ce6a2c15f0..e23a54043682 100644 --- a/pkgs/applications/audio/sonata/default.nix +++ b/pkgs/applications/audio/sonata/default.nix @@ -1,11 +1,11 @@ { pkgs, stdenv, fetchFromGitHub, pkgconfig, intltool, wrapGAppsHook, - python, buildPythonPackage, isPy3k, + python, buildPythonApplication, isPy3k, gnome3, gtk3, gobjectIntrospection, dbus, pygobject3, mpd2 }: with pkgs.lib; -buildPythonPackage rec { +buildPythonApplication rec { name = "sonata-${version}"; version = "1.7b1"; namePrefix = ""; diff --git a/pkgs/applications/editors/leo-editor/default.nix b/pkgs/applications/editors/leo-editor/default.nix index 597f9148564b..6f540d1d74ad 100644 --- a/pkgs/applications/editors/leo-editor/default.nix +++ b/pkgs/applications/editors/leo-editor/default.nix @@ -1,6 +1,6 @@ { stdenv, pythonPackages, fetchgit }: -pythonPackages.buildPythonPackage rec { +pythonPackages.buildPythonApplication rec { name = "leo-editor-${version}"; namePrefix = ""; version = "5.1"; diff --git a/pkgs/applications/editors/nvpy/default.nix b/pkgs/applications/editors/nvpy/default.nix index 29402f3b3d80..a6dd7bcb4033 100644 --- a/pkgs/applications/editors/nvpy/default.nix +++ b/pkgs/applications/editors/nvpy/default.nix @@ -1,6 +1,6 @@ -{ pkgs, fetchurl, tk, buildPythonPackage, pythonPackages }: +{ pkgs, fetchurl, tk, buildPythonApplication, pythonPackages }: -buildPythonPackage rec { +buildPythonApplication rec { version = "0.9.2"; name = "nvpy-${version}"; diff --git a/pkgs/applications/graphics/jbrout/default.nix b/pkgs/applications/graphics/jbrout/default.nix index e37c2c283e47..8d6c15129cb3 100644 --- a/pkgs/applications/graphics/jbrout/default.nix +++ b/pkgs/applications/graphics/jbrout/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchsvn, buildPythonPackage, python, pyGtkGlade, makeWrapper, pyexiv2, pythonPackages, fbida, which }: +{ stdenv, fetchsvn, buildPythonApplication, python, pyGtkGlade, makeWrapper, pyexiv2, pythonPackages, fbida, which }: -buildPythonPackage rec { +buildPythonApplication rec { name = "jbrout-${version}"; version = "338"; diff --git a/pkgs/applications/graphics/mcomix/default.nix b/pkgs/applications/graphics/mcomix/default.nix index 069a4bace286..39d17a32eec3 100644 --- a/pkgs/applications/graphics/mcomix/default.nix +++ b/pkgs/applications/graphics/mcomix/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, buildPythonPackage, python27Packages }: +{ stdenv, fetchurl, buildPythonApplication, python27Packages }: -buildPythonPackage rec { +buildPythonApplication rec { namePrefix = ""; name = "mcomix-1.01"; diff --git a/pkgs/applications/graphics/mirage/default.nix b/pkgs/applications/graphics/mirage/default.nix index c4b14388d1ba..c3f06544bb4a 100644 --- a/pkgs/applications/graphics/mirage/default.nix +++ b/pkgs/applications/graphics/mirage/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, buildPythonPackage, python, pygtk, pillow, libX11, gettext }: +{ stdenv, fetchurl, buildPythonApplication, python, pygtk, pillow, libX11, gettext }: -buildPythonPackage rec { +buildPythonApplication rec { namePrefix = ""; name = "mirage-0.9.5.2"; diff --git a/pkgs/applications/misc/bleachbit/default.nix b/pkgs/applications/misc/bleachbit/default.nix index 511455ba6bb0..cfab4195a09b 100644 --- a/pkgs/applications/misc/bleachbit/default.nix +++ b/pkgs/applications/misc/bleachbit/default.nix @@ -1,5 +1,5 @@ { stdenv, pythonPackages, fetchurl }: -pythonPackages.buildPythonPackage rec { +pythonPackages.buildPythonApplication rec { name = "bleachbit-${version}"; version = "1.8"; diff --git a/pkgs/applications/misc/electrum-dash/default.nix b/pkgs/applications/misc/electrum-dash/default.nix index f046ecc9bf2d..7b1bdef4eb59 100644 --- a/pkgs/applications/misc/electrum-dash/default.nix +++ b/pkgs/applications/misc/electrum-dash/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, buildPythonPackage, pythonPackages, slowaes }: +{ stdenv, fetchurl, buildPythonApplication, pythonPackages, slowaes }: -buildPythonPackage rec { +buildPythonApplication rec { name = "electrum-dash-${version}"; version = "2.4.1"; diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index 632ae689f31f..6025fce776c7 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, buildPythonPackage, pythonPackages, slowaes }: +{ stdenv, fetchurl, buildPythonApplication, pythonPackages, slowaes }: -buildPythonPackage rec { +buildPythonApplication rec { name = "electrum-${version}"; version = "2.5.4"; diff --git a/pkgs/applications/misc/gramps/default.nix b/pkgs/applications/misc/gramps/default.nix index 31cdb8d17863..79393eee7f11 100644 --- a/pkgs/applications/misc/gramps/default.nix +++ b/pkgs/applications/misc/gramps/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, gtk3, pythonPackages, python, pycairo, pygobject3, intltool, pango, gsettings_desktop_schemas }: -pythonPackages.buildPythonPackage rec { +pythonPackages.buildPythonApplication rec { version = "4.1.1"; name = "gramps-${version}"; namePrefix = ""; @@ -18,7 +18,7 @@ pythonPackages.buildPythonPackage rec { pythonPath = [ pygobject3 pango pycairo pythonPackages.bsddb ]; - # Same installPhase as in buildPythonPackage but without --old-and-unmanageble + # Same installPhase as in buildPythonApplication but without --old-and-unmanageble # install flag. installPhase = '' runHook preInstall diff --git a/pkgs/applications/misc/hamster-time-tracker/default.nix b/pkgs/applications/misc/hamster-time-tracker/default.nix index 52298e6c297b..1732a7e1fb07 100644 --- a/pkgs/applications/misc/hamster-time-tracker/default.nix +++ b/pkgs/applications/misc/hamster-time-tracker/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, buildPythonPackage, docbook2x, libxslt, gnome_doc_utils +{ stdenv, fetchzip, buildPythonApplication, docbook2x, libxslt, gnome_doc_utils , intltool, dbus_glib, pygobject, pygtk, pyxdg, gnome_python, dbus, sqlite3 , hicolor_icon_theme }: @@ -8,7 +8,7 @@ # # WARNING:root:Could not import wnck - workspace tracking will be disabled -buildPythonPackage rec { +buildPythonApplication rec { name = "hamster-time-tracker-1.04"; namePrefix = ""; diff --git a/pkgs/applications/misc/khal/default.nix b/pkgs/applications/misc/khal/default.nix index 22610c853e3b..52a4f0dee753 100644 --- a/pkgs/applications/misc/khal/default.nix +++ b/pkgs/applications/misc/khal/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgs, pythonPackages }: -pythonPackages.buildPythonPackage rec { +pythonPackages.buildPythonApplication rec { version = "0.7.0"; name = "khal-${version}"; diff --git a/pkgs/applications/misc/khard/default.nix b/pkgs/applications/misc/khard/default.nix index 0c88314ed02e..dae5ea4075f8 100644 --- a/pkgs/applications/misc/khard/default.nix +++ b/pkgs/applications/misc/khard/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgs, pythonPackages }: -pythonPackages.buildPythonPackage rec { +pythonPackages.buildPythonApplication rec { version = "0.8.1"; name = "khard-${version}"; namePrefix = ""; diff --git a/pkgs/applications/misc/loxodo/default.nix b/pkgs/applications/misc/loxodo/default.nix index 05d29ce7e09d..f4243285e8e6 100644 --- a/pkgs/applications/misc/loxodo/default.nix +++ b/pkgs/applications/misc/loxodo/default.nix @@ -3,7 +3,7 @@ let py = python27Packages; python = py.python; in -py.buildPythonPackage rec { +py.buildPythonApplication rec { name = "loxodo-0.20150124"; src = fetchgit { diff --git a/pkgs/applications/misc/ocropus/default.nix b/pkgs/applications/misc/ocropus/default.nix index 0e6b13f9a288..7e066fbc5919 100644 --- a/pkgs/applications/misc/ocropus/default.nix +++ b/pkgs/applications/misc/ocropus/default.nix @@ -17,7 +17,7 @@ let ]; in -pythonPackages.buildPythonPackage rec { +pythonPackages.buildPythonApplication rec { name = "ocropus-${version}"; version = "20150316"; diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix index 3e8b35ba4350..67b351ba906e 100644 --- a/pkgs/applications/misc/octoprint/default.nix +++ b/pkgs/applications/misc/octoprint/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, pythonPackages }: -pythonPackages.buildPythonPackage rec { +pythonPackages.buildPythonApplication rec { name = "OctoPrint-${version}"; version = "1.2.9"; diff --git a/pkgs/applications/misc/octoprint/plugins.nix b/pkgs/applications/misc/octoprint/plugins.nix index 801be43220d9..829ae11fc7e3 100644 --- a/pkgs/applications/misc/octoprint/plugins.nix +++ b/pkgs/applications/misc/octoprint/plugins.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, octoprint, pythonPackages }: let - buildPlugin = args: pythonPackages.buildPythonPackage (args // { + buildPlugin = args: pythonPackages.buildPythonApplication (args // { buildInputs = (args.buildInputs or []) ++ [ octoprint ]; }); in { diff --git a/pkgs/applications/misc/pdfdiff/default.nix b/pkgs/applications/misc/pdfdiff/default.nix index 43b980353439..90149263644d 100644 --- a/pkgs/applications/misc/pdfdiff/default.nix +++ b/pkgs/applications/misc/pdfdiff/default.nix @@ -2,7 +2,7 @@ let py = pythonPackages; in -py.buildPythonPackage rec { +py.buildPythonApplication rec { name = "pdfdiff-${version}"; version = "0.92"; diff --git a/pkgs/applications/misc/pitz/default.nix b/pkgs/applications/misc/pitz/default.nix index e4f097469a49..1eb65a59470b 100644 --- a/pkgs/applications/misc/pitz/default.nix +++ b/pkgs/applications/misc/pitz/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, buildPythonPackage, tempita, jinja2, pyyaml, clepy, mock +{ stdenv, fetchurl, buildPythonApplication, tempita, jinja2, pyyaml, clepy, mock , nose, decorator, docutils }: @@ -11,7 +11,7 @@ # pitz-shell is not the primary interface, so it is not critical to have it # working. Concider fixing pitz upstream. -buildPythonPackage rec { +buildPythonApplication rec { name = "pitz-1.2.4"; namePrefix = ""; diff --git a/pkgs/applications/misc/printrun/default.nix b/pkgs/applications/misc/printrun/default.nix index 7420441850b6..27a55f4464f2 100644 --- a/pkgs/applications/misc/printrun/default.nix +++ b/pkgs/applications/misc/printrun/default.nix @@ -1,6 +1,6 @@ { stdenv, python27Packages, fetchFromGitHub }: -python27Packages.buildPythonPackage rec { +python27Packages.buildPythonApplication rec { name = "printrun-20150310"; src = fetchFromGitHub { diff --git a/pkgs/applications/misc/pytrainer/default.nix b/pkgs/applications/misc/pytrainer/default.nix index 2f731fea1b0d..bc6b4e16a378 100644 --- a/pkgs/applications/misc/pytrainer/default.nix +++ b/pkgs/applications/misc/pytrainer/default.nix @@ -11,7 +11,7 @@ let in -pythonPackages.buildPythonPackage rec { +pythonPackages.buildPythonApplication rec { name = "pytrainer-${version}"; version = "1.10.0"; diff --git a/pkgs/applications/misc/ranger/default.nix b/pkgs/applications/misc/ranger/default.nix index 19a0582a79ca..14ae58a29327 100644 --- a/pkgs/applications/misc/ranger/default.nix +++ b/pkgs/applications/misc/ranger/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, buildPythonPackage, python, w3m, file }: +{ stdenv, fetchurl, buildPythonApplication, python, w3m, file }: -buildPythonPackage rec { +buildPythonApplication rec { name = "ranger-1.7.2"; meta = { diff --git a/pkgs/applications/misc/rtv/default.nix b/pkgs/applications/misc/rtv/default.nix index 2126ce23d3a0..68097c2e2544 100644 --- a/pkgs/applications/misc/rtv/default.nix +++ b/pkgs/applications/misc/rtv/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, pkgs, lib, python, pythonPackages }: -pythonPackages.buildPythonPackage rec { +pythonPackages.buildPythonApplication rec { version = "1.8.0"; name = "rtv-${version}"; diff --git a/pkgs/applications/misc/solaar/default.nix b/pkgs/applications/misc/solaar/default.nix index 9a199c7ee499..55153d25cf98 100644 --- a/pkgs/applications/misc/solaar/default.nix +++ b/pkgs/applications/misc/solaar/default.nix @@ -1,5 +1,5 @@ {fetchurl, stdenv, gtk3, python34Packages, gobjectIntrospection}: -python34Packages.buildPythonPackage rec { +python34Packages.buildPythonApplication rec { name = "solaar-${version}"; version = "0.9.2"; namePrefix = ""; diff --git a/pkgs/applications/misc/zscroll/default.nix b/pkgs/applications/misc/zscroll/default.nix index 91e6c33310dc..4d9197c8fd44 100644 --- a/pkgs/applications/misc/zscroll/default.nix +++ b/pkgs/applications/misc/zscroll/default.nix @@ -2,7 +2,7 @@ let version = "1.0"; in -python3Packages.buildPythonPackage { +python3Packages.buildPythonApplication { name = "zscroll-${version}"; # don't prefix with python version namePrefix = ""; diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index 61b02d2a6394..1be28829e351 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchurl, python, buildPythonPackage, qtmultimedia, pyqt5 +{ stdenv, fetchurl, python, buildPythonApplication, qtmultimedia, pyqt5 , jinja2, pygments, pyyaml, pypeg2, gst-plugins-base, gst-plugins-good , gst-plugins-bad, gst-libav, wrapGAppsHook, glib_networking }: let version = "0.5.1"; in -buildPythonPackage rec { +buildPythonApplication rec { name = "qutebrowser-${version}"; namePrefix = ""; diff --git a/pkgs/applications/networking/feedreaders/canto-curses/default.nix b/pkgs/applications/networking/feedreaders/canto-curses/default.nix index 8db1dac3b4b6..37736d6edd78 100644 --- a/pkgs/applications/networking/feedreaders/canto-curses/default.nix +++ b/pkgs/applications/networking/feedreaders/canto-curses/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, python34Packages, readline, ncurses, canto-daemon }: -python34Packages.buildPythonPackage rec { +python34Packages.buildPythonApplication rec { version = "0.9.6"; name = "canto-curses-${version}"; diff --git a/pkgs/applications/networking/feedreaders/canto-daemon/default.nix b/pkgs/applications/networking/feedreaders/canto-daemon/default.nix index 0de38c259a34..b6f0ff19dc33 100644 --- a/pkgs/applications/networking/feedreaders/canto-daemon/default.nix +++ b/pkgs/applications/networking/feedreaders/canto-daemon/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, python34Packages, }: -python34Packages.buildPythonPackage rec { +python34Packages.buildPythonApplication rec { version = "0.9.5"; name = "canto-daemon-${version}"; namePrefix = ""; diff --git a/pkgs/applications/networking/feedreaders/rawdog/default.nix b/pkgs/applications/networking/feedreaders/rawdog/default.nix index e5e8f823d277..eca53ccf2ec0 100644 --- a/pkgs/applications/networking/feedreaders/rawdog/default.nix +++ b/pkgs/applications/networking/feedreaders/rawdog/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pythonPackages }: -pythonPackages.buildPythonPackage rec { +pythonPackages.buildPythonApplication rec { name = "rawdog-${version}"; version = "2.21"; diff --git a/pkgs/applications/networking/instant-messengers/blink/default.nix b/pkgs/applications/networking/instant-messengers/blink/default.nix index 9c75af2c77f5..7b0e4d70fd93 100644 --- a/pkgs/applications/networking/instant-messengers/blink/default.nix +++ b/pkgs/applications/networking/instant-messengers/blink/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pythonPackages, pyqt4, cython, libvncserver, zlib, twisted , gnutls, libvpx }: -pythonPackages.buildPythonPackage rec { +pythonPackages.buildPythonApplication rec { name = "blink-${version}"; version = "1.4.2"; diff --git a/pkgs/applications/networking/mailreaders/mailnag/default.nix b/pkgs/applications/networking/mailreaders/mailnag/default.nix index 4818de49e42b..673856e062a8 100644 --- a/pkgs/applications/networking/mailreaders/mailnag/default.nix +++ b/pkgs/applications/networking/mailreaders/mailnag/default.nix @@ -1,9 +1,9 @@ -{ stdenv, buildPythonPackage, fetchurl, gettext, gtk3, pythonPackages +{ stdenv, buildPythonApplication, fetchurl, gettext, gtk3, pythonPackages , gdk_pixbuf, libnotify, gst_all_1 , libgnome_keyring3 ? null, networkmanager ? null }: -buildPythonPackage rec { +buildPythonApplication rec { name = "mailnag-${version}"; version = "1.1.0"; diff --git a/pkgs/applications/networking/mailreaders/mailpile/default.nix b/pkgs/applications/networking/mailreaders/mailpile/default.nix index c43944dc5979..0ace6a01b3f3 100644 --- a/pkgs/applications/networking/mailreaders/mailpile/default.nix +++ b/pkgs/applications/networking/mailreaders/mailpile/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit, pythonPackages, gnupg1orig, makeWrapper, openssl }: -pythonPackages.buildPythonPackage rec { +pythonPackages.buildPythonApplication rec { name = "mailpile-${version}"; version = "0.4.1"; diff --git a/pkgs/applications/office/keepnote/default.nix b/pkgs/applications/office/keepnote/default.nix index 409da36b2640..d4790edbb3e0 100644 --- a/pkgs/applications/office/keepnote/default.nix +++ b/pkgs/applications/office/keepnote/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, buildPythonPackage, pythonPackages, pygtk }: +{ stdenv, fetchurl, buildPythonApplication, pythonPackages, pygtk }: -buildPythonPackage { +buildPythonApplication { name = "keepnote-0.7.8"; namePrefix = ""; diff --git a/pkgs/applications/office/zim/default.nix b/pkgs/applications/office/zim/default.nix index d5163eef4d88..4d2396e8a117 100644 --- a/pkgs/applications/office/zim/default.nix +++ b/pkgs/applications/office/zim/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, buildPythonPackage, pythonPackages, pygtk, pygobject, python }: +{ stdenv, lib, fetchurl, buildPythonApplication, pythonPackages, pygtk, pygobject, python }: # # TODO: Declare configuration options for the following optional dependencies: @@ -7,7 +7,7 @@ # - pyxdg: Need to make it work first (see setupPyInstallFlags). # -buildPythonPackage rec { +buildPythonApplication rec { name = "zim-${version}"; version = "0.63"; namePrefix = ""; diff --git a/pkgs/applications/science/spyder/default.nix b/pkgs/applications/science/spyder/default.nix index 9e74a2332365..73847624e85a 100644 --- a/pkgs/applications/science/spyder/default.nix +++ b/pkgs/applications/science/spyder/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, buildPythonPackage, makeDesktopItem +{ stdenv, fetchurl, unzip, buildPythonApplication, makeDesktopItem # mandatory , pyside # recommended @@ -7,7 +7,7 @@ , ipython ? null, pylint ? null, pep8 ? null }: -buildPythonPackage rec { +buildPythonApplication rec { name = "spyder-${version}"; version = "2.3.8"; namePrefix = ""; diff --git a/pkgs/applications/version-management/git-and-tools/git-cola/default.nix b/pkgs/applications/version-management/git-and-tools/git-cola/default.nix index c10ab14f6398..44a617d70e1f 100644 --- a/pkgs/applications/version-management/git-and-tools/git-cola/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-cola/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, python, pythonPackages, makeWrapper, gettext }: -pythonPackages.buildPythonPackage rec { +pythonPackages.buildPythonApplication rec { name = "git-cola-${version}"; version = "2.2.1"; diff --git a/pkgs/applications/version-management/git-review/default.nix b/pkgs/applications/version-management/git-review/default.nix index fb6d542f4790..de934db5f3ba 100644 --- a/pkgs/applications/version-management/git-review/default.nix +++ b/pkgs/applications/version-management/git-review/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pythonPackages, python} : -pythonPackages.buildPythonPackage rec { +pythonPackages.buildPythonApplication rec { name = "git-review-${version}"; version = "1.25.0"; diff --git a/pkgs/applications/version-management/gitinspector/default.nix b/pkgs/applications/version-management/gitinspector/default.nix index 43df0e5b885f..4e440d4bc6ab 100644 --- a/pkgs/applications/version-management/gitinspector/default.nix +++ b/pkgs/applications/version-management/gitinspector/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchzip, buildPythonPackage }: +{ stdenv, fetchzip, buildPythonApplication }: -buildPythonPackage rec { +buildPythonApplication rec { name = "gitinspector-${version}"; version = "0.4.1"; namePrefix = ""; diff --git a/pkgs/applications/version-management/meld/default.nix b/pkgs/applications/version-management/meld/default.nix index 2f7c4af0024f..d25decf35eb6 100644 --- a/pkgs/applications/version-management/meld/default.nix +++ b/pkgs/applications/version-management/meld/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, itstool, buildPythonPackage, python27, intltool, makeWrapper +{ stdenv, fetchurl, itstool, buildPythonApplication, python27, intltool, makeWrapper , libxml2, pygobject3, gobjectIntrospection, gtk3, gnome3, pycairo, cairo }: @@ -8,7 +8,7 @@ let version = "${minor}.0"; in -buildPythonPackage rec { +buildPythonApplication rec { name = "meld-${version}"; namePrefix = ""; diff --git a/pkgs/applications/version-management/peru/default.nix b/pkgs/applications/version-management/peru/default.nix index d97aee233883..40e7d2f18838 100644 --- a/pkgs/applications/version-management/peru/default.nix +++ b/pkgs/applications/version-management/peru/default.nix @@ -4,7 +4,7 @@ let version = "0.2.3"; in -python3Packages.buildPythonPackage rec { +python3Packages.buildPythonApplication rec { # Do not prefix name with python specific version identifier. namePrefix = ""; diff --git a/pkgs/applications/version-management/rabbitvcs/default.nix b/pkgs/applications/version-management/rabbitvcs/default.nix index 100e854f29b8..58b29c10ae36 100644 --- a/pkgs/applications/version-management/rabbitvcs/default.nix +++ b/pkgs/applications/version-management/rabbitvcs/default.nix @@ -1,5 +1,5 @@ { fetchFromGitHub, lib, python2Packages, meld, subversion, gvfs, xdg_utils }: -python2Packages.buildPythonPackage rec { +python2Packages.buildPythonApplication rec { name = "rabbitvcs-${version}"; version = "0.16"; namePrefix = ""; diff --git a/pkgs/applications/version-management/tailor/default.nix b/pkgs/applications/version-management/tailor/default.nix index ebc0906fc6bb..dde09dfe22d1 100644 --- a/pkgs/applications/version-management/tailor/default.nix +++ b/pkgs/applications/version-management/tailor/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pythonPackages }: -pythonPackages.buildPythonPackage rec { +pythonPackages.buildPythonApplication rec { name = "tailor-${version}"; version = "0.9.35"; diff --git a/pkgs/applications/version-management/tortoisehg/default.nix b/pkgs/applications/version-management/tortoisehg/default.nix index 5e95b408bf7e..ec20122d0ce8 100644 --- a/pkgs/applications/version-management/tortoisehg/default.nix +++ b/pkgs/applications/version-management/tortoisehg/default.nix @@ -1,6 +1,6 @@ { pkgs, lib, mercurial, pyPackages ? pkgs.python27Packages }: -pkgs.buildPythonPackage rec { +pkgs.buildPythonApplication rec { name = "tortoisehg-${version}"; version = "3.6"; namePrefix = ""; diff --git a/pkgs/applications/video/devede/default.nix b/pkgs/applications/video/devede/default.nix index 6520f7ac21fa..ce44377260e7 100644 --- a/pkgs/applications/video/devede/default.nix +++ b/pkgs/applications/video/devede/default.nix @@ -1,9 +1,9 @@ -{ pkgs, stdenv, fetchurl, pythonPackages, buildPythonPackage, pygtk, ffmpeg, mplayer, vcdimager, cdrkit, dvdauthor }: +{ pkgs, stdenv, fetchurl, pythonPackages, buildPythonApplication, pygtk, ffmpeg, mplayer, vcdimager, cdrkit, dvdauthor }: let inherit (pythonPackages) dbus; -in buildPythonPackage rec { +in buildPythonApplication rec { name = "devede-3.23.0"; namePrefix = ""; diff --git a/pkgs/applications/video/kazam/default.nix b/pkgs/applications/video/kazam/default.nix index 17bf282a459a..7217f4746c8f 100644 --- a/pkgs/applications/video/kazam/default.nix +++ b/pkgs/applications/video/kazam/default.nix @@ -2,7 +2,7 @@ , gtk3, libwnck3, keybinder, intltool, libcanberra }: -python3Packages.buildPythonPackage rec { +python3Packages.buildPythonApplication rec { name = "kazam-${version}"; version = "1.4.3"; namePrefix = ""; diff --git a/pkgs/applications/video/key-mon/default.nix b/pkgs/applications/video/key-mon/default.nix index 5d1a0e4a95b6..12fc7151cd0d 100644 --- a/pkgs/applications/video/key-mon/default.nix +++ b/pkgs/applications/video/key-mon/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, buildPythonPackage, gnome, librsvg, pygtk, pythonPackages }: +{ stdenv, fetchurl, buildPythonApplication, gnome, librsvg, pygtk, pythonPackages }: -buildPythonPackage rec { +buildPythonApplication rec { name = "key-mon-${version}"; version = "1.17"; namePrefix = ""; diff --git a/pkgs/applications/video/miro/default.nix b/pkgs/applications/video/miro/default.nix index 6585306b2898..66f249b8e4a5 100644 --- a/pkgs/applications/video/miro/default.nix +++ b/pkgs/applications/video/miro/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python, buildPythonPackage, pythonPackages, pkgconfig +{ stdenv, fetchurl, python, buildPythonApplication, pythonPackages, pkgconfig , pyrex096, ffmpeg, boost, glib, pygobject, gtk2, webkitgtk2, libsoup, pygtk , taglib, sqlite, pycurl, mutagen, pycairo, pythonDBus, pywebkitgtk , libtorrentRasterbar, glib_networking, gsettings_desktop_schemas @@ -10,7 +10,7 @@ assert enableBonjour -> avahi != null; with stdenv.lib; -buildPythonPackage rec { +buildPythonApplication rec { name = "miro-${version}"; namePrefix = ""; version = "6.0"; diff --git a/pkgs/applications/virtualization/openstack/glance.nix b/pkgs/applications/virtualization/openstack/glance.nix index caa72f49b943..0aacbeed0550 100644 --- a/pkgs/applications/virtualization/openstack/glance.nix +++ b/pkgs/applications/virtualization/openstack/glance.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pythonPackages, sqlite, which, strace }: -pythonPackages.buildPythonPackage rec { +pythonPackages.buildPythonApplication rec { name = "glance-${version}"; version = "11.0.0"; namePrefix = ""; diff --git a/pkgs/applications/virtualization/openstack/keystone.nix b/pkgs/applications/virtualization/openstack/keystone.nix index 3060dcb04cb3..956f3b28152d 100644 --- a/pkgs/applications/virtualization/openstack/keystone.nix +++ b/pkgs/applications/virtualization/openstack/keystone.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pythonPackages, xmlsec, which, openssl }: -pythonPackages.buildPythonPackage rec { +pythonPackages.buildPythonApplication rec { name = "keystone-${version}"; version = "8.0.0"; namePrefix = ""; diff --git a/pkgs/applications/virtualization/openstack/neutron.nix b/pkgs/applications/virtualization/openstack/neutron.nix index ce44ed2913ce..0520fcfc027e 100644 --- a/pkgs/applications/virtualization/openstack/neutron.nix +++ b/pkgs/applications/virtualization/openstack/neutron.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pythonPackages, xmlsec, which, dnsmasq }: -pythonPackages.buildPythonPackage rec { +pythonPackages.buildPythonApplication rec { name = "neutron-${version}"; version = "7.0.0"; namePrefix = ""; diff --git a/pkgs/applications/virtualization/openstack/nova.nix b/pkgs/applications/virtualization/openstack/nova.nix index ee139868ba09..20e250bf05cc 100644 --- a/pkgs/applications/virtualization/openstack/nova.nix +++ b/pkgs/applications/virtualization/openstack/nova.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pythonPackages, openssl, openssh }: -pythonPackages.buildPythonPackage rec { +pythonPackages.buildPythonApplication rec { name = "nova-${version}"; version = "12.0.0"; namePrefix = ""; diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix index d22072f1095f..60599d18922c 100644 --- a/pkgs/applications/virtualization/virt-manager/default.nix +++ b/pkgs/applications/virtualization/virt-manager/default.nix @@ -7,7 +7,7 @@ with stdenv.lib; with pythonPackages; -buildPythonPackage rec { +buildPythonApplication rec { name = "virt-manager-${version}"; version = "1.3.1"; namePrefix = ""; diff --git a/pkgs/applications/window-managers/qtile/default.nix b/pkgs/applications/window-managers/qtile/default.nix index 0dae8a76c77b..f2f864506d37 100644 --- a/pkgs/applications/window-managers/qtile/default.nix +++ b/pkgs/applications/window-managers/qtile/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchFromGitHub, buildPythonPackage, python27Packages, pkgs }: +{ stdenv, fetchFromGitHub, buildPythonApplication, python27Packages, pkgs }: let cairocffi-xcffib = python27Packages.cairocffi.override { pythonPath = [ python27Packages.xcffib ]; }; in -buildPythonPackage rec { +buildPythonApplication rec { name = "qtile-${version}"; version = "0.10.4"; diff --git a/pkgs/development/arduino/ino/default.nix b/pkgs/development/arduino/ino/default.nix index 47c7c68c1ab2..073a2339720d 100644 --- a/pkgs/development/arduino/ino/default.nix +++ b/pkgs/development/arduino/ino/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, buildPythonPackage, pythonPackages, picocom +{ stdenv, fetchurl, buildPythonApplication, pythonPackages, picocom , avrdude, arduino-core, avrgcclibc }: -buildPythonPackage rec { +buildPythonApplication rec { name = "ino-0.3.6"; namePrefix = ""; diff --git a/pkgs/development/tools/build-managers/buildbot-slave/default.nix b/pkgs/development/tools/build-managers/buildbot-slave/default.nix index 715b009a17ef..30fbe056926e 100644 --- a/pkgs/development/tools/build-managers/buildbot-slave/default.nix +++ b/pkgs/development/tools/build-managers/buildbot-slave/default.nix @@ -1,6 +1,6 @@ -{ stdenv, buildPythonPackage, fetchurl, coreutils, twisted }: +{ stdenv, buildPythonApplication, fetchurl, coreutils, twisted }: -buildPythonPackage (rec { +buildPythonApplication (rec { name = "buildbot-slave-0.8.10"; namePrefix = ""; diff --git a/pkgs/development/tools/build-managers/buildbot/default.nix b/pkgs/development/tools/build-managers/buildbot/default.nix index a7c4fb89007b..99c1352b4fb6 100644 --- a/pkgs/development/tools/build-managers/buildbot/default.nix +++ b/pkgs/development/tools/build-managers/buildbot/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchurl, twisted, dateutil, jinja2 +{ stdenv, buildPythonApplication, fetchurl, twisted, dateutil, jinja2 , sqlalchemy , sqlalchemy_migrate_0_7 , enableDebugClient ? false, pygobject ? null, pyGtkGlade ? null }: @@ -8,7 +8,7 @@ assert enableDebugClient -> pygobject != null && pyGtkGlade != null; -buildPythonPackage (rec { +buildPythonApplication (rec { name = "buildbot-0.8.12"; namePrefix = ""; diff --git a/pkgs/development/tools/devpi-client/default.nix b/pkgs/development/tools/devpi-client/default.nix index 5db62da06d85..f3db234cd969 100644 --- a/pkgs/development/tools/devpi-client/default.nix +++ b/pkgs/development/tools/devpi-client/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pythonPackages, python} : -pythonPackages.buildPythonPackage rec { +pythonPackages.buildPythonApplication rec { name = "devpi-client-${version}"; version = "2.3.2"; diff --git a/pkgs/development/tools/grabserial/default.nix b/pkgs/development/tools/grabserial/default.nix index bafde1f96873..34a45fa0b846 100644 --- a/pkgs/development/tools/grabserial/default.nix +++ b/pkgs/development/tools/grabserial/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchgit, buildPythonPackage, pythonPackages }: +{ stdenv, fetchgit, buildPythonApplication, pythonPackages }: -buildPythonPackage rec { +buildPythonApplication rec { name = "grabserial-20141120"; namePrefix = ""; diff --git a/pkgs/development/tools/misc/nixbang/default.nix b/pkgs/development/tools/misc/nixbang/default.nix index a97dc3a249a0..ade9954021a1 100644 --- a/pkgs/development/tools/misc/nixbang/default.nix +++ b/pkgs/development/tools/misc/nixbang/default.nix @@ -1,7 +1,7 @@ { lib, pythonPackages, fetchFromGitHub }: let version = "0.1.2"; in -pythonPackages.buildPythonPackage { +pythonPackages.buildPythonApplication { name = "nixbang-${version}"; namePrefix = ""; diff --git a/pkgs/development/tools/misc/ycmd/default.nix b/pkgs/development/tools/misc/ycmd/default.nix index 029e76e0c996..44bf2ac855c9 100644 --- a/pkgs/development/tools/misc/ycmd/default.nix +++ b/pkgs/development/tools/misc/ycmd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, cmake, python, llvmPackages, boost, pythonPackages, buildPythonPackage, makeWrapper +{ stdenv, fetchgit, cmake, python, llvmPackages, boost, pythonPackages, buildPythonApplication, makeWrapper }: stdenv.mkDerivation rec { diff --git a/pkgs/development/tools/profiling/gprof2dot/default.nix b/pkgs/development/tools/profiling/gprof2dot/default.nix index 38315116eeb7..154c0da93d49 100644 --- a/pkgs/development/tools/profiling/gprof2dot/default.nix +++ b/pkgs/development/tools/profiling/gprof2dot/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, pythonPackages }: -pythonPackages.buildPythonPackage { +pythonPackages.buildPythonApplication { name = "gprof2dot-2015-04-27"; src = fetchFromGitHub { diff --git a/pkgs/development/tools/winpdb/default.nix b/pkgs/development/tools/winpdb/default.nix index fd6e0a991387..58a857c22148 100644 --- a/pkgs/development/tools/winpdb/default.nix +++ b/pkgs/development/tools/winpdb/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, buildPythonPackage, wxPython, makeDesktopItem }: +{ stdenv, fetchurl, buildPythonApplication, wxPython, makeDesktopItem }: -buildPythonPackage rec { +buildPythonApplication rec { name = "winpdb-1.4.8"; namePrefix = ""; diff --git a/pkgs/games/mnemosyne/default.nix b/pkgs/games/mnemosyne/default.nix index 8624e168f921..d4f90a906d80 100644 --- a/pkgs/games/mnemosyne/default.nix +++ b/pkgs/games/mnemosyne/default.nix @@ -1,12 +1,12 @@ { stdenv , fetchurl -, buildPythonPackage +, buildPythonApplication , pyqt4 , pythonPackages }: let version = "2.3.2"; -in buildPythonPackage rec { +in buildPythonApplication rec { name = "mnemosyne-${version}"; src = fetchurl { url = "http://sourceforge.net/projects/mnemosyne-proj/files/mnemosyne/${name}/Mnemosyne-${version}.tar.gz"; diff --git a/pkgs/misc/frescobaldi/default.nix b/pkgs/misc/frescobaldi/default.nix index 0ccc0c7c6cfe..04370424abb7 100644 --- a/pkgs/misc/frescobaldi/default.nix +++ b/pkgs/misc/frescobaldi/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pythonPackages, lilypond, pyqt4, pygame }: -pythonPackages.buildPythonPackage rec { +pythonPackages.buildPythonApplication rec { name = "frescobaldi-${version}"; version = "2.0.16"; diff --git a/pkgs/os-specific/linux/iotop/default.nix b/pkgs/os-specific/linux/iotop/default.nix index 7481edeee7b0..a83d4a2ad9fd 100644 --- a/pkgs/os-specific/linux/iotop/default.nix +++ b/pkgs/os-specific/linux/iotop/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, buildPythonPackage, pythonPackages }: +{ stdenv, fetchurl, buildPythonApplication, pythonPackages }: -buildPythonPackage rec { +buildPythonApplication rec { name = "iotop-0.6"; namePrefix = ""; diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 714ff9d002c8..9165e03d79cf 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -1,6 +1,6 @@ -{ pkgs, stdenv, buildPythonPackage, pythonPackages, fetchurl, fetchFromGitHub }: +{ pkgs, stdenv, buildPythonApplication, pythonPackages, fetchurl, fetchFromGitHub }: let - matrix-angular-sdk = buildPythonPackage rec { + matrix-angular-sdk = buildPythonApplication rec { name = "matrix-angular-sdk-${version}"; version = "0.6.6"; @@ -10,7 +10,7 @@ let }; }; in -buildPythonPackage rec { +buildPythonApplication rec { name = "matrix-synapse-${version}"; version = "0.12.0"; diff --git a/pkgs/shells/xonsh/default.nix b/pkgs/shells/xonsh/default.nix index 6b33f5833d86..4aa65a7d8bde 100644 --- a/pkgs/shells/xonsh/default.nix +++ b/pkgs/shells/xonsh/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchFromGitHub, python3Packages}: -python3Packages.buildPythonPackage rec { +python3Packages.buildPythonApplication rec { name = "xonsh-${version}"; version = "0.1.3"; diff --git a/pkgs/tools/X11/arandr/default.nix b/pkgs/tools/X11/arandr/default.nix index a6af7b996512..68355d0d8aa8 100644 --- a/pkgs/tools/X11/arandr/default.nix +++ b/pkgs/tools/X11/arandr/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, python, xrandr, pythonPackages }: -pythonPackages.buildPythonPackage rec { +pythonPackages.buildPythonApplication rec { name = "arandr-0.1.8"; src = fetchurl { diff --git a/pkgs/tools/X11/winswitch/default.nix b/pkgs/tools/X11/winswitch/default.nix index ad7ac7c64c82..767edbc47d56 100644 --- a/pkgs/tools/X11/winswitch/default.nix +++ b/pkgs/tools/X11/winswitch/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl, buildPythonPackage, pythonPackages +{ stdenv, fetchurl, buildPythonApplication, pythonPackages , which, xpra, xmodmap }: let - base = buildPythonPackage rec { + base = buildPythonApplication rec { name = "winswitch-${version}"; namePrefix = ""; version = "0.12.16"; diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index c5b8db591c4c..e0e12051bffd 100644 --- a/pkgs/tools/X11/xpra/default.nix +++ b/pkgs/tools/X11/xpra/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, buildPythonPackage, pythonPackages +{ stdenv, fetchurl, buildPythonApplication, pythonPackages , python, cython, pkgconfig , xorg, gtk, glib, pango, cairo, gdk_pixbuf, atk, pycairo , makeWrapper, xkbcomp, xorgserver, getopt, xauth, utillinux, which, fontsConf, xkeyboard_config , ffmpeg, x264, libvpx, libwebp , libfakeXinerama }: -buildPythonPackage rec { +buildPythonApplication rec { name = "xpra-0.15.3"; namePrefix = ""; diff --git a/pkgs/tools/X11/xpra/gtk3.nix b/pkgs/tools/X11/xpra/gtk3.nix index 6e485dc0a052..5b81ec0a7edc 100644 --- a/pkgs/tools/X11/xpra/gtk3.nix +++ b/pkgs/tools/X11/xpra/gtk3.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, buildPythonPackage +{ stdenv, fetchurl, buildPythonApplication , python, cython, pkgconfig , xorg, gtk3, glib, pango, cairo, gdk_pixbuf, atk, pygobject3, pycairo, gobjectIntrospection , makeWrapper, xkbcomp, xorgserver, getopt, xauth, utillinux, which, fontsConf, xkeyboard_config , ffmpeg, x264, libvpx, libwebp , libfakeXinerama }: -buildPythonPackage rec { +buildPythonApplication rec { name = "xpra-0.14.19"; namePrefix = ""; diff --git a/pkgs/tools/admin/cli53/default.nix b/pkgs/tools/admin/cli53/default.nix index 2fa54796e4c4..3248ac63bf79 100644 --- a/pkgs/tools/admin/cli53/default.nix +++ b/pkgs/tools/admin/cli53/default.nix @@ -1,6 +1,6 @@ -{ lib, buildPythonPackage, pythonPackages, fetchurl }: +{ lib, buildPythonApplication, pythonPackages, fetchurl }: -buildPythonPackage rec { +buildPythonApplication rec { name = "cli53-${version}"; namePrefix = ""; # Suppress "python27-" name prefix version = "0.4.4"; diff --git a/pkgs/tools/admin/letsencrypt/default.nix b/pkgs/tools/admin/letsencrypt/default.nix index 2c74a677b913..516fc20c5a74 100644 --- a/pkgs/tools/admin/letsencrypt/default.nix +++ b/pkgs/tools/admin/letsencrypt/default.nix @@ -1,6 +1,6 @@ { stdenv, pythonPackages, fetchurl, dialog }: -pythonPackages.buildPythonPackage rec { +pythonPackages.buildPythonApplication rec { version = "0.1.0"; name = "letsencrypt-${version}"; diff --git a/pkgs/tools/admin/simp_le/default.nix b/pkgs/tools/admin/simp_le/default.nix index f6b352056fa0..77c45e0ad3fe 100644 --- a/pkgs/tools/admin/simp_le/default.nix +++ b/pkgs/tools/admin/simp_le/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, pythonPackages }: -pythonPackages.buildPythonPackage rec { +pythonPackages.buildPythonApplication rec { name = "simp_le-2016-01-09"; src = fetchFromGitHub { diff --git a/pkgs/tools/audio/beets/alternatives-plugin.nix b/pkgs/tools/audio/beets/alternatives-plugin.nix index 1b0c9b3992b9..75f74e71be52 100644 --- a/pkgs/tools/audio/beets/alternatives-plugin.nix +++ b/pkgs/tools/audio/beets/alternatives-plugin.nix @@ -1,6 +1,6 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, pythonPackages }: +{ stdenv, buildPythonApplication, fetchFromGitHub, pythonPackages }: -buildPythonPackage rec { +buildPythonApplication rec { name = "beets-alternatives-${version}"; version = "0.8.2"; diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix index 91407331d7ca..4532d6424116 100644 --- a/pkgs/tools/audio/beets/default.nix +++ b/pkgs/tools/audio/beets/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, writeScript, glibcLocales -, buildPythonPackage, pythonPackages, python, imagemagick +, buildPythonApplication, pythonPackages, python, imagemagick , enableAcousticbrainz ? true , enableAcoustid ? true @@ -68,7 +68,7 @@ let testShell = "${bashInteractive}/bin/bash --norc"; completion = "${bashCompletion}/share/bash-completion/bash_completion"; -in buildPythonPackage rec { +in buildPythonApplication rec { name = "beets-${version}"; version = "1.3.17"; namePrefix = ""; @@ -103,7 +103,7 @@ in buildPythonPackage rec { ++ optional enableThumbnails pythonPackages.pyxdg ++ optional enableWeb pythonPackages.flask ++ optional enableAlternatives (import ./alternatives-plugin.nix { - inherit stdenv buildPythonPackage pythonPackages fetchFromGitHub; + inherit stdenv buildPythonApplication pythonPackages fetchFromGitHub; }); buildInputs = with pythonPackages; [ diff --git a/pkgs/tools/backup/attic/default.nix b/pkgs/tools/backup/attic/default.nix index 0e2462c5ec85..4f659428c00a 100644 --- a/pkgs/tools/backup/attic/default.nix +++ b/pkgs/tools/backup/attic/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchzip, python3Packages, openssl, acl }: -python3Packages.buildPythonPackage rec { +python3Packages.buildPythonApplication rec { name = "attic-${version}"; version = "0.16"; namePrefix = ""; diff --git a/pkgs/tools/backup/borg/default.nix b/pkgs/tools/backup/borg/default.nix index 1ea8095bd38c..208c3d4b1aa6 100644 --- a/pkgs/tools/backup/borg/default.nix +++ b/pkgs/tools/backup/borg/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, python3Packages, acl, lz4, openssl }: -python3Packages.buildPythonPackage rec { +python3Packages.buildPythonApplication rec { name = "borgbackup-${version}"; version = "0.30.0"; namePrefix = ""; diff --git a/pkgs/tools/backup/obnam/default.nix b/pkgs/tools/backup/obnam/default.nix index c287efe8e112..0df9fa9d39f0 100644 --- a/pkgs/tools/backup/obnam/default.nix +++ b/pkgs/tools/backup/obnam/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, python, pythonPackages, pycrypto, attr }: -pythonPackages.buildPythonPackage rec { +pythonPackages.buildPythonApplication rec { name = "obnam-${version}"; version = "1.19.1"; diff --git a/pkgs/tools/backup/s3ql/default.nix b/pkgs/tools/backup/s3ql/default.nix index b455c672b104..e94af89a7c6d 100644 --- a/pkgs/tools/backup/s3ql/default.nix +++ b/pkgs/tools/backup/s3ql/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, python3Packages, sqlite }: -python3Packages.buildPythonPackage rec { +python3Packages.buildPythonApplication rec { name = "${pname}-${version}"; pname = "s3ql"; version = "2.13"; diff --git a/pkgs/tools/backup/wal-e/default.nix b/pkgs/tools/backup/wal-e/default.nix index 025a998aed4e..3b66ac1b491f 100644 --- a/pkgs/tools/backup/wal-e/default.nix +++ b/pkgs/tools/backup/wal-e/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pythonPackages, lzop, postgresql, pv }: -pythonPackages.buildPythonPackage rec { +pythonPackages.buildPythonApplication rec { name = "wal-e-${version}"; version = "0.6.10"; diff --git a/pkgs/tools/compression/dtrx/default.nix b/pkgs/tools/compression/dtrx/default.nix index 343709dd9571..d412a4e433ef 100644 --- a/pkgs/tools/compression/dtrx/default.nix +++ b/pkgs/tools/compression/dtrx/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl, pythonPackages}: -pythonPackages.buildPythonPackage rec { +pythonPackages.buildPythonApplication rec { name = "dtrx-${version}"; version = "7.1"; diff --git a/pkgs/tools/filesystems/gitfs/default.nix b/pkgs/tools/filesystems/gitfs/default.nix index cd79f5db85b3..9c44394697f7 100644 --- a/pkgs/tools/filesystems/gitfs/default.nix +++ b/pkgs/tools/filesystems/gitfs/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, python, buildPythonPackage, pythonPackages }: +{ stdenv, fetchFromGitHub, python, buildPythonApplication, pythonPackages }: -buildPythonPackage rec { +buildPythonApplication rec { name = "gitfs-0.2.5"; src = fetchFromGitHub { diff --git a/pkgs/tools/filesystems/nixpart/0.4/blivet.nix b/pkgs/tools/filesystems/nixpart/0.4/blivet.nix index d4129f4d390a..d3b3b716ffa0 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/blivet.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/blivet.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, buildPythonPackage, pykickstart, pyparted, pyblock +{ stdenv, fetchurl, buildPythonApplication, pykickstart, pyparted, pyblock , libselinux, cryptsetup, multipath_tools, lsof, utillinux , useNixUdev ? true, udev ? null }: assert useNixUdev -> udev != null; -buildPythonPackage rec { +buildPythonApplication rec { name = "blivet-${version}"; version = "0.17-1"; diff --git a/pkgs/tools/filesystems/nixpart/0.4/default.nix b/pkgs/tools/filesystems/nixpart/0.4/default.nix index 01a3caafc5dd..1d9838168952 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/default.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python, buildPythonPackage +{ stdenv, fetchurl, python, buildPythonApplication # Propagated to blivet , useNixUdev ? true # No longer needed, but kept for backwards-compatibility with older NixOps. @@ -9,7 +9,7 @@ let blivet = import ./blivet.nix { - inherit stdenv fetchurl buildPythonPackage; + inherit stdenv fetchurl buildPythonApplication; inherit pykickstart pyparted pyblock cryptsetup multipath_tools; inherit useNixUdev; inherit (pkgs) lsof utillinux udev; @@ -48,15 +48,15 @@ let }; pykickstart = import ./pykickstart.nix { - inherit stdenv fetchurl python buildPythonPackage urlgrabber; + inherit stdenv fetchurl python buildPythonApplication urlgrabber; }; pyparted = import ./pyparted.nix { - inherit stdenv fetchurl python buildPythonPackage parted; + inherit stdenv fetchurl python buildPythonApplication parted; inherit (pkgs) pkgconfig e2fsprogs; }; -in buildPythonPackage rec { +in buildPythonApplication rec { name = "nixpart-${version}"; version = "0.4.1"; diff --git a/pkgs/tools/filesystems/nixpart/0.4/pykickstart.nix b/pkgs/tools/filesystems/nixpart/0.4/pykickstart.nix index 7bc3f54c2363..86479126d393 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/pykickstart.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/pykickstart.nix @@ -1,6 +1,6 @@ -{ stdenv, python, buildPythonPackage, fetchurl, urlgrabber }: +{ stdenv, python, buildPythonApplication, fetchurl, urlgrabber }: -buildPythonPackage rec { +buildPythonApplication rec { name = "pykickstart-${version}"; version = "1.99.39"; diff --git a/pkgs/tools/filesystems/nixpart/0.4/pyparted.nix b/pkgs/tools/filesystems/nixpart/0.4/pyparted.nix index 67f318c863e1..721e5185be3f 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/pyparted.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/pyparted.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, pkgconfig, python, buildPythonPackage, parted, e2fsprogs }: +{ stdenv, fetchurl, pkgconfig, python, buildPythonApplication, parted, e2fsprogs }: -buildPythonPackage rec { +buildPythonApplication rec { name = "pyparted-${version}"; version = "3.10"; diff --git a/pkgs/tools/filesystems/nixpart/default.nix b/pkgs/tools/filesystems/nixpart/default.nix index 895ae99c3093..ce00367c771c 100644 --- a/pkgs/tools/filesystems/nixpart/default.nix +++ b/pkgs/tools/filesystems/nixpart/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, buildPythonPackage, blivet }: +{ stdenv, fetchurl, buildPythonApplication, blivet }: -buildPythonPackage rec { +buildPythonApplication rec { name = "nixpart-${version}"; version = "1.0.0"; diff --git a/pkgs/tools/misc/apt-offline/default.nix b/pkgs/tools/misc/apt-offline/default.nix index 219cb2139f58..e479167dc159 100644 --- a/pkgs/tools/misc/apt-offline/default.nix +++ b/pkgs/tools/misc/apt-offline/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, bash, buildPythonPackage }: +{ stdenv, fetchurl, bash, buildPythonApplication }: -buildPythonPackage rec { +buildPythonApplication rec { version = "1.3"; name = "apt-offline-${version}"; diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index 6715f1ac38fd..304f721ee8d9 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -4,7 +4,7 @@ , enableBloat ? false }: -pythonPackages.buildPythonPackage rec { +pythonPackages.buildPythonApplication rec { name = "diffoscope-${version}"; version = "45"; diff --git a/pkgs/tools/misc/i3minator/default.nix b/pkgs/tools/misc/i3minator/default.nix index 0c3907b89bfe..45fd27b7f4f9 100644 --- a/pkgs/tools/misc/i3minator/default.nix +++ b/pkgs/tools/misc/i3minator/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, buildPythonPackage, pythonPackages, python }: +{ stdenv, fetchurl, buildPythonApplication, pythonPackages, python }: -buildPythonPackage rec { +buildPythonApplication rec { name = "i3minator-${version}"; version = "0.0.4"; diff --git a/pkgs/tools/misc/trash-cli/default.nix b/pkgs/tools/misc/trash-cli/default.nix index 78835afddef5..e3adbfe3887d 100644 --- a/pkgs/tools/misc/trash-cli/default.nix +++ b/pkgs/tools/misc/trash-cli/default.nix @@ -2,7 +2,7 @@ assert stdenv.isLinux; -python2Packages.buildPythonPackage rec { +python2Packages.buildPythonApplication rec { name = "trash-cli-${version}"; version = "0.12.9.14"; namePrefix = ""; diff --git a/pkgs/tools/misc/vdirsyncer/default.nix b/pkgs/tools/misc/vdirsyncer/default.nix index df7cbc04a142..d6789bf52bc5 100644 --- a/pkgs/tools/misc/vdirsyncer/default.nix +++ b/pkgs/tools/misc/vdirsyncer/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pythonPackages }: -pythonPackages.buildPythonPackage rec { +pythonPackages.buildPythonApplication rec { version = "0.9.0"; name = "vdirsyncer-${version}"; namePrefix = ""; diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index 8baa5cc91740..9bb3250675dd 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, buildPythonPackage, makeWrapper, ffmpeg, zip +{ stdenv, fetchurl, buildPythonApplication, makeWrapper, ffmpeg, zip , pandoc ? null }: @@ -9,7 +9,7 @@ # case someone wants to use this derivation to build a Git version of # the tool that doesn't have the formatted man page included. -buildPythonPackage rec { +buildPythonApplication rec { name = "youtube-dl-${version}"; version = "2016.01.01"; diff --git a/pkgs/tools/networking/getmail/default.nix b/pkgs/tools/networking/getmail/default.nix index 8dd288b5588a..d11e154817d4 100644 --- a/pkgs/tools/networking/getmail/default.nix +++ b/pkgs/tools/networking/getmail/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, buildPythonPackage }: +{ stdenv, fetchurl, buildPythonApplication }: -buildPythonPackage rec { +buildPythonApplication rec { version = "4.49.0"; name = "getmail-${version}"; namePrefix = ""; diff --git a/pkgs/tools/networking/gmvault/default.nix b/pkgs/tools/networking/gmvault/default.nix index aa52e4f3ae24..4ccd09ac555a 100644 --- a/pkgs/tools/networking/gmvault/default.nix +++ b/pkgs/tools/networking/gmvault/default.nix @@ -1,6 +1,6 @@ -{ pkgs, fetchurl, buildPythonPackage, pythonPackages }: +{ pkgs, fetchurl, buildPythonApplication, pythonPackages }: -buildPythonPackage rec { +buildPythonApplication rec { version = "1.8.1-beta"; name = "gmvault-${version}"; diff --git a/pkgs/tools/networking/httpie/default.nix b/pkgs/tools/networking/httpie/default.nix index cc1531961b32..a3c52f7dd501 100644 --- a/pkgs/tools/networking/httpie/default.nix +++ b/pkgs/tools/networking/httpie/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pythonPackages }: -pythonPackages.buildPythonPackage rec { +pythonPackages.buildPythonApplication rec { name = "httpie-0.9.2"; namePrefix = ""; diff --git a/pkgs/tools/networking/offlineimap/default.nix b/pkgs/tools/networking/offlineimap/default.nix index 5331f71a96ac..00061b3aeff1 100644 --- a/pkgs/tools/networking/offlineimap/default.nix +++ b/pkgs/tools/networking/offlineimap/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, buildPythonPackage, sqlite3 }: +{ stdenv, fetchFromGitHub, buildPythonApplication, sqlite3 }: -buildPythonPackage rec { +buildPythonApplication rec { version = "6.6.1"; name = "offlineimap-${version}"; namePrefix = ""; diff --git a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix index dae985febbb3..5f1d6b4ef1a4 100644 --- a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix +++ b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix @@ -5,7 +5,7 @@ # store path. The problem appears to be non-fatal, but there's probably # some loss of functionality because of it. -pythonPackages.buildPythonPackage rec { +pythonPackages.buildPythonApplication rec { version = "1.10.2"; name = "tahoe-lafs-${version}"; namePrefix = ""; diff --git a/pkgs/tools/networking/s3cmd/default.nix b/pkgs/tools/networking/s3cmd/default.nix index 2287671aef2e..0ff741ef7e2c 100644 --- a/pkgs/tools/networking/s3cmd/default.nix +++ b/pkgs/tools/networking/s3cmd/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pythonPackages }: -pythonPackages.buildPythonPackage rec { +pythonPackages.buildPythonApplication rec { name = "s3cmd-1.5.2"; src = fetchurl { diff --git a/pkgs/tools/networking/speedtest-cli/default.nix b/pkgs/tools/networking/speedtest-cli/default.nix index 4e1391dfeb97..10b35298461b 100644 --- a/pkgs/tools/networking/speedtest-cli/default.nix +++ b/pkgs/tools/networking/speedtest-cli/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pythonPackages }: -pythonPackages.buildPythonPackage rec { +pythonPackages.buildPythonApplication rec { name = "speedtest-cli-${version}"; version = "0.3.1"; namePrefix = ""; diff --git a/pkgs/tools/networking/urlwatch/default.nix b/pkgs/tools/networking/urlwatch/default.nix index ef420961a1f3..8ad930951607 100644 --- a/pkgs/tools/networking/urlwatch/default.nix +++ b/pkgs/tools/networking/urlwatch/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, python3Packages }: -python3Packages.buildPythonPackage rec { +python3Packages.buildPythonApplication rec { name = "urlwatch-2.0"; src = fetchurl { diff --git a/pkgs/tools/package-management/nixops/generic.nix b/pkgs/tools/package-management/nixops/generic.nix index b9b9eee8d160..023ec07dba16 100644 --- a/pkgs/tools/package-management/nixops/generic.nix +++ b/pkgs/tools/package-management/nixops/generic.nix @@ -3,7 +3,7 @@ , src, version }: -pythonPackages.buildPythonPackage { +pythonPackages.buildPythonApplication { name = "nixops-${version}"; namePrefix = ""; diff --git a/pkgs/tools/package-management/nox/default.nix b/pkgs/tools/package-management/nox/default.nix index 92edd915ad79..89e72307ead1 100644 --- a/pkgs/tools/package-management/nox/default.nix +++ b/pkgs/tools/package-management/nox/default.nix @@ -1,6 +1,6 @@ { lib, pythonPackages, fetchurl }: -pythonPackages.buildPythonPackage rec { +pythonPackages.buildPythonApplication rec { name = "nox-${version}"; version = "0.0.2"; namePrefix = ""; diff --git a/pkgs/tools/package-management/python2nix/default.nix b/pkgs/tools/package-management/python2nix/default.nix index 1e84a81e5241..0bc92314e02c 100644 --- a/pkgs/tools/package-management/python2nix/default.nix +++ b/pkgs/tools/package-management/python2nix/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, pythonPackages }: -pythonPackages.buildPythonPackage rec { +pythonPackages.buildPythonApplication rec { name = "python2nix-20140927"; src = fetchFromGitHub { diff --git a/pkgs/tools/security/fail2ban/default.nix b/pkgs/tools/security/fail2ban/default.nix index 667157978a38..9443eac01da7 100644 --- a/pkgs/tools/security/fail2ban/default.nix +++ b/pkgs/tools/security/fail2ban/default.nix @@ -2,7 +2,7 @@ let version = "0.9.3"; in -pythonPackages.buildPythonPackage { +pythonPackages.buildPythonApplication { name = "fail2ban-${version}"; namePrefix = ""; diff --git a/pkgs/tools/security/knockknock/default.nix b/pkgs/tools/security/knockknock/default.nix index 6258f2315904..089dd0de2bda 100644 --- a/pkgs/tools/security/knockknock/default.nix +++ b/pkgs/tools/security/knockknock/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, buildPythonPackage, python, pycrypto, hping }: +{ stdenv, fetchFromGitHub, buildPythonApplication, python, pycrypto, hping }: -buildPythonPackage rec { +buildPythonApplication rec { rev = "bf14bbff"; name = "knockknock-r${rev}"; diff --git a/pkgs/tools/security/sshuttle/default.nix b/pkgs/tools/security/sshuttle/default.nix index b7cefdd86ea4..b78eb43782ed 100644 --- a/pkgs/tools/security/sshuttle/default.nix +++ b/pkgs/tools/security/sshuttle/default.nix @@ -1,7 +1,7 @@ { stdenv, pythonPackages, fetchurl, makeWrapper, pandoc , coreutils, iptables, nettools, openssh, procps }: -pythonPackages.buildPythonPackage rec { +pythonPackages.buildPythonApplication rec { name = "sshuttle-${version}"; version = "0.76"; diff --git a/pkgs/tools/security/volatility/default.nix b/pkgs/tools/security/volatility/default.nix index 6aa3a9d5ea11..bed7d5369579 100644 --- a/pkgs/tools/security/volatility/default.nix +++ b/pkgs/tools/security/volatility/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, buildPythonPackage, pycrypto }: +{ stdenv, fetchurl, buildPythonApplication, pycrypto }: -buildPythonPackage rec { +buildPythonApplication rec { namePrefix = ""; name = "volatility-2.4"; diff --git a/pkgs/tools/system/honcho/default.nix b/pkgs/tools/system/honcho/default.nix index b52c1c0f636d..5aca54ad9182 100644 --- a/pkgs/tools/system/honcho/default.nix +++ b/pkgs/tools/system/honcho/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchzip, pythonPackages, buildPythonPackage }: +{ stdenv, fetchzip, pythonPackages, buildPythonApplication }: -let honcho = buildPythonPackage rec { +let honcho = buildPythonApplication rec { name = "honcho-${version}"; version = "0.6.6"; namePrefix = ""; diff --git a/pkgs/tools/text/grin/default.nix b/pkgs/tools/text/grin/default.nix index 2ea4a9501452..da3a77e8d2e4 100644 --- a/pkgs/tools/text/grin/default.nix +++ b/pkgs/tools/text/grin/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pythonPackages }: -pythonPackages.buildPythonPackage rec { +pythonPackages.buildPythonApplication rec { name = "grin-1.2.1"; namePrefix = ""; diff --git a/pkgs/tools/typesetting/odpdown/default.nix b/pkgs/tools/typesetting/odpdown/default.nix index 9ff33b2fb698..fe1e915e27bf 100644 --- a/pkgs/tools/typesetting/odpdown/default.nix +++ b/pkgs/tools/typesetting/odpdown/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl, buildPythonPackage, libreoffice, lpod, lxml, mistune, pillow +{ stdenv, fetchurl, buildPythonApplication, libreoffice, lpod, lxml, mistune, pillow , pygments }: -buildPythonPackage rec { +buildPythonApplication rec { name = "odpdown-${version}"; version = "0.4.1"; diff --git a/pkgs/tools/video/vnc2flv/default.nix b/pkgs/tools/video/vnc2flv/default.nix index 55f54e2cf3de..3675b5ab091b 100644 --- a/pkgs/tools/video/vnc2flv/default.nix +++ b/pkgs/tools/video/vnc2flv/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pythonPackages }: -pythonPackages.buildPythonPackage rec { +pythonPackages.buildPythonApplication rec { name = "vnc2flv-20100207"; namePrefix = ""; diff --git a/pkgs/tools/virtualization/cloud-init/default.nix b/pkgs/tools/virtualization/cloud-init/default.nix index af2779e59e36..34b6226ff98d 100644 --- a/pkgs/tools/virtualization/cloud-init/default.nix +++ b/pkgs/tools/virtualization/cloud-init/default.nix @@ -2,7 +2,7 @@ let version = "0.7.6"; -in pythonPackages.buildPythonPackage rec { +in pythonPackages.buildPythonApplication rec { name = "cloud-init-${version}"; namePrefix = ""; diff --git a/pkgs/tools/virtualization/euca2ools/default.nix b/pkgs/tools/virtualization/euca2ools/default.nix index a87dd5683229..7a93d96036f4 100644 --- a/pkgs/tools/virtualization/euca2ools/default.nix +++ b/pkgs/tools/virtualization/euca2ools/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit, which, pythonPackages }: -pythonPackages.buildPythonPackage rec { +pythonPackages.buildPythonApplication rec { name = "euca2ools-2.1.4"; namePrefix = ""; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 090dbc005ba4..440040bac29c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3197,7 +3197,7 @@ let solvespace = callPackage ../applications/graphics/solvespace { }; sonata = callPackage ../applications/audio/sonata { - inherit (python3Packages) buildPythonPackage python isPy3k dbus pygobject3 mpd2; + inherit (python3Packages) buildPythonApplication python isPy3k dbus pygobject3 mpd2; }; sparsehash = callPackage ../development/libraries/sparsehash { }; @@ -13216,7 +13216,7 @@ let }; qutebrowser = qt55.callPackage ../applications/networking/browsers/qutebrowser { - inherit (python34Packages) buildPythonPackage python pyqt5 jinja2 pygments pyyaml pypeg2; + inherit (python34Packages) buildPythonApplication python pyqt5 jinja2 pygments pyyaml pypeg2; inherit (gst_all_1) gst-plugins-base gst-plugins-good gst-plugins-bad gst-libav; }; @@ -14090,7 +14090,7 @@ let xpra = callPackage ../tools/X11/xpra { inherit (texFunctions) fontsConf; }; libfakeXinerama = callPackage ../tools/X11/xpra/libfakeXinerama.nix { }; #TODO: 'pil' is not available for python3, yet - xpraGtk3 = callPackage ../tools/X11/xpra/gtk3.nix { inherit (texFunctions) fontsConf; inherit (python3Packages) buildPythonPackage python cython pygobject3 pycairo; }; + xpraGtk3 = callPackage ../tools/X11/xpra/gtk3.nix { inherit (texFunctions) fontsConf; inherit (python3Packages) buildPythonApplication python cython pygobject3 pycairo; }; xrestop = callPackage ../tools/X11/xrestop { }; -- cgit 1.4.1 From 1a025a4a9649bbe581a6d6da68bb61cdf7109c81 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 13 Jan 2016 19:46:41 +0300 Subject: cups: 2.0.4 -> 2.1.3 Also enable parallel building and don't install rc.d scripts. --- pkgs/misc/cups/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'pkgs/misc') diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix index 82fd1d65baf5..437300650419 100644 --- a/pkgs/misc/cups/default.nix +++ b/pkgs/misc/cups/default.nix @@ -5,7 +5,7 @@ ### IMPORTANT: before updating cups, make sure the nixos/tests/printing.nix test ### works at least for your platform. -let version = "2.0.4"; in +let version = "2.1.3"; in with stdenv.lib; stdenv.mkDerivation { @@ -15,7 +15,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.cups.org/software/${version}/cups-${version}-source.tar.bz2"; - sha256 = "1gaakz24k6x5nc09rmpiq0xq20j1qdjc3szag8qwmyi4ky6ydmg1"; + sha256 = "1lyl3z01xhg9xb9c8m42398c6h9kw8qr6jwiv8bjdsjab11hv9rn"; }; buildInputs = [ pkgconfig zlib libjpeg libpng libtiff libusb gnutls libpaper ] @@ -53,7 +53,6 @@ stdenv.mkDerivation { # Idem for /etc. "PAMDIR=$(out)/etc/pam.d" "DBUSDIR=$(out)/etc/dbus-1" - "INITDIR=$(out)/etc/rc.d" "XINETD=$(out)/etc/xinetd.d" "SERVERROOT=$(out)/etc/cups" # Idem for /usr. @@ -63,6 +62,8 @@ stdenv.mkDerivation { "CUPS_PRIMARY_SYSTEM_GROUP=root" ]; + enableParallelBuilding = true; + postInstall = '' # Delete obsolete stuff that conflicts with cups-filters. rm -rf $out/share/cups/banners $out/share/cups/data/testprint -- cgit 1.4.1 From 53b9ac0d13a2147a852e0019598dc8fcbb55fa1b Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Mon, 22 Feb 2016 23:22:27 +0100 Subject: wine-unstable: 1.9.3 -> 1.9.4 winetricks: 20160109 -> 20160219 gecko: 2.40 -> 2.44 --- pkgs/misc/emulators/wine/sources.nix | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) (limited to 'pkgs/misc') diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix index b44693502d73..cd877403d3a0 100644 --- a/pkgs/misc/emulators/wine/sources.nix +++ b/pkgs/misc/emulators/wine/sources.nix @@ -30,23 +30,33 @@ in rec { }; unstable = fetchurl rec { - version = "1.9.3"; + version = "1.9.4"; url = "mirror://sourceforge/wine/wine-${version}.tar.bz2"; - sha256 = "0389xbs943iwdgv3a6pvcy2gxrwqzf20vrsbpd2yrj1lan2m8ps7"; - inherit (stable) gecko32 gecko64 mono; + sha256 = "1f5v1gns0xs512a6ym785cn29j8dxdbnxnvkg8v0p1w0p6vfmhbm"; + inherit (stable) mono; + gecko32 = fetchurl rec { + version = "2.44"; + url = "http://dl.winehq.org/wine/wine-gecko/${version}/wine_gecko-${version}-x86.msi"; + sha256 = "0fbd8pxkihhfxs5mcx8n0rcygdx43qdrp2x8hq1s1cvifp8lm9kp"; + }; + gecko64 = fetchurl rec { + version = "2.44"; + url = "http://dl.winehq.org/wine/wine-gecko/${version}/wine_gecko-${version}-x86_64.msi"; + sha256 = "0qb6zx4ycj37q26y2zn73w49bxifdvh9n4riy39cn1kl7c6mm3k2"; + }; }; staging = fetchFromGitHub rec { inherit (unstable) version; - sha256 = "0r932caxlkdw36f36f8y4h2r3anpl61fmqr9payb83fj55gsiq4d"; + sha256 = "0xjxbip0ab1lqgxrww08082ndsb8b5wjfwlf51zlr3f59c9bx9y5"; owner = "wine-compholio"; repo = "wine-staging"; rev = "v${version}"; }; winetricks = fetchFromGitHub rec { - version = "20160109"; - sha256 = "0pnl5362g5q7py368vj07swbdp1fqbpvpq4jv4l5ddyclps8ajg8"; + version = "20160219"; + sha256 = "1wqsbdh2qa5xxswilniki9wzbhlmkl6jqmryjd9f5smirr7ryy2r"; owner = "Winetricks"; repo = "winetricks"; rev = version; -- cgit 1.4.1 From d2d0f19b57e4a7abb9d88556f04a526473404aaf Mon Sep 17 00:00:00 2001 From: Arseniy Seroka Date: Thu, 25 Feb 2016 12:17:06 +0300 Subject: vimPlugins: update 2016-02-25 --- pkgs/misc/vim-plugins/default.nix | 453 ++++++++++----------- pkgs/misc/vim-plugins/vim-plugin-names | 2 +- .../vim-plugins/vim2nix/additional-nix-code/racer | 4 - 3 files changed, 226 insertions(+), 233 deletions(-) delete mode 100644 pkgs/misc/vim-plugins/vim2nix/additional-nix-code/racer (limited to 'pkgs/misc') diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index 84386efeb3af..6c9f8d665e15 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -101,7 +101,7 @@ rec { src = fetchgit { url = "git://github.com/godlygeek/csapprox"; rev = "7981dac51d8b6776985aa08cb7b5ee98ea7f2ddd"; - sha256 = "8ccb47eb79c7ab63109d32158388812bdca340985527af4f2a5489ff8683389f"; + sha256 = "17rqhf3gz2al597sy9smk10a7p1bh648659jkl867ay7g7mlgjwc"; }; dependencies = []; @@ -112,7 +112,7 @@ rec { src = fetchgit { url = "git://github.com/chrisbra/CheckAttach"; rev = "a1d86be7e69b25b41ce1a7fe2d2844330f783b68"; - sha256 = "b8921c826f5a122e9b128301c620b8b3d3fd88a15a2b0634fdea01062fba2c1f"; + sha256 = "07rcp8phc0gazls0cassl64gvlxkp0hcc0c32adjw4jsdy11r4mq"; }; dependencies = []; @@ -123,7 +123,7 @@ rec { src = fetchgit { url = "git://github.com/mattn/gist-vim"; rev = "88c331e2e07765090112a396e5e119b39b5aa754"; - sha256 = "0da7e356b4a50921c1a67edcf066785ed637750094f42ac1bc61ae82a2f7f9c5"; + sha256 = "1igryyi85bk1pk0jmx4l01skgmjyg1kg1p3ylv0j22d5nibf79qd"; }; dependencies = []; @@ -134,7 +134,7 @@ rec { src = fetchgit { url = "git://github.com/Twinside/vim-hoogle"; rev = "a5db36f048ac16ab9774fc86f36cd4ae9a444932"; - sha256 = "31cb37f9fa38e15a52bc35c050e173afc2af5fe8b3d6e5f2026cd5a89bb1a5a0"; + sha256 = "1855n6dsimbc0brfbmmkx1gszhmgfghm1h1mpi95mq9qzbwkgjri"; }; dependencies = []; @@ -145,7 +145,7 @@ rec { src = fetchgit { url = "git://github.com/altercation/vim-colors-solarized"; rev = "528a59f26d12278698bb946f8fb82a63711eec21"; - sha256 = "a1b2ef696eee94dafa76431c31ee260acdd13a7cf87939f27eca431d5aa5a315"; + sha256 = "05d3lmd1shyagvr3jygqghxd3k8a4vp32723fvxdm57fdrlyzcm1"; }; dependencies = []; @@ -156,18 +156,18 @@ rec { src = fetchgit { url = "git://github.com/ervandew/supertab"; rev = "66511772a430a5eaad7f7d03dbb02e8f33c4a641"; - sha256 = "fd49314e9f3ca3262e40b67f05311de94f50d03c946fc53e25b3bd61e33eb418"; + sha256 = "065l7vin3gdk4lzcavwl7k850kz93lqhazxn80p2d8rwkx732jgx"; }; dependencies = []; }; Syntastic = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "Syntastic-2016-01-18"; + name = "Syntastic-2016-02-20"; src = fetchgit { url = "git://github.com/scrooloose/syntastic"; - rev = "d1a179d750bd1d136d7f38e69f2c5b8439886de7"; - sha256 = "e2cfa0fa27b0249b1e5d783883f4c72a13a167a869218d73ae1b2cad631c3a28"; + rev = "8f97e64c78e9ade6cf09fc5d5446f5d2a8deaa35"; + sha256 = "1xxmcr5r0cf2nyp2c2dfxm38x4c19dmax1g2m4clnys5dak7lsdd"; }; dependencies = []; @@ -178,7 +178,7 @@ rec { src = fetchgit { url = "git://github.com/godlygeek/tabular"; rev = "60f25648814f0695eeb6c1040d97adca93c4e0bb"; - sha256 = "28c860ad621587f2c3213fae47d1a3997746527c17d51e9ab94c209eb7bfeb0f"; + sha256 = "03zbpyvrw82cp6d1xm8pgi94cxwrlg8lgbiz471z51qmcann1j18"; }; dependencies = []; @@ -189,7 +189,7 @@ rec { src = fetchgit { url = "git://github.com/majutsushi/tagbar"; rev = "7b36c46d17d57db34fdb0adac9ba6382d0bb5e66"; - sha256 = "346773e772772d1c68318effd8e6c8c8b36f61cfd9c72a85c0bfcec9843f13c7"; + sha256 = "1iqk7y2ckkmzq22jmiyrrxhnzcy8r3kdizwf65l1qbbpfbkp6rrl"; }; dependencies = []; @@ -200,7 +200,7 @@ rec { src = fetchgit { url = "git://github.com/scrooloose/nerdcommenter"; rev = "1f4bfd59920c101a30a74a07b824608a6e65f3fe"; - sha256 = "4ef10aafc54bcb3e119cac7f4b0065d8dc09d43d92dc069a499e96e935afb83d"; + sha256 = "0gdqmwsyk5ly96d0dp4j7pa0kp6qcl04nzxckh8kxjsbqnphmwaf"; }; dependencies = []; @@ -211,18 +211,18 @@ rec { src = fetchgit { url = "git://github.com/scrooloose/nerdtree"; rev = "4ebbb533c3faf2c480211db2b547972bb3b60f2b"; - sha256 = "f730aa7347d6e710451514137985265338f8f60c4ab7f98e2a0eed65071e08ed"; + sha256 = "1v883q3nbv8f5a7gkdsa1kvghf2k4s2pj4ql2m2i1ryn8xrslc7p"; }; dependencies = []; }; UltiSnips = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "UltiSnips-2016-01-20"; + name = "UltiSnips-2016-02-13"; src = fetchgit { url = "git://github.com/SirVer/ultisnips"; - rev = "3f2c591c3b547e7d7b80d15897ac7a9e3bf85ec8"; - sha256 = "6644e8603202adc1ade58a972164e5e6470248ca1d2c40cd949b8f35e67b8019"; + rev = "25882e95cd8981308c4b2d87dcc2c2d6ecd73a6d"; + sha256 = "0bz1qywavysyqb2ni7s9k96pfwdldvhfz79xp5qcw352d1ii7s9n"; }; dependencies = []; @@ -233,18 +233,18 @@ rec { src = fetchgit { url = "git://github.com/vimoutliner/vimoutliner"; rev = "cb41cfd6d636e1243e7e9c46b35fc5cb50588069"; - sha256 = "6faf7e34f4793b2445dd9c3facbf19cd6c1c9ab39b83dfb3d89626314ef1850f"; + sha256 = "03w5y57329lnv2rxz0wvnfd1qv6d36zsqgwwvm2j8fvryhs7xbvg"; }; dependencies = []; }; WebAPI = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "WebAPI-2015-10-05"; + name = "WebAPI-2016-01-25"; src = fetchgit { url = "git://github.com/mattn/webapi-vim"; - rev = "dfc60635e610f9200646a84d11887af9e3d50b10"; - sha256 = "7bc85fe344854e02377f4ac931a015ef1ffd6de14f1d0d8fca04785beabe584b"; + rev = "5726e8270e2a774c7200ca79868b4128c0c57ad7"; + sha256 = "0gfzhny2i6jwkcw5ayhinq0ia3jb086h7bvmxy55lgr0a7ykhvh1"; }; dependencies = []; @@ -267,11 +267,11 @@ rec { }; commentary = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "commentary-2015-09-12"; + name = "commentary-2016-02-15"; src = fetchgit { url = "git://github.com/tpope/vim-commentary"; - rev = "e0f4850d78137a35b9461c530078bd77f39e4dce"; - sha256 = "64896579a5c682e7da2cce7292cba16c4186a42ff68d0e92143fa7345d28cf0d"; + rev = "4dcfc318e0b02fdbb0c2d9ff77cf3562b46eea25"; + sha256 = "1l5krnkx7bx3xry0nj0amwgg6bhqw8ir0jzj75ibvklkg5lmqbxl"; }; dependencies = []; @@ -282,7 +282,7 @@ rec { src = fetchgit { url = "git://github.com/FelikZ/ctrlp-py-matcher"; rev = "8a803267a741cff3d6147650745f83c8f2125578"; - sha256 = "27fc887bdad36bd33a0e8645465e287c20158533408b241f46141528313baa34"; + sha256 = "0d5a7cqjh58l8qgj92s06f2ia83w51g4cic61qxd6sykv9xqiz17"; }; dependencies = []; @@ -293,7 +293,7 @@ rec { src = fetchgit { url = "git://github.com/amiorin/ctrlp-z"; rev = "d1a69ec623ce24b9a30fc8fe3cd468c322b03026"; - sha256 = "d40ba49edba53805779706633ec3ee0056dd88835cc6b2e88fbe628a5e90da9a"; + sha256 = "16nsj1g8lqmyizlb5ijwhf4dsmh0xv1kwqq6jxvhaf55vfga82yl"; }; dependencies = []; @@ -304,29 +304,29 @@ rec { src = fetchgit { url = "git://github.com/int3/vim-extradite"; rev = "52326f6d333cdbb9e9c6d6772af87f4f39c00526"; - sha256 = "91f744ee73faad92adb67a698b58a14cfa0fbb65f6d483a96a1c5b139ee1cdf1"; + sha256 = "1wfdw6g16nqwdalq7m7ncnxhzyjcl5c8nsbsnsnr5bgsfgp49xwi"; }; dependencies = []; }; fugitive = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "fugitive-2016-01-08"; + name = "fugitive-2016-02-24"; src = fetchgit { url = "git://github.com/tpope/vim-fugitive"; - rev = "fd36aa9c61e06d71befdbe8931f97137c489b065"; - sha256 = "ef87be5ad469368f11185db32a8acc14ac08f1b151d0c58492042b0a9314c87e"; + rev = "008b9570860f552534109b4f618cf2ddd145eeb4"; + sha256 = "0nj6airs00q3f1ly29k0nk3ypznzsylqm8n0wakllg86qic4xjlr"; }; dependencies = []; }; ghcmod = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "ghcmod-2016-01-20"; + name = "ghcmod-2016-01-25"; src = fetchgit { url = "git://github.com/eagletmt/ghcmod-vim"; - rev = "a7c76b979918889fa6de02a3f712925931f62cb8"; - sha256 = "2ad76948c97e9141eca81423a8d27d092e0f5c62818c66f08679d9cae70268f6"; + rev = "815616e8b7d64677d6092e95bc6a3e83d2e035d4"; + sha256 = "1s0wxccmxi0w7ywhwyxggv5n8lcjgh68rhbpp2zrv5n5sg0das73"; }; dependencies = []; @@ -337,7 +337,7 @@ rec { src = fetchgit { url = "git://github.com/LnL7/vim-nix"; rev = "f0b7bd4bce5ed0f12fb4d26115c84fb3edcd1e12"; - sha256 = "52dbdd4d5bc12988eb62d9022109dbd8b1c5716c27753ce187db6c2fb6737664"; + sha256 = "0r3nffv2yv6vhzhkqx97diqwbcfqvc4j20nrcbmqhaf1bd6xvnsj"; }; dependencies = []; @@ -348,18 +348,18 @@ rec { src = fetchgit { url = "git://github.com/ap/vim-css-color"; rev = "7ad79c7b77bd83296d7a10e596860d9269070207"; - sha256 = "bd6ad1ddad9d520c018083bab8eb53575f99572f3e079abad452db0bf8871708"; + sha256 = "020phzw0pnsjsjx9l1ry5xbrjpspagmvifl3h00hqllxmpfx2smx"; }; dependencies = []; }; neomake = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neomake-2016-01-21"; + name = "neomake-2016-02-20"; src = fetchgit { url = "git://github.com/benekastah/neomake"; - rev = "e0fa23401c1231bd942779c79c5c71d08f28e440"; - sha256 = "0d0536188127538cacedda77a81e0749d6207fa882ca1f34f36852d009aa73f9"; + rev = "645c433b73f527badaac5e315f1ea16e7d34ef99"; + sha256 = "0vprly61xhl7pqqp8nfr8vanl6ddq7kf5asqz4kpfdpgnbdxrdlc"; }; dependencies = []; @@ -370,7 +370,7 @@ rec { src = fetchgit { url = "git://github.com/bitc/vim-hdevtools"; rev = "474947c52ff9c93dd36f3c49de90bd9a78f0baa1"; - sha256 = "bf5f096b665c51ce611c6c1bfddc3267c4b2f94af84b04482b07272a6a5a92f3"; + sha256 = "1wwjb9m2l9q75d408jzq9bwv5i376bfgs6vc3ihwwlawcrmhjpxz"; }; dependencies = []; @@ -381,7 +381,7 @@ rec { src = fetchgit { url = "git://github.com/christoomey/vim-tmux-navigator"; rev = "1298b71c420f1d0abceba3f35cc710131f84d73b"; - sha256 = "bde962fe1441cd6f030d9704e6e71117fb43d827b8952d3e1d44009c297b4eb5"; + sha256 = "1dafgclrq0243lz2v5dq4zc47yqp27kyc14p1l1nzka12kz65sdx"; }; dependencies = []; @@ -392,29 +392,29 @@ rec { src = fetchgit { url = "git://github.com/ctrlpvim/ctrlp.vim"; rev = "7f74368d85bb521951dd58123349ce66b947d058"; - sha256 = "fecd1137845ccfe72a1d2e3e1660f8e2264dc46cc34dfa9f1037f14f84115f33"; + sha256 = "0csz2624zw9p22gzlkf3dk24s9p2z1h1cgif3lmfgkswhhvi3kgy"; }; dependencies = []; }; vim-jade = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-jade-2016-01-21"; + name = "vim-jade-2016-02-11"; src = fetchgit { url = "git://github.com/digitaltoad/vim-jade"; - rev = "319cba1ee5313e8b50fd912d10dfe40a171f0312"; - sha256 = "280ef32d862793b42685aba4802f919928b52b93328d0cef35584a83baf884d0"; + rev = "0a7ec2edaa3f7fbe353f8fd5bf06d3c043d70c81"; + sha256 = "0qlwbywnx6sl2xacdialpmg1d2wmjkdsdklz97k8086glkairs10"; }; dependencies = []; }; neco-ghc = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neco-ghc-2016-01-20"; + name = "neco-ghc-2016-02-13"; src = fetchgit { url = "git://github.com/eagletmt/neco-ghc"; - rev = "26515b4219c04448d37d6cb4a3c54f2d3080b056"; - sha256 = "265ee24be8f9bf6d067213a751fd54ddcb53570831e7520af41c3eb7f5184fcd"; + rev = "a7b3dc018dff0cbe033c4c3939e1bd777f023083"; + sha256 = "0f48y8fnh9wp1iyq8w7sqzsw3vqm348vqs4p81nwnmwnhgpzxfri"; }; dependencies = []; @@ -425,18 +425,18 @@ rec { src = fetchgit { url = "git://github.com/esneider/YUNOcommit.vim"; rev = "981082055a73ef076d7e27477874d2303153a448"; - sha256 = "4bfd80720c353884e5c373b5457397a63e5e2e4ab4a97d6ce86c1740ac3b4c56"; + sha256 = "0mjc7fn405vcx1n7vadl98p5wgm6jxrlbdbkqgjq8f1m1ir81zab"; }; dependencies = []; }; vim-go = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-go-2016-01-22"; + name = "vim-go-2016-02-25"; src = fetchgit { url = "git://github.com/fatih/vim-go"; - rev = "1beac4aadccb921b3cb264a8e254b75c8a326c21"; - sha256 = "02e92ab38a667c0355a4e5c48e1fc53a7ad416208e9151ff4a9cbd7d477c0fc6"; + rev = "c264aec72eac21f868fdfff2aef67b9ca21aab74"; + sha256 = "1yld56l4bl17r9s1rn72fqfkrjpm96n4wx3qv9hk5vd0yn0nw7y1"; }; dependencies = []; @@ -447,18 +447,18 @@ rec { src = fetchgit { url = "git://github.com/flazz/vim-colorschemes"; rev = "28a989b28457e38df620e4c7ab23e224aff70efe"; - sha256 = "5308c874a34dc03256ece2e54ab7b92c8384ebb4137436582fd4aa6c38ad36e5"; + sha256 = "1r9nmlw6ranl5xc3cx0knkmq90rcp6vlmrg2xib35h2dldsch22k"; }; dependencies = []; }; idris-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "idris-vim-2016-01-14"; + name = "idris-vim-2016-01-29"; src = fetchgit { url = "git://github.com/idris-hackers/idris-vim"; - rev = "09772ea37a83f8633890fc5cd9221bcf6e22c157"; - sha256 = "28eab2793950781a416e76657dfdcb58601c31ffafb336e3beb9790eef6a268d"; + rev = "e1711749f5078f5a9fa53cd15a37627ea9d239f2"; + sha256 = "0mbywk1mwbx3hjzrv7ypp5m800xjj08hxlfmd0piljg41xwkgk5q"; }; dependencies = []; @@ -469,18 +469,18 @@ rec { src = fetchgit { url = "git://github.com/itchyny/calendar.vim"; rev = "2a6c13ee8056fe5b82ce6529f426ed63096dc6bc"; - sha256 = "8228b6e97c42254eb8e8e35e391f24a7fc2f55753af913fe1605b9ade0ff9d98"; + sha256 = "164xzzhavf852vz17y9sfmajzz574hgkjpp3x2w4w9a2gklvca42"; }; dependencies = []; }; thumbnail-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "thumbnail-vim-2016-01-14"; + name = "thumbnail-vim-2016-02-16"; src = fetchgit { url = "git://github.com/itchyny/thumbnail.vim"; - rev = "cf4463dc31722ab116bc61779c515a4b7a1e9af1"; - sha256 = "7037916b16f72ea2aaff666e4fa3e1f9546995c0d6fb4634d2dbfac5b184bb26"; + rev = "3d404c89c7ea783c8386c2e1f03086373f764387"; + sha256 = "02wz7832kyrmwsfpniahpn3b1q1nw5h29zq0l3kj7n19xh5ighm1"; }; dependencies = []; @@ -491,7 +491,7 @@ rec { src = fetchgit { url = "git://github.com/ivanov/vim-ipython"; rev = "42499f094b805b90b683afa5009cee99abd0bb75"; - sha256 = "7f59c3edde4c2b8555d703c96e855ca36665aacdca5a30d1e9e21c31bc252f2d"; + sha256 = "0b9g4ny32772x78k0nnarnm6arm3bj2nxj83sxaqaascvvnw6nbz"; }; dependencies = []; @@ -502,7 +502,7 @@ rec { src = fetchgit { url = "git://github.com/jceb/vim-hier"; rev = "0b8c365263551a67404ebd7e528c55e17c1d3de7"; - sha256 = "f62836545abfe379f9c5410da28409947407cd282ef784b2db89aed0756a1785"; + sha256 = "118pd9sx1bl9vfr89xrf536hfx4l162a43a1qpwpkqxzb9a3ca7n"; }; dependencies = []; buildInputs = [ vim ]; @@ -513,7 +513,7 @@ rec { src = fetchgit { url = "git://github.com/jeetsukumaran/vim-buffergator"; rev = "9a6a946a41bcf492dfe8da5eee4cc2ee3d55c77f"; - sha256 = "6df3d1bffb42f7a96b3136ed80534380ba9e2f508b14dbd665260ffe240ccfee"; + sha256 = "1vng1hjgw3r6cpbdn54ba0prxfl08d9q1v9n65mskxs2zfzx3wvd"; }; dependencies = []; @@ -524,7 +524,7 @@ rec { src = fetchgit { url = "git://github.com/jgdavey/tslime.vim"; rev = "4a8091956e331d7b1d4187a2883b720dfec7e9dd"; - sha256 = "e63113f80c056484c462f6d1eb4634cbe4c6c29170f76f4c992adc17b3539a25"; + sha256 = "09csafrigp1ak566zxvhj71cdr6b6i3fplgncb288r051kw16cg6"; }; dependencies = []; @@ -535,18 +535,18 @@ rec { src = fetchgit { url = "git://github.com/jistr/vim-nerdtree-tabs"; rev = "0decec122e9bb3e9328b01fa20a9650e79cc6ca7"; - sha256 = "ac4bfc3ae18e8a62ef8e20d0dd0a0f7c172d0ebd5fed58c533ccccec3ae7bdc2"; + sha256 = "1hmxwwxfrk6c6g2mivazpl72s5vw1w5dvl10ivpn52lfw4xgqjxc"; }; dependencies = []; }; vim-colorstepper = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-colorstepper-2015-08-04"; + name = "vim-colorstepper-2016-01-28"; src = fetchgit { url = "git://github.com/jonbri/vim-colorstepper"; - rev = "5783c2567a193e7604780353d6f8ce445b2ab191"; - sha256 = "a9ab0c724a827eba9c74d93dda118863656d27df7d5d26b971e0ac71c87f7e59"; + rev = "f23ba0d995d41508a2dc9471cf31d3d01a4b5f05"; + sha256 = "05ykxn0gmh8liz0zv5hb8df1ajggxp88izq3825m0yb3ma3k1jqs"; }; dependencies = []; @@ -557,7 +557,7 @@ rec { src = fetchgit { url = "git://github.com/joonty/vim-xdebug"; rev = "a4980fa65f7f159780593ee37c178281691ba2c4"; - sha256 = "1ccb0e63eaf68548feb1c37b09c07c84b6bea9b350c4257549f091aa414601e2"; + sha256 = "1qh18r0sm4gh95sjbi2hnflvxdl4gk00jyy3n7z4i1gnx9ihxjqw"; }; dependencies = []; postInstall = false; @@ -568,7 +568,7 @@ rec { src = fetchgit { url = "git://github.com/junegunn/limelight.vim"; rev = "153e3f7b78484eb4f5d69833ebf628f44b94996d"; - sha256 = "85a5188dfd51a170b88e1df5ad4f5ae1cfb2e5c54dfbb734d7f4d85cf28eb5fd"; + sha256 = "1zdmivr5rn7lswsbgysdqpjv5kz1b97svx8xisw718aizn6ii9c5"; }; dependencies = []; @@ -579,7 +579,7 @@ rec { src = fetchgit { url = "git://github.com/junegunn/vim-peekaboo"; rev = "b14a7496897bb0a520bed4f519ca79a683bafeec"; - sha256 = "926f42ee4271395ad8a3526e7b0f1077482cec2f557595d3365ac86eb88ae8c3"; + sha256 = "1hz8iaw6xj2s6v9raxam5zn2qj3p207pnvjjlgc5lfbi8bp44vwj"; }; dependencies = []; @@ -590,7 +590,7 @@ rec { src = fetchgit { url = "git://github.com/justincampbell/vim-eighties"; rev = "62a9719df45fddd0456bf47420fc4768f9c8f5a5"; - sha256 = "b3386d1c40650e5c0ebda2105d1404cfb2aab74153e13bace4a73bc667d91e81"; + sha256 = "108yv5kwcfx7wjn3pqak86vsmcng0ha5s452pl75q3k580f6sf5k"; }; dependencies = []; @@ -601,7 +601,7 @@ rec { src = fetchgit { url = "git://github.com/latex-box-team/latex-box"; rev = "3c2901e12cb78bfb2be58ba4c62a488612550fe1"; - sha256 = "8af2c45209c39438da8481183a1f14885891db73454bb4b16d24799453184e81"; + sha256 = "10af319r8y94dnqv8js5fgdr2n482hgkl641hkd3i563159c9wla"; }; dependencies = []; @@ -612,40 +612,40 @@ rec { src = fetchgit { url = "git://github.com/lepture/vim-jinja"; rev = "4412484b410b15caecd71f2e52758b2a90ea124d"; - sha256 = "650c7f23688e8982f30be3f7d45b73d9c1d283f10a6829e518e2583b4a52befc"; + sha256 = "1z5ya953nn7233jjjs0ay61x5hfrfddx9xz31grq52cfd0ipy335"; }; dependencies = []; }; vimtex = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vimtex-2016-01-15"; + name = "vimtex-2016-02-23"; src = fetchgit { url = "git://github.com/lervag/vimtex"; - rev = "1aedd5a7464c93af5af86fec2f4cfce97d5f2947"; - sha256 = "5fcc46c0dcfd41e15dfdbc66417834e1b933cfb7ae3de9e16cfd3975bc196ba1"; + rev = "ec5e0df3607de6bf6562e60d4fe2759519e9f9a7"; + sha256 = "0ld27rr5lnqzlhqpjrkgvrgs7h1hdsrwswkg7whynw83vilal8bd"; }; dependencies = []; }; vim-easymotion = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-easymotion-2016-01-22"; + name = "vim-easymotion-2016-02-15"; src = fetchgit { url = "git://github.com/lokaltog/vim-easymotion"; - rev = "799491e007515890aff363b6eac5dbc9c5aa7f80"; - sha256 = "037ee34adc0811571c536cdd37fcfa2d483dd76276380c8858dfe134893bf5e7"; + rev = "649120e90e92bc2ae5361693fa1e4dd2d02c1822"; + sha256 = "1anh1yflahbsmw3zmgm9xzvpz3c4jh1crk695a6p2sjvf3rr68av"; }; dependencies = []; }; vim-xkbswitch = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-xkbswitch-2016-01-12"; + name = "vim-xkbswitch-2016-01-31"; src = fetchgit { url = "git://github.com/lyokha/vim-xkbswitch"; - rev = "46858cbe11a8d1a2abc94de8c817465d0020d6f6"; - sha256 = "36f89ca04c4fa15f4b792620660fefc48f31233351dcc0387d2c4ee0f3c50bbf"; + rev = "89fa3fc16251f2e97281d29ade3ee022ba285003"; + sha256 = "16wahaz9d6jyqlvmsn764xqircrwaap3pn4fbgmly7vfmdvq4p8b"; }; dependencies = []; patchPhase = '' @@ -656,11 +656,11 @@ rec { }; vim-startify = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-startify-2016-01-12"; + name = "vim-startify-2016-02-15"; src = fetchgit { url = "git://github.com/mhinz/vim-startify"; - rev = "8545f6f553640dc0318582c9749c893f2be3345e"; - sha256 = "cf98c35c106998d7432df572501f7e3d9e452e8104eec3726e9fa6c94c592029"; + rev = "23e043cc828b76524edc09f7dd091753dd1c7f12"; + sha256 = "0cplcpl9a2nhnmnh1h13pxf3hg823frhjmdxssyk35snf6ycgm24"; }; dependencies = []; @@ -671,7 +671,7 @@ rec { src = fetchgit { url = "git://github.com/mkasa/lushtags"; rev = "3d7229b07b47ab2fc188d7db63b33dfcd63a1802"; - sha256 = "f5b6eb7b53a5202d0e55c57d6f4fd7b274dfb4224d8d94c91b708096b4fc07b9"; + sha256 = "1f87zjs9d03h3g4r93ad4asdyx5jsx7nyzf5al72s855adxypdpm"; }; dependencies = []; @@ -682,7 +682,7 @@ rec { src = fetchgit { url = "git://github.com/nbouscal/vim-stylish-haskell"; rev = "c664376ba814de3f87cb7641f90b2c6a9dd53671"; - sha256 = "12a9aad40112200060c3ee86f96589a264db287bdfeb3eb6fdf0f22a6656a5f6"; + sha256 = "1xm5ark2mwphznv3xsyzgcldnr52i5jzk1pfqdh0080j07aama8j"; }; dependencies = []; @@ -693,7 +693,7 @@ rec { src = fetchgit { url = "git://github.com/osyo-manga/shabadou.vim"; rev = "c5af30bb0c028d53cfd89e00cab636c844034a9a"; - sha256 = "392efa8a5e725219e478b571d9a30ddba88d47662467ed3123a168e8b55c4de6"; + sha256 = "1rjdbjsyhs514cqysrr4cr3qva6v1nixjwdmg3j1jlkjbs5glbir"; }; dependencies = []; @@ -704,76 +704,73 @@ rec { src = fetchgit { url = "git://github.com/osyo-manga/vim-watchdogs"; rev = "ebcf3df39007aa5d65910f44eb20c9caea9007df"; - sha256 = "3261d098ae472ec29159b724cf4851d6304d7798e3da6daa4d34be8d308b1a2c"; + sha256 = "0b0sicq8vgil9nm6vnp3k1vlsc6na54cy95pb68w4bj7mscd0q9j"; }; dependencies = []; }; - racer = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "racer-2016-01-22"; + vim-racer = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-racer-2016-02-02"; src = fetchgit { - url = "git://github.com/phildawes/racer"; - rev = "1021df4b42436673f0124a62cad09e62d181635d"; - sha256 = "cef501a639da79bce31532b5f06570bd9c255a3d29ac97c6a4b67d640758bddb"; + url = "git://github.com/racer-rust/vim-racer"; + rev = "ec26ab4ca71a5a805339e1243a691c9f6472eeaa"; + sha256 = "0c70s1dymvp4ji81z2302j2dzl7z8sndvzpf2dwwl14fwlar52db"; }; dependencies = []; - buildPhase = '' - find . -type f -not -name 'racer.vim' -exec rm -rf {} \; - rm -rf editors images src - ''; + }; neocomplete-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neocomplete-vim-2016-01-22"; + name = "neocomplete-vim-2016-02-20"; src = fetchgit { url = "git://github.com/shougo/neocomplete.vim"; - rev = "1606b89be1c4718115503156a657344bb3c62593"; - sha256 = "18c11d7f2aab440d895a742d63c58df5aa7d6353cbbf396ff31d1c85c617295a"; + rev = "fe8aa93a8a6030af3d208f2ecc92096cb3d52693"; + sha256 = "12lxb64jnjgppadli4g388cmf3mg5addkml03xmb94vpyf65cprx"; }; dependencies = []; }; neosnippet-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neosnippet-snippets-2016-01-22"; + name = "neosnippet-snippets-2016-02-15"; src = fetchgit { url = "git://github.com/shougo/neosnippet-snippets"; - rev = "ac866f64a507f8a9c7e2691d947e5eaea679e50b"; - sha256 = "b1493c4b26ec68fab5e994f462c71f8db0341a2d4b8e42c4ee4f2604562b1247"; + rev = "4e7b0a3962742eccaae298100e23e599d384ea67"; + sha256 = "1299wjmwc82x9z6jcy8332lk6jwnjhizgqzg9jf57704n312py8v"; }; dependencies = []; }; neosnippet-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neosnippet-vim-2016-01-20"; + name = "neosnippet-vim-2016-02-24"; src = fetchgit { url = "git://github.com/shougo/neosnippet.vim"; - rev = "52f8a2948957018572760837c165113dbb450e2b"; - sha256 = "a3451afd1896c0198fa9a3f3fd354efd2d0c7f1b59c15b43adf5db1b6c5e276b"; + rev = "e908126f402c4c0f4ff6b21c9dd0e5349f39e585"; + sha256 = "09r0b199fk4m5zvc1f1x2lwyapxhaws1lvvm69jjwp1x4vhfdvjv"; }; dependencies = []; }; unite-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "unite-vim-2016-01-17"; + name = "unite-vim-2016-02-25"; src = fetchgit { url = "git://github.com/shougo/unite.vim"; - rev = "c9ce3b13c19352e3b791db227aa373c0b028d656"; - sha256 = "34319f371b11d97ca3b08b367c919f534bff13a8ab10cf532207e1bf62092f72"; + rev = "65dffd7a27d9cbb0e026621c59d4ccc6073202bf"; + sha256 = "0m57f4kb8vh8z804qsahn94d3rcaqianpxfb3d0cd2d7v1cbgm71"; }; dependencies = []; }; vimproc-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vimproc-vim-2016-01-06"; + name = "vimproc-vim-2016-02-16"; src = fetchgit { url = "git://github.com/shougo/vimproc.vim"; - rev = "aa075b9b56839e1adb08421d2e9837f90e59acad"; - sha256 = "bc587f1cca4dfe8f22af5eecf290a624cbebfdb989906cc02d5471325464b301"; + rev = "78cbb5c683026085de133f160929ccc56a6b203a"; + sha256 = "0hw6ghldrg9zvnkh3j9r9ldi1lzhda71gd630zj09wlaz70x60nj"; }; dependencies = []; buildInputs = [ which ]; @@ -788,11 +785,11 @@ rec { }; vimshell-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vimshell-vim-2015-12-23"; + name = "vimshell-vim-2016-02-18"; src = fetchgit { url = "git://github.com/shougo/vimshell.vim"; - rev = "a5b3d99ba84e76cf94195c37ab762aef5f7b6e25"; - sha256 = "9a58b00cca9b2cf7ef73cdef2174ab69b7fb427130e5b125b96c6b385dec1947"; + rev = "f51ad1e3b4a897f32bb7ca0382f8fb25519e0d11"; + sha256 = "17zk2sm9n7cyhf92613vpqgaq74z4x61p4pxvvl25fc44bsddndf"; }; dependencies = [ "vimproc-vim" ]; }; @@ -802,29 +799,29 @@ rec { src = fetchgit { url = "git://github.com/sjl/gundo.vim"; rev = "e7fe41024ace9047eee610f23311d44fd9d917c0"; - sha256 = "30955656dd2cb6017e14658a3a5e98c79ec87ff1264b70cd6f628a4f3216bfcd"; + sha256 = "1kdz2qr4z2k2dz6p0jr6y5zwi7n7k1g3m2k52iz03dicvmb5d59h"; }; dependencies = []; }; vim-hardtime = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-hardtime-2014-10-21"; + name = "vim-hardtime-2016-02-17"; src = fetchgit { url = "git://github.com/takac/vim-hardtime"; - rev = "b401c72528d1c23e4cc9bc9585fda4361d0199bf"; - sha256 = "65e4bda7531076147fc46f496c8e56c740d1fcf8fe85c18cb2d2070d0c3803cd"; + rev = "7c6a6ec70a1f8a1f8c3ccd21041f84375eb4c160"; + sha256 = "129pwjb3sjz4bffa5cysmk4gy5xd22na4i84ackwx77sw7n6y9kv"; }; dependencies = []; }; vim-quickrun = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-quickrun-2015-12-28"; + name = "vim-quickrun-2016-01-27"; src = fetchgit { url = "git://github.com/thinca/vim-quickrun"; - rev = "da5328d0aec495e4dc25232fd769a8a2e56d8f7d"; - sha256 = "a70e2ffa05a2cc2306483e3ecc09972bcdf2d11bfafcfbf3f8195e23475e7102"; + rev = "ac9f4be0698dffb30ebdf284f8ba5abbaab5eaca"; + sha256 = "1g8s4h2a9iiq7d0j99ajqkl562m1w0vwa73riiz7axdmjz34vjwl"; }; dependencies = []; @@ -835,18 +832,18 @@ rec { src = fetchgit { url = "git://github.com/tomasr/molokai"; rev = "c67bdfcdb31415aa0ade7f8c003261700a885476"; - sha256 = "3a0cd4eef9b4e3a4fd826c66a8edec44a087d04f500217981a84fb59b2fc3ade"; + sha256 = "1piszjr5kyw43ac1f0jh9z88g824xknshrkchbys9qxlz7pd831s"; }; dependencies = []; }; vim-eunuch = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-eunuch-2015-06-30"; + name = "vim-eunuch-2016-02-07"; src = fetchgit { url = "git://github.com/tpope/vim-eunuch"; - rev = "eb8b2d54fb537ee93f762f6331265057a3f69727"; - sha256 = "ec9194bf2ec97ae3c0f5818fb8a7a9edaf4ea93ca790df7c4d6a4e2486218fe6"; + rev = "d02b2d0404134e6cae2708069d6888110d3c2272"; + sha256 = "07xbrx5wrcrv19yaxmnbl7h2qz80f04kmlsz60pag84pyqlina0h"; }; dependencies = []; @@ -857,7 +854,7 @@ rec { src = fetchgit { url = "git://github.com/travitch/hasksyn"; rev = "c434040bf13a17ca20a551223021b3ace7e453b9"; - sha256 = "b1a735928aeca7011b83133959d59b9c95ab8535fd00ce9968fae4c3b1381931"; + sha256 = "0c8r72qw7r7sd2cww07x6n2sp5cwkgamjf8khcdh39zcia93b9xi"; }; dependencies = []; @@ -868,18 +865,18 @@ rec { src = fetchgit { url = "git://github.com/twinside/vim-haskellconceal"; rev = "f73c5dd660b7009a050b131783d7c17b4954e4d9"; - sha256 = "1ebf98b170642d342207eb8c16551f9969f884b3be975b8755f1018947053ba8"; + sha256 = "1a1v0m3qj0gian3mp5xynf2ghscr3xaid37b0wi38bb4f2qrigqy"; }; dependencies = []; }; youcompleteme = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "youcompleteme-2016-01-20"; + name = "youcompleteme-2016-02-25"; src = fetchgit { url = "git://github.com/valloric/youcompleteme"; - rev = "d05bf551a677ac70d5b6de707a7174a97dccd4dd"; - sha256 = "28478612ddd2b917170e88d069687b65778fcb71a31f4aca7c26aa478b09a849"; + rev = "35f6090b7661989518d64451ea4effa376fcb795"; + sha256 = "1n8wzsbw4saawpjmacw7kvk5mhcxckik0sw8zdpbp885812ly5wi"; }; dependencies = []; buildInputs = [ @@ -911,22 +908,22 @@ rec { }; vim-pandoc = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-pandoc-2015-10-20"; + name = "vim-pandoc-2016-02-12"; src = fetchgit { url = "git://github.com/vim-pandoc/vim-pandoc"; - rev = "7d7fdeabb83808f669f4cab37d7950b1bed8adbe"; - sha256 = "451e520ca62cf1207da0f22c2c23f4502f81c0b5a662cd9bfb898e1f53301c41"; + rev = "ff604abdf48e98dd4bd0c441429b9f8f9413134c"; + sha256 = "1c9m1p9zyxqxcrmpn24lkhx1jr6mx51qdvp5wj1vkqwbs811ps26"; }; dependencies = []; }; vim-pandoc-syntax = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-pandoc-syntax-2015-11-05"; + name = "vim-pandoc-syntax-2016-02-22"; src = fetchgit { url = "git://github.com/vim-pandoc/vim-pandoc-syntax"; - rev = "40c65141bc8c771f270ce8251a99ccdda1ab102c"; - sha256 = "c1be96f358b211d8a5126fdb541a6500c9016e829527d57766b1ec18a4d8ad0e"; + rev = "c9f4eb129881fa48b82c181c84a77ec5ceacb6f6"; + sha256 = "117zl8fpzd34895f0i05zc8zx0jsdald0j2wb12yrhsxiw97fwlq"; }; dependencies = []; @@ -937,7 +934,7 @@ rec { src = fetchgit { url = "git://github.com/vim-scripts/Colour-Sampler-Pack"; rev = "05cded87b2ef29aaa9e930230bb88e23abff4441"; - sha256 = "e3dd18f9fd36543e0c87257b7eaa999a82d75cbfa6dce4dfea403fa751c8620f"; + sha256 = "03v2r18sfgs0xbgy9p56pxfdg0lsk6m7wyr5hw63wm1nzpwiipg3"; }; dependencies = []; @@ -948,7 +945,7 @@ rec { src = fetchgit { url = "git://github.com/vim-scripts/a.vim"; rev = "2cbe946206ec622d9d8cf2c99317f204c4d41885"; - sha256 = "ca0982873ed81e7f6545a6623b735104c574fe580d5f21b0aa3dc1557edac240"; + sha256 = "0h62v9z5bh9xmaq22pqdb3z79i84a5rknqm68mjpy7nq7s3q42fa"; }; dependencies = []; @@ -959,7 +956,7 @@ rec { src = fetchgit { url = "git://github.com/vim-scripts/align"; rev = "787662fe90cd057942bc5b682fd70c87e1a9dd77"; - sha256 = "f7b5764357370f03546556bd45558837f3790b0e86afadb63cd04d714a668a29"; + sha256 = "0acacr572kfh7jvavbw61q5pkwrpi1albgancma063rpax1pddgp"; }; dependencies = []; @@ -970,7 +967,7 @@ rec { src = fetchgit { url = "git://github.com/vim-scripts/changeColorScheme.vim"; rev = "b041d49f828629d72f2232531a230d1ec5de2405"; - sha256 = "094ccc132dc3991a30feb31bbdd777755294957e843517491345a4999e86cb5f"; + sha256 = "0pybhsg9k9252d4ifdc4gsar8lkmfzbvs6xkzqq1m6f35l9wqk09"; }; dependencies = []; @@ -981,7 +978,7 @@ rec { src = fetchgit { url = "git://github.com/vim-scripts/random.vim"; rev = "b2d85eb24a38074eab37a5acf2a295e1f2ad8989"; - sha256 = "571f4ed0a2d8c66d1c15029fb812a84b55228d07cd2e4bbbc73a33493013fed3"; + sha256 = "1lzy2cq4jcrsqyxlnbnd0y6j4mabm09bi7q22lf6vinqlb84w7sp"; }; dependencies = []; @@ -992,7 +989,7 @@ rec { src = fetchgit { url = "git://github.com/vim-scripts/tabmerge"; rev = "074e5f06f26e7108a0570071a0f938a821768c06"; - sha256 = "b84501b0fc5cd51bbb58f12f4c2b3a7c97b03fe2a76446b56a2c111bd4f7335f"; + sha256 = "0prkyza1n49cdaslcr57w8zv15vw78mlqbzib2xipmawzjq02idq"; }; dependencies = []; @@ -1003,7 +1000,7 @@ rec { src = fetchgit { url = "git://github.com/vim-scripts/wombat256.vim"; rev = "8734ba45dcf5e38c4d2686b35c94f9fcb30427e2"; - sha256 = "2feb7d57ab0a9f2ea44ccd606e540db64ab3285956398a50ecc562d7b8dbcd05"; + sha256 = "01fdvfwdfqn5xi88lfanb4lb6jmn1ma6wq6d9jj2x7qamdbpvsrg"; }; dependencies = []; @@ -1014,18 +1011,18 @@ rec { src = fetchgit { url = "git://github.com/wakatime/vim-wakatime"; rev = "91262cb3c04fe4d98ecdffe8da2197537c66359c"; - sha256 = "992e41ba32d575bb0bced8b2616cf08aab73f9980292fbc58c94c7f99f914540"; + sha256 = "0h25j6gzkiwlik2zp4h2k3wp7away1n63cnqrq5vnxfm6ax42blr"; }; dependencies = []; buildInputs = [ python ]; }; command-t = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "command-t-2016-01-19"; + name = "command-t-2016-02-09"; src = fetchgit { url = "git://github.com/wincent/command-t"; - rev = "b772049e7e92a354702a9400ad185070ac7e7646"; - sha256 = "425f50d0c21c7f95bdd29532f487d00c7bccb97fb2e372a87a6a5bf2fd11a916"; + rev = "4c7f02c5a9020bbbd498f643abfb059048388707"; + sha256 = "1ij3zkc29zn03kw82c6zv8sbhx3ma3m39fgy9c29419brspzg1r5"; }; dependencies = []; buildInputs = [ perl ruby ]; @@ -1038,11 +1035,11 @@ rec { }; goyo = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "goyo-2015-11-15"; + name = "goyo-2016-02-15"; src = fetchgit { url = "git://github.com/junegunn/goyo.vim"; - rev = "630f5d80861beb36ae2dfa0c587ec6b51982cff5"; - sha256 = "28e74ab067ce55d0dd964b5214601e851046149ccf98b377861c56225f36dc44"; + rev = "cb697998cce4d5a50fb1749310147ae16b0d70e6"; + sha256 = "0sbyk5byfsf10n93dk043ysyxfm43rabiw766pb1gkng5hdqypd0"; }; dependencies = []; @@ -1071,11 +1068,11 @@ rec { }; pathogen = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "pathogen-2016-01-19"; + name = "pathogen-2016-01-26"; src = fetchgit { url = "git://github.com/tpope/vim-pathogen"; - rev = "b4f20ff0acc8267875ca7a3841756fe18d55db15"; - sha256 = "649bdbc573fff16bf4bbb2f50f87978576a86af6fd836bef4f64e1e7996fdfe2"; + rev = "8c91196cfd9c8fe619f35fac6f2ac81be10677f8"; + sha256 = "17d1903spczg2rk0qzg94vvq41dwhmnxwajqgzcx4lmf606cfspi"; }; dependencies = []; @@ -1086,7 +1083,7 @@ rec { src = fetchgit { url = "git://github.com/dannyob/quickfixstatus"; rev = "fd3875b914fc51bbefefa8c4995588c088163053"; - sha256 = "7b6831d5da1c23d95f3158c67e4376d32c2f62ab2e30d02d3f3e14dcfd867d9b"; + sha256 = "16vxhvyxq51y7wnx0c1fmdi2yb6kfr1pxijq65gxj8qwvbak2s3v"; }; dependencies = []; @@ -1097,7 +1094,7 @@ rec { src = fetchgit { url = "git://github.com/kien/rainbow_parentheses.vim"; rev = "eb8baa5428bde10ecc1cb14eed1d6e16f5f24695"; - sha256 = "47975a426d06f41811882691d8a51f32bc72f590477ed52b298660486b2488e3"; + sha256 = "1qw84imlhq4654mxazj7j3sp5g1j3yjxi496i08iix06dm15m5s7"; }; dependencies = []; @@ -1108,18 +1105,18 @@ rec { src = fetchgit { url = "git://github.com/wting/rust.vim"; rev = "2450ecf3091cc7c2711ca9f00eae8e3bedd04376"; - sha256 = "9d2e8b2c06d6100f9a1e76644313d457a2ff955241d8f712de6fddd0b7f5c4ee"; + sha256 = "1vn4ynvx1pbgvq9ggn21aaazz8jpsh9l6r3n3sd0y46n0qn8nblx"; }; dependencies = []; }; sensible = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "sensible-2015-12-26"; + name = "sensible-2016-02-09"; src = fetchgit { url = "git://github.com/tpope/vim-sensible"; - rev = "680a5c693213daa158c816f068fffa895d961dc9"; - sha256 = "959b55a97974d85374eccb58379c3f69c0ec43459d4df2484e42a437c61e34bc"; + rev = "2fb074e84169e177045e8bdb6ceb7eded3a80e8f"; + sha256 = "067ccar0adk2rx96ci26ykdi6bk0p4wnsd10la088lxdfva00m90"; }; dependencies = []; @@ -1130,7 +1127,7 @@ rec { src = fetchgit { url = "git://github.com/tpope/vim-sleuth"; rev = "a17462708aa40a7fc0afd4effa559087d8a2c908"; - sha256 = "72f4b7c5e60c942592e624806960736e71b9f109fbbfa3a5a2a37970b90f6025"; + sha256 = "09b01ywp0yd3lajs7gzv17qvjwbffdh6k014ws92b50cwv2vgx3j"; }; dependencies = []; @@ -1141,7 +1138,7 @@ rec { src = fetchgit { url = "git://github.com/garbas/vim-snipmate"; rev = "7f91de39088138491e40a35a855adb70677b02d3"; - sha256 = "e8c70bbad496fc1306814fbb078736a93d4f418d16f7692f4e37dbcc00ec6633"; + sha256 = "0cv6xh0crnrp9qpnkxqnim0lygd96s3hgfsgh4317z4nsjx0piz8"; }; dependencies = ["vim-addon-mw-utils" "tlib"]; @@ -1152,7 +1149,7 @@ rec { src = fetchgit { url = "git://github.com/chikatoike/sourcemap.vim"; rev = "0dd82d40faea2fdb0771067f46c01deb41610ba1"; - sha256 = "a08c77aea39be4a0a980d62673d1d17fecc518a8aeb9101210e453aaacb78fbd"; + sha256 = "1gcgnynallz420911fdfm0ccbv3zs78p69nnh2ls1r4vlfp7g350"; }; dependencies = []; @@ -1163,7 +1160,7 @@ rec { src = fetchgit { url = "git://github.com/tpope/vim-surround"; rev = "2d05440ad23f97a7874ebd9b5de3a0e65d25d85c"; - sha256 = "e5372cbb384e747181e3dfe4a53f042da18bd0d6af7a01184850ecb084ddb350"; + sha256 = "0l5kvn2b1v2h90c02ymgsv88p89d0hzsbr6zwf0p2x2f72xjqdz5"; }; dependencies = []; @@ -1174,7 +1171,7 @@ rec { src = fetchgit { url = "git://github.com/dhruvasagar/vim-table-mode"; rev = "2ab64777a5b81e240810999eb6e7dc65e1de5461"; - sha256 = "64aff63c0aeb696f087cf41021867e1576e4fe8d392d36ec2ca46ddec104a8e1"; + sha256 = "1qd80k0xwvd45kn3cb9ripzf8xhmgs32247lgh46ysgb18ygdbv4"; }; dependencies = []; @@ -1202,22 +1199,22 @@ rec { }; tlib = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "tlib-2016-01-21"; + name = "tlib-2016-01-26"; src = fetchgit { url = "git://github.com/tomtom/tlib_vim"; - rev = "3232708995e0e61d8e39af40e7a92598e30b84e8"; - sha256 = "525c31d4fdef8c44709b8d0b77d8ef70acf77b2375df40837088aeb0d4368747"; + rev = "9734d8d9e4f7b7b91272123463a62759aef31556"; + sha256 = "19dqzxy1v3wg1n8b93wjds311w3lw70g49svv59sr070s7bwl6z9"; }; dependencies = []; }; undotree = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "undotree-2015-12-16"; + name = "undotree-2016-02-23"; src = fetchgit { url = "git://github.com/mbbill/undotree"; - rev = "39e5cf0fc241c64e920f91d52299b444475d54df"; - sha256 = "767c84917392d1b370ef542c218c0f7bd642e59a7176735bbdd80c8a8f8b04ca"; + rev = "e5a01b2eb94afd256a96cac07ba2981a55dd9665"; + sha256 = "1dga7yhk5gh980w2qlf764i9f2mba4ij9habd86i9mlsh3wdqnrm"; }; dependencies = []; @@ -1228,7 +1225,7 @@ rec { src = fetchgit { url = "git://github.com/MarcWeber/vim-addon-actions"; rev = "a5d20500fb8812958540cf17862bd73e7af64936"; - sha256 = "d2c3eb7a1f29e7233c6fcf3b02d07efebe8252d404ee593419ad399a5fdf6383"; + sha256 = "10v3vxgrlfdd34s5kvh4si985gpygv804fygdwy27rr93xxfphyj"; }; dependencies = ["vim-addon-mw-utils" "tlib"]; @@ -1239,7 +1236,7 @@ rec { src = fetchgit { url = "git://github.com/MarcWeber/vim-addon-async"; rev = "dadc96e188f1cdacbac62129eb29a1eacfed792c"; - sha256 = "27f941e21a8ca5940bd20914e2a9e3809e554f3ef2c27b3bafb9a153107a5d07"; + sha256 = "01sxg88578drmwxpphpj7r7mb7l0wfly4509s85r99cc3bi43y97"; }; dependencies = ["vim-addon-signs"]; @@ -1250,7 +1247,7 @@ rec { src = fetchgit { url = "git://github.com/MarcWeber/vim-addon-background-cmd"; rev = "abf2abf339652d2bc79da81f9d131edfe2755f5a"; - sha256 = "06223ebaa157e17434cc09dae474324c105374e4e05d85695a05c7d0a2761c20"; + sha256 = "080wfsid1iq5b9lqapg0wis5642c69sf9nh9rhs79qapl6x3w8h6"; }; dependencies = ["vim-addon-mw-utils"]; @@ -1261,7 +1258,7 @@ rec { src = fetchgit { url = "git://github.com/MarcWeber/vim-addon-commenting"; rev = "b7cf748ac1c9bf555cbd347589e3b7196030d20b"; - sha256 = "4ad7d5f6669f0a1b4a24c9ce3649c030d7d3fc8588de4d4d6c3269140fbe9b3e"; + sha256 = "0glvpq7i8s9jdi6lvpl8hpyd7mrhq14kdkn94i51n2lzcvvdbmsa"; }; dependencies = []; @@ -1272,7 +1269,7 @@ rec { src = fetchgit { url = "git://github.com/MarcWeber/vim-addon-completion"; rev = "021c449a5ce1ce4ac0af5955e05b0279c1cc0e75"; - sha256 = "969a474749edf7e4443d2540eaf12e891cc0a3f5533e62e081d32408f403a0ea"; + sha256 = "1sm00gs0h96kh7h64gjkyniw07495vqylh157m2f9xzd953lg6ln"; }; dependencies = ["tlib"]; @@ -1283,7 +1280,7 @@ rec { src = fetchgit { url = "git://github.com/MarcWeber/vim-addon-errorformats"; rev = "dcbb203ad5f56e47e75fdee35bc92e2ba69e1d28"; - sha256 = "a1260206545d5ae17f2e6b3319f5cf1808b74e792979b1c6667d75974cc53f95"; + sha256 = "159zqm69fxbxcv3b2y99g57bf20qrzsijcvb5rzy2njxah3049m1"; }; dependencies = []; @@ -1294,7 +1291,7 @@ rec { src = fetchgit { url = "git://github.com/MarcWeber/vim-addon-goto-thing-at-cursor"; rev = "f052e094bdb351829bf72ae3435af9042e09a6e4"; - sha256 = "34658ac99d9a630db9c544b3dfcd2c3df69afa5209e27558cc022b7afc2078ea"; + sha256 = "1skq43y7laq2ric7bqh9abx9mxix5k6xzcs4qnwhsqwskp4qlr9l"; }; dependencies = ["tlib"]; @@ -1305,18 +1302,18 @@ rec { src = fetchgit { url = "git://github.com/MarcWeber/vim-addon-local-vimrc"; rev = "6a27f95b35befa70cd0d049329cd0920566c764b"; - sha256 = "f0687e08f380ff085b6fa3e708d1631049571706f55d796e22612aff02e51459"; + sha256 = "0n8lwl1gyak149p7jpgm0qbmfj8hcg8hirx3dxdhizw0yc47ws7h"; }; dependencies = []; }; vim-addon-manager = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-manager-2014-12-03"; + name = "vim-addon-manager-2016-02-07"; src = fetchgit { url = "git://github.com/MarcWeber/vim-addon-manager"; - rev = "fda9d2f4522024aa8bd8b8305e6a71c4a4a28c07"; - sha256 = "a3b5da9bcc01c6f0fb0a5e13a6f9efb58471339ed32c480fde96856bb9e1e7be"; + rev = "872f9302cf0eb8e9cb6259ea4f329d2265f9e32d"; + sha256 = "0rl6sy1gfjsfr1hg2ilhhxppifvjfqn815kh27b3ikcy82rp7sb0"; }; dependencies = []; buildInputs = stdenv.lib.optional stdenv.isDarwin Cocoa; @@ -1327,7 +1324,7 @@ rec { src = fetchgit { url = "git://github.com/MarcWeber/vim-addon-mru"; rev = "e41e39bd9d1bf78ccfd8d5e1bc05ae5e1026c2bb"; - sha256 = "15b70f796f28cbd999060fea7f47408fa8a6cb176cd4915b9cc3dc6c53eed960"; + sha256 = "0q6rxr9nrp63kidr3m3c2z5sda4g813pzshg0scxkjr8dxwhzdqm"; }; dependencies = ["vim-addon-other" "vim-addon-mw-utils"]; @@ -1338,7 +1335,7 @@ rec { src = fetchgit { url = "git://github.com/MarcWeber/vim-addon-mw-utils"; rev = "0c5612fa31ee434ba055e21c76f456244b3b5109"; - sha256 = "4e1b6d1b59050f1063e58ef4bee9e9603616ad184cd9ef7466d0ec3d8e22b91c"; + sha256 = "075r4a73vv6hcrsfznac32nicdk0x7lvxx4fwmii03q5b4dns6sf"; }; dependencies = []; @@ -1349,7 +1346,7 @@ rec { src = fetchgit { url = "git://github.com/MarcWeber/vim-addon-nix"; rev = "2aed79ba5d8c5e6abd102de77e55e242f61b17f1"; - sha256 = "0e326e2c6cb6597ca533a64a845ef9dd946cd249250375ef9775d974ecef37e2"; + sha256 = "1qipxzn79nbmjzppa0r59796r56xz5g88jm66fjpqndndhn6wchf"; }; dependencies = ["vim-addon-completion" "vim-addon-goto-thing-at-cursor" "vim-addon-errorformats" "vim-addon-actions" "vim-addon-mw-utils" "tlib"]; @@ -1360,7 +1357,7 @@ rec { src = fetchgit { url = "git://github.com/MarcWeber/vim-addon-other"; rev = "f78720c9cb5bf871cabb13c7cbf94378dbf0163b"; - sha256 = "43f027e4b7576031072515c23c2b09f7f2c8bba7ee43a1e2041a4371bd954d1b"; + sha256 = "06sdjnyp2hqs0kia2hzflyxwiwpp14mkrhhm4l3k2q2pnzj2gw23"; }; dependencies = ["vim-addon-actions" "vim-addon-mw-utils"]; @@ -1371,7 +1368,7 @@ rec { src = fetchgit { url = "git://github.com/MarcWeber/vim-addon-php-manual"; rev = "5f9810dd1f6e9f36a45f637ae6260ccff09256ff"; - sha256 = "3942eb6a7191c308beab240e91c99ee4e2c52e2d672503d46f98312e823b86cd"; + sha256 = "1kc67f12wccqdza069b75lpcbqp4kv4r23i4mfz0ihwif5mfnhir"; }; dependencies = []; @@ -1382,7 +1379,7 @@ rec { src = fetchgit { url = "git://github.com/MarcWeber/vim-addon-signs"; rev = "17a49f293d18174ff09d1bfff5ba86e8eee8e8ae"; - sha256 = "a9c03a32e758d51106741605188cb7f00db314c73a26cae75c0c9843509a8fb8"; + sha256 = "1f4gk984760cbkkwl9isqwab63ghny61h18nfh313maqwwr3mh59"; }; dependencies = []; @@ -1393,7 +1390,7 @@ rec { src = fetchgit { url = "git://github.com/MarcWeber/vim-addon-sql"; rev = "05b8a0c211f1ae4c515c64e91dec555cdf20d90b"; - sha256 = "a1334ae694e0a03229bacc8ba7e08e7223df240244c7378e3f1bd91d74e957c2"; + sha256 = "1hjpx5s1vn8v7y73gis408jdy8vjivhag2ycp8lk5870jkk4lcx1"; }; dependencies = ["vim-addon-completion" "vim-addon-background-cmd" "tlib"]; @@ -1404,7 +1401,7 @@ rec { src = fetchgit { url = "git://github.com/MarcWeber/vim-addon-syntax-checker"; rev = "8eb7217e636ca717d4de5cd03cc0180c5b66ae77"; - sha256 = "aef048e664653b5007df71ac24ed34ec55d8938c763d3f80885a122e445a9b3d"; + sha256 = "0gcvb922w4jsi203ygbnij9xhmgc6knj9b3ivw3m0fv5ckk4iw5f"; }; dependencies = ["vim-addon-mw-utils" "tlib"]; @@ -1415,7 +1412,7 @@ rec { src = fetchgit { url = "git://github.com/MarcWeber/vim-addon-toggle-buffer"; rev = "a1b38b9c5709cba666ed2d84ef06548f675c6b0b"; - sha256 = "672166ecfe0599177afb56b444366f587f77e9659c256ac4e41ee45cb2df6055"; + sha256 = "0mb0vyr5rr0ywk26l9cwcplpfzsqdwv49d2nzdx1g685zvn6c8b7"; }; dependencies = ["vim-addon-mw-utils" "tlib"]; @@ -1426,18 +1423,18 @@ rec { src = fetchgit { url = "git://github.com/MarcWeber/vim-addon-xdebug"; rev = "45f26407305b4ce6f8f5f37d2b5e6e4354104172"; - sha256 = "0a7bf2caf36772c94bd25bfbf46bf628623809c9cfab447ff788eb74149464ef"; + sha256 = "1vv4jha79sw8yxzl9aygr44khqi8yrmz9ysvs95wjwk7yg5g4yqa"; }; dependencies = ["WebAPI" "vim-addon-mw-utils" "vim-addon-signs" "vim-addon-async"]; }; vim-airline = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-airline-2016-01-22"; + name = "vim-airline-2016-02-25"; src = fetchgit { url = "git://github.com/bling/vim-airline"; - rev = "fb255b570de5582af13563e243fba743dfd0edc9"; - sha256 = "2dbd61c157ba58213bdccb595bfa13951f4e1db8fa4fbce8ddf94aa3a87c938c"; + rev = "5cf193fa28d0c6f0f93fd1b481ba4845eac9a1ac"; + sha256 = "1dgh9xs4rhziayl18nrknvgjnx8ll5pw4xcy43wrcr7icnmddgrw"; }; dependencies = []; @@ -1448,40 +1445,40 @@ rec { src = fetchgit { url = "git://github.com/kchmck/vim-coffee-script"; rev = "32fe889b8cafd3a4921ef8e6485156453ff58c42"; - sha256 = "d7162b2546c9949c96811d7a72c17ae2db9871697ee65ed0b1a8f0287d278690"; + sha256 = "14464xyjiw58n785xrkyd5qrinz2gb0p4yhxh6b9r5698qjjn5np"; }; dependencies = []; }; vim-easy-align = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-easy-align-2015-10-09"; + name = "vim-easy-align-2016-02-05"; src = fetchgit { url = "git://github.com/junegunn/vim-easy-align"; - rev = "7cb559eb70600bbd81afbb2d7f60d98334f631e2"; - sha256 = "2ea40064f64a8a4f0f1e405ea5db5a3e79424cdec44d033c3d65cc40a2a19b18"; + rev = "dd98d0a8957b7d43ac84be3318bbc950bc9ed467"; + sha256 = "1hdfcg07p4xvd5aa7hqmjg2zf6cmlrp4maid7qc4l0xcfx6wx4j1"; }; dependencies = []; }; vim-gista = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-gista-2016-01-23"; + name = "vim-gista-2016-02-22"; src = fetchgit { url = "git://github.com/lambdalisue/vim-gista"; - rev = "2021858d9cada2289a866387ba728dd025093aa1"; - sha256 = "1e3e925cdb6a9296f20c2261efb96eac0792e12c3b7a4f6a1637ac0a96255eb4"; + rev = "d4da4b6f53a93ebadc7c1dcc4e82836f96c706c9"; + sha256 = "19786fr2m44krq7l62j3h39ayl6a04474s2mkbv8szkg8jb4syzq"; }; dependencies = []; }; vim-gitgutter = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-gitgutter-2016-01-19"; + name = "vim-gitgutter-2016-02-21"; src = fetchgit { url = "git://github.com/airblade/vim-gitgutter"; - rev = "4510e9b33506b4b09168c99934c42ee1ce89bba2"; - sha256 = "77d97922e8970fcdb037272a53c2ab4209d804aced7ae654f6aeb4501705bcd8"; + rev = "0af9f2a3ab029054d279f69364351e95e107008a"; + sha256 = "0kqj50sha1i1jsm9mirx6jn7kpdm0zl60n0zc3rh8z1zsjic0mqr"; }; dependencies = []; @@ -1492,7 +1489,7 @@ rec { src = fetchgit { url = "git://github.com/noc7c9/vim-iced-coffee-script"; rev = "e42e0775fa4b1f8840c55cd36ac3d1cedbc1dea2"; - sha256 = "c7859591975a51a1736f99a433d7ca3e7638b417340a0472a63995e16d8ece93"; + sha256 = "14yfirny359rlrr082il2ys3hxiyrbbk794rdxrs2lasjy8rb1f7"; }; dependencies = []; @@ -1503,62 +1500,62 @@ rec { src = fetchgit { url = "git://github.com/xuhdev/vim-latex-live-preview"; rev = "7695dd4ebddb735bec632d468e2202d070029cb8"; - sha256 = "3551e2a84a98b07f5edce6e35bad5cd2a78da1ef60dd94202c623e238b05bfc8"; + sha256 = "1j5z0n5j6gk25hh99pb0xyhqv9yjbjnmpqz6vig7zc4q9alf4l9m"; }; dependencies = []; }; vim-multiple-cursors = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-multiple-cursors-2016-01-14"; + name = "vim-multiple-cursors-2016-01-28"; src = fetchgit { url = "git://github.com/terryma/vim-multiple-cursors"; - rev = "e543fc86f0c6a8981c9679beceb06482778c3531"; - sha256 = "d10506c2196b32d389027a359f382d41c7c972f615a6745b9ee41c17741e062a"; + rev = "47c9e3fb11a202a9a2fa1d591ec990a41e4221c4"; + sha256 = "006wj5jikdkz9zilhy9q55hr50v6x34z27jpn0dv9shgaj8xf62s"; }; dependencies = []; }; vim-signature = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-signature-2015-11-11"; + name = "vim-signature-2016-02-22"; src = fetchgit { url = "git://github.com/kshenoy/vim-signature"; - rev = "7cabfb5a3d3b45e739eb1d7e198782fb4a5a23da"; - sha256 = "18a8ab7ba9e74d2f65c64c0c316ef824e48f21196520dfd292522c1eb8c87cb3"; + rev = "8b7b40041f938092d3cb5c5db33fec54c41a1854"; + sha256 = "0qqc785r84g1ckxyds0zmf881wslsfa1cmpcx35jwcyjwdaya0a6"; }; dependencies = []; }; vim-signify = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-signify-2016-01-15"; + name = "vim-signify-2016-02-25"; src = fetchgit { url = "git://github.com/mhinz/vim-signify"; - rev = "4f69c11c7cd7b75bb23cf7565f278af918816546"; - sha256 = "816f7472f04043139f216b91fc36612a9d73cddd86ca6c1cf86a7d48ca2d20e3"; + rev = "051dc1a853cb86231497c58a5c06dc82a17837ca"; + sha256 = "0iy03qxv9m301pqa495ydacx072pa1jwdqgk50dpd1z6711cdh44"; }; dependencies = []; }; vim-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-snippets-2016-01-17"; + name = "vim-snippets-2016-02-19"; src = fetchgit { url = "git://github.com/honza/vim-snippets"; - rev = "0fc7fd1181f33b26c015d0f306d149b756f9d679"; - sha256 = "d67ccdcfa42e8e713e7a5bee34b5b150fb955a81fdddfe9c956a1f652f1235b6"; + rev = "732978ab1622c8d6fdf0384cd3b524e3fe7ba5f3"; + sha256 = "0i7jr48vwazdy3bm9y2wa0y5ay1rhp91dpi5kqgs06na85qvhsiz"; }; dependencies = []; }; vim-webdevicons = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-webdevicons-2015-12-21"; + name = "vim-webdevicons-2016-02-08"; src = fetchgit { url = "git://github.com/ryanoasis/vim-devicons"; - rev = "8ac3e02537d32648c3f9738c711639f8b940460c"; - sha256 = "9d4ee89a551ab9e1ec3938e1eba1fd138bbee975ce3b247b5f56eb2613daefbc"; + rev = "d0111ec77c3d7e3e3072e576bb26055643e64a2f"; + sha256 = "1lhycam07licxkf8isl641mwd64i2x8kjqqvzxndhr26incs9pv2"; }; dependencies = []; @@ -1569,7 +1566,7 @@ rec { src = fetchgit { url = "git://github.com/dag/vim2hs"; rev = "f2afd55704bfe0a2d66e6b270d247e9b8a7b1664"; - sha256 = "485fc58595bb4e50f2239bec5a4cbb0d8f5662aa3f744e42c110cd1d66b7e5b0"; + sha256 = "1c75nxk1vk8hq514wx1zm9i5d3qdpd65mv4v4gr50kmvjn2waps8"; }; dependencies = []; @@ -1580,7 +1577,7 @@ rec { src = fetchgit { url = "git://github.com/vimwiki/vimwiki"; rev = "3bd3d9b86036b21aecd69f0a1e572643d626c280"; - sha256 = "7a10ae3881af0d17a041ffd766680ceedf706411abbbedccf64e9e777fabd5c8"; + sha256 = "1j6mmdzpg7jfyv6fvfxb25j71pzf1il6dmzz86h1f3dgh4waw43s"; }; dependencies = []; @@ -1591,18 +1588,18 @@ rec { src = fetchgit { url = "git://github.com/tpope/vim-vinegar"; rev = "75fc3824bc09053f22735d6726c5cfd614c15642"; - sha256 = "19fc1487169f1d8941ffddda1ffadd842ef4a773de2d32536eae52cf494154a6"; + sha256 = "19jl854wylmfdr9k4bfyffkz8bl4vpx1znnxzx0qj7cz2s3i9z0r"; }; dependencies = []; }; vundle = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vundle-2015-11-04"; + name = "vundle-2016-02-21"; src = fetchgit { url = "git://github.com/gmarik/vundle"; - rev = "5f70ae6025e951f0154e3940d123138adffa4c88"; - sha256 = "c063cabca479449a3330c14e879536473d4fdb0ca4b384c9c8be18c198a929fa"; + rev = "8a054139a3623739321303cf06c09b0f9874dc0d"; + sha256 = "0hhjnp9i0glfa5fdfg9n9286zdfvfmdx1ln9ayfr8kmm9nwy24gp"; }; dependencies = []; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index a4dca009cdd9..2feb3049c6f1 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -54,7 +54,7 @@ "github:nbouscal/vim-stylish-haskell" "github:osyo-manga/shabadou.vim" "github:osyo-manga/vim-watchdogs" -"github:phildawes/racer" +"github:racer-rust/vim-racer" "github:shougo/neocomplete.vim" "github:shougo/neosnippet-snippets" "github:shougo/neosnippet.vim" diff --git a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/racer b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/racer deleted file mode 100644 index 57000b870645..000000000000 --- a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/racer +++ /dev/null @@ -1,4 +0,0 @@ - buildPhase = '' - find . -type f -not -name 'racer.vim' -exec rm -rf {} \; - rm -rf editors images src - ''; -- cgit 1.4.1 From e695d73d8f18038ff8b2bb082ef15304e63a68e3 Mon Sep 17 00:00:00 2001 From: Arseniy Seroka Date: Thu, 25 Feb 2016 12:22:44 +0300 Subject: vimPlugins.vim-autoformat: init at 2016-02-24 --- pkgs/misc/vim-plugins/default.nix | 11 +++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 7 ++++--- 2 files changed, 15 insertions(+), 3 deletions(-) (limited to 'pkgs/misc') diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index 6c9f8d665e15..5e6e73419d2e 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -343,6 +343,17 @@ rec { }; + vim-autoformat = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-autoformat-2016-02-24"; + src = fetchgit { + url = "git://github.com/Chiel92/vim-autoformat"; + rev = "a2f9b88bcd66fe47a44ae8b5e1002c2d8e6f4ad4"; + sha256 = "1fahm3dzcmpr7f9rrhzhyrj6fz95fblxal57gajcc3g136bizbnj"; + }; + dependencies = []; + + }; + vim-css-color = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-css-color-2015-10-03"; src = fetchgit { diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 2feb3049c6f1..87420a7a4ca5 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -1,7 +1,6 @@ "CSApprox" "CheckAttach" "Gist" -"github:sjl/gundo.vim" "Hoogle" "Solarized" "Supertab" @@ -20,6 +19,8 @@ "extradite" "fugitive" "ghcmod" +"github:Chiel92/vim-autoformat" +"github:LnL7/vim-nix" "github:ap/vim-css-color" "github:benekastah/neomake" "github:bitc/vim-hdevtools" @@ -46,7 +47,6 @@ "github:latex-box-team/latex-box" "github:lepture/vim-jinja" "github:lervag/vimtex" -"github:LnL7/vim-nix" "github:lokaltog/vim-easymotion" "github:lyokha/vim-xkbswitch" "github:mhinz/vim-startify" @@ -61,10 +61,11 @@ "github:shougo/unite.vim" "github:shougo/vimproc.vim" "github:shougo/vimshell.vim" +"github:sjl/gundo.vim" "github:takac/vim-hardtime" "github:thinca/vim-quickrun" -"github:tpope/vim-eunuch" "github:tomasr/molokai" +"github:tpope/vim-eunuch" "github:travitch/hasksyn" "github:twinside/vim-haskellconceal" "github:valloric/youcompleteme" -- cgit 1.4.1 From bd5e2d723c773da0f0828f20e56d46ffdadf3c5b Mon Sep 17 00:00:00 2001 From: Christoph Hrdinka Date: Fri, 26 Feb 2016 10:21:31 +0100 Subject: pcsx2: init at 1.4.0 --- pkgs/misc/emulators/pcsx2/default.nix | 71 +++++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 73 insertions(+) create mode 100644 pkgs/misc/emulators/pcsx2/default.nix (limited to 'pkgs/misc') diff --git a/pkgs/misc/emulators/pcsx2/default.nix b/pkgs/misc/emulators/pcsx2/default.nix new file mode 100644 index 000000000000..63b221c9a3dc --- /dev/null +++ b/pkgs/misc/emulators/pcsx2/default.nix @@ -0,0 +1,71 @@ +{ alsaLib, cmake, fetchFromGitHub, glib, gtk2, gettext, libaio, libpng +, makeWrapper, perl, pkgconfig, portaudio, SDL2, soundtouch, stdenv +, wxGTK30, zlib }: + +assert stdenv.isi686; + +stdenv.mkDerivation rec { + name = "pcsx2-${version}"; + version = "1.4.0"; + + src = fetchFromGitHub { + owner = "PCSX2"; + repo = "pcsx2"; + rev = "v${version}"; + sha256 = "0s7mxq2cgzwjfsq0vhpz6ljk7wr725nxg48128iyirf85585l691"; + }; + + configurePhase = '' + mkdir -p build + cd build + + cmake \ + -DBIN_DIR="$out/bin" \ + -DCMAKE_BUILD_PO=TRUE \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX="$out" \ + -DDISABLE_PCSX2_WRAPPER=TRUE \ + -DDOC_DIR="$out/share/doc/pcsx2" \ + -DGAMEINDEX_DIR="$out/share/pcsx2" \ + -DGLSL_SHADER_DIR="$out/share/pcsx2" \ + -DGTK2_GLIBCONFIG_INCLUDE_DIR='${glib}/lib/glib-2.0/include' \ + -DGTK2_GDKCONFIG_INCLUDE_DIR='${gtk2}/lib/gtk-2.0/include' \ + -DGTK2_INCLUDE_DIRS='${gtk2}/include/gtk-2.0' \ + -DPACKAGE_MODE=TRUE \ + -DPLUGIN_DIR="$out/lib/pcsx2" \ + -DREBUILD_SHADER=TRUE \ + .. + ''; + + postFixup = '' + wrapProgram $out/bin/PCSX2 \ + --set __GL_THREADED_OPTIMIZATIONS 1 + ''; + + nativeBuildInputs = [ cmake perl pkgconfig ]; + + buildInputs = [ + alsaLib glib gettext gtk2 libaio libpng makeWrapper portaudio SDL2 + soundtouch wxGTK30 zlib + ]; + + meta = with stdenv.lib; { + description = "Playstation 2 emulator"; + longDescription= '' + PCSX2 is an open-source PlayStation 2 (AKA PS2) emulator. Its purpose + is to emulate the PS2 hardware, using a combination of MIPS CPU + Interpreters, Recompilers and a Virtual Machine which manages hardware + states and PS2 system memory. This allows you to play PS2 games on your + PC, with many additional features and benefits. + ''; + homepage = http://pcsx2.net; + maintainers = with maintainers; [ hrdinka ]; + + # PCSX2's source code is released under LGPLv3+. It However ships + # additional data files and code that are licensed differently. + # This might be solved in future, for now we should stick with + # license.free + license = licenses.free; + platforms = platforms.i686; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0ec1c1c0e788..7d18cc291306 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13154,6 +13154,8 @@ let paraview = callPackage ../applications/graphics/paraview { }; + pcsx2 = callPackage_i686 ../misc/emulators/pcsx2 { }; + pencil = callPackage ../applications/graphics/pencil { }; perseus = callPackage ../applications/science/math/perseus {}; -- cgit 1.4.1 From d9c10d6f56ab07c9387efe74a6202c19bb744f6c Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Fri, 26 Feb 2016 17:14:21 +0300 Subject: gutenprint: fix cups and gimp paths Also disable GIMP support by default to reduce closure --- pkgs/misc/drivers/gutenprint/default.nix | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) (limited to 'pkgs/misc') diff --git a/pkgs/misc/drivers/gutenprint/default.nix b/pkgs/misc/drivers/gutenprint/default.nix index 5be7f5ecff4d..e53ddf7143b3 100644 --- a/pkgs/misc/drivers/gutenprint/default.nix +++ b/pkgs/misc/drivers/gutenprint/default.nix @@ -1,7 +1,7 @@ # this package was called gimp-print in the past { stdenv, lib, fetchurl, pkgconfig , ijs, makeWrapper -, gimp2Support ? true, gimp +, gimp2Support ? false, gimp , cupsSupport ? true, cups, libusb, perl }: @@ -23,15 +23,25 @@ stdenv.mkDerivation rec { "--disable-static-genppd" # should be harmless on NixOS ]; + # FIXME: hacky because we modify generated configure, but I haven't found a better way. + # makeFlags doesn't change this everywhere (e.g. in cups-genppdupdate). + preConfigure = lib.optionalString cupsSupport '' + sed -i \ + -e "s,cups_conf_datadir=.*,cups_conf_datadir=\"$out/share/cups\",g" \ + -e "s,cups_conf_serverbin=.*,cups_conf_serverbin=\"$out/lib/cups\",g" \ + -e "s,cups_conf_serverroot=.*,cups_conf_serverroot=\"$out/etc/cups\",g" \ + configure + '' + lib.optionalString gimp2Support '' + sed -i \ + -e "s,gimp2_plug_indir=.*,gimp2_plug_indir=\"$out/lib/gimp/${gimp.majorVersion}\",g" \ + configure + ''; + enableParallelBuilding = true; # Testing is very, very long. # doCheck = true; - installFlags = - lib.optionals cupsSupport [ "cups_conf_datadir=$(out)/share/cups" "cups_conf_serverbin=$(out)/lib/cups" "cups_conf_serverroot=$(out)/etc/cups" ] - ++ lib.optionals gimp2Support [ "gimp2_plug_indir=$(out)/${gimp.name}-plugins" ]; - meta = with stdenv.lib; { description = "Ghostscript and cups printer drivers"; homepage = http://sourceforge.net/projects/gimp-print/; -- cgit 1.4.1