diff --git a/doc/functions.xml b/doc/functions.xml index e3a6975f91f..3850e58c016 100644 --- a/doc/functions.xml +++ b/doc/functions.xml @@ -99,9 +99,70 @@ in ... +
+ <pkg>.overrideAttrs + + + The function overrideAttrs allows overriding the + attribute set passed to a stdenv.mkDerivation call, + producing a new derivation based on the original one. + This function is available on all derivations produced by the + stdenv.mkDerivation function, which is most packages + in the nixpkgs expression pkgs. + + + + Example usage: + + helloWithDebug = pkgs.hello.overrideAttrs (oldAttrs: rec { + separateDebugInfo = true; +}); + + + + In the above example, the separateDebugInfo attribute is + overriden to be true, thus building debug info for + helloWithDebug, while all other attributes will be + retained from the original hello package. + + + + The argument oldAttrs is conventionally used to refer to + the attr set originally passed to stdenv.mkDerivation. + + + + + Note that separateDebugInfo is processed only by the + stdenv.mkDerivation function, not the generated, raw + Nix derivation. Thus, using overrideDerivation will + not work in this case, as it overrides only the attributes of the final + derivation. It is for this reason that overrideAttrs + should be preferred in (almost) all cases to + overrideDerivation, i.e. to allow using + sdenv.mkDerivation to process input arguments, as well + as the fact that it is easier to use (you can use the same attribute + names you see in your Nix code, instead of the ones generated (e.g. + buildInputs vs nativeBuildInputs, + and involves less typing. + + + +
+ +
<pkg>.overrideDerivation + + You should prefer overrideAttrs in almost all + cases, see its documentation for the reasons why. + overrideDerivation is not deprecated and will continue + to work, but is less nice to use and does not have as many abilities as + overrideAttrs. + + + Do not use this function in Nixpkgs as it evaluates a Derivation before modifying it, which breaks package abstraction and removes diff --git a/lib/customisation.nix b/lib/customisation.nix index efe82d78660..3e6e279824b 100644 --- a/lib/customisation.nix +++ b/lib/customisation.nix @@ -56,16 +56,18 @@ rec { ff = f origArgs; overrideWith = newArgs: origArgs // (if builtins.isFunction newArgs then newArgs origArgs else newArgs); in - if builtins.isAttrs ff then (ff // - { override = newArgs: makeOverridable f (overrideWith newArgs); - overrideDerivation = fdrv: - makeOverridable (args: overrideDerivation (f args) fdrv) origArgs; - }) - else if builtins.isFunction ff then - { override = newArgs: makeOverridable f (overrideWith newArgs); - __functor = self: ff; - overrideDerivation = throw "overrideDerivation not yet supported for functors"; - } + if builtins.isAttrs ff then (ff // { + override = newArgs: makeOverridable f (overrideWith newArgs); + overrideDerivation = fdrv: + makeOverridable (args: overrideDerivation (f args) fdrv) origArgs; + ${if ff ? overrideAttrs then "overrideAttrs" else null} = fdrv: + makeOverridable (args: (f args).overrideAttrs fdrv) origArgs; + }) + else if builtins.isFunction ff then { + override = newArgs: makeOverridable f (overrideWith newArgs); + __functor = self: ff; + overrideDerivation = throw "overrideDerivation not yet supported for functors"; + } else ff; diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 5cb2e269123..6ff64599540 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -30,6 +30,7 @@ all = "Nix Committers "; ambrop72 = "Ambroz Bizjak "; amiddelk = "Arie Middelkoop "; + amiloradovsky = "Andrew Miloradovsky "; amorsillo = "Andrew Morsillo "; AndersonTorres = "Anderson Torres "; anderspapitto = "Anders Papitto "; @@ -105,8 +106,8 @@ cstrahan = "Charles Strahan "; cwoac = "Oliver Matthews "; DamienCassou = "Damien Cassou "; - dasuxullebt = "Christoph-Simon Senjak "; danbst = "Danylo Hlynskyi "; + dasuxullebt = "Christoph-Simon Senjak "; davidak = "David Kleuker "; davidrusu = "David Rusu "; davorb = "Davor Babic "; @@ -123,6 +124,7 @@ dipinhora = "Dipin Hora "; dmalikov = "Dmitry Malikov "; dochang = "Desmond O. Chang "; + domenkozar = "Domen Kozar "; doublec = "Chris Double "; drets = "Dmytro Rets "; drewkett = "Andrew Burkett "; @@ -173,8 +175,8 @@ globin = "Robin Gloster "; gnidorah = "Alex Ivanov "; goibhniu = "Cillian de Róiste "; - goodrone = "Andrew Trachenko "; Gonzih = "Max Gonzih "; + goodrone = "Andrew Trachenko "; gpyh = "Yacine Hmito "; grahamc = "Graham Christensen "; gridaphobe = "Eric Seidel "; @@ -190,7 +192,6 @@ hrdinka = "Christoph Hrdinka "; iand675 = "Ian Duncan "; ianwookim = "Ian-Woo Kim "; - domenkozar = "Domen Kozar "; igsha = "Igor Sharonov "; ikervagyok = "Balázs Lengyel "; j-keck = "Jürgen Keck "; @@ -247,7 +248,6 @@ lucas8 = "Luc Chabassier "; ludo = "Ludovic Courtès "; luispedro = "Luis Pedro Coelho "; - sternenseemann = "Lukas Epple "; lukego = "Luke Gorrie "; lw = "Sergey Sofeychuk "; madjar = "Georges Dubus "; @@ -263,10 +263,10 @@ martingms = "Martin Gammelsæter "; matejc = "Matej Cotman "; mathnerd314 = "Mathnerd314 "; + matthewbauer = "Matthew Bauer "; matthiasbeyer = "Matthias Beyer "; maurer = "Matthew Maurer "; mbakke = "Marius Bakke "; - matthewbauer = "Matthew Bauer "; mbe = "Brandon Edens "; mboes = "Mathieu Boespflug "; mcmtroffaes = "Matthias C. M. Troffaes "; @@ -299,16 +299,16 @@ muflax = "Stefan Dorn "; myrl = "Myrl Hex "; nand0p = "Fernando Jose Pando "; - nathan-gs = "Nathan Bijnens "; Nate-Devv = "Nathan Moore "; + nathan-gs = "Nathan Bijnens "; nckx = "Tobias Geerinckx-Rice "; nequissimus = "Tim Steinbach "; nfjinjing = "Jinjing Wang "; nhooyr = "Anmol Sethi "; - nico202 = "Nicolò Balzarotti "; nicknovitski = "Nick Novitski "; - notthemessiah = "Brian Cohen "; + nico202 = "Nicolò Balzarotti "; NikolaMandic = "Ratko Mladic "; + notthemessiah = "Brian Cohen "; np = "Nicolas Pouillard "; nslqqq = "Nikita Mikhailov "; obadz = "obadz "; @@ -383,8 +383,8 @@ rvl = "Rodney Lorrimar "; rvlander = "Gaëtan André "; ryanartecona = "Ryan Artecona "; - ryantm = "Ryan Mulligan "; ryansydnor = "Ryan Sydnor "; + ryantm = "Ryan Mulligan "; rycee = "Robert Helgesson "; ryneeverett = "Ryne Everett "; s1lvester = "Markus Silvester "; @@ -408,8 +408,8 @@ skeidel = "Sven Keidel "; skrzyp = "Jakub Skrzypnik "; sleexyz = "Sean Lee "; - solson = "Scott Olson "; smironov = "Sergey Mironov "; + solson = "Scott Olson "; spacefrogg = "Michael Raitza "; spencerjanssen = "Spencer Janssen "; spinus = "Tomasz Czyż "; @@ -417,6 +417,7 @@ spwhitt = "Spencer Whitt "; SShrike = "Severen Redwood "; stephenmw = "Stephen Weinberg "; + sternenseemann = "Lukas Epple "; steveej = "Stefan Junker "; swarren83 = "Shawn Warren "; swistak35 = "Rafał Łasocha "; @@ -474,6 +475,7 @@ wscott = "Wayne Scott "; wyvie = "Elijah Rum "; yarr = "Dmitry V. "; + yochai = "Yochai "; yurrriq = "Eric Bailey "; z77z = "Marco Maggesi "; zagy = "Christian Zagrodnick "; @@ -481,6 +483,4 @@ zimbatm = "zimbatm "; zohl = "Al Zohali "; zoomulator = "Kim Simmons "; - amiloradovsky = "Andrew Miloradovsky "; - yochai = "Yochai "; } diff --git a/nixos/modules/services/mail/opensmtpd.nix b/nixos/modules/services/mail/opensmtpd.nix index 5856b469755..53acdba4245 100644 --- a/nixos/modules/services/mail/opensmtpd.nix +++ b/nixos/modules/services/mail/opensmtpd.nix @@ -115,7 +115,7 @@ in { chown smtpq.root /var/spool/smtpd/purge chmod 700 /var/spool/smtpd/purge ''; - serviceConfig.ExecStart = "${opensmtpd}/sbin/smtpd -d -f ${conf} ${args}"; + serviceConfig.ExecStart = "${pkgs.opensmtpd}/sbin/smtpd -d -f ${conf} ${args}"; environment.OPENSMTPD_PROC_PATH = "${procEnv}/libexec/opensmtpd"; }; diff --git a/nixos/modules/services/misc/dictd.nix b/nixos/modules/services/misc/dictd.nix index ef744439c3d..24dca15dd91 100644 --- a/nixos/modules/services/misc/dictd.nix +++ b/nixos/modules/services/misc/dictd.nix @@ -2,6 +2,10 @@ with lib; +let + cfg = config.services.dictd; +in + { ###### interface @@ -20,7 +24,7 @@ with lib; DBs = mkOption { type = types.listOf types.package; - default = []; + default = with pkgs.dictdDBs; [ wiktionary wordnet ]; example = [ pkgs.dictdDBs.nld2eng ]; description = ''List of databases to make available.''; }; @@ -34,8 +38,8 @@ with lib; config = let dictdb = pkgs.dictDBCollector { dictlist = map (x: { name = x.name; - filename = x; } ) config.services.dictd.DBs; }; - in mkIf config.services.dictd.enable { + filename = x; } ) cfg.DBs; }; + in mkIf cfg.enable { # get the command line client on system path to make some use of the service environment.systemPackages = [ pkgs.dict ]; diff --git a/pkgs/applications/audio/qmidinet/default.nix b/pkgs/applications/audio/qmidinet/default.nix index 42c98cbb110..f5f3119f73d 100644 --- a/pkgs/applications/audio/qmidinet/default.nix +++ b/pkgs/applications/audio/qmidinet/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchurl, qt4, alsaLib, libjack2 }: +{ stdenv, fetchurl, qt5, alsaLib, libjack2 }: stdenv.mkDerivation rec { - version = "0.2.1"; + version = "0.4.1"; name = "qmidinet-${version}"; src = fetchurl { url = "mirror://sourceforge/qmidinet/${name}.tar.gz"; - sha256 = "1a1pj4w74wj1gcfv4a0vzcglmr5sw0xp0y56w8rk3ig4k11xi8sa"; + sha256 = "1hh06g19lfh6r673avfvy0l2mq999mxk2jnv396226swj97lv7yz"; }; hardeningDisable = [ "format" ]; - buildInputs = [ qt4 alsaLib libjack2 ]; + buildInputs = [ qt5.qtbase qt5.qttools alsaLib libjack2 ]; meta = with stdenv.lib; { description = "A MIDI network gateway application that sends and receives MIDI data (ALSA Sequencer and/or JACK MIDI) over the network"; diff --git a/pkgs/applications/editors/emacs-modes/cask/default.nix b/pkgs/applications/editors/emacs-modes/cask/default.nix index 0566e0e8b87..56ba5ba9710 100644 --- a/pkgs/applications/editors/emacs-modes/cask/default.nix +++ b/pkgs/applications/editors/emacs-modes/cask/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, emacs, python }: stdenv.mkDerivation rec { - version = "0.7.4"; + version = "0.8.1"; name = "cask-${version}"; src = fetchFromGitHub { owner = "cask"; repo = "cask"; rev = "v${version}"; - sha256 = "1hvm6r6a8rgjwnn2mcamwqrmhz424vlr4mbvbri3wmn0ikbk510l"; + sha256 = "1sl094adnchjvf189c3l1njawrj5ww1sv5vvjr9hb1ng2rw20z7b"; }; buildInputs = [ emacs python ]; diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix index c380d05302e..341b8063f66 100644 --- a/pkgs/applications/editors/nano/default.nix +++ b/pkgs/applications/editors/nano/default.nix @@ -12,10 +12,10 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "nano-${version}"; - version = "2.7.0"; + version = "2.7.1"; src = fetchurl { url = "mirror://gnu/nano/${name}.tar.xz"; - sha256 = "08cmnca3s377z74yjw1afz59l2h9s40wsa9wxw5y4x5f2jaz6spq"; + sha256 = "1kapx0fyp0a0pvsdd1n59pm3acrimdrp7ciglg098wqxhdlvwp6z"; }; nativeBuildInputs = [ texinfo ] ++ optional enableNls gettext; buildInputs = [ ncurses ]; @@ -34,7 +34,10 @@ stdenv.mkDerivation rec { homepage = http://www.nano-editor.org/; description = "A small, user-friendly console text editor"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ joachifm ]; + maintainers = with maintainers; [ + jgeerds + joachifm + ]; platforms = platforms.all; }; } diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix index 19678d241e6..57a684d5572 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 , libtool, libuv, luajit, luaPackages, man, ncurses, perl, pkgconfig -, unibilium, makeWrapper, vimUtils, xsel +, unibilium, makeWrapper, vimUtils, xsel, gperf , withPython ? true, pythonPackages, extraPythonPackages ? [] , withPython3 ? true, python3Packages, extraPython3Packages ? [] @@ -18,13 +18,13 @@ let # Note: this is NOT the libvterm already in nixpkgs, but some NIH silliness: neovimLibvterm = stdenv.mkDerivation rec { name = "neovim-libvterm-${version}"; - version = "2015-11-06"; + version = "2016-10-07"; src = fetchFromGitHub { owner = "neovim"; repo = "libvterm"; - rev = "487f21dbf65f1c28962fef3f064603f415fbaeb2"; - sha256 = "1fig6v0qk0ylr7lqqk0d6x5yywb9ymh85vay4spw5b5r5p0ky7yx"; + rev = "e0a3d4dbd44a9534bf7437ee98ceb26dabebf3ad"; + sha256 = "131mcnbdq4wvsf280v4az8vnakr78yrwlaihzgr5s1wmfjvf6knf"; }; buildInputs = [ perl ]; @@ -60,13 +60,13 @@ let neovim = stdenv.mkDerivation rec { name = "neovim-${version}"; - version = "0.1.5"; + version = "0.1.6"; src = fetchFromGitHub { owner = "neovim"; repo = "neovim"; rev = "v${version}"; - sha256 = "1ihlgm2h7147xyd5wrwg61vsnmkqc9j3ghsida4g2ilr7gw9c85y"; + sha256 = "0s8vqf4aym1d1h8yi0znpqw5rv9v3z64y5aha9dmynbwxa58q7pp"; }; enableParallelBuilding = true; @@ -80,6 +80,7 @@ let unibilium luajit luaPackages.lua + gperf ] ++ optional withJemalloc jemalloc ++ lualibs; diff --git a/pkgs/applications/editors/neovim/qt.nix b/pkgs/applications/editors/neovim/qt.nix index 10522f449ae..df98264d969 100644 --- a/pkgs/applications/editors/neovim/qt.nix +++ b/pkgs/applications/editors/neovim/qt.nix @@ -3,7 +3,7 @@ }: let # not very usable ATM - version = "0.2.1"; + version = "0.2.3"; in stdenv.mkDerivation { name = "neovim-qt-${version}"; @@ -12,7 +12,7 @@ stdenv.mkDerivation { owner = "equalsraf"; repo = "neovim-qt"; rev = "v${version}"; - sha256 = "0mqs2f7l05q2ayj77czr5fnpr7fa00qrmjdjxglbwxdxswcsz88n"; + sha256 = "0ichqph7nfw3934jf0sp81bqd376xna3f899cc2xg88alb4f16dv"; }; # It tries to download libmsgpack; let's use ours. diff --git a/pkgs/applications/networking/ipfs/default.nix b/pkgs/applications/networking/ipfs/default.nix index 79e2185f04e..0d018c9588f 100644 --- a/pkgs/applications/networking/ipfs/default.nix +++ b/pkgs/applications/networking/ipfs/default.nix @@ -1,22 +1,31 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub, fetchgx }: buildGoPackage rec { name = "ipfs-${version}"; - version = "i20160112--${stdenv.lib.strings.substring 0 7 rev}"; - rev = "7070b4d878baad57dcc8da80080dd293aa46cabd"; + version = "0.4.4"; + rev = "d905d485192616abaea25f7e721062a9e1093ab9"; goPackagePath = "github.com/ipfs/go-ipfs"; + extraSrcPaths = [ + (fetchgx { + inherit name src; + sha256 = "0mm1rs2mbs3rmxfcji5yal9ai3v1w75kk05bfyhgzmcjvi6lwpyb"; + }) + ]; + src = fetchFromGitHub { owner = "ipfs"; repo = "go-ipfs"; inherit rev; - sha256 = "1b7aimnbz287fy7p27v3qdxnz514r5142v3jihqxanbk9g384gcd"; + sha256 = "06iq7fmq7p0854aqrnmd0f0jvnxy9958wvw7ibn754fdfii9l84l"; }; meta = with stdenv.lib; { description = "A global, versioned, peer-to-peer filesystem"; + homepage = https://ipfs.io/; license = licenses.mit; - broken = true; + platforms = platforms.unix; + maintainers = with maintainers; [ fpletz ]; }; } diff --git a/pkgs/applications/networking/irc/hexchat/default.nix b/pkgs/applications/networking/irc/hexchat/default.nix index 8de3bf1326c..4d7ebbfac2e 100644 --- a/pkgs/applications/networking/irc/hexchat/default.nix +++ b/pkgs/applications/networking/irc/hexchat/default.nix @@ -5,12 +5,12 @@ }: stdenv.mkDerivation rec { - version = "2.12.2"; + version = "2.12.3"; name = "hexchat-${version}"; src = fetchurl { url = "http://dl.hexchat.net/hexchat/${name}.tar.xz"; - sha256 = "1xnclfbrgbkqndxygi5f27q00jd7yy54jbd1061jmhxa6wzpibbd"; + sha256 = "1fpj2kk1p85snffchqxsz3sphhcgiripjw41mgzxi7ks5hvj4avg"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/pyload/default.nix b/pkgs/applications/networking/pyload/default.nix new file mode 100644 index 00000000000..9be45e126a1 --- /dev/null +++ b/pkgs/applications/networking/pyload/default.nix @@ -0,0 +1,54 @@ +{ stdenv, fetchFromGitHub, fetchpatch, pythonPackages, gocr, unrar, rhino, spidermonkey }: +pythonPackages.buildPythonApplication rec { + version = "0.4.9-next"; + name = "pyLoad-" + version; + + src = fetchFromGitHub { + owner = "pyload"; + repo = "pyload"; + rev = "03f3ad9e39da2b9a378987693c4a69720e4084c7"; + sha256 = "0fgsz6yzxrlq3qvsyxsyzgmy4za35v1xh3i4drhispk9zb5jm1xx"; + }; + + patches = + let + # gets merged in next release version of pyload + configParserPatch = fetchpatch { + url = "https://patch-diff.githubusercontent.com/raw/pyload/pyload/pull/2625.diff"; + sha256 = "1bisgx78kcr5c0x0i3h0ch5mykns5wx5wx7gvjj0pc71lfzlxzb9"; + }; + setupPyPatch = fetchpatch { + url = "https://patch-diff.githubusercontent.com/raw/pyload/pyload/pull/2638.diff"; + sha256 = "006g4qbl582262ariflbyfrszcx8ck2ac1cpry1f82f76p4cgf6z"; + }; + in [ configParserPatch setupPyPatch ]; + + buildInputs = [ + unrar rhino spidermonkey gocr pythonPackages.paver + ]; + + propagatedBuildInputs = with pythonPackages; [ + pycurl jinja2 beaker thrift simplejson pycrypto feedparser tkinter + beautifulsoup + ]; + + #remove this once the PR patches above are merged. Needed because githubs diff endpoint + #does not support diff -N + prePatch = '' + touch module/config/__init__.py + ''; + + preBuild = '' + paver generate_setup + ''; + + doCheck = false; + + meta = { + description = "Free and open source downloader for 1-click-hosting sites"; + homepage = https://github.com/pyload/pyload; + license = stdenv.lib.licenses.gpl3; + maintainers = [ stdenv.lib.maintainers.mahe ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/applications/science/logic/yices/default.nix b/pkgs/applications/science/logic/yices/default.nix index f495ee257ff..cf5114b4a41 100644 --- a/pkgs/applications/science/logic/yices/default.nix +++ b/pkgs/applications/science/logic/yices/default.nix @@ -2,24 +2,31 @@ stdenv.mkDerivation rec { name = "yices-${version}"; - version = "2.3.1"; + version = "2.5.1"; src = fetchurl { - url = "http://yices.csl.sri.com/cgi-bin/yices2-newnewdownload.cgi?file=yices-2.3.1-src.tar.gz&accept=I+Agree"; + url = "http://yices.csl.sri.com/cgi-bin/yices2-newnewdownload.cgi?file=yices-${version}-src.tar.gz&accept=I+Agree"; name = "yices-${version}-src.tar.gz"; - sha256 = "1da70n0cah0dh3pk7fcrvjkszx9qmhc0csgl15jqa7bdh707k2zs"; + sha256 = "1wfq6hcm54h0mqmbs1ip63i0ywlwnciav86sbzk3gafxyzg1nd0c"; }; + patchPhase = ''patchShebangs tests/regress/check.sh''; + configureFlags = [ "--with-static-gmp=${gmp-static.out}/lib/libgmp.a" "--with-static-gmp-include-dir=${gmp-static.dev}/include" ]; buildInputs = [ gmp-static gperf autoreconfHook ]; - meta = { + enableParallelBuilding = true; + doCheck = true; + + installPhase = ''make install LDCONFIG=true''; + + meta = with stdenv.lib; { description = "A high-performance theorem prover and SMT solver"; homepage = "http://yices.csl.sri.com"; - license = stdenv.lib.licenses.unfreeRedistributable; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + license = licenses.unfreeRedistributable; + platforms = platforms.linux ++ platforms.darwin; + maintainers = [ maintainers.thoughtpolice ]; }; } diff --git a/pkgs/applications/version-management/git-and-tools/gitflow/default.nix b/pkgs/applications/version-management/git-and-tools/gitflow/default.nix index ff7c652c622..3d411a18324 100644 --- a/pkgs/applications/version-management/git-and-tools/gitflow/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gitflow/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "gitflow"; - version = "1.10.0"; + version = "1.10.2"; name = "${pname}-${version}"; src = fetchFromGitHub { owner = "petervanderdoes"; repo = pname; rev = version; - sha256 = "1l67yizbcmgkhz8qn1zam2p04y8ha9b2gb2d89rff9y528b2m5z6"; + sha256 = "1i8bwi83qcqvi8zrkjn4mp2v8v7y11fd520wpg2jgy5hqyz34chg"; }; preBuild = '' diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index 82fcfcfb238..034eb534423 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -4,25 +4,23 @@ let # if you bump version, update pkgs.tortoisehg too or ping maintainer - version = "3.9.1"; + version = "3.9.2"; name = "mercurial-${version}"; inherit (python2Packages) docutils hg-git dulwich python; -in - -stdenv.mkDerivation { +in python2Packages.mkPythonDerivation { inherit name; src = fetchurl { url = "https://mercurial-scm.org/release/${name}.tar.gz"; - sha256 = "0x6zjl8za6nnlbmyxng4pfrr2h77zi3wbg985262ghjyx33lypk2"; + sha256 = "1kw3cpcjygfapvi5c123limhpbkmg7is2i81pybk1s05gi16l139"; }; inherit python; # pass it so that the same version can be used in hg2git - buildInputs = [ python makeWrapper docutils unzip ]; + buildInputs = [ makeWrapper docutils unzip ]; - propagatedBuildInputs = stdenv.lib.optionals stdenv.isDarwin - [ ApplicationServices cf-private ]; + propagatedBuildInputs = [ hg-git dulwich ] + ++ stdenv.lib.optionals stdenv.isDarwin [ ApplicationServices cf-private ]; makeFlags = "PREFIX=$(out)"; @@ -42,7 +40,6 @@ stdenv.mkDerivation { '' for i in $(cd $out/bin && ls); do wrapProgram $out/bin/$i \ - --prefix PYTHONPATH : "$(toPythonPath "$out ${hg-git}"):$(toPythonPath "$out ${dulwich}")" \ $WRAP_TK done diff --git a/pkgs/applications/version-management/tortoisehg/default.nix b/pkgs/applications/version-management/tortoisehg/default.nix index 754b7df5153..e5c704f71c7 100644 --- a/pkgs/applications/version-management/tortoisehg/default.nix +++ b/pkgs/applications/version-management/tortoisehg/default.nix @@ -2,11 +2,11 @@ pythonPackages.buildPythonApplication rec { name = "tortoisehg-${version}"; - version = "3.9.1"; + version = "3.9.2"; src = fetchurl { url = "https://bitbucket.org/tortoisehg/targz/downloads/${name}.tar.gz"; - sha256 = "12bqvkkwkb6m5hls7gipkxbnspfrk1k6l9l0fff0wp1zajnp4pnn"; + sha256 = "17wcsf91z7dnb7c8vyagasj5vvmas6ms5lx1ny4pnm94qzslkfh2"; }; pythonPath = with pythonPackages; [ pyqt4 mercurial qscintilla iniparse ]; diff --git a/pkgs/applications/version-management/yadm/default.nix b/pkgs/applications/version-management/yadm/default.nix index e1ce841ede2..f87d81bd8fb 100644 --- a/pkgs/applications/version-management/yadm/default.nix +++ b/pkgs/applications/version-management/yadm/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchFromGitHub }: -let version = "1.04"; in +let version = "1.05"; in stdenv.mkDerivation { name = "yadm-${version}"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { owner = "TheLocehiliosan"; repo = "yadm"; rev = "${version}"; - sha256 = "1g5nz4y63ccxlbz67klm78525ps41ynis8683iayakg4907vd898"; + sha256 = "11bqgz28qzgb3iz8xvda9z0mh5r1a9m032pqm772ypiixsfz8hdd"; }; buildCommand = '' diff --git a/pkgs/applications/video/streamlink/default.nix b/pkgs/applications/video/streamlink/default.nix index cca1ed34f6d..f516c871f51 100644 --- a/pkgs/applications/video/streamlink/default.nix +++ b/pkgs/applications/video/streamlink/default.nix @@ -1,14 +1,14 @@ { stdenv, pythonPackages, fetchFromGitHub, rtmpdump }: pythonPackages.buildPythonApplication rec { - version = "1.14.0-rc1"; + version = "0.0.2"; name = "streamlink-${version}"; src = fetchFromGitHub { owner = "streamlink"; repo = "streamlink"; - rev = "ffc099b16b9a9d2c0c44081d687c50ee2e935f29"; - sha256 = "0ix2k2yd2jzcazkjjb0iczr4bv7pgx873k7bhxgb9zwplklxpw1k"; + rev = "${version}"; + sha256 = "156b3smivs8lja7a98g3qa74bawqhc4mi8w8f3dscampbxx4dr9y"; }; propagatedBuildInputs = (with pythonPackages; [ pycrypto requests2 ]) ++ [ rtmpdump ]; diff --git a/pkgs/build-support/fetchgx/default.nix b/pkgs/build-support/fetchgx/default.nix new file mode 100644 index 00000000000..c72bbec6632 --- /dev/null +++ b/pkgs/build-support/fetchgx/default.nix @@ -0,0 +1,30 @@ +{ stdenv, gx, gx-go, go, cacert }: + +{ name, src, sha256 }: + +stdenv.mkDerivation { + name = "${name}-gxdeps"; + inherit src; + + buildInputs = [ go gx gx-go ]; + + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = sha256; + + phases = [ "unpackPhase" "buildPhase" "installPhase" ]; + + SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; + + buildPhase = '' + export GOPATH=$(pwd)/vendor + mkdir vendor + gx install + ''; + + installPhase = '' + mv vendor $out + ''; + + preferLocalBuild = true; +} diff --git a/pkgs/data/fonts/font-awesome-ttf/default.nix b/pkgs/data/fonts/font-awesome-ttf/default.nix index 7f81bc73d0a..55995f6d11d 100644 --- a/pkgs/data/fonts/font-awesome-ttf/default.nix +++ b/pkgs/data/fonts/font-awesome-ttf/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "font-awesome-${version}"; - version = "4.6.3"; + version = "4.7.0"; src = fetchFromGitHub { owner = "FortAwesome"; repo = "Font-Awesome"; rev = "v${version}"; - sha256 = "135k1xskksqzriad9zzcxa79iprldyp2bnmc22wslak0dvjz74w0"; + sha256 = "0w30y26jp8nvxa3iiw7ayl6rkza1rz62msl9xw3srvxya1c77grc"; }; buildCommand = '' diff --git a/pkgs/data/fonts/google-fonts/default.nix b/pkgs/data/fonts/google-fonts/default.nix index 62e99079d17..ee637f880ad 100644 --- a/pkgs/data/fonts/google-fonts/default.nix +++ b/pkgs/data/fonts/google-fonts/default.nix @@ -38,8 +38,8 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://www.google.com/fontsl; - description = "Font files available from Google Font"; + homepage = https://fonts.google.com; + description = "Font files available from Google Fonts"; license = with licenses; [ asl20 ofl ufl ]; platforms = platforms.all; hydraPlatforms = []; diff --git a/pkgs/development/compilers/scala/default.nix b/pkgs/development/compilers/scala/default.nix index d452d0abe30..a1b131eac81 100644 --- a/pkgs/development/compilers/scala/default.nix +++ b/pkgs/development/compilers/scala/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, makeWrapper, jre }: stdenv.mkDerivation rec { - name = "scala-2.11.8"; + name = "scala-2.12.0"; src = fetchurl { url = "http://www.scala-lang.org/files/archive/${name}.tgz"; - sha256 = "1khs7673wca7gnxz2rxphv6v5k94jkpcarlqznsys9cpknhqdz47"; + sha256 = "148wmk7gjiyfms9lrwgiky7vw78pwnvpnx71rg4l30zd6jfiknp9"; }; propagatedBuildInputs = [ jre ] ; diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix index d4d2790b2a3..e076c6ca90e 100644 --- a/pkgs/development/go-modules/generic/default.nix +++ b/pkgs/development/go-modules/generic/default.nix @@ -1,4 +1,4 @@ -{ go, govers, parallel, lib, fetchgit, fetchhg }: +{ go, govers, parallel, lib, fetchgit, fetchhg, rsync }: { name, buildInputs ? [], nativeBuildInputs ? [], passthru ? {}, preFixup ? "" @@ -17,6 +17,10 @@ # Extra sources to include in the gopath , extraSrcs ? [ ] +# Extra gopaths containing src subfolder +# with sources to include in the gopath +, extraSrcPaths ? [ ] + # go2nix dependency file , goDeps ? null @@ -86,6 +90,9 @@ go.stdenv.mkDerivation ( mv goPath/* "go/src/${goPackagePath}" rmdir goPath + '') + (lib.optionalString (extraSrcPaths != []) '' + ${rsync}/bin/rsync -a ${lib.concatMapStrings (p: "${p}/src") extraSrcPaths} go + '') + '' export GOPATH=$NIX_BUILD_TOP/go:$GOPATH diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 35b47467216..50bb3695a71 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1021,6 +1021,10 @@ self: super: { # https://github.com/fpco/store/issues/77 store = dontCheck super.store; + store_0_3 = super.store_0_3.overrideScope (self: super: { + store-core = self.store-core_0_3; + }); + # https://github.com/bmillwood/applicative-quoters/issues/6 applicative-quoters = doJailbreak super.applicative-quoters; diff --git a/pkgs/development/libraries/aubio/default.nix b/pkgs/development/libraries/aubio/default.nix index 1d315d28aee..a14de67d7f3 100644 --- a/pkgs/development/libraries/aubio/default.nix +++ b/pkgs/development/libraries/aubio/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "aubio-0.4.1"; + name = "aubio-0.4.3"; src = fetchurl { url = "http://aubio.org/pub/${name}.tar.bz2"; - sha256 = "15f6nf76y7iyl2kl4ny7ky0zpxfxr8j3902afvd6ydnnkh5dzmr5"; + sha256 = "1azarklqggch8kkz3gbqwi2vlb6ld4lidyhp34qawr0c7h3xnb5n"; }; buildInputs = [ @@ -20,11 +20,11 @@ stdenv.mkDerivation rec { installPhase = "${python2.interpreter} waf install"; - meta = with stdenv.lib; { + meta = with stdenv.lib; { description = "Library for audio labelling"; homepage = http://aubio.org/; license = licenses.gpl2; - maintainers = [ maintainers.goibhniu maintainers.marcweber ]; + maintainers = with maintainers; [ goibhniu marcweber fpletz ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/http-parser/default.nix b/pkgs/development/libraries/http-parser/default.nix index 980dd1f18a2..60a1435462b 100644 --- a/pkgs/development/libraries/http-parser/default.nix +++ b/pkgs/development/libraries/http-parser/default.nix @@ -42,6 +42,6 @@ in stdenv.mkDerivation { homepage = https://github.com/joyent/http-parser; license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.linux; # Broken on pure-darwin, wants xcode + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libhttpseverywhere/default.nix b/pkgs/development/libraries/libhttpseverywhere/default.nix index ea30f3e2de6..cf38f117bb8 100644 --- a/pkgs/development/libraries/libhttpseverywhere/default.nix +++ b/pkgs/development/libraries/libhttpseverywhere/default.nix @@ -1,14 +1,15 @@ -{stdenv, fetchFromGitHub, gnome3, glib, json_glib, libxml2, libarchive, libsoup, gobjectIntrospection, meson, ninja, pkgconfig, valadoc}: +{stdenv, fetchurl, gnome3, glib, json_glib, libxml2, libarchive, libsoup, gobjectIntrospection, meson, ninja, pkgconfig, valadoc}: stdenv.mkDerivation rec { - name = "libhttpseverywhere-${version}"; - version = "0.2.3"; + major = "0.2"; + minor = "3"; + version = "${major}.${minor}"; - src = fetchFromGitHub { - owner = "grindhold"; - repo = "libhttpseverywhere"; - rev = "${version}"; - sha256 = "0ggg1kw5yjakqqpnmjcbcpnq5m4lhc76javh8waqv2klr5mxd2a7"; + name = "libhttpseverywhere-${version}"; + + src = fetchurl { + url = "mirror://gnome/sources/libhttpseverywhere/${major}/libhttpseverywhere-${version}.tar.xz"; + sha256 = "0ndk6yyfcd7iwwkv4rkivhd08k0x8v03gnp9dk1ms4bxb1l2i8l1"; }; nativeBuildInputs = [ gnome3.vala valadoc gobjectIntrospection meson ninja pkgconfig ]; @@ -33,7 +34,7 @@ stdenv.mkDerivation rec { meta = { description = "library to use HTTPSEverywhere in desktop applications"; - homepage = https://github.com/grindhold/libhttpseverywhere; + homepage = https://git.gnome.org/browse/libhttpseverywhere; license = stdenv.lib.licenses.lgpl3; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ sternenseemann ]; diff --git a/pkgs/development/libraries/qt-5/5.6/qtwebengine.nix b/pkgs/development/libraries/qt-5/5.6/qtwebengine.nix index a433976dad1..2a437e62eca 100644 --- a/pkgs/development/libraries/qt-5/5.6/qtwebengine.nix +++ b/pkgs/development/libraries/qt-5/5.6/qtwebengine.nix @@ -1,6 +1,62 @@ -{ qtSubmodule, qtquickcontrols, qtlocation, qtwebchannel }: +{ qtSubmodule, qtquickcontrols, qtlocation, qtwebchannel + +, xlibs, libXcursor, libXScrnSaver, libXrandr, libXtst +, fontconfig, freetype, harfbuzz, icu, dbus +, zlib, libjpeg, libpng, libtiff +, alsaLib +, libcap +, pciutils + +, bison, flex, git, which, gperf +, coreutils +, pkgconfig, python + +}: qtSubmodule { name = "qtwebengine"; qtInputs = [ qtquickcontrols qtlocation qtwebchannel ]; + buildInputs = [ bison flex git which gperf ]; + nativeBuildInputs = [ pkgconfig python coreutils ]; + doCheck = true; + + enableParallelBuilding = true; + + preConfigure = '' + export MAKEFLAGS=-j$NIX_BUILD_CORES + substituteInPlace ./src/3rdparty/chromium/build/common.gypi \ + --replace /bin/echo ${coreutils}/bin/echo + substituteInPlace ./src/3rdparty/chromium/v8/build/toolchain.gypi \ + --replace /bin/echo ${coreutils}/bin/echo + substituteInPlace ./src/3rdparty/chromium/v8/build/standalone.gypi \ + --replace /bin/echo ${coreutils}/bin/echo + + configureFlags+="\ + -plugindir $out/lib/qt5/plugins \ + -importdir $out/lib/qt5/imports \ + -qmldir $out/lib/qt5/qml \ + -docdir $out/share/doc/qt5" + ''; + propagatedBuildInputs = [ + dbus zlib alsaLib + + # Image formats + libjpeg libpng libtiff + + # Text rendering + fontconfig freetype harfbuzz icu + + # X11 libs + xlibs.xrandr libXScrnSaver libXcursor libXrandr xlibs.libpciaccess libXtst + xlibs.libXcomposite + + libcap + pciutils + ]; + postInstall = '' + cat > $out/libexec/qt.conf < $out/libexec/qt.conf <cmds->any_recurse) - { -+ if (enable_nested_output) -+ { -+ log_working_directory (1); -+ fprintf(stderr, "\e[pbuilding %s\n", file->name); -+ stderr_nesting_level++; -+ } - execute_file_commands (file); -+ if (enable_nested_output) -+ { -+ fprintf(stderr, "\e[q"); -+ stderr_nesting_level--; -+ } - return; - } - diff --git a/pkgs/development/tools/misc/intltool/default.nix b/pkgs/development/tools/misc/intltool/default.nix index e59e4c23776..3c5dacb6f65 100644 --- a/pkgs/development/tools/misc/intltool/default.nix +++ b/pkgs/development/tools/misc/intltool/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { patches = [(fetchpatch { name = "perl-5.22.patch"; url = "https://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/intltool" - + "/debian/patches/perl5.22-regex-fixes?revision=47258&view=co"; + + "/debian/patches/perl5.22-regex-fixes.patch?revision=47258&view=co"; sha256 = "17clqczb9fky7hp8czxa0fy82b5478irvz4f3fnans3sqxl95hx3"; })]; diff --git a/pkgs/games/blobby/blobby.sh b/pkgs/games/blobby/blobby.sh new file mode 100644 index 00000000000..4c4b32b1243 --- /dev/null +++ b/pkgs/games/blobby/blobby.sh @@ -0,0 +1,10 @@ +#! @shell@ + +test -d ~/.blobby || { + mkdir ~/.blobby + cp -r "@out@/share/blobby"/* ~/.blobby + chmod u+w -R ~/.blobby + ( cd ~/.blobby; for i in *.zip; do @unzip@/bin/unzip "$i"; done ) +} + +@out@/bin/blobby.bin diff --git a/pkgs/games/blobby/default.nix b/pkgs/games/blobby/default.nix index c577d65a559..03cd2e7ca26 100644 --- a/pkgs/games/blobby/default.nix +++ b/pkgs/games/blobby/default.nix @@ -1,5 +1,5 @@ {stdenv, fetchurl, SDL2, SDL2_image, mesa, cmake, physfs, boost, zip, zlib -, pkgconfig}: +, pkgconfig, unzip}: stdenv.mkDerivation rec { version = "1.0"; name = "blobby-volley-${version}"; @@ -9,12 +9,22 @@ stdenv.mkDerivation rec { sha256 = "1qpmbdlyhfbrdsq4vkb6cb3b8mh27fpizb71q4a21ala56g08yms"; }; - buildInputs = [SDL2 SDL2_image mesa cmake physfs boost zip zlib pkgconfig]; + buildInputs = [SDL2 SDL2_image mesa cmake physfs boost zip zlib pkgconfig + unzip]; preConfigure='' sed -e '1i#include ' -i src/NetworkMessage.cpp ''; + inherit unzip; + + postInstall = '' + cp ../data/Icon.bmp "$out/share/blobby/" + mv "$out/bin"/blobby{,.bin} + substituteAll "${./blobby.sh}" "$out/bin/blobby" + chmod a+x "$out/bin/blobby" + ''; + meta = { description = ''A blobby volleyball game''; license = stdenv.lib.licenses.bsd3; diff --git a/pkgs/os-specific/linux/android-udev-rules/default.nix b/pkgs/os-specific/linux/android-udev-rules/default.nix index cae5fe4329d..a779b53d3a5 100644 --- a/pkgs/os-specific/linux/android-udev-rules/default.nix +++ b/pkgs/os-specific/linux/android-udev-rules/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { name = "android-udev-rules-${version}"; - version = "20160805"; + version = "20161014"; src = fetchFromGitHub { owner = "M0Rf30"; repo = "android-udev-rules"; rev = version; - sha256 = "0sdf3insqs73cdzmwl3lqy7nj82f1lprxd3vm0jh3qpf0sd1k93c"; + sha256 = "0xc7wslxf7xsvfbd83wsw4nikmpq1zfd607y2p2r3j1vkw1yak08"; }; installPhase = '' diff --git a/pkgs/os-specific/linux/iputils/default.nix b/pkgs/os-specific/linux/iputils/default.nix index f6fcef11eb0..3e2eb93d213 100644 --- a/pkgs/os-specific/linux/iputils/default.nix +++ b/pkgs/os-specific/linux/iputils/default.nix @@ -34,7 +34,8 @@ stdenv.mkDerivation rec { mkdir -p $out/share/man/man8 cp -p doc/clockdiff.8 doc/arping.8 doc/ping.8 doc/rdisc.8 \ - doc/tracepath.8 doc/ninfod.8 $out/share/man/man8 + doc/tracepath.8 doc/ninfod.8 doc/traceroute6.8 \ + $out/share/man/man8 ln -s $out/share/man/man8/{ping,ping6}.8 ln -s $out/share/man/man8/{tracepath,tracepath6}.8 ''; diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index 6043c8f0613..bb86b41fd21 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.4.27"; + version = "4.4.28"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1zbahhbwxdhl7v0l2ch1ybllywj2df3rmy8w451whr79z7c7shvc"; + sha256 = "1z7ln5llv67n2y9k6ihy4l4zm03yabhma8xhc0psp4x8168wn6l4"; }; kernelPatches = args.kernelPatches; diff --git a/pkgs/os-specific/linux/kernel/linux-4.8.nix b/pkgs/os-specific/linux/kernel/linux-4.8.nix index 8c07fb7383d..0a2da165638 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.8.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.8.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.8.4"; + version = "4.8.5"; extraMeta.branch = "4.8"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1c122kcd98ljk2f7w4qkbx4cjv7a50w4gdc9qrxkpciaj4yqvjy1"; + sha256 = "0264h3b8h4bqgcif2jzbz4yzv290nrn444bhcqzb0lizj8a1f5s8"; }; kernelPatches = args.kernelPatches; diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 38be5ec588d..39bfbe76e6c 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.9-rc2"; - modDirVersion = "4.9.0-rc2"; + version = "4.9-rc3"; + modDirVersion = "4.9.0-rc3"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/testing/linux-${version}.tar.xz"; - sha256 = "1hf913mgyz5niy971c505s8yhqrdvq65psdrjz7cxmdxsb96pk94"; + sha256 = "16dvjxh1i0s18mzm2bcj1v1drv7n2id39jgy71n7i5pyvzc5ffhj"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/wpa_supplicant/gui.nix b/pkgs/os-specific/linux/wpa_supplicant/gui.nix index a75367f0bb0..89f40589c87 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, qt4, qmake4Hook, inkscape, wpa_supplicant }: +{ stdenv, fetchurl, qt4, qmake4Hook, imagemagick, wpa_supplicant }: stdenv.mkDerivation { name = "wpa_gui-${wpa_supplicant.version}"; @@ -6,33 +6,29 @@ stdenv.mkDerivation { inherit (wpa_supplicant) src; buildInputs = [ qt4 ]; + nativeBuildInputs = [ qmake4Hook imagemagick ]; - nativeBuildInputs = [ inkscape qmake4Hook ]; + patches = [ ./remove_inkscape.patch ]; + prePatch = '' + cd wpa_supplicant/wpa_gui-qt4 + ''; - prePatch = "cd wpa_supplicant/wpa_gui-qt4"; + preConfigure = '' + lrelease wpa_gui.pro + ''; - preConfigure = - '' - lrelease wpa_gui.pro - ''; + postBuild = '' + make -C icons + ''; - # We do not install .xpm icons. First of all, I don't know where they should - # be install. Second, this allows us to drop imagemagick build-time dependency. - postBuild = - '' - sed -e '/ICONS.*xpm/d' -i icons/Makefile - make -C icons - ''; - - installPhase = - '' - mkdir -pv $out/bin - cp -v wpa_gui $out/bin - mkdir -pv $out/share/applications - cp -v wpa_gui.desktop $out/share/applications - mkdir -pv $out/share/icons - cp -av icons/hicolor $out/share/icons - ''; + installPhase = '' + mkdir -pv $out/bin + cp -v wpa_gui $out/bin + mkdir -pv $out/share/applications + cp -v wpa_gui.desktop $out/share/applications + mkdir -pv $out/share/icons + cp -av icons/hicolor $out/share/icons + ''; meta = { description = "Qt-based GUI for wpa_supplicant"; diff --git a/pkgs/os-specific/linux/wpa_supplicant/remove_inkscape.patch b/pkgs/os-specific/linux/wpa_supplicant/remove_inkscape.patch new file mode 100644 index 00000000000..1bdb164e24f --- /dev/null +++ b/pkgs/os-specific/linux/wpa_supplicant/remove_inkscape.patch @@ -0,0 +1,30 @@ +From 7a42ef048b420f9b939085ea8c6af6deb9c19dac Mon Sep 17 00:00:00 2001 +From: Moritz Ulrich +Date: Sun, 30 Oct 2016 22:17:54 +0100 +Subject: [PATCH] Foo + +--- + icons/Makefile | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) + +diff --git a/icons/Makefile b/icons/Makefile +index 709514c..9a5fa94 100644 +--- a/icons/Makefile ++++ b/icons/Makefile +@@ -9,10 +9,9 @@ all: $(ICONS) + + %.png: + mkdir -p hicolor/$(word 1, $(subst /, ,$(@)))/apps/ +- inkscape $(subst .png,.svg, $(word 2, $(subst /, , $(@)))) --without-gui \ +- --export-width=$(word 1, $(subst x, , $(@))) \ +- --export-height=$(word 2, $(subst x, , $(subst /, , $(@)))) \ +- --export-png=hicolor/$(word 1, $(subst /, ,$(@)))/apps/$(word 2, $(subst /, , $@)) ++ convert $(subst .png,.svg, $(word 2, $(subst /, , $(@)))) \ ++ -size $(word 1, $(subst x, , $(@)))x$(word 2, $(subst x, , $(subst /, , $(@)))) \ ++ hicolor/$(word 1, $(subst /, ,$(@)))/apps/$(word 2, $(subst /, , $@)) + + %.xpm: + mkdir -p pixmaps/ +-- +2.10.1 + diff --git a/pkgs/servers/dict/dictd-db.nix b/pkgs/servers/dict/dictd-db.nix index 995a643d7ef..500ac6fd47b 100644 --- a/pkgs/servers/dict/dictd-db.nix +++ b/pkgs/servers/dict/dictd-db.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, callPackage }: let # Probably a bug in some FreeDict release files, but easier to trivially @@ -82,4 +82,6 @@ in rec { dbName = "mueller-names"; locale = "en_UK"; }; + wordnet = callPackage ./dictd-wordnet.nix {}; + wiktionary = callPackage ./dictd-wiktionary.nix {}; } diff --git a/pkgs/servers/dict/dictd-wiktionary.nix b/pkgs/servers/dict/dictd-wiktionary.nix index 42eb3c0757e..8637d043836 100644 --- a/pkgs/servers/dict/dictd-wiktionary.nix +++ b/pkgs/servers/dict/dictd-wiktionary.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, python, dict, glibcLocales, writeScript}: stdenv.mkDerivation rec { - version = "20140118"; + version = "20161001"; name = "dict-db-wiktionary-${version}"; data = fetchurl { url = "http://dumps.wikimedia.org/enwiktionary/${version}/enwiktionary-${version}-pages-articles.xml.bz2"; - sha256 = "892c9fc16b248a31e2d3e42590267161c1b899b31fe923eb1ede1deb6d24cfa8"; + sha256 = "0g3k7kxp2nzg0v56i4cz253af3aqvhn1lwkys2fnam51cn3yqm7m"; }; convert = ./wiktionary2dict.py; diff --git a/pkgs/servers/nosql/redis/default.nix b/pkgs/servers/nosql/redis/default.nix index 7dbdf5f04a2..59f2b4ac5cf 100644 --- a/pkgs/servers/nosql/redis/default.nix +++ b/pkgs/servers/nosql/redis/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, lua }: stdenv.mkDerivation rec { - version = "3.2.3"; + version = "3.2.5"; name = "redis-${version}"; src = fetchurl { url = "http://download.redis.io/releases/${name}.tar.gz"; - sha256 = "05az2g3gna5lkhh6x1a5m6yardbiig1l4ysggldlk5if8ww9qkk7"; + sha256 = "05ak12xfkcinky6wvhy77knzd95m4vlshwka6jrdcjfqxyqww2c5"; }; buildInputs = [ lua ]; diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index c1a341dd6fa..edd5c2785dc 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -234,6 +234,7 @@ let outputs = outputs'; } else { })))) ( { + overrideAttrs = f: mkDerivation (attrs // (f attrs)); # The meta attribute is passed in the resulting attribute set, # but it's not part of the actual derivation, i.e., it's not # passed to the builder and is not a dependency. But since we diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index bdfbbb1aa6d..871d5a9dbd8 100644 --- a/pkgs/tools/X11/xpra/default.nix +++ b/pkgs/tools/X11/xpra/default.nix @@ -10,11 +10,11 @@ with lib; let inherit (pythonPackages) python cython buildPythonApplication; in buildPythonApplication rec { - name = "xpra-0.17.5"; + name = "xpra-0.17.6"; namePrefix = ""; src = fetchurl { url = "http://xpra.org/src/${name}.tar.xz"; - sha256 = "01k5iax42820pblfadig8rqfa1wlcgpakmjp142gx3fg59fnav3i"; + sha256 = "1z7v58m45g10icpv22qg4dipafcfsdqkxqz73z3rwsb6r0kdyrpj"; }; buildInputs = [ diff --git a/pkgs/tools/audio/darkice/default.nix b/pkgs/tools/audio/darkice/default.nix index d9e1d196915..bb2df52f84c 100644 --- a/pkgs/tools/audio/darkice/default.nix +++ b/pkgs/tools/audio/darkice/default.nix @@ -1,24 +1,9 @@ -{ stdenv, buildEnv, fetchurl +{ stdenv, buildEnv, fetchurl, pkgconfig , libjack2, alsaLib, libpulseaudio , faac, lame, libogg, libopus, libvorbis, libsamplerate }: -let - oggEnv = buildEnv { - name = "env-darkice-ogg"; - paths = [ - libopus.dev libopus libvorbis.dev libvorbis libogg.dev libogg - ]; - }; - - darkiceEnv = buildEnv { - name = "env-darkice"; - paths = [ - lame.out lame.lib libpulseaudio libpulseaudio.dev alsaLib alsaLib.dev libsamplerate.out libsamplerate.dev - ]; - }; - -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { name = "darkice-${version}"; version = "1.3"; @@ -27,17 +12,16 @@ in stdenv.mkDerivation rec { sha256 = "1rlxds7ssq7nk2in4s46xws7xy9ylxsqgcz85hxjgh17lsm0y39c"; }; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ + libopus libvorbis libogg libpulseaudio alsaLib libsamplerate libjack2 lame + ]; + + NIX_CFLAGS_COMPILE = "-fpermissive"; + configureFlags = [ - "--with-alsa-prefix=${darkiceEnv}" "--with-faac-prefix=${faac}" - "--with-jack-prefix=${libjack2}" - "--with-lame-prefix=${darkiceEnv}" - "--with-opus-prefix=${oggEnv}" - "--with-pulseaudio-prefix=${darkiceEnv}" - "--with-samplerate-prefix=${darkiceEnv}" - "--with-vorbis-prefix=${oggEnv}" -# "--with-aacplus-prefix=${aacplus}" ### missing: aacplus -# "--with-twolame-prefix=${twolame}" ### missing: twolame + "--with-lame-prefix=${lame.lib}" ]; patches = [ ./fix-undeclared-memmove.patch ]; diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index 005915080af..3710eef238f 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -14,11 +14,11 @@ with stdenv.lib; buildPythonApplication rec { name = "youtube-dl-${version}"; - version = "2016.10.25"; + version = "2016.10.31"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${name}.tar.gz"; - sha256 = "920048c6ff2f7f2c4b55c1ba4810e85f76efd814118e59b3568bdc2c38024697"; + sha256 = "b8a0889bf4fed2f54d8ebbc6ea7860feae05b122d1b192417af68159b83f0bb4"; }; buildInputs = [ makeWrapper zip ] ++ optional generateManPage pandoc; diff --git a/pkgs/tools/security/mpw/default.nix b/pkgs/tools/security/mpw/default.nix index 813c7e5c06c..e30866021da 100644 --- a/pkgs/tools/security/mpw/default.nix +++ b/pkgs/tools/security/mpw/default.nix @@ -1,37 +1,41 @@ -{ stdenv, fetchurl, autoconf, automake, openssl, libxml2 }: +{ stdenv, fetchzip, autoconf, automake, openssl, libxml2, fetchFromGitHub, ncurses }: let - scrypt_src = fetchurl { - url = "http://masterpasswordapp.com/libscrypt-b12b554.tar.gz"; - sha256 = "02vz4i66v1acd15xjgki4ilmmp28m6a5603gi4hf8id3d3ndl9n7"; + scrypt_src = fetchzip { + url = "http://www.tarsnap.com/scrypt/scrypt-1.2.0.tgz"; + sha256 = "0ahylib2pimlhjcm566kpim6n16jci5v749xwdkr9ivgfjrv3xn4"; }; in stdenv.mkDerivation { - name = "mpw-2.1-cli4"; + name = "mpw-2.1-6834f36"; - srcs = [ - (fetchurl { - url = "https://ssl.masterpasswordapp.com/mpw-2.1-cli4-0-gf6b2287.tar.gz"; - sha256 = "141bzb3nj18rbnbpdvsri8cdwwwxz4d6akyhfa834542xf96b9vf"; - }) - scrypt_src - ]; - - sourceRoot = "."; + src = fetchFromGitHub { + owner = "Lyndir"; + repo = "MasterPassword"; + rev = "6834f3689f5dfd4e59ad6959961d349c224977ee"; + sha256 = "0zlpx3hb1y2l60hg961h05lb9yf3xb5phnyycvazah2674gkwb2p"; + }; postUnpack = '' - cp -R libscrypt-b12b554/* lib/scrypt + sourceRoot+=/MasterPassword/C ''; prePatch = '' patchShebangs . + mkdir lib/scrypt/src + cp -R --no-preserve=ownership ${scrypt_src}/* lib/scrypt/src + chmod +w -R lib/scrypt/src + substituteInPlace lib/scrypt/src/libcperciva/cpusupport/Build/cpusupport.sh \ + --replace dirname "$(type -P dirname)" + substituteInPlace lib/scrypt/src/Makefile.in --replace "command -p mv" "mv" ''; NIX_CFLAGS_COMPILE = "-I${libxml2.dev}/include/libxml2"; - buildInputs = [ autoconf automake openssl libxml2 ]; + buildInputs = [ autoconf automake openssl libxml2 ncurses ]; buildPhase = '' + substituteInPlace build --replace '"curses"' '"ncurses"' targets="mpw mpw-tests" ./build ''; diff --git a/pkgs/tools/text/silver-searcher/default.nix b/pkgs/tools/text/silver-searcher/default.nix index fcd7d350f30..2f12020afc3 100644 --- a/pkgs/tools/text/silver-searcher/default.nix +++ b/pkgs/tools/text/silver-searcher/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "silver-searcher-${version}"; - version = "0.32.0"; + version = "0.33.0"; src = fetchFromGitHub { owner = "ggreer"; repo = "the_silver_searcher"; rev = "${version}"; - sha256 = "0mz0i41fb6yrvn5x99bwaa66wqv5c8s5wd9pbnn90mgppxbn1037"; + sha256 = "19705cgn8h476hkfyal3s5kx9mnz64hiz6dihnrx22fa3xvjfzlg"; }; NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s"; diff --git a/pkgs/tools/typesetting/asciidoctor/Gemfile.lock b/pkgs/tools/typesetting/asciidoctor/Gemfile.lock index fc0abf038a9..0212db3816a 100644 --- a/pkgs/tools/typesetting/asciidoctor/Gemfile.lock +++ b/pkgs/tools/typesetting/asciidoctor/Gemfile.lock @@ -4,33 +4,33 @@ GEM Ascii85 (1.0.2) addressable (2.4.0) afm (0.2.2) - asciidoctor (1.5.4) + asciidoctor (1.5.5) asciidoctor-bespoke (1.0.0.alpha.1) asciidoctor (>= 1.5.0) slim (~> 3.0.6) thread_safe (~> 0.3.5) - asciidoctor-diagram (1.4.0) + asciidoctor-diagram (1.5.2) asciidoctor (~> 1.5.0) - asciidoctor-latex (1.5.0.8.dev) + asciidoctor-latex (1.5.0.17.dev) asciidoctor (~> 1.5, >= 1.5.2) htmlentities (~> 4.3) opal (~> 0.6.3) - asciidoctor-pdf (1.5.0.alpha.11) - asciidoctor (~> 1.5.0) + asciidoctor-pdf (1.5.0.alpha.13) + asciidoctor (>= 1.5.0) prawn (>= 1.3.0, < 3.0.0) - prawn-icon (= 1.0.0) - prawn-svg (= 0.21.0) + prawn-icon (= 1.2.0) + prawn-svg (>= 0.21.0, < 0.26.0) prawn-table (= 0.2.2) prawn-templates (= 0.0.3) safe_yaml (~> 1.0.4) thread_safe (~> 0.3.5) treetop (= 1.5.3) concurrent-ruby (1.0.2) - css_parser (1.4.1) + css_parser (1.4.6) addressable hashery (2.1.2) htmlentities (4.3.4) - json (1.8.3) + json (2.0.2) opal (0.6.3) source_map sprockets @@ -45,30 +45,30 @@ GEM prawn (2.1.0) pdf-core (~> 0.6.1) ttfunk (~> 1.4.0) - prawn-icon (1.0.0) + prawn-icon (1.2.0) prawn (>= 1.1.0, < 3.0.0) - prawn-svg (0.21.0) + prawn-svg (0.25.2) css_parser (~> 1.3) - prawn (>= 0.8.4, < 3) + prawn (>= 0.11.1, < 3) prawn-table (0.2.2) prawn (>= 1.3.0, < 3.0.0) prawn-templates (0.0.3) pdf-reader (~> 1.3) prawn (>= 0.15.0) - rack (1.6.4) + rack (2.0.1) ruby-rc4 (0.1.5) safe_yaml (1.0.4) - slim (3.0.6) - temple (~> 0.7.3) + slim (3.0.7) + temple (~> 0.7.6) tilt (>= 1.3.3, < 2.1) source_map (3.0.1) json - sprockets (3.6.0) + sprockets (3.7.0) concurrent-ruby (~> 1.0) rack (> 1, < 3) - temple (0.7.6) + temple (0.7.7) thread_safe (0.3.5) - tilt (2.0.2) + tilt (2.0.5) treetop (1.5.3) polyglot (~> 0.3) ttfunk (1.4.0) @@ -84,4 +84,4 @@ DEPENDENCIES asciidoctor-pdf BUNDLED WITH - 1.11.2 + 1.13.6 diff --git a/pkgs/tools/typesetting/asciidoctor/gemset.nix b/pkgs/tools/typesetting/asciidoctor/gemset.nix index 0c67be72e8a..4c26c6a434a 100644 --- a/pkgs/tools/typesetting/asciidoctor/gemset.nix +++ b/pkgs/tools/typesetting/asciidoctor/gemset.nix @@ -26,10 +26,10 @@ asciidoctor = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0xrli1fjsf1f0h6d9g55vzivxbqac2ygawcacx5ijnqn522wg9qc"; + sha256 = "0kj2lls8f83nlhfkdkmbf7k5q9c9kk1cc15b1a4dy6arx4yzmvw7"; type = "gem"; }; - version = "1.5.4"; + version = "1.5.5"; }; asciidoctor-bespoke = { source = { @@ -42,26 +42,26 @@ asciidoctor-diagram = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0yb2gqzzbvgf5im0bhv26s3h09m9m6a0pjlq3swqcvwi1szc64k5"; + sha256 = "1di271v0ic6d5xkqbbwg6scjyj1ypklgy211gdmhf18xzpka3fvi"; type = "gem"; }; - version = "1.4.0"; + version = "1.5.2"; }; asciidoctor-latex = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0wdrhcxz0sz9kx2zxn3qbqm5p664n9gzvv3lmg3214pj3si5wxnn"; + sha256 = "02qvn1ngp4s9y22vk23zzssd4w1bpyk84akjwiq6nqn8im6s4awz"; type = "gem"; }; - version = "1.5.0.8.dev"; + version = "1.5.0.17.dev"; }; asciidoctor-pdf = { source = { remotes = ["https://rubygems.org"]; - sha256 = "06jsbn1yiavg6r07k93rmjxj6ah8csqla5mpymqjzslrkgjg5brs"; + sha256 = "0lp1q1yxy4y9k3znxxgj6pl0cbymz0yk5hsif73sg2bnpk62id9i"; type = "gem"; }; - version = "1.5.0.alpha.11"; + version = "1.5.0.alpha.13"; }; concurrent-ruby = { source = { @@ -74,10 +74,10 @@ css_parser = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1ql5q4n39278prbdjdsxx9wkxkxblgzzn0qcdqnwibgd1dkvb5av"; + sha256 = "0zsldn0ihmzl7nqk4lww9h8ijv1zb3l8g92y7b4w0da2d6cnyjw8"; type = "gem"; }; - version = "1.4.1"; + version = "1.4.6"; }; hashery = { source = { @@ -98,10 +98,10 @@ json = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1nsby6ry8l9xg3yw4adlhk2pnc7i0h0rznvcss4vk3v74qg0k8lc"; + sha256 = "1lhinj9vj7mw59jqid0bjn2hlfcnq02bnvsx9iv81nl2han603s0"; type = "gem"; }; - version = "1.8.3"; + version = "2.0.2"; }; opal = { source = { @@ -146,18 +146,18 @@ prawn-icon = { source = { remotes = ["https://rubygems.org"]; - sha256 = "07dcsvxg52zdywhg28p6zsbj7ybz3xzbklawc1n7jwym2mli3916"; + sha256 = "101npavqvv5w44vgphlkqn3gdawxmsnd4j8bk6lzbxz7niqgaqny"; type = "gem"; }; - version = "1.0.0"; + version = "1.2.0"; }; prawn-svg = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1p5fsamh33xqp2gld0j4ii80awsxmm4ffp5pq13m0s1gavzaapc3"; + sha256 = "19zc7i6jxycs9m00frvv9g3x98sgzsyb1xf1xnn3h1ki574ibnip"; type = "gem"; }; - version = "0.21.0"; + version = "0.25.2"; }; prawn-table = { source = { @@ -178,10 +178,10 @@ rack = { source = { remotes = ["https://rubygems.org"]; - sha256 = "09bs295yq6csjnkzj7ncj50i6chfxrhmzg1pk6p0vd2lb9ac8pj5"; + sha256 = "053bqbrxr5gjw5k3rrmh6i35s83kgdycxv292lid072vpwrq1xv1"; type = "gem"; }; - version = "1.6.4"; + version = "2.0.1"; }; ruby-rc4 = { source = { @@ -202,10 +202,10 @@ slim = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1szs71hh0msm5gj6qbcxw44m3hqnwybx4yh02scwixnwg576058k"; + sha256 = "122hmc2kn3g151m8c41imadw29mghnsjwyzj8wav5zb1q69y4iqp"; type = "gem"; }; - version = "3.0.6"; + version = "3.0.7"; }; source_map = { source = { @@ -218,18 +218,18 @@ sprockets = { source = { remotes = ["https://rubygems.org"]; - sha256 = "16fnlp4fqzrdxlbalbx3r0bir7dwyr1asg7s9lsmmczngl0x7fw7"; + sha256 = "0jzsfiladswnzbrwqfiaj1xip68y58rwx0lpmj907vvq47k87gj1"; type = "gem"; }; - version = "3.6.0"; + version = "3.7.0"; }; temple = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0ysraljv7lkb04z5vdyrkijab7j1jzj1mgz4bj82744dp7d0rhb0"; + sha256 = "0xlf1if32xj14mkfwh8nxy3zzjzd9lipni0v2bghknp2kfc1hcz6"; type = "gem"; }; - version = "0.7.6"; + version = "0.7.7"; }; thread_safe = { source = { @@ -242,10 +242,10 @@ tilt = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0lkd40xfdqkp333vdfhrfjmi2y7k2hjs4azawfb62mrkfp7ivj84"; + sha256 = "0lgk8bfx24959yq1cn55php3321wddw947mgj07bxfnwyipy9hqf"; type = "gem"; }; - version = "2.0.2"; + version = "2.0.5"; }; treetop = { source = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cf5da20f392..05195015670 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -250,6 +250,8 @@ in fetchNuGet = callPackage ../build-support/fetchnuget { }; buildDotnetPackage = callPackage ../build-support/build-dotnet-package { }; + fetchgx = callPackage ../build-support/fetchgx { }; + resolveMirrorURLs = {url}: fetchurl { showURLs = true; inherit url; @@ -2327,6 +2329,8 @@ in lnav = callPackage ../tools/misc/lnav { }; + loc = callPackage ../development/misc/loc { }; + lockfileProgs = callPackage ../tools/misc/lockfile-progs { }; logstash = callPackage ../tools/misc/logstash { }; @@ -5505,6 +5509,7 @@ in pythonFull = python.override{x11Support=true;}; python2Full = python2.override{x11Support=true;}; python3Full = python3.override{x11Support=true;}; + python27Full = python2Full; # pythonPackages further below, but assigned here because they need to be in sync pythonPackages = python2Packages; @@ -6045,7 +6050,6 @@ in gnum4 = callPackage ../development/tools/misc/gnum4 { }; gnumake380 = callPackage ../development/tools/build-managers/gnumake/3.80 { }; - gnumake381 = callPackage ../development/tools/build-managers/gnumake/3.81 { }; gnumake382 = callPackage ../development/tools/build-managers/gnumake/3.82 { }; gnumake3 = gnumake382; gnumake40 = callPackage ../development/tools/build-managers/gnumake/4.0 { }; @@ -9935,10 +9939,6 @@ in dictDBCollector = callPackage ../servers/dict/dictd-db-collector.nix {}; - dictdWiktionary = callPackage ../servers/dict/dictd-wiktionary.nix {}; - - dictdWordnet = callPackage ../servers/dict/dictd-wordnet.nix {}; - diod = callPackage ../servers/diod { lua = lua5_1; }; #dnschain = callPackage ../servers/dnschain { }; @@ -17115,6 +17115,8 @@ in pt = callPackage ../applications/misc/pt { }; + pyload = callPackage ../applications/networking/pyload {}; + uae = callPackage ../misc/emulators/uae { }; fsuae = callPackage ../misc/emulators/fs-uae { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f502f75de09..185043b27e3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4056,6 +4056,16 @@ in { }; }); + contexter = buildPythonPackage rec { + name = "contexter-${version}"; + version = "0.1.3"; + + src = pkgs.fetchurl { + url = "mirror://pypi/c/contexter/${name}.tar.gz"; + sha256 = "0xrnkjya29ya0hkj8y4k9ni2mnr58i6r0xfqlj7wk07v4jfrkc8n"; + }; + }; + contextlib2 = buildPythonPackage rec { name = "contextlib2-${version}"; @@ -19417,7 +19427,7 @@ in { sha256 = "0hqsap82zklhi5fxhc69kxrwzb0g9566f7sdpz7f9gyxkmyam839"; }; - propagatedBuildInputs = with self; [ pkgs.curl pkgs.openssl ]; + propagatedBuildInputs = with self; [ pkgs.curl pkgs.openssl.out ]; # error: invalid command 'test' doCheck = false; @@ -19427,6 +19437,11 @@ in { export PYCURL_SSL_LIBRARY=openssl ''; + #TODO no idea why this is needed + postInstall = '' + ln -s ${pkgs.openssl.out}/lib/libcrypto* $out/lib/ + ''; + meta = { homepage = http://pycurl.sourceforge.net/; description = "Python wrapper for libcurl"; @@ -19434,7 +19449,6 @@ in { }; }); - pycurl2 = buildPythonPackage (rec { name = "pycurl2-7.20.0"; disabled = isPy3k; @@ -23281,6 +23295,18 @@ in { }; }; + pip2nix = buildPythonPackage rec { + name = "pip2nix-${version}"; + version = "0.3.0"; + + src = pkgs.fetchurl { + url = "mirror://pypi/p/pip2nix/${name}.tar.gz"; + sha256 = "1s76i8r4khq8y5r6g4218jg2c6qldmw5xhzymxad51ii8hafpwq6"; + }; + + propagatedBuildInputs = with self; [ click configobj contexter jinja2 pytest ]; + }; + pychef = buildPythonPackage rec { name = "PyChef-${version}"; version = "0.3.0"; @@ -25160,6 +25186,7 @@ in { sha256 = "0n2shilamgwhzmvf534xg7f6hrnznbixyl5pw2f5a3f391gwy37h"; }; + doCheck = false; propagatedBuildInputs = with self; [ requests2 six requests_oauthlib ]; meta = { @@ -28987,12 +29014,12 @@ in { }; neovim = buildPythonPackage rec { - version = "0.1.9"; + version = "0.1.10"; name = "neovim-${version}"; src = pkgs.fetchurl { url = "mirror://pypi/n/neovim/${name}.tar.gz"; - sha256 = "09q7yz0v9i90grp4cmb1w8dps58q9xny7sb12kgmd8gcr8xwk4dx"; + sha256 = "1n6xxh0n250qbvrdl0cw114d890nfv6d0wjk5wpr505sg2bg9jx4"; }; buildInputs = with self; [ nose ]; @@ -29019,22 +29046,18 @@ in { neovim_gui = buildPythonPackage rec { name = "neovim-pygui-${self.neovim.version}"; - version = "0.1.2"; + version = "0.1.3"; disabled = !isPy27; src = pkgs.fetchFromGitHub { owner = "neovim"; repo = "python-gui"; rev = version; - sha256 = "0sc5apxwxgfj57q7d9cih404jgvczbp7slz5z8wqdyxpxlb42pn2"; + sha256 = "1vpvr3zm3f9sxg1z1cl7f7gi8v1xksjdvxj62qnw65aqj3zqxnkz"; }; - buildInputs = with self; [ neovim ]; - propagatedBuildInputs = [ - self.msgpack - self.greenlet - self.trollius + self.neovim self.click self.pygobject3 pkgs.gobjectIntrospection diff --git a/pkgs/top-level/rust-packages.nix b/pkgs/top-level/rust-packages.nix index 20cc1396653..332fe71f64f 100644 --- a/pkgs/top-level/rust-packages.nix +++ b/pkgs/top-level/rust-packages.nix @@ -7,9 +7,9 @@ { runCommand, fetchFromGitHub, git }: let - version = "2016-09-29"; - rev = "12dc47026cadf5aa2823c9d0fdd055b9f2c0f52c"; - sha256 = "0la6wlnbiwjixcxbq6k0d8m5js8lk5wz5f3mvdx8hwl5car20w6m"; + version = "2016-10-29"; + rev = "623cc0d9328bfb949b54209443f2b4f06c41961e"; + sha256 = "1jyb0ixnrxb7m0c18p6yfi6x8rsy3yz5yc3nyz9f462fr4g6azcs"; src = fetchFromGitHub { inherit rev;