diff --git a/pkgs/applications/altcoins/clightning.nix b/pkgs/applications/altcoins/clightning.nix index 73cdd3664ea579b649645cfb7f2e30aa901ac4a8..d7e4ee233a86220eea35c92f7445abbb897559e1 100644 --- a/pkgs/applications/altcoins/clightning.nix +++ b/pkgs/applications/altcoins/clightning.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchpatch, python3, pkgconfig, which, libtool, autoconf, automake, - autogen, git, sqlite, gmp, zlib, fetchFromGitHub }: +{ stdenv, python3, pkgconfig, which, libtool, autoconf, automake, + autogen, sqlite, gmp, zlib, fetchFromGitHub }: with stdenv.lib; stdenv.mkDerivation rec { diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix index 385e9e53522d22541ef00b34e9627fee606fbf9f..9f1763087de2c331e3f862e42beece447012fc63 100644 --- a/pkgs/applications/altcoins/default.nix +++ b/pkgs/applications/altcoins/default.nix @@ -88,5 +88,5 @@ rec { parity = callPackage ./parity { }; parity-ui = callPackage ./parity-ui { }; - particl-core = callPackage ./particl/particl-core.nix { boost = boost165; miniupnpc = miniupnpc_2; withGui = false; }; + particl-core = callPackage ./particl/particl-core.nix { boost = boost165; miniupnpc = miniupnpc_2; }; } diff --git a/pkgs/applications/altcoins/dero.nix b/pkgs/applications/altcoins/dero.nix index dff7bc0b0dc415f7ea529c19511a3d5b20a1ff91..8405ea8f842b97f4ea6031bacfab539278d6c01e 100644 --- a/pkgs/applications/altcoins/dero.nix +++ b/pkgs/applications/altcoins/dero.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, cmake, pkgconfig, unbound, openssl, boost -, libunwind, lmdb, miniupnpc, readline }: +, lmdb, miniupnpc, readline }: stdenv.mkDerivation rec { name = "dero-${version}"; diff --git a/pkgs/applications/altcoins/dogecoin.nix b/pkgs/applications/altcoins/dogecoin.nix index 33c2e598fca920413a466a5e4c7f2eeb06cc09a3..0452f40133458df36a9c35756c17bf72b9cf2164 100644 --- a/pkgs/applications/altcoins/dogecoin.nix +++ b/pkgs/applications/altcoins/dogecoin.nix @@ -1,7 +1,7 @@ { stdenv , fetchFromGitHub , pkgconfig, autoreconfHook , db5, openssl, boost, zlib, miniupnpc -, glib, protobuf, utillinux, qt4, qrencode +, protobuf, utillinux, qt4, qrencode , withGui }: with stdenv.lib; diff --git a/pkgs/applications/altcoins/ethsign/default.nix b/pkgs/applications/altcoins/ethsign/default.nix index 0659c4fa258505901c3a32c140d71cf44c6efec4..35fd4bc718c8962b65985ce7347a82716ffeb779 100644 --- a/pkgs/applications/altcoins/ethsign/default.nix +++ b/pkgs/applications/altcoins/ethsign/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, fetchgit, clang }: +{ stdenv, buildGoPackage, fetchFromGitHub, fetchgit }: buildGoPackage rec { name = "ethsign-${version}"; diff --git a/pkgs/applications/altcoins/freicoin.nix b/pkgs/applications/altcoins/freicoin.nix index b753e2d48c977c2844bedff219acb070ecb3de41..1e9192bc6e4006bb012b15acd4c15ebbf2237129 100644 --- a/pkgs/applications/altcoins/freicoin.nix +++ b/pkgs/applications/altcoins/freicoin.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, stdenv, db, boost, gmp, mpfr, miniupnpc, qt4, qmake4Hook, unzip }: +{ fetchFromGitHub, stdenv, db, boost, gmp, mpfr, qt4, qmake4Hook }: stdenv.mkDerivation rec { version = "0.8.6-2"; diff --git a/pkgs/applications/altcoins/go-ethereum-classic/default.nix b/pkgs/applications/altcoins/go-ethereum-classic/default.nix index 679312d9a8e9b01bf2a6b5e2a2101f7bb2ce9058..7461e4c376ab672939f27e5443ff9439f76e913c 100644 --- a/pkgs/applications/altcoins/go-ethereum-classic/default.nix +++ b/pkgs/applications/altcoins/go-ethereum-classic/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ lib, buildGoPackage, fetchgit }: buildGoPackage rec { name = "go-ethereum-classic-${version}"; diff --git a/pkgs/applications/altcoins/go-ethereum.nix b/pkgs/applications/altcoins/go-ethereum.nix index 79c8e0dfde8ac4bbef70e8637ebb65d847777afb..73aa4452c0f0bfd98cc103a380fc692810920b64 100644 --- a/pkgs/applications/altcoins/go-ethereum.nix +++ b/pkgs/applications/altcoins/go-ethereum.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub, libobjc, IOKit }: +{ stdenv, buildGoPackage, fetchFromGitHub, libobjc, IOKit }: buildGoPackage rec { name = "go-ethereum-${version}"; diff --git a/pkgs/applications/altcoins/hevm.nix b/pkgs/applications/altcoins/hevm.nix index 1aa598f32545d81611943dc348e25398e47fd972..e7f47d0f220050973f487d60e9a579dedf38ae00 100644 --- a/pkgs/applications/altcoins/hevm.nix +++ b/pkgs/applications/altcoins/hevm.nix @@ -5,12 +5,12 @@ , lens-aeson, memory, monad-par, mtl, optparse-generic, process , QuickCheck, quickcheck-text, readline, rosezipper, scientific , stdenv, tasty, tasty-hunit, tasty-quickcheck, temporary, text -, text-format, time, unordered-containers, vector, vty +, text-format, unordered-containers, vector, vty , restless-git , fetchFromGitHub, lib, makeWrapper -, ncurses, zlib, bzip2, solc, coreutils +, zlib, bzip2, solc, coreutils , bash }: diff --git a/pkgs/applications/altcoins/mist.nix b/pkgs/applications/altcoins/mist.nix index cb8d01467a2e857e89cad7e63c34219f7e4255b1..f809b30189f473621031c38c59a452685115f1f9 100644 --- a/pkgs/applications/altcoins/mist.nix +++ b/pkgs/applications/altcoins/mist.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, makeWrapper, fetchurl, unzip, atomEnv, makeDesktopItem, buildFHSUserEnv }: +{ stdenv, makeWrapper, fetchurl, unzip, atomEnv, makeDesktopItem, buildFHSUserEnv }: let version = "0.10.0"; diff --git a/pkgs/applications/altcoins/namecoin.nix b/pkgs/applications/altcoins/namecoin.nix index f734958116953632cc5e0255f2f9fb528cc09193..9af37ff0bca673de38c0b34945a7f75ce894950f 100644 --- a/pkgs/applications/altcoins/namecoin.nix +++ b/pkgs/applications/altcoins/namecoin.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, openssl, boost, libevent, autoreconfHook, db4, miniupnpc, eject, pkgconfig, qt4, protobuf, libqrencode +{ stdenv, fetchFromGitHub, openssl, boost, libevent, autoreconfHook, db4, miniupnpc, eject, pkgconfig, qt4, protobuf, libqrencode , withGui }: with stdenv.lib; diff --git a/pkgs/applications/altcoins/nano-wallet/default.nix b/pkgs/applications/altcoins/nano-wallet/default.nix index a14a40e9cc7590d6442785fc05b7b6c333392b81..76ee914bd3d7834a2427a72af8a79b71c5d97aff 100644 --- a/pkgs/applications/altcoins/nano-wallet/default.nix +++ b/pkgs/applications/altcoins/nano-wallet/default.nix @@ -1,4 +1,4 @@ -{lib, pkgs, stdenv, fetchFromGitHub, cmake, pkgconfig, boost, libGL, qtbase}: +{lib, stdenv, fetchFromGitHub, cmake, pkgconfig, boost, libGL, qtbase}: stdenv.mkDerivation rec { diff --git a/pkgs/applications/altcoins/parity-ui/default.nix b/pkgs/applications/altcoins/parity-ui/default.nix index b22302d0d39af0abae973324cc474177e3eba779..8566e6037d6f286dc45c0e923c36859fca7a5c4e 100644 --- a/pkgs/applications/altcoins/parity-ui/default.nix +++ b/pkgs/applications/altcoins/parity-ui/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgs, fetchurl, lib, makeWrapper, nodePackages }: +{ stdenv, pkgs, fetchurl, makeWrapper, nodePackages }: let diff --git a/pkgs/applications/altcoins/parity-ui/env.nix b/pkgs/applications/altcoins/parity-ui/env.nix index a273bf33d1006d32e7b557231647016464536f7f..2fd235ade537529696733398281701c25dea510f 100644 --- a/pkgs/applications/altcoins/parity-ui/env.nix +++ b/pkgs/applications/altcoins/parity-ui/env.nix @@ -1,5 +1,5 @@ { stdenv, lib, zlib, glib, alsaLib, dbus, gtk2, atk, pango, freetype, fontconfig -, libgnome-keyring3, gdk_pixbuf, gvfs, cairo, cups, expat, libgpgerror, nspr +, libgnome-keyring3, gdk_pixbuf, cairo, cups, expat, libgpgerror, nspr , nss, xorg, libcap, systemd, libnotify, libsecret, gnome3 }: let diff --git a/pkgs/applications/altcoins/particl/particl-core.nix b/pkgs/applications/altcoins/particl/particl-core.nix index 5be2bec6c72495c862f1a75c900c2be2a0e4d162..331e169cf3f352e4e3b030786bc9b5b5957c5798 100644 --- a/pkgs/applications/altcoins/particl/particl-core.nix +++ b/pkgs/applications/altcoins/particl/particl-core.nix @@ -4,14 +4,11 @@ , db48 , fetchurl , libevent -, libtool , miniupnpc , openssl , pkgconfig -, utillinux , zeromq , zlib -, withGui , unixtools }: diff --git a/pkgs/applications/altcoins/stellar-core.nix b/pkgs/applications/altcoins/stellar-core.nix index 4a4665291d6e8864cda85478177b9ddb11165fca..4c3f9fe0760bb1f4688495368940300e014caffd 100644 --- a/pkgs/applications/altcoins/stellar-core.nix +++ b/pkgs/applications/altcoins/stellar-core.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchgit, autoconf, libtool, automake, pkgconfig, git +{ stdenv, fetchgit, autoconf, libtool, automake, pkgconfig, git , bison, flex, postgresql }: let diff --git a/pkgs/applications/audio/abcde/default.nix b/pkgs/applications/audio/abcde/default.nix index e672e6f3bae18e715add7691307b208d7675324a..04ee72edc36e13dd25d3372373451de0d05413ef 100644 --- a/pkgs/applications/audio/abcde/default.nix +++ b/pkgs/applications/audio/abcde/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, libcdio-paranoia, cddiscid, wget, bash, which, vorbis-tools, id3v2, eyeD3 -, lame, flac, eject, mkcue, glyr +{ stdenv, fetchurl, libcdio-paranoia, cddiscid, wget, which, vorbis-tools, id3v2, eyeD3 +, lame, flac, glyr , perl, DigestSHA, MusicBrainz, MusicBrainzDiscID , makeWrapper }: diff --git a/pkgs/applications/audio/airwave/default.nix b/pkgs/applications/audio/airwave/default.nix index c37963c77f3eff5030b608fd7d363d79b68979eb..737e73421c9bd490be998cef7d144210e03d561d 100644 --- a/pkgs/applications/audio/airwave/default.nix +++ b/pkgs/applications/audio/airwave/default.nix @@ -1,5 +1,5 @@ { stdenv, multiStdenv, cmake, fetchFromGitHub, file, libX11, makeWrapper -, overrideCC, qt5, requireFile, unzip, wine +, qt5, requireFile, unzip, wine }: let diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix index b0c47972e3856c40177a70f57c9a8b7104f15adc..1989fd1400d43f60f89fcc3f66e4dc0f72856fb6 100644 --- a/pkgs/applications/audio/audacity/default.nix +++ b/pkgs/applications/audio/audacity/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, wxGTK30, pkgconfig, file, gettext, gtk2, glib, zlib, perl, intltool, - libogg, libvorbis, libmad, libjack2, lv2, lilv, serd, sord, sratom, suil, alsaLib, libsndfile, soxr, flac, lame, +{ stdenv, fetchurl, wxGTK30, pkgconfig, file, gettext, gtk2, + libvorbis, libmad, libjack2, lv2, lilv, serd, sord, sratom, suil, alsaLib, libsndfile, soxr, flac, lame, expat, libid3tag, ffmpeg, soundtouch, /*, portaudio - given up fighting their portaudio.patch */ autoconf, automake, libtool }: diff --git a/pkgs/applications/audio/banshee/default.nix b/pkgs/applications/audio/banshee/default.nix index a3ac2b097e95c00188b5178dab344075c8f74ec8..2479360b88e942fec0c7d3a2eb566d229cd32c1d 100644 --- a/pkgs/applications/audio/banshee/default.nix +++ b/pkgs/applications/audio/banshee/default.nix @@ -1,4 +1,4 @@ -{ pkgs, stdenv, lib, fetchurl, intltool, pkgconfig, gstreamer, gst-plugins-base +{ stdenv, lib, fetchurl, intltool, pkgconfig, gstreamer, gst-plugins-base , gst-plugins-good, gst-plugins-bad, gst-plugins-ugly, gst-ffmpeg, glib , mono, mono-addins, dbus-sharp-1_0, dbus-sharp-glib-1_0, notify-sharp, gtk-sharp-2_0 , boo, gdata-sharp, taglib-sharp, sqlite, gnome-sharp, gconf, gtk-sharp-beans, gio-sharp diff --git a/pkgs/applications/audio/clementine/default.nix b/pkgs/applications/audio/clementine/default.nix index b8044972576502fb3d32effabb743e534de997e0..611828753e46646fe2703c398dedf83039a578cc 100644 --- a/pkgs/applications/audio/clementine/default.nix +++ b/pkgs/applications/audio/clementine/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, fetchpatch, boost, cmake, chromaprint, gettext, gst_all_1, liblastfm , qt4, taglib, fftw, glew, qjson, sqlite, libgpod, libplist, usbmuxd, libmtp , libpulseaudio, gvfs, libcdio, libechonest, libspotify, pcre, projectm, protobuf -, qca2, pkgconfig, sparsehash, config, makeWrapper, runCommand, gst_plugins }: +, qca2, pkgconfig, sparsehash, config, makeWrapper, gst_plugins }: let withIpod = config.clementine.ipod or false; diff --git a/pkgs/applications/audio/deadbeef/default.nix b/pkgs/applications/audio/deadbeef/default.nix index 4dced0cfafae57250cc7ab1d74ca342225df1ee3..e2fcc3c4626a5ab604abc80331506548c3b2bdfe 100644 --- a/pkgs/applications/audio/deadbeef/default.nix +++ b/pkgs/applications/audio/deadbeef/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, intltool, pkgconfig, fetchpatch, jansson +{ stdenv, fetchurl, intltool, pkgconfig, jansson # deadbeef can use either gtk2 or gtk3 , gtk2Support ? false, gtk2 ? null , gtk3Support ? true, gtk3 ? null, gsettings-desktop-schemas ? null, wrapGAppsHook ? null diff --git a/pkgs/applications/audio/deadbeef/wrapper.nix b/pkgs/applications/audio/deadbeef/wrapper.nix index 5b14302204e7f7d77371352b2162b7376d161432..cd45ef5926b07621cb0ca94c4162e94cea153889 100644 --- a/pkgs/applications/audio/deadbeef/wrapper.nix +++ b/pkgs/applications/audio/deadbeef/wrapper.nix @@ -1,4 +1,4 @@ -{ stdenv, symlinkJoin, deadbeef, makeWrapper, plugins }: +{ symlinkJoin, deadbeef, makeWrapper, plugins }: symlinkJoin { name = "deadbeef-with-plugins-${deadbeef.version}"; diff --git a/pkgs/applications/audio/distrho/default.nix b/pkgs/applications/audio/distrho/default.nix index 5c9211e7f3bbbe8fd768f9051aed20c5319ae629..3aa8aa371e65aac6c19fe31bd6f44f4330f6c414 100644 --- a/pkgs/applications/audio/distrho/default.nix +++ b/pkgs/applications/audio/distrho/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, alsaLib, fftwSinglePrec, freetype, libjack2 -, libxslt, lv2, pkgconfig, premake3, xorg, ladspa-sdk }: +, pkgconfig, premake3, xorg, ladspa-sdk }: stdenv.mkDerivation rec { name = "distrho-ports-unstable-2018-01-01"; diff --git a/pkgs/applications/audio/faust/faust2.nix b/pkgs/applications/audio/faust/faust2.nix index 961ef713569712775f309249a2ed7d8495199dce..cfb37e5761a770cb58383550184f5da1f8633ee5 100644 --- a/pkgs/applications/audio/faust/faust2.nix +++ b/pkgs/applications/audio/faust/faust2.nix @@ -3,7 +3,6 @@ , fetchFromGitHub , makeWrapper , pkgconfig -, clang , llvm , emscripten , openssl diff --git a/pkgs/applications/audio/fmit/default.nix b/pkgs/applications/audio/fmit/default.nix index f1bdcd8c5242528e9ddfb51c3aef772ff91888c7..a61f7dc0a9051942af1dc3f7c04749bdaf8d4d45 100644 --- a/pkgs/applications/audio/fmit/default.nix +++ b/pkgs/applications/audio/fmit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fftw, freeglut, libGLU, qtbase, qtmultimedia, qmake +{ stdenv, fetchFromGitHub, fftw, qtbase, qtmultimedia, qmake , alsaSupport ? true, alsaLib ? null , jackSupport ? false, libjack2 ? null , portaudioSupport ? false, portaudio ? null }: diff --git a/pkgs/applications/audio/gradio/default.nix b/pkgs/applications/audio/gradio/default.nix index d111502651ed2a14abaa1e56ed9de798213c7826..ed34c3118c68ddf0dc2823685be7d1216825ac99 100644 --- a/pkgs/applications/audio/gradio/default.nix +++ b/pkgs/applications/audio/gradio/default.nix @@ -1,5 +1,4 @@ { stdenv, fetchFromGitHub, pkgconfig -, gcc , python3 , gsettings-desktop-schemas , desktop-file-utils diff --git a/pkgs/applications/audio/gtkpod/default.nix b/pkgs/applications/audio/gtkpod/default.nix index e0e620bd05f941b9bb6f348b77b5f2d552d645d0..6546fd7866ea96ee82f21d0e88dbc71ffb1be193 100644 --- a/pkgs/applications/audio/gtkpod/default.nix +++ b/pkgs/applications/audio/gtkpod/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, wrapGAppsHook, intltool, libgpod, curl, flac, - gnome3, gtk3, glib, gettext, perl, perlXMLParser, flex, libid3tag, - libvorbis, hicolor-icon-theme, gdk_pixbuf }: + gnome3, gtk3, gettext, perl, perlXMLParser, flex, libid3tag, + libvorbis, gdk_pixbuf }: stdenv.mkDerivation rec { version = "2.1.5"; diff --git a/pkgs/applications/audio/jaaa/default.nix b/pkgs/applications/audio/jaaa/default.nix index cacbf428caa099a095d23443911763516962ba99..2410106cff035f4948aa70e5cffd3ac2c2659aef 100644 --- a/pkgs/applications/audio/jaaa/default.nix +++ b/pkgs/applications/audio/jaaa/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, alsaLib, libclthreads, libclxclient, libX11, libXft, libXrender, fftwFloat, freetype, fontconfig, libjack2, xorg, zita-alsa-pcmi }: +{ stdenv, fetchurl, alsaLib, libclthreads, libclxclient, libX11, libXft, libXrender, fftwFloat, libjack2, zita-alsa-pcmi }: stdenv.mkDerivation rec { name = "jaaa-${version}"; diff --git a/pkgs/applications/audio/lastfmsubmitd/default.nix b/pkgs/applications/audio/lastfmsubmitd/default.nix index 2cb90081c68beee4743482863405b0ea34a3d3aa..e22bca29bc974b847f8ffcbf6f98fc34a4fe2c36 100644 --- a/pkgs/applications/audio/lastfmsubmitd/default.nix +++ b/pkgs/applications/audio/lastfmsubmitd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pythonPackages }: +{ fetchurl, pythonPackages }: pythonPackages.buildPythonApplication rec { pname = "lastfmsubmitd"; diff --git a/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix b/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix index d7cc88905c535df5422431ed69a9b1456d28ff0b..740763889ffd2dce2aea967734dae3bddc1f5690 100644 --- a/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgs, callPackage, fetchFromGitHub, faust2jack, faust2lv2, helmholtz, mrpeach, puredata-with-plugins }: +{ stdenv, fetchFromGitHub, faust2jack, faust2lv2, helmholtz, mrpeach, puredata-with-plugins }: stdenv.mkDerivation rec { name = "VoiceOfFaust-${version}"; version = "1.1.4"; diff --git a/pkgs/applications/audio/mikmod/default.nix b/pkgs/applications/audio/mikmod/default.nix index f077afec8b209548c627ce377c89a9adf2f1578f..343ec8679feb2f08439c2b89fe0610784e677652 100644 --- a/pkgs/applications/audio/mikmod/default.nix +++ b/pkgs/applications/audio/mikmod/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libmikmod, ncurses, alsaLib }: +{ stdenv, fetchurl, libmikmod, ncurses }: stdenv.mkDerivation rec { name = "mikmod-3.2.8"; diff --git a/pkgs/applications/audio/mopidy/mopify.nix b/pkgs/applications/audio/mopidy/mopify.nix index d55e711cf330259ac0d7d499bb5e375042231b50..b657f69e26eec318844b9d04eab8251dbf878591 100644 --- a/pkgs/applications/audio/mopidy/mopify.nix +++ b/pkgs/applications/audio/mopidy/mopify.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pythonPackages, mopidy }: +{ stdenv, pythonPackages, mopidy }: pythonPackages.buildPythonApplication rec { pname = "Mopidy-Mopify"; diff --git a/pkgs/applications/audio/pianobar/default.nix b/pkgs/applications/audio/pianobar/default.nix index 8e591487111b9b81a226ab30a0e81f9650dcddc0..e21815574d1e28c8cbea7bd4f63b65ce60f9defa 100644 --- a/pkgs/applications/audio/pianobar/default.nix +++ b/pkgs/applications/audio/pianobar/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkgconfig, libao, readline, json_c, libgcrypt, libav, curl }: +{ fetchurl, stdenv, pkgconfig, libao, json_c, libgcrypt, libav, curl }: stdenv.mkDerivation rec { name = "pianobar-2016.06.02"; diff --git a/pkgs/applications/audio/picard/default.nix b/pkgs/applications/audio/picard/default.nix index 26f35f258651aba871b90c1fe4757a5d6bf036d4..d7e6173da9ad169fb47a1496f37651ac6f22e3eb 100644 --- a/pkgs/applications/audio/picard/default.nix +++ b/pkgs/applications/audio/picard/default.nix @@ -1,4 +1,4 @@ -{ stdenv, python2Packages, fetchurl, gettext, chromaprint }: +{ stdenv, python2Packages, fetchurl, gettext }: let pythonPackages = python2Packages; diff --git a/pkgs/applications/audio/puddletag/default.nix b/pkgs/applications/audio/puddletag/default.nix index e96b6f1909a5339878c8c489a9d44dac92423594..915d7fcbd98b80bba3c2e358c5f39defbc559bfc 100644 --- a/pkgs/applications/audio/puddletag/default.nix +++ b/pkgs/applications/audio/puddletag/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python2Packages, makeWrapper, chromaprint }: +{ stdenv, fetchFromGitHub, python2Packages, chromaprint }: python2Packages.buildPythonApplication rec { pname = "puddletag"; diff --git a/pkgs/applications/audio/puredata/wrapper.nix b/pkgs/applications/audio/puredata/wrapper.nix index 9c0a48db51cc0b43478aa9ddde49dfa88fb4da8f..80968e2700b497a854dc82ca789a81f8e6d16497 100644 --- a/pkgs/applications/audio/puredata/wrapper.nix +++ b/pkgs/applications/audio/puredata/wrapper.nix @@ -1,4 +1,4 @@ -{ stdenv, symlinkJoin, puredata, makeWrapper, plugins }: +{ symlinkJoin, puredata, makeWrapper, plugins }: let puredataFlags = map (x: "-path ${x}/") plugins; diff --git a/pkgs/applications/audio/rkrlv2/default.nix b/pkgs/applications/audio/rkrlv2/default.nix index 28a69d5a3b76d51d4971e4716b3174c6d52e69dd..0ff23102e75528e916e2388762a3c96e769081a5 100644 --- a/pkgs/applications/audio/rkrlv2/default.nix +++ b/pkgs/applications/audio/rkrlv2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgs, fetchFromGitHub, +{ stdenv, fetchFromGitHub, automake, pkgconfig, lv2, fftw, cmake, xorg, libjack2, libsamplerate, libsndfile }: diff --git a/pkgs/applications/audio/sonata/default.nix b/pkgs/applications/audio/sonata/default.nix index a3d418cd4fe43d9774ffc657240419b886b0dda0..c5754a199baefdf94ff569880da40d064725b215 100644 --- a/pkgs/applications/audio/sonata/default.nix +++ b/pkgs/applications/audio/sonata/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, intltool, wrapGAppsHook +{ stdenv, fetchFromGitHub, pkgconfig, intltool, wrapGAppsHook , python3Packages, gnome3, gtk3, gobjectIntrospection}: let diff --git a/pkgs/applications/audio/ympd/default.nix b/pkgs/applications/audio/ympd/default.nix index 2e335e6b10e94a97a1c8fba43fe618d31c9c60c1..134e5bfb42a0aedb565a4f029a6fdde380b0bd00 100644 --- a/pkgs/applications/audio/ympd/default.nix +++ b/pkgs/applications/audio/ympd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, llvmPackages, pkgconfig, mpd_clientlib, openssl }: +{ stdenv, fetchFromGitHub, cmake, pkgconfig, mpd_clientlib, openssl }: stdenv.mkDerivation rec { name = "ympd-${version}"; diff --git a/pkgs/applications/backup/crashplan/default.nix b/pkgs/applications/backup/crashplan/default.nix index e840c6eeda0a0bf110bdb18e734455fd450953de..2c76891b3f9edff7ec561beac002563baf14cade 100644 --- a/pkgs/applications/backup/crashplan/default.nix +++ b/pkgs/applications/backup/crashplan/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, jre, cpio, gawk, gnugrep, gnused, procps, swt, gtk2, glib, libXtst }: +{ stdenv, fetchurl, makeWrapper, jre, cpio, gawk, gnugrep, gnused, procps, gtk2, glib, libXtst }: stdenv.mkDerivation rec { version = "4.8.3"; diff --git a/pkgs/applications/display-managers/lightdm/default.nix b/pkgs/applications/display-managers/lightdm/default.nix index 6ba053499f90afdece6d3adb1a585d88d627bffc..8d3d9c9bfcfd4a0cbe7749a2c2e92d725fecaf5d 100644 --- a/pkgs/applications/display-managers/lightdm/default.nix +++ b/pkgs/applications/display-managers/lightdm/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pam, pkgconfig, libxcb, glib, libXdmcp, itstool, libxml2 -, intltool, xlibsWrapper, libxklavier, libgcrypt, audit, coreutils +, intltool, libxklavier, libgcrypt, audit, coreutils , qt4 ? null , withQt5 ? false, qtbase }: diff --git a/pkgs/applications/display-managers/sddm/default.nix b/pkgs/applications/display-managers/sddm/default.nix index 27b23bb571fc20778d2b61915af903769ac261b2..5e583049190c2fae96dbbffd037f1b2543143e39 100644 --- a/pkgs/applications/display-managers/sddm/default.nix +++ b/pkgs/applications/display-managers/sddm/default.nix @@ -1,5 +1,5 @@ -{ mkDerivation, lib, fetchFromGitHub, fetchpatch -, cmake, extra-cmake-modules, pkgconfig, libxcb, libpthreadstubs, lndir +{ mkDerivation, lib, fetchFromGitHub +, cmake, extra-cmake-modules, pkgconfig, libxcb, libpthreadstubs , libXdmcp, libXau, qtbase, qtdeclarative, qttools, pam, systemd }: diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index b7a23b589db1be8606a906db805e7a5d449b3e7c..bd0c412efa536db2cfaa20e7360578f923cd85b3 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, fetchurl, makeFontsConf, gnome2 }: +{ stdenv, callPackage, makeFontsConf, gnome2 }: let mkStudio = opts: callPackage (import ./common.nix opts) { diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix index 8139640457e3666c11b1e16062ddcb7f4b7c3d3d..4078efa6783bb3d441623a8a643a18e695d1acea 100644 --- a/pkgs/applications/editors/atom/default.nix +++ b/pkgs/applications/editors/atom/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgs, fetchurl, lib, makeWrapper, gvfs, atomEnv}: +{ stdenv, pkgs, fetchurl, makeWrapper, gvfs, atomEnv}: let common = pname: {version, sha256}: stdenv.mkDerivation rec { diff --git a/pkgs/applications/editors/atom/env.nix b/pkgs/applications/editors/atom/env.nix index f93d4042a62268b865abfb55bac1a4fe2017f36c..da78c39324a5e8c2aeadcd8b1948b42c96a04298 100644 --- a/pkgs/applications/editors/atom/env.nix +++ b/pkgs/applications/editors/atom/env.nix @@ -1,5 +1,5 @@ { stdenv, lib, zlib, glib, alsaLib, dbus, gtk3, atk, pango, freetype, fontconfig -, libgnome-keyring3, gdk_pixbuf, gvfs, cairo, cups, expat, libgpgerror, nspr +, libgnome-keyring3, gdk_pixbuf, cairo, cups, expat, libgpgerror, nspr , gconf, nss, xorg, libcap, systemd, libnotify, libsecret }: diff --git a/pkgs/applications/editors/brackets/default.nix b/pkgs/applications/editors/brackets/default.nix index 23cb16c0733ffad0d747248226eac9521338b37a..1065564f7b4c3bbb691599577ddc2bfc111580aa 100644 --- a/pkgs/applications/editors/brackets/default.nix +++ b/pkgs/applications/editors/brackets/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, buildEnv, gtk2, glib, gdk_pixbuf, alsaLib, nss, nspr, gconf -, cups, libgcrypt_1_5, systemd, makeWrapper, dbus }: +{ stdenv, fetchurl, gtk2, glib, gdk_pixbuf, alsaLib, nss, nspr, gconf +, cups, libgcrypt_1_5, systemd, dbus }: with stdenv.lib; let diff --git a/pkgs/applications/editors/dit/default.nix b/pkgs/applications/editors/dit/default.nix index 03c3c5d5eec6c7d9c81a5e93034d1fe4c71f9386..33d80a577dbef6ae29e9122fbf4ec67a1acd9c45 100644 --- a/pkgs/applications/editors/dit/default.nix +++ b/pkgs/applications/editors/dit/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, stdenv, coreutils, ncurses, lua }: +{ fetchurl, stdenv, coreutils, ncurses, lua }: stdenv.mkDerivation rec { name = "dit-${version}"; diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix index a2d246809c9d4eb61acc0a789051056886674f3f..c719c7b2da1aa430c39c654be96c0eff0475845c 100644 --- a/pkgs/applications/editors/eclipse/default.nix +++ b/pkgs/applications/editors/eclipse/default.nix @@ -1,8 +1,8 @@ -{ stdenv, lib, fetchurl, makeDesktopItem, makeWrapper -, freetype, fontconfig, libX11, libXext, libXrender, zlib +{ stdenv, fetchurl, makeDesktopItem, makeWrapper +, freetype, fontconfig, libX11, libXrender, zlib , glib, gtk3, libXtst, jdk, gsettings-desktop-schemas , webkitgtk ? null # for internal web browser -, buildEnv, writeText, runCommand +, buildEnv, runCommand , callPackage }: diff --git a/pkgs/applications/editors/emacs-modes/emacs-clang-complete-async/default.nix b/pkgs/applications/editors/emacs-modes/emacs-clang-complete-async/default.nix index 9585f3278211d1f9a260e4bf6f571965f53a6e83..66ac9a3d77e688a6d011725f34819b7e1537d8e8 100644 --- a/pkgs/applications/editors/emacs-modes/emacs-clang-complete-async/default.nix +++ b/pkgs/applications/editors/emacs-modes/emacs-clang-complete-async/default.nix @@ -1,4 +1,4 @@ -{ clangStdenv, fetchgit, llvmPackages, clang }: +{ clangStdenv, fetchgit, llvmPackages }: clangStdenv.mkDerivation { name = "emacs-clang-complete-async-20130218"; diff --git a/pkgs/applications/editors/emacs-modes/filesets-plus/default.nix b/pkgs/applications/editors/emacs-modes/filesets-plus/default.nix index f09a71ec9df09cda98e98d556b94373b17782a81..ad22faf3dff72de577007254317d9c80d98501db 100644 --- a/pkgs/applications/editors/emacs-modes/filesets-plus/default.nix +++ b/pkgs/applications/editors/emacs-modes/filesets-plus/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, melpaBuild }: +{ fetchurl, melpaBuild }: melpaBuild { pname = "filesets-plus"; diff --git a/pkgs/applications/editors/emacs-modes/font-lock-plus/default.nix b/pkgs/applications/editors/emacs-modes/font-lock-plus/default.nix index 5362451e06bf7db3b92005663b654b37326dc5db..b4ee54f3bd31d212200bca5e6ab90e78b4aa8bc6 100644 --- a/pkgs/applications/editors/emacs-modes/font-lock-plus/default.nix +++ b/pkgs/applications/editors/emacs-modes/font-lock-plus/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, melpaBuild }: +{ fetchurl, lib, melpaBuild }: melpaBuild { pname = "font-lock-plus"; diff --git a/pkgs/applications/editors/emacs-modes/header2/default.nix b/pkgs/applications/editors/emacs-modes/header2/default.nix index 7da40425185bc440aa9a39f3a846b26e8442d7e8..171d8c6b16aec1c2529a381cbf396436b6e863b4 100644 --- a/pkgs/applications/editors/emacs-modes/header2/default.nix +++ b/pkgs/applications/editors/emacs-modes/header2/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, melpaBuild }: +{ fetchurl, lib, melpaBuild }: melpaBuild { pname = "header2"; diff --git a/pkgs/applications/editors/emacs-modes/hexrgb/default.nix b/pkgs/applications/editors/emacs-modes/hexrgb/default.nix index 3144eea702df62120209d148731dbcaa70d8db58..8b9ebcd60262765454c0c831d4390e60f52b3979 100644 --- a/pkgs/applications/editors/emacs-modes/hexrgb/default.nix +++ b/pkgs/applications/editors/emacs-modes/hexrgb/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, melpaBuild }: +{ fetchurl, lib, melpaBuild }: melpaBuild { pname = "hexrgb"; diff --git a/pkgs/applications/editors/emacs-modes/lib-requires/default.nix b/pkgs/applications/editors/emacs-modes/lib-requires/default.nix index 8e5d5ee1929ffde88cf4ae32ea93d49a1b4375c3..84dae10127e9ea9f287d1c294df0e7bdfcb50d0a 100644 --- a/pkgs/applications/editors/emacs-modes/lib-requires/default.nix +++ b/pkgs/applications/editors/emacs-modes/lib-requires/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, melpaBuild }: +{ fetchurl, lib, melpaBuild }: melpaBuild { pname = "lib-requires"; diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix index bf0d503689729629b296f3ff3e271c62504a80e0..c0febd803cc0292bc7cf6284e25857d56f718877 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix @@ -13,7 +13,7 @@ To update the list of packages from MELPA, */ -{ lib, external }: +{ external }: self: diff --git a/pkgs/applications/editors/emacs-modes/ocaml/default.nix b/pkgs/applications/editors/emacs-modes/ocaml/default.nix index 7ed6355f9815a344228f75a706870426506b20b9..9f8d408dd5a2dabd1c7289e4fefb38618bbce653 100644 --- a/pkgs/applications/editors/emacs-modes/ocaml/default.nix +++ b/pkgs/applications/editors/emacs-modes/ocaml/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, emacs, ocaml }: +{ stdenv, emacs, ocaml }: # this package installs the emacs-mode which # resides in the ocaml compiler sources. diff --git a/pkgs/applications/editors/emacs-modes/org-packages.nix b/pkgs/applications/editors/emacs-modes/org-packages.nix index 8df45ffb61ee63291bc92034dd00b62de458627f..46b90a52a0913ec3c08e2624f2b3524a36386749 100644 --- a/pkgs/applications/editors/emacs-modes/org-packages.nix +++ b/pkgs/applications/editors/emacs-modes/org-packages.nix @@ -11,7 +11,7 @@ To update the list of packages from ELPA, */ -{ fetchurl, lib, stdenv, texinfo }: +{ }: self: diff --git a/pkgs/applications/editors/emacs-modes/org/default.nix b/pkgs/applications/editors/emacs-modes/org/default.nix index 1189fd1d6d15020c4070ee3f368cddcebdc9f94a..99ecddcb26481972076032c2f60d9e5e80bb3c6d 100644 --- a/pkgs/applications/editors/emacs-modes/org/default.nix +++ b/pkgs/applications/editors/emacs-modes/org/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, emacs, texinfo, which, texlive }: +{ fetchurl, stdenv, emacs, texinfo, texlive }: stdenv.mkDerivation rec { name = "org-8.3.3"; diff --git a/pkgs/applications/editors/emacs-modes/thingatpt-plus/default.nix b/pkgs/applications/editors/emacs-modes/thingatpt-plus/default.nix index d68feaec2939da6e0d1b1d53526e2ca63ff3aaa8..820919b5321f9ae548cf1b4b36a830fbe2bfb8be 100644 --- a/pkgs/applications/editors/emacs-modes/thingatpt-plus/default.nix +++ b/pkgs/applications/editors/emacs-modes/thingatpt-plus/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, melpaBuild }: +{ fetchurl, lib, melpaBuild }: melpaBuild { pname = "thingatpt-plus"; diff --git a/pkgs/applications/editors/emacs/25.nix b/pkgs/applications/editors/emacs/25.nix index b659e060e3b4aade7c6cf43f6492eb8cde080a35..ee21bbbd9bd9a94b6d1fc12438f1d21ebbb90ee3 100644 --- a/pkgs/applications/editors/emacs/25.nix +++ b/pkgs/applications/editors/emacs/25.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, ncurses, xlibsWrapper, libXaw, libXpm, Xaw3d , pkgconfig, gettext, libXft, dbus, libpng, libjpeg, libungif , libtiff, librsvg, gconf, libxml2, imagemagick, gnutls, libselinux -, alsaLib, cairo, acl, gpm, AppKit, CoreWLAN, Kerberos, GSS, ImageIO +, alsaLib, cairo, acl, gpm, AppKit, GSS, ImageIO , withX ? !stdenv.isDarwin , withGTK2 ? false, gtk2 ? null , withGTK3 ? true, gtk3 ? null, gsettings-desktop-schemas ? null diff --git a/pkgs/applications/editors/emacs/default.nix b/pkgs/applications/editors/emacs/default.nix index 67afdb24cd4729d62de789fd0f1165428b76825c..01eaac7be5d1bbf6465dfe99933b20e144ecbaeb 100644 --- a/pkgs/applications/editors/emacs/default.nix +++ b/pkgs/applications/editors/emacs/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, ncurses, xlibsWrapper, libXaw, libXpm, Xaw3d , pkgconfig, gettext, libXft, dbus, libpng, libjpeg, libungif , libtiff, librsvg, gconf, libxml2, imagemagick, gnutls, libselinux -, alsaLib, cairo, acl, gpm, AppKit, CoreWLAN, Kerberos, GSS, ImageIO +, alsaLib, cairo, acl, gpm, AppKit, GSS, ImageIO , withX ? !stdenv.isDarwin , withGTK2 ? false, gtk2 ? null , withGTK3 ? true, gtk3 ? null, gsettings-desktop-schemas ? null diff --git a/pkgs/applications/editors/jetbrains/common.nix b/pkgs/applications/editors/jetbrains/common.nix index 7715de153981d9ad241fa0fec77e8f6151ebcc3d..f357972c449189d6fa1072aa59df7fbc713ec87e 100644 --- a/pkgs/applications/editors/jetbrains/common.nix +++ b/pkgs/applications/editors/jetbrains/common.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, makeDesktopItem, makeWrapper, patchelf, p7zip -, coreutils, gnugrep, which, git, python, unzip, libsecret +{ stdenv, makeDesktopItem, makeWrapper, patchelf, p7zip +, coreutils, gnugrep, which, git, unzip, libsecret }: { name, product, version, src, wmClass, jdk, meta } @ attrs: diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 060d1de5e045e144717a22343591f085045ed115..2d7ea931dd2a8643f65ebbed21e30470a046cf4a 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, callPackage, fetchurl, makeDesktopItem, makeWrapper, patchelf -, coreutils, gnugrep, which, git, python, unzip, p7zip -, androidsdk, jdk, cmake, libxml2, zlib, python3, ncurses +{ lib, stdenv, callPackage, fetchurl +, python +, jdk, cmake, libxml2, zlib, python3, ncurses }: with stdenv.lib; @@ -10,7 +10,7 @@ let # Sorted alphabetically - buildClion = { name, version, src, license, description, wmClass, update-channel }: + buildClion = { name, version, src, license, description, wmClass, ... }: lib.overrideDerivation (mkJetBrainsProduct rec { inherit name version src wmClass jdk; product = "CLion"; @@ -66,7 +66,7 @@ let ''; }); - buildDataGrip = { name, version, src, license, description, wmClass, update-channel }: + buildDataGrip = { name, version, src, license, description, wmClass, ... }: (mkJetBrainsProduct { inherit name version src wmClass jdk; product = "DataGrip"; @@ -83,7 +83,7 @@ let }; }); - buildGoland = { name, version, src, license, description, wmClass, update-channel }: + buildGoland = { name, version, src, license, description, wmClass, ... }: lib.overrideDerivation (mkJetBrainsProduct { inherit name version src wmClass jdk; product = "Goland"; @@ -108,7 +108,7 @@ let ''; }); - buildIdea = { name, version, src, license, description, wmClass, update-channel }: + buildIdea = { name, version, src, license, description, wmClass, ... }: (mkJetBrainsProduct rec { inherit name version src wmClass jdk; product = "IDEA"; @@ -125,7 +125,7 @@ let }; }); - buildPhpStorm = { name, version, src, license, description, wmClass, update-channel }: + buildPhpStorm = { name, version, src, license, description, wmClass, ... }: (mkJetBrainsProduct { inherit name version src wmClass jdk; product = "PhpStorm"; @@ -142,7 +142,7 @@ let }; }); - buildPycharm = { name, version, src, license, description, wmClass, update-channel }: + buildPycharm = { name, version, src, license, description, wmClass, ... }: (mkJetBrainsProduct rec { inherit name version src wmClass jdk; product = "PyCharm"; @@ -169,7 +169,7 @@ let propagatedUserEnvPkgs = [ python ]; }; - buildRider = { name, version, src, license, description, wmClass, update-channel }: + buildRider = { name, version, src, license, description, wmClass, ... }: lib.overrideDerivation (mkJetBrainsProduct rec { inherit name version src wmClass jdk; product = "Rider"; @@ -195,7 +195,7 @@ let ''; }); - buildRubyMine = { name, version, src, license, description, wmClass, update-channel }: + buildRubyMine = { name, version, src, license, description, wmClass, ... }: (mkJetBrainsProduct rec { inherit name version src wmClass jdk; product = "RubyMine"; @@ -208,7 +208,7 @@ let }; }); - buildWebStorm = { name, version, src, license, description, wmClass, update-channel }: + buildWebStorm = { name, version, src, license, description, wmClass, ... }: lib.overrideDerivation (mkJetBrainsProduct { inherit name version src wmClass jdk; product = "WebStorm"; diff --git a/pkgs/applications/editors/jucipp/default.nix b/pkgs/applications/editors/jucipp/default.nix index 6f5f416f4f5f40d7601433038c3f52553e9e405c..08918beb8d5921cf3c26edd5bf9797fae56f50e3 100644 --- a/pkgs/applications/editors/jucipp/default.nix +++ b/pkgs/applications/editors/jucipp/default.nix @@ -1,4 +1,4 @@ -{ config, stdenv, fetchgit, makeWrapper, gnome3, at-spi2-core, libcxx, +{ stdenv, fetchgit, gnome3, at-spi2-core, boost, epoxy, cmake, aspell, llvmPackages, libgit2, pkgconfig, pcre, libXdmcp, libxkbcommon, libpthreadstubs, wrapGAppsHook, aspellDicts, coreutils, glibc, dbus, openssl, libxml2, gnumake, ctags }: diff --git a/pkgs/applications/editors/kakoune/default.nix b/pkgs/applications/editors/kakoune/default.nix index 8ef1e549906ef0cd08f364ac8c870c66ec6187eb..83598bd7eb172a13b36037c5f6e5336032b11f11 100644 --- a/pkgs/applications/editors/kakoune/default.nix +++ b/pkgs/applications/editors/kakoune/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ncurses, boost, asciidoc, docbook_xsl, libxslt, pkgconfig }: +{ stdenv, fetchFromGitHub, ncurses, asciidoc, docbook_xsl, libxslt, pkgconfig }: with stdenv.lib; diff --git a/pkgs/applications/editors/kodestudio/default.nix b/pkgs/applications/editors/kodestudio/default.nix index b03abc2146aaab2c8bc36637e12d1bd0d4c2f1aa..4e22e032e357ffe8e2bd65e6e1dadeecae8cd85c 100644 --- a/pkgs/applications/editors/kodestudio/default.nix +++ b/pkgs/applications/editors/kodestudio/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, callPackage, fetchurl, makeDesktopItem, makeWrapper +{ stdenv, lib, fetchurl, makeDesktopItem, makeWrapper , # Patchelf dependencies: alsaLib, atomEnv, boehmgc, flac, libogg, libvorbis, libXScrnSaver, libGLU_combined , openssl, xorg, zlib diff --git a/pkgs/applications/editors/monodevelop/default.nix b/pkgs/applications/editors/monodevelop/default.nix index 66112b3498dd560714e44291a9b01e1808d7e4e0..69e102f207750f03ecf421543e34fa97a3807404 100644 --- a/pkgs/applications/editors/monodevelop/default.nix +++ b/pkgs/applications/editors/monodevelop/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchgit, fetchNuGet +{ stdenv, fetchurl , autoconf, automake, pkgconfig, shared-mime-info, intltool , glib, mono, gtk-sharp-2_0, gnome2, gnome-sharp, unzip , dotnetPackages diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix index fb0ce43a60e6e75ef078d7dbd03f813a30e99e41..96a9cea09c762be82eac3a7b05caee9ebe7753ba 100644 --- a/pkgs/applications/editors/nano/default.nix +++ b/pkgs/applications/editors/nano/default.nix @@ -1,4 +1,4 @@ -{ stdenv, hostPlatform, fetchurl, fetchFromGitHub +{ stdenv, fetchurl, fetchFromGitHub , ncurses , texinfo , gettext ? null diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix index f47688b8280201a61fc99193110b1be6964bf775..af454d357e95ed96405a14164ac32bb2238c31ce 100644 --- a/pkgs/applications/editors/neovim/default.nix +++ b/pkgs/applications/editors/neovim/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, cmake, gettext, libmsgpack, libtermkey, libiconv -, libtool, libuv, luaPackages, ncurses, perl, pkgconfig -, unibilium, vimUtils, xsel, gperf, callPackage +, libuv, luaPackages, ncurses, pkgconfig +, unibilium, xsel, gperf , libvterm-neovim , withJemalloc ? true, jemalloc }: diff --git a/pkgs/applications/editors/neovim/wrapper.nix b/pkgs/applications/editors/neovim/wrapper.nix index f1ec03cb42ee7fbb4904032d79040f3fdf4290d3..fa0603255599418cfd5ec3bba1147ff428cbf5f7 100644 --- a/pkgs/applications/editors/neovim/wrapper.nix +++ b/pkgs/applications/editors/neovim/wrapper.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, makeDesktopItem, makeWrapper +{ stdenv, lib, makeWrapper , vimUtils , bundlerEnv, ruby , pythonPackages @@ -10,8 +10,7 @@ neovim: let wrapper = { - name ? "neovim" - , withPython ? true, extraPythonPackages ? [] + withPython ? true, extraPythonPackages ? [] , withPython3 ? true, extraPython3Packages ? [] , withRuby ? true , withPyGUI ? false diff --git a/pkgs/applications/editors/nvpy/default.nix b/pkgs/applications/editors/nvpy/default.nix index e806e63cdbf626e3c98d0dd94c1749d2ee25054f..567f47520352799555ee8ceb544613dca076bb2e 100644 --- a/pkgs/applications/editors/nvpy/default.nix +++ b/pkgs/applications/editors/nvpy/default.nix @@ -1,4 +1,4 @@ -{ pkgs, fetchurl, tk, python2Packages }: +{ pkgs, fetchurl, python2Packages }: let pythonPackages = python2Packages; diff --git a/pkgs/applications/editors/texmacs/darwin.nix b/pkgs/applications/editors/texmacs/darwin.nix index e319ccf39b1b1639c1627ef5168b71ff61795fb5..dfb2e49e0c8d02ccbc18514bd8225c4bd5de1bb0 100644 --- a/pkgs/applications/editors/texmacs/darwin.nix +++ b/pkgs/applications/editors/texmacs/darwin.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, fetchurl, makeWrapper, +{ stdenv, callPackage, fetchurl, guile_1_8, qt4, zlib, freetype, CoreFoundation, Cocoa, gettext, libiconv, ghostscript, tex ? null, aspell ? null, diff --git a/pkgs/applications/editors/tiled/default.nix b/pkgs/applications/editors/tiled/default.nix index b23db38e0f45930c28eb411ae43c059e2d481193..5f9fa850fe66b57e37c6c4bc619c44921420a291 100644 --- a/pkgs/applications/editors/tiled/default.nix +++ b/pkgs/applications/editors/tiled/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, pkgconfig, qmake -, python, qtbase, qttools, zlib }: +, python, qtbase, qttools }: stdenv.mkDerivation rec { name = "tiled-${version}"; diff --git a/pkgs/applications/editors/typora/default.nix b/pkgs/applications/editors/typora/default.nix index 082bc2a2536c3469a66ee5d60faeab4a1d95212a..7777ef1f17ccc7508cb48440b27f77f8dfa8dfd0 100644 --- a/pkgs/applications/editors/typora/default.nix +++ b/pkgs/applications/editors/typora/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, dpkg, lib, glib, dbus, makeWrapper, gnome3, gtk3, atk, cairo, pango +{ stdenv, fetchurl, dpkg, glib, dbus, makeWrapper, gnome3, gtk3, atk, cairo, pango , gdk_pixbuf, freetype, fontconfig, nspr, nss, xorg, alsaLib, cups, expat, udev, wrapGAppsHook }: stdenv.mkDerivation rec { diff --git a/pkgs/applications/editors/vim/macvim.nix b/pkgs/applications/editors/vim/macvim.nix index b6c03a57b561cdc6b886ec2816fcb955141eb62c..c97b17bd9af1f1ac217543f300ef216c36b671e0 100644 --- a/pkgs/applications/editors/vim/macvim.nix +++ b/pkgs/applications/editors/vim/macvim.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, ncurses, gettext -, pkgconfig, cscope, python, ruby, tcl, perl, luajit +, pkgconfig, python, ruby, tcl, perl, luajit , darwin }: diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/default.nix index cf58d5d219080fa44d9d528e59006a73085ef361..3e815642c178abf4bb94af090ba8c12bb70845c8 100644 --- a/pkgs/applications/editors/vscode/default.nix +++ b/pkgs/applications/editors/vscode/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, callPackage, fetchurl, unzip, atomEnv, makeDesktopItem, +{ stdenv, lib, fetchurl, unzip, atomEnv, makeDesktopItem, gtk2, makeWrapper, libXScrnSaver, libxkbfile, libsecret }: let diff --git a/pkgs/applications/editors/vscode/with-extensions.nix b/pkgs/applications/editors/vscode/with-extensions.nix index 9b0d69ae65aacc11786558565fe02d8afc031da6..5535d9ab11282e835395c0f0c99c1a5bca543801 100644 --- a/pkgs/applications/editors/vscode/with-extensions.nix +++ b/pkgs/applications/editors/vscode/with-extensions.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, runCommand, buildEnv, vscode, which, writeScript +{ stdenv, lib, runCommand, buildEnv, vscode, which, writeScript , vscodeExtensions ? [] }: /* diff --git a/pkgs/applications/editors/wxhexeditor/default.nix b/pkgs/applications/editors/wxhexeditor/default.nix index 5597bf0d0b3cb1e73048352d1c3433d29ed7bfd3..c345e8a95d55b6a1e8976877cf13eeea6f52d6d1 100644 --- a/pkgs/applications/editors/wxhexeditor/default.nix +++ b/pkgs/applications/editors/wxhexeditor/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, wxGTK, autoconf, automake, libtool, python, gettext, bash }: +{ stdenv, fetchFromGitHub, fetchpatch, wxGTK, autoconf, automake, libtool, python, gettext }: stdenv.mkDerivation rec { name = "wxHexEditor-${version}"; diff --git a/pkgs/applications/gis/qgis/default.nix b/pkgs/applications/gis/qgis/default.nix index 02e874739efe09ca9d578e7fce4a5f2065dbe5c4..c2ead5a19141e7e8d114832b8671d0f651e30e12 100644 --- a/pkgs/applications/gis/qgis/default.nix +++ b/pkgs/applications/gis/qgis/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, gdal, cmake, qt4, flex, bison, proj, geos, xlibsWrapper, sqlite, gsl +{ stdenv, fetchurl, gdal, cmake, qt4, flex, bison, proj, geos, xlibsWrapper, sqlite, gsl , qwt, fcgi, python2Packages, libspatialindex, libspatialite, qscintilla, postgresql, makeWrapper , qjson, qca2, txt2tags, openssl, darwin, pkgconfig , withGrass ? true, grass, IOKit, ApplicationServices diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix index 63cf950f02a4e91d283a869177bdb73b8fff4868..86aafa9697df825b3bbfd9be30b6a4adda934093 100644 --- a/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -1,8 +1,8 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, pkgconfig, libtool +{ lib, stdenv, fetchFromGitHub, pkgconfig, libtool , bzip2, zlib, libX11, libXext, libXt, fontconfig, freetype, ghostscript, libjpeg , lcms2, openexr, libpng, librsvg, libtiff, libxml2, openjpeg, libwebp, libheif , ApplicationServices -, buildPlatform, hostPlatform +, hostPlatform }: let diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index b767f11da00b7ddab68a1bb651cb6d22908b8b7c..94a4aeaa9337e7b6a419b5e19c6d0df65093bb33 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -2,7 +2,7 @@ , bzip2, zlib, libX11, libXext, libXt, fontconfig, freetype, ghostscript, libjpeg , lcms2, openexr, libpng, librsvg, libtiff, libxml2, openjpeg, libwebp, fftw, libheif, libde265 , ApplicationServices -, buildPlatform, hostPlatform +, hostPlatform }: let diff --git a/pkgs/applications/graphics/ahoviewer/default.nix b/pkgs/applications/graphics/ahoviewer/default.nix index 5fb7e0078065d9d8937799e3258052952ca5d714..5326458038087b3101d0afcb9934c10c99f38e6e 100644 --- a/pkgs/applications/graphics/ahoviewer/default.nix +++ b/pkgs/applications/graphics/ahoviewer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgs, fetchurl, fetchFromGitHub, pkgconfig, libconfig, +{ stdenv, fetchFromGitHub, pkgconfig, libconfig, gtkmm2, glibmm, libxml2, libsecret, curl, libzip, librsvg, gst_all_1, autoreconfHook, makeWrapper, useUnrar ? false, unrar diff --git a/pkgs/applications/graphics/avocode/default.nix b/pkgs/applications/graphics/avocode/default.nix index fbf6443b91f852206f47afd349a6e99e1c8a6af6..d427b2586c005c1d1a44d0bada5f065833615437 100644 --- a/pkgs/applications/graphics/avocode/default.nix +++ b/pkgs/applications/graphics/avocode/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, makeDesktopItem, fetchurl, unzip +{ stdenv, makeDesktopItem, fetchurl, unzip , gdk_pixbuf, glib, gtk2, atk, pango, cairo, freetype, fontconfig, dbus, nss, nspr, alsaLib, cups, expat, udev, gnome2 , xorg, mozjpeg }: diff --git a/pkgs/applications/graphics/awesomebump/default.nix b/pkgs/applications/graphics/awesomebump/default.nix index f7a813f360612979f9a5deb00ccadde382b05ab4..df742645e86b1d241476bf3cbcd8b573b8514a89 100644 --- a/pkgs/applications/graphics/awesomebump/default.nix +++ b/pkgs/applications/graphics/awesomebump/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, qtbase, qmake, makeWrapper, qtscript, gcc, flex, bison, qtdeclarative, gnutar }: +{ lib, stdenv, fetchgit, qtbase, qmake, makeWrapper, qtscript, flex, bison, qtdeclarative }: let diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix index 5c6a4bab93066ceff03ef6cf0a9280df9fbb77ae..a31bbe8caeb6f780691a5e63164b8b213cd0eac8 100644 --- a/pkgs/applications/graphics/digikam/default.nix +++ b/pkgs/applications/graphics/digikam/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchFromGitHub, cmake, doxygen, extra-cmake-modules, wrapGAppsHook, fetchpatch +{ mkDerivation, lib, fetchFromGitHub, cmake, doxygen, extra-cmake-modules, wrapGAppsHook # For `digitaglinktree` , perl, sqlite @@ -35,7 +35,6 @@ , libusb1 , marble , libGLU_combined -, mysql , opencv3 , pcre , threadweaver diff --git a/pkgs/applications/graphics/dosage/default.nix b/pkgs/applications/graphics/dosage/default.nix index 7667b674fcec60d459f2bd97856478309c2c2001..69d09cd429c1278ffad46e5a583bd9c9ac2da5b9 100644 --- a/pkgs/applications/graphics/dosage/default.nix +++ b/pkgs/applications/graphics/dosage/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pythonPackages, fetchFromGitHub }: +{ pythonPackages, fetchFromGitHub }: pythonPackages.buildPythonApplication rec { pname = "dosage"; diff --git a/pkgs/applications/graphics/epeg/default.nix b/pkgs/applications/graphics/epeg/default.nix index 02528a43e31b6216ff9e7037978c80e4ad4c805d..ef694dec6527fad6b703af72b4b7cf8dcb30b0be 100644 --- a/pkgs/applications/graphics/epeg/default.nix +++ b/pkgs/applications/graphics/epeg/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, libtool, autoconf, automake +{ stdenv, fetchFromGitHub, pkgconfig, libtool, autoconf, automake , libjpeg, libexif }: diff --git a/pkgs/applications/graphics/fstl/default.nix b/pkgs/applications/graphics/fstl/default.nix index 355acf7681a09c302c215b31dbbe6321f0d2d3c1..b1437508a5094814f73d337abb15fa5495c64936 100644 --- a/pkgs/applications/graphics/fstl/default.nix +++ b/pkgs/applications/graphics/fstl/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, qtbase, mesa_glu, qmake}: +{stdenv, fetchFromGitHub, qtbase, mesa_glu}: stdenv.mkDerivation rec { name = "fstl-${version}"; version = "0.9.3"; diff --git a/pkgs/applications/graphics/glabels/default.nix b/pkgs/applications/graphics/glabels/default.nix index 2d4fa882dd61b55a704a9fe38b91ae9564075228..b4715902df1f17b97cc6d579a916c2f84c150b33 100644 --- a/pkgs/applications/graphics/glabels/default.nix +++ b/pkgs/applications/graphics/glabels/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, barcode, gnome3, autoreconfHook , gtk3, gtk-doc, libxml2, librsvg , libtool, libe-book -, intltool, itstool, makeWrapper, pkgconfig, which +, intltool, itstool, makeWrapper, pkgconfig }: stdenv.mkDerivation rec { diff --git a/pkgs/applications/graphics/goxel/default.nix b/pkgs/applications/graphics/goxel/default.nix index 3d49452cbe62dd29e5488ba5961122b3a9510cbb..99230eb23e32d6fe876c8ec1c632083d23313fdd 100644 --- a/pkgs/applications/graphics/goxel/default.nix +++ b/pkgs/applications/graphics/goxel/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, scons, pkgconfig, wrapGAppsHook +{ stdenv, fetchFromGitHub, scons, pkgconfig, wrapGAppsHook , glfw3, gtk3, libpng12 }: stdenv.mkDerivation rec { diff --git a/pkgs/applications/graphics/graphicsmagick/default.nix b/pkgs/applications/graphics/graphicsmagick/default.nix index 2c322128c38695d6cec44b07d0be4bdcfdc75d67..ee58e9831e9af57086c9a04e5043ecbf731b2922 100644 --- a/pkgs/applications/graphics/graphicsmagick/default.nix +++ b/pkgs/applications/graphics/graphicsmagick/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, bzip2, freetype, graphviz, ghostscript +{ stdenv, fetchurl, bzip2, freetype, graphviz, ghostscript , libjpeg, libpng, libtiff, libxml2, zlib, libtool, xz, libX11 , libwebp, quantumdepth ? 8, fixDarwinDylibNames }: diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index 639f1928f8a4b113be955c2867b237758c760d7f..a82f13ee409ab1d40aa6361574591bc7b8b19cb3 100644 --- a/pkgs/applications/graphics/inkscape/default.nix +++ b/pkgs/applications/graphics/inkscape/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, perl, perlXMLParser, libXft +{ stdenv, fetchurl, pkgconfig, perl, perlXMLParser, libXft , libpng, zlib, popt, boehmgc, libxml2, libxslt, glib, gtkmm2 , glibmm, libsigcxx, lcms, boost, gettext, makeWrapper , gsl, python2, poppler, imagemagick, libwpg, librevenge diff --git a/pkgs/applications/graphics/k3d/default.nix b/pkgs/applications/graphics/k3d/default.nix index 996d495d87c1a3f8f9b7c06fb0f10649b3608284..3555c2b477ffccc3ed4641d542aaa93da67cff56 100644 --- a/pkgs/applications/graphics/k3d/default.nix +++ b/pkgs/applications/graphics/k3d/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, unzip, ftgl, glew, asciidoc +{ stdenv, fetchFromGitHub, fetchpatch, ftgl, glew, asciidoc , cmake, ninja, libGLU_combined, zlib, python, expat, libxml2, libsigcxx, libuuid, freetype , libpng, boost, doxygen, cairomm, pkgconfig, imagemagick, libjpeg, libtiff , gettext, intltool, perl, gtkmm2, glibmm, gtkglext, pangox_compat, libXmu }: diff --git a/pkgs/applications/graphics/kgraphviewer/default.nix b/pkgs/applications/graphics/kgraphviewer/default.nix index 8f043816ba06d6087ae93ab34a230a3a96702aa1..0d898df14b3f9ee5d9246ca289661f3009681f08 100644 --- a/pkgs/applications/graphics/kgraphviewer/default.nix +++ b/pkgs/applications/graphics/kgraphviewer/default.nix @@ -1,5 +1,5 @@ { stdenv, mkDerivation, fetchurl, cmake, extra-cmake-modules, pkgconfig, wrapGAppsHook -, kconfig, kcrash, kinit, kdoctools, kiconthemes, kio, kparts, kwidgetsaddons +, kconfig, kinit, kdoctools, kio, kparts, kwidgetsaddons , qtbase, qtsvg , boost, graphviz }: diff --git a/pkgs/applications/graphics/krita/default.nix b/pkgs/applications/graphics/krita/default.nix index 1fd19162a4f7612142db0ac2f829de1235c92071..ec92638f8559073eeb516aff287fffc3692102bc 100644 --- a/pkgs/applications/graphics/krita/default.nix +++ b/pkgs/applications/graphics/krita/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchurl, fetchpatch, cmake, extra-cmake-modules +{ mkDerivation, lib, fetchurl, cmake, extra-cmake-modules , karchive, kconfig, kwidgetsaddons, kcompletion, kcoreaddons , kguiaddons, ki18n, kitemmodels, kitemviews, kwindowsystem , kio, kcrash diff --git a/pkgs/applications/graphics/nomacs/default.nix b/pkgs/applications/graphics/nomacs/default.nix index 1103c9ff40a95a3d7a92323dfb74a8be6b785320..50862a4583b4d64b7bff86f6b4f3658b63453512 100644 --- a/pkgs/applications/graphics/nomacs/default.nix +++ b/pkgs/applications/graphics/nomacs/default.nix @@ -1,7 +1,6 @@ { stdenv , fetchFromGitHub , cmake -, makeWrapper , pkgconfig , wrapGAppsHook , gsettings-desktop-schemas diff --git a/pkgs/applications/graphics/openscad/default.nix b/pkgs/applications/graphics/openscad/default.nix index 9ab5288700cce31ba73ac8b9b2fc2a86ea161492..44855d5c8b49c0c4f06e9f054bac229b6141704d 100644 --- a/pkgs/applications/graphics/openscad/default.nix +++ b/pkgs/applications/graphics/openscad/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchFromGitHub, qt5, libsForQt5 +{ stdenv, fetchFromGitHub, qt5, libsForQt5 , bison, flex, eigen, boost, libGLU_combined, glew, opencsg, cgal , mpfr, gmp, glib, pkgconfig, harfbuzz, gettext }: diff --git a/pkgs/applications/graphics/processing3/default.nix b/pkgs/applications/graphics/processing3/default.nix index 803257d9392915381945a10a0775605f93f06249..6916ef4ad7aad59cec345a4fbc53e83813219a1a 100644 --- a/pkgs/applications/graphics/processing3/default.nix +++ b/pkgs/applications/graphics/processing3/default.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, fetchFromGitHub, fetchurl, xmlstarlet, makeWrapper, ant, jdk, rsync, javaPackages, libXxf86vm, gsettings-desktop-schemas }: +{ stdenv, fetchFromGitHub, fetchurl, xmlstarlet, makeWrapper, ant, jdk, rsync, javaPackages, libXxf86vm, gsettings-desktop-schemas }: stdenv.mkDerivation rec { version = "3.3.7"; diff --git a/pkgs/applications/graphics/sane/backends/generic.nix b/pkgs/applications/graphics/sane/backends/generic.nix index 2ca1fead84c8988fa5599671f7e268cf40ebdc4f..0f47c82f0325324c5871c31b5b570750fe4838e9 100644 --- a/pkgs/applications/graphics/sane/backends/generic.nix +++ b/pkgs/applications/graphics/sane/backends/generic.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ stdenv , avahi, libjpeg, libusb1, libv4l, net_snmp, libpng , gettext, pkgconfig diff --git a/pkgs/applications/graphics/scantailor/advanced.nix b/pkgs/applications/graphics/scantailor/advanced.nix index 29e53683d1c24cbbcc7253c03414476b07198eee..d55441e39fa55fad5aa14127987d49d77dca251e 100644 --- a/pkgs/applications/graphics/scantailor/advanced.nix +++ b/pkgs/applications/graphics/scantailor/advanced.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, makeDesktopItem +{ stdenv, fetchFromGitHub , cmake, libjpeg, libpng, libtiff, boost , qtbase, qttools }: diff --git a/pkgs/applications/graphics/screencloud/default.nix b/pkgs/applications/graphics/screencloud/default.nix index cffe485711f639640e925d83bdf37accd9b87cb1..292ae9c8faa875de4929bec6e859f0148c11d570 100644 --- a/pkgs/applications/graphics/screencloud/default.nix +++ b/pkgs/applications/graphics/screencloud/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchFromGitHub, cmake, qt4, quazip, qt-mobility, qxt, pythonPackages, glib }: +{ stdenv, fetchFromGitHub, cmake, qt4, quazip, qt-mobility, qxt, pythonPackages }: with stdenv.lib; stdenv.mkDerivation rec { diff --git a/pkgs/applications/graphics/shutter/default.nix b/pkgs/applications/graphics/shutter/default.nix index 3bc814e1e758d88428b06f93d9921d7f54380cae..1f41253b69946427d71e2b35ee6773e7ddae8511 100644 --- a/pkgs/applications/graphics/shutter/default.nix +++ b/pkgs/applications/graphics/shutter/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, perl, perlPackages, makeWrapper, imagemagick, gdk_pixbuf, librsvg +{ stdenv, fetchurl, perl, perlPackages, makeWrapper, imagemagick, gdk_pixbuf, librsvg , hicolor-icon-theme }: diff --git a/pkgs/applications/graphics/synfigstudio/default.nix b/pkgs/applications/graphics/synfigstudio/default.nix index 930a7e686f8f1c5164029cb36fae565573494c9f..63d35cc545316f2c91677c77403aa3cf641497c0 100644 --- a/pkgs/applications/graphics/synfigstudio/default.nix +++ b/pkgs/applications/graphics/synfigstudio/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchFromGitHub, boost, cairo, fontsConf, gettext, glibmm, gtk3, gtkmm3 -, libjack2, libsigcxx, libtool, libxmlxx, makeWrapper, mlt-qt5, pango, pkgconfig +{ stdenv, fetchFromGitHub, boost, cairo, gettext, glibmm, gtk3, gtkmm3 +, libjack2, libsigcxx, libxmlxx, makeWrapper, mlt-qt5, pango, pkgconfig , imagemagick, intltool, autoreconfHook, which, defaultIconTheme }: diff --git a/pkgs/applications/graphics/write_stylus/default.nix b/pkgs/applications/graphics/write_stylus/default.nix index a1c39fadb59d787e1e51739a9b32778f3a2d905c..231a9799b59f832cfe7a50c79c839424d80c4c75 100644 --- a/pkgs/applications/graphics/write_stylus/default.nix +++ b/pkgs/applications/graphics/write_stylus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, qtbase, qtsvg, makeWrapper, fetchurl, makeDesktopItem }: +{ stdenv, lib, qtbase, qtsvg, fetchurl, makeDesktopItem }: stdenv.mkDerivation rec { name = "write_stylus-${version}"; version = "209"; diff --git a/pkgs/applications/graphics/yed/default.nix b/pkgs/applications/graphics/yed/default.nix index a8b4038b11f3cdf7cabd78ca4dd4b851bea3c376..aa2435c43de686e2ff1e6e64cbb8d7554fa4da14 100644 --- a/pkgs/applications/graphics/yed/default.nix +++ b/pkgs/applications/graphics/yed/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, requireFile, makeWrapper, unzip, jre }: +{ stdenv, requireFile, makeWrapper, unzip, jre }: stdenv.mkDerivation rec { name = "yEd-${version}"; diff --git a/pkgs/applications/inferno/default.nix b/pkgs/applications/inferno/default.nix index 3f3c2a32e68edb165923bfe24684449dc9033c2e..de9be76b6e45ca8f5926d83fd598fa1110425abe 100644 --- a/pkgs/applications/inferno/default.nix +++ b/pkgs/applications/inferno/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, fetchhg, stdenv, xorg, makeWrapper }: +{ fetchhg, stdenv, xorg, makeWrapper }: stdenv.mkDerivation rec { # Inferno is a rolling release from a mercurial repository. For the verison number diff --git a/pkgs/applications/kde/ark/default.nix b/pkgs/applications/kde/ark/default.nix index fb631414838cd36005c2e72df63b48131825e4a1..598857f2e70d3d46e7f772cc3f4ebe3550e00c40 100644 --- a/pkgs/applications/kde/ark/default.nix +++ b/pkgs/applications/kde/ark/default.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, config, makeWrapper, + mkDerivation, lib, makeWrapper, extra-cmake-modules, kdoctools, diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index 8f64c88493116b53e2701886f3d66dd35a62f09a..d839a7141e3b2be8264983103f8a4db36701aeb4 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -26,8 +26,7 @@ still shows most of the available features is in `./gwenview.nix`. */ { - stdenv, lib, libsForQt5, fetchurl, recurseIntoAttrs, - plasma5, attica, phonon, + lib, libsForQt5, fetchurl, okteta }: diff --git a/pkgs/applications/kde/dolphin.nix b/pkgs/applications/kde/dolphin.nix index 2570e37bf2c9a50b9cc21e7621a2790f305f4d7a..6a4635c26fb341c6e742d36e8cf000347844dc67 100644 --- a/pkgs/applications/kde/dolphin.nix +++ b/pkgs/applications/kde/dolphin.nix @@ -1,10 +1,10 @@ { mkDerivation, lib, extra-cmake-modules, kdoctools, - baloo, baloo-widgets, dolphin-plugins, kactivities, kbookmarks, kcmutils, + baloo, baloo-widgets, kactivities, kbookmarks, kcmutils, kcompletion, kconfig, kcoreaddons, kdelibs4support, kdbusaddons, kfilemetadata, ki18n, kiconthemes, kinit, kio, knewstuff, knotifications, - konsole, kparts, ktexteditor, kwindowsystem, phonon, solid + kparts, ktexteditor, kwindowsystem, phonon, solid }: mkDerivation { diff --git a/pkgs/applications/kde/kdenlive.nix b/pkgs/applications/kde/kdenlive.nix index 65080ba7f066b201390d149dff9d0211af61dde1..9da12b248c5681c886a952002a4d71471f10d725 100644 --- a/pkgs/applications/kde/kdenlive.nix +++ b/pkgs/applications/kde/kdenlive.nix @@ -2,18 +2,13 @@ , lib , extra-cmake-modules , kdoctools -, kactivities , kconfig , kcrash , kguiaddons , kiconthemes , ki18n , kinit -, kio -, kio-extras -, kwindowsystem , kdbusaddons -, plasma-framework , knotifications , knewstuff , karchive diff --git a/pkgs/applications/kde/libkomparediff2.nix b/pkgs/applications/kde/libkomparediff2.nix index 52aa2b10e2414ca79ffe2bab0b1733aec0067183..cae2aec5668d3bd8783e86d002b69f3fba3b7963 100644 --- a/pkgs/applications/kde/libkomparediff2.nix +++ b/pkgs/applications/kde/libkomparediff2.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, extra-cmake-modules, ki18n, kxmlgui, kcodecs, kio }: +{ mkDerivation, extra-cmake-modules, ki18n, kxmlgui, kcodecs, kio }: mkDerivation { name = "libkomparediff2"; diff --git a/pkgs/applications/kde/pim-data-exporter.nix b/pkgs/applications/kde/pim-data-exporter.nix index 10123944e3a6929a040203803c67b997eb81263b..d17ffb3c044460dced77372295bed4d7d114cccb 100644 --- a/pkgs/applications/kde/pim-data-exporter.nix +++ b/pkgs/applications/kde/pim-data-exporter.nix @@ -4,7 +4,7 @@ akonadi, kcmutils, kcrash, kdbusaddons, kidentitymanagement, kldap, kmailtransport, knewstuff, knotifications, knotifyconfig, kparts, kross, ktexteditor, kwallet, libkdepim, libkleo, pimcommon, qttools, - karchive, mailcommon, messagelib, pim-data-exporter + karchive, mailcommon, messagelib }: mkDerivation { diff --git a/pkgs/applications/kde/pimcommon.nix b/pkgs/applications/kde/pimcommon.nix index 02e9a47274b4e3656288371034920b66ecf73c05..bbbcca13d9804fd855b8d97e437c78b2ce2999a1 100644 --- a/pkgs/applications/kde/pimcommon.nix +++ b/pkgs/applications/kde/pimcommon.nix @@ -2,7 +2,7 @@ mkDerivation, lib, kdepimTeam, extra-cmake-modules, kdoctools, akonadi, akonadi-contacts, akonadi-mime, grantlee, karchive, kcodecs, - kcompletion, kconfig, kconfigwidgets, kcontacts, kdbusaddons, kdesignerplugin, + kcompletion, kconfig, kconfigwidgets, kcontacts, kdbusaddons, kiconthemes, kimap, kio, kitemmodels, kjobwidgets, knewstuff, kpimtextedit, kwallet, kwindowsystem, libkdepim, qtwebengine }: diff --git a/pkgs/applications/misc/acbuild/default.nix b/pkgs/applications/misc/acbuild/default.nix index 319764ae81a5d5d1f51276b93671fcee94929177..c1b8a7eb866308ac55dedf7017d2494da14a1772 100644 --- a/pkgs/applications/misc/acbuild/default.nix +++ b/pkgs/applications/misc/acbuild/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, go, fetchFromGitHub }: +{ stdenv, go, fetchFromGitHub }: stdenv.mkDerivation rec { name = "acbuild-${version}"; diff --git a/pkgs/applications/misc/alacritty/default.nix b/pkgs/applications/misc/alacritty/default.nix index 698485fb086f3d9743507cf99cc363106ae012fc..09da61f346410683b0e7648aa15ff8be28b96b61 100644 --- a/pkgs/applications/misc/alacritty/default.nix +++ b/pkgs/applications/misc/alacritty/default.nix @@ -9,7 +9,6 @@ freetype, fontconfig, libX11, - gperf, libXcursor, libXxf86vm, libXi, diff --git a/pkgs/applications/misc/bashSnippets/default.nix b/pkgs/applications/misc/bashSnippets/default.nix index acd5ae7dd73d4f55d45122d5f542f22d817d8ca7..fc5fa4d030062251cbf6e4f1bed92c6102e699e8 100644 --- a/pkgs/applications/misc/bashSnippets/default.nix +++ b/pkgs/applications/misc/bashSnippets/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, makeWrapper -, curl, netcat, python, bind, iproute, bc, gitMinimal }: +, curl, python, bind, iproute, bc, gitMinimal }: let version = "1.17.3"; deps = lib.makeBinPath [ diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 1aabbb587eb561fd1c78bba836625cf37478afd1..8e553af52505d632c1528dc17bf41c4524b20e0d 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, fetchpatch, poppler_utils, pkgconfig, libpng +{ stdenv, fetchurl, poppler_utils, pkgconfig, libpng , imagemagick, libjpeg, fontconfig, podofo, qtbase, qmake, icu, sqlite -, makeWrapper, unrarSupport ? false, chmlib, python2Packages, xz, libusb1, libmtp +, makeWrapper, unrarSupport ? false, chmlib, python2Packages, libusb1, libmtp , xdg_utils, makeDesktopItem, wrapGAppsHook }: diff --git a/pkgs/applications/misc/cataract/default.nix b/pkgs/applications/misc/cataract/default.nix index 83292a76c5dd658d0c4098b151fd89a74d4c2174..3a9f20289227bf3cd87f498d842519e3be46340f 100644 --- a/pkgs/applications/misc/cataract/default.nix +++ b/pkgs/applications/misc/cataract/default.nix @@ -1,13 +1,4 @@ -{ callPackage -, stdenv -, fetchgit -, autoconf -, automake -, glib -, pkgconfig -, libxml2 -, exiv2 -, imagemagick }: +{ callPackage }: callPackage ./build.nix { version = "1.1.0"; diff --git a/pkgs/applications/misc/cataract/unstable.nix b/pkgs/applications/misc/cataract/unstable.nix index 8d8b063e48b375c42ea4707423935194576c209c..397aed355a952483eb84e54aa3ff9ea0a15542b2 100644 --- a/pkgs/applications/misc/cataract/unstable.nix +++ b/pkgs/applications/misc/cataract/unstable.nix @@ -1,13 +1,4 @@ -{ callPackage -, stdenv -, fetchgit -, autoconf -, automake -, glib -, pkgconfig -, libxml2 -, exiv2 -, imagemagick }: +{ callPackage }: callPackage ./build.nix { version = "unstable-2016-10-18"; diff --git a/pkgs/applications/misc/cherrytree/default.nix b/pkgs/applications/misc/cherrytree/default.nix index 03709c30373d8af8a3254ea07aa25f1344697a8c..6bd1cef7c1b26a3f6fbca0fb771427d5021aa228 100644 --- a/pkgs/applications/misc/cherrytree/default.nix +++ b/pkgs/applications/misc/cherrytree/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pythonPackages, gettext, sqlite }: +{ stdenv, fetchurl, pythonPackages, gettext }: with stdenv.lib; stdenv.mkDerivation rec { diff --git a/pkgs/applications/misc/chirp/default.nix b/pkgs/applications/misc/chirp/default.nix index 6e0152c71ed098101d0770a85681bc7405d69ca0..8c57ebead6ae2c1c290b63ee501effaef675bd18 100644 --- a/pkgs/applications/misc/chirp/default.nix +++ b/pkgs/applications/misc/chirp/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, libxml2Python, libxslt, makeWrapper -, python, pyserial, pygtk }: +, pyserial, pygtk }: stdenv.mkDerivation rec { name = "chirp-daily-${version}"; diff --git a/pkgs/applications/misc/dbvisualizer/default.nix b/pkgs/applications/misc/dbvisualizer/default.nix index 7aa19ffb30179f615fa97da9e4bc4502b227bc0b..fbeb965df3805d99eab21639f4915e4bd72cb4f1 100644 --- a/pkgs/applications/misc/dbvisualizer/default.nix +++ b/pkgs/applications/misc/dbvisualizer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, jre, coreutils, makeWrapper }: +{ stdenv, fetchurl, jre, makeWrapper }: stdenv.mkDerivation { name = "dbvisualizer-9.5.7"; diff --git a/pkgs/applications/misc/dfilemanager/default.nix b/pkgs/applications/misc/dfilemanager/default.nix index 53344595f7831827cf7d171132df7da6b9963b09..6cbdc8ece0ca47ccfa1a912663992f6bfab9aba7 100644 --- a/pkgs/applications/misc/dfilemanager/default.nix +++ b/pkgs/applications/misc/dfilemanager/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, cmake, file, qtbase, qttools, qtx11extras, solid }: +{ stdenv, fetchgit, cmake, file, qtbase, qttools, solid }: let version = "git-2016-01-10"; diff --git a/pkgs/applications/misc/electron-cash/default.nix b/pkgs/applications/misc/electron-cash/default.nix index 76b61de56088cc60dbfed3eabf207a52c0c59f2f..891222a0f10e36b295cb54f30a09df69623b594c 100644 --- a/pkgs/applications/misc/electron-cash/default.nix +++ b/pkgs/applications/misc/electron-cash/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python3Packages, qtbase }: +{ stdenv, fetchurl, python3Packages }: let diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index 383f73b62994b300b005b79aec824089735a389e..ed2f0626e5d27e3926dae2e82bea162ba942a091 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python3, python3Packages, zbar, fetchpatch }: +{ stdenv, fetchurl, python3, python3Packages, zbar }: python3Packages.buildPythonApplication rec { name = "electrum-${version}"; diff --git a/pkgs/applications/misc/evtest/default.nix b/pkgs/applications/misc/evtest/default.nix index 73911bab6f66bccc2058b24471ba5dfc3a51dc72..3d715a1d16bd30054637f30b415c392a3aac97bb 100644 --- a/pkgs/applications/misc/evtest/default.nix +++ b/pkgs/applications/misc/evtest/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, autoreconfHook, automake, pkgconfig, libxml2 }: +{ stdenv, fetchgit, autoreconfHook, pkgconfig, libxml2 }: stdenv.mkDerivation rec { name = "evtest-1.33"; diff --git a/pkgs/applications/misc/far2l/default.nix b/pkgs/applications/misc/far2l/default.nix index 9ddd39981cc2902fa2a40f5d2f8df8fe3e9f8285..d8a0c53d9e1a7d502dec8393265dd24a1e770055 100644 --- a/pkgs/applications/misc/far2l/default.nix +++ b/pkgs/applications/misc/far2l/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, makeWrapper, cmake, pkgconfig, wxGTK30, glib, pcre, m4, bash, +{ stdenv, fetchFromGitHub, makeWrapper, cmake, pkgconfig, wxGTK30, glib, pcre, m4, bash, xdg_utils, gvfs, zip, unzip, gzip, bzip2, gnutar, p7zip, xz, imagemagick, darwin }: with stdenv.lib; diff --git a/pkgs/applications/misc/finalterm/default.nix b/pkgs/applications/misc/finalterm/default.nix index 93e5d297ffb3012d42f803ae61eecb47e4878d95..2c024b9fe0edb527dd3065c1cedfdcd00635c4c0 100644 --- a/pkgs/applications/misc/finalterm/default.nix +++ b/pkgs/applications/misc/finalterm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, makeWrapper +{ stdenv, fetchFromGitHub, makeWrapper , pkgconfig, cmake, libxml2, vala_0_26, intltool, libmx, gnome3, gtk3, gtk-doc , keybinder3, clutter-gtk, libnotify , libxkbcommon, xorg, udev diff --git a/pkgs/applications/misc/gcal/default.nix b/pkgs/applications/misc/gcal/default.nix index f3f7fe2aacbae8702f8bef0d88fe51004508bc4d..a3aebf227339db2715a90695c05053ed0240e66e 100644 --- a/pkgs/applications/misc/gcal/default.nix +++ b/pkgs/applications/misc/gcal/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, ncurses }: +{ stdenv, fetchurl, ncurses }: stdenv.mkDerivation rec { name = "gcal-${version}"; diff --git a/pkgs/applications/misc/golden-cheetah/default.nix b/pkgs/applications/misc/golden-cheetah/default.nix index efd3bfe73dd9265131333ad4520ab34dd26290b6..f62eb92ac04a59676c9fc80a8d73a2b7ad10ca06 100644 --- a/pkgs/applications/misc/golden-cheetah/default.nix +++ b/pkgs/applications/misc/golden-cheetah/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl , qtbase, qtsvg, qtserialport, qtwebkit, qtmultimedia, qttools, qtconnectivity -, yacc, flex, zlib, config, qmake, makeWrapper +, yacc, flex, zlib, qmake, makeWrapper }: stdenv.mkDerivation rec { name = "golden-cheetah-${version}"; diff --git a/pkgs/applications/misc/googleearth/default.nix b/pkgs/applications/misc/googleearth/default.nix index c77f8658220b24df387905897e02114968245372..9c1b457c299da0087faa730ca9f1276c9fa1625e 100644 --- a/pkgs/applications/misc/googleearth/default.nix +++ b/pkgs/applications/misc/googleearth/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, glibc, libGLU_combined, freetype, glib, libSM, libICE, libXi, libXv -, libXrender, libXrandr, libXfixes, libXcursor, libXinerama, libXext, libX11, qt4 +, libXrender, libXrandr, libXfixes, libXcursor, libXinerama, libXext, libX11 , zlib, fontconfig, dpkg, libproxy, libxml2, gstreamer, gst_all_1, dbus }: let diff --git a/pkgs/applications/misc/gpsprune/default.nix b/pkgs/applications/misc/gpsprune/default.nix index 586807b2dd5ce131e4917ced10eb1e2a8736a91c..6689a3cae102696db1c0a0b8a7287b16373b5103 100644 --- a/pkgs/applications/misc/gpsprune/default.nix +++ b/pkgs/applications/misc/gpsprune/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, makeDesktopItem, makeWrapper, unzip, bash, jre8 }: +{ fetchurl, stdenv, makeDesktopItem, makeWrapper, unzip, jre8 }: stdenv.mkDerivation rec { name = "gpsprune-${version}"; diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix index d87ac459d0210cfe5b31ec14ffa4145a2b58fedb..ed0dd3ba5be33b58c87834275e7cc581192aeba4 100644 --- a/pkgs/applications/misc/gpxsee/default.nix +++ b/pkgs/applications/misc/gpxsee/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, qmake, qtbase, qttools }: +{ stdenv, fetchFromGitHub, qmake, qttools }: stdenv.mkDerivation rec { name = "gpxsee-${version}"; diff --git a/pkgs/applications/misc/gramps/default.nix b/pkgs/applications/misc/gramps/default.nix index 50f575d15cecf3d4fa492d597891b44cc2273aec..b4b98909447e569e46004ea8117937f243e39786 100644 --- a/pkgs/applications/misc/gramps/default.nix +++ b/pkgs/applications/misc/gramps/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, gtk3, pythonPackages, intltool, gnome3, - pango, gsettings-desktop-schemas, gobjectIntrospection, wrapGAppsHook, + pango, gobjectIntrospection, wrapGAppsHook, # Optional packages: enableOSM ? true, osm-gps-map }: diff --git a/pkgs/applications/misc/gummi/default.nix b/pkgs/applications/misc/gummi/default.nix index 5fdb8985bbbbd39916c355fb783c356e8e76677f..6c84f3cbd326522de46bccf8b81d64da4f54bf12 100644 --- a/pkgs/applications/misc/gummi/default.nix +++ b/pkgs/applications/misc/gummi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgs, makeWrapper +{ stdenv, pkgs, makeWrapper , glib, gnome2, gnome3, gtk2-x11, gtkspell2, poppler , pkgconfig, intltool, autoreconfHook, wrapGAppsHook }: diff --git a/pkgs/applications/misc/hamster-time-tracker/default.nix b/pkgs/applications/misc/hamster-time-tracker/default.nix index 105f7beb98fe3dc73014e06a6300f519a421e824..2abdce45c95f246630bfdea4860c1cd95466cc81 100644 --- a/pkgs/applications/misc/hamster-time-tracker/default.nix +++ b/pkgs/applications/misc/hamster-time-tracker/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchzip, pythonPackages, docbook2x, libxslt, gnome-doc-utils -, intltool, dbus-glib, gnome_python, dbus +, intltool, dbus-glib, gnome_python , hicolor-icon-theme }: diff --git a/pkgs/applications/misc/haxor-news/default.nix b/pkgs/applications/misc/haxor-news/default.nix index 624c15e118a2e0dd5ec557dc27cf01594e867f22..1fa016627d4e0badb47c274551d41937cbcdfb4f 100644 --- a/pkgs/applications/misc/haxor-news/default.nix +++ b/pkgs/applications/misc/haxor-news/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python }: +{ stdenv, python }: with python.pkgs; diff --git a/pkgs/applications/misc/houdini/default.nix b/pkgs/applications/misc/houdini/default.nix index 0b679617243dd3bb372e9bd366bec0a978f5fafa..607dff2931895b5c5deea1e181d356306ef27803 100644 --- a/pkgs/applications/misc/houdini/default.nix +++ b/pkgs/applications/misc/houdini/default.nix @@ -1,4 +1,4 @@ -{ zsh, stdenv, callPackage, buildFHSUserEnv, undaemonize }: +{ callPackage, buildFHSUserEnv, undaemonize }: let houdini-runtime = callPackage ./runtime.nix { }; diff --git a/pkgs/applications/misc/icesl/default.nix b/pkgs/applications/misc/icesl/default.nix index 2295e15cc3d3c18916be72eded0709fdd1ee7e9d..49b1741fd5af564427698b47137a4852b77f80ff 100644 --- a/pkgs/applications/misc/icesl/default.nix +++ b/pkgs/applications/misc/icesl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchzip, patchelf, freeglut, libXmu, libXi, libX11, libICE, libGLU_combined, libSM, libXext, dialog, makeWrapper }: +{ stdenv, lib, fetchzip, freeglut, libXmu, libXi, libX11, libICE, libGLU_combined, libSM, libXext, dialog, makeWrapper }: let lpath = stdenv.lib.makeLibraryPath [ libXmu libXi libX11 freeglut libICE libGLU_combined libSM libXext ]; in diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix index c4f10a1c35bb9bfeb11a3ce26df7222f47bfb222..9872ff23f3479c30b43aa22d943722e1324171b2 100644 --- a/pkgs/applications/misc/josm/default.nix +++ b/pkgs/applications/misc/josm/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, makeDesktopItem, makeWrapper, unzip, bash, jre10 }: +{ fetchurl, stdenv, makeDesktopItem, makeWrapper, unzip, jre10 }: stdenv.mkDerivation rec { name = "josm-${version}"; diff --git a/pkgs/applications/misc/khard/default.nix b/pkgs/applications/misc/khard/default.nix index 075640f702cb4b6f937a2704ad304f4d178689b2..3c5184d54632b50840d49328a765f948f0609e57 100644 --- a/pkgs/applications/misc/khard/default.nix +++ b/pkgs/applications/misc/khard/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchFromGitHub, glibcLocales, python3 }: +{ stdenv, fetchurl, glibcLocales, python3 }: let python = python3.override { diff --git a/pkgs/applications/misc/kitty/default.nix b/pkgs/applications/misc/kitty/default.nix index 38c2494c9f7d3dc135328084f136f96e5f0de094..0c894fb0b6129986782abe319626ff19101668fa 100644 --- a/pkgs/applications/misc/kitty/default.nix +++ b/pkgs/applications/misc/kitty/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchFromGitHub, pkgs, python3Packages, glfw, libunistring, harfbuzz, - fontconfig, zlib, pkgconfig, ncurses, imagemagick, makeWrapper, xsel, +{ stdenv, fetchFromGitHub, python3Packages, glfw, libunistring, harfbuzz, + fontconfig, pkgconfig, ncurses, imagemagick, xsel, libstartup_notification, libX11, libXrandr, libXinerama, libXcursor, libxkbcommon, libXi, libXext, wayland-protocols, wayland, which diff --git a/pkgs/applications/misc/kiwix/default.nix b/pkgs/applications/misc/kiwix/default.nix index 699cb2fd09863897d9479676671ded985122a8ec..c37d26f3dbcce97ae4c45bf06cd540d85fe8c466 100644 --- a/pkgs/applications/misc/kiwix/default.nix +++ b/pkgs/applications/misc/kiwix/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, makeWrapper, pkgconfig , zip, python, zlib, which, icu, libmicrohttpd, lzma, aria2, wget, bc -, libuuid, glibc, libX11, libXext, libXt, libXrender, glib, dbus, dbus-glib +, libuuid, libX11, libXext, libXt, libXrender, glib, dbus, dbus-glib , gtk2, gdk_pixbuf, pango, cairo, freetype, fontconfig, alsaLib, atk, cmake , xapian, ctpp2, zimlib }: diff --git a/pkgs/applications/misc/kupfer/default.nix b/pkgs/applications/misc/kupfer/default.nix index bb55fc2d4a8b7d38bb7602a23c3174a17ee99db5..3072963c43e85580df7248387f39c69e7ef4575c 100644 --- a/pkgs/applications/misc/kupfer/default.nix +++ b/pkgs/applications/misc/kupfer/default.nix @@ -1,11 +1,9 @@ { stdenv -, makeWrapper , fetchurl , intltool , python3Packages , gobjectIntrospection , gtk3 -, dbus , libwnck3 , keybinder3 , hicolor-icon-theme diff --git a/pkgs/applications/misc/llpp/default.nix b/pkgs/applications/misc/llpp/default.nix index 25067e3bba56c91db0558ac41181a61a567ec7a0..372adef4375c4e284b49f7d3e2370f92712e87dc 100644 --- a/pkgs/applications/misc/llpp/default.nix +++ b/pkgs/applications/misc/llpp/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, makeWrapper, fetchgit, pkgconfig, ninja, ocaml, findlib, mupdf -, lablgl, gtk3, openjpeg, jbig2dec, mujs, xsel, openssl, freetype, ncurses }: +, gtk3, openjpeg, jbig2dec, mujs, xsel, openssl, freetype, ncurses }: assert lib.versionAtLeast (lib.getVersion ocaml) "4.02"; diff --git a/pkgs/applications/misc/madonctl/default.nix b/pkgs/applications/misc/madonctl/default.nix index 787ce7231f30f0d693f29f06afb255fb0541853e..f2dacb7890f051c7f9e14b6abd470217b112283e 100644 --- a/pkgs/applications/misc/madonctl/default.nix +++ b/pkgs/applications/misc/madonctl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, fetchgx }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "madonctl-${version}"; diff --git a/pkgs/applications/misc/masterpdfeditor/default.nix b/pkgs/applications/misc/masterpdfeditor/default.nix index fb17aadfa4904817d1fec48a1a05576c7c7125c9..23f14d7ac9afba1fd276cb22178b0b93a2f11c47 100644 --- a/pkgs/applications/misc/masterpdfeditor/default.nix +++ b/pkgs/applications/misc/masterpdfeditor/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, glibc, sane-backends, qtbase, qtsvg, libXext, libX11, libXdmcp, libXau, libxcb, autoPatchelfHook }: +{ stdenv, fetchurl, sane-backends, qtbase, qtsvg, autoPatchelfHook }: let version = "4.3.89"; in stdenv.mkDerivation { diff --git a/pkgs/applications/misc/mop/default.nix b/pkgs/applications/misc/mop/default.nix index 336b136c56d61b320e25b1ff8835cf42eadb0d8f..8c6bd92d5362e9c0a2f84c481c9cdeef181e853d 100644 --- a/pkgs/applications/misc/mop/default.nix +++ b/pkgs/applications/misc/mop/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchgit }: +{ stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { name = "mop-${version}"; diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix index 6b057186eaf3dc1c30bd7f6329cede866ffaf214..2abbfdea0417c06273a55af1e32387065ec4da80 100644 --- a/pkgs/applications/misc/octoprint/default.nix +++ b/pkgs/applications/misc/octoprint/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python2, fetchurl }: +{ stdenv, fetchFromGitHub, python2 }: let diff --git a/pkgs/applications/misc/octoprint/plugins.nix b/pkgs/applications/misc/octoprint/plugins.nix index 0a1d26012a8020afbe901c1d666116060507b813..bd65acf5e5e9ad8c12ec1bb3f8924389fa1c615b 100644 --- a/pkgs/applications/misc/octoprint/plugins.nix +++ b/pkgs/applications/misc/octoprint/plugins.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, octoprint, pythonPackages }: +{ stdenv, fetchFromGitHub, octoprint, pythonPackages }: let buildPlugin = args: pythonPackages.buildPythonApplication (args // { diff --git a/pkgs/applications/misc/orca/default.nix b/pkgs/applications/misc/orca/default.nix index ca06b5fa6df6fab0c4f93c0499f6567fbdf98524..199fa3e9bfe9edc559f13e7e14d376f0de2f04f9 100644 --- a/pkgs/applications/misc/orca/default.nix +++ b/pkgs/applications/misc/orca/default.nix @@ -1,9 +1,9 @@ -{ stdenv, lib, pkgconfig, fetchurl, buildPythonApplication +{ lib, pkgconfig, fetchurl, buildPythonApplication , autoreconfHook, wrapGAppsHook, gobjectIntrospection , intltool, yelp-tools, itstool, libxmlxx3 , python, pygobject3, gtk3, gnome3, substituteAll , at-spi2-atk, at-spi2-core, pyatspi, dbus, dbus-python, pyxdg -, xkbcomp, gsettings-desktop-schemas, liblouis +, xkbcomp, gsettings-desktop-schemas , speechd, brltty, setproctitle, gst_all_1, gst-python }: diff --git a/pkgs/applications/misc/perkeep/default.nix b/pkgs/applications/misc/perkeep/default.nix index 746a319c2e1e11a7d3a325ab9b55f1ea9d47efca..9ecf0da58067e4cdeb1b4bdc543f4673b9924fe3 100644 --- a/pkgs/applications/misc/perkeep/default.nix +++ b/pkgs/applications/misc/perkeep/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, go, fetchzip, git, fetchpatch, fetchFromGitHub, fetchgit }: +{ stdenv, go, fetchzip, git, fetchFromGitHub, fetchgit }: # When perkeep is updated all deps in the let block should be removed let diff --git a/pkgs/applications/misc/pgmanage/default.nix b/pkgs/applications/misc/pgmanage/default.nix index 23ab0f8d34ad815b8fff80f0c2eaaffd37bcdfb6..a548c149665a1ab1bf81ba75bb9b5427bd46ce45 100644 --- a/pkgs/applications/misc/pgmanage/default.nix +++ b/pkgs/applications/misc/pgmanage/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, runCommand, postgresql, openssl } : +{ stdenv, fetchFromGitHub, postgresql, openssl } : stdenv.mkDerivation rec { name = "pgmanage-${version}"; diff --git a/pkgs/applications/misc/polybar/default.nix b/pkgs/applications/misc/polybar/default.nix index 05ad3e2a9066d9a493e6e4541f7d8c9692948578..3ac719d18d253d7f7132e89436e53f1ca8a52028 100644 --- a/pkgs/applications/misc/polybar/default.nix +++ b/pkgs/applications/misc/polybar/default.nix @@ -1,6 +1,6 @@ { cairo, cmake, fetchgit, libXdmcp, libpthreadstubs, libxcb, pcre, pkgconfig , python2 , stdenv, xcbproto, xcbutil, xcbutilimage, xcbutilrenderutil -, xcbutilwm, xcbutilxrm, fetchpatch, makeWrapper +, xcbutilwm, xcbutilxrm, makeWrapper # optional packages-- override the variables ending in 'Support' to enable or # disable modules diff --git a/pkgs/applications/misc/pt/default.nix b/pkgs/applications/misc/pt/default.nix index a400bb04da430e9dd1064ea824f0bb0af47fbbb6..dbda7664bde077a613fd3bb6ba841d3793ce8375 100644 --- a/pkgs/applications/misc/pt/default.nix +++ b/pkgs/applications/misc/pt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, bundlerEnv, ruby }: +{ lib, bundlerEnv, ruby }: bundlerEnv { name = "pt-0.7.3"; diff --git a/pkgs/applications/misc/redis-desktop-manager/default.nix b/pkgs/applications/misc/redis-desktop-manager/default.nix index 7a4348260fd38135d0847867f3c0e67a088e097c..bf4559e911780e2c699976aacdf88c51492f4074 100644 --- a/pkgs/applications/misc/redis-desktop-manager/default.nix +++ b/pkgs/applications/misc/redis-desktop-manager/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchgit, fetchpatch, pkgconfig, libssh2 +{ stdenv, lib, fetchgit, pkgconfig, libssh2 , qtbase, qtdeclarative, qtgraphicaleffects, qtimageformats, qtquickcontrols , qtsvg, qttools, qtquick1, qtcharts , qmake diff --git a/pkgs/applications/misc/redshift/default.nix b/pkgs/applications/misc/redshift/default.nix index dcc8300550f4169653694d659da5740320668a1e..c6d3d6e1a9d52b186536e3d452a2acfacbe8dbbe 100644 --- a/pkgs/applications/misc/redshift/default.nix +++ b/pkgs/applications/misc/redshift/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchurl, autoconf, automake, gettext, intltool +{ stdenv, fetchFromGitHub, autoconf, automake, gettext, intltool , libtool, pkgconfig, wrapGAppsHook, wrapPython, gobjectIntrospection , gtk3, python, pygobject3, hicolor-icon-theme, pyxdg diff --git a/pkgs/applications/misc/rofi/default.nix b/pkgs/applications/misc/rofi/default.nix index 7da721e9f3740c373c9dbdc13e88c49f51016636..2d22d87c49a8d37a30a8a67c4584777318f8bafe 100644 --- a/pkgs/applications/misc/rofi/default.nix +++ b/pkgs/applications/misc/rofi/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, autoreconfHook, pkgconfig, libxkbcommon, pango, which, git -, cairo, glib, libxcb, xcbutil, xcbutilwm, xcbutilxrm, libstartup_notification +, cairo, libxcb, xcbutil, xcbutilwm, xcbutilxrm, libstartup_notification , bison, flex, librsvg, check }: diff --git a/pkgs/applications/misc/rofi/wrapper.nix b/pkgs/applications/misc/rofi/wrapper.nix index 17bbf1583c466585d867b6f44d7a44b999f69990..c2384f56faa1a775636f915bd99dc9da85de4f18 100644 --- a/pkgs/applications/misc/rofi/wrapper.nix +++ b/pkgs/applications/misc/rofi/wrapper.nix @@ -1,4 +1,4 @@ -{ stdenv, rofi-unwrapped, makeWrapper, theme ? null, lib }: +{ stdenv, rofi-unwrapped, makeWrapper, theme ? null }: if theme == null then rofi-unwrapped else stdenv.mkDerivation { diff --git a/pkgs/applications/misc/roxterm/default.nix b/pkgs/applications/misc/roxterm/default.nix index 3ef5a6c4e3453ec8e9ca175b7c4bd302c3db30e8..11a75e4064f40d5649714f13ca8bbf0f00d5aaf6 100644 --- a/pkgs/applications/misc/roxterm/default.nix +++ b/pkgs/applications/misc/roxterm/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, docbook_xsl, dbus, dbus-glib, expat, gettext -, gsettings-desktop-schemas, gdk_pixbuf, gtk2, gtk3, hicolor-icon-theme -, imagemagick, itstool, librsvg, libtool, libxslt, lockfile, makeWrapper +{ stdenv, fetchurl, docbook_xsl, dbus, dbus-glib, expat +, gsettings-desktop-schemas, gdk_pixbuf, gtk3, hicolor-icon-theme +, imagemagick, itstool, librsvg, libtool, libxslt, makeWrapper , pkgconfig, python, pythonPackages, vte , wrapGAppsHook}: diff --git a/pkgs/applications/misc/rtv/default.nix b/pkgs/applications/misc/rtv/default.nix index d2027696824433955cce940fef7be79b3a1dcb3c..5c16a02ddb8cf908c92bec57225119ff048834b8 100644 --- a/pkgs/applications/misc/rtv/default.nix +++ b/pkgs/applications/misc/rtv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgs, pythonPackages }: +{ stdenv, fetchFromGitHub, pythonPackages }: with pythonPackages; buildPythonApplication rec { diff --git a/pkgs/applications/misc/rxvt_unicode/wrapper.nix b/pkgs/applications/misc/rxvt_unicode/wrapper.nix index 98d7e12a8ed889cf76319cf05f9821cb52fe8b09..909c267def828eca3a50425a03f375db04c4b14e 100644 --- a/pkgs/applications/misc/rxvt_unicode/wrapper.nix +++ b/pkgs/applications/misc/rxvt_unicode/wrapper.nix @@ -1,4 +1,4 @@ -{ stdenv, symlinkJoin, rxvt_unicode, makeWrapper, plugins }: +{ symlinkJoin, rxvt_unicode, makeWrapper, plugins }: let rxvt_name = builtins.parseDrvName rxvt_unicode.name; diff --git a/pkgs/applications/misc/simplenote/default.nix b/pkgs/applications/misc/simplenote/default.nix index 513c5facc6b2efdfe5dba2168bf3c11dce5b3196..8049cc2feae701df709364ef10660ae145f1f474 100644 --- a/pkgs/applications/misc/simplenote/default.nix +++ b/pkgs/applications/misc/simplenote/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, lib, zlib, glib, alsaLib, dbus, gtk2, atk, pango, freetype, fontconfig -, libgnome-keyring3, gdk_pixbuf, gvfs, cairo, cups, expat, libgpgerror, nspr +, libgnome-keyring3, gdk_pixbuf, cairo, cups, expat, libgpgerror, nspr , nss, xorg, libcap, systemd, libnotify ,libXScrnSaver, gnome3 }: stdenv.mkDerivation rec { diff --git a/pkgs/applications/misc/slic3r/prusa3d.nix b/pkgs/applications/misc/slic3r/prusa3d.nix index 11a5baa288ddc751c56005e7dffaf054d7dad3d7..9f4036c3f967545cdae54f91be1e433fa647d772 100644 --- a/pkgs/applications/misc/slic3r/prusa3d.nix +++ b/pkgs/applications/misc/slic3r/prusa3d.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, makeWrapper, which, cmake, perl, perlPackages, - boost, tbb, wxGTK30, pkgconfig, gtk3, fetchurl, gtk2, bash, libGLU, + boost, tbb, wxGTK30, pkgconfig, gtk3, fetchurl, gtk2, libGLU, glew, eigen, curl }: let AlienWxWidgets = perlPackages.buildPerlPackage rec { diff --git a/pkgs/applications/misc/spacefm/default.nix b/pkgs/applications/misc/spacefm/default.nix index 6fa594dec046f403e8d16b18ece237f15c850801..9f20b20f7f3a3ffbc40e96bcf8f5e977fe4f558d 100644 --- a/pkgs/applications/misc/spacefm/default.nix +++ b/pkgs/applications/misc/spacefm/default.nix @@ -1,6 +1,6 @@ { pkgs, fetchFromGitHub, stdenv, gtk3, udev, desktop-file-utils , shared-mime-info, intltool, pkgconfig, wrapGAppsHook, ffmpegthumbnailer -, jmtpfs, ifuseSupport ? false, ifuse ? null, lsof, udisks2, hicolor-icon-theme, adwaita-icon-theme }: +, jmtpfs, ifuseSupport ? false, ifuse ? null, lsof, udisks2 }: stdenv.mkDerivation rec { name = "spacefm-${version}"; diff --git a/pkgs/applications/misc/sweethome3d/editors.nix b/pkgs/applications/misc/sweethome3d/editors.nix index 6c4b32ca9aa6a62f69575963fbba31a2c051b0e5..14285a52e27c7e13be2969c097e038891fbf2242 100644 --- a/pkgs/applications/misc/sweethome3d/editors.nix +++ b/pkgs/applications/misc/sweethome3d/editors.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, fetchcvs, makeWrapper, makeDesktopItem, jdk, jre, ant -, gtk3, gsettings-desktop-schemas, p7zip, sweethome3dApp }: +{ stdenv, fetchcvs, makeWrapper, makeDesktopItem, jdk, jre, ant +, gtk3, gsettings-desktop-schemas, sweethome3dApp }: let diff --git a/pkgs/applications/misc/tasksh/default.nix b/pkgs/applications/misc/tasksh/default.nix index 1e51ba22ddc3d9a12efcd2a049d26b4261e0d418..dac447edd7d2f9f8fff5a7c5ade615d3a5466af5 100644 --- a/pkgs/applications/misc/tasksh/default.nix +++ b/pkgs/applications/misc/tasksh/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, libuuid, gnutls, readline }: +{ stdenv, fetchurl, cmake, readline }: stdenv.mkDerivation rec { name = "tasksh-${version}"; diff --git a/pkgs/applications/misc/tilix/default.nix b/pkgs/applications/misc/tilix/default.nix index 1cc03b4cd42614950a4e34c6b770c5030245ff2a..f30c6a63948979ebb2fdcdb8ad935cea2ac9add8 100644 --- a/pkgs/applications/misc/tilix/default.nix +++ b/pkgs/applications/misc/tilix/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, dmd, gnome3, dbus -, gsettings-desktop-schemas, libsecret, desktop-file-utils, gettext, gtkd +, gsettings-desktop-schemas, desktop-file-utils, gettext, gtkd , perlPackages, wrapGAppsHook, xdg_utils }: stdenv.mkDerivation rec { diff --git a/pkgs/applications/misc/timewarrior/default.nix b/pkgs/applications/misc/timewarrior/default.nix index 9aca45264af370c63c65efb21b25df76a446f51e..ff3caec29644918ffcd1ca6f0bf12fb585365c1a 100644 --- a/pkgs/applications/misc/timewarrior/default.nix +++ b/pkgs/applications/misc/timewarrior/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, libuuid, gnutls }: +{ stdenv, fetchurl, cmake }: stdenv.mkDerivation rec { name = "timewarrior-${version}"; diff --git a/pkgs/applications/misc/twmn/default.nix b/pkgs/applications/misc/twmn/default.nix index 297f3d0b5991c7549f2c1df2387dff4757daabd6..020aa963541e999fe173e9b943c487485f20a612 100644 --- a/pkgs/applications/misc/twmn/default.nix +++ b/pkgs/applications/misc/twmn/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, fetchgit, qtbase, qtx11extras, qmake, pkgconfig, boost }: +{ stdenv, fetchgit, qtbase, qtx11extras, qmake, pkgconfig, boost }: stdenv.mkDerivation rec { name = "twmn-git-2014-09-23"; diff --git a/pkgs/applications/misc/wego/default.nix b/pkgs/applications/misc/wego/default.nix index e59a3e989432c5582ff08eb213631be3450d9c24..b61566af6b2c1351e2b927485c1a2a8e96da43bf 100644 --- a/pkgs/applications/misc/wego/default.nix +++ b/pkgs/applications/misc/wego/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { name = "wego-${version}"; diff --git a/pkgs/applications/misc/welle-io/default.nix b/pkgs/applications/misc/welle-io/default.nix index 27376f4db81cfd0936d91cb57ded7420f8be4524..410346bce9adfb7e790e2981a5a85db3e4193392 100644 --- a/pkgs/applications/misc/welle-io/default.nix +++ b/pkgs/applications/misc/welle-io/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildEnv, fetchFromGitHub, cmake, pkgconfig +{ stdenv, fetchFromGitHub, cmake, pkgconfig , qtbase, qtcharts, qtmultimedia, qtquickcontrols, qtquickcontrols2 , faad2, rtl-sdr, soapysdr-with-plugins, libusb, fftwSinglePrec }: let diff --git a/pkgs/applications/misc/wsjtx/default.nix b/pkgs/applications/misc/wsjtx/default.nix index 23be3a5dc4facf0a96553a80c4326204d58b0b66..fd6be8f59201b60f982a0f71a3d65522f97f0721 100644 --- a/pkgs/applications/misc/wsjtx/default.nix +++ b/pkgs/applications/misc/wsjtx/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, asciidoc, asciidoctor, autoconf, automake, cmake, - docbook_xsl, fftw, fftwFloat, gfortran, libtool, libpulseaudio, qtbase, + docbook_xsl, fftw, fftwFloat, gfortran, libtool, qtbase, qtmultimedia, qtserialport, texinfo, libusb1 }: stdenv.mkDerivation rec { diff --git a/pkgs/applications/misc/xmr-stak/default.nix b/pkgs/applications/misc/xmr-stak/default.nix index 05530af12547f2f94e9ea502b87e02660dd76f48..9d68affa7ad29afa37b087b1d766156bfb8f6e00 100644 --- a/pkgs/applications/misc/xmr-stak/default.nix +++ b/pkgs/applications/misc/xmr-stak/default.nix @@ -1,5 +1,5 @@ { stdenv, stdenvGcc6, lib -, fetchFromGitHub, cmake, libuv, libmicrohttpd, openssl +, fetchFromGitHub, cmake, libmicrohttpd, openssl , opencl-headers, ocl-icd, hwloc, cudatoolkit , devDonationLevel ? "0.0" , cudaSupport ? false diff --git a/pkgs/applications/misc/yarssr/default.nix b/pkgs/applications/misc/yarssr/default.nix index cadf5ccb6a48b6ac94179d74dc08ac9fe4d6bf48..2c569b7d6816d708998a69dd962f4cf7237bc867 100644 --- a/pkgs/applications/misc/yarssr/default.nix +++ b/pkgs/applications/misc/yarssr/default.nix @@ -1,6 +1,6 @@ { fetchFromGitHub, stdenv, lib, -autoreconfHook, intltool, pkgconfig, makeWrapper, pkgs, +makeWrapper, pkgs, perl, perlPackages, gnome2 }: diff --git a/pkgs/applications/misc/yubioath-desktop/default.nix b/pkgs/applications/misc/yubioath-desktop/default.nix index 06fa8d2bd0dd3218230cd8535c89558a41c93423..8843c821ffb41906ccae67ae2fdffd5bdd219318 100644 --- a/pkgs/applications/misc/yubioath-desktop/default.nix +++ b/pkgs/applications/misc/yubioath-desktop/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python27Packages, swig, gettext, pcsclite, qt48Full, yubikey-personalization }: +{ stdenv, fetchurl, python27Packages, pcsclite, yubikey-personalization }: python27Packages.buildPythonApplication rec { namePrefix = ""; diff --git a/pkgs/applications/misc/zathura/core/default.nix b/pkgs/applications/misc/zathura/core/default.nix index 415995a828d626ebd7ab0d4d0909f62dcbb81ad2..001d70775d6d1548bea2b294b888a71bd2229782 100644 --- a/pkgs/applications/misc/zathura/core/default.nix +++ b/pkgs/applications/misc/zathura/core/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, meson, ninja, makeWrapper, pkgconfig , appstream-glib, desktop-file-utils, python3 -, gtk, girara, ncurses, gettext, libxml2 +, gtk, girara, gettext, libxml2 , file, sqlite, glib, texlive, libintl, libseccomp , gtk-mac-integration, synctexSupport ? true }: diff --git a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix index 86fe453465a5156c2cec54bb7862716414113e2b..9d86dfe4a445d9c7f0c7056836db1d142f4e81c7 100644 --- a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix +++ b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix @@ -1,6 +1,5 @@ { stdenv, lib, meson, ninja, fetchurl, pkgconfig, zathura_core, cairo, -gtk-mac-integration, girara, mupdf, openssl , libjpeg, jbig2dec, -openjpeg, fetchpatch }: +gtk-mac-integration, girara, mupdf }: stdenv.mkDerivation rec { version = "0.3.3"; diff --git a/pkgs/applications/misc/zscroll/default.nix b/pkgs/applications/misc/zscroll/default.nix index 92d173807f90b405de1b1685483dd5dce4274fda..18876cf355b86e73c46c1b2daf949680d294f104 100644 --- a/pkgs/applications/misc/zscroll/default.nix +++ b/pkgs/applications/misc/zscroll/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, python3, python3Packages, fetchFromGitHub }: +{ stdenv, python3, python3Packages, fetchFromGitHub }: let version = "1.0"; in diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 196e2eb79bd060b5ba737cc9816ba620fce3dd15..c2471d8a0eaa7288dfbb2f7db760531d98f2a74b 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -5,7 +5,7 @@ , libevent, expat, libjpeg, snappy , libpng, libcap , xdg_utils, yasm, minizip, libwebp -, libusb1, pciutils, nss, re2, zlib, libvpx +, libusb1, pciutils, nss, re2, zlib , python2Packages, perl, pkgconfig , nspr, systemd, kerberos @@ -14,11 +14,10 @@ , glib, gtk2, gtk3, dbus-glib , libXScrnSaver, libXcursor, libXtst, libGLU_combined , protobuf, speechd, libXdamage, cups -, ffmpeg, harfbuzz, harfbuzz-icu, libxslt, libxml2 +, ffmpeg, libxslt, libxml2 # optional dependencies , libgcrypt ? null # gnomeSupport || cupsSupport -, libexif ? null # only needed for Chromium before version 51 # package customization , enableNaCl ? false diff --git a/pkgs/applications/networking/browsers/falkon/default.nix b/pkgs/applications/networking/browsers/falkon/default.nix index 9dad2df7fd0a984fa56b849b6b192d6dc9a7da05..21631ef191c487a15d12b30b94414070927b42c3 100644 --- a/pkgs/applications/networking/browsers/falkon/default.nix +++ b/pkgs/applications/networking/browsers/falkon/default.nix @@ -1,5 +1,5 @@ -{ stdenv, lib, fetchFromGitHub, cmake, extra-cmake-modules, pkgconfig, qmake -, libpthreadstubs, libxcb, libXdmcp, qtsvg, qttools, qtwebengine, qtx11extras, kwallet, openssl }: +{ stdenv, fetchFromGitHub, cmake, extra-cmake-modules, pkgconfig, qmake +, libpthreadstubs, libxcb, libXdmcp, qtsvg, qttools, qtwebengine, qtx11extras, kwallet }: stdenv.mkDerivation rec { name = "falkon-${version}"; diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 50eb396d6442ccd48672039ceb3608ae61d7d284..336cd255661110ec5a4191de8e8fdd72f00ca092 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -8,7 +8,7 @@ , freetype, fontconfig, file, nspr, nss, libnotify , yasm, libGLU_combined, sqlite, unzip, makeWrapper , hunspell, libevent, libstartup_notification, libvpx -, cairo, icu, libpng, jemalloc, glib +, icu, libpng, jemalloc, glib , autoconf213, which, gnused, cargo, rustc, llvmPackages , debugBuild ? false diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index bdb9dab4f9d26175c7fd35c34447f1ea938a3180..f1d7b216120df8a81b28d0bb6995bf11cdd2e9d7 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -1,4 +1,4 @@ -{ lib, callPackage, stdenv, overrideCC, gcc5, fetchurl, fetchFromGitHub, fetchpatch, python3 }: +{ lib, callPackage, stdenv, fetchurl, fetchFromGitHub, fetchpatch, python3 }: let diff --git a/pkgs/applications/networking/browsers/google-chrome/default.nix b/pkgs/applications/networking/browsers/google-chrome/default.nix index 2df2043517ae33e4ba47ba144b491dea3d404dff..52a2ccb292bb40a0c3c8219837dd4331120baf46 100644 --- a/pkgs/applications/networking/browsers/google-chrome/default.nix +++ b/pkgs/applications/networking/browsers/google-chrome/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, patchelf, makeWrapper +{ stdenv, patchelf, makeWrapper # Linked dynamic libraries. , glib, fontconfig, freetype, pango, cairo, libX11, libXi, atk, gconf, nss, nspr diff --git a/pkgs/applications/networking/browsers/lynx/default.nix b/pkgs/applications/networking/browsers/lynx/default.nix index 9cdd32d2aaed4d1eef0e1cc1fad60adcce8838f4..6097c0e95f0d94d204431eb73c87fb98ef4d187f 100644 --- a/pkgs/applications/networking/browsers/lynx/default.nix +++ b/pkgs/applications/networking/browsers/lynx/default.nix @@ -1,7 +1,6 @@ { stdenv, buildPackages , fetchurl, pkgconfig, ncurses, gzip , sslSupport ? true, openssl ? null -, buildPlatform, hostPlatform , nukeReferences }: diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix index a320321ea171a1957bb6b1fb2d6df280dca8d891..a172e0e8d5d9cb234d3ff4ac6c872c7723728bec 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, rpm, cpio, libGL, xorg, cairo +{ stdenv, fetchurl, libGL, xorg, cairo , libpng, gtk2, glib, gdk_pixbuf, fontconfig, freetype, curl , dbus-glib, alsaLib, libpulseaudio, systemd, pango }: diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/trezor/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/trezor/default.nix index fb6e85ccdbba3b0af3510f4984c318f0d3b14e2e..3d4e0fc002257fb2ba651d22fd30cc1f676d6d1d 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/trezor/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/trezor/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, dpkg, zlib }: +{ stdenv, fetchurl, dpkg }: stdenv.mkDerivation { name = "TREZOR-bridge-1.0.5"; diff --git a/pkgs/applications/networking/browsers/otter/default.nix b/pkgs/applications/networking/browsers/otter/default.nix index 0a8efb3aace963a7a0f46ebe4639c54a50a6b4c2..d1f50627d905d5bdb93c6d2f7db9035d7a2f7d17 100644 --- a/pkgs/applications/networking/browsers/otter/default.nix +++ b/pkgs/applications/networking/browsers/otter/default.nix @@ -1,4 +1,4 @@ -{ stdenv, cmake, openssl, gst_all_1, fetchFromGitHub +{ stdenv, cmake, fetchFromGitHub , qtbase, qtmultimedia, qtwebengine , version ? "0.9.96" , sourceSha ? "1xzfy3jjx9sskwwbk7l8hnwnjf8af62p4kjkydp0ld0j50apc39p" diff --git a/pkgs/applications/networking/browsers/vimprobable2/default.nix b/pkgs/applications/networking/browsers/vimprobable2/default.nix index 54abc7dedff4daee5c539da7edfde2d9caa17698..9de7518677deb95d003ee33b42969fe8e9122143 100644 --- a/pkgs/applications/networking/browsers/vimprobable2/default.nix +++ b/pkgs/applications/networking/browsers/vimprobable2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, glib, glib-networking, gtk2, libsoup, libX11, perl, +{ stdenv, fetchurl, makeWrapper, glib-networking, gtk2, libsoup, libX11, perl, pkgconfig, webkit, gsettings-desktop-schemas }: stdenv.mkDerivation rec { diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index 7aba25dc339a4204d92098ea681c22099af96a41..11264df98f13fb5cdcaa4f8c1659aa5ad7504b94 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchurl, zlib, libX11, libXext, libSM, libICE , libXfixes, libXt, libXi, libXcursor, libXScrnSaver, libXcomposite, libXdamage, libXtst, libXrandr , alsaLib, dbus, cups, libexif, ffmpeg, systemd -, freetype, fontconfig, libXft, libXrender, libxcb, expat, libXau, libXdmcp -, libuuid, xz +, freetype, fontconfig, libXft, libXrender, libxcb, expat +, libuuid , gstreamer, gst-plugins-base, libxml2 , glib, gtk3, pango, gdk_pixbuf, cairo, atk, at-spi2-atk, gnome3 , nss, nspr diff --git a/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix b/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix index 11aa0ce706d665acf35d7cafcfb86a5b8782afe6..ab2c24727d7c29f7822a249cf5cd8e7ba43cf9af 100644 --- a/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix +++ b/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch +{ stdenv, fetchurl , dbus-glib, gtk2, gtk3, libexif, libpulseaudio, libXScrnSaver, ninja, nss , pciutils, pkgconfig, python2, xdg_utils }: diff --git a/pkgs/applications/networking/cluster/habitat/default.nix b/pkgs/applications/networking/cluster/habitat/default.nix index 1656e5a09a6b69d549df256179a704beb33a4400..0c210dcc535b7ad7bfbcd3bbc338d5e70c77f5c0 100644 --- a/pkgs/applications/networking/cluster/habitat/default.nix +++ b/pkgs/applications/networking/cluster/habitat/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, rustPlatform, pkgconfig +{ lib, fetchFromGitHub, rustPlatform, pkgconfig , libsodium, libarchive, openssl }: with rustPlatform; diff --git a/pkgs/applications/networking/cluster/kompose/default.nix b/pkgs/applications/networking/cluster/kompose/default.nix index ff0f664154aa87bcabfe3f017c4d864793c3d41e..d6e703f79d052136035cd64d7a0935c59659af4c 100644 --- a/pkgs/applications/networking/cluster/kompose/default.nix +++ b/pkgs/applications/networking/cluster/kompose/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "kompose-${version}"; diff --git a/pkgs/applications/networking/cluster/kops/default.nix b/pkgs/applications/networking/cluster/kops/default.nix index a1e17f60810d615dabf679f1db7c82da943a1b7d..5f7a2e8e28435f339e6259445426e8803f96f012 100644 --- a/pkgs/applications/networking/cluster/kops/default.nix +++ b/pkgs/applications/networking/cluster/kops/default.nix @@ -1,5 +1,5 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub, go-bindata }: +{ stdenv, buildGoPackage, fetchFromGitHub, go-bindata }: buildGoPackage rec { name = "kops-${version}"; diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index 6bd7ba3eac2cd955520f8af2e744ac5cabe593a8..01bf3467af957f5a518fca50b986dafe5872df76 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -1,5 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, removeReferencesTo, which, go_1_9, go-bindata, makeWrapper, rsync -, iptables, coreutils +{ stdenv, lib, fetchFromGitHub, removeReferencesTo, which, go_1_9, go-bindata, makeWrapper, rsync , components ? [ "cmd/kubeadm" "cmd/kubectl" diff --git a/pkgs/applications/networking/cluster/mesos/default.nix b/pkgs/applications/networking/cluster/mesos/default.nix index 961c0afc5c50dcb611df74f81b8011a910e46945..6e2089f99352ae8db012dafed2e605712b1230f1 100644 --- a/pkgs/applications/networking/cluster/mesos/default.nix +++ b/pkgs/applications/networking/cluster/mesos/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, makeWrapper, fetchurl, curl, sasl, openssh , unzip, gnutar, jdk, python, wrapPython -, setuptools, boto, pythonProtobuf, apr, subversion, gzip, systemd +, setuptools, boto, pythonProtobuf, apr, subversion, gzip , leveldb, glog, perf, utillinux, libnl, iproute, openssl, libevent , ethtool, coreutils, which, iptables, maven , bash, autoreconfHook diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix index 4c2e1b6f4c0eff7db758a1215399e66a0ef53c73..b674f1f645808d766b544c6e0c47adac5a40c34e 100644 --- a/pkgs/applications/networking/cluster/minikube/default.nix +++ b/pkgs/applications/networking/cluster/minikube/default.nix @@ -1,5 +1,5 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, fetchurl, go-bindata, libvirt, qemu -, gpgme, makeWrapper, hostPlatform, vmnet, python, pkgconfig +{ stdenv, buildGoPackage, fetchFromGitHub, go-bindata, libvirt, qemu +, gpgme, makeWrapper, hostPlatform, vmnet, python , docker-machine-kvm, docker-machine-kvm2 , extraDrivers ? [] }: diff --git a/pkgs/applications/networking/cluster/openshift/default.nix b/pkgs/applications/networking/cluster/openshift/default.nix index 6b6a2dc8986ba3857f494457bf6819ca5c511a67..6f836d27357aaa3dde6b11f13731661e04d2f4a4 100644 --- a/pkgs/applications/networking/cluster/openshift/default.nix +++ b/pkgs/applications/networking/cluster/openshift/default.nix @@ -1,5 +1,5 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, removeReferencesTo, which, go_1_9, go-bindata, makeWrapper, rsync, utillinux -, iptables, coreutils, kerberos, clang +{ stdenv, lib, fetchFromGitHub, removeReferencesTo, which, go_1_9, go-bindata, makeWrapper, rsync, utillinux +, coreutils, kerberos, clang , components ? [ "cmd/oc" "cmd/openshift" diff --git a/pkgs/applications/networking/cluster/taktuk/default.nix b/pkgs/applications/networking/cluster/taktuk/default.nix index 1510dc575cc9ecbc7271c86e75b7ab3498404efb..c61896d892182d2bd089eab33baea05efedd2b34 100644 --- a/pkgs/applications/networking/cluster/taktuk/default.nix +++ b/pkgs/applications/networking/cluster/taktuk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl , openssh}: +{ stdenv, fetchurl, perl }: stdenv.mkDerivation rec { version = "3.7.7"; diff --git a/pkgs/applications/networking/cluster/terraform-provider-ibm/default.nix b/pkgs/applications/networking/cluster/terraform-provider-ibm/default.nix index ad4edec6b4eaa1bb2b6b4e93287f7a161bad1845..fddf13795f3eab11d69ebd9aa776632dedfeb9d8 100644 --- a/pkgs/applications/networking/cluster/terraform-provider-ibm/default.nix +++ b/pkgs/applications/networking/cluster/terraform-provider-ibm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: # # USAGE: diff --git a/pkgs/applications/networking/cluster/terraform-provider-nixos/default.nix b/pkgs/applications/networking/cluster/terraform-provider-nixos/default.nix index 135e5402929a70982a513a93ab0063ab9e2ac5e5..f4ad171c267ee46322fd8e3f97c463d358963d36 100644 --- a/pkgs/applications/networking/cluster/terraform-provider-nixos/default.nix +++ b/pkgs/applications/networking/cluster/terraform-provider-nixos/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "terraform-provider-nixos-${version}"; version = "0.0.1"; diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index fbcb6c8be40d88e7c9d946a39df34e3bcf635991..358a1f23147aa8ff7249562894879cdcd9379592 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildEnv, buildGoPackage, fetchpatch, fetchFromGitHub, makeWrapper }: +{ stdenv, lib, buildEnv, buildGoPackage, fetchFromGitHub, makeWrapper }: let goPackagePath = "github.com/hashicorp/terraform"; @@ -75,7 +75,7 @@ let }); in withPlugins (_: []); - plugins = import ./providers { inherit stdenv lib buildGoPackage fetchFromGitHub; }; + plugins = import ./providers { inherit lib buildGoPackage fetchFromGitHub; }; in rec { terraform_0_8_5 = generic { version = "0.8.5"; diff --git a/pkgs/applications/networking/cluster/terraform/providers/default.nix b/pkgs/applications/networking/cluster/terraform/providers/default.nix index 40117b4585506c2c47a3d008a3f4ee98f8a8181b..cf1649f7bb39ab9f9de7e480305043a894a20091 100644 --- a/pkgs/applications/networking/cluster/terraform/providers/default.nix +++ b/pkgs/applications/networking/cluster/terraform/providers/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: let list = import ./data.nix; diff --git a/pkgs/applications/networking/compactor/default.nix b/pkgs/applications/networking/compactor/default.nix index 749b94f7b7ec5740acd856af7c2d8c85bbc00a1d..d2b1a8eba36719fa2871118b21d8f809c1efa832 100644 --- a/pkgs/applications/networking/compactor/default.nix +++ b/pkgs/applications/networking/compactor/default.nix @@ -1,4 +1,4 @@ -{ autoconf, automake, boost, cbor-diag, cddl, fetchFromGitHub, file, gcc, libpcap, libtins, libtool, lzma, openssl, pkgconfig, stdenv, tcpdump, wireshark-cli }: +{ autoconf, automake, boost, cbor-diag, cddl, fetchFromGitHub, file, libpcap, libtins, libtool, lzma, openssl, pkgconfig, stdenv, tcpdump, wireshark-cli }: stdenv.mkDerivation rec { name = "compactor-${version}"; diff --git a/pkgs/applications/networking/drive/default.nix b/pkgs/applications/networking/drive/default.nix index 826452016e73648960f82025ef2a4f2e6ef5cc80..113d6a2e5f4650207cd4080771ad4135cfd3b8f3 100644 --- a/pkgs/applications/networking/drive/default.nix +++ b/pkgs/applications/networking/drive/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "drive-${version}"; diff --git a/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix index 9793fd234a18de96fe58dbf514ae0cb1a0f114c1..aa7895ce14883f788656a55d9988094d6ccb968b 100644 --- a/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix +++ b/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, fetchFromGitHub, stdenv, bitlbee, autoconf, automake, libtool, pkgconfig, glib, json-glib }: +{ fetchFromGitHub, stdenv, bitlbee, autoconf, automake, libtool, pkgconfig, glib, json-glib }: with stdenv.lib; stdenv.mkDerivation rec { diff --git a/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix index 1477d0674642971f7701aab88d87479cf0464c9a..a034827c4ed47b12e811de2c9d8633c0e44d0f06 100644 --- a/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix +++ b/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, fetchFromGitHub, stdenv, bitlbee, autoconf, automake, libtool, pkgconfig, glib, libgcrypt }: +{ fetchFromGitHub, stdenv, bitlbee, autoconf, automake, libtool, pkgconfig, glib, libgcrypt }: with stdenv.lib; stdenv.mkDerivation rec { diff --git a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix index 0b2a97b53786a162590fae4ebfac16a837ac22a1..2ed7fbcee3b53ff43cbb18a2acc04d8a6d464ef3 100644 --- a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix +++ b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, fetchpatch, stdenv, gnutls, glib, pkgconfig, check, libotr, python, +{ fetchurl, stdenv, gnutls, glib, pkgconfig, check, libotr, python, enableLibPurple ? false, pidgin ? null }: with stdenv.lib; diff --git a/pkgs/applications/networking/instant-messengers/ekiga/default.nix b/pkgs/applications/networking/instant-messengers/ekiga/default.nix index 003ffbfc7d1eb1af37d7045be934bb72c4981d9b..f831ac0847ce7cd30a1fd51a396fd25ee4dfef7c 100644 --- a/pkgs/applications/networking/instant-messengers/ekiga/default.nix +++ b/pkgs/applications/networking/instant-messengers/ekiga/default.nix @@ -1,7 +1,7 @@ { stdenv, glib, fetchurl, fetchpatch, cyrus_sasl, gettext, openldap, ptlib, opal, libXv, rarian, intltool , perl, perlXMLParser, evolution-data-server, gnome-doc-utils, avahi, autoreconfHook , libsigcxx, gtk, dbus-glib, libnotify, libXext, xextproto, gnome3, boost, libsecret -, pkgconfig, libxml2, videoproto, unixODBC, db, nspr, nss, zlib, hicolor-icon-theme +, pkgconfig, libxml2, videoproto, unixODBC, db, nspr, nss, zlib , libXrandr, randrproto, which, libxslt, libtasn1, gmp, nettle, sqlite, makeWrapper }: stdenv.mkDerivation rec { diff --git a/pkgs/applications/networking/instant-messengers/linphone/default.nix b/pkgs/applications/networking/instant-messengers/linphone/default.nix index e0aecd2c810286cf58edbadac552980eab16da7d..1b257ea61dce9a94ac86e1ab7f49c4573a503c92 100644 --- a/pkgs/applications/networking/instant-messengers/linphone/default.nix +++ b/pkgs/applications/networking/instant-messengers/linphone/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, intltool, pkgconfig, readline, openldap, cyrus_sasl, libupnp +{ stdenv, intltool, pkgconfig, readline, openldap, cyrus_sasl, libupnp , zlib, libxml2, gtk2, libnotify, speex, ffmpeg, libX11, libsoup, udev , ortp, mediastreamer, sqlite, belle-sip, libosip, libexosip, bzrtp , mediastreamer-openh264, bctoolbox, makeWrapper, fetchFromGitHub, cmake diff --git a/pkgs/applications/networking/instant-messengers/mikutter/default.nix b/pkgs/applications/networking/instant-messengers/mikutter/default.nix index 6b17eb0a8975947d079db1af431337bf3205c6cc..3c267e612a685f1f635ac9eb774ea7987876b251 100644 --- a/pkgs/applications/networking/instant-messengers/mikutter/default.nix +++ b/pkgs/applications/networking/instant-messengers/mikutter/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl -, bundlerEnv, ruby, pkgconfig +, bundlerEnv, ruby , alsaUtils, libnotify, which, wrapGAppsHook, gtk2 }: diff --git a/pkgs/applications/networking/instant-messengers/pidgin/wrapper.nix b/pkgs/applications/networking/instant-messengers/pidgin/wrapper.nix index 914b3480a95d96f6d4cc4b5660eaa4c7cecef849..095f838fe981e458286e9f5ec879c09a2337249d 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/wrapper.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/wrapper.nix @@ -1,4 +1,4 @@ -{ stdenv, symlinkJoin, pidgin, makeWrapper, plugins }: +{ symlinkJoin, pidgin, makeWrapper, plugins }: let extraArgs = map (x: x.wrapArgs or "") plugins; diff --git a/pkgs/applications/networking/instant-messengers/pond/default.nix b/pkgs/applications/networking/instant-messengers/pond/default.nix index 5d463648bd8bc2bcf1a82b4397440979d2ab98ae..e7527bafcc65d2180524ea66c90290b84ec68b88 100644 --- a/pkgs/applications/networking/instant-messengers/pond/default.nix +++ b/pkgs/applications/networking/instant-messengers/pond/default.nix @@ -1,5 +1,5 @@ -{ stdenv, lib, buildGoPackage, trousers, dclxvi, wrapGAppsHook, pkgconfig, gtk3, gtkspell3, - fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, buildGoPackage, trousers, dclxvi, wrapGAppsHook, pkgconfig, gtk3, gtkspell3, + fetchgit }: let gui = true; # Might be implemented with nixpkgs config. diff --git a/pkgs/applications/networking/instant-messengers/psi/default.nix b/pkgs/applications/networking/instant-messengers/psi/default.nix index 7fabfa5f7722519d07c9cdf61340c9fd484aa29e..37d9de8794e554e147f277814ac1d6bca72d8b70 100644 --- a/pkgs/applications/networking/instant-messengers/psi/default.nix +++ b/pkgs/applications/networking/instant-messengers/psi/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, enchant, qt4, zlib, sox, libX11, xproto, libSM -, libICE, qca2, pkgconfig, callPackage, which, glib +, libICE, qca2, pkgconfig, which, glib , libXScrnSaver, scrnsaverproto }: diff --git a/pkgs/applications/networking/instant-messengers/ricochet/default.nix b/pkgs/applications/networking/instant-messengers/ricochet/default.nix index c99130f28a391c35f00a47bd669d33f7e93eea77..a6aef5e6a2fb21866923d9439346dae7cbed957a 100644 --- a/pkgs/applications/networking/instant-messengers/ricochet/default.nix +++ b/pkgs/applications/networking/instant-messengers/ricochet/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, makeDesktopItem, unzip +{ stdenv, fetchurl, pkgconfig, makeDesktopItem , qtbase, qttools, qtmultimedia, qtquick1, qtquickcontrols , openssl, protobuf, qmake }: diff --git a/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix b/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix index 024902a9c486faae0b02c5437ae73dd5c293a014..f858bb38dd19b30dbb48c69a5ffbbdfbe5338c46 100644 --- a/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix +++ b/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix @@ -30,7 +30,6 @@ , openssl , perl , python3 -, bash , libupnp , speexdsp , fetchFromGitHub diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix index dbf17d9cbdb1dccdee9e03838c7a9757610b4b24..37ce34f09df80b7e1fbbfb73e89789e8600907e8 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix +++ b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, writeText, conf ? null }: +{ lib, stdenv, fetchurl, writeText, conf ? null }: let configFile = writeText "riot-config.json" conf; in stdenv.mkDerivation rec { diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix index 32648ee34c907cfcbb8dc5d9ff33f0beecf59c2c..7f7245152b751db481eb78dd4b3155ed25c1aea1 100644 --- a/pkgs/applications/networking/instant-messengers/slack/default.nix +++ b/pkgs/applications/networking/instant-messengers/slack/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, dpkg, makeWrapper , alsaLib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, glib , gnome3, gtk3, gdk_pixbuf, libnotify, libxcb, nspr, nss, pango -, systemd, wget, xorg }: +, systemd, xorg }: let diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 9354ae7282186e63183a5e6296dd2ff3fc60f805..39d664805fa90b4d65391b876be0353cf6d5abac 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -1,4 +1,4 @@ -{ qt5, stdenv }: +{ qt5 }: let mkTelegram = args: qt5.callPackage (import ./generic.nix args) { }; diff --git a/pkgs/applications/networking/instant-messengers/utox/default.nix b/pkgs/applications/networking/instant-messengers/utox/default.nix index e139904fee53bb0551b76e94bf9baa436b366ccb..5955ecb60bd9ca07f08a879bd39e09531ae598aa 100644 --- a/pkgs/applications/networking/instant-messengers/utox/default.nix +++ b/pkgs/applications/networking/instant-messengers/utox/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchFromGitHub, check, cmake, pkgconfig , libtoxcore, filter-audio, dbus, libvpx, libX11, openal, freetype, libv4l -, libXrender, fontconfig, libXext, libXft, utillinux, libsodium, libopus }: +, libXrender, fontconfig, libXext, libXft, libsodium, libopus }: stdenv.mkDerivation rec { name = "utox-${version}"; diff --git a/pkgs/applications/networking/instant-messengers/vacuum/default.nix b/pkgs/applications/networking/instant-messengers/vacuum/default.nix index 9ed954cc7ec2ccf996dfb0865aaf54724b9220b0..9d5d5c1b80fc8031cfdec333e7d21d669c06853d 100644 --- a/pkgs/applications/networking/instant-messengers/vacuum/default.nix +++ b/pkgs/applications/networking/instant-messengers/vacuum/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub +{ stdenv, fetchFromGitHub , qt4, qmake4Hook, openssl , xproto, libX11, libXScrnSaver, scrnsaverproto , xz, zlib diff --git a/pkgs/applications/networking/irc/irssi/otr/default.nix b/pkgs/applications/networking/irc/irssi/otr/default.nix index 8d7bf677983c7df1324d5ff81c817f100fd166b8..add4fa632c91bda464b0831064e54b4ad12048a3 100644 --- a/pkgs/applications/networking/irc/irssi/otr/default.nix +++ b/pkgs/applications/networking/irc/irssi/otr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchFromGitHub, libotr, automake, autoconf, libtool, glib, pkgconfig, irssi }: +{ stdenv, fetchFromGitHub, libotr, automake, autoconf, libtool, glib, pkgconfig, irssi }: with stdenv.lib; stdenv.mkDerivation rec { diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix index a672fa73c4f0a9594d65fbcba146ceae17c4211d..dcd16c7c5b2be46d3e2d97273dbbdd92f0718436 100644 --- a/pkgs/applications/networking/irc/weechat/default.nix +++ b/pkgs/applications/networking/irc/weechat/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl, fetchpatch, lib +{ stdenv, fetchurl, lib , ncurses, openssl, aspell, gnutls , zlib, curl, pkgconfig, libgcrypt , cmake, makeWrapper, libobjc, libresolv, libiconv -, writeScriptBin, symlinkJoin # for withPlugins +, writeScriptBin # for withPlugins , asciidoctor # manpages , guileSupport ? true, guile , luaSupport ? true, lua5 diff --git a/pkgs/applications/networking/mailreaders/alpine/default.nix b/pkgs/applications/networking/mailreaders/alpine/default.nix index 3b45c2fd44569826cf8096600b515b4a573903f0..bb62014c77a447d00c948dda151ece6e7ed486bb 100644 --- a/pkgs/applications/networking/mailreaders/alpine/default.nix +++ b/pkgs/applications/networking/mailreaders/alpine/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ncurses, tcl, openssl, pam, pkgconfig, gettext, kerberos +{stdenv, fetchurl, ncurses, tcl, openssl, pam, kerberos , openldap }: diff --git a/pkgs/applications/networking/mailreaders/mailnag/default.nix b/pkgs/applications/networking/mailreaders/mailnag/default.nix index 75f34952394eb1462b75de46900cc7420a50963f..2b62db069bc9d5742dafd8fabea23febd31128da 100644 --- a/pkgs/applications/networking/mailreaders/mailnag/default.nix +++ b/pkgs/applications/networking/mailreaders/mailnag/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, gettext, gtk3, pythonPackages , gdk_pixbuf, libnotify, gst_all_1 -, libgnome-keyring3, networkmanager +, libgnome-keyring3 , wrapGAppsHook, gnome3 # otherwise passwords are stored unencrypted , withGnomeKeyring ? true diff --git a/pkgs/applications/networking/mailreaders/mailpile/default.nix b/pkgs/applications/networking/mailreaders/mailpile/default.nix index 36dc94951d5c883499d9b5c489b7f460ccb53156..0f11d9a6df05a9d138a4f190744d73488c16c16d 100644 --- a/pkgs/applications/networking/mailreaders/mailpile/default.nix +++ b/pkgs/applications/networking/mailreaders/mailpile/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python2Packages, gnupg1orig, makeWrapper, openssl, git }: +{ stdenv, fetchFromGitHub, python2Packages, gnupg1orig, openssl, git }: python2Packages.buildPythonApplication rec { name = "mailpile-${version}"; diff --git a/pkgs/applications/networking/mailreaders/msgviewer/default.nix b/pkgs/applications/networking/mailreaders/msgviewer/default.nix index 487b2799b980c6140b68bb3683b17ad26f1124b1..6e2e8d58c6760bc83af7a30783be9342a679a1eb 100644 --- a/pkgs/applications/networking/mailreaders/msgviewer/default.nix +++ b/pkgs/applications/networking/mailreaders/msgviewer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, writeScript, unzip, jre }: +{ stdenv, fetchurl, makeWrapper, unzip, jre }: let version = "1.9"; diff --git a/pkgs/applications/networking/mailreaders/nylas-mail-bin/default.nix b/pkgs/applications/networking/mailreaders/nylas-mail-bin/default.nix index 766aab39ce307080f7f86275a49ec2ff632fbc53..e7e199155d731022c32ff54fc3e09c8b1bbd82e2 100644 --- a/pkgs/applications/networking/mailreaders/nylas-mail-bin/default.nix +++ b/pkgs/applications/networking/mailreaders/nylas-mail-bin/default.nix @@ -1,4 +1,4 @@ -{ dpkg, fetchurl, lib, pkgs, stdenv, config +{ dpkg, fetchurl, lib, pkgs, stdenv , alsaLib , atk , cairo @@ -13,7 +13,6 @@ , gdk_pixbuf , glib , gnome2 -, libgcrypt , libgnome-keyring , libnotify , makeWrapper diff --git a/pkgs/applications/networking/mailreaders/realpine/default.nix b/pkgs/applications/networking/mailreaders/realpine/default.nix index 728287f8c75ab20f0a930226ed595d71b2f3fd95..713f585d283c9b7bdfe297490c77a62542025594 100644 --- a/pkgs/applications/networking/mailreaders/realpine/default.nix +++ b/pkgs/applications/networking/mailreaders/realpine/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ncurses, tcl, openssl, pam, pkgconfig, gettext, kerberos +{stdenv, fetchurl, ncurses, tcl, openssl, pam, kerberos , openldap }: # NOTE: Please check if any changes here are applicable to ../alpine/ as well diff --git a/pkgs/applications/networking/mailreaders/sup/default.nix b/pkgs/applications/networking/mailreaders/sup/default.nix index b7ac621eb6db8ef5739ee27a2f07b3ff86f07803..06777916b92af0ca906bc4e5eae1db2d85dcaa0c 100644 --- a/pkgs/applications/networking/mailreaders/sup/default.nix +++ b/pkgs/applications/networking/mailreaders/sup/default.nix @@ -1,5 +1,4 @@ -{ stdenv, lib, bundlerEnv, gpgme, ruby, ncurses, writeText, zlib, xapian -, pkgconfig, which }: +{ lib, bundlerEnv, ruby }: bundlerEnv { name = "sup-0.22.1"; diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index 921611644858249afe3e877496f46223c7668da4..85c98742af38306276866cc3e1642808b62b3f2d 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -3,7 +3,7 @@ , freetype, fontconfig, file, nspr, nss, libnotify , yasm, libGLU_combined, sqlite, unzip , hunspell, libevent, libstartup_notification -, cairo, gstreamer, gst-plugins-base, icu, libpng, jemalloc +, icu, libpng, jemalloc , autoconf213, which, m4 , writeScript, xidel, common-updater-scripts, coreutils, gnused, gnugrep, curl , enableGTK3 ? false, gtk3, gnome3, wrapGAppsHook, makeWrapper diff --git a/pkgs/applications/networking/newsreaders/pan/default.nix b/pkgs/applications/networking/newsreaders/pan/default.nix index 916bd36ba54cbf0ab0d901c84ef7042c5caa8d18..4a1940ae654546353c351bfec565cf2768ba44e6 100644 --- a/pkgs/applications/networking/newsreaders/pan/default.nix +++ b/pkgs/applications/networking/newsreaders/pan/default.nix @@ -1,6 +1,6 @@ { spellChecking ? true , stdenv, fetchurl, pkgconfig, gtk3, gtkspell3 ? null -, perl, pcre, gmime2, gettext, intltool, itstool, libxml2, dbus-glib, libnotify, gnutls +, perl, gmime2, gettext, intltool, itstool, libxml2, dbus-glib, libnotify, gnutls , makeWrapper, gnupg , gnomeSupport ? true, libgnome-keyring3 }: diff --git a/pkgs/applications/networking/owamp/default.nix b/pkgs/applications/networking/owamp/default.nix index 293c67164835ea382126280d95c01b084d592297..9ed532acfe1a138b661d2c58b483972c94bd4da6 100644 --- a/pkgs/applications/networking/owamp/default.nix +++ b/pkgs/applications/networking/owamp/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, fetchFromGitHub +{stdenv, fetchFromGitHub , autoconf, automake, mandoc }: stdenv.mkDerivation rec { diff --git a/pkgs/applications/networking/p2p/frostwire/default.nix b/pkgs/applications/networking/p2p/frostwire/default.nix index 8cb5f768f9563dbc47cb4698b99b63b6d612249d..7b854fce6c5552a702ab9ea399e29b82d209fa25 100644 --- a/pkgs/applications/networking/p2p/frostwire/default.nix +++ b/pkgs/applications/networking/p2p/frostwire/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, gradle, perl, jre, makeWrapper, makeDesktopItem, mplayer }: +{ stdenv, fetchFromGitHub, gradle, perl, jre, makeWrapper, makeDesktopItem, mplayer }: let version = "6.6.7-build-529"; diff --git a/pkgs/applications/networking/p2p/ktorrent/default.nix b/pkgs/applications/networking/p2p/ktorrent/default.nix index 53485e95b9a6b3fff0ac438ae974b7ceeebeeedc..c66c3ca05a4ec2998ec9944c6eb7c6cbeb90cd14 100644 --- a/pkgs/applications/networking/p2p/ktorrent/default.nix +++ b/pkgs/applications/networking/p2p/ktorrent/default.nix @@ -2,7 +2,7 @@ , extra-cmake-modules, qtbase, qtscript , karchive, kcrash, kdnssd, ki18n, kio, knotifications, knotifyconfig , kdoctools, kross, kcmutils, kwindowsystem -, libktorrent, boost, taglib, libgcrypt, kplotting +, libktorrent, taglib, libgcrypt, kplotting }: stdenv.mkDerivation rec { diff --git a/pkgs/applications/networking/p2p/retroshare/default.nix b/pkgs/applications/networking/p2p/retroshare/default.nix index 950187ed9c60beee0f0db8fa0169b8df8c058639..34b4780633b838e0bd94e7b3ea153a84a2c297f0 100644 --- a/pkgs/applications/networking/p2p/retroshare/default.nix +++ b/pkgs/applications/networking/p2p/retroshare/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, libupnp, gpgme, gnome3, glib, libssh, pkgconfig, protobuf, bzip2 +{ stdenv, fetchFromGitHub, libupnp, gpgme, gnome3, glib, libssh, pkgconfig, protobuf, bzip2 , libXScrnSaver, speex, curl, libxml2, libxslt, sqlcipher, libmicrohttpd, opencv, qmake, ffmpeg , qtmultimedia, qtx11extras, qttools }: diff --git a/pkgs/applications/networking/p2p/soulseekqt/default.nix b/pkgs/applications/networking/p2p/soulseekqt/default.nix index 315106ea85255bf9f1bb6e982c8e025dd578e07a..e525c564c509203c0faf5883cc127ea8e98dcab4 100644 --- a/pkgs/applications/networking/p2p/soulseekqt/default.nix +++ b/pkgs/applications/networking/p2p/soulseekqt/default.nix @@ -1,8 +1,8 @@ { stdenv , fetchurl , dbus -, expat, zlib, fontconfig -, libpng, libX11, libxcb, libXau, libXdmcp, freetype, libbsd +, zlib, fontconfig +, libX11, libxcb, libXau, libXdmcp, freetype, libbsd }: with stdenv.lib; diff --git a/pkgs/applications/networking/p2p/transmission/default.nix b/pkgs/applications/networking/p2p/transmission/default.nix index d8fc1d840d2be8def0221428f821040821780153..d9ddf04592168653390bee1aeec1501285adbd97 100644 --- a/pkgs/applications/networking/p2p/transmission/default.nix +++ b/pkgs/applications/networking/p2p/transmission/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, intltool, file, wrapGAppsHook +{ stdenv, fetchurl, pkgconfig, intltool, file, wrapGAppsHook , openssl, curl, libevent, inotify-tools, systemd, zlib , enableGTK3 ? false, gtk3 , enableSystemd ? stdenv.isLinux diff --git a/pkgs/applications/networking/p2p/tribler/default.nix b/pkgs/applications/networking/p2p/tribler/default.nix index aa42af5ccbdd7b7b638ae76bb91f8161ae2f05c2..1169dba188cdd302c9eaf380c2696627343270dc 100644 --- a/pkgs/applications/networking/p2p/tribler/default.nix +++ b/pkgs/applications/networking/p2p/tribler/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pythonPackages, makeWrapper, nettools, libtorrentRasterbar, imagemagick +{ stdenv, fetchurl, pythonPackages, makeWrapper, libtorrentRasterbar, imagemagick , enablePlayer ? true, vlc ? null, qt5 }: stdenv.mkDerivation rec { diff --git a/pkgs/applications/networking/pyload/default.nix b/pkgs/applications/networking/pyload/default.nix index c331c4f287e62e4a88439701b6e7ef69992ce728..6a89731ff10413ec1964e24851fb432a41bd4f82 100644 --- a/pkgs/applications/networking/pyload/default.nix +++ b/pkgs/applications/networking/pyload/default.nix @@ -1,5 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, pythonPackages, gocr, unrar, rhino, spidermonkey -, pkgs }: +{ stdenv, fetchFromGitHub, fetchpatch, pythonPackages, gocr, unrar, rhino, spidermonkey }: let beautifulsoup = pythonPackages.callPackage ./beautifulsoup.nix { diff --git a/pkgs/applications/networking/remote/anydesk/default.nix b/pkgs/applications/networking/remote/anydesk/default.nix index 19e85a9711d156df560e38df16468c7a536493c0..0f107936be6fcdaa6ce3cc162ef929fa0c940f1f 100644 --- a/pkgs/applications/networking/remote/anydesk/default.nix +++ b/pkgs/applications/networking/remote/anydesk/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, autoPatchelfHook, makeWrapper, makeDesktopItem -, atk, cairo, freetype, gdk_pixbuf, glib, gnome2, gtk2, libGLU_combined, pango, xorg +{ stdenv, fetchurl, makeWrapper, makeDesktopItem +, atk, cairo, gdk_pixbuf, glib, gnome2, gtk2, libGLU_combined, pango, xorg , lsb-release }: let diff --git a/pkgs/applications/networking/remote/freerdp/legacy.nix b/pkgs/applications/networking/remote/freerdp/legacy.nix index d3746fa6c7ad83ccdcbfb5f53e811044ca6d1f01..9830b84652597e4501da2546ec623dadf7961758 100644 --- a/pkgs/applications/networking/remote/freerdp/legacy.nix +++ b/pkgs/applications/networking/remote/freerdp/legacy.nix @@ -14,10 +14,9 @@ , ffmpeg , libxkbfile #, xmlto, docbook_xml_dtd_412, docbook_xml_xslt -, libXfixes , libXinerama , libXv -, pulseaudioSupport ? true, libpulseaudio +, pulseaudioSupport ? true }: assert printerSupport -> cups != null; diff --git a/pkgs/applications/networking/remote/ssvnc/default.nix b/pkgs/applications/networking/remote/ssvnc/default.nix index 1d1d6f4e1e3f6150fdf6c8a27f24875b74fc4e03..f20bb740615c537a4c1291d0121fa204f199a452 100644 --- a/pkgs/applications/networking/remote/ssvnc/default.nix +++ b/pkgs/applications/networking/remote/ssvnc/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, imake, zlib, jdk, libX11, libXt, libXmu -, libXaw, libXext, libXpm, openjpeg, openssl, tcl, tk, perl }: +, libXaw, libXext, libXpm, openjpeg, openssl, tk, perl }: stdenv.mkDerivation rec { name = "ssvnc-${version}"; diff --git a/pkgs/applications/networking/remote/teamviewer/default.nix b/pkgs/applications/networking/remote/teamviewer/default.nix index 5365228ae65723ff2f14826d5a4700480100554f..e4715cce8e18f6ee24d2796efaf9a6a989ec23bb 100644 --- a/pkgs/applications/networking/remote/teamviewer/default.nix +++ b/pkgs/applications/networking/remote/teamviewer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, autoPatchelfHook, makeWrapper, xdg_utils, dbus, qtbase, qtwebkit, qtx11extras, qtquickcontrols, glibc, libXrandr, libX11 }: +{ stdenv, fetchurl, autoPatchelfHook, makeWrapper, xdg_utils, dbus, qtbase, qtwebkit, qtx11extras, qtquickcontrols, glibc, libXrandr, libX11 }: stdenv.mkDerivation rec { diff --git a/pkgs/applications/networking/remote/xrdp/default.nix b/pkgs/applications/networking/remote/xrdp/default.nix index 3061467c82bd9a299c386e81ecc1b1c1fb28ab8a..a778042c2ea2c93b340cb5e3bb8b8b022d2280be 100644 --- a/pkgs/applications/networking/remote/xrdp/default.nix +++ b/pkgs/applications/networking/remote/xrdp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, which, perl, autoconf, automake, libtool, openssl, systemd, pam, fuse, libjpeg, libopus, nasm, xorg }: +{ stdenv, fetchFromGitHub, pkgconfig, which, perl, autoconf, automake, libtool, openssl, systemd, pam, fuse, libjpeg, libopus, nasm, xorg }: let xorgxrdp = stdenv.mkDerivation rec { diff --git a/pkgs/applications/networking/seafile-client/default.nix b/pkgs/applications/networking/seafile-client/default.nix index ea0a756e76d104f44d22e546e01d4ea294b91bc3..a1f1d50e5beefdbc8d76aa6078adc62f207e3ed2 100644 --- a/pkgs/applications/networking/seafile-client/default.nix +++ b/pkgs/applications/networking/seafile-client/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, writeScript, pkgconfig, cmake, qtbase, qttools +{ stdenv, fetchFromGitHub, pkgconfig, cmake, qtbase, qttools , seafile-shared, ccnet, makeWrapper , withShibboleth ? true, qtwebengine }: diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index ef1dade4dddd50cd6b2d5457349125d1e00cdfa4..5232704cd361d353ec7c8309011d491eac87df91 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -1,5 +1,5 @@ -{ stdenv, lib, fetchurl, pkgconfig, pcre, perl, flex, bison, gettext, libpcap, libnl, c-ares -, gnutls, libgcrypt, libgpgerror, geoip, openssl, lua5, makeDesktopItem, python, libcap, glib +{ stdenv, fetchurl, pkgconfig, pcre, perl, flex, bison, gettext, libpcap, libnl, c-ares +, gnutls, libgcrypt, libgpgerror, geoip, openssl, lua5, python, libcap, glib , libssh, zlib, cmake, extra-cmake-modules, fetchpatch, makeWrapper , withGtk ? false, gtk3 ? null, librsvg ? null, gsettings-desktop-schemas ? null, wrapGAppsHook ? null , withQt ? false, qt5 ? null diff --git a/pkgs/applications/networking/super-productivity/default.nix b/pkgs/applications/networking/super-productivity/default.nix index 251bef91360a6c3c2dd1ff6a0a468740a7b64fdd..5519ba41ac7bfbf24e2e6edb7c2f0e4215368fb6 100644 --- a/pkgs/applications/networking/super-productivity/default.nix +++ b/pkgs/applications/networking/super-productivity/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, dpkg, makeWrapper , alsaLib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, glib , gnome3, gtk3, gdk_pixbuf, libnotify, libxcb, nspr, nss, pango -, systemd, wget, xorg, xprintidle-ng }: +, systemd, xorg, xprintidle-ng }: let diff --git a/pkgs/applications/networking/sync/backintime/qt4.nix b/pkgs/applications/networking/sync/backintime/qt4.nix index b8f388c63eb53e25e56acb5b67ccbae6a4d4dcd6..26288f9f6e65033a9bbc417e26b1d253130b0d3d 100644 --- a/pkgs/applications/networking/sync/backintime/qt4.nix +++ b/pkgs/applications/networking/sync/backintime/qt4.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, makeWrapper, gettext, pkgconfig, libtool, backintime-common, python3, python3Packages }: +{stdenv, makeWrapper, gettext, backintime-common, python3, python3Packages }: stdenv.mkDerivation rec { inherit (backintime-common) version src installFlags; diff --git a/pkgs/applications/networking/sync/casync/default.nix b/pkgs/applications/networking/sync/casync/default.nix index 82dd3a506dee8d0dfbfc55e2be272e135fbc3252..bea6a0780ed92d7f7c672990654ee356c46a37ad 100644 --- a/pkgs/applications/networking/sync/casync/default.nix +++ b/pkgs/applications/networking/sync/casync/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch +{ stdenv, fetchFromGitHub , meson, ninja, pkgconfig, sphinx , acl, curl, fuse, libselinux, udev, xz, zstd , fuseSupport ? true diff --git a/pkgs/applications/networking/sync/rsync/base.nix b/pkgs/applications/networking/sync/rsync/base.nix index abc1f27e4f60aa81512a53cbd10c61e94ef62181..fc4bc6c0671e44c156a57894c95e5f0a0e6e98f5 100644 --- a/pkgs/applications/networking/sync/rsync/base.nix +++ b/pkgs/applications/networking/sync/rsync/base.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch }: +{ stdenv, fetchurl }: rec { version = "3.1.3"; diff --git a/pkgs/applications/networking/sync/rsync/default.nix b/pkgs/applications/networking/sync/rsync/default.nix index f1e3f6b7301cd5feaf85b24e076a32f49c3d06da..0b4d580cd2099684629265d9fa2439d3c5d5fa3e 100644 --- a/pkgs/applications/networking/sync/rsync/default.nix +++ b/pkgs/applications/networking/sync/rsync/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, perl, libiconv, zlib, popt +{ stdenv, fetchurl, perl, libiconv, zlib, popt , enableACLs ? true, acl ? null , enableCopyDevicesPatch ? false }: @@ -6,7 +6,7 @@ assert enableACLs -> acl != null; let - base = import ./base.nix { inherit stdenv fetchurl fetchpatch; }; + base = import ./base.nix { inherit stdenv fetchurl; }; in stdenv.mkDerivation rec { name = "rsync-${base.version}"; diff --git a/pkgs/applications/networking/sync/rsync/rrsync.nix b/pkgs/applications/networking/sync/rsync/rrsync.nix index bc2a6eb9c3cb658c49e0b314f06d558648357203..e5c04798aab8c4776829faef4d6d05c77f318dcb 100644 --- a/pkgs/applications/networking/sync/rsync/rrsync.nix +++ b/pkgs/applications/networking/sync/rsync/rrsync.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, fetchpatch, perl, rsync }: let - base = import ./base.nix { inherit stdenv fetchurl fetchpatch; }; + base = import ./base.nix { inherit stdenv fetchurl; }; in stdenv.mkDerivation rec { name = "rrsync-${base.version}"; diff --git a/pkgs/applications/networking/znc/modules.nix b/pkgs/applications/networking/znc/modules.nix index 4b68285c3f1a5735c7bb6e8a998e458b0e739bd2..a799df2d1ed0ac9a64bab28385f3fa0762cab423 100644 --- a/pkgs/applications/networking/znc/modules.nix +++ b/pkgs/applications/networking/znc/modules.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchFromGitHub, znc }: +{ stdenv, fetchFromGitHub, znc }: let zncDerivation = a@{ diff --git a/pkgs/applications/office/autokey/default.nix b/pkgs/applications/office/autokey/default.nix index fdff39e27f90f76c714276229f61fc64d5a57a9f..0a6268f8452f0656cb6afa8bf211bd81bf0d5f59 100644 --- a/pkgs/applications/office/autokey/default.nix +++ b/pkgs/applications/office/autokey/default.nix @@ -1,5 +1,5 @@ { lib, python3Packages, fetchFromGitHub, wrapGAppsHook, gobjectIntrospection -, gtksourceview, gnome3, libappindicator-gtk3, libnotify }: +, gnome3, libappindicator-gtk3, libnotify }: python3Packages.buildPythonApplication rec { name = "autokey-${version}"; diff --git a/pkgs/applications/office/calligra/default.nix b/pkgs/applications/office/calligra/default.nix index 80046ecb2cd516443aa7878c9d6483cf3fa4dc93..a7c6165bdd2b8309dcce92676dd02a8f7264afeb 100644 --- a/pkgs/applications/office/calligra/default.nix +++ b/pkgs/applications/office/calligra/default.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, fetchurl, fetchpatch, extra-cmake-modules, kdoctools, makeWrapper, + mkDerivation, lib, fetchurl, extra-cmake-modules, kdoctools, makeWrapper, boost, qtwebkit, qtx11extras, shared-mime-info, breeze-icons, kactivities, karchive, kcodecs, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kdiagram, kguiaddons, khtml, ki18n, diff --git a/pkgs/applications/office/impressive/default.nix b/pkgs/applications/office/impressive/default.nix index 92feb6618c9e9c103c08c4f65c538f9601d2c5dc..8946bbab93164d83be2e2f4323b0995191bf5af4 100644 --- a/pkgs/applications/office/impressive/default.nix +++ b/pkgs/applications/office/impressive/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, python2, makeWrapper, lib -, libGLU_combined, SDL, freeglut, ghostscript, pdftk, dejavu_fonts }: +, SDL, ghostscript, pdftk, dejavu_fonts }: let version = "0.12.0"; diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index e3ff0b594b4efafa6138169c24c059b70ba90057..43258282ac06c0fac13e4054c34b245ea749d590 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pam, python3, libxslt, perl, ArchiveZip, gettext -, CompressZlib, zlib, libjpeg, expat, pkgconfigUpstream, freetype, libwpd +, CompressZlib, zlib, libjpeg, expat, freetype, libwpd , libxml2, db, sablotron, curl, fontconfig, libsndfile, neon , bison, flex, zip, unzip, gtk3, gtk2, libmspack, getopt, file, cairo, which , icu, boost, jdk, ant, cups, xorg, libcmis @@ -8,7 +8,7 @@ , autoconf, automake, openldap, bash, hunspell, librdf_redland, nss, nspr , libwpg, dbus-glib, glibc, qt4, clucene_core, libcdr, lcms, vigra , unixODBC, mdds, sane-backends, mythes, libexttextcat, libvisio -, fontsConf, pkgconfig, libzip, bluez5, libtool, maven, carlito +, fontsConf, pkgconfig, bluez5, libtool, carlito , libatomic_ops, graphite2, harfbuzz, libodfgen, libzmf , librevenge, libe-book, libmwaw, glm, glew, gst_all_1 , gdb, commonsLogging, librdf_rasqal, wrapGAppsHook diff --git a/pkgs/applications/office/libreoffice/still.nix b/pkgs/applications/office/libreoffice/still.nix index dbfeb0f2fe867630eea8d963c4e21eed05675004..7a2538e4bcd667d317b0c942242b88c0b58e9fb5 100644 --- a/pkgs/applications/office/libreoffice/still.nix +++ b/pkgs/applications/office/libreoffice/still.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pam, python3, libxslt, perl, ArchiveZip -, CompressZlib, zlib, libjpeg, expat, pkgconfigUpstream, freetype, libwpd +, CompressZlib, zlib, libjpeg, expat, freetype, libwpd , libxml2, db, sablotron, curl, fontconfig, libsndfile, neon , bison, flex, zip, unzip, gtk3, gtk2, libmspack, getopt, file, cairo, which , icu, boost, jdk, ant, cups, xorg, libcmis, carlito @@ -8,7 +8,7 @@ , autoconf, automake, openldap, bash, hunspell, librdf_redland, nss, nspr , libwpg, dbus-glib, glibc, qt4, clucene_core, libcdr, lcms, vigra , unixODBC, mdds, sane-backends, mythes, libexttextcat, libvisio -, fontsConf, pkgconfig, libzip, bluez5, libtool, maven +, fontsConf, pkgconfig, bluez5, libtool , libatomic_ops, graphite2, harfbuzz, libodfgen, libzmf , librevenge, libe-book, libmwaw, glm, glew, gst_all_1 , gdb, commonsLogging, librdf_rasqal, wrapGAppsHook diff --git a/pkgs/applications/office/moneyplex/default.nix b/pkgs/applications/office/moneyplex/default.nix index 31de4db76f1aa6e29175036ade117a36bd151462..47d2ecc81ea371d2d73dc7d3f47abd91583dd08c 100644 --- a/pkgs/applications/office/moneyplex/default.nix +++ b/pkgs/applications/office/moneyplex/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, patchelf, libredirect, coreutils, pcsclite +{ stdenv, fetchurl, patchelf, coreutils, pcsclite , zlib, glib, gdk_pixbuf, gtk2, cairo, pango, libX11, atk, openssl }: let diff --git a/pkgs/applications/office/timetrap/default.nix b/pkgs/applications/office/timetrap/default.nix index 3564454a67414b0a50f870ea23c393761d6e4298..20dd27fa28737c60307ca6477fe86aba31758265 100644 --- a/pkgs/applications/office/timetrap/default.nix +++ b/pkgs/applications/office/timetrap/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, bundlerEnv, ruby }: +{ lib, bundlerEnv, ruby }: bundlerEnv rec { name = "timetrap-${version}"; diff --git a/pkgs/applications/office/trytond/default.nix b/pkgs/applications/office/trytond/default.nix index d1b3cb1b1a1718d39a2876e1118040baee5b84e8..59c58a3af13a0fc5a9d363ed649b618d65a7bb4a 100644 --- a/pkgs/applications/office/trytond/default.nix +++ b/pkgs/applications/office/trytond/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python2Packages +{ stdenv, python2Packages , withPostgresql ? true }: with stdenv.lib; diff --git a/pkgs/applications/office/wpsoffice/default.nix b/pkgs/applications/office/wpsoffice/default.nix index a55a98b1f5eb548e0dd441c650d1ac31d452662c..46faf9ba651e9e504a4fbfda624a1443f57c6e9b 100644 --- a/pkgs/applications/office/wpsoffice/default.nix +++ b/pkgs/applications/office/wpsoffice/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchFromGitHub +{ stdenv, fetchurl , libX11, glib, xorg, fontconfig, freetype , zlib, libpng12, libICE, libXrender, cups }: diff --git a/pkgs/applications/office/zim/default.nix b/pkgs/applications/office/zim/default.nix index 9f7048f36462ba781bce0b6c46def9951bca2264..26a141dc5067071ec62b9c8ef19ffc88b336ca7e 100644 --- a/pkgs/applications/office/zim/default.nix +++ b/pkgs/applications/office/zim/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, python2Packages }: +{ stdenv, fetchurl, python2Packages }: # # TODO: Declare configuration options for the following optional dependencies: diff --git a/pkgs/applications/science/astronomy/celestia/default.nix b/pkgs/applications/science/astronomy/celestia/default.nix index 589625cc18f98ccc75ddb59933682b5c5acc4128..e3ceffd34c199e413f1e3e997a9916c68c917d27 100644 --- a/pkgs/applications/science/astronomy/celestia/default.nix +++ b/pkgs/applications/science/astronomy/celestia/default.nix @@ -1,6 +1,5 @@ { stdenv, fetchurl, freeglut, gtk2, gtkglext, libjpeg_turbo, libtheora, libXmu -, lua, libGLU_combined, pkgconfig, perl, autoreconfHook, glib, cairo -, pango, gdk_pixbuf, atk +, lua, libGLU_combined, pkgconfig, perl, autoreconfHook }: let diff --git a/pkgs/applications/science/astronomy/stellarium/default.nix b/pkgs/applications/science/astronomy/stellarium/default.nix index 111608126718b2af5cca77c8233cb47b32cf6a6b..24d6246e90cdc329276cecbaf3fc9c3f8f31cec8 100644 --- a/pkgs/applications/science/astronomy/stellarium/default.nix +++ b/pkgs/applications/science/astronomy/stellarium/default.nix @@ -1,5 +1,5 @@ { mkDerivation, lib, fetchFromGitHub -, cmake, freetype, libpng, libGLU_combined, gettext, openssl, perl, libiconv +, cmake, freetype, libpng, libGLU_combined, openssl, perl, libiconv , qtscript, qtserialport, qttools , qtmultimedia, qtlocation, makeWrapper, qtbase }: diff --git a/pkgs/applications/science/biology/diamond/default.nix b/pkgs/applications/science/biology/diamond/default.nix index a45e5df2f52843ea225e48d6d51a5264cdff8dcf..854e91b2fcbb67d74c6b0d0ce0cba8f71b88da53 100644 --- a/pkgs/applications/science/biology/diamond/default.nix +++ b/pkgs/applications/science/biology/diamond/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, gcc, zlib }: +{ stdenv, fetchurl, cmake, zlib }: stdenv.mkDerivation rec { name = "diamond-0.8.36"; diff --git a/pkgs/applications/science/biology/freebayes/default.nix b/pkgs/applications/science/biology/freebayes/default.nix index 99d2dfa55ddd36e7ab7c15daa79e343c7a24469b..1a15dcf6197d01c96a0ad0505370318c2fdb8147 100644 --- a/pkgs/applications/science/biology/freebayes/default.nix +++ b/pkgs/applications/science/biology/freebayes/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, gcc, zlib, bzip2, lzma }: +{ stdenv, fetchFromGitHub, zlib, bzip2, lzma }: stdenv.mkDerivation rec { name = "freebayes-${version}"; diff --git a/pkgs/applications/science/biology/mosdepth/default.nix b/pkgs/applications/science/biology/mosdepth/default.nix index 05cd7992aa900e7f7308aacf5d86094b779fa9cf..4b4920a6ca3a05e8f2ee1a3873b1e73312fbe6b1 100644 --- a/pkgs/applications/science/biology/mosdepth/default.nix +++ b/pkgs/applications/science/biology/mosdepth/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, nim, htslib, patchelf, pcre}: +{stdenv, fetchFromGitHub, nim, htslib, pcre}: let hts-nim = fetchFromGitHub { diff --git a/pkgs/applications/science/biology/raxml/default.nix b/pkgs/applications/science/biology/raxml/default.nix index efe19a4e2b6e8ce477424f3873849a5f7c787634..140f7032319406258770d87398a6f03ff991af73 100644 --- a/pkgs/applications/science/biology/raxml/default.nix +++ b/pkgs/applications/science/biology/raxml/default.nix @@ -1,6 +1,5 @@ { stdenv , fetchFromGitHub -, zlib , pkgs , mpi ? false }: diff --git a/pkgs/applications/science/biology/vcftools/default.nix b/pkgs/applications/science/biology/vcftools/default.nix index ab3050955df790e9975f573f41f2cbfe1059974d..394973692dca70d8b5fc020546f2945bf54f7100 100755 --- a/pkgs/applications/science/biology/vcftools/default.nix +++ b/pkgs/applications/science/biology/vcftools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, htslib, zlib, autoreconfHook, pkgconfig, perl }: +{ stdenv, fetchFromGitHub, zlib, autoreconfHook, pkgconfig, perl }: stdenv.mkDerivation rec { name = "${pname}-${version}"; diff --git a/pkgs/applications/science/electronics/adms/default.nix b/pkgs/applications/science/electronics/adms/default.nix index 99b7ef79594f0921771abd98944159db76a60f3e..236225959f7a479a704d08ee8665a87b19712b95 100644 --- a/pkgs/applications/science/electronics/adms/default.nix +++ b/pkgs/applications/science/electronics/adms/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libtool, autoreconfHook, flex, bison, gperf, +{ stdenv, fetchFromGitHub, autoreconfHook, flex, bison, gperf, libxml2, perl, perlPackages, gd }: stdenv.mkDerivation rec { diff --git a/pkgs/applications/science/electronics/bitscope/common.nix b/pkgs/applications/science/electronics/bitscope/common.nix index ba2d5221cc510f508ac462c53644d8ed9fbd4a87..64777b5a0ac8ee0d2e1bb5602b90c6e1b3c1ca2d 100644 --- a/pkgs/applications/science/electronics/bitscope/common.nix +++ b/pkgs/applications/science/electronics/bitscope/common.nix @@ -2,14 +2,12 @@ , buildFHSUserEnv , cairo , dpkg -, fetchurl , gdk_pixbuf , glib , gtk2-x11 , makeWrapper , pango , stdenv -, writeTextFile , xorg }: diff --git a/pkgs/applications/science/electronics/bitscope/packages.nix b/pkgs/applications/science/electronics/bitscope/packages.nix index dc333f3d3b76d305c2b0464f1c7e1a0326274e1f..58e01f4f9f4986e22a19592d8533c88c5e204a79 100644 --- a/pkgs/applications/science/electronics/bitscope/packages.nix +++ b/pkgs/applications/science/electronics/bitscope/packages.nix @@ -1,8 +1,5 @@ -{ buildFHSUserEnv -, callPackage +{ callPackage , fetchurl -, makeWrapper -, stdenv }: let diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix index 8e98bad55c3dfb20ffa950603c60539869cea646..e3244ec339ea6bb06110064c9e95f235148c01c0 100644 --- a/pkgs/applications/science/electronics/kicad/default.nix +++ b/pkgs/applications/science/electronics/kicad/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchbzr, cmake, libGLU_combined, wxGTK, zlib, libX11, gettext, glew, cairo, curl, openssl, boost, pkgconfig, doxygen }: +{ stdenv, fetchurl, cmake, libGLU_combined, wxGTK, zlib, libX11, gettext, glew, cairo, curl, openssl, boost, pkgconfig, doxygen }: stdenv.mkDerivation rec { name = "kicad-${version}"; diff --git a/pkgs/applications/science/electronics/librepcb/default.nix b/pkgs/applications/science/electronics/librepcb/default.nix index 48afb5bf9dc0cabf2bb57719617ec3f5acb5674e..33eb52c18ee7ebc2206a2110fd5231a7eda19834 100644 --- a/pkgs/applications/science/electronics/librepcb/default.nix +++ b/pkgs/applications/science/electronics/librepcb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, qtbase, qttools, qmake, libGLU_combined, openssl, zlib }: +{ stdenv, fetchFromGitHub, qtbase, qttools, qmake }: stdenv.mkDerivation rec { name = "librepcb-${version}"; diff --git a/pkgs/applications/science/logic/aspino/default.nix b/pkgs/applications/science/logic/aspino/default.nix index 5e1a448a7cf99b14cf020b3ec447570e786beef4..d7a5e7b4c83fb8ddde1ebc71c98eadf5e3071eee 100644 --- a/pkgs/applications/science/logic/aspino/default.nix +++ b/pkgs/applications/science/logic/aspino/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchFromGitHub, zlib, boost, glucose }: +{ stdenv, fetchurl, fetchFromGitHub, zlib, boost }: let glucose' = fetchurl { diff --git a/pkgs/applications/science/logic/coq2html/default.nix b/pkgs/applications/science/logic/coq2html/default.nix index 9687ac66ead16efaeb4aac86fef02279f48f7f04..a987bf1ba57ee5f04686c3c5a9e6c112aea81033 100644 --- a/pkgs/applications/science/logic/coq2html/default.nix +++ b/pkgs/applications/science/logic/coq2html/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, make, fetchgit, ocaml }: +{ stdenv, make, fetchgit, ocaml }: let version = "20170720"; diff --git a/pkgs/applications/science/logic/elan/default.nix b/pkgs/applications/science/logic/elan/default.nix index ff737de0cc4f8f29e5932cb7f431106ae64506cb..2b7cb9c30faef2086145fe9065d10fca1613b3b7 100644 --- a/pkgs/applications/science/logic/elan/default.nix +++ b/pkgs/applications/science/logic/elan/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, pkgconfig, curl, openssl, zlib, fetchFromGitHub, rustPlatform }: +{ stdenv, pkgconfig, curl, openssl, zlib, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { name = "elan-${version}"; diff --git a/pkgs/applications/science/logic/hol_light/default.nix b/pkgs/applications/science/logic/hol_light/default.nix index 8d7c11ee91b7d3f98f34bc07bf3c44234f3c9c2e..a1779baf5f82b4cffe3acb86991b1f997f8a8c95 100644 --- a/pkgs/applications/science/logic/hol_light/default.nix +++ b/pkgs/applications/science/logic/hol_light/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, writeScript, ocaml, camlp5 }: +{ stdenv, fetchFromGitHub, fetchpatch, ocaml, camlp5 }: let start_script = '' diff --git a/pkgs/applications/science/logic/lean2/default.nix b/pkgs/applications/science/logic/lean2/default.nix index 2b861b6d06d9bb64cd372f3e45c1d97c902f5f6b..4e1415d3961db52700a0428c1045a1f8b0f3a0b0 100644 --- a/pkgs/applications/science/logic/lean2/default.nix +++ b/pkgs/applications/science/logic/lean2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, gmp, mpfr, boost, python +{ stdenv, fetchFromGitHub, cmake, gmp, mpfr, python , gperftools, ninja, makeWrapper }: stdenv.mkDerivation rec { diff --git a/pkgs/applications/science/logic/mcrl2/default.nix b/pkgs/applications/science/logic/mcrl2/default.nix index 6d9549b526f9b2438174884f018e202c9ff68d22..dc32e84279a80829dc7efd1d1de6cb917f00bb49 100644 --- a/pkgs/applications/science/logic/mcrl2/default.nix +++ b/pkgs/applications/science/logic/mcrl2/default.nix @@ -1,5 +1,4 @@ -{stdenv, fetchurl, cmake, subversion, libGLU_combined, qt5, boost, - python27, python27Packages}: +{stdenv, fetchurl, cmake, libGLU_combined, qt5, boost}: stdenv.mkDerivation rec { version = "201707"; diff --git a/pkgs/applications/science/logic/saw-tools/default.nix b/pkgs/applications/science/logic/saw-tools/default.nix index 949b34420b79e2be81c1eb4b6fae2c3d878df7f3..65d2b4d91c3052e8f8b6546c5a3e4c7e73e280dd 100644 --- a/pkgs/applications/science/logic/saw-tools/default.nix +++ b/pkgs/applications/science/logic/saw-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gmp4, ncurses, zlib, makeWrapper, clang_35 }: +{ stdenv, fetchurl, gmp4, ncurses, zlib, clang_35 }: let libPath = stdenv.lib.makeLibraryPath diff --git a/pkgs/applications/science/logic/tamarin-prover/default.nix b/pkgs/applications/science/logic/tamarin-prover/default.nix index fb37554b65fe7afcf31436fcb38fb79a00761e2a..4efc384ed227973f61ed48581f83ed6f1ac6c562 100644 --- a/pkgs/applications/science/logic/tamarin-prover/default.nix +++ b/pkgs/applications/science/logic/tamarin-prover/default.nix @@ -1,4 +1,4 @@ -{ haskell, haskellPackages, mkDerivation, fetchFromGitHub, lib +{ haskellPackages, mkDerivation, fetchFromGitHub, lib # the following are non-haskell dependencies , makeWrapper, which, maude, graphviz, sapic }: diff --git a/pkgs/applications/science/logic/tlaplus/tlaps.nix b/pkgs/applications/science/logic/tlaplus/tlaps.nix index 9a78c1df8b17c2691cdf722f073d527370d841c6..7d35f5f91df3f4421ec43286f6346672c2eac0dd 100644 --- a/pkgs/applications/science/logic/tlaplus/tlaps.nix +++ b/pkgs/applications/science/logic/tlaplus/tlaps.nix @@ -1,8 +1,6 @@ -{ lib -, fetchurl -, makeWrapper +{ fetchurl , stdenv -, ocaml, gawk, isabelle, cvc3, perl, wget, which +, ocaml, isabelle, cvc3, perl, wget, which }: stdenv.mkDerivation rec { diff --git a/pkgs/applications/science/logic/workcraft/default.nix b/pkgs/applications/science/logic/workcraft/default.nix index b677927a8eff78054d834fe32ccb53a68560de11..313fe5a9f1dd68c71331b6dcb50941b9cf1accd9 100644 --- a/pkgs/applications/science/logic/workcraft/default.nix +++ b/pkgs/applications/science/logic/workcraft/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgs, fetchurl, jre, makeWrapper }: +{ stdenv, fetchurl, jre, makeWrapper }: stdenv.mkDerivation rec { name = "workcraft-${version}"; diff --git a/pkgs/applications/science/machine-learning/torch/torch-distro.nix b/pkgs/applications/science/machine-learning/torch/torch-distro.nix index 85a4aa02e4410a1d6561356286eca09715925b5a..9c4f24021430f2a3d4d024a4463492b1e97ac061 100644 --- a/pkgs/applications/science/machine-learning/torch/torch-distro.nix +++ b/pkgs/applications/science/machine-learning/torch/torch-distro.nix @@ -1,6 +1,6 @@ -{ luarocks, lib , stdenv, writeText , readline, makeWrapper, - less, ncurses, cmake, openblas, coreutils, fetchgit, libuuid, czmq, openssl, - gnuplot, fetchurl, lua, src, libjpeg, libpng +{ luarocks, lib , stdenv, readline, makeWrapper, + less, ncurses, cmake, coreutils, fetchgit, libuuid, czmq, openssl, + gnuplot, lua, src, libjpeg, libpng } : let diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix index 25ebee96a103dd6fc2f061a07e7ed7e6cae60668..913fac6ac1286df351885ab8268a4d60057fa1d2 100644 --- a/pkgs/applications/science/math/R/default.nix +++ b/pkgs/applications/science/math/R/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, bzip2, gfortran, libX11, libXmu, libXt, libjpeg, libpng , libtiff, ncurses, pango, pcre, perl, readline, tcl, texLive, tk, xz, zlib , less, texinfo, graphviz, icu, pkgconfig, bison, imake, which, jdk, openblas -, curl, Cocoa, Foundation, cf-private, libobjc, libcxx, tzdata, fetchpatch +, curl, Cocoa, Foundation, libobjc, libcxx, tzdata , withRecommendedPackages ? true , enableStrictBarrier ? false }: diff --git a/pkgs/applications/science/math/cntk/default.nix b/pkgs/applications/science/math/cntk/default.nix index 07740f4c8aeac2b33479d0d7199a2b3913927c40..fe5c77be8b22b70140a116a151ce1ca9e3690d38 100644 --- a/pkgs/applications/science/math/cntk/default.nix +++ b/pkgs/applications/science/math/cntk/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, fetchFromGitHub, fetchpatch, cmake +{ lib, stdenv, fetchgit, fetchFromGitHub, cmake , openblas, opencv3, libzip, boost, protobuf, openmpi , onebitSGDSupport ? false , cudaSupport ? false, cudatoolkit, nvidia_x11 diff --git a/pkgs/applications/science/math/colpack/default.nix b/pkgs/applications/science/math/colpack/default.nix index 29785363b0482ff149ef2b4c27aeb23d864c9ac6..e62df7f11cc7e6f77dba605438b3fbd2ef7e1294 100644 --- a/pkgs/applications/science/math/colpack/default.nix +++ b/pkgs/applications/science/math/colpack/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, autoconf, automake, libtool, gettext }: +{ stdenv, fetchFromGitHub, autoconf, automake, libtool, gettext }: stdenv.mkDerivation rec { diff --git a/pkgs/applications/science/math/mathematica/10.nix b/pkgs/applications/science/math/mathematica/10.nix index 6a49976c86b8d0fb6f13da976a0716cece83bee0..4884ee1f93abd5f10d8037339cc0bbb7258e67b6 100644 --- a/pkgs/applications/science/math/mathematica/10.nix +++ b/pkgs/applications/science/math/mathematica/10.nix @@ -7,13 +7,11 @@ , freetype , gcc , glib -, libpng , ncurses , opencv , openssl , unixODBC , xorg -, zlib , libxml2 , libuuid }: diff --git a/pkgs/applications/science/math/mathematica/9.nix b/pkgs/applications/science/math/mathematica/9.nix index c4fd0c384c1481600a4b6f1559ca46977626794d..d60feb54695d7765e8afe2b4eed26c9d5bba0d2f 100644 --- a/pkgs/applications/science/math/mathematica/9.nix +++ b/pkgs/applications/science/math/mathematica/9.nix @@ -7,13 +7,11 @@ , freetype , gcc , glib -, libpng , ncurses , opencv , openssl , unixODBC , xorg -, zlib }: let diff --git a/pkgs/applications/science/math/mathematica/default.nix b/pkgs/applications/science/math/mathematica/default.nix index d2a518e9db0be1ded15501d395a3f54f77988aad..fa4ff8b00687508944df31f2431461a8a719e469 100644 --- a/pkgs/applications/science/math/mathematica/default.nix +++ b/pkgs/applications/science/math/mathematica/default.nix @@ -8,7 +8,6 @@ , freetype , gcc , glib -, libpng , ncurses , opencv , openssl diff --git a/pkgs/applications/science/math/sage/env-locations.nix b/pkgs/applications/science/math/sage/env-locations.nix index 2ed079ab32bc886ed367cc58a74c100f80fd0bbf..288ffd6e0e1a1421b293b5eaabe6696607388a4b 100644 --- a/pkgs/applications/science/math/sage/env-locations.nix +++ b/pkgs/applications/science/math/sage/env-locations.nix @@ -1,5 +1,4 @@ -{ stdenv -, writeTextFile +{ writeTextFile , pari_data , pari , singular diff --git a/pkgs/applications/science/math/sage/openblas-pc.nix b/pkgs/applications/science/math/sage/openblas-pc.nix index ba46850bbc617fa01c6ace1f75861bd4999e6b37..f4669a6557e94ffe29c2b9cd06482a5018de03be 100644 --- a/pkgs/applications/science/math/sage/openblas-pc.nix +++ b/pkgs/applications/science/math/sage/openblas-pc.nix @@ -1,5 +1,4 @@ -{ stdenv -, openblasCompat +{ openblasCompat , writeTextFile , name }: diff --git a/pkgs/applications/science/math/sage/sage-with-env.nix b/pkgs/applications/science/math/sage/sage-with-env.nix index 3d1ebe87c6b7117d71195598e2921273e976c893..63b9772b8231f7615268eaf3808b6bbc6ae8ce1d 100644 --- a/pkgs/applications/science/math/sage/sage-with-env.nix +++ b/pkgs/applications/science/math/sage/sage-with-env.nix @@ -3,8 +3,6 @@ , makeWrapper , sage-env , sage-src -, sagelib -, sagedoc , openblasCompat , openblas-blas-pc , openblas-cblas-pc @@ -14,7 +12,6 @@ , singular , libgap , gap-libgap-compatible -, gcc , giac , maxima-ecl , pari diff --git a/pkgs/applications/science/math/sage/sagedoc.nix b/pkgs/applications/science/math/sage/sagedoc.nix index 7b280e9e0280678c3508450c55e7bd064009cef4..a594428a389ae14979d02f5a915de26a7d075c99 100644 --- a/pkgs/applications/science/math/sage/sagedoc.nix +++ b/pkgs/applications/science/math/sage/sagedoc.nix @@ -1,7 +1,5 @@ -{ pkgs -, stdenv +{ stdenv , sage-src -, env-locations , sage-with-env , sagelib , python2 diff --git a/pkgs/applications/science/math/sage/sagelib.nix b/pkgs/applications/science/math/sage/sagelib.nix index a053d997bf9a6adb36fd07677d4e3a49591826c8..abcefba5e260f18cf5cf56d4288c897643c22e1e 100644 --- a/pkgs/applications/science/math/sage/sagelib.nix +++ b/pkgs/applications/science/math/sage/sagelib.nix @@ -1,5 +1,4 @@ -{ stdenv -, sage-src +{ sage-src , perl , buildPythonPackage , arb diff --git a/pkgs/applications/science/math/scilab/default.nix b/pkgs/applications/science/math/scilab/default.nix index fcdbb6b985d69e5575a3b5f79f415643d17ae6c8..6063a45a3efb569668f85d765d1cf8a2995c0697 100644 --- a/pkgs/applications/science/math/scilab/default.nix +++ b/pkgs/applications/science/math/scilab/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl, lib, gfortran , ncurses -, Xaw3d, withXaw3d ? false +, withXaw3d ? false #, withPVMlib ? false , tcl, tk, withTk ? false , gtk2, withGtk ? false # working ? diff --git a/pkgs/applications/science/math/singular/default.nix b/pkgs/applications/science/math/singular/default.nix index cec1a831c9128860887d3db7d9decbafe87160e8..8be302f41e5e5d729126cbcfad2f2e4dfb1f0309 100644 --- a/pkgs/applications/science/math/singular/default.nix +++ b/pkgs/applications/science/math/singular/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gmp, bison, perl, autoconf, ncurses, readline, coreutils, pkgconfig +{ stdenv, fetchurl, gmp, bison, perl, ncurses, readline, coreutils, pkgconfig , autoreconfHook , file , flint diff --git a/pkgs/applications/science/misc/gephi/default.nix b/pkgs/applications/science/misc/gephi/default.nix index 3a0bcb66813e2329e9d90fa3de2fdf3f431c350a..b81f188a91bfb769a5677fb8821c036c7cbf0cd1 100644 --- a/pkgs/applications/science/misc/gephi/default.nix +++ b/pkgs/applications/science/misc/gephi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, callPackage, jdk, maven, javaPackages }: +{ stdenv, fetchFromGitHub, jdk, maven, javaPackages }: let version = "0.9.2"; diff --git a/pkgs/applications/science/misc/golly/beta.nix b/pkgs/applications/science/misc/golly/beta.nix index f423adbe786465145be1d795139cbdc56372f023..dc768725d4fbec3c5dafce349835c3d404b74a26 100644 --- a/pkgs/applications/science/misc/golly/beta.nix +++ b/pkgs/applications/science/misc/golly/beta.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, fetchgit +{stdenv, fetchgit , wxGTK, perl, python2, zlib, libGLU_combined, libX11 , automake, autoconf }: diff --git a/pkgs/applications/science/misc/openmvg/default.nix b/pkgs/applications/science/misc/openmvg/default.nix index 0f0c6aaf74da6a53a316c61b85fd0a5e9f6b52e2..c3e1cd60bf0bbf8402664750526fe8207aa988b1 100644 --- a/pkgs/applications/science/misc/openmvg/default.nix +++ b/pkgs/applications/science/misc/openmvg/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, pkgconfig, cmake +{ stdenv, fetchgit, pkgconfig, cmake , libjpeg ? null , zlib ? null , libpng ? null diff --git a/pkgs/applications/science/misc/openmvs/default.nix b/pkgs/applications/science/misc/openmvs/default.nix index 4e5b986a428e5ab39ca55f4d34540795f059b905..b665d5f4f6878cf367c326f57f70362fcb9c4119 100644 --- a/pkgs/applications/science/misc/openmvs/default.nix +++ b/pkgs/applications/science/misc/openmvs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, cmake +{ stdenv, fetchFromGitHub, pkgconfig, cmake , eigen, opencv, ceres-solver, cgal, boost, vcg , gmp, mpfr, glog, google-gflags, libjpeg_turbo }: diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix index 00ca1d2c7abe88504e15bcccca81eb172dbd918c..e966e798ae6dd9062e1611cc9a5eb6cc09094ac6 100644 --- a/pkgs/applications/science/misc/root/default.nix +++ b/pkgs/applications/science/misc/root/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, cmake, pcre, pkgconfig, python2 +{ stdenv, fetchurl, cmake, pcre, pkgconfig, python2 , libX11, libXpm, libXft, libXext, libGLU_combined, zlib, libxml2, lz4, lzma, gsl, xxHash , Cocoa, OpenGL, noSplash ? false }: diff --git a/pkgs/applications/science/robotics/gazebo/default.nix b/pkgs/applications/science/robotics/gazebo/default.nix index babd87eb2b1d14d498058f69d43592a61b94ef4e..98ccd92c4ee58fff9269cb96ef9ef5305f336c2b 100644 --- a/pkgs/applications/science/robotics/gazebo/default.nix +++ b/pkgs/applications/science/robotics/gazebo/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, cmake, pkgconfig, boost, protobuf, freeimage , boost-build, boost_process , xorg_sys_opengl, tbb, ogre, tinyxml-2 - , libtar, glxinfo, libusb, libxslt, ruby, ignition + , libtar, glxinfo, libusb, libxslt, ignition , pythonPackages, utillinux # these deps are hidden; cmake doesn't catch them diff --git a/pkgs/applications/science/robotics/qgroundcontrol/default.nix b/pkgs/applications/science/robotics/qgroundcontrol/default.nix index 95462c02eb5b784b58f1ac57363522d089eac7df..ce3317da9f8fd067fd854adc77c6e92140e0670c 100644 --- a/pkgs/applications/science/robotics/qgroundcontrol/default.nix +++ b/pkgs/applications/science/robotics/qgroundcontrol/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchgit, git, espeak, SDL2, udev, doxygen, cmake +{ stdenv, fetchgit, git, SDL2, udev, doxygen , qtbase, qtlocation, qtserialport, qtdeclarative, qtconnectivity, qtxmlpatterns , qtsvg, qtquick1, qtquickcontrols, qtgraphicaleffects, qmake, qtspeech -, makeWrapper, lndir -, gst_all_1, qt-gstreamer1, pkgconfig, glibc +, makeWrapper +, gst_all_1, pkgconfig }: stdenv.mkDerivation rec { diff --git a/pkgs/applications/science/robotics/yarp/default.nix b/pkgs/applications/science/robotics/yarp/default.nix index 98576cfd09175f8ddfbe4c341d0b7ddae3b68e47..507481cddab28aa9860522ce8a30b6a8a8f6fc93 100644 --- a/pkgs/applications/science/robotics/yarp/default.nix +++ b/pkgs/applications/science/robotics/yarp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, cmake, ace +{ stdenv, fetchFromGitHub, cmake, ace }: stdenv.mkDerivation rec { diff --git a/pkgs/applications/science/spyder/default.nix b/pkgs/applications/science/spyder/default.nix index 4411d78cec215c1d5a8a1e7d40fcce547b39d67e..0564f3de1b7829b5f8073dd523baad56a39813b8 100644 --- a/pkgs/applications/science/spyder/default.nix +++ b/pkgs/applications/science/spyder/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchPypi, unzip, buildPythonApplication, makeDesktopItem +{ stdenv, fetchPypi, buildPythonApplication, makeDesktopItem # mandatory , numpydoc, qtconsole, qtawesome, jedi, pycodestyle, psutil -, pyflakes, rope, sphinx, nbconvert, mccabe, pyopengl, cloudpickle +, pyflakes, rope, nbconvert, mccabe, pyopengl, cloudpickle # optional , numpy ? null, scipy ? null, matplotlib ? null # optional diff --git a/pkgs/applications/version-management/bazaar/tools.nix b/pkgs/applications/version-management/bazaar/tools.nix index d6c65548c1f708717d8a82b4efd3e027a77b4bfb..0ad3c6079acdb88f65529fc6054669bfffa4ac48 100644 --- a/pkgs/applications/version-management/bazaar/tools.nix +++ b/pkgs/applications/version-management/bazaar/tools.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, python2Packages, bazaar }: +{ stdenv, fetchurl, python2Packages }: python2Packages.buildPythonApplication rec { name = "bzr-tools-${version}"; diff --git a/pkgs/applications/version-management/bitkeeper/default.nix b/pkgs/applications/version-management/bitkeeper/default.nix index 06cfc90e65f138b7c5d0a3fa8194006e1c6c7c9a..26397380d57f591ad783135fc3fdd20aead8646e 100644 --- a/pkgs/applications/version-management/bitkeeper/default.nix +++ b/pkgs/applications/version-management/bitkeeper/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, perl, gperf, bison, groff -, pkgconfig, libXft, fontconfig, pcre -, libtomcrypt, libtommath, lz4, zlib }: +, pkgconfig, libXft, pcre +, libtomcrypt, libtommath, lz4 }: stdenv.mkDerivation rec { name = "bitkeeper-${version}"; diff --git a/pkgs/applications/version-management/git-and-tools/fast-export/default.nix b/pkgs/applications/version-management/git-and-tools/fast-export/default.nix index 474faa30467b69589a1f26312ef4f10865197fcd..88d1f07ee74bee8e460d0a71b614c995f34bcc3d 100644 --- a/pkgs/applications/version-management/git-and-tools/fast-export/default.nix +++ b/pkgs/applications/version-management/git-and-tools/fast-export/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchgit, mercurial, coreutils, git, makeWrapper, subversion}: +{stdenv, fetchgit, mercurial, makeWrapper, subversion}: with stdenv.lib; stdenv.mkDerivation { diff --git a/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/default.nix index 9f1d8e9d7171c43560d1871afd7c61f83e5a23b1..4d0f33730e45bd0a8afe3687d1835487e4df7f0a 100644 --- a/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { name = "git-annex-remote-b2-${version}"; 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 391ca26de257fbb49e55af500a9d426653e6eff2..9bccbdb5049ba92d6516f65b35e73b6ab638ba08 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,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pythonPackages, makeWrapper, gettext, git }: +{ stdenv, fetchFromGitHub, pythonPackages, gettext, git }: let inherit (pythonPackages) buildPythonApplication pyqt5 sip pyinotify python mock; diff --git a/pkgs/applications/version-management/git-and-tools/git-dit/default.nix b/pkgs/applications/version-management/git-and-tools/git-dit/default.nix index 654576a29e8055484f0ac336a801abb3ba5f35c9..9c362276383c20f8e439b71a26e52f0cf761c42e 100644 --- a/pkgs/applications/version-management/git-and-tools/git-dit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-dit/default.nix @@ -1,7 +1,6 @@ { stdenv , fetchFromGitHub , openssl -, gcc , zlib , libssh , cmake diff --git a/pkgs/applications/version-management/git-and-tools/git-fame/default.nix b/pkgs/applications/version-management/git-and-tools/git-fame/default.nix index 8b77efd1be23d75b3fc8d1edce08b9c0cd2236bc..9ca7a67a53e76c243e95c7e2c16b74e44ded2750 100644 --- a/pkgs/applications/version-management/git-and-tools/git-fame/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-fame/default.nix @@ -1,4 +1,4 @@ -{ stdenv, bundlerEnv, ruby, fetchFromGitHub, makeWrapper, bundler }: +{ stdenv, bundlerEnv, ruby }: bundlerEnv rec { inherit ruby; diff --git a/pkgs/applications/version-management/git-and-tools/git-hub/default.nix b/pkgs/applications/version-management/git-and-tools/git-hub/default.nix index 94143e652f9559c78fda03e919067389d3392778..ba126bb476c12dc1abdff2d1642a59e743ff8893 100644 --- a/pkgs/applications/version-management/git-and-tools/git-hub/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-hub/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, docutils, gitMinimal, python2Packages }: +{ stdenv, fetchFromGitHub, gitMinimal, python2Packages }: stdenv.mkDerivation rec { name = "git-hub-${version}"; diff --git a/pkgs/applications/version-management/git-and-tools/hub/default.nix b/pkgs/applications/version-management/git-and-tools/hub/default.nix index 645b12220bdc16e26e4732b739b5abb9bd469167..12b7b8965efadd1e4160bbccbddf0bc9f3c6dd88 100644 --- a/pkgs/applications/version-management/git-and-tools/hub/default.nix +++ b/pkgs/applications/version-management/git-and-tools/hub/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, go, ronn, ruby, groff, Security, utillinux }: +{ stdenv, buildGoPackage, fetchFromGitHub, ronn, ruby, groff, Security, utillinux }: buildGoPackage rec { name = "hub-${version}"; diff --git a/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix b/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix index e3ceccdcf3bd0a5783163b6670979e4483828c72..17fb74945dc44ea4396de0ba17c388a0780b179d 100644 --- a/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix +++ b/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, qmake, qtbase, qttools, subversion, apr }: +{ stdenv, fetchFromGitHub, qmake, qtbase, qttools, subversion, apr }: let version = "1.0.12"; diff --git a/pkgs/applications/version-management/git-lfs/1.nix b/pkgs/applications/version-management/git-lfs/1.nix index 24c22d423d5dedac7b369ae24609f37c4c068bcf..3cde046a2adff62e591cac036bb748a31aa4d6e6 100644 --- a/pkgs/applications/version-management/git-lfs/1.nix +++ b/pkgs/applications/version-management/git-lfs/1.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "git-lfs-${version}"; diff --git a/pkgs/applications/version-management/git-review/default.nix b/pkgs/applications/version-management/git-review/default.nix index 21ceccf9f351f9059df3a1068b99a863dae317e6..7b81c28c37556676bdfdfa9129140acedceade06 100644 --- a/pkgs/applications/version-management/git-review/default.nix +++ b/pkgs/applications/version-management/git-review/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pythonPackages, python} : +{ stdenv, fetchurl, pythonPackages} : pythonPackages.buildPythonApplication rec { name = "git-review-${version}"; diff --git a/pkgs/applications/version-management/git-sizer/default.nix b/pkgs/applications/version-management/git-sizer/default.nix index a0d7382de3419b07f8a3750065b45c5512bc66a4..9c5ab20d364fdccf3d3cb83feb97d65913067be2 100644 --- a/pkgs/applications/version-management/git-sizer/default.nix +++ b/pkgs/applications/version-management/git-sizer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "git-sizer"; diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix index 917deac6daa32cd9b7c5a40b8f90dc744074d4f4..5f8619b4a7f8619b0a268621e4b33964a2c23e56 100644 --- a/pkgs/applications/version-management/gitea/default.nix +++ b/pkgs/applications/version-management/gitea/default.nix @@ -1,5 +1,5 @@ { stdenv, buildGoPackage, fetchFromGitHub, makeWrapper -, git, coreutils, bash, gzip, openssh +, git, bash, gzip, openssh , sqliteSupport ? true }: diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix index db2fdf0199e39643cfaea706e141c111aff3192b..3fb9b9492af2d82ea6723294a5f6e6c7675db69e 100644 --- a/pkgs/applications/version-management/gitkraken/default.nix +++ b/pkgs/applications/version-management/gitkraken/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, libXcomposite, libgnome-keyring, makeWrapper, udev, curl, alsaLib +{ stdenv, libXcomposite, libgnome-keyring, makeWrapper, udev, curl, alsaLib , libXfixes, atk, gtk2, libXrender, pango, gnome2, cairo, freetype, fontconfig , libX11, libXi, libxcb, libXext, libXcursor, glib, libXScrnSaver, libxkbfile, libXtst , nss, nspr, cups, fetchurl, expat, gdk_pixbuf, libXdamage, libXrandr, dbus diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index 87e4aff28c378f09e0ba3dd6b05691c55a78caeb..71c62b758682a2c199aeb26fc5031403b3de7ffc 100644 --- a/pkgs/applications/version-management/gitlab/default.nix +++ b/pkgs/applications/version-management/gitlab/default.nix @@ -1,4 +1,4 @@ -{ pkgs, stdenv, lib, bundler, fetchurl, fetchFromGitHub, bundlerEnv, libiconv +{ stdenv, lib, fetchurl, fetchFromGitHub, bundlerEnv , ruby, tzdata, git, procps, nettools }: diff --git a/pkgs/applications/version-management/gogs/default.nix b/pkgs/applications/version-management/gogs/default.nix index 508c8b3fb6de9a5215bec615c1cb2b2a0a326d27..d3c248b44752d16e7a632e382a91e10fe2a90065 100644 --- a/pkgs/applications/version-management/gogs/default.nix +++ b/pkgs/applications/version-management/gogs/default.nix @@ -1,5 +1,5 @@ { stdenv, buildGoPackage, fetchFromGitHub, makeWrapper -, git, coreutils, bash, gzip, openssh +, git, bash, gzip, openssh , sqliteSupport ? true }: diff --git a/pkgs/applications/version-management/guitone/default.nix b/pkgs/applications/version-management/guitone/default.nix index ded0d5e398634d8f8b69588a36adaa5dc3826c78..88074a0862c148296f247437640c18f2d6c15e05 100644 --- a/pkgs/applications/version-management/guitone/default.nix +++ b/pkgs/applications/version-management/guitone/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchmtn, qt4, qmake4Hook, pkgconfig, graphviz }: +{ stdenv, fetchmtn, qt4, qmake4Hook, pkgconfig, graphviz }: let version = "1.0-mtn-head"; in stdenv.mkDerivation rec { diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index a00393abf270bdf5bdf25e3ecf00b876acdd0c10..d786e93967528df4d51396e4314fd0829e08d28c 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, python2Packages, makeWrapper, docutils, unzip +{ stdenv, fetchurl, python2Packages, makeWrapper, unzip , guiSupport ? false, tk ? null -, ApplicationServices, cf-private }: +, ApplicationServices }: let # if you bump version, update pkgs.tortoisehg too or ping maintainer diff --git a/pkgs/applications/version-management/rapidsvn/default.nix b/pkgs/applications/version-management/rapidsvn/default.nix index 7b3c7aafa44e5ccc866bc2a3c17525dba19d6682..e799d5fac43b92587749d38cc00ba880f792e10b 100644 --- a/pkgs/applications/version-management/rapidsvn/default.nix +++ b/pkgs/applications/version-management/rapidsvn/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, wxGTK, subversion, apr, aprutil, python }: +{ stdenv, fetchurl, wxGTK, subversion, apr, aprutil, python }: stdenv.mkDerivation rec { name = "rapidsvn-${version}"; diff --git a/pkgs/applications/version-management/redmine/default.nix b/pkgs/applications/version-management/redmine/default.nix index 1535d88026a3d16553b8b84cd111e6f472948b65..5a23c38a886383dcd6578f755334da870c77cbd5 100644 --- a/pkgs/applications/version-management/redmine/default.nix +++ b/pkgs/applications/version-management/redmine/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ruby, bundler, libiconv, libxslt, libxml2, pkgconfig, libffi, glibc, imagemagickBig, postgresql }: +{ stdenv, fetchurl, ruby, bundler, libiconv, libxslt, libxml2, pkgconfig, libffi, imagemagickBig, postgresql }: let gemspec = map (gem: fetchurl { url=gem.url; sha256=gem.hash; }) (import ./Gemfile.nix); diff --git a/pkgs/applications/version-management/reposurgeon/default.nix b/pkgs/applications/version-management/reposurgeon/default.nix index 84b6633b8835de063fcbe7d3eca7f44475d32f89..3fd66572315974bde1a274a71310cea5e1574958 100644 --- a/pkgs/applications/version-management/reposurgeon/default.nix +++ b/pkgs/applications/version-management/reposurgeon/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, makeWrapper, python27Packages, git , docbook_xml_dtd_412, docbook_xsl, asciidoc, xmlto , bazaar ? null, cvs ? null, darcs ? null, fossil ? null -, mercurial ? null, monotone ? null, rcs ? null, src ? null +, mercurial ? null, monotone ? null, rcs ? null , subversion ? null, cvs_fast_export ? null }: with stdenv; with lib; diff --git a/pkgs/applications/version-management/smartgithg/default.nix b/pkgs/applications/version-management/smartgithg/default.nix index a34afbab55e6c09b78438876a244b45076d22658..519f339a5083f369248d4f90c8d7f474e4118c97 100644 --- a/pkgs/applications/version-management/smartgithg/default.nix +++ b/pkgs/applications/version-management/smartgithg/default.nix @@ -2,7 +2,6 @@ , jre , gtk2, glib , libXtst -, git, mercurial, subversion , which }: diff --git a/pkgs/applications/version-management/tailor/default.nix b/pkgs/applications/version-management/tailor/default.nix index dc202e9e7b490af5c2c4277daad69da543adcf14..c68cc928848dd3cd48c71340e370b1fee21e3b11 100644 --- a/pkgs/applications/version-management/tailor/default.nix +++ b/pkgs/applications/version-management/tailor/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python2Packages }: +{ fetchurl, python2Packages }: python2Packages.buildPythonApplication rec { name = "tailor-${version}"; diff --git a/pkgs/applications/version-management/yadm/default.nix b/pkgs/applications/version-management/yadm/default.nix index 8b2d6fcc8c3859166f2d0e80ba55eb44c7be9d2e..0553b60fde71c75c733117ab3ae50f16c3e94c71 100644 --- a/pkgs/applications/version-management/yadm/default.nix +++ b/pkgs/applications/version-management/yadm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchFromGitHub }: +{ stdenv, fetchFromGitHub }: let version = "1.12.0"; in stdenv.mkDerivation { diff --git a/pkgs/applications/video/avidemux/default.nix b/pkgs/applications/video/avidemux/default.nix index b36147009a6613508d860c6ba32c087c6cc54260..0637e813b48cb260c403cd0212c957de1fc118cb 100644 --- a/pkgs/applications/video/avidemux/default.nix +++ b/pkgs/applications/video/avidemux/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, cmake, pkgconfig, lndir +{ stdenv, lib, fetchurl, cmake, pkgconfig , zlib, gettext, libvdpau, libva, libXv, sqlite , yasm, freetype, fontconfig, fribidi , makeWrapper, libXext, libGLU, qttools, qtbase diff --git a/pkgs/applications/video/cinelerra/default.nix b/pkgs/applications/video/cinelerra/default.nix index 4adbdbdadb2a87dde1a4a59d9101acb06fa9e662..4235ebb802ed494624842e517542c1aebcc8b973 100644 --- a/pkgs/applications/video/cinelerra/default.nix +++ b/pkgs/applications/video/cinelerra/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, sourceFromHead, autoconf, automake, libtool +{ stdenv, fetchgit, autoconf, automake, libtool , pkgconfig, faad2, faac, a52dec, alsaLib, fftw, lame, libavc1394 , libiec61883, libraw1394, libsndfile, libvorbis, libogg, libjpeg , libtiff, freetype, mjpegtools, x264, gettext, openexr diff --git a/pkgs/applications/video/devede/default.nix b/pkgs/applications/video/devede/default.nix index 157e4903e52ebb19e4d52557ea430cfa00a2629e..48c5032f2da2c7ca0daf0b1fae8b1090c3a2a39f 100644 --- a/pkgs/applications/video/devede/default.nix +++ b/pkgs/applications/video/devede/default.nix @@ -1,4 +1,4 @@ -{ pkgs, stdenv, fetchFromGitHub, python3Packages, ffmpeg, mplayer, vcdimager, cdrkit, dvdauthor +{ stdenv, fetchFromGitHub, python3Packages, ffmpeg, mplayer, vcdimager, cdrkit, dvdauthor , gtk3, gettext, wrapGAppsHook, gdk_pixbuf }: let diff --git a/pkgs/applications/video/handbrake/default.nix b/pkgs/applications/video/handbrake/default.nix index 0d0ac0a2e947e7cecfd5a2ac5f811ded6349722d..32dd3e6ff75840c5cf9f5a56f8bb40448c00e44e 100644 --- a/pkgs/applications/video/handbrake/default.nix +++ b/pkgs/applications/video/handbrake/default.nix @@ -4,13 +4,13 @@ # { stdenv, lib, fetchurl, - python2, pkgconfig, yasm, harfbuzz, zlib, + python2, pkgconfig, yasm, zlib, autoconf, automake, libtool, m4, jansson, libass, libiconv, libsamplerate, fribidi, libxml2, bzip2, libogg, libopus, libtheora, libvorbis, libdvdcss, a52dec, lame, libdvdread, libdvdnav, libbluray, mp4v2, mpeg2dec, x264, x265, libmkv, - fontconfig, freetype, hicolor-icon-theme, + fontconfig, freetype, glib, gtk3, intltool, libnotify, gst_all_1, dbus-glib, udev, libgudev, libvpx, useGtk ? true, wrapGAppsHook ? null, libappindicator-gtk3 ? null, diff --git a/pkgs/applications/video/k9copy/default.nix b/pkgs/applications/video/k9copy/default.nix index 48c7624cfa6a90fe1a458c21f443e9e2f6e93037..1e8883eae7ffabc4e8ed6779db4f688782ec6b51 100644 --- a/pkgs/applications/video/k9copy/default.nix +++ b/pkgs/applications/video/k9copy/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl -, cmake, automoc4 +, cmake , dvdauthor, xineLib, libmpeg2, libav, libdvdread, libdvdnav, dvdplusrwtools , phonon, qtx11extras , extra-cmake-modules, kio, kiconthemes, ki18n, kdesu, kdoctools, solid diff --git a/pkgs/applications/video/kodi/commons.nix b/pkgs/applications/video/kodi/commons.nix index 734229eac938bc3f270f66344d042506e5204dbc..eff9b7871069b35900f68aad9dc97b799548b23c 100644 --- a/pkgs/applications/video/kodi/commons.nix +++ b/pkgs/applications/video/kodi/commons.nix @@ -1,6 +1,5 @@ -{ stdenv, fetchurl, fetchFromGitHub, fetchpatch, lib -, unzip, cmake, kodiPlain, steam, libcec_platform, tinyxml -, libusb, pcre-cpp, jsoncpp, libhdhomerun }: +{ stdenv, fetchFromGitHub +, cmake, kodiPlain, libcec_platform, tinyxml }: rec { diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix index 776d2732327f6f8aa641e35574f81decea5bd9e8..5ca678a2e175f74222c9bb0346fbb15a58795a8c 100644 --- a/pkgs/applications/video/kodi/default.nix +++ b/pkgs/applications/video/kodi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, fetchurl, autoconf, automake, libtool, makeWrapper +{ stdenv, lib, fetchFromGitHub, autoconf, automake, libtool, makeWrapper , pkgconfig, cmake, gnumake, yasm, python2 , libgcrypt, libgpgerror, libunistring , boost, avahi, lame, autoreconfHook diff --git a/pkgs/applications/video/kodi/plugins.nix b/pkgs/applications/video/kodi/plugins.nix index 4d6b18854549b4095892d32283c60b6a05c7b9d8..5a0583202e6d3ab1d458eae2f90c1a062d6eea11 100644 --- a/pkgs/applications/video/kodi/plugins.nix +++ b/pkgs/applications/video/kodi/plugins.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, callPackage, fetchurl, fetchFromGitHub, unzip +{ stdenv, callPackage, fetchurl, fetchFromGitHub, unzip , steam, libusb, pcre-cpp, jsoncpp, libhdhomerun, zlib }: with (callPackage ./commons.nix {}); diff --git a/pkgs/applications/video/lightworks/default.nix b/pkgs/applications/video/lightworks/default.nix index e3b94b69179c66170ad76b57a9df4e6401b4d34b..64a967001b57f593b85e60cb71934c88e1644c06 100644 --- a/pkgs/applications/video/lightworks/default.nix +++ b/pkgs/applications/video/lightworks/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, dpkg, makeWrapper, patchelf, buildFHSUserEnv -, gtk3, gnome3, gdk_pixbuf, cairo, libjpeg_original, glib, gnome2, libGLU +{ stdenv, fetchurl, dpkg, makeWrapper, buildFHSUserEnv +, gnome3, gdk_pixbuf, cairo, libjpeg_original, glib, gnome2, libGLU , nvidia_cg_toolkit, zlib, openssl, portaudio }: let diff --git a/pkgs/applications/video/mapmap/default.nix b/pkgs/applications/video/mapmap/default.nix index 6569caad6c527e3240d394f3a8cf448cafdfbbe8..c44bd25b91a7556ad27aab3e4eaccf3529a95d13 100644 --- a/pkgs/applications/video/mapmap/default.nix +++ b/pkgs/applications/video/mapmap/default.nix @@ -1,7 +1,6 @@ { stdenv , fetchFromGitHub , qttools -, qtbase , qtmultimedia , liblo , gst_all_1 diff --git a/pkgs/applications/video/mplayer/default.nix b/pkgs/applications/video/mplayer/default.nix index f2d40c2ac8084334bb3e6c5bcf68308352b1f238..02a0c2c0ec490bbb3c554516e8ed05bb7b649ab4 100644 --- a/pkgs/applications/video/mplayer/default.nix +++ b/pkgs/applications/video/mplayer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, freetype, yasm, ffmpeg +{ stdenv, fetchurl, pkgconfig, freetype, yasm, ffmpeg , aalibSupport ? true, aalib ? null , fontconfigSupport ? true, fontconfig ? null, freefont_ttf ? null , fribidiSupport ? true, fribidi ? null diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index cefd5b66aed14c4348c85e4e434f809a0b71e9e6..e3954598cbe00ca72d148e2e41f28b88bf77ef87 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchFromGitHub, fetchpatch, makeWrapper +{ stdenv, fetchurl, fetchFromGitHub, makeWrapper , docutils, perl, pkgconfig, python3, which, ffmpeg_4 , freefont_ttf, freetype, libass, libpthreadstubs , lua, luasocket, libuchardet, libiconv ? null, darwin diff --git a/pkgs/applications/video/natron/default.nix b/pkgs/applications/video/natron/default.nix index 1eb725d10bbc88d1a2254a521ba7f8ac21ac59c3..090b4ec9ffe212b5056ae542f7344522177cd193 100644 --- a/pkgs/applications/video/natron/default.nix +++ b/pkgs/applications/video/natron/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, qt4, pkgconfig, boost, expat, cairo, python2Packages, cmake, flex, bison, pango, librsvg, librevenge, libxml2, libcdr, libzip, - poppler, imagemagick, glew, openexr, ffmpeg, opencolorio, openimageio, + poppler, imagemagick, openexr, ffmpeg, opencolorio, openimageio, qmake4Hook, libpng, libGL, lndir }: let diff --git a/pkgs/applications/video/openshot-qt/libopenshot.nix b/pkgs/applications/video/openshot-qt/libopenshot.nix index 9e5e278ba8941018163d3514354f763cca8fca58..422b50a85854880efa8a117f39674f7ee6e0851d 100644 --- a/pkgs/applications/video/openshot-qt/libopenshot.nix +++ b/pkgs/applications/video/openshot-qt/libopenshot.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch +{ stdenv, fetchFromGitHub , pkgconfig, cmake, doxygen , libopenshot-audio, imagemagick, ffmpeg , swig, python3 diff --git a/pkgs/applications/video/pitivi/default.nix b/pkgs/applications/video/pitivi/default.nix index 6c92b9aeed6b458fcd7057f5343448dac9501b17..cea85f553b5f74cec9a0ecd1cd4fe46dc5f59426 100644 --- a/pkgs/applications/video/pitivi/default.nix +++ b/pkgs/applications/video/pitivi/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, intltool, itstool, wrapGAppsHook -, python3Packages, gst, gtk3, hicolor-icon-theme +, python3Packages, gst, gtk3 , gobjectIntrospection, librsvg, gnome3, libnotify , meson, ninja }: diff --git a/pkgs/applications/video/qstopmotion/default.nix b/pkgs/applications/video/qstopmotion/default.nix index a689697e0a0fed0bda843d63d845c1ac5c5bccca..1fce30edbdf4e751899dd3e7d5fc2fc21ecd0ed2 100644 --- a/pkgs/applications/video/qstopmotion/default.nix +++ b/pkgs/applications/video/qstopmotion/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, qt5, ffmpeg, guvcview, automoc4 +{ stdenv, fetchurl, qt5, ffmpeg, guvcview , cmake, ninja, libxml2, gettext, pkgconfig, libgphoto2, gphoto2, v4l_utils , libv4l, pcre }: diff --git a/pkgs/applications/video/recordmydesktop/gtk.nix b/pkgs/applications/video/recordmydesktop/gtk.nix index 2beb3ca94f2453bbd30538c46d50f566ddef2640..984b623cee7ef26c7179d378ce3bbd53e96b899d 100644 --- a/pkgs/applications/video/recordmydesktop/gtk.nix +++ b/pkgs/applications/video/recordmydesktop/gtk.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchsvn, recordmydesktop, autoreconfHook, pkgconfig, glib +{ stdenv, lib, fetchsvn, recordmydesktop, autoreconfHook, pkgconfig , pythonPackages, jack2, xwininfo }: let diff --git a/pkgs/applications/video/zdfmediathk/default.nix b/pkgs/applications/video/zdfmediathk/default.nix index d85e4df7434d69a924ccf994c40226c24582d1e5..a875daf065e99977e3c4b2bd57093cddc0fb61af 100644 --- a/pkgs/applications/video/zdfmediathk/default.nix +++ b/pkgs/applications/video/zdfmediathk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, jre }: +{ stdenv, fetchurl, jre }: with stdenv; diff --git a/pkgs/applications/virtualization/containerd/default.nix b/pkgs/applications/virtualization/containerd/default.nix index 46d03ad3d622bb340e5f3f32e67cd50593db3e2c..6c739b32c5fbf487abb40c9a2fb983fbd4fd2e8e 100644 --- a/pkgs/applications/virtualization/containerd/default.nix +++ b/pkgs/applications/virtualization/containerd/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, removeReferencesTo -, go, libapparmor, apparmor-parser, libseccomp, btrfs-progs }: +, go, btrfs-progs }: with lib; diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 6e40f9ba07622c95767056777c9988ebb674e003..d52b5365b5efe7024e45821ec3020ae19a7eb89a 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchFromGitHub, makeWrapper, removeReferencesTo, pkgconfig , go-md2man, go, containerd, runc, docker-proxy, tini, libtool -, sqlite, iproute, bridge-utils, lvm2, systemd +, sqlite, iproute, lvm2, systemd , btrfs-progs, iptables, e2fsprogs, xz, utillinux, xfsprogs , procps, libseccomp }: diff --git a/pkgs/applications/virtualization/runc/default.nix b/pkgs/applications/virtualization/runc/default.nix index b0fd42f4efb13bb1760d27b12253ac10e78f9337..7172b172ef2faabcfc0d4289be0f5a1290c93ec5 100644 --- a/pkgs/applications/virtualization/runc/default.nix +++ b/pkgs/applications/virtualization/runc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, removeReferencesTo, go-md2man +{ stdenv, lib, fetchFromGitHub, removeReferencesTo, go-md2man , go, pkgconfig, libapparmor, apparmor-parser, libseccomp }: with lib; diff --git a/pkgs/applications/virtualization/virtinst/default.nix b/pkgs/applications/virtualization/virtinst/default.nix index f0ee4b5b26ede39726e9140c533ce595320568ab..8222fb50a8f934bc3620c17fa7d7bec1dcd7392b 100644 --- a/pkgs/applications/virtualization/virtinst/default.nix +++ b/pkgs/applications/virtualization/virtinst/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python2Packages, intltool, libxml2Python, curl }: +{ stdenv, fetchurl, python2Packages, intltool, libxml2Python }: with stdenv.lib; diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index e7ab3aa251cf63c78621068fc3d9b0f43a4a9ab1..f9770435aaf0baaeaaae34bcd1afe367461bde47 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, lib, fetchpatch, iasl, dev86, pam, libxslt, libxml2 , libX11, xproto, libXext, libXcursor, libXmu, qt5, libIDL, SDL, libcap -, zlib, libpng, glib, lvm2, libXrandr, libXinerama +, libpng, glib, lvm2, libXrandr, libXinerama , pkgconfig, which, docbook_xsl, docbook_xml_dtd_43 -, alsaLib, curl, libvpx, gawk, nettools, dbus +, alsaLib, curl, libvpx, nettools, dbus , xorriso, makeself, perl , javaBindings ? false, jdk ? null , pythonBindings ? false, python2 ? null -, enableExtensionPack ? false, requireFile ? null, patchelf ? null, fakeroot ? null +, enableExtensionPack ? false, requireFile ? null, fakeroot ? null , pulseSupport ? false, libpulseaudio ? null , enableHardening ? false , headless ? false diff --git a/pkgs/applications/virtualization/vpcs/default.nix b/pkgs/applications/virtualization/vpcs/default.nix index af344eb82cf515a6aa0bcb870dddaff372b2b48e..65435e19366be33a7b2dd1893d654e94bee7d20c 100644 --- a/pkgs/applications/virtualization/vpcs/default.nix +++ b/pkgs/applications/virtualization/vpcs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, glibc, buildPlatform }: +{ stdenv, fetchurl, glibc, buildPlatform }: stdenv.mkDerivation rec { name = "${pname}-${version}"; diff --git a/pkgs/applications/window-managers/bspwm/default.nix b/pkgs/applications/window-managers/bspwm/default.nix index 0538228d4b4e26302078abff8d2402f4c0abbe82..dc57ad13d414b12771d2f4fa325a7e9b7d3e2dca 100644 --- a/pkgs/applications/window-managers/bspwm/default.nix +++ b/pkgs/applications/window-managers/bspwm/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, libxcb, libXinerama -, sxhkd, xcbutil, xcbutilkeysyms, xcbutilwm +, xcbutil, xcbutilkeysyms, xcbutilwm }: stdenv.mkDerivation rec { diff --git a/pkgs/applications/window-managers/bspwm/unstable.nix b/pkgs/applications/window-managers/bspwm/unstable.nix index 7b31c63128a74dd12c1c14be0c7554f2991d8bed..09c7c8e0e088b2f649be39a8db13e29538566853 100644 --- a/pkgs/applications/window-managers/bspwm/unstable.nix +++ b/pkgs/applications/window-managers/bspwm/unstable.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libxcb, libXinerama, sxhkd, xcbutil, xcbutilkeysyms, xcbutilwm }: +{ stdenv, fetchFromGitHub, libxcb, libXinerama, xcbutil, xcbutilkeysyms, xcbutilwm }: stdenv.mkDerivation rec { name = "bspwm-unstable-2016-09-30"; diff --git a/pkgs/applications/window-managers/clfswm/default.nix b/pkgs/applications/window-managers/clfswm/default.nix index 97e399a133ef16f513467e0416154b39f67c3d61..cc00f1e4b6e949be037ee4ddcfbb3442ae60e4eb 100644 --- a/pkgs/applications/window-managers/clfswm/default.nix +++ b/pkgs/applications/window-managers/clfswm/default.nix @@ -1,6 +1,5 @@ -{ stdenv, pkgs, fetchgit, autoconf, sbcl, lispPackages, xdpyinfo, texinfo4 -, makeWrapper , rlwrap, gnused, gnugrep, coreutils, xprop -, extraModulePaths ? [] }: +{ stdenv, fetchgit, autoconf, sbcl, lispPackages, xdpyinfo, texinfo4 +, makeWrapper }: stdenv.mkDerivation rec { name = "clfswm"; diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix index 986639c947b07ef549df01e6073bddeff5fd9290..74c3c71dbf7c66f92e5b303f129739fe33d8a0cf 100644 --- a/pkgs/applications/window-managers/i3/default.nix +++ b/pkgs/applications/window-managers/i3/default.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, which, pkgconfig, makeWrapper, libxcb, xcbutilkeysyms , xcbutil, xcbutilwm, xcbutilxrm, libstartup_notification, libX11, pcre, libev -, yajl, xcb-util-cursor, coreutils, perl, pango, perlPackages, libxkbcommon +, yajl, xcb-util-cursor, perl, pango, perlPackages, libxkbcommon , xorgserver, xvfb_run }: stdenv.mkDerivation rec { diff --git a/pkgs/applications/window-managers/notion/default.nix b/pkgs/applications/window-managers/notion/default.nix index ebe58e921dddec8bed63b44a8d9d1d42580ae3ca..eaeb9979c10c90e603df198a127e79189a9d2fae 100644 --- a/pkgs/applications/window-managers/notion/default.nix +++ b/pkgs/applications/window-managers/notion/default.nix @@ -1,6 +1,6 @@ { enableXft ? true, libXft ? null, patches ? [], stdenv, lua, gettext, pkgconfig, xlibsWrapper, libXinerama, libXrandr, libX11, - xterm, xmessage, makeWrapper, lib, fetchFromGitHub, mandoc, which + xterm, xmessage, makeWrapper, fetchFromGitHub, mandoc, which }: assert enableXft -> libXft != null; diff --git a/pkgs/applications/window-managers/spectrwm/default.nix b/pkgs/applications/window-managers/spectrwm/default.nix index 1a3c976f77dea6d5c1bfd304009d19853dc2d5bf..81901be0e60b9348342d42cad9dc5a87a4fee386 100644 --- a/pkgs/applications/window-managers/spectrwm/default.nix +++ b/pkgs/applications/window-managers/spectrwm/default.nix @@ -1,5 +1,4 @@ { fetchurl -, coreutils , libX11 , libXrandr , libXcursor diff --git a/pkgs/applications/window-managers/stumpwm/default.nix b/pkgs/applications/window-managers/stumpwm/default.nix index 117d4fe1d6a8f7cc930a94e107202986dd8f5276..3ed7f4325f24364948aa3a723104c8dffaffd5ce 100644 --- a/pkgs/applications/window-managers/stumpwm/default.nix +++ b/pkgs/applications/window-managers/stumpwm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgs, fetchgit, autoconf, sbcl, lispPackages, xdpyinfo, texinfo4 +{ stdenv, fetchgit, autoconf, sbcl, lispPackages, xdpyinfo, texinfo4 , makeWrapper , rlwrap, gnused, gnugrep, coreutils, xprop , extraModulePaths ? [] , version }: diff --git a/pkgs/applications/window-managers/taffybar/default.nix b/pkgs/applications/window-managers/taffybar/default.nix index b1e0628ba921f89e643e00c2b5971dbb85589186..dfb2eec5dc553707da247e5a9b746873d565ec89 100644 --- a/pkgs/applications/window-managers/taffybar/default.nix +++ b/pkgs/applications/window-managers/taffybar/default.nix @@ -1,4 +1,4 @@ -{ stdenv, ghcWithPackages, xmessage, makeWrapper, packages ? (x: []) }: +{ stdenv, ghcWithPackages, makeWrapper, packages ? (x: []) }: let taffybarEnv = ghcWithPackages (self: [ self.taffybar ] ++ packages self); diff --git a/pkgs/applications/window-managers/wtftw/default.nix b/pkgs/applications/window-managers/wtftw/default.nix index c68562d82b39ac19cca3daaa056ab8c70eed4a20..8a680e1f763342fd9579e3d79ef084f36208dcc9 100644 --- a/pkgs/applications/window-managers/wtftw/default.nix +++ b/pkgs/applications/window-managers/wtftw/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform, cargo, libXinerama, libX11, pkgconfig }: +{ stdenv, fetchFromGitHub, rustPlatform, libXinerama, libX11, pkgconfig }: rustPlatform.buildRustPackage rec { name = "wtftw-0.0pre20170921"; diff --git a/pkgs/build-support/build-fhs-userenv/default.nix b/pkgs/build-support/build-fhs-userenv/default.nix index 219530a67bd8c9b05aeec76a9680ec5a55d77c3a..c733556de45c80eff9d2b206073141d7ef2c51a0 100644 --- a/pkgs/build-support/build-fhs-userenv/default.nix +++ b/pkgs/build-support/build-fhs-userenv/default.nix @@ -1,4 +1,4 @@ -{ callPackage, runCommand, lib, writeScript, stdenv, coreutils }: +{ callPackage, runCommand, writeScript, stdenv, coreutils }: let buildFHSEnv = callPackage ./env.nix { }; in diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index ff45cf81d7e5fd85c9e3f046c8110218816d5021..950c0c86a6e4479c55ef3506d836cdcec4ec7176 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -1,5 +1,4 @@ { - callPackage, coreutils, docker, e2fsprogs, diff --git a/pkgs/build-support/emacs/elpa.nix b/pkgs/build-support/emacs/elpa.nix index 79a26abcb831b7a5e01ca2fce528540c94c9a7a3..e6f6c23e449ffba0e1c408508ab8fd12f3c5a331 100644 --- a/pkgs/build-support/emacs/elpa.nix +++ b/pkgs/build-support/emacs/elpa.nix @@ -1,6 +1,6 @@ # builder for Emacs packages built for packages.el -{ lib, stdenv, fetchurl, emacs, texinfo }: +{ lib, stdenv, emacs, texinfo }: with lib; diff --git a/pkgs/build-support/emacs/melpa.nix b/pkgs/build-support/emacs/melpa.nix index f55c91f82c7db475b92bc46fec7c369fd27f6420..5fa45b154a371a2c9934ee4f4441e6b71bb981e4 100644 --- a/pkgs/build-support/emacs/melpa.nix +++ b/pkgs/build-support/emacs/melpa.nix @@ -1,7 +1,7 @@ # builder for Emacs packages built for packages.el # using MELPA package-build.el -{ lib, stdenv, fetchurl, fetchFromGitHub, emacs, texinfo }: +{ lib, stdenv, fetchFromGitHub, emacs, texinfo }: with lib; diff --git a/pkgs/build-support/fetchdarcs/default.nix b/pkgs/build-support/fetchdarcs/default.nix index 3b965b06662c3fdc117cd753176fb5280c67764d..02777c9900dcc8d3dc84c31f0e287c1e3bd78eca 100644 --- a/pkgs/build-support/fetchdarcs/default.nix +++ b/pkgs/build-support/fetchdarcs/default.nix @@ -1,4 +1,4 @@ -{stdenvNoCC, darcs, nix, cacert}: +{stdenvNoCC, darcs, cacert}: {url, rev ? null, context ? null, md5 ? "", sha256 ? ""}: diff --git a/pkgs/build-support/fetchdocker/credentials.nix b/pkgs/build-support/fetchdocker/credentials.nix index c01288dbf53a0a394db6c9d404a350a300709c29..001693501ccb0d071590bbccd1751d8ed69600b8 100644 --- a/pkgs/build-support/fetchdocker/credentials.nix +++ b/pkgs/build-support/fetchdocker/credentials.nix @@ -32,7 +32,7 @@ let pathParts = (builtins.filter - ({path, prefix}: "DOCKER_CREDENTIALS" == prefix) + ({prefix}: "DOCKER_CREDENTIALS" == prefix) builtins.nixPath); in if (pathParts != []) then (builtins.head pathParts).path else "" diff --git a/pkgs/build-support/fetchdocker/default.nix b/pkgs/build-support/fetchdocker/default.nix index ae3ae4185e0537e9740a0503a0602367cc357a12..3556df32d926d0ddef3cf664f551372679be4b1a 100644 --- a/pkgs/build-support/fetchdocker/default.nix +++ b/pkgs/build-support/fetchdocker/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, coreutils, bash, gnutar, jq, writeText }: +{ stdenv, lib, coreutils, bash, gnutar, writeText }: let stripScheme = builtins.replaceStrings [ "https://" "http://" ] [ "" "" ]; diff --git a/pkgs/build-support/fetchgit/private.nix b/pkgs/build-support/fetchgit/private.nix index 4dcf6d06718afd03f86c85e577233b9b480c6300..59376f3b0424f5609a2c9d3a7d6fd79438e3774c 100644 --- a/pkgs/build-support/fetchgit/private.nix +++ b/pkgs/build-support/fetchgit/private.nix @@ -1,4 +1,4 @@ -{ fetchgit, runCommand, makeWrapper, openssh, stdenv }: args: derivation ((fetchgit args).drvAttrs // { +{ fetchgit, runCommand, makeWrapper, openssh }: args: derivation ((fetchgit args).drvAttrs // { SSH_AUTH_SOCK = if (builtins.tryEval ).success then builtins.toString else null; diff --git a/pkgs/build-support/fetchgitlocal/default.nix b/pkgs/build-support/fetchgitlocal/default.nix index 7a25966e9fb520a78796165087cbdd4f74995612..fa1945775537467898653a90fb40e20c2153d3c4 100644 --- a/pkgs/build-support/fetchgitlocal/default.nix +++ b/pkgs/build-support/fetchgitlocal/default.nix @@ -1,4 +1,4 @@ -{ runCommand, git, nix }: src: +{ runCommand, git }: src: let srcStr = toString src; diff --git a/pkgs/build-support/fetchhg/default.nix b/pkgs/build-support/fetchhg/default.nix index 36a48ce9f17001529e1b9a08fe6214cce2eadf45..40ead021cdbf882ff7e45efe86f25359d2c1d1b8 100644 --- a/pkgs/build-support/fetchhg/default.nix +++ b/pkgs/build-support/fetchhg/default.nix @@ -1,4 +1,4 @@ -{stdenvNoCC, mercurial, nix}: {name ? null, url, rev ? null, md5 ? null, sha256 ? null, fetchSubrepos ? false}: +{stdenvNoCC, mercurial}: {name ? null, url, rev ? null, md5 ? null, sha256 ? null, fetchSubrepos ? false}: if md5 != null then throw "fetchhg does not support md5 anymore, please use sha256" diff --git a/pkgs/build-support/fetchnuget/default.nix b/pkgs/build-support/fetchnuget/default.nix index 40ba79ec4353f240f3c9233dc65d235f78deef00..960bc3c1ffb2e6e2130b252e220a0fbc89b1ff07 100644 --- a/pkgs/build-support/fetchnuget/default.nix +++ b/pkgs/build-support/fetchnuget/default.nix @@ -1,4 +1,4 @@ -{ stdenvNoCC, fetchurl, buildDotnetPackage, unzip }: +{ fetchurl, buildDotnetPackage, unzip }: attrs @ { baseName diff --git a/pkgs/build-support/fetchs3/default.nix b/pkgs/build-support/fetchs3/default.nix index 14dac9997d94d343897a058be9b591766c8c2779..3dbde203374d886df75903eb2c2f2ef54639c865 100644 --- a/pkgs/build-support/fetchs3/default.nix +++ b/pkgs/build-support/fetchs3/default.nix @@ -5,7 +5,6 @@ , sha256 , region ? "us-east-1" , credentials ? null # Default to looking at local EC2 metadata service -, executable ? false , recursiveHash ? false , postFetch ? null }: diff --git a/pkgs/build-support/rust/build-rust-crate.nix b/pkgs/build-support/rust/build-rust-crate.nix index 7f21b66ce129083901eeefebac4d15ed28260637..6c7dd67c40025e0611661a3d946afb21edfccbfc 100644 --- a/pkgs/build-support/rust/build-rust-crate.nix +++ b/pkgs/build-support/rust/build-rust-crate.nix @@ -53,7 +53,7 @@ let makeDeps = dependencies: ''; configureCrate = - { crateName, crateVersion, crateAuthors, build, libName, crateFeatures, colors, libPath, release, buildDependencies, completeDeps, completeBuildDeps, verbose, dependencies, workspace_member, extraLinkFlags }: + { crateName, crateVersion, crateAuthors, build, libName, crateFeatures, colors, libPath, release, buildDependencies, completeDeps, completeBuildDeps, verbose, workspace_member, extraLinkFlags }: let version_ = lib.splitString "-" crateVersion; versionPre = if lib.tail version_ == [] then "" else builtins.elemAt version_ 1; version = lib.splitString "." (lib.head version_); @@ -181,9 +181,9 @@ let makeDeps = dependencies: runHook postConfigure ''; - buildCrate = { crateName, crateVersion, crateAuthors, - dependencies, completeDeps, completeBuildDeps, - crateFeatures, libName, build, release, libPath, + buildCrate = { crateName, + dependencies, + crateFeatures, libName, release, libPath, crateType, metadata, crateBin, finalBins, extraRustcOpts, verbose, colors }: @@ -422,16 +422,16 @@ stdenv.mkDerivation (rec { colors = lib.attrByPath [ "colors" ] "always" crate; extraLinkFlags = builtins.concatStringsSep " " (crate.extraLinkFlags or []); configurePhase = configureCrate { - inherit crateName dependencies buildDependencies completeDeps completeBuildDeps + inherit crateName buildDependencies completeDeps completeBuildDeps crateFeatures libName build workspace_member release libPath crateVersion extraLinkFlags crateAuthors verbose colors; }; extraRustcOpts = if crate ? extraRustcOpts then crate.extraRustcOpts else []; buildPhase = buildCrate { - inherit crateName dependencies completeDeps completeBuildDeps - crateFeatures libName build release libPath crateType - crateVersion crateAuthors metadata crateBin finalBins verbose colors + inherit crateName dependencies + crateFeatures libName release libPath crateType + metadata crateBin finalBins verbose colors extraRustcOpts; }; installPhase = installCrate crateName metadata; diff --git a/pkgs/build-support/rust/cargo-vendor/cargo-vendor.nix b/pkgs/build-support/rust/cargo-vendor/cargo-vendor.nix index ac6bb6ab1bd449cdbbdc7cfdb192539fc5bfa24b..486f365f78acfb4ae59c5a233d031ae6b3ace684 100644 --- a/pkgs/build-support/rust/cargo-vendor/cargo-vendor.nix +++ b/pkgs/build-support/rust/cargo-vendor/cargo-vendor.nix @@ -1,5 +1,5 @@ # Generated by carnix 0.5.2: carnix Cargo.lock -o cargo-vendor.nix -{ lib, buildPlatform, buildRustCrate, fetchgit }: +{ lib, buildPlatform, buildRustCrate }: let kernel = buildPlatform.parsed.kernel.name; abi = buildPlatform.parsed.abi.name; hasFeature = feature: diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix index 59e8c3e7f7edf69573a99bba585198596d3b1dfc..fb1d6e390ae1647fc83d647ac1268af1f48359ed 100644 --- a/pkgs/build-support/rust/default.nix +++ b/pkgs/build-support/rust/default.nix @@ -1,4 +1,4 @@ -{ callPackage, fetchurl, stdenv, path, cacert, git, rust, cargo-vendor }: +{ stdenv, cacert, git, rust, cargo-vendor }: let fetchcargo = import ./fetchcargo.nix { inherit stdenv cacert git rust cargo-vendor; diff --git a/pkgs/build-support/singularity-tools/default.nix b/pkgs/build-support/singularity-tools/default.nix index db2bef367e9ee4e4646f91049254719ee8f85c9c..5179f47eaa5ee3a0656819894047b0ab5093aa28 100644 --- a/pkgs/build-support/singularity-tools/default.nix +++ b/pkgs/build-support/singularity-tools/default.nix @@ -8,8 +8,7 @@ , vmTools , gawk , utillinux -, e2fsprogs -, squashfsTools }: +, e2fsprogs }: rec { shellScript = name: text: diff --git a/pkgs/data/fonts/arkpandora/default.nix b/pkgs/data/fonts/arkpandora/default.nix index c2e64cb63dd1440602cb9471a757139694c5bc5c..909985d945bca47dbab6072423143ccca0d3261e 100644 --- a/pkgs/data/fonts/arkpandora/default.nix +++ b/pkgs/data/fonts/arkpandora/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip }: +{ stdenv, fetchurl }: let version = "2.04"; diff --git a/pkgs/data/fonts/iosevka/default.nix b/pkgs/data/fonts/iosevka/default.nix index 4fc47793661b6519c528c8eaea8774dd7d19dde1..f7fce315e8c1391bf66d32aa8e0364abc76aee04 100644 --- a/pkgs/data/fonts/iosevka/default.nix +++ b/pkgs/data/fonts/iosevka/default.nix @@ -1,7 +1,6 @@ { stdenv, lib, fetchFromGitHub, fetchurl, - runCommand, writeText, nodejs, ttfautohint-nox, otfcc, # Custom font set options. diff --git a/pkgs/data/fonts/noto-fonts/default.nix b/pkgs/data/fonts/noto-fonts/default.nix index 33435c98267a08c997ec5b712e59e0d8c2539d86..0a086453244ac1e026bce1dabbc1f478e157f043 100644 --- a/pkgs/data/fonts/noto-fonts/default.nix +++ b/pkgs/data/fonts/noto-fonts/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, fetchFromGitHub, optipng, cairo, unzip, pythonPackages, pkgconfig, pngquant, which, imagemagick }: +{ stdenv, fetchzip, fetchFromGitHub, optipng, cairo, pythonPackages, pkgconfig, pngquant, which, imagemagick }: let mkNoto = { name, weights, sha256, }: diff --git a/pkgs/data/fonts/tex-gyre/default.nix b/pkgs/data/fonts/tex-gyre/default.nix index 1cbf7168ea961828a57b775ac8363caaff52fa40..a801886350df10b4b69df83ed702758d8bc0f867 100644 --- a/pkgs/data/fonts/tex-gyre/default.nix +++ b/pkgs/data/fonts/tex-gyre/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchzip }: let - mkVariant = variant: { displayName, version, abbreviation, sha256, outputHash }: stdenv.mkDerivation { + mkVariant = variant: { version, abbreviation, sha256, outputHash }: stdenv.mkDerivation { name = "tex-gyre-${variant}-${version}"; inherit version; diff --git a/pkgs/data/misc/cacert/default.nix b/pkgs/data/misc/cacert/default.nix index e867d0fbb4beb19d181467ea9085f0f6e016647a..aa6a42badb7c3994a18943d175151d11d1908cf5 100644 --- a/pkgs/data/misc/cacert/default.nix +++ b/pkgs/data/misc/cacert/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, writeText, nss, python +{ stdenv, fetchurl, nss, python , blacklist ? [] , includeEmail ? false }: diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/default.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/default.nix index bc51ceeca43190b424a6a3cc3d07aa227da98384..3d8e16443dbf3cb1aba1875089af0d748c55eebe 100644 --- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/default.nix +++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, unzip}: +{stdenv, fetchurl}: stdenv.mkDerivation { name = "docbook-xml-ebnf-1.2b1"; diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.1.2.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.1.2.nix index d4cb7bc889d37370cbf8a048db2bf6a445e9a3aa..35e69641f1169af01d5b71c90e4bbcfb73138499 100644 --- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.1.2.nix +++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.1.2.nix @@ -12,7 +12,7 @@ let in import ./generic.nix { - inherit stdenv fetchurl unzip findXMLCatalogs; + inherit stdenv unzip findXMLCatalogs; name = "docbook-xml-4.1.2"; src = fetchurl { url = http://www.docbook.org/xml/4.1.2/docbkx412.zip; diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.2.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.2.nix index d2cc69559b869169194df8e77d930f762cacf235..f8c827e826d0f3f8244aae4d60ef99c3384a2d42 100644 --- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.2.nix +++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.2.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, unzip, findXMLCatalogs}: import ./generic.nix { - inherit stdenv fetchurl unzip findXMLCatalogs; + inherit stdenv unzip findXMLCatalogs; name = "docbook-xml-4.2"; src = fetchurl { url = http://www.docbook.org/xml/4.2/docbook-xml-4.2.zip; diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.3.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.3.nix index e1f9337df9416953fd35559136dfdf3b16dd03ab..2c253a1029d6150bdcea9aa06dce32ec8af912b7 100644 --- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.3.nix +++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.3.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, unzip, findXMLCatalogs}: import ./generic.nix { - inherit stdenv fetchurl unzip findXMLCatalogs; + inherit stdenv unzip findXMLCatalogs; name = "docbook-xml-4.3"; src = fetchurl { url = http://www.docbook.org/xml/4.3/docbook-xml-4.3.zip; diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.4.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.4.nix index 1a9d622affc603a1e5a0e0f5b7b2093daa1b32dc..d051d205808b5816e7e284a00635be2ce9c4fcbb 100644 --- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.4.nix +++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.4.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, unzip, findXMLCatalogs}: import ./generic.nix { - inherit stdenv fetchurl unzip findXMLCatalogs; + inherit stdenv unzip findXMLCatalogs; name = "docbook-xml-4.4"; src = fetchurl { url = http://www.docbook.org/xml/4.4/docbook-xml-4.4.zip; diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.5.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.5.nix index 301b400ac7e1fa973cd5b650ca73d129352b0d83..156ee653bbe369c6ff610cdc99b225118f69eaba 100644 --- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.5.nix +++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.5.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, unzip, findXMLCatalogs}: import ./generic.nix { - inherit stdenv fetchurl unzip findXMLCatalogs; + inherit stdenv unzip findXMLCatalogs; name = "docbook-xml-4.5"; src = fetchurl { url = http://www.docbook.org/xml/4.5/docbook-xml-4.5.zip; diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/generic.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/generic.nix index 10b76f7b2b55ae88da0c781dbb97b2b1cfde91c4..41c4b73d3f629cfb74915345776154f52965ac9c 100644 --- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/generic.nix +++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/generic.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, src, name, postInstall ? "true", meta ? {}, findXMLCatalogs }: +{ stdenv, unzip, src, name, postInstall ? "true", meta ? {}, findXMLCatalogs }: stdenv.mkDerivation { inherit src name postInstall; diff --git a/pkgs/desktops/enlightenment/enlightenment.nix b/pkgs/desktops/enlightenment/enlightenment.nix index dc538625bf09c8135c384cde3d84e125c6ec1722..9119d5e93d81fe8b638207c4a0c1c61a837b4f38 100644 --- a/pkgs/desktops/enlightenment/enlightenment.nix +++ b/pkgs/desktops/enlightenment/enlightenment.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, meson, ninja, pkgconfig, gettext, efl, xcbutilkeysyms, libXrandr, libXdmcp, libxcb, libffi, pam, alsaLib, - luajit, bzip2, libpthreadstubs, gdbm, libcap, libGLU, mesa_noglu, + luajit, bzip2, libpthreadstubs, gdbm, libcap, mesa_noglu, xkeyboard_config, pcre }: diff --git a/pkgs/desktops/gnome-2/desktop/gnome-control-center/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-control-center/default.nix index 276bc7e79c1a68f9883c16b31635d72503a7cb50..c4f6ad8207c2f1f896b9e2863b4e188fe50f665b 100644 --- a/pkgs/desktops/gnome-2/desktop/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome-2/desktop/gnome-control-center/default.nix @@ -1,8 +1,7 @@ -{ stdenv, fetchurl, pkgconfig, dbus-glib, libxml2Python, libxslt, libxklavier, cairo, popt, which, python +{ stdenv, fetchurl, pkgconfig, dbus-glib, libxml2Python, libxslt, libxklavier, popt, which, python , shared-mime-info, desktop-file-utils, libunique, libtool, bzip2 -, glib, gtk, pango, atk, gnome-doc-utils, intltool, GConf, libglade, libgnome, libgnomeui, libgnomekbd +, gtk, gnome-doc-utils, intltool, GConf, libglade, libgnomeui, libgnomekbd , librsvg, gnome_menus, gnome-desktop, gnome_panel, metacity, gnome-settings-daemon -, libbonobo, libbonoboui, libgnomecanvas, libart_lgpl, gnome_vfs, ORBit2 , libSM, docbook_xml_dtd_412 }: stdenv.mkDerivation { diff --git a/pkgs/desktops/gnome-2/desktop/gnome-panel/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-panel/default.nix index d85b5494da47a49b03d0a8b78c0b7629e6e136e5..3bef218740cbece4e8d60dc3de8c688717c543e6 100644 --- a/pkgs/desktops/gnome-2/desktop/gnome-panel/default.nix +++ b/pkgs/desktops/gnome-2/desktop/gnome-panel/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, pkgconfig, dbus-glib, dbus, cairo, popt, which, libxml2Python, libxslt, bzip2, python -, glib, gtk, pango, atk, libXau, libcanberra-gtk2 +{ stdenv, fetchurl, pkgconfig, dbus-glib, popt, which, libxml2Python, libxslt, bzip2, python +, gtk, libXau, libcanberra-gtk2 , intltool, ORBit2, libglade, libgnome, libgnomeui, libbonobo, libbonoboui, GConf, gnome_menus, gnome-desktop -, libwnck, librsvg, libgweather, gnome-doc-utils, libgnomecanvas, libart_lgpl, libtasn1, libtool, xorg }: +, libwnck, librsvg, libgweather, gnome-doc-utils, libtasn1, libtool, xorg }: stdenv.mkDerivation { name = "gnome-panel-2.32.1"; diff --git a/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix b/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix index d4935c498f136dde81d2c2f67239f8762fd9366f..c14ee25981c77527cabcc048f7e5301a3f8306e1 100644 --- a/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix +++ b/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchFromGitHub, pkgconfig, glib, gnome2, dbus-glib, gmime, libnotify, libgnome-keyring, openssl, cyrus_sasl, gnonlin, sylpheed, gob2, gettext, intltool, libxml2, hicolor-icon-theme, tango-icon-theme }: +{ stdenv, fetchFromGitHub, pkgconfig, glib, gnome2, dbus-glib, gmime, libnotify, libgnome-keyring, openssl, cyrus_sasl, gnonlin, sylpheed, gob2, gettext, intltool, libxml2, hicolor-icon-theme, tango-icon-theme }: stdenv.mkDerivation rec { rev = "9ae8768"; diff --git a/pkgs/desktops/gnome-2/desktop/zenity/default.nix b/pkgs/desktops/gnome-2/desktop/zenity/default.nix index a9b692aadf51157cb4802fde1cff75112c255701..0233f6340f554df53a33868c0668b5573d0b3755 100644 --- a/pkgs/desktops/gnome-2/desktop/zenity/default.nix +++ b/pkgs/desktops/gnome-2/desktop/zenity/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, cairo, libxml2, libxslt, glib, gtk, pango, atk +{ stdenv, fetchurl, pkgconfig, libxml2, libxslt, gtk , gnome-doc-utils, intltool, libglade, libX11, which, docbook_xml_dtd_412 }: stdenv.mkDerivation { diff --git a/pkgs/desktops/gnome-2/platform/gnome-vfs-monikers/default.nix b/pkgs/desktops/gnome-2/platform/gnome-vfs-monikers/default.nix index 029d751e719078993d8146af15c15696860bcb82..5ae126df331c295760672dd9098feea58389d0c4 100644 --- a/pkgs/desktops/gnome-2/platform/gnome-vfs-monikers/default.nix +++ b/pkgs/desktops/gnome-2/platform/gnome-vfs-monikers/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, glib, intltool, gnome_vfs, libbonobo, ORBit2}: +{stdenv, fetchurl, pkgconfig, glib, intltool, gnome_vfs, libbonobo}: stdenv.mkDerivation { name = "gnome-vfs-monikers-2.15.3"; diff --git a/pkgs/desktops/gnome-2/platform/libbonobo/default.nix b/pkgs/desktops/gnome-2/platform/libbonobo/default.nix index ee0bf5f82a098bb9a8ece3508fab84088a3293d6..bf0cec8dfbe6039691fa52ef36de4bdfd277ee9c 100644 --- a/pkgs/desktops/gnome-2/platform/libbonobo/default.nix +++ b/pkgs/desktops/gnome-2/platform/libbonobo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, flex, bison, pkgconfig, glib, dbus-glib, libxml2, popt +{ stdenv, fetchurl, flex, bison, pkgconfig, glib, libxml2, popt , intltool, ORBit2, procps }: stdenv.mkDerivation rec { diff --git a/pkgs/desktops/gnome-2/platform/libgnome/default.nix b/pkgs/desktops/gnome-2/platform/libgnome/default.nix index 2dcb85235ee4c075c46c68f94e31c3880c4846d7..42f47bc5a83fe4c518d85b8ba84123642fb1253c 100644 --- a/pkgs/desktops/gnome-2/platform/libgnome/default.nix +++ b/pkgs/desktops/gnome-2/platform/libgnome/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, glib, popt, zlib, libcanberra-gtk2 -, intltool, libbonobo, GConf, gnome_vfs, ORBit2, libtool, libogg +, intltool, libbonobo, GConf, gnome_vfs, libtool, libogg }: stdenv.mkDerivation rec { diff --git a/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix b/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix index b07417ecc35aa81f3cf2ea8d87128ccffaf24ef0..b5525957d468de4ac961a847ba818230212351de 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, meson, ninja, pkgconfig, gettext, gnome3, glib, gtk3, pango, wrapGAppsHook -, gobjectIntrospection, gjs, gdk_pixbuf, librsvg, libunistring }: +, gobjectIntrospection, gjs, libunistring }: stdenv.mkDerivation rec { name = "gnome-characters-${version}"; diff --git a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix b/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix index 7db21d9e74830551983f623ca1ede3362017ac8d..a7d4288c9eb5483b4255a2f7cfec66c35553fa27 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix @@ -1,10 +1,10 @@ { stdenv, meson, ninja, gettext, fetchurl, evince, gjs , pkgconfig, gtk3, glib, tracker, tracker-miners -, itstool, libxslt, webkitgtk, libgdata, gnome-online-accounts +, itstool, libxslt, webkitgtk, libgdata , gnome-desktop, libzapojit, libgepub -, gnome3, librsvg, gdk_pixbuf, libsoup, docbook_xsl -, gobjectIntrospection, json-glib, inkscape, poppler_utils -, gmp, desktop-file-utils, wrapGAppsHook }: +, gnome3, gdk_pixbuf, libsoup, docbook_xsl +, gobjectIntrospection, inkscape, poppler_utils +, desktop-file-utils, wrapGAppsHook }: stdenv.mkDerivation rec { name = "gnome-documents-${version}"; diff --git a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix index 560d8446f088426f73d88f255b4d125d771abf18..eef91ec0fbb8a510eb30d471a74f5c896c234c70 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix @@ -1,7 +1,7 @@ { stdenv, meson, ninja, gettext, fetchurl, gdk_pixbuf, tracker , libxml2, python3, libnotify, wrapGAppsHook, libmediaart , gobjectIntrospection, gnome-online-accounts, grilo, grilo-plugins -, pkgconfig, gtk3, glib, cairo, desktop-file-utils, appstream-glib +, pkgconfig, gtk3, glib, desktop-file-utils, appstream-glib , itstool, gnome3, gst_all_1 }: python3.pkgs.buildPythonApplication rec { diff --git a/pkgs/desktops/gnome-3/apps/polari/default.nix b/pkgs/desktops/gnome-3/apps/polari/default.nix index 4ae67f9b41d688de2988858a06debb2430608f54..d3bb75d1f97d92ef03c797843978af8e7e138cd1 100644 --- a/pkgs/desktops/gnome-3/apps/polari/default.nix +++ b/pkgs/desktops/gnome-3/apps/polari/default.nix @@ -1,4 +1,4 @@ -{ stdenv, itstool, fetchurl, fetchpatch, gdk_pixbuf, adwaita-icon-theme +{ stdenv, itstool, fetchurl, gdk_pixbuf, adwaita-icon-theme , telepathy-glib, gjs, meson, ninja, gettext, telepathy-idle, libxml2, desktop-file-utils , pkgconfig, gtk3, glib, libsecret, libsoup, gobjectIntrospection, appstream-glib , gnome3, wrapGAppsHook, telepathy-logger, gspell }: diff --git a/pkgs/desktops/gnome-3/apps/seahorse/default.nix b/pkgs/desktops/gnome-3/apps/seahorse/default.nix index 60e8822135ced34c3bad0d705cf85dfc9fbdef10..1bcf778390074582c1b82e174f278b1e4ea59684 100644 --- a/pkgs/desktops/gnome-3/apps/seahorse/default.nix +++ b/pkgs/desktops/gnome-3/apps/seahorse/default.nix @@ -1,7 +1,7 @@ { stdenv, intltool, fetchurl, vala , pkgconfig, gtk3, glib , wrapGAppsHook, itstool, gnupg, libsoup -, gnome3, librsvg, gdk_pixbuf, gpgme +, gnome3, gpgme , libsecret, avahi, p11-kit, openssh }: let diff --git a/pkgs/desktops/gnome-3/core/dconf/default.nix b/pkgs/desktops/gnome-3/core/dconf/default.nix index 400b3ea9a9b09c12e8924a541b77d5e1687b151c..71779c17280772098f32025d3497fb251b9844c0 100644 --- a/pkgs/desktops/gnome-3/core/dconf/default.nix +++ b/pkgs/desktops/gnome-3/core/dconf/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, meson, ninja, python3, vala, libxslt, pkgconfig, glib, dbus-glib, gnome3 -, libxml2, docbook_xsl, makeWrapper }: +, libxml2, docbook_xsl }: let pname = "dconf"; diff --git a/pkgs/desktops/gnome-3/core/empathy/default.nix b/pkgs/desktops/gnome-3/core/empathy/default.nix index 98cfc686e9780eb21e65fa1ad1395cab1755bbe1..089c32d602ea0242d00ca242cd704f4a2f2a5d11 100644 --- a/pkgs/desktops/gnome-3/core/empathy/default.nix +++ b/pkgs/desktops/gnome-3/core/empathy/default.nix @@ -1,12 +1,12 @@ { stdenv, intltool, fetchurl, webkitgtk, pkgconfig, gtk3, glib , file, librsvg, gnome3, gdk_pixbuf -, dbus-glib, telepathy-glib, telepathy-farstream +, telepathy-glib, telepathy-farstream , clutter-gtk, clutter-gst, gst_all_1, cogl, gnome-online-accounts , gcr, libsecret, folks, libpulseaudio, telepathy-mission-control , telepathy-logger, libnotify, clutter, libsoup, gnutls , evolution-data-server, yelp-xsl , libcanberra-gtk3, p11-kit, farstream, libtool, shared-mime-info -, bash, wrapGAppsHook, itstool, libxml2, libxslt, icu, libgee +, wrapGAppsHook, itstool, libxml2, libxslt, icu, libgee , isocodes, enchant, libchamplain, geoclue2, geocode-glib, cheese, libgudev }: stdenv.mkDerivation rec { diff --git a/pkgs/desktops/gnome-3/core/gdm/default.nix b/pkgs/desktops/gnome-3/core/gdm/default.nix index 2f7452dbc572a3a9e7b5fa728d0c2a5eb146d888..5ceba1a77194e2ad89d957b14cfa433fc1527ac7 100644 --- a/pkgs/desktops/gnome-3/core/gdm/default.nix +++ b/pkgs/desktops/gnome-3/core/gdm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, substituteAll, pkgconfig, glib, itstool, libxml2, xorg, dbus +{ stdenv, fetchurl, substituteAll, pkgconfig, glib, itstool, libxml2, xorg , intltool, accountsservice, libX11, gnome3, systemd, autoreconfHook , gtk, libcanberra-gtk3, pam, libtool, gobjectIntrospection, plymouth , librsvg, coreutils, xwayland }: diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix index 772df5d24417d93939c27e432bc7f1e292310da9..c3b2f97f9b2f4fa38d283cb0cc762880ee75e35e 100644 --- a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix @@ -2,7 +2,7 @@ , python3Packages, libsoup, polkit, clutter, networkmanager, docbook_xsl , docbook_xsl_ns, at-spi2-core , libstartup_notification, telepathy-glib, telepathy-logger, libXtst, unzip, glibcLocales, shared-mime-info , libgweather, libcanberra-gtk3, librsvg, geoclue2, perl, docbook_xml_dtd_42, desktop-file-utils -, libpulseaudio, libical, nss, gobjectIntrospection, gstreamer, wrapGAppsHook +, libpulseaudio, libical, gobjectIntrospection, gstreamer, wrapGAppsHook , accountsservice, gdk_pixbuf, gdm, upower, ibus, networkmanagerapplet , sassc, systemd, gst_all_1 }: diff --git a/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix b/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix index 6cb827bc504f310ccb61ea1336aa9927f5d9ad72..1938c90a8254a03ba6209f96010d8d96abde127c 100644 --- a/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, file, gnome3, itstool, libxml2, intltool }: +{ stdenv, fetchurl, pkgconfig, gnome3, itstool, libxml2, intltool }: stdenv.mkDerivation rec { name = "gnome-user-docs-${version}"; diff --git a/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix b/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix index 509c10d75648ae322add4525b35d67385c48d777..da117a536911a629704365c5d712e7f9d7747692 100644 --- a/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix @@ -1,6 +1,6 @@ { stdenv, intltool, fetchurl, apacheHttpd, nautilus -, pkgconfig, gtk3, glib, libxml2, gnused, systemd -, bash, wrapGAppsHook, itstool, libnotify, libtool, mod_dnssd +, pkgconfig, gtk3, glib, libxml2, systemd +, wrapGAppsHook, itstool, libnotify, libtool, mod_dnssd , gnome3, librsvg, gdk_pixbuf, file, libcanberra-gtk3 }: stdenv.mkDerivation rec { diff --git a/pkgs/desktops/gnome-3/core/grilo-plugins/default.nix b/pkgs/desktops/gnome-3/core/grilo-plugins/default.nix index c6000352ab06c4b64d2431b59260ac0cc1440666..35e2012c531389f3d5637fb88dca15dd2215d109 100644 --- a/pkgs/desktops/gnome-3/core/grilo-plugins/default.nix +++ b/pkgs/desktops/gnome-3/core/grilo-plugins/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, file, intltool, glib, sqlite +{ stdenv, fetchurl, pkgconfig, intltool, sqlite , gnome3, libxml2, gupnp, gssdp, lua5, liboauth, gupnp-av , gmime, json-glib, avahi, tracker, dleyna-server, itstool }: diff --git a/pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/default.nix b/pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/default.nix index e5ca314c69afc767895a62f7245fd2b5e5c232a0..5dc6137c9fcabeaf8163c0edc96d5f099793905e 100644 --- a/pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/default.nix +++ b/pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, intltool, glib, gobjectIntrospection # just for passthru -, gnome3, gtk3, gsettings-desktop-schemas }: +, gnome3 }: stdenv.mkDerivation rec { name = "gsettings-desktop-schemas-${version}"; diff --git a/pkgs/desktops/gnome-3/core/gucharmap/default.nix b/pkgs/desktops/gnome-3/core/gucharmap/default.nix index 1562c42b374a34b7ca1daa17c26e58a339b94e41..861702a3986e4729f7f7bf072ab1dcf9ba8fd379 100644 --- a/pkgs/desktops/gnome-3/core/gucharmap/default.nix +++ b/pkgs/desktops/gnome-3/core/gucharmap/default.nix @@ -1,5 +1,5 @@ { stdenv, intltool, fetchFromGitLab, pkgconfig, gtk3, defaultIconTheme -, glib, desktop-file-utils, bash, appdata-tools, gtk-doc, autoconf, automake, libtool +, glib, desktop-file-utils, appdata-tools, gtk-doc, autoconf, automake, libtool , wrapGAppsHook, gnome3, itstool, libxml2 , callPackage, unzip, gobjectIntrospection }: diff --git a/pkgs/desktops/gnome-3/core/nautilus/default.nix b/pkgs/desktops/gnome-3/core/nautilus/default.nix index 2daaf2d43261c09f26a0ad273f6c63438cd3343c..5beabd08fa3a23b33a86f68936ebcf184f73c1a0 100644 --- a/pkgs/desktops/gnome-3/core/nautilus/default.nix +++ b/pkgs/desktops/gnome-3/core/nautilus/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, meson, ninja, pkgconfig, gettext, libxml2, desktop-file-utils, wrapGAppsHook -, gtk, gnome3, gnome-autoar, glib, dbus-glib, shared-mime-info, libnotify, libexif +, gtk, gnome3, gnome-autoar, dbus-glib, shared-mime-info, libnotify, libexif , exempi, librsvg, tracker, tracker-miners, gnome-desktop, gexiv2, libselinux, gdk_pixbuf }: let diff --git a/pkgs/desktops/gnome-3/core/sushi/default.nix b/pkgs/desktops/gnome-3/core/sushi/default.nix index 114c0d8ac960d6bf6f620a7eeaf9bd13507460dc..100a2727fc3c7cfdf6efb60d358b5162c3e6adec 100644 --- a/pkgs/desktops/gnome-3/core/sushi/default.nix +++ b/pkgs/desktops/gnome-3/core/sushi/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, file, intltool, gobjectIntrospection, glib -, clutter-gtk, clutter-gst, gnome3, gtksourceview, libmusicbrainz +, clutter-gtk, clutter-gst, gnome3, gtksourceview , webkitgtk, libmusicbrainz5, icu, makeWrapper, gst_all_1 , gdk_pixbuf, librsvg, gtk3, harfbuzz }: diff --git a/pkgs/desktops/gnome-3/core/totem/default.nix b/pkgs/desktops/gnome-3/core/totem/default.nix index 7cf1872da5a903281f57574021c116f770fa9c45..1a7e257f92971775421077d7eb360d998d5c55ba 100644 --- a/pkgs/desktops/gnome-3/core/totem/default.nix +++ b/pkgs/desktops/gnome-3/core/totem/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, meson, ninja, intltool, gst_all_1, clutter +{ stdenv, fetchurl, meson, ninja, intltool, gst_all_1 , clutter-gtk, clutter-gst, python3Packages, shared-mime-info , pkgconfig, gtk3, glib, gobjectIntrospection -, bash, wrapGAppsHook, itstool, libxml2, vala, gnome3, librsvg +, wrapGAppsHook, itstool, libxml2, vala, gnome3 , gdk_pixbuf, tracker, nautilus }: stdenv.mkDerivation rec { diff --git a/pkgs/desktops/gnome-3/core/vte/default.nix b/pkgs/desktops/gnome-3/core/vte/default.nix index ed313221e56afb14b4289cdfc7df6bc2891ca17f..17385ab7202958b68fe4f0803955faf03acf4432 100644 --- a/pkgs/desktops/gnome-3/core/vte/default.nix +++ b/pkgs/desktops/gnome-3/core/vte/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, intltool, pkgconfig , gnome3, ncurses, gobjectIntrospection, vala, libxml2, gnutls -, fetchFromGitHub, autoconf, automake, libtool, gtk-doc, gperf, pcre2 +, gperf, pcre2 }: stdenv.mkDerivation rec { diff --git a/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix b/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix index f904a90454f3f77dc6f801fef56563131ea73cef..6abaff8e32be70ad2eec9e5d8d047fe544a4046f 100644 --- a/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix +++ b/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, intltool, fetchurl, pkgconfig, bash +{ stdenv, intltool, fetchurl, pkgconfig , itstool, libxml2, libxslt, gnome3 }: stdenv.mkDerivation rec { diff --git a/pkgs/desktops/gnome-3/core/zenity/default.nix b/pkgs/desktops/gnome-3/core/zenity/default.nix index b9788106342738f53357c5326c20aeccd2dbc85a..7f9996d17d99759b71652e926d22acb6f754f1a1 100644 --- a/pkgs/desktops/gnome-3/core/zenity/default.nix +++ b/pkgs/desktops/gnome-3/core/zenity/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, cairo, libxml2, libxslt, gnome3, pango +{ stdenv, fetchurl, pkgconfig, libxml2, libxslt, gnome3 , gnome-doc-utils, intltool, libX11, which, itstool, wrapGAppsHook }: stdenv.mkDerivation rec { diff --git a/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix b/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix index 47a0238a7fd55b71a121771e3641be461941ed78..395e90d263efc3bd2c07e6723b450d01ab13a491 100644 --- a/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix +++ b/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix @@ -1,4 +1,4 @@ -{ config, stdenv, substituteAll, fetchFromGitHub, glib, glib-networking, libgtop, pkgs }: +{ stdenv, substituteAll, fetchFromGitHub, glib, glib-networking, libgtop }: stdenv.mkDerivation rec { name = "gnome-shell-system-monitor-${version}"; diff --git a/pkgs/desktops/gnome-3/extensions/topicons-plus/default.nix b/pkgs/desktops/gnome-3/extensions/topicons-plus/default.nix index 84a9d26c2d761c881978508b81c4321569ed06ac..f9c45f45ea4a734ff4e71cf5e1cafd0c6e93cd78 100644 --- a/pkgs/desktops/gnome-3/extensions/topicons-plus/default.nix +++ b/pkgs/desktops/gnome-3/extensions/topicons-plus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, glib, gettext, bash }: +{ stdenv, fetchFromGitHub, glib, gettext }: stdenv.mkDerivation rec { name = "gnome-shell-extension-topicons-plus-${version}"; diff --git a/pkgs/desktops/gnome-3/misc/gfbgraph/default.nix b/pkgs/desktops/gnome-3/misc/gfbgraph/default.nix index 8194e3f1699d7c54a1fe83a0736770ee9cefbd5a..f8d2961222351f9db58844c9feaf5dbce8a7ad56 100644 --- a/pkgs/desktops/gnome-3/misc/gfbgraph/default.nix +++ b/pkgs/desktops/gnome-3/misc/gfbgraph/default.nix @@ -1,4 +1,4 @@ -{ stdenv, intltool, fetchurl, pkgconfig, glib +{ stdenv, fetchurl, pkgconfig, glib , gnome3, libsoup, json-glib, gobjectIntrospection }: let diff --git a/pkgs/desktops/gnome-3/misc/gitg/default.nix b/pkgs/desktops/gnome-3/misc/gitg/default.nix index 32da3a9a4b81583253a313b77ccb542a7ffbad3e..d2dce9d6f1b85fe7e9099f86acdfd6a82b3c5d40 100644 --- a/pkgs/desktops/gnome-3/misc/gitg/default.nix +++ b/pkgs/desktops/gnome-3/misc/gitg/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, vala, intltool, pkgconfig, gtk3, glib , json-glib, wrapGAppsHook, libpeas, bash, gobjectIntrospection -, gnome3, gtkspell3, shared-mime-info, libgee, libgit2-glib, librsvg, libsecret -, libsoup }: +, gnome3, gtkspell3, shared-mime-info, libgee, libgit2-glib, libsecret + }: let pname = "gitg"; diff --git a/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix b/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix index a7c69de44eb64a471d3533dc871959c28e35c6c4..41206b71d42a6a991345ea6d2960fec5981e416a 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix @@ -1,7 +1,7 @@ -{ stdenv, meson, ninja, gettext, fetchurl, atk +{ stdenv, meson, ninja, gettext, fetchurl , pkgconfig, gtk3, glib, libsoup -, bash, itstool, libxml2, python3Packages -, gnome3, librsvg, gdk_pixbuf, file, libnotify, gobjectIntrospection, wrapGAppsHook }: +, itstool, libxml2, python3Packages +, gnome3, gdk_pixbuf, libnotify, gobjectIntrospection, wrapGAppsHook }: let pname = "gnome-tweaks"; diff --git a/pkgs/desktops/gnome-3/misc/libgda/default.nix b/pkgs/desktops/gnome-3/misc/libgda/default.nix index ce7bb6f75b5cd71926671a8bd2a7b30836b2f7ef..a10675ab80335b66ae9ca255a77ff3d70be54f2b 100644 --- a/pkgs/desktops/gnome-3/misc/libgda/default.nix +++ b/pkgs/desktops/gnome-3/misc/libgda/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, intltool, itstool, libxml2, gtk3, openssl, gnome3 +{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, gtk3, openssl, gnome3 , mysqlSupport ? false, mysql ? null , postgresSupport ? false, postgresql ? null }: diff --git a/pkgs/desktops/gnustep/gworkspace/default.nix b/pkgs/desktops/gnustep/gworkspace/default.nix index 210b72292fd66129ca19cb05b052b588a67d737f..d5018a4350f829cb81b8e44e687937da0ea392c6 100644 --- a/pkgs/desktops/gnustep/gworkspace/default.nix +++ b/pkgs/desktops/gnustep/gworkspace/default.nix @@ -1,6 +1,5 @@ { back, base, gui, gsmakeDerivation , fetchurl -, sqlite , system_preferences }: let diff --git a/pkgs/desktops/gnustep/make/gsmakeDerivation.nix b/pkgs/desktops/gnustep/make/gsmakeDerivation.nix index 00b96cd2fac1bb473dba5138d324f4145ecde280..7bb287c3fa5985b8524edb639970bca29b021fcc 100644 --- a/pkgs/desktops/gnustep/make/gsmakeDerivation.nix +++ b/pkgs/desktops/gnustep/make/gsmakeDerivation.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, make, makeWrapper, which }: +{ stdenv, make, makeWrapper, which }: { buildInputs ? [], ...} @ args: stdenv.mkDerivation (args // { buildInputs = [ makeWrapper make which ] ++ buildInputs; diff --git a/pkgs/desktops/lxqt/core/lxqt-config/default.nix b/pkgs/desktops/lxqt/core/lxqt-config/default.nix index 191fe0796e887ecd8371681c8f8710f98d888785..ba4937a7227fb48163af6611e1ad049b955fff86 100644 --- a/pkgs/desktops/lxqt/core/lxqt-config/default.nix +++ b/pkgs/desktops/lxqt/core/lxqt-config/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, cmake, pkgconfig, lxqt-build-tools, qtbase, qtx11extras, qttools, qtsvg, kwindowsystem, libkscreen, liblxqt, libqtxdg, libpthreadstubs, xorg }: +{ stdenv, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, qtbase, qtx11extras, qttools, qtsvg, kwindowsystem, libkscreen, liblxqt, libqtxdg, xorg }: stdenv.mkDerivation rec { name = "${pname}-${version}"; diff --git a/pkgs/desktops/lxqt/default.nix b/pkgs/desktops/lxqt/default.nix index 40c25b3302ca4b8272ec96a93f1d68c13472250e..675368c9a69e6714114f050bae3d8c814342a958 100644 --- a/pkgs/desktops/lxqt/default.nix +++ b/pkgs/desktops/lxqt/default.nix @@ -1,4 +1,4 @@ -{ pkgs, makeScope, libsForQt5, fetchFromGitHub }: +{ pkgs, makeScope, libsForQt5 }: let packages = self: with self; { diff --git a/pkgs/desktops/mate/mate-applets/default.nix b/pkgs/desktops/mate/mate-applets/default.nix index eda4e9b05bcd48c90dedea160dcb96415202b355..59316039b36b85989781d696ed96fcc711730fc3 100644 --- a/pkgs/desktops/mate/mate-applets/default.nix +++ b/pkgs/desktops/mate/mate-applets/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, itstool, gnome3, libwnck3, libgtop, libxml2, libnotify, dbus-glib, polkit, upower, wirelesstools, mate, hicolor-icon-theme, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, intltool, itstool, gnome3, libwnck3, libgtop, libxml2, libnotify, polkit, upower, wirelesstools, mate, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { name = "mate-applets-${version}"; diff --git a/pkgs/desktops/mate/mate-settings-daemon/default.nix b/pkgs/desktops/mate/mate-settings-daemon/default.nix index 6a24e67d2c7056d83af4cd36421b216bf249cf0e..4138a042856b0d773d793591b52236545b827a6d 100644 --- a/pkgs/desktops/mate/mate-settings-daemon/default.nix +++ b/pkgs/desktops/mate/mate-settings-daemon/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, glib, dbus-glib, libxklavier, libcanberra-gtk3, libnotify, nss, polkit, gnome3, mate, wrapGAppsHook +{ stdenv, fetchurl, pkgconfig, intltool, dbus-glib, libxklavier, libcanberra-gtk3, libnotify, nss, polkit, gnome3, mate, wrapGAppsHook , pulseaudioSupport ? stdenv.config.pulseaudio or true, libpulseaudio }: diff --git a/pkgs/desktops/mate/mate-themes/default.nix b/pkgs/desktops/mate/mate-themes/default.nix index 8d6d470727dd7dee55f79fddc44933b42d370a44..bdf5ac29ca61e78ae3ab43d3dd70f49590d512ca 100644 --- a/pkgs/desktops/mate/mate-themes/default.nix +++ b/pkgs/desktops/mate/mate-themes/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, mate, gnome3, gtk2, gtk_engines, +{ stdenv, fetchurl, pkgconfig, intltool, mate, gtk2, gtk_engines, gtk-engine-murrine, gdk_pixbuf, librsvg }: stdenv.mkDerivation rec { diff --git a/pkgs/desktops/plasma-5/default.nix b/pkgs/desktops/plasma-5/default.nix index 0b1668038f59640ea903819d1e3ac1847e32632c..2c99713bcd4a32a6a22f8a8802a0bee4b009f61f 100644 --- a/pkgs/desktops/plasma-5/default.nix +++ b/pkgs/desktops/plasma-5/default.nix @@ -26,8 +26,7 @@ existing packages here and modify it as necessary. { libsForQt5, lib, fetchurl, - gconf, gsettings-desktop-schemas, - debug ? false, + gconf, gsettings-desktop-schemas }: let diff --git a/pkgs/desktops/plasma-5/kdeplasma-addons.nix b/pkgs/desktops/plasma-5/kdeplasma-addons.nix index e23ffd3644a04a57c6000d14609e4475cf95449f..398fc356fc9393f7f34afbc2e6527ec674e70606 100644 --- a/pkgs/desktops/plasma-5/kdeplasma-addons.nix +++ b/pkgs/desktops/plasma-5/kdeplasma-addons.nix @@ -1,7 +1,7 @@ { mkDerivation, extra-cmake-modules, kdoctools, - kconfig, kconfigwidgets, kcoreaddons, kcmutils, kdelibs4support, ki18n, kio, + kconfig, kconfigwidgets, kcoreaddons, kcmutils, kdelibs4support, kio, knewstuff, kross, krunner, kservice, ksysguard, kunitconversion, ibus, plasma-framework, plasma-workspace, qtdeclarative, qtx11extras, kholidays }: diff --git a/pkgs/desktops/plasma-5/kwin/default.nix b/pkgs/desktops/plasma-5/kwin/default.nix index 2c9d824999e2cc5923c26307440a7adc05e9ecfa..a0b09e30338f50fb423f23962de29431e6cd9f4a 100644 --- a/pkgs/desktops/plasma-5/kwin/default.nix +++ b/pkgs/desktops/plasma-5/kwin/default.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, copyPathsToStore, fetchpatch, + mkDerivation, lib, copyPathsToStore, extra-cmake-modules, kdoctools, epoxy,libICE, libSM, libinput, libxkbcommon, udev, wayland, xcb-util-cursor, diff --git a/pkgs/desktops/xfce/applications/xfce4-screenshooter.nix b/pkgs/desktops/xfce/applications/xfce4-screenshooter.nix index 28c586382b46ce5ef26caad29f10efe2ce86e9ec..8e5bffd9dd6f2813db8eb0307708175e23def82c 100644 --- a/pkgs/desktops/xfce/applications/xfce4-screenshooter.nix +++ b/pkgs/desktops/xfce/applications/xfce4-screenshooter.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, intltool, xfce4-panel, libxfce4util, gtk, libsoup -, makeWrapper, glib-networking, exo, hicolor-icon-theme, wrapGAppsHook }: +, glib-networking, exo, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { p_name = "xfce4-screenshooter"; diff --git a/pkgs/desktops/xfce/core/xfce4-session.nix b/pkgs/desktops/xfce/core/xfce4-session.nix index 2d5a169a215d223ca7912a8dc2b7b43fd74267fd..3f6237d6de17baac8b98b45ad7ea633031726dd6 100644 --- a/pkgs/desktops/xfce/core/xfce4-session.nix +++ b/pkgs/desktops/xfce/core/xfce4-session.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, intltool, gtk, polkit +{ stdenv, fetchurl, pkgconfig, intltool, gtk, polkit , libxfce4util, libxfce4ui, xfce4-panel, libwnck, dbus-glib, xfconf, libglade, xorg , hicolor-icon-theme }: diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/appmenu-gtk-module.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/appmenu-gtk-module.nix index 4db9e03ae721676777a6b4bcb070c4d8b505bf9c..7134d29c9ffbe6f994910320c3eea3c7915983d5 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/appmenu-gtk-module.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/appmenu-gtk-module.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, substituteAll, cmake, vala, glib, gtk2, gtk3 }: +{ stdenv, fetchFromGitHub, cmake, vala, glib, gtk2, gtk3 }: stdenv.mkDerivation rec { name = "vala-panel-appmenu-xfce-${version}"; version = "0.6.94"; diff --git a/pkgs/development/arduino/platformio/default.nix b/pkgs/development/arduino/platformio/default.nix index dfdd8141aaaa844a342fb85215b36b3d92f018e6..45186914604dd334964f43efd298977bc41ba197 100644 --- a/pkgs/development/arduino/platformio/default.nix +++ b/pkgs/development/arduino/platformio/default.nix @@ -1,5 +1,5 @@ -{ pkgs, newScope }: +{ newScope }: let callPackage = newScope self; diff --git a/pkgs/development/compilers/boo/default.nix b/pkgs/development/compilers/boo/default.nix index 968c845a011969729f02964c10734d9837ae6c96..ec5e08ffda402d30db14f8887fd666ba3ce7d314 100644 --- a/pkgs/development/compilers/boo/default.nix +++ b/pkgs/development/compilers/boo/default.nix @@ -1,6 +1,5 @@ -{ stdenv, fetchFromGitHub, pkgconfig, dbus, mono, makeWrapper, nant -, shared-mime-info, gtksourceview, gtk2 -, targetVersion ? "4.5" }: +{ stdenv, fetchFromGitHub, pkgconfig, mono, makeWrapper, nant +, shared-mime-info, gtksourceview, gtk2 }: let release = "alpha"; diff --git a/pkgs/development/compilers/chicken/eggDerivation.nix b/pkgs/development/compilers/chicken/eggDerivation.nix index bcb7a763fb6bdb8c65d035f0e9c13cff42777eeb..2a14a997e57daf3a582d5ed6866b735eadd0415d 100644 --- a/pkgs/development/compilers/chicken/eggDerivation.nix +++ b/pkgs/development/compilers/chicken/eggDerivation.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchegg, chicken, makeWrapper }: +{ stdenv, chicken, makeWrapper }: { name, src , buildInputs ? [] , chickenInstallFlags ? [] diff --git a/pkgs/development/compilers/clasp/default.nix b/pkgs/development/compilers/clasp/default.nix index 6bfb71a9627d9bd305a47368489267f62b6ac69d..6ff2028e3c16e28a01655c614de7864112b59f83 100644 --- a/pkgs/development/compilers/clasp/default.nix +++ b/pkgs/development/compilers/clasp/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchFromGitHub , llvmPackages , cmake, boehmgc, gmp, zlib, ncurses, boost - , waf, python, git, sbcl + , python, git, sbcl }: stdenv.mkDerivation rec { name = "${pname}-${version}"; diff --git a/pkgs/development/compilers/cudatoolkit/default.nix b/pkgs/development/compilers/cudatoolkit/default.nix index b7c310cf01d2aad3302419d1fc051f7c08cc17e3..e44c21abe94602bfbc28c84425e84cf4dced1084 100644 --- a/pkgs/development/compilers/cudatoolkit/default.nix +++ b/pkgs/development/compilers/cudatoolkit/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, makeWrapper, fetchurl, requireFile, patchelf, perl, ncurses, expat, python27, zlib +{ lib, stdenv, makeWrapper, fetchurl, requireFile, perl, ncurses, expat, python27, zlib , gcc48, gcc49, gcc5, gcc6 , xorg, gtk2, glib, fontconfig, freetype, unixODBC, alsaLib, glibc }: diff --git a/pkgs/development/compilers/dotnet/sdk/default.nix b/pkgs/development/compilers/dotnet/sdk/default.nix index e7cb7495c90e0298e175bafcad99a5d7998996e6..f16be1b28225f946452135ef36be3f8595c9c607 100644 --- a/pkgs/development/compilers/dotnet/sdk/default.nix +++ b/pkgs/development/compilers/dotnet/sdk/default.nix @@ -6,7 +6,6 @@ , libuuid , zlib , curl -, patchelf }: let diff --git a/pkgs/development/compilers/elm/default.nix b/pkgs/development/compilers/elm/default.nix index 8ed34cf9d1e04c4f2e374230560f717effcbaf22..6a8d5f11b75c0cc2bef5d977eb5135a843d44300 100644 --- a/pkgs/development/compilers/elm/default.nix +++ b/pkgs/development/compilers/elm/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildEnv, haskell, nodejs, fetchurl, fetchpatch, makeWrapper }: +{ lib, stdenv, buildEnv, haskell, nodejs, fetchurl, makeWrapper }: # To update: # 1) Update versions in ./update-elm.rb and run it. diff --git a/pkgs/development/compilers/emscripten/default.nix b/pkgs/development/compilers/emscripten/default.nix index 8e268aa7eb7446de99d1b99e74fa672ad68cf6ee..e03039cb5e14eaab55ded357783a056c92641347 100644 --- a/pkgs/development/compilers/emscripten/default.nix +++ b/pkgs/development/compilers/emscripten/default.nix @@ -1,5 +1,5 @@ -{ emscriptenVersion, stdenv, fetchFromGitHub, emscriptenfastcomp, python, nodejs, closurecompiler, pkgs -, jre, binaryen, enableWasm ? true , python2Packages, cmake +{ emscriptenVersion, stdenv, fetchFromGitHub, emscriptenfastcomp, python, nodejs, closurecompiler +, jre, binaryen, enableWasm ? true , cmake }: let diff --git a/pkgs/development/compilers/emscripten/fastcomp/emscripten-fastcomp.nix b/pkgs/development/compilers/emscripten/fastcomp/emscripten-fastcomp.nix index 5317cf25d41baed100dd62d5e687845b19daf884..06acebd2ba4a8d6ed30b8d7e6f829bf612ca8453 100644 --- a/pkgs/development/compilers/emscripten/fastcomp/emscripten-fastcomp.nix +++ b/pkgs/development/compilers/emscripten/fastcomp/emscripten-fastcomp.nix @@ -1,4 +1,4 @@ -{ emscriptenVersion, stdenv, llvm, fetchFromGitHub, cmake, python, gtest, ... }: +{ emscriptenVersion, stdenv, fetchFromGitHub, cmake, python, gtest, ... }: let rev = emscriptenVersion; diff --git a/pkgs/development/compilers/factor-lang/default.nix b/pkgs/development/compilers/factor-lang/default.nix index ce1987866007ecd49d1b69a34b717b9224ded1ee..4dab2e06f48e88611ef5d09477db53c80bd2aa24 100644 --- a/pkgs/development/compilers/factor-lang/default.nix +++ b/pkgs/development/compilers/factor-lang/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchFromGitHub, glib, glibc, git, +{ stdenv, fetchurl, fetchFromGitHub, glib, git, rlwrap, curl, pkgconfig, perl, makeWrapper, tzdata, ncurses, libX11, pango, cairo, gtk2, gdk_pixbuf, gtkglext, libGLU, libXmu, libXt, libICE, libSM }: diff --git a/pkgs/development/compilers/gambit/build.nix b/pkgs/development/compilers/gambit/build.nix index 202e552542223863ab0037ec5a6b34514b514f5d..72530f99cdbcc16e5b790d8b9b85eaf143b66c1c 100644 --- a/pkgs/development/compilers/gambit/build.nix +++ b/pkgs/development/compilers/gambit/build.nix @@ -1,4 +1,4 @@ -{ stdenv, git, openssl, autoconf, pkgs, makeStaticLibraries, version, git-version, SRC }: +{ stdenv, git, openssl, autoconf, pkgs, makeStaticLibraries, version, SRC }: stdenv.mkDerivation rec { name = "gambit-${version}"; diff --git a/pkgs/development/compilers/gambit/default.nix b/pkgs/development/compilers/gambit/default.nix index 93f1d9184b4d8c6812c76212536f3ed8048ac7ce..77e8fb51602cbaa83381bcc49b0a77c259effbce 100644 --- a/pkgs/development/compilers/gambit/default.nix +++ b/pkgs/development/compilers/gambit/default.nix @@ -2,7 +2,6 @@ callPackage ./build.nix { version = "4.8.9"; - git-version = "4.8.9"; SRC = fetchurl { url = "http://www.iro.umontreal.ca/~gambit/download/gambit/v4.8/source/gambit-v4_8_9-devel.tgz"; diff --git a/pkgs/development/compilers/gambit/unstable.nix b/pkgs/development/compilers/gambit/unstable.nix index 545bece12c4886590f2969ea5a49a2bda23eafea..169ddb5a6a310fdb2cfe4922d5688fa438312b34 100644 --- a/pkgs/development/compilers/gambit/unstable.nix +++ b/pkgs/development/compilers/gambit/unstable.nix @@ -2,7 +2,6 @@ callPackage ./build.nix { version = "unstable-2018-05-30"; - git-version = "4.8.9-54-gffe8841b"; SRC = fetchgit { url = "https://github.com/feeley/gambit.git"; rev = "ffe8841b56330eb86fd794b16dc7f83914ecc7c5"; diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix index 15071fd2ba5e14e1265b0b14943e6cce6c20d737..943391611de1953b26aca702be3781ea4e27a78a 100644 --- a/pkgs/development/compilers/gcc/4.8/default.nix +++ b/pkgs/development/compilers/gcc/4.8/default.nix @@ -28,7 +28,6 @@ , # Strip kills static libs of other archs (hence no cross) stripped ? hostPlatform == buildPlatform && targetPlatform == hostPlatform , gnused ? null -, darwin ? null , buildPlatform, hostPlatform, targetPlatform , buildPackages }: diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix index 006cbdf40dc253b303b3e32e10e2564d3d92b99b..bf3b192e1bbda684130a593f806cbea72d8c04d6 100644 --- a/pkgs/development/compilers/gcc/4.9/default.nix +++ b/pkgs/development/compilers/gcc/4.9/default.nix @@ -28,7 +28,6 @@ , # Strip kills static libs of other archs (hence no cross) stripped ? hostPlatform == buildPlatform && targetPlatform == hostPlatform , gnused ? null -, darwin ? null , buildPlatform, hostPlatform, targetPlatform , buildPackages }: diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix index f360ed135d7354c3fa4b95dee626dcab1b4250dd..0564329967e56c1b2eabdab04fdcfcf7468af99c 100644 --- a/pkgs/development/compilers/gcc/5/default.nix +++ b/pkgs/development/compilers/gcc/5/default.nix @@ -29,7 +29,6 @@ stripped ? hostPlatform == buildPlatform && targetPlatform == hostPlatform , gnused ? null , cloog # unused; just for compat with gcc4, as we override the parameter on some places -, darwin ? null , buildPlatform, hostPlatform, targetPlatform , buildPackages }: diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix index 02a0035016218730ce4351ecbddc7de27062f41c..50d55aef23423c7d55ebe23a67031873ace736ab 100644 --- a/pkgs/development/compilers/gcc/6/default.nix +++ b/pkgs/development/compilers/gcc/6/default.nix @@ -29,7 +29,6 @@ stripped ? hostPlatform == buildPlatform && targetPlatform == hostPlatform , gnused ? null , cloog # unused; just for compat with gcc4, as we override the parameter on some places -, darwin ? null , buildPlatform, hostPlatform, targetPlatform , buildPackages }: diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix index 84323cca823a28ad4f695175111ddb3f0abfdcda..0c51868aef8dae46b802ccff32c25c7341d6a4a4 100644 --- a/pkgs/development/compilers/gcc/7/default.nix +++ b/pkgs/development/compilers/gcc/7/default.nix @@ -22,7 +22,6 @@ stripped ? hostPlatform == buildPlatform && targetPlatform == hostPlatform , gnused ? null , cloog # unused; just for compat with gcc4, as we override the parameter on some places -, darwin ? null , buildPlatform, hostPlatform, targetPlatform , buildPackages }: diff --git a/pkgs/development/compilers/gcc/8/default.nix b/pkgs/development/compilers/gcc/8/default.nix index 85c03bc440ff6afee72c8d897ef39c34d686043f..38d8bcd83cf59c4dd3d5e5e637acb8409a580bc6 100644 --- a/pkgs/development/compilers/gcc/8/default.nix +++ b/pkgs/development/compilers/gcc/8/default.nix @@ -1,4 +1,4 @@ -{ stdenv, targetPackages, fetchurl, fetchpatch, noSysDirs +{ stdenv, targetPackages, fetchurl, noSysDirs , langC ? true, langCC ? true, langFortran ? false , langObjC ? targetPlatform.isDarwin , langObjCpp ? targetPlatform.isDarwin @@ -22,7 +22,6 @@ stripped ? hostPlatform == buildPlatform && targetPlatform == hostPlatform , gnused ? null , cloog # unused; just for compat with gcc4, as we override the parameter on some places -, darwin ? null , buildPlatform, hostPlatform, targetPlatform , buildPackages }: diff --git a/pkgs/development/compilers/gcc/snapshot/default.nix b/pkgs/development/compilers/gcc/snapshot/default.nix index b00f180bbc7c8482b6b38b0ca9cdb3366690a791..124fdbcdf9d44cfa8233aa74fa4f14df30be08f9 100644 --- a/pkgs/development/compilers/gcc/snapshot/default.nix +++ b/pkgs/development/compilers/gcc/snapshot/default.nix @@ -22,7 +22,6 @@ stripped ? hostPlatform == buildPlatform && targetPlatform == hostPlatform , gnused ? null , cloog # unused; just for compat with gcc4, as we override the parameter on some places -, darwin ? null , flex ? null , buildPlatform, hostPlatform, targetPlatform , buildPackages diff --git a/pkgs/development/compilers/gcl/2.6.13-pre.nix b/pkgs/development/compilers/gcl/2.6.13-pre.nix index 2a80eccfb40369d6f0dc1fe93160bb8fb484973a..71a6eaa8db8de791382ac362745f5068c9884b0a 100644 --- a/pkgs/development/compilers/gcl/2.6.13-pre.nix +++ b/pkgs/development/compilers/gcl/2.6.13-pre.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, mpfr, m4, binutils, fetchcvs, emacs, zlib, which +{ stdenv, fetchgit, mpfr, m4, binutils, emacs, zlib, which , texinfo, libX11, xproto, inputproto, libXi, gmp, readline, strace , libXext, xextproto, libXt, libXaw, libXmu } : diff --git a/pkgs/development/compilers/gcl/default.nix b/pkgs/development/compilers/gcl/default.nix index 0e4d5bed0514cd543eaa45b87d1e790019e502cf..f503427b326eba8d3ea04b6e87245d6ab7e2a9ee 100644 --- a/pkgs/development/compilers/gcl/default.nix +++ b/pkgs/development/compilers/gcl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, mpfr, m4, binutils, fetchcvs, emacs, zlib, which +{ stdenv, fetchurl, mpfr, m4, binutils, emacs, zlib, which , texinfo, libX11, xproto, inputproto, libXi, gmp , libXext, xextproto, libXt, libXaw, libXmu } : diff --git a/pkgs/development/compilers/gerbil/build.nix b/pkgs/development/compilers/gerbil/build.nix index 5609de15d4cb0738d67ef5b3e2843dacbeb5772c..0ce9fbb00e2e886ea735333109ebe45cf2f466a6 100644 --- a/pkgs/development/compilers/gerbil/build.nix +++ b/pkgs/development/compilers/gerbil/build.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, makeStaticLibraries, +{ stdenv, makeStaticLibraries, coreutils, rsync, bash, openssl, zlib, sqlite, libxml2, libyaml, mysql, lmdb, leveldb, postgresql, version, git-version, GAMBIT, SRC }: diff --git a/pkgs/development/compilers/ghc/7.10.3.nix b/pkgs/development/compilers/ghc/7.10.3.nix index 2a906d918aa35950b29bd3f539a9464eddb2f23a..0cf3a4cb12b48f88106c38f714a8d65ee7ba0a8c 100644 --- a/pkgs/development/compilers/ghc/7.10.3.nix +++ b/pkgs/development/compilers/ghc/7.10.3.nix @@ -3,10 +3,10 @@ # build-tools , bootPkgs, hscolour -, coreutils, fetchurl, fetchpatch, perl +, coreutils, fetchurl, perl , docbook_xsl, docbook_xml_dtd_45, docbook_xml_dtd_42, libxml2, libxslt -, libffi, libiconv ? null, ncurses +, libiconv ? null, ncurses , useLLVM ? !targetPlatform.isx86 , # LLVM is conceptually a run-time-only depedendency, but for diff --git a/pkgs/development/compilers/ghc/8.0.2.nix b/pkgs/development/compilers/ghc/8.0.2.nix index 8062e93df549dfd76d621766d3ba3f2d7b19e46a..7671fcdb0252e74a1399d0e518df38e7933b7587 100644 --- a/pkgs/development/compilers/ghc/8.0.2.nix +++ b/pkgs/development/compilers/ghc/8.0.2.nix @@ -5,7 +5,7 @@ , bootPkgs, hscolour , coreutils, fetchpatch, fetchurl, perl, sphinx -, libffi, libiconv ? null, ncurses +, libiconv ? null, ncurses , useLLVM ? !targetPlatform.isx86 , # LLVM is conceptually a run-time-only depedendency, but for diff --git a/pkgs/development/compilers/ghc/8.2.2.nix b/pkgs/development/compilers/ghc/8.2.2.nix index d740a7ee673b8cf3d921c6d8adc6be48fb932f45..c24cdeb43bfd203292ae2ff2b4edc096741d3b96 100644 --- a/pkgs/development/compilers/ghc/8.2.2.nix +++ b/pkgs/development/compilers/ghc/8.2.2.nix @@ -6,7 +6,7 @@ , autoconf, autoreconfHook, automake, coreutils, fetchurl, fetchpatch, perl, python3, sphinx , runCommand -, libffi, libiconv ? null, ncurses +, libiconv ? null, ncurses , useLLVM ? !targetPlatform.isx86 || (targetPlatform.isMusl && hostPlatform != targetPlatform) , # LLVM is conceptually a run-time-only depedendency, but for diff --git a/pkgs/development/compilers/ghc/8.4.3.nix b/pkgs/development/compilers/ghc/8.4.3.nix index 182afa6b3496ef166a0bb5094dc547c55c9c577b..c93fb1fd9b2277738757e630c667be5eae365cbc 100644 --- a/pkgs/development/compilers/ghc/8.4.3.nix +++ b/pkgs/development/compilers/ghc/8.4.3.nix @@ -5,7 +5,7 @@ , bootPkgs, alex, happy, hscolour , autoconf, automake, coreutils, fetchurl, fetchpatch, perl, python3, m4 -, libffi, libiconv ? null, ncurses +, libiconv ? null, ncurses , useLLVM ? !targetPlatform.isx86 || (targetPlatform.isMusl && hostPlatform != targetPlatform) , # LLVM is conceptually a run-time-only depedendency, but for diff --git a/pkgs/development/compilers/ghc/8.6.1.nix b/pkgs/development/compilers/ghc/8.6.1.nix index 522ad32e69f4f981dc45dd6bc4273be38c0ab549..ae22e1f1e4062e6fa1a8f67235d5afbbe4677e90 100644 --- a/pkgs/development/compilers/ghc/8.6.1.nix +++ b/pkgs/development/compilers/ghc/8.6.1.nix @@ -3,9 +3,9 @@ # build-tools , bootPkgs, alex, happy, hscolour -, autoconf, automake, coreutils, fetchurl, fetchpatch, perl, python3, m4 +, autoconf, automake, coreutils, fetchurl, perl, python3, m4 -, libffi, libiconv ? null, ncurses +, libiconv ? null, ncurses , useLLVM ? !targetPlatform.isx86 || (targetPlatform.isMusl && hostPlatform != targetPlatform) , # LLVM is conceptually a run-time-only depedendency, but for diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 4c1e5d986dcf7437d2495cc90f82b2115bb2c983..2824ce669ee62b64c694b6931acf57bfccee7a68 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -5,7 +5,7 @@ , bootPkgs, alex, happy, hscolour , autoconf, automake, coreutils, fetchgit, perl, python3, m4 -, libffi, libiconv ? null, ncurses +, libiconv ? null, ncurses , useLLVM ? !targetPlatform.isx86 || (targetPlatform.isMusl && hostPlatform != targetPlatform) , # LLVM is conceptually a run-time-only depedendency, but for diff --git a/pkgs/development/compilers/ghcjs-ng/configured-ghcjs-src.nix b/pkgs/development/compilers/ghcjs-ng/configured-ghcjs-src.nix index 57d9fccd266b924b9407473e4407043cf031a905..df1394e4a24b85994edbfe85d78e39cd363c1d63 100644 --- a/pkgs/development/compilers/ghcjs-ng/configured-ghcjs-src.nix +++ b/pkgs/development/compilers/ghcjs-ng/configured-ghcjs-src.nix @@ -4,7 +4,6 @@ , python3 , gcc , cabal-install -, gmp , runCommand , lib , stdenv diff --git a/pkgs/development/compilers/ghcjs/base.nix b/pkgs/development/compilers/ghcjs/base.nix index f09a577110b76c58e093e9cf6d0ca1a4a12c4c52..46e9d8d72bed2eb0eebf6c57261ee243db35ee0c 100644 --- a/pkgs/development/compilers/ghcjs/base.nix +++ b/pkgs/development/compilers/ghcjs/base.nix @@ -3,7 +3,6 @@ , broken ? false , test-framework , test-framework-hunit -, test-framework-quickcheck2 , data-default , ghc-paths , haskell-src-exts @@ -20,10 +19,8 @@ , transformers-compat , haddock-api , regex-posix -, callPackage , bootPkgs, gmp -, jailbreak-cabal , runCommand , nodejs, stdenv, filepath, HTTP, HUnit, mtl, network, QuickCheck, random, stm @@ -32,11 +29,11 @@ , lens , parallel, safe, shelly, split, stringsearch, syb , tar, terminfo -, vector, yaml, fetchgit, fetchFromGitHub, Cabal +, vector, yaml, fetchgit, fetchFromGitHub , alex, happy, git, gnumake, autoconf, patch , automake, libtool , cryptohash -, haddock, hspec, xhtml, primitive, cacert, pkgs +, haddock, hspec, xhtml, pkgs , coreutils , libiconv diff --git a/pkgs/development/compilers/go/1.10.nix b/pkgs/development/compilers/go/1.10.nix index b4fa005c3de851135a43bcbc043c6302de639685..272c953af7a12833b7661efac9d532891992ff92 100644 --- a/pkgs/development/compilers/go/1.10.nix +++ b/pkgs/development/compilers/go/1.10.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, tzdata, iana-etc, go_bootstrap, runCommand, writeScriptBin , perl, which, pkgconfig, patch, procps , pcre, cacert, llvm -, Security, Foundation, bash +, Security, Foundation , makeWrapper, git, subversion, mercurial, bazaar }: let diff --git a/pkgs/development/compilers/go/1.9.nix b/pkgs/development/compilers/go/1.9.nix index 8ef528e2c92ae27bc47cbfe3c672acd307d989f9..cbaa427c827742e2e363da9f01bb8ab46287ca3d 100644 --- a/pkgs/development/compilers/go/1.9.nix +++ b/pkgs/development/compilers/go/1.9.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, tzdata, iana-etc, go_bootstrap, runCommand, writeScriptBin , perl, which, pkgconfig, patch, procps , pcre, cacert, llvm -, Security, Foundation, bash +, Security, Foundation , makeWrapper, git, subversion, mercurial, bazaar }: let diff --git a/pkgs/development/compilers/graalvm/default.nix b/pkgs/development/compilers/graalvm/default.nix index 79446744371517ce2f9b4f58178ed95c05749d9f..52a49c519b3991a2d785a40ec3df3cb598b79cd1 100644 --- a/pkgs/development/compilers/graalvm/default.nix +++ b/pkgs/development/compilers/graalvm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, fetchhg, fetchurl, fetchzip, mercurial, python27, zlib, makeWrapper, oraclejdk8 }: +{ stdenv, lib, fetchFromGitHub, fetchurl, fetchzip, mercurial, python27, zlib, makeWrapper, oraclejdk8 }: let # pre-download some cache entries ('mx' will not be able to download under nixbld1) diff --git a/pkgs/development/compilers/haxe/default.nix b/pkgs/development/compilers/haxe/default.nix index afeef2b3637cbd63d211d009deb4e159e12b1692..0a974fccc888bcbb8a77d014ae1a693f60059e4d 100644 --- a/pkgs/development/compilers/haxe/default.nix +++ b/pkgs/development/compilers/haxe/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, bash, coreutils, ocaml, zlib, pcre, neko, camlp4 }: +{ stdenv, fetchgit, coreutils, ocaml, zlib, pcre, neko, camlp4 }: let generic = { version, sha256, prePatch }: diff --git a/pkgs/development/compilers/inform7/default.nix b/pkgs/development/compilers/inform7/default.nix index 7f1830430c45b2b99c63c7f92ac09344fc0fcfc9..a6955c030519f392acec7e8ee0e5cdfe30684260 100644 --- a/pkgs/development/compilers/inform7/default.nix +++ b/pkgs/development/compilers/inform7/default.nix @@ -1,4 +1,4 @@ -{ stdenv, writeText, fetchzip, coreutils, perl, gnutar, gzip }: +{ stdenv, fetchzip, coreutils, perl, gnutar, gzip }: let version = "6M62"; in stdenv.mkDerivation { diff --git a/pkgs/development/compilers/ios-cross-compile/9.2.nix b/pkgs/development/compilers/ios-cross-compile/9.2.nix index 9c4b38f87dedc14afafe8bfee5643f93776607b3..e64c0c912d947a8da2b86986b9c2a3a856b9c41a 100644 --- a/pkgs/development/compilers/ios-cross-compile/9.2.nix +++ b/pkgs/development/compilers/ios-cross-compile/9.2.nix @@ -1,6 +1,6 @@ { stdenv, git, clang, fetchFromGitHub, requireFile, - openssl, xz, gnutar, gcc, + openssl, xz, gnutar, automake, autoconf, libtool, clangStdenv } : clangStdenv.mkDerivation rec { diff --git a/pkgs/development/compilers/ispc/default.nix b/pkgs/development/compilers/ispc/default.nix index 7aedf191abee0a35ec92a5e913fe6c43c8362183..a5d6247ffdc7e35cdc1f683028142b64de124f3d 100644 --- a/pkgs/development/compilers/ispc/default.nix +++ b/pkgs/development/compilers/ispc/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, fetchpatch, bash, which, m4, python, bison, flex, llvmPackages, +{stdenv, fetchFromGitHub, fetchpatch, which, m4, python, bison, flex, llvmPackages, testedTargets ? ["sse2" "host"] # the default test target is sse4, but that is not supported by all Hydra agents }: diff --git a/pkgs/development/compilers/julia/0.5.nix b/pkgs/development/compilers/julia/0.5.nix index cff6c1c446f1403602a2217e9a310a924dd1506b..e503b7a92ce48d2fa7e32b281db2cfc4e2fd98fa 100644 --- a/pkgs/development/compilers/julia/0.5.nix +++ b/pkgs/development/compilers/julia/0.5.nix @@ -1,11 +1,10 @@ -{ stdenv, fetchgit, fetchurl, fetchzip +{ stdenv, fetchurl, fetchzip # build tools , gfortran, m4, makeWrapper, patchelf, perl, which, python2 -, runCommand , paxctl # libjulia dependencies , libunwind, readline, utf8proc, zlib -, llvm, libffi, ncurses +, llvm # standard library dependencies , curl, fftwSinglePrec, fftw, gmp, libgit2, mpfr, openlibm, openspecfun, pcre2 # linear algebra diff --git a/pkgs/development/compilers/julia/0.6.nix b/pkgs/development/compilers/julia/0.6.nix index 49bbaf0e8df117ca5ffc7ea5695c2714be3e2cf8..fcf486b3b41a31358fd4283b3e469f4b176a9aac 100644 --- a/pkgs/development/compilers/julia/0.6.nix +++ b/pkgs/development/compilers/julia/0.6.nix @@ -1,11 +1,10 @@ -{ stdenv, fetchgit, fetchurl, fetchzip +{ stdenv, fetchurl, fetchzip # build tools , gfortran, m4, makeWrapper, patchelf, perl, which, python2 -, runCommand , paxctl # libjulia dependencies , libunwind, readline, utf8proc, zlib -, llvm, libffi, ncurses +, llvm # standard library dependencies , curl, fftwSinglePrec, fftw, gmp, libgit2, mpfr, openlibm, openspecfun, pcre2 # linear algebra diff --git a/pkgs/development/compilers/julia/default.nix b/pkgs/development/compilers/julia/default.nix index b5a3a8c6be2d2464d08435ad505d7df723be5160..a504dc2ea463d071c70aa3dce0e218a6e14547eb 100644 --- a/pkgs/development/compilers/julia/default.nix +++ b/pkgs/development/compilers/julia/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, fetchurl +{ stdenv, fetchurl # build tools , gfortran, m4, makeWrapper, patchelf, perl, which, python2, paxctl # libjulia dependencies diff --git a/pkgs/development/compilers/ldc/default.nix b/pkgs/development/compilers/ldc/default.nix index 48301a8f28740a1bf92deec20b2d4f4740da5b90..dc6a933a93459e678b018ff2b2d8dbb046d71604 100644 --- a/pkgs/development/compilers/ldc/default.nix +++ b/pkgs/development/compilers/ldc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, fetchurl, cmake, llvm, curl, tzdata +{ stdenv, fetchurl, cmake, llvm, curl, tzdata , python, libconfig, lit, gdb, unzip, darwin, bash , callPackage, makeWrapper, targetPackages , bootstrapVersion ? false diff --git a/pkgs/development/compilers/llvm/3.4/llvm.nix b/pkgs/development/compilers/llvm/3.4/llvm.nix index 0b29b04825a10ff80324a380ce57879950a3c487..25bb082841424ff21073e3ec2b37384c60ed3e93 100644 --- a/pkgs/development/compilers/llvm/3.4/llvm.nix +++ b/pkgs/development/compilers/llvm/3.4/llvm.nix @@ -8,7 +8,6 @@ , libffi , libbfd , libxml2 -, valgrind , ncurses , version , zlib diff --git a/pkgs/development/compilers/llvm/3.5/dragonegg.nix b/pkgs/development/compilers/llvm/3.5/dragonegg.nix index 96d4f9f558c8c8c1779e4ca7a7cc6489186022c5..d54ffd96382d19f15935860243ef491f98db421c 100644 --- a/pkgs/development/compilers/llvm/3.5/dragonegg.nix +++ b/pkgs/development/compilers/llvm/3.5/dragonegg.nix @@ -1,4 +1,4 @@ -{stdenv, fetch, fetchpatch, llvm, gmp, mpfr, libmpc, ncurses, zlib, version}: +{stdenv, fetch, llvm, gmp, mpfr, libmpc, ncurses, zlib, version}: stdenv.mkDerivation rec { name = "dragonegg-${version}"; diff --git a/pkgs/development/compilers/llvm/3.7/default.nix b/pkgs/development/compilers/llvm/3.7/default.nix index 1bd4b88c72d4823b96af21a4838de9c81d8d1a0a..f176894dedb9f84c1dbbd815fbd875514290e867 100644 --- a/pkgs/development/compilers/llvm/3.7/default.nix +++ b/pkgs/development/compilers/llvm/3.7/default.nix @@ -1,5 +1,5 @@ -{ newScope, stdenv, libstdcxxHook, cmake, libxml2, python2, isl, fetchurl -, overrideCC, wrapCCWith, darwin +{ newScope, stdenv, libstdcxxHook, isl, fetchurl +, overrideCC, wrapCCWith , buildLlvmTools # tools, but from the previous stage, for cross , targetLlvmLibraries # libraries, but from the next stage, for cross }: diff --git a/pkgs/development/compilers/llvm/3.7/llvm.nix b/pkgs/development/compilers/llvm/3.7/llvm.nix index 1654914ff8c4ca52a29bc20dafac1bd9a3e280bd..98b6f4adbbf6810d7af8f78055a0075d5bf1e0e0 100644 --- a/pkgs/development/compilers/llvm/3.7/llvm.nix +++ b/pkgs/development/compilers/llvm/3.7/llvm.nix @@ -8,7 +8,6 @@ , libffi , libbfd , libxml2 -, valgrind , ncurses , version , zlib diff --git a/pkgs/development/compilers/llvm/3.8/default.nix b/pkgs/development/compilers/llvm/3.8/default.nix index 28f908ee829f0df06a55a3c74d4e0019cc61f7df..99869e6e80a74cae305b3d74753eb28d99afa09e 100644 --- a/pkgs/development/compilers/llvm/3.8/default.nix +++ b/pkgs/development/compilers/llvm/3.8/default.nix @@ -1,4 +1,4 @@ -{ newScope, stdenv, libstdcxxHook, isl, fetchurl, overrideCC, wrapCCWith, darwin +{ newScope, stdenv, libstdcxxHook, isl, fetchurl, overrideCC, wrapCCWith , buildLlvmTools # tools, but from the previous stage, for cross , targetLlvmLibraries # libraries, but from the next stage, for cross }: diff --git a/pkgs/development/compilers/llvm/3.8/llvm.nix b/pkgs/development/compilers/llvm/3.8/llvm.nix index a6fb6119817608cab8f72f2a61f89a921eb56eb5..8cfcb1af43d4e9e9ddb7a98b640ec7077490f506 100644 --- a/pkgs/development/compilers/llvm/3.8/llvm.nix +++ b/pkgs/development/compilers/llvm/3.8/llvm.nix @@ -8,7 +8,6 @@ , libffi , libbfd , libxml2 -, valgrind , ncurses , version , zlib diff --git a/pkgs/development/compilers/llvm/3.9/default.nix b/pkgs/development/compilers/llvm/3.9/default.nix index ea3ea36eb6d365e28c89823798cd066aac690c6b..01c08f4bd2091dd269b62677b23ca521112ef6e1 100644 --- a/pkgs/development/compilers/llvm/3.9/default.nix +++ b/pkgs/development/compilers/llvm/3.9/default.nix @@ -1,4 +1,4 @@ -{ newScope, stdenv, libstdcxxHook, isl, fetchurl, overrideCC, wrapCCWith, darwin +{ newScope, stdenv, libstdcxxHook, isl, fetchurl, overrideCC, wrapCCWith , buildLlvmTools # tools, but from the previous stage, for cross , targetLlvmLibraries # libraries, but from the next stage, for cross }: diff --git a/pkgs/development/compilers/llvm/3.9/llvm.nix b/pkgs/development/compilers/llvm/3.9/llvm.nix index 458ad7db8efde4e6605480388a11ef56c67ee852..c974eb6f6d39542e484ddb60d14aa95dd2dcf03b 100644 --- a/pkgs/development/compilers/llvm/3.9/llvm.nix +++ b/pkgs/development/compilers/llvm/3.9/llvm.nix @@ -8,14 +8,12 @@ , libffi , libbfd , libxml2 -, valgrind , ncurses , version , zlib , compiler-rt_src , debugVersion ? false , enableSharedLibraries ? (buildPlatform == hostPlatform) -, darwin , buildPackages , buildPlatform , hostPlatform diff --git a/pkgs/development/compilers/llvm/4/default.nix b/pkgs/development/compilers/llvm/4/default.nix index ae674d1fa8e8dba37dcc7892be590cf6f9310756..75037f6a07db1a9d287ce1c61ce708732c30b76b 100644 --- a/pkgs/development/compilers/llvm/4/default.nix +++ b/pkgs/development/compilers/llvm/4/default.nix @@ -1,6 +1,5 @@ -{ lowPrio, newScope, stdenv, targetPlatform, cmake, libstdcxxHook +{ lowPrio, newScope, stdenv, cmake, libstdcxxHook , libxml2, python2, isl, fetchurl, overrideCC, wrapCCWith -, darwin , buildLlvmTools # tools, but from the previous stage, for cross , targetLlvmLibraries # libraries, but from the next stage, for cross }: diff --git a/pkgs/development/compilers/llvm/4/libc++/default.nix b/pkgs/development/compilers/llvm/4/libc++/default.nix index 6ce9c0d4792b4febf46e336e60e0a19ea8d383c9..2b543b9d793ab49fbbfbcc0761be420863e57a81 100644 --- a/pkgs/development/compilers/llvm/4/libc++/default.nix +++ b/pkgs/development/compilers/llvm/4/libc++/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetch, cmake, python, llvm, libcxxabi, fixDarwinDylibNames, version }: +{ lib, stdenv, fetch, cmake, python, libcxxabi, fixDarwinDylibNames, version }: stdenv.mkDerivation rec { name = "libc++-${version}"; diff --git a/pkgs/development/compilers/llvm/4/lld.nix b/pkgs/development/compilers/llvm/4/lld.nix index 776109ee74d18dea502356bc852ff1b8bd31a0e7..21b0c1c3601c1d5e30d276193c00530280cf5a35 100644 --- a/pkgs/development/compilers/llvm/4/lld.nix +++ b/pkgs/development/compilers/llvm/4/lld.nix @@ -1,9 +1,7 @@ { stdenv , fetch , cmake -, zlib , llvm -, python , version }: diff --git a/pkgs/development/compilers/llvm/4/llvm.nix b/pkgs/development/compilers/llvm/4/llvm.nix index e9140d3fcc6aa6ee4e94f0b51ab58c70dab23a48..514c3a006e38a00d0c165549f1e0e6eee5dd09a2 100644 --- a/pkgs/development/compilers/llvm/4/llvm.nix +++ b/pkgs/development/compilers/llvm/4/llvm.nix @@ -6,7 +6,6 @@ , libffi , libbfd , libxml2 -, valgrind , ncurses , version , release_version @@ -15,7 +14,6 @@ , debugVersion ? false , enableManpages ? false , enableSharedLibraries ? true -, darwin }: let diff --git a/pkgs/development/compilers/llvm/4/openmp.nix b/pkgs/development/compilers/llvm/4/openmp.nix index 0bdf5c71e1f3a8fb6cd66685efffb58065cb0c0e..a8a6b3dfea874dc4044b7356439903a553b033d0 100644 --- a/pkgs/development/compilers/llvm/4/openmp.nix +++ b/pkgs/development/compilers/llvm/4/openmp.nix @@ -1,7 +1,6 @@ { stdenv , fetch , cmake -, zlib , llvm , perl , version diff --git a/pkgs/development/compilers/llvm/5/clang/default.nix b/pkgs/development/compilers/llvm/5/clang/default.nix index 07738048f8e259eab7abce47d7772bca971b8587..5fd0271f0261d0fe7ef692d66c7b48c1f3a01f4c 100644 --- a/pkgs/development/compilers/llvm/5/clang/default.nix +++ b/pkgs/development/compilers/llvm/5/clang/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetch, cmake, libxml2, llvm, version, release_version, clang-tools-extra_src, python +{ stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python , fixDarwinDylibNames , enableManpages ? false }: diff --git a/pkgs/development/compilers/llvm/5/default.nix b/pkgs/development/compilers/llvm/5/default.nix index ef2e1c29088fd0deaf19546ba13dda4a6a445645..00b0083108b5a3f6ef65098d44f7c8f2bbb2581e 100644 --- a/pkgs/development/compilers/llvm/5/default.nix +++ b/pkgs/development/compilers/llvm/5/default.nix @@ -1,6 +1,5 @@ -{ lowPrio, newScope, stdenv, targetPlatform, cmake, libstdcxxHook +{ lowPrio, newScope, stdenv, cmake, libstdcxxHook , libxml2, python2, isl, fetchurl, overrideCC, wrapCCWith -, darwin , buildLlvmTools # tools, but from the previous stage, for cross , targetLlvmLibraries # libraries, but from the next stage, for cross }: diff --git a/pkgs/development/compilers/llvm/5/libc++/default.nix b/pkgs/development/compilers/llvm/5/libc++/default.nix index 5492e12da98c0c84ed29c7ca74c6d141045b5653..c7b4615e374a2a890a9eae44e09ebab6a013019a 100644 --- a/pkgs/development/compilers/llvm/5/libc++/default.nix +++ b/pkgs/development/compilers/llvm/5/libc++/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetch, cmake, python, llvm, libcxxabi, fixDarwinDylibNames, version }: +{ lib, stdenv, fetch, cmake, python, libcxxabi, fixDarwinDylibNames, version }: stdenv.mkDerivation rec { name = "libc++-${version}"; diff --git a/pkgs/development/compilers/llvm/5/lld.nix b/pkgs/development/compilers/llvm/5/lld.nix index 05801f2f08f07c705b879ca80e470991e9495008..9a47435cf140dac82d12fc4dadedbe681ccde2e3 100644 --- a/pkgs/development/compilers/llvm/5/lld.nix +++ b/pkgs/development/compilers/llvm/5/lld.nix @@ -1,9 +1,7 @@ { stdenv , fetch , cmake -, zlib , llvm -, python , version }: diff --git a/pkgs/development/compilers/llvm/5/llvm.nix b/pkgs/development/compilers/llvm/5/llvm.nix index 31750e2d0da82843ffc2406979795804d93d1d49..68eebc33c6b90cfa97c25a62241b645f01561e55 100644 --- a/pkgs/development/compilers/llvm/5/llvm.nix +++ b/pkgs/development/compilers/llvm/5/llvm.nix @@ -1,12 +1,10 @@ { stdenv , fetch -, fetchpatch , cmake , python , libffi , libbfd , libxml2 -, valgrind , ncurses , version , release_version @@ -15,7 +13,6 @@ , debugVersion ? false , enableManpages ? false , enableSharedLibraries ? true -, darwin }: let diff --git a/pkgs/development/compilers/llvm/5/openmp.nix b/pkgs/development/compilers/llvm/5/openmp.nix index 5c2b7501f9798ea245ea06052cb5fb49e8c32a0d..901015bf2ff4a2ba1ab9f28ca97302ceb26c09c1 100644 --- a/pkgs/development/compilers/llvm/5/openmp.nix +++ b/pkgs/development/compilers/llvm/5/openmp.nix @@ -1,7 +1,6 @@ { stdenv , fetch , cmake -, zlib , llvm , perl , version diff --git a/pkgs/development/compilers/llvm/6/clang/default.nix b/pkgs/development/compilers/llvm/6/clang/default.nix index 8821441840647b4075a33da02642c159ef155dbf..840567496785f90d0974dfe398310002f0600539 100644 --- a/pkgs/development/compilers/llvm/6/clang/default.nix +++ b/pkgs/development/compilers/llvm/6/clang/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetch, cmake, libxml2, llvm, version, release_version, clang-tools-extra_src, python +{ stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python , fixDarwinDylibNames , enableManpages ? false }: diff --git a/pkgs/development/compilers/llvm/6/default.nix b/pkgs/development/compilers/llvm/6/default.nix index 66f0facc952cbdf9c449f9074a3a257998ffc10d..141daa88dcffd291573a589995a762e7924473e3 100644 --- a/pkgs/development/compilers/llvm/6/default.nix +++ b/pkgs/development/compilers/llvm/6/default.nix @@ -1,6 +1,5 @@ -{ lowPrio, newScope, stdenv, targetPlatform, cmake, libstdcxxHook +{ lowPrio, newScope, stdenv, cmake, libstdcxxHook , libxml2, python2, isl, fetchurl, overrideCC, wrapCCWith -, darwin , buildLlvmTools # tools, but from the previous stage, for cross , targetLlvmLibraries # libraries, but from the next stage, for cross }: diff --git a/pkgs/development/compilers/llvm/6/libc++/default.nix b/pkgs/development/compilers/llvm/6/libc++/default.nix index c1f0b9f61294b23141bd62e1fc90485e9920dc5f..1f87cb83ab01dc0efc46cc29baf3711e04fd112d 100644 --- a/pkgs/development/compilers/llvm/6/libc++/default.nix +++ b/pkgs/development/compilers/llvm/6/libc++/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetch, cmake, python, llvm, libcxxabi, fixDarwinDylibNames, version }: +{ lib, stdenv, fetch, cmake, python, libcxxabi, fixDarwinDylibNames, version }: stdenv.mkDerivation rec { name = "libc++-${version}"; diff --git a/pkgs/development/compilers/llvm/6/lld.nix b/pkgs/development/compilers/llvm/6/lld.nix index 818ad47a335afb9d99f6d433f4986064bdf643ac..1e68276945ecc9b63b8e76594d21b63586caae25 100644 --- a/pkgs/development/compilers/llvm/6/lld.nix +++ b/pkgs/development/compilers/llvm/6/lld.nix @@ -3,7 +3,6 @@ , cmake , libxml2 , llvm -, python , version }: diff --git a/pkgs/development/compilers/llvm/6/llvm.nix b/pkgs/development/compilers/llvm/6/llvm.nix index 6fc448574f43da2b395c225489d851951c979de3..a86f5b5039e75d37f868254c67704e7aec923b7a 100644 --- a/pkgs/development/compilers/llvm/6/llvm.nix +++ b/pkgs/development/compilers/llvm/6/llvm.nix @@ -1,12 +1,10 @@ { stdenv , fetch -, fetchpatch , cmake , python , libffi , libbfd , libxml2 -, valgrind , ncurses , version , release_version @@ -15,7 +13,6 @@ , enableManpages ? false , enableSharedLibraries ? true , enableWasm ? true -, darwin }: let diff --git a/pkgs/development/compilers/llvm/6/openmp.nix b/pkgs/development/compilers/llvm/6/openmp.nix index 16093758e8264433f352474d2cc9b5f6a0714a44..908a5f1218f7679118d2a22b0a00d68871905484 100644 --- a/pkgs/development/compilers/llvm/6/openmp.nix +++ b/pkgs/development/compilers/llvm/6/openmp.nix @@ -1,7 +1,6 @@ { stdenv , fetch , cmake -, zlib , llvm , perl , version diff --git a/pkgs/development/compilers/matter-compiler/default.nix b/pkgs/development/compilers/matter-compiler/default.nix index 58fb0ca22d7c5b57a728e2b186c53289d63bc703..63e5b50c3d472186fe80f5979d73496ddf774868 100644 --- a/pkgs/development/compilers/matter-compiler/default.nix +++ b/pkgs/development/compilers/matter-compiler/default.nix @@ -1,5 +1,5 @@ -{ stdenv, lib, bundlerEnv, ruby }: +{ lib, bundlerEnv, ruby }: bundlerEnv { name = "matter_compiler-0.5.1"; diff --git a/pkgs/development/compilers/mcpp/default.nix b/pkgs/development/compilers/mcpp/default.nix index cdf201cec7ad0d1e7ed2924e6095e934be0bd8e4..9ce7c9166bca76d2c5c0d1ef222ab4b3946b4e26 100644 --- a/pkgs/development/compilers/mcpp/default.nix +++ b/pkgs/development/compilers/mcpp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, mcpp }: +{ stdenv, fetchurl }: stdenv.mkDerivation rec { name = "mcpp-2.7.2"; diff --git a/pkgs/development/compilers/mono/4.0.nix b/pkgs/development/compilers/mono/4.0.nix index f13883db74ff94c172b7b7580b90891409f6e789..892ae99abaf53fdfba36ad7b65b3002cfa7f769c 100644 --- a/pkgs/development/compilers/mono/4.0.nix +++ b/pkgs/development/compilers/mono/4.0.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, Foundation, libobjc }: +{ callPackage, Foundation, libobjc }: callPackage ./generic.nix (rec { inherit Foundation libobjc; version = "4.0.4.1"; diff --git a/pkgs/development/compilers/mono/4.4.nix b/pkgs/development/compilers/mono/4.4.nix index f80cffe220ea91b255ff1c25f0c9c85902e0eabb..9a3ccd1fd861c12d96b04b832811422a86fe3eb6 100644 --- a/pkgs/development/compilers/mono/4.4.nix +++ b/pkgs/development/compilers/mono/4.4.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, Foundation, libobjc }: +{ callPackage, Foundation, libobjc }: callPackage ./generic.nix (rec { inherit Foundation libobjc; diff --git a/pkgs/development/compilers/mono/4.6.nix b/pkgs/development/compilers/mono/4.6.nix index 7c9918cdd397496b9012223f79e49d800344682e..2bba660b69cd69e9b18ded92bc28af5a1cdccca0 100644 --- a/pkgs/development/compilers/mono/4.6.nix +++ b/pkgs/development/compilers/mono/4.6.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, Foundation, libobjc }: +{ callPackage, Foundation, libobjc }: callPackage ./generic.nix (rec { inherit Foundation libobjc; diff --git a/pkgs/development/compilers/mono/4.8.nix b/pkgs/development/compilers/mono/4.8.nix index c3ba316cd13bb0b7a62ce90c5717bf9181ae5b5f..f445127c0da8575401a0a3ee24435e1254e99a72 100644 --- a/pkgs/development/compilers/mono/4.8.nix +++ b/pkgs/development/compilers/mono/4.8.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, Foundation, libobjc }: +{ callPackage, Foundation, libobjc }: callPackage ./generic-cmake.nix (rec { inherit Foundation libobjc; diff --git a/pkgs/development/compilers/mono/5.0.nix b/pkgs/development/compilers/mono/5.0.nix index d10d6e3e60532fa89a5b12a3bf8fac7b1ec149fb..53820c97b1b03f9345251dd8ce0ed083a9d3bb3a 100644 --- a/pkgs/development/compilers/mono/5.0.nix +++ b/pkgs/development/compilers/mono/5.0.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, Foundation, libobjc }: +{ callPackage, Foundation, libobjc }: callPackage ./generic-cmake.nix (rec { inherit Foundation libobjc; diff --git a/pkgs/development/compilers/mono/5.4.nix b/pkgs/development/compilers/mono/5.4.nix index 31e86f94c0a262916d9a9cd69705dd34c5fbd448..acebb4beef6a3004cb4b567bab51201e361b7288 100644 --- a/pkgs/development/compilers/mono/5.4.nix +++ b/pkgs/development/compilers/mono/5.4.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, Foundation, libobjc }: +{ callPackage, Foundation, libobjc }: callPackage ./generic-cmake.nix (rec { inherit Foundation libobjc; diff --git a/pkgs/development/compilers/mono/5.8.nix b/pkgs/development/compilers/mono/5.8.nix index 6db9e19807bbcfa27512821079f3228cd7bfb7c7..7b5008fd04c2e9da6add9552026c5a092d556c52 100644 --- a/pkgs/development/compilers/mono/5.8.nix +++ b/pkgs/development/compilers/mono/5.8.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, Foundation, libobjc }: +{ callPackage, Foundation, libobjc }: callPackage ./generic-cmake.nix (rec { inherit Foundation libobjc; diff --git a/pkgs/development/compilers/nvidia-cg-toolkit/default.nix b/pkgs/development/compilers/nvidia-cg-toolkit/default.nix index 9eec23f1ba88fbc4185f8879f249288cde32fe26..21ccf77e4a24ac832be5ab1abe1ef8f05db7fda6 100644 --- a/pkgs/development/compilers/nvidia-cg-toolkit/default.nix +++ b/pkgs/development/compilers/nvidia-cg-toolkit/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, patchelf }: +{ lib, stdenv, fetchurl }: assert stdenv ? glibc; diff --git a/pkgs/development/compilers/obliv-c/default.nix b/pkgs/development/compilers/obliv-c/default.nix index 774cefb794041fbc07730f1a4fc03dab951088a5..f5bd3430ae707ea9f38c5d4b722cffcadcc46be8 100644 --- a/pkgs/development/compilers/obliv-c/default.nix +++ b/pkgs/development/compilers/obliv-c/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libgcrypt, fetchFromGitHub, ocamlPackages, perl }: +{ stdenv, libgcrypt, fetchFromGitHub, ocamlPackages, perl }: stdenv.mkDerivation rec { name = "obliv-c-${version}"; version = "0.0pre20170827"; diff --git a/pkgs/development/compilers/openjdk/10.nix b/pkgs/development/compilers/openjdk/10.nix index 7ed493fe92e96683eba644f1243a572540e0ba3f..6e8d9003bf431810571bcedbe400c49cd6c0b027 100644 --- a/pkgs/development/compilers/openjdk/10.nix +++ b/pkgs/development/compilers/openjdk/10.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, bash, cpio, pkgconfig, file, which, unzip, zip, cups, freetype -, alsaLib, bootjdk, cacert, perl, liberation_ttf, fontconfig, zlib, lndir +, alsaLib, bootjdk, perl, liberation_ttf, fontconfig, zlib, lndir , libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama, libXcursor, libXrandr , libjpeg, giflib , setJavaClassPath diff --git a/pkgs/development/compilers/openjdk/bootstrap.nix b/pkgs/development/compilers/openjdk/bootstrap.nix index 3c29df7ec78e8c9471522da098b33568fe71f3bc..612f0db058215b27b91ad0cb787ad2aec989df41 100644 --- a/pkgs/development/compilers/openjdk/bootstrap.nix +++ b/pkgs/development/compilers/openjdk/bootstrap.nix @@ -1,5 +1,5 @@ { stdenv -, runCommand, fetchurl, file, zlib +, runCommand, fetchurl, zlib , version }: diff --git a/pkgs/development/compilers/oraclejdk/jdk10-linux.nix b/pkgs/development/compilers/oraclejdk/jdk10-linux.nix index e6e868fdf41b9c4e001b1f486ca92f80e9b3d92e..de063500b709672c043ff8ff23ee65851c7aec32 100644 --- a/pkgs/development/compilers/oraclejdk/jdk10-linux.nix +++ b/pkgs/development/compilers/oraclejdk/jdk10-linux.nix @@ -2,11 +2,9 @@ , stdenv , requireFile , makeWrapper -, unzip , file , xorg ? null , packageType ? "JDK" # JDK, JRE, or ServerJRE -, pluginSupport ? true , glib , libxml2 , ffmpeg_2 diff --git a/pkgs/development/compilers/pakcs/default.nix b/pkgs/development/compilers/pakcs/default.nix index 94b89cf3a952ab97eea6804847991c6f52d1f4ab..603882653480332e815c25f9b549869d941a673b 100644 --- a/pkgs/development/compilers/pakcs/default.nix +++ b/pkgs/development/compilers/pakcs/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { curryBase = haskellPackages.callPackage ( { mkDerivation, base, Cabal, containers, directory, either - , filepath, mtl, pretty, stdenv, syb, time + , filepath, mtl, pretty, syb, time }: mkDerivation { pname = "curry-base"; @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { curryFront = haskellPackages.callPackage ( { mkDerivation, base, Cabal, containers, directory - , filepath, mtl, network-uri, process, stdenv, syb, transformers + , filepath, mtl, network-uri, process, syb, transformers }: mkDerivation { pname = "curry-frontend"; diff --git a/pkgs/development/compilers/rust/binaryBuild.nix b/pkgs/development/compilers/rust/binaryBuild.nix index 4c3c5d008f0616d3cc67e630dcafe8b229dda3b8..3cf6d4efe2d5d34e17d74dea392ca08dadc74b5f 100644 --- a/pkgs/development/compilers/rust/binaryBuild.nix +++ b/pkgs/development/compilers/rust/binaryBuild.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, bash, cacert, zlib, buildRustPackage, curl, darwin +{ stdenv, makeWrapper, bash, buildRustPackage, curl, darwin , version , src , platform diff --git a/pkgs/development/compilers/rust/cargo.nix b/pkgs/development/compilers/rust/cargo.nix index 46caabf33917c515f3b1191ac94b8ad2a5118da2..2ff3257c7fb73192fb3706a6416f094bc2a92115 100644 --- a/pkgs/development/compilers/rust/cargo.nix +++ b/pkgs/development/compilers/rust/cargo.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, file, curl, pkgconfig, python, openssl, cmake, zlib +{ stdenv, file, curl, pkgconfig, python, openssl, cmake, zlib , makeWrapper, libiconv, cacert, rustPlatform, rustc, libgit2, darwin , version , patches ? [] diff --git a/pkgs/development/compilers/souffle/default.nix b/pkgs/development/compilers/souffle/default.nix index 099a591b407decbe8b6712d8f4f9cd7c3516628a..0523e099e497383540d3f8adc454455b6307b63c 100644 --- a/pkgs/development/compilers/souffle/default.nix +++ b/pkgs/development/compilers/souffle/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub , boost, bison, flex, openjdk, doxygen -, perl, graphviz, libtool, ncurses, zlib, sqlite +, perl, graphviz, ncurses, zlib, sqlite , autoreconfHook }: stdenv.mkDerivation rec { diff --git a/pkgs/development/compilers/swift/default.nix b/pkgs/development/compilers/swift/default.nix index abbfdd2abb72e4e26944f716a3f0ba99724b3929..9c1a36585907bfe4d8032b7886b672b3ae674543 100644 --- a/pkgs/development/compilers/swift/default.nix +++ b/pkgs/development/compilers/swift/default.nix @@ -27,7 +27,6 @@ , git , libgit2 , fetchFromGitHub -, fetchpatch , paxctl , findutils , makeWrapper diff --git a/pkgs/development/compilers/urweb/default.nix b/pkgs/development/compilers/urweb/default.nix index f2b6016ceb70e09e480c69d38e3ace6290e447db..8426635ce962b2882155acf1459c54bcba993a4c 100644 --- a/pkgs/development/compilers/urweb/default.nix +++ b/pkgs/development/compilers/urweb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, file, openssl, mlton +{ stdenv, fetchurl, file, openssl, mlton , mysql, postgresql, sqlite, gcc }: diff --git a/pkgs/development/coq-modules/mathcomp/generic.nix b/pkgs/development/coq-modules/mathcomp/generic.nix index 1cc5dc368da3ec2bd3c6adb9b3bbd161f9ee6b8d..22721ca98bc2f5901bbabb0caba2cdffc084cc09 100644 --- a/pkgs/development/coq-modules/mathcomp/generic.nix +++ b/pkgs/development/coq-modules/mathcomp/generic.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, coq, ncurses, which +{ stdenv, coq, ncurses, which , graphviz, withDoc ? false , src, name }: diff --git a/pkgs/development/coq-modules/ssreflect/generic.nix b/pkgs/development/coq-modules/ssreflect/generic.nix index a44e81d3c19cac2c86f52474506ac0745ac3967d..d09e47a7f8456f3738e06f6a53f36c3d6ff4f47b 100644 --- a/pkgs/development/coq-modules/ssreflect/generic.nix +++ b/pkgs/development/coq-modules/ssreflect/generic.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, coq, ncurses, which +{ stdenv, coq, ncurses, which , graphviz, withDoc ? false , src, name, patches ? [] }: diff --git a/pkgs/development/idris-modules/build-builtin-package.nix b/pkgs/development/idris-modules/build-builtin-package.nix index 1cd687058b3a4c746b3944090c435e2387f35396..ff19e52135c806397ccb1a872f86030d89894ec7 100644 --- a/pkgs/development/idris-modules/build-builtin-package.nix +++ b/pkgs/development/idris-modules/build-builtin-package.nix @@ -1,7 +1,7 @@ # Build one of the packages that comes with idris # name: The name of the package # deps: The dependencies of the package -{ idris, build-idris-package, lib }: name: deps: +{ idris, build-idris-package }: name: deps: let inherit (builtins.parseDrvName idris.name) version; in diff --git a/pkgs/development/interpreters/erlang/R19.nix b/pkgs/development/interpreters/erlang/R19.nix index d0ba1912e9a4c3ae749b09abf2f3a9b1a8dea22f..d94d4a5a14d09e41d25961801c6ab5aaa46762e6 100644 --- a/pkgs/development/interpreters/erlang/R19.nix +++ b/pkgs/development/interpreters/erlang/R19.nix @@ -1,4 +1,4 @@ -{ mkDerivation, fetchurl, fetchpatch }: +{ mkDerivation, fetchpatch }: mkDerivation rec { version = "19.3.6.6"; diff --git a/pkgs/development/interpreters/erlang/R20.nix b/pkgs/development/interpreters/erlang/R20.nix index 5cea1fd533f2de9b003d59cfa02583fdea890e9c..19ac6d3559265bd219288e122aa058239e316645 100644 --- a/pkgs/development/interpreters/erlang/R20.nix +++ b/pkgs/development/interpreters/erlang/R20.nix @@ -1,4 +1,4 @@ -{ mkDerivation, fetchurl }: +{ mkDerivation }: mkDerivation rec { version = "20.3.8"; diff --git a/pkgs/development/interpreters/erlang/R21.nix b/pkgs/development/interpreters/erlang/R21.nix index de00ebdf2cb064246535100c8b1af7cbbe76dbcf..e9aa2a3dc426b09c054853cbee9be4d077b00e3e 100644 --- a/pkgs/development/interpreters/erlang/R21.nix +++ b/pkgs/development/interpreters/erlang/R21.nix @@ -1,4 +1,4 @@ -{ mkDerivation, fetchurl }: +{ mkDerivation }: mkDerivation rec { version = "21.0"; diff --git a/pkgs/development/interpreters/erlang/generic-builder.nix b/pkgs/development/interpreters/erlang/generic-builder.nix index 6ea3ac73a4b11a5add71d13f5a8ec3681b5f4dea..ba0a00b30376afd50c176ea254fd65a2d7470879 100644 --- a/pkgs/development/interpreters/erlang/generic-builder.nix +++ b/pkgs/development/interpreters/erlang/generic-builder.nix @@ -1,4 +1,4 @@ -{ pkgs, stdenv, fetchurl, fetchFromGitHub, makeWrapper, gawk, gnum4, gnused +{ pkgs, stdenv, fetchFromGitHub, makeWrapper, gawk, gnum4, gnused , libxml2, libxslt, ncurses, openssl, perl, autoreconfHook , openjdk ? null # javacSupport , unixODBC ? null # odbcSupport diff --git a/pkgs/development/interpreters/guile/2.0.nix b/pkgs/development/interpreters/guile/2.0.nix index b0eeb89ce431fd762c73078bb6161b06c03c2951..848b8666f27de6f96fd29dc8550592bfe4e43145 100644 --- a/pkgs/development/interpreters/guile/2.0.nix +++ b/pkgs/development/interpreters/guile/2.0.nix @@ -2,7 +2,7 @@ , buildPlatform, hostPlatform , fetchpatch, fetchurl, makeWrapper, gawk, pkgconfig , libffi, libtool, readline, gmp, boehmgc, libunistring -, coverageAnalysis ? null, gnu ? null +, coverageAnalysis ? null }: # Do either a coverage analysis build or a standard build. diff --git a/pkgs/development/interpreters/guile/default.nix b/pkgs/development/interpreters/guile/default.nix index 196c899fcea99098f58a5b4d370f2e28aa86a6e0..8110598e17304b99c2a43c3a184ce3afe9fbbe5e 100644 --- a/pkgs/development/interpreters/guile/default.nix +++ b/pkgs/development/interpreters/guile/default.nix @@ -2,7 +2,7 @@ , buildPlatform, hostPlatform , fetchurl, makeWrapper, gawk, pkgconfig , libffi, libtool, readline, gmp, boehmgc, libunistring -, coverageAnalysis ? null, gnu ? null +, coverageAnalysis ? null }: # Do either a coverage analysis build or a standard build. diff --git a/pkgs/development/interpreters/lua-5/5.1.nix b/pkgs/development/interpreters/lua-5/5.1.nix index 271490c995745a4778734e4de1310ea77fc42faf..09af492490cf20555e30cdeb2712669a10a3216f 100644 --- a/pkgs/development/interpreters/lua-5/5.1.nix +++ b/pkgs/development/interpreters/lua-5/5.1.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, readline }: +{ stdenv, fetchurl, readline }: let dsoPatch = fetchurl { diff --git a/pkgs/development/interpreters/lua-5/5.2.nix b/pkgs/development/interpreters/lua-5/5.2.nix index 6221bf3fb8433aa928edbb47b7480b899377fb84..6d8de7bae27eebd26529313cdd1eed9bbb197178 100644 --- a/pkgs/development/interpreters/lua-5/5.2.nix +++ b/pkgs/development/interpreters/lua-5/5.2.nix @@ -1,6 +1,4 @@ -{ stdenv, fetchurl, readline, compat ? false -, hostPlatform -}: +{ stdenv, fetchurl, readline, compat ? false }: let dsoPatch = fetchurl { diff --git a/pkgs/development/interpreters/lua-5/5.3.nix b/pkgs/development/interpreters/lua-5/5.3.nix index 5a4893db0637552bd50ab4c060c3e0ce2f9b7cff..2c4f3657aac2dd040bbc48b0784ec8a38d56c1e5 100644 --- a/pkgs/development/interpreters/lua-5/5.3.nix +++ b/pkgs/development/interpreters/lua-5/5.3.nix @@ -1,6 +1,4 @@ -{ stdenv, fetchurl, readline, compat ? false -, hostPlatform -}: +{ stdenv, fetchurl, readline, compat ? false }: stdenv.mkDerivation rec { name = "lua-${version}"; diff --git a/pkgs/development/interpreters/luajit/default.nix b/pkgs/development/interpreters/luajit/default.nix index 73b979e9ca4fa5cc85e3a1677cc85ebf6fc1513b..9ee628f498ee6a9f0695c3ab5ab14452b14e238a 100644 --- a/pkgs/development/interpreters/luajit/default.nix +++ b/pkgs/development/interpreters/luajit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, hostPlatform }: +{ stdenv, lib, fetchurl }: rec { luajit = luajit_2_1; diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix index 08672d28a1f85d42f3de39b310c71c1939782c4e..40a70623dcb7e2c49b7ea0e4ee319032792e516c 100644 --- a/pkgs/development/interpreters/perl/default.nix +++ b/pkgs/development/interpreters/perl/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurlBoot, buildPackages -, enableThreading ? stdenv ? glibc, fetchpatch, makeWrapper +, enableThreading ? stdenv ? glibc, makeWrapper }: with lib; diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 3032b5e4c2a122cb65ef2e3f57eaf6d72b143123..52a3c64f81caf1e229fd7d6a5a9b01c016b42277 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -1,6 +1,6 @@ # pcre functionality is tested in nixos/tests/php-pcre.nix -{ lib, stdenv, fetchurl, composableDerivation, autoconf, automake, flex, bison +{ lib, stdenv, fetchurl, composableDerivation, flex, bison , mysql, libxml2, readline, zlib, curl, postgresql, gettext , openssl, pcre, pkgconfig, sqlite, config, libjpeg, libpng, freetype , libxslt, libmcrypt, bzip2, icu, openldap, cyrus_sasl, libmhash, freetds diff --git a/pkgs/development/interpreters/pyrex/0.9.5.nix b/pkgs/development/interpreters/pyrex/0.9.5.nix index 18bc875fb334d0fcd8d4ade158c026c663a75cb8..be11b38a0b83a24eed162b363a3c16dd215be5b7 100644 --- a/pkgs/development/interpreters/pyrex/0.9.5.nix +++ b/pkgs/development/interpreters/pyrex/0.9.5.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python2Packages }: +{ fetchurl, python2Packages }: let version = "0.9.5.1.1"; in diff --git a/pkgs/development/interpreters/pyrex/0.9.6.nix b/pkgs/development/interpreters/pyrex/0.9.6.nix index 2feb15b647dad75d96ddbcc8ca1c911de51ce62a..2a18dbff9e6eb523b21b75afe9ab21654231ca22 100644 --- a/pkgs/development/interpreters/pyrex/0.9.6.nix +++ b/pkgs/development/interpreters/pyrex/0.9.6.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python2Packages }: +{ fetchurl, python2Packages }: let version = "0.9.6.4"; in diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix index d37f59250d55684b822b67757acb977e3f6f0a13..fd84d924d7b80efc7c377376c66fa430d4596a32 100644 --- a/pkgs/development/interpreters/python/cpython/2.7/default.nix +++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix @@ -10,7 +10,6 @@ , zlib , callPackage , self -, gettext , db , expat , libffi @@ -19,7 +18,7 @@ # Some proprietary libs assume UCS2 unicode, especially on darwin :( , ucsEncoding ? 4 # For the Python package set -, pkgs, packageOverrides ? (self: super: {}) +, packageOverrides ? (self: super: {}) }: assert x11Support -> tcl != null diff --git a/pkgs/development/interpreters/python/cpython/3.4/default.nix b/pkgs/development/interpreters/python/cpython/3.4/default.nix index a8b6ffd1da91553ca2893ee61d1e7425795e31da..7e583087c083f3e1665f0fe8af1fc1f55bfd0c27 100644 --- a/pkgs/development/interpreters/python/cpython/3.4/default.nix +++ b/pkgs/development/interpreters/python/cpython/3.4/default.nix @@ -15,7 +15,7 @@ , CF, configd , python-setup-hook # For the Python package set -, pkgs, packageOverrides ? (self: super: {}) +, packageOverrides ? (self: super: {}) }: assert x11Support -> tcl != null diff --git a/pkgs/development/interpreters/python/cpython/3.5/default.nix b/pkgs/development/interpreters/python/cpython/3.5/default.nix index 2bbdb8bdd840d0bfed3b0841dc8cf6c893e90826..588880c1e82e52d9c2f0f340cc5299410ae0f4d6 100644 --- a/pkgs/development/interpreters/python/cpython/3.5/default.nix +++ b/pkgs/development/interpreters/python/cpython/3.5/default.nix @@ -15,7 +15,7 @@ , CF, configd , python-setup-hook # For the Python package set -, pkgs, packageOverrides ? (self: super: {}) +, packageOverrides ? (self: super: {}) }: assert x11Support -> tcl != null diff --git a/pkgs/development/interpreters/python/cpython/3.6/default.nix b/pkgs/development/interpreters/python/cpython/3.6/default.nix index f8628186d7992956816d92093a282eacf0229e1f..6b9e26e99fcd803d2e71ebe2d4b48abd87b0fc19 100644 --- a/pkgs/development/interpreters/python/cpython/3.6/default.nix +++ b/pkgs/development/interpreters/python/cpython/3.6/default.nix @@ -1,5 +1,4 @@ { stdenv, fetchurl, fetchpatch, buildPackages -, glibc , bzip2 , expat , libffi @@ -16,7 +15,7 @@ , CF, configd , python-setup-hook # For the Python package set -, pkgs, packageOverrides ? (self: super: {}) +, packageOverrides ? (self: super: {}) }: assert x11Support -> tcl != null diff --git a/pkgs/development/interpreters/python/cpython/3.7/default.nix b/pkgs/development/interpreters/python/cpython/3.7/default.nix index e0cc198c096ebb4078a80b0ae0dce36e84dd1c75..adee8d594f18be579a08c35dd44ce8592c47971e 100644 --- a/pkgs/development/interpreters/python/cpython/3.7/default.nix +++ b/pkgs/development/interpreters/python/cpython/3.7/default.nix @@ -1,5 +1,4 @@ { stdenv, fetchurl, fetchpatch -, glibc , bzip2 , expat , libffi @@ -16,7 +15,7 @@ , CF, configd , python-setup-hook # For the Python package set -, pkgs, packageOverrides ? (self: super: {}) +, packageOverrides ? (self: super: {}) }: assert x11Support -> tcl != null diff --git a/pkgs/development/interpreters/python/pypy/2.7/default.nix b/pkgs/development/interpreters/python/pypy/2.7/default.nix index e68cfc3148ffdf279474f0e885f7d2e99cebbfaf..95a893a209c12382e96d5a4bf99fae06b9384cc2 100644 --- a/pkgs/development/interpreters/python/pypy/2.7/default.nix +++ b/pkgs/development/interpreters/python/pypy/2.7/default.nix @@ -4,7 +4,7 @@ , makeWrapper, callPackage, self, gdbm, db , python-setup-hook # For the Python package set -, pkgs, packageOverrides ? (self: super: {}) +, packageOverrides ? (self: super: {}) }: assert zlibSupport -> zlib != null; diff --git a/pkgs/development/interpreters/rebol/default.nix b/pkgs/development/interpreters/rebol/default.nix index 8a13c4efce611bb587ae6cc4ec2f3a247c8f86b6..4d98f18eee4a7e108965ab821d7f365e6fbd07d5 100644 --- a/pkgs/development/interpreters/rebol/default.nix +++ b/pkgs/development/interpreters/rebol/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchurl, patchelf, glibc, libX11, libXt, perl }: +{ stdenv, fetchFromGitHub, fetchurl, glibc, libX11, libXt, perl }: stdenv.mkDerivation rec { name = "rebol-nightly-${version}"; diff --git a/pkgs/development/interpreters/self/default.nix b/pkgs/development/interpreters/self/default.nix index 31ef51802ed61dc0e67e0263648d290bde787350..594bbc05b7ceb632823875cc018785332be2cd11 100644 --- a/pkgs/development/interpreters/self/default.nix +++ b/pkgs/development/interpreters/self/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, fetchgit, stdenv, xorg, makeWrapper, ncurses, cmake }: +{ fetchgit, stdenv, xorg, makeWrapper, ncurses, cmake }: stdenv.mkDerivation rec { # The Self wrapper stores source in $XDG_DATA_HOME/self or ~/.local/share/self diff --git a/pkgs/development/interpreters/tcl/generic.nix b/pkgs/development/interpreters/tcl/generic.nix index 3bf4ba2dc2f0191ff88f07650258f92fff023cfe..a472ccaafbf2dc404fd254148cdfe1dfb8e2ed73 100644 --- a/pkgs/development/interpreters/tcl/generic.nix +++ b/pkgs/development/interpreters/tcl/generic.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ stdenv # Version specific stuff , release, version, src diff --git a/pkgs/development/interpreters/unicon-lang/default.nix b/pkgs/development/interpreters/unicon-lang/default.nix index a6dfec49b2a258275b239d9a381d707f53cccbb7..77154b54fd8feb515ce78f96bde935c8ceb91db0 100644 --- a/pkgs/development/interpreters/unicon-lang/default.nix +++ b/pkgs/development/interpreters/unicon-lang/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, gdbm, libX11, libXt }: +{ stdenv, fetchurl, unzip, libX11, libXt }: stdenv.mkDerivation rec { name = "unicon-lang-${version}"; diff --git a/pkgs/development/java-modules/jogl/default.nix b/pkgs/development/java-modules/jogl/default.nix index cceec44e6ae60252a5cab0f115533aa1cd311b48..a3c3b2bf96f68acdc6b570c8bc110f1d83270f19 100644 --- a/pkgs/development/java-modules/jogl/default.nix +++ b/pkgs/development/java-modules/jogl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, makeWrapper, ant, jdk, openjdk8, zulu8, git, xorg, udev, libGL, libGLU }: +{ stdenv, fetchgit, ant, jdk, openjdk8, zulu8, git, xorg, udev, libGL, libGLU }: let # workaround https://github.com/NixOS/nixpkgs/issues/37364 diff --git a/pkgs/development/java-modules/maven-minimal.nix b/pkgs/development/java-modules/maven-minimal.nix index df87f51768df5d53c80366a2565c1d79c2d6309b..ca7cc7027be7110a542d9e7fb87bd013df060b4e 100644 --- a/pkgs/development/java-modules/maven-minimal.nix +++ b/pkgs/development/java-modules/maven-minimal.nix @@ -6,7 +6,7 @@ with pkgs.javaPackages; let collections = import ./collections.nix { inherit pkgs; }; fetchMaven = pkgs.callPackage ./m2install.nix { }; - plugins = import ./mavenPlugins.nix { inherit stdenv pkgs maven; }; + plugins = import ./mavenPlugins.nix { inherit pkgs; }; poms = import ./poms.nix { inherit fetchMaven; }; in rec { # Maven needs all of these to function diff --git a/pkgs/development/java-modules/mavenPlugins.nix b/pkgs/development/java-modules/mavenPlugins.nix index e9ce5b1ce8cf8edce2451fd69240ac221d106af0..8cc79dc1d228aa6f3b869e9f439135d3e6013047 100644 --- a/pkgs/development/java-modules/mavenPlugins.nix +++ b/pkgs/development/java-modules/mavenPlugins.nix @@ -1,4 +1,4 @@ -{ pkgs, stdenv, maven }: +{ pkgs }: with pkgs; with pkgs.javaPackages; diff --git a/pkgs/development/libraries/arguments/default.nix b/pkgs/development/libraries/arguments/default.nix index 912ea53c3d3ac8e321bd6eb7b0f6ed42ed372270..60fafd60ad0b65ccfc2cb6a995523b089ccf9f51 100644 --- a/pkgs/development/libraries/arguments/default.nix +++ b/pkgs/development/libraries/arguments/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, libminc, bicpl }: +{ stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "arguments"; diff --git a/pkgs/development/libraries/assimp/default.nix b/pkgs/development/libraries/assimp/default.nix index 219c8df803b762d7679e67571c424c29155f8b80..24e06b0d65a9a0cd652bbe38de36581b1aae8750 100644 --- a/pkgs/development/libraries/assimp/default.nix +++ b/pkgs/development/libraries/assimp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, unzip, cmake, boost, zlib }: +{ stdenv, fetchFromGitHub, cmake, boost, zlib }: stdenv.mkDerivation rec { name = "assimp-${version}"; diff --git a/pkgs/development/libraries/audio/libbass/default.nix b/pkgs/development/libraries/audio/libbass/default.nix index 703679ba3a55a5d361d888c5cb5696f2fb10992b..ec93e2f64671f42dfa7befd1df98b2ca175fe5d0 100644 --- a/pkgs/development/libraries/audio/libbass/default.nix +++ b/pkgs/development/libraries/audio/libbass/default.nix @@ -1,4 +1,4 @@ -{ stdenv, unzip, fetchurl, writeText }: +{ stdenv, unzip, fetchurl }: let version = "24"; diff --git a/pkgs/development/libraries/avro-c/default.nix b/pkgs/development/libraries/avro-c/default.nix index 8b787855c4deee18be700508a95ad94552253c07..580cd1bd73f5bc884424532a7c6d56b717dd74c1 100644 --- a/pkgs/development/libraries/avro-c/default.nix +++ b/pkgs/development/libraries/avro-c/default.nix @@ -1,4 +1,4 @@ -{ stdenv, bash, cmake, fetchurl, pkgconfig, jansson, zlib }: +{ stdenv, cmake, fetchurl, pkgconfig, jansson, zlib }: let version = "1.8.2"; diff --git a/pkgs/development/libraries/belcard/default.nix b/pkgs/development/libraries/belcard/default.nix index 8805dc74a26c30accff751400d84a74d2777bbd5..093bb811489fcd4fe0ad94fe566bb045ae6b6248 100644 --- a/pkgs/development/libraries/belcard/default.nix +++ b/pkgs/development/libraries/belcard/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, fetchFromGitHub, bctoolbox, belr }: +{ stdenv, cmake, fetchFromGitHub, bctoolbox, belr }: stdenv.mkDerivation rec { baseName = "belcard"; diff --git a/pkgs/development/libraries/belle-sip/default.nix b/pkgs/development/libraries/belle-sip/default.nix index 003fce0ea8c31d7397986873e9fe6fcb8047fedc..09ca4908d7891d6e74d44311815ed41e5045a9ca 100644 --- a/pkgs/development/libraries/belle-sip/default.nix +++ b/pkgs/development/libraries/belle-sip/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, antlr3_4, libantlr3c, jre, polarssl, fetchFromGitHub +{ stdenv, antlr3_4, libantlr3c, jre, polarssl, fetchFromGitHub , cmake, zlib, bctoolbox }: diff --git a/pkgs/development/libraries/belr/default.nix b/pkgs/development/libraries/belr/default.nix index 214abb21f2cda16d44e4e0a055b6be67c6f55067..736c9a2f9e0cef2393b04b012d0ef71201566130 100644 --- a/pkgs/development/libraries/belr/default.nix +++ b/pkgs/development/libraries/belr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, fetchFromGitHub, bctoolbox }: +{ stdenv, cmake, fetchFromGitHub, bctoolbox }: stdenv.mkDerivation rec { baseName = "belr"; diff --git a/pkgs/development/libraries/bzrtp/default.nix b/pkgs/development/libraries/bzrtp/default.nix index cdc660ca3f3261855ab6c557db070a4acb812f9a..11b94a0181a19a4f2074d8b67fc72b20edb513d9 100644 --- a/pkgs/development/libraries/bzrtp/default.nix +++ b/pkgs/development/libraries/bzrtp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, fetchFromGitHub, bctoolbox, sqlite }: +{ stdenv, cmake, fetchFromGitHub, bctoolbox, sqlite }: stdenv.mkDerivation rec { baseName = "bzrtp"; diff --git a/pkgs/development/libraries/caf/default.nix b/pkgs/development/libraries/caf/default.nix index 1e764aff4cc1f10caaec15ab05e9e35593ec64b0..397e80961e064b6bd4b9bd64a050219f7505076a 100644 --- a/pkgs/development/libraries/caf/default.nix +++ b/pkgs/development/libraries/caf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, cmake }: +{ stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { name = "actor-framework-${version}"; diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix index 4486149cfcef3a2abcc87d56e5000afd04199923..db46412ceb554006b6e5f7227cb218c97e655d6e 100644 --- a/pkgs/development/libraries/cairo/default.nix +++ b/pkgs/development/libraries/cairo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchFromGitHub, fetchpatch, pkgconfig, libiconv +{ stdenv, fetchurl, pkgconfig, libiconv , libintl, expat, zlib, libpng, pixman, fontconfig, freetype, xorg , gobjectSupport ? true, glib , xcbSupport ? true # no longer experimental since 1.12 diff --git a/pkgs/development/libraries/cairomm/default.nix b/pkgs/development/libraries/cairomm/default.nix index 47250f2b3da281620fd77a268fe86bee3dda82d5..a4e4968f562f7bd322a85856147d93c85ce10b58 100644 --- a/pkgs/development/libraries/cairomm/default.nix +++ b/pkgs/development/libraries/cairomm/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkgconfig, darwin, cairo, xlibsWrapper, fontconfig, freetype, libsigcxx }: +{ fetchurl, stdenv, pkgconfig, darwin, cairo, fontconfig, freetype, libsigcxx }: let ver_maj = "1.12"; ver_min = "2"; diff --git a/pkgs/development/libraries/capstone/default.nix b/pkgs/development/libraries/capstone/default.nix index 64e3690eb3e64d38b797046c53d5f24b81676ae7..0fc0dfb07066f234df3a71cfc58160a2879f2b98 100644 --- a/pkgs/development/libraries/capstone/default.nix +++ b/pkgs/development/libraries/capstone/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, bash, pkgconfig }: +{ stdenv, fetchurl, pkgconfig }: stdenv.mkDerivation rec { name = "capstone-${version}"; diff --git a/pkgs/development/libraries/cl/default.nix b/pkgs/development/libraries/cl/default.nix index 7c44c2e0ab0cf017e46002dedb8cc63beb11ea4f..7cb75d8de0f39fd3d63ea573298b1876706c9861 100644 --- a/pkgs/development/libraries/cl/default.nix +++ b/pkgs/development/libraries/cl/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, SDL, libGLU_combined, rebar, erlang, opencl-headers, ocl-icd }: +{stdenv, fetchFromGitHub, rebar, erlang, opencl-headers, ocl-icd }: stdenv.mkDerivation rec { version = "1.2.3"; diff --git a/pkgs/development/libraries/clutter/default.nix b/pkgs/development/libraries/clutter/default.nix index eba94288e8fe079b39a25f34a9654fb899711205..705aa7252d1f720e03d746c9bd48b3da67c6c095 100644 --- a/pkgs/development/libraries/clutter/default.nix +++ b/pkgs/development/libraries/clutter/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, glib, pkgconfig, libGLU_combined, libX11, libXext, libXfixes +{ stdenv, fetchurl, pkgconfig, libGLU_combined, libX11, libXext, libXfixes , libXdamage, libXcomposite, libXi, libxcb, cogl, pango, atk, json-glib, gobjectIntrospection, gtk3, gnome3 }: diff --git a/pkgs/development/libraries/crypto++/default.nix b/pkgs/development/libraries/crypto++/default.nix index c1bf789c59bd728053305664140355f431f3ed59..ba5b2aa43718a1db7ece74c2f48a3e1d36822247 100644 --- a/pkgs/development/libraries/crypto++/default.nix +++ b/pkgs/development/libraries/crypto++/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, fetchFromGitHub, stdenv }: +{ fetchFromGitHub, stdenv }: stdenv.mkDerivation rec { name = "crypto++-${version}"; diff --git a/pkgs/development/libraries/db/generic.nix b/pkgs/development/libraries/db/generic.nix index fb12921817566545a40deb51bc1196ac41167d5e..c3ca9aa442bd2689247700d5f6d169828fca52c0 100644 --- a/pkgs/development/libraries/db/generic.nix +++ b/pkgs/development/libraries/db/generic.nix @@ -5,7 +5,7 @@ # Options from inherited versions , version, sha256 -, patchSrc ? "src", extraPatches ? [ ] +, extraPatches ? [ ] , license ? stdenv.lib.licenses.sleepycat , drvArgs ? {} }: diff --git a/pkgs/development/libraries/dbus-sharp/dbus-sharp-1.0.nix b/pkgs/development/libraries/dbus-sharp/dbus-sharp-1.0.nix index c17a140b9c570c757987be103b7c9a375c2c7329..013913e52972560181a4da6531ccb0bedd2ac973 100644 --- a/pkgs/development/libraries/dbus-sharp/dbus-sharp-1.0.nix +++ b/pkgs/development/libraries/dbus-sharp/dbus-sharp-1.0.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, pkgconfig, dbus, mono, autoreconfHook }: +{stdenv, fetchFromGitHub, pkgconfig, mono, autoreconfHook }: stdenv.mkDerivation rec { name = "dbus-sharp-${version}"; diff --git a/pkgs/development/libraries/dbus-sharp/default.nix b/pkgs/development/libraries/dbus-sharp/default.nix index ea7d920dc82833878c77b899c924df082f1eecbd..40c633dda523cd8f48dca4d73239dcbbff104c90 100644 --- a/pkgs/development/libraries/dbus-sharp/default.nix +++ b/pkgs/development/libraries/dbus-sharp/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, pkgconfig, dbus, mono, autoreconfHook }: +{stdenv, fetchFromGitHub, pkgconfig, mono, autoreconfHook }: stdenv.mkDerivation rec { name = "dbus-sharp-${version}"; diff --git a/pkgs/development/libraries/eclib/default.nix b/pkgs/development/libraries/eclib/default.nix index e4d1fa2073fab1fc66f92ce4485e3d100f586ad1..62014489f30c03cd2e8001b7139d410622e15f31 100644 --- a/pkgs/development/libraries/eclib/default.nix +++ b/pkgs/development/libraries/eclib/default.nix @@ -2,8 +2,6 @@ , fetchFromGitHub , fetchpatch , autoreconfHook -, libtool -, gettext , pari , ntl , gmp diff --git a/pkgs/development/libraries/expat/default.nix b/pkgs/development/libraries/expat/default.nix index e341ce842eb66f2f44e8cc3ca32e2d87814a72c3..79b29a90463eef341990f8c24e13cff64c9b91d0 100644 --- a/pkgs/development/libraries/expat/default.nix +++ b/pkgs/development/libraries/expat/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchpatch, fetchurl }: +{ stdenv, fetchurl }: stdenv.mkDerivation rec { name = "expat-2.2.5"; diff --git a/pkgs/development/libraries/faac/default.nix b/pkgs/development/libraries/faac/default.nix index 5169688614820ccb47217539954209fd3f088572..04d085bde73c9a54cfa81421e1da3d7746808e7a 100644 --- a/pkgs/development/libraries/faac/default.nix +++ b/pkgs/development/libraries/faac/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, autoreconfHook +{ stdenv, fetchurl, autoreconfHook , mp4v2Support ? true, mp4v2 ? null , drmSupport ? false # Digital Radio Mondiale }: diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix index c5ce5e252fac60145a48bd9ecf22d14078062e7e..34c649022cf5b099304c699bfabbe27bf0285502 100644 --- a/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/pkgs/development/libraries/ffmpeg-full/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, perl, texinfo, yasm +{ stdenv, fetchurl, pkgconfig, perl, texinfo, yasm , hostPlatform /* * Licensing options (yes some are listed twice, filters and such are not listed) @@ -80,7 +80,6 @@ #, libnut ? null # NUT (de)muxer, native (de)muser exists , libogg ? null # Ogg container used by vorbis & theora , libopus ? null # Opus de/encoder -, libsndio ? null # sndio playback/record support , libssh ? null # SFTP protocol , libtheora ? null # Theora encoder , libv4l ? null # Video 4 Linux support diff --git a/pkgs/development/libraries/ffmpeg-sixel/default.nix b/pkgs/development/libraries/ffmpeg-sixel/default.nix index a3ce9ea9c2bf8b4aff72df13e7be7c12d14e5a35..4607d3e2f197508c0f5a73390dbe713304ae319e 100644 --- a/pkgs/development/libraries/ffmpeg-sixel/default.nix +++ b/pkgs/development/libraries/ffmpeg-sixel/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, perl, libsixel, yasm +{ stdenv, fetchFromGitHub, pkgconfig, libsixel, yasm }: stdenv.mkDerivation rec { diff --git a/pkgs/development/libraries/ffmpegthumbnailer/default.nix b/pkgs/development/libraries/ffmpegthumbnailer/default.nix index 9e76c1e6400171e8a6a13211e186e208a82427f9..a1cc11fb8c1e71273a3ea36d4eda27e9bebc0565 100644 --- a/pkgs/development/libraries/ffmpegthumbnailer/default.nix +++ b/pkgs/development/libraries/ffmpegthumbnailer/default.nix @@ -1,4 +1,4 @@ -{ pkgs, fetchFromGitHub, stdenv, ffmpeg, cmake, libpng, pkgconfig, libjpeg +{ fetchFromGitHub, stdenv, ffmpeg, cmake, libpng, pkgconfig, libjpeg }: stdenv.mkDerivation rec { diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix index ccf2d6d0585598450d82a8ee8756e60c78af3431..2b6a949c23269988189afa4eb00c88955173ab55 100644 --- a/pkgs/development/libraries/folly/default.nix +++ b/pkgs/development/libraries/folly/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, pkgconfig, boost, libevent +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, boost, libevent , double-conversion, glog, google-gflags, python, libiberty, openssl }: stdenv.mkDerivation rec { diff --git a/pkgs/development/libraries/fontconfig/default.nix b/pkgs/development/libraries/fontconfig/default.nix index c2d99446d81b79fe8732015757f74e534b8d7cff..01c4140f3b5ca1cb07315e438539cf062f844762 100644 --- a/pkgs/development/libraries/fontconfig/default.nix +++ b/pkgs/development/libraries/fontconfig/default.nix @@ -1,4 +1,4 @@ -{ stdenv, substituteAll, fetchurl, fetchpatch +{ stdenv, substituteAll, fetchurl , pkgconfig, freetype, expat, libxslt, gperf, dejavu_fonts , hostPlatform }: diff --git a/pkgs/development/libraries/fontconfig/make-fonts-cache.nix b/pkgs/development/libraries/fontconfig/make-fonts-cache.nix index 8b534edd2498ace4364f175eda1c8e0bb2c16f14..76e89b97617e27c176f3fc6407f0a3c32c23e5e4 100644 --- a/pkgs/development/libraries/fontconfig/make-fonts-cache.nix +++ b/pkgs/development/libraries/fontconfig/make-fonts-cache.nix @@ -1,4 +1,4 @@ -{ runCommand, lib, writeText, fontconfig, fontDirectories }: +{ runCommand, lib, fontconfig, fontDirectories }: runCommand "fc-cache" rec { diff --git a/pkgs/development/libraries/frame/default.nix b/pkgs/development/libraries/frame/default.nix index 2f5374851d82032cdfedb25f5c8e2cc3218e6a15..e15626a160e27689900b3ebd0ad65cdd6ccefa3e 100644 --- a/pkgs/development/libraries/frame/default.nix +++ b/pkgs/development/libraries/frame/default.nix @@ -1,5 +1,5 @@ { enableX11 ? true -, stdenv, fetchurl, pkgconfig, xorg, xorgserver, xinput }: +, stdenv, fetchurl, pkgconfig, xorg }: stdenv.mkDerivation rec { name = "frame-${version}"; diff --git a/pkgs/development/libraries/freetype/default.nix b/pkgs/development/libraries/freetype/default.nix index 23aa86af377c52a63e528cd1270e1425ba86072e..c678b46c0d21396c785e2d349c6c8e070adb0e31 100644 --- a/pkgs/development/libraries/freetype/default.nix +++ b/pkgs/development/libraries/freetype/default.nix @@ -1,5 +1,4 @@ -{ stdenv, lib, fetchurl, copyPathsToStore -, hostPlatform +{ stdenv, fetchurl , pkgconfig, which, makeWrapper , zlib, bzip2, libpng, gnumake, glib diff --git a/pkgs/development/libraries/gbenchmark/default.nix b/pkgs/development/libraries/gbenchmark/default.nix index 6745bc1ecf5fae5b926261c500a82bcce3384326..d700c3d3c16045d595146a78f72f19cfe6cedf81 100644 --- a/pkgs/development/libraries/gbenchmark/default.nix +++ b/pkgs/development/libraries/gbenchmark/default.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, fetchFromGitHub, cmake }: +{ stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { name = "gbenchmark-${version}"; diff --git a/pkgs/development/libraries/gegl/default.nix b/pkgs/development/libraries/gegl/default.nix index d2987be6a3d50a2a68599109366f96f2ba1ef572..ccfa7e536111d76286d3592b3ff6ae9a791e44b5 100644 --- a/pkgs/development/libraries/gegl/default.nix +++ b/pkgs/development/libraries/gegl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, babl, libpng, cairo, libjpeg +{ stdenv, fetchurl, pkgconfig, babl, libpng, cairo, libjpeg , librsvg, pango, gtk2, bzip2, intltool, libintl , OpenGL ? null }: diff --git a/pkgs/development/libraries/geos/default.nix b/pkgs/development/libraries/geos/default.nix index b92f6e61f56a5c1d666f0670581052f2ea55128a..83030a7a014228ade182369ec9f1f85545fad250 100644 --- a/pkgs/development/libraries/geos/default.nix +++ b/pkgs/development/libraries/geos/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, python }: +{ stdenv, fetchurl, python }: stdenv.mkDerivation rec { name = "geos-3.6.2"; diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index fd6e0a65abcef22a524c1d3b53669a6acff251b4..8a07a9f9f2276dff87fde6816dc9439a8cb4892c 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, hostPlatform, fetchurl, gettext, pkgconfig, perl, python +{ stdenv, fetchurl, gettext, pkgconfig, perl, python , libiconv, zlib, libffi, pcre, libelf, gnome3 # use utillinuxMinimal to avoid circular dependency (utillinux, systemd, glib) , utillinuxMinimal ? null diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index 5c504d0d8e25fc3e3014f57578dfb834b5ca9d8f..8b4a213aae0517887559514afdb7431b2e58b1af 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -20,7 +20,7 @@ { stdenv, lib , buildPlatform, hostPlatform , buildPackages -, fetchurl, fetchpatch ? null +, fetchurl ? null , linuxHeaders ? null , gd ? null, libpng ? null , bison diff --git a/pkgs/development/libraries/gnutls-kdh/generic.nix b/pkgs/development/libraries/gnutls-kdh/generic.nix index 472ec83fb02c404d43f4cca272bcb10a5ab854fc..a81cd91fdc76c05bbadfafe4ec9ad392ca26d6da 100644 --- a/pkgs/development/libraries/gnutls-kdh/generic.nix +++ b/pkgs/development/libraries/gnutls-kdh/generic.nix @@ -1,6 +1,6 @@ -{ lib, fetchurl, stdenv, zlib, lzo, libtasn1, nettle, pkgconfig, lzip +{ lib, stdenv, zlib, lzo, libtasn1, nettle, pkgconfig, lzip , guileBindings, guile, perl, gmp, autogen, libidn, p11-kit, unbound, libiconv -, tpmSupport ? true, trousers, nettools, bash, gperftools, gperf, gettext, automake +, tpmSupport ? true, trousers, nettools, gperftools, gperf, gettext, automake , yacc, texinfo # Version dependent args diff --git a/pkgs/development/libraries/gnutls/generic.nix b/pkgs/development/libraries/gnutls/generic.nix index 984603827c8d36adcca10c22fef6b0641a05fad6..081d896a6e0b8ef4d5ebe793df36abbbd5823e37 100644 --- a/pkgs/development/libraries/gnutls/generic.nix +++ b/pkgs/development/libraries/gnutls/generic.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, stdenv, zlib, lzo, libtasn1, nettle, pkgconfig, lzip +{ lib, stdenv, zlib, lzo, libtasn1, nettle, pkgconfig, lzip , guileBindings, guile, perl, gmp, autogen, libidn, p11-kit, libiconv , tpmSupport ? false, trousers, which, nettools, libunistring , unbound, dns-root-data, gettext diff --git a/pkgs/development/libraries/goffice/default.nix b/pkgs/development/libraries/goffice/default.nix index 6cdd19f307dfd895cd522a62ad1bddcf33f65a61..6155b8b18bd0f1c8e631cbecbcc507c06dbac918 100644 --- a/pkgs/development/libraries/goffice/default.nix +++ b/pkgs/development/libraries/goffice/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, pkgconfig, intltool, glib, gtk3 -, libgsf, libxml2, libxslt, cairo, pango, librsvg, libspectre }: +, libgsf, libxml2, libxslt, cairo, pango, librsvg }: stdenv.mkDerivation rec { name = "goffice-0.10.39"; diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix index 94c09b716832e1cee4c9e57fb449ff38db3452d3..e7da60a9d1a228241dc2c18d3b2bacc382b42951 100644 --- a/pkgs/development/libraries/gpgme/default.nix +++ b/pkgs/development/libraries/gpgme/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, libgpgerror, gnupg, pkgconfig, glib, pth, libassuan +{ stdenv, fetchurl, libgpgerror, gnupg, pkgconfig, glib, pth, libassuan , file, which , autoreconfHook , git diff --git a/pkgs/development/libraries/gsasl/default.nix b/pkgs/development/libraries/gsasl/default.nix index 720ff06ceaa5023fe483c0885537de37996791ad..9c19bdbdc29a0e3b4d17cbc05c9ec7c02e7a94f8 100644 --- a/pkgs/development/libraries/gsasl/default.nix +++ b/pkgs/development/libraries/gsasl/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, gss, libidn, kerberos }: +{ fetchurl, stdenv, libidn, kerberos }: stdenv.mkDerivation rec { name = "gsasl-1.8.0"; diff --git a/pkgs/development/libraries/gsl/default.nix b/pkgs/development/libraries/gsl/default.nix index 4f952359f711106d6d2a93e3cc2770f1c814155d..37d4843db8d45f09970d52320e039355999f2340 100644 --- a/pkgs/development/libraries/gsl/default.nix +++ b/pkgs/development/libraries/gsl/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, fetchpatch, stdenv }: +{ fetchurl, stdenv }: stdenv.mkDerivation rec { name = "gsl-2.5"; diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix index dfd3383cdbad073f3c7f6969c4469014672c8e2a..49216b70fe12fb4c2b316c665ee45c465924ec37 100644 --- a/pkgs/development/libraries/gstreamer/base/default.nix +++ b/pkgs/development/libraries/gstreamer/base/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchpatch, lib , pkgconfig, meson, ninja, gettext, gobjectIntrospection -, python, gstreamer, orc, pango, libtheora, libvisual +, python, gstreamer, orc, pango, libtheora , libintl, libopus , enableX11 ? stdenv.isLinux, libXv , enableWayland ? stdenv.isLinux, wayland diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix index 8371b2780409214dfc66ec8cb199cde3d3f64565..db75705c825abc4b16f81fc66236a7cb4972dd9e 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkgconfig, python, gstreamer, xorg, alsaLib, cdparanoia +{ fetchurl, stdenv, pkgconfig, gstreamer, xorg, alsaLib, cdparanoia , libogg, libtheora, libvorbis, freetype, pango, liboil, glib, cairo, orc , libintl , ApplicationServices diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix index 75583624f5457e4a2e6c7355c74f60c674cc7492..9c47ef0260b4e7c9deef8cbb379bf4c536733609 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, lib, pkgconfig, gst-plugins-base, aalib, cairo -, flac, libjpeg, zlib, speex, libpng, libdv, libcaca, libvpx -, libiec61883, libavc1394, taglib, libpulseaudio, gdk_pixbuf, orc +, flac, libjpeg, speex, libpng, libdv, libcaca, libvpx +, taglib, libpulseaudio, gdk_pixbuf, orc , glib, gstreamer, bzip2, libsoup, libshout, ncurses, libintl , # Whether to build no plugins that have external dependencies # (except the PulseAudio plugin). diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-ugly/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-ugly/default.nix index ac680f8432ab062684699a9d2f3ea5df099779e9..2f46016adac814e7e7eb78cd0f1eb937340a99c6 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-ugly/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-ugly/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, pkgconfig, glib, gstreamer, gst-plugins-base -, libmad, libdvdread, libmpeg2, libcdio, a52dec, x264, orc, lame, libintl }: +, libmad, libdvdread, a52dec, x264, orc, lame, libintl }: stdenv.mkDerivation rec { name = "gst-plugins-ugly-0.10.19"; diff --git a/pkgs/development/libraries/gstreamer/vaapi/default.nix b/pkgs/development/libraries/gstreamer/vaapi/default.nix index 11b451e76fdfce3957e30817c65138e51f31152f..7255894f3b1fe9b78cbd46ed8e28921895343c29 100644 --- a/pkgs/development/libraries/gstreamer/vaapi/default.nix +++ b/pkgs/development/libraries/gstreamer/vaapi/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, meson, ninja, pkgconfig, gst-plugins-base, bzip2, libva, wayland -, libdrm, udev, xorg, libGLU_combined, yasm, gstreamer, gst-plugins-bad, nasm +, libdrm, udev, xorg, libGLU_combined, gstreamer, gst-plugins-bad, nasm , libvpx, python }: diff --git a/pkgs/development/libraries/gtkd/default.nix b/pkgs/development/libraries/gtkd/default.nix index f206a169b93ded32ffd8e772a4c1abcf4c9b90ff..c0dc0753cd01317968eb2d423142c694fa35b381 100644 --- a/pkgs/development/libraries/gtkd/default.nix +++ b/pkgs/development/libraries/gtkd/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchzip, atk, cairo, dmd, gdk_pixbuf, gnome3, gst_all_1, librsvg -, pango, pkgconfig, substituteAll, which }: +, pango, pkgconfig, which }: stdenv.mkDerivation rec { name = "gtkd-${version}"; diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix index 4f3bc64b5d4011a14a5eadb17100ad950a1aa3b4..4c858242bb540d9d20daee26f2e479239f54ed1f 100644 --- a/pkgs/development/libraries/gvfs/default.nix +++ b/pkgs/development/libraries/gvfs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, meson, ninja, fetchurl, pkgconfig, gettext, gnome3 +{ stdenv, fetchurl, pkgconfig, gettext, gnome3 , glib, libgudev, udisks2, libgcrypt, libcap, polkit , libgphoto2, avahi, libarchive, fuse, libcdio , libxml2, libxslt, docbook_xsl, docbook_xml_dtd_42, samba, libmtp diff --git a/pkgs/development/libraries/hunspell/dictionaries.nix b/pkgs/development/libraries/hunspell/dictionaries.nix index ee8a5107b341f8254bf538e50ae314a3024f3cd0..9f0a6c34512ff38ad3db51b4682550d705188367 100644 --- a/pkgs/development/libraries/hunspell/dictionaries.nix +++ b/pkgs/development/libraries/hunspell/dictionaries.nix @@ -163,6 +163,7 @@ let name = "hunspell-dict-${shortName}-linguistico-${version}"; readmeFile = dictFileName + "_README.txt"; meta = with stdenv.lib; { + description = "Hunspell dictionary for ${shortDescription}"; homepage = https://sourceforge.net/projects/linguistico/; license = licenses.gpl3; maintainers = with maintainers; [ renzo ]; diff --git a/pkgs/development/libraries/icu/base.nix b/pkgs/development/libraries/icu/base.nix index ee868d371ce5e18c271a9499fb71363ee9bf8993..705fb816b2e5e4f28bacd01f59828540ff812904 100644 --- a/pkgs/development/libraries/icu/base.nix +++ b/pkgs/development/libraries/icu/base.nix @@ -1,5 +1,5 @@ { version, sha256, patches ? [], patchFlags ? "" }: -{ stdenv, fetchurl, fetchpatch, fixDarwinDylibNames +{ stdenv, fetchurl, fixDarwinDylibNames # Cross-compiled icu4c requires a build-root of a native compile , buildRootOnly ? false, nativeBuildRoot, buildPlatform, hostPlatform }: diff --git a/pkgs/development/libraries/ignition-transport/generic.nix b/pkgs/development/libraries/ignition-transport/generic.nix index 3568edb7890ce3c3a3449465383d2c1a5a2bd4b2..8abff4c5f0592170a2bd3e27bb3a372792d20c8e 100644 --- a/pkgs/development/libraries/ignition-transport/generic.nix +++ b/pkgs/development/libraries/ignition-transport/generic.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, pkgconfig, utillinux, +{ stdenv, cmake, pkgconfig, utillinux, protobuf, zeromq, cppzmq, version, src # parametrize version and src so we can easily have pkgs # for different versions diff --git a/pkgs/development/libraries/ijs/default.nix b/pkgs/development/libraries/ijs/default.nix index ed500ca518fd37b659d6eb97d9a634b5b33cb021..a5b226ee9c744da9e8819ff5934db708cc7714a2 100644 --- a/pkgs/development/libraries/ijs/default.nix +++ b/pkgs/development/libraries/ijs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, autoreconfHook, ghostscript }: +{ stdenv, autoreconfHook, ghostscript }: stdenv.mkDerivation { name = "ijs-${ghostscript.version}"; diff --git a/pkgs/development/libraries/iso-codes/default.nix b/pkgs/development/libraries/iso-codes/default.nix index 4dfe190124b175eab520c451277d784f32f298f9..d78c59e9c25a02475dcb3368539293de05252397 100644 --- a/pkgs/development/libraries/iso-codes/default.nix +++ b/pkgs/development/libraries/iso-codes/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, gettext, python3, xz}: +{stdenv, fetchurl, gettext, python3}: stdenv.mkDerivation rec { name = "iso-codes-${version}"; diff --git a/pkgs/development/libraries/itk/default.nix b/pkgs/development/libraries/itk/default.nix index 5280a95afb4012aabbdde0d4f92d71a1f35c6989..5f6a6f51a52202f12f7f751e4b7bea41a80c59ba 100644 --- a/pkgs/development/libraries/itk/default.nix +++ b/pkgs/development/libraries/itk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, cmake, libX11, libuuid, xz, vtk }: +{ stdenv, fetchurl, cmake, libX11, libuuid, xz, vtk }: stdenv.mkDerivation rec { name = "itk-4.13.0"; diff --git a/pkgs/development/libraries/jbig2dec/default.nix b/pkgs/development/libraries/jbig2dec/default.nix index 8731bd8e73664440f774047e3f636950ae5291ec..b9dcc927172f692db29907fd8044d2540813bba3 100644 --- a/pkgs/development/libraries/jbig2dec/default.nix +++ b/pkgs/development/libraries/jbig2dec/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch }: +{ stdenv, fetchurl }: stdenv.mkDerivation rec { name = "jbig2dec-0.14"; diff --git a/pkgs/development/libraries/json-glib/default.nix b/pkgs/development/libraries/json-glib/default.nix index a9b5d596b395cacf6786b6619b7516bd78291702..be83dbc52f4550c8c9ac129217109f880c7a35dc 100644 --- a/pkgs/development/libraries/json-glib/default.nix +++ b/pkgs/development/libraries/json-glib/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchpatch, glib, meson, ninja, pkgconfig, gettext -, gobjectIntrospection, dbus, fixDarwinDylibNames, gnome3 +, gobjectIntrospection, fixDarwinDylibNames, gnome3 }: let diff --git a/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix b/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix index cd5f2163dd955984833946c0f7113fb1f7cea6b1..d5a407ee16f269070071b1519fe0c6599b718bd1 100644 --- a/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix +++ b/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, fetchurl, writeScript, + mkDerivation, lib, extra-cmake-modules, qtbase, qttools, shared-mime-info }: diff --git a/pkgs/development/libraries/kde-frameworks/kdeclarative.nix b/pkgs/development/libraries/kde-frameworks/kdeclarative.nix index 7aabeb021545e9692e88c8095b924c0817bbd980..34e01b4c1b623ece5ca39735cf95eb244235166a 100644 --- a/pkgs/development/libraries/kde-frameworks/kdeclarative.nix +++ b/pkgs/development/libraries/kde-frameworks/kdeclarative.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, extra-cmake-modules, epoxy, kconfig, kglobalaccel, kguiaddons, ki18n, kiconthemes, kio, kpackage, - kwidgetsaddons, kwindowsystem, pkgconfig, qtdeclarative + kwidgetsaddons, kwindowsystem, qtdeclarative }: mkDerivation { diff --git a/pkgs/development/libraries/kde-frameworks/kglobalaccel.nix b/pkgs/development/libraries/kde-frameworks/kglobalaccel.nix index ae945ab73384e9efa2406597731de5f1474e4497..ca015151e0f1c0541bc673d3485d4803f04201b6 100644 --- a/pkgs/development/libraries/kde-frameworks/kglobalaccel.nix +++ b/pkgs/development/libraries/kde-frameworks/kglobalaccel.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, + mkDerivation, extra-cmake-modules, kconfig, kcoreaddons, kcrash, kdbusaddons, kservice, kwindowsystem, qtbase, qttools, qtx11extras, diff --git a/pkgs/development/libraries/kde-frameworks/kpackage/default.nix b/pkgs/development/libraries/kde-frameworks/kpackage/default.nix index c0b4b63128610eddae8e8fba448cf26cca938fc5..6779faa50cdcfa7356eb1ae5b6d29188f1bf10f1 100644 --- a/pkgs/development/libraries/kde-frameworks/kpackage/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kpackage/default.nix @@ -1,5 +1,5 @@ { - mkDerivation, fetchurl, lib, copyPathsToStore, + mkDerivation, lib, copyPathsToStore, extra-cmake-modules, kdoctools, karchive, kconfig, kcoreaddons, ki18n, qtbase, }: diff --git a/pkgs/development/libraries/kde-frameworks/ktexteditor.nix b/pkgs/development/libraries/kde-frameworks/ktexteditor.nix index 3efd4cf4e2a8b87e00e4b0b87fd5b9e230b8a34e..c633aee30a1beb4fe5ef6c4a6129f529a065387a 100644 --- a/pkgs/development/libraries/kde-frameworks/ktexteditor.nix +++ b/pkgs/development/libraries/kde-frameworks/ktexteditor.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, copyPathsToStore, fetchpatch, + mkDerivation, lib, extra-cmake-modules, perl, karchive, kconfig, kguiaddons, ki18n, kiconthemes, kio, kparts, libgit2, qtscript, qtxmlpatterns, sonnet, syntax-highlighting, qtquickcontrols diff --git a/pkgs/development/libraries/keybinder3/default.nix b/pkgs/development/libraries/keybinder3/default.nix index cf4b85043bb27d5464bd059e996f2284fc40d1c1..194b57c0534263b92b95d21972092a83f4e1d4b3 100644 --- a/pkgs/development/libraries/keybinder3/default.nix +++ b/pkgs/development/libraries/keybinder3/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, gnome3 -, gtk-doc, gtk3, python, lua, libX11, libXext, libXrender, gobjectIntrospection +, gtk-doc, gtk3, libX11, libXext, libXrender, gobjectIntrospection }: stdenv.mkDerivation rec { diff --git a/pkgs/development/libraries/kpmcore/default.nix b/pkgs/development/libraries/kpmcore/default.nix index c6c3ba53d2c38e53a2895904f73b9d55dc2a39fd..5c53f5e6ad5da955ac4a8d9e7dcdc07348e6b162 100644 --- a/pkgs/development/libraries/kpmcore/default.nix +++ b/pkgs/development/libraries/kpmcore/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, extra-cmake-modules, pkgconfig +{ stdenv, lib, fetchurl, extra-cmake-modules , qtbase, kdeFrameworks , libatasmart, parted , utillinux }: diff --git a/pkgs/development/libraries/kreport/default.nix b/pkgs/development/libraries/kreport/default.nix index 3f44dbb9c1389205d32b34bcb4ef2753d4f7e460..256989992c5a0c0e248bd58219bb8a696fb1c386 100644 --- a/pkgs/development/libraries/kreport/default.nix +++ b/pkgs/development/libraries/kreport/default.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, fetchurl, extra-cmake-modules, - qtbase, qtdeclarative, qtwebkit, kconfig, kcoreaddons, kwidgetsaddons, kguiaddons, kproperty, marble, python2 + qtdeclarative, qtwebkit, kconfig, kcoreaddons, kwidgetsaddons, kguiaddons, kproperty, marble, python2 }: mkDerivation rec { diff --git a/pkgs/development/libraries/languagemachines/frogdata.nix b/pkgs/development/libraries/languagemachines/frogdata.nix index 61b4559ebab0c4377359127f1314caf9cfa327c9..2c418c1bc5f57782d641c4a40d1422c060708fe8 100644 --- a/pkgs/development/libraries/languagemachines/frogdata.nix +++ b/pkgs/development/libraries/languagemachines/frogdata.nix @@ -1,7 +1,5 @@ { stdenv, fetchurl , automake, autoconf, libtool, pkgconfig, autoconf-archive -, libxml2, icu -, languageMachines }: let diff --git a/pkgs/development/libraries/languagemachines/uctodata.nix b/pkgs/development/libraries/languagemachines/uctodata.nix index 7defa71fc0ee1822a2ec5447f5c501dd5cae77d0..01a78b5b4be641d4c8076f529810b3d074cddbe8 100644 --- a/pkgs/development/libraries/languagemachines/uctodata.nix +++ b/pkgs/development/libraries/languagemachines/uctodata.nix @@ -1,7 +1,6 @@ { stdenv, fetchurl , automake, autoconf, libtool, pkgconfig, autoconf-archive -, libxml2, icu -, languageMachines }: + }: let release = builtins.fromJSON (builtins.readFile ./release-info/LanguageMachines-uctodata.json); diff --git a/pkgs/development/libraries/lensfun/default.nix b/pkgs/development/libraries/lensfun/default.nix index 5791b0808b4a327d34ce929ec404681b33846774..e9ba4ae5ac2125fdabb484b22006df27cf1409d7 100644 --- a/pkgs/development/libraries/lensfun/default.nix +++ b/pkgs/development/libraries/lensfun/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, python, glib, zlib, libpng, gnumake3, cmake }: +{ stdenv, fetchurl, pkgconfig, glib, zlib, libpng, gnumake3, cmake }: stdenv.mkDerivation rec { version = "0.3.2"; diff --git a/pkgs/development/libraries/libatomic_ops/default.nix b/pkgs/development/libraries/libatomic_ops/default.nix index fde8a06eb4162ad374b1aad56c06e1b8ce62d7f5..0c0fc3861c9ea23d90141d3aefa4a8be7f2d2615 100644 --- a/pkgs/development/libraries/libatomic_ops/default.nix +++ b/pkgs/development/libraries/libatomic_ops/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoconf, automake, libtool, hostPlatform }: +{ stdenv, fetchurl, autoconf, automake, libtool }: stdenv.mkDerivation rec { name = "libatomic_ops-${version}"; diff --git a/pkgs/development/libraries/libbdplus/default.nix b/pkgs/development/libraries/libbdplus/default.nix index 8b2f0b0da92db80d9db5ad70378afdc31da9e7e6..3a1b77525143da98ba42cdc0e7c43256efa480be 100644 --- a/pkgs/development/libraries/libbdplus/default.nix +++ b/pkgs/development/libraries/libbdplus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libgcrypt, libgpgerror, yacc, flex, gettext }: +{ stdenv, fetchurl, libgcrypt, libgpgerror, gettext }: # library that allows libbluray to play BDplus protected bluray disks # libaacs does not infringe DRM's right or copyright. See the legal page of the website for more info. diff --git a/pkgs/development/libraries/libbfd/default.nix b/pkgs/development/libraries/libbfd/default.nix index 3f244d399f7e776d7c33617fb3f9ac00cd84ac0e..c02e2108f2376194488e1ea8d7d06ff713971d42 100644 --- a/pkgs/development/libraries/libbfd/default.nix +++ b/pkgs/development/libraries/libbfd/default.nix @@ -1,5 +1,5 @@ -{ stdenv, buildPackages -, fetchurl, fetchpatch, gnu-config, autoreconfHook264, bison, binutils-unwrapped +{ stdenv +, fetchpatch, gnu-config, autoreconfHook264, bison, binutils-unwrapped , libiberty, zlib }: diff --git a/pkgs/development/libraries/libchamplain/default.nix b/pkgs/development/libraries/libchamplain/default.nix index 418e9cf0b57332124b5ad3aa68db57c9b4438243..e4864aded279fe6bd827abae9bdb85b1bd305da1 100644 --- a/pkgs/development/libraries/libchamplain/default.nix +++ b/pkgs/development/libraries/libchamplain/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkgconfig, glib, gtk3, cairo, clutter, sqlite, gnome3 +{ fetchurl, stdenv, pkgconfig, glib, gtk3, cairo, sqlite, gnome3 , clutter-gtk, libsoup, gobjectIntrospection /*, libmemphis */ }: let diff --git a/pkgs/development/libraries/libcollectdclient/default.nix b/pkgs/development/libraries/libcollectdclient/default.nix index 4f0ba439417f220664065652a6147709a877a036..4f4007649d04c63559ba8aa6d2ac85443dda643d 100644 --- a/pkgs/development/libraries/libcollectdclient/default.nix +++ b/pkgs/development/libraries/libcollectdclient/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, collectd }: +{ stdenv, collectd }: with stdenv.lib; collectd.overrideAttrs (oldAttrs: { diff --git a/pkgs/development/libraries/libdazzle/default.nix b/pkgs/development/libraries/libdazzle/default.nix index 7f4eaa5fd14b4c77d77defba8908ac162ec28e87..295028abc97d8c91964f126f9f31c8af6913dc46 100644 --- a/pkgs/development/libraries/libdazzle/default.nix +++ b/pkgs/development/libraries/libdazzle/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgs, fetchurl, ninja, meson, pkgconfig, vala, gobjectIntrospection, libxml2 +{ stdenv, fetchurl, ninja, meson, pkgconfig, vala, gobjectIntrospection, libxml2 , gtk-doc, docbook_xsl, dbus, xvfb_run, glib, gtk3, gnome3 }: let diff --git a/pkgs/development/libraries/libedit/default.nix b/pkgs/development/libraries/libedit/default.nix index bc4cea1b4702239fda172b51b8e1b0c1efe2c2bb..c68e171084b93796423d43b47b270a0e5f3eb31f 100644 --- a/pkgs/development/libraries/libedit/default.nix +++ b/pkgs/development/libraries/libedit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses, groff }: +{ stdenv, fetchurl, ncurses }: stdenv.mkDerivation rec { name = "libedit-20180525-3.1"; diff --git a/pkgs/development/libraries/libewf/default.nix b/pkgs/development/libraries/libewf/default.nix index b1a6238a3780168cd0e6d95a22a2d1efc137e4e7..d150d4a0033097f8300e1ae2f92e00df4edeff69 100644 --- a/pkgs/development/libraries/libewf/default.nix +++ b/pkgs/development/libraries/libewf/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, zlib, openssl, libuuid, file, fuse, autoreconfHook, pkgconfig }: +{ fetchurl, stdenv, zlib, openssl, libuuid, pkgconfig }: stdenv.mkDerivation rec { version = "20171104"; diff --git a/pkgs/development/libraries/libgdiplus/default.nix b/pkgs/development/libraries/libgdiplus/default.nix index 05c320c42aecc9ae0bfaec84d8186d448b2abdb8..5e94d00dcdb7dfa04c537db51402a723e0f517fd 100644 --- a/pkgs/development/libraries/libgdiplus/default.nix +++ b/pkgs/development/libraries/libgdiplus/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, glib, cairo, Carbon, fontconfig -, libtiff, giflib, libjpeg, libpng, monoDLLFixer +, libtiff, giflib, libjpeg, libpng , libXrender, libexif }: stdenv.mkDerivation rec { diff --git a/pkgs/development/libraries/libgksu/default.nix b/pkgs/development/libraries/libgksu/default.nix index 652848d8a955c357d058f48de21611d849cc4784..29f346e9acfbbd57d077cf8bca7d458921c9d0b3 100644 --- a/pkgs/development/libraries/libgksu/default.nix +++ b/pkgs/development/libraries/libgksu/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, wrapGAppsHook, gtk2, gnome2, gnome3, libstartup_notification, libgtop, perl, perlXMLParser, - autoreconfHook, intltool, docbook_xsl, xauth, sudo + autoreconfHook, intltool, docbook_xsl, xauth }: stdenv.mkDerivation rec { diff --git a/pkgs/development/libraries/libgphoto2/default.nix b/pkgs/development/libraries/libgphoto2/default.nix index 96b42ac068ccb1b850db864b3cc455f4c2dba217..8616a0146755a82679b7e372f5f77d0768e9a523 100644 --- a/pkgs/development/libraries/libgphoto2/default.nix +++ b/pkgs/development/libraries/libgphoto2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchpatch, fetchFromGitHub, pkgconfig, libusb1, libtool, libexif, libjpeg, gettext, autoreconfHook }: +{ stdenv, fetchFromGitHub, pkgconfig, libusb1, libtool, libexif, libjpeg, gettext, autoreconfHook }: stdenv.mkDerivation rec { name = "libgphoto2-${meta.version}"; diff --git a/pkgs/development/libraries/libgpod/default.nix b/pkgs/development/libraries/libgpod/default.nix index fbe421e9974e548b8f5a170fab59b32e1f923d47..c6056ee49fbf38f5a43733de793f3f88ba818db1 100644 --- a/pkgs/development/libraries/libgpod/default.nix +++ b/pkgs/development/libraries/libgpod/default.nix @@ -1,5 +1,5 @@ {stdenv, lib, fetchurl, gettext, perl, perlXMLParser, intltool, pkgconfig, glib, - libxml2, sqlite, libusb1, zlib, sg3_utils, gdk_pixbuf, taglib, + libxml2, sqlite, zlib, sg3_utils, gdk_pixbuf, taglib, libimobiledevice, pythonPackages, mutagen, monoSupport ? true, mono, gtk-sharp-2_0 }: diff --git a/pkgs/development/libraries/libgtop/default.nix b/pkgs/development/libraries/libgtop/default.nix index 6498014aee8d056a70cb8accb78068a031011b7d..d0be9e25b87e758dabb8baacff18617120e8084a 100644 --- a/pkgs/development/libraries/libgtop/default.nix +++ b/pkgs/development/libraries/libgtop/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, glib, pkgconfig, perl, gettext, gobjectIntrospection, libintl, libtool, gnome3, gtk-doc }: +{ stdenv, fetchurl, fetchpatch, glib, pkgconfig, perl, gettext, gobjectIntrospection, libtool, gnome3, gtk-doc }: let pname = "libgtop"; version = "2.38.0"; diff --git a/pkgs/development/libraries/libiberty/default.nix b/pkgs/development/libraries/libiberty/default.nix index 516e6bbbe88c8cf45715b30d737181232c37b8a3..bcc85abbd3efc1404d367fbf22df894723df7a2b 100644 --- a/pkgs/development/libraries/libiberty/default.nix +++ b/pkgs/development/libraries/libiberty/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPackages, fetchurl, staticBuild ? false }: +{ stdenv, buildPackages, staticBuild ? false }: let inherit (buildPackages.buildPackages) gcc; in diff --git a/pkgs/development/libraries/libid3tag/default.nix b/pkgs/development/libraries/libid3tag/default.nix index a153001a9600c40596ce4f5d52cec4394345b758..0289a5331f8937775a6035397644472cb2358bc7 100644 --- a/pkgs/development/libraries/libid3tag/default.nix +++ b/pkgs/development/libraries/libid3tag/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, writeText, zlib, gperf}: +{stdenv, fetchurl, zlib, gperf}: stdenv.mkDerivation rec { name = "libid3tag-${version}"; diff --git a/pkgs/development/libraries/libidn2/default.nix b/pkgs/development/libraries/libidn2/default.nix index a100b0cc59323d547d4c4696aab6601cfb46d8ae..dd8e3c4a4f87811f9e3d35add523ed154556d10f 100644 --- a/pkgs/development/libraries/libidn2/default.nix +++ b/pkgs/development/libraries/libidn2/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, libiconv, libunistring, help2man, ronn, buildPackages }: +{ fetchurl, stdenv, libiconv, libunistring, help2man, buildPackages }: with stdenv.lib; diff --git a/pkgs/development/libraries/libircclient/default.nix b/pkgs/development/libraries/libircclient/default.nix index fef5e7278b818dafd88f857daa3c1cffe7e39c25..612de78b741dc5bc2f9fdc2a53e95640023207d7 100644 --- a/pkgs/development/libraries/libircclient/default.nix +++ b/pkgs/development/libraries/libircclient/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake }: +{ stdenv, fetchurl }: stdenv.mkDerivation rec { name = "${pname}-${version}"; diff --git a/pkgs/development/libraries/libjson-rpc-cpp/default.nix b/pkgs/development/libraries/libjson-rpc-cpp/default.nix index 87cae224685287e1ad6381c5fbaa93bd0a08de85..f352c8e9ed198fa2f4935f7e097df08370eacf53 100644 --- a/pkgs/development/libraries/libjson-rpc-cpp/default.nix +++ b/pkgs/development/libraries/libjson-rpc-cpp/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cmake, jsoncpp, argtable, curl, libmicrohttpd -, doxygen, catch, pkgconfig, git +, doxygen, catch, pkgconfig }: stdenv.mkDerivation rec { diff --git a/pkgs/development/libraries/libndctl/default.nix b/pkgs/development/libraries/libndctl/default.nix index 4b547fde3ab0c37707080c0af1d86e24d523a6a7..79439f822696d5849d020cd7eabbeadc64ba9bda 100644 --- a/pkgs/development/libraries/libndctl/default.nix +++ b/pkgs/development/libraries/libndctl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, autoconf, automake, asciidoc, docbook_xsl, docbook_xml_dtd_45, libxslt, xmlto, pkgconfig, json_c, kmod, which, systemd, utillinux +{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, asciidoc, docbook_xsl, docbook_xml_dtd_45, libxslt, xmlto, pkgconfig, json_c, kmod, which, systemd, utillinux }: let diff --git a/pkgs/development/libraries/libopcodes/default.nix b/pkgs/development/libraries/libopcodes/default.nix index c918c61abf0d64a8d9023ae4b86f4fb7f7319c6a..2c59fa03ea06a48edfe7459c57c2b7eb9331f6a7 100644 --- a/pkgs/development/libraries/libopcodes/default.nix +++ b/pkgs/development/libraries/libopcodes/default.nix @@ -1,5 +1,5 @@ { stdenv, buildPackages -, fetchurl, autoreconfHook264, bison, binutils-unwrapped +, autoreconfHook264, bison, binutils-unwrapped , libiberty, libbfd }: diff --git a/pkgs/development/libraries/libopus/default.nix b/pkgs/development/libraries/libopus/default.nix index 66c7e7e882e810a9c46c1bd5a9fd2ce474b8f530..135f1caf97e2f5324ebe0c0c19f044db98a42957 100644 --- a/pkgs/development/libraries/libopus/default.nix +++ b/pkgs/development/libraries/libopus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch +{ stdenv, fetchurl , fixedPoint ? false, withCustomModes ? true }: let diff --git a/pkgs/development/libraries/libplist/default.nix b/pkgs/development/libraries/libplist/default.nix index 8da097c3d386c1501aebf3b64ece1e42d402d156..8dc64f2c2b57c31e4933d2ebf912277ee6a916af 100644 --- a/pkgs/development/libraries/libplist/default.nix +++ b/pkgs/development/libraries/libplist/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libxml2, swig2, python2Packages, glib }: +{ stdenv, fetchurl, pkgconfig, swig2, python2Packages, glib }: let inherit (python2Packages) python cython; diff --git a/pkgs/development/libraries/libpng/default.nix b/pkgs/development/libraries/libpng/default.nix index 5ad9cf1e7b771a867c8310471766b9d432bca893..4173588ac522ad20ccf7f93f42c95a611f7cddf9 100644 --- a/pkgs/development/libraries/libpng/default.nix +++ b/pkgs/development/libraries/libpng/default.nix @@ -1,6 +1,4 @@ -{ stdenv, fetchurl, zlib, apngSupport ? true -, buildPlatform, hostPlatform -}: +{ stdenv, fetchurl, zlib, apngSupport ? true }: assert zlib != null; diff --git a/pkgs/development/libraries/libproxy/default.nix b/pkgs/development/libraries/libproxy/default.nix index 02e634b22a3444746f4076846b41014682e5ef9e..0e0499251eb9147df5dd0f07298ac497015c35f6 100644 --- a/pkgs/development/libraries/libproxy/default.nix +++ b/pkgs/development/libraries/libproxy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, pkgconfig, cmake, zlib +{ stdenv, fetchFromGitHub, pkgconfig, cmake, zlib , dbus, networkmanager, spidermonkey_38, pcre, python2, python3 , SystemConfiguration, CoreFoundation, JavaScriptCore }: diff --git a/pkgs/development/libraries/librdf/raptor2.nix b/pkgs/development/libraries/librdf/raptor2.nix index b7a78cb3daf6683e069321c45f3b3baf3fca3785..3f43667712357999878ca83d207de9be4f2e664d 100644 --- a/pkgs/development/libraries/librdf/raptor2.nix +++ b/pkgs/development/libraries/librdf/raptor2.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libxml2, libxslt, curl }: +{ stdenv, fetchurl, libxml2, libxslt }: stdenv.mkDerivation rec { name = "raptor2-2.0.15"; diff --git a/pkgs/development/libraries/libsecret/default.nix b/pkgs/development/libraries/libsecret/default.nix index b77ba49822fdbfbeee2f9113f8c911039c354f16..f311d1a03353380c9eaa612594f908521bac7f43 100644 --- a/pkgs/development/libraries/libsecret/default.nix +++ b/pkgs/development/libraries/libsecret/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, glib, pkgconfig, intltool, libxslt, docbook_xsl, gtk-doc +{ stdenv, fetchurl, glib, pkgconfig, intltool, libxslt, docbook_xsl , libgcrypt, gobjectIntrospection, vala_0_38, gnome3, libintl }: let pname = "libsecret"; diff --git a/pkgs/development/libraries/libsigcxx/default.nix b/pkgs/development/libraries/libsigcxx/default.nix index f6bfff78fa2698b9adf93978ae9924d0a60452c4..def5ee0e19a21a3ffd68b231e1a436382df75903 100644 --- a/pkgs/development/libraries/libsigcxx/default.nix +++ b/pkgs/development/libraries/libsigcxx/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, gnum4 }: +{ stdenv, fetchurl, pkgconfig, gnum4 }: let ver_maj = "2.10"; # odd major numbers are unstable ver_min = "0"; diff --git a/pkgs/development/libraries/libsigsegv/default.nix b/pkgs/development/libraries/libsigsegv/default.nix index 8152c1ea8524625616a6ae273472a77135c31e1d..306c73a9b551c422be6e4736c7b42fc53e37275d 100644 --- a/pkgs/development/libraries/libsigsegv/default.nix +++ b/pkgs/development/libraries/libsigsegv/default.nix @@ -1,5 +1,4 @@ { stdenv, fetchurl -, buildPlatform, hostPlatform , enableSigbusFix ? false # required by kernels < 3.18.6 }: diff --git a/pkgs/development/libraries/libskk/default.nix b/pkgs/development/libraries/libskk/default.nix index 48b0ed6d711c43c13c49eed51b9fd2fc56d1990f..b64c3e51778258e5d6accb33437f843ba8da73d6 100644 --- a/pkgs/development/libraries/libskk/default.nix +++ b/pkgs/development/libraries/libskk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchFromGitHub, +{ stdenv, fetchFromGitHub, libtool, gettext, pkgconfig, vala, gnome-common, gobjectIntrospection, libgee, json-glib, skk-dicts }: diff --git a/pkgs/development/libraries/libsnark/default.nix b/pkgs/development/libraries/libsnark/default.nix index 578053bbb42738c56a408b06ad3052d7f393517b..4ea2209160f82ee10fa18cfbbb6f6a26a7b974e4 100644 --- a/pkgs/development/libraries/libsnark/default.nix +++ b/pkgs/development/libraries/libsnark/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, openssl, boost, gmp, procps, fetchpatch, patchutils }: +{ stdenv, fetchFromGitHub, cmake, pkgconfig, openssl, boost, gmp, procps }: let rev = "9e6b19ff15bc19fba5da1707ba18e7f160e5ed07"; diff --git a/pkgs/development/libraries/libtheora/default.nix b/pkgs/development/libraries/libtheora/default.nix index fd58f4f44e78d8d296e3dd01f04dbb8b4227d9f1..b5ab9d310da338fed35bb3774bd221bdbeef153a 100644 --- a/pkgs/development/libraries/libtheora/default.nix +++ b/pkgs/development/libraries/libtheora/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, libogg, libvorbis, tremor, autoconf, automake, libtool, pkgconfig}: +{stdenv, fetchurl, libogg, libvorbis, pkgconfig}: stdenv.mkDerivation rec { name = "libtheora-1.1.1"; diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix index c492a15bfa4e05868ba4a079082830248efc9e78..c5a12432280b9f70ec5fcac67cdc044d4121a86a 100644 --- a/pkgs/development/libraries/libtiff/default.nix +++ b/pkgs/development/libraries/libtiff/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, zlib, libjpeg, xz }: +{ stdenv, fetchurl, pkgconfig, zlib, libjpeg, xz }: let version = "4.0.9"; diff --git a/pkgs/development/libraries/libunwind/default.nix b/pkgs/development/libraries/libunwind/default.nix index dbf1d7a3756fdf9eece2c3c974daf3e94fb9c278..6a32ccf5c1b14876d35b744e05e0d03ae481890c 100644 --- a/pkgs/development/libraries/libunwind/default.nix +++ b/pkgs/development/libraries/libunwind/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, autoreconfHook, xz }: +{ stdenv, fetchurl, autoreconfHook, xz }: stdenv.mkDerivation rec { name = "libunwind-${version}"; diff --git a/pkgs/development/libraries/libva-utils/default.nix b/pkgs/development/libraries/libva-utils/default.nix index 95d4be08548ac48f819045e7789921262cf44d02..6868e5c8cfa9c1632c5c8b375fd14a4881ac4ff0 100644 --- a/pkgs/development/libraries/libva-utils/default.nix +++ b/pkgs/development/libraries/libva-utils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, autoreconfHook, pkgconfig +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig , libdrm, libva }: diff --git a/pkgs/development/libraries/libvpx/default.nix b/pkgs/development/libraries/libvpx/default.nix index 731892d33b4d8aa4357e744a1f32f5cd29c83c36..4338a70907014eb7c30b86bc87467d5903730d91 100644 --- a/pkgs/development/libraries/libvpx/default.nix +++ b/pkgs/development/libraries/libvpx/default.nix @@ -33,7 +33,6 @@ , temporalDenoisingSupport ? true # use temporal denoising instead of spatial denoising , coefficientRangeCheckingSupport ? false # decoder checks if intermediate transform coefficients are in valid range , vp9HighbitdepthSupport ? true # 10/12 bit color support in VP9 -, experimentalSupport ? false # experimental features # Experimental features , experimentalSpatialSvcSupport ? false # Spatial scalable video coding , experimentalFpMbStatsSupport ? false diff --git a/pkgs/development/libraries/libvpx/git.nix b/pkgs/development/libraries/libvpx/git.nix index 7d4b75d6cdf8112209c6193757d0263d9a37fec9..fb7f828f61f05f13e0c9ee74b78a82710aec701d 100644 --- a/pkgs/development/libraries/libvpx/git.nix +++ b/pkgs/development/libraries/libvpx/git.nix @@ -35,7 +35,6 @@ , temporalDenoisingSupport ? true # use temporal denoising instead of spatial denoising , coefficientRangeCheckingSupport ? false # decoder checks if intermediate transform coefficients are in valid range , vp9HighbitdepthSupport ? true # 10/12 bit color support in VP9 -, experimentalSupport ? false # experimental features # Experimental features , experimentalSpatialSvcSupport ? false # Spatial scalable video coding , experimentalFpMbStatsSupport ? false diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix index 8a3d7abdfa576a9eee9903c42cca4a13fd369d52..51c142a81119de793f08da32384c50e2822f9955 100644 --- a/pkgs/development/libraries/libxml2/default.nix +++ b/pkgs/development/libraries/libxml2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, fetchpatch +{ stdenv, lib, fetchurl , zlib, xz, python2, findXMLCatalogs, libiconv , buildPlatform, hostPlatform , pythonSupport ? buildPlatform == hostPlatform diff --git a/pkgs/development/libraries/libxslt/default.nix b/pkgs/development/libraries/libxslt/default.nix index 1bb90ee195dad070ec4ac1dcda892975b61a5e7e..5b6fdb462c2c474d0bbfa69bb322e0375da9b455 100644 --- a/pkgs/development/libraries/libxslt/default.nix +++ b/pkgs/development/libraries/libxslt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, libxml2, findXMLCatalogs, python2 +{ stdenv, fetchurl, libxml2, findXMLCatalogs, python2 , buildPlatform, hostPlatform , cryptoSupport ? false , pythonSupport ? buildPlatform == hostPlatform diff --git a/pkgs/development/libraries/libyaml-cpp/default.nix b/pkgs/development/libraries/libyaml-cpp/default.nix index ff09aeab2c6fb7362924e8a3cc6dece9e6e63d46..af665c6d9a4a87254d2119f7ae38073b7b9565f5 100644 --- a/pkgs/development/libraries/libyaml-cpp/default.nix +++ b/pkgs/development/libraries/libyaml-cpp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, boost }: +{ stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { name = "libyaml-cpp-${version}"; diff --git a/pkgs/development/libraries/libyaml/default.nix b/pkgs/development/libraries/libyaml/default.nix index 7178e64b6b6a0dbc071287a3ad30c4eb1965093d..7bd0d1970f4e43c6b18ab8462b34fac95d71d6f5 100644 --- a/pkgs/development/libraries/libyaml/default.nix +++ b/pkgs/development/libraries/libyaml/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch }: +{ stdenv, fetchurl }: let version = "0.1.7"; in diff --git a/pkgs/development/libraries/linenoise-ng/default.nix b/pkgs/development/libraries/linenoise-ng/default.nix index 3f008744c1b483c24073c1eb4444ebd70d6c1001..5fa1035868d1b453603f9bcc9b2f86606750ba68 100644 --- a/pkgs/development/libraries/linenoise-ng/default.nix +++ b/pkgs/development/libraries/linenoise-ng/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, cmake }: +{ stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { name = "linenoise-ng-${version}"; diff --git a/pkgs/development/libraries/lirc/default.nix b/pkgs/development/libraries/lirc/default.nix index 7f4d8cc19c8e437a88299b278fc71e9806e0e698..ad6d2df1d8bdf8c1b05796248502fcbed5daeee6 100644 --- a/pkgs/development/libraries/lirc/default.nix +++ b/pkgs/development/libraries/lirc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, alsaLib, bash, help2man, pkgconfig, xlibsWrapper, python3 +{ stdenv, fetchurl, alsaLib, help2man, pkgconfig, xlibsWrapper, python3 , libxslt, systemd, libusb, libftdi1 }: stdenv.mkDerivation rec { diff --git a/pkgs/development/libraries/lucene++/default.nix b/pkgs/development/libraries/lucene++/default.nix index 93c8a0474d9611c6dd2316e730ea434b02fdf53e..c45fa6bc61aab503f6b56dce5e7014601104caea 100644 --- a/pkgs/development/libraries/lucene++/default.nix +++ b/pkgs/development/libraries/lucene++/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, cmake, boost, gtest }: +{ stdenv, fetchurl, cmake, boost, gtest }: stdenv.mkDerivation rec { name = "lucene++-${version}"; diff --git a/pkgs/development/libraries/mediastreamer/default.nix b/pkgs/development/libraries/mediastreamer/default.nix index 8b756e338e483747484e66a66bd04080bb5b65cf..4b69d5d0aafe437f5a784c4f0858ab0b8dfa26af 100644 --- a/pkgs/development/libraries/mediastreamer/default.nix +++ b/pkgs/development/libraries/mediastreamer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, alsaLib, libpulseaudio, speex, gsm +{ stdenv, pkgconfig, intltool, alsaLib, libpulseaudio, speex, gsm , libopus, ffmpeg, libX11, libXv, libGLU_combined, glew, libtheora, libvpx, SDL, libupnp , ortp, libv4l, libpcap, srtp, fetchFromGitHub, cmake, bctoolbox, doxygen , python, libXext, libmatroska, openssl, fetchpatch diff --git a/pkgs/development/libraries/mediastreamer/msopenh264.nix b/pkgs/development/libraries/mediastreamer/msopenh264.nix index f49b7ba2c4b4d920f97526ba87762bf4a8e5bee2..b8a8c64011ca0967282569b0ecdb839d0b70d85d 100644 --- a/pkgs/development/libraries/mediastreamer/msopenh264.nix +++ b/pkgs/development/libraries/mediastreamer/msopenh264.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook, pkgconfig, mediastreamer, openh264 +{ stdenv, autoreconfHook, pkgconfig, mediastreamer, openh264 , fetchgit, cmake }: diff --git a/pkgs/development/libraries/mesa-darwin/default.nix b/pkgs/development/libraries/mesa-darwin/default.nix index 0ae17b4d3f6193acdb182a0d7695b3e51ab89f01..f18c1e693cbcc1c572e6fa8a88674612e21451dd 100644 --- a/pkgs/development/libraries/mesa-darwin/default.nix +++ b/pkgs/development/libraries/mesa-darwin/default.nix @@ -1,7 +1,5 @@ -{ stdenv, stdenvAdapters, fetchurl, pkgconfig, intltool, flex, bison -, python, libxml2Python, file, expat, makedepend, xorg, llvm, libffi, libvdpau -, enableTextureFloats ? false # Texture floats are patented, see docs/patents.txt -, enableExtraFeatures ? false # not maintained +{ stdenv, fetchurl, pkgconfig, intltool, flex, bison +, python, libxml2Python, expat, makedepend, xorg, llvm, libffi, libvdpau , OpenGL, apple_sdk, Xplugin }: diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 9c0bf29d49089cc00c86d75412599c084398c896..028930ba066d84c1f83110191fd6e7b08a424485 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, fetchpatch, lib -, pkgconfig, intltool, autoreconfHook, substituteAll +{ stdenv, fetchurl, lib +, pkgconfig, intltool, autoreconfHook , file, expat, libdrm, xorg, wayland, wayland-protocols, openssl , llvmPackages, libffi, libomxil-bellagio, libva-minimal , libelf, libvdpau, valgrind-light, python2 diff --git a/pkgs/development/libraries/mlt/default.nix b/pkgs/development/libraries/mlt/default.nix index 2d4de33904226ed2e0014819962016be5c9e92ee..d8075c41a7036cda3f86e43c9948673b3807a305 100644 --- a/pkgs/development/libraries/mlt/default.nix +++ b/pkgs/development/libraries/mlt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchurl, makeWrapper +{ stdenv, fetchFromGitHub, makeWrapper , SDL, ffmpeg, frei0r, libjack2, libdv, libsamplerate , libvorbis, libxml2, movit, pkgconfig, sox , gtk2 diff --git a/pkgs/development/libraries/mono-zeroconf/default.nix b/pkgs/development/libraries/mono-zeroconf/default.nix index 444ec9dac2bef1f9f87e9bd85cd542ad94ffc2b6..d96f90b4bfd673a0f3f7ae95121461a1ca194fe0 100644 --- a/pkgs/development/libraries/mono-zeroconf/default.nix +++ b/pkgs/development/libraries/mono-zeroconf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook, which, pkgconfig, mono }: +{ stdenv, fetchurl, which, pkgconfig, mono }: stdenv.mkDerivation rec { name = "mono-zeroconf-${version}"; diff --git a/pkgs/development/libraries/mpich2/default.nix b/pkgs/development/libraries/mpich2/default.nix index 6c5a0e5279ce949c172954e1f40c70bce12dea13..b5a36c184ff742882257dab2378fb92a11f7be50 100644 --- a/pkgs/development/libraries/mpich2/default.nix +++ b/pkgs/development/libraries/mpich2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python, perl, gfortran +{ stdenv, fetchurl, perl, gfortran , slurm, openssh, hwloc } : diff --git a/pkgs/development/libraries/mpir/default.nix b/pkgs/development/libraries/mpir/default.nix index b9b25e7f43b3bf0ad85234687b1579e2664a7af1..2ecae98387e1880280c3abfef07d44931261fe05 100644 --- a/pkgs/development/libraries/mpir/default.nix +++ b/pkgs/development/libraries/mpir/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, m4, which, yasm }: +{ stdenv, fetchurl, m4, which, yasm }: stdenv.mkDerivation rec { name = "mpir-${version}"; diff --git a/pkgs/development/libraries/neardal/default.nix b/pkgs/development/libraries/neardal/default.nix index e0adb312677c5b2a1ca4167b60e1b3776ecd7573..65679c7e282517715148de330264e926ebc0bd6f 100644 --- a/pkgs/development/libraries/neardal/default.nix +++ b/pkgs/development/libraries/neardal/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, libtool, gettext, pkgconfig, glib, readline, makeWrapper }: +{ stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, glib, readline, makeWrapper }: stdenv.mkDerivation rec { name = "neardal-0.7-post-git-20150930"; diff --git a/pkgs/development/libraries/ntrack/default.nix b/pkgs/development/libraries/ntrack/default.nix index 3483d4bed778d9e605ae4d349852abfad59f91f4..fb36839fe233789fc8baad5290dd9cf830ba821d 100644 --- a/pkgs/development/libraries/ntrack/default.nix +++ b/pkgs/development/libraries/ntrack/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, glib, qt4, pkgconfig, libnl, python }: +{ stdenv, fetchurl, qt4, pkgconfig, libnl, python }: let version = "016"; diff --git a/pkgs/development/libraries/odpic/default.nix b/pkgs/development/libraries/odpic/default.nix index 94aba672887d0c45980e4a7f037de4a799a2621d..2715ff4dfaffc9a6f8ce51329c8f7ad6b2b3d936 100644 --- a/pkgs/development/libraries/odpic/default.nix +++ b/pkgs/development/libraries/odpic/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, fixDarwinDylibNames, oracle-instantclient, libaio }: +{ stdenv, fetchurl, fixDarwinDylibNames, oracle-instantclient, libaio }: stdenv.mkDerivation rec { name = "odpic-${version}"; diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix index 1d3a9629fd0ce1d64d45a99a5802b827dcc36e19..264c05e1af9dfe80695a9f45b675b346489c0853 100644 --- a/pkgs/development/libraries/opencv/3.x.nix +++ b/pkgs/development/libraries/opencv/3.x.nix @@ -1,5 +1,5 @@ { lib, stdenv -, fetchurl, fetchFromGitHub, fetchpatch +, fetchurl, fetchFromGitHub , cmake, pkgconfig, unzip, zlib, pcre, hdf5 , glog, boost, google-gflags, protobuf , config diff --git a/pkgs/development/libraries/openexr/default.nix b/pkgs/development/libraries/openexr/default.nix index 60ee30177c02068c4af360e0768562658130cd9b..293274a57767c7b334e35e0c6b97b94fa613e904 100644 --- a/pkgs/development/libraries/openexr/default.nix +++ b/pkgs/development/libraries/openexr/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, autoconf, automake, libtool, pkgconfig, zlib, ilmbase }: +{ lib, stdenv, fetchurl, autoconf, automake, libtool, pkgconfig, zlib, ilmbase }: stdenv.mkDerivation rec { name = "openexr-${lib.getVersion ilmbase}"; diff --git a/pkgs/development/libraries/openpam/default.nix b/pkgs/development/libraries/openpam/default.nix index 187f861337568ad56da3f5199f0f36dc4ed12f38..7d84392d204aed7d88bc4cb47a8bb47d789e8ecc 100644 --- a/pkgs/development/libraries/openpam/default.nix +++ b/pkgs/development/libraries/openpam/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPackages, hostPlatform, fetchurl, lib }: +{ stdenv, fetchurl, lib }: stdenv.mkDerivation rec { name = "openpam-${version}"; diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 0251de77d03ebaae9f3ca0fea5cb25d1f4b66cbb..b4b932f8d0589bf95717f54eac90e9e190709c33 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -1,6 +1,5 @@ { stdenv, fetchurl, buildPackages, perl , buildPlatform, hostPlatform -, fetchpatch , withCryptodev ? false, cryptodevHeaders , enableSSL2 ? false }: diff --git a/pkgs/development/libraries/opensubdiv/default.nix b/pkgs/development/libraries/opensubdiv/default.nix index 62c093f310fb11264966ba76844f594e97fd2000..b10e4713019d00acfe16fa8b1f01aa037c6f310e 100644 --- a/pkgs/development/libraries/opensubdiv/default.nix +++ b/pkgs/development/libraries/opensubdiv/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchFromGitHub, cmake, pkgconfig, xorg, libGLU +{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, xorg, libGLU , libGL, glew, ocl-icd, python3 , cudaSupport ? false, cudatoolkit , darwin diff --git a/pkgs/development/libraries/ortp/default.nix b/pkgs/development/libraries/ortp/default.nix index 5dc5df8e95b95acae0f56020e5cd1ecea7459d35..e58e347c7f3e5cc91affb05261e43d64aecf5fa7 100644 --- a/pkgs/development/libraries/ortp/default.nix +++ b/pkgs/development/libraries/ortp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, fetchFromGitHub, bctoolbox }: +{ stdenv, cmake, fetchFromGitHub, bctoolbox }: stdenv.mkDerivation rec { baseName = "ortp"; diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix index 9a27901c862d5d78a4e6e3eea5adfe448a0e8cbc..0dd507d6bb4d0e5b5fb247209925e65eb1c71f0e 100644 --- a/pkgs/development/libraries/pango/default.nix +++ b/pkgs/development/libraries/pango/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, libXft, cairo, harfbuzz +{ stdenv, fetchurl, pkgconfig, libXft, cairo, harfbuzz , libintl, gobjectIntrospection, darwin }: diff --git a/pkgs/development/libraries/pcre2/default.nix b/pkgs/development/libraries/pcre2/default.nix index 73e7fd42cdba8800f71648ecc04aa6c67f824965..e0819cde679b6650be11974ae20a16dad665c0de 100644 --- a/pkgs/development/libraries/pcre2/default.nix +++ b/pkgs/development/libraries/pcre2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch }: +{ stdenv, fetchurl }: stdenv.mkDerivation rec { name = "pcre2-${version}"; diff --git a/pkgs/development/libraries/physics/herwig/default.nix b/pkgs/development/libraries/physics/herwig/default.nix index 9993060eb728b4ec87616bff0a8e0404b09d11f3..a8655c2dcbe3b58204b2c66953a5b9cfe82c01c2 100644 --- a/pkgs/development/libraries/physics/herwig/default.nix +++ b/pkgs/development/libraries/physics/herwig/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchpatch, fetchurl, boost, fastjet, gfortran, gsl, lhapdf, thepeg, zlib, autoconf, automake, libtool }: +{ stdenv, fetchurl, boost, fastjet, gfortran, gsl, lhapdf, thepeg, zlib, autoconf, automake, libtool }: stdenv.mkDerivation rec { name = "herwig-${version}"; diff --git a/pkgs/development/libraries/physics/mcgrid/default.nix b/pkgs/development/libraries/physics/mcgrid/default.nix index 32a05d10d3a67f19cc95cffeb878042ad1bd11cf..b287e52b24313a01636ca54b9d5edcb9db27773b 100644 --- a/pkgs/development/libraries/physics/mcgrid/default.nix +++ b/pkgs/development/libraries/physics/mcgrid/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fastnlo, rivet, pkgconfig, sherpa }: +{ stdenv, fetchurl, fastnlo, rivet, pkgconfig }: stdenv.mkDerivation rec { name = "mcgrid-${version}"; diff --git a/pkgs/development/libraries/physics/nlojet/default.nix b/pkgs/development/libraries/physics/nlojet/default.nix index 0c9d879fbd096a79f7fce8dc592e668c343b57ff..2f79a2b76ab9c93fb3647ab4d6bab27752c1ae03 100644 --- a/pkgs/development/libraries/physics/nlojet/default.nix +++ b/pkgs/development/libraries/physics/nlojet/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch }: +{ stdenv, fetchurl }: stdenv.mkDerivation rec { name = "nlojet++-${version}"; diff --git a/pkgs/development/libraries/physics/yoda/default.nix b/pkgs/development/libraries/physics/yoda/default.nix index eb34b94118a97ca0af5824711fc19efe446a3596..1dacdba1b1ce3f807949961a9eed462a8a255c8d 100644 --- a/pkgs/development/libraries/physics/yoda/default.nix +++ b/pkgs/development/libraries/physics/yoda/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, python2Packages, root, makeWrapper, zlib, withRootSupport ? false }: +{ stdenv, fetchurl, python2Packages, root, makeWrapper, zlib, withRootSupport ? false }: stdenv.mkDerivation rec { name = "yoda-${version}"; diff --git a/pkgs/development/libraries/postgis/default.nix b/pkgs/development/libraries/postgis/default.nix index aa9a3f9fdc0a7a989314376674fcafd33486765e..a577d318523dbdc881972de87580d479e99ec169 100644 --- a/pkgs/development/libraries/postgis/default.nix +++ b/pkgs/development/libraries/postgis/default.nix @@ -1,12 +1,10 @@ { fetchurl -, fetchpatch , stdenv , perl , libxml2 , postgresql , geos , proj -, flex , gdal , json_c , pkgconfig diff --git a/pkgs/development/libraries/protobuf/generic.nix b/pkgs/development/libraries/protobuf/generic.nix index 06154e0008ba54893989a1364604cd533aae448b..1a20d806b968b2ebfcc5f3eb707152cad82f9528 100644 --- a/pkgs/development/libraries/protobuf/generic.nix +++ b/pkgs/development/libraries/protobuf/generic.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, version, src +{ stdenv, version, src , autoreconfHook, zlib, gtest , ... }: diff --git a/pkgs/development/libraries/qimageblitz/default.nix b/pkgs/development/libraries/qimageblitz/default.nix index 4e74e31e3ec824a7c67e5f4073ff2b19fb5e3841..51253676341ff2355c6eb40e47da00b7ef6913b4 100644 --- a/pkgs/development/libraries/qimageblitz/default.nix +++ b/pkgs/development/libraries/qimageblitz/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, lib, cmake, qt4}: +{stdenv, fetchurl, cmake, qt4}: let pn = "qimageblitz"; diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix index 4227575acb091fb2bb9a0a668f18ef088c857ab4..01d0fc510aaaebffa1895608e3d35e566a716d0d 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchurl, fetchpatch, substituteAll , hostPlatform -, libXrender, libXinerama, libXcursor, libXmu, libXv, libXext +, libXrender, libXinerama, libXcursor, libXv, libXext , libXfixes, libXrandr, libSM, freetype, fontconfig, zlib, libjpeg, libpng -, libmng, which, libGLSupported, libGL, libGLU, openssl, dbus, cups, pkgconfig +, libmng, which, libGLSupported, libGLU, openssl, dbus, cups, pkgconfig , libtiff, glib, icu, mysql, postgresql, sqlite, perl, coreutils, libXi , buildMultimedia ? stdenv.isLinux, alsaLib, gstreamer, gst-plugins-base , buildWebkit ? (stdenv.isLinux || stdenv.isDarwin) diff --git a/pkgs/development/libraries/qt-5/5.11/default.nix b/pkgs/development/libraries/qt-5/5.11/default.nix index 5407a79cd77505d00e8fc72869f1eac505e93f78..2a706fc7b6e8de18101f594c53a6fe920710f140 100644 --- a/pkgs/development/libraries/qt-5/5.11/default.nix +++ b/pkgs/development/libraries/qt-5/5.11/default.nix @@ -17,7 +17,7 @@ top-level attribute to `top-level/all-packages.nix`. { newScope, - stdenv, fetchurl, fetchFromGitHub, makeSetupHook, makeWrapper, + stdenv, fetchurl, fetchFromGitHub, makeSetupHook, bison, cups ? null, harfbuzz, libGL, perl, gstreamer, gst-plugins-base, gtk3, dconf, diff --git a/pkgs/development/libraries/qt-5/5.6/default.nix b/pkgs/development/libraries/qt-5/5.6/default.nix index b9ed5eddd5cf6531bd42f023019540d975b41857..8732b1061342f539e71b2211b30085f85614611b 100644 --- a/pkgs/development/libraries/qt-5/5.6/default.nix +++ b/pkgs/development/libraries/qt-5/5.6/default.nix @@ -26,7 +26,7 @@ existing packages here and modify it as necessary. { newScope, - stdenv, fetchurl, makeSetupHook, makeWrapper, + stdenv, fetchurl, makeSetupHook, bison, cups ? null, harfbuzz, libGL, perl, gstreamer, gst-plugins-base, diff --git a/pkgs/development/libraries/qt-5/5.9/default.nix b/pkgs/development/libraries/qt-5/5.9/default.nix index e109fe447aa235f5600a8e45dafda6c9564b99f9..755e6a9487e76acffc2b7bd9d3f4c4968f119c5b 100644 --- a/pkgs/development/libraries/qt-5/5.9/default.nix +++ b/pkgs/development/libraries/qt-5/5.9/default.nix @@ -17,7 +17,7 @@ top-level attribute to `top-level/all-packages.nix`. { newScope, - stdenv, fetchurl, makeSetupHook, makeWrapper, + stdenv, fetchurl, makeSetupHook, bison, cups ? null, harfbuzz, libGL, perl, gstreamer, gst-plugins-base, gtk3, dconf, diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix index 15e19c77567a01746ac2a166535f0b1e58db4569..0d9cb81afda93fc560e4311b6b3cf3025b225d51 100644 --- a/pkgs/development/libraries/qt-5/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix @@ -3,14 +3,14 @@ src, patches, version, qtCompatVersion, coreutils, bison, flex, gdb, gperf, lndir, patchelf, perl, pkgconfig, python2, - ruby, which, + which, # darwin support - darwin, libiconv, libcxx, + darwin, libiconv, dbus, fontconfig, freetype, glib, harfbuzz, icu, libX11, libXcomposite, libXcursor, libXext, libXi, libXrender, libinput, libjpeg, libpng, libtiff, libxcb, libxkbcommon, libxml2, libxslt, openssl, pcre16, pcre2, sqlite, udev, - xcbutil, xcbutilimage, xcbutilkeysyms, xcbutilrenderutil, xcbutilwm, xorg, + xcbutil, xcbutilimage, xcbutilkeysyms, xcbutilrenderutil, xcbutilwm, zlib, # optional dependencies diff --git a/pkgs/development/libraries/qt-5/modules/qtmultimedia.nix b/pkgs/development/libraries/qt-5/modules/qtmultimedia.nix index 1b7a7c1fceaaeb761bc4076e59948e9abbf28bfe..d0bab88b2f21442866d4eb5a852da3f8909cf74c 100644 --- a/pkgs/development/libraries/qt-5/modules/qtmultimedia.nix +++ b/pkgs/development/libraries/qt-5/modules/qtmultimedia.nix @@ -1,6 +1,5 @@ { qtModule, stdenv, qtbase, qtdeclarative, pkgconfig , alsaLib, gstreamer, gst-plugins-base, libpulseaudio -, darwin }: with stdenv.lib; diff --git a/pkgs/development/libraries/qt-5/modules/qtserialport.nix b/pkgs/development/libraries/qt-5/modules/qtserialport.nix index 2f8c142323d224a825be3ca0d778a2f674703171..516d38340dc5364e1da4b1eec2d4f0419808b939 100644 --- a/pkgs/development/libraries/qt-5/modules/qtserialport.nix +++ b/pkgs/development/libraries/qt-5/modules/qtserialport.nix @@ -1,4 +1,4 @@ -{ qtModule, stdenv, lib, qtbase, substituteAll, systemd }: +{ qtModule, stdenv, lib, qtbase, systemd }: let inherit (lib) getLib optional; in diff --git a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix index 8691e20ec45217eb911324be801a6bda8429e6a5..62da679157f017f991c395a88d5a56b2825e0b3e 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix @@ -4,7 +4,6 @@ , sqlite, systemd, glib, gst_all_1, cmake , bison2, flex, gdb, gperf, perl, pkgconfig, python2, ruby , darwin -, substituteAll , flashplayerFix ? false , src ? null , version ? null diff --git a/pkgs/development/libraries/qt-5/qt-env.nix b/pkgs/development/libraries/qt-5/qt-env.nix index 49585f601d146d6859531d0192e0c8daf445e0f0..da56c07779b9cfe6c35aa4e841e3c659a2f8334e 100644 --- a/pkgs/development/libraries/qt-5/qt-env.nix +++ b/pkgs/development/libraries/qt-5/qt-env.nix @@ -1,4 +1,4 @@ -{ lib, buildEnv, qtbase }: name: paths: +{ buildEnv, qtbase }: name: paths: buildEnv { inherit name; diff --git a/pkgs/development/libraries/qtstyleplugins/default.nix b/pkgs/development/libraries/qtstyleplugins/default.nix index a8611b3124053472a81317c9e33a802f88667bfb..b94cdd22f7f05e9976ac7c5e33594e354fc7a05e 100644 --- a/pkgs/development/libraries/qtstyleplugins/default.nix +++ b/pkgs/development/libraries/qtstyleplugins/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, qmake, qtbase, pkgconfig, gtk2 }: +{ stdenv, fetchFromGitHub, qmake, pkgconfig, gtk2 }: stdenv.mkDerivation rec { name = "qtstyleplugins-2017-03-11"; diff --git a/pkgs/development/libraries/quazip/default.nix b/pkgs/development/libraries/quazip/default.nix index 8d096e18f08fc364b863b9ecfa9bc87abd434b97..ae858738ec1665eef2f3c0e1025192618d01b37b 100644 --- a/pkgs/development/libraries/quazip/default.nix +++ b/pkgs/development/libraries/quazip/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, zip, zlib, qtbase, qmake }: +{ fetchurl, stdenv, zlib, qtbase, qmake }: stdenv.mkDerivation rec { name = "quazip-0.7.3"; diff --git a/pkgs/development/libraries/quickder/default.nix b/pkgs/development/libraries/quickder/default.nix index 77e76ad638abf981d794b87b70241179b706d5c8..35d16ee5e19b60e6aa23b2b49b117922989152f6 100644 --- a/pkgs/development/libraries/quickder/default.nix +++ b/pkgs/development/libraries/quickder/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchurl, python2Packages, hexio +{ stdenv, fetchFromGitHub, python2Packages, hexio , which, cmake, bash, arpa2cm, git, asn2quickder, pkgconfig }: stdenv.mkDerivation rec { diff --git a/pkgs/development/libraries/rocksdb/default.nix b/pkgs/development/libraries/rocksdb/default.nix index 90389055a415af4fc920e031b163fbbb3525e8db..786fce0fb6381c96ebbbc90c8cdfb4e63feff347 100644 --- a/pkgs/development/libraries/rocksdb/default.nix +++ b/pkgs/development/libraries/rocksdb/default.nix @@ -5,7 +5,6 @@ # Optional Arguments , snappy ? null, google-gflags ? null, zlib ? null, bzip2 ? null, lz4 ? null -, numactl ? null # Malloc implementation , jemalloc ? null, gperftools ? null diff --git a/pkgs/development/libraries/science/math/arpack/default.nix b/pkgs/development/libraries/science/math/arpack/default.nix index 77cb7cf1f2b6f875056e78627fa3e8bb6814a7bb..55c1a641fc3d2dea7670be67df2e9229aba4e435 100644 --- a/pkgs/development/libraries/science/math/arpack/default.nix +++ b/pkgs/development/libraries/science/math/arpack/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, copyPathsToStore, fetchurl, autoconf, automake, gettext, libtool +{ stdenv, fetchurl, autoconf, automake, gettext, libtool , gfortran, openblas }: with stdenv.lib; diff --git a/pkgs/development/libraries/science/math/caffe2/default.nix b/pkgs/development/libraries/science/math/caffe2/default.nix index 916bf122b3c244f87c30920db6e9bfcc46301bb5..c1994533b78d8ec8d164384c6149e05d748f3546 100644 --- a/pkgs/development/libraries/science/math/caffe2/default.nix +++ b/pkgs/development/libraries/science/math/caffe2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, config, fetchFromGitHub, fetchpatch +{ stdenv, lib, config, fetchFromGitHub , cmake , glog, google-gflags, gtest , protobuf, snappy diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix index fc8f11f2f11eba438303c72c203199888d46dc68..a9aa528a840945f17cd9abc970946bcfc156ee3f 100644 --- a/pkgs/development/libraries/science/math/openblas/default.nix +++ b/pkgs/development/libraries/science/math/openblas/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, gfortran, perl, which, config, coreutils +{ stdenv, fetchurl, gfortran, perl, which, coreutils # Most packages depending on openblas expect integer width to match # pointer width, but some expect to use 32-bit integers always # (for compatibility with reference BLAS). diff --git a/pkgs/development/libraries/science/networking/ns3/default.nix b/pkgs/development/libraries/science/networking/ns3/default.nix index 3601066cb22f28d0a4b85dd8c53947d9938b7f7a..632380328db168dc2a049eab4e84546fd70f28f8 100644 --- a/pkgs/development/libraries/science/networking/ns3/default.nix +++ b/pkgs/development/libraries/science/networking/ns3/default.nix @@ -1,5 +1,5 @@ { stdenv -, fetchFromGitHub, fetchurl +, fetchFromGitHub , python # for binding generation diff --git a/pkgs/development/libraries/serf/default.nix b/pkgs/development/libraries/serf/default.nix index dfaf1c679dd79c14c319e9e28de15a5b72e35ad2..f794c3841b93278ac518a75c90e6aebe5fdd34fd 100644 --- a/pkgs/development/libraries/serf/default.nix +++ b/pkgs/development/libraries/serf/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, apr, scons, openssl, aprutil, zlib, kerberos -, pkgconfig, gnused, expat, openldap, libiconv }: +, pkgconfig, libiconv }: stdenv.mkDerivation rec { name = "serf-1.3.9"; diff --git a/pkgs/development/libraries/smpeg2/default.nix b/pkgs/development/libraries/smpeg2/default.nix index 3207bdb3a7f2775608edbf80b024186c07779bf7..9004378647173d7f29d2800148c3fe8304d6f8f5 100644 --- a/pkgs/development/libraries/smpeg2/default.nix +++ b/pkgs/development/libraries/smpeg2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, darwin, fetchsvn, autoconf, automake, libtool, m4, pkgconfig, makeWrapper, SDL2 }: +{ stdenv, darwin, fetchsvn, autoconf, automake, pkgconfig, makeWrapper, SDL2 }: stdenv.mkDerivation rec { name = "smpeg2-svn${version}"; diff --git a/pkgs/development/libraries/speech-tools/default.nix b/pkgs/development/libraries/speech-tools/default.nix index 22d66b7e71d1f7d323973ef3f95ba2ff825dda65..771ad033ed915a99183b6dcc8a2f43ecc61b9b72 100644 --- a/pkgs/development/libraries/speech-tools/default.nix +++ b/pkgs/development/libraries/speech-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gawk, alsaLib, ncurses }: +{ stdenv, fetchurl, alsaLib, ncurses }: stdenv.mkDerivation rec { name = "speech_tools-${version}.0"; diff --git a/pkgs/development/libraries/spice/default.nix b/pkgs/development/libraries/spice/default.nix index 0b815f9095f9cb44053bd6523a06d462807d17c3..ba3791a8a8bdb48401feb5fdf73a34c53cfc245f 100644 --- a/pkgs/development/libraries/spice/default.nix +++ b/pkgs/development/libraries/spice/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, pixman, celt, alsaLib +{ stdenv, fetchurl, pkgconfig, pixman, celt, alsaLib , openssl, libXrandr, libXfixes, libXext, libXrender, libXinerama , libjpeg, zlib, spice-protocol, python, pyparsing, glib, cyrus_sasl , lz4 }: diff --git a/pkgs/development/libraries/tachyon/default.nix b/pkgs/development/libraries/tachyon/default.nix index 0185bd2733b40dc98f7afec639d8baef6aadf663..4f711a639f7311de8d6ae56240f20b68dbd99b3f 100644 --- a/pkgs/development/libraries/tachyon/default.nix +++ b/pkgs/development/libraries/tachyon/default.nix @@ -1,6 +1,5 @@ { stdenv , fetchurl -, fetchpatch , Carbon ? null , libjpeg ? null , libpng ? null diff --git a/pkgs/development/libraries/ti-rpc/default.nix b/pkgs/development/libraries/ti-rpc/default.nix index 99f0bb65441c2e71296e83fee867b6cc2e3846ce..24251cf0cc1d2039a285697315b0b206321e9813 100644 --- a/pkgs/development/libraries/ti-rpc/default.nix +++ b/pkgs/development/libraries/ti-rpc/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, fetchpatch, stdenv, autoreconfHook, libkrb5 }: +{ fetchurl, stdenv, autoreconfHook, libkrb5 }: stdenv.mkDerivation rec { name = "libtirpc-1.0.3"; diff --git a/pkgs/development/libraries/unicorn-emu/default.nix b/pkgs/development/libraries/unicorn-emu/default.nix index 9f9d8e62de5061b4850fd29e87929d81f5f97075..aa4a7890b23ef27b7aa6161828b46770b525b0fe 100644 --- a/pkgs/development/libraries/unicorn-emu/default.nix +++ b/pkgs/development/libraries/unicorn-emu/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, bash, pkgconfig, python }: +{ stdenv, fetchurl, pkgconfig, python }: stdenv.mkDerivation rec { name = "unicorn-emulator-${version}"; diff --git a/pkgs/development/libraries/v8/3.14.nix b/pkgs/development/libraries/v8/3.14.nix index 9112079a90eaa6c46159e6b64896717c30b61419..ce666becc85535951517c62d1d5b8eed3ebff4de 100644 --- a/pkgs/development/libraries/v8/3.14.nix +++ b/pkgs/development/libraries/v8/3.14.nix @@ -1,5 +1,5 @@ # This old version of V8 is still needed for the R V8 module -{ stdenv, callPackage, fetchFromGitHub, gyp, readline, python, which, icu, ... }: +{ stdenv, fetchFromGitHub, gyp, readline, python, which, icu, ... }: assert readline != null; diff --git a/pkgs/development/libraries/vigra/default.nix b/pkgs/development/libraries/vigra/default.nix index 438b4eda454bf92b7b9039e63239dc0feca4cafc..14211ea65e9aba7b5dd7e041d5a361e49b8c38bf 100644 --- a/pkgs/development/libraries/vigra/default.nix +++ b/pkgs/development/libraries/vigra/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, boost, cmake, doxygen, fftw, fftwSinglePrec, hdf5, ilmbase +{ stdenv, fetchurl, boost, cmake, fftw, fftwSinglePrec, hdf5, ilmbase , libjpeg, libpng, libtiff, openexr, python2Packages }: let diff --git a/pkgs/development/libraries/vtk/default.nix b/pkgs/development/libraries/vtk/default.nix index 984a106236ce07b135ec3c22ddce79fef5e67e2b..bdfe3d1c5c60af1b2ce2031d167aa58c02c27308 100644 --- a/pkgs/development/libraries/vtk/default.nix +++ b/pkgs/development/libraries/vtk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, cmake, libGLU_combined, libX11, xproto, libXt +{ stdenv, fetchurl, cmake, libGLU_combined, libX11, xproto, libXt , qtLib ? null # Darwin support , Cocoa, CoreServices, DiskArbitration, IOKit, CFNetwork, Security, GLUT, OpenGL diff --git a/pkgs/development/libraries/wavpack/default.nix b/pkgs/development/libraries/wavpack/default.nix index 29a27e53f22558b00a52e5568bfb0350b78e60a3..9eb3254001d59664ab698705f32a0c88ac59c20b 100644 --- a/pkgs/development/libraries/wavpack/default.nix +++ b/pkgs/development/libraries/wavpack/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, libiconv }: +{ stdenv, fetchurl, libiconv }: stdenv.mkDerivation rec { name = "wavpack-${version}"; diff --git a/pkgs/development/libraries/wayland/1.9.nix b/pkgs/development/libraries/wayland/1.9.nix index d832becbed88f1f7454822618362fb00b967a6d0..3555a92322855ba50c536caa3b03ea66bd3833ca 100644 --- a/pkgs/development/libraries/wayland/1.9.nix +++ b/pkgs/development/libraries/wayland/1.9.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkgconfig -, libffi, docbook_xsl, doxygen, graphviz, libxslt, xmlto, libxml2 +, libffi, libxml2 , expat ? null # Build wayland-scanner (currently cannot be disabled as of 1.7.0) }: diff --git a/pkgs/development/libraries/wayland/default.nix b/pkgs/development/libraries/wayland/default.nix index bbc33f33e701475e4d61578214fce7f9cf201f1b..fce0dae6c7313ed98a77f2af589e5bb1f67e71d2 100644 --- a/pkgs/development/libraries/wayland/default.nix +++ b/pkgs/development/libraries/wayland/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkgconfig -, libffi, docbook_xsl, doxygen, graphviz, libxslt, xmlto, libxml2 +, libffi, libxml2 , expat ? null # Build wayland-scanner (currently cannot be disabled as of 1.7.0) }: diff --git a/pkgs/development/libraries/wlc/default.nix b/pkgs/development/libraries/wlc/default.nix index 2b9244ff1b184d198bade434d543484e8ddb2f40..572adfeb0bb698f08455f8b35c3030158f464271 100644 --- a/pkgs/development/libraries/wlc/default.nix +++ b/pkgs/development/libraries/wlc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, cmake, pkgconfig +{ stdenv, fetchFromGitHub, cmake, pkgconfig , wayland, pixman, libxkbcommon, libinput, xcbutilwm, xcbutilimage, libGL , libX11, dbus, wayland-protocols, libdrm, mesa_noglu , libpthreadstubs, libXdmcp, libXext, libXfixes diff --git a/pkgs/development/libraries/xcb-util-cursor/HEAD.nix b/pkgs/development/libraries/xcb-util-cursor/HEAD.nix index 17f8646b51770357501906f582ebf24d5911267f..e343c301127fa2fcdf12799648c2d513f8ad0cdc 100644 --- a/pkgs/development/libraries/xcb-util-cursor/HEAD.nix +++ b/pkgs/development/libraries/xcb-util-cursor/HEAD.nix @@ -1,5 +1,5 @@ { stdenv, fetchgit, autoconf, automake, libtool, pkgconfig -, git, xorg, gnum4, libxcb, gperf }: +, xorg, gnum4, libxcb, gperf }: stdenv.mkDerivation rec { name = "xcb-util-cursor-0.1.1-3-unstable-${version}"; diff --git a/pkgs/development/libraries/xgboost/default.nix b/pkgs/development/libraries/xgboost/default.nix index 7865724efa4073d54c05c38d24df6c200720bce3..63dee2529fe295bd1c2056f5fa27a64e365761dc 100644 --- a/pkgs/development/libraries/xgboost/default.nix +++ b/pkgs/development/libraries/xgboost/default.nix @@ -1,5 +1,4 @@ { stdenv, lib, fetchgit, cmake -, avxSupport ? false , cudaSupport ? false, cudatoolkit , ncclSupport ? false, nccl , llvmPackages diff --git a/pkgs/development/libraries/xine-lib/default.nix b/pkgs/development/libraries/xine-lib/default.nix index 274a70057bdd708f90ce770c049484b31e5a1cf0..69b5b95e7613a965d32493ba9d2a8a3c2c2e5435 100644 --- a/pkgs/development/libraries/xine-lib/default.nix +++ b/pkgs/development/libraries/xine-lib/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, xorg, alsaLib, libGLU_combined, aalib -, libvorbis, libtheora, speex, zlib, libdvdcss, perl, ffmpeg +, libvorbis, libtheora, speex, zlib, perl, ffmpeg , flac, libcaca, libpulseaudio, libmng, libcdio, libv4l, vcdimager , libmpcdec }: diff --git a/pkgs/development/lisp-modules/clwrapper/default.nix b/pkgs/development/lisp-modules/clwrapper/default.nix index c834ab7a305b16b52ca1ac54a1558020bee72cc4..019a44482b9a0b721abe300215d9185a928a51f9 100644 --- a/pkgs/development/lisp-modules/clwrapper/default.nix +++ b/pkgs/development/lisp-modules/clwrapper/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, asdf, which, bash, lisp ? null}: +{stdenv, asdf, which, bash, lisp ? null}: stdenv.mkDerivation { name = "cl-wrapper-script"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix index 1dc2488f55a25b8dcdd142fcf528d411aa9ce4b4..91493d7431e82da8eb193820315334e7191ab066 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix @@ -1,4 +1,4 @@ -{pkgs, buildLispPackage, clwrapper, quicklisp-to-nix-packages}: +{pkgs, quicklisp-to-nix-packages}: let addNativeLibs = libs: x: { propagatedBuildInputs = libs; }; skipBuildPhase = x: { diff --git a/pkgs/development/misc/loc/default.nix b/pkgs/development/misc/loc/default.nix index efa76ea00a0e2691d6c2c6f5426156528e8d5f5e..b43deeceb8679a4ea50e2c11ef587ba601369520 100644 --- a/pkgs/development/misc/loc/default.nix +++ b/pkgs/development/misc/loc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform, makeWrapper }: +{ stdenv, fetchFromGitHub, rustPlatform }: with rustPlatform; diff --git a/pkgs/development/mobile/titaniumenv/default.nix b/pkgs/development/mobile/titaniumenv/default.nix index 6765a9cc5c30ad93aaf5854e0a702eca8ecbefba..b09a483290f76c89d23944a43fd9d2127ff57c05 100644 --- a/pkgs/development/mobile/titaniumenv/default.nix +++ b/pkgs/development/mobile/titaniumenv/default.nix @@ -1,4 +1,4 @@ -{pkgs, pkgs_i686, xcodeVersion ? "9.2", xcodeBaseDir ? "/Applications/Xcode.app", tiVersion ? "7.1.0.GA"}: +{pkgs, xcodeVersion ? "9.2", xcodeBaseDir ? "/Applications/Xcode.app", tiVersion ? "7.1.0.GA"}: rec { androidenv = pkgs.androidenv; diff --git a/pkgs/development/mobile/titaniumenv/examples/simulate-kitchensink/default.nix b/pkgs/development/mobile/titaniumenv/examples/simulate-kitchensink/default.nix index 5bdd0fd63c5adcaa1baae65dc03c463797893ff9..bbd94cb7882ad59ef0c0d25fcfa50912ce0e2877 100644 --- a/pkgs/development/mobile/titaniumenv/examples/simulate-kitchensink/default.nix +++ b/pkgs/development/mobile/titaniumenv/examples/simulate-kitchensink/default.nix @@ -1,4 +1,4 @@ -{stdenv, xcodeenv, kitchensink, bundleId}: +{xcodeenv, kitchensink, bundleId}: xcodeenv.simulateApp { name = "simulate-${kitchensink.name}"; diff --git a/pkgs/development/mobile/titaniumenv/titaniumsdk-6.3.nix b/pkgs/development/mobile/titaniumenv/titaniumsdk-6.3.nix index 53963c100c74eb79757705423d67b8ea09432b8c..26adf373826e14300ed480ba52bb453afefae2ec 100644 --- a/pkgs/development/mobile/titaniumenv/titaniumsdk-6.3.nix +++ b/pkgs/development/mobile/titaniumenv/titaniumsdk-6.3.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, unzip, makeWrapper, python, jdk}: +{stdenv, fetchurl, unzip, makeWrapper}: stdenv.mkDerivation { name = "mobilesdk-6.3.1.GA"; diff --git a/pkgs/development/mobile/titaniumenv/titaniumsdk-7.1.nix b/pkgs/development/mobile/titaniumenv/titaniumsdk-7.1.nix index 61c23a6d0b375dc3d8e88e843c58624922e04f29..a6de1f0ae8c6815f2359671d4144bfbbfa8da49e 100644 --- a/pkgs/development/mobile/titaniumenv/titaniumsdk-7.1.nix +++ b/pkgs/development/mobile/titaniumenv/titaniumsdk-7.1.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, unzip, makeWrapper, python, jdk}: +{stdenv, fetchurl, unzip, makeWrapper}: let # Gradle is a build system that bootstraps itself. This is what it actually diff --git a/pkgs/development/ocaml-modules/atdgen/default.nix b/pkgs/development/ocaml-modules/atdgen/default.nix index bab2541fd74444daca3b5d387295f1b9c2d4f3ad..291dd03c8d11412fec61d7e4431a82b0f4e30e85 100644 --- a/pkgs/development/ocaml-modules/atdgen/default.nix +++ b/pkgs/development/ocaml-modules/atdgen/default.nix @@ -1,4 +1,4 @@ -{stdenv, atd, yojson, menhir, easy-format, biniou, cppo, buildOcaml, fetchurl, which}: +{stdenv, atd, yojson, biniou, buildOcaml, fetchurl, which}: buildOcaml rec { name = "atdgen"; diff --git a/pkgs/development/ocaml-modules/bap/default.nix b/pkgs/development/ocaml-modules/bap/default.nix index 8882bbf66474bcff8c4b55c261901c7e2b240d1c..72c426ce0372d765198d1595a6585e35c75f12f3 100644 --- a/pkgs/development/ocaml-modules/bap/default.nix +++ b/pkgs/development/ocaml-modules/bap/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, fetchurl, fetchpatch , ocaml, findlib, ocamlbuild, ocaml_oasis, - bitstring, camlzip, cmdliner, core_kernel, ezjsonm, faillib, fileutils, ocaml_lwt, ocamlgraph, ocurl, re, uri, zarith, piqi, piqi-ocaml, uuidm, llvm_38, ulex, easy-format, xmlm, frontc, ounit, ppx_jane, parsexp, + bitstring, camlzip, cmdliner, core_kernel, ezjsonm, faillib, fileutils, ocaml_lwt, ocamlgraph, ocurl, re, uri, zarith, piqi, piqi-ocaml, uuidm, llvm_38, frontc, ounit, ppx_jane, parsexp, utop, which, makeWrapper, writeText }: diff --git a/pkgs/development/ocaml-modules/bin_prot/default.nix b/pkgs/development/ocaml-modules/bin_prot/default.nix index 4a2b9846271bdb868d48edfc2610fa519975eadf..1acb17a8f7a34184c7f4e48fd9426f53720ebfae 100644 --- a/pkgs/development/ocaml-modules/bin_prot/default.nix +++ b/pkgs/development/ocaml-modules/bin_prot/default.nix @@ -1,4 +1,4 @@ -{stdenv, writeText, buildOcaml, fetchurl, type_conv}: +{stdenv, buildOcaml, fetchurl, type_conv}: buildOcaml rec { name = "bin_prot"; diff --git a/pkgs/development/ocaml-modules/cohttp/default.nix b/pkgs/development/ocaml-modules/cohttp/default.nix index 24f0e9bfd7a5a57d70be1e78078eaf7e78764b2d..962525b47e42dd27baf11c36f7c21dc6f5ea5079 100644 --- a/pkgs/development/ocaml-modules/cohttp/default.nix +++ b/pkgs/development/ocaml-modules/cohttp/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, ocaml, findlib, jbuilder , ppx_fields_conv, ppx_sexp_conv, ppx_deriving -, base64, fieldslib, jsonm, logs, re, stringext, uri +, base64, fieldslib, jsonm, re, stringext, uri }: stdenv.mkDerivation rec { diff --git a/pkgs/development/ocaml-modules/cstruct/1.9.0.nix b/pkgs/development/ocaml-modules/cstruct/1.9.0.nix index 25f84826ec18dc5b316898ee0b933f958634d448..0122ec9ff61dab0dbb2a4294770ac51cb45247c9 100644 --- a/pkgs/development/ocaml-modules/cstruct/1.9.0.nix +++ b/pkgs/development/ocaml-modules/cstruct/1.9.0.nix @@ -1,4 +1,4 @@ -{ stdenv, writeText, fetchFromGitHub, ocaml, ocamlbuild, ocplib-endian, sexplib, findlib, ppx_tools +{ stdenv, fetchFromGitHub, ocaml, ocamlbuild, ocplib-endian, sexplib, findlib, ppx_tools , async ? null, lwt ? null }: diff --git a/pkgs/development/ocaml-modules/eliom/default.nix b/pkgs/development/ocaml-modules/eliom/default.nix index 8b304aadd9efdbb3276107b376449f12b36e70e8..f82cf33e3079454703d7f7e61d81cf4219664272 100644 --- a/pkgs/development/ocaml-modules/eliom/default.nix +++ b/pkgs/development/ocaml-modules/eliom/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, which, ocsigen_server, ocsigen_deriving, ocaml, camlp4, - js_of_ocaml, lwt_react, cryptokit, + lwt_react, cryptokit, ipaddr, ocamlnet, lwt_ssl, ocaml_pcre, opaline, ppx_tools, ppx_deriving, findlib , js_of_ocaml-ocamlbuild, js_of_ocaml-ppx, js_of_ocaml-ppx_deriving_json diff --git a/pkgs/development/ocaml-modules/erm_xmpp/0.3.nix b/pkgs/development/ocaml-modules/erm_xmpp/0.3.nix index a7290c8bb98f337ce2c3214e1d33cb9d599182ce..1a8f854185a2f0173478dd42b7436cc5bbfccbcd 100644 --- a/pkgs/development/ocaml-modules/erm_xmpp/0.3.nix +++ b/pkgs/development/ocaml-modules/erm_xmpp/0.3.nix @@ -1,4 +1,4 @@ -{ stdenv, buildOcaml, fetchFromGitHub, fetchurl, ocaml, findlib, erm_xml, nocrypto }: +{ stdenv, buildOcaml, fetchFromGitHub, ocaml, findlib, erm_xml, nocrypto }: buildOcaml rec { version = "0.3"; diff --git a/pkgs/development/ocaml-modules/git-unix/default.nix b/pkgs/development/ocaml-modules/git-unix/default.nix index 189388efe324fbab0918591eaa0d0127e79f0c05..afeb3f1957b0e4412b76440196771aca693af5bb 100644 --- a/pkgs/development/ocaml-modules/git-unix/default.nix +++ b/pkgs/development/ocaml-modules/git-unix/default.nix @@ -1,6 +1,6 @@ { stdenv, ocaml, findlib, jbuilder, git-http , cohttp-lwt-unix -, tls, magic-mime, cmdliner, mtime +, tls, cmdliner, mtime }: stdenv.mkDerivation rec { diff --git a/pkgs/development/ocaml-modules/git/default.nix b/pkgs/development/ocaml-modules/git/default.nix index 6f0f0d0b120b855d7f972b83f7f4e07e94460193..0bf43174412c5bd21c176d0a7e12cd4feafd36f9 100644 --- a/pkgs/development/ocaml-modules/git/default.nix +++ b/pkgs/development/ocaml-modules/git/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ocaml, findlib, jbuilder, opam +{ stdenv, fetchFromGitHub, ocaml, findlib, jbuilder , astring, decompress, fmt, hex, logs, mstruct, ocaml_lwt, ocamlgraph, uri , alcotest, mtime, nocrypto }: diff --git a/pkgs/development/ocaml-modules/janestreet/async-extra.nix b/pkgs/development/ocaml-modules/janestreet/async-extra.nix index 4a283cc9910b34a7aeb53f15bbcd3364e3d27489..19eef7cf1825781b82b671177e3874778d9a35e5 100644 --- a/pkgs/development/ocaml-modules/janestreet/async-extra.nix +++ b/pkgs/development/ocaml-modules/janestreet/async-extra.nix @@ -1,4 +1,4 @@ -{stdenv, buildOcamlJane, fetchurl, async_kernel, async_unix, +{stdenv, buildOcamlJane, async_kernel, async_unix, bin_prot, core, ppx_custom_printf, fieldslib, herelib, pipebang, sexplib, async_rpc_kernel}: diff --git a/pkgs/development/ocaml-modules/janestreet/async-kernel.nix b/pkgs/development/ocaml-modules/janestreet/async-kernel.nix index 4d7213a8603e35731034d953064cff7474e0a8a1..938f5ccf4474c32c2fb041ed2167f16e6577086c 100644 --- a/pkgs/development/ocaml-modules/janestreet/async-kernel.nix +++ b/pkgs/development/ocaml-modules/janestreet/async-kernel.nix @@ -1,6 +1,6 @@ -{stdenv, buildOcamlJane, fetchurl, core_kernel, +{stdenv, buildOcamlJane, core_kernel, bin_prot, fieldslib, - sexplib, herelib, opam, js_build_tools, ocaml_oasis}: + sexplib, herelib}: buildOcamlJane rec { name = "async_kernel"; diff --git a/pkgs/development/ocaml-modules/janestreet/async-unix.nix b/pkgs/development/ocaml-modules/janestreet/async-unix.nix index 5621d2ec704b5db8af43a3b331edf48047e834ad..7db7cae27096feb03c848b72ed153f5cfe62987a 100644 --- a/pkgs/development/ocaml-modules/janestreet/async-unix.nix +++ b/pkgs/development/ocaml-modules/janestreet/async-unix.nix @@ -1,4 +1,4 @@ -{stdenv, buildOcamlJane, fetchurl, async_kernel, +{stdenv, buildOcamlJane, async_kernel, bin_prot, comparelib, core, fieldslib, herelib, pipebang, sexplib}: diff --git a/pkgs/development/ocaml-modules/janestreet/async.nix b/pkgs/development/ocaml-modules/janestreet/async.nix index 2e776e273be11ceb42e9d638e4dc820f8bcd83de..4cd67e1af86b7822271f2475dbe9127aaa34fcb6 100644 --- a/pkgs/development/ocaml-modules/janestreet/async.nix +++ b/pkgs/development/ocaml-modules/janestreet/async.nix @@ -1,4 +1,4 @@ -{stdenv, buildOcamlJane, fetchurl, async_kernel, +{stdenv, buildOcamlJane, async_kernel, async_unix, async_extra}: buildOcamlJane rec { diff --git a/pkgs/development/ocaml-modules/janestreet/async_ssl.nix b/pkgs/development/ocaml-modules/janestreet/async_ssl.nix index bc1977ce2d6934e670b930d4e458d687004b73eb..631562159762313359e545f6106042d77aec93b9 100644 --- a/pkgs/development/ocaml-modules/janestreet/async_ssl.nix +++ b/pkgs/development/ocaml-modules/janestreet/async_ssl.nix @@ -1,5 +1,5 @@ -{ stdenv, ocaml, buildOcamlJane, fetchurl, async, comparelib, core, ctypes -, openssl, fieldslib, herelib, pipebang, sexplib, ocaml_oasis, integers +{ stdenv, buildOcamlJane, async, comparelib, core, ctypes +, openssl, fieldslib, herelib, pipebang, sexplib, ocaml_oasis }: buildOcamlJane rec { diff --git a/pkgs/development/ocaml-modules/janestreet/core-extended.nix b/pkgs/development/ocaml-modules/janestreet/core-extended.nix index dc84ea34337e944e2949e6aad54d29627f27f6e3..5410167e0a2625ef5697c7576b1c85ab75fa46e5 100644 --- a/pkgs/development/ocaml-modules/janestreet/core-extended.nix +++ b/pkgs/development/ocaml-modules/janestreet/core-extended.nix @@ -1,9 +1,8 @@ -{stdenv, buildOcamlJane, fetchurl, +{stdenv, buildOcamlJane, core, bin_prot, fieldslib, sexplib, typerep, variantslib, ppx_assert, ppx_bench, ppx_driver, ppx_expect, ppx_inline_test, ppx_jane, - re2, textutils, - ocaml_oasis, opam, js_build_tools}: + re2, textutils}: buildOcamlJane rec { name = "core_extended"; diff --git a/pkgs/development/ocaml-modules/janestreet/core.nix b/pkgs/development/ocaml-modules/janestreet/core.nix index 05ea4d5d566b5869b4ed738947b122bb9baa09be..c2f97badda93d63eeb8983765256bf834dd6e279 100644 --- a/pkgs/development/ocaml-modules/janestreet/core.nix +++ b/pkgs/development/ocaml-modules/janestreet/core.nix @@ -1,8 +1,7 @@ -{stdenv, buildOcamlJane, fetchurl, +{stdenv, buildOcamlJane, core_kernel, bin_prot, fieldslib, sexplib, typerep, variantslib, - ppx_assert, ppx_bench, ppx_driver, ppx_expect, ppx_inline_test, ppx_jane, - ocaml_oasis, opam, js_build_tools}: + ppx_assert, ppx_bench, ppx_driver, ppx_expect, ppx_inline_test, ppx_jane}: buildOcamlJane rec { name = "core"; diff --git a/pkgs/development/ocaml-modules/janestreet/core_kernel.nix b/pkgs/development/ocaml-modules/janestreet/core_kernel.nix index 93fcdde5bb384f8576fb7243b3aac26638ba12ce..e5bbb7800520c6c34a874a16aec406e9da24b8c8 100644 --- a/pkgs/development/ocaml-modules/janestreet/core_kernel.nix +++ b/pkgs/development/ocaml-modules/janestreet/core_kernel.nix @@ -1,7 +1,6 @@ -{stdenv, buildOcamlJane, fetchurl, +{stdenv, buildOcamlJane, bin_prot, fieldslib, sexplib, typerep, variantslib, - ppx_assert, ppx_bench, ppx_driver, ppx_expect, ppx_inline_test, ppx_jane, - ocaml_oasis, opam, js_build_tools}: + ppx_assert, ppx_bench, ppx_driver, ppx_expect, ppx_inline_test, ppx_jane}: buildOcamlJane rec { name = "core_kernel"; diff --git a/pkgs/development/ocaml-modules/janestreet/default.nix b/pkgs/development/ocaml-modules/janestreet/default.nix index a4c3c15160d1a679ad27ddb084b94d3e3791569b..a05d49245b257d0694db04c52b7a8b27c7a843fd 100644 --- a/pkgs/development/ocaml-modules/janestreet/default.nix +++ b/pkgs/development/ocaml-modules/janestreet/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, janePackage, ocaml, ocamlbuild, angstrom, cryptokit, ctypes, +{ stdenv, janePackage, ocamlbuild, angstrom, cryptokit, ctypes, magic-mime, ocaml-migrate-parsetree, octavius, ounit, ppx_deriving, re, zarith, num, openssl , ppxlib diff --git a/pkgs/development/ocaml-modules/mysql/default.nix b/pkgs/development/ocaml-modules/mysql/default.nix index 5482d7ac87cd6dbbf6ee054bb031472be57c2714..1986f7e48f69e35feb7ad80f457bcd9b7ec52b06 100644 --- a/pkgs/development/ocaml-modules/mysql/default.nix +++ b/pkgs/development/ocaml-modules/mysql/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, ocaml, findlib, mysql, openssl }: +{ stdenv, fetchurl, fetchpatch, ocaml, findlib, mysql }: # TODO: la versione stabile da' un errore di compilazione dovuto a # qualche cambiamento negli header .h diff --git a/pkgs/development/ocaml-modules/ocaml-cairo/default.nix b/pkgs/development/ocaml-modules/ocaml-cairo/default.nix index 165dda1fa0271503a66710fb39fe3d4950799c9f..e1590bb0c9ae0ad6712780ea122e1b24e5d45ea6 100644 --- a/pkgs/development/ocaml-modules/ocaml-cairo/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-cairo/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, automake, ocaml, autoconf, gnum4, pkgconfig, freetype, lablgtk, unzip, cairo, findlib, gdk_pixbuf, glib, gtk2, pango }: +{stdenv, fetchurl, automake, ocaml, autoconf, gnum4, pkgconfig, freetype, lablgtk, unzip, cairo, findlib, gdk_pixbuf, gtk2, pango }: let pname = "ocaml-cairo"; diff --git a/pkgs/development/ocaml-modules/piqi-ocaml/default.nix b/pkgs/development/ocaml-modules/piqi-ocaml/default.nix index 165a566b1b71ac800367849c2e90d245c859c98e..38b56ac7beb1e0ff370eb7fd42ca1f7c6e26cd05 100644 --- a/pkgs/development/ocaml-modules/piqi-ocaml/default.nix +++ b/pkgs/development/ocaml-modules/piqi-ocaml/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, piqi, ulex, easy-format, xmlm, camlp4 }: +{ stdenv, fetchurl, ocaml, findlib, piqi, camlp4 }: stdenv.mkDerivation rec { version = "0.7.5"; diff --git a/pkgs/development/ocaml-modules/ppx_import/default.nix b/pkgs/development/ocaml-modules/ppx_import/default.nix index 3948cfce0e8e0632170b6641c9079fd184a12db4..1f53b8712828388c3b11864dadd5f8dd329afbe4 100644 --- a/pkgs/development/ocaml-modules/ppx_import/default.nix +++ b/pkgs/development/ocaml-modules/ppx_import/default.nix @@ -1,5 +1,5 @@ -{stdenv, fetchFromGitHub, buildOcaml, ocaml, opaline, - cppo, ppx_tools, ounit, ppx_deriving}: +{stdenv, fetchFromGitHub, buildOcaml, opaline, + cppo, ounit, ppx_deriving}: buildOcaml rec { name = "ppx_import"; diff --git a/pkgs/development/ocaml-modules/re2/default.nix b/pkgs/development/ocaml-modules/re2/default.nix index 9b26c4040959922a5ec6f7ace8f6057f1fa92202..2b7d9855665f7b68078675f3622cb0ba15598c3f 100644 --- a/pkgs/development/ocaml-modules/re2/default.nix +++ b/pkgs/development/ocaml-modules/re2/default.nix @@ -1,4 +1,4 @@ -{stdenv, buildOcaml, fetchurl, ocaml, core_p4, pa_ounit, pa_test, +{stdenv, buildOcaml, fetchurl, core_p4, pa_ounit, pa_test, bin_prot_p4, comparelib, sexplib_p4, rsync}: buildOcaml rec { diff --git a/pkgs/development/ocaml-modules/tls/default.nix b/pkgs/development/ocaml-modules/tls/default.nix index 1e031b135d29ea64f8fdc9388d7654e672619079..181946802d7084080c4d47fdd254b89aa8f615c0 100644 --- a/pkgs/development/ocaml-modules/tls/default.nix +++ b/pkgs/development/ocaml-modules/tls/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, topkg -, ppx_tools, ppx_sexp_conv, result, x509, nocrypto, cstruct, ppx_cstruct, cstruct-unix, ounit +, ppx_sexp_conv, result, x509, nocrypto, cstruct, ppx_cstruct, cstruct-unix, ounit , lwt ? null}: with stdenv.lib; diff --git a/pkgs/development/perl-modules/MNI/default.nix b/pkgs/development/perl-modules/MNI/default.nix index 176cd06a9cc35303a52763050788f8b75c407a22..dbb167e27b32c43147bd1f46796234d918e38f72 100644 --- a/pkgs/development/perl-modules/MNI/default.nix +++ b/pkgs/development/perl-modules/MNI/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, buildPerlPackage, stdenv, perl }: +{ fetchFromGitHub, buildPerlPackage, stdenv }: buildPerlPackage rec { name = "MNI-Perllib-2012-04-13"; diff --git a/pkgs/development/pharo/vm/build-vm.nix b/pkgs/development/pharo/vm/build-vm.nix index 82b3da7a37c4682efe7ca83189fb96915d8a3fa8..b59be96bb6211a14892b6c08aeb328287ffc9aee 100644 --- a/pkgs/development/pharo/vm/build-vm.nix +++ b/pkgs/development/pharo/vm/build-vm.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, bash, unzip, glibc, openssl, gcc, libGLU_combined, freetype, xorg, alsaLib, cairo, libuuid, autoreconfHook, gcc48, ... }: +{ stdenv, fetchurl, bash, unzip, glibc, openssl, libGLU_combined, freetype, xorg, alsaLib, cairo, libuuid, autoreconfHook, gcc48, ... }: { name, src, version, source-date, source-url, ... }: diff --git a/pkgs/development/pure-modules/gen/default.nix b/pkgs/development/pure-modules/gen/default.nix index e8c1a948fe929040f06df1dcd486c4a9d418fceb..22bbb4d3be41de8d3ba9ecdba0988cbcc8aea709 100644 --- a/pkgs/development/pure-modules/gen/default.nix +++ b/pkgs/development/pure-modules/gen/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, +{ stdenv, fetchurl, pkgconfig, pure, haskellPackages }: stdenv.mkDerivation rec { diff --git a/pkgs/development/pure-modules/glpk/default.nix b/pkgs/development/pure-modules/glpk/default.nix index e86f08b57ca905791f25c2613031e8b0995732e5..7b615928da9aa474cd8a4f008d8b1f5262a6ab4d 100644 --- a/pkgs/development/pure-modules/glpk/default.nix +++ b/pkgs/development/pure-modules/glpk/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, - pkgconfig, pure, glpk, gmp, libtool, mysql, libiodbc, zlib }: + pkgconfig, pure, glpk, gmp, libtool, mysql, libiodbc }: stdenv.mkDerivation rec { baseName = "glpk"; diff --git a/pkgs/development/python-modules/Cython/default.nix b/pkgs/development/python-modules/Cython/default.nix index 124e8b80ba024136e7602c84d7d925b2319806b2..fa07eee0d7e14a2f23b4772810e70ce923250a6c 100644 --- a/pkgs/development/python-modules/Cython/default.nix +++ b/pkgs/development/python-modules/Cython/default.nix @@ -2,7 +2,6 @@ , stdenv , buildPythonPackage , fetchPypi -, isPy3k , python , glibcLocales , pkgconfig diff --git a/pkgs/development/python-modules/GeoIP/default.nix b/pkgs/development/python-modules/GeoIP/default.nix index 4f0a7d4aebc26b64b48cbdeed86abcd6e48b47fd..550fa1da3edf7b559ea7087a9daa6ba599e00460 100644 --- a/pkgs/development/python-modules/GeoIP/default.nix +++ b/pkgs/development/python-modules/GeoIP/default.nix @@ -1,5 +1,4 @@ -{lib, buildPythonPackage, fetchPypi, isPy3k, incremental, ipaddress, twisted -, automat, zope_interface, idna, pyopenssl, service-identity, pytest, mock, lsof +{lib, buildPythonPackage, fetchPypi , geoip, nose}: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/JPype1/default.nix b/pkgs/development/python-modules/JPype1/default.nix index 13bddd3ffb8f6b244013800569e864eb9e056c6d..879cdb9bd095806d109181f958bb963d7eb1de05 100644 --- a/pkgs/development/python-modules/JPype1/default.nix +++ b/pkgs/development/python-modules/JPype1/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k }: +{ buildPythonPackage, fetchPypi, isPy3k }: buildPythonPackage rec { pname = "JPype1"; diff --git a/pkgs/development/python-modules/PyLD/default.nix b/pkgs/development/python-modules/PyLD/default.nix index 29a792000e9954a162c2b43611d2b78475b5caac..48878995bb4e8584ec9387b2e0c6c95816943c45 100644 --- a/pkgs/development/python-modules/PyLD/default.nix +++ b/pkgs/development/python-modules/PyLD/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage, fetchFromGitHub, python, gnugrep }: +{ stdenv, buildPythonPackage, fetchFromGitHub, python, gnugrep }: let diff --git a/pkgs/development/python-modules/Theano/default.nix b/pkgs/development/python-modules/Theano/default.nix index 30c820ec6c19d1b87a2cd58b1683e971e2c1b526..e2b31cdda7942c9d158a26300ab91deda3120480 100644 --- a/pkgs/development/python-modules/Theano/default.nix +++ b/pkgs/development/python-modules/Theano/default.nix @@ -9,7 +9,6 @@ , isPy3k , nose , numpy -, pydot_ng , scipy , six , libgpuarray diff --git a/pkgs/development/python-modules/acme/default.nix b/pkgs/development/python-modules/acme/default.nix index cd81a7facc2276272f35546059c0a2488d1b6bfb..820ee2a95d81aa36f9d51765587b58a6f0706309 100644 --- a/pkgs/development/python-modules/acme/default.nix +++ b/pkgs/development/python-modules/acme/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi +{ buildPythonPackage , certbot , nose , cryptography diff --git a/pkgs/development/python-modules/aiohttp-jinja2/default.nix b/pkgs/development/python-modules/aiohttp-jinja2/default.nix index f0756e1572e72790aaac9d59e2d39df3cc7a4bd9..9f307f24dfaf369d2cb013a228e4edf5a45e78af 100644 --- a/pkgs/development/python-modules/aiohttp-jinja2/default.nix +++ b/pkgs/development/python-modules/aiohttp-jinja2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, aiohttp, jinja2, pytest, pytest-aiohttp }: +{ lib, buildPythonPackage, fetchPypi, aiohttp, jinja2, pytest, pytest-aiohttp }: buildPythonPackage rec { pname = "aiohttp-jinja2"; diff --git a/pkgs/development/python-modules/aiohttp/cors.nix b/pkgs/development/python-modules/aiohttp/cors.nix index 3065bb17c05d33ddd354ca2b73894515943cafa8..00198cd27cffaa4247d8baa86ec8ccb17d49992a 100644 --- a/pkgs/development/python-modules/aiohttp/cors.nix +++ b/pkgs/development/python-modules/aiohttp/cors.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pythonOlder +{ lib, buildPythonPackage, fetchPypi, pythonOlder , typing, aiohttp }: diff --git a/pkgs/development/python-modules/aiohue/default.nix b/pkgs/development/python-modules/aiohue/default.nix index 2ad260f5d40697b966c59550baf54495eb34a3c1..1492a15aadf384448d736d7827b35cc6ec7a0787 100644 --- a/pkgs/development/python-modules/aiohue/default.nix +++ b/pkgs/development/python-modules/aiohue/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, aiohttp }: +{ lib, buildPythonPackage, fetchPypi, aiohttp }: buildPythonPackage rec { pname = "aiohue"; diff --git a/pkgs/development/python-modules/anyjson/default.nix b/pkgs/development/python-modules/anyjson/default.nix index ba32cf7ea695d1580633bd893095862682188cc3..6db4bbdc31486f8de15929bf60ec9d4751d6dfb3 100644 --- a/pkgs/development/python-modules/anyjson/default.nix +++ b/pkgs/development/python-modules/anyjson/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPy3k, nose }: +{ buildPythonPackage, fetchPypi, isPy3k, nose }: buildPythonPackage rec { pname = "anyjson"; diff --git a/pkgs/development/python-modules/application/default.nix b/pkgs/development/python-modules/application/default.nix index 32314b81edca51cbe824f69d6c24099f231debad..584eb3ae2c52199e112d0d777aa89ab379343bd4 100644 --- a/pkgs/development/python-modules/application/default.nix +++ b/pkgs/development/python-modules/application/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchdarcs, zope_interface, isPy3k }: +{ buildPythonPackage, fetchdarcs, zope_interface, isPy3k }: buildPythonPackage rec { pname = "python-application"; diff --git a/pkgs/development/python-modules/area53/default.nix b/pkgs/development/python-modules/area53/default.nix index 808ddc57096d2246eb1555b57201c3ad93921008..20013b8a1ed44ecd7133e7e7086eb80142fec522 100644 --- a/pkgs/development/python-modules/area53/default.nix +++ b/pkgs/development/python-modules/area53/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi +{ buildPythonPackage, fetchPypi , boto }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/argcomplete/default.nix b/pkgs/development/python-modules/argcomplete/default.nix index 28b88d3b46a0e04f57be7d3753a751b8ed33d19a..37d97f42aa1fe8c2ec08d621aee4851bb431a701 100644 --- a/pkgs/development/python-modules/argcomplete/default.nix +++ b/pkgs/development/python-modules/argcomplete/default.nix @@ -1,5 +1,5 @@ { buildPythonPackage, fetchPypi, lib, - coverage, dicttoxml, flake8, pexpect, prettytable, requests_toolbelt + dicttoxml, pexpect, prettytable, requests_toolbelt }: buildPythonPackage rec { pname = "argcomplete"; diff --git a/pkgs/development/python-modules/argon2_cffi/default.nix b/pkgs/development/python-modules/argon2_cffi/default.nix index f46efd9f496ec5516f220164cd4f6a16a4242779..ce371076256e929a5c4ba726b2dd2b3944848cc2 100644 --- a/pkgs/development/python-modules/argon2_cffi/default.nix +++ b/pkgs/development/python-modules/argon2_cffi/default.nix @@ -1,5 +1,4 @@ -{ lib -, cffi +{ cffi , six , hypothesis , pytest diff --git a/pkgs/development/python-modules/asana/default.nix b/pkgs/development/python-modules/asana/default.nix index fd89457ed310b30dc348d0553d86b92700fe96b6..2fbe4932bedacd6089377556d8e8197ce26e7f0c 100644 --- a/pkgs/development/python-modules/asana/default.nix +++ b/pkgs/development/python-modules/asana/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, pytest, requests, requests_oauthlib, six +{ buildPythonPackage, pytest, requests, requests_oauthlib, six , fetchFromGitHub, responses, stdenv }: diff --git a/pkgs/development/python-modules/async_timeout/default.nix b/pkgs/development/python-modules/async_timeout/default.nix index bc8e375271d6a029862bda00b265dd06b1ea3e34..ee15be954186a1e5ca04ea35e99db2396e727e02 100644 --- a/pkgs/development/python-modules/async_timeout/default.nix +++ b/pkgs/development/python-modules/async_timeout/default.nix @@ -1,7 +1,6 @@ { lib , fetchPypi , buildPythonPackage -, pytestrunner , pythonOlder }: diff --git a/pkgs/development/python-modules/asyncio/default.nix b/pkgs/development/python-modules/asyncio/default.nix index c3ed7bed7426f35b96e95f4607a90978704a6d81..489a31b3242c1297a62f9e1d54e8fdb5fe028871 100644 --- a/pkgs/development/python-modules/asyncio/default.nix +++ b/pkgs/development/python-modules/asyncio/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPy33, pythonOlder }: +{ stdenv, buildPythonPackage, fetchPypi, pythonOlder }: buildPythonPackage rec { pname = "asyncio"; diff --git a/pkgs/development/python-modules/asynctest/default.nix b/pkgs/development/python-modules/asynctest/default.nix index 0004badd6f402c65648bbc4d52219e2e1c893bf4..187e0924ccacda52c68ead8d846399370fbf485a 100644 --- a/pkgs/development/python-modules/asynctest/default.nix +++ b/pkgs/development/python-modules/asynctest/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, fetchFromGitHub, pythonOlder, python }: +{ lib, buildPythonPackage, fetchPypi, pythonOlder, python }: buildPythonPackage rec { pname = "asynctest"; diff --git a/pkgs/development/python-modules/autograd/default.nix b/pkgs/development/python-modules/autograd/default.nix index 1c3c1fdefbeabd8918b5df952fecc4e8ac226765..bf7c35fa69895a1a1a9089fcbfac480477483f9a 100644 --- a/pkgs/development/python-modules/autograd/default.nix +++ b/pkgs/development/python-modules/autograd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, numpy, future, nose }: +{ stdenv, buildPythonPackage, fetchPypi, numpy, future }: buildPythonPackage rec { pname = "autograd"; diff --git a/pkgs/development/python-modules/behave/default.nix b/pkgs/development/python-modules/behave/default.nix index a4a7b63b8a3f0e2c2e285565acc249fc6e76453c..6fc3f16b3ad225d41766ce10afa972dcda0f3644 100644 --- a/pkgs/development/python-modules/behave/default.nix +++ b/pkgs/development/python-modules/behave/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchPypi -, buildPythonApplication, isPy27, python, pythonOlder +, buildPythonApplication, python, pythonOlder , mock, nose, pathpy, pyhamcrest, pytest , glibcLocales, parse, parse-type, six , traceback2 diff --git a/pkgs/development/python-modules/bootstrapped-pip/default.nix b/pkgs/development/python-modules/bootstrapped-pip/default.nix index 240dd5513e85c4b0e37fb1f35b354001d8057b76..2a9cb2a2cfdf9a8a5bfb70506bc27d5f99ddbe27 100644 --- a/pkgs/development/python-modules/bootstrapped-pip/default.nix +++ b/pkgs/development/python-modules/bootstrapped-pip/default.nix @@ -1,4 +1,4 @@ -{ stdenv, python, fetchPypi, fetchurl, makeWrapper, unzip }: +{ stdenv, python, fetchPypi, makeWrapper, unzip }: let wheel_source = fetchPypi { diff --git a/pkgs/development/python-modules/bottleneck/default.nix b/pkgs/development/python-modules/bottleneck/default.nix index 791b05e81cad26f573bad4148c05191fdc65658c..c9ca8f7ec0473525797ffe17463ad516a252418f 100644 --- a/pkgs/development/python-modules/bottleneck/default.nix +++ b/pkgs/development/python-modules/bottleneck/default.nix @@ -1,5 +1,4 @@ -{ lib -, buildPythonPackage +{ buildPythonPackage , fetchPypi , nose , numpy diff --git a/pkgs/development/python-modules/browsermob-proxy/default.nix b/pkgs/development/python-modules/browsermob-proxy/default.nix index 5a9bae58bd6d4843acf48ec9ec4601e356f43bae..b5da73a32d21e66b9bb2bbdbac8953784b9eb29e 100644 --- a/pkgs/development/python-modules/browsermob-proxy/default.nix +++ b/pkgs/development/python-modules/browsermob-proxy/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , buildPythonPackage , fetchPypi , requests diff --git a/pkgs/development/python-modules/bz2file/default.nix b/pkgs/development/python-modules/bz2file/default.nix index 3bc9882585f6399b5b8458598f8b487d2468d62e..8efb1c083f26da9f0e7b0dbb0d185e0e7f8b9102 100644 --- a/pkgs/development/python-modules/bz2file/default.nix +++ b/pkgs/development/python-modules/bz2file/default.nix @@ -1,6 +1,5 @@ { lib , buildPythonPackage -, isPy3k , fetchPypi }: diff --git a/pkgs/development/python-modules/cachetools/default.nix b/pkgs/development/python-modules/cachetools/default.nix index de15ffaabc69325ad812599e2b95c547780edf41..d4b9195c5558ec375cf51a4d10846aad04e96dbe 100644 --- a/pkgs/development/python-modules/cachetools/default.nix +++ b/pkgs/development/python-modules/cachetools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPyPy }: +{ stdenv, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "cachetools"; diff --git a/pkgs/development/python-modules/can/default.nix b/pkgs/development/python-modules/can/default.nix index 395122b4da9e1de350f3ad176506a5691a6e57b2..f85f80ea23991fba45b269513d1c4c4416322529 100644 --- a/pkgs/development/python-modules/can/default.nix +++ b/pkgs/development/python-modules/can/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , buildPythonPackage , fetchPypi , pyserial diff --git a/pkgs/development/python-modules/canmatrix/default.nix b/pkgs/development/python-modules/canmatrix/default.nix index 99ac6c3ec45baf86fee1964979d6a94e3c8e265e..3e07188986d07665da787e0d240b52ab297be3b4 100644 --- a/pkgs/development/python-modules/canmatrix/default.nix +++ b/pkgs/development/python-modules/canmatrix/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , buildPythonPackage , fetchFromGitHub , python diff --git a/pkgs/development/python-modules/canopen/default.nix b/pkgs/development/python-modules/canopen/default.nix index 08ae54e0b73bb72484052a765918cc9eb877831c..1afe23416331b5638233679bd8597be3a9c3d379 100644 --- a/pkgs/development/python-modules/canopen/default.nix +++ b/pkgs/development/python-modules/canopen/default.nix @@ -1,7 +1,5 @@ { lib -, stdenv , buildPythonPackage -, fetchPypi , fetchFromGitHub , nose , can diff --git a/pkgs/development/python-modules/cdecimal/default.nix b/pkgs/development/python-modules/cdecimal/default.nix index 2c0b0e623ca96e0e6b92511b5e258d2cff99c2f9..0c636e1208847af2e44ee98a029e60addb2896cf 100644 --- a/pkgs/development/python-modules/cdecimal/default.nix +++ b/pkgs/development/python-modules/cdecimal/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, wget, buildPythonPackage, isPy3k }: +{ stdenv, fetchurl, buildPythonPackage, isPy3k }: with stdenv.lib; diff --git a/pkgs/development/python-modules/cffi/default.nix b/pkgs/development/python-modules/cffi/default.nix index 724769422761514d2c3b9e4328979869e31cbca4..3f1456f6e948dfb021dd052e32fa5d1f736c6a1c 100644 --- a/pkgs/development/python-modules/cffi/default.nix +++ b/pkgs/development/python-modules/cffi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, isPy27, isPyPy, fetchPypi, libffi, pycparser, pytest }: +{ stdenv, buildPythonPackage, isPyPy, fetchPypi, libffi, pycparser, pytest }: if isPyPy then null else buildPythonPackage rec { pname = "cffi"; diff --git a/pkgs/development/python-modules/cftime/default.nix b/pkgs/development/python-modules/cftime/default.nix index 0e355723604e4a388bf68c045b1b4af40bdddb3d..425a53987caf73585efc457480f72b5477a61822 100644 --- a/pkgs/development/python-modules/cftime/default.nix +++ b/pkgs/development/python-modules/cftime/default.nix @@ -1,5 +1,4 @@ -{ lib -, buildPythonPackage +{ buildPythonPackage , fetchPypi , pytest , coveralls diff --git a/pkgs/development/python-modules/chainer/default.nix b/pkgs/development/python-modules/chainer/default.nix index b07a205ba2158aaedbdae5c8ae526c6f71e927c6..cc75649119bd404db03f35d6861471e0df81de41 100644 --- a/pkgs/development/python-modules/chainer/default.nix +++ b/pkgs/development/python-modules/chainer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, python +{ stdenv, lib , buildPythonPackage, fetchPypi, isPy3k , filelock, protobuf, numpy, pytest, mock , cupy, cudaSupport ? false diff --git a/pkgs/development/python-modules/characteristic/default.nix b/pkgs/development/python-modules/characteristic/default.nix index f004e6d541c5ef4f60f9119b16569b95e81a6dfd..1c42b1283eee6bf7ae462c4a2bf949ab51de78e5 100644 --- a/pkgs/development/python-modules/characteristic/default.nix +++ b/pkgs/development/python-modules/characteristic/default.nix @@ -1,5 +1,4 @@ -{ lib -, buildPythonPackage +{ buildPythonPackage , fetchPypi , pytest }: diff --git a/pkgs/development/python-modules/circus/default.nix b/pkgs/development/python-modules/circus/default.nix index 7e6cc206cdc0b8e28301af199bce779048073154..0a82238b703e32f49fda47d5af3a294c7dae2d83 100644 --- a/pkgs/development/python-modules/circus/default.nix +++ b/pkgs/development/python-modules/circus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi +{ buildPythonPackage, fetchPypi , iowait, psutil, pyzmq, tornado, mock }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/cmd2/default.nix b/pkgs/development/python-modules/cmd2/default.nix index e83fd4163e4a7a6376fb0e3ff9c30c0707ee3186..967941666c8488a18af10d75a4f71955e381d62a 100644 --- a/pkgs/development/python-modules/cmd2/default.nix +++ b/pkgs/development/python-modules/cmd2/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchPypi, buildPythonPackage, pythonOlder, isPy3k , pyperclip, six, pyparsing, vim, wcwidth, colorama -, contextlib2 ? null, subprocess32 ? null -, pytest, mock, which, fetchFromGitHub, glibcLocales +, contextlib2 ? null +, pytest, mock, which, glibcLocales }: buildPythonPackage rec { pname = "cmd2"; diff --git a/pkgs/development/python-modules/cmd2/old.nix b/pkgs/development/python-modules/cmd2/old.nix index 5ffa51def0d2799d7d02bd212e80634a0118b235..7778e73f92f756f60e05de811c0a32e5dd4c68fc 100644 --- a/pkgs/development/python-modules/cmd2/old.nix +++ b/pkgs/development/python-modules/cmd2/old.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage, pythonOlder +{ stdenv, buildPythonPackage, pythonOlder , pyperclip, six, pyparsing, vim , contextlib2 ? null, subprocess32 ? null , pytest, mock, which, fetchFromGitHub, glibcLocales diff --git a/pkgs/development/python-modules/coinmarketcap/default.nix b/pkgs/development/python-modules/coinmarketcap/default.nix index cfd6389ce5fb43071cfb7dc8028dfc40b500f4fc..bcf3271479657f67b96123b4b2cca8bb9f470af0 100644 --- a/pkgs/development/python-modules/coinmarketcap/default.nix +++ b/pkgs/development/python-modules/coinmarketcap/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, requests-cache }: +{ lib, buildPythonPackage, fetchPypi, requests-cache }: buildPythonPackage rec { pname = "coinmarketcap"; diff --git a/pkgs/development/python-modules/colorlover/default.nix b/pkgs/development/python-modules/colorlover/default.nix index 1ccb31d5120a70c3f0b5d45f8401a5c20922c5aa..14bae27592ab71db1bcbada075db8a96ff4a81e1 100644 --- a/pkgs/development/python-modules/colorlover/default.nix +++ b/pkgs/development/python-modules/colorlover/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, fetchPypi, python, stdenv, nose +{ buildPythonPackage, fetchPypi, stdenv }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/configargparse/default.nix b/pkgs/development/python-modules/configargparse/default.nix index 6a52076252e86ec43576faaf45c9b4b423993e05..62e63a8e5b31bb802da376cabb8cdd604a616546 100644 --- a/pkgs/development/python-modules/configargparse/default.nix +++ b/pkgs/development/python-modules/configargparse/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "ConfigArgParse"; diff --git a/pkgs/development/python-modules/configparser/default.nix b/pkgs/development/python-modules/configparser/default.nix index 8e770c504c3b2009e7e6c6faf5b793e781e81563..7bef3e8293515757df358352eebaad9ac4d7fe65 100644 --- a/pkgs/development/python-modules/configparser/default.nix +++ b/pkgs/development/python-modules/configparser/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPy3k }: +{ stdenv, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "configparser"; diff --git a/pkgs/development/python-modules/construct/default.nix b/pkgs/development/python-modules/construct/default.nix index afba2e17bf64b3507793f1d5f0cefc3802b4e7f5..680f6e02cd01bffd6ebeadff91158018fbdbd5e3 100644 --- a/pkgs/development/python-modules/construct/default.nix +++ b/pkgs/development/python-modules/construct/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, six, pytest, pythonOlder }: +{ stdenv, buildPythonPackage, fetchFromGitHub, six, pytest }: buildPythonPackage rec { pname = "construct"; diff --git a/pkgs/development/python-modules/coverage/default.nix b/pkgs/development/python-modules/coverage/default.nix index 4d2a168f79cc0b1f32270b94c57abecfc4187d4a..0aa38aed296d7d7fec6358312a8b6094fbcc2f24 100644 --- a/pkgs/development/python-modules/coverage/default.nix +++ b/pkgs/development/python-modules/coverage/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchPypi -, isPy3k , mock }: diff --git a/pkgs/development/python-modules/cram/default.nix b/pkgs/development/python-modules/cram/default.nix index 232a4a19fd858ed0e65cbcb9cfa3d843f7466d29..f27cfc44e57bd51dd8fb21db2eca4989cc761fa2 100644 --- a/pkgs/development/python-modules/cram/default.nix +++ b/pkgs/development/python-modules/cram/default.nix @@ -1,4 +1,4 @@ -{stdenv, lib, buildPythonPackage, fetchPypi, bash, which, writeText}: +{stdenv, lib, buildPythonPackage, fetchPypi, bash, which}: buildPythonPackage rec { version = "0.7"; diff --git a/pkgs/development/python-modules/credstash/default.nix b/pkgs/development/python-modules/credstash/default.nix index e19850be8ceeff833fecb1db3658700c4f3e882a..db48326535dbd20f0278430082f0d2fab47741ca 100644 --- a/pkgs/development/python-modules/credstash/default.nix +++ b/pkgs/development/python-modules/credstash/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, fetchpatch, cryptography, boto3, pyyaml, docutils, nose }: +{ stdenv, buildPythonPackage, fetchPypi, cryptography, boto3, pyyaml, docutils, nose }: buildPythonPackage rec { pname = "credstash"; diff --git a/pkgs/development/python-modules/cryptography_vectors/default.nix b/pkgs/development/python-modules/cryptography_vectors/default.nix index bcab5c4347595614dbdbd5ea5d15f540a34ce067..6285ac28fce1982847aecb5090b2e622d72ca69b 100644 --- a/pkgs/development/python-modules/cryptography_vectors/default.nix +++ b/pkgs/development/python-modules/cryptography_vectors/default.nix @@ -1,6 +1,5 @@ { buildPythonPackage , fetchPypi -, cryptography }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/cupy/default.nix b/pkgs/development/python-modules/cupy/default.nix index 3a3aeb7b2267059eebb3667bc88ab77cfec15a60..da742b310507deaf9f44847ab82ed34b932152ce 100644 --- a/pkgs/development/python-modules/cupy/default.nix +++ b/pkgs/development/python-modules/cupy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, python, buildPythonPackage +{ stdenv, buildPythonPackage , fetchPypi, isPy3k, linuxPackages, gcc5 , fastrlock, numpy, six, wheel, pytest, mock , cudatoolkit, cudnn, nccl diff --git a/pkgs/development/python-modules/cx_freeze/default.nix b/pkgs/development/python-modules/cx_freeze/default.nix index 69a5e8c11d486ffc39e6437bed59890370ff6755..67120bf0f3d00f4f2441136d4c054f1b2ba6972f 100644 --- a/pkgs/development/python-modules/cx_freeze/default.nix +++ b/pkgs/development/python-modules/cx_freeze/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPyPy, isPy35, ncurses }: +{ stdenv, buildPythonPackage, fetchPypi, ncurses }: buildPythonPackage rec { pname = "cx_Freeze"; diff --git a/pkgs/development/python-modules/datadog/default.nix b/pkgs/development/python-modules/datadog/default.nix index d01029652a98e251a43b8a4664804a131db9a891..47c206fda5e8bfddf4087c88668abfc196844028 100644 --- a/pkgs/development/python-modules/datadog/default.nix +++ b/pkgs/development/python-modules/datadog/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchFromGitHub, isPy3k +{ lib, buildPythonPackage, fetchFromGitHub , decorator, requests, simplejson , nose, mock }: diff --git a/pkgs/development/python-modules/dateparser/default.nix b/pkgs/development/python-modules/dateparser/default.nix index fdc408e1c4c10c7600399035b0aee7fd62c8b168..f6af0855b9f54b1b00d6d379fcd29fe84a0f3f13 100644 --- a/pkgs/development/python-modules/dateparser/default.nix +++ b/pkgs/development/python-modules/dateparser/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchPypi, buildPythonPackage, isPy3k +{ lib, fetchPypi, buildPythonPackage , nose , parameterized , mock diff --git a/pkgs/development/python-modules/debian/default.nix b/pkgs/development/python-modules/debian/default.nix index 937b6df4229272ac285d373cc7528f6cc37b4fac..e4cd21bce4a37d078ec642bf5ec5060fc14c51f3 100644 --- a/pkgs/development/python-modules/debian/default.nix +++ b/pkgs/development/python-modules/debian/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi +{ buildPythonPackage, fetchPypi , chardet, six}: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/defusedxml/default.nix b/pkgs/development/python-modules/defusedxml/default.nix index 6426333ed26a393c6fade1dbdff4071a132f2d4d..328195365006434ac82022fadfac265955bca609 100644 --- a/pkgs/development/python-modules/defusedxml/default.nix +++ b/pkgs/development/python-modules/defusedxml/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi }: +{ buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "defusedxml"; diff --git a/pkgs/development/python-modules/django_tagging/default.nix b/pkgs/development/python-modules/django_tagging/default.nix index 6b048db90e308dedf314fd46d23cbaa4eb1e33b6..fa06117a64495d48f81a680e4e14c7dda14e0e97 100644 --- a/pkgs/development/python-modules/django_tagging/default.nix +++ b/pkgs/development/python-modules/django_tagging/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, django }: +{ buildPythonPackage, fetchPypi, django }: buildPythonPackage rec { pname = "django-tagging"; diff --git a/pkgs/development/python-modules/dkimpy/default.nix b/pkgs/development/python-modules/dkimpy/default.nix index dabc3244592affaf07ab79e16bdfded41f651524..7ce8877bbce01f81c166fa9cc6d9aab5cc943825 100644 --- a/pkgs/development/python-modules/dkimpy/default.nix +++ b/pkgs/development/python-modules/dkimpy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, openssl, makeWrapper, buildPythonPackage +{ stdenv, fetchPypi, openssl, buildPythonPackage , pytest, dnspython, pynacl, authres, python }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/dugong/default.nix b/pkgs/development/python-modules/dugong/default.nix index 27b1a3e6122c399eadd016317184ff1f0da4492f..20f4bc7e0c33f9b96c64b27e642d692a42329792 100644 --- a/pkgs/development/python-modules/dugong/default.nix +++ b/pkgs/development/python-modules/dugong/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, pythonOlder }: +{ buildPythonPackage, fetchPypi, pythonOlder }: buildPythonPackage rec { pname = "dugong"; diff --git a/pkgs/development/python-modules/ecpy/default.nix b/pkgs/development/python-modules/ecpy/default.nix index 334778c93aab4d27e6b0b17fa7850ff7490d272c..97f04828300b8fe7b98f7399086fcc74360d0eab 100644 --- a/pkgs/development/python-modules/ecpy/default.nix +++ b/pkgs/development/python-modules/ecpy/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchPypi, buildPythonPackage, isPy3k, hidapi -, pycrypto, pillow, protobuf, future, ecpy +, pycrypto, pillow, protobuf, future }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/email-validator/default.nix b/pkgs/development/python-modules/email-validator/default.nix index a0a619a39c848e8c3d34863ef9a2bec0344f69ae..99859ac1517543240bbb4562274f80820398da2f 100644 --- a/pkgs/development/python-modules/email-validator/default.nix +++ b/pkgs/development/python-modules/email-validator/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildPythonPackage, fetchPypi, isPy3k, dnspython, idna, ipaddress }: +{ lib, buildPythonPackage, fetchPypi, isPy3k, dnspython, idna, ipaddress }: buildPythonPackage rec { pname = "email_validator"; diff --git a/pkgs/development/python-modules/faulthandler/default.nix b/pkgs/development/python-modules/faulthandler/default.nix index a05ac1ba679eb609f80eeea298ca611ccfb3cc05..c4d600ec994e2e3786e30ac3cfbfc29d48aa61ab 100644 --- a/pkgs/development/python-modules/faulthandler/default.nix +++ b/pkgs/development/python-modules/faulthandler/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage, fetchpatch }: +{ stdenv, fetchPypi, buildPythonPackage }: buildPythonPackage rec { pname = "faulthandler"; diff --git a/pkgs/development/python-modules/feedgen/default.nix b/pkgs/development/python-modules/feedgen/default.nix index c5ac67106a2fe9f890818e42a0d351d283ead9b9..67ff86e8f729257246ddb349d83b1ae938998b59 100644 --- a/pkgs/development/python-modules/feedgen/default.nix +++ b/pkgs/development/python-modules/feedgen/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, fetchurl, dateutil, lxml }: +{ stdenv, buildPythonPackage, fetchPypi, dateutil, lxml }: buildPythonPackage rec { pname = "feedgen"; diff --git a/pkgs/development/python-modules/flake8-future-import/default.nix b/pkgs/development/python-modules/flake8-future-import/default.nix index 2612cfde1f50f7b3c3115e75b892f805311ce035..eaed804245fa50a9946e7237ea8d337ce37b765b 100644 --- a/pkgs/development/python-modules/flake8-future-import/default.nix +++ b/pkgs/development/python-modules/flake8-future-import/default.nix @@ -1,5 +1,4 @@ -{ lib, fetchFromGitHub, buildPythonPackage, python, flake8, six, - fetchurl }: +{ lib, fetchFromGitHub, buildPythonPackage, flake8, six }: buildPythonPackage rec { pname = "flake8-future-import"; diff --git a/pkgs/development/python-modules/flask-migrate/default.nix b/pkgs/development/python-modules/flask-migrate/default.nix index f4fc3cf3fa2420c310eef75ebee47e825f8b0ef9..89cbdf0fbf82019fa82210ffaa7fa19bd519c589 100644 --- a/pkgs/development/python-modules/flask-migrate/default.nix +++ b/pkgs/development/python-modules/flask-migrate/default.nix @@ -1,5 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPy3k, python, glibcLocales, flask, flask_sqlalchemy, flask_script, alembic -}: +{ stdenv, buildPythonPackage, fetchPypi, isPy3k, glibcLocales, flask, flask_sqlalchemy, flask_script, alembic }: with stdenv.lib; diff --git a/pkgs/development/python-modules/flit/default.nix b/pkgs/development/python-modules/flit/default.nix index 17b9d018c397a168797bacee2f021d819369366a..d9a0682a02e00b3aa7d599e768b493b79b0c5ee1 100644 --- a/pkgs/development/python-modules/flit/default.nix +++ b/pkgs/development/python-modules/flit/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchPypi -, fetchurl , isPy3k , docutils , requests diff --git a/pkgs/development/python-modules/fpdf/default.nix b/pkgs/development/python-modules/fpdf/default.nix index c09d54ad555537c7d30715ca73841430cc6fbe08..a528244cb0f9b3c207b49d020eb89aad5ad51762 100644 --- a/pkgs/development/python-modules/fpdf/default.nix +++ b/pkgs/development/python-modules/fpdf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, writeText, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "fpdf"; diff --git a/pkgs/development/python-modules/ftfy/default.nix b/pkgs/development/python-modules/ftfy/default.nix index ca1c9a09e4eb93a5166f19c5c6b2134e8569e894..d2e806e43b901fafa0a29c27c7ed95b882f018a1 100644 --- a/pkgs/development/python-modules/ftfy/default.nix +++ b/pkgs/development/python-modules/ftfy/default.nix @@ -4,8 +4,6 @@ , html5lib , wcwidth , nose -, python -, isPy3k }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/gensim/default.nix b/pkgs/development/python-modules/gensim/default.nix index 3faa6d914d257140be45741ddd2e0aeb4f38b39a..1b3ab52c4c39624c63adc795c219b12925b46a31 100644 --- a/pkgs/development/python-modules/gensim/default.nix +++ b/pkgs/development/python-modules/gensim/default.nix @@ -5,9 +5,6 @@ , six , scipy , smart_open -, scikitlearn -, testfixtures -, unittest2 }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/graph-tool/2.x.x.nix b/pkgs/development/python-modules/graph-tool/2.x.x.nix index 7f2c7a582290d53659a550f09f32fd8741eec77a..aa8050de088552b79df309db0234b8d7355704f3 100644 --- a/pkgs/development/python-modules/graph-tool/2.x.x.nix +++ b/pkgs/development/python-modules/graph-tool/2.x.x.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, python, cairomm, sparsehash, pycairo, autoreconfHook, -pkgconfig, boost, expat, scipy, numpy, cgal, gmp, mpfr, lndir, +pkgconfig, boost, expat, scipy, cgal, gmp, mpfr, gobjectIntrospection, pygobject3, gtk3, matplotlib, ncurses, buildPythonPackage }: diff --git a/pkgs/development/python-modules/h5py/default.nix b/pkgs/development/python-modules/h5py/default.nix index 144e826b675d75a8a1d144d9695b3a0e7160d6ee..2b95b1473cb21c049e16ab63f7f029ecf833d765 100644 --- a/pkgs/development/python-modules/h5py/default.nix +++ b/pkgs/development/python-modules/h5py/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, fetchpatch, isPy27, python, buildPythonPackage +{ stdenv, fetchPypi, isPy27, python, buildPythonPackage , numpy, hdf5, cython, six, pkgconfig, unittest2 , mpi4py ? null, openssh }: diff --git a/pkgs/development/python-modules/hupper/default.nix b/pkgs/development/python-modules/hupper/default.nix index bbd4760bdf893ee246a1656d4c7ab8c166a22f88..5131e64a3c2b77665b28e1a678a4d1d47b018fa0 100644 --- a/pkgs/development/python-modules/hupper/default.nix +++ b/pkgs/development/python-modules/hupper/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, python +{ stdenv, buildPythonPackage, fetchPypi , pytest, pytestcov, watchdog, mock }: diff --git a/pkgs/development/python-modules/hypchat/default.nix b/pkgs/development/python-modules/hypchat/default.nix index b72544611833bced2563c005a63255205d8cd6e4..8337fd2230ba5c52fb13a251ba625e44b17e2b7f 100644 --- a/pkgs/development/python-modules/hypchat/default.nix +++ b/pkgs/development/python-modules/hypchat/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi +{ buildPythonPackage, fetchPypi , requests, six, dateutil }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/hypothesis/default.nix b/pkgs/development/python-modules/hypothesis/default.nix index d5ee59ac2d925988cbc19d1403f8dcf0455c081a..88705962627ff533553cda7f96631018b9383b16 100644 --- a/pkgs/development/python-modules/hypothesis/default.nix +++ b/pkgs/development/python-modules/hypothesis/default.nix @@ -1,6 +1,6 @@ -{ lib, buildPythonPackage, fetchFromGitHub, python +{ lib, buildPythonPackage, fetchFromGitHub , isPy3k, attrs, coverage, enum34 -, doCheck ? true, pytest, pytest_xdist, flake8, flaky, mock +, doCheck ? true, pytest, pytest_xdist, flaky, mock }: buildPythonPackage rec { # http://hypothesis.readthedocs.org/en/latest/packaging.html diff --git a/pkgs/development/python-modules/image-match/default.nix b/pkgs/development/python-modules/image-match/default.nix index 25c3c901a4efa4775e537a4a14084a42e9100b83..49d1062abc319272e2855e99bc307dad33c6a0a4 100644 --- a/pkgs/development/python-modules/image-match/default.nix +++ b/pkgs/development/python-modules/image-match/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, pytestrunner, dask, scikitimage, six }: +{ stdenv, buildPythonPackage, fetchFromGitHub, pytestrunner, scikitimage }: buildPythonPackage { pname = "image-match"; diff --git a/pkgs/development/python-modules/iowait/default.nix b/pkgs/development/python-modules/iowait/default.nix index ef2444c0d2f0518e023c5df41d040266059e8fbb..c67d56b153e04495ef5b3ead8c0fce9479eece73 100644 --- a/pkgs/development/python-modules/iowait/default.nix +++ b/pkgs/development/python-modules/iowait/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi }: +{ buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "iowait"; diff --git a/pkgs/development/python-modules/ipython/5.nix b/pkgs/development/python-modules/ipython/5.nix index a91988bd97d06a82ba49b94a55be9fb3ff4b4d31..f2066fee2a4a21ef1959ca4e2f73c13d743d7c2d 100644 --- a/pkgs/development/python-modules/ipython/5.nix +++ b/pkgs/development/python-modules/ipython/5.nix @@ -2,7 +2,6 @@ , stdenv , buildPythonPackage , fetchPypi -, pythonOlder # Build dependencies , glibcLocales # Test dependencies @@ -13,7 +12,6 @@ , mock # Runtime dependencies , backports_shutil_get_terminal_size -, jedi , decorator , pathlib2 , pickleshare diff --git a/pkgs/development/python-modules/joblib/default.nix b/pkgs/development/python-modules/joblib/default.nix index 65d1f4f68220271e37a1e0141f14c9093e334bc9..17896a58469c437e0432139b0c5fc9bbcbe67c5a 100644 --- a/pkgs/development/python-modules/joblib/default.nix +++ b/pkgs/development/python-modules/joblib/default.nix @@ -1,11 +1,8 @@ { lib , buildPythonPackage , fetchPypi -, nose , sphinx , numpydoc -, isPy3k -, stdenv , pytest }: diff --git a/pkgs/development/python-modules/jsmin/default.nix b/pkgs/development/python-modules/jsmin/default.nix index 3a6d69cc829fb788c879a622ffe7f8060a8d82f0..f11fccb086bcd8c52eff6de64f43f574b242489a 100644 --- a/pkgs/development/python-modules/jsmin/default.nix +++ b/pkgs/development/python-modules/jsmin/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "jsmin"; diff --git a/pkgs/development/python-modules/jupyter_core/default.nix b/pkgs/development/python-modules/jupyter_core/default.nix index c934d24dab7b2bcf9033a218aadd2fcb9f0df8b3..a6a955507a79274ca4c440a3d76ae58845005837 100644 --- a/pkgs/development/python-modules/jupyter_core/default.nix +++ b/pkgs/development/python-modules/jupyter_core/default.nix @@ -1,5 +1,4 @@ { lib -, python , buildPythonPackage , fetchPypi , ipython diff --git a/pkgs/development/python-modules/jupyterhub/default.nix b/pkgs/development/python-modules/jupyterhub/default.nix index dbd2e36b7b8400df9b21055c80d29c0b23ace20f..8598654e2060b0d8cd5912953b2d06ac66ed1be7 100644 --- a/pkgs/development/python-modules/jupyterhub/default.nix +++ b/pkgs/development/python-modules/jupyterhub/default.nix @@ -1,5 +1,4 @@ { lib -, python , buildPythonPackage , fetchPypi , fetchzip @@ -13,7 +12,6 @@ , traitlets , requests , pythonOlder -, nodejs-8_x , nodePackages }: diff --git a/pkgs/development/python-modules/kaitaistruct/default.nix b/pkgs/development/python-modules/kaitaistruct/default.nix index 19169e88b125a50860408997daee511c5d484076..a1e795421b0753101a465475c36a5c2696501004 100644 --- a/pkgs/development/python-modules/kaitaistruct/default.nix +++ b/pkgs/development/python-modules/kaitaistruct/default.nix @@ -1,4 +1,4 @@ -{ stdenv, kaitaistruct, buildPythonPackage, fetchPypi }: +{ stdenv, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "kaitaistruct"; diff --git a/pkgs/development/python-modules/keras/default.nix b/pkgs/development/python-modules/keras/default.nix index be59a112be746daacbcb01b79d817dbed135c85d..3b221238f3af4272f8cf9abc400b69359f4fbecc 100644 --- a/pkgs/development/python-modules/keras/default.nix +++ b/pkgs/development/python-modules/keras/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildPythonPackage, fetchPypi +{ stdenv, buildPythonPackage, fetchPypi , pytest, pytestcov, pytestpep8, pytest_xdist , six, numpy, scipy, pyyaml, h5py }: diff --git a/pkgs/development/python-modules/ldap/default.nix b/pkgs/development/python-modules/ldap/default.nix index 95672600a30ae7712b44714cb68c550cbab91055..17a6b158d3f224d8bfba1636286944396830acac 100644 --- a/pkgs/development/python-modules/ldap/default.nix +++ b/pkgs/development/python-modules/ldap/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi +{ buildPythonPackage, fetchPypi , pyasn1, pyasn1-modules, pytest , openldap, cyrus_sasl }: diff --git a/pkgs/development/python-modules/ldappool/default.nix b/pkgs/development/python-modules/ldappool/default.nix index 58ca72a3dc98432b39faeae007db8be863950b1a..02d10b832ff2cccba324a77d54472b37e9dd1666 100644 --- a/pkgs/development/python-modules/ldappool/default.nix +++ b/pkgs/development/python-modules/ldappool/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k +{ lib, buildPythonPackage, fetchPypi , pbr, ldap, fixtures, testresources, testtools }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/libarcus/default.nix b/pkgs/development/python-modules/libarcus/default.nix index 2fc66e810d0614369469b413d5100917af268065..fc58c6ca6a1dc448733b015bd83cdc34d330b818 100644 --- a/pkgs/development/python-modules/libarcus/default.nix +++ b/pkgs/development/python-modules/libarcus/default.nix @@ -1,5 +1,5 @@ -{ stdenv, lib, buildPythonPackage, fetchFromGitHub -, python, cmake, sip, protobuf, pythonOlder }: +{ stdenv, buildPythonPackage, fetchFromGitHub +, cmake, sip, protobuf, pythonOlder }: buildPythonPackage rec { pname = "libarcus"; diff --git a/pkgs/development/python-modules/libgpuarray/default.nix b/pkgs/development/python-modules/libgpuarray/default.nix index 14e83584678ce8f9f8db6460c14021a8c568b318..ef01fde2daa73191551d1ce94cca13390e3cd6d3 100644 --- a/pkgs/development/python-modules/libgpuarray/default.nix +++ b/pkgs/development/python-modules/libgpuarray/default.nix @@ -8,7 +8,6 @@ , six , nose , Mako -, python , cudaSupport ? false, cudatoolkit , nvidia_x11 , openclSupport ? true, ocl-icd, clblas }: diff --git a/pkgs/development/python-modules/libversion/default.nix b/pkgs/development/python-modules/libversion/default.nix index cf0a1a865a19f46144f184065b2b0a68d030e19a..75e55944e987dd27b57202b261d062586a69af1b 100644 --- a/pkgs/development/python-modules/libversion/default.nix +++ b/pkgs/development/python-modules/libversion/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, python, pkgconfig, libversion, pythonOlder }: +{ stdenv, buildPythonPackage, fetchPypi, pkgconfig, libversion, pythonOlder }: buildPythonPackage rec { pname = "libversion"; diff --git a/pkgs/development/python-modules/libvirt/default.nix b/pkgs/development/python-modules/libvirt/default.nix index a99d4542ba5aa8f992a6e220932d785cc987b6e7..26b42020fc340911019897e06319ba7fb0722f70 100644 --- a/pkgs/development/python-modules/libvirt/default.nix +++ b/pkgs/development/python-modules/libvirt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchgit, python, pkgconfig, lxml, libvirt, nose }: +{ stdenv, buildPythonPackage, fetchgit, pkgconfig, lxml, libvirt, nose }: buildPythonPackage rec { pname = "libvirt"; diff --git a/pkgs/development/python-modules/linode-api/default.nix b/pkgs/development/python-modules/linode-api/default.nix index ad6b938c9888c33b33a5b1908007edcbcbb3035d..4689050ba6c700cf921ffb610cc3cfb823eb83ed 100644 --- a/pkgs/development/python-modules/linode-api/default.nix +++ b/pkgs/development/python-modules/linode-api/default.nix @@ -1,7 +1,6 @@ { stdenv, buildPythonPackage, fetchFromGitHub, - isPy3k, pythonOlder, lib, requests, diff --git a/pkgs/development/python-modules/lmtpd/default.nix b/pkgs/development/python-modules/lmtpd/default.nix index c9b9b4896139fb865d4735c657bb25ce729a8af1..bc91139728b0ef75a1f95eaf9601dd7271fb27cb 100644 --- a/pkgs/development/python-modules/lmtpd/default.nix +++ b/pkgs/development/python-modules/lmtpd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, fetchFromGitHub }: +{ stdenv, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "lmtpd"; diff --git a/pkgs/development/python-modules/marionette-harness/default.nix b/pkgs/development/python-modules/marionette-harness/default.nix index 4a96ce8ad05130d185550fb26603c1e31c27ab2e..ff1a6e49b0133b4e7cef0b8fb1aa1ffe8cb896cd 100644 --- a/pkgs/development/python-modules/marionette-harness/default.nix +++ b/pkgs/development/python-modules/marionette-harness/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , buildPythonPackage , fetchPypi , isPy3k diff --git a/pkgs/development/python-modules/marionette-harness/manifestparser.nix b/pkgs/development/python-modules/marionette-harness/manifestparser.nix index 5d52b52ac7f2f2558bb5d5e74b13f3ea3d4aa3df..7316526aa28044640e4d26466bde9f8f6167e8d3 100644 --- a/pkgs/development/python-modules/marionette-harness/manifestparser.nix +++ b/pkgs/development/python-modules/marionette-harness/manifestparser.nix @@ -1,5 +1,4 @@ { lib -, stdenv , buildPythonPackage , fetchPypi , isPy3k diff --git a/pkgs/development/python-modules/marionette-harness/marionette_driver.nix b/pkgs/development/python-modules/marionette-harness/marionette_driver.nix index d27637874af8ef58cb7ff2c8c13dfcf35ecfdd5e..b6d761f077ce53d15f2bf831399b8165aac5c3f5 100644 --- a/pkgs/development/python-modules/marionette-harness/marionette_driver.nix +++ b/pkgs/development/python-modules/marionette-harness/marionette_driver.nix @@ -1,5 +1,4 @@ { lib -, stdenv , buildPythonPackage , fetchPypi , isPy3k diff --git a/pkgs/development/python-modules/marionette-harness/mozcrash.nix b/pkgs/development/python-modules/marionette-harness/mozcrash.nix index ccd0eb6cc9f89f4d5bff68e6fa432f57d0c13c60..3f7710acb3c16499d70de95a7023fad8681a46d5 100644 --- a/pkgs/development/python-modules/marionette-harness/mozcrash.nix +++ b/pkgs/development/python-modules/marionette-harness/mozcrash.nix @@ -1,5 +1,4 @@ { lib -, stdenv , buildPythonPackage , fetchPypi , mozfile diff --git a/pkgs/development/python-modules/marionette-harness/mozdevice.nix b/pkgs/development/python-modules/marionette-harness/mozdevice.nix index 8569d9287ac827f5f73067b8b0b480d55d2db03c..491069cd87fb9539fbebf3db4983191592131b01 100644 --- a/pkgs/development/python-modules/marionette-harness/mozdevice.nix +++ b/pkgs/development/python-modules/marionette-harness/mozdevice.nix @@ -1,5 +1,4 @@ { lib -, stdenv , buildPythonPackage , fetchPypi , moznetwork diff --git a/pkgs/development/python-modules/marionette-harness/mozfile.nix b/pkgs/development/python-modules/marionette-harness/mozfile.nix index 7bd14f2d10cab9ebe0e7b907b4a6f41c34f26773..34350dd4821f827ef8f0bbdb6c6fd622de6d5b44 100644 --- a/pkgs/development/python-modules/marionette-harness/mozfile.nix +++ b/pkgs/development/python-modules/marionette-harness/mozfile.nix @@ -1,5 +1,4 @@ { lib -, stdenv , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/marionette-harness/mozhttpd.nix b/pkgs/development/python-modules/marionette-harness/mozhttpd.nix index 1d1be733f998587de34155faa7fa92e024ff8e38..6862967e420f3da7f5b656e7d6bd1ee1cd2f383c 100644 --- a/pkgs/development/python-modules/marionette-harness/mozhttpd.nix +++ b/pkgs/development/python-modules/marionette-harness/mozhttpd.nix @@ -1,5 +1,4 @@ { lib -, stdenv , buildPythonPackage , fetchPypi , moznetwork diff --git a/pkgs/development/python-modules/marionette-harness/mozlog.nix b/pkgs/development/python-modules/marionette-harness/mozlog.nix index dfe91309ea40072d68e2fee1a2327cc2ee42a7c0..bc4b9e914653f5bb6ba1e6fc353f74eb7d37446b 100644 --- a/pkgs/development/python-modules/marionette-harness/mozlog.nix +++ b/pkgs/development/python-modules/marionette-harness/mozlog.nix @@ -1,5 +1,4 @@ { lib -, stdenv , buildPythonPackage , fetchPypi , isPy3k diff --git a/pkgs/development/python-modules/marionette-harness/moznetwork.nix b/pkgs/development/python-modules/marionette-harness/moznetwork.nix index a6561d3e07ace2496d8f0fe8cbc7af6ee7cbe466..3901f7c310d06bf58c7febfe79eda925d5eb3519 100644 --- a/pkgs/development/python-modules/marionette-harness/moznetwork.nix +++ b/pkgs/development/python-modules/marionette-harness/moznetwork.nix @@ -1,5 +1,4 @@ { lib -, stdenv , buildPythonPackage , fetchPypi , mozlog diff --git a/pkgs/development/python-modules/marionette-harness/mozprocess.nix b/pkgs/development/python-modules/marionette-harness/mozprocess.nix index c1e5344326077fbe40de6b113d7f1700c63990ce..e8130e8038fdf1b9694efe64b019719e4971b6e0 100644 --- a/pkgs/development/python-modules/marionette-harness/mozprocess.nix +++ b/pkgs/development/python-modules/marionette-harness/mozprocess.nix @@ -1,5 +1,4 @@ { lib -, stdenv , buildPythonPackage , fetchPypi , mozinfo diff --git a/pkgs/development/python-modules/marionette-harness/mozprofile.nix b/pkgs/development/python-modules/marionette-harness/mozprofile.nix index c94acdd3ba5a8640b5066a305a1c7298f180950c..3620248904cefc693156ef53dc2d22bcee3be8e0 100644 --- a/pkgs/development/python-modules/marionette-harness/mozprofile.nix +++ b/pkgs/development/python-modules/marionette-harness/mozprofile.nix @@ -1,5 +1,4 @@ { lib -, stdenv , buildPythonPackage , fetchPypi , mozlog diff --git a/pkgs/development/python-modules/marionette-harness/mozrunner.nix b/pkgs/development/python-modules/marionette-harness/mozrunner.nix index e9f6177cfa1bb0089c547e075da1a3e59e1f07b7..324c7c6c2d24e2ba5e1092eaa6c6ac3fcb49897e 100644 --- a/pkgs/development/python-modules/marionette-harness/mozrunner.nix +++ b/pkgs/development/python-modules/marionette-harness/mozrunner.nix @@ -1,5 +1,4 @@ { lib -, stdenv , buildPythonPackage , fetchPypi , mozdevice diff --git a/pkgs/development/python-modules/marionette-harness/moztest.nix b/pkgs/development/python-modules/marionette-harness/moztest.nix index d1c799c95dee5fdfee3cac334c43e7823184dee7..2ff50e1fa92eae1b63ecab84f94cad0c87955e99 100644 --- a/pkgs/development/python-modules/marionette-harness/moztest.nix +++ b/pkgs/development/python-modules/marionette-harness/moztest.nix @@ -1,5 +1,4 @@ { lib -, stdenv , buildPythonPackage , fetchPypi , mozinfo diff --git a/pkgs/development/python-modules/marionette-harness/mozversion.nix b/pkgs/development/python-modules/marionette-harness/mozversion.nix index c9eb12bd52b461170778dd07be413c31c45c7a1a..dbe3cb4bc2d8b6557ae2ddbae7e82f6b47a0e7eb 100644 --- a/pkgs/development/python-modules/marionette-harness/mozversion.nix +++ b/pkgs/development/python-modules/marionette-harness/mozversion.nix @@ -1,5 +1,4 @@ { lib -, stdenv , buildPythonPackage , fetchPypi , mozlog diff --git a/pkgs/development/python-modules/moto/default.nix b/pkgs/development/python-modules/moto/default.nix index e4b2bdefad206808d033d7932bf1610f71960c4a..cfb70724210ef86a80bd1ad4c0ec313449683e92 100644 --- a/pkgs/development/python-modules/moto/default.nix +++ b/pkgs/development/python-modules/moto/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, jinja2, werkzeug, flask +{ buildPythonPackage, fetchPypi, jinja2, werkzeug, flask , requests, pytz, backports_tempfile, cookies, jsondiff, botocore, aws-xray-sdk, docker, responses , six, boto, httpretty, xmltodict, nose, sure, boto3, freezegun, dateutil, mock, pyaml }: diff --git a/pkgs/development/python-modules/mrbob/default.nix b/pkgs/development/python-modules/mrbob/default.nix index 3f974872b9594aef29f30345772deb10f486bc5a..6dbfa1fae60357efd82e0da1b329f55bfad3d7f2 100644 --- a/pkgs/development/python-modules/mrbob/default.nix +++ b/pkgs/development/python-modules/mrbob/default.nix @@ -1,5 +1,5 @@ { buildPythonPackage, stdenv, glibcLocales, mock, nose, isPy3k, argparse, jinja2, six -, fetchPypi, lib +, fetchPypi }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/murmurhash/default.nix b/pkgs/development/python-modules/murmurhash/default.nix index f689bc2ff49d8ecc01d9ff5c3ac8aeb7caed5934..a3a9096a335c66debabc26d6549e11e7c5edbcb1 100644 --- a/pkgs/development/python-modules/murmurhash/default.nix +++ b/pkgs/development/python-modules/murmurhash/default.nix @@ -2,7 +2,6 @@ , buildPythonPackage , fetchPypi , cython -, python }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/nbconvert/default.nix b/pkgs/development/python-modules/nbconvert/default.nix index dfa87c843ff25ff834b3917f09f0f9baafafe5a8..b167b7f427c1ff08604d9aa32b34d6ec362ad669 100644 --- a/pkgs/development/python-modules/nbconvert/default.nix +++ b/pkgs/development/python-modules/nbconvert/default.nix @@ -13,7 +13,6 @@ , testpath , jupyter_core , nbformat -, nbconvert , ipykernel , pandocfilters , tornado diff --git a/pkgs/development/python-modules/ncclient/default.nix b/pkgs/development/python-modules/ncclient/default.nix index 4cc5769d8d836ca0ae1dd72bce92cdc81520310b..27fc7d11e7519d1844d3b54ca2806888bac60560 100644 --- a/pkgs/development/python-modules/ncclient/default.nix +++ b/pkgs/development/python-modules/ncclient/default.nix @@ -5,7 +5,6 @@ , lxml , libxml2 , libxslt -, pytest , nose , rednose }: diff --git a/pkgs/development/python-modules/netdisco/default.nix b/pkgs/development/python-modules/netdisco/default.nix index af7e4dde59e3b52359a4c11923d65e4233a06591..e60233c3590e4a738d2623b3c412798947e00b1f 100644 --- a/pkgs/development/python-modules/netdisco/default.nix +++ b/pkgs/development/python-modules/netdisco/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, isPy3k, fetchFromGitHub, fetchpatch, requests, zeroconf, netifaces, pytest }: +{ stdenv, buildPythonPackage, isPy3k, fetchFromGitHub, requests, zeroconf, netifaces, pytest }: buildPythonPackage rec { pname = "netdisco"; diff --git a/pkgs/development/python-modules/nltk/default.nix b/pkgs/development/python-modules/nltk/default.nix index 9645e54f7ec1d84eb16297e271681405e0359210..56edc44bce71fde7b895c991d21e47625f457c0b 100644 --- a/pkgs/development/python-modules/nltk/default.nix +++ b/pkgs/development/python-modules/nltk/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, buildPythonPackage, isPy33, lib, six, pythonAtLeast, pythonOlder }: +{ fetchurl, buildPythonPackage, lib, six, pythonAtLeast, pythonOlder }: buildPythonPackage rec { version = "3.2.5"; diff --git a/pkgs/development/python-modules/numpy/default.nix b/pkgs/development/python-modules/numpy/default.nix index d6531eda2ef12497d4d5fc0b0b257ec1842e47ae..d9e884dabbe0f23fc1949cc8824994596f9d32db 100644 --- a/pkgs/development/python-modules/numpy/default.nix +++ b/pkgs/development/python-modules/numpy/default.nix @@ -1,4 +1,4 @@ -{lib, fetchPypi, python, buildPythonPackage, isPy27, isPyPy, gfortran, nose, blas, hostPlatform }: +{lib, fetchPypi, python, buildPythonPackage, isPyPy, gfortran, nose, blas, hostPlatform }: buildPythonPackage rec { pname = "numpy"; diff --git a/pkgs/development/python-modules/ovh/default.nix b/pkgs/development/python-modules/ovh/default.nix index 3f37940ed8aebac99216fc5ef56ddf4f63f9b00e..474609220cfae0ad0040b66ba4a521ebcf04abb1 100644 --- a/pkgs/development/python-modules/ovh/default.nix +++ b/pkgs/development/python-modules/ovh/default.nix @@ -1,9 +1,6 @@ { lib , buildPythonPackage , fetchPypi -, requests -, nose -, mock }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/pandas/0.17.1.nix b/pkgs/development/python-modules/pandas/0.17.1.nix index 2c0a2c44f6eb2a09f5595cb2893c4927740f0861..e4973d0d6e39ba89d0296b4eebd2ceaaf519d018 100644 --- a/pkgs/development/python-modules/pandas/0.17.1.nix +++ b/pkgs/development/python-modules/pandas/0.17.1.nix @@ -1,8 +1,6 @@ { buildPythonPackage , fetchPypi -, python , stdenv -, fetchurl , pytest , glibcLocales , cython diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix index 08fdddb73467e1119fbbf1c55acfe4d408e99ef5..fc75e5803afcb4ae5a868ff20eac95096e1465cd 100644 --- a/pkgs/development/python-modules/pandas/default.nix +++ b/pkgs/development/python-modules/pandas/default.nix @@ -2,7 +2,6 @@ , fetchPypi , python , stdenv -, fetchurl , pytest , glibcLocales , cython diff --git a/pkgs/development/python-modules/parse-type/default.nix b/pkgs/development/python-modules/parse-type/default.nix index ac150af4b7824b20f169d55f648687bbb89fe909..34573626bacac86442bf43b12276ab7ddd5dfc11 100644 --- a/pkgs/development/python-modules/parse-type/default.nix +++ b/pkgs/development/python-modules/parse-type/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, fetchpatch +{ stdenv, fetchPypi , buildPythonPackage, pythonOlder , pytest, pytestrunner , parse, six, enum34 diff --git a/pkgs/development/python-modules/parse/default.nix b/pkgs/development/python-modules/parse/default.nix index 18cc23338bf69b00bcb601551f71822c11766ba8..4092f5e1c4f35dd5afc27540a8921dc6fe3e37b6 100644 --- a/pkgs/development/python-modules/parse/default.nix +++ b/pkgs/development/python-modules/parse/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, fetchpatch +{ stdenv, fetchPypi , buildPythonPackage, python }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/passlib/default.nix b/pkgs/development/python-modules/passlib/default.nix index 165de7bd2baf42f136c21c6a83be71f4160334f0..24539c7bbcef53f967662051f79184c7c3cac475 100644 --- a/pkgs/development/python-modules/passlib/default.nix +++ b/pkgs/development/python-modules/passlib/default.nix @@ -1,5 +1,4 @@ -{ lib -, buildPythonPackage +{ buildPythonPackage , fetchPypi , nose , bcrypt diff --git a/pkgs/development/python-modules/pelican/default.nix b/pkgs/development/python-modules/pelican/default.nix index 2d1f707a8ebd8196eda382d17216b72989df140f..1ee93c753d80d0904a2819044c73ce887ec47dc3 100644 --- a/pkgs/development/python-modules/pelican/default.nix +++ b/pkgs/development/python-modules/pelican/default.nix @@ -1,5 +1,5 @@ { stdenv, buildPythonPackage, fetchFromGitHub -, glibcLocales, pandoc, git +, glibcLocales, git , mock, nose, markdown, lxml, typogrify , jinja2, pygments, docutils, pytz, unidecode, six, dateutil, feedgenerator , blinker, pillow, beautifulsoup4, markupsafe }: diff --git a/pkgs/development/python-modules/persistent/default.nix b/pkgs/development/python-modules/persistent/default.nix index b861797c4a8f285e6df719622508cbac6b1d677f..4f2e7f3ca845591b4ef5adcd25200f1507c26fc2 100644 --- a/pkgs/development/python-modules/persistent/default.nix +++ b/pkgs/development/python-modules/persistent/default.nix @@ -1,7 +1,6 @@ { buildPythonPackage , fetchPypi , zope_interface -, pkgs }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/plaster-pastedeploy/default.nix b/pkgs/development/python-modules/plaster-pastedeploy/default.nix index 3f90e6b2da7d4b048dbd806179f2edcca9499e3a..5675be32397398b2ea0416b44ce7f3175c956640 100644 --- a/pkgs/development/python-modules/plaster-pastedeploy/default.nix +++ b/pkgs/development/python-modules/plaster-pastedeploy/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, fetchPypi, python +{ buildPythonPackage, fetchPypi , plaster, PasteDeploy , pytest, pytestcov }: diff --git a/pkgs/development/python-modules/plaster/default.nix b/pkgs/development/python-modules/plaster/default.nix index 8c3de8bd0351b0893486eaaa3e6482e6a1f7d92e..82aaebb10039366ed82adc995d7017b8b8dd271d 100644 --- a/pkgs/development/python-modules/plaster/default.nix +++ b/pkgs/development/python-modules/plaster/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, fetchPypi, python +{ buildPythonPackage, fetchPypi , pytest, pytestcov }: diff --git a/pkgs/development/python-modules/pluggy/default.nix b/pkgs/development/python-modules/pluggy/default.nix index 0fbfa5108c1b503c91671802064ac4bfae8348e7..2a6996c628e6bf2dec5bd4b5c10a7018a91c5371 100644 --- a/pkgs/development/python-modules/pluggy/default.nix +++ b/pkgs/development/python-modules/pluggy/default.nix @@ -1,7 +1,6 @@ { buildPythonPackage , lib , fetchPypi -, pytest }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/plumbum/default.nix b/pkgs/development/python-modules/plumbum/default.nix index 5269ecd5d8b400c423c2ba410b69ffd0a0505148..2c6eb7e5fbf7feb45e3f3f8afdb5511fc8c738c0 100644 --- a/pkgs/development/python-modules/plumbum/default.nix +++ b/pkgs/development/python-modules/plumbum/default.nix @@ -1,5 +1,4 @@ -{ lib -, buildPythonPackage +{ buildPythonPackage , fetchPypi , pytest }: diff --git a/pkgs/development/python-modules/poppler-qt5/default.nix b/pkgs/development/python-modules/poppler-qt5/default.nix index 0ae689034a3ad47c9d2ad93ca5bc64eb30a95676..2b00a007f90b3096e7f76a184c58b192be2324e4 100644 --- a/pkgs/development/python-modules/poppler-qt5/default.nix +++ b/pkgs/development/python-modules/poppler-qt5/default.nix @@ -1,5 +1,5 @@ { buildPythonPackage, fetchPypi, stdenv, sip, qtbase, pyqt5, poppler, pkgconfig, fetchpatch -, python, substituteAll +, substituteAll }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/powerline/default.nix b/pkgs/development/python-modules/powerline/default.nix index f51c6989c011bf512dc55b8eefb48c1ce8d4279f..841e003bc897c5ad25faede8f57a8afc7f3ecd5f 100644 --- a/pkgs/development/python-modules/powerline/default.nix +++ b/pkgs/development/python-modules/powerline/default.nix @@ -1,9 +1,6 @@ { lib , fetchurl , buildPythonPackage -, git -, mercurial -, bazaar , psutil , pygit2 }: diff --git a/pkgs/development/python-modules/progressbar2/default.nix b/pkgs/development/python-modules/progressbar2/default.nix index 212c06cc9421f146cf0dbcd6924452778416cf32..18fb14c3aa9a5a56be09cbdd9c3b1a105e00f1cf 100644 --- a/pkgs/development/python-modules/progressbar2/default.nix +++ b/pkgs/development/python-modules/progressbar2/default.nix @@ -2,7 +2,6 @@ , python , buildPythonPackage , fetchFromGitHub -, isPy3k , pytest , python-utils , sphinx diff --git a/pkgs/development/python-modules/prometheus_client/default.nix b/pkgs/development/python-modules/prometheus_client/default.nix index eaf353af08231c8d86ebfccd7735b9a187a06580..f6b2bfa939c6278f8addaf3e9a724a3e572f5064 100644 --- a/pkgs/development/python-modules/prometheus_client/default.nix +++ b/pkgs/development/python-modules/prometheus_client/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pytest }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "prometheus_client"; diff --git a/pkgs/development/python-modules/psutil/default.nix b/pkgs/development/python-modules/psutil/default.nix index 7fbdfb7c33eb3625234c80ec6aef65b8b01bc0fc..84fe2f69554585d632629ec460553bff01ed5983 100644 --- a/pkgs/development/python-modules/psutil/default.nix +++ b/pkgs/development/python-modules/psutil/default.nix @@ -2,7 +2,6 @@ , buildPythonPackage , fetchPypi , darwin -, mock }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/pyGithub/default.nix b/pkgs/development/python-modules/pyGithub/default.nix index 6adc1e7ec04ca0c220c38ab2722574094127da51..be409e348ea3bf8eae1d83bf5a324b2387081ff1 100644 --- a/pkgs/development/python-modules/pyGithub/default.nix +++ b/pkgs/development/python-modules/pyGithub/default.nix @@ -1,5 +1,4 @@ { stdenv, fetchFromGitHub -, cacert , buildPythonPackage, python-jose, pyjwt }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/pyaml/default.nix b/pkgs/development/python-modules/pyaml/default.nix index 5fd1be7c15cc20593ebba78727255d4d644dd8f8..fd1866d22f434f0c718efa0266cc72a8925c6a5f 100644 --- a/pkgs/development/python-modules/pyaml/default.nix +++ b/pkgs/development/python-modules/pyaml/default.nix @@ -3,7 +3,6 @@ , fetchPypi , pyyaml , unidecode -, python }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/pycaption/default.nix b/pkgs/development/python-modules/pycaption/default.nix index 845630e514fac2493cb64afbaa51985ccb96e576..d4ed6088409b0b375b08a833feeb5c20c4c9d8b1 100644 --- a/pkgs/development/python-modules/pycaption/default.nix +++ b/pkgs/development/python-modules/pycaption/default.nix @@ -1,5 +1,5 @@ { lib, fetchpatch -, buildPythonPackage, fetchPypi, isPy3k, pythonOlder +, buildPythonPackage, fetchPypi, isPy3k , beautifulsoup4, lxml, cssutils, future, enum34, six }: diff --git a/pkgs/development/python-modules/pycollada/default.nix b/pkgs/development/python-modules/pycollada/default.nix index b074f9f4934eae446639850a30ec39d1cc20b195..23ed4917cc58b8aeb731673643da2a17d071bef9 100644 --- a/pkgs/development/python-modules/pycollada/default.nix +++ b/pkgs/development/python-modules/pycollada/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage, numpy, isPy3k, dateutil }: +{ stdenv, fetchPypi, buildPythonPackage, numpy, dateutil }: buildPythonPackage rec { pname = "pycollada"; diff --git a/pkgs/development/python-modules/pycrypto/default.nix b/pkgs/development/python-modules/pycrypto/default.nix index af975e333f0f2ffedef15bbe5e743c20c1fdd59a..e7858888d36106cd661d715b9f926c608e16f88a 100644 --- a/pkgs/development/python-modules/pycrypto/default.nix +++ b/pkgs/development/python-modules/pycrypto/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, buildPythonPackage, pycryptodome }: +{ buildPythonPackage, pycryptodome }: # This is a dummy package providing the drop-in replacement pycryptodome. # https://github.com/NixOS/nixpkgs/issues/21671 diff --git a/pkgs/development/python-modules/pycryptodome/default.nix b/pkgs/development/python-modules/pycryptodome/default.nix index b4ef42cb22abb814ce2780bbbc0c65937e23d1c7..35041f8447ba9075584dd842f5418c8a1b7c7213 100644 --- a/pkgs/development/python-modules/pycryptodome/default.nix +++ b/pkgs/development/python-modules/pycryptodome/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, python, buildPythonPackage, gmp }: +{ stdenv, fetchPypi, buildPythonPackage }: buildPythonPackage rec { version = "3.6.2"; diff --git a/pkgs/development/python-modules/pygame/default.nix b/pkgs/development/python-modules/pygame/default.nix index 5a4a81f13accc1e4cb11826790ac3c7c6faf7f92..b6c9ae5e8ba6191d96ce84050174cc644a303335 100644 --- a/pkgs/development/python-modules/pygame/default.nix +++ b/pkgs/development/python-modules/pygame/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, buildPythonPackage, python, smpeg, libX11 +{ stdenv, lib, fetchurl, buildPythonPackage, python, libX11 , SDL, SDL_image, SDL_mixer, SDL_ttf, libpng, libjpeg, portmidi, freetype }: diff --git a/pkgs/development/python-modules/pygame_sdl2/default.nix b/pkgs/development/python-modules/pygame_sdl2/default.nix index 08c266da6963afc510cf1f26a5bc80ed8e8986a6..916bf7f692d2199af8e061bfc60249f11df2d426 100644 --- a/pkgs/development/python-modules/pygame_sdl2/default.nix +++ b/pkgs/development/python-modules/pygame_sdl2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgs, buildPythonPackage, fetchurl, isPy27, fetchpatch +{ stdenv, buildPythonPackage, fetchurl, isPy27, fetchpatch , cython, SDL2, SDL2_image, SDL2_ttf, SDL2_mixer, libjpeg, libpng }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/pygccxml/default.nix b/pkgs/development/python-modules/pygccxml/default.nix index 5271677dc1eab7cf622dfe20fdf6f418ec3512cd..d4c46d6b835977ac444594f87608d447c8d410a2 100644 --- a/pkgs/development/python-modules/pygccxml/default.nix +++ b/pkgs/development/python-modules/pygccxml/default.nix @@ -1,5 +1,5 @@ { stdenv, castxml, fetchFromGitHub, buildPythonPackage, -llvmPackages, clang }: +llvmPackages }: buildPythonPackage rec { pname = "pygccxml"; version = "1.9.1"; diff --git a/pkgs/development/python-modules/pygobject/3.nix b/pkgs/development/python-modules/pygobject/3.nix index 524fb4af61c5903027f543fcceac77bd324b995a..c6264f08de8684e0f77accc3a1e3035bf37148b6 100644 --- a/pkgs/development/python-modules/pygobject/3.nix +++ b/pkgs/development/python-modules/pygobject/3.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, buildPythonPackage, python, pkgconfig, glib, gobjectIntrospection, pycairo, cairo, which, ncurses}: +{ stdenv, fetchurl, buildPythonPackage, pkgconfig, glib, gobjectIntrospection, pycairo, cairo, which, ncurses}: buildPythonPackage rec { major = "3.26"; diff --git a/pkgs/development/python-modules/pymc3/default.nix b/pkgs/development/python-modules/pymc3/default.nix index a0dd6113b750c912d7fc0f5ddc7795f4b277cc63..5af6ef9922894f227ce8701cd190c488d06099e2 100644 --- a/pkgs/development/python-modules/pymc3/default.nix +++ b/pkgs/development/python-modules/pymc3/default.nix @@ -12,7 +12,6 @@ , pytest , nose , parameterized -, matplotlib }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/pymvglive/default.nix b/pkgs/development/python-modules/pymvglive/default.nix index 1263c498a46b36392b0afb6ab00583f918fb9ff6..3b7011fa748210a51c2c0d6263eca9f7f91b2f05 100644 --- a/pkgs/development/python-modules/pymvglive/default.nix +++ b/pkgs/development/python-modules/pymvglive/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, requests }: +{ lib, buildPythonPackage, fetchPypi, requests }: buildPythonPackage rec { pname = "PyMVGLive"; diff --git a/pkgs/development/python-modules/pynacl/default.nix b/pkgs/development/python-modules/pynacl/default.nix index bceb2b50cc5967892abd9441c2c873e6e8c9e44b..463cd8044e1daa3a4567548faf36d552ecce88b2 100644 --- a/pkgs/development/python-modules/pynacl/default.nix +++ b/pkgs/development/python-modules/pynacl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, pytest, coverage, libsodium, cffi, six, hypothesis}: +{ stdenv, buildPythonPackage, fetchFromGitHub, pytest, libsodium, cffi, six, hypothesis}: buildPythonPackage rec { pname = "pynacl"; diff --git a/pkgs/development/python-modules/pyogg/default.nix b/pkgs/development/python-modules/pyogg/default.nix index 08fc87127959eb2ed8c1a4bfc4b35d8e1a21e73d..09b7f38613030f1c22fe4dd805a7dafaa0ba6737 100644 --- a/pkgs/development/python-modules/pyogg/default.nix +++ b/pkgs/development/python-modules/pyogg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchPypi, buildPythonPackage, fetchurl, libvorbis, flac, libogg, libopus, opusfile }: +{ stdenv, lib, fetchPypi, buildPythonPackage, libvorbis, flac, libogg, libopus, opusfile }: buildPythonPackage rec { pname = "PyOgg"; diff --git a/pkgs/development/python-modules/pyowm/default.nix b/pkgs/development/python-modules/pyowm/default.nix index 8175ef2b1725bc348e57ae8ab9ecffdb35c597e3..55f96416efd47319fa3c5acbc9e8700e1314aa7f 100644 --- a/pkgs/development/python-modules/pyowm/default.nix +++ b/pkgs/development/python-modules/pyowm/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, requests }: +{ lib, buildPythonPackage, fetchPypi, requests }: buildPythonPackage rec { pname = "pyowm"; diff --git a/pkgs/development/python-modules/pyqt/5.x.nix b/pkgs/development/python-modules/pyqt/5.x.nix index ebad81f809b58de7537adb98c7ed4c7bd31c9102..6a3e3e66e2c9dcac491d544f95b6ca6b9135aef9 100644 --- a/pkgs/development/python-modules/pyqt/5.x.nix +++ b/pkgs/development/python-modules/pyqt/5.x.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, fetchpatch, pythonPackages, pkgconfig, makeWrapper +{ lib, fetchurl, fetchpatch, pythonPackages, pkgconfig , qmake, lndir, qtbase, qtsvg, qtwebkit, qtwebengine, dbus , withWebSockets ? false, qtwebsockets , withConnectivity ? false, qtconnectivity diff --git a/pkgs/development/python-modules/pysc2/default.nix b/pkgs/development/python-modules/pysc2/default.nix index 89799988fa1f1a11c7340088fbcc08e1882ce576..280981ab2c2463ab52517457d9c830a86f84b6b9 100644 --- a/pkgs/development/python-modules/pysc2/default.nix +++ b/pkgs/development/python-modules/pysc2/default.nix @@ -4,7 +4,6 @@ , absl-py , enum34 , future -, futures , mock , mpyq , numpy diff --git a/pkgs/development/python-modules/pysdl2/default.nix b/pkgs/development/python-modules/pysdl2/default.nix index 6681b1b199add6aff79c2db814e44d9ef23c955a..1ffc546cfa1e28a5e96ab9571f7f3e41c456c18e 100644 --- a/pkgs/development/python-modules/pysdl2/default.nix +++ b/pkgs/development/python-modules/pysdl2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchPypi, buildPythonPackage, fetchurl, SDL2, SDL2_ttf, SDL2_image, SDL2_gfx, SDL2_mixer, pyopengl }: +{ stdenv, lib, fetchPypi, buildPythonPackage, SDL2, SDL2_ttf, SDL2_image, SDL2_gfx, SDL2_mixer }: buildPythonPackage rec { pname = "PySDL2"; diff --git a/pkgs/development/python-modules/pyside/default.nix b/pkgs/development/python-modules/pyside/default.nix index 288b141d32e82b5988df50b0021858cdeb851281..ab46c726f6c7096bc47b648aad958d87f77d9427 100644 --- a/pkgs/development/python-modules/pyside/default.nix +++ b/pkgs/development/python-modules/pyside/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, cmake, python, buildPythonPackage, pysideGeneratorrunner, pysideShiboken, qt4 }: +{ lib, fetchurl, cmake, buildPythonPackage, pysideGeneratorrunner, pysideShiboken, qt4 }: # This derivation provides a Python module and should therefore be called via `python-packages.nix`. buildPythonPackage rec { diff --git a/pkgs/development/python-modules/pytest-cram/default.nix b/pkgs/development/python-modules/pytest-cram/default.nix index 4555479af43eb67cfc5511413b8b6b823da5d9d1..3ca4f832c8cfc3bf6a29b265b28328c375a8a4dc 100644 --- a/pkgs/development/python-modules/pytest-cram/default.nix +++ b/pkgs/development/python-modules/pytest-cram/default.nix @@ -1,4 +1,4 @@ -{lib, buildPythonPackage, fetchPypi, pytest, cram, bash, writeText}: +{lib, buildPythonPackage, fetchPypi, pytest, cram, bash}: buildPythonPackage rec { version = "0.2.0"; diff --git a/pkgs/development/python-modules/pytest-flake8/default.nix b/pkgs/development/python-modules/pytest-flake8/default.nix index c2d205f2833c31c65e2f8c7b20dd1b020a5ff2e4..101594750fd5ceb2a9cffcd3337613cb972bbc55 100644 --- a/pkgs/development/python-modules/pytest-flake8/default.nix +++ b/pkgs/development/python-modules/pytest-flake8/default.nix @@ -1,4 +1,4 @@ -{lib, buildPythonPackage, fetchPypi, fetchpatch, pytest, flake8}: +{lib, buildPythonPackage, fetchPypi, pytest, flake8}: buildPythonPackage rec { pname = "pytest-flake8"; diff --git a/pkgs/development/python-modules/pytest-mock/default.nix b/pkgs/development/python-modules/pytest-mock/default.nix index c12d4b8add03d555e8a55b991ce554a30efcaf15..163063ae57fc0895b436251debfb08856aa267cb 100644 --- a/pkgs/development/python-modules/pytest-mock/default.nix +++ b/pkgs/development/python-modules/pytest-mock/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, fetchpatch, isPy3k, pytest, mock, setuptools_scm }: +{ lib, buildPythonPackage, fetchPypi, isPy3k, pytest, mock, setuptools_scm }: buildPythonPackage rec { pname = "pytest-mock"; diff --git a/pkgs/development/python-modules/pytest-xdist/default.nix b/pkgs/development/python-modules/pytest-xdist/default.nix index 38d34a958545f6783aa10f2fe962bf4f7bc63d8c..84f337e1b83aad052b477457aa337fd46a8cafad 100644 --- a/pkgs/development/python-modules/pytest-xdist/default.nix +++ b/pkgs/development/python-modules/pytest-xdist/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage, isPy3k, execnet, pytest, setuptools_scm, pytest-forked }: +{ stdenv, fetchPypi, buildPythonPackage, execnet, pytest, setuptools_scm, pytest-forked }: buildPythonPackage rec { pname = "pytest-xdist"; diff --git a/pkgs/development/python-modules/python-oauth2/default.nix b/pkgs/development/python-modules/python-oauth2/default.nix index f4d87dc035c1a2a3eaa1067c3ad741e567a732ed..e8c71bff18b2d6836627ce7a4e50ed9c10232d67 100644 --- a/pkgs/development/python-modules/python-oauth2/default.nix +++ b/pkgs/development/python-modules/python-oauth2/default.nix @@ -1,5 +1,4 @@ { lib -, python , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/pytorch/default.nix b/pkgs/development/python-modules/pytorch/default.nix index 18162d105acfae4124b7d5e479d362e9d1f47441..962ebbecbaaa4fe340d108e68bdf90d04b7397ac 100644 --- a/pkgs/development/python-modules/pytorch/default.nix +++ b/pkgs/development/python-modules/pytorch/default.nix @@ -1,7 +1,7 @@ { buildPythonPackage, pythonOlder, cudaSupport ? false, cudatoolkit ? null, cudnn ? null, - fetchFromGitHub, fetchpatch, lib, numpy, pyyaml, cffi, typing, cmake, - stdenv, linkFarm, symlinkJoin, + fetchFromGitHub, lib, numpy, pyyaml, cffi, typing, cmake, + linkFarm, symlinkJoin, utillinux, which }: assert cudnn == null || cudatoolkit != null; diff --git a/pkgs/development/python-modules/pywbem/default.nix b/pkgs/development/python-modules/pywbem/default.nix index d09a9bbd6d80d1613aa77f979d099f7e4aa9d759..159e0ce15fb424e55a7decf4799bf3db282818cb 100644 --- a/pkgs/development/python-modules/pywbem/default.nix +++ b/pkgs/development/python-modules/pywbem/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, fetchpatch, libxml2 +{ stdenv, buildPythonPackage, fetchFromGitHub, libxml2 , m2crypto, ply, pyyaml, six , httpretty, lxml, mock, pytest, requests }: diff --git a/pkgs/development/python-modules/pyxml/default.nix b/pkgs/development/python-modules/pyxml/default.nix index 646308feece4ae71fba4c9e7a2b9bb3a5acbbdd3..5a55c1f47bb2e27769a47d699d405185d1d5829c 100644 --- a/pkgs/development/python-modules/pyxml/default.nix +++ b/pkgs/development/python-modules/pyxml/default.nix @@ -1,4 +1,4 @@ -{lib, fetchurl, python, buildPythonPackage, makeWrapper}: +{fetchurl, python, buildPythonPackage, makeWrapper}: buildPythonPackage rec { pname = "PyXML"; diff --git a/pkgs/development/python-modules/pyzmq/default.nix b/pkgs/development/python-modules/pyzmq/default.nix index 26107ea3c4af246385c1dedcf2d1c3551f65d4a4..4de7777fa8b913752215a8e67add34ff1d91ba3e 100644 --- a/pkgs/development/python-modules/pyzmq/default.nix +++ b/pkgs/development/python-modules/pyzmq/default.nix @@ -1,5 +1,4 @@ -{ lib -, buildPythonPackage +{ buildPythonPackage , fetchPypi , pytest , tornado diff --git a/pkgs/development/python-modules/qiskit/default.nix b/pkgs/development/python-modules/qiskit/default.nix index 1eda590a864fecb11400d9fae3fbd4344d97dd5f..dae43aa0462434ed4bb8f2ed2b28267031fc2139 100644 --- a/pkgs/development/python-modules/qiskit/default.nix +++ b/pkgs/development/python-modules/qiskit/default.nix @@ -2,8 +2,6 @@ , isPy3k , buildPythonPackage , fetchPypi -, fetchurl -, python , numpy , scipy , sympy diff --git a/pkgs/development/python-modules/rdflib/default.nix b/pkgs/development/python-modules/rdflib/default.nix index cdbba1806735fbcb19e8c7fd9ef9ecbfd36f49d2..badaf9b3787bfb3ba891aaae35930b817fd1111d 100644 --- a/pkgs/development/python-modules/rdflib/default.nix +++ b/pkgs/development/python-modules/rdflib/default.nix @@ -1,5 +1,4 @@ -{ lib -, buildPythonPackage +{ buildPythonPackage , fetchPypi , isodate , html5lib diff --git a/pkgs/development/python-modules/redis/default.nix b/pkgs/development/python-modules/redis/default.nix index de2683595e5f262afdb89d741cd0787f46f9f5cd..6ea233f695bb4a826b10c1dd83d47997c124d025 100644 --- a/pkgs/development/python-modules/redis/default.nix +++ b/pkgs/development/python-modules/redis/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage }: +{ fetchPypi, buildPythonPackage }: buildPythonPackage rec { pname = "redis"; version = "2.10.6"; diff --git a/pkgs/development/python-modules/reportlab/default.nix b/pkgs/development/python-modules/reportlab/default.nix index a356db74f07cf56342960a51df40c24208e75756..0b3e84c3512889877e68933570d5a6727b0eaf27 100644 --- a/pkgs/development/python-modules/reportlab/default.nix +++ b/pkgs/development/python-modules/reportlab/default.nix @@ -1,9 +1,7 @@ -{ lib -, buildPythonPackage +{ buildPythonPackage , fetchPypi , freetype , pillow -, pip , glibcLocales , python , isPyPy diff --git a/pkgs/development/python-modules/requests-mock/default.nix b/pkgs/development/python-modules/requests-mock/default.nix index 6bd294671dee997a8108d9159694f6192e61df0c..2286d9c2dc7fbe89497ab3e489b856c815e12e66 100644 --- a/pkgs/development/python-modules/requests-mock/default.nix +++ b/pkgs/development/python-modules/requests-mock/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, python +{ buildPythonPackage, fetchPypi, python , mock, testrepository, testtools , requests, six }: diff --git a/pkgs/development/python-modules/responses/default.nix b/pkgs/development/python-modules/responses/default.nix index 4cc74431fc8525ab142f5e9fd1ddd45c563b644d..662045a9ce1e4c4ade9475263b255a9624c291e2 100644 --- a/pkgs/development/python-modules/responses/default.nix +++ b/pkgs/development/python-modules/responses/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi +{ buildPythonPackage, fetchPypi , cookies, mock, requests, six }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/rhpl/default.nix b/pkgs/development/python-modules/rhpl/default.nix index d9c8791817655ee05da1c27d9c4d48cf2d3d440b..ed0bf42ae68722a1d59a749357435bdfd0592471 100644 --- a/pkgs/development/python-modules/rhpl/default.nix +++ b/pkgs/development/python-modules/rhpl/default.nix @@ -1,4 +1,4 @@ -{stdenv, buildPythonPackage, fetchurl, rpmextract, python, wirelesstools, gettext}: +{buildPythonPackage, fetchurl, rpmextract, python, wirelesstools, gettext}: buildPythonPackage rec { pname = "rhpl"; diff --git a/pkgs/development/python-modules/rubymarshal/default.nix b/pkgs/development/python-modules/rubymarshal/default.nix index 7184795639c40720468481cf5eb446f20830a432..d8c43c1ea8661d066ed647f8846c80034fc484ef 100644 --- a/pkgs/development/python-modules/rubymarshal/default.nix +++ b/pkgs/development/python-modules/rubymarshal/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, python, hypothesis }: +{ stdenv, buildPythonPackage, fetchPypi, hypothesis }: buildPythonPackage rec { pname = "rubymarshal"; diff --git a/pkgs/development/python-modules/salmon-mail/default.nix b/pkgs/development/python-modules/salmon-mail/default.nix index ed358213492e43176c75110f896e17b616ae27bd..c642039d4fea85ac226cd45895f7196939e9c739 100644 --- a/pkgs/development/python-modules/salmon-mail/default.nix +++ b/pkgs/development/python-modules/salmon-mail/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, pythonOlder, nose, dnspython +{ stdenv, buildPythonPackage, fetchPypi, nose, dnspython , chardet, lmtpd, pythondaemon, six, jinja2, mock }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/scikit-image/default.nix b/pkgs/development/python-modules/scikit-image/default.nix index 6ac3ab5ddb9de96e981002de6284e984d5e5e9a8..1a07e001caec692b535dd7b041517f12fad2b1e6 100644 --- a/pkgs/development/python-modules/scikit-image/default.nix +++ b/pkgs/development/python-modules/scikit-image/default.nix @@ -11,7 +11,6 @@ , pywavelets , dask , cloudpickle -, nose , pytest }: diff --git a/pkgs/development/python-modules/scikitlearn/default.nix b/pkgs/development/python-modules/scikitlearn/default.nix index edaf7cd90cc5f41f5fd3465105707b790a777717..39af29da814578bb1315762dde4e50af5c642177 100644 --- a/pkgs/development/python-modules/scikitlearn/default.nix +++ b/pkgs/development/python-modules/scikitlearn/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchpatch, fetchPypi, python +{ stdenv, buildPythonPackage, fetchPypi, python , nose, pillow , gfortran, glibcLocales , numpy, scipy diff --git a/pkgs/development/python-modules/scipy/default.nix b/pkgs/development/python-modules/scipy/default.nix index 5e57dd3f093da6773e726dc738202a1b9b2ffc22..41878b19d0859a775ab09e073b4da602e989ab61 100644 --- a/pkgs/development/python-modules/scipy/default.nix +++ b/pkgs/development/python-modules/scipy/default.nix @@ -1,4 +1,4 @@ -{lib, fetchPypi, python, buildPythonPackage, isPyPy, gfortran, nose, pytest, numpy}: +{lib, fetchPypi, python, buildPythonPackage, gfortran, nose, pytest, numpy}: buildPythonPackage rec { pname = "scipy"; diff --git a/pkgs/development/python-modules/serversyncstorage/default.nix b/pkgs/development/python-modules/serversyncstorage/default.nix index 1cef1510ccf5200cf02767da01b1d11ad7015a82..0e4b6cfa1e4757cb666e7e9f8cfa4355104db914 100644 --- a/pkgs/development/python-modules/serversyncstorage/default.nix +++ b/pkgs/development/python-modules/serversyncstorage/default.nix @@ -1,5 +1,4 @@ -{ stdenv -, buildPythonPackage +{ buildPythonPackage , fetchgit , isPy27 , testfixtures diff --git a/pkgs/development/python-modules/smart_open/default.nix b/pkgs/development/python-modules/smart_open/default.nix index 006f52f1d38b7bc3c37f64bd028cf65ce7a6a451..8c66df80dc587dae6204f4de9c0229ed4ca91403 100644 --- a/pkgs/development/python-modules/smart_open/default.nix +++ b/pkgs/development/python-modules/smart_open/default.nix @@ -1,6 +1,5 @@ { lib , buildPythonPackage -, isPy3k , fetchPypi , boto , boto3 diff --git a/pkgs/development/python-modules/spacy/default.nix b/pkgs/development/python-modules/spacy/default.nix index 16c1841a3d625fdfeb6104f92b298ba2bcf0be2d..d2a306356b6d22298970ed3734ee66f1da5df6db 100644 --- a/pkgs/development/python-modules/spacy/default.nix +++ b/pkgs/development/python-modules/spacy/default.nix @@ -1,7 +1,5 @@ { lib -, pkgs , buildPythonPackage -, python , fetchPypi , pythonOlder , html5lib diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix index 211419f86b1bfbe417f5f997de3f45358760fe55..50d58877b7ea0bf967ddef290462fcf4019c2ef6 100644 --- a/pkgs/development/python-modules/sqlalchemy/default.nix +++ b/pkgs/development/python-modules/sqlalchemy/default.nix @@ -3,7 +3,6 @@ , buildPythonPackage , pytest , mock -, pytest_xdist , isPy3k , pysqlite }: diff --git a/pkgs/development/python-modules/sseclient/default.nix b/pkgs/development/python-modules/sseclient/default.nix index 9ac04e18e4f6ce6bad98c824a237e36b4d58b122..a122a0c40ec8706fde44efb34384833846acd327 100644 --- a/pkgs/development/python-modules/sseclient/default.nix +++ b/pkgs/development/python-modules/sseclient/default.nix @@ -1,6 +1,6 @@ { stdenv, buildPythonPackage, fetchPypi , requests, six -, backports_unittest-mock, pluggy, pytest, pytestrunner }: +, backports_unittest-mock, pytest, pytestrunner }: buildPythonPackage rec { pname = "sseclient"; diff --git a/pkgs/development/python-modules/syncserver/default.nix b/pkgs/development/python-modules/syncserver/default.nix index 3c650bd60ddac4310831699a6a067d7b411dba58..7a93d64a89f5c8642f9ec3be968f96e311aaf9ee 100644 --- a/pkgs/development/python-modules/syncserver/default.nix +++ b/pkgs/development/python-modules/syncserver/default.nix @@ -1,5 +1,4 @@ -{ stdenv -, buildPythonPackage +{ buildPythonPackage , fetchgit , isPy27 , unittest2 diff --git a/pkgs/development/python-modules/tempora/default.nix b/pkgs/development/python-modules/tempora/default.nix index c56a5d7889f635b5964c5a31fbce40b072ec0e18..9f8087a305d91e8760723ad2e0796bb7a8e81575 100644 --- a/pkgs/development/python-modules/tempora/default.nix +++ b/pkgs/development/python-modules/tempora/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi +{ buildPythonPackage, fetchPypi , setuptools_scm , six, pytz}: diff --git a/pkgs/development/python-modules/tensorflow/bin.nix b/pkgs/development/python-modules/tensorflow/bin.nix index 21b21f174d0bedf84f995db9541b376ec1c5e3ff..4e3621157f939b08280ca37fb6060fdce0b6803d 100644 --- a/pkgs/development/python-modules/tensorflow/bin.nix +++ b/pkgs/development/python-modules/tensorflow/bin.nix @@ -2,7 +2,7 @@ , lib , fetchurl , buildPythonPackage -, isPy3k, isPy35, isPy36, pythonOlder +, isPy3k, isPy36, pythonOlder , astor , gast , numpy diff --git a/pkgs/development/python-modules/testfixtures/default.nix b/pkgs/development/python-modules/testfixtures/default.nix index 628be2e946af6fe7ae490a02759060a5f74db4b7..1e35d95c5e1f8a90f7c51d79ac190fb9968d3f1e 100644 --- a/pkgs/development/python-modules/testfixtures/default.nix +++ b/pkgs/development/python-modules/testfixtures/default.nix @@ -1,5 +1,5 @@ { stdenv, buildPythonPackage, fetchPypi -, mock, manuel, pytest, sybil, zope_component, django }: +, mock, manuel, pytest, sybil, zope_component }: buildPythonPackage rec { pname = "testfixtures"; diff --git a/pkgs/development/python-modules/textacy/default.nix b/pkgs/development/python-modules/textacy/default.nix index d42430248216f64fb1b6800f079f6d5ed90dad31..9b22ad3e5456097c9410d66a5b2e5a1270a913b9 100644 --- a/pkgs/development/python-modules/textacy/default.nix +++ b/pkgs/development/python-modules/textacy/default.nix @@ -4,7 +4,6 @@ , fetchPypi , cachetools , cld2-cffi -, cython , cytoolz , ftfy , ijson diff --git a/pkgs/development/python-modules/thespian/default.nix b/pkgs/development/python-modules/thespian/default.nix index 0ffaf315d54b4d22262dd20ec5a51b943227b40e..0ced52c7ba1059c8c5cd81b12a38df2d25240f89 100644 --- a/pkgs/development/python-modules/thespian/default.nix +++ b/pkgs/development/python-modules/thespian/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage, lib }: +{ fetchPypi, buildPythonPackage, lib }: buildPythonPackage rec { version = "3.9.2"; diff --git a/pkgs/development/python-modules/thinc/default.nix b/pkgs/development/python-modules/thinc/default.nix index b5812820023800c6c76f74f14bd34b3689516515..88e6c8d167429af68761b7549588220c2693db13 100644 --- a/pkgs/development/python-modules/thinc/default.nix +++ b/pkgs/development/python-modules/thinc/default.nix @@ -1,6 +1,5 @@ { stdenv , lib -, pkgs , buildPythonPackage , fetchPypi , pythonOlder @@ -11,7 +10,6 @@ , msgpack-python , preshed , numpy -, python , murmurhash , pathlib , hypothesis diff --git a/pkgs/development/python-modules/tiros/default.nix b/pkgs/development/python-modules/tiros/default.nix index b55c42cfa561e7700a6e5d4e7388d12102f59507..edc4bbdebb13383324a80ff7bc261ebca08f5e72 100644 --- a/pkgs/development/python-modules/tiros/default.nix +++ b/pkgs/development/python-modules/tiros/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage +{ fetchPypi, buildPythonPackage , semantic-version, boto3, flask, docutils, requests }: diff --git a/pkgs/development/python-modules/todoist/default.nix b/pkgs/development/python-modules/todoist/default.nix index 829d7bcfcb2b6af3d3bd284c432e1552140dcb62..6f3eae60c635f70febc8cc6b72da860169ef878b 100644 --- a/pkgs/development/python-modules/todoist/default.nix +++ b/pkgs/development/python-modules/todoist/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, python, buildPythonPackage +{ stdenv, fetchPypi, buildPythonPackage , requests }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/tokenserver/default.nix b/pkgs/development/python-modules/tokenserver/default.nix index c6efe5ba2397e79f41771614acb7b5c7ac8a91b3..44fcb9b46ff9b54ca8d103b811c162c120128c04 100644 --- a/pkgs/development/python-modules/tokenserver/default.nix +++ b/pkgs/development/python-modules/tokenserver/default.nix @@ -1,5 +1,4 @@ -{ stdenv -, buildPythonPackage +{ buildPythonPackage , fetchgit , testfixtures , cornice diff --git a/pkgs/development/python-modules/tox/default.nix b/pkgs/development/python-modules/tox/default.nix index 359f13e2a00bfdbe970621b5de29465e0f13bca0..4ceeb026634ce17de8c1e1a7855800359a8c8180 100644 --- a/pkgs/development/python-modules/tox/default.nix +++ b/pkgs/development/python-modules/tox/default.nix @@ -1,5 +1,4 @@ -{ lib -, buildPythonPackage +{ buildPythonPackage , fetchPypi , py , virtualenv diff --git a/pkgs/development/python-modules/tqdm/default.nix b/pkgs/development/python-modules/tqdm/default.nix index 87fa393ce5e33f08877b6ececd436743984dbb28..0b77f7068012071b00cba5cd4f94bfcb1a12ffaa 100644 --- a/pkgs/development/python-modules/tqdm/default.nix +++ b/pkgs/development/python-modules/tqdm/default.nix @@ -5,8 +5,6 @@ , coverage , glibcLocales , flake8 -, matplotlib -, pandas }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/typed-ast/default.nix b/pkgs/development/python-modules/typed-ast/default.nix index 0cfc8c3e14a93c6ba053bedd01722c0509c5d9d9..5bd0f5f81d2baab0ec2918ee2199690146378fdd 100644 --- a/pkgs/development/python-modules/typed-ast/default.nix +++ b/pkgs/development/python-modules/typed-ast/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, fetchPypi, isPy3k, lib, pythonOlder }: +{ buildPythonPackage, fetchPypi, lib, pythonOlder }: buildPythonPackage rec { pname = "typed-ast"; version = "1.1.0"; diff --git a/pkgs/development/python-modules/tzlocal/default.nix b/pkgs/development/python-modules/tzlocal/default.nix index 3bb75fb2ac291598cfbb793ae95f350db4c86fa9..8320500fc141d358d4b2e93deca0d9133e4074e6 100644 --- a/pkgs/development/python-modules/tzlocal/default.nix +++ b/pkgs/development/python-modules/tzlocal/default.nix @@ -1,5 +1,5 @@ { stdenv, buildPythonPackage, fetchPypi -, tzlocal, pytz }: +, pytz }: buildPythonPackage rec { pname = "tzlocal"; diff --git a/pkgs/development/python-modules/ukpostcodeparser/default.nix b/pkgs/development/python-modules/ukpostcodeparser/default.nix index 235f33da5994423b6db6f9e7e53d586dfc094aea..42588347c851727ad30ae378bc81a4b0dda322db 100644 --- a/pkgs/development/python-modules/ukpostcodeparser/default.nix +++ b/pkgs/development/python-modules/ukpostcodeparser/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "UkPostcodeParser"; diff --git a/pkgs/development/python-modules/uranium/default.nix b/pkgs/development/python-modules/uranium/default.nix index 276ed481601c1365aa5b044f1a42aff95433d938..eb2fa2bd042d5c3c4fce6d8a9a211c95179d79d5 100644 --- a/pkgs/development/python-modules/uranium/default.nix +++ b/pkgs/development/python-modules/uranium/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildPythonPackage, fetchFromGitHub, python, cmake +{ stdenv, buildPythonPackage, fetchFromGitHub, python, cmake , pyqt5, numpy, scipy, libarcus, doxygen, gettext, pythonOlder }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/vcrpy/default.nix b/pkgs/development/python-modules/vcrpy/default.nix index ab4ce1be2b1a6b3de9bcdefa9d2a5505f32fdf45..805941cab60db5163211ea53bd26c26ff1be7bb9 100644 --- a/pkgs/development/python-modules/vcrpy/default.nix +++ b/pkgs/development/python-modules/vcrpy/default.nix @@ -7,7 +7,6 @@ , contextlib2 , wrapt , pytest -, httpbin , pytest-httpbin , yarl , pythonOlder diff --git a/pkgs/development/python-modules/warrant/default.nix b/pkgs/development/python-modules/warrant/default.nix index c152271af3359798c4d919e5d6b75adead7c7a0a..ef6089baa507f21229166472b05d21b2eb8f433d 100644 --- a/pkgs/development/python-modules/warrant/default.nix +++ b/pkgs/development/python-modules/warrant/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchFromGitHub, fetchPypi, fetchpatch +{ lib, buildPythonPackage, fetchFromGitHub, fetchpatch , mock , boto3, envs, python-jose, requests }: diff --git a/pkgs/development/python-modules/wptserve/default.nix b/pkgs/development/python-modules/wptserve/default.nix index b2ce75c43c3a51fbca7428166edfff3b710803a7..32145623e4da429e46bee50352f7404ff6152de9 100644 --- a/pkgs/development/python-modules/wptserve/default.nix +++ b/pkgs/development/python-modules/wptserve/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , buildPythonPackage , fetchPypi , isPy3k diff --git a/pkgs/development/python-modules/wsproto/default.nix b/pkgs/development/python-modules/wsproto/default.nix index e98fcf205fd595da3db569cef3bdb9d3d0c5879b..c3ac5b51cb0fa41f738fc4674085219ed4d16596 100644 --- a/pkgs/development/python-modules/wsproto/default.nix +++ b/pkgs/development/python-modules/wsproto/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, h11, enum34 }: +{ buildPythonPackage, fetchPypi, h11, enum34 }: buildPythonPackage rec { pname = "wsproto"; diff --git a/pkgs/development/python-modules/xarray/default.nix b/pkgs/development/python-modules/xarray/default.nix index 039a751a5e14d9c7bda3336394126be9558d7c7d..a9041f9a76f751c5dad24976b66d65e0c5bcda04 100644 --- a/pkgs/development/python-modules/xarray/default.nix +++ b/pkgs/development/python-modules/xarray/default.nix @@ -5,7 +5,6 @@ , numpy , pandas , python -, fetchurl }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/zeep/default.nix b/pkgs/development/python-modules/zeep/default.nix index 418fcebaefd526fd8b391b6c0ed3563accb183d6..f283479c8de8dfd5864d1ba7f89a6ffa69a29f5d 100644 --- a/pkgs/development/python-modules/zeep/default.nix +++ b/pkgs/development/python-modules/zeep/default.nix @@ -19,7 +19,6 @@ , pytest , pytestcov , requests-mock -, testtools , tornado }: diff --git a/pkgs/development/python-modules/zodb/default.nix b/pkgs/development/python-modules/zodb/default.nix index 9aab2ba9e8441fbd27851d5bab35b6f1a41a6cf7..c23f332638d04fc3326dbd0100eec88bc161dc0f 100644 --- a/pkgs/development/python-modules/zodb/default.nix +++ b/pkgs/development/python-modules/zodb/default.nix @@ -1,7 +1,6 @@ { stdenv , fetchPypi , buildPythonPackage -, isPy3k , zope_testrunner , transaction , six diff --git a/pkgs/development/python-modules/zope_testrunner/default.nix b/pkgs/development/python-modules/zope_testrunner/default.nix index e2bf3a569d0487980cb5caba42ce288b88cc9d6f..a4988332b226d58f7208e6c1e83fd3043b21021e 100644 --- a/pkgs/development/python-modules/zope_testrunner/default.nix +++ b/pkgs/development/python-modules/zope_testrunner/default.nix @@ -1,7 +1,6 @@ { stdenv , buildPythonPackage , fetchPypi -, fetchpatch , zope_interface , zope_exceptions , zope_testing diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 68ab42a76dd7c810df29403d8a452dcd35e25c74..acaee897d9376794c29a2109dc977459d214390d 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -47,11 +47,11 @@ let "mirror://bioc/${biocVersion}/bioc/src/contrib/Archive/${name}_${version}.tar.gz" ]; }; deriveBiocAnn = mkDerive { - mkHomepage = {name, biocVersion}: "http://www.bioconductor.org/packages/${name}.html"; + mkHomepage = {name}: "http://www.bioconductor.org/packages/${name}.html"; mkUrls = {name, version, biocVersion}: [ "mirror://bioc/${biocVersion}/data/annotation/src/contrib/${name}_${version}.tar.gz" ]; }; deriveBiocExp = mkDerive { - mkHomepage = {name, biocVersion}: "http://www.bioconductor.org/packages/${name}.html"; + mkHomepage = {name}: "http://www.bioconductor.org/packages/${name}.html"; mkUrls = {name, version, biocVersion}: [ "mirror://bioc/${biocVersion}/data/experiment/src/contrib/${name}_${version}.tar.gz" ]; }; deriveCran = mkDerive { diff --git a/pkgs/development/ruby-modules/bundler/default.nix b/pkgs/development/ruby-modules/bundler/default.nix index 2f9a822383256a4ccfe26afd6dee9fd4f8d1a802..b1d0b76f086c8f43ff5c25f7820cccd624952a7f 100644 --- a/pkgs/development/ruby-modules/bundler/default.nix +++ b/pkgs/development/ruby-modules/bundler/default.nix @@ -1,4 +1,4 @@ -{ buildRubyGem, makeWrapper, ruby, coreutils }: +{ buildRubyGem, ruby }: buildRubyGem rec { inherit ruby; diff --git a/pkgs/development/tools/analysis/qcachegrind/default.nix b/pkgs/development/tools/analysis/qcachegrind/default.nix index 30d82aca83ae44c9c555d7d4ad839c29cdbc0f2b..fb0f7414841cfd1443bd0edfd31bd209b8042e5a 100644 --- a/pkgs/development/tools/analysis/qcachegrind/default.nix +++ b/pkgs/development/tools/analysis/qcachegrind/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, qmake, qtbase, perl, python, php, kcachegrind, fetchpatch }: +{ stdenv, qmake, qtbase, perl, python, php, kcachegrind }: let name = stdenv.lib.replaceStrings ["kcachegrind"] ["qcachegrind"] kcachegrind.name; diff --git a/pkgs/development/tools/analysis/radare/default.nix b/pkgs/development/tools/analysis/radare/default.nix index b174d6c069b71a85bd64da79acbaa2ae03539049..b9b9b8abfb929570da4beb024bb9503d4658b4cb 100644 --- a/pkgs/development/tools/analysis/radare/default.nix +++ b/pkgs/development/tools/analysis/radare/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, libusb, readline, lua, libewf, perl, +{stdenv, fetchurl, pkgconfig, libusb, readline, lua, perl, gtk2 ? null, vte ? null, gtkdialog ? null, python ? null, ruby ? null, diff --git a/pkgs/development/tools/analysis/valgrind/default.nix b/pkgs/development/tools/analysis/valgrind/default.nix index 131533896ff94ebe942704a8aa30629455bd55dd..cbcfa981b6b5b646a7342d5b1960641b71c1ec2d 100644 --- a/pkgs/development/tools/analysis/valgrind/default.nix +++ b/pkgs/development/tools/analysis/valgrind/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, perl, gdb, llvm, cctools, xnu, bootstrap_cmds }: +{ stdenv, fetchurl, perl, gdb, llvm, cctools, xnu, bootstrap_cmds }: stdenv.mkDerivation rec { name = "valgrind-3.13.0"; diff --git a/pkgs/development/tools/backblaze-b2/default.nix b/pkgs/development/tools/backblaze-b2/default.nix index 5bda2d945eb6c2be1ec67bf0ae04429d70b0b62e..19609e15c7651a2cf8649aabb3c466c434e77696 100644 --- a/pkgs/development/tools/backblaze-b2/default.nix +++ b/pkgs/development/tools/backblaze-b2/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonApplication, fetchFromGitHub, makeWrapper +{ lib, buildPythonApplication, fetchFromGitHub , arrow, futures, logfury, requests, six, tqdm }: diff --git a/pkgs/development/tools/bloaty/default.nix b/pkgs/development/tools/bloaty/default.nix index 953a10ca47ab7f6c872c48baa03754dbd9f2fe97..5f2e9b5f440d8c3ce55b9924b3b39e088e67f26e 100644 --- a/pkgs/development/tools/bloaty/default.nix +++ b/pkgs/development/tools/bloaty/default.nix @@ -1,4 +1,4 @@ -{ stdenv, binutils, cmake, zlib, fetchFromGitHub }: +{ stdenv, cmake, zlib, fetchFromGitHub }: stdenv.mkDerivation rec { version = "2018-06-15"; diff --git a/pkgs/development/tools/build-managers/buck/default.nix b/pkgs/development/tools/build-managers/buck/default.nix index 5d486f47844eb8ef14d607ab4e1f6089243e4bfc..e64bf432b38ba545b9249ae63414a9e115823805 100644 --- a/pkgs/development/tools/build-managers/buck/default.nix +++ b/pkgs/development/tools/build-managers/buck/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, jdk, ant, python2, python2Packages, watchman, unzip, bash, makeWrapper }: +{ stdenv, fetchFromGitHub, jdk, ant, python2, python2Packages, watchman, bash, makeWrapper }: stdenv.mkDerivation rec { name = "buck-${version}"; diff --git a/pkgs/development/tools/build-managers/buildbot/default.nix b/pkgs/development/tools/build-managers/buildbot/default.nix index 3729abfe247d6bbda68981009c41fede61b26d71..adb279cdea68f8d495a17d3f0a25a1f9f6f0b50e 100644 --- a/pkgs/development/tools/build-managers/buildbot/default.nix +++ b/pkgs/development/tools/build-managers/buildbot/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, openssh, buildbot-worker, buildbot-pkg, pythonPackages, runCommand, makeWrapper }: +{ stdenv, openssh, buildbot-worker, buildbot-pkg, pythonPackages, runCommand, makeWrapper }: let withPlugins = plugins: runCommand "wrapped-${package.name}" { diff --git a/pkgs/development/tools/build-managers/cmake/2.8.nix b/pkgs/development/tools/build-managers/cmake/2.8.nix index f6da92fe6219561c161911551c6a3592e9f0b130..c61bf3287db18888c78a460682a339150f08389d 100644 --- a/pkgs/development/tools/build-managers/cmake/2.8.nix +++ b/pkgs/development/tools/build-managers/cmake/2.8.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, replace, curl, expat, zlib, bzip2 +{ stdenv, fetchurl, fetchpatch, curl, expat, zlib, bzip2 , useNcurses ? false, ncurses, useQt4 ? false, qt4, ps , buildPlatform, hostPlatform }: diff --git a/pkgs/development/tools/build-managers/conan/default.nix b/pkgs/development/tools/build-managers/conan/default.nix index 9ff32f1b3484489b6737de3ebb9a4175b26e81a2..e77647b2fed44067c37648c47a3f1226ef93b348 100644 --- a/pkgs/development/tools/build-managers/conan/default.nix +++ b/pkgs/development/tools/build-managers/conan/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchpatch, python }: +{ lib, python }: let newPython = python.override { packageOverrides = self: super: { diff --git a/pkgs/development/tools/build-managers/dub/default.nix b/pkgs/development/tools/build-managers/dub/default.nix index 52e29acc9d81bf8da47b8bbd2af8b42c8bdd3340..b9a8c97bd5eb5b3e033b55ec348f7eb6f2a932ea 100644 --- a/pkgs/development/tools/build-managers/dub/default.nix +++ b/pkgs/development/tools/build-managers/dub/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, curl, dmd, libevent, rsync }: +{ stdenv, fetchFromGitHub, curl, dmd, libevent, rsync }: let diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix index f14f6adf5fef9e2663f90776abaa0b3092731ab7..3cb906d50edf10aa4e8edd6fb37b4ed71c9ef9d3 100644 --- a/pkgs/development/tools/build-managers/meson/default.nix +++ b/pkgs/development/tools/build-managers/meson/default.nix @@ -1,4 +1,4 @@ -{ lib, python3Packages, stdenv, ninja, pkgconfig, targetPlatform, writeTextDir, substituteAll }: let +{ lib, python3Packages, stdenv, targetPlatform, writeTextDir, substituteAll }: let targetPrefix = lib.optionalString stdenv.isCross (targetPlatform.config + "-"); in python3Packages.buildPythonApplication rec { diff --git a/pkgs/development/tools/build-managers/nant/default.nix b/pkgs/development/tools/build-managers/nant/default.nix index 5da32f2334a78912401389297cbdb58876e6a030..c394d87e09ec3a1dacd2ce34d5892351797f1fc5 100644 --- a/pkgs/development/tools/build-managers/nant/default.nix +++ b/pkgs/development/tools/build-managers/nant/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, fetchFromGitHub, pkgconfig, mono, makeWrapper +{ stdenv, fetchFromGitHub, pkgconfig, mono, makeWrapper , targetVersion ? "4.5" }: let diff --git a/pkgs/development/tools/build-managers/pants/default.nix b/pkgs/development/tools/build-managers/pants/default.nix index 38a197aa900b72b8bc4c45ba3e6ff895f0b3b350..1ad52f327e15b89046e2de0ccfbd8cccc297daea 100644 --- a/pkgs/development/tools/build-managers/pants/default.nix +++ b/pkgs/development/tools/build-managers/pants/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pythonPackages, runCommand, curl }: +{ stdenv, pythonPackages }: with stdenv.lib; with pythonPackages; diff --git a/pkgs/development/tools/build-managers/rebar3/default.nix b/pkgs/development/tools/build-managers/rebar3/default.nix index ff6dc07ea9e968fc003b38ea0e57dc3f4d2def54..d9e260a13de3eb7bd1183dfcba1c2d0114d91dbc 100644 --- a/pkgs/development/tools/build-managers/rebar3/default.nix +++ b/pkgs/development/tools/build-managers/rebar3/default.nix @@ -1,6 +1,6 @@ -{ stdenv, writeText, callPackage, fetchurl, +{ stdenv, fetchurl, fetchHex, erlang, hermeticRebar3 ? true, - tree, fetchFromGitHub, hexRegistrySnapshot }: + tree, hexRegistrySnapshot }: let version = "3.6.1"; diff --git a/pkgs/development/tools/build-managers/scons/common.nix b/pkgs/development/tools/build-managers/scons/common.nix index d3842a39f18b6a210afdb965d094f8b0a8888cdd..4b0242a3956d2b08858faaec0fff9e0fe0e2d183 100644 --- a/pkgs/development/tools/build-managers/scons/common.nix +++ b/pkgs/development/tools/build-managers/scons/common.nix @@ -1,6 +1,6 @@ { version, sha256 }: -{ stdenv, fetchurl, fetchpatch, python2Packages }: +{ stdenv, fetchurl, python2Packages }: let name = "scons"; in python2Packages.buildPythonApplication { diff --git a/pkgs/development/tools/build-managers/scons/default.nix b/pkgs/development/tools/build-managers/scons/default.nix index f52d53526fa1dec0a20566c52dac24195c4987a0..3bd31523412aaf7bc648ee585bfc1e95db689cb4 100644 --- a/pkgs/development/tools/build-managers/scons/default.nix +++ b/pkgs/development/tools/build-managers/scons/default.nix @@ -1,4 +1,4 @@ -{ callPackage, stdenv }: +{ callPackage }: let mkScons = args: callPackage (import ./common.nix args) { }; diff --git a/pkgs/development/tools/build-managers/waf/default.nix b/pkgs/development/tools/build-managers/waf/default.nix index 000943f117f63db59fe3e22d0ceedcb43e92c6ca..e86d61cf6c9a10996e0b65550bbbf4c6abc5e531 100644 --- a/pkgs/development/tools/build-managers/waf/default.nix +++ b/pkgs/development/tools/build-managers/waf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, python2 }: +{ stdenv, fetchurl, python2 }: stdenv.mkDerivation rec { name = "waf-${version}"; diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix index 2dca2b6cd423ea8ffb0bfc63edd57c5870d0dc29..95ee4e93f2a8f139bed8187d6fc4c640514c54ce 100644 --- a/pkgs/development/tools/buildah/default.nix +++ b/pkgs/development/tools/buildah/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub, runCommand +{ stdenv, buildGoPackage, fetchFromGitHub , gpgme, libgpgerror, lvm2, btrfs-progs, pkgconfig, ostree, libselinux, libseccomp , go-md2man }: diff --git a/pkgs/development/tools/castxml/default.nix b/pkgs/development/tools/castxml/default.nix index f42adffc5f420ab3cf8eb8ea7098cef2ddc27c4e..603b155ee4f9a1989dff28418710089aa9e03f75 100644 --- a/pkgs/development/tools/castxml/default.nix +++ b/pkgs/development/tools/castxml/default.nix @@ -1,6 +1,5 @@ { stdenv, fetchFromGitHub , pythonPackages -, pkgconfig , cmake , llvmPackages , withMan ? true diff --git a/pkgs/development/tools/chefdk/default.nix b/pkgs/development/tools/chefdk/default.nix index df06793eaec0b752335905bc2ba0d267e223cd6d..1d81d469eb29afe9df8a05492a79c4b6c4a2d43f 100644 --- a/pkgs/development/tools/chefdk/default.nix +++ b/pkgs/development/tools/chefdk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, bundlerEnv, ruby_2_4, perl, autoconf }: +{ lib, bundlerEnv, ruby_2_4, perl, autoconf }: bundlerEnv { # Last updated via: diff --git a/pkgs/development/tools/compass/default.nix b/pkgs/development/tools/compass/default.nix index f96d3e810ca55c00f8dad4fc95a88fd249bbb905..3e3e239fbfb3fae0bb0e0a9550fdf1616e9913a2 100644 --- a/pkgs/development/tools/compass/default.nix +++ b/pkgs/development/tools/compass/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, bundlerEnv, ruby }: +{ lib, bundlerEnv, ruby }: bundlerEnv { name = "compass-1.0.3"; diff --git a/pkgs/development/tools/container-linux-config-transpiler/default.nix b/pkgs/development/tools/container-linux-config-transpiler/default.nix index 8d43736d3a8a560233992a67c5c0e5654c3c66b3..b2b903b095c69bc49e2bb62ab13fabadea4aab96 100644 --- a/pkgs/development/tools/container-linux-config-transpiler/default.nix +++ b/pkgs/development/tools/container-linux-config-transpiler/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, buildGoPackage }: +{ lib, fetchFromGitHub, buildGoPackage }: with lib; diff --git a/pkgs/development/tools/database/liquibase/default.nix b/pkgs/development/tools/database/liquibase/default.nix index 7f66317167a5f0efc3562036e40f5327045a7940..46104e78d1d7ba4078d315c4a20a99bdf171bcbc 100644 --- a/pkgs/development/tools/database/liquibase/default.nix +++ b/pkgs/development/tools/database/liquibase/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, writeText, jre, makeWrapper, fetchMavenArtifact +{ stdenv, fetchurl, jre, makeWrapper , mysqlSupport ? true, mysql_jdbc ? null }: assert mysqlSupport -> mysql_jdbc != null; diff --git a/pkgs/development/tools/delve/default.nix b/pkgs/development/tools/delve/default.nix index 9a7a600d13436d0f50220b6f196b4afa6d14f021..b101e52aad9ccdc1f6afa1aeb256eecd64d3fc9e 100644 --- a/pkgs/development/tools/delve/default.nix +++ b/pkgs/development/tools/delve/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "delve-${version}"; diff --git a/pkgs/development/tools/devpi-client/default.nix b/pkgs/development/tools/devpi-client/default.nix index 905314efe5a9b8aca62863ae7e48199857f24ab6..26d96a64126398e47e632a61ab8f031582b5f3dc 100644 --- a/pkgs/development/tools/devpi-client/default.nix +++ b/pkgs/development/tools/devpi-client/default.nix @@ -1,5 +1,4 @@ { stdenv -, lib , pythonPackages , glibcLocales , devpi-server diff --git a/pkgs/development/tools/devpi-server/default.nix b/pkgs/development/tools/devpi-server/default.nix index 6823ae3372cb8a46e194d1cc294da30189f22802..f3ade82e52e8ad95b74f2259c878919d66f54458 100644 --- a/pkgs/development/tools/devpi-server/default.nix +++ b/pkgs/development/tools/devpi-server/default.nix @@ -1,4 +1,4 @@ - { stdenv, pythonPackages, glibcLocales, nginx }: + { stdenv, pythonPackages, nginx }: pythonPackages.buildPythonApplication rec { name = "${pname}-${version}"; diff --git a/pkgs/development/tools/documentation/gnome-doc-utils/default.nix b/pkgs/development/tools/documentation/gnome-doc-utils/default.nix index f6920a83e09c9d76f8288eb2b397cd67ec104392..7e8a41590724f4db2b7479847b2a4f4dbe6da236 100644 --- a/pkgs/development/tools/documentation/gnome-doc-utils/default.nix +++ b/pkgs/development/tools/documentation/gnome-doc-utils/default.nix @@ -1,5 +1,5 @@ -{stdenv, fetchurl, pkgconfig, libxml2Python, libxslt, intltool -, makeWrapper, python2Packages }: +{fetchurl, pkgconfig, libxml2Python, libxslt, intltool +, python2Packages }: python2Packages.buildPythonApplication { name = "gnome-doc-utils-0.20.10"; diff --git a/pkgs/development/tools/easyjson/default.nix b/pkgs/development/tools/easyjson/default.nix index 253f5b374d3c397b7eb9acc1841fd71ba6a98902..de9fb82f66f24b33d050f0796845b46504ef3f2d 100644 --- a/pkgs/development/tools/easyjson/default.nix +++ b/pkgs/development/tools/easyjson/default.nix @@ -1,5 +1,5 @@ # This file was generated by https://github.com/kamilchm/go2nix v1.2.1 -{ stdenv, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { name = "easyjson-unstable-${version}"; diff --git a/pkgs/development/tools/egg2nix/chicken-eggs.nix b/pkgs/development/tools/egg2nix/chicken-eggs.nix index 4ec9e0daa47af08facdce04e10b69a583c4e1d79..1f786f127c91a4589d93533cc2454dc8dea76912 100644 --- a/pkgs/development/tools/egg2nix/chicken-eggs.nix +++ b/pkgs/development/tools/egg2nix/chicken-eggs.nix @@ -1,4 +1,4 @@ -{ pkgs, stdenv }: +{ pkgs }: rec { inherit (pkgs) eggDerivation fetchegg; diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index 38432e58d0d9099427d7fcab6ca30d3605737504..695a532305a91ddf302353bf5f7c69aba361792c 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, libXScrnSaver, makeWrapper, fetchurl, unzip, atomEnv, gtk2 }: +{ stdenv, libXScrnSaver, makeWrapper, fetchurl, unzip, atomEnv, gtk2 }: let version = "1.8.2"; diff --git a/pkgs/development/tools/erlang/hex2nix/default.nix b/pkgs/development/tools/erlang/hex2nix/default.nix index 082edb37a4f3d0aeed2b652491cfe24104cb5939..e21749f90d0298f447f188ea8fe730424be893af 100644 --- a/pkgs/development/tools/erlang/hex2nix/default.nix +++ b/pkgs/development/tools/erlang/hex2nix/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildRebar3, buildHex, +{ fetchFromGitHub, buildRebar3, # Erlang dependencies: ibrowse_4_2_2, diff --git a/pkgs/development/tools/erlang/relx-exe/default.nix b/pkgs/development/tools/erlang/relx-exe/default.nix index df14c29c372830c5a981a4e93d2baa1d3ee529bf..9bbdc8c8334d2894d0a8991c0784a23c1344049d 100644 --- a/pkgs/development/tools/erlang/relx-exe/default.nix +++ b/pkgs/development/tools/erlang/relx-exe/default.nix @@ -1,4 +1,4 @@ -{ stdenv, beamPackages, buildRebar3, buildHex, fetchHex +{ stdenv, buildHex , getopt_0_8_2, erlware_commons_1_0_0, cf_0_2_2 }: diff --git a/pkgs/development/tools/fac/default.nix b/pkgs/development/tools/fac/default.nix index d6cc527e6418a97aff2453341638cb9a68228b2e..18367d14f6e593f3eb7736124a069c6b035c4471 100644 --- a/pkgs/development/tools/fac/default.nix +++ b/pkgs/development/tools/fac/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, fetchurl, makeWrapper, git }: +{ stdenv, buildGoPackage, fetchFromGitHub, makeWrapper, git }: buildGoPackage rec { name = "fac-${version}"; diff --git a/pkgs/development/tools/git-ftp/default.nix b/pkgs/development/tools/git-ftp/default.nix index 3d4d542d2f926d0164eee51bdcfa1769bc4ac977..4c67a45d8c30da8ba7c8489d7d2cc243502bdb06 100644 --- a/pkgs/development/tools/git-ftp/default.nix +++ b/pkgs/development/tools/git-ftp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pandoc, man }: +{ stdenv, fetchFromGitHub, pandoc, man }: stdenv.mkDerivation rec { name = "git-ftp-${version}"; version = "1.5.1"; diff --git a/pkgs/development/tools/go-bindata/default.nix b/pkgs/development/tools/go-bindata/default.nix index 4b87e74a6308eb5e943d72149252a7faf870cdc3..9a783deecee6d5b79c65bc957676f5ea5672ac89 100644 --- a/pkgs/development/tools/go-bindata/default.nix +++ b/pkgs/development/tools/go-bindata/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { name = "go-bindata-${version}"; diff --git a/pkgs/development/tools/go-outline/default.nix b/pkgs/development/tools/go-outline/default.nix index fe159c85c3d64feefb4591a203ecea7002ce88df..5e1cd03e0af5d73e900f2a2052cd39718ce5df00 100644 --- a/pkgs/development/tools/go-outline/default.nix +++ b/pkgs/development/tools/go-outline/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "go-outline-${version}"; diff --git a/pkgs/development/tools/go-repo-root/default.nix b/pkgs/development/tools/go-repo-root/default.nix index e47b84354d62a834a809c3c3dad037c87a47c711..52cd37f98850140f556f2ca8e3757e21b198b166 100644 --- a/pkgs/development/tools/go-repo-root/default.nix +++ b/pkgs/development/tools/go-repo-root/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, gotools, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { name = "go-repo-root-${version}"; diff --git a/pkgs/development/tools/go-symbols/default.nix b/pkgs/development/tools/go-symbols/default.nix index 9a8b592b038ded7855c121912d73ac37b0500d51..38ceea7d417beadc0e340579309d607eeeedaf9c 100644 --- a/pkgs/development/tools/go-symbols/default.nix +++ b/pkgs/development/tools/go-symbols/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchgit }: +{ stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { name = "go-symbols-${version}"; diff --git a/pkgs/development/tools/gocode/default.nix b/pkgs/development/tools/gocode/default.nix index 2501c36dd5cdd171c8017d3229f4c00f95a7fa98..a20e1658988c6f5aed25a98d45396271b91f4d08 100644 --- a/pkgs/development/tools/gocode/default.nix +++ b/pkgs/development/tools/gocode/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { name = "gocode-${version}"; diff --git a/pkgs/development/tools/goconvey/default.nix b/pkgs/development/tools/goconvey/default.nix index e4ef9d26da2575c55ba9011dc84d2616cecad6f9..fcdb56460e19c92d5ab8d8a79583e04edefb3d49 100644 --- a/pkgs/development/tools/goconvey/default.nix +++ b/pkgs/development/tools/goconvey/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "goconvey-${version}"; diff --git a/pkgs/development/tools/godef/default.nix b/pkgs/development/tools/godef/default.nix index 6644c8fcfc4f7c333a496e9b3dc93c1f2835fbe2..3227ed8eec2eae91bef9c3e03ea0bbc435e8da77 100644 --- a/pkgs/development/tools/godef/default.nix +++ b/pkgs/development/tools/godef/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchgit }: +{ stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { name = "godef-${version}"; diff --git a/pkgs/development/tools/goimports/default.nix b/pkgs/development/tools/goimports/default.nix index 5c69f34e28b30be437a49920dedff8035913a15b..14c319320d0c6635caf32bf97732f970a9f85f42 100644 --- a/pkgs/development/tools/goimports/default.nix +++ b/pkgs/development/tools/goimports/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { name = "goimports-${version}"; diff --git a/pkgs/development/tools/golint/default.nix b/pkgs/development/tools/golint/default.nix index 99f049314ae801f64a8f27444baa4ac4ec6b713c..a617e582c980119b7e6a2c0ed5b348dac4f397b6 100644 --- a/pkgs/development/tools/golint/default.nix +++ b/pkgs/development/tools/golint/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { name = "lint-${version}"; diff --git a/pkgs/development/tools/gomodifytags/default.nix b/pkgs/development/tools/gomodifytags/default.nix index f1452bc121148a9d9f2f54f3200433b9d49465a3..86b7246b4113f5e8ce06140844b18e9d737d773f 100644 --- a/pkgs/development/tools/gomodifytags/default.nix +++ b/pkgs/development/tools/gomodifytags/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchgit }: +{ stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { name = "gomodifytags-${version}"; diff --git a/pkgs/development/tools/gopkgs/default.nix b/pkgs/development/tools/gopkgs/default.nix index 298657fe38c57c5995f791c96afbbd82851213b9..ea9c92c0d0a1258ddaf61f9fb094b85f7b52fc99 100644 --- a/pkgs/development/tools/gopkgs/default.nix +++ b/pkgs/development/tools/gopkgs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "gopkgs-${version}"; diff --git a/pkgs/development/tools/gotags/default.nix b/pkgs/development/tools/gotags/default.nix index ad22d4ea40796b4a9aeb73497a076b74a610769d..b8230561fb42d308a506c93b32078036748054ea 100644 --- a/pkgs/development/tools/gotags/default.nix +++ b/pkgs/development/tools/gotags/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { name = "gotags-${version}"; diff --git a/pkgs/development/tools/gotests/default.nix b/pkgs/development/tools/gotests/default.nix index ccdab780e6cfac448129ccbca5b9ae35984e25e1..6c8270f85986f09ab7e4e039b54b24a7cba6d91c 100644 --- a/pkgs/development/tools/gotests/default.nix +++ b/pkgs/development/tools/gotests/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "gotests-${version}"; diff --git a/pkgs/development/tools/gotools/default.nix b/pkgs/development/tools/gotools/default.nix index e9a7e7ac89183cfcf375bfb215f10038106776e9..4bbb6b0bd4ff35757392efd3613d4d8a5b6ee1eb 100644 --- a/pkgs/development/tools/gotools/default.nix +++ b/pkgs/development/tools/gotools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, go, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, go, buildGoPackage, fetchgit }: buildGoPackage rec { name = "gotools-${version}"; diff --git a/pkgs/development/tools/govers/default.nix b/pkgs/development/tools/govers/default.nix index a80f1569329c198d7e7cf06c52e621ba9e60f764..440b5e2eb0b7169599911a409c0f05fea79ed688 100644 --- a/pkgs/development/tools/govers/default.nix +++ b/pkgs/development/tools/govers/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { name = "govers-${version}"; diff --git a/pkgs/development/tools/gox/default.nix b/pkgs/development/tools/gox/default.nix index 65bc55c6d8d7ba30e4e40710dad916a8470d4e17..69b20dd3a179e496afd3f7e71e65983773d2968f 100644 --- a/pkgs/development/tools/gox/default.nix +++ b/pkgs/development/tools/gox/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "gox-${version}"; diff --git a/pkgs/development/tools/haskell/hyper-haskell/default.nix b/pkgs/development/tools/haskell/hyper-haskell/default.nix index 31697750a702e18c7b63cb26e7fd92b2a3432ee9..a2a049615b78ccc5c0d7cbec75d8345bd3c5ace7 100644 --- a/pkgs/development/tools/haskell/hyper-haskell/default.nix +++ b/pkgs/development/tools/haskell/hyper-haskell/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, writeText, jshon, electron, hyper-haskell-server, extra-packages ? [] }: +{ stdenv, fetchFromGitHub, jshon, electron, hyper-haskell-server, extra-packages ? [] }: let binPath = stdenv.lib.makeBinPath ([ hyper-haskell-server ] ++ extra-packages); diff --git a/pkgs/development/tools/haskell/lambdabot/default.nix b/pkgs/development/tools/haskell/lambdabot/default.nix index edf967f7d1100b000d592381a8e9f51a62cf3dc3..5e372b4f3874d6a4b5bb75e194c1213d62362523 100644 --- a/pkgs/development/tools/haskell/lambdabot/default.nix +++ b/pkgs/development/tools/haskell/lambdabot/default.nix @@ -1,4 +1,4 @@ -{ lib, haskellLib, fetchpatch, makeWrapper, haskellPackages +{ lib, haskellLib, makeWrapper, haskellPackages , mueval , withDjinn ? true , aspell ? null diff --git a/pkgs/development/tools/haskell/multi-ghc-travis/default.nix b/pkgs/development/tools/haskell/multi-ghc-travis/default.nix index 88c4fc14a66618ec64c5a054a3658c60dd84e3fa..30dd7f217915debeed0a9344e56c76d8608b5722 100644 --- a/pkgs/development/tools/haskell/multi-ghc-travis/default.nix +++ b/pkgs/development/tools/haskell/multi-ghc-travis/default.nix @@ -1,6 +1,6 @@ { mkDerivation, ansi-terminal, base, bytestring, Cabal, containers , deepseq, Diff, directory, filepath, ShellCheck, stdenv, tasty -, tasty-golden, transformers, fetchFromGitHub, fetchpatch +, tasty-golden, transformers, fetchFromGitHub }: mkDerivation { diff --git a/pkgs/development/tools/hexio/default.nix b/pkgs/development/tools/hexio/default.nix index 6511bdd20102f9eb5cc64b961c890fd0b2630868..905580482d45f94f2c02823648dfd99e15c0e1c3 100644 --- a/pkgs/development/tools/hexio/default.nix +++ b/pkgs/development/tools/hexio/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchurl, python, pcsclite, pth }: +{ stdenv, fetchFromGitHub, python, pcsclite, pth }: stdenv.mkDerivation rec { pname = "hexio"; diff --git a/pkgs/development/tools/iaca/2.1.nix b/pkgs/development/tools/iaca/2.1.nix index e71e296212cd5fd1c16fcb071fc588a90ee9fb3c..b2c764c5a8566fe62760b534f4bb4dcc3471a815 100644 --- a/pkgs/development/tools/iaca/2.1.nix +++ b/pkgs/development/tools/iaca/2.1.nix @@ -1,4 +1,4 @@ -{ stdenv, makeWrapper, requireFile, patchelf, gcc, unzip }: +{ stdenv, makeWrapper, requireFile, gcc, unzip }: with stdenv.lib; # v2.1: last version with NHM/WSM arch support diff --git a/pkgs/development/tools/iaca/3.0.nix b/pkgs/development/tools/iaca/3.0.nix index af738bc71a93dae77786344448aff5685e5b200d..34b9e1df1906465e0ebf5937e7b9cdf72d33cf74 100644 --- a/pkgs/development/tools/iaca/3.0.nix +++ b/pkgs/development/tools/iaca/3.0.nix @@ -1,4 +1,4 @@ -{ stdenv, requireFile, patchelf, unzip }: +{ stdenv, requireFile, unzip }: with stdenv.lib; stdenv.mkDerivation { diff --git a/pkgs/development/tools/irony-server/default.nix b/pkgs/development/tools/irony-server/default.nix index e2aa27a96eb5a6d8c2f9e554678c18737cf50232..b6a78071bc87d4572fb76a781f8ba89c30a697ea 100644 --- a/pkgs/development/tools/irony-server/default.nix +++ b/pkgs/development/tools/irony-server/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, cmake, llvmPackages, irony }: +{ stdenv, cmake, llvmPackages, irony }: stdenv.mkDerivation rec { name = "irony-server-${version}"; diff --git a/pkgs/development/tools/jmespath/default.nix b/pkgs/development/tools/jmespath/default.nix index dd0379e83a7c2af58227d7e56b9758c5afa689f6..c53d6608efd337d223de0c76019a802db4848064 100644 --- a/pkgs/development/tools/jmespath/default.nix +++ b/pkgs/development/tools/jmespath/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "jmespath-${version}"; diff --git a/pkgs/development/tools/jp/default.nix b/pkgs/development/tools/jp/default.nix index d46f7b3e88337f79115fb5cabefbfb0fae718daa..e8e8acd6a9a416ecee0ed3216f4cc27a39d0cec1 100644 --- a/pkgs/development/tools/jp/default.nix +++ b/pkgs/development/tools/jp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub, jmespath }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "jp-${version}"; diff --git a/pkgs/development/tools/json2hcl/default.nix b/pkgs/development/tools/json2hcl/default.nix index d53b39021339d1d02018e2e788269a0d1a209907..694428f55a6baab815d180216a678c797d51f81a 100644 --- a/pkgs/development/tools/json2hcl/default.nix +++ b/pkgs/development/tools/json2hcl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "json2hcl"; diff --git a/pkgs/development/tools/kube-aws/default.nix b/pkgs/development/tools/kube-aws/default.nix index 11f4a5c8bd0a85d979b4fc078a53c7279e2eede4..af5c0e9c2f9fea393aad7679eafa70eee5107c02 100644 --- a/pkgs/development/tools/kube-aws/default.nix +++ b/pkgs/development/tools/kube-aws/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, buildGoPackage }: +{ lib, fetchFromGitHub, buildGoPackage }: with lib; diff --git a/pkgs/development/tools/leaps/default.nix b/pkgs/development/tools/leaps/default.nix index 9e41ef3813180cf49e45203af1a11fce112d5343..afac17b52519878943e4b23ffb3079f661b7f943 100644 --- a/pkgs/development/tools/leaps/default.nix +++ b/pkgs/development/tools/leaps/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "leaps-${version}"; diff --git a/pkgs/development/tools/librarian-puppet-go/default.nix b/pkgs/development/tools/librarian-puppet-go/default.nix index 8adea820ec7675596d79e4f981ca678431892bc7..58f50dd2f7e30f5bc52e6201e1f147403cb98439 100644 --- a/pkgs/development/tools/librarian-puppet-go/default.nix +++ b/pkgs/development/tools/librarian-puppet-go/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, buildGoPackage }: +{ lib, fetchFromGitHub, buildGoPackage }: buildGoPackage rec { name = "librarian-puppet-go-${version}"; diff --git a/pkgs/development/tools/manul/default.nix b/pkgs/development/tools/manul/default.nix index c4df52da170131735c5949691e8f4d58a24963b3..a5dd0a882728171daef9bf778b8a524c1f505b19 100644 --- a/pkgs/development/tools/manul/default.nix +++ b/pkgs/development/tools/manul/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "manul-unstable-2016-09-30"; diff --git a/pkgs/development/tools/misc/autogen/default.nix b/pkgs/development/tools/misc/autogen/default.nix index 660917ee9f1ff9ec35cdc48bd860fc291698d269..265d425bbcfb5ef0771430d498eea30f683331c3 100644 --- a/pkgs/development/tools/misc/autogen/default.nix +++ b/pkgs/development/tools/misc/autogen/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPackages, fetchurl, which, pkgconfig, texinfo, perl, guile, libxml2 }: +{ stdenv, buildPackages, fetchurl, which, pkgconfig, perl, guile, libxml2 }: stdenv.mkDerivation rec { name = "autogen-${version}"; diff --git a/pkgs/development/tools/misc/automake/automake-1.16.x.nix b/pkgs/development/tools/misc/automake/automake-1.16.x.nix index affc400a9ed0f9d5d1c730fad7f5f7cd54080d08..6646b847252676f78a3591842f4b41551793e35e 100644 --- a/pkgs/development/tools/misc/automake/automake-1.16.x.nix +++ b/pkgs/development/tools/misc/automake/automake-1.16.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, autoconf, makeWrapper, doCheck ? false }: +{ stdenv, fetchurl, perl, autoconf, doCheck ? false }: stdenv.mkDerivation rec { name = "automake-1.16.1"; diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index 0b71c6719dc4ae0bb5c9b00e64529676f7df04ce..df4d0e3f47db8d366faa4cc3a6123522c39dd1bd 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -1,6 +1,6 @@ { stdenv, buildPackages , fetchurl, zlib, autoreconfHook264 -, buildPlatform, hostPlatform, targetPlatform +, hostPlatform, targetPlatform , noSysDirs, gold ? true, bison ? null }: diff --git a/pkgs/development/tools/misc/blackmagic/default.nix b/pkgs/development/tools/misc/blackmagic/default.nix index ab84cb37656eec6d6261f021aef0a14648f7c086..2d7225ee03edcfafad320fd20ef127c1a12a2493 100644 --- a/pkgs/development/tools/misc/blackmagic/default.nix +++ b/pkgs/development/tools/misc/blackmagic/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub -, gcc-arm-embedded, bash, libftdi +, gcc-arm-embedded, libftdi , python, pythonPackages }: diff --git a/pkgs/development/tools/misc/cbrowser/default.nix b/pkgs/development/tools/misc/cbrowser/default.nix index 51610349c45efd4c70a012238fb0393b7e60205a..6519f349bfc8a39b8d9e069e58e5dad10909c039 100644 --- a/pkgs/development/tools/misc/cbrowser/default.nix +++ b/pkgs/development/tools/misc/cbrowser/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, cscope, tk, makeWrapper }: +{ fetchurl, stdenv, tk, makeWrapper }: stdenv.mkDerivation rec { name = "cbrowser-0.8"; diff --git a/pkgs/development/tools/misc/ccache/default.nix b/pkgs/development/tools/misc/ccache/default.nix index 34d1d8a829b137dddf8469c19ddef10d1b4f66e9..c5cb277c256f6c3e13f4d002cf04bf63800be1c1 100644 --- a/pkgs/development/tools/misc/ccache/default.nix +++ b/pkgs/development/tools/misc/ccache/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, runCommand, perl, zlib, makeWrapper }: +{ stdenv, fetchurl, perl, zlib, makeWrapper }: let ccache = stdenv.mkDerivation rec { name = "ccache-${version}"; diff --git a/pkgs/development/tools/misc/cquery/default.nix b/pkgs/development/tools/misc/cquery/default.nix index bf9797671269972a6c5366594b1fa058570b8f58..0b86deb52055ee64bbd8216d26c779d63dcdeee3 100644 --- a/pkgs/development/tools/misc/cquery/default.nix +++ b/pkgs/development/tools/misc/cquery/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, makeWrapper +{ fetchFromGitHub, makeWrapper , cmake, llvmPackages, ncurses }: let diff --git a/pkgs/development/tools/misc/ctags/wrapped.nix b/pkgs/development/tools/misc/ctags/wrapped.nix index 4df04f44f56ad59d368ca49aa6ffd624657a6140..75ae9f1ba8b24c33062da96c3cfa651145cf80de 100644 --- a/pkgs/development/tools/misc/ctags/wrapped.nix +++ b/pkgs/development/tools/misc/ctags/wrapped.nix @@ -1,4 +1,4 @@ -{ pkgs, ctags, writeScriptBin }: +{ pkgs, ctags }: with pkgs.stdenv.lib; diff --git a/pkgs/development/tools/misc/dialog/default.nix b/pkgs/development/tools/misc/dialog/default.nix index 09d1276ed42ff49aec660248a35991470a8ea5b1..591254c73f578a0f94dde4271e9f90aab602a264 100644 --- a/pkgs/development/tools/misc/dialog/default.nix +++ b/pkgs/development/tools/misc/dialog/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses, gettext +{ stdenv, fetchurl, ncurses , withLibrary ? false, libtool , unicodeSupport ? true }: diff --git a/pkgs/development/tools/misc/fswatch/default.nix b/pkgs/development/tools/misc/fswatch/default.nix index 4d8a9b05847a15d4cfed2a0221ef5f6f9ba0a67e..a1f33fdfc9e7038cfbbf5a1c1e8e876d8704bb91 100644 --- a/pkgs/development/tools/misc/fswatch/default.nix +++ b/pkgs/development/tools/misc/fswatch/default.nix @@ -1,7 +1,7 @@ { stdenv , fetchFromGitHub , autoreconfHook -, findutils # for xargs + # for xargs , gettext , libtool , makeWrapper diff --git a/pkgs/development/tools/misc/global/default.nix b/pkgs/development/tools/misc/global/default.nix index 296d9673d8f152cc3e71be768446835972ebe949..f0f21f8f4d5a864c80ea5f2522e979d2bff373b9 100644 --- a/pkgs/development/tools/misc/global/default.nix +++ b/pkgs/development/tools/misc/global/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, libtool, makeWrapper -, coreutils, ctags, ncurses, pythonPackages, sqlite, universal-ctags, pkgconfig +, coreutils, ctags, ncurses, pythonPackages, sqlite, universal-ctags }: stdenv.mkDerivation rec { diff --git a/pkgs/development/tools/misc/hydra/default.nix b/pkgs/development/tools/misc/hydra/default.nix index 4fdd017306acc644912d3fa6ef23df4704d5ec04..cf516b16f4b492192b03bf59dcd12de9d30580e9 100644 --- a/pkgs/development/tools/misc/hydra/default.nix +++ b/pkgs/development/tools/misc/hydra/default.nix @@ -1,9 +1,9 @@ { stdenv, nix, perlPackages, buildEnv, releaseTools, fetchFromGitHub , makeWrapper, autoconf, automake, libtool, unzip, pkgconfig, sqlite, libpqxx , gitAndTools, mercurial, darcs, subversion, bazaar, openssl, bzip2, libxslt -, guile, perl, postgresql, aws-sdk-cpp, nukeReferences, git, boehmgc +, guile, perl, postgresql, nukeReferences, git, boehmgc , docbook_xsl, openssh, gnused, coreutils, findutils, gzip, lzma, gnutar -, rpm, dpkg, cdrkit, fetchpatch, pixz }: +, rpm, dpkg, cdrkit, pixz }: with stdenv; diff --git a/pkgs/development/tools/misc/intel-gpu-tools/default.nix b/pkgs/development/tools/misc/intel-gpu-tools/default.nix index 08729f6b41b2dd0d510d41e655dcb2df19d57851..d92b20a12b02005693e7e3f3a6b1e6ac4cc887d9 100644 --- a/pkgs/development/tools/misc/intel-gpu-tools/default.nix +++ b/pkgs/development/tools/misc/intel-gpu-tools/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, libdrm, libpciaccess, cairo, dri2proto, udev , libX11, libXext, libXv, libXrandr, glib, bison, libunwind, python3, kmod -, procps, autoreconfHook, utilmacros, gnome2 }: +, procps, utilmacros, gnome2 }: stdenv.mkDerivation rec { name = "intel-gpu-tools-1.22"; diff --git a/pkgs/development/tools/misc/linuxkit/default.nix b/pkgs/development/tools/misc/linuxkit/default.nix index 71bc3b87a7ac66bf87e1b3c5f7e0005f837f1fa9..27f49ebcf38ca2a2b289c1c5f06ba5f1abeef526 100644 --- a/pkgs/development/tools/misc/linuxkit/default.nix +++ b/pkgs/development/tools/misc/linuxkit/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoPackage, go, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "linuxkit-${version}"; diff --git a/pkgs/development/tools/misc/loccount/default.nix b/pkgs/development/tools/misc/loccount/default.nix index 9205f6caf0dc6553e4a38d0e01af639657f3bb00..017c6ad804915effa2539eadf487707b2246a032 100644 --- a/pkgs/development/tools/misc/loccount/default.nix +++ b/pkgs/development/tools/misc/loccount/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitLab }: +{ stdenv, buildGoPackage, fetchFromGitLab }: buildGoPackage rec { name = "loccount-${version}"; version = "1.2"; diff --git a/pkgs/development/tools/misc/md2man/default.nix b/pkgs/development/tools/misc/md2man/default.nix index 208f0ebd411b2d9af035c757a8c919133de1737b..23b7119e7d744cd590d5f2d1874e9b65aab0a8f9 100644 --- a/pkgs/development/tools/misc/md2man/default.nix +++ b/pkgs/development/tools/misc/md2man/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, go, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: with lib; diff --git a/pkgs/development/tools/misc/moby/default.nix b/pkgs/development/tools/misc/moby/default.nix index e6f7ac3290b4a0928ad925248e387f2e6d7eb941..c45e7841d450e227710444012c0ce0f4408b988a 100644 --- a/pkgs/development/tools/misc/moby/default.nix +++ b/pkgs/development/tools/misc/moby/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoPackage, go, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "moby-${version}"; diff --git a/pkgs/development/tools/misc/pkgconfig/default.nix b/pkgs/development/tools/misc/pkgconfig/default.nix index 219281f4ec1718fa9643888853bc8d9f07b48e39..7235af49c2e6ca5f7f526bcd0cda789de2518231 100644 --- a/pkgs/development/tools/misc/pkgconfig/default.nix +++ b/pkgs/development/tools/misc/pkgconfig/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, automake, libiconv, vanilla ? false }: +{stdenv, fetchurl, libiconv, vanilla ? false }: with stdenv.lib; diff --git a/pkgs/development/tools/misc/stm32flash/default.nix b/pkgs/development/tools/misc/stm32flash/default.nix index 3da98f38ebc76491e4e59b5bcf10ca8b40617c0e..553ded815ef836562448765301d248d81e96c78c 100644 --- a/pkgs/development/tools/misc/stm32flash/default.nix +++ b/pkgs/development/tools/misc/stm32flash/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip }: +{ stdenv, fetchurl }: stdenv.mkDerivation rec { name = "stm32flash-0.5"; diff --git a/pkgs/development/tools/misc/swig/3.x.nix b/pkgs/development/tools/misc/swig/3.x.nix index 9b4fd05dc0a0147bf8a429372a49408ac9c89df1..48a2e7bd2cb167b35bb4cf8b66d14875a2d8107a 100644 --- a/pkgs/development/tools/misc/swig/3.x.nix +++ b/pkgs/development/tools/misc/swig/3.x.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, bison, pcre }: +{ stdenv, fetchFromGitHub, autoconf, automake, libtool, bison, pcre }: stdenv.mkDerivation rec { name = "swig-${version}"; diff --git a/pkgs/development/tools/misc/teensy-loader-cli/default.nix b/pkgs/development/tools/misc/teensy-loader-cli/default.nix index 4263b80789a204d90c09bccffaed581942267863..d6c5256ca84df33b57b9e29785c8d1ccb2f4a918 100644 --- a/pkgs/development/tools/misc/teensy-loader-cli/default.nix +++ b/pkgs/development/tools/misc/teensy-loader-cli/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, libusb, fetchgit }: +{ stdenv, unzip, libusb, fetchgit }: let version = "2.1"; in diff --git a/pkgs/development/tools/misc/trv/default.nix b/pkgs/development/tools/misc/trv/default.nix index c8747e66e39b3d096ffd5b4104045d75089dfceb..11caf8e7b20e8bfad0d32c3ba21a452e97382a20 100644 --- a/pkgs/development/tools/misc/trv/default.nix +++ b/pkgs/development/tools/misc/trv/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchFromGitHub, ocaml, findlib, camlp4, core_p4, async_p4, async_unix_p4 , re2_p4, async_extra_p4, sexplib_p4, async_shell, core_extended_p4, async_find -, cohttp, conduit, magic-mime, tzdata +, cohttp, conduit, magic-mime }: assert stdenv.lib.versionOlder "4.02" ocaml.version; diff --git a/pkgs/development/tools/nailgun/default.nix b/pkgs/development/tools/nailgun/default.nix index dea1ab2a4459b2989264ba8cb9ddde863f54c5c6..6a34c1c130d981150f92fa9f37fb201d17c0a2ac 100644 --- a/pkgs/development/tools/nailgun/default.nix +++ b/pkgs/development/tools/nailgun/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchMavenArtifact, fetchFromGitHub, bash, jre, makeWrapper }: +{ stdenv, fetchMavenArtifact, fetchFromGitHub, jre, makeWrapper }: let version = "0.9.1"; diff --git a/pkgs/development/tools/node-webkit/nw12.nix b/pkgs/development/tools/node-webkit/nw12.nix index f09dbfdb16538072c9f6497ba69fe54194b1e1e3..df7630e2d16f2b4851f08cd651ec3592b08e03ce 100644 --- a/pkgs/development/tools/node-webkit/nw12.nix +++ b/pkgs/development/tools/node-webkit/nw12.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, buildEnv, makeWrapper , xorg, alsaLib, dbus, glib, gtk2, atk, pango, freetype, fontconfig -, gdk_pixbuf, cairo, zlib, nss, nssTools, nspr, gconf, expat, systemd, libcap +, gdk_pixbuf, cairo, nss, nspr, gconf, expat, systemd, libcap , libnotify}: let bits = if stdenv.system == "x86_64-linux" then "x64" diff --git a/pkgs/development/tools/nwjs/default.nix b/pkgs/development/tools/nwjs/default.nix index fc1513ecf34bc7c1973b72a3fe5d0a0ab2c3778d..6840bcac0dc58ea3a889045f3a31077cd31cb18f 100644 --- a/pkgs/development/tools/nwjs/default.nix +++ b/pkgs/development/tools/nwjs/default.nix @@ -1,9 +1,9 @@ { stdenv, fetchurl, buildEnv, makeWrapper -, xorg, alsaLib, dbus, glib, gtk2, gtk3, atk, pango, freetype, fontconfig -, gdk_pixbuf, cairo, zlib, nss, nssTools, nspr, gconf, expat, systemd, libcap +, xorg, alsaLib, dbus, glib, gtk3, atk, pango, freetype, fontconfig +, gdk_pixbuf, cairo, nss, nspr, gconf, expat, systemd, libcap , libnotify -, ffmpeg, libxcb, libXScrnSaver, cups +, ffmpeg, libxcb, cups , sqlite, udev }: let diff --git a/pkgs/development/tools/ocaml/camlidl/default.nix b/pkgs/development/tools/ocaml/camlidl/default.nix index 7cdf7dc939641c1c61d70551fa85a17cda364f31..7c7bf79acc7d609fae800b23c7da97c4ffa2b851 100644 --- a/pkgs/development/tools/ocaml/camlidl/default.nix +++ b/pkgs/development/tools/ocaml/camlidl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, ocaml, ncurses, writeText }: +{ stdenv, fetchurl, ocaml, writeText }: let pname = "camlidl"; diff --git a/pkgs/development/tools/ocaml/opam/default.nix b/pkgs/development/tools/ocaml/opam/default.nix index aa9feda985a3f23dc707923d1e530d07e093f55b..73b7da119abe5235e9868a07486864e9ef6527e4 100644 --- a/pkgs/development/tools/ocaml/opam/default.nix +++ b/pkgs/development/tools/ocaml/opam/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchgit, fetchurl, makeWrapper, +{ stdenv, lib, fetchurl, makeWrapper, ocaml, unzip, ncurses, curl, aspcud }: diff --git a/pkgs/development/tools/ocaml/utop/default.nix b/pkgs/development/tools/ocaml/utop/default.nix index 340c57f2817668729386c2fcafa5184325323782..74f450a9e3ac01946d37e2d0e244d4cf3873f63c 100644 --- a/pkgs/development/tools/ocaml/utop/default.nix +++ b/pkgs/development/tools/ocaml/utop/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, bash, ocaml, findlib, ocamlbuild, jbuilder +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, jbuilder , lambdaTerm, cppo, makeWrapper }: diff --git a/pkgs/development/tools/parsing/bison/3.x.nix b/pkgs/development/tools/parsing/bison/3.x.nix index 287bb8beb52459cd9ff3668651a3c2eb08453585..469e64acff06dd650d0315e4ffa20ef4245f6a32 100644 --- a/pkgs/development/tools/parsing/bison/3.x.nix +++ b/pkgs/development/tools/parsing/bison/3.x.nix @@ -1,4 +1,4 @@ -{ stdenv, hostPlatform, fetchurl, m4, perl, help2man }: +{ stdenv, fetchurl, m4, perl, help2man }: stdenv.mkDerivation rec { name = "bison-3.0.5"; diff --git a/pkgs/development/tools/parsing/hammer/default.nix b/pkgs/development/tools/parsing/hammer/default.nix index 27596878f346e25824b9a3430308817a6f3eccae..86c1f82678aee7c3200bde680808141177f9af59 100644 --- a/pkgs/development/tools/parsing/hammer/default.nix +++ b/pkgs/development/tools/parsing/hammer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, glib, pkgconfig, python, scons, pythonPackages }: +{ stdenv, fetchgit, glib, pkgconfig, python, scons }: stdenv.mkDerivation rec { name = "hammer-${version}"; diff --git a/pkgs/development/tools/quicktemplate/default.nix b/pkgs/development/tools/quicktemplate/default.nix index 614ffe5e218d67c547a6e48cde9064a9d05479db..624866ea9e37857ba62a0596824a8a65c6ae18f9 100644 --- a/pkgs/development/tools/quicktemplate/default.nix +++ b/pkgs/development/tools/quicktemplate/default.nix @@ -1,5 +1,5 @@ # This file was generated by https://github.com/kamilchm/go2nix v1.2.1 -{ stdenv, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { name = "quicktemplate-unstable-${version}"; diff --git a/pkgs/development/tools/redis-dump/default.nix b/pkgs/development/tools/redis-dump/default.nix index 88c975b5735210e7b037ffc9b131107e920f0131..55797948a84a5e3f5eb1e4a5ae9c221e56aa3b5e 100644 --- a/pkgs/development/tools/redis-dump/default.nix +++ b/pkgs/development/tools/redis-dump/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, bundlerEnv, ruby, perl, autoconf }: +{ lib, bundlerEnv, ruby, perl, autoconf }: bundlerEnv { name = "redis-dump-0.3.5"; diff --git a/pkgs/development/tools/rtags/default.nix b/pkgs/development/tools/rtags/default.nix index a2c75a02aa28a20fbfebf2a959ed7bf3d7a89402..da3b27ebacc585380fc7e0ab42c9798d860ca0cf 100644 --- a/pkgs/development/tools/rtags/default.nix +++ b/pkgs/development/tools/rtags/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchgit, cmake, llvmPackages, openssl, writeScript, apple_sdk, bash, emacs, pkgconfig }: +{ stdenv, lib, fetchgit, cmake, llvmPackages, openssl, apple_sdk, emacs, pkgconfig }: stdenv.mkDerivation rec { name = "rtags-${version}"; diff --git a/pkgs/development/tools/rubocop/default.nix b/pkgs/development/tools/rubocop/default.nix index 850fb5ad7f5800ffbe3c6afe48206bf502fd43e4..2b9792e4df255f86b554203943385514526d09b8 100644 --- a/pkgs/development/tools/rubocop/default.nix +++ b/pkgs/development/tools/rubocop/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, bundlerEnv, ruby, makeWrapper }: +{ lib, bundlerEnv, ruby }: bundlerEnv rec { pname = "rubocop"; diff --git a/pkgs/development/tools/rust/rainicorn/default.nix b/pkgs/development/tools/rust/rainicorn/default.nix index 370318d1ff299149087fdf81b506c72f326c8c09..50c890e3c47e212adc2da984c7604570e215253d 100644 --- a/pkgs/development/tools/rust/rainicorn/default.nix +++ b/pkgs/development/tools/rust/rainicorn/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform, makeWrapper }: +{ stdenv, fetchFromGitHub, rustPlatform }: with rustPlatform; diff --git a/pkgs/development/tools/selenium/server/default.nix b/pkgs/development/tools/selenium/server/default.nix index c3d71e2b2a3a3060edb2e271dd262f95f5bc84a5..48bfbdd689b88b382bf7c1a689291a3a191f82d7 100644 --- a/pkgs/development/tools/selenium/server/default.nix +++ b/pkgs/development/tools/selenium/server/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, jre, jdk, gcc, xorg +{ stdenv, fetchurl, makeWrapper, jre , htmlunit-driver, chromedriver, chromeSupport ? true }: with stdenv.lib; diff --git a/pkgs/development/tools/slimerjs/default.nix b/pkgs/development/tools/slimerjs/default.nix index 041aee7a1c5cc9b961e4309ac9a574dc64f2a30c..534c69200e026f40a830485aff97007ad4e89d0b 100644 --- a/pkgs/development/tools/slimerjs/default.nix +++ b/pkgs/development/tools/slimerjs/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, fetchgit, fetchFromGitHub, zip, unzip, firefox, bash}: +{stdenv, fetchFromGitHub, zip, unzip, firefox, bash}: let s = # Generated upstream information rec { diff --git a/pkgs/development/tools/textql/default.nix b/pkgs/development/tools/textql/default.nix index f6687f4e4328b97b9f5b28c043c81757a065d425..a3499258a99958eff34a699013b881fa0df0e30d 100644 --- a/pkgs/development/tools/textql/default.nix +++ b/pkgs/development/tools/textql/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub, sqlite }: +{ stdenv, buildGoPackage, fetchFromGitHub, sqlite }: buildGoPackage rec { name = "textql-${version}"; diff --git a/pkgs/development/tools/vim-vint/default.nix b/pkgs/development/tools/vim-vint/default.nix index 0db25f88d768882ad928e9fee38978a9ccadd4a7..ab90bb27bd5eb565b978052fb8809a8cdabd11a5 100644 --- a/pkgs/development/tools/vim-vint/default.nix +++ b/pkgs/development/tools/vim-vint/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, lib, python3Packages, stdenv }: +{ fetchFromGitHub, lib, python3Packages }: with python3Packages; diff --git a/pkgs/development/tools/vndr/default.nix b/pkgs/development/tools/vndr/default.nix index 2a4ddaf803985d04870ba2a8fab66e8b3b3bfafb..0fbcd7b71a6015ad2dfb5b029e0605938c449c2b 100644 --- a/pkgs/development/tools/vndr/default.nix +++ b/pkgs/development/tools/vndr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "vndr-${version}"; diff --git a/pkgs/development/tools/ws/default.nix b/pkgs/development/tools/ws/default.nix index b99780d41382d3bab76d9c9af167c10ec52811da..17c64f0548b3eefb63eef36942979dc40bd94d68 100644 --- a/pkgs/development/tools/ws/default.nix +++ b/pkgs/development/tools/ws/default.nix @@ -1,5 +1,5 @@ # This file was generated by https://github.com/kamilchm/go2nix v1.2.1 -{ stdenv, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { name = "ws-${version}"; diff --git a/pkgs/development/tools/xcbuild/wrapper.nix b/pkgs/development/tools/xcbuild/wrapper.nix index f8b1c1bf31e9d80838de134f10920eafe5ac896b..6a3267b7c341827a8c689834b57f53766c739575 100644 --- a/pkgs/development/tools/xcbuild/wrapper.nix +++ b/pkgs/development/tools/xcbuild/wrapper.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildPackages, makeWrapper, writeText, runCommand +{ lib, buildPackages, makeWrapper, writeText, runCommand , CoreServices, ImageIO, CoreGraphics , targetPlatform , xcodePlatform ? targetPlatform.xcodePlatform or "MacOSX" diff --git a/pkgs/development/tools/xib2nib/default.nix b/pkgs/development/tools/xib2nib/default.nix index d585a35b0bc55b13fd36b019652fca14fe5b8b7b..4d62f5b8571419630e8021159fb83396106ae7f7 100644 --- a/pkgs/development/tools/xib2nib/default.nix +++ b/pkgs/development/tools/xib2nib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, fetchFromGitHub, pugixml, boost, PlistCpp }: +{ stdenv, fetchFromGitHub, pugixml, boost, PlistCpp }: stdenv.mkDerivation { name = "xib2nib-730e177"; diff --git a/pkgs/development/tools/yq/default.nix b/pkgs/development/tools/yq/default.nix index 52231d0a831863dfa452dfb3de9e203040952980..a08e01a48b7f521fe485a617c37e50576834eba4 100644 --- a/pkgs/development/tools/yq/default.nix +++ b/pkgs/development/tools/yq/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildPythonApplication, fetchPypi, pyyaml, xmltodict, jq }: +{ lib, buildPythonApplication, fetchPypi, pyyaml, xmltodict, jq }: buildPythonApplication rec { pname = "yq"; diff --git a/pkgs/development/web/minify/default.nix b/pkgs/development/web/minify/default.nix index 0220fbd8df8245f474b4d356b3c3e6d71a2b84a6..e63f609fc2b6c90b81e6b2700784fee0f3fa67b4 100644 --- a/pkgs/development/web/minify/default.nix +++ b/pkgs/development/web/minify/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "minify-${version}"; diff --git a/pkgs/development/web/postman/default.nix b/pkgs/development/web/postman/default.nix index c51e1595ee7234d04899ec8f3457ba39e2fdbb70..4b45251cde5fb26344c9e1180912834e28b53e1e 100644 --- a/pkgs/development/web/postman/default.nix +++ b/pkgs/development/web/postman/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, gnome2, fetchurl, pkgs, xorg, udev, makeWrapper, makeDesktopItem }: +{ stdenv, lib, gnome2, fetchurl, pkgs, xorg, makeWrapper, makeDesktopItem }: stdenv.mkDerivation rec { name = "postman-${version}"; diff --git a/pkgs/games/0ad/game.nix b/pkgs/games/0ad/game.nix index 0cf1b6f5e67109b10d01caba236d343328515d3e..d05f19d3171cb4433b4aef30d1b36c660d2a683d 100644 --- a/pkgs/games/0ad/game.nix +++ b/pkgs/games/0ad/game.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, callPackage, perl, fetchurl, python2 +{ stdenv, lib, perl, fetchurl, python2 , pkgconfig, spidermonkey_38, boost, icu, libxml2, libpng, libsodium , libjpeg, zlib, curl, libogg, libvorbis, enet, miniupnpc , openal, libGLU_combined, xproto, libX11, libXcursor, nspr, SDL2 diff --git a/pkgs/games/90secondportraits/default.nix b/pkgs/games/90secondportraits/default.nix index 0ada8d64685dcfea8053c9fa18d5004922a73f02..f2be128fd99899a3ad9ce9555dd82fa32ede1cd9 100644 --- a/pkgs/games/90secondportraits/default.nix +++ b/pkgs/games/90secondportraits/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, love, lua, makeWrapper, makeDesktopItem }: +{ stdenv, fetchurl, love, lua, makeWrapper, makeDesktopItem }: let pname = "90secondportraits"; diff --git a/pkgs/games/commandergenius/default.nix b/pkgs/games/commandergenius/default.nix index 70413f0f941b65237f1a8fe22c5425589dfa4890..2abc46690e944b92baa92b470d709ffed0a14a8f 100644 --- a/pkgs/games/commandergenius/default.nix +++ b/pkgs/games/commandergenius/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, SDL2, SDL2_image, pkgconfig +{ stdenv, fetchFromGitHub, SDL2, SDL2_image, pkgconfig , libvorbis, libGL, boost, cmake, zlib, curl, SDL2_mixer, python3 }: diff --git a/pkgs/games/dwarf-fortress/default.nix b/pkgs/games/dwarf-fortress/default.nix index d9a5df73f17ccbe3f30282bd93640d401735ab8e..cb75b6802702e945875533044a9763eb1a244d96 100644 --- a/pkgs/games/dwarf-fortress/default.nix +++ b/pkgs/games/dwarf-fortress/default.nix @@ -1,4 +1,4 @@ -{ pkgs, stdenv, stdenvNoCC, buildEnv, gccStdenv, lib, recurseIntoAttrs }: +{ pkgs, stdenv, stdenvNoCC, gccStdenv, lib, recurseIntoAttrs }: # To whomever it may concern: # @@ -60,9 +60,7 @@ let legends-browser = callPackage ./legends-browser {}; twbt = callPackage ./twbt {}; - themes = recurseIntoAttrs (callPackage ./themes { - stdenv = stdenvNoCC; - }); + themes = recurseIntoAttrs (callPackage ./themes { }); # aliases phoebus-theme = themes.phoebus; diff --git a/pkgs/games/dwarf-fortress/dfhack/default.nix b/pkgs/games/dwarf-fortress/dfhack/default.nix index baad45298441f143076cb3a47fbca6e62d446b52..f781b0a71de35d68b572bee2ac1b0b55f736e48b 100644 --- a/pkgs/games/dwarf-fortress/dfhack/default.nix +++ b/pkgs/games/dwarf-fortress/dfhack/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildEnv, hostPlatform, lib, fetchurl, fetchFromGitHub, cmake, writeScriptBin, callPackage +{ stdenv, buildEnv, lib, fetchFromGitHub, cmake, writeScriptBin , perl, XMLLibXML, XMLLibXSLT, zlib , enableStoneSense ? false, allegro5, libGLU_combined , enableTWBT ? true, twbt diff --git a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix index 5e92bbb285b827532afe4e0cc98be28250870a6e..4236d6bab989ff4705cc8ae81895fc336bd5cd46 100644 --- a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix +++ b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, coreutils, qtbase +{ stdenv, fetchFromGitHub, qtbase , qtdeclarative, cmake, texlive, ninja }: stdenv.mkDerivation rec { diff --git a/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix b/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix index 54f0f0405ac5d3b4dd2ca1ac03c61a7fd85d6229..322a21ec3ad979abb4fe8ec7f810399faf28e509 100644 --- a/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix +++ b/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix @@ -1,4 +1,4 @@ -{ stdenv, symlinkJoin, lib, dwarf-therapist, dwarf-fortress, makeWrapper }: +{ stdenv, symlinkJoin, dwarf-therapist, dwarf-fortress, makeWrapper }: let platformSlug = if stdenv.targetPlatform.is32bit then diff --git a/pkgs/games/dwarf-fortress/lazy-pack.nix b/pkgs/games/dwarf-fortress/lazy-pack.nix index 3aa9e573f61dfeb64e585b5073bf71fef226487d..3e0d3dcc6d73a866a1c28ee6857bdc08181598df 100644 --- a/pkgs/games/dwarf-fortress/lazy-pack.nix +++ b/pkgs/games/dwarf-fortress/lazy-pack.nix @@ -1,4 +1,4 @@ -{ stdenvNoCC, lib, buildEnv, callPackage +{ stdenvNoCC, lib, buildEnv , dwarf-fortress, themes # This package should, at any given time, provide an opinionated "optimal" # DF experience. It's the equivalent of the Lazy Newbie Pack, that is, and diff --git a/pkgs/games/dwarf-fortress/themes/default.nix b/pkgs/games/dwarf-fortress/themes/default.nix index 5caaa9e05ca515863f747af36d0565421cb2ac55..0b8eb23a7b9d1befce6231c582157449a1f535c6 100644 --- a/pkgs/games/dwarf-fortress/themes/default.nix +++ b/pkgs/games/dwarf-fortress/themes/default.nix @@ -1,4 +1,4 @@ -{stdenv, lib, fetchFromGitHub}: +{lib, fetchFromGitHub}: with builtins; diff --git a/pkgs/games/gcs/default.nix b/pkgs/games/gcs/default.nix index defee04e5c2494fae1425bc3393cd68f5af45d1c..b718a92143cb89d814b9176061fb634f4092aa5f 100644 --- a/pkgs/games/gcs/default.nix +++ b/pkgs/games/gcs/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchFromGitHub, runCommand , jdk8, ant , jre8, makeWrapper -, findutils }: let diff --git a/pkgs/games/gzdoom/default.nix b/pkgs/games/gzdoom/default.nix index df1dd47905e4e34b65131a65e16662aab9a01394..ae1db1d8b4a360c4f750b7a2eef952a2441c681d 100644 --- a/pkgs/games/gzdoom/default.nix +++ b/pkgs/games/gzdoom/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, zdoom, makeWrapper +{ stdenv, fetchFromGitHub, cmake, makeWrapper , openal, fluidsynth, soundfont-fluid, libGL, SDL2 , bzip2, zlib, libjpeg, libsndfile, mpg123, game-music-emu }: diff --git a/pkgs/games/meritous/default.nix b/pkgs/games/meritous/default.nix index 8d49d38b415860815c309b36798c4619e9538fbb..21d2ad87dfb8a25a3f7996f55a54f3d776e4883c 100644 --- a/pkgs/games/meritous/default.nix +++ b/pkgs/games/meritous/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, SDL, SDL_image, SDL_mixer, zlib, binutils }: +{ stdenv, fetchFromGitLab, SDL, SDL_image, SDL_mixer, zlib }: stdenv.mkDerivation rec { name = "meritous-${version}"; diff --git a/pkgs/games/mnemosyne/default.nix b/pkgs/games/mnemosyne/default.nix index a5b349334923eebd5d7ae1a9b48890d95deb9da5..7c32d7faa3c5977148b3f168540e21cb60f4bb25 100644 --- a/pkgs/games/mnemosyne/default.nix +++ b/pkgs/games/mnemosyne/default.nix @@ -1,5 +1,4 @@ -{ stdenv -, fetchurl +{ fetchurl , python }: diff --git a/pkgs/games/mrrescue/default.nix b/pkgs/games/mrrescue/default.nix index a693c79e8cec0ca5cf0aefcdcd3176183ee60655..aa4a06bc7d2bf36cf72cd87b5aa7ca60f06502f0 100644 --- a/pkgs/games/mrrescue/default.nix +++ b/pkgs/games/mrrescue/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, love, lua, makeWrapper, makeDesktopItem }: +{ stdenv, fetchurl, love, lua, makeWrapper, makeDesktopItem }: let pname = "mrrescue"; diff --git a/pkgs/games/nethack/default.nix b/pkgs/games/nethack/default.nix index db959177eb57808a582ee317085380bf7f94b0ae..d4ad1119b9f53584bdf5d2df3d297cb702028063 100644 --- a/pkgs/games/nethack/default.nix +++ b/pkgs/games/nethack/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, writeScript, coreutils, ncurses, gzip, flex, bison +{ stdenv, lib, fetchurl, coreutils, ncurses, gzip, flex, bison , less, makeWrapper , x11Mode ? false, qtMode ? false, libXaw, libXext, mkfontdir, pkgconfig, qt5 }: diff --git a/pkgs/games/opendune/default.nix b/pkgs/games/opendune/default.nix index 7b848086794bcfe7ef74a45df5006efea1c08f00..0f045faf371eb02c5bcacbf2cf9b9df9311b9a00 100644 --- a/pkgs/games/opendune/default.nix +++ b/pkgs/games/opendune/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, SDL, SDL_image, SDL_mixer, binutils }: +{ stdenv, fetchFromGitHub, SDL, SDL_image, SDL_mixer }: # - set the opendune configuration at ~/.config/opendune/opendune.ini: # [opendune] diff --git a/pkgs/games/openmw/default.nix b/pkgs/games/openmw/default.nix index 8080c959638800569e305789b47af9e725732d0c..4d01feaccc0db2a2ed01ef6b4f834fecf740d2e9 100644 --- a/pkgs/games/openmw/default.nix +++ b/pkgs/games/openmw/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, qt4, openscenegraph, mygui, bullet, ffmpeg, boost, cmake, SDL2, unshield, openal -, giflib, libXt, pkgconfig }: +, libXt, pkgconfig }: let openscenegraph_ = openscenegraph.overrideDerivation (self: { diff --git a/pkgs/games/openrct2/default.nix b/pkgs/games/openrct2/default.nix index 9e67c7847f83f9f2e4dea8020fab55954b9417fc..e5783ec5396f8d7d105d67a34328c82ef27301e3 100644 --- a/pkgs/games/openrct2/default.nix +++ b/pkgs/games/openrct2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchFromGitHub, +{ stdenv, fetchFromGitHub, SDL2, cmake, curl, fontconfig, freetype, icu, jansson, libiconv, libpng, libpthreadstubs, libzip, libGLU, openssl, pkgconfig, speexdsp, zlib }: diff --git a/pkgs/games/openspades/default.nix b/pkgs/games/openspades/default.nix index 582cafcc4d462f59331d171574b5f76326e9439b..b475726555597a34dd8f9693c9ab73e36fa22798 100644 --- a/pkgs/games/openspades/default.nix +++ b/pkgs/games/openspades/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, fetchFromGitHub, cmake, unzip, zip, file +{ stdenv, fetchurl, fetchFromGitHub, cmake, unzip, zip, file , curl, glew , libGL, SDL2, SDL2_image, zlib, freetype, imagemagick , openal , opusfile, libogg }: diff --git a/pkgs/games/openxcom/default.nix b/pkgs/games/openxcom/default.nix index a936ca134122abf2e6a34ebfaed2e7add1d65f22..9a82c678f3701dfcc7e7a056860c799f7e145221 100644 --- a/pkgs/games/openxcom/default.nix +++ b/pkgs/games/openxcom/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, fetchpatch, cmake, libGLU_combined, zlib, openssl, libyamlcpp, boost +{stdenv, fetchFromGitHub, cmake, libGLU_combined, zlib, openssl, libyamlcpp, boost , SDL, SDL_image, SDL_mixer, SDL_gfx }: let version = "1.0.0.2018.01.28"; in diff --git a/pkgs/games/pokerth/default.nix b/pkgs/games/pokerth/default.nix index 122ce3f6e2fab6bad94aa8afa30ee14272156d16..aae49eedd7c989edf8f27fa51f7cc8e510b933b8 100644 --- a/pkgs/games/pokerth/default.nix +++ b/pkgs/games/pokerth/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, qmake4Hook, qt4, protobuf, boost155, tinyxml2, libgcrypt, sqlite, gsasl, curl, SDL, SDL_mixer, libircclient }: +{ stdenv, fetchFromGitHub, qmake4Hook, qt4, protobuf, boost155, tinyxml2, libgcrypt, sqlite, gsasl, curl, SDL, SDL_mixer, libircclient }: let boost = boost155; in stdenv.mkDerivation rec { diff --git a/pkgs/games/quake3/wrapper/default.nix b/pkgs/games/quake3/wrapper/default.nix index 69b166664be4242751bcf708eaba5bc00e250d43..4ab53d677324f4ffb3be84466d0a56c62c7672c1 100644 --- a/pkgs/games/quake3/wrapper/default.nix +++ b/pkgs/games/quake3/wrapper/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildEnv, lib, fetchurl, libGL, ioquake3, makeWrapper }: +{ stdenv, buildEnv, lib, libGL, ioquake3, makeWrapper }: { paks, name ? (stdenv.lib.head paks).name, description ? "" }: diff --git a/pkgs/games/rigsofrods/default.nix b/pkgs/games/rigsofrods/default.nix index a038957f701edc0baa14d6a99034132b71baf2a7..e75698e72799cb09f09068a3f701d1a5894b30a7 100644 --- a/pkgs/games/rigsofrods/default.nix +++ b/pkgs/games/rigsofrods/default.nix @@ -1,5 +1,5 @@ -{ fetchurl, fetchFromGitHub, stdenv, wxGTK30, freeimage, cmake, zziplib, libGLU_combined, boost, - pkgconfig, libuuid, openal, ogre, ois, curl, gtk2, pixman, mygui, unzip, +{ fetchFromGitHub, stdenv, wxGTK30, freeimage, cmake, zziplib, libGLU_combined, boost, + pkgconfig, libuuid, openal, ogre, ois, curl, gtk2, mygui, unzip, angelscript, ogrepaged, mysocketw, libxcb }: diff --git a/pkgs/games/sienna/default.nix b/pkgs/games/sienna/default.nix index 2636bc9e79901c5d0eb338d2807ea96aaa88d19a..58ed85c79fdb7e0b6da34e72961e3db49e4f6fdf 100644 --- a/pkgs/games/sienna/default.nix +++ b/pkgs/games/sienna/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, love, lua, makeWrapper, makeDesktopItem }: +{ stdenv, fetchurl, love, lua, makeWrapper, makeDesktopItem }: let pname = "sienna"; diff --git a/pkgs/games/spring/default.nix b/pkgs/games/spring/default.nix index 83a85415664d64afc75240503504030697d713b2..1dcf432ccd48495af1c6977381b421e86e1530f1 100644 --- a/pkgs/games/spring/default.nix +++ b/pkgs/games/spring/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, cmake, lzma, boost, libdevil, zlib, p7zip -, openal, libvorbis, glew, freetype, xorg, SDL2, libGLU_combined, binutils +, openal, libvorbis, glew, freetype, xorg, SDL2, libGLU_combined , asciidoc, libxslt, docbook_xsl, docbook_xsl_ns, curl, makeWrapper , jdk ? null, python ? null, systemd, libunwind, which, minizip , withAI ? true # support for AI Interfaces and Skirmish AIs diff --git a/pkgs/games/spring/springlobby.nix b/pkgs/games/spring/springlobby.nix index 2000398b537d4d5c22aa10118c5f9aa86203a74c..632a047e96c7124b3dcc697065e8b2f147f99a17 100644 --- a/pkgs/games/spring/springlobby.nix +++ b/pkgs/games/spring/springlobby.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, cmake, wxGTK30, openal, pkgconfig, curl, libtorrentRasterbar -, libpng, libX11, gettext, bash, gawk, boost, libnotify, gtk2, doxygen, spring +, libpng, libX11, gettext, boost, libnotify, gtk2, doxygen, spring , makeWrapper, glib, minizip, alure, pcre, jsoncpp }: stdenv.mkDerivation rec { diff --git a/pkgs/games/stepmania/default.nix b/pkgs/games/stepmania/default.nix index d51d1bb154d693e8f4ea8ed409a194ba8889a29a..4f9406abd835543b119837ba0a91fed05f2324b4 100644 --- a/pkgs/games/stepmania/default.nix +++ b/pkgs/games/stepmania/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchpatch, fetchFromGitHub, cmake, nasm +{ stdenv, lib, fetchFromGitHub, cmake, nasm , gtk2, glib, ffmpeg, alsaLib, libmad, libogg, libvorbis , glew, libpulseaudio, udev }: diff --git a/pkgs/games/tibia/default.nix b/pkgs/games/tibia/default.nix index e0f9bae2e39b3ef3d289beff685b05c41fd0c34d..cfef1ed0db2b1dc8a1380f8e71fa8cb700c550f1 100644 --- a/pkgs/games/tibia/default.nix +++ b/pkgs/games/tibia/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, patchelf, glibc, libX11, libGLU_combined }: +{ stdenv, fetchurl, glibc, libX11, libGLU_combined }: with stdenv.lib; stdenv.mkDerivation { diff --git a/pkgs/games/torcs/default.nix b/pkgs/games/torcs/default.nix index 522a1a2857d5420fcf913fb29c7aa1147eee9feb..b941f3bd2e050075aa9fc646a09c686756a2cf37 100644 --- a/pkgs/games/torcs/default.nix +++ b/pkgs/games/torcs/default.nix @@ -1,6 +1,6 @@ { fetchpatch, fetchurl, stdenv, libGLU, freeglut, libX11, plib, openal, freealut, libXrandr, xproto, libXext, libSM, libICE, libXi, libXt, libXrender, libXxf86vm, libvorbis, -libpng, zlib, bash, makeWrapper }: +libpng, zlib, makeWrapper }: stdenv.mkDerivation rec { name = "torcs-1.3.7"; diff --git a/pkgs/games/uqm/default.nix b/pkgs/games/uqm/default.nix index dd60c0efb599b6e8d99093d8fabbd8275002cd27..00592f7c39bb21de6a57dc8ab16e1297cbe88fb9 100644 --- a/pkgs/games/uqm/default.nix +++ b/pkgs/games/uqm/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, pkgconfig, libGLU_combined -, SDL, SDL_image, libpng, zlib, libvorbis, libogg, libmikmod +, SDL, SDL_image, libpng, libvorbis, libogg, libmikmod , use3DOVideos ? false, requireFile ? null, writeText ? null , haskellPackages ? null diff --git a/pkgs/games/vdrift/default.nix b/pkgs/games/vdrift/default.nix index ce20d1b3f1779d2af3071cd08ca86980e0198c2b..7e43fbf2c880cff6cdc11a3b0f7d69fd7053f9eb 100644 --- a/pkgs/games/vdrift/default.nix +++ b/pkgs/games/vdrift/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, fetchsvn, pkgconfig, scons, libGLU_combined, SDL2, SDL2_image -, libvorbis, bullet, curl, gettext, writeTextFile, writeShellScriptBin +, libvorbis, bullet, curl, gettext, writeTextFile , data ? fetchsvn { url = "svn://svn.code.sf.net/p/vdrift/code/vdrift-data"; diff --git a/pkgs/games/wesnoth/default.nix b/pkgs/games/wesnoth/default.nix index 45b4e5a5891ee244b5d1d811afa0b457e5bced5b..75afddf52c8e4098458139b68c91e692459519e0 100644 --- a/pkgs/games/wesnoth/default.nix +++ b/pkgs/games/wesnoth/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, cmake, pkgconfig, SDL2, SDL2_image, SDL2_mixer, SDL2_net, SDL2_ttf -, pango, gettext, boost, freetype, libvorbis, fribidi, dbus, libpng, pcre, openssl, icu +, pango, gettext, boost, libvorbis, fribidi, dbus, libpng, pcre, openssl, icu , Cocoa, Foundation , enableTools ? false }: diff --git a/pkgs/games/widelands/default.nix b/pkgs/games/widelands/default.nix index 222275a2ba1ade50edc5212467f750fab04a31ee..1e2c17814d6feecc7d948b1c0f9b72989580c0f9 100644 --- a/pkgs/games/widelands/default.nix +++ b/pkgs/games/widelands/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, cmake, python, gettext , boost, libpng, zlib, glew, lua, doxygen, icu -, SDL2, SDL2_image, SDL2_mixer, SDL2_net, SDL2_ttf, SDL2_gfx +, SDL2, SDL2_image, SDL2_mixer, SDL2_net, SDL2_ttf }: stdenv.mkDerivation rec { diff --git a/pkgs/games/worldofgoo/default.nix b/pkgs/games/worldofgoo/default.nix index af76e85346f7934ad0fbb73da0fc2e2243c4da92..9684f3b876a8667b5c98d898b8771535e5325aa7 100644 --- a/pkgs/games/worldofgoo/default.nix +++ b/pkgs/games/worldofgoo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, config, requireFile, fetchurl +{ stdenv, requireFile , libX11, libXext, libXau, libxcb, libXdmcp , SDL, SDL_mixer, libvorbis, libGLU_combined , demo ? false }: diff --git a/pkgs/games/xonotic/default.nix b/pkgs/games/xonotic/default.nix index 6d9ae55e639c564845ca97e9f9d343f7dc34ace2..ac7bf7973d77e0983912339710b4e621cbeeeed3 100644 --- a/pkgs/games/xonotic/default.nix +++ b/pkgs/games/xonotic/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl , # required for both - unzip, libjpeg, zlib, libvorbis, curl, patchelf + unzip, libjpeg, zlib, libvorbis, curl , # glx libX11, libGLU_combined, libXpm, libXext, libXxf86vm, alsaLib , # sdl diff --git a/pkgs/games/zandronum/sqlite.nix b/pkgs/games/zandronum/sqlite.nix index 35fcb4a0eec796418cb6efcd55a8a9104a0debdd..3d60dab6fe0061f3cd0fee1fcc01a6e05b2f66af 100644 --- a/pkgs/games/zandronum/sqlite.nix +++ b/pkgs/games/zandronum/sqlite.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, unzip }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation { name = "sqlite-zandronum-3.0"; diff --git a/pkgs/misc/cups/drivers/brlaser/default.nix b/pkgs/misc/cups/drivers/brlaser/default.nix index 0f5ee05349defab3ada0c1c6ee94d546f1a86678..1786a4996a3042cca258057304fa244839f9aac0 100644 --- a/pkgs/misc/cups/drivers/brlaser/default.nix +++ b/pkgs/misc/cups/drivers/brlaser/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, zlib, cups, ghostscript }: +{ stdenv, fetchFromGitHub, cmake, zlib, cups }: stdenv.mkDerivation rec { diff --git a/pkgs/misc/cups/drivers/hl1110/default.nix b/pkgs/misc/cups/drivers/hl1110/default.nix index 6f27985bdbfcf27e4f2883df4d31c5aeda1832ef..701d4b6a1002fe3e09aeb1368fc60d8164adb129 100644 --- a/pkgs/misc/cups/drivers/hl1110/default.nix +++ b/pkgs/misc/cups/drivers/hl1110/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, cups, dpkg, gnused, makeWrapper, ghostscript, file, a2ps, coreutils, gawk, patchelf}: +{stdenv, fetchurl, cups, dpkg, gnused, makeWrapper, ghostscript, file, a2ps, coreutils, gawk}: let version = "3.0.1-1"; diff --git a/pkgs/misc/cups/drivers/mfcj470dwlpr/default.nix b/pkgs/misc/cups/drivers/mfcj470dwlpr/default.nix index c5b63b07318d90637e65e09c168bfa267db8571d..f69c972c9996ec2811449dc7614c8bde1084fa7d 100644 --- a/pkgs/misc/cups/drivers/mfcj470dwlpr/default.nix +++ b/pkgs/misc/cups/drivers/mfcj470dwlpr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cups, dpkg, ghostscript, patchelf, a2ps, coreutils, gnused, gawk, file, makeWrapper }: +{ stdenv, fetchurl, cups, dpkg, ghostscript, a2ps, coreutils, gnused, gawk, file, makeWrapper }: stdenv.mkDerivation rec { name = "mfcj470dw-cupswrapper-${version}"; diff --git a/pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix b/pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix index 40e65136f1b04181d2f0a16babe6f00a2998c04a..ff71df5dc1baec52c8aa8a983bb08712a0b5b239 100644 --- a/pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix +++ b/pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgsi686Linux, dpkg, makeWrapper, coreutils, gnused, gawk, file, cups, patchelf, utillinux, xxd +{ stdenv, fetchurl, pkgsi686Linux, dpkg, makeWrapper, coreutils, gnused, gawk, file, cups, utillinux, xxd , ghostscript, a2ps }: # Why: diff --git a/pkgs/misc/cups/drivers/samsung/default.nix b/pkgs/misc/cups/drivers/samsung/default.nix index e8da0541f6c56eeb547df67bd446e390482aba91..48636e1f76aaf1f342f231da27251623b23f2feb 100644 --- a/pkgs/misc/cups/drivers/samsung/default.nix +++ b/pkgs/misc/cups/drivers/samsung/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, glibc, cups, libusb, libxml2, ghostscript }: +{ stdenv, fetchurl, cups, libusb, libxml2 }: let diff --git a/pkgs/misc/cups/drivers/splix/default.nix b/pkgs/misc/cups/drivers/splix/default.nix index 2cdaca8d7832dabfc47c0897b463793baace608d..bde918a7c484a46c79530ca4d43ba492da6cc58e 100644 --- a/pkgs/misc/cups/drivers/splix/default.nix +++ b/pkgs/misc/cups/drivers/splix/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchsvn, fetchurl, cups, zlib }: +{ stdenv, fetchsvn, cups, zlib }: let rev = "315"; in stdenv.mkDerivation rec { name = "splix-svn-${rev}"; diff --git a/pkgs/misc/cups/filters.nix b/pkgs/misc/cups/filters.nix index d15680b6363960560b8591ab4a8f6d71eea449fc..d85331e78825207df15547f66a296ba6acb450c3 100644 --- a/pkgs/misc/cups/filters.nix +++ b/pkgs/misc/cups/filters.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, cups, poppler, poppler_utils, fontconfig -, libjpeg, libpng, perl, ijs, qpdf, dbus, substituteAll, bash, avahi +, libjpeg, libpng, perl, ijs, qpdf, dbus, avahi , makeWrapper, coreutils, gnused, bc, gawk, gnugrep, which, ghostscript , mupdf }: diff --git a/pkgs/misc/drivers/epson-alc1100/default.nix b/pkgs/misc/drivers/epson-alc1100/default.nix index 88b88f59afc84d5bfa030609aa4613c6a22b06ea..1dac6034fdab9c2924d142032e91833bcbd6729e 100644 --- a/pkgs/misc/drivers/epson-alc1100/default.nix +++ b/pkgs/misc/drivers/epson-alc1100/default.nix @@ -1,4 +1,4 @@ -{ stdenv, stdenv_32bit, fetchurl, cups, pkgsi686Linux, dpkg, psutils, makeWrapper, ghostscript, bash }: +{ stdenv, fetchurl, cups, pkgsi686Linux, dpkg, psutils, makeWrapper, ghostscript, bash }: let version = "1.2-0"; diff --git a/pkgs/misc/drivers/hplip/3.16.11.nix b/pkgs/misc/drivers/hplip/3.16.11.nix index 37f2361b45e80413e61b106cc612691939a397b7..91dce834a4bda0aed6d4bdf0f98be0ca561882ce 100644 --- a/pkgs/misc/drivers/hplip/3.16.11.nix +++ b/pkgs/misc/drivers/hplip/3.16.11.nix @@ -1,8 +1,7 @@ { stdenv, fetchurl, substituteAll , pkgconfig -, makeWrapper -, cups, zlib, libjpeg, libusb1, pythonPackages, sane-backends, dbus, usbutils -, net_snmp, openssl, polkit, nettools +, cups, libjpeg, libusb1, pythonPackages, sane-backends, dbus, usbutils +, net_snmp, openssl, nettools , bash, coreutils, utillinux , qtSupport ? true , withPlugin ? false diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix index 4b88d4a96fa0dd73d58031dfd97fe5837b9b5d9b..59a75dab883237d3e9988c2a7ef1cc08d832531d 100644 --- a/pkgs/misc/drivers/hplip/default.nix +++ b/pkgs/misc/drivers/hplip/default.nix @@ -1,9 +1,8 @@ { stdenv, fetchurl, substituteAll , pkgconfig -, makeWrapper , cups, zlib, libjpeg, libusb1, pythonPackages, sane-backends , dbus, file, ghostscript, usbutils -, net_snmp, openssl, perl, polkit, nettools +, net_snmp, openssl, perl, nettools , bash, coreutils, utillinux , withQt5 ? true , withPlugin ? false diff --git a/pkgs/misc/drivers/postscript-lexmark/default.nix b/pkgs/misc/drivers/postscript-lexmark/default.nix index f4110458062650a73ddd0acc9e25f7ce6cf6abaa..a7d5710a2793c4dbbdfcfe39810c7415afc4613a 100644 --- a/pkgs/misc/drivers/postscript-lexmark/default.nix +++ b/pkgs/misc/drivers/postscript-lexmark/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, rpmextract }: +{ stdenv, fetchurl, rpmextract }: let version = "20160218"; in diff --git a/pkgs/misc/emulators/cdemu/analyzer.nix b/pkgs/misc/emulators/cdemu/analyzer.nix index e0fe451ce24d950e13e2d26010b948a9c22c28ed..64b485bea310308484a40c169eb2abbdb5db8987 100644 --- a/pkgs/misc/emulators/cdemu/analyzer.nix +++ b/pkgs/misc/emulators/cdemu/analyzer.nix @@ -1,4 +1,4 @@ -{ callPackage, gtk3, glib, libxml2, gnuplot, makeWrapper, stdenv, gnome3, gdk_pixbuf, librsvg, intltool }: +{ callPackage, gtk3, glib, libxml2, gnuplot, makeWrapper, gnome3, gdk_pixbuf, librsvg, intltool }: let pkg = import ./base.nix { version = "3.1.0"; pkgName = "image-analyzer"; diff --git a/pkgs/misc/emulators/cdemu/gui.nix b/pkgs/misc/emulators/cdemu/gui.nix index d6c85c53b42121ab386f000e5563f91f08a651d1..9403a969e8f4e5330f4c212adc00e36fd70989c4 100644 --- a/pkgs/misc/emulators/cdemu/gui.nix +++ b/pkgs/misc/emulators/cdemu/gui.nix @@ -1,4 +1,4 @@ -{ callPackage, pythonPackages, gtk3, glib, libnotify, intltool, makeWrapper, gobjectIntrospection, gnome3, gdk_pixbuf, librsvg }: +{ callPackage, pythonPackages, gtk3, glib, libnotify, intltool, makeWrapper, gnome3, gdk_pixbuf, librsvg }: let pkg = import ./base.nix { version = "3.1.0"; diff --git a/pkgs/misc/emulators/cdemu/vhba.nix b/pkgs/misc/emulators/cdemu/vhba.nix index 081846f78e352544c3ccb4344a00454abc6d8905..73ef7bc6a180933b6703863daa8cb4dc4e5e5cab 100644 --- a/pkgs/misc/emulators/cdemu/vhba.nix +++ b/pkgs/misc/emulators/cdemu/vhba.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, kernel, libelf }: +{ stdenv, fetchurl, kernel }: stdenv.mkDerivation rec { name = "vhba-${version}"; diff --git a/pkgs/misc/emulators/dosbox/unstable.nix b/pkgs/misc/emulators/dosbox/unstable.nix index 86dfd25d175f83710a7fffca29f7e0339d52813a..aecfd7698f07da5ee612d7880b1cc8cd94915bbe 100644 --- a/pkgs/misc/emulators/dosbox/unstable.nix +++ b/pkgs/misc/emulators/dosbox/unstable.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchsvn, SDL, SDL_net, SDL_sound, libpng, makeDesktopItem, libGLU_combined, autoreconfHook }: +{ stdenv, fetchsvn, SDL, SDL_net, SDL_sound, libpng, makeDesktopItem, libGLU_combined, autoreconfHook }: let revision = "4025"; revisionDate = "2017-07-02"; diff --git a/pkgs/misc/emulators/epsxe/default.nix b/pkgs/misc/emulators/epsxe/default.nix index a0999e6caf520992a7f3a189bffa94e9379ef51d..5de8ac46b9051f9b38b628dc7146a7a95770bcab 100644 --- a/pkgs/misc/emulators/epsxe/default.nix +++ b/pkgs/misc/emulators/epsxe/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, alsaLib, curl, gdk_pixbuf, gcc, glib, gtk3, +{ stdenv, fetchurl, alsaLib, curl, gdk_pixbuf, glib, gtk3, libX11, openssl, ncurses5, SDL, SDL_ttf, unzip, zlib, wrapGAppsHook }: with stdenv.lib; diff --git a/pkgs/misc/emulators/mupen64plus/default.nix b/pkgs/misc/emulators/mupen64plus/default.nix index 7de9b576ef3779254a30417e2287a5e3d8652505..9ff99110eccfafbce71074ca8699a23991a70c22 100644 --- a/pkgs/misc/emulators/mupen64plus/default.nix +++ b/pkgs/misc/emulators/mupen64plus/default.nix @@ -1,4 +1,4 @@ -{stdenv, lib, fetchurl, boost, dash, freetype, libpng, pkgconfig, SDL, which, zlib }: +{stdenv, fetchurl, boost, dash, freetype, libpng, pkgconfig, SDL, which, zlib }: stdenv.mkDerivation rec { name = "mupen64plus-${version}"; diff --git a/pkgs/misc/emulators/nestopia/default.nix b/pkgs/misc/emulators/nestopia/default.nix index 8a366ba737f316fbd3d9b263ad7d05282d8f332e..9eb353ede5832a80b977422c72c194f85e9a6a9b 100644 --- a/pkgs/misc/emulators/nestopia/default.nix +++ b/pkgs/misc/emulators/nestopia/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, SDL2, alsaLib, gtk3 -, makeWrapper, libGLU_combined, libarchive, libao, unzip, xdg_utils, gsettings-desktop-schemas +{ stdenv, fetchFromGitHub, pkgconfig, SDL2, alsaLib, gtk3 +, makeWrapper, libGLU_combined, libarchive, libao, unzip, xdg_utils , epoxy, gdk_pixbuf, gnome3, wrapGAppsHook }: diff --git a/pkgs/misc/emulators/qmc2/default.nix b/pkgs/misc/emulators/qmc2/default.nix index 2e47cead8ec20c2b143cac56deed0ffbb97af910..65cc0bd9c05a761c9a24f6c3122d99a87568cb88 100644 --- a/pkgs/misc/emulators/qmc2/default.nix +++ b/pkgs/misc/emulators/qmc2/default.nix @@ -1,5 +1,5 @@ { stdenv -, fetchurl, qmake, qttools, pkgconfig +, fetchurl, qttools, pkgconfig , minizip, zlib , qtbase, qtsvg, qtmultimedia, qtwebkit, qttranslations, qtxmlpatterns , rsync, SDL2, xwininfo diff --git a/pkgs/misc/emulators/retrofe/default.nix b/pkgs/misc/emulators/retrofe/default.nix index ffc494dad4ca9b2235bb353f84f7032d518de712..40c1fcc6fdeffc69ffcf10ad55e599bba7d00e87 100644 --- a/pkgs/misc/emulators/retrofe/default.nix +++ b/pkgs/misc/emulators/retrofe/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchhg, cmake, dos2unix, glib, gst_all_1, makeWrapper, pkgconfig +{ stdenv, fetchhg, cmake, glib, gst_all_1, makeWrapper, pkgconfig , python, SDL2, SDL2_image, SDL2_mixer, SDL2_ttf, sqlite, zlib }: diff --git a/pkgs/misc/emulators/vbam/default.nix b/pkgs/misc/emulators/vbam/default.nix index 66ea5b12575719d5d2ec86e29e492c5653589a8d..ac078f622515dfdd49671a1a6c92c93ae87c1cd5 100644 --- a/pkgs/misc/emulators/vbam/default.nix +++ b/pkgs/misc/emulators/vbam/default.nix @@ -5,10 +5,6 @@ , ffmpeg , gettext , gtk2-x11 -, libpng -, libpthreadstubs -, libXdmcp -, libxshmfence , libGLU_combined , openal , pkgconfig diff --git a/pkgs/misc/emulators/vice/default.nix b/pkgs/misc/emulators/vice/default.nix index 010c4721dc2db41512884ca31f6c992f88453efb..ae8fbe9e1f5e0d1745fe62499987e4ecaeec7dc2 100644 --- a/pkgs/misc/emulators/vice/default.nix +++ b/pkgs/misc/emulators/vice/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, bison, flex, perl, libpng, giflib, libjpeg, alsaLib, readline, libGLU_combined, libX11, libXaw +{ stdenv, fetchurl, bison, flex, perl, libpng, giflib, libjpeg, alsaLib, readline, libGLU_combined, libXaw , pkgconfig, gtk2, SDL, autoreconfHook, makeDesktopItem }: diff --git a/pkgs/misc/emulators/wine/default.nix b/pkgs/misc/emulators/wine/default.nix index ca67ca836ba01c85c316d3720d9721b0f93ef27e..a8eacbe234c60307240143f412b86602b283d131 100644 --- a/pkgs/misc/emulators/wine/default.nix +++ b/pkgs/misc/emulators/wine/default.nix @@ -6,7 +6,7 @@ # }; # Make additional configurations on demand: # wine.override { wineBuild = "wine32"; wineRelease = "staging"; }; -{ lib, pkgs, system, callPackage, +{ lib, system, callPackage, wineRelease ? "stable", wineBuild ? (if system == "x86_64-linux" then "wineWow" else "wine32"), libtxc_dxtn_Name ? "libtxc_dxtn_s2tc", diff --git a/pkgs/misc/emulators/wine/packages.nix b/pkgs/misc/emulators/wine/packages.nix index 156db148435e93120200148aeca240453b3efda9..3ea60e62c6652235c9b8cdfe87a29a5a6e224d8f 100644 --- a/pkgs/misc/emulators/wine/packages.nix +++ b/pkgs/misc/emulators/wine/packages.nix @@ -1,4 +1,4 @@ -{ system, stdenv, stdenv_32bit, lib, pkgs, pkgsi686Linux, callPackage, +{ stdenv_32bit, lib, pkgs, pkgsi686Linux, callPackage, wineRelease ? "stable", supportFlags }: diff --git a/pkgs/misc/emulators/wine/staging.nix b/pkgs/misc/emulators/wine/staging.nix index 4a7fe0ff55b65f1c965a7e1603cc00a1fa5593ec..5264e66279f772523ab82f9756621edd12043ccf 100644 --- a/pkgs/misc/emulators/wine/staging.nix +++ b/pkgs/misc/emulators/wine/staging.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, lib, wineUnstable, libtxc_dxtn_Name }: +{ stdenv, callPackage, wineUnstable, libtxc_dxtn_Name }: with callPackage ./util.nix {}; diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix index 182e176cacba33f6bc7e326c294a0e69b5578186..5839b076c0de5a39a8c400d164be5eb3be795320 100644 --- a/pkgs/misc/ghostscript/default.nix +++ b/pkgs/misc/ghostscript/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, fetchpatch, pkgconfig, zlib, expat, openssl, autoconf +{ stdenv, lib, fetchurl, pkgconfig, zlib, expat, openssl, autoconf , libjpeg, libpng, libtiff, freetype, fontconfig, lcms2, libpaper, jbig2dec , libiconv, ijs , x11Support ? false, xlibsWrapper ? null diff --git a/pkgs/misc/jackaudio/default.nix b/pkgs/misc/jackaudio/default.nix index 52b0abc48a7a5584defdd492e489c6f8ca194b1c..391ac107ab710203bef259754148a936b74a0795 100644 --- a/pkgs/misc/jackaudio/default.nix +++ b/pkgs/misc/jackaudio/default.nix @@ -6,7 +6,6 @@ # Optional Dependencies , dbus ? null, libffado ? null, alsaLib ? null , libopus ? null -, darwin # Extra options , prefix ? "" diff --git a/pkgs/misc/lilypond/unstable.nix b/pkgs/misc/lilypond/unstable.nix index 046416cd9df204e7356be601167a20d6a44ce066..df83502aa88a01b99a876cc20df3e219484a8c3c 100644 --- a/pkgs/misc/lilypond/unstable.nix +++ b/pkgs/misc/lilypond/unstable.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchgit, guile, rsync, lilypond, gyre-fonts }: +{ stdenv, fetchurl, fetchgit, rsync, lilypond, gyre-fonts }: with stdenv.lib; diff --git a/pkgs/misc/my-env/default.nix b/pkgs/misc/my-env/default.nix index d0b7458bf572f6e2fef0cd54550a4a71f781aa8b..fb8de9b6a71f805d2109b7bedb0ce6441c67d172 100644 --- a/pkgs/misc/my-env/default.nix +++ b/pkgs/misc/my-env/default.nix @@ -59,7 +59,7 @@ { mkDerivation, substituteAll, pkgs }: { stdenv ? pkgs.stdenv, name, buildInputs ? [] - , propagatedBuildInputs ? [], gcc ? stdenv.cc, cTags ? [], extraCmds ? "" + , propagatedBuildInputs ? [], gcc ? stdenv.cc, extraCmds ? "" , cleanupCmds ? "", shell ? "${pkgs.bashInteractive}/bin/bash --norc"}: mkDerivation { diff --git a/pkgs/misc/phabricator/default.nix b/pkgs/misc/phabricator/default.nix index 435cf2e0c9a784933516098b22f7f61b146d3476..367e4e53442e1f4f0a9fa47513df9aa4eaf6d028 100644 --- a/pkgs/misc/phabricator/default.nix +++ b/pkgs/misc/phabricator/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, pkgs, ... }: +{ stdenv, pkgs }: stdenv.mkDerivation rec { version = "2014-07-16"; diff --git a/pkgs/misc/screensavers/slock/default.nix b/pkgs/misc/screensavers/slock/default.nix index 82ce4c20df8e7af636b0adf7db727859c82a788d..5e658abff47d26c5170986b94a00c4a3c9146b2a 100644 --- a/pkgs/misc/screensavers/slock/default.nix +++ b/pkgs/misc/screensavers/slock/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, writeText +{ stdenv, fetchurl, writeText , xproto, libX11, libXext, libXrandr # default header can be obtained from # https://git.suckless.org/slock/tree/config.def.h diff --git a/pkgs/misc/themes/vertex/default.nix b/pkgs/misc/themes/vertex/default.nix index 86a6b4883acf6897749cc2b2254b9d072d6787a6..06d42da79362897aee5fbc4db0cf44bc4432f9d9 100644 --- a/pkgs/misc/themes/vertex/default.nix +++ b/pkgs/misc/themes/vertex/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gnome3, gtk-engine-murrine }: +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gtk-engine-murrine }: stdenv.mkDerivation rec { name = "${pname}-${version}"; diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix index 2a628e0cdf4961108466328e95c291a8d051e6b7..2bf5274eeb465e64dcfc9ddf4283f17ac21a41fc 100644 --- a/pkgs/misc/uboot/default.nix +++ b/pkgs/misc/uboot/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchpatch, bc, bison, dtc, flex, openssl, python2, swig , armTrustedFirmwareAllwinner -, hostPlatform, buildPackages +, buildPackages }: let diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index 8428a3b7894a26ef18b0ec60c1d995028009d24d..672e46409461b7edb449a8af43a73bfebac3d28f 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -1,9 +1,9 @@ # TODO check that no license information gets lost -{ config, lib, fetchurl, stdenv, python, git, go, cmake, vim, vimUtils, perl, ruby +{ config, lib, stdenv, python, cmake, vim, vimUtils, ruby , which, fetchgit, llvmPackages, rustPlatform -, xkb_switch, rustracerd, fzf, skim +, xkb_switch, fzf, skim , python3, boost, icu, ncurses -, ycmd, makeWrapper, rake +, ycmd, rake , pythonPackages, python3Packages , substituteAll , languagetool diff --git a/pkgs/misc/vscode-extensions/cpptools/default.nix b/pkgs/misc/vscode-extensions/cpptools/default.nix index 6cec206b73a40094121c52ed3d624ca59987dcb4..5bc1dddeab8ee33144e4a2d374fe988ffe5a74fa 100644 --- a/pkgs/misc/vscode-extensions/cpptools/default.nix +++ b/pkgs/misc/vscode-extensions/cpptools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, fetchzip, vscode-utils, jq, mono46, clang-tools, writeScript +{ stdenv, fetchzip, vscode-utils, jq, mono46, clang-tools, writeScript , gdbUseFixed ? true, gdb # The gdb default setting will be fixed to specified. Use version from `PATH` otherwise. }: diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index 16ddb8fd40527cbfbe9163b2761ff0c7784fcfd3..68304d6622439359ea73a25fede4cc8754bf91eb 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, callPackage, vscode-utils }: +{ stdenv, callPackage, vscode-utils }: let inherit (vscode-utils) buildVscodeExtension buildVscodeMarketplaceExtension diff --git a/pkgs/misc/vscode-extensions/python/default.nix b/pkgs/misc/vscode-extensions/python/default.nix index 41db2c1fcea3256c646a8c84652764c09a2b8f49..c33359ccbfc88e47f7b0e788ffb4477cc9f833b4 100644 --- a/pkgs/misc/vscode-extensions/python/default.nix +++ b/pkgs/misc/vscode-extensions/python/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, vscode-utils +{ lib, vscode-utils , pythonUseFixed ? false, python # When `true`, the python default setting will be fixed to specified. # Use version from `PATH` for default setting otherwise. diff --git a/pkgs/misc/vscode-extensions/vscode-utils.nix b/pkgs/misc/vscode-extensions/vscode-utils.nix index 4c095278f9185882f3a940ed8a88631f9853fc5d..d7ec669204cdd41a47adcb9e7bb9eba28b573594 100644 --- a/pkgs/misc/vscode-extensions/vscode-utils.nix +++ b/pkgs/misc/vscode-extensions/vscode-utils.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, runCommand, vscode, unzip }: +{ stdenv, lib, fetchurl, vscode, unzip }: let extendedPkgVersion = lib.getVersion vscode; diff --git a/pkgs/os-specific/darwin/apple-source-releases/ICU/default.nix b/pkgs/os-specific/darwin/apple-source-releases/ICU/default.nix index 6cf7ee07b70bbb7652dcc068afc6efe7ebcf4b57..89ff68266a295428df656e118546b8bb8b2b7c91 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/ICU/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/ICU/default.nix @@ -1,4 +1,4 @@ -{ stdenv, cctools, appleDerivation }: +{ cctools, appleDerivation }: appleDerivation { nativeBuildInputs = [ cctools ]; diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libc/825_40_1.nix b/pkgs/os-specific/darwin/apple-source-releases/Libc/825_40_1.nix index 302a657992aaf7cc4233a8a466b63c8c00edd9a1..29aa3d64cb08b910f5f83dfc71e6c80a13ffdb41 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/Libc/825_40_1.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/Libc/825_40_1.nix @@ -1,4 +1,4 @@ -{ stdenv, appleDerivation, ed, unifdef }: +{ appleDerivation, ed, unifdef }: appleDerivation { nativeBuildInputs = [ ed unifdef ]; diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libc/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Libc/default.nix index d73dc8f3ec24717be717c68ed8f70110cfefb0f3..542ea20de11ec765518c1eae8748b38337238934 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/Libc/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/Libc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, appleDerivation, ed, unifdef, Libc_old, Libc_10-9 }: +{ appleDerivation, ed, unifdef, Libc_old, Libc_10-9 }: appleDerivation { nativeBuildInputs = [ ed unifdef ]; diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libinfo/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Libinfo/default.nix index d3ffa1fa2834670befce67dcad4eb8b5ffaa181f..add51a61d3d3ca687739b4909f57640f99f5fd3a 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/Libinfo/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/Libinfo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, appleDerivation }: +{ appleDerivation }: appleDerivation { installPhase = '' diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libm/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Libm/default.nix index 1a01d03219187378a55042ff7637b61158e58200..df5f6b7b8fd6412955feadfa2a040b887ef02546 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/Libm/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/Libm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, appleDerivation }: +{ appleDerivation }: appleDerivation { installPhase = '' diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libnotify/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Libnotify/default.nix index de691a056f3ea33115108b8db10106bdee39fa95..2ee80d70264635781360ab2690c88c091cb96d80 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/Libnotify/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/Libnotify/default.nix @@ -1,4 +1,4 @@ -{ stdenv, appleDerivation }: +{ appleDerivation }: appleDerivation { installPhase = '' diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix index 386480d629024a3b377558e351fbe88167b8c950..1e27ead69f1bd7cae27a6155038bef0128f38b21 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix @@ -1,6 +1,6 @@ -{ stdenv, appleDerivation, cpio, bootstrap_cmds, xnu, Libc, Libm, libdispatch, cctools, Libinfo, +{ stdenv, appleDerivation, cpio, xnu, Libc, Libm, libdispatch, cctools, Libinfo, dyld, Csu, architecture, libclosure, CarbonHeaders, ncurses, CommonCrypto, copyfile, - removefile, libresolv, Libnotify, libplatform, libpthread, mDNSResponder, launchd, libutil, version }: + removefile, libresolv, Libnotify, libplatform, libpthread, mDNSResponder, launchd, libutil }: appleDerivation rec { phases = [ "unpackPhase" "installPhase" ]; diff --git a/pkgs/os-specific/darwin/apple-source-releases/Security/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Security/default.nix index f09842630fdb2ff1a279ae76c2bbb072be29ef21..e04142b8b11e36346dc2d45dadb5a77499cfa303 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/Security/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/Security/default.nix @@ -1,4 +1,4 @@ -{ stdenv, appleDerivation }: +{ appleDerivation }: appleDerivation { phases = [ "unpackPhase" "installPhase" ]; diff --git a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/default.nix index 35608587c56901264487a8290c42d662a5b6d044..318e2728fc2e2fafd948682b4a2d634dccff4b21 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/default.nix @@ -1,4 +1,4 @@ -{ stdenv, appleDerivation, fetchzip, version, bsdmake, perl, flex, yacc, writeScriptBin +{ stdenv, appleDerivation, fetchzip, bsdmake, perl, flex, yacc }: # this derivation sucks diff --git a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix index fda7cd85e4f7afb6e433871fcb1090d6a1de6ebf..7b1492799ddb6160b8134b840d758142049a573b 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix @@ -1,4 +1,4 @@ -{ stdenv, appleDerivation, fetchurl, xcbuild, ncurses, libutil-new }: +{ stdenv, appleDerivation, xcbuild, ncurses, libutil-new }: appleDerivation { # We can't just run the root build, because https://github.com/facebook/xcbuild/issues/264 diff --git a/pkgs/os-specific/darwin/apple-source-releases/basic_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/basic_cmds/default.nix index 596ca25d70a46880eca8a8e6b37358f3200937c0..5d9781f3aa4ad4b45b604ce6fdb179264a172928 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/basic_cmds/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/basic_cmds/default.nix @@ -1,4 +1,4 @@ -{ stdenv, appleDerivation, fetchurl, xcbuildHook }: +{ stdenv, appleDerivation, xcbuildHook }: appleDerivation rec { nativeBuildInputs = [ xcbuildHook ]; diff --git a/pkgs/os-specific/darwin/apple-source-releases/bsdmake/default.nix b/pkgs/os-specific/darwin/apple-source-releases/bsdmake/default.nix index baa3b11225d09b8695e0443c81416c1bfaf8f4e2..043c7b0bc70d34168d4c269a274d96649d405189 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/bsdmake/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/bsdmake/default.nix @@ -1,4 +1,4 @@ -{ stdenv, appleDerivation, fetchurl, fetchpatch, makeWrapper }: +{ stdenv, appleDerivation, makeWrapper }: appleDerivation { nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/os-specific/darwin/apple-source-releases/copyfile/default.nix b/pkgs/os-specific/darwin/apple-source-releases/copyfile/default.nix index 37dffaa9b20e2564257e1340894e428d5522eb97..7e1dc5309b1d02b99e33eb56462d63461e7d740e 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/copyfile/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/copyfile/default.nix @@ -1,4 +1,4 @@ -{ stdenv, appleDerivation }: +{ appleDerivation }: appleDerivation { dontBuild = true; diff --git a/pkgs/os-specific/darwin/apple-source-releases/developer_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/developer_cmds/default.nix index a572d46ceab56c27bafa9af38a7e64fb9f5fa179..4220c50d61cb1639312c44ab12cb4e2eef6b540e 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/developer_cmds/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/developer_cmds/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, appleDerivation, xcbuildHook }: +{ stdenv, appleDerivation, xcbuildHook }: appleDerivation rec { nativeBuildInputs = [ xcbuildHook ]; diff --git a/pkgs/os-specific/darwin/apple-source-releases/diskdev_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/diskdev_cmds/default.nix index b947267ab14dc518e0a264f19040576319a3fe27..f27b5ae13022042e5ee80deb82d9da79be57744c 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/diskdev_cmds/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/diskdev_cmds/default.nix @@ -1,5 +1,5 @@ { stdenv, appleDerivation, xcbuildHook -, lib, hostPlatform, Libc, xnu, libutil-new }: +, Libc, xnu, libutil-new }: appleDerivation { nativeBuildInputs = [ xcbuildHook ]; diff --git a/pkgs/os-specific/darwin/apple-source-releases/dtrace/default.nix b/pkgs/os-specific/darwin/apple-source-releases/dtrace/default.nix index 5fcd04266d5ab620859147e7909adcb235c26fcf..fd2c95563b48a346817543d3c33048c34b5cb125 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/dtrace/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/dtrace/default.nix @@ -1,4 +1,4 @@ -{ stdenv, appleDerivation, cctools, zlib }: +{ appleDerivation, cctools, zlib }: appleDerivation { buildInputs = [ cctools zlib ]; diff --git a/pkgs/os-specific/darwin/apple-source-releases/eap8021x/default.nix b/pkgs/os-specific/darwin/apple-source-releases/eap8021x/default.nix index 80d629dfa3e607f55372b0d789c0d106458f93d9..b24d94b9d70d8639fe8951f5d485d3ad36f9c56e 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/eap8021x/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/eap8021x/default.nix @@ -1,4 +1,4 @@ -{ stdenv, appleDerivation }: +{ appleDerivation }: appleDerivation { dontBuild = true; diff --git a/pkgs/os-specific/darwin/apple-source-releases/launchd/default.nix b/pkgs/os-specific/darwin/apple-source-releases/launchd/default.nix index 86bc6e598f7d3feed4dd3fb05ace5c813b39294c..eed7982e9d8cc21a8b525d8e1c8f4aabef41bb80 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/launchd/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/launchd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, appleDerivation }: +{ appleDerivation }: appleDerivation { # No clue why the same file has two different names. Ask Apple! diff --git a/pkgs/os-specific/darwin/apple-source-releases/libclosure/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libclosure/default.nix index 826dbed1dfe05b35eff44abe8b4f2835ff80769b..ac33a24a8b4e6e51d38fb1c5f8ec033d2ff8b519 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libclosure/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libclosure/default.nix @@ -1,4 +1,4 @@ -{ stdenv, appleDerivation }: +{ appleDerivation }: appleDerivation { installPhase = '' diff --git a/pkgs/os-specific/darwin/apple-source-releases/libdispatch/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libdispatch/default.nix index a43c00f7691b3cdb75df85b626dd00796891f9c1..46e9e592ddc690b1b399784d6b72a8d135a8c022 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libdispatch/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libdispatch/default.nix @@ -1,4 +1,4 @@ -{ stdenv, appleDerivation }: +{ appleDerivation }: appleDerivation { dontConfigure = true; diff --git a/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix index d325e38b272e772bb631c2d35adf170fa48e724a..3d62c3961221294ec4128801c5f7e305179d5b9e 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, appleDerivation, lib, autoreconfHook, targetPlatform +{ stdenv, appleDerivation, lib, targetPlatform , enableStatic ? targetPlatform.isiOS , enableShared ? !targetPlatform.isiOS }: diff --git a/pkgs/os-specific/darwin/apple-source-releases/libplatform/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libplatform/default.nix index 41b1bf74af9eebeae12f18c293cea3c816217ce5..4fd0ab8a7fb2269bd0a4c872e7ddfa516153a28b 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libplatform/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libplatform/default.nix @@ -1,4 +1,4 @@ -{ stdenv, appleDerivation }: +{ appleDerivation }: appleDerivation { installPhase = '' diff --git a/pkgs/os-specific/darwin/apple-source-releases/libresolv/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libresolv/default.nix index 5a2cd33d8a0347701c3580ed472669dc3344075f..f3c7558cfc626e49fffe460bace34b3fd081e38d 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libresolv/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libresolv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, appleDerivation, Libinfo, configd, mDNSResponder }: +{ appleDerivation, Libinfo, configd, mDNSResponder }: appleDerivation { buildInputs = [ Libinfo configd mDNSResponder ]; diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_cdsa_utils/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_cdsa_utils/default.nix index aa73c281cab25c01b5da0c0dbc7521af4e8c09aa..e5637d6db410b661d16d9f4cf596547c7223a271 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_cdsa_utils/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_cdsa_utils/default.nix @@ -1,4 +1,4 @@ -{ Security, appleDerivation, libsecurity_cdsa_utilities, libsecurity_utilities, m4 }: +{ appleDerivation, libsecurity_cdsa_utilities, libsecurity_utilities, m4 }: appleDerivation { buildInputs = [ libsecurity_utilities diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_cssm/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_cssm/default.nix index 053dea134c725e45bc7f7193711f06c73c28d3c4..cf9fe411533f64236dccd39c8b24904d1255efca 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_cssm/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_cssm/default.nix @@ -1,4 +1,4 @@ -{ appleDerivation, libsecurity_cdsa_client, libsecurity_cdsa_plugin, libsecurity_cdsa_utilities, libsecurity_codesigning, libsecurity_utilities, perl }: +{ appleDerivation, libsecurity_cdsa_client, libsecurity_cdsa_plugin, libsecurity_cdsa_utilities, libsecurity_utilities, perl }: appleDerivation { buildInputs = [ libsecurity_utilities diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_keychain/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_keychain/default.nix index 07a3186caeec9546614559d26839b6561cdd07a3..609d07fda1009ddc729a4686cf00043dd3f09345 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_keychain/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_keychain/default.nix @@ -1,4 +1,4 @@ -{ CF, Security, appleDerivation, apple_sdk, libsecurity_asn1, libsecurity_cdsa_client, libsecurity_cdsa_utilities, libsecurity_cdsa_utils, libsecurity_ocspd, libsecurity_pkcs12, libsecurity_utilities, libsecurityd, openssl, osx_private_sdk, security_dotmac_tp, lib }: +{ CF, appleDerivation, apple_sdk, libsecurity_asn1, libsecurity_cdsa_client, libsecurity_cdsa_utilities, libsecurity_cdsa_utils, libsecurity_ocspd, libsecurity_pkcs12, libsecurity_utilities, libsecurityd, openssl, osx_private_sdk, security_dotmac_tp, lib }: appleDerivation { buildInputs = [ libsecurity_utilities diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_utilities/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_utilities/default.nix index e811c4c11a82e5be22ff2241c963dd91bc0220d2..1ab950a9233c5bc688edc84711cbe7aa3661023a 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_utilities/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_utilities/default.nix @@ -1,4 +1,4 @@ -{ IOKit, appleDerivation, apple_sdk, libauto, libobjc, libsecurity_codesigning, sqlite, stdenv, osx_private_sdk }: +{ IOKit, appleDerivation, apple_sdk, libauto, libobjc, sqlite, stdenv, osx_private_sdk }: appleDerivation { buildInputs = [ libauto diff --git a/pkgs/os-specific/darwin/apple-source-releases/mDNSResponder/default.nix b/pkgs/os-specific/darwin/apple-source-releases/mDNSResponder/default.nix index 63674808d93b10cdb53f231122c1f8abda276bfa..f17ed785360d95625d0918d7f00f6482c1b0a996 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/mDNSResponder/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/mDNSResponder/default.nix @@ -1,4 +1,4 @@ -{ stdenv, appleDerivation }: +{ appleDerivation }: appleDerivation { phases = [ "unpackPhase" "installPhase" ]; diff --git a/pkgs/os-specific/darwin/apple-source-releases/objc4/default.nix b/pkgs/os-specific/darwin/apple-source-releases/objc4/default.nix index cea5fc9a4e2cddb1b2ada5c3e7bbcb3320055de3..5c78182085b5ae19632b8ff7d449eeaadf01e2ab 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/objc4/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/objc4/default.nix @@ -1,4 +1,4 @@ -{ stdenv, appleDerivation }: +{ appleDerivation }: appleDerivation { phases = [ "unpackPhase" "installPhase" ]; diff --git a/pkgs/os-specific/darwin/apple-source-releases/ppp/default.nix b/pkgs/os-specific/darwin/apple-source-releases/ppp/default.nix index 17c24bebfda7d0581983da8ff816272932f5a3d0..5668c376130e7167639bee8a028a643449451b58 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/ppp/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/ppp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, appleDerivation }: +{ appleDerivation }: appleDerivation { dontBuild = true; diff --git a/pkgs/os-specific/darwin/apple-source-releases/removefile/default.nix b/pkgs/os-specific/darwin/apple-source-releases/removefile/default.nix index 8baf62dba01bdddf66dd4fb40ca7141379917aab..2b45fbdb45e283b53a70b1bae24e418c32f05c39 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/removefile/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/removefile/default.nix @@ -1,4 +1,4 @@ -{ stdenv, appleDerivation }: +{ appleDerivation }: appleDerivation { installPhase = '' diff --git a/pkgs/os-specific/darwin/apple-source-releases/system_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/system_cmds/default.nix index 1bbda6ab7add90843d1ec825bd85da896a88ff06..39c903a2e7b99cd47111db4d07afcca33bfcb035 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/system_cmds/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/system_cmds/default.nix @@ -1,4 +1,4 @@ -{ stdenv, appleDerivation, xcbuild, lib, hostPlatform +{ stdenv, appleDerivation, lib , Librpcsvc, apple_sdk, pam, CF, openbsm }: appleDerivation rec { diff --git a/pkgs/os-specific/darwin/apple-source-releases/text_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/text_cmds/default.nix index 08df235ed8c2f9e4e427e5b635b685c242f39c4e..91abb3ca07a83a1474bacdb0306f0fdbc1fa1056 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/text_cmds/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/text_cmds/default.nix @@ -1,4 +1,4 @@ -{ stdenv, appleDerivation, fetchurl, xcbuildHook, ncurses, bzip2, zlib, lzma }: +{ stdenv, appleDerivation, xcbuildHook, ncurses, bzip2, zlib, lzma }: appleDerivation { nativeBuildInputs = [ xcbuildHook ]; diff --git a/pkgs/os-specific/darwin/apple-source-releases/xnu/default.nix b/pkgs/os-specific/darwin/apple-source-releases/xnu/default.nix index 2c7da5be6e4c1c3367c9e4e669030a7fa42c2258..74c9f2543481e55b80b5c600d45e076e30e925d2 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/xnu/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/xnu/default.nix @@ -1,4 +1,4 @@ -{ stdenv, appleDerivation, fetchzip, bootstrap_cmds, bison, flex, gnum4, unifdef, perl, python }: +{ appleDerivation, bootstrap_cmds, bison, flex, gnum4, unifdef, perl, python }: appleDerivation { phases = [ "unpackPhase" "patchPhase" "installPhase" ]; diff --git a/pkgs/os-specific/darwin/binutils/default.nix b/pkgs/os-specific/darwin/binutils/default.nix index 21d64979d7eafb53fd145536896bc71ef063482b..bd10dde5572c7ee38b80d46f667f7b37488841c6 100644 --- a/pkgs/os-specific/darwin/binutils/default.nix +++ b/pkgs/os-specific/darwin/binutils/default.nix @@ -1,5 +1,4 @@ { stdenv, binutils-unwrapped, cctools -, hostPlatform, targetPlatform }: # Make sure both underlying packages claim to have prepended their binaries diff --git a/pkgs/os-specific/darwin/cctools/port.nix b/pkgs/os-specific/darwin/cctools/port.nix index 0c908197acb8c1d46739c44f5d22446ab58a9092..995e9af38cb8c0bec80ff1d12b69e4ae0a9e8017 100644 --- a/pkgs/os-specific/darwin/cctools/port.nix +++ b/pkgs/os-specific/darwin/cctools/port.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchFromGitHub, makeWrapper, autoconf, automake, libtool_2, autoreconfHook -, libcxx, libcxxabi, libuuid +{ stdenv, fetchFromGitHub, autoconf, automake, libtool_2, autoreconfHook +, libcxxabi, libuuid , libobjc ? null, maloader ? null , hostPlatform, targetPlatform , enableDumpNormalizedLibArgs ? false diff --git a/pkgs/os-specific/darwin/darling/default.nix b/pkgs/os-specific/darwin/darling/default.nix index c1e29843147c01ae06377adb0d354cada537dd63..6ed3b28eccc3cba669e5c21967a6d1d3db1133d9 100644 --- a/pkgs/os-specific/darwin/darling/default.nix +++ b/pkgs/os-specific/darwin/darling/default.nix @@ -1,4 +1,4 @@ -{stdenv, lib, fetchzip, cmake, bison, flex}: +{stdenv, lib, fetchzip}: stdenv.mkDerivation rec { pname = "darling"; diff --git a/pkgs/os-specific/darwin/security-tool/default.nix b/pkgs/os-specific/darwin/security-tool/default.nix index 4566d82835f7e6deff9e590f4cf7b028a11bc2ef..f161a7a88e175a20a611785de7ba65f22fb8c612 100644 --- a/pkgs/os-specific/darwin/security-tool/default.nix +++ b/pkgs/os-specific/darwin/security-tool/default.nix @@ -1,4 +1,4 @@ -{ CoreServices, Foundation, PCSC, Security, GSS, Kerberos, makeWrapper, apple_sdk, +{ Foundation, PCSC, Security, GSS, Kerberos, makeWrapper, apple_sdk, fetchurl, gnustep, libobjc, libsecurity_apple_csp, libsecurity_apple_cspdl, libsecurity_apple_file_dl, libsecurity_apple_x509_cl, libsecurity_apple_x509_tp, libsecurity_asn1, libsecurity_cdsa_client, libsecurity_cdsa_plugin, diff --git a/pkgs/os-specific/darwin/swift-corelibs/default.nix b/pkgs/os-specific/darwin/swift-corelibs/default.nix index fdc97304528df2f4584fd0cf5ea7101f5f80c374..dd652dc56273bab1a9731ce4e7be8678d8012542 100644 --- a/pkgs/os-specific/darwin/swift-corelibs/default.nix +++ b/pkgs/os-specific/darwin/swift-corelibs/default.nix @@ -1,4 +1,4 @@ -{callPackage, stdenv, darwin, xcbuild}: +{callPackage, darwin}: rec { corefoundation = callPackage ./corefoundation.nix {}; diff --git a/pkgs/os-specific/darwin/xcode/sdk-pkgs.nix b/pkgs/os-specific/darwin/xcode/sdk-pkgs.nix index d5ed21cd9e242f99030d3e40a63c114b76bdda8d..b848265736e63fc6d565b8482161c2baa47c08e7 100644 --- a/pkgs/os-specific/darwin/xcode/sdk-pkgs.nix +++ b/pkgs/os-specific/darwin/xcode/sdk-pkgs.nix @@ -1,4 +1,4 @@ -{ lib, hostPlatform, targetPlatform +{ targetPlatform , clang-unwrapped , binutils-unwrapped , runCommand diff --git a/pkgs/os-specific/linux/amdgpu-pro/default.nix b/pkgs/os-specific/linux/amdgpu-pro/default.nix index df0ef80ff4d4518cabaa3b6ab718af5f6a6c7e06..97658c831eb091fdd9b28ab936ea811ef092190b 100644 --- a/pkgs/os-specific/linux/amdgpu-pro/default.nix +++ b/pkgs/os-specific/linux/amdgpu-pro/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, elfutils , xorg, patchelf, openssl, libdrm, udev , libxcb, libxshmfence, epoxy, perl, zlib -, fetchFromGitHub, ncurses +, ncurses , libsOnly ? false, kernel ? null }: diff --git a/pkgs/os-specific/linux/autofs/default.nix b/pkgs/os-specific/linux/autofs/default.nix index 859593e4b9aa5697c2e91dfa456a5a5565a67e5d..60ccad04eea4789e7093bfced0d0d5ab5ee01ed1 100644 --- a/pkgs/os-specific/linux/autofs/default.nix +++ b/pkgs/os-specific/linux/autofs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, flex, bison, linuxHeaders, libtirpc, mount, umount, nfs-utils, e2fsprogs +{ stdenv, fetchurl, flex, bison, linuxHeaders, libtirpc, mount, umount, nfs-utils, e2fsprogs , libxml2, kerberos, kmod, openldap, sssd, cyrus_sasl, openssl }: let diff --git a/pkgs/os-specific/linux/bcc/default.nix b/pkgs/os-specific/linux/bcc/default.nix index 3104004b3d674588d56a805cc9b9c3a7aa4089ac..2796fed17dc618a3abe2428c991075126ea505c7 100644 --- a/pkgs/os-specific/linux/bcc/default.nix +++ b/pkgs/os-specific/linux/bcc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, makeWrapper, cmake, llvmPackages, kernel +{ stdenv, fetchFromGitHub, makeWrapper, cmake, llvmPackages, kernel , flex, bison, elfutils, python, luajit, netperf, iperf, libelf , systemtap }: diff --git a/pkgs/os-specific/linux/blcr/default.nix b/pkgs/os-specific/linux/blcr/default.nix index 275600d42785a89a6adee0ebcb80fde575a52098..626e978f1f168e59749d462f8768161c177c0f91 100644 --- a/pkgs/os-specific/linux/blcr/default.nix +++ b/pkgs/os-specific/linux/blcr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, kernel, perl, makeWrapper }: +{ stdenv, fetchurl, kernel, perl, makeWrapper }: # BLCR version 0.8.6 should works with linux kernel up to version 3.17.x diff --git a/pkgs/os-specific/linux/broadcom-sta/default.nix b/pkgs/os-specific/linux/broadcom-sta/default.nix index 9423e7a33f4eb0db855fa9210332a37646ddf268..9848882f3b867a66388445a4d986225424124b96 100644 --- a/pkgs/os-specific/linux/broadcom-sta/default.nix +++ b/pkgs/os-specific/linux/broadcom-sta/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, kernel }: +{ stdenv, fetchurl, kernel }: let version = "6.30.223.271"; diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix index 06a2d4301596c6a68f998bdb67950636465c298b..bfd79cb42dc5660a4123c9c8f407e0116759162f 100644 --- a/pkgs/os-specific/linux/busybox/default.nix +++ b/pkgs/os-specific/linux/busybox/default.nix @@ -1,9 +1,8 @@ -{ stdenv, lib, buildPackages, fetchurl, fetchpatch +{ stdenv, lib, buildPackages, fetchurl , enableStatic ? false , enableMinimal ? false , useMusl ? stdenv.hostPlatform.libc == "musl", musl , extraConfig ? "" -, buildPlatform, hostPlatform }: assert stdenv.hostPlatform.libc == "musl" -> useMusl; diff --git a/pkgs/os-specific/linux/checksec/default.nix b/pkgs/os-specific/linux/checksec/default.nix index 9b7f69d4ab89947c9df13df55702e174a0d8972f..a8ffb133a90592afce2ca3b2adc3434819709dee 100644 --- a/pkgs/os-specific/linux/checksec/default.nix +++ b/pkgs/os-specific/linux/checksec/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, file, findutils, binutils, glibc, procps, coreutils, sysctl }: +{ stdenv, fetchurl, file, findutils, binutils, glibc, coreutils, sysctl }: stdenv.mkDerivation rec { name = "checksec-${version}"; diff --git a/pkgs/os-specific/linux/conky/default.nix b/pkgs/os-specific/linux/conky/default.nix index e4c45a9440ab5929501ffc54d9dcb0efa2299241..eb4e6a16e38a250b2a077bbe36f45d08c2bc4982 100644 --- a/pkgs/os-specific/linux/conky/default.nix +++ b/pkgs/os-specific/linux/conky/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, cmake +{ stdenv, fetchFromGitHub, pkgconfig, cmake # dependencies , glib, libXinerama diff --git a/pkgs/os-specific/linux/cpupower/default.nix b/pkgs/os-specific/linux/cpupower/default.nix index d10b789f3e476c4f6ac314a91808a58f663b75f8..2b8efe7e7449a693e1f6821e41674978dff6f2ad 100644 --- a/pkgs/os-specific/linux/cpupower/default.nix +++ b/pkgs/os-specific/linux/cpupower/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPackages, fetchurl, kernel, pciutils, gettext }: +{ stdenv, buildPackages, kernel, pciutils, gettext }: stdenv.mkDerivation { name = "cpupower-${kernel.version}"; diff --git a/pkgs/os-specific/linux/criu/default.nix b/pkgs/os-specific/linux/criu/default.nix index ad9b27f83fa9738e7172f1be9c1148cce3e39dcb..832167b6f26a2bad2d1d9eb8f77d796274f4b375 100644 --- a/pkgs/os-specific/linux/criu/default.nix +++ b/pkgs/os-specific/linux/criu/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, protobuf, protobufc, asciidoc -, xmlto, utillinux, docbook_xsl, libpaper, libnl, libcap, libnet, pkgconfig +, xmlto, docbook_xsl, libpaper, libnl, libcap, libnet, pkgconfig , python }: stdenv.mkDerivation rec { diff --git a/pkgs/os-specific/linux/cryptodev/default.nix b/pkgs/os-specific/linux/cryptodev/default.nix index d25692b6cdf697e31cdad70682d397b2f7dd35a6..45a7fe177f2bc0343da76a876b111886c6603ec5 100644 --- a/pkgs/os-specific/linux/cryptodev/default.nix +++ b/pkgs/os-specific/linux/cryptodev/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, kernel, onlyHeaders ? false }: +{ fetchurl, stdenv, kernel ? false }: stdenv.mkDerivation rec { pname = "cryptodev-linux-1.9"; diff --git a/pkgs/os-specific/linux/dbus-broker/default.nix b/pkgs/os-specific/linux/dbus-broker/default.nix index c57650e0806fb78451e07c1b965692191cb93631..794ebd126fa47b77500a3c1807b90cae5faf6e7b 100644 --- a/pkgs/os-specific/linux/dbus-broker/default.nix +++ b/pkgs/os-specific/linux/dbus-broker/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, fetchFromGitHub, docutils, meson, ninja, pkgconfig +{ stdenv, fetchFromGitHub, docutils, meson, ninja, pkgconfig , dbus, glib, linuxHeaders, systemd }: stdenv.mkDerivation rec { diff --git a/pkgs/os-specific/linux/displaylink/default.nix b/pkgs/os-specific/linux/displaylink/default.nix index 55be85d33f05bcf785a5bcd1c7314f9dad9df794..ad42590ad19c4d958ec0d5a3d4c437df1a79ee6b 100644 --- a/pkgs/os-specific/linux/displaylink/default.nix +++ b/pkgs/os-specific/linux/displaylink/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, unzip, utillinux, +{ stdenv, lib, unzip, utillinux, libusb1, evdi, systemd, makeWrapper, requireFile }: let diff --git a/pkgs/os-specific/linux/ena/default.nix b/pkgs/os-specific/linux/ena/default.nix index e3f382ababc386f5fde99bd1851e412402edc14e..180957ac2adff7dee70c6e8054bde55800f39924 100644 --- a/pkgs/os-specific/linux/ena/default.nix +++ b/pkgs/os-specific/linux/ena/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, kernel, kmod }: +{ stdenv, fetchFromGitHub, kernel }: stdenv.mkDerivation rec { version = "1.5.2"; diff --git a/pkgs/os-specific/linux/fatrace/default.nix b/pkgs/os-specific/linux/fatrace/default.nix index 6f6418edc3e561d2c647e337d270f88ff307034b..fb1a3e563884cf02ce3aa793b05d56867a86fd66 100644 --- a/pkgs/os-specific/linux/fatrace/default.nix +++ b/pkgs/os-specific/linux/fatrace/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, python3, which }: +{ stdenv, fetchurl, python3, which }: stdenv.mkDerivation rec { name = "fatrace-${version}"; diff --git a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix index 724498b960c03ef70e2f18d5718aaba2ce9fd931..47d56cbf7967fad9ba73bab00dcc2378c6d46e46 100644 --- a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix +++ b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, runCommand, git, cacert, gnupg }: +{ stdenv, fetchgit }: stdenv.mkDerivation rec { name = "firmware-linux-nonfree-${version}"; diff --git a/pkgs/os-specific/linux/fuse/common.nix b/pkgs/os-specific/linux/fuse/common.nix index d813258f95a9e01e088c87b44d6d29de69adbaa1..7cc58c19c07d6acfbfadb7bbece5d6ba39911cc8 100644 --- a/pkgs/os-specific/linux/fuse/common.nix +++ b/pkgs/os-specific/linux/fuse/common.nix @@ -2,7 +2,6 @@ { stdenv, fetchFromGitHub, fetchpatch , fusePackages, utillinux, gettext -, autoconf, automake, libtool , meson, ninja, pkgconfig , autoreconfHook }: diff --git a/pkgs/os-specific/linux/fuse/default.nix b/pkgs/os-specific/linux/fuse/default.nix index cdbcca55d2ff243316f3f87ea3d7ef3addc65a37..594f966c2f4233c0e8a8975299e2f8d33185bf22 100644 --- a/pkgs/os-specific/linux/fuse/default.nix +++ b/pkgs/os-specific/linux/fuse/default.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, utillinux }: +{ callPackage, utillinux }: let mkFuse = args: callPackage (import ./common.nix args) { diff --git a/pkgs/os-specific/linux/guvcview/default.nix b/pkgs/os-specific/linux/guvcview/default.nix index 581d0f841b964124be49cc18f9856656fc1edcb5..c8146c39cf5905ee7ab43f750a1825e664314bc4 100644 --- a/pkgs/os-specific/linux/guvcview/default.nix +++ b/pkgs/os-specific/linux/guvcview/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, intltool, gettext, pkgconfig -, gtk3, portaudio, libpng, SDL2, ffmpeg, udev, libusb1, libv4l, alsaLib, gsl +{ stdenv, fetchurl, intltool, pkgconfig +, gtk3, portaudio, SDL2, ffmpeg, udev, libusb1, libv4l, alsaLib, gsl , pulseaudioSupport ? true, libpulseaudio ? null }: assert pulseaudioSupport -> libpulseaudio != null; diff --git a/pkgs/os-specific/linux/iproute/default.nix b/pkgs/os-specific/linux/iproute/default.nix index 3f5ed788bb233532cc39529b6376b758e85a5cc3..4204105bb6058d68171d12c5fae4830e600caa47 100644 --- a/pkgs/os-specific/linux/iproute/default.nix +++ b/pkgs/os-specific/linux/iproute/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, config, lib, flex, bash, bison, db, iptables, pkgconfig }: +{ fetchurl, stdenv, config, flex, bash, bison, db, iptables, pkgconfig }: stdenv.mkDerivation rec { name = "iproute2-${version}"; diff --git a/pkgs/os-specific/linux/iputils/default.nix b/pkgs/os-specific/linux/iputils/default.nix index d0a8950a508736182fa199fde9b3ae8d1934f086..4caa0acb4b6a72709cd3ffd51c363eb05b5d6a84 100644 --- a/pkgs/os-specific/linux/iputils/default.nix +++ b/pkgs/os-specific/linux/iputils/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl -, sysfsutils, gnutls, openssl +, sysfsutils, openssl , libcap, opensp, docbook_sgml_dtd_31 , libidn, nettle , SGMLSpm, libgcrypt }: diff --git a/pkgs/os-specific/linux/kernel-headers/default.nix b/pkgs/os-specific/linux/kernel-headers/default.nix index 01cab57f71961edaae80e7d85f1879372bea60c8..677bb076b0c8eab8e740eebb32daa2dcaea3160e 100644 --- a/pkgs/os-specific/linux/kernel-headers/default.nix +++ b/pkgs/os-specific/linux/kernel-headers/default.nix @@ -1,5 +1,5 @@ { stdenvNoCC, lib, buildPackages -, buildPlatform, hostPlatform +, hostPlatform , fetchurl, perl }: diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index fe46b9eab40349123a806e91651abc82533e0fc4..b2171067307f01f47be6859a7c8db54bca1428da 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -1,8 +1,7 @@ { buildPackages, runCommand, nettools, bc, bison, flex, perl, gmp, libmpc, mpfr, openssl -, ncurses ? null , libelf , utillinux -, writeTextFile, ubootTools +, writeTextFile }: let diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index e0826aaa9d48f30c421d6df0ff990e4b156a0e38..1a365046f5f3512205142bcb5a1d484d8b72c31c 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, pkgs }: +{ fetchpatch }: rec { bridge_stp_helper = diff --git a/pkgs/os-specific/linux/keyutils/default.nix b/pkgs/os-specific/linux/keyutils/default.nix index 201f170c258097013eca18749ac519c03a4fd4e8..6932afdf478dcd02aebb9a7c2e12f40ed5fde259 100644 --- a/pkgs/os-specific/linux/keyutils/default.nix +++ b/pkgs/os-specific/linux/keyutils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gnumake, file }: +{ stdenv, fetchurl }: stdenv.mkDerivation rec { name = "keyutils-${version}"; diff --git a/pkgs/os-specific/linux/lvm2/default.nix b/pkgs/os-specific/linux/lvm2/default.nix index 0f542b9e38244023f27ce641cd6a53cd37a5a45b..a24024112c959f4126fcbfe3eee8a137e8c10a54 100644 --- a/pkgs/os-specific/linux/lvm2/default.nix +++ b/pkgs/os-specific/linux/lvm2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, systemd, udev, utillinux, coreutils, libuuid +{ stdenv, fetchurl, fetchpatch, pkgconfig, systemd, udev, utillinux, libuuid , thin-provisioning-tools, enable_dmeventd ? false }: let diff --git a/pkgs/os-specific/linux/lxc/default.nix b/pkgs/os-specific/linux/lxc/default.nix index 491f89f3cb44fafe3fa9b1432d68070e9c31e24a..3c158e228f370ca0630eddbe789c8c91ba899bf6 100644 --- a/pkgs/os-specific/linux/lxc/default.nix +++ b/pkgs/os-specific/linux/lxc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, autoreconfHook, pkgconfig, perl, docbook2x +{ stdenv, fetchurl, autoreconfHook, pkgconfig, perl, docbook2x , docbook_xml_dtd_45, python3Packages, pam # Optional Dependencies diff --git a/pkgs/os-specific/linux/mbpfan/default.nix b/pkgs/os-specific/linux/mbpfan/default.nix index a825314683eaa167ee144c2bfffe0e734789db0b..77b0d915edb63097794b868e1eba4428965bf0fd 100644 --- a/pkgs/os-specific/linux/mbpfan/default.nix +++ b/pkgs/os-specific/linux/mbpfan/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, gnugrep, kmod }: +{ stdenv, lib, fetchFromGitHub }: stdenv.mkDerivation rec { name = "mbpfan-${version}"; diff --git a/pkgs/os-specific/linux/microcode/amd.nix b/pkgs/os-specific/linux/microcode/amd.nix index 76a3405299105dec2c06354b34d5800fa424d114..bd4b3d9377f7586324d9ffffeafbbda24fbbdb82 100644 --- a/pkgs/os-specific/linux/microcode/amd.nix +++ b/pkgs/os-specific/linux/microcode/amd.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, firmwareLinuxNonfree, libarchive }: +{ stdenv, firmwareLinuxNonfree, libarchive }: stdenv.mkDerivation rec { name = "amd-ucode-${firmwareLinuxNonfree.version}"; diff --git a/pkgs/os-specific/linux/mkinitcpio-nfs-utils/default.nix b/pkgs/os-specific/linux/mkinitcpio-nfs-utils/default.nix index f4e7ad1f23445945c6b344fc235035f98a363ac6..1b5925a55816aee787ff45d6ec64ae9c937b23dd 100644 --- a/pkgs/os-specific/linux/mkinitcpio-nfs-utils/default.nix +++ b/pkgs/os-specific/linux/mkinitcpio-nfs-utils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, xz }: +{ stdenv, fetchurl }: stdenv.mkDerivation rec { name = "mkinitcpio-nfs-utils-0.3"; diff --git a/pkgs/os-specific/linux/musl/default.nix b/pkgs/os-specific/linux/musl/default.nix index 6bcd2ea692d3b4c45a0769eb3957634aca93168f..d6936ccd650e584fec6cbe1db42e815f542ac442 100644 --- a/pkgs/os-specific/linux/musl/default.nix +++ b/pkgs/os-specific/linux/musl/default.nix @@ -1,5 +1,4 @@ { stdenv, lib, fetchurl -, buildPackages , linuxHeaders ? null , useBSDCompatHeaders ? true }: diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 8eeaf502020dd1778aeb1cf73a6dd3a8f0662204..6fcb28a985c8931f5bd069ab1d315a7106709fdf 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -1,4 +1,4 @@ -{ lib, callPackage, fetchurl, fetchpatch }: +{ lib, callPackage, fetchurl }: let generic = args: callPackage (import ./generic.nix args) { }; diff --git a/pkgs/os-specific/linux/nvidia-x11/generic.nix b/pkgs/os-specific/linux/nvidia-x11/generic.nix index b5435f23e71b4e49f37c98e6528fc417b03dc86b..0ededc08050d76d36f2fb8005f2a12a2e12c6653 100644 --- a/pkgs/os-specific/linux/nvidia-x11/generic.nix +++ b/pkgs/os-specific/linux/nvidia-x11/generic.nix @@ -12,7 +12,7 @@ , patches ? [] }: -{ stdenv, callPackage, pkgsi686Linux, fetchurl, fetchpatch +{ stdenv, callPackage, pkgsi686Linux, fetchurl , kernel ? null, xorg, zlib, perl, nukeReferences , # Whether to build the libraries only (i.e. not the kernel module or # nvidia-settings). Used to support 32-bit binaries on 64-bit diff --git a/pkgs/os-specific/linux/nvidia-x11/persistenced.nix b/pkgs/os-specific/linux/nvidia-x11/persistenced.nix index 21e6cb5d500b45018cdc607384319631eade4b87..474d3a69119c5b345cd02a0e8b49e4e6654fc042 100644 --- a/pkgs/os-specific/linux/nvidia-x11/persistenced.nix +++ b/pkgs/os-specific/linux/nvidia-x11/persistenced.nix @@ -1,6 +1,6 @@ nvidia_x11: sha256: -{ stdenv, lib, fetchurl, m4 }: +{ stdenv, fetchurl, m4 }: stdenv.mkDerivation rec { name = "nvidia-persistenced-${nvidia_x11.version}"; diff --git a/pkgs/os-specific/linux/openvswitch/default.nix b/pkgs/os-specific/linux/openvswitch/default.nix index ac8a1c7de4a818303ce109cf8c624dcded3a6ee6..a2a272f1b3a588c27c1d6786df570dad5fdcfbac 100644 --- a/pkgs/os-specific/linux/openvswitch/default.nix +++ b/pkgs/os-specific/linux/openvswitch/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, makeWrapper, pkgconfig, utillinux, which -, procps, libcap_ng, openssl, python27, iproute , perl +, procps, libcap_ng, openssl, python27 , perl , kernel ? null }: with stdenv.lib; diff --git a/pkgs/os-specific/linux/ply/default.nix b/pkgs/os-specific/linux/ply/default.nix index 8ae731892768f66c260fc8be326c7b1be78a2a29..43f184f384ddd88bd19a396d4f201279d60b644d 100644 --- a/pkgs/os-specific/linux/ply/default.nix +++ b/pkgs/os-specific/linux/ply/default.nix @@ -1,4 +1,4 @@ -{ stdenv, kernel, fetchFromGitHub, autoreconfHook, yacc, flex, bison, p7zip }: +{ stdenv, kernel, fetchFromGitHub, autoreconfHook, yacc, flex, p7zip }: assert kernel != null -> stdenv.lib.versionAtLeast kernel.version "4.0"; diff --git a/pkgs/os-specific/linux/pmount/default.nix b/pkgs/os-specific/linux/pmount/default.nix index 63d159e1884298f181baf6197edf1f8a6b1682f1..1a7a31d978af9969caa5a1ddcbb9b6f1a2517f0c 100644 --- a/pkgs/os-specific/linux/pmount/default.nix +++ b/pkgs/os-specific/linux/pmount/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cryptsetup, dbus, dbus-glib, intltool, ntfs3g, utillinux +{ stdenv, fetchurl, intltool, ntfs3g, utillinux , mediaDir ? "/media/" , lockDir ? "/var/lock/pmount" , whiteList ? "/etc/pmount.allow" diff --git a/pkgs/os-specific/linux/prl-tools/default.nix b/pkgs/os-specific/linux/prl-tools/default.nix index 000d11af87d1c5beece28f8dda607c985a13aee0..be93ff6f2eb9087bdd0ad76694a9398db992212b 100644 --- a/pkgs/os-specific/linux/prl-tools/default.nix +++ b/pkgs/os-specific/linux/prl-tools/default.nix @@ -1,8 +1,7 @@ -{ stdenv, lib, requireFile, makeWrapper, substituteAll, p7zip +{ stdenv, lib, makeWrapper, p7zip , gawk, utillinux, xorg, glib, dbus-glib, zlib , kernel ? null, libsOnly ? false , undmg, fetchurl -, libelf }: assert (!libsOnly) -> kernel != null; diff --git a/pkgs/os-specific/linux/rtl8812au/default.nix b/pkgs/os-specific/linux/rtl8812au/default.nix index 96306a9d5c6a3f425a77116e9da95a6a951aa8bd..879c427b04946532ff7ac95111e30b9f2389cf5a 100644 --- a/pkgs/os-specific/linux/rtl8812au/default.nix +++ b/pkgs/os-specific/linux/rtl8812au/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, kernel, bc }: +{ stdenv, fetchFromGitHub, kernel, bc }: stdenv.mkDerivation rec { name = "rtl8812au-${kernel.version}-${version}"; diff --git a/pkgs/os-specific/linux/rtl8814au/default.nix b/pkgs/os-specific/linux/rtl8814au/default.nix index 99b42fc7400757e7cf0365c2e4bbbad8bb69cf74..c54d45773428c4c363f2d867389e52d40e6687e4 100644 --- a/pkgs/os-specific/linux/rtl8814au/default.nix +++ b/pkgs/os-specific/linux/rtl8814au/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, kernel }: +{ stdenv, fetchFromGitHub, kernel }: stdenv.mkDerivation rec { name = "rtl8814au-${kernel.version}-${version}"; diff --git a/pkgs/os-specific/linux/service-wrapper/default.nix b/pkgs/os-specific/linux/service-wrapper/default.nix index 07a9b06ae76df0c41bf849c8daa3ba051b743d53..64e38b41a5fadb867988da0a3f7e797e8d0c3ccf 100644 --- a/pkgs/os-specific/linux/service-wrapper/default.nix +++ b/pkgs/os-specific/linux/service-wrapper/default.nix @@ -1,4 +1,4 @@ -{ lib, runCommand, substituteAll, fetchurl, systemd, coreutils }: +{ lib, runCommand, substituteAll, coreutils }: let name = "service-wrapper-${version}"; diff --git a/pkgs/os-specific/linux/seturgent/default.nix b/pkgs/os-specific/linux/seturgent/default.nix index 4491bb7bf9367a008d47bef0bfba3843c6bd201a..42b5317d55620064fd8e437bad6e60d1719b6c0d 100644 --- a/pkgs/os-specific/linux/seturgent/default.nix +++ b/pkgs/os-specific/linux/seturgent/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libX11, xproto, xdotool, unzip }: +{ stdenv, fetchurl, libX11, xproto, unzip }: stdenv.mkDerivation { name = "seturgent-2012-08-17"; diff --git a/pkgs/os-specific/linux/sssd/default.nix b/pkgs/os-specific/linux/sssd/default.nix index 99e4b09f46d8b2d024e88dfdf67f98b1c7770be6..0a55608af9682113722f95bd17e0a6c952f4f157 100644 --- a/pkgs/os-specific/linux/sssd/default.nix +++ b/pkgs/os-specific/linux/sssd/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchurl, pkgs, lib, glibc, augeas, dnsutils, c-ares, curl, +{ stdenv, fetchurl, pkgs, glibc, augeas, dnsutils, c-ares, curl, cyrus_sasl, ding-libs, libnl, libunistring, nss, samba, libnfsidmap, doxygen, python, python3, pam, popt, talloc, tdb, tevent, pkgconfig, ldb, openldap, pcre, kerberos, cifs-utils, glib, keyutils, dbus, fakeroot, libxslt, libxml2, - libuuid, docbook_xsl, ldap, systemd, nspr, check, cmocka, uid_wrapper, - nss_wrapper, docbook_xml_dtd_44, ncurses, Po4a, http-parser, jansson + libuuid, ldap, systemd, nspr, check, cmocka, uid_wrapper, + nss_wrapper, ncurses, Po4a, http-parser, jansson , withSudo ? false }: let diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix index 6223c967619d62f6f48d388b089d3f49aefad28e..cdb1910d9c0e08ff92d4359e23bc2547f38d93e8 100644 --- a/pkgs/os-specific/linux/sysdig/default.nix +++ b/pkgs/os-specific/linux/sysdig/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, fetchFromGitHub, cmake, luajit, kernel, zlib, ncurses, perl, jsoncpp, libb64, openssl, curl, jq, gcc, fetchpatch}: +{stdenv, fetchFromGitHub, cmake, luajit, kernel, zlib, ncurses, perl, jsoncpp, libb64, openssl, curl, jq, gcc}: with stdenv.lib; stdenv.mkDerivation rec { diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 307ba9f43fa113039e3b3bb55e9b02a9397e3632..abb6efa29bfb5510dc9ce04998da93088ceeeda4 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchFromGitHub, fetchpatch, pkgconfig, intltool, gperf, libcap, kmod -, zlib, xz, pam, acl, cryptsetup, libuuid, m4, utillinux, libffi +, xz, pam, acl, libuuid, m4, utillinux, libffi , glib, kbd, libxslt, coreutils, libgcrypt, libgpgerror, libidn2, libapparmor , audit, lz4, bzip2, libmicrohttpd, pcre2 , linuxHeaders ? stdenv.cc.libc.linuxHeaders , iptables, gnu-efi -, autoreconfHook, gettext, docbook_xsl, docbook_xml_dtd_42, docbook_xml_dtd_45 +, gettext, docbook_xsl, docbook_xml_dtd_42, docbook_xml_dtd_45 , ninja, meson, python3Packages, glibcLocales , patchelf , getent diff --git a/pkgs/os-specific/linux/tbs/default.nix b/pkgs/os-specific/linux/tbs/default.nix index 291666c0b4502e0e02d7e7ba3cf318b9de00ad72..fec70e8c485eb03ceec963f6aa651e20ca2963d9 100644 --- a/pkgs/os-specific/linux/tbs/default.nix +++ b/pkgs/os-specific/linux/tbs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, kernel, kmod, perl, patchutils, perlPackages, libelf }: +{ stdenv, lib, fetchFromGitHub, kernel, kmod, perl, patchutils, perlPackages }: let media = fetchFromGitHub rec { diff --git a/pkgs/os-specific/linux/thunderbolt/default.nix b/pkgs/os-specific/linux/thunderbolt/default.nix index 9d919aaaa938a918ec85d9f869fe595f668e26b7..ac687de8c9ab5e3c772eebb9178b9c71bb1c0216 100644 --- a/pkgs/os-specific/linux/thunderbolt/default.nix +++ b/pkgs/os-specific/linux/thunderbolt/default.nix @@ -4,7 +4,6 @@ , fetchFromGitHub , pkgconfig , txt2tags -, udev }: stdenv.mkDerivation rec { diff --git a/pkgs/os-specific/linux/trinity/default.nix b/pkgs/os-specific/linux/trinity/default.nix index 4c3a92cd87e64fea3d7b3e3eb5196f47ea3f6f08..46b09dce43797933137d0852594340f965120677 100644 --- a/pkgs/os-specific/linux/trinity/default.nix +++ b/pkgs/os-specific/linux/trinity/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchFromGitHub, linuxHeaders }: +{ stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { name = "trinity-${version}"; diff --git a/pkgs/os-specific/linux/udisks/2-default.nix b/pkgs/os-specific/linux/udisks/2-default.nix index 9f65d0a0316cb6d6564c3a2f2e26e2307ad98643..65c995558a4f323b88564b459f323c8e12022d8f 100644 --- a/pkgs/os-specific/linux/udisks/2-default.nix +++ b/pkgs/os-specific/linux/udisks/2-default.nix @@ -2,7 +2,7 @@ , gnome3, gtk-doc, acl, systemd, glib, libatasmart, polkit, coreutils, bash , expat, libxslt, docbook_xsl, utillinux, mdadm, libgudev, libblockdev, parted , gobjectIntrospection, docbook_xml_dtd_412, docbook_xml_dtd_43 -, libxfs, f2fs-tools, dosfstools, e2fsprogs, btrfs-progs, exfat, nilfs-utils, udftools, ntfs3g +, libxfs, f2fs-tools, dosfstools, e2fsprogs, btrfs-progs, exfat, nilfs-utils, ntfs3g }: let diff --git a/pkgs/os-specific/linux/upower/default.nix b/pkgs/os-specific/linux/upower/default.nix index 1e9101b68afefdcb61db7372020c04e826e87883..c4af0bec9a231a6fc0e74dc2427a9385eb100e56 100644 --- a/pkgs/os-specific/linux/upower/default.nix +++ b/pkgs/os-specific/linux/upower/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, dbus-glib +{ stdenv, fetchurl, pkgconfig, dbus-glib , intltool, libxslt, docbook_xsl, udev, libgudev, libusb1 , useSystemd ? true, systemd, gobjectIntrospection }: diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix index 9ec6c22d32a57993138dfef5d9cb6eac8903cb3e..35f32b0afdd86e96c7031937c932752aec1010fa 100644 --- a/pkgs/os-specific/linux/util-linux/default.nix +++ b/pkgs/os-specific/linux/util-linux/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, zlib, fetchpatch, shadow +{ lib, stdenv, fetchurl, pkgconfig, zlib, shadow , ncurses ? null, perl ? null, pam, systemd, minimal ? false }: let diff --git a/pkgs/os-specific/linux/virtualbox/default.nix b/pkgs/os-specific/linux/virtualbox/default.nix index 72d7690d2f8a7d6632d38eee492859192a46b36d..9e2dee099cec85ef1ea92ff4386472a1a303fbf8 100644 --- a/pkgs/os-specific/linux/virtualbox/default.nix +++ b/pkgs/os-specific/linux/virtualbox/default.nix @@ -1,4 +1,4 @@ -{ stdenv, virtualbox, kernel, strace }: +{ stdenv, virtualbox, kernel }: stdenv.mkDerivation { name = "virtualbox-modules-${virtualbox.version}-${kernel.version}"; diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix index 42982d49ce873a78579f2e87cc1d69d9d0364531..8f9a565ecc772c7d4b52e64b8e5ac9e2140a3f60 100644 --- a/pkgs/os-specific/linux/wireguard/default.nix +++ b/pkgs/os-specific/linux/wireguard/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, kernel, wireguard-tools }: +{ stdenv, kernel, wireguard-tools }: # module requires Linux >= 3.10 https://www.wireguard.io/install/#kernel-requirements assert stdenv.lib.versionAtLeast kernel.version "3.10"; diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix index 7b421aaff3d7c043d57242194f35d01b93238034..add7c6488562ff9769fb9254469032a7fb3cbdca 100644 --- a/pkgs/os-specific/linux/wpa_supplicant/default.nix +++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchpatch, fetchurl, lib, openssl, pkgconfig, libnl +{ stdenv, fetchurl, openssl, pkgconfig, libnl , dbus, readline ? null, pcsclite ? null }: diff --git a/pkgs/os-specific/linux/wpa_supplicant/gui.nix b/pkgs/os-specific/linux/wpa_supplicant/gui.nix index 06a38b291661df837a0bdd3b4be1a1949349dc04..f4ef1b1498f89ff7ba0cab940e945b95c317d16b 100644 --- a/pkgs/os-specific/linux/wpa_supplicant/gui.nix +++ b/pkgs/os-specific/linux/wpa_supplicant/gui.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, qtbase, qmake, inkscape, imagemagick, wpa_supplicant }: +{ stdenv, qtbase, qmake, inkscape, imagemagick, wpa_supplicant }: stdenv.mkDerivation { name = "wpa_gui-${wpa_supplicant.version}"; diff --git a/pkgs/os-specific/linux/xf86-input-wacom/default.nix b/pkgs/os-specific/linux/xf86-input-wacom/default.nix index b5937dff375252fe811c1bebac2a1fadce07bf30..e0e211642af7f3b362275c4dd847b8afb4ccab4e 100644 --- a/pkgs/os-specific/linux/xf86-input-wacom/default.nix +++ b/pkgs/os-specific/linux/xf86-input-wacom/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl -, file, inputproto, libX11, libXext, libXi, libXrandr, libXrender +, inputproto, libX11, libXext, libXi, libXrandr, libXrender , ncurses, pkgconfig, randrproto, xorgserver, xproto, udev, libXinerama, pixman }: stdenv.mkDerivation rec { diff --git a/pkgs/os-specific/windows/pthread-w32/default.nix b/pkgs/os-specific/windows/pthread-w32/default.nix index ef42dadc2973a422770adf6cd65f4eb683badc85..7cd414a97b08621c3d103b70bab0b23e3a4d4ade 100644 --- a/pkgs/os-specific/windows/pthread-w32/default.nix +++ b/pkgs/os-specific/windows/pthread-w32/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, mingw_header, hostPlatform, buildPlatform }: +{ fetchurl, stdenv, hostPlatform, buildPlatform }: # This file is tweaked for cross-compilation only. assert hostPlatform != buildPlatform; diff --git a/pkgs/servers/amqp/rabbitmq-server/default.nix b/pkgs/servers/amqp/rabbitmq-server/default.nix index 4cc187846d0d04f1ee55e7ff79f9aa3a213498dd..22a9aef8edab1bd61738ad3f28f4460b76166e86 100644 --- a/pkgs/servers/amqp/rabbitmq-server/default.nix +++ b/pkgs/servers/amqp/rabbitmq-server/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, runCommand +{ stdenv, fetchurl , erlang, python, libxml2, libxslt, xmlto , docbook_xml_dtd_45, docbook_xsl, zip, unzip, rsync , AppKit, Carbon, Cocoa diff --git a/pkgs/servers/asterisk/default.nix b/pkgs/servers/asterisk/default.nix index b1d60d8c14567814cd227d7bff4c49d76f682809..b2b681bcc8bd910495f5ca93187890dc88438bd5 100644 --- a/pkgs/servers/asterisk/default.nix +++ b/pkgs/servers/asterisk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgs, lib, fetchurl, fetchgit, fetchsvn, fetchpatch, +{ stdenv, lib, fetchurl, fetchsvn, jansson, libxml2, libxslt, ncurses, openssl, sqlite, utillinux, dmidecode, libuuid, newt, lua, speex, diff --git a/pkgs/servers/caddy/default.nix b/pkgs/servers/caddy/default.nix index 548d01c249d2005f6964292710eca4284b3700b1..ee403ab49f0987f4536de58bb315111df481aae9 100644 --- a/pkgs/servers/caddy/default.nix +++ b/pkgs/servers/caddy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, fetchpatch }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "caddy-${version}"; diff --git a/pkgs/servers/computing/storm/default.nix b/pkgs/servers/computing/storm/default.nix index 90c87f8019d09a9eebcd24e2c780ee840ab52427..8335e40de98f53998e5bb3d5c24d17e8e3dc896d 100644 --- a/pkgs/servers/computing/storm/default.nix +++ b/pkgs/servers/computing/storm/default.nix @@ -1,6 +1,6 @@ -{ stdenv, lib, fetchurl, zip, unzip, makeWrapper +{ stdenv, lib, fetchurl, zip, unzip , jzmq, jdk, python -, logsDir ? "", confFile ? "", extraLibraryPaths ? [], extraJars ? [] }: +, confFile ? "", extraLibraryPaths ? [], extraJars ? [] }: stdenv.mkDerivation rec { name = "apache-storm-" + version; diff --git a/pkgs/servers/consul/default.nix b/pkgs/servers/consul/default.nix index d2ad5d0bd8e830aba80f2f982d44cdc9beeff809..5cf192791000c1fff4657b02715d6823df1d0301 100644 --- a/pkgs/servers/consul/default.nix +++ b/pkgs/servers/consul/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, consul-ui, fetchFromGitHub }: +{ stdenv, buildGoPackage, consul-ui, fetchFromGitHub }: buildGoPackage rec { name = "consul-${version}"; diff --git a/pkgs/servers/dict/dictd-wordnet.nix b/pkgs/servers/dict/dictd-wordnet.nix index 13a78d61098b6688a46ba848a696a0eba9ae9068..8a1bb6313ad2d21d480a62afd3287ad1cec9ae32 100644 --- a/pkgs/servers/dict/dictd-wordnet.nix +++ b/pkgs/servers/dict/dictd-wordnet.nix @@ -1,4 +1,4 @@ -{stdenv, fetchsvn, python, wordnet, writeScript}: +{stdenv, python, wordnet, writeScript}: stdenv.mkDerivation rec { version = "542"; diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix index bfa610b57d8ab79ac2ad411f0eac929ad1b45e03..90cbc6cec55db2ecae003397601aaeff966588ec 100644 --- a/pkgs/servers/dns/knot-resolver/default.nix +++ b/pkgs/servers/dns/knot-resolver/default.nix @@ -2,7 +2,7 @@ , knot-dns, luajit, libuv, lmdb, gnutls, nettle , cmocka, systemd, dns-root-data, makeWrapper , extraFeatures ? false /* catch-all if defaults aren't enough */ -, hiredis, libmemcached, luajitPackages +, luajitPackages }: let # un-indented, over the whole file diff --git a/pkgs/servers/dns/nsd/default.nix b/pkgs/servers/dns/nsd/default.nix index 2c82b0bf33a8c69f464cdcbe34ad17cc4270c5f4..1ac1d3948942e57dec629c28c437acb2f124f153 100644 --- a/pkgs/servers/dns/nsd/default.nix +++ b/pkgs/servers/dns/nsd/default.nix @@ -1,4 +1,4 @@ -{ config, stdenv, fetchurl, libevent, openssl +{ stdenv, fetchurl, libevent, openssl , bind8Stats ? false , checking ? false , ipv6 ? true diff --git a/pkgs/servers/etcd/default.nix b/pkgs/servers/etcd/default.nix index 29cb8c2223c06142339784924d29a2dd91d1fac0..d6b71f8160839dffb6e2a8413f06498af73baac5 100644 --- a/pkgs/servers/etcd/default.nix +++ b/pkgs/servers/etcd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, libpcap, buildGoPackage, fetchFromGitHub }: +{ lib, libpcap, buildGoPackage, fetchFromGitHub }: with lib; diff --git a/pkgs/servers/exhibitor/default.nix b/pkgs/servers/exhibitor/default.nix index c1234606291daa261afb3c470a03289d90ce3f50..5e2381ada1d10ed2b9a5c7457ee97cec5575c633 100644 --- a/pkgs/servers/exhibitor/default.nix +++ b/pkgs/servers/exhibitor/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, buildMaven, maven, jdk, makeWrapper, stdenv, ... }: +{ fetchFromGitHub, maven, jdk, makeWrapper, stdenv, ... }: stdenv.mkDerivation rec { name = "exhibitor-${version}"; version = "1.5.6"; diff --git a/pkgs/servers/firebird/default.nix b/pkgs/servers/firebird/default.nix index 24ed1dffd4d8719a66f1a6a6715d59596789dc64..caf7d8360f076ddaaa2818432e7181d034c4405e 100644 --- a/pkgs/servers/firebird/default.nix +++ b/pkgs/servers/firebird/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, libedit, ncurses, automake, autoconf, libtool +{stdenv, fetchurl, libedit, automake, autoconf, libtool , # icu = null: use icu which comes with firebird diff --git a/pkgs/servers/gotty/default.nix b/pkgs/servers/gotty/default.nix index 89f1821981fcb97e171c0cbb1fd5b645300c991b..ebade244bdf7e4ce6fb135278ab397c868d8e9c2 100644 --- a/pkgs/servers/gotty/default.nix +++ b/pkgs/servers/gotty/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "gotty-${version}"; diff --git a/pkgs/servers/h2/default.nix b/pkgs/servers/h2/default.nix index fc9d4c0508edb5d8f165d2f6e89e3e1c12799768..c4be1f3c3b34a90c801c70db7bd5cb7a6cd399e0 100644 --- a/pkgs/servers/h2/default.nix +++ b/pkgs/servers/h2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, jre, makeWrapper, unzip }: +{ stdenv, fetchzip, jre, makeWrapper }: stdenv.mkDerivation rec { name = "h2-${version}"; diff --git a/pkgs/servers/hbase/default.nix b/pkgs/servers/hbase/default.nix index dcd81fa44b0558e33a650570c62eabe8dcdbe319..6a33ac638d215f3d4e9ee04d8a0514d48f488171 100644 --- a/pkgs/servers/hbase/default.nix +++ b/pkgs/servers/hbase/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, jre, makeWrapper }: +{ stdenv, fetchurl, makeWrapper }: stdenv.mkDerivation rec { name = "hbase-${version}"; version = "0.98.24"; diff --git a/pkgs/servers/home-assistant/appdaemon.nix b/pkgs/servers/home-assistant/appdaemon.nix index 493131795034e2054cdcbcef28f4f80840f795b1..d921eee49cfcc9adfe148d03957024c853d2fd2a 100644 --- a/pkgs/servers/home-assistant/appdaemon.nix +++ b/pkgs/servers/home-assistant/appdaemon.nix @@ -1,4 +1,4 @@ -{ lib, python3, fetchpatch }: +{ lib, python3 }: let python = python3.override { diff --git a/pkgs/servers/http/couchdb/default.nix b/pkgs/servers/http/couchdb/default.nix index 43334819dc5643a0d07a0742da04222a28e6e66e..5a873c7e84b1c289087376fc67c1585576887bf1 100644 --- a/pkgs/servers/http/couchdb/default.nix +++ b/pkgs/servers/http/couchdb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, erlang, icu, openssl, spidermonkey, curl, help2man, python +{ stdenv, fetchurl, erlang, icu, openssl, spidermonkey, curl, help2man , sphinx, which, file, pkgconfig, getopt }: stdenv.mkDerivation rec { diff --git a/pkgs/servers/http/jboss/jdbc/mysql/default.nix b/pkgs/servers/http/jboss/jdbc/mysql/default.nix index dbc5c73414cd5297883e959323f46c36a74d2caf..fd2dec44c7f396518dc902488b904b5279242cf6 100644 --- a/pkgs/servers/http/jboss/jdbc/mysql/default.nix +++ b/pkgs/servers/http/jboss/jdbc/mysql/default.nix @@ -1,4 +1,4 @@ -{ stdenv, jboss, mysql_jdbc }: +{ stdenv, mysql_jdbc }: stdenv.mkDerivation { name = "jboss-mysql-jdbc"; diff --git a/pkgs/servers/http/nginx/generic.nix b/pkgs/servers/http/nginx/generic.nix index 448695930039716f9ca7425c648a1b3328377337..643e7ed719a478c9410dc777e4e5d8fa1c4ebf59 100644 --- a/pkgs/servers/http/nginx/generic.nix +++ b/pkgs/servers/http/nginx/generic.nix @@ -1,10 +1,9 @@ -{ stdenv, fetchurl, fetchFromGitHub, openssl, zlib, pcre, libxml2, libxslt, expat +{ stdenv, fetchurl, openssl, zlib, pcre, libxml2, libxslt , gd, geoip , withDebug ? false , withStream ? true , withMail ? false , modules ? [] -, hardening ? true , version, sha256, ... }: diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index 1f6fcc319435b9e4a54e00b241c37de6be215499..0910a6d0584495ef4aa241c804dfcd0e77da21f6 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, fetchurl, lib, pkgs }: +{ fetchFromGitHub, lib, pkgs }: { brotli = { diff --git a/pkgs/servers/http/nix-binary-cache/default.nix b/pkgs/servers/http/nix-binary-cache/default.nix index 33801c8cd326402180233fcae6d4d8e8966e38f7..479c9e41aa91de20474fc6a7b1378ee2a6c48e41 100644 --- a/pkgs/servers/http/nix-binary-cache/default.nix +++ b/pkgs/servers/http/nix-binary-cache/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl +{stdenv , coreutils, findutils, nix, xz, bzip2, gnused, gnugrep, openssl , lighttpd, iproute }: stdenv.mkDerivation rec { diff --git a/pkgs/servers/http/openresty/default.nix b/pkgs/servers/http/openresty/default.nix index 1155bac75703507668cc4987a5af4f8f999f84d4..1fe48e84fac75581c7745901c5e7fe30ec3ed13d 100644 --- a/pkgs/servers/http/openresty/default.nix +++ b/pkgs/servers/http/openresty/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchgit, openssl, zlib, pcre, postgresql, libxml2, libxslt, +{ stdenv, fetchurl, openssl, zlib, pcre, postgresql, libxml2, libxslt, gd, geoip, perl }: with stdenv.lib; diff --git a/pkgs/servers/interlock/default.nix b/pkgs/servers/interlock/default.nix index 0df055f9690f9fa223d8f4f4897e162781612f7d..f57c94cd108492eb3d4ffd53645d233aea8e13dc 100644 --- a/pkgs/servers/interlock/default.nix +++ b/pkgs/servers/interlock/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, sudo, coreutils, systemd, cryptsetup +{ sudo, coreutils, systemd, cryptsetup , mount, umount , buildGoPackage, fetchFromGitHub }: diff --git a/pkgs/servers/isso/default.nix b/pkgs/servers/isso/default.nix index 5aafe55512beb2dbf13f36959c5a8c806dd65fcc..9e8a9dc9ec60047c05086cb8d1b2daebf28291f0 100644 --- a/pkgs/servers/isso/default.nix +++ b/pkgs/servers/isso/default.nix @@ -1,4 +1,4 @@ -{ stdenv, python2, fetchurl, fetchFromGitHub }: +{ stdenv, python2, fetchFromGitHub }: let python = python2.override { packageOverrides = self: super: { diff --git a/pkgs/servers/ldap/389/default.nix b/pkgs/servers/ldap/389/default.nix index 6826df5f6e86933e3c8e15d968bcd10ea1d5b75a..4276a51715a6cd3dd0c6a2ae4c77fba77d0c58e2 100644 --- a/pkgs/servers/ldap/389/default.nix +++ b/pkgs/servers/ldap/389/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, perl, pam, nspr, nss, openldap +{ stdenv, fetchurl, pkgconfig, perl, pam, nspr, nss, openldap , db, cyrus_sasl, svrcore, icu, net_snmp, kerberos, pcre, perlPackages }: let diff --git a/pkgs/servers/mail/dovecot/default.nix b/pkgs/servers/mail/dovecot/default.nix index e676246a08ec24b5cea3d704c99a4ec9988c42b6..5a9d8e61b1fee172f29b257a47c9fdad6086717e 100644 --- a/pkgs/servers/mail/dovecot/default.nix +++ b/pkgs/servers/mail/dovecot/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, fetchpatch, perl, pkgconfig, systemd, openssl +{ stdenv, lib, fetchurl, perl, pkgconfig, systemd, openssl , bzip2, zlib, lz4, inotify-tools, pam, libcap , clucene_core_2, icu, openldap, libsodium, libstemmer # Auth modules diff --git a/pkgs/servers/mail/mlmmj/default.nix b/pkgs/servers/mail/mlmmj/default.nix index f11400c190af90ea8b916cc72f4b031f815dcf28..98b270ad7d41317565a1f0d666349103fcf3943b 100644 --- a/pkgs/servers/mail/mlmmj/default.nix +++ b/pkgs/servers/mail/mlmmj/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig }: +{ stdenv, fetchurl }: stdenv.mkDerivation rec { diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 302aa8d55932fc87b22009dbb3a87da1cf5372e8..8c86cc6577a7a1a30c941a71e46f5ef705d1102a 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -1,4 +1,4 @@ -{ lib, pkgs, stdenv, pythonPackages, fetchurl, fetchFromGitHub, fetchpatch }: +{ stdenv, pythonPackages, fetchurl, fetchFromGitHub }: let matrix-angular-sdk = pythonPackages.buildPythonPackage rec { name = "matrix-angular-sdk-${version}"; diff --git a/pkgs/servers/mesos-dns/default.nix b/pkgs/servers/mesos-dns/default.nix index 53c87745e67ac8b1afdefee5af4a3d5074d4c3ae..fe1f1c6760d8a430f901d1e840961d715574a6e3 100644 --- a/pkgs/servers/mesos-dns/default.nix +++ b/pkgs/servers/mesos-dns/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "mesos-dns-${version}"; diff --git a/pkgs/servers/mirrorbits/default.nix b/pkgs/servers/mirrorbits/default.nix index 98ac1534cf8a87d4480f7cf91cf0e95e3f9e5352..10c8811c548faf9072b2dbd021d3c84789fc3855 100644 --- a/pkgs/servers/mirrorbits/default.nix +++ b/pkgs/servers/mirrorbits/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub, fetchpatch +{ lib, buildGoPackage, fetchFromGitHub, fetchpatch , pkgconfig, zlib, geoip }: buildGoPackage rec { diff --git a/pkgs/servers/monitoring/cadvisor/default.nix b/pkgs/servers/monitoring/cadvisor/default.nix index 0480d056c592a6e582e70c156972e427e5208680..0e256d907dc269ac2da30b21dc5a54c8377e74a0 100644 --- a/pkgs/servers/monitoring/cadvisor/default.nix +++ b/pkgs/servers/monitoring/cadvisor/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, go, fetchFromGitHub }: +{ stdenv, go, fetchFromGitHub }: stdenv.mkDerivation rec { name = "cadvisor-${version}"; diff --git a/pkgs/servers/monitoring/consul-alerts/default.nix b/pkgs/servers/monitoring/consul-alerts/default.nix index 646a7856788b0504f08b5b0860bf487802b493a7..a888549bb6aa99918fc3f229fa95ce816651f9ab 100644 --- a/pkgs/servers/monitoring/consul-alerts/default.nix +++ b/pkgs/servers/monitoring/consul-alerts/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "consul-alerts-${version}"; diff --git a/pkgs/servers/monitoring/fusion-inventory/default.nix b/pkgs/servers/monitoring/fusion-inventory/default.nix index 34b4e87bf65c6dc8f2f0faa2d41f400e4e95ab49..96eaa5ef0cc428e98dc16dc8fbc0a420a6511c16 100644 --- a/pkgs/servers/monitoring/fusion-inventory/default.nix +++ b/pkgs/servers/monitoring/fusion-inventory/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, buildPerlPackage, perlPackages, gnused, nix, dmidecode, pciutils, usbutils, iproute, nettools +{ stdenv, lib, fetchurl, buildPerlPackage, perlPackages, nix, dmidecode, pciutils, usbutils, iproute, nettools , fetchFromGitHub, makeWrapper }: diff --git a/pkgs/servers/monitoring/kapacitor/default.nix b/pkgs/servers/monitoring/kapacitor/default.nix index 409801e8b7dc1e03912788480b4f26d4e7703398..0e21069bbb0ea6ece74a6fec5ed6b200c4227b3f 100644 --- a/pkgs/servers/monitoring/kapacitor/default.nix +++ b/pkgs/servers/monitoring/kapacitor/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, buildGoPackage }: +{ lib, fetchFromGitHub, buildGoPackage }: buildGoPackage rec { name = "kapacitor-${version}"; diff --git a/pkgs/servers/monitoring/lcdproc/default.nix b/pkgs/servers/monitoring/lcdproc/default.nix index 859849f7b2c71b4aeeae38c139c1dbe5ac76200d..af5f2880a0f89784ad5c7e84cd2019657bfe186c 100644 --- a/pkgs/servers/monitoring/lcdproc/default.nix +++ b/pkgs/servers/monitoring/lcdproc/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, autoreconfHook, makeWrapper, pkgconfig -, doxygen, freetype, libX11, libftdi, libftdi1, libusb, libusb1, ncurses, perl }: +, doxygen, freetype, libX11, libftdi, libusb, libusb1, ncurses, perl }: stdenv.mkDerivation rec { name = "lcdproc-${version}"; diff --git a/pkgs/servers/monitoring/plugins/labs_consol_de.nix b/pkgs/servers/monitoring/plugins/labs_consol_de.nix index 957aee43691aac2a4c18e8e4d86a55ac3d35ec34..5d93f4c53496322a2e6a1237cab00f0f7d03116f 100644 --- a/pkgs/servers/monitoring/plugins/labs_consol_de.nix +++ b/pkgs/servers/monitoring/plugins/labs_consol_de.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchurl, buildPerlPackage, autoreconfHook, makeWrapper +{ stdenv, fetchFromGitHub, fetchurl, autoreconfHook, makeWrapper , perl, DBDsybase, NetSNMP, coreutils, gnused, gnugrep }: let diff --git a/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix b/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix index 798f31c3458e12665e3d7365ab59aee23a662026..1f342adebaa07edfb29f1a75802c52ad03c765ba 100644 --- a/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "blackbox_exporter-${version}"; diff --git a/pkgs/servers/monitoring/prometheus/collectd-exporter.nix b/pkgs/servers/monitoring/prometheus/collectd-exporter.nix index 2bd9b6af0748502c03c05a2a73fafb78a495e910..0d6fbac60e5d88c3cb0f4147109961818cfff087 100644 --- a/pkgs/servers/monitoring/prometheus/collectd-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/collectd-exporter.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "collectd-exporter-${version}"; diff --git a/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix b/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix index 2e7a4932de6250607d3beb4b2acbb9bee275f25d..1271b3d40e141d872c72190afefcabc6b81da77f 100644 --- a/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "fritzbox-exporter-${version}"; diff --git a/pkgs/servers/monitoring/prometheus/json-exporter.nix b/pkgs/servers/monitoring/prometheus/json-exporter.nix index ea17c0b18b23dccdc085f4177be5023ff9e2a8c4..ffba472bdc335959993cd70b2533c86e551315dc 100644 --- a/pkgs/servers/monitoring/prometheus/json-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/json-exporter.nix @@ -1,5 +1,5 @@ # This file was generated by go2nix. -{ stdenv, buildGoPackage, fetchFromGitHub, lib }: +{ buildGoPackage, fetchFromGitHub, lib }: buildGoPackage rec { name = "prometheus-json-exporter-${version}"; diff --git a/pkgs/servers/monitoring/prometheus/mesos-exporter.nix b/pkgs/servers/monitoring/prometheus/mesos-exporter.nix index 42ff2496df1209d334ee9d4989a7055783cb377e..ade9bb87d993399b26f007fc91c964f2e696d4d2 100644 --- a/pkgs/servers/monitoring/prometheus/mesos-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/mesos-exporter.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "mesos_exporter-${version}"; diff --git a/pkgs/servers/monitoring/prometheus/minio-exporter/default.nix b/pkgs/servers/monitoring/prometheus/minio-exporter/default.nix index 59314f1f282acc733637b2a80e1ff2bdcc4af7c5..8b6c54d41f91b56dd6662b1b9fb6ec8882c77547 100644 --- a/pkgs/servers/monitoring/prometheus/minio-exporter/default.nix +++ b/pkgs/servers/monitoring/prometheus/minio-exporter/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub, fetchpatch }: +{ stdenv, buildGoPackage, fetchFromGitHub, fetchpatch }: buildGoPackage rec { name = "minio-exporter-${version}"; diff --git a/pkgs/servers/monitoring/prometheus/prom2json.nix b/pkgs/servers/monitoring/prometheus/prom2json.nix index 788fe8633967cc5826841b5e06f0d173e961a294..5e4ebb581400b9a559b279b8d8d1b9cfc83f03c5 100644 --- a/pkgs/servers/monitoring/prometheus/prom2json.nix +++ b/pkgs/servers/monitoring/prometheus/prom2json.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "prom2json-${version}"; diff --git a/pkgs/servers/monitoring/prometheus/snmp-exporter.nix b/pkgs/servers/monitoring/prometheus/snmp-exporter.nix index 9692354ad8a8b36c906bb7f53f032c13342f5bfe..29454dd44d2b4dfb56519b3dfa7d68c72e9eef81 100644 --- a/pkgs/servers/monitoring/prometheus/snmp-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/snmp-exporter.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, go, buildGoPackage, fetchFromGitHub, net_snmp }: +{ stdenv, buildGoPackage, fetchFromGitHub, net_snmp }: buildGoPackage rec { name = "snmp_exporter-${version}"; diff --git a/pkgs/servers/monitoring/prometheus/statsd-bridge.nix b/pkgs/servers/monitoring/prometheus/statsd-bridge.nix index f4d9f5a85037b9a6e0f7ac348a5c18d83c89f82c..e5480e020372171214a0561b61e9dd9b687b29b5 100644 --- a/pkgs/servers/monitoring/prometheus/statsd-bridge.nix +++ b/pkgs/servers/monitoring/prometheus/statsd-bridge.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "statsd_exporter-${version}"; diff --git a/pkgs/servers/monitoring/prometheus/surfboard-exporter.nix b/pkgs/servers/monitoring/prometheus/surfboard-exporter.nix index 13e17d0b0192bbb129878c936b5ed4a11abe1d3e..0c5cc62676594893964d2a9c54ad818d27babca5 100644 --- a/pkgs/servers/monitoring/prometheus/surfboard-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/surfboard-exporter.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "surfboard_exporter-${version}"; diff --git a/pkgs/servers/monitoring/prometheus/unifi-exporter/default.nix b/pkgs/servers/monitoring/prometheus/unifi-exporter/default.nix index 44a670b95ab4cb6d07155b82aadf1f33eaac5711..18fa3f98db234ba610232993fb8d1acfbe23028e 100644 --- a/pkgs/servers/monitoring/prometheus/unifi-exporter/default.nix +++ b/pkgs/servers/monitoring/prometheus/unifi-exporter/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "unifi-exporter-${version}"; diff --git a/pkgs/servers/monitoring/prometheus/varnish-exporter.nix b/pkgs/servers/monitoring/prometheus/varnish-exporter.nix index d83aa5b46658b5780ab176e252947c05861c63a3..b23270cd8c1e1c88ae6f85c64750ea94ee122f69 100644 --- a/pkgs/servers/monitoring/prometheus/varnish-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/varnish-exporter.nix @@ -1,5 +1,5 @@ # This file was generated by go2nix. -{ stdenv, lib, buildGoPackage, fetchFromGitHub, makeWrapper, varnish }: +{ lib, buildGoPackage, fetchFromGitHub, makeWrapper, varnish }: buildGoPackage rec { name = "prometheus_varnish_exporter-${version}"; diff --git a/pkgs/servers/monitoring/zabbix/2.0.nix b/pkgs/servers/monitoring/zabbix/2.0.nix index d3816cf1ecdb28c838ae17e0d988aca20efb6dc7..9f1a2baeb9ac8873cb571faa7e80e15f22deaec6 100644 --- a/pkgs/servers/monitoring/zabbix/2.0.nix +++ b/pkgs/servers/monitoring/zabbix/2.0.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, postgresql, curl, openssl, zlib, gettext +{ stdenv, fetchurl, pkgconfig, postgresql, curl, openssl, zlib , enableJabber ? false, minmay ? null }: assert enableJabber -> minmay != null; diff --git a/pkgs/servers/monitoring/zabbix/2.2.nix b/pkgs/servers/monitoring/zabbix/2.2.nix index bc5556d4bc00c04fe43360b4c098444616d2c54d..bf3849e6524b0ba93d3c2939ea9ffe21794ef530 100644 --- a/pkgs/servers/monitoring/zabbix/2.2.nix +++ b/pkgs/servers/monitoring/zabbix/2.2.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, postgresql, curl, openssl, zlib, gettext +{ stdenv, fetchurl, pkgconfig, postgresql, curl, openssl, zlib , net_snmp , libssh2, openldap , enableJabber ? false, minmay ? null , enableSnmp ? false diff --git a/pkgs/servers/monitoring/zabbix/3.4.nix b/pkgs/servers/monitoring/zabbix/3.4.nix index 69b3577720f5cba3b5b6e5c81fd6a96c2255b238..047ce0a5130e955edc73d517406dc93edf1644c6 100644 --- a/pkgs/servers/monitoring/zabbix/3.4.nix +++ b/pkgs/servers/monitoring/zabbix/3.4.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, postgresql, curl, openssl, zlib, pcre, libevent, libiconv }: +{ stdenv, fetchurl, pcre, libiconv }: let diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index 35637e7f73aca12868dca46ad7b76fed3ad8273d..f8523e8607d3570c152d307871c36fb4f152b98b 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, pkgconfig, glib, systemd, boost, darwin +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, glib, systemd, boost, darwin , alsaSupport ? true, alsaLib , avahiSupport ? true, avahi, dbus , flacSupport ? true, flac diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index 0121d748129ba07a3a989c9bbe15d5861f0ad767..3d6a1aa9c6fa4269209b2cdd9552fb188e048b1e 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch }: +{ stdenv, fetchurl }: stdenv.mkDerivation rec { name= "nextcloud-${version}"; diff --git a/pkgs/servers/nosql/arangodb/default.nix b/pkgs/servers/nosql/arangodb/default.nix index 9b21deecf4b300cdf40c72b8af89c30b90a5fb0d..f3d3fed23a4175c91d60b3469bfaefff23783395 100644 --- a/pkgs/servers/nosql/arangodb/default.nix +++ b/pkgs/servers/nosql/arangodb/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub -, openssl, zlib, python2Packages, readline, cmake, python }: +, openssl, zlib, readline, cmake, python }: let in stdenv.mkDerivation rec { diff --git a/pkgs/servers/nosql/eventstore/default.nix b/pkgs/servers/nosql/eventstore/default.nix index f97a3a5c1842dfcb7a5437789c79a3799b7ecf31..1d3240fae716d23a416b64ac45f4a5e34fabf3c1 100644 --- a/pkgs/servers/nosql/eventstore/default.nix +++ b/pkgs/servers/nosql/eventstore/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, git, mono, v8 }: +{ stdenv, fetchFromGitHub, git, mono, v8 }: # There are some similarities with the pinta derivation. We should # have a helper to make it easy to package these Mono apps. diff --git a/pkgs/servers/nosql/mongodb/default.nix b/pkgs/servers/nosql/mongodb/default.nix index b9e850e8dfd4df3833d207c001355384db10f1d0..c62ade1a20bbc3976c6adc1d06ae19b3d32b6622 100644 --- a/pkgs/servers/nosql/mongodb/default.nix +++ b/pkgs/servers/nosql/mongodb/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchpatch, scons, boost, gperftools, pcre-cpp, snappy -, zlib, libyamlcpp, sasl, openssl, libpcap, wiredtiger, Security +, zlib, libyamlcpp, sasl, openssl, libpcap, Security }: # Note: diff --git a/pkgs/servers/nosql/rethinkdb/default.nix b/pkgs/servers/nosql/rethinkdb/default.nix index e935b5d098797828605cb3f9c1b4d61d4e63f300..d6ee407e3418c5d228bb4157923c3203be319d5f 100644 --- a/pkgs/servers/nosql/rethinkdb/default.nix +++ b/pkgs/servers/nosql/rethinkdb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, which, m4, python +{ stdenv, fetchurl, which, m4 , protobuf, boost, zlib, curl, openssl, icu, jemalloc, libtool , python2Packages, makeWrapper }: diff --git a/pkgs/servers/nosql/riak-cs/2.1.1.nix b/pkgs/servers/nosql/riak-cs/2.1.1.nix index 9075756c16214a1d28666a54ef639c79069e9d0d..cf807e70596dcef92352e3f4bcebae707a7044f1 100644 --- a/pkgs/servers/nosql/riak-cs/2.1.1.nix +++ b/pkgs/servers/nosql/riak-cs/2.1.1.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, unzip, erlang, git, wget, which, pam, coreutils, riak +{ stdenv, lib, fetchurl, unzip, erlang, git, wget, which, pam , Carbon ? null, Cocoa ? null }: stdenv.mkDerivation rec { diff --git a/pkgs/servers/nosql/riak-cs/stanchion.nix b/pkgs/servers/nosql/riak-cs/stanchion.nix index a064049072c964b2c3187319e507eb8e40eb6fde..1524ca207009cfdb051aee2dcad499c25a14f778 100644 --- a/pkgs/servers/nosql/riak-cs/stanchion.nix +++ b/pkgs/servers/nosql/riak-cs/stanchion.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, unzip, erlang, git, wget, which, pam, coreutils, riak +{ stdenv, lib, fetchurl, unzip, erlang, git, wget, which, pam , Carbon ? null, Cocoa ? null }: stdenv.mkDerivation rec { diff --git a/pkgs/servers/nosql/riak/2.2.0.nix b/pkgs/servers/nosql/riak/2.2.0.nix index e4c9b90ab1455932bd2ae229121eeb305712c89d..b041aa9f35fc7f78fcf27ab37bacfeaa2f7aa8e3 100644 --- a/pkgs/servers/nosql/riak/2.2.0.nix +++ b/pkgs/servers/nosql/riak/2.2.0.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, unzip, erlang, which, pam, coreutils }: +{ stdenv, lib, fetchurl, unzip, erlang, which, pam }: let solrName = "solr-4.10.4-yz-2.tgz"; diff --git a/pkgs/servers/nsq/default.nix b/pkgs/servers/nsq/default.nix index fa78c876c1ec319393534b183e33d0838d483cd7..d48587c924e78f086833184450fa66e6545c41f6 100644 --- a/pkgs/servers/nsq/default.nix +++ b/pkgs/servers/nsq/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "nsq-${version}"; diff --git a/pkgs/servers/openafs/1.6/default.nix b/pkgs/servers/openafs/1.6/default.nix index 3f92299c2a0a2a904eb0ac0c191a5a75ef228d80..22f09994ebf0d97fd82a056f0122b33bd65ed67b 100644 --- a/pkgs/servers/openafs/1.6/default.nix +++ b/pkgs/servers/openafs/1.6/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchgit, which, autoconf, automake, flex, yacc +{ stdenv, fetchurl, which, autoconf, automake, flex, yacc , glibc, perl, kerberos, libxslt, docbook_xsl, docbook_xml_dtd_43 , ncurses # Extra ncurses utilities. Only needed for debugging. , tsmbac ? null # Tivoli Storage Manager Backup Client from IBM diff --git a/pkgs/servers/openafs/1.8/default.nix b/pkgs/servers/openafs/1.8/default.nix index 59c15839b39375cdc8fb8e2d532ad646bc91f16d..fc6b1bc2426b98ef8beae41928a5ab49fbf59601 100644 --- a/pkgs/servers/openafs/1.8/default.nix +++ b/pkgs/servers/openafs/1.8/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchgit, which, autoconf, automake, flex, yacc +{ stdenv, fetchurl, which, autoconf, automake, flex, yacc , glibc, perl, kerberos, libxslt, docbook_xsl, docbook_xml_dtd_43 , libtool_2, removeReferencesTo , ncurses # Extra ncurses utilities. Only needed for debugging. diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix index ed4a8889c67dca47284e19f293f449da248aeb5c..73af65ef2561495b87a8d5a160ca707df317e2b9 100644 --- a/pkgs/servers/pulseaudio/default.nix +++ b/pkgs/servers/pulseaudio/default.nix @@ -5,9 +5,6 @@ , sbc, bluez5, udev, openssl, fftwFloat , speexdsp, systemd, webrtc-audio-processing, gconf ? null -# Database selection -, tdb ? null, gdbm ? null - , x11Support ? false , useSystemd ? true diff --git a/pkgs/servers/rippled/data-api.nix b/pkgs/servers/rippled/data-api.nix index 230e0aee2181df8d37983eac28fd42f668c1b4cf..04d520b412c142278fc3a9b9f68e4cb847538896 100644 --- a/pkgs/servers/rippled/data-api.nix +++ b/pkgs/servers/rippled/data-api.nix @@ -1,4 +1,4 @@ -{ lib, fetchgit, fetchurl, nodePackages }: +{ lib, fetchgit, nodePackages }: with lib; diff --git a/pkgs/servers/rippled/package.nix b/pkgs/servers/rippled/package.nix index 6f5bb1d3a71fe21d8741b704da4bd865ddea1e32..87f4326c48c34ea3c1dccb8478c16890a7c1e7e0 100644 --- a/pkgs/servers/rippled/package.nix +++ b/pkgs/servers/rippled/package.nix @@ -1,4 +1,4 @@ -{ self, fetchurl, fetchgit ? null, lib }: +{ self, fetchurl ? null }: { by-spec."abbrev"."1" = diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix index 0ff7f88911f2695813ddc9b8463c69e570d0f100..eec80cb66bcc27162d311ea3ecad8bc609de53be 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -1,9 +1,9 @@ { lib, stdenv, fetchurl, python, pkgconfig, perl, libxslt, docbook_xsl , fetchpatch -, docbook_xml_dtd_42, docbook_xml_dtd_45, readline, talloc +, docbook_xml_dtd_42, readline, talloc , popt, iniparser, libbsd, libarchive, libiconv, gettext , krb5Full, zlib, openldap, cups, pam, avahi, acl, libaio, fam, libceph, glusterfs -, gnutls, libgcrypt, libgpgerror +, gnutls , ncurses, libunwind, libibverbs, librdmacm, systemd , enableInfiniband ? false diff --git a/pkgs/servers/samba/master.nix b/pkgs/servers/samba/master.nix index df1f9feb4de5b44a8e078d4e03f35ffed984d68c..21038a0f2183e096f327e1a0288ef74f77bf5da1 100644 --- a/pkgs/servers/samba/master.nix +++ b/pkgs/servers/samba/master.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub +{ fetchFromGitHub , samba4 , nettle } : diff --git a/pkgs/servers/search/elasticsearch/plugins.nix b/pkgs/servers/search/elasticsearch/plugins.nix index ade2ea94453456231165ae5d9399d7b38bd365eb..b93d8c2203d7cbe078f653d70387ba0ca70c52a2 100644 --- a/pkgs/servers/search/elasticsearch/plugins.nix +++ b/pkgs/servers/search/elasticsearch/plugins.nix @@ -1,4 +1,4 @@ -{ pkgs, stdenv, fetchurl, fetchFromGitHub, unzip, elasticsearch }: +{ pkgs, stdenv, fetchurl, unzip, elasticsearch }: with pkgs.lib; diff --git a/pkgs/servers/skydns/default.nix b/pkgs/servers/skydns/default.nix index ccb174371e0ce962d823405f765a0a8e534d068a..7bfea23c78b5af7f7540e3d3de682c79fa6a7f03 100644 --- a/pkgs/servers/skydns/default.nix +++ b/pkgs/servers/skydns/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "skydns-${version}"; diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 126a8cf0690e619b917cc7d3c884ce17de27ae2d..121e42f7a978cdd7def308c67264d973527baa6c 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, cmake, pkgconfig, ncurses, zlib, xz, lzo, lz4, bzip2, snappy , libiconv, openssl, pcre, boost, judy, bison, libxml2 -, libaio, libevent, groff, jemalloc, cracklib, systemd, numactl, perl +, libaio, libevent, jemalloc, cracklib, systemd, numactl, perl , fixDarwinDylibNames, cctools, CoreServices , asio, buildEnv, check, scons }: diff --git a/pkgs/servers/x11/xquartz/default.nix b/pkgs/servers/x11/xquartz/default.nix index 9c133f9d5d99278661fa604309361c58286be09f..3fc7aaea9c9352f1865b12581631e5066893b225 100644 --- a/pkgs/servers/x11/xquartz/default.nix +++ b/pkgs/servers/x11/xquartz/default.nix @@ -1,5 +1,5 @@ -{ stdenv, lib, buildEnv, makeFontsConf, gnused, writeScript, xorg, bashInteractive, substituteAll, xterm, makeWrapper, ruby -, openssl, quartz-wm, fontconfig, xlsfonts, xfontsel +{ stdenv, lib, buildEnv, makeFontsConf, gnused, writeScript, xorg, bashInteractive, xterm, makeWrapper, ruby +, quartz-wm, fontconfig, xlsfonts, xfontsel , ttf_bitstream_vera, freefont_ttf, liberation_ttf , shell ? "${bashInteractive}/bin/bash" }: diff --git a/pkgs/shells/bash/4.4.nix b/pkgs/shells/bash/4.4.nix index 72ce29bf3f2baa6626f82d6519609bde4d1fddf3..ab89dc28828b8d9567f39bd751fbedf6d87b3891 100644 --- a/pkgs/shells/bash/4.4.nix +++ b/pkgs/shells/bash/4.4.nix @@ -5,7 +5,6 @@ # patch for cygwin requires readline support , interactive ? stdenv.isCygwin, readline70 ? null , withDocs ? false, texinfo ? null -, self }: with stdenv.lib; diff --git a/pkgs/shells/elvish/default.nix b/pkgs/shells/elvish/default.nix index 086fca480bb3eb49c589cb05aa8e8bf54d91f33f..5a7128fa6463f1581b4b6fa2fa179e78e0d3d3bd 100644 --- a/pkgs/shells/elvish/default.nix +++ b/pkgs/shells/elvish/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "elvish-${version}"; diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix index d6c107e995326782fa48900dcd58ba01b6b6a3f7..2ef0480942c4b77c08602aa40dc9d1a1d01a00bf 100644 --- a/pkgs/shells/fish/default.nix +++ b/pkgs/shells/fish/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, coreutils, utillinux, - nettools, kbd, bc, which, gnused, gnugrep, + nettools, bc, which, gnused, gnugrep, groff, man-db, getent, libiconv, pcre2, gettext, ncurses, python3 diff --git a/pkgs/shells/oh/default.nix b/pkgs/shells/oh/default.nix index c118cea117290942dae2a6b926a71db57fb12466..2e200a74f7b489413cce0dc4c3a0538b9e724093 100644 --- a/pkgs/shells/oh/default.nix +++ b/pkgs/shells/oh/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { name = "oh-${version}"; diff --git a/pkgs/shells/oil/default.nix b/pkgs/shells/oil/default.nix index ab475a63499cb1215bd072614c0d25e240e9d0e4..8d3452b912bdfb029b78037536c56e7c068f09cd 100644 --- a/pkgs/shells/oil/default.nix +++ b/pkgs/shells/oil/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, coreutils }: +{ stdenv, lib, fetchurl }: let version = "0.3.0"; in diff --git a/pkgs/shells/powershell/default.nix b/pkgs/shells/powershell/default.nix index a053884bb88547d24a508c85f25bd313e66d9a4d..93488d9e87f3368865a344316d16e74f9368e054 100644 --- a/pkgs/shells/powershell/default.nix +++ b/pkgs/shells/powershell/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, autoPatchelfHook, fetchzip, libunwind, libuuid, icu, curl, +{ stdenv, autoPatchelfHook, fetchzip, libunwind, libuuid, icu, curl, makeWrapper, less, openssl, pam, lttng-ust }: let platformString = if stdenv.isDarwin then "osx" diff --git a/pkgs/shells/zsh/antibody/default.nix b/pkgs/shells/zsh/antibody/default.nix index 665f403047f39c27e91c1a3a2b2bd09de899aba4..98ca9ce8f999b133c455dd5d463685a4f2d89f3b 100644 --- a/pkgs/shells/zsh/antibody/default.nix +++ b/pkgs/shells/zsh/antibody/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "antibody-${version}"; diff --git a/pkgs/shells/zsh/zsh-powerlevel9k/default.nix b/pkgs/shells/zsh/zsh-powerlevel9k/default.nix index 2babf35f2b68d69c57c12216cb5e7f44f2a210e5..30c45ea3c9bff3b4100b37eda4015871332bbbc6 100644 --- a/pkgs/shells/zsh/zsh-powerlevel9k/default.nix +++ b/pkgs/shells/zsh/zsh-powerlevel9k/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, zsh }: +{ stdenv, fetchFromGitHub }: # To make use of this derivation, use # `programs.zsh.promptInit = "source ${pkgs.zsh-powerlevel9k}/share/zsh-powerlevel9k/powerlevel9k.zsh-theme";` diff --git a/pkgs/shells/zsh/zsh-prezto/default.nix b/pkgs/shells/zsh/zsh-prezto/default.nix index 7bef904081e0608e8a7163fc891d95e33571cd1f..8acdd8bb5161059395addd431fc2070a1118425e 100644 --- a/pkgs/shells/zsh/zsh-prezto/default.nix +++ b/pkgs/shells/zsh/zsh-prezto/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchpatch, fetchgit, fetchFromGitHub }: +{ stdenv, fetchgit }: stdenv.mkDerivation rec { name = "zsh-prezto-2017-12-03"; diff --git a/pkgs/tools/X11/bumblebee/default.nix b/pkgs/tools/X11/bumblebee/default.nix index 7345528dad2b164ad0d4c16d196bd85df26e941e..0d764a4cbd108557c271673774f0bf8d7c64682e 100644 --- a/pkgs/tools/X11/bumblebee/default.nix +++ b/pkgs/tools/X11/bumblebee/default.nix @@ -18,15 +18,14 @@ { stdenv, lib, fetchurl, fetchpatch, pkgconfig, help2man, makeWrapper , glib, libbsd -, libX11, libXext, xorgserver, xkbcomp, kmod, xf86videonouveau -, nvidia_x11, virtualgl, libglvnd, primusLib +, libX11, xorgserver, kmod, xf86videonouveau +, nvidia_x11, virtualgl, libglvnd , automake111x, autoconf # The below should only be non-null in a x86_64 system. On a i686 # system the above nvidia_x11 and virtualgl will be the i686 packages. # TODO: Confusing. Perhaps use "SubArch" instead of i686? , nvidia_x11_i686 ? null , libglvnd_i686 ? null -, primusLib_i686 ? null , useDisplayDevice ? false , extraNvidiaDeviceOptions ? "" , extraNouveauDeviceOptions ? "" diff --git a/pkgs/tools/X11/go-sct/default.nix b/pkgs/tools/X11/go-sct/default.nix index aeb4546ff4d3b73ff3f258766fb219c25c8af052..189dc56975f3f873accb08d33de5a9527b4c6f47 100644 --- a/pkgs/tools/X11/go-sct/default.nix +++ b/pkgs/tools/X11/go-sct/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, xorg, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, xorg, buildGoPackage, fetchgit }: buildGoPackage rec { name = "go-sct-${version}"; diff --git a/pkgs/tools/X11/primus/default.nix b/pkgs/tools/X11/primus/default.nix index d130c9bac7cc9d3e4d87f4fb6b3773b958ed01b6..669cb4b4844ac4244fc840dd0ede558f1e2e9348 100644 --- a/pkgs/tools/X11/primus/default.nix +++ b/pkgs/tools/X11/primus/default.nix @@ -6,7 +6,6 @@ { stdenv , stdenv_i686 , lib -, bumblebee , primusLib , writeScriptBin , primusLib_i686 ? null diff --git a/pkgs/tools/X11/setroot/default.nix b/pkgs/tools/X11/setroot/default.nix index 669da86621fd3458b60540426478222cd24cd211..45cb1966a4ff502fb9814d3108d64aa9f3fc8728 100644 --- a/pkgs/tools/X11/setroot/default.nix +++ b/pkgs/tools/X11/setroot/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, libX11, imlib2 +{ stdenv, fetchFromGitHub, libX11, imlib2 , enableXinerama ? true, libXinerama ? null }: diff --git a/pkgs/tools/X11/vdpauinfo/default.nix b/pkgs/tools/X11/vdpauinfo/default.nix index 21d7a50566db346d827517bd95f2041f534b3959..153ff45d2a7029d59eed78200cb394b9ee4de1e0 100644 --- a/pkgs/tools/X11/vdpauinfo/default.nix +++ b/pkgs/tools/X11/vdpauinfo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, xorg, libvdpau }: +{ stdenv, fetchurl, pkgconfig, libvdpau }: stdenv.mkDerivation rec { name = "vdpauinfo-1.0"; diff --git a/pkgs/tools/X11/xbindkeys-config/default.nix b/pkgs/tools/X11/xbindkeys-config/default.nix index e3d9ecd5953e78a4df2c46ed5dafe29d11a5a1f6..987293878d82ad9416360b1f20f492e4e5b82aea 100644 --- a/pkgs/tools/X11/xbindkeys-config/default.nix +++ b/pkgs/tools/X11/xbindkeys-config/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libX11, gtk, pkgconfig, procps, makeWrapper, ... }: +{ stdenv, fetchurl, gtk, pkgconfig, procps, makeWrapper, ... }: stdenv.mkDerivation rec { name = "xbindkeys-config-${version}"; diff --git a/pkgs/tools/X11/xdg-utils/default.nix b/pkgs/tools/X11/xdg-utils/default.nix index 28839891aa5521bc2cb0e9da30929ef15acb309f..d8ae32c6ee4c75886ea2730e9574d07387a72f4c 100644 --- a/pkgs/tools/X11/xdg-utils/default.nix +++ b/pkgs/tools/X11/xdg-utils/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchFromGitHub , file, libxslt, docbook_xml_dtd_412, docbook_xsl, xmlto -, w3m, which, gnugrep, gnused, coreutils, xset +, w3m, gnugrep, gnused, coreutils, xset , mimiSupport ? false, gawk ? null }: assert mimiSupport -> gawk != null; diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index 8bff5a2e714aed1fc4291dfa79e97014d14d2bde..e3f815621e7b777bd4ace1b7338863cc25e98495 100644 --- a/pkgs/tools/X11/xpra/default.nix +++ b/pkgs/tools/X11/xpra/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchurl, python2Packages, pkgconfig , xorg, gtk2, glib, pango, cairo, gdk_pixbuf, atk -, makeWrapper, xkbcomp, xorgserver, getopt, xauth, utillinux, which, fontsConf +, makeWrapper, xorgserver, getopt, xauth, utillinux, which , ffmpeg, x264, libvpx, libwebp , libfakeXinerama , gst_all_1, pulseaudio, gobjectIntrospection diff --git a/pkgs/tools/X11/xpra/gtk3.nix b/pkgs/tools/X11/xpra/gtk3.nix index a0c2ee8f995f02c8b3bc261429b8e40fdf9d0695..16693b08e1104241ec7bf3596e7f9a115930b9ac 100644 --- a/pkgs/tools/X11/xpra/gtk3.nix +++ b/pkgs/tools/X11/xpra/gtk3.nix @@ -1,7 +1,7 @@ { 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 +, makeWrapper, xorgserver, getopt, xauth, utillinux, which, fontsConf , ffmpeg, x264, libvpx, libwebp , libfakeXinerama, pam }: diff --git a/pkgs/tools/admin/ansible/default.nix b/pkgs/tools/admin/ansible/default.nix index b942ae6a006ce15df5d6f89f257de8c1d32db530..d18fe4eafd344ca1295ad24b68f11ec91e48db5e 100644 --- a/pkgs/tools/admin/ansible/default.nix +++ b/pkgs/tools/admin/ansible/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchFromGitHub, python2 +{ stdenv, fetchurl, python2 , windowsSupport ? false }: diff --git a/pkgs/tools/admin/dehydrated/default.nix b/pkgs/tools/admin/dehydrated/default.nix index 38b70d1b5d074b8971d546e487b9f76db4669379..c9c879becaa055213cf04d06acbd311fa13bf1c4 100644 --- a/pkgs/tools/admin/dehydrated/default.nix +++ b/pkgs/tools/admin/dehydrated/default.nix @@ -1,4 +1,4 @@ -{ stdenv, bash, coreutils, curl, diffutils, gawk, gnugrep, gnused, openssl, makeWrapper, fetchFromGitHub }: +{ stdenv, coreutils, curl, diffutils, gawk, gnugrep, gnused, openssl, makeWrapper, fetchFromGitHub }: let pkgName = "dehydrated"; version = "0.6.2"; diff --git a/pkgs/tools/admin/gtk-vnc/default.nix b/pkgs/tools/admin/gtk-vnc/default.nix index 59a5ec8d4dad95bfc88eaf0fef00e22c1ce2061b..cd6cf90a5aa59fb863f72de92876fb6369c9ea50 100644 --- a/pkgs/tools/admin/gtk-vnc/default.nix +++ b/pkgs/tools/admin/gtk-vnc/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, gobjectIntrospection -, gnutls, cairo, libtool, glib, pkgconfig, libtasn1 +, gnutls, cairo, libtool, glib, pkgconfig , libffi, cyrus_sasl, intltool, perl, perlPackages, libpulseaudio -, kbproto, libX11, libXext, xextproto, libgcrypt, gtk3, vala_0_32 +, libgcrypt, gtk3, vala_0_32 , libogg, libgpgerror, pythonPackages }: let diff --git a/pkgs/tools/admin/intecture/agent.nix b/pkgs/tools/admin/intecture/agent.nix index 2b663cd3bceeb656812e471633930bdc7fb4f2f5..780eb4e9aa52f223668b35be100720d357f2f58d 100644 --- a/pkgs/tools/admin/intecture/agent.nix +++ b/pkgs/tools/admin/intecture/agent.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, rustPlatform +{ lib, fetchFromGitHub, rustPlatform , openssl, zeromq, czmq, pkgconfig, cmake, zlib }: with rustPlatform; diff --git a/pkgs/tools/admin/intecture/auth.nix b/pkgs/tools/admin/intecture/auth.nix index 759230c6a29323542449ed275c3c63d3a9428009..2a02873a8b5c427f2704fd5aa32c35a4bf6fa915 100644 --- a/pkgs/tools/admin/intecture/auth.nix +++ b/pkgs/tools/admin/intecture/auth.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, rustPlatform +{ lib, fetchFromGitHub, rustPlatform , openssl, zeromq, czmq, pkgconfig, cmake, zlib }: with rustPlatform; diff --git a/pkgs/tools/admin/intecture/cli.nix b/pkgs/tools/admin/intecture/cli.nix index a4ac74e9f2da53eb0b7c45ad04d4f26d78fc9ff2..fef0e50cd5b1582ea2942f9ee7f165379dcdb7a9 100644 --- a/pkgs/tools/admin/intecture/cli.nix +++ b/pkgs/tools/admin/intecture/cli.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, rustPlatform +{ lib, fetchFromGitHub, rustPlatform , openssl, zeromq, czmq, pkgconfig, cmake, zlib }: with rustPlatform; diff --git a/pkgs/tools/admin/lxd/default.nix b/pkgs/tools/admin/lxd/default.nix index dfe4c099bebbdf4f761b5091e7824bf8558beda5..2fbfff287cb9c31999ecbde8cb41ed53ec12d7af 100644 --- a/pkgs/tools/admin/lxd/default.nix +++ b/pkgs/tools/admin/lxd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, pkgconfig, lxc, buildGoPackage, fetchurl +{ stdenv, pkgconfig, lxc, buildGoPackage, fetchurl , makeWrapper, acl, rsync, gnutar, xz, btrfs-progs, gzip, dnsmasq , squashfsTools, iproute, iptables, ebtables }: diff --git a/pkgs/tools/admin/simp_le/default.nix b/pkgs/tools/admin/simp_le/default.nix index 47bf848578d9a8cb3c6ec248297898ce5eb6a015..ca0e16c1185a624ca918bb5c73e113c295c40be7 100644 --- a/pkgs/tools/admin/simp_le/default.nix +++ b/pkgs/tools/admin/simp_le/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, pythonPackages, bash }: +{ stdenv, pythonPackages, bash }: pythonPackages.buildPythonApplication rec { pname = "simp_le-client"; diff --git a/pkgs/tools/admin/ssl-cert-check/default.nix b/pkgs/tools/admin/ssl-cert-check/default.nix index 8d30307af2d3c7d7b586f164661c888dfd930c50..f8e893078157c472895342d51ca091972dd73df8 100644 --- a/pkgs/tools/admin/ssl-cert-check/default.nix +++ b/pkgs/tools/admin/ssl-cert-check/default.nix @@ -1,5 +1,4 @@ { stdenv -, lib , fetchFromGitHub , makeWrapper , openssl diff --git a/pkgs/tools/archivers/innoextract/default.nix b/pkgs/tools/archivers/innoextract/default.nix index 14b128d15c7a3dba064a764ad59cd1843da77470..dc9796cc9e3a7b3c788fcb7f2672c95950e73473 100644 --- a/pkgs/tools/archivers/innoextract/default.nix +++ b/pkgs/tools/archivers/innoextract/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, doxygen, makeWrapper, python +{ stdenv, fetchurl, cmake, makeWrapper, python , boost, lzma , withGog ? false, unar ? null }: diff --git a/pkgs/tools/archivers/rpmextract/default.nix b/pkgs/tools/archivers/rpmextract/default.nix index c9ce6ac4d10b865356c564179dcd0c10d0fe7d8e..8d4d5fd8dddd4ea1d9a913f245ab71a9cb07aab4 100644 --- a/pkgs/tools/archivers/rpmextract/default.nix +++ b/pkgs/tools/archivers/rpmextract/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, rpm, cpio, substituteAll }: +{ stdenv, rpm, cpio, substituteAll }: stdenv.mkDerivation rec { name = "rpmextract"; diff --git a/pkgs/tools/archivers/unp/default.nix b/pkgs/tools/archivers/unp/default.nix index 7583663ebf0ab94aa9eb41abd2be69ed18c9a104..79c8e2f20ecce223aa0c318aa379d32a87c50ea4 100644 --- a/pkgs/tools/archivers/unp/default.nix +++ b/pkgs/tools/archivers/unp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgs, lib, fetchurl, makeWrapper, perl, unrar, unzip, gzip, file, extraBackends ? [] }: +{ stdenv, lib, fetchurl, makeWrapper, perl, unrar, unzip, gzip, file, extraBackends ? [] }: stdenv.mkDerivation rec { name = "unp-${version}"; diff --git a/pkgs/tools/archivers/zpaq/zpaqd.nix b/pkgs/tools/archivers/zpaq/zpaqd.nix index 3004c7e2132cdbeb9c6e94121490af88ef12c98c..0d60e7962460572658f2838ed09a257b4fa92c6c 100644 --- a/pkgs/tools/archivers/zpaq/zpaqd.nix +++ b/pkgs/tools/archivers/zpaq/zpaqd.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, unzip -, buildPlatform, hostPlatform +, hostPlatform }: let diff --git a/pkgs/tools/backup/bareos/default.nix b/pkgs/tools/backup/bareos/default.nix index 691568673df391c271a32ce3b8d2460a12c3ef0e..e93b02e062e291f5fb6c00dc3288fbe8e2065a57 100644 --- a/pkgs/tools/backup/bareos/default.nix +++ b/pkgs/tools/backup/bareos/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, nettools, gettext, libtool, flex +{ stdenv, fetchFromGitHub, pkgconfig, nettools, gettext, flex , readline ? null, openssl ? null, python2 ? null, ncurses ? null, rocksdb , sqlite ? null, postgresql ? null, mysql ? null, zlib ? null, lzo ? null , jansson ? null, acl ? null, glusterfs ? null, libceph ? null, libcap ? null diff --git a/pkgs/tools/backup/ddar/default.nix b/pkgs/tools/backup/ddar/default.nix index eac589813f4738fc8b458649bcde2fe132b8b83e..ce65ef4eb80b39491ae42a8c67219ddf7c97ee11 100644 --- a/pkgs/tools/backup/ddar/default.nix +++ b/pkgs/tools/backup/ddar/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonApplication, fetchFromGitHub, python, protobuf, roundup }: +{ lib, buildPythonApplication, fetchFromGitHub, protobuf, roundup }: buildPythonApplication rec { pname = "ddar"; diff --git a/pkgs/tools/backup/partimage/default.nix b/pkgs/tools/backup/partimage/default.nix index c902802abce2d28c9b08e14fccc6ae726c57c79d..8781c2d2cada4abfb6ee8568d472f98beada4d3e 100644 --- a/pkgs/tools/backup/partimage/default.nix +++ b/pkgs/tools/backup/partimage/default.nix @@ -1,5 +1,4 @@ {stdenv, fetchurl, fetchpatch, bzip2, zlib, newt, openssl, pkgconfig, slang -, automake, autoconf, libtool, gettext }: stdenv.mkDerivation { name = "partimage-0.6.9"; diff --git a/pkgs/tools/backup/rsnapshot/default.nix b/pkgs/tools/backup/rsnapshot/default.nix index 77f5951d39e244dc9ef2a867d64b1820319562ce..6abd7002f8d740007a95bfbf1da041b948d2913d 100644 --- a/pkgs/tools/backup/rsnapshot/default.nix +++ b/pkgs/tools/backup/rsnapshot/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, writeText, perl, openssh, rsync, logger }: +{ fetchurl, stdenv, perl, openssh, rsync, logger }: stdenv.mkDerivation rec { name = "rsnapshot-1.4.2"; diff --git a/pkgs/tools/backup/ugarit-manifest-maker/default.nix b/pkgs/tools/backup/ugarit-manifest-maker/default.nix index 00651806a10ab63f40bf4a2ef065f4eb78c14b28..8f93474f8f169eab7021b178e9398be59e7bd807 100644 --- a/pkgs/tools/backup/ugarit-manifest-maker/default.nix +++ b/pkgs/tools/backup/ugarit-manifest-maker/default.nix @@ -1,6 +1,6 @@ { pkgs, stdenv, eggDerivation, fetchegg }: let - eggs = import ./eggs.nix { inherit pkgs stdenv eggDerivation fetchegg; }; + eggs = import ./eggs.nix { inherit eggDerivation fetchegg; }; in with pkgs; eggDerivation rec { pname = "ugarit-manifest-maker"; version = "0.1"; diff --git a/pkgs/tools/backup/ugarit-manifest-maker/eggs.nix b/pkgs/tools/backup/ugarit-manifest-maker/eggs.nix index 0af5dd5bfff193154a85dc68c95ff0cec1bd6dd0..889d698188e29fb8ddc49f4f5b6357b58eccb004 100644 --- a/pkgs/tools/backup/ugarit-manifest-maker/eggs.nix +++ b/pkgs/tools/backup/ugarit-manifest-maker/eggs.nix @@ -1,4 +1,4 @@ -{ pkgs, stdenv, eggDerivation, fetchegg }: +{ eggDerivation, fetchegg }: rec { blob-utils = eggDerivation { name = "blob-utils-1.0.3"; diff --git a/pkgs/tools/backup/ugarit/default.nix b/pkgs/tools/backup/ugarit/default.nix index 56da9a8102087ba5a1db727ed724dfc657e3a3db..e8f0ea22df10b2d4bf9937287dfdc8aa25628dd5 100644 --- a/pkgs/tools/backup/ugarit/default.nix +++ b/pkgs/tools/backup/ugarit/default.nix @@ -1,6 +1,6 @@ { pkgs, stdenv, eggDerivation, fetchegg }: let - eggs = import ./eggs.nix { inherit pkgs stdenv eggDerivation fetchegg; }; + eggs = import ./eggs.nix { inherit eggDerivation fetchegg; }; in with pkgs; eggDerivation rec { pname = "ugarit"; version = "2.0"; diff --git a/pkgs/tools/backup/ugarit/eggs.nix b/pkgs/tools/backup/ugarit/eggs.nix index 9329618887fbb1d439c3741caadbe2d303b1465c..fe958cb55cc614a71c9d978a4e8599688b4b57d4 100644 --- a/pkgs/tools/backup/ugarit/eggs.nix +++ b/pkgs/tools/backup/ugarit/eggs.nix @@ -1,4 +1,4 @@ -{ pkgs, stdenv, eggDerivation, fetchegg }: +{ eggDerivation, fetchegg }: rec { aes = eggDerivation { name = "aes-1.5"; diff --git a/pkgs/tools/backup/znapzend/default.nix b/pkgs/tools/backup/znapzend/default.nix index f78c300afd0a7cff56cc7f430341cf8caad86791..bc57215c0c4b963ab826b4ca630b06ddcead335b 100644 --- a/pkgs/tools/backup/znapzend/default.nix +++ b/pkgs/tools/backup/znapzend/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchurl, zfs, mbuffer, perl, perlPackages, wget, autoconf, automake }: +{ stdenv, fetchFromGitHub, fetchurl, perl, perlPackages, wget, autoconf, automake }: let # when upgrade znapzend, check versions of Perl libs here: https://github.com/oetiker/znapzend/blob/master/PERL_MODULES diff --git a/pkgs/tools/bluetooth/blueman/default.nix b/pkgs/tools/bluetooth/blueman/default.nix index 394f3fe5b9808d3089a2515e770d19c5aa51e28f..da562fde1603822974a33ea128bb3379981122f8 100644 --- a/pkgs/tools/bluetooth/blueman/default.nix +++ b/pkgs/tools/bluetooth/blueman/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, intltool, pkgconfig, pythonPackages, bluez, polkit, gtk3 +{ stdenv, lib, fetchurl, intltool, pkgconfig, pythonPackages, bluez, gtk3 , obex_data_server, xdg_utils, libnotify, dnsmasq, dhcp , hicolor-icon-theme, librsvg, wrapGAppsHook, gobjectIntrospection , withPulseAudio ? true, libpulseaudio }: diff --git a/pkgs/tools/bootloaders/refind/default.nix b/pkgs/tools/bootloaders/refind/default.nix index 80add316094cb5370a4a79c57caf222b50a5c0af..674bb5b552b94bb2b32f33cabf3ca8d51ee78e4d 100644 --- a/pkgs/tools/bootloaders/refind/default.nix +++ b/pkgs/tools/bootloaders/refind/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, gnu-efi }: +{ stdenv, fetchurl, gnu-efi }: let archids = { diff --git a/pkgs/tools/cd-dvd/brasero/default.nix b/pkgs/tools/cd-dvd/brasero/default.nix index 8223ba2be4bb0fea45f02cb8053250129d476904..9587416a96af0409531faaf5afacafbd7018d1e6 100644 --- a/pkgs/tools/cd-dvd/brasero/default.nix +++ b/pkgs/tools/cd-dvd/brasero/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, pkgconfig, gtk3, itstool, gst_all_1, libxml2, libnotify -, libcanberra-gtk3, intltool, makeWrapper, dvdauthor, libburn, libisofs +, libcanberra-gtk3, intltool, dvdauthor, libburn, libisofs , vcdimager, wrapGAppsHook, hicolor-icon-theme }: # libdvdcss is "too old" (in fast "too new"), see https://bugs.launchpad.net/ubuntu/+source/brasero/+bug/611590 diff --git a/pkgs/tools/compression/bzip2/default.nix b/pkgs/tools/compression/bzip2/default.nix index 3a06a39dcad7dd8e6e7eb7c66bf4c58edb714f8e..0d2e63c7d59deb7d254b206ccf1b0e3f2389249f 100644 --- a/pkgs/tools/compression/bzip2/default.nix +++ b/pkgs/tools/compression/bzip2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch +{ stdenv, fetchurl , linkStatic ? (stdenv.system == "i686-cygwin") }: diff --git a/pkgs/tools/compression/gzip/default.nix b/pkgs/tools/compression/gzip/default.nix index c39216f1e0ccd14b3bed82ef08fb804ac73c2a32..09065ede68277aa15d3f08d82ad86e2282651c0f 100644 --- a/pkgs/tools/compression/gzip/default.nix +++ b/pkgs/tools/compression/gzip/default.nix @@ -1,4 +1,4 @@ -{ stdenv, hostPlatform, fetchurl, xz }: +{ stdenv, fetchurl, xz }: stdenv.mkDerivation rec { name = "gzip-${version}"; diff --git a/pkgs/tools/compression/lzbench/default.nix b/pkgs/tools/compression/lzbench/default.nix index a38e0a67b28297792d26793f36028c5a716c049d..df7700d41cb8758b89d7718809131bec48c1d19f 100644 --- a/pkgs/tools/compression/lzbench/default.nix +++ b/pkgs/tools/compression/lzbench/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, glibc }: +{ stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { name = "lzbench-20170208"; diff --git a/pkgs/tools/compression/upx/default.nix b/pkgs/tools/compression/upx/default.nix index 213d98a1ec12ff84f778f4ea390851f53b0f24a4..ea363ae8cc2ae25120daa50f5407fb77a26172ad 100644 --- a/pkgs/tools/compression/upx/default.nix +++ b/pkgs/tools/compression/upx/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchFromGitHub, ucl, zlib, perl }: +{ stdenv, fetchurl, ucl, zlib, perl }: stdenv.mkDerivation rec { name = "upx-${version}"; diff --git a/pkgs/tools/filesystems/bcachefs-tools/default.nix b/pkgs/tools/filesystems/bcachefs-tools/default.nix index c2e13b75daa982d0c87f6e109d3a525317a977ea..1fafe7412d87bfd086cf1d441a39cdd12141d5e1 100644 --- a/pkgs/tools/filesystems/bcachefs-tools/default.nix +++ b/pkgs/tools/filesystems/bcachefs-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgs, fetchgit, pkgconfig, attr, libuuid, libscrypt, libsodium +{ stdenv, fetchgit, pkgconfig, attr, libuuid, libscrypt, libsodium , keyutils, liburcu, zlib, libaio, zstd }: stdenv.mkDerivation rec { diff --git a/pkgs/tools/filesystems/ceph/generic.nix b/pkgs/tools/filesystems/ceph/generic.nix index 20eb363b2278b4c26ee6dac5b3e9cf2062a0b0e2..14fedd6610e144228c4fdbd8fec9f6bd4197d935 100644 --- a/pkgs/tools/filesystems/ceph/generic.nix +++ b/pkgs/tools/filesystems/ceph/generic.nix @@ -9,7 +9,7 @@ # Optional Dependencies , yasm ? null, fcgi ? null, expat ? null -, curl ? null, fuse ? null, libibverbs ? null, librdmacm ? null +, curl ? null, fuse ? null , libedit ? null, libatomic_ops ? null, kinetic-cpp-client ? null , libs3 ? null @@ -25,7 +25,7 @@ , zfs ? null # Version specific arguments -, version, src, patches ? [], buildInputs ? [] +, version, src ? [], buildInputs ? [] , ... }: @@ -92,7 +92,7 @@ let ps.prettytable ps.webob ps.cherrypy - ]); + ]); in stdenv.mkDerivation { @@ -101,7 +101,7 @@ stdenv.mkDerivation { inherit src; patches = [ - # ./ceph-patch-cmake-path.patch + # ./ceph-patch-cmake-path.patch ./0001-kv-RocksDBStore-API-break-additional.patch ] ++ optionals stdenv.isLinux [ ./0002-fix-absolute-include-path.patch diff --git a/pkgs/tools/filesystems/fatresize/default.nix b/pkgs/tools/filesystems/fatresize/default.nix index f929f354766c87d17d7dfcef0ab067fbb3c8123c..9af14b051261779a4a07b11daae1a006310e1567 100644 --- a/pkgs/tools/filesystems/fatresize/default.nix +++ b/pkgs/tools/filesystems/fatresize/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, parted, substituteAll, utillinux }: +{ stdenv, fetchurl, parted, utillinux }: stdenv.mkDerivation rec { diff --git a/pkgs/tools/filesystems/glusterfs/default.nix b/pkgs/tools/filesystems/glusterfs/default.nix index 494fd7036e29076acd77bf6838aa4c2d602dd501..beb046cdbdb785e10993d9e6fe60ad65ba1f8b69 100644 --- a/pkgs/tools/filesystems/glusterfs/default.nix +++ b/pkgs/tools/filesystems/glusterfs/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl, fuse, bison, flex_2_5_35, openssl, python2, ncurses, readline, autoconf, automake, libtool, pkgconfig, zlib, libaio, libxml2, acl, sqlite, - liburcu, attr, makeWrapper, coreutils, gnused, gnugrep, which, python2Packages, + liburcu, attr, makeWrapper, coreutils, gnused, gnugrep, which, openssh, gawk, findutils, utillinux, lvm2, btrfs-progs, e2fsprogs, xfsprogs, systemd, rsync, glibc }: diff --git a/pkgs/tools/filesystems/go-mtpfs/default.nix b/pkgs/tools/filesystems/go-mtpfs/default.nix index 028aef6024b105a8f47dedea784b7b563762a1ea..0438b9c38e4b8c97cea8785500f147073bcaed4a 100644 --- a/pkgs/tools/filesystems/go-mtpfs/default.nix +++ b/pkgs/tools/filesystems/go-mtpfs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, pkgconfig, libusb1, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, pkgconfig, libusb1, buildGoPackage, fetchgit }: buildGoPackage rec { name = "go-mtpfs-${version}"; diff --git a/pkgs/tools/filesystems/grive2/default.nix b/pkgs/tools/filesystems/grive2/default.nix index f4bb5592abdb8b614a029d829aa523b2ad2e7198..4f7c2248a8edb40a970f2f3701fb2353915b6dc1 100644 --- a/pkgs/tools/filesystems/grive2/default.nix +++ b/pkgs/tools/filesystems/grive2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, fetchurl, yajl, cmake, libgcrypt, curl, expat, boost, libiberty }: +{ stdenv, fetchFromGitHub, pkgconfig, yajl, cmake, libgcrypt, curl, expat, boost, libiberty }: stdenv.mkDerivation rec { version = "0.5.0"; diff --git a/pkgs/tools/filesystems/irods/default.nix b/pkgs/tools/filesystems/irods/default.nix index c2066f95ef5ab24cf0bda8934f509454d5b5b998..24a88349bf43558dee51066a9fe6890f226d0ee8 100644 --- a/pkgs/tools/filesystems/irods/default.nix +++ b/pkgs/tools/filesystems/irods/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python, bzip2, zlib, autoconf, automake, cmake, gnumake, help2man , texinfo, libtool , cppzmq , libarchive, avro-cpp_llvm, boost, jansson, zeromq, openssl , pam, libiodbc, kerberos, gcc, libcxx, which }: +{ stdenv, fetchurl, bzip2, zlib, autoconf, automake, cmake, gnumake, help2man , texinfo, libtool , cppzmq , libarchive, avro-cpp_llvm, boost, jansson, zeromq, openssl , pam, libiodbc, kerberos, gcc, libcxx, which }: with stdenv; diff --git a/pkgs/tools/filesystems/nixpart/0.4/default.nix b/pkgs/tools/filesystems/nixpart/0.4/default.nix index 217056117ea7304752e05238872a785637962852..758e130e4adf41190052bd619df9d75e90d310b0 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/default.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/default.nix @@ -1,8 +1,6 @@ { stdenv, fetchurl, python, buildPythonApplication # Propagated to blivet , useNixUdev ? true -# No longer needed, but kept for backwards-compatibility with older NixOps. -, udevSoMajor ? null # Propagated dependencies , pkgs, urlgrabber }: diff --git a/pkgs/tools/filesystems/squashfuse/default.nix b/pkgs/tools/filesystems/squashfuse/default.nix index 341b025b079152d0830b802f43530aa45fa04677..b3d8d70f0e2911884fc486eeb47f3bb328797526 100644 --- a/pkgs/tools/filesystems/squashfuse/default.nix +++ b/pkgs/tools/filesystems/squashfuse/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchFromGitHub, fetchpatch, automake, autoreconfHook, libtool, fuse, - pkgconfig, pcre, lz4, xz, zlib, lzo, zstd }: +{ stdenv, fetchFromGitHub, autoreconfHook, libtool, fuse, + pkgconfig, lz4, xz, zlib, lzo, zstd }: with stdenv.lib; diff --git a/pkgs/tools/filesystems/xtreemfs/default.nix b/pkgs/tools/filesystems/xtreemfs/default.nix index 2a85adb60b568267e061da02c46c781ac1a8de18..4c0c2343dd2a1eb240eaaf49f5330861fffe1767 100644 --- a/pkgs/tools/filesystems/xtreemfs/default.nix +++ b/pkgs/tools/filesystems/xtreemfs/default.nix @@ -1,5 +1,5 @@ { stdenv, boost, fuse, openssl, cmake, attr, jdk, ant, which, file, python -, fetchurl, lib, valgrind, makeWrapper, fetchFromGitHub }: +, lib, valgrind, makeWrapper, fetchFromGitHub }: stdenv.mkDerivation rec { src = fetchFromGitHub { diff --git a/pkgs/tools/filesystems/zkfuse/default.nix b/pkgs/tools/filesystems/zkfuse/default.nix index 9dfb2deeaee32ea55534091526e04b9488dc6937..66e6690bc6a7f9d32645256b34feaa78b35b89ad 100644 --- a/pkgs/tools/filesystems/zkfuse/default.nix +++ b/pkgs/tools/filesystems/zkfuse/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, zookeeper, zookeeper_mt, fuse, pkgconfig, autoreconfHook, log4cxx, boost, tree }: +{ stdenv, lib, zookeeper, zookeeper_mt, fuse, autoreconfHook, log4cxx, boost }: stdenv.mkDerivation rec { name = "zkfuse-${version}"; diff --git a/pkgs/tools/graphics/argyllcms/default.nix b/pkgs/tools/graphics/argyllcms/default.nix index 7a06d9f346b842af663686dc2db9bba0a64498a8..a3b259703517284c805eec483a51274dfd5cb113 100644 --- a/pkgs/tools/graphics/argyllcms/default.nix +++ b/pkgs/tools/graphics/argyllcms/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchzip, jam, unzip, libX11, libXxf86vm, libXrandr, libXinerama , libXrender, libXext, libtiff, libjpeg, libpng, libXScrnSaver, writeText -, libXdmcp, libXau, lib, openssl, zlib }: +, libXdmcp, libXau, lib, openssl }: let version = "2.0.0"; in diff --git a/pkgs/tools/graphics/cuneiform/default.nix b/pkgs/tools/graphics/cuneiform/default.nix index 0a48e947a48ea4394ae0680544165bf31c719c1d..cc899ab104f90ce38c57154eca68ae1bd04c6e10 100644 --- a/pkgs/tools/graphics/cuneiform/default.nix +++ b/pkgs/tools/graphics/cuneiform/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, patchelf, imagemagick }: +{ stdenv, fetchurl, cmake, imagemagick }: stdenv.mkDerivation rec { name = "cuneiform-${version}"; diff --git a/pkgs/tools/graphics/gmic/default.nix b/pkgs/tools/graphics/gmic/default.nix index 6c62e0528386ce6687c299608ee02ab19ca2fbef..c267695dd784e4e916f2b8c513a47c09e68b8c06 100644 --- a/pkgs/tools/graphics/gmic/default.nix +++ b/pkgs/tools/graphics/gmic/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchFromGitHub, cmake, ninja, pkgconfig +{ stdenv, fetchurl, cmake, ninja, pkgconfig , opencv, openexr, graphicsmagick, fftw, zlib, libjpeg, libtiff, libpng , withGimpPlugin ? true, gimp ? null}: diff --git a/pkgs/tools/graphics/gnuplot/default.nix b/pkgs/tools/graphics/gnuplot/default.nix index 0a4ebf495b248bfbaf586829634a23e44783f82d..d50adaa387facb6a2357b1d57db53308549d04cb 100644 --- a/pkgs/tools/graphics/gnuplot/default.nix +++ b/pkgs/tools/graphics/gnuplot/default.nix @@ -2,7 +2,6 @@ , cairo, gd, libcerf, pango, readline, zlib , withTeXLive ? false, texlive , withLua ? false, lua -, emacs ? null , libX11 ? null , libXt ? null , libXpm ? null diff --git a/pkgs/tools/graphics/jbig2enc/default.nix b/pkgs/tools/graphics/jbig2enc/default.nix index 0bb0bb00efa5fdc987a6bc82d8aca72b51c44754..393c18d385299f4f85ffc5ab4114f21f40c093ac 100644 --- a/pkgs/tools/graphics/jbig2enc/default.nix +++ b/pkgs/tools/graphics/jbig2enc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, leptonica, zlib, libwebp, giflib, libjpeg, libpng, libtiff }: +{ stdenv, fetchurl, leptonica, zlib, libwebp, giflib, libjpeg, libpng, libtiff }: stdenv.mkDerivation { name = "jbig2enc-0.28"; diff --git a/pkgs/tools/graphics/pywal/default.nix b/pkgs/tools/graphics/pywal/default.nix index 95f7c547b5596c766fab79ba81b54eb3e4102f75..a83bc845eb9eb9f8f6200d39e33735cb6b23cab2 100644 --- a/pkgs/tools/graphics/pywal/default.nix +++ b/pkgs/tools/graphics/pywal/default.nix @@ -1,4 +1,4 @@ -{ lib, python3Packages, fetchFromGitHub, imagemagick, feh }: +{ lib, python3Packages, imagemagick, feh }: python3Packages.buildPythonApplication rec { pname = "pywal"; diff --git a/pkgs/tools/graphics/vips/default.nix b/pkgs/tools/graphics/vips/default.nix index da63cb58a55fdeb9eb6473db2c8a6485ce463061..18699f412847bf9c50d646b8325b5565be94c407 100644 --- a/pkgs/tools/graphics/vips/default.nix +++ b/pkgs/tools/graphics/vips/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, pkgconfig, glib, libxml2, flex, bison, vips, expat, +{ stdenv, fetchurl, pkgconfig, glib, libxml2, expat, fftw, orc, lcms, imagemagick, openexr, libtiff, libjpeg, libgsf, libexif, - python27, libpng, matio ? null, cfitsio ? null, libwebp ? null + python27, libpng ? null }: stdenv.mkDerivation rec { diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-mozc/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-mozc/default.nix index 170ac4c6a26fc2d6f80b338d97123fbdc95e57c7..d74c7608bc90ef23f8b036cb03ed87a30f395b18 100644 --- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-mozc/default.nix +++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-mozc/default.nix @@ -1,5 +1,5 @@ { clangStdenv, fetchFromGitHub, fetchurl, fetchpatch, gyp, which, ninja, - python, pkgconfig, protobuf, gtk2, zinnia, qt5, libxcb, tegaki-zinnia-japanese, + python, pkgconfig, protobuf, gtk2, zinnia, qt5, libxcb, fcitx, gettext }: let japanese_usage_dictionary = fetchFromGitHub { diff --git a/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix b/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix index 50ab7d85c5ac0f609a8b98d5680eec9c2c0880ed..166fd16811abe34bbab2b854e713483d56d71529 100644 --- a/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix +++ b/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, cmake, fcitx, pkgconfig, qtbase, extra-cmake-modules +{ stdenv, fetchurl, cmake, fcitx, pkgconfig, qtbase, extra-cmake-modules , fetchpatch }: diff --git a/pkgs/tools/inputmethods/fcitx/unwrapped.nix b/pkgs/tools/inputmethods/fcitx/unwrapped.nix index c7d0eecb763c9e1a94c640eca4548de148ce53dc..ab8a7bdb34de523ff2a2feb629d29749caa99676 100644 --- a/pkgs/tools/inputmethods/fcitx/unwrapped.nix +++ b/pkgs/tools/inputmethods/fcitx/unwrapped.nix @@ -2,7 +2,7 @@ , libxml2, enchant, isocodes, icu, libpthreadstubs , pango, cairo, libxkbfile, libXau, libXdmcp, libxkbcommon , dbus, gtk2, gtk3, qt4, extra-cmake-modules -, xkeyboard_config, pcre, libuuid, curl, cacert +, xkeyboard_config, pcre, libuuid , withPinyin ? true , fetchFromGitHub }: diff --git a/pkgs/tools/inputmethods/fcitx/wrapper.nix b/pkgs/tools/inputmethods/fcitx/wrapper.nix index 1dfe6b24506106a08774f38b8fa9b9caa02a1743..28a08e39b225d79cd119a89fdfe6ec7f1f683f22 100644 --- a/pkgs/tools/inputmethods/fcitx/wrapper.nix +++ b/pkgs/tools/inputmethods/fcitx/wrapper.nix @@ -1,4 +1,4 @@ -{ stdenv, symlinkJoin, fcitx, fcitx-configtool, makeWrapper, plugins, libsForQt5 }: +{ symlinkJoin, fcitx, fcitx-configtool, makeWrapper, plugins, libsForQt5 }: symlinkJoin { name = "fcitx-with-plugins-${fcitx.version}"; diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix index f70c7d02e9f06b0afa8a07916c780814a8355a43..cb2076cd21c7aa4a8597c0a4edefcab249d094a9 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, intltool, pkgconfig -, gtk3, ibus, libhangul, librsvg, python3 +, gtk3, ibus, libhangul, python3 }: stdenv.mkDerivation rec { diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix index fd924cdd2a2b1550ce3c6b8b6cde3cb8321e84bb..01b092ef2a613ee49b615cca2d69ba05a6a860e9 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix @@ -1,5 +1,5 @@ { clangStdenv, fetchFromGitHub, which, ninja, python, gyp, pkgconfig, protobuf -, ibus, gtk2, zinnia, qt5, libxcb, tegaki-zinnia-japanese }: +, ibus, gtk2, zinnia, qt5, libxcb }: let japanese_usage_dictionary = fetchFromGitHub { diff --git a/pkgs/tools/inputmethods/ibus/default.nix b/pkgs/tools/inputmethods/ibus/default.nix index d3507b57cbd020eeba0176b1bf691a49a34632c6..540779477e35cf2ed0c7be1f029214a1fa79e9aa 100644 --- a/pkgs/tools/inputmethods/ibus/default.nix +++ b/pkgs/tools/inputmethods/ibus/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchFromGitHub, autoreconfHook, gconf, intltool, makeWrapper, pkgconfig -, vala, wrapGAppsHook, atk, dbus, dconf ? null, glib, gdk_pixbuf, gobjectIntrospection, gtk2 +, vala, wrapGAppsHook, dbus, dconf ? null, glib, gdk_pixbuf, gobjectIntrospection, gtk2 , gtk3, gtk-doc, isocodes, python3, json-glib, libnotify ? null, enablePythonLibrary ? true , enableUI ? true, withWayland ? false, libxkbcommon ? null, wayland ? null }: diff --git a/pkgs/tools/inputmethods/interception-tools/default.nix b/pkgs/tools/inputmethods/interception-tools/default.nix index 33c66fb7ff201975278f3597149240ef52dd1380..a6aed47d964cee955e2bbb24a4e1f89f7e623311 100644 --- a/pkgs/tools/inputmethods/interception-tools/default.nix +++ b/pkgs/tools/inputmethods/interception-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchFromGitHub, pkgconfig, cmake, libyamlcpp, +{ stdenv, fetchurl, pkgconfig, cmake, libyamlcpp, libevdev, udev }: let diff --git a/pkgs/tools/misc/apt-offline/default.nix b/pkgs/tools/misc/apt-offline/default.nix index ff146e6092322df4ff4b81837c1b2a513a662126..1044c0acc0a8ac282c282d095fa0fee32ec275fc 100644 --- a/pkgs/tools/misc/apt-offline/default.nix +++ b/pkgs/tools/misc/apt-offline/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, bash, pythonPackages }: +{ stdenv, fetchurl, pythonPackages }: pythonPackages.buildPythonApplication rec { version = "1.3"; diff --git a/pkgs/tools/misc/azure-vhd-utils/default.nix b/pkgs/tools/misc/azure-vhd-utils/default.nix index fcdd9a81d7204cc86e59100a9326f3a28c2c07c8..5ead0e1020cbf0e6e3241c256121d5ae501693a6 100644 --- a/pkgs/tools/misc/azure-vhd-utils/default.nix +++ b/pkgs/tools/misc/azure-vhd-utils/default.nix @@ -1,5 +1,5 @@ # This file was generated by go2nix. -{ stdenv, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { name = "azure-vhd-utils-${version}"; diff --git a/pkgs/tools/misc/bibutils/default.nix b/pkgs/tools/misc/bibutils/default.nix index 41a50eecd84b646016adf0418bb528a380c1be91..d0434ebe28b43b246388113c5e143fbb1794f9b3 100644 --- a/pkgs/tools/misc/bibutils/default.nix +++ b/pkgs/tools/misc/bibutils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl }: +{ stdenv, fetchurl }: stdenv.mkDerivation rec { name = "bibutils-${version}"; diff --git a/pkgs/tools/misc/byobu/default.nix b/pkgs/tools/misc/byobu/default.nix index c5ebe7cf32eec53c6f661b795ed35a5299ef3224..026c626ff77ec3ca9876158dbf7096737ecfc166 100644 --- a/pkgs/tools/misc/byobu/default.nix +++ b/pkgs/tools/misc/byobu/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses, python, perl, textual-window-manager }: +{ stdenv, fetchurl, python, perl, textual-window-manager }: stdenv.mkDerivation rec { version = "5.125"; diff --git a/pkgs/tools/misc/colord/default.nix b/pkgs/tools/misc/colord/default.nix index 4461834cb74de38a646e9703dc42643e821e2be7..a5d71a9487cc6a4fcf22e2966fd6b7b0d929ecc0 100644 --- a/pkgs/tools/misc/colord/default.nix +++ b/pkgs/tools/misc/colord/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, bash-completion , glib, polkit, pkgconfig, gettext, gusb, lcms2, sqlite, systemd, dbus , gobjectIntrospection, argyllcms, meson, ninja, libxml2, vala_0_40 -, libgudev, sane-backends, udev, gnome3, makeWrapper }: +, libgudev, sane-backends, gnome3, makeWrapper }: stdenv.mkDerivation rec { name = "colord-1.4.2"; diff --git a/pkgs/tools/misc/dashing/default.nix b/pkgs/tools/misc/dashing/default.nix index 673e5c4c321f8854bec35fa81c1d35f927e64c32..a8a878b1998d8f687ea40dd40609188194b129cc 100644 --- a/pkgs/tools/misc/dashing/default.nix +++ b/pkgs/tools/misc/dashing/default.nix @@ -1,5 +1,5 @@ # This file was generated by https://github.com/kamilchm/go2nix v1.2.1 -{ stdenv, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { name = "dashing-unstable-${version}"; diff --git a/pkgs/tools/misc/debootstrap/default.nix b/pkgs/tools/misc/debootstrap/default.nix index 054822e60699c8e7a10a27fc4374acf7ca700b7c..b3a654be04e4a68f8ab7f7a5416ab1689b2f02ca 100644 --- a/pkgs/tools/misc/debootstrap/default.nix +++ b/pkgs/tools/misc/debootstrap/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, dpkg, gettext, gawk, perl, wget, coreutils, fakeroot }: +{ stdenv, fetchurl, dpkg, gettext, gawk, perl, wget, coreutils }: # USAGE like this: debootstrap sid /tmp/target-chroot-directory # There is also cdebootstrap now. Is that easier to maintain? diff --git a/pkgs/tools/misc/direnv/default.nix b/pkgs/tools/misc/direnv/default.nix index e22bce7c69893ac496d0df12aab2a0e0b99c176d..508fc77a9a03b7b08424b9d560bc79b58ed346fe 100644 --- a/pkgs/tools/misc/direnv/default.nix +++ b/pkgs/tools/misc/direnv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildGoPackage, bash, writeText}: +{ stdenv, fetchFromGitHub, buildGoPackage, bash}: buildGoPackage rec { name = "direnv-${version}"; diff --git a/pkgs/tools/misc/dust/default.nix b/pkgs/tools/misc/dust/default.nix index f34d05758cf42d6bf64954627dc353394b163af3..aa23b51f4b894f15a6c56d2b0a70b73734b77546 100644 --- a/pkgs/tools/misc/dust/default.nix +++ b/pkgs/tools/misc/dust/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cargo, rustPlatform }: +{ stdenv, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { name = "dust-${version}"; diff --git a/pkgs/tools/misc/fluentd/default.nix b/pkgs/tools/misc/fluentd/default.nix index 8219d110f2ef38fd885affba1d6b2425a84a32fe..c9ee511ff8309c127a586bc9d7de6f880705b6f6 100644 --- a/pkgs/tools/misc/fluentd/default.nix +++ b/pkgs/tools/misc/fluentd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, bundlerEnv, ruby, curl }: +{ lib, bundlerEnv, ruby }: bundlerEnv { inherit ruby; diff --git a/pkgs/tools/misc/fontforge/default.nix b/pkgs/tools/misc/fontforge/default.nix index 0f6fb38ef3bc4e629885c6b7b466bd084bcf70d5..04717974a8b37c4b14850cabc5e91c860a1bb080 100644 --- a/pkgs/tools/misc/fontforge/default.nix +++ b/pkgs/tools/misc/fontforge/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, lib +{ stdenv, fetchFromGitHub, lib , autoconf, automake, gnum4, libtool, perl, gnulib, uthash, pkgconfig, gettext , python, freetype, zlib, glib, libungif, libpng, libjpeg, libtiff, libxml2, pango , withSpiro ? false, libspiro diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix index ba85c5376db1f194ad35c9c7717482573be892a7..e8e2152f7110fcaa25aee76cb04932655b22ce1a 100644 --- a/pkgs/tools/misc/fzf/default.nix +++ b/pkgs/tools/misc/fzf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, ncurses, buildGoPackage, fetchFromGitHub, writeText }: +{ stdenv, ncurses, buildGoPackage, fetchFromGitHub, writeText }: buildGoPackage rec { name = "fzf-${version}"; diff --git a/pkgs/tools/misc/gams/default.nix b/pkgs/tools/misc/gams/default.nix index 84d3239729f5ba88ac3c0061cde75ade94e0e375..990282b2d584a452acc82148c378939800596770 100644 --- a/pkgs/tools/misc/gams/default.nix +++ b/pkgs/tools/misc/gams/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, lib, file, licenseFile, optgamsFile}: +{ stdenv, fetchurl, unzip, file, licenseFile, optgamsFile}: assert licenseFile != null; diff --git a/pkgs/tools/misc/gawp/default.nix b/pkgs/tools/misc/gawp/default.nix index 7c944ceaab3f271295438c80ca2290b9e75415a7..c187b09624ad2927113bc4fc2b317df2b48e9871 100644 --- a/pkgs/tools/misc/gawp/default.nix +++ b/pkgs/tools/misc/gawp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchgit }: +{ stdenv, buildGoPackage, fetchgit }: with builtins; diff --git a/pkgs/tools/misc/gh-ost/default.nix b/pkgs/tools/misc/gh-ost/default.nix index 24841a2bac792cf0ec737ec98dfa80eab0a5b2bb..a5871d2bc33e65a80d461820a5b8af66eb836958 100644 --- a/pkgs/tools/misc/gh-ost/default.nix +++ b/pkgs/tools/misc/gh-ost/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: let goPackagePath = "github.com/github/gh-ost"; diff --git a/pkgs/tools/misc/gosu/default.nix b/pkgs/tools/misc/gosu/default.nix index 1c1fb05050f18aa4e05811da3ed70350643a878c..d7c10220f4b7c7c7753d7b131d1f2a9e3ad0ec86 100644 --- a/pkgs/tools/misc/gosu/default.nix +++ b/pkgs/tools/misc/gosu/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { name = "gosu-${version}"; diff --git a/pkgs/tools/misc/graylog/plugins.nix b/pkgs/tools/misc/graylog/plugins.nix index 21a624c9d256881b9167312ae4e3b1d0d99249ea..3f476cfea9418441fa87ce68b0b07ed487974514 100644 --- a/pkgs/tools/misc/graylog/plugins.nix +++ b/pkgs/tools/misc/graylog/plugins.nix @@ -1,4 +1,4 @@ -{ pkgs, stdenv, fetchurl, fetchFromGitHub, unzip, graylog }: +{ pkgs, stdenv, fetchurl, unzip, graylog }: with pkgs.lib; diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix index 58c9f18ec5aa54e4a3593f6d7a08c8df43efee8e..63511782f00b673f1fbb1168499e5f2b0aece48b 100644 --- a/pkgs/tools/misc/grub/2.0x.nix +++ b/pkgs/tools/misc/grub/2.0x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchFromSavannah, autogen, flex, bison, python, autoconf, automake +{ stdenv, fetchurl, flex, bison, python , gettext, ncurses, libusb, freetype, qemu, lvm2, unifont, pkgconfig , fuse # only needed for grub-mount , zfs ? null diff --git a/pkgs/tools/misc/hdf5/1_8.nix b/pkgs/tools/misc/hdf5/1_8.nix index 14c8ca234331de168b20d7c1ae5fee21fb37146c..17b48ad8741a68af596a62629961df5e3806dad7 100644 --- a/pkgs/tools/misc/hdf5/1_8.nix +++ b/pkgs/tools/misc/hdf5/1_8.nix @@ -1,6 +1,5 @@ { stdenv , fetchurl -, gcc , removeReferencesTo , cpp ? false , gfortran ? null diff --git a/pkgs/tools/misc/hdf5/default.nix b/pkgs/tools/misc/hdf5/default.nix index 494616d2b48557d6653ec2d258af6b916f87797d..31813c0b880a92bb4631ed78f36af6447a98d32d 100644 --- a/pkgs/tools/misc/hdf5/default.nix +++ b/pkgs/tools/misc/hdf5/default.nix @@ -1,6 +1,5 @@ { stdenv , fetchurl -, gcc , removeReferencesTo , cpp ? false , gfortran ? null diff --git a/pkgs/tools/misc/hdfview/default.nix b/pkgs/tools/misc/hdfview/default.nix index 03af224b4c0513a42dcd93b67c63ef7ee8db7b29..82801da322c6b8e142dc54db00b242c80054e1a3 100644 --- a/pkgs/tools/misc/hdfview/default.nix +++ b/pkgs/tools/misc/hdfview/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, ant, javac, hdf_java }: +{ stdenv, fetchurl, ant, javac, hdf_java }: stdenv.mkDerivation rec { name = "hdfview-${version}"; diff --git a/pkgs/tools/misc/i3cat/default.nix b/pkgs/tools/misc/i3cat/default.nix index 52e7793d9744c3ccf868fe1e95047797282b3eef..7035f2ecedff1c3ad7547c6c3f15adab6fe7dd66 100644 --- a/pkgs/tools/misc/i3cat/default.nix +++ b/pkgs/tools/misc/i3cat/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { name = "i3cat-${version}"; diff --git a/pkgs/tools/misc/libbitcoin/libbitcoin-client.nix b/pkgs/tools/misc/libbitcoin/libbitcoin-client.nix index 8d55b2cdc00ee70509fd7d8a0224ee2d8806d18f..eb3b6aa11e6ab5b1391c557366d7966f9c2e3cb4 100644 --- a/pkgs/tools/misc/libbitcoin/libbitcoin-client.nix +++ b/pkgs/tools/misc/libbitcoin/libbitcoin-client.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, pkgconfig, autoreconfHook +{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook , boost, libbitcoin, libbitcoin-protocol }: let diff --git a/pkgs/tools/misc/libbitcoin/libbitcoin-explorer.nix b/pkgs/tools/misc/libbitcoin/libbitcoin-explorer.nix index e49614834ae3aea1e200423655a342563864bd03..d0395ecbd7f0ba64e8d2251758ae940720405439 100644 --- a/pkgs/tools/misc/libbitcoin/libbitcoin-explorer.nix +++ b/pkgs/tools/misc/libbitcoin/libbitcoin-explorer.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, pkgconfig, autoreconfHook +{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook , boost, libbitcoin-client, libbitcoin-network }: let diff --git a/pkgs/tools/misc/libbitcoin/libbitcoin-network.nix b/pkgs/tools/misc/libbitcoin/libbitcoin-network.nix index c17c99980a88d7e0df49a20ea7a3098a0a9e8646..cb9e2cbf1e8421a2c44e84305db65f0596c63bce 100644 --- a/pkgs/tools/misc/libbitcoin/libbitcoin-network.nix +++ b/pkgs/tools/misc/libbitcoin/libbitcoin-network.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, pkgconfig, autoreconfHook +{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook , boost, libbitcoin, zeromq }: let diff --git a/pkgs/tools/misc/libbitcoin/libbitcoin-protocol.nix b/pkgs/tools/misc/libbitcoin/libbitcoin-protocol.nix index fbfcfc1007407510c616fbb32ec3fcd467f6872d..2c13927dfad8d293429e392e052f145dff3fbf4c 100644 --- a/pkgs/tools/misc/libbitcoin/libbitcoin-protocol.nix +++ b/pkgs/tools/misc/libbitcoin/libbitcoin-protocol.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, pkgconfig, autoreconfHook +{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook , boost, libbitcoin, secp256k1, zeromq }: let diff --git a/pkgs/tools/misc/libbitcoin/libbitcoin.nix b/pkgs/tools/misc/libbitcoin/libbitcoin.nix index f8910f83ec5726c458865641ef5ae8a5b484e36d..18177c0a7e30538ad8af5be4f6f4c162320ded26 100644 --- a/pkgs/tools/misc/libbitcoin/libbitcoin.nix +++ b/pkgs/tools/misc/libbitcoin/libbitcoin.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, pkgconfig, autoreconfHook +{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook , boost, secp256k1 }: let diff --git a/pkgs/tools/misc/massren/default.nix b/pkgs/tools/misc/massren/default.nix index 085e6f41a0915a16c6fe0090731acc8ab15b456f..e2ff4868c9eac8e83c058091d51a2e7e9bce7f90 100644 --- a/pkgs/tools/misc/massren/default.nix +++ b/pkgs/tools/misc/massren/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "massren-${version}"; diff --git a/pkgs/tools/misc/mmake/default.nix b/pkgs/tools/misc/mmake/default.nix index c6f9f4749b347954c9e1719e7ff8fa024bb22382..1d3a355dd95008c6a9a136d719325963cadaeb9f 100644 --- a/pkgs/tools/misc/mmake/default.nix +++ b/pkgs/tools/misc/mmake/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "mmake-${version}"; diff --git a/pkgs/tools/misc/neofetch/default.nix b/pkgs/tools/misc/neofetch/default.nix index 7dbfc90fa12574202a4897079685cc1c70ea7cf1..a076a405ce78741c00ac4b9658f1897b39ffb3fc 100644 --- a/pkgs/tools/misc/neofetch/default.nix +++ b/pkgs/tools/misc/neofetch/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch }: +{ stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { name = "neofetch-${version}"; diff --git a/pkgs/tools/misc/pal/default.nix b/pkgs/tools/misc/pal/default.nix index 267b458cccc67a7f1c9f72567177da4f68b506f2..be96dd9d3d354a231be94601308886194d460efb 100644 --- a/pkgs/tools/misc/pal/default.nix +++ b/pkgs/tools/misc/pal/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ncurses, glib, gettext, readline, pkgconfig }: +{stdenv, fetchurl, glib, gettext, readline, pkgconfig }: stdenv.mkDerivation rec { name = "pal-0.4.3"; diff --git a/pkgs/tools/misc/papis/default.nix b/pkgs/tools/misc/papis/default.nix index 260d96a981f304894c04bdca36d34e5378bbbbe4..52e704eb52e14c159b7e4ed03a28bfc5b57b76c3 100644 --- a/pkgs/tools/misc/papis/default.nix +++ b/pkgs/tools/misc/papis/default.nix @@ -1,4 +1,4 @@ -{ buildPythonApplication, lib, fetchFromGitHub, bashInteractive +{ lib, fetchFromGitHub, bashInteractive , python3, vim }: diff --git a/pkgs/tools/misc/peruse/default.nix b/pkgs/tools/misc/peruse/default.nix index 38cab5cf8623b6a02fead65ccb0154548e3fdb7b..69b60ae0997edfdb13b10d535387f51991781d96 100644 --- a/pkgs/tools/misc/peruse/default.nix +++ b/pkgs/tools/misc/peruse/default.nix @@ -1,5 +1,5 @@ { - mkDerivation, fetchFromGitHub, fetchurl, lib, + mkDerivation, fetchFromGitHub, lib, extra-cmake-modules, kdoctools, wrapGAppsHook, baloo, karchive, kconfig, kcrash, kfilemetadata, kinit, kirigami2, knewstuff, plasma-framework }: diff --git a/pkgs/tools/misc/pipelight/default.nix b/pkgs/tools/misc/pipelight/default.nix index f39ee734d81de3b1937f1981d41e97b70d5f6ab6..c320f8ef5f6aefba51d9780881d52ec8e34f04a0 100644 --- a/pkgs/tools/misc/pipelight/default.nix +++ b/pkgs/tools/misc/pipelight/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, bash, cabextract, curl, gnupg, libX11, libGLU_combined, perl, wineStaging +{ stdenv, fetchurl, bash, cabextract, curl, gnupg, libX11, libGLU_combined, wineStaging }: let diff --git a/pkgs/tools/misc/profile-sync-daemon/default.nix b/pkgs/tools/misc/profile-sync-daemon/default.nix index 670f7067765496d066655a28c1447d7c77bfbec7..c1b99b315677fd595a01fc33524d930a6754a72d 100644 --- a/pkgs/tools/misc/profile-sync-daemon/default.nix +++ b/pkgs/tools/misc/profile-sync-daemon/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, rsync, glibc, gawk }: +{ stdenv, fetchurl }: stdenv.mkDerivation rec { version = "5.53"; diff --git a/pkgs/tools/misc/qt5ct/default.nix b/pkgs/tools/misc/qt5ct/default.nix index c6fdf0a5120e05656854743ab6361902c360eccc..a43335626acf759fe5b732052ba60f4bc073eb49 100644 --- a/pkgs/tools/misc/qt5ct/default.nix +++ b/pkgs/tools/misc/qt5ct/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, qtbase, qtsvg, qttools, qmake }: +{ stdenv, fetchurl, qtbase, qttools, qmake }: let inherit (stdenv.lib) getDev; in diff --git a/pkgs/tools/misc/recutils/default.nix b/pkgs/tools/misc/recutils/default.nix index f1712a43c3be870386d838a073b431942268b46b..a1fa7dee08367408747b60f30334c1b72d9b8d40 100644 --- a/pkgs/tools/misc/recutils/default.nix +++ b/pkgs/tools/misc/recutils/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, gettext, emacs, curl, check, bc }: +{ fetchurl, stdenv, emacs, curl, check, bc }: stdenv.mkDerivation rec { name = "recutils-1.7"; diff --git a/pkgs/tools/misc/s6-portable-utils/default.nix b/pkgs/tools/misc/s6-portable-utils/default.nix index 668a3fd5c9963dd4e747484b52820d4d81724cb0..082eb6879c41029e9bb267c9e58fb77e277ce21f 100644 --- a/pkgs/tools/misc/s6-portable-utils/default.nix +++ b/pkgs/tools/misc/s6-portable-utils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, skalibs, gcc }: +{ stdenv, fetchurl, skalibs }: with stdenv.lib; diff --git a/pkgs/tools/misc/svtplay-dl/default.nix b/pkgs/tools/misc/svtplay-dl/default.nix index f0abb38706b02f20099c2675b1df0ebe3e1951b6..9ba61221684a752406eb162d5dbb15b695325237 100644 --- a/pkgs/tools/misc/svtplay-dl/default.nix +++ b/pkgs/tools/misc/svtplay-dl/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, makeWrapper, pythonPackages, perl, zip -, rtmpdump, substituteAll }: +, rtmpdump }: let inherit (pythonPackages) python nose pycrypto requests mock; diff --git a/pkgs/tools/misc/system-config-printer/default.nix b/pkgs/tools/misc/system-config-printer/default.nix index 9d12fa254d4733b4df2d74d258548c61f99bc446..a58eb3156384770325dacdb42e7c3718b4044129 100644 --- a/pkgs/tools/misc/system-config-printer/default.nix +++ b/pkgs/tools/misc/system-config-printer/default.nix @@ -1,10 +1,9 @@ { stdenv, fetchurl, udev, intltool, pkgconfig, glib, xmlto, wrapGAppsHook -, makeWrapper, gtk3, docbook_xml_dtd_412, docbook_xsl +, docbook_xml_dtd_412, docbook_xsl , libxml2, desktop-file-utils, libusb1, cups, gdk_pixbuf, pango, atk, libnotify , gobjectIntrospection, libsecret , cups-filters , pythonPackages -, withGUI ? true }: stdenv.mkDerivation rec { diff --git a/pkgs/tools/misc/t/default.nix b/pkgs/tools/misc/t/default.nix index b9c93c6395493b5b35c9d938ccf23e0a3452ed44..0ad683bd652c37aa3e944d5fa67b7abf5f3756f4 100644 --- a/pkgs/tools/misc/t/default.nix +++ b/pkgs/tools/misc/t/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, bundlerEnv, ruby }: +{ lib, bundlerEnv, ruby }: bundlerEnv { name = "t-3.1.0"; diff --git a/pkgs/tools/misc/tmuxinator/default.nix b/pkgs/tools/misc/tmuxinator/default.nix index 1f50eef0ed0004511bcb3dfeab5287cb9bc5b777..be6a5070d6117af083ef5a51be656bb03320027c 100644 --- a/pkgs/tools/misc/tmuxinator/default.nix +++ b/pkgs/tools/misc/tmuxinator/default.nix @@ -1,4 +1,4 @@ -{ lib, buildRubyGem, makeWrapper, ruby }: +{ lib, buildRubyGem, ruby }: # Cannot use bundleEnv because bundleEnv create stub with # BUNDLE_FROZEN='1' environment variable set, which broke everything diff --git a/pkgs/tools/misc/tmuxp/default.nix b/pkgs/tools/misc/tmuxp/default.nix index 3932e06192ed6ddbfdd35a128cc74c663ccc979a..dd0fb4de702e36ef5ac92699c794136621d27723 100644 --- a/pkgs/tools/misc/tmuxp/default.nix +++ b/pkgs/tools/misc/tmuxp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python }: +{ stdenv, python }: with python.pkgs; diff --git a/pkgs/tools/misc/toilet/default.nix b/pkgs/tools/misc/toilet/default.nix index 10e481b7664b1db71a13b7f4c7c499289cdd65ce..2729f6f885947d70c8b4ce1363b2d7f7e645202d 100644 --- a/pkgs/tools/misc/toilet/default.nix +++ b/pkgs/tools/misc/toilet/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libcaca, figlet }: +{ stdenv, fetchurl, pkgconfig, libcaca }: stdenv.mkDerivation rec { name = "toilet-${version}"; diff --git a/pkgs/tools/misc/trash-cli/default.nix b/pkgs/tools/misc/trash-cli/default.nix index 113c7e127d4f98c65257e0e46fb094d814127451..7ae871afc783a7d8528fc64fdd7be625c82f6135 100644 --- a/pkgs/tools/misc/trash-cli/default.nix +++ b/pkgs/tools/misc/trash-cli/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, fetchpatch, coreutils -, python3, python3Packages, substituteAll }: +, python3Packages, substituteAll }: python3Packages.buildPythonApplication rec { name = "trash-cli-${version}"; diff --git a/pkgs/tools/misc/upower-notify/default.nix b/pkgs/tools/misc/upower-notify/default.nix index ff8e7873839bb3c28b27dfd074fb4d1ee57d5643..7751e03df1935480f524688e46441656faf6d026 100644 --- a/pkgs/tools/misc/upower-notify/default.nix +++ b/pkgs/tools/misc/upower-notify/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, buildGoPackage, fetchgit }: # To use upower-notify, the maintainer suggests adding something like this to your configuration.nix: # diff --git a/pkgs/tools/misc/urjtag/default.nix b/pkgs/tools/misc/urjtag/default.nix index 25687a3dbe1e1780f7fe7a370eb8f8964c39a46f..48edb601a43f00480a4a5025c5de32f8867d99ab 100644 --- a/pkgs/tools/misc/urjtag/default.nix +++ b/pkgs/tools/misc/urjtag/default.nix @@ -1,4 +1,4 @@ -{ stdenv, autoconf, automake, pkgconfig, gettext, intltool, libtool, bison +{ stdenv, autoconf, automake, pkgconfig, gettext, libtool, bison , flex, which, subversion, fetchsvn, makeWrapper, libftdi, libusb, readline , python3 , svfSupport ? false diff --git a/pkgs/tools/misc/watchexec/default.nix b/pkgs/tools/misc/watchexec/default.nix index 2b801bb74a4200ef874a7b673787132ceb4824e5..b1704c3b46c615968bfcd2d23163ca25208f8abe 100644 --- a/pkgs/tools/misc/watchexec/default.nix +++ b/pkgs/tools/misc/watchexec/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, rustPlatform, fetchFromGitHub }: +{ stdenv, rustPlatform, fetchFromGitHub }: with rustPlatform; diff --git a/pkgs/tools/misc/xfstests/default.nix b/pkgs/tools/misc/xfstests/default.nix index 80a728747fefb757ad5aaf13161aa8fe6638a4a6..e03f84355cad244008319ce644b6fd3557e03d0e 100644 --- a/pkgs/tools/misc/xfstests/default.nix +++ b/pkgs/tools/misc/xfstests/default.nix @@ -1,6 +1,6 @@ { stdenv, acl, attr, autoconf, automake, bash, bc, coreutils, e2fsprogs , fetchgit, fio, gawk, keyutils, killall, lib, libaio, libcap, libtool -, libuuid, libxfs, lvm2, openssl, perl, procps, quota, su +, libuuid, libxfs, lvm2, openssl, perl, procps, quota , time, utillinux, which, writeScript, xfsprogs }: stdenv.mkDerivation { diff --git a/pkgs/tools/misc/xvfb-run/default.nix b/pkgs/tools/misc/xvfb-run/default.nix index 80135f4ab4474b9421fa266ad800d2f439e39537..c4cfc00308e91bf880853d271c166733e162ed03 100644 --- a/pkgs/tools/misc/xvfb-run/default.nix +++ b/pkgs/tools/misc/xvfb-run/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, xkbcomp, xorgserver, getopt +{ stdenv, fetchurl, makeWrapper, xorgserver, getopt , xauth, utillinux, which, fontsConf, gawk, coreutils }: let xvfb_run = fetchurl { diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index 90489e126fa55964898887b3145c23af83e72494..be6bacd3b2142fbaf5b650da788d552a1814f6a2 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, targetPlatform, fetchurl, buildPythonPackage +{ lib, fetchurl, buildPythonPackage , zip, ffmpeg, rtmpdump, phantomjs2, atomicparsley, pycryptodome, pandoc # Pandoc is required to build the package's man page. Release tarballs contain a # formatted man page already, though, it will still be installed. We keep the diff --git a/pkgs/tools/misc/yubikey-neo-manager/default.nix b/pkgs/tools/misc/yubikey-neo-manager/default.nix index 528f9aecb54fa20787dce54538efdd46207e01b4..acc0bac04ff6e01438e904d7f7ca01ec54b5c977 100644 --- a/pkgs/tools/misc/yubikey-neo-manager/default.nix +++ b/pkgs/tools/misc/yubikey-neo-manager/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, python27Packages +{ stdenv, fetchurl, python27Packages , libykneomgr, yubikey-personalization, libu2f-host }: python27Packages.buildPythonPackage rec { diff --git a/pkgs/tools/misc/zsh-autoenv/default.nix b/pkgs/tools/misc/zsh-autoenv/default.nix index 492b72a176edba5d2041b271bfe9fe186f1abae0..589e6717c7dc6df6ab322b94e874e7021f929b37 100644 --- a/pkgs/tools/misc/zsh-autoenv/default.nix +++ b/pkgs/tools/misc/zsh-autoenv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, bash }: +{ stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { name = "zsh-autoenv-${version}"; diff --git a/pkgs/tools/networking/airfield/default.nix b/pkgs/tools/networking/airfield/default.nix index 93535e935dc8e907fff7f3126e63a8dc02dde5d0..6f6009c107bac53df3c9e39eb4fab2f084ce469c 100644 --- a/pkgs/tools/networking/airfield/default.nix +++ b/pkgs/tools/networking/airfield/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, callPackage, python, utillinux +{ stdenv, fetchFromGitHub , pkgs, makeWrapper, buildEnv , nodejs }: diff --git a/pkgs/tools/networking/argus/default.nix b/pkgs/tools/networking/argus/default.nix index e5c2aace400607aa85ebd103155365ae841374a3..8b9d1e3b704c8a9ff1000c2d2d657ddd01e43d70 100644 --- a/pkgs/tools/networking/argus/default.nix +++ b/pkgs/tools/networking/argus/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, libpcap, bison, flex, cyrus_sasl, tcp_wrappers, - pkgconfig, procps, which, wget, lsof, net_snmp, bash, perl }: + pkgconfig, procps, which, wget, lsof, net_snmp, perl }: stdenv.mkDerivation rec { pname = "argus"; diff --git a/pkgs/tools/networking/assh/default.nix b/pkgs/tools/networking/assh/default.nix index 7af7a8f551d1230e088bce73a59bd49d255a4e07..7904ffb0d04e4620c41e3b44d4064025c4862d05 100644 --- a/pkgs/tools/networking/assh/default.nix +++ b/pkgs/tools/networking/assh/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub, openssh, makeWrapper }: +{ stdenv, buildGoPackage, fetchFromGitHub, openssh, makeWrapper }: buildGoPackage rec { name = "assh-${version}"; diff --git a/pkgs/tools/networking/cmst/default.nix b/pkgs/tools/networking/cmst/default.nix index 1d9e2e1677fddaa4df5c42ece4dea380e62e1a49..e20d62d1f077da0f4f64a1d49331a07ed11737b0 100644 --- a/pkgs/tools/networking/cmst/default.nix +++ b/pkgs/tools/networking/cmst/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, qmake, qtbase, libX11 }: +{ stdenv, fetchFromGitHub, qmake, qtbase }: stdenv.mkDerivation rec { name = "cmst-${version}"; diff --git a/pkgs/tools/networking/connman/default.nix b/pkgs/tools/networking/connman/default.nix index f6e0608ca7f8c85348573ec9b7d736de68fa6a38..e960f8c3a84854ffa65b20c6c1bbf3ebca1f9155 100644 --- a/pkgs/tools/networking/connman/default.nix +++ b/pkgs/tools/networking/connman/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, openconnect, file, gawk, +{ stdenv, fetchurl, pkgconfig, openconnect, file, gawk, openvpn, vpnc, glib, dbus, iptables, gnutls, polkit, wpa_supplicant, readline6, pptp, ppp }: diff --git a/pkgs/tools/networking/dd-agent/default.nix b/pkgs/tools/networking/dd-agent/default.nix index 1038882573bcd4c9124d2e7761e8188fe12a0232..ff4a24fb781075f491d5f30c874db200664dc8b1 100644 --- a/pkgs/tools/networking/dd-agent/default.nix +++ b/pkgs/tools/networking/dd-agent/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, pythonPackages -, sysstat, unzip, makeWrapper }: +, unzip, makeWrapper }: let inherit (pythonPackages) python; docker_1_10 = pythonPackages.buildPythonPackage rec { diff --git a/pkgs/tools/networking/dnsmasq/default.nix b/pkgs/tools/networking/dnsmasq/default.nix index be14db79880f83a4816fde9ba3e976d919d0a38d..9adb95d1d3fbd2aa37575ffc64cc6bf0c2149227 100644 --- a/pkgs/tools/networking/dnsmasq/default.nix +++ b/pkgs/tools/networking/dnsmasq/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, dbus, nettle -, libidn, libnetfilter_conntrack, fetchpatch }: +, libidn, libnetfilter_conntrack }: with stdenv.lib; let diff --git a/pkgs/tools/networking/flannel/default.nix b/pkgs/tools/networking/flannel/default.nix index 732051d8ec78b3a436053af79bb26a604ac170dc..e440d35e82106f0408651ff02fbd0e8177ac2593 100644 --- a/pkgs/tools/networking/flannel/default.nix +++ b/pkgs/tools/networking/flannel/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: with lib; diff --git a/pkgs/tools/networking/i2pd/default.nix b/pkgs/tools/networking/i2pd/default.nix index c7d7b5ec6dfd2a8cd41c2f5114399516237888a0..12f68af7d0a6ea79b708f276864a10acea8ab6b1 100644 --- a/pkgs/tools/networking/i2pd/default.nix +++ b/pkgs/tools/networking/i2pd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch +{ stdenv, fetchFromGitHub , boost, zlib, openssl , upnpSupport ? true, miniupnpc ? null , aesniSupport ? false diff --git a/pkgs/tools/networking/inadyn/default.nix b/pkgs/tools/networking/inadyn/default.nix index 9d588f6fa5e11783a2eff7567006784ce9c4f8bb..2bd76188a638fa2961a5a3c4b19bf7dfcf385ab0 100644 --- a/pkgs/tools/networking/inadyn/default.nix +++ b/pkgs/tools/networking/inadyn/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, pkgconfig +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig , gnutls, libite, libconfuse }: stdenv.mkDerivation rec { diff --git a/pkgs/tools/networking/ipv6calc/default.nix b/pkgs/tools/networking/ipv6calc/default.nix index f28c75774db56dfb9c71398729ea10329990c878..c66218c48986c5bccb53d1864e29509dcc223b4b 100644 --- a/pkgs/tools/networking/ipv6calc/default.nix +++ b/pkgs/tools/networking/ipv6calc/default.nix @@ -1,6 +1,5 @@ { stdenv, fetchurl, getopt, ip2location-c, openssl, perl -, geoip ? null, geolite-legacy ? null -, ip2location-database ? null }: +, geoip ? null, geolite-legacy ? null }: stdenv.mkDerivation rec { name = "ipv6calc-${version}"; diff --git a/pkgs/tools/networking/maxscale/default.nix b/pkgs/tools/networking/maxscale/default.nix index 425e531419e4649b3be06f4aecff88d5eb6c291b..a7648fd59c35232b9a393d21e1af3f1b26b57e72 100644 --- a/pkgs/tools/networking/maxscale/default.nix +++ b/pkgs/tools/networking/maxscale/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, gcc, glibc +{ stdenv, fetchFromGitHub, cmake, pkgconfig, glibc , bison2, curl, flex, gperftools, jansson, jemalloc, kerberos, lua, mariadb , ncurses, openssl, pcre, pcre2, perl, rabbitmq-c, sqlite, tcl , libaio, libedit, libtool, libui, libuuid, zlib diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix index 85c285fd3ece104f8221b1419632301b7e3ed05a..62c9e7b63d16f5b8b401e683a3aab7fae3af7c1d 100644 --- a/pkgs/tools/networking/network-manager/default.nix +++ b/pkgs/tools/networking/network-manager/default.nix @@ -2,7 +2,7 @@ , systemd, libuuid, polkit, gnutls, ppp, dhcp, iptables , libgcrypt, dnsmasq, bluez5, readline , gobjectIntrospection, modemmanager, openresolv, libndp, newt, libsoup -, ethtool, iputils, gnused, coreutils, file, inetutils, kmod, jansson, libxslt +, ethtool, gnused, coreutils, file, inetutils, kmod, jansson, libxslt , python3Packages, docbook_xsl, openconnect, curl, autoreconfHook }: let diff --git a/pkgs/tools/networking/network-manager/dmenu.nix b/pkgs/tools/networking/network-manager/dmenu.nix index 82810e714d52b4ee96a9dbcadef3e3da363232a5..93827eebb571897ae96c6cb4e2abe35955af94a9 100644 --- a/pkgs/tools/networking/network-manager/dmenu.nix +++ b/pkgs/tools/networking/network-manager/dmenu.nix @@ -1,5 +1,5 @@ { stdenv, glib, fetchFromGitHub, networkmanager, python3Packages -, gobjectIntrospection, dmenu }: +, gobjectIntrospection }: let inherit (python3Packages) python pygobject3; in stdenv.mkDerivation rec { diff --git a/pkgs/tools/networking/network-manager/fortisslvpn.nix b/pkgs/tools/networking/network-manager/fortisslvpn.nix index 73aaea06c9176c7735c697b0ddf6168454558aa4..54046a23b7df4a0eba362cc80f612daf29263ddf 100644 --- a/pkgs/tools/networking/network-manager/fortisslvpn.nix +++ b/pkgs/tools/networking/network-manager/fortisslvpn.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, openfortivpn, automake, autoconf, libtool, intltool, pkgconfig, -networkmanager, ppp, lib, libsecret, withGnome ? true, gnome3, procps, kmod }: +networkmanager, ppp, libsecret, withGnome ? true, gnome3 }: let pname = "NetworkManager-fortisslvpn"; diff --git a/pkgs/tools/networking/network-manager/openvpn/default.nix b/pkgs/tools/networking/network-manager/openvpn/default.nix index 2eef7f31ab555ae2f7b4fa85437e3c1d54807174..28b7c873d364acc967aa3f055ca3e2b630297f1a 100644 --- a/pkgs/tools/networking/network-manager/openvpn/default.nix +++ b/pkgs/tools/networking/network-manager/openvpn/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, substituteAll, openvpn, intltool, libxml2, pkgconfig, networkmanager, libsecret -, withGnome ? true, gnome3, procps, kmod }: +, withGnome ? true, gnome3, kmod }: let pname = "NetworkManager-openvpn"; diff --git a/pkgs/tools/networking/ngrok-1/default.nix b/pkgs/tools/networking/ngrok-1/default.nix index e354ad223b8cd170c50b6c65614d926fc57dacb0..26bcc8f803f19e452fe63bcfbca468f308b4ce3b 100644 --- a/pkgs/tools/networking/ngrok-1/default.nix +++ b/pkgs/tools/networking/ngrok-1/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, pkgconfig, buildGoPackage, go-bindata, fetchFromGitHub }: +{ buildGoPackage, go-bindata, fetchFromGitHub }: buildGoPackage rec { name = "ngrok-${version}"; diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index 46c0ee0f27684072eaaca2c422c2b3550068d210..04a77176682d71685b92bd7a812b90f7cadd7047 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, zlib, openssl, perl, libedit, pkgconfig, pam, autoreconfHook +{ stdenv, fetchurl, fetchpatch, zlib, openssl, libedit, pkgconfig, pam, autoreconfHook , etcDir ? null , hpnSupport ? false , withKerberos ? true diff --git a/pkgs/tools/networking/s3gof3r/default.nix b/pkgs/tools/networking/s3gof3r/default.nix index a13d6599ffb01ec4f30007d65332079c2bf73fad..3814af60112e09e3c5f7ffbf4cccc6888362ca8f 100644 --- a/pkgs/tools/networking/s3gof3r/default.nix +++ b/pkgs/tools/networking/s3gof3r/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { name = "s3gof3r-${version}"; diff --git a/pkgs/tools/networking/shadowsocks-libev/default.nix b/pkgs/tools/networking/shadowsocks-libev/default.nix index d2e8a9a30519754a076e9c48d59beb997defa3b8..09fa69dd37c4e50f8a3ebe252f670fe685ce255b 100644 --- a/pkgs/tools/networking/shadowsocks-libev/default.nix +++ b/pkgs/tools/networking/shadowsocks-libev/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchgit, cmake +{ stdenv, fetchgit, cmake , libsodium, mbedtls, libev, c-ares, pcre , asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt }: diff --git a/pkgs/tools/networking/skydive/default.nix b/pkgs/tools/networking/skydive/default.nix index ce2a8cf6a7f358c01411ae63a88dd848b6122b7d..e721479374454aa24046b59185a7d0ef233124e2 100644 --- a/pkgs/tools/networking/skydive/default.nix +++ b/pkgs/tools/networking/skydive/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub, perl +{ lib, buildGoPackage, fetchFromGitHub, perl , go-bindata, libxml2, protobuf3_1, libpcap, pkgconfig, go-protobuf }: buildGoPackage rec { diff --git a/pkgs/tools/networking/srelay/default.nix b/pkgs/tools/networking/srelay/default.nix index a3f08cb5a0771223ae144745abb922a2577a758f..7d3f773b1930bfecadc4eab6d3112b514b3b005c 100644 --- a/pkgs/tools/networking/srelay/default.nix +++ b/pkgs/tools/networking/srelay/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openssl }: +{ stdenv, fetchurl }: stdenv.mkDerivation rec { name = "srelay-0.4.8"; diff --git a/pkgs/tools/networking/tcpdump/default.nix b/pkgs/tools/networking/tcpdump/default.nix index 59cc89ac57274dcd7c3f1944ce41d1c055a1145b..8b4850a6347cbb089f91499e0b5ab1022176e149 100644 --- a/pkgs/tools/networking/tcpdump/default.nix +++ b/pkgs/tools/networking/tcpdump/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, libpcap }: +{ stdenv, fetchurl, libpcap }: stdenv.mkDerivation rec { name = "tcpdump-${version}"; diff --git a/pkgs/tools/networking/tcptraceroute/default.nix b/pkgs/tools/networking/tcptraceroute/default.nix index 9e13cfc59c1caa096e8b0baff7b4059d0c2f65e7..cfb627e8b3b9dcf4b034b36ee7494567c395546d 100644 --- a/pkgs/tools/networking/tcptraceroute/default.nix +++ b/pkgs/tools/networking/tcptraceroute/default.nix @@ -1,4 +1,4 @@ -{ stdenv , pkgs , fetchurl, libpcap, libnet +{ stdenv , fetchurl, libpcap, libnet }: stdenv.mkDerivation rec { diff --git a/pkgs/tools/networking/tftp-hpa/default.nix b/pkgs/tools/networking/tftp-hpa/default.nix index b9abba2cd0da34330e52b76fd3ff3d8883f20750..bc97d5d8d6e411ca773726ceb96be06d0ea3acf0 100644 --- a/pkgs/tools/networking/tftp-hpa/default.nix +++ b/pkgs/tools/networking/tftp-hpa/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, tcp_wrappers }: +{ stdenv, fetchurl }: stdenv.mkDerivation rec { name = "tftp-hpa-${version}"; diff --git a/pkgs/tools/networking/tinc/pre.nix b/pkgs/tools/networking/tinc/pre.nix index db4b6a2281d4843cfbf56c3f72ca1a13d4b9a9d7..09c737c048ae29100236de157c5da1d6e34236af 100644 --- a/pkgs/tools/networking/tinc/pre.nix +++ b/pkgs/tools/networking/tinc/pre.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, fetchpatch, autoreconfHook, texinfo, ncurses, readline, zlib, lzo, openssl }: +{ stdenv, fetchgit, autoreconfHook, texinfo, ncurses, readline, zlib, lzo, openssl }: stdenv.mkDerivation rec { name = "tinc-${version}"; diff --git a/pkgs/tools/networking/ua/default.nix b/pkgs/tools/networking/ua/default.nix index 5fe69ede1a7df5e11e00b379a9721ac09d110c19..ea40a541a22411c4e403803c081df0cd91da871c 100644 --- a/pkgs/tools/networking/ua/default.nix +++ b/pkgs/tools/networking/ua/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn +{ stdenv, buildGoPackage, fetchgit , pkgconfig , glib, libxml2 }: diff --git a/pkgs/tools/networking/wicd/default.nix b/pkgs/tools/networking/wicd/default.nix index fe315666a2ea2df4c633b889539017a2b0eecf1a..9f67dd4e2c30290540afc289d5d6f969cf267226 100644 --- a/pkgs/tools/networking/wicd/default.nix +++ b/pkgs/tools/networking/wicd/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchurl, python2Packages , wpa_supplicant, dhcp, dhcpcd, wirelesstools -, nettools, openresolv, iproute, iputils -, locale ? "C" }: +, nettools, openresolv, iproute, iputils }: let inherit (python2Packages) python pygobject2 dbus-python pyGtkGlade pycairo; diff --git a/pkgs/tools/networking/zap/default.nix b/pkgs/tools/networking/zap/default.nix index 263a44615305d6a38ffcc3574fa17f0600675bbb..7dc0e07f9451985cf05391095d2a11c9680d5e4c 100644 --- a/pkgs/tools/networking/zap/default.nix +++ b/pkgs/tools/networking/zap/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, jre, jdk, ant }: +{ stdenv, fetchFromGitHub, jdk, ant }: stdenv.mkDerivation rec { name = "zap-${version}"; diff --git a/pkgs/tools/package-management/nix-prefetch-scripts/default.nix b/pkgs/tools/package-management/nix-prefetch-scripts/default.nix index a2ff38ab3004e3fde47b5dd87aaa94e8f09a6cdf..69e978d3439de06955d2aba9437d55a4270d2499 100644 --- a/pkgs/tools/package-management/nix-prefetch-scripts/default.nix +++ b/pkgs/tools/package-management/nix-prefetch-scripts/default.nix @@ -1,5 +1,5 @@ { stdenv, makeWrapper, buildEnv, - git, subversion, mercurial, bazaar, cvs, unzip, curl, gnused, coreutils, nix + git, subversion, mercurial, bazaar, cvs, gnused, coreutils, nix }: let mkPrefetchScript = tool: src: deps: diff --git a/pkgs/tools/package-management/nix-repl/default.nix b/pkgs/tools/package-management/nix-repl/default.nix index facf47ebca675f44de0296f5ec3924d78c195c93..9fe6ec6e291b7ca5a5fb23360dd4a4f7f6fbb1a5 100644 --- a/pkgs/tools/package-management/nix-repl/default.nix +++ b/pkgs/tools/package-management/nix-repl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, nix, readline, boehmgc }: +{ lib, stdenv, fetchFromGitHub, nix, readline }: let rev = "a1ea85e92b067a0a42354a28355c633eac7be65c"; in diff --git a/pkgs/tools/package-management/nix-serve/default.nix b/pkgs/tools/package-management/nix-serve/default.nix index d03e6f614e5750fc8f8b7316117859267ba2dab6..660dce347a5b0a0bbf62e666c0776cbe7d27b0cf 100644 --- a/pkgs/tools/package-management/nix-serve/default.nix +++ b/pkgs/tools/package-management/nix-serve/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, +{ stdenv, fetchFromGitHub, bzip2, nix, perl, perlPackages, }: diff --git a/pkgs/tools/package-management/nixops/generic.nix b/pkgs/tools/package-management/nixops/generic.nix index da62eba63fd373b8f0966010b2b1c46fbb929754..105cb6d7ab0fc9ca255932db9520fd0f38227dbf 100644 --- a/pkgs/tools/package-management/nixops/generic.nix +++ b/pkgs/tools/package-management/nixops/generic.nix @@ -1,4 +1,4 @@ -{ lib, python2Packages, fetchurl, libxslt, docbook_xsl_ns, openssh +{ lib, python2Packages, libxslt, docbook_xsl_ns, openssh # version args , src, version }: diff --git a/pkgs/tools/package-management/nixops/nixops-dns.nix b/pkgs/tools/package-management/nixops/nixops-dns.nix index 27edfa890fcf019d991474a88b1904e23f6e2f58..ce31de9f65d3b9d22a4e49aacb10a19ffa4bb66f 100644 --- a/pkgs/tools/package-management/nixops/nixops-dns.nix +++ b/pkgs/tools/package-management/nixops/nixops-dns.nix @@ -1,5 +1,4 @@ { lib -, stdenv , buildGoPackage , fetchFromGitHub }: diff --git a/pkgs/tools/package-management/nixui/default.nix b/pkgs/tools/package-management/nixui/default.nix index 2d1e1fb326ae640563e97a3564a12e6f5059cc62..6f46b39e65b17f8d34da074ff450429d1207e0ac 100644 --- a/pkgs/tools/package-management/nixui/default.nix +++ b/pkgs/tools/package-management/nixui/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgs, fetchgit, nix, node_webkit, config, makeDesktopItem +{ stdenv, pkgs, fetchgit, nix, node_webkit, makeDesktopItem , writeScript }: let version = "0.2.1"; diff --git a/pkgs/tools/package-management/packagekit/qt.nix b/pkgs/tools/package-management/packagekit/qt.nix index c38ef25f3548c9753992a1648acf92a0e0dd1569..f0f05a4c858e8a8e7269dad2ffeecae55c8c4cdf 100644 --- a/pkgs/tools/package-management/packagekit/qt.nix +++ b/pkgs/tools/package-management/packagekit/qt.nix @@ -1,5 +1,5 @@ -{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig -, qtbase, qttools, packagekit }: +{ stdenv, fetchFromGitHub, cmake, pkgconfig +, qttools, packagekit }: stdenv.mkDerivation rec { name = "packagekit-qt-${version}"; diff --git a/pkgs/tools/security/afl/default.nix b/pkgs/tools/security/afl/default.nix index 1ff0ad6f6b686b325dd04c2ba8f2d2223d33878c..c61cbeb32682d131c6ac58d8b3a8d3e3c60e0165 100644 --- a/pkgs/tools/security/afl/default.nix +++ b/pkgs/tools/security/afl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, bash, callPackage, makeWrapper +{ stdenv, fetchurl, callPackage, makeWrapper , clang, llvm, which, libcgroup }: diff --git a/pkgs/tools/security/afl/qemu.nix b/pkgs/tools/security/afl/qemu.nix index d21500960fecacb0fd0928b99802633d8366040a..7637dcf246af068319c8273c48d7c5ebef5de418 100644 --- a/pkgs/tools/security/afl/qemu.nix +++ b/pkgs/tools/security/afl/qemu.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, python2, zlib, pkgconfig, glib, ncurses, perl -, attr, libcap, vde2, alsaLib, texinfo, libuuid, flex, bison, lzo, snappy +, attr, libcap, vde2, texinfo, libuuid, flex, bison, lzo, snappy , libaio, libcap_ng, gnutls, pixman, autoconf , writeText }: diff --git a/pkgs/tools/security/cfssl/default.nix b/pkgs/tools/security/cfssl/default.nix index 91a5fa4bdd24a1e923c7f86dc553ae3f6400d59f..b3c256ae59bf1c9d09c241acce205a7caf15ff45 100644 --- a/pkgs/tools/security/cfssl/default.nix +++ b/pkgs/tools/security/cfssl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub, pkgs }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "cfssl-${version}"; diff --git a/pkgs/tools/security/cipherscan/default.nix b/pkgs/tools/security/cipherscan/default.nix index 859c1fdf49a07edea3c726e841dd10160cdf2532..a4afa772d10e1ef1120bda28731cc3b2e0e4ccb1 100644 --- a/pkgs/tools/security/cipherscan/default.nix +++ b/pkgs/tools/security/cipherscan/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, pkgconfig, openssl, makeWrapper, python, coreutils }: +{ stdenv, lib, fetchFromGitHub, openssl, makeWrapper, python, coreutils }: stdenv.mkDerivation rec { name = "cipherscan-${version}"; diff --git a/pkgs/tools/security/clamav/default.nix b/pkgs/tools/security/clamav/default.nix index 79644d3577459edf3dc4b21810e9b5db42d4e305..825993937246ebb664eb5113d022c16c05061938 100644 --- a/pkgs/tools/security/clamav/default.nix +++ b/pkgs/tools/security/clamav/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig +{ stdenv, fetchurl, pkgconfig , zlib, bzip2, libiconv, libxml2, openssl, ncurses, curl, libmilter, pcre2 , libmspack, systemd }: diff --git a/pkgs/tools/security/diceware/default.nix b/pkgs/tools/security/diceware/default.nix index 07061aa0d11729eef98dc5b2d4b2e33d7900692a..32819b603f90b92cec7c6cda34003c0ee23c5766 100644 --- a/pkgs/tools/security/diceware/default.nix +++ b/pkgs/tools/security/diceware/default.nix @@ -1,6 +1,5 @@ { lib , pythonPackages -, fetchpatch }: with pythonPackages; diff --git a/pkgs/tools/security/enpass/default.nix b/pkgs/tools/security/enpass/default.nix index f27f9af59c68f77e01dff03c8d8f63f931dcdd35..b99087e475d2cf8d811e1aef263c8cfdf1084fc1 100644 --- a/pkgs/tools/security/enpass/default.nix +++ b/pkgs/tools/security/enpass/default.nix @@ -1,7 +1,7 @@ {stdenv, system, fetchurl, dpkg, openssl, xorg , glib, libGLU_combined, libpulseaudio, zlib, dbus, fontconfig, freetype , gtk2, pango, atk, cairo, gdk_pixbuf, jasper, xkeyboardconfig -, makeWrapper , makeDesktopItem, python, pythonPackages, lib +, makeWrapper , python, pythonPackages, lib , libredirect, lsof}: let diff --git a/pkgs/tools/security/gnupg/22.nix b/pkgs/tools/security/gnupg/22.nix index b0381b32bcfec432123ee1a668aab7535f763b95..fd773da4adea47d3cb508ad452831341215b1a6f 100644 --- a/pkgs/tools/security/gnupg/22.nix +++ b/pkgs/tools/security/gnupg/22.nix @@ -1,4 +1,4 @@ -{ fetchurl, fetchpatch, stdenv, pkgconfig, libgcrypt, libassuan, libksba +{ fetchurl, stdenv, pkgconfig, libgcrypt, libassuan, libksba , libiconv, npth, gettext, texinfo, pcsclite, sqlite # Each of the dependencies below are optional. diff --git a/pkgs/tools/security/gorilla-bin/default.nix b/pkgs/tools/security/gorilla-bin/default.nix index cbd260455d8ec09fafd3be33878ddceea3f5876e..df9d42211f6c87bc7c2ceca47020baa9c520bd1e 100644 --- a/pkgs/tools/security/gorilla-bin/default.nix +++ b/pkgs/tools/security/gorilla-bin/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, makeWrapper, patchelf, pkgs, stdenv, libXft, libX11, freetype, fontconfig, libXrender, libXScrnSaver, libXext }: +{ fetchurl, makeWrapper, patchelf, stdenv, libXft, libX11, freetype, fontconfig, libXrender, libXScrnSaver, libXext }: stdenv.mkDerivation rec { name = "gorilla-bin-${version}"; diff --git a/pkgs/tools/security/hash-slinger/default.nix b/pkgs/tools/security/hash-slinger/default.nix index fd78d9b2efbf39fe8cf84a00b999029af4a56857..385a201d88b0174bb220a56e403908412f131d9b 100644 --- a/pkgs/tools/security/hash-slinger/default.nix +++ b/pkgs/tools/security/hash-slinger/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pythonPackages, openssh, gnupg, unbound, libreswan }: +{ stdenv, fetchFromGitHub, pythonPackages, unbound, libreswan }: let inherit (pythonPackages) python; diff --git a/pkgs/tools/security/hologram/default.nix b/pkgs/tools/security/hologram/default.nix index 5d873885b1fdfc8011889f73486a4c7f84218442..e6c375599a92c9a0652f5147c1a835189a6cdc37 100644 --- a/pkgs/tools/security/hologram/default.nix +++ b/pkgs/tools/security/hologram/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "hologram-2018-03-19"; diff --git a/pkgs/tools/security/jd-gui/default.nix b/pkgs/tools/security/jd-gui/default.nix index d9617e3eb2bafe5a6313a4ce7b89f2571978675b..62b92b7d0bddb34bc12d57c61bfa28c18416db66 100644 --- a/pkgs/tools/security/jd-gui/default.nix +++ b/pkgs/tools/security/jd-gui/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gradle_2_5, perl, makeWrapper, jre, makeDesktopItem, writeShellScriptBin, writeText }: +{ stdenv, fetchurl, gradle_2_5, perl, makeWrapper, jre, makeDesktopItem, writeText }: let version = "1.4.0"; diff --git a/pkgs/tools/security/john/default.nix b/pkgs/tools/security/john/default.nix index e55e97656f637944e98fb362ec70caf8e13c954b..862b4a0df6e2a8d4e51b582b86e3c1031145bb04 100644 --- a/pkgs/tools/security/john/default.nix +++ b/pkgs/tools/security/john/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, openssl, nss, nspr, kerberos, gmp, zlib, libpcap, re2 -, writeText, gcc, pythonPackages, perl, perlPackages, makeWrapper +, gcc, pythonPackages, perl, perlPackages, makeWrapper }: with stdenv.lib; diff --git a/pkgs/tools/security/keybase/gui.nix b/pkgs/tools/security/keybase/gui.nix index 1a7cf30b9528dc09f5a5973b4c92837730c53bd6..549794b7831345a413ba976f94ca85b7e7efb151 100644 --- a/pkgs/tools/security/keybase/gui.nix +++ b/pkgs/tools/security/keybase/gui.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, buildFHSUserEnv, writeTextFile, alsaLib, atk, cairo, cups +{ stdenv, fetchurl, alsaLib, atk, cairo, cups , dbus, expat, fontconfig, freetype, gcc, gdk_pixbuf, glib, gnome2, gtk3 -, libnotify, nspr, nss, pango, systemd, xorg, utillinuxMinimal }: +, libnotify, nspr, nss, pango, systemd, xorg }: let libPath = stdenv.lib.makeLibraryPath [ diff --git a/pkgs/tools/security/pass/default.nix b/pkgs/tools/security/pass/default.nix index c7e9267dde71f7a101b4487a3a12558514ea9fa1..007414d68a5e62577d872fbc15182cb986c85095 100644 --- a/pkgs/tools/security/pass/default.nix +++ b/pkgs/tools/security/pass/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, pkgs, fetchurl, fetchFromGitHub, buildEnv +{ stdenv, lib, pkgs, fetchurl, buildEnv , coreutils, gnused, getopt, git, tree, gnupg, which, procps, qrencode , makeWrapper diff --git a/pkgs/tools/security/pinentry/mac.nix b/pkgs/tools/security/pinentry/mac.nix index b198d7446a924b9266a8a7877c25e6bf65d58f02..4acdd6cb897e4e7a1bd01eed6093fe8e618f2f04 100644 --- a/pkgs/tools/security/pinentry/mac.nix +++ b/pkgs/tools/security/pinentry/mac.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, fetchFromGitHub, xcbuildHook, libiconv, Cocoa, ncurses }: +{ stdenv, fetchFromGitHub, xcbuildHook, libiconv, Cocoa, ncurses }: stdenv.mkDerivation rec { name = "pinentry-mac-0.9.4"; diff --git a/pkgs/tools/security/qesteidutil/default.nix b/pkgs/tools/security/qesteidutil/default.nix index 0c6d15e7d776f1c5361a0c1f7c2105790f688fa7..016017205ab43de051ad59afeedef487b7e688c8 100644 --- a/pkgs/tools/security/qesteidutil/default.nix +++ b/pkgs/tools/security/qesteidutil/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch +{ stdenv, fetchFromGitHub , cmake, ccid, qttools, qttranslations , pkgconfig, pcsclite, hicolor-icon-theme }: diff --git a/pkgs/tools/security/saml2aws/default.nix b/pkgs/tools/security/saml2aws/default.nix index bf5f9116f08cb2c33e3d7ae04a901746f7282c86..047706cd8a68dbbe4d7244cdbfc4f1fb6c926cf2 100644 --- a/pkgs/tools/security/saml2aws/default.nix +++ b/pkgs/tools/security/saml2aws/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "saml2aws-${version}"; diff --git a/pkgs/tools/security/sops/default.nix b/pkgs/tools/security/sops/default.nix index 26faf2c730c64689187645e99cc124e02633397d..bbcfc4c78907f0743f8618e027bb5b1e74dabd73 100644 --- a/pkgs/tools/security/sops/default.nix +++ b/pkgs/tools/security/sops/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "sops-${version}"; diff --git a/pkgs/tools/security/ssdeep/default.nix b/pkgs/tools/security/ssdeep/default.nix index 0a9804a743bc30112cb47d3168599f3d3f8121a6..50b16ad58399e4afdc1a47d703bfb69b8d95143f 100644 --- a/pkgs/tools/security/ssdeep/default.nix +++ b/pkgs/tools/security/ssdeep/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, patchelf }: +{ stdenv, fetchurl }: stdenv.mkDerivation rec { name = "ssdeep-${version}"; diff --git a/pkgs/tools/security/theharvester/default.nix b/pkgs/tools/security/theharvester/default.nix index f1bac7adba1087bd704519bb0c9c51b78419c32c..0c0cf29f977fe500c9a51750894671434fa7e720 100644 --- a/pkgs/tools/security/theharvester/default.nix +++ b/pkgs/tools/security/theharvester/default.nix @@ -1,4 +1,4 @@ -{ stdenv, makeWrapper, python2Packages, fetchFromGitHub, python2 }: +{ stdenv, makeWrapper, python2Packages, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "theHarvester"; diff --git a/pkgs/tools/security/tor/update.nix b/pkgs/tools/security/tor/update.nix index 6a7682a8f5786feee544f12b454fe6cfe75b9e9c..c944883d41783c6ee855ac5c1ff5fa047b7c7099 100644 --- a/pkgs/tools/security/tor/update.nix +++ b/pkgs/tools/security/tor/update.nix @@ -1,6 +1,5 @@ { lib , writeScript -, runCommand , common-updater-scripts , bash , coreutils diff --git a/pkgs/tools/security/vulnix/default.nix b/pkgs/tools/security/vulnix/default.nix index 6e099e5d78649039ae8f1be41d550c9aa590d857..4f2671aeacbf561a4f3e6caffc7cc69fb42ead17 100644 --- a/pkgs/tools/security/vulnix/default.nix +++ b/pkgs/tools/security/vulnix/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pythonPackages, fetchurl, callPackage, nix, ronn }: +{ stdenv, pythonPackages, nix, ronn }: pythonPackages.buildPythonApplication rec { pname = "vulnix"; diff --git a/pkgs/tools/system/bootchart/default.nix b/pkgs/tools/system/bootchart/default.nix index f99d22becdb831458fe4c8065fae618ae504dd55..9cba7df21b7dca360f9b472a270c916425a58a5a 100644 --- a/pkgs/tools/system/bootchart/default.nix +++ b/pkgs/tools/system/bootchart/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, lib, pkgconfig, glib, gtk2, python27, python2Packages }: +{stdenv, fetchurl, pkgconfig, glib, gtk2, python2Packages }: stdenv.mkDerivation rec { version = "0.14.7"; diff --git a/pkgs/tools/system/confd/default.nix b/pkgs/tools/system/confd/default.nix index ebe654d946e3b944b8d7b89dee588c961f5d29ef..3dc2a5caeb91dcea6e1bea09caae7fc9ff77f912 100644 --- a/pkgs/tools/system/confd/default.nix +++ b/pkgs/tools/system/confd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "confd-${version}"; diff --git a/pkgs/tools/system/consul-template/default.nix b/pkgs/tools/system/consul-template/default.nix index e664c0ef8e2cecda287cd3512f75d2248fb0bc1a..35c57dd8ea916a3e50ed8388422810d1384410d3 100644 --- a/pkgs/tools/system/consul-template/default.nix +++ b/pkgs/tools/system/consul-template/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "consul-template-${version}"; diff --git a/pkgs/tools/system/ddrescue/default.nix b/pkgs/tools/system/ddrescue/default.nix index fc42c3b856f61ef01fec5662df76114df08a0406..2f507de9c22f47fe5526b92acfc698154386ea3e 100644 --- a/pkgs/tools/system/ddrescue/default.nix +++ b/pkgs/tools/system/ddrescue/default.nix @@ -1,6 +1,5 @@ { stdenv , fetchurl, lzip -, hostPlatform, buildPlatform }: let inherit (stdenv.lib) optionals; in diff --git a/pkgs/tools/system/evemu/default.nix b/pkgs/tools/system/evemu/default.nix index b6f1af7b23fe6e1651d332235e7139b0ae4f7bf6..5a902914b37bc489977f8b0458e17c66b868d0fc 100644 --- a/pkgs/tools/system/evemu/default.nix +++ b/pkgs/tools/system/evemu/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchgit, autoreconfHook, pkgconfig, pythonPackages -, libevdev, linuxHeaders +, libevdev }: stdenv.mkDerivation rec { diff --git a/pkgs/tools/system/gohai/default.nix b/pkgs/tools/system/gohai/default.nix index 77f65de9a8d0ade51a65ff76c2ad1425a17b2adc..9eef3b064a0c7d7bb2c6bf0c4e21359998ae88d8 100644 --- a/pkgs/tools/system/gohai/default.nix +++ b/pkgs/tools/system/gohai/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ lib, buildGoPackage, fetchgit }: buildGoPackage rec { name = "gohai-${version}"; diff --git a/pkgs/tools/system/journalwatch/default.nix b/pkgs/tools/system/journalwatch/default.nix index 316b94befde3b1b4a6205057876043bf331e1bac..473d245618fafd6edf2aff31c3fce33e1c07f87a 100644 --- a/pkgs/tools/system/journalwatch/default.nix +++ b/pkgs/tools/system/journalwatch/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchurl, fetchgit, pythonOlder, systemd, pytest }: +{ stdenv, buildPythonPackage, fetchurl, pythonOlder, systemd, pytest }: buildPythonPackage rec { pname = "journalwatch"; diff --git a/pkgs/tools/system/osquery/default.nix b/pkgs/tools/system/osquery/default.nix index 7bbf42b11321cf2b63ed4c58e0a88dbe1e1fb08c..5b2be75e452f88d123b8bbf519db56bd8e20ba8e 100644 --- a/pkgs/tools/system/osquery/default.nix +++ b/pkgs/tools/system/osquery/default.nix @@ -4,7 +4,7 @@ , beecrypt, augeas, libxml2, sleuthkit, yara, lldpd, google-gflags , thrift, boost, rocksdb_lite, glog, gbenchmark, snappy , openssl, file, doxygen -, gtest, sqlite, fpm, zstd, rdkafka, rapidjson, path +, gtest, sqlite, fpm, zstd, rdkafka, rapidjson }: let diff --git a/pkgs/tools/system/pcstat/default.nix b/pkgs/tools/system/pcstat/default.nix index cd3c815934f3f6507115e75b5746606a5f69324b..b673c0f929a6a74b5c0e0057ae9b0e123ab7dcca 100644 --- a/pkgs/tools/system/pcstat/default.nix +++ b/pkgs/tools/system/pcstat/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "pcstat-unstable-${version}"; diff --git a/pkgs/tools/system/procodile/default.nix b/pkgs/tools/system/procodile/default.nix index 3a5cb1b4965dabd1533092d2076cee58ad804cb0..5414d670423201dd6dda1b6735ab11aeaa3f0b5f 100644 --- a/pkgs/tools/system/procodile/default.nix +++ b/pkgs/tools/system/procodile/default.nix @@ -1,4 +1,4 @@ -{ lib, bundlerEnv, ruby, stdenv }: +{ lib, bundlerEnv, ruby }: bundlerEnv rec { name = "procodile-${version}"; diff --git a/pkgs/tools/text/codesearch/default.nix b/pkgs/tools/text/codesearch/default.nix index 62be30319cf85f70e3d3aa2b4dda8a070469fb1b..56a8133bd3a82fef8468412029f4acba6467559e 100644 --- a/pkgs/tools/text/codesearch/default.nix +++ b/pkgs/tools/text/codesearch/default.nix @@ -1,5 +1,5 @@ # This file was generated by go2nix. -{ stdenv, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { name = "codesearch-${version}"; diff --git a/pkgs/tools/text/groff/default.nix b/pkgs/tools/text/groff/default.nix index 27581134ca3417f903a81fdf4c4a1af90fe4c672..ab0f8893bfde43dcd0642a9e14ff392e1fbf09dc 100644 --- a/pkgs/tools/text/groff/default.nix +++ b/pkgs/tools/text/groff/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, groff +{ stdenv, fetchurl, perl , ghostscript #for postscript and html output , psutils, netpbm #for html output , buildPackages diff --git a/pkgs/tools/text/platinum-searcher/default.nix b/pkgs/tools/text/platinum-searcher/default.nix index c76ba8ea88d5a1224e2294059266c4a55977042c..829d734a8f75745d58557a4e42b46a12e760b018 100644 --- a/pkgs/tools/text/platinum-searcher/default.nix +++ b/pkgs/tools/text/platinum-searcher/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "the_platinum_searcher-${version}"; diff --git a/pkgs/tools/text/ripgrep/default.nix b/pkgs/tools/text/ripgrep/default.nix index 11355bb6df1d5f32c8620eabf69be27bd5f45823..aa41e7b7f60a6471f666c811c6ac4e2312986dae 100644 --- a/pkgs/tools/text/ripgrep/default.nix +++ b/pkgs/tools/text/ripgrep/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform, makeWrapper, asciidoc, docbook_xsl, libxslt }: +{ stdenv, fetchFromGitHub, rustPlatform, asciidoc, docbook_xsl, libxslt }: rustPlatform.buildRustPackage rec { name = "ripgrep-${version}"; diff --git a/pkgs/tools/text/sgml/jade/default.nix b/pkgs/tools/text/sgml/jade/default.nix index e87a8bc0275091bac5cb3af4c1b37035b767ec95..b7f8bd6df3814b96621c478606642ab82bb52b5f 100644 --- a/pkgs/tools/text/sgml/jade/default.nix +++ b/pkgs/tools/text/sgml/jade/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgs, gnum4 }: +{ stdenv, fetchurl, gnum4 }: stdenv.mkDerivation rec { name = "jade-${version}-${debpatch}"; diff --git a/pkgs/tools/text/shfmt/default.nix b/pkgs/tools/text/shfmt/default.nix index 7328cd3878a20ace8d71028049a612df9a46c537..fe699b35590026292ebaec6f7398e6d5519ce722 100644 --- a/pkgs/tools/text/shfmt/default.nix +++ b/pkgs/tools/text/shfmt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "shfmt-${version}"; diff --git a/pkgs/tools/text/sift/default.nix b/pkgs/tools/text/sift/default.nix index efa5e539bd148863f38472b2466231b38c1facdc..421715f7c33ca781cc498e044d2b13116bb19d73 100644 --- a/pkgs/tools/text/sift/default.nix +++ b/pkgs/tools/text/sift/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "sift-${version}"; diff --git a/pkgs/tools/text/wgetpaste/default.nix b/pkgs/tools/text/wgetpaste/default.nix index 81b90e4925dec9c2db2d7ce6b230a2e9bc33d4a2..c3db482d271a7443f3c84b8e37c1d76b43d10ada 100644 --- a/pkgs/tools/text/wgetpaste/default.nix +++ b/pkgs/tools/text/wgetpaste/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, wget, bash, coreutils }: +{ stdenv, fetchurl, wget, bash }: stdenv.mkDerivation rec { version = "2.28"; diff --git a/pkgs/tools/text/zimreader/default.nix b/pkgs/tools/text/zimreader/default.nix index f9debaaf061525e07f6dedc90d96728b8c592aa8..4271bf095a1454e73b52b146690ff9397c758870 100644 --- a/pkgs/tools/text/zimreader/default.nix +++ b/pkgs/tools/text/zimreader/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, fetchpatch, automake, autoconf, libtool -, zlib, openssl, zip, zimlib, cxxtools, tntnet +, zimlib, cxxtools, tntnet }: stdenv.mkDerivation rec { diff --git a/pkgs/tools/typesetting/tectonic/default.nix b/pkgs/tools/typesetting/tectonic/default.nix index 8ce2a6b0aa3c9a8ff27f0a195641fd8ba23b16f5..fa8af0089556a3971aceef50db50cb814c0c6f64 100644 --- a/pkgs/tools/typesetting/tectonic/default.nix +++ b/pkgs/tools/typesetting/tectonic/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform, makeWrapper +{ stdenv, fetchFromGitHub, rustPlatform , darwin, fontconfig, harfbuzz-icu, openssl, pkgconfig }: rustPlatform.buildRustPackage rec { diff --git a/pkgs/tools/typesetting/tex/nix/default.nix b/pkgs/tools/typesetting/tex/nix/default.nix index 0566e5118705f9be8356b1437d9ad2db2d7d4349..4ee45bf4bc8f51caa724a63a222c0874a3afa037 100644 --- a/pkgs/tools/typesetting/tex/nix/default.nix +++ b/pkgs/tools/typesetting/tex/nix/default.nix @@ -207,7 +207,6 @@ rec { simpleTeXToPNG = { preamble ? null , body - , name ? baseNameOf (toString body) , packages ? [] }: @@ -227,7 +226,6 @@ rec { simpleTeXToPDF = { preamble ? null , body - , name ? baseNameOf (toString body) , packages ? [] }: diff --git a/pkgs/tools/typesetting/tex/texlive/bin.nix b/pkgs/tools/typesetting/tex/texlive/bin.nix index 32894748ac46547563508863999478c7e801e04b..9bc5a9b273b9966bfd3991381a723ec811d1a439 100644 --- a/pkgs/tools/typesetting/tex/texlive/bin.nix +++ b/pkgs/tools/typesetting/tex/texlive/bin.nix @@ -1,10 +1,10 @@ -{ stdenv, lib, fetchurl +{ stdenv, fetchurl , texlive -, zlib, bzip2, ncurses, libiconv, libpng, flex, bison, libX11, libICE, xproto -, freetype, t1lib, gd, libXaw, icu, ghostscript, ed, libXt, libXpm, libXmu, libXext -, xextproto, perl, libSM, ruby, expat, curl, libjpeg, python, fontconfig, pkgconfig -, poppler, libpaper, graphite2, zziplib, harfbuzz, texinfo, potrace, gmp, mpfr -, xpdf, cairo, pixman, xorg, clisp, biber +, zlib, libiconv, libpng, libX11 +, freetype, gd, libXaw, icu, ghostscript, libXpm, libXmu, libXext +, perl, pkgconfig +, poppler, libpaper, graphite2, zziplib, harfbuzz, potrace, gmp, mpfr +, cairo, pixman, xorg, clisp, biber , makeWrapper }: diff --git a/pkgs/tools/typesetting/xmlto/default.nix b/pkgs/tools/typesetting/xmlto/default.nix index ed3dad64f16d1f2752f5a6423bd411978a1e765e..939615f5797cf878c667336a0634dfd066254fe1 100644 --- a/pkgs/tools/typesetting/xmlto/default.nix +++ b/pkgs/tools/typesetting/xmlto/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, flex, libxml2, libxslt +{ fetchurl, stdenv, libxml2, libxslt , docbook_xml_dtd_45, docbook_xsl, w3m , bash, getopt, makeWrapper }: diff --git a/pkgs/tools/video/flvtool2/default.nix b/pkgs/tools/video/flvtool2/default.nix index dab4bf44a6f9deb785a367ede068bbaa6e32d200..975e13b65da7adeb77a4b61079d8d6bccd6fe292 100644 --- a/pkgs/tools/video/flvtool2/default.nix +++ b/pkgs/tools/video/flvtool2/default.nix @@ -1,4 +1,4 @@ -{ buildRubyGem, lib, ruby }: +{ buildRubyGem, ruby }: buildRubyGem rec { inherit ruby; diff --git a/pkgs/tools/video/vnc2flv/default.nix b/pkgs/tools/video/vnc2flv/default.nix index bb72fd2911f77e604e35300ef909b727dd1bd1bd..32cf2771b51da63f531d6019a5aca7d150d41ee9 100644 --- a/pkgs/tools/video/vnc2flv/default.nix +++ b/pkgs/tools/video/vnc2flv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pythonPackages }: +{ fetchurl, pythonPackages }: pythonPackages.buildPythonApplication rec { name = "vnc2flv-20100207"; diff --git a/pkgs/tools/virtualization/awless/default.nix b/pkgs/tools/virtualization/awless/default.nix index 549c830e887155f384e6d0d74ab4b46a9439cbb6..ff9a13c500b36006de429dc5b19734cb4fd3811d 100644 --- a/pkgs/tools/virtualization/awless/default.nix +++ b/pkgs/tools/virtualization/awless/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "awless-${version}"; diff --git a/pkgs/tools/virtualization/cloud-init/default.nix b/pkgs/tools/virtualization/cloud-init/default.nix index 60ccc0f4724a696dbf530b8e80189cb9b97108b9..5e2f84dee1d2b729147390a3f11de4c884bf4c91 100644 --- a/pkgs/tools/virtualization/cloud-init/default.nix +++ b/pkgs/tools/virtualization/cloud-init/default.nix @@ -1,4 +1,4 @@ -{ lib, pythonPackages, fetchurl, kmod, systemd, cloud-utils }: +{ lib, pythonPackages, fetchurl, cloud-utils }: let version = "0.7.9"; diff --git a/pkgs/tools/virtualization/distrobuilder/default.nix b/pkgs/tools/virtualization/distrobuilder/default.nix index 83a340348c8edad6010b2dba287b3a6b217a9796..2286faf4d1b8ca60e009487418ddbd6a302d4265 100644 --- a/pkgs/tools/virtualization/distrobuilder/default.nix +++ b/pkgs/tools/virtualization/distrobuilder/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, pkgconfig, buildGoPackage, fetchFromGitHub +{ stdenv, pkgconfig, buildGoPackage, fetchFromGitHub , makeWrapper, coreutils, gnupg, gnutar, squashfsTools, debootstrap }: diff --git a/pkgs/tools/virtualization/euca2ools/default.nix b/pkgs/tools/virtualization/euca2ools/default.nix index dce806cf6e34ee34291680f64bc21b2cb5f07053..ce628ff84b5e1ee05a106e3ee2981dee11cb1bd3 100644 --- a/pkgs/tools/virtualization/euca2ools/default.nix +++ b/pkgs/tools/virtualization/euca2ools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, which, python2Packages }: +{ stdenv, fetchgit, python2Packages }: let inherit (python2Packages) buildPythonApplication boto m2crypto; diff --git a/pkgs/tools/virtualization/google-compute-engine/default.nix b/pkgs/tools/virtualization/google-compute-engine/default.nix index 3645de88bf8a0aae4b41d59682f83df74fe7c0a9..e987bc7986b11f595ad92b6ec032c8814ffbefb2 100644 --- a/pkgs/tools/virtualization/google-compute-engine/default.nix +++ b/pkgs/tools/virtualization/google-compute-engine/default.nix @@ -2,7 +2,6 @@ , fetchFromGitHub , buildPythonApplication , bash -, shadow , systemd , utillinux , boto diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 91d2d5aaa5659f81ec89f603ebadb774f454a59e..598f3c009efe452f69c38e6f6df39e4fe2ff87be 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -700,9 +700,7 @@ with pkgs; xcodeenv = callPackage ../development/mobile/xcodeenv { }; - titaniumenv = callPackage ../development/mobile/titaniumenv { - pkgs_i686 = pkgsi686Linux; - }; + titaniumenv = callPackage ../development/mobile/titaniumenv { }; abootimg = callPackage ../development/mobile/abootimg {}; @@ -5167,7 +5165,7 @@ with pkgs; sourceHighlight = callPackage ../tools/text/source-highlight { }; - spaceFM = callPackage ../applications/misc/spacefm { adwaita-icon-theme = gnome3.adwaita-icon-theme; }; + spaceFM = callPackage ../applications/misc/spacefm { }; squashfsTools = callPackage ../tools/filesystems/squashfs { }; @@ -6756,9 +6754,8 @@ with pkgs; (if pluginSupport then appendToName "with-plugin" else x: x) (callPackage ../development/compilers/oraclejdk/jdk8psu-linux.nix { inherit installjdk pluginSupport; }); - oraclejdk10distro = packageType: pluginSupport: - (if pluginSupport then appendToName "with-plugin" else x: x) - (callPackage ../development/compilers/oraclejdk/jdk10-linux.nix { inherit packageType pluginSupport; }); + oraclejdk10distro = packageType: _: + (callPackage ../development/compilers/oraclejdk/jdk10-linux.nix { inherit packageType; }); jikes = callPackage ../development/compilers/jikes { }; @@ -8639,7 +8636,6 @@ with pkgs; xcodebuild = callPackage ../development/tools/xcbuild/wrapper.nix { inherit (darwin.apple_sdk.frameworks) CoreServices CoreGraphics ImageIO; - stdenv = buildPackages.clangStdenv; }; xcbuild = xcodebuild; xcbuildHook = makeSetupHook { @@ -11417,7 +11413,6 @@ with pkgs; # XXX: mariadb doesn't built on fbsd as of nov 2015 mysql = if (!stdenv.isFreeBSD) then mysql else null; - inherit libGL; inherit (pkgs.darwin) cf-private libobjc; inherit (pkgs.darwin.apple_sdk.frameworks) ApplicationServices OpenGL Cocoa AGL; }; @@ -11438,7 +11433,7 @@ with pkgs; qt56 = recurseIntoAttrs (makeOverridable (import ../development/libraries/qt-5/5.6) { inherit newScope; - inherit stdenv fetchurl makeSetupHook makeWrapper; + inherit stdenv fetchurl makeSetupHook; bison = bison2; # error: too few arguments to function 'int yylex(... inherit cups; harfbuzz = harfbuzz-icu; @@ -11452,7 +11447,7 @@ with pkgs; qt59 = recurseIntoAttrs (makeOverridable (import ../development/libraries/qt-5/5.9) { inherit newScope; - inherit stdenv fetchurl makeSetupHook makeWrapper; + inherit stdenv fetchurl makeSetupHook; bison = bison2; # error: too few arguments to function 'int yylex(... inherit cups; harfbuzz = harfbuzz-icu; @@ -11467,7 +11462,7 @@ with pkgs; qt511 = recurseIntoAttrs (makeOverridable (import ../development/libraries/qt-5/5.11) { inherit newScope; - inherit stdenv fetchurl fetchFromGitHub makeSetupHook makeWrapper; + inherit stdenv fetchurl fetchFromGitHub makeSetupHook; bison = bison2; # error: too few arguments to function 'int yylex(... inherit cups; harfbuzz = harfbuzz-icu; @@ -12167,13 +12162,9 @@ with pkgs; wavpack = callPackage ../development/libraries/wavpack { }; - wayland = callPackage ../development/libraries/wayland { - graphviz = graphviz-nox; - }; + wayland = callPackage ../development/libraries/wayland { }; - wayland_1_9 = callPackage ../development/libraries/wayland/1.9.nix { - graphviz = graphviz-nox; - }; + wayland_1_9 = callPackage ../development/libraries/wayland/1.9.nix { }; wayland-protocols = callPackage ../development/libraries/wayland/protocols.nix { }; @@ -12560,7 +12551,7 @@ with pkgs; openblas = openblasCompat; withRecommendedPackages = false; inherit (darwin.apple_sdk.frameworks) Cocoa Foundation; - inherit (darwin) cf-private libobjc; + inherit (darwin) libobjc; }; rWrapper = callPackage ../development/r-modules/wrapper.nix { @@ -12677,7 +12668,6 @@ with pkgs; couchdb = callPackage ../servers/http/couchdb { spidermonkey = spidermonkey_1_8_5; - python = python27; sphinx = python27Packages.sphinx; erlang = erlangR19; }; @@ -15751,7 +15741,7 @@ with pkgs; imagemagick = null; acl = null; gpm = null; - inherit (darwin.apple_sdk.frameworks) AppKit CoreWLAN GSS Kerberos ImageIO; + inherit (darwin.apple_sdk.frameworks) AppKit GSS ImageIO; }; emacs26-nox = lowPrio (appendToName "nox" (emacs26.override { @@ -15769,7 +15759,7 @@ with pkgs; imagemagick = null; acl = null; gpm = null; - inherit (darwin.apple_sdk.frameworks) AppKit CoreWLAN GSS Kerberos ImageIO; + inherit (darwin.apple_sdk.frameworks) AppKit GSS ImageIO; }; emacs25-nox = lowPrio (appendToName "nox" (emacs25.override { @@ -16369,9 +16359,7 @@ with pkgs; python = python27; }; - git-review = callPackage ../applications/version-management/git-review { - python = python27; - }; + git-review = callPackage ../applications/version-management/git-review { }; gitolite = callPackage ../applications/version-management/gitolite { }; @@ -16414,7 +16402,6 @@ with pkgs; jetbrains = (recurseIntoAttrs (callPackages ../applications/editors/jetbrains { jdk = jetbrains.jdk; - androidsdk = androidsdk_extras; }) // { jdk = callPackage ../development/compilers/jetbrains-jdk { }; }); @@ -16869,9 +16856,7 @@ with pkgs; let mkApplications = import ../applications/kde; attrs = { - inherit stdenv lib libsForQt5 fetchurl recurseIntoAttrs; - inherit plasma5; - inherit attica phonon; + inherit lib libsForQt5 fetchurl; inherit okteta; }; in @@ -17183,7 +17168,6 @@ with pkgs; mercurial = callPackage ../applications/version-management/mercurial { inherit (darwin.apple_sdk.frameworks) ApplicationServices; - inherit (darwin) cf-private; guiSupport = false; # use mercurialFull to get hgk GUI }; @@ -17502,7 +17486,6 @@ with pkgs; }; synfigstudio = callPackage ../applications/graphics/synfigstudio { - fontsConf = makeFontsConf { fontDirectories = [ freefont_ttf ]; }; inherit (gnome3) defaultIconTheme; mlt-qt5 = libsForQt5.mlt; }; @@ -18816,9 +18799,6 @@ with pkgs; nvidia_x11_i686 = if system == "x86_64-linux" then pkgsi686Linux.linuxPackages.nvidia_x11.override { libsOnly = true; } else null; - primusLib_i686 = if system == "x86_64-linux" - then pkgsi686Linux.primusLib - else null; libglvnd_i686 = if system == "x86_64-linux" then pkgsi686Linux.libglvnd else null; @@ -19234,7 +19214,7 @@ with pkgs; libxpdf = callPackage ../applications/misc/xpdf/libxpdf.nix { }; - xpra = callPackage ../tools/X11/xpra { inherit (texFunctions) fontsConf; }; + xpra = callPackage ../tools/X11/xpra { }; libfakeXinerama = callPackage ../tools/X11/xpra/libfakeXinerama.nix { }; #TODO: 'pil' is not available for python3, yet xpraGtk3 = callPackage ../tools/X11/xpra/gtk3.nix { inherit (texFunctions) fontsConf; inherit (python3Packages) buildPythonApplication python cython pygobject3 pycairo; }; @@ -19268,7 +19248,6 @@ with pkgs; finalterm = callPackage ../applications/misc/finalterm { }; roxterm = callPackage ../applications/misc/roxterm { - inherit (pythonPackages) lockfile; inherit (gnome3) gsettings-desktop-schemas vte; }; @@ -20176,7 +20155,7 @@ with pkgs; lumina = libsForQt5.callPackage ../desktops/lumina { }; lxqt = recurseIntoAttrs (import ../desktops/lxqt { - inherit pkgs libsForQt5 fetchFromGitHub; + inherit pkgs libsForQt5; inherit (lib) makeScope; }); @@ -21245,7 +21224,7 @@ with pkgs; kops = callPackage ../applications/networking/cluster/kops { }; lilypond = callPackage ../misc/lilypond { guile = guile_1_8; }; - lilypond-unstable = callPackage ../misc/lilypond/unstable.nix { guile = guile_1_8; }; + lilypond-unstable = callPackage ../misc/lilypond/unstable.nix { }; lilypond-with-fonts = callPackage ../misc/lilypond/with-fonts.nix { lilypond = lilypond-unstable; }; @@ -21684,7 +21663,6 @@ with pkgs; }; vice = callPackage ../misc/emulators/vice { - libX11 = xorg.libX11; giflib = giflib_4_1; }; diff --git a/pkgs/top-level/beam-packages.nix b/pkgs/top-level/beam-packages.nix index 8f8caf755edf69d9c32d29228c3cac0cfa1262bb..3440bfafb110c4da1410c15e4d000d0d1c296ba5 100644 --- a/pkgs/top-level/beam-packages.nix +++ b/pkgs/top-level/beam-packages.nix @@ -1,4 +1,4 @@ -{ pkgs, stdenv, callPackage, wxGTK30, darwin }: +{ callPackage, wxGTK30 }: rec { lib = callPackage ../development/beam-modules/lib.nix {}; diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix index 4527451d71a44c7a8498e81ddb73225d7b4de2f0..3782fc33d6a6ed97021ac90ffdb8e34707bca5ad 100644 --- a/pkgs/top-level/dotnet-packages.nix +++ b/pkgs/top-level/dotnet-packages.nix @@ -6,7 +6,6 @@ , fetchNuGet , pkgconfig , mono -, monodevelop , fsharp , unzip , overrides ? {} diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index f6c992d5bd5fe1e608cf61e8c8906525cb1d75c7..f1b0aa997ece8f77838b121f7f48c8d755dc8676 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -50,16 +50,14 @@ let }; melpaStablePackages = import ../applications/editors/emacs-modes/melpa-stable-packages.nix { - inherit external lib; + inherit external; }; melpaPackages = import ../applications/editors/emacs-modes/melpa-packages.nix { inherit external lib; }; - orgPackages = import ../applications/editors/emacs-modes/org-packages.nix { - inherit fetchurl lib stdenv texinfo; - }; + orgPackages = import ../applications/editors/emacs-modes/org-packages.nix { }; emacsWithPackages = import ../build-support/emacs/wrapper.nix { inherit lib lndir makeWrapper stdenv runCommand; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 5fef4872db210949f23095790526ae60eb6ddf7b..bef3c2d0a219d4c4ce29b2f283c512ce552e9259 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1,5 +1,5 @@ { buildPackages, pkgs -, newScope, stdenv +, newScope , buildPlatform, targetPlatform }: diff --git a/pkgs/top-level/haxe-packages.nix b/pkgs/top-level/haxe-packages.nix index 3ac8d5f164d5c6c42de36a81285334334334f937..35b0b42da3fe18d6d678478834fc38f8b7916f59 100644 --- a/pkgs/top-level/haxe-packages.nix +++ b/pkgs/top-level/haxe-packages.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, fetchFromGitHub, newScope, haxe, neko, nodejs, wine, php, python3, jdk, mono, haskellPackages, fetchpatch }: +{ stdenv, fetchzip, fetchFromGitHub, haxe, neko, jdk, mono }: let self = haxePackages; diff --git a/pkgs/top-level/java-packages.nix b/pkgs/top-level/java-packages.nix index 77cd5b0eba53ecddba339e2d8a4cbb584c2f2bcf..73ed6bf9162cdfd2c72888ef40432d85c5f5a8e1 100644 --- a/pkgs/top-level/java-packages.nix +++ b/pkgs/top-level/java-packages.nix @@ -1,4 +1,4 @@ -{ pkgs, stdenv, maven }: +{ pkgs }: with pkgs; diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index 520db16d3661c4cacf869718d818bf8df11f8e70..cb9df43824636436e0e3673ce65abda828dec0fa 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -5,9 +5,9 @@ for each package in a separate file: the call to the function would be almost as must code as the function itself. */ -{ fetchurl, fetchzip, stdenv, lua, callPackage, unzip, zziplib, pkgconfig, libtool -, pcre, oniguruma, gnulib, tre, glibc, sqlite, openssl, expat, cairo -, perl, gtk2, python, glib, gobjectIntrospection, libevent, zlib, autoreconfHook +{ fetchurl, stdenv, lua, callPackage, unzip, zziplib, pkgconfig +, pcre, oniguruma, gnulib, tre, glibc, sqlite, openssl, expat +, glib, gobjectIntrospection, libevent, zlib, autoreconfHook , mysql, postgresql, cyrus_sasl , fetchFromGitHub, libmpack, which, fetchpatch, writeText }: diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index a49d638dc47eef96085bf636fd224b2db6bb970d..eb76c323dde4cc6a2426c786df9c5c372e074e96 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -748,14 +748,14 @@ let # Jane Street janePackage = callPackage ../development/ocaml-modules/janestreet/janePackage.nix {}; - + janeStreet = import ../development/ocaml-modules/janestreet { - inherit lib janePackage ocaml ocamlbuild angstrom ctypes cryptokit; + inherit janePackage ocamlbuild angstrom ctypes cryptokit; inherit magic-mime num ocaml-migrate-parsetree octavius ounit; inherit ppx_deriving re zarith ppxlib; inherit (pkgs) stdenv openssl; }; - + janeStreet_0_9_0 = import ../development/ocaml-modules/janestreet/old.nix { janePackage = callPackage ../development/ocaml-modules/janestreet/janePackage.nix { defaultVersion = "0.9.0"; }; inherit lib ocaml ocamlbuild ctypes cryptokit; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index b5df07148d94b3d0addce21774ace097717053a5..255ea6d4ffdaf1d8ed2612e8c717099e55b5b49a 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5,7 +5,7 @@ for each package in a separate file: the call to the function would be almost as much code as the function itself. */ -{config, pkgs, fetchurl, fetchFromGitHub, stdenv, fetchsvn, gnused, perl, overrides}: +{config, pkgs, fetchurl, fetchFromGitHub, stdenv, gnused, perl, overrides}: let self = _self // overrides; _self = with self; { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 81d38de4f388433604618e294ac17754582e7b83..d1c0ac374896cfe4dd20a610a2d2300d293630b5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9650,7 +9650,7 @@ in { fixtures = callPackage ../development/python-modules/fixtures { }; pelican = callPackage ../development/python-modules/pelican { - inherit (pkgs) glibcLocales pandoc git; + inherit (pkgs) glibcLocales git; }; pep8 = buildPythonPackage rec { diff --git a/pkgs/top-level/release-python.nix b/pkgs/top-level/release-python.nix index 3bc252e440f7234b002cbe2b0ae445256adec6ac..8b7240e21a336208a7ba34e58ddb664fee39a5e1 100644 --- a/pkgs/top-level/release-python.nix +++ b/pkgs/top-level/release-python.nix @@ -3,9 +3,7 @@ $ hydra-eval-jobs pkgs/top-level/release-python.nix */ -{ nixpkgs ? { outPath = (import ../../lib).cleanSource ../..; revCount = 1234; shortRev = "abcdef"; } -, officialRelease ? false -, # The platforms for which we build Nixpkgs. +{ # The platforms for which we build Nixpkgs. supportedSystems ? [ "x86_64-linux" ] }: diff --git a/pkgs/top-level/unix-tools.nix b/pkgs/top-level/unix-tools.nix index cc6a8e0592a8b71b29751fc8c032855c23e934d4..1dface338a39e5f056585febcf35fae4f6a799cf 100644 --- a/pkgs/top-level/unix-tools.nix +++ b/pkgs/top-level/unix-tools.nix @@ -1,5 +1,4 @@ -{ pkgs, buildEnv, runCommand, hostPlatform, lib -, stdenv }: +{ pkgs, buildEnv, runCommand, hostPlatform, lib }: # These are some unix tools that are commonly included in the /usr/bin # and /usr/sbin directory under more normal distributions. Along with