diff options
Diffstat (limited to 'pkgs')
272 files changed, 5842 insertions, 4388 deletions
diff --git a/pkgs/applications/altcoins/cryptop/default.nix b/pkgs/applications/altcoins/cryptop/default.nix new file mode 100644 index 000000000000..33853f150cb6 --- /dev/null +++ b/pkgs/applications/altcoins/cryptop/default.nix @@ -0,0 +1,24 @@ +{ lib, python2}: + +python2.pkgs.buildPythonApplication rec { + pname = "cryptop"; + version = "0.1.0"; + name = "${pname}-${version}"; + + src = python2.pkgs.fetchPypi { + inherit pname version; + sha256 = "00glnlyig1aajh30knc5rnfbamwfxpg29js2db6mymjmfka8lbhh"; + }; + + propagatedBuildInputs = [ python2.pkgs.requests ]; + + # No tests in archive + doCheck = false; + + meta = { + homepage = "http://github.com/huwwp/cryptop"; + description = "Command line Cryptocurrency Portfolio"; + license = with lib.licenses; [ mit ]; + maintainers = with lib.maintainers; [ bhipple ]; + }; +} diff --git a/pkgs/applications/audio/cantata/default.nix b/pkgs/applications/audio/cantata/default.nix index 82a6d44f6436..f09791d9aa1f 100644 --- a/pkgs/applications/audio/cantata/default.nix +++ b/pkgs/applications/audio/cantata/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, cmake, vlc +{ stdenv, fetchFromGitHub, cmake, pkgconfig, vlc , withQt4 ? false, qt4 -, withQt5 ? true, qtbase, qtsvg, qttools +, withQt5 ? true, qtbase, qtmultimedia, qtsvg, qttools # Cantata doesn't build with cdparanoia enabled so we disable that # default for now until I (or someone else) figure it out. @@ -34,7 +34,7 @@ assert withOnlineServices -> withTaglib; assert withReplaygain -> withTaglib; let - version = "2.0.1"; + version = "2.1.0"; pname = "cantata"; fstat = x: fn: "-DENABLE_" + fn + "=" + (if x then "ON" else "OFF"); fstats = x: map (fstat x); @@ -44,24 +44,27 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchFromGitHub { - owner = "CDrummond"; - repo = "cantata"; - rev = "v${version}"; - sha256 = "18fiz3cav41dpap42qwj9hwxf2k9fmhyg2r34yggxqi2cjlsil36"; + owner = "CDrummond"; + repo = "cantata"; + rev = "v${version}"; + sha256 = "1mwc3cyrvg8qxjn70h4i6kdkvz85xspb3wi8wrb56jrhil409fkh"; }; - buildInputs = - [ cmake vlc ] - ++ stdenv.lib.optional withQt4 qt4 - ++ stdenv.lib.optionals withQt5 [ qtbase qtsvg qttools ] + buildInputs = [ vlc ] + ++ stdenv.lib.optional withQt4 qt4 + ++ stdenv.lib.optionals withQt5 [ qtbase qtmultimedia qtsvg qttools ] ++ stdenv.lib.optionals withTaglib [ taglib taglib_extras ] ++ stdenv.lib.optionals withReplaygain [ ffmpeg speex mpg123 ] - ++ stdenv.lib.optional withCdda cdparanoia - ++ stdenv.lib.optional withCddb libcddb - ++ stdenv.lib.optional withLame lame - ++ stdenv.lib.optional withMtp libmtp - ++ stdenv.lib.optional withMusicbrainz libmusicbrainz5 - ++ stdenv.lib.optional (withTaglib && withDevices) udisks2; + ++ stdenv.lib.optional withCdda cdparanoia + ++ stdenv.lib.optional withCddb libcddb + ++ stdenv.lib.optional withLame lame + ++ stdenv.lib.optional withMtp libmtp + ++ stdenv.lib.optional withMusicbrainz libmusicbrainz5 + ++ stdenv.lib.optional (withTaglib && withDevices) udisks2; + + nativeBuildInputs = [ cmake pkgconfig ]; + + enableParallelBuilding = true; cmakeFlags = stdenv.lib.flatten [ (fstat withQt5 "QT5") @@ -94,6 +97,6 @@ stdenv.mkDerivation rec { # Technically Cantata can run on Windows so if someone wants to # bother figuring that one out, be my guest. platforms = platforms.linux; - maintainers = [ maintainers.fuuzetsu ]; + maintainers = with maintainers; [ fuuzetsu ]; }; } diff --git a/pkgs/applications/editors/android-studio/common.nix b/pkgs/applications/editors/android-studio/common.nix index e74d04218f48..bd8e25fa41cc 100644 --- a/pkgs/applications/editors/android-studio/common.nix +++ b/pkgs/applications/editors/android-studio/common.nix @@ -34,7 +34,7 @@ let androidStudio = stdenv.mkDerivation { - inherit src meta; + inherit src; name = "${pname}"; buildInputs = [ makeWrapper @@ -103,12 +103,13 @@ let name = "${pname}-fhs-env"; }; -in writeTextFile { - name = "${pname}-${version}"; - destination = "/bin/${pname}"; - executable = true; - text = '' - #!${bash}/bin/bash - ${fhsEnv}/bin/${pname}-fhs-env ${androidStudio}/bin/studio.sh - ''; -} +in + writeTextFile { + name = "${pname}-${version}"; + destination = "/bin/${pname}"; + executable = true; + text = '' + #!${bash}/bin/bash + ${fhsEnv}/bin/${pname}-fhs-env ${androidStudio}/bin/studio.sh + ''; + } // { inherit meta; } diff --git a/pkgs/applications/editors/android-studio/packages.nix b/pkgs/applications/editors/android-studio/packages.nix index 1dab1d472061..da3e8b8b944a 100644 --- a/pkgs/applications/editors/android-studio/packages.nix +++ b/pkgs/applications/editors/android-studio/packages.nix @@ -13,7 +13,11 @@ in rec { }; meta = with stdenv.lib; { - description = "The Official IDE for Android"; + description = "The Official IDE for Android (stable version)"; + longDescription = '' + Android Studio is the official IDE for Android app development, based on + IntelliJ IDEA. + ''; homepage = https://developer.android.com/studio/index.html; license = licenses.asl20; platforms = [ "x86_64-linux" ]; @@ -36,8 +40,9 @@ in rec { }; meta = stable.meta // { + description = "The Official IDE for Android (preview version)"; homepage = https://developer.android.com/studio/preview/index.html; - maintainers = with stdenv.lib.maintainers; [ tomsmeets ]; + maintainers = with stdenv.lib.maintainers; [ primeos tomsmeets ]; }; } { fontsConf = makeFontsConf { diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix index da2eefd985ae..b5c0d4653681 100644 --- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix @@ -1446,10 +1446,10 @@ }) {}; org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "org"; - version = "20170724"; + version = "20170731"; src = fetchurl { - url = "https://elpa.gnu.org/packages/org-20170724.tar"; - sha256 = "1f1szds6642427hrzagxgkr05z66sf57n5l2acvmpgw4z358ms0n"; + url = "https://elpa.gnu.org/packages/org-20170731.tar"; + sha256 = "1vf91r4ifnjg5r82l5ikq0bwsxd5dsbgywzmwaspm6ckx49nksnl"; }; packageRequires = []; meta = { @@ -1785,10 +1785,10 @@ }) {}; sokoban = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "sokoban"; - version = "1.4.4"; + version = "1.4.5"; src = fetchurl { - url = "https://elpa.gnu.org/packages/sokoban-1.4.4.tar"; - sha256 = "0lz0qxgs71yh23iayv50rb6qgqvgbz2bg2sgfxcps8wag643ns20"; + url = "https://elpa.gnu.org/packages/sokoban-1.4.5.tar"; + sha256 = "1hh35g1p2f5al88jsbgiz35bvhn7iw5sf9zhsjimiig5isv7khip"; }; packageRequires = []; meta = { diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix index 192306a059a9..8caa31c5dadb 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix @@ -822,8 +822,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "afbf59630203624e0a5eecee52a3296295e6d620"; - sha256 = "0bygl7ahwsz6xmw0fif7gqnpzbk8cx7hpg4gp96f8inicq849z26"; + rev = "db1244c1c14514324474f362c857112e89bbf0c6"; + sha256 = "1fcrlxk9z11vbarznfcpfyqzvj6v3ydbn5z6vbdmgf9cxb52kfma"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ac-rtags"; @@ -881,12 +881,12 @@ ac-sly = callPackage ({ auto-complete, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, sly }: melpaBuild { pname = "ac-sly"; - version = "20150421.1322"; + version = "20170728.327"; src = fetchFromGitHub { owner = "qoocku"; repo = "ac-sly"; - rev = "b37a1ecfaab10a6d81c6d894417176d3bb4c5285"; - sha256 = "0mif35chyj4ai1bj4gq8qi38dyfsp72yi1xchhzy9zi2plpvqa7a"; + rev = "bf69c687c4ecf1994349d20c182e9b567399912e"; + sha256 = "09g6v2yp3wl566488zsb79lklqpai9dgz6xwv1y5h6zkghxvkhpy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bb26741e841d4886c14f0a059a52805732f179b1/recipes/ac-sly"; @@ -1613,12 +1613,12 @@ all-the-icons = callPackage ({ emacs, fetchFromGitHub, fetchurl, font-lock-plus, lib, melpaBuild, memoize }: melpaBuild { pname = "all-the-icons"; - version = "20170713.146"; + version = "20170726.140"; src = fetchFromGitHub { owner = "domtronn"; repo = "all-the-icons.el"; - rev = "84514026e342aa3cc98d8b6492175e1bdf788e5c"; - sha256 = "0s5cll8sq5hg1jm7g1nkcpbcz0n6f84ax9drzghv9y0m86v819mq"; + rev = "64fd8651fde0a25d55561517576d05c407373f8e"; + sha256 = "0f57pym95bgb6s2mkwpk3jvsinwlz350k63xph6fkijygwzfkmwm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/604c01aa15927bd122260529ff0f4bb6a8168b7e/recipes/all-the-icons"; @@ -1655,12 +1655,12 @@ all-the-icons-gnus = callPackage ({ all-the-icons, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "all-the-icons-gnus"; - version = "20170718.2354"; + version = "20170726.619"; src = fetchFromGitHub { owner = "nlamirault"; repo = "all-the-icons-gnus"; - rev = "8785d04f54b1692c04f4b665864f8f95425c20c6"; - sha256 = "0zn9aq0ml39p2adjb9hpqk2iwb1dk5z5jdhabxszmhbs3zs53i52"; + rev = "45560293e42d02c17c332894f3764dd624d25444"; + sha256 = "1j0s3m54gyrl50bqss6xaijja1hdbm5285py750dn4ykrj5m3d3r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f8ed74d39d165343c81c2a21aa47e3d3895d8119/recipes/all-the-icons-gnus"; @@ -2289,27 +2289,6 @@ license = lib.licenses.free; }; }) {}; - anything-project = callPackage ({ anything, fetchFromGitHub, fetchurl, imakado, lib, melpaBuild }: - melpaBuild { - pname = "anything-project"; - version = "20141024.227"; - src = fetchFromGitHub { - owner = "imakado"; - repo = "anything-project"; - rev = "9f6f04bc1911474e97e99faf52e204cf159add83"; - sha256 = "16a7i01q8qqkgph1s3jnwdr2arjq3cm3jpv5bk5sqs29c003q0pp"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/e842d55882ec4d689d279fb80490db60a1f32fd6/recipes/anything-project"; - sha256 = "10crwm34igb4kjh97alni15xzhsb2s0d4ghva86f2gpjidka9fhr"; - name = "anything-project"; - }; - packageRequires = [ anything imakado ]; - meta = { - homepage = "https://melpa.org/#/anything-project"; - license = lib.licenses.free; - }; - }) {}; anything-prosjekt = callPackage ({ anything, fetchFromGitHub, fetchurl, lib, melpaBuild, prosjekt }: melpaBuild { pname = "anything-prosjekt"; @@ -2625,12 +2604,12 @@ apropospriate-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "apropospriate-theme"; - version = "20170721.1400"; + version = "20170726.1123"; src = fetchFromGitHub { owner = "waymondo"; repo = "apropospriate-theme"; - rev = "5727dd549d9cb95a6a18919f90428d7c5b860a99"; - sha256 = "0a66s9lyi4anf4s6sxh66b4c4lsa9m3bqdqym4qhf53ywi55qal5"; + rev = "4137ad1eed3fc2fe48c122e636f83580d1d04dd9"; + sha256 = "1ydxwlv3v2whl4k77shlyjk0yyrm4cr6src9rsbzvw6in5cm483f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1da33013f15825ab656260ce7453b8127e0286f4/recipes/apropospriate-theme"; @@ -2665,12 +2644,12 @@ arch-packer = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "arch-packer"; - version = "20170723.430"; + version = "20170730.621"; src = fetchFromGitHub { owner = "brotzeitmacher"; repo = "arch-packer"; - rev = "743b3dc5f239c77e9c5c3049b5a9701da1ae12ee"; - sha256 = "0h5ajz5mcj9g1y9f5fyqcjmqss99403v6lbqngh20mj8pi6w9rr5"; + rev = "940e96f7d357c6570b675a0f942181c787f1bfd7"; + sha256 = "0m80ka51m7a1797q6br41x96znvqfmpwzh3vk4mz66mdx2r4xk77"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/39f13017cde2d209a58dc45f0df25dc723398b72/recipes/arch-packer"; @@ -2873,12 +2852,12 @@ asn1-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "asn1-mode"; - version = "20160626.2240"; + version = "20170728.1926"; src = fetchFromGitHub { owner = "kawabata"; repo = "asn1-mode"; - rev = "c244717529229d7ecc2b2c160992f28dcb755d2c"; - sha256 = "0r004sli3ggkhsdi61m8p32l227h5wligzph0mfhsy39fkhmva34"; + rev = "d5d4a8259daf708411699bcea85d322f18beb972"; + sha256 = "067khpi4ghzyifrk1vhi57n3alp67qks4k4km11hasiavi5gsjmp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b694baceceb54810be8f8c7152b2ac0b4063f01c/recipes/asn1-mode"; @@ -3150,8 +3129,8 @@ src = fetchFromGitHub { owner = "DamienCassou"; repo = "auth-password-store"; - rev = "e8d8733b1af67e4ea088d1ed015c554171feecb9"; - sha256 = "05yzqrdk2d6mqyapgnfflfvm2pqifmb6fprf5si8n6wb8gmi2idw"; + rev = "b9fb3ef8d4ebe7bef939a3cf574f9caa833347c9"; + sha256 = "1rzqz560zqsymdpv84n1z17jyf7k75797y4bkzhk5grd3ry77x9j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0f4d2a28373ba93da5b280ebf40c5a3fa758ea11/recipes/auth-password-store"; @@ -3225,22 +3204,22 @@ license = lib.licenses.free; }; }) {}; - auto-compile = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, packed }: + auto-compile = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, packed }: melpaBuild { pname = "auto-compile"; - version = "20170130.1017"; + version = "20170728.942"; src = fetchFromGitHub { owner = "tarsius"; repo = "auto-compile"; - rev = "0cbebd8fd22c88a57a834797e4841900ea1bae1c"; - sha256 = "1sngafab6sssidz6w1zsxw8i6k4j13m0073lbmp7gq3ixsqdxbr7"; + rev = "c9786234bdc32237e6c304e6a7c917504370358d"; + sha256 = "0x9vmq9q3hkljv2dz57q97szsv60sbiyp6bbzp3272ykz6snpj76"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e00dcd4f8c59c748cc3c85af1607dd19b85d7813/recipes/auto-compile"; sha256 = "1cdv41hg71mi5ixxi4kiizyg03xai2gyhk0vz7gw59d9a7482yks"; name = "auto-compile"; }; - packageRequires = [ dash emacs packed ]; + packageRequires = [ emacs packed ]; meta = { homepage = "https://melpa.org/#/auto-compile"; license = lib.licenses.free; @@ -4802,8 +4781,8 @@ src = fetchFromGitHub { owner = "DamienCassou"; repo = "beginend"; - rev = "a06a479c2279da9e852cf42628b6dfa466fff0bd"; - sha256 = "1jbhg73g1rrkbwql5vi2b0ys9avfazmwzwgd90gkzwavw0ch9cvl"; + rev = "6e489758708cf7797ab3619cfdccd7422615dcda"; + sha256 = "0cjc9c2sr081b9nfspballb032h2809n1w3533v3ci8pcq82vq96"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/31c1157d4fd9e47a780bbd91075252acdc7899dd/recipes/beginend"; @@ -5612,7 +5591,7 @@ }) {}; bookmark-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "bookmark-plus"; - version = "20170719.2147"; + version = "20170731.1658"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/bookmark+.el"; sha256 = "0iqvlwqilwpqlymj8iynw2miifl28h1g7z10q08rly2430fnmi37"; @@ -5657,8 +5636,8 @@ src = fetchFromGitHub { owner = "jyp"; repo = "boon"; - rev = "2b7a41491df809e425b81a574fea64e9d6f7f011"; - sha256 = "1haxw4xccalkwmrln5whd0lgfrq7lhdfyip2firlnrkaq8zw741w"; + rev = "d45fecf0aca62f977ceb3b725aa7b7625ae82f33"; + sha256 = "1ma40xnbxdpb49c9w1i65g2q1hl0b731c2vagqazxw21ng36mf71"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/boon"; @@ -6424,12 +6403,12 @@ buttercup = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "buttercup"; - version = "20170701.429"; + version = "20170729.609"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "emacs-buttercup"; - rev = "b6deeffe032527696e32623b69bdf07b538a315e"; - sha256 = "0ldc26wpgx01i1sfy9kc52dh3lmy53dr3pxxrn841rb37yc4h1rh"; + rev = "ca090405d92d28bc9552ef4d5eab00e3d18a7d3c"; + sha256 = "1ghpcz22i8dzdnxr8m5cl4g4l4bqc5z2h4f9chwhkc0csxlrvkal"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d4b187cb5b3cc5b546bfa6b94b6792e6363242d1/recipes/buttercup"; @@ -6905,12 +6884,12 @@ cargo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rust-mode }: melpaBuild { pname = "cargo"; - version = "20170725.248"; + version = "20170801.117"; src = fetchFromGitHub { owner = "kwrooijen"; repo = "cargo.el"; - rev = "7a843c9209cf48c53e1f3dfd533c156d6c701501"; - sha256 = "0xj0bqn3mc8kpihpki1y2wx9ydqvza9kbpz2di8wa768zj1xh6qz"; + rev = "486d9a6aa6aac64a9c53555ec69980be5f3ad366"; + sha256 = "03rc80v44slqh4r9fdyl95mljcx4gspn1bij4kc1wzrs5anf8dig"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e997b356b009b3d2ab467fe49b79d728a8cfe24b/recipes/cargo"; @@ -7077,8 +7056,8 @@ src = fetchFromGitHub { owner = "skk-dev"; repo = "ddskk"; - rev = "78798134af82a300e54a5d22d2f10c2885cd11ae"; - sha256 = "1svdv0c9c0q68d0ad65kvaxvkafb15gv62yhxb02a4h4g4w9n4vs"; + rev = "16d156562aef72f02ced58087335ed72d520d878"; + sha256 = "0rz49i2yqs1yalqqnwgk2zvsga6qav4hc2dhf8p2kfkzrcbpzgxx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7375cab750a67ede1a021b6a4371b678a7b991b0/recipes/ccc"; @@ -7119,8 +7098,8 @@ src = fetchFromGitHub { owner = "skk-dev"; repo = "ddskk"; - rev = "78798134af82a300e54a5d22d2f10c2885cd11ae"; - sha256 = "1svdv0c9c0q68d0ad65kvaxvkafb15gv62yhxb02a4h4g4w9n4vs"; + rev = "16d156562aef72f02ced58087335ed72d520d878"; + sha256 = "0rz49i2yqs1yalqqnwgk2zvsga6qav4hc2dhf8p2kfkzrcbpzgxx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b48fe069ecd95ea0f9768ecad969e0838344e45d/recipes/cdb"; @@ -7328,8 +7307,8 @@ src = fetchFromGitHub { owner = "cfengine"; repo = "core"; - rev = "e14319ed4308647746027bd62131ef07692710b9"; - sha256 = "1rpv8nl18wgijz3vh7anh1xvhqx8vbc8bajx0l2036v3k4mq3dc6"; + rev = "089803189dafa145564b37b2e9340da547ff7c0c"; + sha256 = "07xd2pkz30nf09jv7vqb29n1vd3wc70p7j42f0zz22dcvx3iw2g3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c737839aeda583e61257ad40157e24df7f918b0f/recipes/cfengine-code-style"; @@ -7368,7 +7347,7 @@ version = "20170201.347"; src = fetchsvn { url = "https://beta.visl.sdu.dk/svn/visl/tools/vislcg3/trunk/emacs"; - rev = "12277"; + rev = "12278"; sha256 = "0lv9lsh1dnsmida4hhj04ysq48v4m12nj9yq621xn3i6s2qz7s1k"; }; recipeFile = fetchurl { @@ -7700,16 +7679,16 @@ chinese-fonts-setup = callPackage ({ cnfonts, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "chinese-fonts-setup"; - version = "20170724.737"; + version = "20170726.1517"; src = fetchFromGitHub { owner = "tumashu"; - repo = "chinese-fonts-setup"; - rev = "bb285b91da12ba9c5897a6aed9c893449000210d"; - sha256 = "0dq745yjbwv1xb6i7m7372i4rb6brq9y4f70m01wcmacm6h85j14"; + repo = "cnfonts"; + rev = "5cfe656554c91b3d0dcc5417e43afa85d2a7a182"; + sha256 = "1px5gc83g70whdiysq7mmxz7rm74mhsjs2y1vbzgg8k1z0cs9wkp"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/c536882e613e83a4a2baf86479bfb3efb86d916a/recipes/chinese-fonts-setup"; - sha256 = "141ri6a6mnxf7fn17gw48kxk8pvl3khdxkb4pw8brxwrr9rx0xd5"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/0d5787ffeeee68ffa41f3e777071815084e0ed7a/recipes/chinese-fonts-setup"; + sha256 = "0fqj721zk57641wxnmk82wsj08ycnzj61z9i34x58d7c0k3424w1"; name = "chinese-fonts-setup"; }; packageRequires = [ cnfonts emacs ]; @@ -7742,16 +7721,16 @@ chinese-pyim = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pyim }: melpaBuild { pname = "chinese-pyim"; - version = "20170724.1618"; + version = "20170728.2242"; src = fetchFromGitHub { owner = "tumashu"; - repo = "chinese-pyim"; - rev = "dd034c6fb9473aed7ee856a366f3cac031e82209"; - sha256 = "1clqz4yg86mm673pabzi54angc7qr41pikrz0x2ya0qhz88g0y9s"; + repo = "pyim"; + rev = "88adc57d754c9aecc922fe8b29239148f2b6557c"; + sha256 = "11hd2k64j5wm75hmnbf0ywcak0lc733jhkivmbvkx1qkb4cwll6v"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/157a264533124ba05c161aa93a32c7209f002fba/recipes/chinese-pyim"; - sha256 = "0zdx5zhgj1ly89pl48vigjzd8g74fxnxcd9bxrqykcn7y5qvim8l"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/151a0af91a58e27f724854d85d5dd9668229fe8d/recipes/chinese-pyim"; + sha256 = "0chh4vnb2gh6ckf01w7xd1kw4454p1vkzmy17dvm0c7269rya9mn"; name = "chinese-pyim"; }; packageRequires = [ pyim ]; @@ -7760,69 +7739,6 @@ license = lib.licenses.free; }; }) {}; - chinese-pyim-basedict = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "chinese-pyim-basedict"; - version = "20170724.1523"; - src = fetchFromGitHub { - owner = "tumashu"; - repo = "chinese-pyim-basedict"; - rev = "6b6eea5375d2e0b4b6374fbf766ebb209ece86af"; - sha256 = "0rx30m9ag3hbggm9jl0bpkn0svf5838nj6qsailcnxkyxq3cga2l"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/e2315ffe7d13928eddaf217a5f67a3e0dd5e62a1/recipes/chinese-pyim-basedict"; - sha256 = "1qmr71lnpn06mcbb6gfr3dh78pav0sk9mld956cvnkg82vg7nmpv"; - name = "chinese-pyim-basedict"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/chinese-pyim-basedict"; - license = lib.licenses.free; - }; - }) {}; - chinese-pyim-greatdict = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "chinese-pyim-greatdict"; - version = "20170724.1525"; - src = fetchFromGitHub { - owner = "tumashu"; - repo = "chinese-pyim-greatdict"; - rev = "45fa4ff26f3444fb98c4dea460d84b740204d105"; - sha256 = "1j89mcfsqyclmllfqmsx8a55ihrn2kzay8qh2lyfm8dzd6mi1za0"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/03234f7a1abe7423c5a9bcb4c100957c8eece351/recipes/chinese-pyim-greatdict"; - sha256 = "1xqr2fcsb45khavqx06ry2sm8db790zlggk61civbdyafvlz8ikc"; - name = "chinese-pyim-greatdict"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/chinese-pyim-greatdict"; - license = lib.licenses.free; - }; - }) {}; - chinese-pyim-wbdict = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "chinese-pyim-wbdict"; - version = "20170724.1527"; - src = fetchFromGitHub { - owner = "tumashu"; - repo = "chinese-pyim-wbdict"; - rev = "114489ed97e825ae11a8d09da6e873820cf23106"; - sha256 = "187wx418pj4h8p8baf4943v9dsb6mfbn0n19r8xiil1z2cmm4ygc"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/7c77ba5562e8bd8b8f532e7745edcdf3489584ac/recipes/chinese-pyim-wbdict"; - sha256 = "0y9hwn9rjplb69vi4s9bvf6fkvns2rlpkqm0qvv44mxq7g61lm5c"; - name = "chinese-pyim-wbdict"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/chinese-pyim-wbdict"; - license = lib.licenses.free; - }; - }) {}; chinese-wbim = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "chinese-wbim"; @@ -7971,12 +7887,12 @@ cider = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, queue, seq, spinner }: melpaBuild { pname = "cider"; - version = "20170724.2248"; + version = "20170729.133"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "cider"; - rev = "ea6aa352f7e5b97e00ac2057c2d7579a9e6f411f"; - sha256 = "000zgcb66hgh1sxcn48q6dp2ln90nakpknikp441z8h9yhaazh8f"; + rev = "71f737d444da95c6175b513d500c56ae9711bbd0"; + sha256 = "0z2djw2y0rzpm256jqihv19hn9q8b7x2mga3h5r2gwzw803134y9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/55a937aed818dbe41530037da315f705205f189b/recipes/cider"; @@ -8160,12 +8076,12 @@ circe = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "circe"; - version = "20170528.731"; + version = "20170728.638"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "circe"; - rev = "13c605e639194c3da0c2e685056fac685f8c76a0"; - sha256 = "0n7v0g332ml1ang2fjc8rjbi8h1f4bqazcqi8dlfn99vvv8kcd21"; + rev = "47bbcf4268602688f90c08ce64ec93226fc3f894"; + sha256 = "1bi9hc1xcg5zjlzlrjgg3pwkdr9krgsyd5y87z57mxzmpndlxadr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a2b295656d53fddc76cacc86b239e5648e49e3a4/recipes/circe"; @@ -8247,7 +8163,7 @@ version = "20170120.137"; src = fetchsvn { url = "http://llvm.org/svn/llvm-project/cfe/trunk/tools/clang-format"; - rev = "309006"; + rev = "309673"; sha256 = "0qyhvjb3pf0qp7ag2wav4wxrxfgk1zga0dy4kzw8lm32ajzjjavk"; }; recipeFile = fetchurl { @@ -8549,12 +8465,12 @@ cloc = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cloc"; - version = "20151007.201"; + version = "20170728.1124"; src = fetchFromGitHub { owner = "cosmicexplorer"; repo = "cloc-emacs"; - rev = "15e63b83dd6261f543d25aac4c72e764e3274d53"; - sha256 = "1rflc00yrbb7xzfh8c54ajf4qnhsp3mq07gkr257gjyrwsdw762v"; + rev = "f30f0472e465cc8d433d2473e9d3b8dfe2c94491"; + sha256 = "0g8hklc0914dsi3ks7g251w58ixa78qsh87dx914cc8sahpc0ws2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0dd7a641efd13aa0bd7509d8a5b0a28e3a0493c8/recipes/cloc"; @@ -8633,12 +8549,12 @@ clojure-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "clojure-mode"; - version = "20170712.349"; + version = "20170725.2307"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "clojure-mode"; - rev = "276dad92886d7a3c7edb95be3e9fb2c17ea8b2a4"; - sha256 = "1hk0pyiz2nfmlh1xziqsjkdzjk7m4hlc4ki62pwyv4f1izajrrdd"; + rev = "5d0b53aa2446e0047b61f27b3c76e2645a423613"; + sha256 = "0wq835jxkd4f999nwjvsdn7rb282ixglln1v5lgvl0rahxyskbxf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode"; @@ -8658,8 +8574,8 @@ src = fetchFromGitHub { owner = "clojure-emacs"; repo = "clojure-mode"; - rev = "276dad92886d7a3c7edb95be3e9fb2c17ea8b2a4"; - sha256 = "1hk0pyiz2nfmlh1xziqsjkdzjk7m4hlc4ki62pwyv4f1izajrrdd"; + rev = "5d0b53aa2446e0047b61f27b3c76e2645a423613"; + sha256 = "0wq835jxkd4f999nwjvsdn7rb282ixglln1v5lgvl0rahxyskbxf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode-extra-font-locking"; @@ -8717,12 +8633,12 @@ clomacs = callPackage ({ cider, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "clomacs"; - version = "20170705.719"; + version = "20170726.436"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "clomacs"; - rev = "7af6fa717f08fda930641a27f3a07743c2042514"; - sha256 = "1diavwmjgaz0jxjbkzhlca9klqd7kmpih98clp8wiavhms80ykds"; + rev = "8d3e12a2f73e81499fa18f30adaea8c861e4a9b1"; + sha256 = "01wpzbv4vjad0nvbydc0rwb3jdqbncwajs5xrng88n1xxhrajh1x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/345f9797e87e3f5f957c167a5e3d33d1e31b50a3/recipes/clomacs"; @@ -8738,12 +8654,12 @@ closql = callPackage ({ emacs, emacsql-sqlite, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "closql"; - version = "20161130.925"; + version = "20170629.921"; src = fetchFromGitHub { owner = "emacscollective"; repo = "closql"; - rev = "0bb0fa3dd1e545cbf025d42e253ddb00107156a3"; - sha256 = "1mpycmj88gi62rhzxdv4933l318j3llphbc00b7rvzms55sgpcz5"; + rev = "73e68bcfbe076e152beed1b8e5f894ca438f9770"; + sha256 = "0vj18784x6cdl39sbfpsksmxln5yj31ah250q5n7ivh54vk2hvjl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2df16abf56e53d4a1cc267a78797419520ff8a1c/recipes/closql"; @@ -8864,12 +8780,12 @@ cmake-ide = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, levenshtein, lib, melpaBuild, s, seq }: melpaBuild { pname = "cmake-ide"; - version = "20170712.809"; + version = "20170730.546"; src = fetchFromGitHub { owner = "atilaneves"; repo = "cmake-ide"; - rev = "a20bf1a6b3c0c70f3637f5a8f4280ff3479ec180"; - sha256 = "07m1z36823pzlf4d0wf3v053svgyi2r8wk7rxjmnzrz717y6xj9h"; + rev = "7747ab37dfd678c3349d13ab8bcb9e5cff93c637"; + sha256 = "1p9vn3jnk3j0l2xm818dijfh5wm8l6y4ir2xiq6pqxf9v3qrp2lv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/17e8a8a5205d222950dc8e9245549a48894b864a/recipes/cmake-ide"; @@ -8889,8 +8805,8 @@ src = fetchFromGitHub { owner = "Kitware"; repo = "CMake"; - rev = "d9a541eacbd0d3e833a93853f03e6be26b99dc37"; - sha256 = "0fr4wml4ay4vi9wsn8jv566nakq1q68ylm3yacy7031fndq3ipvr"; + rev = "748c192f8b8181f3df39ab4f6a07f25a45211c8f"; + sha256 = "1l4xx4lbm9xlvkq80dij7sydh0vnaj97ad42qjll9afwp6galp2b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode"; @@ -9006,6 +8922,27 @@ license = lib.licenses.free; }; }) {}; + cnfonts = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "cnfonts"; + version = "20170731.1611"; + src = fetchFromGitHub { + owner = "tumashu"; + repo = "cnfonts"; + rev = "5cfe656554c91b3d0dcc5417e43afa85d2a7a182"; + sha256 = "1px5gc83g70whdiysq7mmxz7rm74mhsjs2y1vbzgg8k1z0cs9wkp"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/0d5787ffeeee68ffa41f3e777071815084e0ed7a/recipes/cnfonts"; + sha256 = "1pryn08fkdrdj7w302205nj1qhfbk1jzqxx6717crrxakkdqmn9w"; + name = "cnfonts"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/cnfonts"; + license = lib.licenses.free; + }; + }) {}; cobra-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cobra-mode"; @@ -9239,12 +9176,12 @@ color-identifiers-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "color-identifiers-mode"; - version = "20170615.1338"; + version = "20170730.1852"; src = fetchFromGitHub { owner = "ankurdave"; repo = "color-identifiers-mode"; - rev = "d57e162c2dcb926291ded21cbe46b98ad0ca32c8"; - sha256 = "1n12z7qfwgsdvdzzi5gkgkmdaazbrg5064s08xsc6gsfs4rb5d17"; + rev = "2091833fde5e3877f966e987ee8e30a85c8e31ac"; + sha256 = "0q2il3df7hm4nn3fpn82b9mz911yhzybzcizvhv6dpsdadbhidjr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5c735755e414fdf169aca5ec6f742533d21472e0/recipes/color-identifiers-mode"; @@ -9385,12 +9322,12 @@ color-theme-sanityinc-tomorrow = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "color-theme-sanityinc-tomorrow"; - version = "20170626.1417"; + version = "20170730.241"; src = fetchFromGitHub { owner = "purcell"; repo = "color-theme-sanityinc-tomorrow"; - rev = "ffcec9177c8b4393f036acb5ca51b33b53916ea8"; - sha256 = "0w59yfg7chx6srxpxsnwz7qrgyy35pdswv44j6lbh33hylxmclrh"; + rev = "51c95e37f02bc075a3d0d7a795dc7083ab57128b"; + sha256 = "16jbf9h0x0vw1mly4x0zrqvzs6wg16jplgy43kcnr8sc1xbj16xy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/color-theme-sanityinc-tomorrow"; @@ -10217,12 +10154,12 @@ company-math = callPackage ({ company, fetchFromGitHub, fetchurl, lib, math-symbol-lists, melpaBuild }: melpaBuild { pname = "company-math"; - version = "20170221.751"; + version = "20170729.429"; src = fetchFromGitHub { owner = "vspinu"; repo = "company-math"; - rev = "34b4b52f67e5c1ffaf807e4be1512fca4695eea8"; - sha256 = "0xl2am7kwbdfaxysjamq0b9slcdmlqqprb23zf07i4b28qa72qca"; + rev = "1ab4b8e582450a1b1780e69c823d63c4622b8a1e"; + sha256 = "0i64qm7y0c93ca3fsydinab9l4mgr1kd4m0l06871583w3brjirf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fadff01600d57f5b9ea9c0c47ed109e058114998/recipes/company-math"; @@ -10437,8 +10374,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "afbf59630203624e0a5eecee52a3296295e6d620"; - sha256 = "0bygl7ahwsz6xmw0fif7gqnpzbk8cx7hpg4gp96f8inicq849z26"; + rev = "db1244c1c14514324474f362c857112e89bbf0c6"; + sha256 = "1fcrlxk9z11vbarznfcpfyqzvj6v3ydbn5z6vbdmgf9cxb52kfma"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/company-rtags"; @@ -10978,12 +10915,12 @@ counsel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }: melpaBuild { pname = "counsel"; - version = "20170725.946"; + version = "20170728.855"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "112c5ba0df7deea11b3e91b5db3990d693eb5b72"; - sha256 = "0fcskn4v0rx5i04qr40wa8jggsswxxp8g8hk0s4sr447mxbiksbv"; + rev = "fc275339b57690d4157160ed22b7672d5382cbe7"; + sha256 = "1l5y83mx2qh8bz3f9fbbcpc474jis8aikqyilvkvnn932wkxlw8l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c50f32b8d603db0d70e77907e36862cd66b811/recipes/counsel"; @@ -11398,12 +11335,12 @@ cricbuzz = callPackage ({ dash, enlive, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "cricbuzz"; - version = "20170724.2330"; + version = "20170726.504"; src = fetchFromGitHub { owner = "lepisma"; repo = "cricbuzz.el"; - rev = "049e9d3c0c67350e008e62bd15b263add8f3a403"; - sha256 = "1vvaysvmpvdm4l20arzwgy0xhqy7lnav6wglq1x9ax7c7c0a3cdr"; + rev = "62c86b1aa6e0779c4f6d8fb9d31d75bf81994f69"; + sha256 = "1k8n65scj3frafy1fk25j3kzpp0q8r98ydibryv48izndpck03h3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/cricbuzz"; @@ -11485,8 +11422,8 @@ src = fetchFromGitHub { owner = "bbatsov"; repo = "crux"; - rev = "e805ab780a4a1ce22a4436bde09b95e97d150e51"; - sha256 = "007mhf60w8385ki2bqhsfjhhc4zq8k21ivgzpw15z83y641nyjp5"; + rev = "11096b95d1119847e746e4aae36c9de6163e5472"; + sha256 = "0ykm3cm6yrwp4a1b5rjjg9wzdp37w2rnjg1cyg2q33k31p49ywrf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/575e3442a925500a5806e0b900208c1e6bfd11ae/recipes/crux"; @@ -11586,16 +11523,16 @@ csound-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, multi, shut-up }: melpaBuild { pname = "csound-mode"; - version = "20170725.855"; + version = "20170731.1504"; src = fetchFromGitHub { owner = "hlolli"; repo = "csound-mode"; - rev = "14524d63a174c36a052c79025942f6a116a5f197"; - sha256 = "1h5sfwl2mjy8w2hnb73w2am1p2glwzf5n53q3d0ri8in83nxjn59"; + rev = "34d9499e8da475c491eac1158bd429bf0e10e7de"; + sha256 = "1j7gykp16im5rlrlhrxk5svz9w543350q6lz41754ah0f7i8gc6m"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/95ccfae76a2c0f627f6d218ca68072e79fcfd088/recipes/csound-mode"; - sha256 = "15zmgsh1071cyd9a0d7cljq8k7d8l2gkjjpv8z22gnm0wfbb0yys"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/c940d29de11e43b4abf2901c466c94d426a21818/recipes/csound-mode"; + sha256 = "047a78nhkn6qycsz8w9a0r1xyz5wyf4rds3z5yx9sn5wkv54w95d"; name = "csound-mode"; }; packageRequires = [ emacs multi shut-up ]; @@ -11731,12 +11668,12 @@ ctags-update = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ctags-update"; - version = "20170120.2313"; + version = "20170728.58"; src = fetchFromGitHub { owner = "jixiuf"; repo = "ctags-update"; - rev = "9c58084395bd5c62c3fe500cd56d62bfc1dcee51"; - sha256 = "0cgq31ivhhr32pz17yfy7sja81bhxjh7fn502fa8mc9c3msgflwn"; + rev = "783bf91eba1cd27cbb739067a24e15e5e04564e6"; + sha256 = "1navj3cm5gmp0h8wyk281i1gjry1kj0i73wlz1fjwkqm6awxfz4w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e5d0c347ff8cf6e0ade80853775fd6b84f387fa5/recipes/ctags-update"; @@ -12065,8 +12002,8 @@ src = fetchFromGitHub { owner = "cython"; repo = "cython"; - rev = "fb5e92001fe31a49227378e90a77bc5f4e2a83ff"; - sha256 = "0ym87yhmidxn25ba9si6hl76svgzm9mb8ar2qbbb9h7xcqscx6p0"; + rev = "c95ca9f21a3524718a83c3415bb7102a508154be"; + sha256 = "1d1hrd57k23gg5sbm49y17a1ly55d0d07if2sm467sa0b12zk45m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode"; @@ -12226,22 +12163,22 @@ license = lib.licenses.free; }; }) {}; - dante = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, s }: + dante = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild, s }: melpaBuild { pname = "dante"; - version = "20170708.421"; + version = "20170726.1140"; src = fetchFromGitHub { owner = "jyp"; repo = "dante"; - rev = "bf5d2bfc9a1696b97b1658a8090fdf80b6e9a730"; - sha256 = "0y5gg85sp73xzn6hj54w19di4d9x5w0nzl6h7lfp7l9kg94v0dsv"; + rev = "ac13c74b76aaf646af2bec9d01fe29f1725baac6"; + sha256 = "1k51pm10qkp2svbzlajswgsyghad8v91djir6iyfdjl54qjhk56y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5afa8226077cbda4b76f52734cf8e0b745ab88e8/recipes/dante"; sha256 = "1j0qwjshh2227k63vd06bvrsccymqssx26yfzams1xf7bp6y0krs"; name = "dante"; }; - packageRequires = [ dash emacs f flycheck s ]; + packageRequires = [ dash emacs f flycheck haskell-mode s ]; meta = { homepage = "https://melpa.org/#/dante"; license = lib.licenses.free; @@ -12397,12 +12334,12 @@ darkokai-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "darkokai-theme"; - version = "20170711.403"; + version = "20170728.339"; src = fetchFromGitHub { owner = "sjrmanning"; repo = "darkokai"; - rev = "94f845d0194bfd45e6a3c17222bba19aece9dd63"; - sha256 = "1zdzwjn3qcgxp7azz3sb5nfnmfd5mh9frvjlq5k013syy2p6xh44"; + rev = "d881d51acf0a7f806ae68d48305e30941a741a0e"; + sha256 = "008kn8gllhzlv49br0bs3469insjpcgr3r7iijz1frgy6wrpmdjp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/81387a5a70f7c42fbae16b52db765136795a37e1/recipes/darkokai-theme"; @@ -12460,12 +12397,12 @@ dash = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dash"; - version = "20170613.151"; + version = "20170727.212"; src = fetchFromGitHub { owner = "magnars"; repo = "dash.el"; - rev = "0468a3137c9e0d49121213f416fc7e2547d46a77"; - sha256 = "1ax99zbzbrjm1i94wpwgxqisrinxbk12mgd9admrfhsg180qvlhg"; + rev = "b4faa9397e06206b646f684a603e320f962674d1"; + sha256 = "0cjh9g8xfzf2rb6dy313rpxwd40yl7n3hdl9a2k8fdwyaww97p6a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57eed8767c3e98614259c408dc0b5c54d3473883/recipes/dash"; @@ -12506,8 +12443,8 @@ src = fetchFromGitHub { owner = "magnars"; repo = "dash.el"; - rev = "0468a3137c9e0d49121213f416fc7e2547d46a77"; - sha256 = "1ax99zbzbrjm1i94wpwgxqisrinxbk12mgd9admrfhsg180qvlhg"; + rev = "b4faa9397e06206b646f684a603e320f962674d1"; + sha256 = "0cjh9g8xfzf2rb6dy313rpxwd40yl7n3hdl9a2k8fdwyaww97p6a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57eed8767c3e98614259c408dc0b5c54d3473883/recipes/dash-functional"; @@ -12716,8 +12653,8 @@ src = fetchFromGitHub { owner = "skk-dev"; repo = "ddskk"; - rev = "78798134af82a300e54a5d22d2f10c2885cd11ae"; - sha256 = "1svdv0c9c0q68d0ad65kvaxvkafb15gv62yhxb02a4h4g4w9n4vs"; + rev = "16d156562aef72f02ced58087335ed72d520d878"; + sha256 = "0rz49i2yqs1yalqqnwgk2zvsga6qav4hc2dhf8p2kfkzrcbpzgxx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6eccccb79881eaa04af3ed6395cd2ab981d9c894/recipes/ddskk"; @@ -13128,12 +13065,12 @@ devdocs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "devdocs"; - version = "20160607.540"; + version = "20170731.150"; src = fetchFromGitHub { owner = "xuchunyang"; repo = "devdocs.el"; - rev = "1bff4bd406fc71199d9dcac503269f7aa8fcebe6"; - sha256 = "0qxy4i9438jmbxbj980civ8csh507gri3q3bszg3s1wv966k69rz"; + rev = "a2d51e824f0cc48a9dd611cc740bc8b86143e611"; + sha256 = "0nzh7pgvj4cs5d29lrrmbas29xdslgqzsqjmpapzqzbnrgprnbx8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a54ff5faeefabf484ef175433cfc2b8317993f74/recipes/devdocs"; @@ -13149,12 +13086,12 @@ dfmt = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dfmt"; - version = "20160911.228"; + version = "20170728.323"; src = fetchFromGitHub { owner = "qsimpleq"; repo = "elisp-dfmt"; - rev = "f07512fc8555ecd592d8a44722baf922f9f77aaf"; - sha256 = "1ph8z4hazz71k8zsv4gfhpsbysj4d3rinb68fmhp842n00ds6fk4"; + rev = "21b9094e907b7ac53f5ecb4ff4539613a9d12434"; + sha256 = "11r1i8nlz98z49fqb447abg1pv6838q54ly19wyg82k52875ms7m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a343a752d25185b30b10805c4012f3b21a03651e/recipes/dfmt"; @@ -14819,22 +14756,22 @@ license = lib.licenses.free; }; }) {}; - docker-compose-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + docker-compose-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, yaml-mode }: melpaBuild { pname = "docker-compose-mode"; - version = "20170722.941"; + version = "20170730.1527"; src = fetchFromGitHub { owner = "meqif"; repo = "docker-compose-mode"; - rev = "c21c79aa0aac7175eb90913b2eaa1201c181bd01"; - sha256 = "03w99zlhafypsw3rjf0skp5m963sq7ygd63ibknqaw3xghb0vxyz"; + rev = "a38b64aecd037556c91d9aef29f1d04496295f2b"; + sha256 = "140rbh5n1mqckjy652bp7mj08ylk8q1hr3ajl1cpyc00rniqwfds"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9d74905aa52aa78bdc8e96aa3b791c3d2a70965f/recipes/docker-compose-mode"; sha256 = "094r2mqxmll5dqbjhhdfg60xs9m74qn22lz475692k48ma5a7gd0"; name = "docker-compose-mode"; }; - packageRequires = [ dash emacs ]; + packageRequires = [ dash emacs yaml-mode ]; meta = { homepage = "https://melpa.org/#/docker-compose-mode"; license = lib.licenses.free; @@ -14969,12 +14906,12 @@ doom-themes = callPackage ({ all-the-icons, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "doom-themes"; - version = "20170718.1137"; + version = "20170727.1321"; src = fetchFromGitHub { owner = "hlissner"; repo = "emacs-doom-themes"; - rev = "557ff5d129b8b79e48287e68c934d309070c0542"; - sha256 = "1swwb3mkysn3rj9mbmbnyg0whx13k060cyi0phly5zssk4sj1n5i"; + rev = "70e99c07e626774f52008cacb3f7fc18453d97ce"; + sha256 = "160m5f05l32372i9qj611zmkf6bj5f7vnjprrkkx29ldz7f5pc0i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c5084bc2c3fe378af6ff39d65e40649c6359b7b5/recipes/doom-themes"; @@ -15404,7 +15341,7 @@ version = "20130120.1257"; src = fetchsvn { url = "https://svn.apache.org/repos/asf/subversion/trunk/contrib/client-side/emacs/"; - rev = "1802990"; + rev = "1803635"; sha256 = "016dxpzm1zba8rag7czynlk58hys4xab4mz1nkry5bfihknpzcrq"; }; recipeFile = fetchurl { @@ -15505,12 +15442,12 @@ dumb-jump = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s }: melpaBuild { pname = "dumb-jump"; - version = "20170721.49"; + version = "20170725.1803"; src = fetchFromGitHub { owner = "jacktasia"; repo = "dumb-jump"; - rev = "e1a6647fecdaf77f737c3d16e0b8e6cb3cab1cb2"; - sha256 = "0bxfayqrp05fsic0nfk47iarfqgdlnqaahvbr9bx56js9s0fgm5p"; + rev = "8fae9be1b630c57d5d40586bddda70024006701f"; + sha256 = "18mq9anbw6l0d13lfbnghbc2iszibi36ds14zd1jvmfq2nbxq3bb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dumb-jump"; @@ -15568,12 +15505,12 @@ dut-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dut-mode"; - version = "20170721.2214"; + version = "20170729.1411"; src = fetchFromGitHub { owner = "dut-lang"; repo = "dut-mode"; - rev = "affd16ad1e78799bb4ec99f80006271447d075f9"; - sha256 = "16yp7s3m7bm4chmkzlbqix4cfv6x7mgcdcl7j55h782dm252zfcg"; + rev = "9235c7acaa6690942e9de8b7acd1e4be0c859dc1"; + sha256 = "0fpqsm6y23anyx57gp4c6whzxrn8x03cp76iwx27c4gkq6ph1z8n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ecf49ceab8b25591fab2ed6574cba0e6634d1539/recipes/dut-mode"; @@ -15903,12 +15840,12 @@ easy-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "easy-hugo"; - version = "20170724.1123"; + version = "20170730.2031"; src = fetchFromGitHub { owner = "masasam"; repo = "emacs-easy-hugo"; - rev = "ca215061068b2dec3dd98f0da3a1294fa2f77430"; - sha256 = "06mihlh2zzgfkbss9gbhyd5f8wkmb4lxsxnxfndym63pgzsy2j0s"; + rev = "b656f1e3e1eaef01990b6c946a6f522538f76d19"; + sha256 = "0bni2j8kcad85h2rgv8nmp5xv2mz32d5nwbmg0v9dy5m12g452md"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/easy-hugo"; @@ -16050,12 +15987,12 @@ ecb = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ecb"; - version = "20160101.933"; + version = "20170728.1221"; src = fetchFromGitHub { owner = "ecb-home"; repo = "ecb"; - rev = "661edbfcddcdb75331cf28870e6a5fb4ba9ca27f"; - sha256 = "1ac9b6k10kniqkiadzfa7mjhy1nf6ypd3fl6yvmr8yigc2phszny"; + rev = "1330a44cf3c171781083b0b926ab7622f64e6e81"; + sha256 = "0nx1blkvnzrxd2l7ckdihm9fvq5vkcghf6qccagkjzk4zbdalz30"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4db5183f35bedbc459843ad9f442f9cb6608c5fc/recipes/ecb"; @@ -16510,12 +16447,12 @@ editorconfig = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "editorconfig"; - version = "20170607.713"; + version = "20170725.1610"; src = fetchFromGitHub { owner = "editorconfig"; repo = "editorconfig-emacs"; - rev = "1543835ce00412c3cd34a61497af5f68ead250a6"; - sha256 = "1c516972gx1rvlixdl6mgknx6vx1m4hbzbz3x43pzlg0mn31yn01"; + rev = "1884ac61c2d8045bbb96465df7e29b2c740c48ed"; + sha256 = "1c8h7vndcf4dwp5zlwsdnw3mkmxmjifn7m660pnpxj52s2da3801"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/50d4f2ed288ef38153a7eab44c036e4f075b51d0/recipes/editorconfig"; @@ -16615,12 +16552,12 @@ edts = callPackage ({ auto-complete, auto-highlight-symbol, dash, erlang, f, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s }: melpaBuild { pname = "edts"; - version = "20170725.338"; + version = "20170729.659"; src = fetchFromGitHub { owner = "tjarvstrand"; repo = "edts"; - rev = "5b94473b7fe00edc50a001ff4eb55f54753d8742"; - sha256 = "00yqmfic02f6082mndndnfcas16by3lav8w3z0hh618a8prmzhdm"; + rev = "b3508bc998cebd4946b591d61b0bb4d5a56ef704"; + sha256 = "0r6g8pzf94n3h56fz933hq8jxf7chpj3kbgykj3ffabxkjxfn2rg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/782db7fba2713bfa17d9305ae15b0a9e1985445b/recipes/edts"; @@ -16662,6 +16599,27 @@ license = lib.licenses.free; }; }) {}; + eg = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "eg"; + version = "20170730.849"; + src = fetchFromGitHub { + owner = "davep"; + repo = "eg.el"; + rev = "4d9fb8f2f4905c25aefd0759e89fa13cb994cdeb"; + sha256 = "1d4lcf48m8ac2rmszx7l0nkmfr28fv2g3flwwpmb4zjkhz2k1gw0"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/3d2b6b92b2a71486f260571885bf149ad6afc551/recipes/eg"; + sha256 = "1ic6qzk0zmay3vvbb8jg35irqkc0k68dmgbq4j9isiawy449zvp7"; + name = "eg"; + }; + packageRequires = [ cl-lib emacs ]; + meta = { + homepage = "https://melpa.org/#/eg"; + license = lib.licenses.free; + }; + }) {}; egg = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "egg"; @@ -16765,15 +16723,15 @@ license = lib.licenses.free; }; }) {}; - ein = callPackage ({ auto-complete, cl-generic, dash, deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, request, skewer-mode, websocket }: + ein = callPackage ({ auto-complete, cl-generic, dash, deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, request, request-deferred, skewer-mode, websocket }: melpaBuild { pname = "ein"; - version = "20170714.1910"; + version = "20170725.1457"; src = fetchFromGitHub { owner = "millejoh"; repo = "emacs-ipython-notebook"; - rev = "cda6143270cf44d2c9e59904b2c7bbd225d226ee"; - sha256 = "13h93cs69cz9rq56jncjiq3p0fkd3khniral828ky5vkvhihf2wv"; + rev = "4f5f29d3516d687025ad9423dc98bcd202efed56"; + sha256 = "17243a77m7y4abiwscf885wmci1mkln4axay49f44cyfcj3fk2i2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/215e163755fe391ce1f049622e7b9bf9a8aea95a/recipes/ein"; @@ -16786,6 +16744,7 @@ dash deferred request + request-deferred skewer-mode websocket ]; @@ -16839,12 +16798,12 @@ ejc-sql = callPackage ({ auto-complete, cider, clomacs, dash, direx, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, spinner }: melpaBuild { pname = "ejc-sql"; - version = "20170621.348"; + version = "20170728.539"; src = fetchFromGitHub { owner = "kostafey"; repo = "ejc-sql"; - rev = "438e4f5995285d28fe7dddceacac212c2250dfe2"; - sha256 = "01nxgv2yz9clbqr35kdl36zmip0nkqa45ab6b06npdxpcs4438nq"; + rev = "c02d2f14e3e803094c47c5d605196af887a5d80f"; + sha256 = "140s75sqlvgc7a00ankkb7892yc03vznk6gvilgdcccw76dki9l1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8f2cd74717269ef7f10362077a91546723a72104/recipes/ejc-sql"; @@ -17648,12 +17607,12 @@ elm-mode = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, s }: melpaBuild { pname = "elm-mode"; - version = "20170714.1600"; + version = "20170729.338"; src = fetchFromGitHub { owner = "jcollard"; repo = "elm-mode"; - rev = "4155f4333545189901ce574601ef34dada07b672"; - sha256 = "1q5qgjmmwnhgq4ckpkzy3wvmnj3cgzcggwm9q9jsdfmz0j1dgwn4"; + rev = "e3fca6d8f5bc176de26d37fe9c1b3e129f79cab0"; + sha256 = "1p30k2bws9r3j4dmdxin1dz31d751wyikqgyqs9wzcddk0cfrm46"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1a4d786b137f61ed3a1dd4ec236d0db120e571/recipes/elm-mode"; @@ -18030,27 +17989,6 @@ license = lib.licenses.free; }; }) {}; - elscreen-persist = callPackage ({ elscreen, fetchFromGitHub, fetchurl, lib, melpaBuild, revive }: - melpaBuild { - pname = "elscreen-persist"; - version = "20160505.1829"; - src = fetchFromGitHub { - owner = "robario"; - repo = "elscreen-persist"; - rev = "79cb33909a9c66bb183432b956edffbc6b12ace3"; - sha256 = "0p0zphl3ylrbs3mz12y40hphslxd1hlszk1pqi151xrfgc2r0pp8"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/c30ec71dcc29d1d0fd6c54de512c8c4636a7e0a6/recipes/elscreen-persist"; - sha256 = "1rjfvpsx0y5l9b76wa1ilj5lx39jd0m78nb1a4bqn81z0rkfpl4k"; - name = "elscreen-persist"; - }; - packageRequires = [ elscreen revive ]; - meta = { - homepage = "https://melpa.org/#/elscreen-persist"; - license = lib.licenses.free; - }; - }) {}; elscreen-separate-buffer-list = callPackage ({ elscreen, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elscreen-separate-buffer-list"; @@ -18072,6 +18010,27 @@ license = lib.licenses.free; }; }) {}; + elvish-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "elvish-mode"; + version = "20170729.1702"; + src = fetchFromGitHub { + owner = "ALSchwalm"; + repo = "elvish-mode"; + rev = "72ac8385c0dc923ce2385f1e8c4aee3f6ef99d1c"; + sha256 = "0daw0wgd7rpdp78dsacw8kr2kcrhqg4082wdbzl14lyimpmzm4fy"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/0fc724072702a565af471f9ae523a1e6e48e3f04/recipes/elvish-mode"; + sha256 = "1f5pyadmbh2ldd51srvlhbjq2849f1f0s8qmpjnsz9bc986yga34"; + name = "elvish-mode"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/elvish-mode"; + license = lib.licenses.free; + }; + }) {}; elwm = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elwm"; @@ -18121,8 +18080,8 @@ src = fetchFromGitHub { owner = "echosa"; repo = "emacs-setup"; - rev = "cc36ad5318c6c0e65d1b9ff8dff5ea2437675de2"; - sha256 = "15l3ab11vcmzqibkd6h5zqw5a83k8dmgcp4n26px29c0gv6bkpy8"; + rev = "c783ec13e3b39093fffb6f6d64dccdce8ce4d375"; + sha256 = "1crpjcxwanbrd1yd4lbb5lmqwvx1mczya7ff2qr3phk497czpsqm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/abb7101b2d48af56af09d1dc85c540300dba7b3c/recipes/emacs-setup"; @@ -18860,22 +18819,22 @@ license = lib.licenses.free; }; }) {}; - engine-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + engine-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "engine-mode"; - version = "20170508.828"; + version = "20170731.1304"; src = fetchFromGitHub { owner = "hrs"; repo = "engine-mode"; - rev = "59f1d463fada670895b00bab406160570fb8bc35"; - sha256 = "1j8jym795k59lhsckvnh06mykz7b2f54v52n0dwvhyy2aaq0bnhl"; + rev = "feb41a46e3a4cfcdea405db2bc3ea485776eaa7f"; + sha256 = "0g5sxrbcbf5bv62szw7m9cfxj0lxa090pxj9s6i0v83ljxnra8sn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ea1b5dfb6628cf17e77369f25341835aad425f54/recipes/engine-mode"; sha256 = "1gg7i93163m7k7lr3pnal1svymnhzwrfpfcdc0798d7ybv26gg8c"; name = "engine-mode"; }; - packageRequires = []; + packageRequires = [ cl-lib ]; meta = { homepage = "https://melpa.org/#/engine-mode"; license = lib.licenses.free; @@ -18968,12 +18927,12 @@ ensime = callPackage ({ company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s, sbt-mode, scala-mode, yasnippet }: melpaBuild { pname = "ensime"; - version = "20170724.630"; + version = "20170731.425"; src = fetchFromGitHub { owner = "ensime"; repo = "ensime-emacs"; - rev = "c8e936ed3793fab0dcbfad797ff97aa5c91562e2"; - sha256 = "0mj0k5wh6sndlnj8pcfhl0gwgas6433iyjrifpf0v5p7m5cizy5x"; + rev = "6f6978d41126803ee61f614c91e791e6b5a36e38"; + sha256 = "1acqi07n3yncv2mz2qm6c46b2381j1fjmmrrlcg3yb72inqr73y7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/502faab70af713f50dd8952be4f7a5131075e78e/recipes/ensime"; @@ -19081,12 +19040,12 @@ epkg = callPackage ({ closql, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "epkg"; - version = "20170723.1240"; + version = "20170726.940"; src = fetchFromGitHub { owner = "emacscollective"; repo = "epkg"; - rev = "11e8cc60a4dcfa973fabb4085b35e5951def84ca"; - sha256 = "1izgmlv52qgc8y29zx12q25bm1y3yzzz0sdy128bj2blc6j60wbd"; + rev = "f0959ca39cdbcb72049b31cab6e7c449749bfefe"; + sha256 = "1pblli8g6ahsxgjk55yyzpdhlriq44i54yl27wdyvcyv2fffbdab"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2df16abf56e53d4a1cc267a78797419520ff8a1c/recipes/epkg"; @@ -19609,8 +19568,8 @@ src = fetchFromGitHub { owner = "erlang"; repo = "otp"; - rev = "72d994d7a6251e6ec72cf864b11309e01c50ba1f"; - sha256 = "05bs7r01bm2zfldg3j4915rnm7px2hcr04p3yzsy8sz36hqcjm81"; + rev = "e25f673d520342bfe7cd479ef6b850a57f8ab1ea"; + sha256 = "11gx8rqgxxnadgb1hizv6rdj7s9ib9m7bg8rm0ncvgrmykfaq8wm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang"; @@ -19877,12 +19836,12 @@ esh-help = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "esh-help"; - version = "20170702.1912"; + version = "20170730.2157"; src = fetchFromGitHub { owner = "tom-tan"; repo = "esh-help"; - rev = "15994c0d1c36f6209547742690c6d8f2ef505393"; - sha256 = "0a0n05mhgp8gvxkld0510k4kq4m81aq2jdrgmfyafm5am5abz6lp"; + rev = "fdd62fb873e2a9a664314a45f91529cac00b8c47"; + sha256 = "1z8gl8mwnr1g7n9jn9iw5a6c9jsr1gjbx3004k07rlw8dld59qd0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ab94c66d1ed7cfdbc437ee239984ba70408fd28a/recipes/esh-help"; @@ -20192,12 +20151,12 @@ ess = callPackage ({ fetchFromGitHub, fetchurl, julia-mode, lib, melpaBuild }: melpaBuild { pname = "ess"; - version = "20170725.59"; + version = "20170728.238"; src = fetchFromGitHub { owner = "emacs-ess"; repo = "ESS"; - rev = "a313565f97badfefb289672af45df6311060eef3"; - sha256 = "15zy6hjfpwkacxc11ws76w7ynwl4m2qqlh84xq3nifg2zpl4cns6"; + rev = "58c130a1bc13c8933bde229424d628ec2b6a6a97"; + sha256 = "086isv62shvvf8sp5iicd45d3p1z071l5vik7445lbgind6wfbg5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/12997b9e2407d782b3d2fcd2843f7c8b22442c0a/recipes/ess"; @@ -20318,12 +20277,12 @@ esup = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "esup"; - version = "20170724.2348"; + version = "20170729.1742"; src = fetchFromGitHub { owner = "jschaf"; repo = "esup"; - rev = "86500014ccf9736a731038222d5d2727e428bb6c"; - sha256 = "03kblqlh9q2i3zmlj97wi0m93df3c799njlb6gpjl7ml6qfj4qf7"; + rev = "94e0d2bef2bcdbd9477e702f63148cc2de75ecb3"; + sha256 = "0rz2a8ydr7jrsgz1mxgjk4wyf7rkz0w3qvx6jy8mygzhzhmniy24"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b9d2948a42da5d4864404d2d11a924a4f235fc3b/recipes/esup"; @@ -20440,12 +20399,12 @@ euslisp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "euslisp-mode"; - version = "20170621.945"; + version = "20170731.943"; src = fetchFromGitHub { owner = "iory"; repo = "euslisp-mode"; - rev = "16ee25d6d84d0e0b1b153791c51acedafd8d572b"; - sha256 = "1a496xzw6vs6rv7pp6yv3zmjdxbypjz132r6s6595gjcvwrfisr5"; + rev = "e2c6506a4d333ceb99dc64c34944beb0b34431c8"; + sha256 = "1knphaw3sw20wjvyqs9a1ppx0r04xif756ixxb2ymakhb8g0ifbh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b09a7c4b73203d75c5260f1d08845236cbbeae46/recipes/euslisp-mode"; @@ -20482,12 +20441,12 @@ eval-in-repl = callPackage ({ ace-window, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, paredit }: melpaBuild { pname = "eval-in-repl"; - version = "20170217.1432"; + version = "20170730.1445"; src = fetchFromGitHub { owner = "kaz-yos"; repo = "eval-in-repl"; - rev = "b21c5f0da65973d542952ab86e001b777c5f3447"; - sha256 = "15zd9vqjh89lhy9h6kbhrm5m5394zfzma3xdcfp1dmk8v7384py8"; + rev = "7e2b42570b449b2a3c2922f3036a027d1e393a60"; + sha256 = "0x97flv356kd7j6wbhacz0lmsrdd9as87b0n6nliq5n0y30my8dy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0bee5fb7a7874dd20babd1de7f216c5bda3e0115/recipes/eval-in-repl"; @@ -20587,12 +20546,12 @@ evil = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, goto-chg, lib, melpaBuild, undo-tree }: melpaBuild { pname = "evil"; - version = "20170712.2350"; + version = "20170726.912"; src = fetchFromGitHub { owner = "emacs-evil"; repo = "evil"; - rev = "a0b6afcf3993f2edcce39052403220a10e74f362"; - sha256 = "0qswzjxm91s34x32xa61ypwr2fc7cgjaj1wnlgqznxyzjqvdh709"; + rev = "41847fdc4dd183b5ca23c097bed17bdf2d9d9f7f"; + sha256 = "047af7a76zi0xi8hbgr3a9c251vlnjqh78qxsxlv62czzv9nxzi1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/440482c0edac8ee8bd4fe22f6bc5c1607f34c7ad/recipes/evil"; @@ -21154,12 +21113,12 @@ evil-matchit = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-matchit"; - version = "20170719.702"; + version = "20170727.1741"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "evil-matchit"; - rev = "bed39041b1181ec26cf2601a8a7aa4afe2510f5b"; - sha256 = "0b1gl5mhl8w63rhx4bbr69cklgz630038lxpjb4nl6h8yl41pcrp"; + rev = "dbaae2b7537aadb2e44a8915745ee190768b4b2a"; + sha256 = "1y386wjz23kqfqbbgrwg4fnv2ma21dzk5ppnqd0y5245v388q69n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/aeab4a998bffbc784e8fb23927d348540baf9951/recipes/evil-matchit"; @@ -21550,22 +21509,22 @@ license = lib.licenses.free; }; }) {}; - evil-swap-keys = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: + evil-swap-keys = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-swap-keys"; - version = "20170221.444"; + version = "20170726.1120"; src = fetchFromGitHub { owner = "wbolster"; repo = "evil-swap-keys"; - rev = "6a2f4db944076439c2cb481c4e9e4e5d736a5ab8"; - sha256 = "0ymxmlx6dfczxkdgsm8g8pz6dhdnb3ay74s2a70jgwqns8yaqv7k"; + rev = "56bc201e265a6bd482a7c41a7c81d2238341ef3a"; + sha256 = "0n0hl0plaghz9rjssabxwfzm46kr6564hpfh6hn8lzla4rf1q5zs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2abff8e3d54ac13c4fe90692a56437844accca25/recipes/evil-swap-keys"; sha256 = "12cx95mjm4ymggidvf41gh3a364z32h655jmhk417v0ga9jk9fv6"; name = "evil-swap-keys"; }; - packageRequires = [ emacs evil ]; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/evil-swap-keys"; license = lib.licenses.free; @@ -21613,6 +21572,27 @@ license = lib.licenses.free; }; }) {}; + evil-test-helpers = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "evil-test-helpers"; + version = "20170719.1445"; + src = fetchFromGitHub { + owner = "emacs-evil"; + repo = "evil"; + rev = "41847fdc4dd183b5ca23c097bed17bdf2d9d9f7f"; + sha256 = "047af7a76zi0xi8hbgr3a9c251vlnjqh78qxsxlv62czzv9nxzi1"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/87da8c50f9167ad9c3844b23becb6904f809611d/recipes/evil-test-helpers"; + sha256 = "0l4skyznzgr76z518q22lf90ymlsfcs02w8vqkg8az1nfl3ch7fs"; + name = "evil-test-helpers"; + }; + packageRequires = [ evil ]; + meta = { + homepage = "https://melpa.org/#/evil-test-helpers"; + license = lib.licenses.free; + }; + }) {}; evil-text-object-python = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-text-object-python"; @@ -22161,12 +22141,12 @@ f3 = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "f3"; - version = "20160628.1601"; + version = "20170728.1120"; src = fetchFromGitHub { owner = "cosmicexplorer"; repo = "f3"; - rev = "114fec094c4ea063724c05404a2ece53f510b3e3"; - sha256 = "0fh69qhvdks1hclwhr9nv6bgbsjwdk0mwqhw3dmlv2jb5yip308m"; + rev = "1ed0ac4368a9f631f6dfad7ad17e9f7434a42bd6"; + sha256 = "03crpcb1jbbc12nz912qdkipmm94xlrpzr2cgckya0cj8sdgv9fz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b40de62a82d6895a37ff795d56f7d0f783461e6/recipes/f3"; @@ -23470,12 +23450,12 @@ flow-minor-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "flow-minor-mode"; - version = "20170418.1253"; + version = "20170729.1008"; src = fetchFromGitHub { owner = "an-sh"; repo = "flow-minor-mode"; - rev = "b05d59f387133249e03004b79bf16d6fe6c38217"; - sha256 = "0kw001kcdqjj3ymk9vn9giiv18icp3yrys8xdvszkhlby99y74h5"; + rev = "75067baceed7d699dda43944da49dc58d22baeff"; + sha256 = "0r1xs3vff3ng0h2w8nn7mxssdnipnrzwk9dh5f5v7prwk2q60byb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/66504f789069922ea56f268f4da90fac52b601ff/recipes/flow-minor-mode"; @@ -23575,12 +23555,12 @@ flycheck = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, seq }: melpaBuild { pname = "flycheck"; - version = "20170723.839"; + version = "20170730.1740"; src = fetchFromGitHub { owner = "flycheck"; repo = "flycheck"; - rev = "35c0ce171dc7127d85a745d922b233544c41040b"; - sha256 = "0084lk692l6lxz82k242v2gwp6bdv5yjv5xvn3ra43x2d7mx4zz1"; + rev = "c451140ef785dd7853445121866f9ea45889255b"; + sha256 = "0vnpnv7kcbgdrpnqw9mb3qn5lzi4493k8b5jwwl6rz5hrl84yrx3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/649f9c3576e81409ae396606798035173cc6669f/recipes/flycheck"; @@ -24244,6 +24224,27 @@ license = lib.licenses.free; }; }) {}; + flycheck-inline = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, flycheck, inline-docs, lib, melpaBuild }: + melpaBuild { + pname = "flycheck-inline"; + version = "20170728.2328"; + src = fetchFromGitHub { + owner = "stardiviner"; + repo = "flycheck-inline"; + rev = "d24e3772b0ac6e40306ff25cebd7c6add696d54c"; + sha256 = "0hgcgyjrbdqsgf54wa3j6mkq41nq28n2hyysdgfgnn4kd2jmri40"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/6ad3925576719f34682f65867fd5bbbc97818870/recipes/flycheck-inline"; + sha256 = "1yas4csz0xv0h61nzlywrp9z665gcmwr8vjrkm2psh04rfqhx3wg"; + name = "flycheck-inline"; + }; + packageRequires = [ cl-lib emacs flycheck inline-docs ]; + meta = { + homepage = "https://melpa.org/#/flycheck-inline"; + license = lib.licenses.free; + }; + }) {}; flycheck-irony = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, irony, lib, melpaBuild }: melpaBuild { pname = "flycheck-irony"; @@ -24289,12 +24290,12 @@ flycheck-julia = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-julia"; - version = "20170715.945"; + version = "20170729.1441"; src = fetchFromGitHub { owner = "gdkrmr"; repo = "flycheck-julia"; - rev = "0eaa3216dc35679d72c0d107127d48915516df08"; - sha256 = "091zjabzrw1f194pmz60ij3ys8sw54dxj9q3vpl3sigr1jd1qq7v"; + rev = "213b60a5a9a1cb7887260e1d159b5bb27167cbb6"; + sha256 = "0wk8mc8j67dmc3mxzrhypgxmyywwrjh5q5llj4m2mgf0j7yp2576"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e964e3c6f737d0102b4fd7440fa9d434e6382bf/recipes/flycheck-julia"; @@ -24478,12 +24479,12 @@ flycheck-ocaml = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild, merlin }: melpaBuild { pname = "flycheck-ocaml"; - version = "20151103.212"; + version = "20170730.1453"; src = fetchFromGitHub { owner = "flycheck"; repo = "flycheck-ocaml"; - rev = "e4412025f27850918762237fa80b33e285a63e7c"; - sha256 = "0fm8w7126vf04n76qhh33rzybvl1n7va2whbqzafbvmv2nny3v94"; + rev = "8707a7bf545a8639a6a5c600a98d9a2ea1487dc9"; + sha256 = "13vzxkjq6v1f1i9zgxgjbwpiba04k9frkcl2wx6a9h3vgd7jyay0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8ce9283eb1285953a2578eb7c4d280b4d98c801f/recipes/flycheck-ocaml"; @@ -24643,6 +24644,27 @@ license = lib.licenses.free; }; }) {}; + flycheck-pycheckers = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: + melpaBuild { + pname = "flycheck-pycheckers"; + version = "20170728.1103"; + src = fetchFromGitHub { + owner = "msherry"; + repo = "flycheck-pycheckers"; + rev = "2fd53300525deb3c5ac903cc4cb89e3e5cce7b4e"; + sha256 = "1nw6vifmpncnkhdbnn95khncdwjahri2l862c97q4ni5ikms7i7q"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/af36dca316b318d25d65c9e842f15f736e19ea63/recipes/flycheck-pycheckers"; + sha256 = "18ski3bp8x33589pc273i5ia3hffvlb4czrd97wkfgr4k59ww6yq"; + name = "flycheck-pycheckers"; + }; + packageRequires = [ flycheck ]; + meta = { + homepage = "https://melpa.org/#/flycheck-pycheckers"; + license = lib.licenses.free; + }; + }) {}; flycheck-pyflakes = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-pyflakes"; @@ -24692,8 +24714,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "afbf59630203624e0a5eecee52a3296295e6d620"; - sha256 = "0bygl7ahwsz6xmw0fif7gqnpzbk8cx7hpg4gp96f8inicq849z26"; + rev = "db1244c1c14514324474f362c857112e89bbf0c6"; + sha256 = "1fcrlxk9z11vbarznfcpfyqzvj6v3ydbn5z6vbdmgf9cxb52kfma"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/flycheck-rtags"; @@ -24814,12 +24836,12 @@ flycheck-tip = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup }: melpaBuild { pname = "flycheck-tip"; - version = "20160908.1953"; + version = "20170729.1411"; src = fetchFromGitHub { owner = "yuutayamada"; repo = "flycheck-tip"; - rev = "53e812ae6d517e8d35907eed8ddcee95c2922e91"; - sha256 = "180c9q273k8167kfkfkvgsadprr34irnmb4qx8ksr3dmg77ghpc8"; + rev = "cbdff9a574fab1222ed50d7c1359ffb820f30934"; + sha256 = "0ic9cdsi30mx5ldrbzc2i9y4q69fpa9s19zrdk10i3wxs6mmgl8l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/024f1e588e94014734fa252ee7bdb00b4991ede9/recipes/flycheck-tip"; @@ -25339,12 +25361,12 @@ flymake-puppet = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }: melpaBuild { pname = "flymake-puppet"; - version = "20141006.1855"; + version = "20170731.2254"; src = fetchFromGitHub { owner = "benprew"; repo = "flymake-puppet"; - rev = "fc4cd25aeac37ed5722bc586d5350fd06ee3067c"; - sha256 = "1r3yjqxig2j7l50l787qsi96mkvjcgqll9vb4ci51j7b43d53c5m"; + rev = "9579e5c736cb890195464fabf51df113313de88d"; + sha256 = "1bk16l8rbvrwmcd0zd2yg8xmfn7b036716niy21wfizmar0pk7p7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/302dbe34e7949da9c65e9c7bf2ab924db91b968f/recipes/flymake-puppet"; @@ -25402,12 +25424,12 @@ flymake-rust = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }: melpaBuild { pname = "flymake-rust"; - version = "20141004.1552"; + version = "20170729.1439"; src = fetchFromGitHub { owner = "jxs"; repo = "flymake-rust"; - rev = "72ec92c261670b7384ee2593d0f1946ea29f429a"; - sha256 = "1qxb3vhh83ikhmm89ms7irdip2l03hnjcq5ncmgywkaqkpslaacv"; + rev = "2f42d1f2dad73ec9de460eda6176e3ab25c446f0"; + sha256 = "02fgkv9hxwrv8n5h6izb5jyjcpazlf86pjjj4zkv1ycpa6gyzzwn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/flymake-rust"; @@ -25469,8 +25491,8 @@ src = fetchFromGitHub { owner = "kootenpv"; repo = "flymake-solidity"; - rev = "07f33ed52aac5d958fc0f50026a9bf111e1a5308"; - sha256 = "1rq47qhp3jdrw1n22cnhvhcxqzbi6v9r94kgf3200vrfp435rvkn"; + rev = "b9a9aa78b84b2358c24a73a84fcd3d133a0423f1"; + sha256 = "06ndpccsqrnfgxpgsywgq81ykkxchm2dp0q2617klbihwngfr8w4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3b13f57b77f6648336a049a8dda37757d4dafd90/recipes/flymake-solidity"; @@ -26198,12 +26220,12 @@ fountain-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fountain-mode"; - version = "20161207.141"; + version = "20170728.507"; src = fetchFromGitHub { owner = "rnkn"; repo = "fountain-mode"; - rev = "37289bb68f01dd49b1192032ade6b0741d024a54"; - sha256 = "06bqnyx2h0ypyxy5vxrh3v75qqfcmfgx31xkip7w6sj6pbfc8dq5"; + rev = "be10ce90ede2d76b67abb5eff9c09294fe189f1e"; + sha256 = "17zipwazcqqbbsb7p9j2jcid2m0knlah56vbw71yxqb3qbpq7fcz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/913386ac8d5049d37154da3ab32bde408a226511/recipes/fountain-mode"; @@ -26495,12 +26517,12 @@ fstar-mode = callPackage ({ company, company-quickhelp, dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, quick-peek, yasnippet }: melpaBuild { pname = "fstar-mode"; - version = "20170725.829"; + version = "20170730.1659"; src = fetchFromGitHub { owner = "FStarLang"; repo = "fstar-mode.el"; - rev = "9e2ddf0c32edb8c7726daf636876f01e1fd2f757"; - sha256 = "170ffm6mybp0cs3962cpq281fg67vxcfx22nl9q9vrlk7rwlrqz0"; + rev = "f521a27332898aecf5b2ee710d67e1bcca380641"; + sha256 = "07lbjdiqyazvylk4ddb9789kyrnlllhnf67c770lsaagxn69scks"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c58ace42342c3d3ff5a56d86a16206f2ecb45f77/recipes/fstar-mode"; @@ -26527,8 +26549,8 @@ version = "20170709.139"; src = fetchgit { url = "git://factorcode.org/git/factor.git"; - rev = "154de53470720c57da4f57a64f4adb6bf669b59c"; - sha256 = "1wrc48xd2brqr97zphn11sikhlbalhi1fh59azi85ri47y1yvvij"; + rev = "bfd830f6b4b4c01a64a287395ea62d8e671b0891"; + sha256 = "1xnh1qp8gmn6g9sm0l1sh8k9j9x3y0vns8h5wh1i22bs420rl1w3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0c3633c23baa472560a489fc663a0302f082bcef/recipes/fuel"; @@ -26653,8 +26675,8 @@ src = fetchFromGitHub { owner = "HIPERFIT"; repo = "futhark"; - rev = "4e1a7ed0e47da1c33dc5a20ba22cb604ebdef0c7"; - sha256 = "1wyk6fh58s675j3rr74lk358q3nlx9rlkq0bs8qkix11y93asp7j"; + rev = "68037c3af786aad0a605847278393babd0095203"; + sha256 = "180hxfh1igkhfnwd5613gvnqk1rmsncfyi28yd0plqryi3495822"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0607f01aad7e77d53595ad8db95d32acfd29b148/recipes/futhark-mode"; @@ -26771,12 +26793,12 @@ fxrd-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "fxrd-mode"; - version = "20170125.228"; + version = "20170728.1101"; src = fetchFromGitHub { owner = "msherry"; repo = "fxrd-mode"; - rev = "8a1a0d5a08527ec8dee9bbe135803ed7ad297d9d"; - sha256 = "1yzw0fnlqilpx4xl84hpr75l86y9iiqyh13r1hskmwb79s2niw1m"; + rev = "18a603474abb5a786a8d9f20c283d5f7beed3540"; + sha256 = "1yprlpxxh7bbxg8filgb00lqqlavbz03h7hqf4280aiypkwi0y86"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/796eb6b2126ec616c0de6af6abb7598900557c12/recipes/fxrd-mode"; @@ -27235,8 +27257,8 @@ src = fetchFromGitHub { owner = "candera"; repo = "gherkin-mode"; - rev = "d84a2977a536f2f8bf4836aebc33a4e86925673d"; - sha256 = "0lcbyw6yrl6c8py5v2hqghcbsf9cbiplzil90al4lwqps7rw09a8"; + rev = "ff9e47350c5ba319feb6b87fe20695519681fa64"; + sha256 = "0dbdms3ddsfhscwy7jj0cfpn3jdxnzynrfz5jps2l91adx2g011y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/82d80becedead8db441eed6f7856ca64d78815e2/recipes/gherkin-mode"; @@ -27294,16 +27316,16 @@ ghub = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ghub"; - version = "20170725.1200"; + version = "20170728.849"; src = fetchFromGitHub { - owner = "tarsius"; + owner = "magit"; repo = "ghub"; - rev = "8f81a2aa0b2aaca55e92f7a78944f9d80296f405"; - sha256 = "03rd2f5zs95ld56jzq70y6jb0r21q2qhkndi2jrbic1fknfviiqh"; + rev = "e85479bf048e06740331234a67c07bcdb3e294c4"; + sha256 = "1sh8cwaaxlg0ja59lg70hl1lyhl9i7bfkamq3qz7kl2913axnzw2"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/9375cbae3ffe5bf4ba5606358860050f3005d9b7/recipes/ghub"; - sha256 = "01kzziqv5y798rps52w45kkdcn0shhb6mrina2iawab4rlvlmnd8"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/d5db83957187c9b65f697eba7e4c3320567cf4ab/recipes/ghub"; + sha256 = "15kjyi8ialpr1zjqvw68w9pa5sigcwy2szq21yvcy295z7ylzy4i"; name = "ghub"; }; packageRequires = [ emacs ]; @@ -27508,8 +27530,8 @@ src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "4f0046012cc4783e7ec31e757e07d338c931a6e3"; - sha256 = "0lziv48xw065p6iwagraff2477dm3qldjbf6xfd2iqqwm7kfhd48"; + rev = "0ffd49d48b14e7acd107ccff3efc2d8704ea26a4"; + sha256 = "0zzxs5jpd6inh6bapyq1vq87yangf988lw24ywm783rawzdbcj4b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/git-commit"; @@ -28365,12 +28387,12 @@ gnuplot-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gnuplot-mode"; - version = "20151122.2339"; + version = "20170727.1339"; src = fetchFromGitHub { owner = "mkmcc"; repo = "gnuplot-mode"; - rev = "296ff8d263513cdfb8e85b06e2441c751565b793"; - sha256 = "1pss9a60dh6i277pkp8j5g1v5h7qlh11w2fki50qcp0zglyw1kaq"; + rev = "eafa9395771a5ceace503cf5922efac1df0f5ec5"; + sha256 = "03799c7gwblpwpinbahbp5l510lg6yi85cmpsahsncfvkwirp2rm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d801a2e0ba5ae7c65b5d312fbf41261278a8b1ba/recipes/gnuplot-mode"; @@ -28703,8 +28725,8 @@ src = fetchFromGitHub { owner = "dominikh"; repo = "go-mode.el"; - rev = "2d1d33aee33a5cc088a8f51057464b7cd738cbdd"; - sha256 = "0ck7yj843y7bwc2y772zaan1g9m2zdjmq9pjpsva1z4x3p3c821g"; + rev = "99b06da201afb91e8db0c525c0f3c3590fd92fa6"; + sha256 = "0ss6fpjnz3h3g4d1rjv50sknzr112c2r5zwzy2aqp7sw24cz10r2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0cede3a468b6f7e4ad88e9fa985f0fdee7d195f5/recipes/go-guru"; @@ -28741,12 +28763,12 @@ go-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "go-mode"; - version = "20170725.402"; + version = "20170726.555"; src = fetchFromGitHub { owner = "dominikh"; repo = "go-mode.el"; - rev = "2d1d33aee33a5cc088a8f51057464b7cd738cbdd"; - sha256 = "0ck7yj843y7bwc2y772zaan1g9m2zdjmq9pjpsva1z4x3p3c821g"; + rev = "99b06da201afb91e8db0c525c0f3c3590fd92fa6"; + sha256 = "0ss6fpjnz3h3g4d1rjv50sknzr112c2r5zwzy2aqp7sw24cz10r2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0cede3a468b6f7e4ad88e9fa985f0fdee7d195f5/recipes/go-mode"; @@ -28829,8 +28851,8 @@ src = fetchFromGitHub { owner = "dominikh"; repo = "go-mode.el"; - rev = "2d1d33aee33a5cc088a8f51057464b7cd738cbdd"; - sha256 = "0ck7yj843y7bwc2y772zaan1g9m2zdjmq9pjpsva1z4x3p3c821g"; + rev = "99b06da201afb91e8db0c525c0f3c3590fd92fa6"; + sha256 = "0ss6fpjnz3h3g4d1rjv50sknzr112c2r5zwzy2aqp7sw24cz10r2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d806abe90da9a8951fdb0c31e2167bde13183c5c/recipes/go-rename"; @@ -29102,8 +29124,8 @@ src = fetchFromGitHub { owner = "google"; repo = "styleguide"; - rev = "d75bd35c8fd1c32aab86ea47e7ef4d3c776faa0a"; - sha256 = "0s1q9qw6azzbzr7k4c58m6d83cbz3srn63mi73jlh5fmad1w8g4p"; + rev = "6c8669edb20249cd5534c78cfb48e7cf0978dda3"; + sha256 = "096jmch5wqzal8qd6f72bsh0wi1fwlmjsis4n888942mq84vk8jw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/google-c-style"; @@ -29373,8 +29395,8 @@ src = fetchFromGitHub { owner = "vmware"; repo = "govmomi"; - rev = "8ab1a62d9c0873b8a25404c52928be2358b78963"; - sha256 = "0y86g43g2bngca7f3vznw4swwc778mcm0kfiqn3b18ibppvzrph7"; + rev = "fb0cb14954e799dfa69d1aaf56e863db48c2c296"; + sha256 = "076bdkswajjzxb1jhwq71rwz8pn9klxk68r2ldab3pk9wlih4adn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/92d6391318021c63b06fe39b0ca38f667bb45ae9/recipes/govc"; @@ -29499,8 +29521,8 @@ src = fetchFromGitHub { owner = "Groovy-Emacs-Modes"; repo = "groovy-emacs-modes"; - rev = "85fb30df520f55e32aeb92af4e1d7c801300c99e"; - sha256 = "1iz17qv561x6w67r222ya0ig1dplb17ygvy8r3hyh20ijjdq733n"; + rev = "785067783c93278de73cf4abe7fbf29b59b1f686"; + sha256 = "0wdy7n8f447ngkqnkz5khybps92pavy6d8nmlv0pf7kai899hczv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/grails-mode"; @@ -29859,12 +29881,12 @@ groovy-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "groovy-mode"; - version = "20170724.535"; + version = "20170731.150"; src = fetchFromGitHub { owner = "Groovy-Emacs-Modes"; repo = "groovy-emacs-modes"; - rev = "85fb30df520f55e32aeb92af4e1d7c801300c99e"; - sha256 = "1iz17qv561x6w67r222ya0ig1dplb17ygvy8r3hyh20ijjdq733n"; + rev = "785067783c93278de73cf4abe7fbf29b59b1f686"; + sha256 = "0wdy7n8f447ngkqnkz5khybps92pavy6d8nmlv0pf7kai899hczv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/groovy-mode"; @@ -29922,12 +29944,12 @@ gruvbox-theme = callPackage ({ autothemer, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gruvbox-theme"; - version = "20170718.741"; + version = "20170730.1820"; src = fetchFromGitHub { owner = "Greduan"; repo = "emacs-theme-gruvbox"; - rev = "21c1673622ba160bcf8cfdb0f066567b388b2960"; - sha256 = "1bh04nvaxphvfq7fgd53zd5k00gg35hldbida1ikw42pwkch3zk8"; + rev = "813a2165b993014d6a3d02abfd077d711f7372fe"; + sha256 = "1hwv7jqmigwnwdq50dlbi1i8ddq33qi40jhfynh8855kz0c2gqh9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2bd48c87919f64ced9f3add4860751bb34cb5ecb/recipes/gruvbox-theme"; @@ -30111,12 +30133,12 @@ guru-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "guru-mode"; - version = "20160415.1921"; + version = "20170730.31"; src = fetchFromGitHub { owner = "bbatsov"; repo = "guru-mode"; - rev = "81db5611dd29f2c3d9ea91fb7f086a2cf9847553"; - sha256 = "1jymhjjpn600svd5jbj42m3vnpaza838zby507ynbwc95nja29vs"; + rev = "c180e05ebc1484764aad245c85b69de779826e4e"; + sha256 = "0qb6yr6vbic0rh8ayrpbz5byq7jxmwm1fc9l4alpz7dhyb11z07v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e60af6ccb902d8ef00cfecbb13cafebbe3b00d89/recipes/guru-mode"; @@ -30573,12 +30595,12 @@ haskell-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "haskell-mode"; - version = "20170704.1445"; + version = "20170731.1629"; src = fetchFromGitHub { owner = "haskell"; repo = "haskell-mode"; - rev = "00ca4d935e80707e18c17e40630ea9e36b39592c"; - sha256 = "049q8igjx4y9jancqv0bibd2jhz02llm1v6xfl9379v5p6nkfm3b"; + rev = "518701c157468659e393e40aed2bdc37bcb408db"; + sha256 = "0646bk3ky0gv32dqiy7m40va82fcc5jpsbli7rz06zgg4nvh77h6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7f18b4dcbad4192b0153a316cff6533272898f1a/recipes/haskell-mode"; @@ -30842,12 +30864,12 @@ helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }: melpaBuild { pname = "helm"; - version = "20170724.2137"; + version = "20170731.1225"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "9e803b5a4a431b386966ea1b2a303003d7869375"; - sha256 = "0x797xy6p1b74zkqcdrf10kwp1ypjvkypayd070qh1sfjnrng4mf"; + rev = "b91b5fc3664a1f8309b1610a660898f45f0fb7de"; + sha256 = "0jlhnc236agfvvjg4mnrb12ikxky4v6a2gnw49yc2rjh7hplpwhw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm"; @@ -31052,12 +31074,12 @@ helm-bibtex = callPackage ({ biblio, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, parsebib, s }: melpaBuild { pname = "helm-bibtex"; - version = "20170321.1306"; + version = "20170801.157"; src = fetchFromGitHub { owner = "tmalsburg"; repo = "helm-bibtex"; - rev = "13f27f3cfdf137bdb22addfc0c832ba1c8572c25"; - sha256 = "02b9hb7nmh75qwkmanw6ci6pyann71ag8mp4fd5agrlwq6rrlgl4"; + rev = "e30bfc86e7205a19c757fd0e5659c79b815a119b"; + sha256 = "0di786z1a3jqjx1hwgl2z4qlj547adnbgv1xd5b68ah1bsdnv7xl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f4118a7721435240cf8489daa4dd39369208855b/recipes/helm-bibtex"; @@ -31451,12 +31473,12 @@ helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "helm-core"; - version = "20170725.419"; + version = "20170727.1245"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "9e803b5a4a431b386966ea1b2a303003d7869375"; - sha256 = "0x797xy6p1b74zkqcdrf10kwp1ypjvkypayd070qh1sfjnrng4mf"; + rev = "b91b5fc3664a1f8309b1610a660898f45f0fb7de"; + sha256 = "0jlhnc236agfvvjg4mnrb12ikxky4v6a2gnw49yc2rjh7hplpwhw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core"; @@ -32585,11 +32607,11 @@ helm-ls-git = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-ls-git"; - version = "20170716.109"; + version = "20170727.1238"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm-ls-git"; - rev = "47981a8d80e1d464a7cddde5a391b35626929f00"; + rev = "d116bb96b6ea946f633ed7735fbf38a63e611a3a"; sha256 = "0z09qvb6yyz2vnxkcg6xhaawja1ynxfwzx5j2aqyiicwqbyf3kvg"; }; recipeFile = fetchurl { @@ -32836,12 +32858,12 @@ helm-org-rifle = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }: melpaBuild { pname = "helm-org-rifle"; - version = "20170711.2354"; + version = "20170726.1718"; src = fetchFromGitHub { owner = "alphapapa"; repo = "helm-org-rifle"; - rev = "87e00cc5a47b6dae8040ad27d2883f4028cbcfc1"; - sha256 = "0n7nwpc9wy5p81hbp2b8wzfr040k0xn4ksm9a1fjdl9fg8hvh0pc"; + rev = "58690a15a06f7dc645175f1b34c9e099ac68f018"; + sha256 = "14z0ivi69ja9zd0qjpf98jp1x8skdp3a7w9yy2h9ffjhm2c7pgaf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f39cc94dde5aaf0d6cfea5c98dd52cdb0bcb1615/recipes/helm-org-rifle"; @@ -33340,12 +33362,12 @@ helm-rtags = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, rtags }: melpaBuild { pname = "helm-rtags"; - version = "20170723.2050"; + version = "20170730.1306"; src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "afbf59630203624e0a5eecee52a3296295e6d620"; - sha256 = "0bygl7ahwsz6xmw0fif7gqnpzbk8cx7hpg4gp96f8inicq849z26"; + rev = "db1244c1c14514324474f362c857112e89bbf0c6"; + sha256 = "1fcrlxk9z11vbarznfcpfyqzvj6v3ydbn5z6vbdmgf9cxb52kfma"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/helm-rtags"; @@ -34212,8 +34234,8 @@ src = fetchFromGitHub { owner = "DamienCassou"; repo = "hierarchy"; - rev = "3f5d0d932fb6d2152f4c269df10bcc435a5ac764"; - sha256 = "1qj2sf3x2bq54n0xqllis3abikjgbp18qn1i4vff5cs6n2an69cb"; + rev = "98ba6d3d7744d536aee714e1284ffecfe8f590cc"; + sha256 = "1y8jj0xgj6hqqshcfr406216bpni5sj0bh9q52ds9mn5plmh4asa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7aea238a2d14e9f58c0474251984b6c617b6854d/recipes/hierarchy"; @@ -35032,12 +35054,12 @@ hledger-mode = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild, popup }: melpaBuild { pname = "hledger-mode"; - version = "20170716.116"; + version = "20170729.742"; src = fetchFromGitHub { owner = "narendraj9"; repo = "hledger-mode"; - rev = "2412435e53c4f739a7aa93c9b9d80d861a1aa764"; - sha256 = "0l5fw1c1dilsiiw82a1lwaa2xjq4dlfm51rvnkf2iay1ndr7l11x"; + rev = "ace6725f72efd50556f52c359f7b1836b956fa2b"; + sha256 = "1r7vww10dvv843zgmg62wwv2b6fw8nx73lsqzj5j01pi3zxz74vm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/hledger-mode"; @@ -35867,10 +35889,10 @@ }) {}; icicles = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "icicles"; - version = "20170707.610"; + version = "20170726.849"; src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/icicles.el?revision=1088"; - sha256 = "0lckab25irgpm7y2wdg00v31514m6aw6n0wf9gz1v21zzc5ij6cz"; + url = "https://www.emacswiki.org/emacs/download/icicles.el?revision=1089"; + sha256 = "10w1lghh9jqxxm5cszi2qyk24vnvazfywmyyz1v7zf6cyiwbndrz"; name = "icicles.el"; }; recipeFile = fetchurl { @@ -36763,12 +36785,12 @@ imenu-list = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "imenu-list"; - version = "20170215.125"; + version = "20170728.632"; src = fetchFromGitHub { owner = "bmag"; repo = "imenu-list"; - rev = "999fc0ec7f03b56be8e2a6e673d9473f51e5a92f"; - sha256 = "0py4sc5a5hjdijavymjmvipkm9z4jy1l8yb35d8rl7mfzr5cz3l7"; + rev = "27170d27c9594989587c03c23f753a809f6a0e10"; + sha256 = "13xh9bdl3k6ccfq83wjmkpi4269qahv4davki4wq18dr4amrzhlx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/86dea881a5b2d0458449f08b82c2614ad9abd068/recipes/imenu-list"; @@ -37012,12 +37034,12 @@ indent-tools = callPackage ({ fetchFromGitLab, fetchurl, hydra, lib, melpaBuild, s, yafolding }: melpaBuild { pname = "indent-tools"; - version = "20170725.735"; + version = "20170728.546"; src = fetchFromGitLab { owner = "emacs-stuff"; repo = "indent-tools"; - rev = "45aa1321674fc111b6cf4398e90c53c27f8274af"; - sha256 = "1v1x43af69q6crky4l65j649rb35qdxw2gw1ivz6ihsdcwa4dywz"; + rev = "565c0b984d19c62b7a85efd69ae195b592d62f7f"; + sha256 = "0rqc1n4z2w5i48ma29mrbb90350kxfgzk0vf8wdnksa78ja87yyn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/indent-tools"; @@ -37054,12 +37076,12 @@ indium = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, memoize, seq, sourcemap, websocket }: melpaBuild { pname = "indium"; - version = "20170725.1119"; + version = "20170728.1109"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "Indium"; - rev = "a0feb67bfd035dc0d2f2b6eff12a1af050cb8b1b"; - sha256 = "1h230lrq3pdmb26930n8ma2h1gqrz0zxzxy38h65khqqkcv37ldv"; + rev = "a64f1ffc81539d40df9e89802bbebf14a0d19f83"; + sha256 = "0cmh6mv319m4i2y89rl63z2k3634d4ldg18yy3aal44ljxrbdslq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4292058cc6e31cabc0de575134427bce7fcef541/recipes/indium"; @@ -37104,12 +37126,12 @@ inf-clojure = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "inf-clojure"; - version = "20170720.2256"; + version = "20170730.119"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "inf-clojure"; - rev = "15963caac5791c2e9145cc99e4db8576807eb0ec"; - sha256 = "088r68rj4ih3mlh4pv986zd4cgs0f32ar27550fxky6kr8197k46"; + rev = "aaaeef6a4b1f41ebc3ab11ff28d6fa5938f762d4"; + sha256 = "19qjamjpm96wwv4ni2lbzwrb73d5xwfkrq6lvy32k6rav5r7lx1d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5d6112e06d1efcb7cb5652b0bec8d282d7f67bd9/recipes/inf-clojure"; @@ -37250,10 +37272,10 @@ }) {}; info-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "info-plus"; - version = "20170303.1500"; + version = "20170730.2148"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/info+.el"; - sha256 = "0xpgry9bzjwmdj0j0pcsr2a37gp8yqbcpl06linv0hjxcwca9nsz"; + sha256 = "0xg4cw8s5ildc7iyyvy6xxri3cy00g06b10022izlhbxy7crdgai"; name = "info+.el"; }; recipeFile = fetchurl { @@ -37626,12 +37648,12 @@ intero = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild }: melpaBuild { pname = "intero"; - version = "20170721.1851"; + version = "20170728.814"; src = fetchFromGitHub { owner = "commercialhaskell"; repo = "intero"; - rev = "aec455424105ddcf8e311acaf880078f7a6d92b3"; - sha256 = "1a5shx3i7lhplcglrldzhway0w0rhq0h4wb9h835nzmjl2p6lprd"; + rev = "28271d50ca65c460cd0983cea13a2c4509b95583"; + sha256 = "0b73cwr68sdi5vc486952x0iv95hwyw79gymp91kyi558wxdssp3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/intero"; @@ -38100,6 +38122,27 @@ license = lib.licenses.free; }; }) {}; + isortify = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "isortify"; + version = "20170726.1254"; + src = fetchFromGitHub { + owner = "proofit404"; + repo = "isortify"; + rev = "28699f29cfc0d9d78b636d0ecadcf9139173bc6f"; + sha256 = "0r7hbvsnn590wfydwibvpdihcah5jj6ylqhqq7w1a1nljzwk6d4h"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/9d4ad18492e7f4a56a1515873bc0b66fa49829bb/recipes/isortify"; + sha256 = "0nlpjd6mrhv8iccdny0x5lb41dpyp6l7kiax4xqra0rb2vq0chcs"; + name = "isortify"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/isortify"; + license = lib.licenses.free; + }; + }) {}; iss-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "iss-mode"; @@ -38229,12 +38272,12 @@ ivy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ivy"; - version = "20170725.948"; + version = "20170728.1036"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "112c5ba0df7deea11b3e91b5db3990d693eb5b72"; - sha256 = "0fcskn4v0rx5i04qr40wa8jggsswxxp8g8hk0s4sr447mxbiksbv"; + rev = "fc275339b57690d4157160ed22b7672d5382cbe7"; + sha256 = "1l5y83mx2qh8bz3f9fbbcpc474jis8aikqyilvkvnn932wkxlw8l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy"; @@ -38250,12 +38293,12 @@ ivy-bibtex = callPackage ({ biblio, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, s, swiper }: melpaBuild { pname = "ivy-bibtex"; - version = "20170321.1306"; + version = "20170801.157"; src = fetchFromGitHub { owner = "tmalsburg"; repo = "helm-bibtex"; - rev = "13f27f3cfdf137bdb22addfc0c832ba1c8572c25"; - sha256 = "02b9hb7nmh75qwkmanw6ci6pyann71ag8mp4fd5agrlwq6rrlgl4"; + rev = "e30bfc86e7205a19c757fd0e5659c79b815a119b"; + sha256 = "0di786z1a3jqjx1hwgl2z4qlj547adnbgv1xd5b68ah1bsdnv7xl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c23c09225c57a9b9abe0a0a770a9184ae2e58f7c/recipes/ivy-bibtex"; @@ -38359,8 +38402,8 @@ src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "112c5ba0df7deea11b3e91b5db3990d693eb5b72"; - sha256 = "0fcskn4v0rx5i04qr40wa8jggsswxxp8g8hk0s4sr447mxbiksbv"; + rev = "fc275339b57690d4157160ed22b7672d5382cbe7"; + sha256 = "1l5y83mx2qh8bz3f9fbbcpc474jis8aikqyilvkvnn932wkxlw8l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy-hydra"; @@ -38394,6 +38437,27 @@ license = lib.licenses.free; }; }) {}; + ivy-pass = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, password-store }: + melpaBuild { + pname = "ivy-pass"; + version = "20170730.2153"; + src = fetchFromGitHub { + owner = "ecraven"; + repo = "ivy-pass"; + rev = "b2d9b66583107694e8816e4e51809ebe9ee31d81"; + sha256 = "1jz7bbr94bv4ql3xhxgdlhd0azjmhqiisc6bzcpwsf4q9jq42vwj"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/7bfef855e071442d2b9d1e0ce9b5706937bffc53/recipes/ivy-pass"; + sha256 = "1sb29q22fsjqfxqznf73xcqhzy132bjd45w7r27sfmf825vcysci"; + name = "ivy-pass"; + }; + packageRequires = [ emacs ivy password-store ]; + meta = { + homepage = "https://melpa.org/#/ivy-pass"; + license = lib.licenses.free; + }; + }) {}; ivy-purpose = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, window-purpose }: melpaBuild { pname = "ivy-purpose"; @@ -38443,8 +38507,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "afbf59630203624e0a5eecee52a3296295e6d620"; - sha256 = "0bygl7ahwsz6xmw0fif7gqnpzbk8cx7hpg4gp96f8inicq849z26"; + rev = "db1244c1c14514324474f362c857112e89bbf0c6"; + sha256 = "1fcrlxk9z11vbarznfcpfyqzvj6v3ydbn5z6vbdmgf9cxb52kfma"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ivy-rtags"; @@ -39882,12 +39946,12 @@ jumblr = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "jumblr"; - version = "20140908.1352"; + version = "20170727.1343"; src = fetchFromGitHub { owner = "mkmcc"; repo = "jumblr"; - rev = "705c7286e09a307b2b7f60072a12ed45325657c0"; - sha256 = "1f0kai4cz3r25fqlnryyvnyf80cf57xa655dvv1rx8si3xd20x4j"; + rev = "34533dfb9db8538c005f4eaffafeff7ed193729f"; + sha256 = "0nn2m27c70nykin4iakrna0c61qd1hr09czrfmfpk06k70iifjky"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b47000c35a181c03263e85e8955eb4b4c9e69e4d/recipes/jumblr"; @@ -40640,8 +40704,8 @@ src = fetchFromGitHub { owner = "kivy"; repo = "kivy"; - rev = "c07f97179a02e1bddace948633e4b5b94ccc6ad4"; - sha256 = "0ad3hkggdvd800cf0hwxa8v5j6c3dvkssy7lrs4yarwzpgaljyjv"; + rev = "22aa73f55b5943fb464c3335978bf9b38daa39e1"; + sha256 = "1imb37jmnybimyjl1j3fqja2yxjl8h7cn0pzkmchl6gv3yyw3w01"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/688e2a114073958c413e56e1d117d48db9d16fb8/recipes/kivy-mode"; @@ -42002,12 +42066,12 @@ lispy = callPackage ({ ace-window, emacs, fetchFromGitHub, fetchurl, hydra, iedit, lib, melpaBuild, swiper, zoutline }: melpaBuild { pname = "lispy"; - version = "20170723.712"; + version = "20170731.842"; src = fetchFromGitHub { owner = "abo-abo"; repo = "lispy"; - rev = "76db06252dbc45b70e55886e00f4efda6a100a8f"; - sha256 = "1b6869ncq5lixndfyjffk3x4fjk5namxr21k3066q3lph4l26my5"; + rev = "3f7a041410a16bff68611a06f8d0bba766159f07"; + sha256 = "165il7rpwwz2xc3cx49xshpkmd0zf8i97zj5p187hi62z7pi2xyn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e23c062ff32d7aeae486c01e29c56a74727dcf1d/recipes/lispy"; @@ -42341,8 +42405,8 @@ src = fetchFromGitHub { owner = "donkirkby"; repo = "live-py-plugin"; - rev = "d4a0708e2bac6492355c675717e458f88b7fab63"; - sha256 = "1fr8kwm6m3k57s55gfn3sjh6zb9hj57rqnygwq8klyvi5ydh9w9f"; + rev = "cee63ee3591eb0f498ace801f1543a4bc6b58514"; + sha256 = "1h6m8qixvl9mnj6lmkqwljvyv65c6yb683krxrrbs4nrsy41z6s3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c7615237e80b46b5c50cb51a3ed5b07d92566fb7/recipes/live-py-mode"; @@ -42445,8 +42509,8 @@ version = "20150910.644"; src = fetchgit { url = "http://llvm.org/git/llvm"; - rev = "5b3e8fe6d9709fb676290385ab3861d291574dd4"; - sha256 = "0jxxm2191in165bpqxm35shhfvcy8zjqakmvyrql0z4yb0ib2shm"; + rev = "ca05253041c3e241f3987b430771f5db8aa35806"; + sha256 = "03w7w70hj7nrhr0hsrxfbi8hrmxrbbhi2rzmzzk6pv1r9l7krjbd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/05b7a689463c1dd4d3d00b992b9863d10e93112d/recipes/llvm-mode"; @@ -42459,6 +42523,26 @@ license = lib.licenses.free; }; }) {}; + lms = callPackage ({ emacs, fetchhg, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "lms"; + version = "20170731.1219"; + src = fetchhg { + url = "https://bitbucket.com/inigoserna/lms.el"; + rev = "5f20620f62a1"; + sha256 = "04wi14x2y2cb8ps3nzq4g0ryvqm40jh727jm44knlqfrx15imkw9"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/b8be8497494b8543a8257c9ea92444baf7674951/recipes/lms"; + sha256 = "1ckrh6qbh5y2y3yzl2iyq8nqlpy4qp6vzc72ijcgayvcflb01vr1"; + name = "lms"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/lms"; + license = lib.licenses.free; + }; + }) {}; load-relative = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "load-relative"; @@ -42818,12 +42902,12 @@ love-minor-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, lua-mode, melpaBuild }: melpaBuild { pname = "love-minor-mode"; - version = "20130429.1459"; + version = "20170726.2236"; src = fetchFromGitHub { owner = "ejmr"; repo = "love-minor-mode"; - rev = "31c3fc1ecd31f72f0f736014a4ff905eb3742e74"; - sha256 = "179r4pz3hlb5p6bjfhdikkx1zvh09ln5dbw3c3rmlyww1q7v26yl"; + rev = "3ca8f3405338f2d6f4fbcdd5e89342a46378543a"; + sha256 = "1hwm7yxbwvb27pa35cgcxyjfjdjhk2a33i417q2akc7vppdbcmzh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0f224c4c7519b3668b1270c957227e486896b7b6/recipes/love-minor-mode"; @@ -43095,8 +43179,8 @@ src = fetchFromGitHub { owner = "phillord"; repo = "m-buffer-el"; - rev = "e2d5a416ce47b36da10a9815ff5702f28c716d57"; - sha256 = "0nm8ljciim7wjc4r021jv8xrsk7jffmagzbllbvd5cab4zxvs4ik"; + rev = "8681342aaffa187e5c54945ab91b812965a96d19"; + sha256 = "040g7l0r4bxz4ynp4zxy80jsa6x2f48z8rylc41fqxiblasmh0af"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c34d02682e87c9978a3583bd903dcac5da5b41d5/recipes/m-buffer"; @@ -43112,12 +43196,12 @@ mac-pseudo-daemon = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mac-pseudo-daemon"; - version = "20170722.837"; + version = "20170728.1240"; src = fetchFromGitHub { owner = "DarwinAwardWinner"; repo = "osx-pseudo-daemon"; - rev = "4d10e327cd8ee5bb7f006d68744be21c7097c1fc"; - sha256 = "0rjdjddlkaps9cfyc23kcr3cdh08c12jfgkz7ca2j141mm89pyp2"; + rev = "d235680a72677f11925b912428ad1a57b664e3e8"; + sha256 = "0gqknrwhfzr7cf5pgs33a5xh79y0yzxghs6wsvavvqkmf4cvck40"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e89752e595c7cec9488e755c30af18f5f6fc1698/recipes/mac-pseudo-daemon"; @@ -43278,12 +43362,12 @@ magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit-popup, melpaBuild, with-editor }: melpaBuild { pname = "magit"; - version = "20170725.1153"; + version = "20170731.914"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "4f0046012cc4783e7ec31e757e07d338c931a6e3"; - sha256 = "0lziv48xw065p6iwagraff2477dm3qldjbf6xfd2iqqwm7kfhd48"; + rev = "0ffd49d48b14e7acd107ccff3efc2d8704ea26a4"; + sha256 = "0zzxs5jpd6inh6bapyq1vq87yangf988lw24ywm783rawzdbcj4b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/68bb049b7c4424345f5c1aea82e950a5e47e9e47/recipes/magit"; @@ -43432,12 +43516,12 @@ magit-imerge = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: melpaBuild { pname = "magit-imerge"; - version = "20170724.2157"; + version = "20170725.1850"; src = fetchFromGitHub { owner = "magit"; repo = "magit-imerge"; - rev = "b19e5b53553a4d057d944f9a17a2d44f71f20d62"; - sha256 = "0i8nv28axp4nhh87lh7liimry398mgp038dm0v24b3ly1i4vf0gn"; + rev = "ea578e8adf1ba2f98934660bd9db01cfc074b334"; + sha256 = "06w281ir0iwlmcad26b2zkk08ympw190znsll9pdlcdvzyrsl5nl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e78a5c27eedfc9b1d79e37e8d333c5d253f31a3c/recipes/magit-imerge"; @@ -43495,12 +43579,12 @@ magit-popup = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "magit-popup"; - version = "20170709.510"; + version = "20170730.2139"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "4f0046012cc4783e7ec31e757e07d338c931a6e3"; - sha256 = "0lziv48xw065p6iwagraff2477dm3qldjbf6xfd2iqqwm7kfhd48"; + rev = "0ffd49d48b14e7acd107ccff3efc2d8704ea26a4"; + sha256 = "0zzxs5jpd6inh6bapyq1vq87yangf988lw24ywm783rawzdbcj4b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-popup"; @@ -43579,12 +43663,12 @@ magit-tbdiff = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: melpaBuild { pname = "magit-tbdiff"; - version = "20170724.2156"; + version = "20170725.1850"; src = fetchFromGitHub { owner = "magit"; repo = "magit-tbdiff"; - rev = "549b27375b2f834eb86eeae0a8ad5475425cafed"; - sha256 = "1jhl9afkz4lcwdbp7698pl630259n677jfigaywin2nvv0klb1s7"; + rev = "1d1333af9d76b9e832212e9da152397df65f7205"; + sha256 = "1rhjqvdg43n0qa9qdq9rlq4v8msy48y912m9dcjdvsaw45hh8062"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ad97eea866c8732e3adc17551d37a6d1ae511e6c/recipes/magit-tbdiff"; @@ -43621,12 +43705,12 @@ magithub = callPackage ({ emacs, fetchFromGitHub, fetchurl, ghub-plus, lib, magit, melpaBuild, s }: melpaBuild { pname = "magithub"; - version = "20170516.612"; + version = "20170730.723"; src = fetchFromGitHub { owner = "vermiculus"; repo = "magithub"; - rev = "7fd7343c3c87df56c7c7dd6c41a80b14291b1ac4"; - sha256 = "0a0q94lvk0rzj4r7hchypp197rj561d2a28jfzrfvvhq6x9vb4im"; + rev = "4ebcc6890ed53d789869da85a0bcb33c2b210801"; + sha256 = "153pcx585hhinj10bsfa5hlzx6lr768dyrwsv3wm16wfli53p18v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/magithub"; @@ -44175,12 +44259,12 @@ markdown-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "markdown-mode"; - version = "20170724.2018"; + version = "20170731.1713"; src = fetchFromGitHub { owner = "jrblevin"; repo = "markdown-mode"; - rev = "d29cea8534e80acf174ddb6fca7cfe071d84edd0"; - sha256 = "0lg1cfk0rk6rx5zighr6xjsqga3mn290kll44hzrmaq4zzbfzfa9"; + rev = "884a72d9b69db4974e06d4a9c265b8fd607f7e31"; + sha256 = "06hxl0bdc2pa3gzznczhxhrwzdk7p0abhsmg11yh1s6csw678qsm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/74610ec93d4478e835f8b3b446279efc0c71d644/recipes/markdown-mode"; @@ -44933,12 +45017,12 @@ merlin = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "merlin"; - version = "20170204.628"; + version = "20170731.907"; src = fetchFromGitHub { owner = "the-lambda-church"; repo = "merlin"; - rev = "957e551140587f0cd83d9186a06fba10a38c6084"; - sha256 = "1df6cx7y5i35cmfi5c4b48iys21cszrvlh039cdbkmy6d0pdbvi7"; + rev = "803dfd048c97f9fc16148d6b8ca116a281e8b537"; + sha256 = "10ba2zrivllzp5rl77hsd06pgw7s42s7hsvfdvx01482xf22b7lb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b1b9bfd3164e62758dc0a3362d85c6627ed7cbf8/recipes/merlin"; @@ -45159,27 +45243,6 @@ license = lib.licenses.free; }; }) {}; - mic-paren = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "mic-paren"; - version = "20150110.1816"; - src = fetchFromGitHub { - owner = "emacsmirror"; - repo = "mic-paren"; - rev = "d0332fae515af2fa461d19afa7f933588afc327f"; - sha256 = "0l7xfana2cb894w5qi6wwx7w9k89c3i8k40fpsd93sm3hgi5ryii"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/0fda2b54a0ff0b6fc3bd6d20cfcbbf63cae5380f/recipes/mic-paren"; - sha256 = "042dzp0nal18nxq94qlwwksh0nnypsyc0yykmc6l3kayp9pv4hw7"; - name = "mic-paren"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/mic-paren"; - license = lib.licenses.free; - }; - }) {}; micgoline = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, powerline }: melpaBuild { pname = "micgoline"; @@ -45851,8 +45914,8 @@ src = fetchFromGitHub { owner = "mrkkrp"; repo = "modalka"; - rev = "f2b2e206105332620b97c1f3bfd6cb03469db98f"; - sha256 = "09wg7hbigk3084nvjw0ikfs9hgdp1ip0spmrsx70iq18xgv5fm37"; + rev = "70db2088c14884e9d93a1f987ee9bc2753ca5772"; + sha256 = "07zqv6rm97kaxh0ii6n88yva7h3r3n8k6sssiy8hw6mf8817x44p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fa0a02da851a603b81e183f461da55bf4c71f0e9/recipes/modalka"; @@ -46137,12 +46200,12 @@ monokai-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "monokai-theme"; - version = "20170724.740"; + version = "20170731.504"; src = fetchFromGitHub { owner = "oneKelvinSmith"; repo = "monokai-emacs"; - rev = "b9be135bb01328ee7c1349c3eb81aecd045ea015"; - sha256 = "01mzz1bdli0x4kgf089iy62d15y2gjxk51hybrlb9naddwl9zz89"; + rev = "623083f05c381761a8cf2fd923e493bfa8762c28"; + sha256 = "02d759s4zh6a2yj2xq9cdfjyrsj3a3a5wngcwkl6bq0jgbjz5pvv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2bc9ce95a02fc4bcf7bc7547849c1c15d6db5089/recipes/monokai-theme"; @@ -46571,27 +46634,6 @@ license = lib.licenses.free; }; }) {}; - mpg123 = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "mpg123"; - version = "20170313.715"; - src = fetchFromGitHub { - owner = "emacsmirror"; - repo = "mpg123"; - rev = "d1dd8c56428ae55df9e23ba26f102588001d55be"; - sha256 = "1faqz3svh9l14617d39b8c7gfgf7kxf4q6d0k2q6y8whfljnbyvm"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/714d40891ab697b6303a3e25df2cb8adf04942f3/recipes/mpg123"; - sha256 = "184ip9pvv4zkfxnrzxbfajjadc9f4dz4psn33f9x3sfh7s1y4nw8"; - name = "mpg123"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/mpg123"; - license = lib.licenses.free; - }; - }) {}; mpv = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild, names, org }: melpaBuild { pname = "mpv"; @@ -46786,7 +46828,7 @@ src = fetchFromGitHub { owner = "IvanMalison"; repo = "multi-line"; - rev = "7e99fd560b15a6176a5ccfcac0af4ef9e8dd0656"; + rev = "ca151864e7ff7ade0e530e8eb2c26291d37a56b6"; sha256 = "01dsnpfwkycmq3kiy76hz92bm1hq4rqqg3kp56scy05sz9biqzkc"; }; recipeFile = fetchurl { @@ -46911,8 +46953,8 @@ src = fetchFromGitHub { owner = "magnars"; repo = "multiple-cursors.el"; - rev = "c94566597a80c07a1782a75644fe1a2ca4f29bad"; - sha256 = "0g4w3xcwazdm6f07n00jgdkv5blrd9aaqmwbx28lm1qq3v6w0xqp"; + rev = "e14fdb77a1f65465a61e8f69180505095cc2b7dd"; + sha256 = "0ahy9sv57wc0djaxi9740z37pnwjk3a436zgmabj85ib6ykmla1y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5f015e6b88be2a5ded363bd882a558e94d1f391/recipes/multiple-cursors"; @@ -47091,27 +47133,6 @@ license = lib.licenses.free; }; }) {}; - mwe-log-commands = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "mwe-log-commands"; - version = "20100703.541"; - src = fetchFromGitHub { - owner = "emacsmirror"; - repo = "mwe-log-commands"; - rev = "8253f2a311f35b03f72a035744f0cbdd776ea17e"; - sha256 = "0qdlbyq47gr65yq5ri8s9lxw4wp9fmyqc2prkh560d4hkvw60aw3"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/mwe-log-commands"; - sha256 = "1nf3rd5i4r61z64apkqi5wx60fpshx5px0y53jqf0rk86708l6wx"; - name = "mwe-log-commands"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/mwe-log-commands"; - license = lib.licenses.free; - }; - }) {}; mwim = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mwim"; @@ -47220,12 +47241,12 @@ mysql2sqlite = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mysql2sqlite"; - version = "20151123.1339"; + version = "20170725.1516"; src = fetchFromGitHub { owner = "echosa"; repo = "emacs-mysql2sqlite"; - rev = "07415c5fcd895ebccf1b774d0eab175f2700652f"; - sha256 = "0q5809hq22hyzxx5xr2hwwf3jh3qlpf3mkbl3fxqq93gm16plh1i"; + rev = "8e6e74451c942e2e92f90dc13222b95a7dbb285e"; + sha256 = "18jriaj391n4wr0qiva68jf482yx9v9l4xagbzl9vw125lszkngb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9841d3cfd1ee954eb0ab9b2ca3a3f605eb0fd22a/recipes/mysql2sqlite"; @@ -47800,6 +47821,27 @@ license = lib.licenses.free; }; }) {}; + neato-graph-bar = callPackage ({ emacs, fetchFromGitLab, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "neato-graph-bar"; + version = "20170731.2341"; + src = fetchFromGitLab { + owner = "RobertCochran"; + repo = "neato-graph-bar"; + rev = "3ebd5168c9b8cc56cc4163206c03864b9b802f27"; + sha256 = "133k1lwmb7ky91ij03nd4vipkivvx4bz56m4waf1pdmaynsidy6j"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/49c5bd4e1506a28ada9856e5f70e520890123d16/recipes/neato-graph-bar"; + sha256 = "1p4jmla75ny443cv7djk3nvl3ikchllnsivxx9yds14ynk4jxhgb"; + name = "neato-graph-bar"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/neato-graph-bar"; + license = lib.licenses.free; + }; + }) {}; nemerle = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nemerle"; @@ -48096,12 +48138,12 @@ nim-mode = callPackage ({ commenter, emacs, epc, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild }: melpaBuild { pname = "nim-mode"; - version = "20170716.948"; + version = "20170729.1816"; src = fetchFromGitHub { owner = "nim-lang"; repo = "nim-mode"; - rev = "05ac362f97874d50131ea38277cf95a5cfecb250"; - sha256 = "0phxkvi1s49grc717iprg96dalb5w2jcj1dfyrh339xny11f2hqb"; + rev = "91fc75e8ceebf850bd2ec07522e744eef0b89098"; + sha256 = "0margf3d0zg6nk5lf7s7dgf7qhx664jhk27wlsjnysm79d6d98f7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dc2ccb5f24b9d55c77eaa7952a9e6a2e0ed7be24/recipes/nim-mode"; @@ -48184,8 +48226,8 @@ src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "c94f3d5575d7af5403274d1e9e2f3c9d72989751"; - sha256 = "1akfzzm4f07wj6l7za916xv5rnh71pk3vl8dphgradjfqb37bv18"; + rev = "a2778988f2b70a5f000202afa7213b553350c72e"; + sha256 = "1iiy8sfdqqd2jz8lcccf0lpwxqaa5ppa47maic2gy2m7qxgw7418"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f2b542189cfde5b9b1ebee4625684949b6704ded/recipes/nix-mode"; @@ -48327,12 +48369,12 @@ no-littering = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "no-littering"; - version = "20170702.457"; + version = "20170728.952"; src = fetchFromGitHub { owner = "tarsius"; repo = "no-littering"; - rev = "8b689a1e16d4825d0221f4a41756b63bbc361c82"; - sha256 = "02cb5m1r5k1f6il79yv8fa5yiyz2m37awlbjjxmkv1av06kl0abn"; + rev = "c1b3aa13f5311e1a7778f9cccd25680bbbf04c5f"; + sha256 = "0rd3cr63vgy1xbbszdi87p7g55ypnq59gjqkmzfc69z0fv05d2fv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cf5d2152c91b7c5c38181b551db3287981657ce3/recipes/no-littering"; @@ -48534,11 +48576,11 @@ }) {}; notmuch = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "notmuch"; - version = "20170715.511"; + version = "20170720.301"; src = fetchgit { url = "git://git.notmuchmail.org/git/notmuch"; - rev = "4c6e3d83fb2d5d3ce04710d92b97ef6a59a11051"; - sha256 = "145313a0krav6lcalbpq6skyf2iw96c97v6cd7s6bci5i93w0mp3"; + rev = "4a101ec7aabef163ffbdafe1b0a732bb23b3b0bc"; + sha256 = "172027wirk7gc4siy3f9zccm01iqjlfx0nk3s8pq7qg20cx0aa39"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch"; @@ -48871,8 +48913,8 @@ src = fetchFromGitHub { owner = "TeMPOraL"; repo = "nyan-mode"; - rev = "4195cd368aca8f05a71cbff4e60cfa9dde10319a"; - sha256 = "1bnfxw6cnhsqill3n32j9bc6adl437ia9ivbwvwjpz1ay928yxm7"; + rev = "3447aa114575230cb230862ac0ac9b065f789ecd"; + sha256 = "1nlsgkll6gagn4bs092ad1glkcihlcac9ai4cbj63l8x9x346yqg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4d8c3000df5f2ee2493a54dee6f9b65008add753/recipes/nyan-mode"; @@ -49013,12 +49055,12 @@ ob-blockdiag = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ob-blockdiag"; - version = "20170524.1605"; + version = "20170727.1801"; src = fetchFromGitHub { owner = "corpix"; repo = "ob-blockdiag.el"; - rev = "715e7d41124a98d3f1e38e430e3a7f31b52704e4"; - sha256 = "0mqi9hm00apq43mmabai05x96q4x0l29n9gvdhphzjrhvjabmm6l"; + rev = "634fcf64a4ae735afe7001d865b03f5d71e23046"; + sha256 = "0xr3bv4wxz13b1grfyl2qnrszzab3n9735za837nf4lxh527ksaj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/261b77a3fd07644d1c250b16857de70cc1bbf478/recipes/ob-blockdiag"; @@ -49202,12 +49244,12 @@ ob-go = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ob-go"; - version = "20170324.932"; + version = "20170731.1057"; src = fetchFromGitHub { owner = "pope"; repo = "ob-go"; - rev = "28183e10581fa5fe0f5b5a885cbde32cb4b053ba"; - sha256 = "1liggd9nbl90c6mc0iccchckwm1pw2lb23nn61y2p9c1hj9myhm8"; + rev = "28a0250cd969974936e44dfdccb0265632d25f84"; + sha256 = "1g595miqn7wdmphvgi06ijqzjy801nal226kbghk9p002s3xzzn0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3afb687d6d3d1e52336ca9a7343278a9f37c3d54/recipes/ob-go"; @@ -49454,12 +49496,12 @@ ob-rust = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ob-rust"; - version = "20170619.802"; + version = "20170730.759"; src = fetchFromGitHub { owner = "micanzhang"; repo = "ob-rust"; - rev = "126ee38c6f560cac2ea6bbef034f92ff948d2664"; - sha256 = "1szayb60ibihjfd5ihij0cvjdmvcays1701h5ak0wpvqirdmyc60"; + rev = "f23d93725c21ab95a44cb4d2c0c4ab0489bd55d9"; + sha256 = "0indljqh6idfwza286gi9dkqwrndbnny4a5f7csz8gssmn0x3i30"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/843affc2fd481647c5377bf9a96b636b39718034/recipes/ob-rust"; @@ -50760,6 +50802,27 @@ license = lib.licenses.free; }; }) {}; + org-category-capture = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: + melpaBuild { + pname = "org-category-capture"; + version = "20170731.2235"; + src = fetchFromGitHub { + owner = "IvanMalison"; + repo = "org-projectile"; + rev = "d72c56458bd3b0535fc97dccaa23bd85dead099f"; + sha256 = "0rn33pily979l7cmyr8az30kkv8yqdzvk3xwxjw4vivcbzrzd4j7"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/6760daac1ef9d9d7ba07e2fc9668873020f901f1/recipes/org-category-capture"; + sha256 = "0l5n71h9lc8q9k0sb5ghzwb81lah4l1ykc06shfl9zw5lqqvahav"; + name = "org-category-capture"; + }; + packageRequires = [ emacs org ]; + meta = { + homepage = "https://melpa.org/#/org-category-capture"; + license = lib.licenses.free; + }; + }) {}; org-chinese-utils = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-chinese-utils"; @@ -51437,8 +51500,8 @@ version = "20140107.519"; src = fetchgit { url = "git://orgmode.org/org-mode.git"; - rev = "ed6849d18dd7831f3f7917970d2c24e771f75476"; - sha256 = "0f3c0jj6479b3sxmsa9nd5h5gnl81xnrdhymh2rs7rjgcj58fbws"; + rev = "fbf31df38a20e03127a3d415f4391b6a72fc73a4"; + sha256 = "0hdnl8bc3zyn50vb557f2739fvr66wvgabvmd2gcy5m9ins2vi08"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ee69e5e7b1617a29919d5fcece92414212fdf963/recipes/org-mac-iCal"; @@ -51457,8 +51520,8 @@ version = "20170105.1723"; src = fetchgit { url = "git://orgmode.org/org-mode.git"; - rev = "ed6849d18dd7831f3f7917970d2c24e771f75476"; - sha256 = "0f3c0jj6479b3sxmsa9nd5h5gnl81xnrdhymh2rs7rjgcj58fbws"; + rev = "fbf31df38a20e03127a3d415f4391b6a72fc73a4"; + sha256 = "0hdnl8bc3zyn50vb557f2739fvr66wvgabvmd2gcy5m9ins2vi08"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b86c666ee9b0620390a250dddd42b17cbec2409f/recipes/org-mac-link"; @@ -51651,11 +51714,11 @@ org-parser = callPackage ({ dash, emacs, fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-parser"; - version = "20170703.1738"; + version = "20170728.2120"; src = fetchhg { url = "https://bitbucket.com/zck/org-parser.el"; - rev = "e8c81e633595"; - sha256 = "1zwwn0xwpq8iscl0cznq3cxcr7kpwrxl6w9v2nrxjs3lffzyzl7a"; + rev = "0febaec75eda"; + sha256 = "1vvxpldjd2y95y3935z16g4v6agz02k1d9c0pb0pr41ms60q0b9w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/28d55005cbce276cda21021a8d9368568cb4bcc6/recipes/org-parser"; @@ -51772,27 +51835,48 @@ license = lib.licenses.free; }; }) {}; - org-projectile = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }: + org-projectile = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org-category-capture, projectile, s }: melpaBuild { pname = "org-projectile"; - version = "20170520.2310"; + version = "20170731.2333"; src = fetchFromGitHub { owner = "IvanMalison"; repo = "org-projectile"; - rev = "0ca3b80a46d8c541d36f161506ac8d8dc36d8e80"; - sha256 = "0r5h6ibq73b84w82382ld5dbihhvff4pj2bind68i5isam7pxlbh"; + rev = "d72c56458bd3b0535fc97dccaa23bd85dead099f"; + sha256 = "0rn33pily979l7cmyr8az30kkv8yqdzvk3xwxjw4vivcbzrzd4j7"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org-projectile"; - sha256 = "1kkgi49bvdwz50x32lqdj2ii02mxv8i4dr1asr8zk6mdg0fwlqpf"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/9d7a7ab98f364d3d5e93f83f0cb3d80a95f28689/recipes/org-projectile"; + sha256 = "0xdkd5pkyi6yfqi4przgp5mpklyxfxv0cww285zdlh00rzl935cw"; name = "org-projectile"; }; - packageRequires = [ dash emacs projectile ]; + packageRequires = [ dash emacs org-category-capture projectile s ]; meta = { homepage = "https://melpa.org/#/org-projectile"; license = lib.licenses.free; }; }) {}; + org-projectile-helm = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, org-projectile }: + melpaBuild { + pname = "org-projectile-helm"; + version = "20170729.1153"; + src = fetchFromGitHub { + owner = "IvanMalison"; + repo = "org-projectile"; + rev = "d72c56458bd3b0535fc97dccaa23bd85dead099f"; + sha256 = "0rn33pily979l7cmyr8az30kkv8yqdzvk3xwxjw4vivcbzrzd4j7"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/6760daac1ef9d9d7ba07e2fc9668873020f901f1/recipes/org-projectile-helm"; + sha256 = "0x79j5yr9wsgzjf1dpp7d4xiji8hgyhr79vb973an5z2r02vnaf4"; + name = "org-projectile-helm"; + }; + packageRequires = [ emacs helm org-projectile ]; + meta = { + homepage = "https://melpa.org/#/org-projectile-helm"; + license = lib.licenses.free; + }; + }) {}; org-protocol-jekyll = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-protocol-jekyll"; @@ -51865,12 +51949,12 @@ org-recent-headings = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "org-recent-headings"; - version = "20170722.1507"; + version = "20170727.1633"; src = fetchFromGitHub { owner = "alphapapa"; repo = "org-recent-headings"; - rev = "56e52d65a03df0458bf79ceea5252f5efe432e3e"; - sha256 = "10ymgycm7imigbisqnccd0rzvj9ihzmql4ipqj81iqwrssssqwyb"; + rev = "1b14f7f833f158f03461fb12d41a8c9f6ad4bd6a"; + sha256 = "09jp7kfjkcaqlnnls80pzxgsga7fids7w495sd319sml36fa46m8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/668b79c179cbdb77c4049e7c620433255f63d808/recipes/org-recent-headings"; @@ -51907,12 +51991,12 @@ org-ref = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, helm-bibtex, hydra, ivy, key-chord, lib, melpaBuild, pdf-tools, s }: melpaBuild { pname = "org-ref"; - version = "20170724.1235"; + version = "20170727.1217"; src = fetchFromGitHub { owner = "jkitchin"; repo = "org-ref"; - rev = "5a59df1f9474103faed807fbc3448919cf7aa779"; - sha256 = "15i8kqv5a18i19pcw1kcq4ricmgm1q1qlkfzaawwilfd45ipl6d6"; + rev = "30be4111d465b6d8fbdc9785e8c49dc0ce16bab0"; + sha256 = "0zcv0np6hnq5jcblxxrvh99rd9zi7savpyhad29krqw7rhii1z71"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/550e4dcef2f74fbd96474561c1cb6c4fd80091fe/recipes/org-ref"; @@ -52062,6 +52146,27 @@ license = lib.licenses.free; }; }) {}; + org-super-agenda = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org, s }: + melpaBuild { + pname = "org-super-agenda"; + version = "20170801.156"; + src = fetchFromGitHub { + owner = "alphapapa"; + repo = "org-super-agenda"; + rev = "591ea418588a2ad0cd34146831d369b030cea188"; + sha256 = "06jk5xp5x01123lwxv4srhcirjg8cwffz35x0kfndl0lq43g3mzi"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/fd27b2df7594a867529de4b84c8107f82dabe2e9/recipes/org-super-agenda"; + sha256 = "1h3kqvpjq2w0n8qiqwb8wcpdy2g4ac7j6kin0943g7p5gm5yf0ra"; + name = "org-super-agenda"; + }; + packageRequires = [ dash emacs org s ]; + meta = { + homepage = "https://melpa.org/#/org-super-agenda"; + license = lib.licenses.free; + }; + }) {}; org-sync = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "org-sync"; @@ -52338,12 +52443,12 @@ org-wc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-wc"; - version = "20160204.1715"; + version = "20170727.1911"; src = fetchFromGitHub { owner = "dato"; repo = "org-wc"; - rev = "7735d5111f779a84c40b1eb3783631e6048fb6fe"; - sha256 = "08yww77697kck1ld9xcrcx8amqdh28rdc4fsavp5d3my78qk7rac"; + rev = "d294ad7117c150445e6166fc0d88c14a8386f34e"; + sha256 = "1ijmdir2csvrmfqh9b5h57x0v3jcla5xzjamb4c7hhd87a6qd9wl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e2f0d29fb0c046d9f7c32215ea58897147f3b291/recipes/org-wc"; @@ -52359,12 +52464,12 @@ org-webpage = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, ht, htmlize, lib, melpaBuild, mustache, org, simple-httpd }: melpaBuild { pname = "org-webpage"; - version = "20170318.450"; + version = "20170730.50"; src = fetchFromGitHub { owner = "tumashu"; repo = "org-webpage"; - rev = "c71042f16bf33120d0d3d40e107f3f4de044ae53"; - sha256 = "1jy55qapc8fqf6r3wz4v489iyw4pxzj2hadkwsgsv1m1ha1sdvyk"; + rev = "e9bb72c7bf75243553f786193e7c9535777559f0"; + sha256 = "0ak2210d9qx4zfgqzilxzla1rswwjgjnc15kh6drn6dfmj1krfnz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1428ef6b2291d415ae2114de123652d9e378398e/recipes/org-webpage"; @@ -52527,12 +52632,12 @@ orgit = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild, org }: melpaBuild { pname = "orgit"; - version = "20170403.1323"; + version = "20170731.1003"; src = fetchFromGitHub { owner = "magit"; repo = "orgit"; - rev = "c91e662ace7e3ce992269cbf755f378bc6742511"; - sha256 = "0x7d8wjfg61gzi6ghq4cfkizzjcpiz56j797h6kmbri73yb7xf16"; + rev = "022687eb02f0bf0d0151d0ad917b165bfef2d663"; + sha256 = "1cddyns82a06ydbw8rhxzghkjav5vxmmc671pdnai50mql3cx9kf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/73b5f7c44c90540e4cbdc003d9881f0ac22cc7bc/recipes/orgit"; @@ -52867,8 +52972,8 @@ src = fetchFromGitHub { owner = "DarwinAwardWinner"; repo = "osx-pseudo-daemon"; - rev = "4d10e327cd8ee5bb7f006d68744be21c7097c1fc"; - sha256 = "0rjdjddlkaps9cfyc23kcr3cdh08c12jfgkz7ca2j141mm89pyp2"; + rev = "d235680a72677f11925b912428ad1a57b664e3e8"; + sha256 = "0gqknrwhfzr7cf5pgs33a5xh79y0yzxghs6wsvavvqkmf4cvck40"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e89752e595c7cec9488e755c30af18f5f6fc1698/recipes/osx-pseudo-daemon"; @@ -53102,8 +53207,8 @@ sha256 = "06lp56na1fv87296hhaxgb6gfnzln39p4v245gfxhk0k27589vxj"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a679ebaedcb496f915b9338f9d5c003e1389594d/recipes/ox-bibtex-chinese"; - sha256 = "0h02jlzk97rd3jmdni5mggbkij61d7zn1n1ibz1jg6zb0000cj7a"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/6c09c708c4372451502923cd3cb756f4f98ba97b/recipes/ox-bibtex-chinese"; + sha256 = "0f3xigrkhc86vv23f76fdd4rjsspsd2ck5c65biq2ds247f4gm61"; name = "ox-bibtex-chinese"; }; packageRequires = [ emacs ]; @@ -53119,8 +53224,8 @@ src = fetchFromGitHub { owner = "jkitchin"; repo = "scimax"; - rev = "7e3b7a8adf92e5166d98c35e54dccb88831e85dd"; - sha256 = "1lsbgpdbry37wgy9p9zbd60cwfrvs9a2fr8b3mzv9i5w9f1wdjy8"; + rev = "4470f452f4219a53947da4c3d4ade188f978ad73"; + sha256 = "1nz02plf1p73690z2czn95fpiy5hissq6xnhfj5gf3ykmyzn5wbc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/222ccf4480395bda8c582ad5faf8c7902a69370e/recipes/ox-clip"; @@ -53644,8 +53749,8 @@ src = fetchFromGitHub { owner = "milkypostman"; repo = "package-filter"; - rev = "c8e2531227c02c4c5e9d593f2cdb6a4ab4a6849b"; - sha256 = "001h92jchz6x6pm8bj90law0yzc5xd84f703z7fcwan4k0g1iwl7"; + rev = "bc73b41aea1d65ca44ef1593ca13126df9bbb39e"; + sha256 = "0fq31zcz5j0n29p3zmx2k2w0xvay24zs34mbq8nb0y0jr7ycm184"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/89312eaf69f3d7ac46647255c847fcb45415e78d/recipes/package-filter"; @@ -53932,12 +54037,12 @@ pamparam = callPackage ({ emacs, fetchFromGitHub, fetchurl, hydra, lib, lispy, melpaBuild, worf }: melpaBuild { pname = "pamparam"; - version = "20170721.1905"; + version = "20170725.1345"; src = fetchFromGitHub { owner = "abo-abo"; repo = "pamparam"; - rev = "0740cf4a5b5da561d5dbab96a6a34e2db28d24ed"; - sha256 = "1h52zig64g2wdsvx1g590bl62zfg8l4bikfi6y25zx1gic9cifnk"; + rev = "017df884700a9db27dc486f7047da4bc7639ee6e"; + sha256 = "1b5gkmgqwibbavw3qfkgyaj1y3shr0nm3ksrl3ahhabylg3fj5as"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/067b5e3594641447478db8c1ffcb36d63018b1b2/recipes/pamparam"; @@ -54308,12 +54413,12 @@ pass = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, password-store }: melpaBuild { pname = "pass"; - version = "20170725.34"; + version = "20170728.26"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "pass"; - rev = "42bfe9f471f19c9d801f15ffde658ea3f4655ac8"; - sha256 = "12hajddf6bkg5fsi1w31rj1wrg0yr8idp7c1jn00824h0la2maf0"; + rev = "4dc3397caaa2fb3672cf7fbb2189927538c4642c"; + sha256 = "1gxkx73avmv2j19qaszjwy6kasggh40ahnmayfxsvgjxxzd5c46s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/428c2d53db69bed8938ec3486dfcf7fc048cd4e8/recipes/pass"; @@ -54410,21 +54515,21 @@ license = lib.licenses.free; }; }) {}; - password-store = callPackage ({ f, fetchgit, fetchurl, lib, melpaBuild, s }: + password-store = callPackage ({ f, fetchgit, fetchurl, lib, melpaBuild, s, with-editor }: melpaBuild { pname = "password-store"; - version = "20151027.1449"; + version = "20170726.2054"; src = fetchgit { - url = "http://git.zx2c4.com/password-store"; - rev = "38ec1c72e29c872ec0cdde82f75490640d4019bf"; - sha256 = "04rqph353qfhnrwji6fmvrbk4yag8brqpbpaysq5z0c9l4p9ci87"; + url = "https://git.zx2c4.com/password-store"; + rev = "8fa1be8cdff8f5278011616171d8095b8a46b287"; + sha256 = "0i9iqsrg5y2w694kx9wa4fv3syijdshripjl6wi83c2xi4cp6p8s"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/e204fb4d672220ee1a4a49975fd3999916e60f8c/recipes/password-store"; - sha256 = "1jh24737l4hccr1k0b9fnq45ag2dsk84fnfs86hcgsadl94d6kss"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/ceff76206bd44d92c00adc931236c4ae15db5583/recipes/password-store"; + sha256 = "06l4xlvrjswy5kndn6h6swliqcp007nh4fyvma3jaac4f3x2qi65"; name = "password-store"; }; - packageRequires = [ f s ]; + packageRequires = [ f s with-editor ]; meta = { homepage = "https://melpa.org/#/password-store"; license = lib.licenses.free; @@ -55544,12 +55649,12 @@ phoenix-dark-mono-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "phoenix-dark-mono-theme"; - version = "20130306.1215"; + version = "20170729.706"; src = fetchFromGitHub { owner = "j0ni"; repo = "phoenix-dark-mono"; - rev = "dafb65c542605145d6b1702aae5b195b70f98285"; - sha256 = "1fg63g1cm9mp50sf3ldcb0pr4bvlfxx010arisxdkj102pmib2ri"; + rev = "a54f515d162148bcb38676980bc2316adb3d7b8b"; + sha256 = "1zr334qsjrajd2vrrlc1rfm4b4kdw15jfh5d102vj5bp7z7ajhb4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/87e3b036fbcc96b047bbb141345a7b51f19d6951/recipes/phoenix-dark-mono-theme"; @@ -55565,12 +55670,12 @@ phoenix-dark-pink-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "phoenix-dark-pink-theme"; - version = "20170324.1144"; + version = "20170729.703"; src = fetchFromGitHub { owner = "j0ni"; repo = "phoenix-dark-pink"; - rev = "219edf69adb7e911394c5849c310ca0f4201a917"; - sha256 = "0i7m9iqnglirwfdibskz2alk8bzkffp8gaa38yqg6bxwb46x67nq"; + rev = "4defbb76b00c1a29f060813898578152d6be623d"; + sha256 = "03d7ak4ia3fifp0c8fm4qdydizsfsxvcvbzwfxlsk66s28p5wglc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/87e3b036fbcc96b047bbb141345a7b51f19d6951/recipes/phoenix-dark-pink-theme"; @@ -55691,12 +55796,12 @@ php-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "php-mode"; - version = "20170722.1205"; + version = "20170729.1258"; src = fetchFromGitHub { owner = "ejmr"; repo = "php-mode"; - rev = "1728f36aaa7b44993495476a06e9c8be0140c51c"; - sha256 = "1pk3lxg2fa7skz17qygjhvwbvcl34bs2as728i3nid6ghw71fk5s"; + rev = "151ae717b03d6d5fcc2bc86e349175840bfbe079"; + sha256 = "00f2k41zmda299rj4lfpxisnrr9i5f0gg51cb8fri7lyjzrq829a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7cdbc35fee67b87b87ec72aa00e6dca77aef17c4/recipes/php-mode"; @@ -55716,8 +55821,8 @@ src = fetchFromGitHub { owner = "echosa"; repo = "phpplus-mode"; - rev = "963eb19c06a7237879ae7b7a111c83abcfe9ca36"; - sha256 = "06ffbw66zw5ssavgbllcb9a0syi5asy6wq8yqxdyw66nj941kjbr"; + rev = "8224e6aabc2e3d046d717b4c87c643aa98a8e203"; + sha256 = "041xv3c2gwcxlj9bnjx6hlrm2k7s7fyzqbp4c583is6jx1adjfn3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d542e94471b9f601f1ee6f31e727bc4a31fa8f9e/recipes/php+-mode"; @@ -56045,22 +56150,22 @@ license = lib.licenses.free; }; }) {}; - pippel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: + pippel = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "pippel"; - version = "20170325.649"; + version = "20170730.623"; src = fetchFromGitHub { owner = "brotzeitmacher"; repo = "pippel"; - rev = "764c8ec30ad14288accd05c7f8a1c9425d6aab7f"; - sha256 = "0plpjjyhn1rz8pwyldshwa61r7pfz310j4qciw55smjizz4hfjx8"; + rev = "3737d5934665b5059c1e858feeb4270262b37e53"; + sha256 = "0k94y305c6abhxgq6birfvnrplsx5gadwsqwn8m87sh8ldsjnmgi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/pippel"; sha256 = "0w6qbjb1wpz8gn4gzifzzjbc3gckhgnqvrpszrrklqmd10rk5mrw"; name = "pippel"; }; - packageRequires = [ emacs s ]; + packageRequires = [ dash emacs s ]; meta = { homepage = "https://melpa.org/#/pippel"; license = lib.licenses.free; @@ -57712,12 +57817,12 @@ projectile = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }: melpaBuild { pname = "projectile"; - version = "20170725.1304"; + version = "20170727.2351"; src = fetchFromGitHub { owner = "bbatsov"; repo = "projectile"; - rev = "63dc5bcf0803ef81bc13ca499e60c61b8fea2fd6"; - sha256 = "0lxs3k93jw9whbymbg3swk9c6gbix93vw7mqx9n84qdvijm3zrr4"; + rev = "5e9249dd42245222b26779e50cf9d00cae80bcde"; + sha256 = "04zvr24dxzi1z70z0vq218x14mva3z6s4my7wx6c6c9fwma1vbx4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/projectile"; @@ -58136,8 +58241,8 @@ src = fetchFromGitHub { owner = "google"; repo = "protobuf"; - rev = "bb8664419b7d0dd4a94cc1242a2d77bf5e8f567b"; - sha256 = "1cca2vkpqysnswqawx4rgf7zsmnwvg13irs3jf6ipcld8wsnb17q"; + rev = "072431452a365450c607e9503f51786be44ecf7f"; + sha256 = "0yl003jbxd7k70a8ajs19256pq4g71fkx1nqg207mzvagmnp3iqp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode"; @@ -58712,8 +58817,8 @@ src = fetchFromGitHub { owner = "mattharrison"; repo = "pycoverage.el"; - rev = "dbc152a807efcaac4e50bedb64c026674009a279"; - sha256 = "0qap6iz865l43mixga7541c2z9kdx8zkkdcgdlgn6n8pyv8iz7qs"; + rev = "4f5451f4d6e1e2ddd5878fc7d18f5fc4fc92a83d"; + sha256 = "0xhkzskxnj4lmf4152c3n1vp68l1xgwa277f3yg8sslg6ixkd2p0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eb0310bbe8427abdcba2b30414ec26475b0b7440/recipes/pycoverage"; @@ -58851,6 +58956,111 @@ license = lib.licenses.free; }; }) {}; + pyim = callPackage ({ async, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pos-tip, pyim-basedict }: + melpaBuild { + pname = "pyim"; + version = "20170730.1512"; + src = fetchFromGitHub { + owner = "tumashu"; + repo = "pyim"; + rev = "88adc57d754c9aecc922fe8b29239148f2b6557c"; + sha256 = "11hd2k64j5wm75hmnbf0ywcak0lc733jhkivmbvkx1qkb4cwll6v"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/151a0af91a58e27f724854d85d5dd9668229fe8d/recipes/pyim"; + sha256 = "1ly4xhfr3irlrwvv20j3kyz98g7barridi9n8jppc0brh2dlv98j"; + name = "pyim"; + }; + packageRequires = [ async cl-lib emacs popup pos-tip pyim-basedict ]; + meta = { + homepage = "https://melpa.org/#/pyim"; + license = lib.licenses.free; + }; + }) {}; + pyim-basedict = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "pyim-basedict"; + version = "20170726.1959"; + src = fetchFromGitHub { + owner = "tumashu"; + repo = "pyim-basedict"; + rev = "3196cb210e056702c5a4ea1dac1d8e1e27740fab"; + sha256 = "03jbjc5a1h22vpcybg0gmbyibaa85w2ml1pjk646qb28ljywd5aw"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/151a0af91a58e27f724854d85d5dd9668229fe8d/recipes/pyim-basedict"; + sha256 = "1y8cmccli3im5bvws2h582z7k4nj6p8brgypl8h09y3na6yjy2z9"; + name = "pyim-basedict"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/pyim-basedict"; + license = lib.licenses.free; + }; + }) {}; + pyim-cangjie5dict = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pyim }: + melpaBuild { + pname = "pyim-cangjie5dict"; + version = "20170729.1946"; + src = fetchFromGitHub { + owner = "erstern"; + repo = "pyim-cangjie5dict"; + rev = "c8618590780b818db1a67a29bc47c5d25903517a"; + sha256 = "0p49h2kn8wy3b51zahzyc1cy24h3b44cg5yjpmv4w23dhsr4zlz8"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/27a58729115b038abe813601bf16bba1524cdb2c/recipes/pyim-cangjie5dict"; + sha256 = "0k2nxdlrj3m09javv599ajwd8cd5mjz0hj1j51zpv4y0l1n801bn"; + name = "pyim-cangjie5dict"; + }; + packageRequires = [ pyim ]; + meta = { + homepage = "https://melpa.org/#/pyim-cangjie5dict"; + license = lib.licenses.free; + }; + }) {}; + pyim-greatdict = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "pyim-greatdict"; + version = "20170724.1525"; + src = fetchFromGitHub { + owner = "tumashu"; + repo = "pyim-greatdict"; + rev = "45fa4ff26f3444fb98c4dea460d84b740204d105"; + sha256 = "1j89mcfsqyclmllfqmsx8a55ihrn2kzay8qh2lyfm8dzd6mi1za0"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/151a0af91a58e27f724854d85d5dd9668229fe8d/recipes/pyim-greatdict"; + sha256 = "1bbindnklmmxdskv9vmjxhvlxxmaccgqn70prblhpg6n11bxjhl9"; + name = "pyim-greatdict"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/pyim-greatdict"; + license = lib.licenses.free; + }; + }) {}; + pyim-wbdict = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pyim }: + melpaBuild { + pname = "pyim-wbdict"; + version = "20170724.1527"; + src = fetchFromGitHub { + owner = "tumashu"; + repo = "pyim-wbdict"; + rev = "114489ed97e825ae11a8d09da6e873820cf23106"; + sha256 = "187wx418pj4h8p8baf4943v9dsb6mfbn0n19r8xiil1z2cmm4ygc"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/ab1cb8bc623d1f12f78fa42ce8b16514e5b07c51/recipes/pyim-wbdict"; + sha256 = "1s0i9xcnpy8kxqhsv7rqxabv5vnxsciyng398mn32mknib03315i"; + name = "pyim-wbdict"; + }; + packageRequires = [ pyim ]; + meta = { + homepage = "https://melpa.org/#/pyim-wbdict"; + license = lib.licenses.free; + }; + }) {}; pyimport = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shut-up }: melpaBuild { pname = "pyimport"; @@ -58900,8 +59110,8 @@ src = fetchFromGitHub { owner = "PyCQA"; repo = "pylint"; - rev = "d41e49a18817997106ed9f1df20651e1f438222b"; - sha256 = "0ygj6zzz4dzfwch7hgvmkm83y6rr5jhy789d7qnkdsjyfshkx5dp"; + rev = "7d6114fe71f1e6ab4a7c19546f380a7cb216eac9"; + sha256 = "1dq3ihmqdh6nb1ybz29qrkgz1ka2jhv76izh5a1q0l19qgni8wqi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a073c91d6f4d31b82f6bfee785044c4e3ae96d3f/recipes/pylint"; @@ -59043,12 +59253,12 @@ python-mode = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }: melpaBuild { pname = "python-mode"; - version = "20170723.1213"; + version = "20170731.105"; src = fetchFromGitLab { owner = "python-mode-devs"; repo = "python-mode"; - rev = "3ad3e8e0f98d90c634ff81f50776e70e75a98034"; - sha256 = "0al6jvjrxcqrqkmx1akaqb2ill0crjawc2k7b43aysch3fx7caf2"; + rev = "1d4cdc44c4fa1a15b0b1c4bb1774d0fc20d48616"; + sha256 = "1xp4lzwc95qkam8b86pmz8y0zg3w579rvygh22y47g0dlblyxgsn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/82861e1ab114451af5e1106d53195afd3605448a/recipes/python-mode"; @@ -59274,12 +59484,12 @@ quelpa = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, package-build }: melpaBuild { pname = "quelpa"; - version = "20170717.2225"; + version = "20170727.557"; src = fetchFromGitHub { owner = "quelpa"; repo = "quelpa"; - rev = "eb93cf1ca9d1298a92c680a736dedbd1c3cbbb5a"; - sha256 = "13wr46qwmi4dnx3i2py0sjhichl5kjai64jcywymp1mc52f6nyl0"; + rev = "c095fa14046c1313b97df4ec102bdea5a981ff1d"; + sha256 = "159pkv7q0kz3slc34489gnfbyw07g3iphkx6mvzqkxql8k2iw0v7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7dc3ba4f3efbf66142bf946d9cd31ff0c7a0b60e/recipes/quelpa"; @@ -59946,12 +60156,12 @@ rcirc-groups = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rcirc-groups"; - version = "20160115.431"; + version = "20170731.1401"; src = fetchFromGitHub { owner = "dimitri"; repo = "rcirc-groups"; - rev = "e858084e5956ba32a84046616326c0903de6d59f"; - sha256 = "0d99x7dfw5xrn62knvs65lvn6xyy7399xwqyy47bs4n81v25aqbh"; + rev = "b68ece9d219b909244d4e3c0d8bf6a746d6fead7"; + sha256 = "196x3qg22rhh917diml1q0hszqrqwg0klzp96q1c7c744mlq82fx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/35b9c9e877c686df0ac9f96855d733a240063829/recipes/rcirc-groups"; @@ -60097,8 +60307,8 @@ src = fetchFromGitHub { owner = "gromnitsky"; repo = "read-aloud.el"; - rev = "d5f80ab72054a957aed25224639c1779cae5f4d1"; - sha256 = "1hbb6diz96jabajxrnancjfpyd9div8vzbwys1f5bddi9z8l2jyy"; + rev = "c662366226abfb07204ab442b4f853ed85438d8a"; + sha256 = "0wmfjbk3s45wj8j6xwfdldxwkrxsfcby2a242r2p88y3f8pp30i1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/20452bf3112276a7e1c880bfab259150fc70b47a/recipes/read-aloud"; @@ -60288,12 +60498,12 @@ rebecca-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rebecca-theme"; - version = "20170406.2136"; + version = "20170730.943"; src = fetchFromGitHub { owner = "vic"; repo = "rebecca-theme"; - rev = "cf8c45993ed4e0a49dcbda71827dbe5835bda077"; - sha256 = "15v688mnr0vg7pj8mcwqpwbw896xrfjpcbwhgfhq2bd0z0j0shbk"; + rev = "ee0d8796eca831110b7084a2af96fb4184d0a418"; + sha256 = "138hs6lgql40cn86p7v2xhb7ck2zcvz1vi6jd7fk55l0xgj5w61k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/19f40f30113c7dabd76a2d0e52898e6d6be69a35/recipes/rebecca-theme"; @@ -60519,8 +60729,8 @@ src = fetchFromGitHub { owner = "RedPRL"; repo = "sml-redprl"; - rev = "bb149c75cb00cedbabc12dd497dce0ab5a7f5072"; - sha256 = "1m18hnb1hnm6rr5bi2laq9i8djkm73sxp83mawbybydq5j0446bm"; + rev = "f5a1ad20cacba47193be6d40230519c28e3578fd"; + sha256 = "07i5xa87wdyv9v0ib2j3bk9gv2dc8ah7jgi2agicfn4lxygf710b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06e7371d703ffdc5b6ea555f2ed289e57e71e377/recipes/redprl"; @@ -60932,10 +61142,10 @@ }) {}; replace-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "replace-plus"; - version = "20170307.942"; + version = "20170731.2148"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/replace+.el"; - sha256 = "0bbqmgz4grbg9g4kd5c85wn1icfgqapdkb2v7jmqwg4mc8s7piv5"; + sha256 = "0fj2kkvilgrz0ih08issdrq8wbswcxs8af1jv50zx7lfyjpix2s3"; name = "replace+.el"; }; recipeFile = fetchurl { @@ -61141,12 +61351,12 @@ restclient = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "restclient"; - version = "20170715.440"; + version = "20170727.825"; src = fetchFromGitHub { owner = "pashky"; repo = "restclient.el"; - rev = "afcd8dbd6adc6f7cecea4e5489b5dfe392e7cd8c"; - sha256 = "1q3ipirc6prhgha23jy1w4kd2bmcj9qsy5d5q0q4qxmqnbzwlcpn"; + rev = "ef6d756e2013843f7afcbea42b69ad54aa5de518"; + sha256 = "0a44hyfi55khripys7spml7xnz8yp8v7cbj01q9q0vsips6gqpra"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/59303304fe1f724596245556dd90f6afffba425d/recipes/restclient"; @@ -61166,8 +61376,8 @@ src = fetchFromGitHub { owner = "pashky"; repo = "restclient.el"; - rev = "afcd8dbd6adc6f7cecea4e5489b5dfe392e7cd8c"; - sha256 = "1q3ipirc6prhgha23jy1w4kd2bmcj9qsy5d5q0q4qxmqnbzwlcpn"; + rev = "ef6d756e2013843f7afcbea42b69ad54aa5de518"; + sha256 = "0a44hyfi55khripys7spml7xnz8yp8v7cbj01q9q0vsips6gqpra"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/59303304fe1f724596245556dd90f6afffba425d/recipes/restclient-helm"; @@ -61304,27 +61514,6 @@ license = lib.licenses.free; }; }) {}; - revive = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "revive"; - version = "20150417.1555"; - src = fetchFromGitHub { - owner = "emacsmirror"; - repo = "revive"; - rev = "16e1ac7cfa2fdccddf60d4a0e15731fc7448d818"; - sha256 = "037sac5fvz6l2zgzlf8ykk4jf9zhj7ybzyz013jqzjj47a6sn1r1"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/965891688e94839e63fcc7c22dae317bb56d1ff6/recipes/revive"; - sha256 = "1l7c6zq3ga2k1488qb0hgxlk08p3vrcf0sx116c1f8z8nf4c8ny5"; - name = "revive"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/revive"; - license = lib.licenses.free; - }; - }) {}; reykjavik-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "reykjavik-theme"; @@ -61410,12 +61599,12 @@ rib-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rib-mode"; - version = "20170722.356"; + version = "20170726.748"; src = fetchFromGitHub { owner = "blezek"; repo = "rib-mode"; - rev = "4172e902fd66f235184c0eb6db7fd4a73dbd0866"; - sha256 = "0s9dyqv4yh0zxngay951g98g07029h51m4r2fc7ib2arw6srfram"; + rev = "97470158784c3c212e22e2c20b8471ee65ba59af"; + sha256 = "0hln0hympmxmsci82ivc2rw289j1bmgdxns96m1ng1bl668bwag7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c38c18f3eb75d559752fcd9956464fef890be728/recipes/rib-mode"; @@ -61788,12 +61977,12 @@ rtags = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rtags"; - version = "20170714.1944"; + version = "20170731.1057"; src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "afbf59630203624e0a5eecee52a3296295e6d620"; - sha256 = "0bygl7ahwsz6xmw0fif7gqnpzbk8cx7hpg4gp96f8inicq849z26"; + rev = "db1244c1c14514324474f362c857112e89bbf0c6"; + sha256 = "1fcrlxk9z11vbarznfcpfyqzvj6v3ydbn5z6vbdmgf9cxb52kfma"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/rtags"; @@ -61854,7 +62043,7 @@ version = "20161115.2259"; src = fetchsvn { url = "https://svn.ruby-lang.org/repos/ruby/trunk/misc/"; - rev = "59417"; + rev = "59459"; sha256 = "18fkx4a8jarznczv3h36663dqprwh6pyf76s3f210cqqy8c5y5yi"; }; recipeFile = fetchurl { @@ -62205,12 +62394,12 @@ rust-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rust-mode"; - version = "20170719.1308"; + version = "20170728.1006"; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust-mode"; - rev = "0985f5fde747f64b3fcff2661226aa4dad286e04"; - sha256 = "10mvrdv8cbdsynn4kxv06xm4r6syarmi858pdj6r2bysbp4w6cs8"; + rev = "09efc45dee786cb220c233426ddd82b26ad950eb"; + sha256 = "0rga8whnzhnz6a0n13bimrdjardzmn5h38d71gmvrs40kbs0350h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8f6e5d990d699d571dccbdeb13327b33389bb113/recipes/rust-mode"; @@ -62583,12 +62772,12 @@ sbt-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sbt-mode"; - version = "20170725.1332"; + version = "20170726.204"; src = fetchFromGitHub { owner = "ensime"; repo = "emacs-sbt-mode"; - rev = "3e8a75a5d48724ecd6c4171107e1b581100dfce1"; - sha256 = "14ng4xxld7c3x92bmcww74x724h4c466jd70wrl7hpjhg1z8xhn2"; + rev = "137845bffe904145c927a7f564bc9d6906e155ce"; + sha256 = "1q5d1ah178xq16945hni3gm8lp17hamnc2ac4jzshkj36gm1a9wq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/364abdc3829fc12e19f00b534565227dbc30baad/recipes/sbt-mode"; @@ -63021,12 +63210,12 @@ scrooge = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, thrift }: melpaBuild { pname = "scrooge"; - version = "20160718.1735"; + version = "20170728.1106"; src = fetchFromGitHub { owner = "cosmicexplorer"; repo = "emacs-scrooge"; - rev = "5e8a301919ec88a7aa48a9c66cafb1bddd9f6100"; - sha256 = "0ndv9j7n9z53f7q0w7cgb4wsh7vyb8f4bga723cm7j0gipx8fjnf"; + rev = "fb55c64eb2ae4db57b14bc99d2e411d81b2c5c2a"; + sha256 = "1hhbm7jmngv69l81vaj0fhpzkvw4sf7q5mdf9mm27mwd2jk70prl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7e3623181fa771dc94a7026eb58ac81fe9d9fc68/recipes/scrooge"; @@ -63253,8 +63442,8 @@ src = fetchFromGitHub { owner = "kiyoka"; repo = "sekka"; - rev = "b9b2ba5aca378ad12cb9e0f0ac537d695bd39937"; - sha256 = "1karh4pa190xmjbw1ai2f594i8nf9qa0lxybn3syif7r50ciym3c"; + rev = "17884d02d8aaf2478590ea13542f2954d1dc203b"; + sha256 = "04wqrkpihrgrw244baama1aaj1ih80w0001hw3xnbl6xnxsyvm4z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/350bbb5761b5ba69aeb4acf6d7cdf2256dba95a6/recipes/sekka"; @@ -64692,12 +64881,12 @@ skewer-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, simple-httpd }: melpaBuild { pname = "skewer-mode"; - version = "20170722.1745"; + version = "20170730.1241"; src = fetchFromGitHub { owner = "skeeto"; repo = "skewer-mode"; - rev = "cf8115d4e1ab5c2f990fb6d02a6c75d7d6b82a9e"; - sha256 = "1m0xbjbvfmy986isgxjm3kj4rzi6vsy4b1hlrbh4kpbjfj3p9sz0"; + rev = "7df248a4b7ec2eb0f3cabcbdfb052593d1f86590"; + sha256 = "07l90cqcngwy8vxx4yxx7i72lp10wzv44ypn07zwyrl69bcmf2q8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/10fba4f7935c78c4fc5eee7dbb161173dea884ba/recipes/skewer-mode"; @@ -64776,12 +64965,12 @@ slack = callPackage ({ alert, circe, emojify, fetchFromGitHub, fetchurl, lib, melpaBuild, oauth2, request, websocket }: melpaBuild { pname = "slack"; - version = "20170725.133"; + version = "20170731.25"; src = fetchFromGitHub { owner = "yuya373"; repo = "emacs-slack"; - rev = "2c756be071b8a8e69022daf606b849f53f211805"; - sha256 = "003i3snyjh47ckjny15g9isc5k0zhng2dvwmjxazfm4q3ka7p6ir"; + rev = "5858bd60b4adadf2a52825aef9a49021eba89477"; + sha256 = "1difrbzz0cfw48nabaglcqlpvsrd2zn24f6spfx0qh22rfhcz4qy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f0258cc41de809b67811a5dde3d475c429df0695/recipes/slack"; @@ -64818,12 +65007,12 @@ slim-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "slim-mode"; - version = "20140611.950"; + version = "20170728.648"; src = fetchFromGitHub { owner = "slim-template"; repo = "emacs-slim"; - rev = "869c84821cf3e556b380c5c35d8ad62287c4df58"; - sha256 = "0vgyc2ny9qmn8f5r149y4g398mh4gnwsp4yim85z4vmdikqg8vi1"; + rev = "3636d18ab1c8b316eea71c4732eb44743e2ded87"; + sha256 = "1sqylm6ipmlh9249mmwfb16b4pv94cvzdwvi3zakdpz713phyjw5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6a3b59bdbc53d7c0b4c4d6434689f7aab2546678/recipes/slim-mode"; @@ -65987,6 +66176,27 @@ license = lib.licenses.free; }; }) {}; + snoopy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "snoopy"; + version = "20170730.1951"; + src = fetchFromGitHub { + owner = "anmonteiro"; + repo = "snoopy-mode"; + rev = "8adce636376812df99bd79f3fbb3d9ec19a02351"; + sha256 = "04sq37bpvg6lqsqmjvdm9jzwrq4xhbakfzl5b2rcm3mlhzwnhs88"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/4a882cd92964ac195a09469006c9a44dc202f000/recipes/snoopy"; + sha256 = "1wa8jykqyj6rxqfhwbiyli6yh8s7n0pqv7fc9sfaymarda93zbgi"; + name = "snoopy"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/snoopy"; + license = lib.licenses.free; + }; + }) {}; socyl = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, s }: melpaBuild { pname = "socyl"; @@ -66501,12 +66711,12 @@ spacemacs-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "spacemacs-theme"; - version = "20170713.1156"; + version = "20170731.845"; src = fetchFromGitHub { owner = "nashamri"; repo = "spacemacs-theme"; - rev = "b26162e8974c532b3241a43c8f194a340636e9ea"; - sha256 = "0wxn7diy0pw0iwf3pxvr1yg2h7svrkyna0pgpkyipz3z1chd6h49"; + rev = "5bcac14ab4b99bc3bef20fd62ef981c4590c4021"; + sha256 = "0xx22mf4wskn9gv04farwyp3mpx2ab3lsmmxvd3k00x99637x6jq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6c8ac39214856c1598beca0bd609e011b562346f/recipes/spacemacs-theme"; @@ -66585,12 +66795,12 @@ sparql-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sparql-mode"; - version = "20170718.329"; + version = "20170731.542"; src = fetchFromGitHub { owner = "ljos"; repo = "sparql-mode"; - rev = "b2216118167d9294ff43326b3b57fa72b20e1f76"; - sha256 = "055lq7hc9i44w21j37a0p1bm4vd40vbp4yyliaw8v6a7vg9jwhs0"; + rev = "25de49d5f587985d92c7fb56247d86fe06d53f0e"; + sha256 = "0y2z6n18xrfi9g2ar0xm825j39qwsydpndilk40gncwz0civd4fa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c3d729130a41903bb01465d0f01c34fbc508b56e/recipes/sparql-mode"; @@ -66625,12 +66835,12 @@ speech-tagger = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "speech-tagger"; - version = "20160224.2"; + version = "20170728.1129"; src = fetchFromGitHub { owner = "cosmicexplorer"; repo = "speech-tagger"; - rev = "60ce97b0fc34eb32f507957646679fff77b5f0fd"; - sha256 = "0v4v2nr680zgljr9k7rgf7mhy49bv5ixc8ksba3g1bbrz0qv5ny6"; + rev = "61955b40d4e8b09e66a3e8033e82893f81657c06"; + sha256 = "07rgs1f9z2ayphv04jdjk9v1s2s47qvksf64z6qn1zss2alc0y0v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/db80aa5d95846ee02a9d762aa68325ab5e37dcf7/recipes/speech-tagger"; @@ -67041,27 +67251,6 @@ license = lib.licenses.free; }; }) {}; - sql-mssql = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "sql-mssql"; - version = "20160512.137"; - src = fetchFromGitHub { - owner = "tumashu"; - repo = "sql-mssql"; - rev = "f8a7f16720fbc7480a7ae83e21958860f66c1ccf"; - sha256 = "02jsz69j1mi082s0xfk99qrm6wskdfz20na3jc7c35f564l493hs"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/f4df28e4f5fe01a7c4e02744c4a335047779fe1d/recipes/sql-mssql"; - sha256 = "15z60d2244mxhigr52g332qzjj5ygqyl1i6c19q6vfv2z2vcvy7x"; - name = "sql-mssql"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://melpa.org/#/sql-mssql"; - license = lib.licenses.free; - }; - }) {}; sqlite = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sqlite"; @@ -68061,12 +68250,12 @@ suggest = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, loop, melpaBuild, s }: melpaBuild { pname = "suggest"; - version = "20170703.1433"; + version = "20170730.306"; src = fetchFromGitHub { owner = "Wilfred"; repo = "suggest.el"; - rev = "59e140248a667127771aa7aa49ee0511c55e8817"; - sha256 = "0j0lrphg97lvyxlchgws7l0n0c76hxh6sbm0c98dvsnki6jgfj72"; + rev = "1c8a6ca6e135e7228d45247adee75f721f20ef64"; + sha256 = "0ld6ivnkrhj3rdlr54sg90i4pdkgvyma9mhpr52ni6ab4053mpyj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b9fd27e812549587dc2ec26bb58974177ff263ff/recipes/suggest"; @@ -68164,12 +68353,12 @@ suomalainen-kalenteri = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "suomalainen-kalenteri"; - version = "20170528.801"; + version = "20170801.126"; src = fetchFromGitHub { owner = "tlikonen"; repo = "suomalainen-kalenteri"; - rev = "d380321ce7b7a5650847a7866bd98226af51d4b4"; - sha256 = "1fcyh26zd7rpp0519kswgr9ps67flwwypw2ic3nwgjdhxb41kmzs"; + rev = "c702e33cb6e13cb28bd761844e95be112a3c04f3"; + sha256 = "13avc3ba6vhysmhrcxfpkamggfpal479gn7k9n7509dpwp06dv8h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/181adf1b16253481674663fd28b195172231b7da/recipes/suomalainen-kalenteri"; @@ -68439,8 +68628,8 @@ src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "112c5ba0df7deea11b3e91b5db3990d693eb5b72"; - sha256 = "0fcskn4v0rx5i04qr40wa8jggsswxxp8g8hk0s4sr447mxbiksbv"; + rev = "fc275339b57690d4157160ed22b7672d5382cbe7"; + sha256 = "1l5y83mx2qh8bz3f9fbbcpc474jis8aikqyilvkvnn932wkxlw8l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/swiper"; @@ -70044,10 +70233,10 @@ thing-cmds = callPackage ({ fetchurl, hide-comnt, lib, melpaBuild }: melpaBuild { pname = "thing-cmds"; - version = "20170331.1338"; + version = "20170726.1355"; src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/thing-cmds.el?revision=57"; - sha256 = "0zi7hbdb5w0lry09rdsxmb0kqnfp6s72kn0z5npfhvwalkcpywbq"; + url = "https://www.emacswiki.org/emacs/download/thing-cmds.el?revision=58"; + sha256 = "07z49csdlrf08h8d8p9n8j492r22s7wgpzjwafppbsm4mvgshmq9"; name = "thing-cmds.el"; }; recipeFile = fetchurl { @@ -70171,8 +70360,8 @@ src = fetchFromGitHub { owner = "apache"; repo = "thrift"; - rev = "5c302e02c40be558a21f3a82b53e527f7bec2ff2"; - sha256 = "0vm97r6ldd138mjdgz8g92grswfq6a20qyh1pn9sg2liygprabb2"; + rev = "ec2a252136cb864a9edb22ef895bd62ff29c53e1"; + sha256 = "1avsnlxmr12zbjfv82mg69031s64c1rff7yfbk12hzba93rndnlp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/857ab7e3a5c290265d88ebacb9685b3faee586e5/recipes/thrift"; @@ -70229,12 +70418,12 @@ tide = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, typescript-mode }: melpaBuild { pname = "tide"; - version = "20170720.2101"; + version = "20170729.2113"; src = fetchFromGitHub { owner = "ananthakumaran"; repo = "tide"; - rev = "1a1a378060a989589cb6129fa22cfbf3eeb5eab8"; - sha256 = "0c0hvqpg5fgcxlqadz9dsaca9chmnlf19q366rwk0a6vlcwjgb3a"; + rev = "6ad865937b7615652004ceca2e59c8ecfd737a9b"; + sha256 = "1krl4h20sr2yk2napqap1b5lm88vzzdy5162i5rf7l53scjdc8vr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a21e063011ebbb03ac70bdcf0a379f9e383bdfab/recipes/tide"; @@ -70997,8 +71186,8 @@ src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "circe"; - rev = "13c605e639194c3da0c2e685056fac685f8c76a0"; - sha256 = "0n7v0g332ml1ang2fjc8rjbi8h1f4bqazcqi8dlfn99vvv8kcd21"; + rev = "47bbcf4268602688f90c08ce64ec93226fc3f894"; + sha256 = "1bi9hc1xcg5zjlzlrjgg3pwkdr9krgsyd5y87z57mxzmpndlxadr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a2b295656d53fddc76cacc86b239e5648e49e3a4/recipes/tracking"; @@ -71098,12 +71287,12 @@ transmission = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }: melpaBuild { pname = "transmission"; - version = "20170723.1417"; + version = "20170730.2052"; src = fetchFromGitHub { owner = "holomorph"; repo = "transmission"; - rev = "509eb326bf6c2e329fb083e116dab6b407be33b5"; - sha256 = "1fzdk63qmkyah58hl4c9b1vksv8qijkmz326hzszldgm2zr9xnih"; + rev = "7a1af3d62e0b27e032b9c9219b97289c11b332ab"; + sha256 = "0sfq643pfdmfcidm8ji52fn987vf3zwk2v6drmw8p3qzjx2k1m7q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9ed7e414687c0bd82b140a1bd8044084d094d18f/recipes/transmission"; @@ -71203,12 +71392,12 @@ treemacs = callPackage ({ ace-window, cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pfuture, s }: melpaBuild { pname = "treemacs"; - version = "20170724.445"; + version = "20170729.834"; src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "treemacs"; - rev = "e550867a72359e4a6656b6055c5c3ea26a285499"; - sha256 = "138hsm4qs1srz2fp26v16rr233qc580wl7ix7wphkr1k1mwmw313"; + rev = "a28abd17d1f29b91892e67e6396a5bf88fd11b93"; + sha256 = "1nwm0dgk4fhxpsa2z6kqjagx8rw3l82z3lwcsv68wbmg1knbzvqw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a52c2770097fe8968bff7c31ac411b3d9b60972e/recipes/treemacs"; @@ -71228,8 +71417,8 @@ src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "treemacs"; - rev = "e550867a72359e4a6656b6055c5c3ea26a285499"; - sha256 = "138hsm4qs1srz2fp26v16rr233qc580wl7ix7wphkr1k1mwmw313"; + rev = "a28abd17d1f29b91892e67e6396a5bf88fd11b93"; + sha256 = "1nwm0dgk4fhxpsa2z6kqjagx8rw3l82z3lwcsv68wbmg1knbzvqw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a52c2770097fe8968bff7c31ac411b3d9b60972e/recipes/treemacs-evil"; @@ -71457,8 +71646,8 @@ src = fetchFromGitHub { owner = "ocaml"; repo = "tuareg"; - rev = "79bca7dc9254da190d821b504da4946df8c3d548"; - sha256 = "02zjjq3nmmawmialhj95bz032a3ycyvzl5sgp7g37l7q3l0s63bc"; + rev = "1af437337abe17afc95de7070fd242165529f556"; + sha256 = "0jjlb4i1vp5390v9w0dg4cc0l46jrxqphvw6b3wn1zy511r9q1jm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/01fb6435a1dfeebdf4e7fa3f4f5928bc75526809/recipes/tuareg"; @@ -71936,8 +72125,8 @@ src = fetchFromGitHub { owner = "marktran"; repo = "color-theme-ujelly"; - rev = "e3a343991c0175092f27665fce9474e240f3f1f7"; - sha256 = "0wmyym7aj0wr80ya1wif1ywmsy4pln4khyzcnfhd0xrp62pya2cv"; + rev = "3f9938f24d053ad21fbbc4773fc786f78a55d522"; + sha256 = "1x1ay6qwgmj9294shi8l7xr6x7sjrpdwrxgdjynzf4wwgl2ydz4p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/ujelly-theme"; @@ -73261,12 +73450,12 @@ vimish-fold = callPackage ({ cl-lib ? null, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "vimish-fold"; - version = "20170606.539"; + version = "20170730.2206"; src = fetchFromGitHub { owner = "mrkkrp"; repo = "vimish-fold"; - rev = "527a1d9b9e031713c29f12d1a82f1fdac50c5610"; - sha256 = "1k8m7b0h3qb5w0wvvjz8047xz71ljfj7kj4z5sv26rhsh5bsdb2s"; + rev = "e631352fbf910f692807afe38a2b6a7882a403a8"; + sha256 = "152w1wqxj7yzm3d12lknzz1aix4h8cb571sjns3m1s7azsr3vfbq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b4862b0a3d43f073e645803cbbf11d973a4b51d5/recipes/vimish-fold"; @@ -74622,8 +74811,8 @@ src = fetchFromGitHub { owner = "foretagsplatsen"; repo = "emacs-js"; - rev = "ec98973a39d32d7c5d908d61383def5c50fa867d"; - sha256 = "1pf3sa1xfszaakfcjfllhqc624vmxxgy1g5mksbb36d7jjzx0jcb"; + rev = "e9e61170f98bfde12b49b750966a826c0c72f848"; + sha256 = "1s9jysl6gql0fnngm4mwqclbw99502dkrvakz3wxh37c7mf5g9r2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/78d7a15152f45a193384741fa00d0649c4bba91e/recipes/widgetjs"; @@ -74826,12 +75015,12 @@ window-number = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "window-number"; - version = "20141106.1829"; + version = "20170731.1851"; src = fetchFromGitHub { owner = "nikolas"; repo = "window-number"; - rev = "1d222f0b48c8d51bad956c3000ff0635b883a355"; - sha256 = "0n6a4kriwx7c8shvns3fcdp8l1i66bsca5mgd00p7nllnxvldhn3"; + rev = "d41722de646ffeb3f70d26e4a86a5a1ba5c6be87"; + sha256 = "1ifs7zp8c5m9da5dz0y4cq7pgqgdkz63v00ib07xdycnfjp4w17i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/74523af6e22ebae2f5fe7c4da4e8af8fac5fa074/recipes/window-number"; @@ -74995,8 +75184,8 @@ version = "20160419.1232"; src = fetchhg { url = "https://bitbucket.com/ArneBab/wisp"; - rev = "1ab8f296baeb"; - sha256 = "02g34b7kp3lkv4sfgf1762vlmmsnxib37v8385lmv90ww24lwggg"; + rev = "70b4ccc031bc"; + sha256 = "1mbypvclk83lhwvdy6ancl4j9nysv47s8yp6baa8pi54zlc9w3i1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/wisp-mode"; @@ -75033,12 +75222,12 @@ with-editor = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "with-editor"; - version = "20170707.1401"; + version = "20170730.314"; src = fetchFromGitHub { owner = "magit"; repo = "with-editor"; - rev = "791f985f63abe7f10de3fbd6fd49f9efac05a285"; - sha256 = "0nh12j3bf247q1ikb2apcpbx8nxvvi9rpj4fbsjbnrs0v65n0v4v"; + rev = "5cddefaff6aa0fa8ce2a0fa23900687c07d87481"; + sha256 = "11fsaam88xj8aambiacsmcgn1mjfkx3mm7y74lnnwcslbrmj977a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8c52c840dc35f3fd17ec660e113ddbb53aa99076/recipes/with-editor"; @@ -75075,12 +75264,12 @@ with-simulated-input = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, seq }: melpaBuild { pname = "with-simulated-input"; - version = "20170723.941"; + version = "20170729.1252"; src = fetchFromGitHub { owner = "DarwinAwardWinner"; repo = "with-simulated-input"; - rev = "f0dbf2fdd99c6afe7ab2af83c94a4028e4af9c1c"; - sha256 = "03y3j0q2iy9mgm0yn4mnxkdwwda8jsy6rsm0qdzha8gq4cdcqrjj"; + rev = "7f37451dcfbb1873f605e2a412d0585f5c3bed49"; + sha256 = "0s40mpy10fbdr2b241qa239zdh54gmqk4j9pigqm1zlzi9d5msan"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e4ddf16e19f5018106a423327ddc7e7499cf9248/recipes/with-simulated-input"; @@ -75205,8 +75394,8 @@ src = fetchFromGitHub { owner = "gromnitsky"; repo = "wordnut"; - rev = "bcdb86f1f7ee91f721a427b19492ee9578ae74fc"; - sha256 = "0p8nl5ccic8jx0dzy2976v5mkwb5sq4165qnhq4i26741qbalb62"; + rev = "6e223dced5b865e9d38af6f9b7e57b3a56d362bb"; + sha256 = "1w4037jplkl8sr6b7qj4cb5qcrjwz6vnfxfshdjimilwgc3ihs16"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/321c5e171eb4da85980968ac3c8ef4300101c0b1/recipes/wordnut"; @@ -75432,12 +75621,12 @@ wsd-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "wsd-mode"; - version = "20160930.236"; + version = "20170731.837"; src = fetchFromGitHub { owner = "josteink"; repo = "wsd-mode"; - rev = "cdbdf48f60900cedca2805a8b0875327a3a81f19"; - sha256 = "1ms30d1vz4nd90q6nypz5vixw1s3x6c68lm3l9zgq2ls6bw3kz93"; + rev = "566ae4b45b4a34b985f1b363d6cdbd463ab6aba6"; + sha256 = "0k30i1gq6ljxwf97f6nlz8b6blh6hg0b4syfx64lzf0zc22di2l4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/wsd-mode"; @@ -75621,12 +75810,12 @@ xah-find = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-find"; - version = "20170713.624"; + version = "20170729.1407"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-find"; - rev = "d5f12b6185af9674d236a758df16649bfafadf2c"; - sha256 = "19cg18gh18pp1z862aykfhn44vhnbggr32rrs7smy33nq2h6q512"; + rev = "5eaa02e28c4496bbf898271401005a694176a2d3"; + sha256 = "0wdlc3d4ciyhc2nnnvfp0bdvar4486rcqfkj9czjb6v6jax3farx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1d94ffd9c3380cd56770f253e43d566a95083e37/recipes/xah-find"; @@ -75642,12 +75831,12 @@ xah-fly-keys = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-fly-keys"; - version = "20170725.1253"; + version = "20170729.1310"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-fly-keys"; - rev = "7f884f13d01a5914e0201d58eef7275a6f884cae"; - sha256 = "1sgh3mk7f1p92jmzcga67bcc4s6ciipc7ga1biav0r3nqfk087jy"; + rev = "636d4be0adf234ace22ee236b66b7b9ce81cff54"; + sha256 = "1kqy10y7bqza4y7fj5n0vg536hksjzjbd2r3n36dij27k8n996dm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fc1683be70d1388efa3ce00adc40510e595aef2b/recipes/xah-fly-keys"; @@ -75873,12 +76062,12 @@ xml-plus = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xml-plus"; - version = "20160210.1942"; + version = "20170727.1651"; src = fetchFromGitHub { owner = "bddean"; repo = "xml-plus"; - rev = "1b728dda31dd13506aa4e1220f925bb43c93847b"; - sha256 = "0c30xh7qxg3y2p5jqkbssz5z53rx0yp64qqyy9f87qzgkcd2jd8k"; + rev = "232fa863c08fc159b21dd58c39ea45dce3334895"; + sha256 = "0b7v59dya346ds1wad0avrqhjimx5n9r3pcgqafagzf34hdcv3jy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/244388d158efda6fe8c1362a65b89b352c444422/recipes/xml+"; @@ -76297,8 +76486,8 @@ src = fetchFromGitHub { owner = "drdv"; repo = "yahtzee"; - rev = "d0671b315a8411ec299af63742813783e3eff04d"; - sha256 = "1a9rc2k4rah80hmwwmk8ca8k0s2812qsigci072lvc8x49smylld"; + rev = "69c4e154f9335750ab8658a00577952930138a79"; + sha256 = "166zhipzsv2v2qlxglmxr8a0syi5aq2rrh8sxs6n4wmnpgcfglhg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/200169fdabce0ae3a2ecb6f4f3255c15ec3ed094/recipes/yahtzee"; @@ -76335,12 +76524,12 @@ yaml-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yaml-mode"; - version = "20170406.241"; + version = "20170727.1531"; src = fetchFromGitHub { owner = "yoshiki"; repo = "yaml-mode"; - rev = "64b28913bfe910b147d6ee16488dbaedb1452ca6"; - sha256 = "0c4c9qa8avqnkd0qp88wdc1jpp674bghma4x0bvbi147g224ybp7"; + rev = "28c34033194130d452d5c958b5241c88d42ca02b"; + sha256 = "1m3fr19sfkr7d94qzqkl7x1jmhpar2hnhq6mjscd3lfcqkifh6kv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/yaml-mode"; @@ -77344,11 +77533,11 @@ zpresent = callPackage ({ dash, emacs, fetchhg, fetchurl, lib, melpaBuild, org-parser, request }: melpaBuild { pname = "zpresent"; - version = "20170724.2249"; + version = "20170730.2055"; src = fetchhg { url = "https://bitbucket.com/zck/zpresent.el"; - rev = "620afddbc133"; - sha256 = "1cjnig9x8xsdjyxdp3wmc8dhp050xzqvi8ca0hrd1fgwzgvg0wvv"; + rev = "bddebd64d652"; + sha256 = "1q7rhcsxr66fmhwmpbw35y8gdvlbfisvjy4xmh455ajy3126zyp2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3aae38ad54490fa650c832fb7d22e2c73b0fb060/recipes/zpresent"; diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix index 0796c41d749d..434e4384738a 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix @@ -611,12 +611,12 @@ ac-rtags = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild, rtags }: melpaBuild { pname = "ac-rtags"; - version = "2.11"; + version = "2.12"; src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "942ae6faa64ab6de73d093e628bc5b036f1a967c"; - sha256 = "19ljfz95jwbgw35d3y0m0p3l4as5llwvc6q3v2jlv3xl3ihpd923"; + rev = "db1244c1c14514324474f362c857112e89bbf0c6"; + sha256 = "1fcrlxk9z11vbarznfcpfyqzvj6v3ydbn5z6vbdmgf9cxb52kfma"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ac-rtags"; @@ -4030,13 +4030,13 @@ version = "0.1"; src = fetchFromGitHub { owner = "tumashu"; - repo = "chinese-fonts-setup"; + repo = "cnfonts"; rev = "6f4423664e55d5470c4f239d04b88da5d6acb34d"; sha256 = "0d9xx43ijxrp95j5bnxcsnfwn032ypy2c1lypak15772nk6i7s1w"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/c536882e613e83a4a2baf86479bfb3efb86d916a/recipes/chinese-fonts-setup"; - sha256 = "141ri6a6mnxf7fn17gw48kxk8pvl3khdxkb4pw8brxwrr9rx0xd5"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/0d5787ffeeee68ffa41f3e777071815084e0ed7a/recipes/chinese-fonts-setup"; + sha256 = "0fqj721zk57641wxnmk82wsj08ycnzj61z9i34x58d7c0k3424w1"; name = "chinese-fonts-setup"; }; packageRequires = [ cl-lib ]; @@ -4045,69 +4045,27 @@ license = lib.licenses.free; }; }) {}; - chinese-pyim = callPackage ({ async, chinese-pyim-basedict, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pos-tip }: + chinese-pyim = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pyim }: melpaBuild { pname = "chinese-pyim"; - version = "1.5.3"; + version = "1.6.1"; src = fetchFromGitHub { owner = "tumashu"; - repo = "chinese-pyim"; - rev = "ed2ccea3d827084b3c80afbd5d7b9345f31243d1"; - sha256 = "03nvmrwvkadab9yp74d5msfxd01xjj1jhqxymisj6jnhgv421yi0"; + repo = "pyim"; + rev = "f4dacfbac11d6d58f1fcbf766691e03b6983a9f6"; + sha256 = "0dy0y159fqcip805l86gmjbsgbcvj3hm5rfsc6slinmxsrl4nl9l"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/157a264533124ba05c161aa93a32c7209f002fba/recipes/chinese-pyim"; - sha256 = "0zdx5zhgj1ly89pl48vigjzd8g74fxnxcd9bxrqykcn7y5qvim8l"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/151a0af91a58e27f724854d85d5dd9668229fe8d/recipes/chinese-pyim"; + sha256 = "0chh4vnb2gh6ckf01w7xd1kw4454p1vkzmy17dvm0c7269rya9mn"; name = "chinese-pyim"; }; - packageRequires = [ async chinese-pyim-basedict cl-lib popup pos-tip ]; + packageRequires = [ pyim ]; meta = { homepage = "https://melpa.org/#/chinese-pyim"; license = lib.licenses.free; }; }) {}; - chinese-pyim-basedict = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "chinese-pyim-basedict"; - version = "0.1"; - src = fetchFromGitHub { - owner = "tumashu"; - repo = "chinese-pyim-basedict"; - rev = "f13b6d20629a0b691ead626cca249b227622fa83"; - sha256 = "1ddld5jkhqarm31p6qjdvdha36k6yqaz3jzg3lyzd0nkavcmdq57"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/e2315ffe7d13928eddaf217a5f67a3e0dd5e62a1/recipes/chinese-pyim-basedict"; - sha256 = "1qmr71lnpn06mcbb6gfr3dh78pav0sk9mld956cvnkg82vg7nmpv"; - name = "chinese-pyim-basedict"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/chinese-pyim-basedict"; - license = lib.licenses.free; - }; - }) {}; - chinese-pyim-greatdict = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "chinese-pyim-greatdict"; - version = "0.1"; - src = fetchFromGitHub { - owner = "tumashu"; - repo = "chinese-pyim-greatdict"; - rev = "11cf5145710349e9d928eb9197bebb426025fd58"; - sha256 = "1pza690b31ynyj31f1gp7y2d29ri3swcblpzd2pcpj3ynmnbsy3f"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/03234f7a1abe7423c5a9bcb4c100957c8eece351/recipes/chinese-pyim-greatdict"; - sha256 = "1xqr2fcsb45khavqx06ry2sm8db790zlggk61civbdyafvlz8ikc"; - name = "chinese-pyim-greatdict"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/chinese-pyim-greatdict"; - license = lib.licenses.free; - }; - }) {}; chinese-word-at-point = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "chinese-word-at-point"; @@ -5326,12 +5284,12 @@ company-rtags = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rtags }: melpaBuild { pname = "company-rtags"; - version = "2.11"; + version = "2.12"; src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "942ae6faa64ab6de73d093e628bc5b036f1a967c"; - sha256 = "19ljfz95jwbgw35d3y0m0p3l4as5llwvc6q3v2jlv3xl3ihpd923"; + rev = "db1244c1c14514324474f362c857112e89bbf0c6"; + sha256 = "1fcrlxk9z11vbarznfcpfyqzvj6v3ydbn5z6vbdmgf9cxb52kfma"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/company-rtags"; @@ -5893,12 +5851,12 @@ cricbuzz = callPackage ({ dash, enlive, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "cricbuzz"; - version = "0.2.9"; + version = "0.2.10"; src = fetchFromGitHub { owner = "lepisma"; repo = "cricbuzz.el"; - rev = "05087b0f6d5a941b5ec18acc8bcf20efd6d71568"; - sha256 = "1zin191dcr6qli2cwgf6jjz2dvlxiaranglpc5365bkkvwb5f250"; + rev = "62c86b1aa6e0779c4f6d8fb9d31d75bf81994f69"; + sha256 = "1k8n65scj3frafy1fk25j3kzpp0q8r98ydibryv48izndpck03h3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/cricbuzz"; @@ -5998,16 +5956,16 @@ csound-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, multi, shut-up }: melpaBuild { pname = "csound-mode"; - version = "0.1.1"; + version = "0.1.2"; src = fetchFromGitHub { owner = "hlolli"; repo = "csound-mode"; - rev = "e3fbb1fecd730fd66893cadf41c2cb8c2d9c1685"; - sha256 = "105hhn5f5ml32i3iwrm2d2ikx9lb96m3lsg9v9i72713mayvkqan"; + rev = "877c7c9d5bdc6a2acf4ac1a10e9e24ba1bd3cc76"; + sha256 = "1vsngs42n8xp72701ppvmwyy6b90vnj39fq12yvp7x9zqf29lmq1"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/95ccfae76a2c0f627f6d218ca68072e79fcfd088/recipes/csound-mode"; - sha256 = "15zmgsh1071cyd9a0d7cljq8k7d8l2gkjjpv8z22gnm0wfbb0yys"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/c940d29de11e43b4abf2901c466c94d426a21818/recipes/csound-mode"; + sha256 = "047a78nhkn6qycsz8w9a0r1xyz5wyf4rds3z5yx9sn5wkv54w95d"; name = "csound-mode"; }; packageRequires = [ emacs multi shut-up ]; @@ -7323,22 +7281,22 @@ license = lib.licenses.free; }; }) {}; - docker-compose-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + docker-compose-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, yaml-mode }: melpaBuild { pname = "docker-compose-mode"; - version = "0.1"; + version = "0.2.1"; src = fetchFromGitHub { owner = "meqif"; repo = "docker-compose-mode"; - rev = "85cf81d2964c7b721a7f1317cf9efd5bf3a7f671"; - sha256 = "1l0pcmjhvayfx1hn4125ilhr3lb4rzhrqrf91lnkh7m1rv3npcik"; + rev = "a38b64aecd037556c91d9aef29f1d04496295f2b"; + sha256 = "140rbh5n1mqckjy652bp7mj08ylk8q1hr3ajl1cpyc00rniqwfds"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9d74905aa52aa78bdc8e96aa3b791c3d2a70965f/recipes/docker-compose-mode"; sha256 = "094r2mqxmll5dqbjhhdfg60xs9m74qn22lz475692k48ma5a7gd0"; name = "docker-compose-mode"; }; - packageRequires = [ dash emacs ]; + packageRequires = [ dash emacs yaml-mode ]; meta = { homepage = "https://melpa.org/#/docker-compose-mode"; license = lib.licenses.free; @@ -7850,12 +7808,12 @@ easy-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "easy-hugo"; - version = "1.3.1"; + version = "1.5.5"; src = fetchFromGitHub { owner = "masasam"; repo = "emacs-easy-hugo"; - rev = "468352a0a813c5ce8edba71c82f00e24b516d74c"; - sha256 = "0sryibflylwy8pqp80xyxmdndk2idcgpgk9zxixwpim3mcwn78yl"; + rev = "b656f1e3e1eaef01990b6c946a6f522538f76d19"; + sha256 = "0bni2j8kcad85h2rgv8nmp5xv2mz32d5nwbmg0v9dy5m12g452md"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/easy-hugo"; @@ -8288,6 +8246,27 @@ license = lib.licenses.free; }; }) {}; + eg = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "eg"; + version = "1.0"; + src = fetchFromGitHub { + owner = "davep"; + repo = "eg.el"; + rev = "66c7bfd84151cac093090834919a615d5f824b42"; + sha256 = "0pk8rvfdybkkrxb80yhj831gr3sj075gair9g7p60jfnyxwsgqw2"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/3d2b6b92b2a71486f260571885bf149ad6afc551/recipes/eg"; + sha256 = "1ic6qzk0zmay3vvbb8jg35irqkc0k68dmgbq4j9isiawy449zvp7"; + name = "eg"; + }; + packageRequires = [ cl-lib emacs ]; + meta = { + homepage = "https://melpa.org/#/eg"; + license = lib.licenses.free; + }; + }) {}; egg = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "egg"; @@ -8559,6 +8538,27 @@ license = lib.licenses.free; }; }) {}; + el2org = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "el2org"; + version = "0.5.0"; + src = fetchFromGitHub { + owner = "tumashu"; + repo = "el2org"; + rev = "c85837d56ed8fe1b31927755294db49ac46f443e"; + sha256 = "0znnvpngghd9z8a0cakpvrw261mnmxqa15lpjcxfm7w8wgb2d4f6"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/el2org"; + sha256 = "02kyvzpjws2mrp414i4zm4fmrnzgkaax6bnrlyhp17a8aqaggbnh"; + name = "el2org"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/el2org"; + license = lib.licenses.free; + }; + }) {}; eldoc-eval = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eldoc-eval"; @@ -8877,12 +8877,12 @@ elpy = callPackage ({ company, fetchFromGitHub, fetchurl, find-file-in-project, highlight-indentation, lib, melpaBuild, pyvenv, s, yasnippet }: melpaBuild { pname = "elpy"; - version = "1.15.1"; + version = "1.16.0"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "elpy"; - rev = "55ee3d57872c87cb640abd5d63ac1887f9e8dc5d"; - sha256 = "0866l17sqq2p7bla2krg10y70wgsxf158kashcgschfr0h2f7r1i"; + rev = "c33794ae03fa787c7f93b93cc9427d864b63e25f"; + sha256 = "1q8zjsl9zbgwqcbvzkdlqy28z4h1qr0kkhhrq037vab0w0l0zi6l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1d8fcd8745bb15402c9f3b6f4573ea151415237a/recipes/elpy"; @@ -8944,27 +8944,6 @@ license = lib.licenses.free; }; }) {}; - elscreen-persist = callPackage ({ elscreen, fetchFromGitHub, fetchurl, lib, melpaBuild, revive }: - melpaBuild { - pname = "elscreen-persist"; - version = "0.2.0"; - src = fetchFromGitHub { - owner = "robario"; - repo = "elscreen-persist"; - rev = "652b4c738f92c518ead69343ebfcf66bc2a0254c"; - sha256 = "06g7fl2c7cvwsrgi462wf6j13ny56y6zvgkizz9f256xjjq77ymf"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/c30ec71dcc29d1d0fd6c54de512c8c4636a7e0a6/recipes/elscreen-persist"; - sha256 = "1rjfvpsx0y5l9b76wa1ilj5lx39jd0m78nb1a4bqn81z0rkfpl4k"; - name = "elscreen-persist"; - }; - packageRequires = [ elscreen revive ]; - meta = { - homepage = "https://melpa.org/#/elscreen-persist"; - license = lib.licenses.free; - }; - }) {}; elwm = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elwm"; @@ -9823,12 +9802,12 @@ erlang = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "erlang"; - version = "20.0.1"; + version = "20.0.2"; src = fetchFromGitHub { owner = "erlang"; repo = "otp"; - rev = "a01de6873844ba510084090abec734c4166d71fa"; - sha256 = "0bni9rchblp3n7lh07wq3rpf5xykh79jm6bl6f2dk2j24wwrhjqs"; + rev = "6ede2da826335960037299d9f3b0e66d072ea5a0"; + sha256 = "1zxfyd711l13n6xhspa8l0k4l7hb8aq1q1j2b2yrzw9k1hx2lfyj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang"; @@ -10263,12 +10242,12 @@ esup = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "esup"; - version = "0.5"; + version = "0.6"; src = fetchFromGitHub { owner = "jschaf"; repo = "esup"; - rev = "6faef1fe1b5ff2fb761722ef1972a16395d9a10b"; - sha256 = "18igz3gcdp42wk89y59d4gxkbv0zvs8i4lg1b0qsrf90knasfjc9"; + rev = "53355b13dc9f1636ba681ffff830162ebbd3b223"; + sha256 = "1a4b8390azimlrr5ayxvaks1w7009vfbm56q11ybx00xxrd26v43"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b9d2948a42da5d4864404d2d11a924a4f235fc3b/recipes/esup"; @@ -10326,12 +10305,12 @@ eval-in-repl = callPackage ({ ace-window, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, paredit }: melpaBuild { pname = "eval-in-repl"; - version = "0.9.4"; + version = "0.9.6"; src = fetchFromGitHub { owner = "kaz-yos"; repo = "eval-in-repl"; - rev = "674873139ebde439fbeecaf0fb217d54f470bc14"; - sha256 = "1fzsq6fkkrsxg6mimrnls0kn59rq7w332b94gg04j0khl61s1v1s"; + rev = "7e2b42570b449b2a3c2922f3036a027d1e393a60"; + sha256 = "0x97flv356kd7j6wbhacz0lmsrdd9as87b0n6nliq5n0y30my8dy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0bee5fb7a7874dd20babd1de7f216c5bda3e0115/recipes/eval-in-repl"; @@ -12180,12 +12159,12 @@ flycheck-julia = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-julia"; - version = "0.0.3"; + version = "0.1.1"; src = fetchFromGitHub { owner = "gdkrmr"; repo = "flycheck-julia"; - rev = "67cdef277741f06c884525636a1cf1349efebbb4"; - sha256 = "1qn2i643nbvb94vgdwc94himwh3z984cmg2fklvmlw8xyyxm7ny2"; + rev = "213b60a5a9a1cb7887260e1d159b5bb27167cbb6"; + sha256 = "0wk8mc8j67dmc3mxzrhypgxmyywwrjh5q5llj4m2mgf0j7yp2576"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e964e3c6f737d0102b4fd7440fa9d434e6382bf/recipes/flycheck-julia"; @@ -12366,6 +12345,27 @@ license = lib.licenses.free; }; }) {}; + flycheck-pycheckers = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: + melpaBuild { + pname = "flycheck-pycheckers"; + version = "0.1"; + src = fetchFromGitHub { + owner = "msherry"; + repo = "flycheck-pycheckers"; + rev = "3c89f455472b5a77e28129825bb801b464d96ca1"; + sha256 = "1fxbabxsdqm98vhs51k5z6prjkskjq2nsl9vsmlbwgjgyg4hx1xr"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/af36dca316b318d25d65c9e842f15f736e19ea63/recipes/flycheck-pycheckers"; + sha256 = "18ski3bp8x33589pc273i5ia3hffvlb4czrd97wkfgr4k59ww6yq"; + name = "flycheck-pycheckers"; + }; + packageRequires = [ flycheck ]; + meta = { + homepage = "https://melpa.org/#/flycheck-pycheckers"; + license = lib.licenses.free; + }; + }) {}; flycheck-rebar3 = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-rebar3"; @@ -12390,12 +12390,12 @@ flycheck-rtags = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, rtags }: melpaBuild { pname = "flycheck-rtags"; - version = "2.11"; + version = "2.12"; src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "942ae6faa64ab6de73d093e628bc5b036f1a967c"; - sha256 = "19ljfz95jwbgw35d3y0m0p3l4as5llwvc6q3v2jlv3xl3ihpd923"; + rev = "db1244c1c14514324474f362c857112e89bbf0c6"; + sha256 = "1fcrlxk9z11vbarznfcpfyqzvj6v3ydbn5z6vbdmgf9cxb52kfma"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/flycheck-rtags"; @@ -13572,12 +13572,12 @@ fxrd-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "fxrd-mode"; - version = "0.8"; + version = "1.0"; src = fetchFromGitHub { owner = "msherry"; repo = "fxrd-mode"; - rev = "8a1a0d5a08527ec8dee9bbe135803ed7ad297d9d"; - sha256 = "1yzw0fnlqilpx4xl84hpr75l86y9iiqyh13r1hskmwb79s2niw1m"; + rev = "795b969346982b75e24b5c8619b46197982fbb4d"; + sha256 = "0aha13vqj6ygyr7bflrxll837g4z6wrmrhh5rhcd0vphqg70frgn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/796eb6b2126ec616c0de6af6abb7598900557c12/recipes/fxrd-mode"; @@ -13889,14 +13889,14 @@ pname = "ghub"; version = "1.2.0"; src = fetchFromGitHub { - owner = "tarsius"; + owner = "magit"; repo = "ghub"; rev = "da60fa2316bf829cab18676afd5a43088ac06b60"; sha256 = "0aj0ayh4jvpxwqss5805qnklqbp9krzbh689syyz65ja6r0r2bgs"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/9375cbae3ffe5bf4ba5606358860050f3005d9b7/recipes/ghub"; - sha256 = "01kzziqv5y798rps52w45kkdcn0shhb6mrina2iawab4rlvlmnd8"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/d5db83957187c9b65f697eba7e4c3320567cf4ab/recipes/ghub"; + sha256 = "15kjyi8ialpr1zjqvw68w9pa5sigcwy2szq21yvcy295z7ylzy4i"; name = "ghub"; }; packageRequires = [ emacs ]; @@ -14493,6 +14493,27 @@ license = lib.licenses.free; }; }) {}; + gitpatch = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "gitpatch"; + version = "0.5.0"; + src = fetchFromGitHub { + owner = "tumashu"; + repo = "gitpatch"; + rev = "577d5adf65c8133caa325c10e89e1e2fc323c907"; + sha256 = "1jj12pjwza6cq8a3kr8nqnmm3vxs0wam8h983irry4xr4ifywsn4"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/e1746d87f65dc4b0d8f47c7d6ba4c7e0dfa35953/recipes/gitpatch"; + sha256 = "0qaswkk06z24v40nkjkv7f6gfv0dlsjd6wchkn0ppqw95883vhv1"; + name = "gitpatch"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/gitpatch"; + license = lib.licenses.free; + }; + }) {}; gitter = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }: melpaBuild { pname = "gitter"; @@ -17381,12 +17402,12 @@ helm-rtags = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, rtags }: melpaBuild { pname = "helm-rtags"; - version = "2.11"; + version = "2.12"; src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "942ae6faa64ab6de73d093e628bc5b036f1a967c"; - sha256 = "19ljfz95jwbgw35d3y0m0p3l4as5llwvc6q3v2jlv3xl3ihpd923"; + rev = "db1244c1c14514324474f362c857112e89bbf0c6"; + sha256 = "1fcrlxk9z11vbarznfcpfyqzvj6v3ydbn5z6vbdmgf9cxb52kfma"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/helm-rtags"; @@ -18872,12 +18893,12 @@ imenu-list = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "imenu-list"; - version = "0.7"; + version = "0.8"; src = fetchFromGitHub { owner = "bmag"; repo = "imenu-list"; - rev = "999fc0ec7f03b56be8e2a6e673d9473f51e5a92f"; - sha256 = "0py4sc5a5hjdijavymjmvipkm9z4jy1l8yb35d8rl7mfzr5cz3l7"; + rev = "27170d27c9594989587c03c23f753a809f6a0e10"; + sha256 = "13xh9bdl3k6ccfq83wjmkpi4269qahv4davki4wq18dr4amrzhlx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/86dea881a5b2d0458449f08b82c2614ad9abd068/recipes/imenu-list"; @@ -19669,12 +19690,12 @@ ivy-rtags = callPackage ({ fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, rtags }: melpaBuild { pname = "ivy-rtags"; - version = "2.11"; + version = "2.12"; src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "942ae6faa64ab6de73d093e628bc5b036f1a967c"; - sha256 = "19ljfz95jwbgw35d3y0m0p3l4as5llwvc6q3v2jlv3xl3ihpd923"; + rev = "db1244c1c14514324474f362c857112e89bbf0c6"; + sha256 = "1fcrlxk9z11vbarznfcpfyqzvj6v3ydbn5z6vbdmgf9cxb52kfma"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ivy-rtags"; @@ -21435,6 +21456,26 @@ license = lib.licenses.free; }; }) {}; + lms = callPackage ({ emacs, fetchhg, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "lms"; + version = "0.6"; + src = fetchhg { + url = "https://bitbucket.com/inigoserna/lms.el"; + rev = "5f20620f62a1"; + sha256 = "04wi14x2y2cb8ps3nzq4g0ryvqm40jh727jm44knlqfrx15imkw9"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/b8be8497494b8543a8257c9ea92444baf7674951/recipes/lms"; + sha256 = "1ckrh6qbh5y2y3yzl2iyq8nqlpy4qp6vzc72ijcgayvcflb01vr1"; + name = "lms"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/lms"; + license = lib.licenses.free; + }; + }) {}; load-relative = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "load-relative"; @@ -21582,22 +21623,22 @@ license = lib.licenses.free; }; }) {}; - love-minor-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + love-minor-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, lua-mode, melpaBuild }: melpaBuild { pname = "love-minor-mode"; - version = "1.1"; + version = "1.2"; src = fetchFromGitHub { owner = "ejmr"; repo = "love-minor-mode"; - rev = "1634ff3a8b657c63a5cffd9a937812a289f2c954"; - sha256 = "11y5jyq4xg9zlm1qi2y97nh05vhva9pai9yyr4x2pr41xz3s8fpk"; + rev = "3ca8f3405338f2d6f4fbcdd5e89342a46378543a"; + sha256 = "1hwm7yxbwvb27pa35cgcxyjfjdjhk2a33i417q2akc7vppdbcmzh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0f224c4c7519b3668b1270c957227e486896b7b6/recipes/love-minor-mode"; sha256 = "1skg039h2hn8dh47ww6n9l776s2yda8ariab4v9f56kb21bncr4m"; name = "love-minor-mode"; }; - packageRequires = []; + packageRequires = [ lua-mode ]; meta = { homepage = "https://melpa.org/#/love-minor-mode"; license = lib.licenses.free; @@ -22628,12 +22669,12 @@ merlin = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "merlin"; - version = "3.0.0"; + version = "3.0.1"; src = fetchFromGitHub { owner = "the-lambda-church"; repo = "merlin"; - rev = "957e551140587f0cd83d9186a06fba10a38c6084"; - sha256 = "1df6cx7y5i35cmfi5c4b48iys21cszrvlh039cdbkmy6d0pdbvi7"; + rev = "803dfd048c97f9fc16148d6b8ca116a281e8b537"; + sha256 = "10ba2zrivllzp5rl77hsd06pgw7s42s7hsvfdvx01482xf22b7lb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b1b9bfd3164e62758dc0a3362d85c6627ed7cbf8/recipes/merlin"; @@ -22730,27 +22771,6 @@ license = lib.licenses.free; }; }) {}; - mic-paren = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "mic-paren"; - version = "3.10"; - src = fetchFromGitHub { - owner = "emacsmirror"; - repo = "mic-paren"; - rev = "e4cf6e1a0ee91e849a9d42ecdcd6ed0287f8a521"; - sha256 = "1cdjpqrsv2vhpdmv67krsds7wz19z9ajkabawr3yhxqii4myl4ik"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/0fda2b54a0ff0b6fc3bd6d20cfcbbf63cae5380f/recipes/mic-paren"; - sha256 = "042dzp0nal18nxq94qlwwksh0nnypsyc0yykmc6l3kayp9pv4hw7"; - name = "mic-paren"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/mic-paren"; - license = lib.licenses.free; - }; - }) {}; migemo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "migemo"; @@ -24199,11 +24219,11 @@ }) {}; notmuch = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "notmuch"; - version = "0.25pre0"; + version = "0.25"; src = fetchgit { url = "git://git.notmuchmail.org/git/notmuch"; - rev = "952a0f0cda7d1a12432d1c9ad71b41401cb1615c"; - sha256 = "1mj3946sg2lxamcz16jkys88scx1fyhky3amwxnl5iszd15lhvxz"; + rev = "9f648dfbb8e253dab1bc4a0e761ad46cec405f4d"; + sha256 = "17b2rwvfq5zqm4cw8zqqzns8jjld3bpb25ca4133ckgkwach4v1d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch"; @@ -24450,12 +24470,12 @@ ob-blockdiag = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ob-blockdiag"; - version = "20170501.112"; + version = "20170728.113"; src = fetchFromGitHub { owner = "corpix"; repo = "ob-blockdiag.el"; - rev = "e6532af46dcea8e79f3ad3cb2863cbbe516efbf6"; - sha256 = "059jcl1qpfxwsykbj1sf7r1fpg7wix4fbdhhghrhbhgf5w165hsv"; + rev = "634fcf64a4ae735afe7001d865b03f5d71e23046"; + sha256 = "0xr3bv4wxz13b1grfyl2qnrszzab3n9735za837nf4lxh527ksaj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/261b77a3fd07644d1c250b16857de70cc1bbf478/recipes/ob-blockdiag"; @@ -25172,6 +25192,27 @@ license = lib.licenses.free; }; }) {}; + org-category-capture = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: + melpaBuild { + pname = "org-category-capture"; + version = "1.0.0"; + src = fetchFromGitHub { + owner = "IvanMalison"; + repo = "org-projectile"; + rev = "d72c56458bd3b0535fc97dccaa23bd85dead099f"; + sha256 = "0rn33pily979l7cmyr8az30kkv8yqdzvk3xwxjw4vivcbzrzd4j7"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/6760daac1ef9d9d7ba07e2fc9668873020f901f1/recipes/org-category-capture"; + sha256 = "0l5n71h9lc8q9k0sb5ghzwb81lah4l1ykc06shfl9zw5lqqvahav"; + name = "org-category-capture"; + }; + packageRequires = [ emacs org ]; + meta = { + homepage = "https://melpa.org/#/org-category-capture"; + license = lib.licenses.free; + }; + }) {}; org-commentary = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "org-commentary"; @@ -25590,27 +25631,48 @@ license = lib.licenses.free; }; }) {}; - org-projectile = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }: + org-projectile = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org-category-capture, projectile, s }: melpaBuild { pname = "org-projectile"; - version = "0.2.6"; + version = "1.0.0"; src = fetchFromGitHub { owner = "IvanMalison"; repo = "org-projectile"; - rev = "e2b78ca7fbd2e3b873d3ab9bb7196be4d7613f92"; - sha256 = "03zy2bb1ha22xpx29d8610yrqfyaiaa8vgplpx6bmixaw85mcv58"; + rev = "d72c56458bd3b0535fc97dccaa23bd85dead099f"; + sha256 = "0rn33pily979l7cmyr8az30kkv8yqdzvk3xwxjw4vivcbzrzd4j7"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org-projectile"; - sha256 = "1kkgi49bvdwz50x32lqdj2ii02mxv8i4dr1asr8zk6mdg0fwlqpf"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/9d7a7ab98f364d3d5e93f83f0cb3d80a95f28689/recipes/org-projectile"; + sha256 = "0xdkd5pkyi6yfqi4przgp5mpklyxfxv0cww285zdlh00rzl935cw"; name = "org-projectile"; }; - packageRequires = [ dash emacs projectile ]; + packageRequires = [ dash emacs org-category-capture projectile s ]; meta = { homepage = "https://melpa.org/#/org-projectile"; license = lib.licenses.free; }; }) {}; + org-projectile-helm = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, org-projectile }: + melpaBuild { + pname = "org-projectile-helm"; + version = "1.0.0"; + src = fetchFromGitHub { + owner = "IvanMalison"; + repo = "org-projectile"; + rev = "d72c56458bd3b0535fc97dccaa23bd85dead099f"; + sha256 = "0rn33pily979l7cmyr8az30kkv8yqdzvk3xwxjw4vivcbzrzd4j7"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/6760daac1ef9d9d7ba07e2fc9668873020f901f1/recipes/org-projectile-helm"; + sha256 = "0x79j5yr9wsgzjf1dpp7d4xiji8hgyhr79vb973an5z2r02vnaf4"; + name = "org-projectile-helm"; + }; + packageRequires = [ emacs helm org-projectile ]; + meta = { + homepage = "https://melpa.org/#/org-projectile-helm"; + license = lib.licenses.free; + }; + }) {}; org-protocol-jekyll = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-protocol-jekyll"; @@ -26969,13 +27031,13 @@ pname = "password-store"; version = "1.7.1"; src = fetchgit { - url = "http://git.zx2c4.com/password-store"; + url = "https://git.zx2c4.com/password-store"; rev = "38ec1c72e29c872ec0cdde82f75490640d4019bf"; sha256 = "04rqph353qfhnrwji6fmvrbk4yag8brqpbpaysq5z0c9l4p9ci87"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/e204fb4d672220ee1a4a49975fd3999916e60f8c/recipes/password-store"; - sha256 = "1jh24737l4hccr1k0b9fnq45ag2dsk84fnfs86hcgsadl94d6kss"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/ceff76206bd44d92c00adc931236c4ae15db5583/recipes/password-store"; + sha256 = "06l4xlvrjswy5kndn6h6swliqcp007nh4fyvma3jaac4f3x2qi65"; name = "password-store"; }; packageRequires = [ f s ]; @@ -28912,6 +28974,90 @@ license = lib.licenses.free; }; }) {}; + pyim = callPackage ({ async, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pos-tip, pyim-basedict }: + melpaBuild { + pname = "pyim"; + version = "1.6.1"; + src = fetchFromGitHub { + owner = "tumashu"; + repo = "pyim"; + rev = "f4dacfbac11d6d58f1fcbf766691e03b6983a9f6"; + sha256 = "0dy0y159fqcip805l86gmjbsgbcvj3hm5rfsc6slinmxsrl4nl9l"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/151a0af91a58e27f724854d85d5dd9668229fe8d/recipes/pyim"; + sha256 = "1ly4xhfr3irlrwvv20j3kyz98g7barridi9n8jppc0brh2dlv98j"; + name = "pyim"; + }; + packageRequires = [ async cl-lib emacs popup pos-tip pyim-basedict ]; + meta = { + homepage = "https://melpa.org/#/pyim"; + license = lib.licenses.free; + }; + }) {}; + pyim-basedict = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "pyim-basedict"; + version = "0.2"; + src = fetchFromGitHub { + owner = "tumashu"; + repo = "pyim-basedict"; + rev = "f71d0ffd9d2421f2b51cd0ccb89fd9eb43c09585"; + sha256 = "0576r8ap9gp91ycjf1d47pn13kxp0f9fysn09zlq44hr0s1y2y5d"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/151a0af91a58e27f724854d85d5dd9668229fe8d/recipes/pyim-basedict"; + sha256 = "1y8cmccli3im5bvws2h582z7k4nj6p8brgypl8h09y3na6yjy2z9"; + name = "pyim-basedict"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/pyim-basedict"; + license = lib.licenses.free; + }; + }) {}; + pyim-greatdict = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "pyim-greatdict"; + version = "0.2"; + src = fetchFromGitHub { + owner = "tumashu"; + repo = "pyim-greatdict"; + rev = "45fa4ff26f3444fb98c4dea460d84b740204d105"; + sha256 = "1j89mcfsqyclmllfqmsx8a55ihrn2kzay8qh2lyfm8dzd6mi1za0"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/151a0af91a58e27f724854d85d5dd9668229fe8d/recipes/pyim-greatdict"; + sha256 = "1bbindnklmmxdskv9vmjxhvlxxmaccgqn70prblhpg6n11bxjhl9"; + name = "pyim-greatdict"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/pyim-greatdict"; + license = lib.licenses.free; + }; + }) {}; + pyim-wbdict = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pyim }: + melpaBuild { + pname = "pyim-wbdict"; + version = "0.1"; + src = fetchFromGitHub { + owner = "tumashu"; + repo = "pyim-wbdict"; + rev = "114489ed97e825ae11a8d09da6e873820cf23106"; + sha256 = "187wx418pj4h8p8baf4943v9dsb6mfbn0n19r8xiil1z2cmm4ygc"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/ab1cb8bc623d1f12f78fa42ce8b16514e5b07c51/recipes/pyim-wbdict"; + sha256 = "1s0i9xcnpy8kxqhsv7rqxabv5vnxsciyng398mn32mknib03315i"; + name = "pyim-wbdict"; + }; + packageRequires = [ pyim ]; + meta = { + homepage = "https://melpa.org/#/pyim-wbdict"; + license = lib.licenses.free; + }; + }) {}; pyimport = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "pyimport"; @@ -30238,12 +30384,12 @@ rtags = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rtags"; - version = "2.11"; + version = "2.12"; src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "942ae6faa64ab6de73d093e628bc5b036f1a967c"; - sha256 = "19ljfz95jwbgw35d3y0m0p3l4as5llwvc6q3v2jlv3xl3ihpd923"; + rev = "db1244c1c14514324474f362c857112e89bbf0c6"; + sha256 = "1fcrlxk9z11vbarznfcpfyqzvj6v3ydbn5z6vbdmgf9cxb52kfma"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/rtags"; @@ -32165,6 +32311,27 @@ license = lib.licenses.free; }; }) {}; + snoopy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "snoopy"; + version = "0.1.1"; + src = fetchFromGitHub { + owner = "anmonteiro"; + repo = "snoopy-mode"; + rev = "8d2b7b1354414f261b237f2fed0d472803ba3909"; + sha256 = "05q407dg6jppmqdxpp1ba8xs6yjilsa74hga46dbhcc9nzj9850a"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/4a882cd92964ac195a09469006c9a44dc202f000/recipes/snoopy"; + sha256 = "1wa8jykqyj6rxqfhwbiyli6yh8s7n0pqv7fc9sfaymarda93zbgi"; + name = "snoopy"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/snoopy"; + license = lib.licenses.free; + }; + }) {}; socyl = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, s }: melpaBuild { pname = "socyl"; @@ -32441,12 +32608,12 @@ sparql-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sparql-mode"; - version = "2.0.1"; + version = "2.1.0"; src = fetchFromGitHub { owner = "ljos"; repo = "sparql-mode"; - rev = "a51d4e57974e8d06f7d49ada0fdca656b7470642"; - sha256 = "0ywhqk6n5k0l85zjwbnrivnvxjzqipqrggv06lify6yv18qmyl6s"; + rev = "25de49d5f587985d92c7fb56247d86fe06d53f0e"; + sha256 = "0y2z6n18xrfi9g2ar0xm825j39qwsydpndilk40gncwz0civd4fa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c3d729130a41903bb01465d0f01c34fbc508b56e/recipes/sparql-mode"; @@ -33110,12 +33277,12 @@ suomalainen-kalenteri = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "suomalainen-kalenteri"; - version = "2015.11.29"; + version = "2017.8.1"; src = fetchFromGitHub { owner = "tlikonen"; repo = "suomalainen-kalenteri"; - rev = "b7991cb35624ebc04a89bbe759d40f186c9c097e"; - sha256 = "1b637p2cyc8a83qv9vba4yamzhk08f62zykqh5p35jwvym8wkann"; + rev = "c702e33cb6e13cb28bd761844e95be112a3c04f3"; + sha256 = "13avc3ba6vhysmhrcxfpkamggfpal479gn7k9n7509dpwp06dv8h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/181adf1b16253481674663fd28b195172231b7da/recipes/suomalainen-kalenteri"; @@ -34180,12 +34347,12 @@ tide = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, typescript-mode }: melpaBuild { pname = "tide"; - version = "2.3.1"; + version = "2.4.2"; src = fetchFromGitHub { owner = "ananthakumaran"; repo = "tide"; - rev = "669ce39bcd93ca6353d24a72a358272d7b0e2268"; - sha256 = "1sbvkgrdf6s8bkg38rfyj677dq3x4pry84hv30dgqhll7h8ja72w"; + rev = "f8b4752dfe7fde7b90c65895c47943231af3237d"; + sha256 = "1hy0jzk457nz9rz7s4hq6b5asv9g9wrrs1fdsisz7jzy6hzw4pqp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a21e063011ebbb03ac70bdcf0a379f9e383bdfab/recipes/tide"; @@ -34389,12 +34556,12 @@ treemacs = callPackage ({ ace-window, cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pfuture, s }: melpaBuild { pname = "treemacs"; - version = "1.7.6"; + version = "1.8"; src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "treemacs"; - rev = "53f0e0c562ba28b9738d05cd730728e983d2917f"; - sha256 = "13v8pydbyzl4h53xad93sfqa3aa4p8k4b8k53cqjv7mgd87pdvcw"; + rev = "56007723b5eeb2d01be80e4b9df471747bb0b7f4"; + sha256 = "00fq88wgbj9lji4pjc2bk34d584kiirh03ydiwz8pc2f2smv61pk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a52c2770097fe8968bff7c31ac411b3d9b60972e/recipes/treemacs"; @@ -34410,12 +34577,12 @@ treemacs-evil = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild, treemacs }: melpaBuild { pname = "treemacs-evil"; - version = "1.7.6"; + version = "1.8"; src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "treemacs"; - rev = "53f0e0c562ba28b9738d05cd730728e983d2917f"; - sha256 = "13v8pydbyzl4h53xad93sfqa3aa4p8k4b8k53cqjv7mgd87pdvcw"; + rev = "56007723b5eeb2d01be80e4b9df471747bb0b7f4"; + sha256 = "00fq88wgbj9lji4pjc2bk34d584kiirh03ydiwz8pc2f2smv61pk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a52c2770097fe8968bff7c31ac411b3d9b60972e/recipes/treemacs-evil"; @@ -35319,12 +35486,12 @@ vimish-fold = callPackage ({ cl-lib ? null, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "vimish-fold"; - version = "0.2.2"; + version = "0.2.3"; src = fetchFromGitHub { owner = "mrkkrp"; repo = "vimish-fold"; - rev = "5c9ae8018002c10a034de60b527c42f3665f6b67"; - sha256 = "01wxjvbq3i1ji9fpff7fbk20pzmr52z6fycqfi7malgwq05is1bm"; + rev = "e631352fbf910f692807afe38a2b6a7882a403a8"; + sha256 = "152w1wqxj7yzm3d12lknzz1aix4h8cb571sjns3m1s7azsr3vfbq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b4862b0a3d43f073e645803cbbf11d973a4b51d5/recipes/vimish-fold"; @@ -36225,8 +36392,8 @@ version = "0.9.1"; src = fetchhg { url = "https://bitbucket.com/ArneBab/wisp"; - rev = "1ab8f296baeb"; - sha256 = "02g34b7kp3lkv4sfgf1762vlmmsnxib37v8385lmv90ww24lwggg"; + rev = "70b4ccc031bc"; + sha256 = "1mbypvclk83lhwvdy6ancl4j9nysv47s8yp6baa8pi54zlc9w3i1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/wisp-mode"; diff --git a/pkgs/applications/editors/emacs-modes/org-generated.nix b/pkgs/applications/editors/emacs-modes/org-generated.nix index 9d7af37e5140..f51fec800756 100644 --- a/pkgs/applications/editors/emacs-modes/org-generated.nix +++ b/pkgs/applications/editors/emacs-modes/org-generated.nix @@ -1,10 +1,10 @@ { callPackage }: { org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "org"; - version = "20170724"; + version = "20170731"; src = fetchurl { - url = "http://orgmode.org/elpa/org-20170724.tar"; - sha256 = "07rpr8zf12c62sfbk9c9lvvfphs3ws136d3vlnq6j7gypdzyb32m"; + url = "http://orgmode.org/elpa/org-20170731.tar"; + sha256 = "0lphzjxmk5y9g6b9rnacc9z55hbws3xmycsqdvsz56xr3aawx255"; }; packageRequires = []; meta = { @@ -14,10 +14,10 @@ }) {}; org-plus-contrib = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "org-plus-contrib"; - version = "20170724"; + version = "20170731"; src = fetchurl { - url = "http://orgmode.org/elpa/org-plus-contrib-20170724.tar"; - sha256 = "12xgvdmpz6wnylcvfngh7lqvgs9wv1bdrm7l7fivakx8y3dyq7k7"; + url = "http://orgmode.org/elpa/org-plus-contrib-20170731.tar"; + sha256 = "1bba4m9r598f9l8wmr1j670d1qp4fcbbhzp9m4qd2md09rm3nsnw"; }; packageRequires = []; meta = { diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix index d924532eb340..3cb53a6116b6 100644 --- a/pkgs/applications/editors/nano/default.nix +++ b/pkgs/applications/editors/nano/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchFromGitHub +{ stdenv, hostPlatform, fetchurl, fetchFromGitHub , ncurses , texinfo , gettext ? null diff --git a/pkgs/applications/graphics/fbida/default.nix b/pkgs/applications/graphics/fbida/default.nix index d06c3eb5ec13..2943b5ef94c0 100644 --- a/pkgs/applications/graphics/fbida/default.nix +++ b/pkgs/applications/graphics/fbida/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ libexif libjpeg libpng libungif freetype fontconfig libtiff libwebp imagemagick curl sane-backends libdrm libXpm epoxy poppler lirc ]; - makeFlags = [ "prefix=$(out)" "verbose=yes" ]; + makeFlags = [ "prefix=$(out)" "verbose=yes" "STRIP=" ]; patchPhase = '' diff --git a/pkgs/applications/kde/fetch.sh b/pkgs/applications/kde/fetch.sh index ad521a2b0388..929771ed5faf 100644 --- a/pkgs/applications/kde/fetch.sh +++ b/pkgs/applications/kde/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/applications/17.04.2/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/applications/17.04.3/ -A '*.tar.xz' ) diff --git a/pkgs/applications/kde/srcs.nix b/pkgs/applications/kde/srcs.nix index 66498b0d2804..ec3628abef22 100644 --- a/pkgs/applications/kde/srcs.nix +++ b/pkgs/applications/kde/srcs.nix @@ -3,2235 +3,2235 @@ { akonadi = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/akonadi-17.04.2.tar.xz"; - sha256 = "08b3xyrff3y3s3c39l1fv3i55rdz6fq9mrsi3g80vs4i4x70f46d"; - name = "akonadi-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/akonadi-17.04.3.tar.xz"; + sha256 = "0cddlz5v25ak9x1f682rjm3vlaqfm9n9y1bfd3h3md59j9l4gq49"; + name = "akonadi-17.04.3.tar.xz"; }; }; akonadi-calendar = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/akonadi-calendar-17.04.2.tar.xz"; - sha256 = "17nx990k3l0mgwssrdg9avvp4yf6ichakx0cq4yg4mif5rc4angd"; - name = "akonadi-calendar-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/akonadi-calendar-17.04.3.tar.xz"; + sha256 = "0543wixfwy80sx0lsy8jwlbyr3cxl3jyf04n644zyrkl461lv637"; + name = "akonadi-calendar-17.04.3.tar.xz"; }; }; akonadi-calendar-tools = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/akonadi-calendar-tools-17.04.2.tar.xz"; - sha256 = "1qbj5fkzia0bjzyv8mybqf2gg917dyjqmiywf4asr0xlqxwydccj"; - name = "akonadi-calendar-tools-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/akonadi-calendar-tools-17.04.3.tar.xz"; + sha256 = "1yzfv80lyair5nkyql17ijnbcp9iyidhwrff6if9kn87sv5i9b4v"; + name = "akonadi-calendar-tools-17.04.3.tar.xz"; }; }; akonadiconsole = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/akonadiconsole-17.04.2.tar.xz"; - sha256 = "00wps8p6094bywkc6yrh9rpqp0q49nq68kmnbm7jqd9k07g93mxz"; - name = "akonadiconsole-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/akonadiconsole-17.04.3.tar.xz"; + sha256 = "1v449q0d1ld84jjy0bshnf99ss5qq9mg2vp9c2wl2i8f640k7f0v"; + name = "akonadiconsole-17.04.3.tar.xz"; }; }; akonadi-contacts = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/akonadi-contacts-17.04.2.tar.xz"; - sha256 = "0fnmfcfxzjghfh3plliksa7sffjy8m2hif1s8gsdv2bl5v13gxbz"; - name = "akonadi-contacts-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/akonadi-contacts-17.04.3.tar.xz"; + sha256 = "03sffvybravzmg8qjqylgvfrn7ajvahkm7qnr8k44b9i9cy676ak"; + name = "akonadi-contacts-17.04.3.tar.xz"; }; }; akonadi-import-wizard = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/akonadi-import-wizard-17.04.2.tar.xz"; - sha256 = "0wg1nnrfafmpdb0li7d9i3qfdam4v2ybkbrbwgdwiawdqs9znaaa"; - name = "akonadi-import-wizard-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/akonadi-import-wizard-17.04.3.tar.xz"; + sha256 = "0gb2vzvznmyc3qvrzaka5q43qp982izm4yf7i340yi780qaixz18"; + name = "akonadi-import-wizard-17.04.3.tar.xz"; }; }; akonadi-mime = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/akonadi-mime-17.04.2.tar.xz"; - sha256 = "1ariwnjgsyccfa3iky3sf8lz08hv44jd6xa4hjfyz4bkp822grld"; - name = "akonadi-mime-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/akonadi-mime-17.04.3.tar.xz"; + sha256 = "050kn3shqnzk22bx2h83b6qymn3npscnjqd2vrrwvbwh1b2ww2si"; + name = "akonadi-mime-17.04.3.tar.xz"; }; }; akonadi-notes = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/akonadi-notes-17.04.2.tar.xz"; - sha256 = "00p7sksfid7lln43f65jna8dr4w47wkxqyls2gzbgnblpd7m2rqg"; - name = "akonadi-notes-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/akonadi-notes-17.04.3.tar.xz"; + sha256 = "1l8rhfvl8fh04igldggcq1fz1f6s595c89hzzza75qqbcs2azfps"; + name = "akonadi-notes-17.04.3.tar.xz"; }; }; akonadi-search = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/akonadi-search-17.04.2.tar.xz"; - sha256 = "111r1fplrd13xb7s36cm9bk5zkj8ap33d252xarwmzpj51q0l3vh"; - name = "akonadi-search-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/akonadi-search-17.04.3.tar.xz"; + sha256 = "0b4magnl3lrlnfsnsw46vkbhkp1bbxf2fgjfm84vndmwyglj1605"; + name = "akonadi-search-17.04.3.tar.xz"; }; }; akregator = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/akregator-17.04.2.tar.xz"; - sha256 = "0ngpw432pm57p34y4wcvrxlrlmixlgrpqawgn2b73dhvb2m8ypvy"; - name = "akregator-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/akregator-17.04.3.tar.xz"; + sha256 = "12wajdwn3pp2prl9b2wlx1326b9w75j04yhg6q3082nrhlgmcnm2"; + name = "akregator-17.04.3.tar.xz"; }; }; analitza = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/analitza-17.04.2.tar.xz"; - sha256 = "0qs2mp7nlca9y8lpycwfsmdd33ficz36z2fbmqzqm837w1r5jplp"; - name = "analitza-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/analitza-17.04.3.tar.xz"; + sha256 = "0scz8qi25gk1p8n6134wbcrknvxihyjkwvs6x22606nnrghlfc1b"; + name = "analitza-17.04.3.tar.xz"; }; }; ark = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/ark-17.04.2.tar.xz"; - sha256 = "0zdyxd7ghwrj48avyqv4q6dpyrxryzrg8v5ljwwsizlb7lp25afx"; - name = "ark-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/ark-17.04.3.tar.xz"; + sha256 = "1b9kadiz91d86q3hrailzd56pbaxzh7jmvy317nfiqrflw541sin"; + name = "ark-17.04.3.tar.xz"; }; }; artikulate = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/artikulate-17.04.2.tar.xz"; - sha256 = "0rjqpn8aa0y3v2940qgfxl9xdrls1jw6yfvgqdsicrhd9qwpr6i2"; - name = "artikulate-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/artikulate-17.04.3.tar.xz"; + sha256 = "0axc54cqyhmb28rzxlflmms4cfv2539wwb4lmgm99z8kgg7634g6"; + name = "artikulate-17.04.3.tar.xz"; }; }; audiocd-kio = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/audiocd-kio-17.04.2.tar.xz"; - sha256 = "0h6zvlhyi9dxmcxgcnn12pj056r62a6389nd9dnqzcc3m7jp0ypi"; - name = "audiocd-kio-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/audiocd-kio-17.04.3.tar.xz"; + sha256 = "1q1zlp2p94044p0gb6vwzybvj3g2c1lwnyj4x2kim6wkj2x9pqrf"; + name = "audiocd-kio-17.04.3.tar.xz"; }; }; baloo-widgets = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/baloo-widgets-17.04.2.tar.xz"; - sha256 = "1fspq5n53zgnwpvnq0z9g77xhfspd3indcvim8j8ls5qhmn4c8g9"; - name = "baloo-widgets-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/baloo-widgets-17.04.3.tar.xz"; + sha256 = "1awhqv8gqjkdcblsq9sn6wd2f2693niyk59x0vhf3ml87sqmhki4"; + name = "baloo-widgets-17.04.3.tar.xz"; }; }; blinken = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/blinken-17.04.2.tar.xz"; - sha256 = "12pzbgxhdrzjnzg02hd96pxcqpjnzfrlv2bjpkpzb7ng70wb50ia"; - name = "blinken-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/blinken-17.04.3.tar.xz"; + sha256 = "13m0854d4bahhcpfq7v04ydhvxs79x9h0rhhvp9zapzq8kvhc6s0"; + name = "blinken-17.04.3.tar.xz"; }; }; blogilo = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/blogilo-17.04.2.tar.xz"; - sha256 = "14pn6l2qvgf7ab05i93lnhm6fjhy41xwnxa5v7an7xc8ismi5ric"; - name = "blogilo-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/blogilo-17.04.3.tar.xz"; + sha256 = "1ziipi55hwmkmf7pr9j64qhc0px3v4pzd3b4b2gqz4fjg2sggp12"; + name = "blogilo-17.04.3.tar.xz"; }; }; bomber = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/bomber-17.04.2.tar.xz"; - sha256 = "19c5ak9cw3ybcvw21rzjh7k0q7g1j9dv060pvjdfsphfyzkym5m3"; - name = "bomber-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/bomber-17.04.3.tar.xz"; + sha256 = "13z4zs9mvcwlidxx17nx6qzbdcc7r15adh5awxnjxnqv0akmqj7p"; + name = "bomber-17.04.3.tar.xz"; }; }; bovo = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/bovo-17.04.2.tar.xz"; - sha256 = "0z4ajphzrnag1zqv3d9i6cvrfn5b74sklacxhn09hgjgx6ihps77"; - name = "bovo-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/bovo-17.04.3.tar.xz"; + sha256 = "0a27n64krkj6nmkzyi5vww6nsc2bzjlfzh8k32r8fjix500263i1"; + name = "bovo-17.04.3.tar.xz"; }; }; calendarsupport = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/calendarsupport-17.04.2.tar.xz"; - sha256 = "1n2nb15fn3v6hlp8ya3ah3pdyjjss1632a51k696lg474dhxvlzk"; - name = "calendarsupport-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/calendarsupport-17.04.3.tar.xz"; + sha256 = "1xv8n8hc5kp0cvbj7fpd065sb329ps3sazfmrf4h4gkh1zj5i8wi"; + name = "calendarsupport-17.04.3.tar.xz"; }; }; cantor = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/cantor-17.04.2.tar.xz"; - sha256 = "0811770qn76ri11mgx2pac7vg67mj5qg3v3zhx4ym3f072lfp57i"; - name = "cantor-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/cantor-17.04.3.tar.xz"; + sha256 = "0lcvhc2pyhyzlj9px6cni99l0zddyv32gk32s3wg7pz71msaw91w"; + name = "cantor-17.04.3.tar.xz"; }; }; cervisia = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/cervisia-17.04.2.tar.xz"; - sha256 = "1gar8rx9vknpc7fnwlg7kvwj90wv9wd8c3dd59fj55d9fpwin3qg"; - name = "cervisia-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/cervisia-17.04.3.tar.xz"; + sha256 = "1hrik6r87sx2d99fnn89k48mf76xnrq4wgh2zg03hmf327ydviq2"; + name = "cervisia-17.04.3.tar.xz"; }; }; dolphin = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/dolphin-17.04.2.tar.xz"; - sha256 = "1yd0fawz9n64gsd868qzp424h653f5lf22r5mf116bkgxia59b25"; - name = "dolphin-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/dolphin-17.04.3.tar.xz"; + sha256 = "1q8pj2wh186l76cg5ir3l9f6xma1kjgbrk9kfd9br400dx2pz62a"; + name = "dolphin-17.04.3.tar.xz"; }; }; dolphin-plugins = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/dolphin-plugins-17.04.2.tar.xz"; - sha256 = "1h8g962pmpwahhrnzzd7x15j7p3bcxg92csfkd0y2mn6pfl9zb5s"; - name = "dolphin-plugins-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/dolphin-plugins-17.04.3.tar.xz"; + sha256 = "1is11ja2lzqxnsmj6kkr1q9l9csjy4ymv869yrgsbid0xjc2krj3"; + name = "dolphin-plugins-17.04.3.tar.xz"; }; }; dragon = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/dragon-17.04.2.tar.xz"; - sha256 = "0yp0bswjq9zymczyscy3y186d7g921jmah6i5wd36j1vgff3i0ry"; - name = "dragon-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/dragon-17.04.3.tar.xz"; + sha256 = "1raki9yp51s73ca6fv093pbhwjfw3hbiazbhfwf6f3dqag24w11w"; + name = "dragon-17.04.3.tar.xz"; }; }; eventviews = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/eventviews-17.04.2.tar.xz"; - sha256 = "0rf87q002ax5r6qh99hmbdrm528grw3ib5zi5pnjai3l403vd6g6"; - name = "eventviews-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/eventviews-17.04.3.tar.xz"; + sha256 = "18j8xikfxn2mpx61d4ynahai9s6gwi0x5xsfvnyrc2v43a69w7ks"; + name = "eventviews-17.04.3.tar.xz"; }; }; ffmpegthumbs = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/ffmpegthumbs-17.04.2.tar.xz"; - sha256 = "02i9x2amkwc40a7fpk939spgwbrcfm1s9swgmp1wzyg7arrf4qz3"; - name = "ffmpegthumbs-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/ffmpegthumbs-17.04.3.tar.xz"; + sha256 = "1f8xrga8v045g5drcls87m9w5d00887sglk274gi1jmf60sy55jk"; + name = "ffmpegthumbs-17.04.3.tar.xz"; }; }; filelight = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/filelight-17.04.2.tar.xz"; - sha256 = "0wpcmk6i8hfalzymj8m1hsg1qi2hil8x51nvxg0c55x1cqg6k9a0"; - name = "filelight-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/filelight-17.04.3.tar.xz"; + sha256 = "0srwhi3zi3gv8iid21f9gk709w59r4l7z560piywfgdmpp9spmgg"; + name = "filelight-17.04.3.tar.xz"; }; }; granatier = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/granatier-17.04.2.tar.xz"; - sha256 = "0bxf4cv1351bzz3yafdadih8bdcjjn0119zazmll2jjdnh4qiq0z"; - name = "granatier-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/granatier-17.04.3.tar.xz"; + sha256 = "1gv4xikxkqfw54pcgrkj5l2m84fc39pckyg495aid3fbh73pgi7i"; + name = "granatier-17.04.3.tar.xz"; }; }; grantlee-editor = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/grantlee-editor-17.04.2.tar.xz"; - sha256 = "1sjrsljp0g53gi4vlcmz6r9k657k4wr1l10743sfmg268skvs84b"; - name = "grantlee-editor-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/grantlee-editor-17.04.3.tar.xz"; + sha256 = "0lm97icf22gbrq9pgj8cmwcgpqb5nsgwv78ldz8hp1s9x05qck2v"; + name = "grantlee-editor-17.04.3.tar.xz"; }; }; grantleetheme = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/grantleetheme-17.04.2.tar.xz"; - sha256 = "102a49ifkvjpz2703fr6dv45ksyg7y1yjc6xm0im95vb66aw3cb5"; - name = "grantleetheme-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/grantleetheme-17.04.3.tar.xz"; + sha256 = "0jbgxjlsih2alc5ylbkrwwc2ij11ywsynlz1vsm0qzrfb7j534si"; + name = "grantleetheme-17.04.3.tar.xz"; }; }; gwenview = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/gwenview-17.04.2.tar.xz"; - sha256 = "0x9pxw33ahzn0h4klgiw7ifcgkdwv7l1zzfapbh9gr9h3rbrpsra"; - name = "gwenview-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/gwenview-17.04.3.tar.xz"; + sha256 = "12dy8hicrbns40gjnz2j60cqyjmrz5ci8sq2npblq5gr3avhdgla"; + name = "gwenview-17.04.3.tar.xz"; }; }; incidenceeditor = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/incidenceeditor-17.04.2.tar.xz"; - sha256 = "1qhkmw6n402xnv5ggpfp586gii5z6r5gqmgfd0jzxlnygslqd784"; - name = "incidenceeditor-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/incidenceeditor-17.04.3.tar.xz"; + sha256 = "1xjgmz23q45s5m3kzfdr3k94l711i672m8cp5lfv9sczv4lgi45y"; + name = "incidenceeditor-17.04.3.tar.xz"; }; }; jovie = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/jovie-17.04.2.tar.xz"; - sha256 = "0mcv00hk1h1hl7hg4n2pcbsjw1g21k98fls7424jjh6vgvarbxmg"; - name = "jovie-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/jovie-17.04.3.tar.xz"; + sha256 = "0v9ndwp7phd62vnp3qv3ax9khrzbqwhs0mv2glf8r8w4qqv39gsq"; + name = "jovie-17.04.3.tar.xz"; }; }; juk = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/juk-17.04.2.tar.xz"; - sha256 = "01lsmfd5h1km5w9xz9bwh07qvxlgh2j8nl638bxx6k9vydg53gll"; - name = "juk-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/juk-17.04.3.tar.xz"; + sha256 = "1kff1rcipw1m19w7dij3fjzqm4xkgzzy3qanhwhbicy77pkmcwjp"; + name = "juk-17.04.3.tar.xz"; }; }; k3b = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/k3b-17.04.2.tar.xz"; - sha256 = "1yv2rgwsvabyj7pj91yir6zj7bc4n9psazg0q658pyqbdkgwrkx8"; - name = "k3b-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/k3b-17.04.3.tar.xz"; + sha256 = "0a1hk0is5iswbvrq1zlj8fgr02dg94nm1393s3j1ashgvxsfzmfk"; + name = "k3b-17.04.3.tar.xz"; }; }; kaccessible = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kaccessible-17.04.2.tar.xz"; - sha256 = "00m2ya93isyhr9cbx7fa79pi1iqnj5nqqnjmh8kqx9abkpvy2yff"; - name = "kaccessible-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kaccessible-17.04.3.tar.xz"; + sha256 = "1iik3dbdxqr9702mcrvij56j3w5wr4vmylnpkr9lm46pf0kpxyby"; + name = "kaccessible-17.04.3.tar.xz"; }; }; kaccounts-integration = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kaccounts-integration-17.04.2.tar.xz"; - sha256 = "0wrfyfczm92qz0w6gyvaac8n0763fviglji7ls73y0gy7xm1lfmj"; - name = "kaccounts-integration-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kaccounts-integration-17.04.3.tar.xz"; + sha256 = "0s67vgk2sh11gf2icg5syk3zy66ilkdnjspahhfsmvqkgpgcr3w7"; + name = "kaccounts-integration-17.04.3.tar.xz"; }; }; kaccounts-providers = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kaccounts-providers-17.04.2.tar.xz"; - sha256 = "0y2y231f0xyysxnwdprlffp3m4wxyxabc2d4j8sr9w9gn0qfzdkj"; - name = "kaccounts-providers-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kaccounts-providers-17.04.3.tar.xz"; + sha256 = "0j3w66gvvaa1fsncr2h15lw3fk4m1qzkhzaxp13yg5cig3mkg3bb"; + name = "kaccounts-providers-17.04.3.tar.xz"; }; }; kaddressbook = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kaddressbook-17.04.2.tar.xz"; - sha256 = "0y44b3wwpgpzim3an8kvrhqnw1wg0m2fcmanm2sj9vvccayy9fl6"; - name = "kaddressbook-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kaddressbook-17.04.3.tar.xz"; + sha256 = "0gr3g0vi2h9qy4fw82g997wq2snam71qivqg5fk7bdgvzi3qm2d0"; + name = "kaddressbook-17.04.3.tar.xz"; }; }; kajongg = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kajongg-17.04.2.tar.xz"; - sha256 = "08wzxkhfwagh2awcs4wdg56ks628bwysim5whwhrvw3rzc30v2ig"; - name = "kajongg-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kajongg-17.04.3.tar.xz"; + sha256 = "0clq9gvxn8lma5s1qxl2j56nylbs1vijqlw1xplxi4pfwzv2d09g"; + name = "kajongg-17.04.3.tar.xz"; }; }; kalarm = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kalarm-17.04.2.tar.xz"; - sha256 = "0km7fzhd8iskg4bkn6x62y9pgcvq8zwrjk3w7qvrx5j6dszjw11w"; - name = "kalarm-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kalarm-17.04.3.tar.xz"; + sha256 = "00h90n9r05ffgca34fz1f5vr4c95xgq6ay6a0y7p7bda2kvl2rwg"; + name = "kalarm-17.04.3.tar.xz"; }; }; kalarmcal = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kalarmcal-17.04.2.tar.xz"; - sha256 = "0rca71h85rd88fkx0pkxj40c8fnyiwfcnvmczkd9xb729hvrfblk"; - name = "kalarmcal-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kalarmcal-17.04.3.tar.xz"; + sha256 = "1qn9idrjql02fzbvjdk70jqp1c4npjmbjgfbnjg2m4jnd98xd7yr"; + name = "kalarmcal-17.04.3.tar.xz"; }; }; kalgebra = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kalgebra-17.04.2.tar.xz"; - sha256 = "12496gk238ipi2zmxx4njwc58mx9q3w463qp9ji23abv3c59g44f"; - name = "kalgebra-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kalgebra-17.04.3.tar.xz"; + sha256 = "0hcybpy7bjmxym09xlv4mi4fidl8l130c0ghbigw8774f11k6vp5"; + name = "kalgebra-17.04.3.tar.xz"; }; }; kalzium = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kalzium-17.04.2.tar.xz"; - sha256 = "0gckmnbgym09kq53q0n3jsqfiaz4g7235ylpnwsaids3243jpa06"; - name = "kalzium-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kalzium-17.04.3.tar.xz"; + sha256 = "0pwxbb1qgkbx9y3320hwx96ymy91p6ycarvx731cyinp6v9lizld"; + name = "kalzium-17.04.3.tar.xz"; }; }; kamera = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kamera-17.04.2.tar.xz"; - sha256 = "1ikniri791v63zzsng7yjvdil6vz08cw2iz9f0dwxzldlwws41j6"; - name = "kamera-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kamera-17.04.3.tar.xz"; + sha256 = "0gjxv55lzdfwxk7cm8s9yzk5z6lqb64irx57682l76an3azkjwsf"; + name = "kamera-17.04.3.tar.xz"; }; }; kanagram = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kanagram-17.04.2.tar.xz"; - sha256 = "06yqc197yzzzzga45db8i05q2yr4jyjf5bvry0k22nss3wgsy8mk"; - name = "kanagram-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kanagram-17.04.3.tar.xz"; + sha256 = "01479ryshlaf9kqd3nlhdrx02i8xp7sn7n1ir4cdxpnm8jg28x0c"; + name = "kanagram-17.04.3.tar.xz"; }; }; kapman = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kapman-17.04.2.tar.xz"; - sha256 = "15yyp69m096wbmpi52fi2ca6i83w0agjgsy1j6qiy6ki0fj2xyry"; - name = "kapman-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kapman-17.04.3.tar.xz"; + sha256 = "0llrh5g52gzvyxa5l3ardjv17msy2zj83in2g4cy094g1zciyk40"; + name = "kapman-17.04.3.tar.xz"; }; }; kapptemplate = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kapptemplate-17.04.2.tar.xz"; - sha256 = "0v5v6m0z7jgq5lzlpa3qkza3s0amx6xikwcg1lbzivnwfjvyb9nj"; - name = "kapptemplate-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kapptemplate-17.04.3.tar.xz"; + sha256 = "0r4s5lfggv3nbqgi2y5y9zbyqp3fc7hlhlbdfr24cyljagmi8hgw"; + name = "kapptemplate-17.04.3.tar.xz"; }; }; kate = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kate-17.04.2.tar.xz"; - sha256 = "1bya5xh57icsbx9jmk5w330xm97bjs3amvlnj0i8rplawjzcai8h"; - name = "kate-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kate-17.04.3.tar.xz"; + sha256 = "1p6sfn80f8hvkgrg6z2yk7h23v403695sp39fb7s3q4cn5a0sch8"; + name = "kate-17.04.3.tar.xz"; }; }; katomic = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/katomic-17.04.2.tar.xz"; - sha256 = "06bdvc8nckckd3rin7q7cjajxv0yzsq6m1jwzmyh90mm2sbq5g0j"; - name = "katomic-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/katomic-17.04.3.tar.xz"; + sha256 = "0rm2alxjmr74m2nxf5vwg3j5ynajz4c5z57cnpmzwvxgdh2c49p0"; + name = "katomic-17.04.3.tar.xz"; }; }; kblackbox = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kblackbox-17.04.2.tar.xz"; - sha256 = "1z6ladzhd1mgcqv0y199wv3dafpmy7h6yfgy7hgl26pqgw2qpz9z"; - name = "kblackbox-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kblackbox-17.04.3.tar.xz"; + sha256 = "183yvajbg8h48h4zwzm55zdajjan84dsnndg1db4n8gyibkv3f9d"; + name = "kblackbox-17.04.3.tar.xz"; }; }; kblocks = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kblocks-17.04.2.tar.xz"; - sha256 = "0a3d4q2kph192zp6lcm2wxh8f55s3wj3wvxvfjk3v5vwjld6a298"; - name = "kblocks-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kblocks-17.04.3.tar.xz"; + sha256 = "0j66756d66ravgiq4ybfyhm4hacmys9snjyadr035103j26z89pw"; + name = "kblocks-17.04.3.tar.xz"; }; }; kblog = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kblog-17.04.2.tar.xz"; - sha256 = "1w97qkp2mwf7wqjwrrq94sah32cdybgxp2rzs5ypwaszka77xcd9"; - name = "kblog-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kblog-17.04.3.tar.xz"; + sha256 = "10ngg2b83mczd937ikwzbwdqlrvlxsqzgrz95454x3s3j649hcy9"; + name = "kblog-17.04.3.tar.xz"; }; }; kbounce = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kbounce-17.04.2.tar.xz"; - sha256 = "1mgbjgbp2wmghvjgyf1s3gjwnwg4c8h6ni01mazqv8jlf0v14g1j"; - name = "kbounce-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kbounce-17.04.3.tar.xz"; + sha256 = "1f9np47ddhybnmm0m98fwpy51d9c8zgl7qrlj8g3diia45hy1s39"; + name = "kbounce-17.04.3.tar.xz"; }; }; kbreakout = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kbreakout-17.04.2.tar.xz"; - sha256 = "1pydl6p7f8f1jxd6k8d563wwigx52fg850d2x736wzw1nk4vwg8b"; - name = "kbreakout-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kbreakout-17.04.3.tar.xz"; + sha256 = "0s7khwg6sl709gjzf5ymq5l79iilnfx14jp5bnck0ir568vhybkf"; + name = "kbreakout-17.04.3.tar.xz"; }; }; kbruch = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kbruch-17.04.2.tar.xz"; - sha256 = "0kpzqlnx3wzygnna5l1rssclz9fkvl6mzr5jnr730d5c3r7hymby"; - name = "kbruch-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kbruch-17.04.3.tar.xz"; + sha256 = "11r50x5yp7s749prqwkxf3k5pm93pmk0h3b0i9c5507nbh2b2x9b"; + name = "kbruch-17.04.3.tar.xz"; }; }; kcachegrind = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kcachegrind-17.04.2.tar.xz"; - sha256 = "148wmzq482jarpg0sywdlrjc0bgb2vkg0g2pn7wqj1czijs5l0rv"; - name = "kcachegrind-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kcachegrind-17.04.3.tar.xz"; + sha256 = "0wcjvmdsqg27b2d4rzvrl98nqj5k7hp02d1w136fklfsh5mzxbxn"; + name = "kcachegrind-17.04.3.tar.xz"; }; }; kcalc = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kcalc-17.04.2.tar.xz"; - sha256 = "03lzvhs4kyj9cvhw6kh1xmhs2r9vaa4a9ibqnkjb6xx1nx4cpm84"; - name = "kcalc-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kcalc-17.04.3.tar.xz"; + sha256 = "1zshisq51vwsd04fxc5pw7lywrimpz04v2c9ad6lxwppmxcjr177"; + name = "kcalc-17.04.3.tar.xz"; }; }; kcalcore = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kcalcore-17.04.2.tar.xz"; - sha256 = "05v1w8k70cdvvw5kv4994llbifrq2almir74i44v4i1449x7ziqn"; - name = "kcalcore-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kcalcore-17.04.3.tar.xz"; + sha256 = "17i7d29yq06his3qjn5jblbdzf04500q9sdh7cr7xffdr3rpahdc"; + name = "kcalcore-17.04.3.tar.xz"; }; }; kcalutils = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kcalutils-17.04.2.tar.xz"; - sha256 = "1hj3k4lqj019cy8p7j6f20lkc75g8wma1p8vwynzlclnz43bsikp"; - name = "kcalutils-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kcalutils-17.04.3.tar.xz"; + sha256 = "07k0vx3rdn1dvg16b3ipwng87aibr9g1jv9wg0hnk0fydsrpf99n"; + name = "kcalutils-17.04.3.tar.xz"; }; }; kcharselect = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kcharselect-17.04.2.tar.xz"; - sha256 = "1xw5sd93zkkkp3v75p718bwrd9m391pryb12slrk66nsq1lbw1wn"; - name = "kcharselect-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kcharselect-17.04.3.tar.xz"; + sha256 = "1cy3ljdmip0zqqmyqjj2d5jd5q0hyxiqkl8pcgl2hb7ypx5c06sx"; + name = "kcharselect-17.04.3.tar.xz"; }; }; kcolorchooser = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kcolorchooser-17.04.2.tar.xz"; - sha256 = "156w22x3hx244l6v1zlndl45bxq25nnagji6zl0jspsa4csbzfrn"; - name = "kcolorchooser-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kcolorchooser-17.04.3.tar.xz"; + sha256 = "0jc7cynzbvc1r743fzqlfl5ck0cdd7m63lh27i033c4fpvvi4f6k"; + name = "kcolorchooser-17.04.3.tar.xz"; }; }; kcontacts = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kcontacts-17.04.2.tar.xz"; - sha256 = "0nj7kff7yk7pbmq8g65qpj4g489mxfgwh8axbxsz8z31fgsg1i7s"; - name = "kcontacts-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kcontacts-17.04.3.tar.xz"; + sha256 = "0y0vnpk09bk8w5dx8a2zpng2phdzlrs2s380saf06h01n0ni9g01"; + name = "kcontacts-17.04.3.tar.xz"; }; }; kcron = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kcron-17.04.2.tar.xz"; - sha256 = "1k3ya01icz65zyl33p3668p6ivkrlfpp95aydfmnfcd2q365vksx"; - name = "kcron-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kcron-17.04.3.tar.xz"; + sha256 = "11sbb1wvl1v6z0059hkmg3p29p8b77ij51kvkv3dicyvh7xzc4f8"; + name = "kcron-17.04.3.tar.xz"; }; }; kdav = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kdav-17.04.2.tar.xz"; - sha256 = "0yhjl9p4rnd6r5jwscxhwgv9d2xkj34mx4hh3rk4mc28bhy3yw9w"; - name = "kdav-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kdav-17.04.3.tar.xz"; + sha256 = "1yv8jhfak671k1s0fsy3j4bj7y64shhipp9k67v34q5cgg0q4hwl"; + name = "kdav-17.04.3.tar.xz"; }; }; kdebugsettings = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kdebugsettings-17.04.2.tar.xz"; - sha256 = "1c05zh66ahnm1ann35bm9q93lg6cylrfsyawki8g5485ivxfs5xh"; - name = "kdebugsettings-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kdebugsettings-17.04.3.tar.xz"; + sha256 = "1l2jg75jfvbf9ixs2spg4b284vimsf0hz04yhfcqicljykrwlwq4"; + name = "kdebugsettings-17.04.3.tar.xz"; }; }; kde-dev-scripts = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kde-dev-scripts-17.04.2.tar.xz"; - sha256 = "1vid5j08x8pkzzhqr78nsn4r9nnhisvsb7bfl9a1pc609y461y31"; - name = "kde-dev-scripts-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kde-dev-scripts-17.04.3.tar.xz"; + sha256 = "0cshxm7s2ivvj1baciy3il8vbk9qby9ybdclrhkq6n7a7li5w1lm"; + name = "kde-dev-scripts-17.04.3.tar.xz"; }; }; kde-dev-utils = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kde-dev-utils-17.04.2.tar.xz"; - sha256 = "1xf20zdlrinp9kxdky9a5lvflxikzdzv2yj211nlir8a63iv0bz7"; - name = "kde-dev-utils-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kde-dev-utils-17.04.3.tar.xz"; + sha256 = "02d0fm4dv5vl5zi3xp608m9c8rnv00x7wk3hkv4mdvi7li5h62j4"; + name = "kde-dev-utils-17.04.3.tar.xz"; }; }; kdeedu-data = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kdeedu-data-17.04.2.tar.xz"; - sha256 = "1bdh14d9ypai97jcxf1sfaw6ccfnf2ckj677fc8gl8g7fid094np"; - name = "kdeedu-data-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kdeedu-data-17.04.3.tar.xz"; + sha256 = "01vv6x600hpqpvg25aa07mbsjsnv83jqghna1bwqxgwrx1p3z8nd"; + name = "kdeedu-data-17.04.3.tar.xz"; }; }; kdegraphics-mobipocket = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kdegraphics-mobipocket-17.04.2.tar.xz"; - sha256 = "0qyv804a9cvqm0dm77zd79jj27i09jbw2cpgmazg3jn0plb5lkm6"; - name = "kdegraphics-mobipocket-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kdegraphics-mobipocket-17.04.3.tar.xz"; + sha256 = "1nir7k3sf8q0k8ancs5mhp4qs5v405mjdiwnqf92mpmpfv6gw7ba"; + name = "kdegraphics-mobipocket-17.04.3.tar.xz"; }; }; kdegraphics-thumbnailers = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kdegraphics-thumbnailers-17.04.2.tar.xz"; - sha256 = "06vr377nr59n599dsmi250nak78ka1zkfa8ckp93sasp5nlilbnp"; - name = "kdegraphics-thumbnailers-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kdegraphics-thumbnailers-17.04.3.tar.xz"; + sha256 = "041bd8in0kwma5xkdwv9304r49rim4sxc977l7dnpyf306dx48rr"; + name = "kdegraphics-thumbnailers-17.04.3.tar.xz"; }; }; kde-l10n-ar = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-ar-17.04.2.tar.xz"; - sha256 = "0w675vdbvms758y9hywjkg72sl37i2q1n8wq7mrqkvbgd7fri198"; - name = "kde-l10n-ar-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-ar-17.04.3.tar.xz"; + sha256 = "1z72mz94c95m2fq4k1aaqga8j9pnf4735radlny9ybfvv3wyliyb"; + name = "kde-l10n-ar-17.04.3.tar.xz"; }; }; kde-l10n-ast = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-ast-17.04.2.tar.xz"; - sha256 = "0v6qsn1x6rgll1hpr482jis0pljmqw0bax31a7vvr16ahp0rlrmk"; - name = "kde-l10n-ast-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-ast-17.04.3.tar.xz"; + sha256 = "0r4srnzb30c0616zl15qbadb9rpkskvdhrqhxmy5pj0vaq349y8p"; + name = "kde-l10n-ast-17.04.3.tar.xz"; }; }; kde-l10n-bg = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-bg-17.04.2.tar.xz"; - sha256 = "0hi7dvv25yji3924983k3fjgxynz1avp6l9amj7frn6g0c68lbp4"; - name = "kde-l10n-bg-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-bg-17.04.3.tar.xz"; + sha256 = "15ffbpsynzqinjvirn4aa7ij87awq4b2kv8bx6bbnpv727b34cm8"; + name = "kde-l10n-bg-17.04.3.tar.xz"; }; }; kde-l10n-bs = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-bs-17.04.2.tar.xz"; - sha256 = "11sikg952dv75f12rd7sky9rwamr9w4szdqkd9zw9kdgy6q2izn7"; - name = "kde-l10n-bs-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-bs-17.04.3.tar.xz"; + sha256 = "0hc9gsw7i1wmvxd5lg3xd14njsdnfpf82km3hny46lyiqki1riyd"; + name = "kde-l10n-bs-17.04.3.tar.xz"; }; }; kde-l10n-ca = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-ca-17.04.2.tar.xz"; - sha256 = "0s4j2vqxbpbsira0zyxz13kd59iicam2fhqz6xnlrd769vbfcbbv"; - name = "kde-l10n-ca-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-ca-17.04.3.tar.xz"; + sha256 = "0h6aj2hi1gyjq7prza9v207ipcis32hr2a76i5rrbnf5c8hpih1r"; + name = "kde-l10n-ca-17.04.3.tar.xz"; }; }; kde-l10n-ca_valencia = { - version = "ca_valencia-17.04.2"; + version = "ca_valencia-17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-ca@valencia-17.04.2.tar.xz"; - sha256 = "1dib0xvjcpg996smni56vncdq9wb9jcfr4abvqm7x3v50ip95f7f"; - name = "kde-l10n-ca_valencia-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-ca@valencia-17.04.3.tar.xz"; + sha256 = "1bvl1v9niqb9h2ilji70qfcybx7lraszkimbi6zawvimj5y68jfg"; + name = "kde-l10n-ca_valencia-17.04.3.tar.xz"; }; }; kde-l10n-cs = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-cs-17.04.2.tar.xz"; - sha256 = "05hjzfrzafb9xabsb15lq5hl152brqf68hvl3h0vsmxyw7hqzxrj"; - name = "kde-l10n-cs-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-cs-17.04.3.tar.xz"; + sha256 = "0miqxwhbcqzds8lgq5g7zb2w0gkx3y7g45vq989641jaqqlfca1c"; + name = "kde-l10n-cs-17.04.3.tar.xz"; }; }; kde-l10n-da = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-da-17.04.2.tar.xz"; - sha256 = "05g8vh33fxvi6dmj6ryr6i2j3l4fd4cj3dkzch76bgvi00750fah"; - name = "kde-l10n-da-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-da-17.04.3.tar.xz"; + sha256 = "0j7j9b9i81984fyh7g5yv9j0gasws9hz648ycqi96k43zs80cahb"; + name = "kde-l10n-da-17.04.3.tar.xz"; }; }; kde-l10n-de = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-de-17.04.2.tar.xz"; - sha256 = "1hiqbscd2py88z45g7blbj74ayqj4mmgy0b8z6hcxn9n0ph4sidb"; - name = "kde-l10n-de-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-de-17.04.3.tar.xz"; + sha256 = "0ra0idakfiggiw8x67iw4jbv9g2g0ypcskgcjzvwm61q9dqnr6hy"; + name = "kde-l10n-de-17.04.3.tar.xz"; }; }; kde-l10n-el = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-el-17.04.2.tar.xz"; - sha256 = "066n3r1vi9j8nln4xyhgpjhsl7gwhl6q7gqbdcp6zpwgxhwv6zic"; - name = "kde-l10n-el-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-el-17.04.3.tar.xz"; + sha256 = "1lmxrx7vkdpa9m730his0z9ry6nvycp4428waz0r4wxqqfz1acwr"; + name = "kde-l10n-el-17.04.3.tar.xz"; }; }; kde-l10n-en_GB = { - version = "en_GB-17.04.2"; + version = "en_GB-17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-en_GB-17.04.2.tar.xz"; - sha256 = "1307v713djkhny8rcg2schcwljn1cp728yllh227m30znprrqn41"; - name = "kde-l10n-en_GB-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-en_GB-17.04.3.tar.xz"; + sha256 = "1mr9rgxklfnmhd7yb5h3hddjjn1qxxbqw16sn5d1d077p3wz6896"; + name = "kde-l10n-en_GB-17.04.3.tar.xz"; }; }; kde-l10n-eo = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-eo-17.04.2.tar.xz"; - sha256 = "06i2m3g4s4raa1vzynfw5m89ydkcgjlbd96a4qxx76v888q65lsl"; - name = "kde-l10n-eo-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-eo-17.04.3.tar.xz"; + sha256 = "1aq501z6mnpp8h354p45wwxs4fbfawm0dj67xh74xcr6sh0nj3ap"; + name = "kde-l10n-eo-17.04.3.tar.xz"; }; }; kde-l10n-es = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-es-17.04.2.tar.xz"; - sha256 = "1al4figznf5f6lgpz2l57x01n87jlaqxldgp7gi545672lxzyx44"; - name = "kde-l10n-es-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-es-17.04.3.tar.xz"; + sha256 = "1hk8731avlmirzhv2sckrqaf4ykgvy2brnq0a86dr4n95138hhmw"; + name = "kde-l10n-es-17.04.3.tar.xz"; }; }; kde-l10n-et = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-et-17.04.2.tar.xz"; - sha256 = "1dhqk1sj32pij4wc4pgfih3i8g3jf9b223rnraymhbsima200hx4"; - name = "kde-l10n-et-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-et-17.04.3.tar.xz"; + sha256 = "0cdy7mmjg8q5s19lqjsbhn64h3fk6f8y0j3ldvnmc4wj24gfnc5n"; + name = "kde-l10n-et-17.04.3.tar.xz"; }; }; kde-l10n-eu = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-eu-17.04.2.tar.xz"; - sha256 = "0kix9qs15488ns71hv67yvp3w03n68lxjll6cjxhyhrfcji9ldwc"; - name = "kde-l10n-eu-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-eu-17.04.3.tar.xz"; + sha256 = "06c2940qsqf03acly35jpcnsljzq20mljmlzx9234i7gqr88g74r"; + name = "kde-l10n-eu-17.04.3.tar.xz"; }; }; kde-l10n-fa = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-fa-17.04.2.tar.xz"; - sha256 = "1867hgiqh51f6nzdmkq6nplnq7hs22lvzpishckhzw8x770sv10b"; - name = "kde-l10n-fa-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-fa-17.04.3.tar.xz"; + sha256 = "1q3a2dyvrk22azj0rngb8h0dh88aczsxys7aaf4yvvwsdm7zbj8k"; + name = "kde-l10n-fa-17.04.3.tar.xz"; }; }; kde-l10n-fi = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-fi-17.04.2.tar.xz"; - sha256 = "1p4agangwvdzcx9029wslq5228wkgk4kpxddi2alzhlcxd25fk7b"; - name = "kde-l10n-fi-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-fi-17.04.3.tar.xz"; + sha256 = "0hfzs1g5ikz6cgjss7kibxx2vd0zxn9rny7br4ysp1x89nz5qb34"; + name = "kde-l10n-fi-17.04.3.tar.xz"; }; }; kde-l10n-fr = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-fr-17.04.2.tar.xz"; - sha256 = "0lby60rklzcjk62qw2inslvhv4fli57kjn6a76hidcwvwmi3kcyh"; - name = "kde-l10n-fr-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-fr-17.04.3.tar.xz"; + sha256 = "14i752qqdzdgbxh8r9rmjmjjsmhhh6vpcna3gp8g577r7y8rqpwk"; + name = "kde-l10n-fr-17.04.3.tar.xz"; }; }; kde-l10n-ga = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-ga-17.04.2.tar.xz"; - sha256 = "06xkiizvcsg61ww8gdqjn84ymhwcxr9pkf8p0g5mrplvnxc9v1ys"; - name = "kde-l10n-ga-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-ga-17.04.3.tar.xz"; + sha256 = "164jc111sgj8mqcvvqx8yccjjinvk5h7g5z4a964dwhh587xir1h"; + name = "kde-l10n-ga-17.04.3.tar.xz"; }; }; kde-l10n-gl = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-gl-17.04.2.tar.xz"; - sha256 = "059xv4a7mgf16h3wj2m4j1f32r8msvk0fdw62dlfypk0xi8lnzch"; - name = "kde-l10n-gl-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-gl-17.04.3.tar.xz"; + sha256 = "1c5vz652fd91pxx8p5savcfjg40ks96qay8djjvjznhs8rpkmxf9"; + name = "kde-l10n-gl-17.04.3.tar.xz"; }; }; kde-l10n-he = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-he-17.04.2.tar.xz"; - sha256 = "1w3rc832ngw91m1yrd988hxp8y0aaqgvkizkgmjiki0gqk3fkj25"; - name = "kde-l10n-he-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-he-17.04.3.tar.xz"; + sha256 = "142np920w44jwrkkrbplnfdyxpf72c0r86zwfdps7cc2giycj793"; + name = "kde-l10n-he-17.04.3.tar.xz"; }; }; kde-l10n-hi = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-hi-17.04.2.tar.xz"; - sha256 = "1kd4yxq3m5kg3crn6w86aiipslkfa4z79prm3fd6d4a5zpacmqbf"; - name = "kde-l10n-hi-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-hi-17.04.3.tar.xz"; + sha256 = "17r2rfzk7773zxj454zm33fysd0jfc0kaji2pcpi27skypxcrsl7"; + name = "kde-l10n-hi-17.04.3.tar.xz"; }; }; kde-l10n-hr = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-hr-17.04.2.tar.xz"; - sha256 = "1m3avcrbyz31ir8qwwf9lhl4xr4qg241j99jbv28mgmsiv73ifji"; - name = "kde-l10n-hr-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-hr-17.04.3.tar.xz"; + sha256 = "08fak1f5f5228djl28l8xx026mxq5khklvklss8fi42l57091azv"; + name = "kde-l10n-hr-17.04.3.tar.xz"; }; }; kde-l10n-hu = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-hu-17.04.2.tar.xz"; - sha256 = "1vh94d0ffjak5gwf4flgc2giq6vswyh57i334sq7n3vbpg6rwh7s"; - name = "kde-l10n-hu-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-hu-17.04.3.tar.xz"; + sha256 = "0i5lgkdxs81kjhjrhzjdk0ayp28vdigrsfv1n6k0aqj3jzfpbhbz"; + name = "kde-l10n-hu-17.04.3.tar.xz"; }; }; kde-l10n-ia = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-ia-17.04.2.tar.xz"; - sha256 = "0k391rwrrj6bd86nd791pk0ih7g3z1b7vva43dmlishh5xind12p"; - name = "kde-l10n-ia-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-ia-17.04.3.tar.xz"; + sha256 = "18bgdyazgqcslyajz97g0s96linx89ngr916zqknz64xqhxdhvdy"; + name = "kde-l10n-ia-17.04.3.tar.xz"; }; }; kde-l10n-id = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-id-17.04.2.tar.xz"; - sha256 = "13pfybpngzv1lscd3q4x4qh8kxs2k7md9biyibrs1vpyr28jw01c"; - name = "kde-l10n-id-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-id-17.04.3.tar.xz"; + sha256 = "0dncq9p12bgn4d6zra4skk6mb1ivnswn0z51llqrma90271ibflr"; + name = "kde-l10n-id-17.04.3.tar.xz"; }; }; kde-l10n-is = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-is-17.04.2.tar.xz"; - sha256 = "19cngzf26438amwfc7prz6hrszlqr78j2w9djm7y24gy7r6blfjq"; - name = "kde-l10n-is-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-is-17.04.3.tar.xz"; + sha256 = "1pkp87di1da6f2f9jjsj7li19d8pcn5ljhk1fhbrqc9b3whaansm"; + name = "kde-l10n-is-17.04.3.tar.xz"; }; }; kde-l10n-it = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-it-17.04.2.tar.xz"; - sha256 = "0wfsvrhmmarl277qvgwh4w9nl3rcqslkd4fjsl88m7230xzcjy6k"; - name = "kde-l10n-it-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-it-17.04.3.tar.xz"; + sha256 = "0n468q4z29mfl9b4a4clmv643p6fhlhf5mhsfl6dsi4l0v9a15mk"; + name = "kde-l10n-it-17.04.3.tar.xz"; }; }; kde-l10n-ja = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-ja-17.04.2.tar.xz"; - sha256 = "1b41f8pki75rc2swjaf1hvdvvjqvfz0glawrh4dda872naw65mhy"; - name = "kde-l10n-ja-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-ja-17.04.3.tar.xz"; + sha256 = "00q937jdq6c2q2x75ky2xyfij0654xfzjm904j6kimvmpkyc33xk"; + name = "kde-l10n-ja-17.04.3.tar.xz"; }; }; kde-l10n-kk = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-kk-17.04.2.tar.xz"; - sha256 = "01jrsjwlv10qdyzlwljf74cdwxprmsfvhi1pdlhv271z2ix661w5"; - name = "kde-l10n-kk-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-kk-17.04.3.tar.xz"; + sha256 = "1srjbxg969rhzqw81vy8kab9pkasp061i4r5ark8rg8k7agjdcml"; + name = "kde-l10n-kk-17.04.3.tar.xz"; }; }; kde-l10n-km = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-km-17.04.2.tar.xz"; - sha256 = "1fw62awnkmk7q4ybjqiszj8d0jkmm247lq25l6h8zsmidc9x4xz9"; - name = "kde-l10n-km-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-km-17.04.3.tar.xz"; + sha256 = "1szigmhybhfa70lg2wzpkzja73c20szzr8wawjzy869ql8fcip3w"; + name = "kde-l10n-km-17.04.3.tar.xz"; }; }; kde-l10n-ko = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-ko-17.04.2.tar.xz"; - sha256 = "1b5pqr5q7kn4vh7p8kngsw82ya7lv1jzbn8ngzrr8qkf6hh6ig2a"; - name = "kde-l10n-ko-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-ko-17.04.3.tar.xz"; + sha256 = "1j9zgf9pl3nns5a8jdd2ggragq2ln3x11h7y2apkffihyd0kz40v"; + name = "kde-l10n-ko-17.04.3.tar.xz"; }; }; kde-l10n-lt = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-lt-17.04.2.tar.xz"; - sha256 = "06pn3dx7dx26w16lfcwdrzphakvnk709bs5mki9p08pdmamjdr7w"; - name = "kde-l10n-lt-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-lt-17.04.3.tar.xz"; + sha256 = "1rpia72cz2a3knxzzanhhpqp3r89mj5dn4yh9ym81xw6s4acz5fg"; + name = "kde-l10n-lt-17.04.3.tar.xz"; }; }; kde-l10n-lv = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-lv-17.04.2.tar.xz"; - sha256 = "0a2kchx1qkyqzmqa7ajadfpxa5zywyhv55db5qax2xncz1w7v515"; - name = "kde-l10n-lv-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-lv-17.04.3.tar.xz"; + sha256 = "1vpdgq90ph7c6yjvn0ijdq7ry699m03i7857sxq9vsgy4hi7xi14"; + name = "kde-l10n-lv-17.04.3.tar.xz"; }; }; kde-l10n-mr = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-mr-17.04.2.tar.xz"; - sha256 = "0mjg9v484ayafgdz0z6ahsqsdlyn3iv9sa0xwg2x2fc04r5k5dni"; - name = "kde-l10n-mr-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-mr-17.04.3.tar.xz"; + sha256 = "1rfp5bi6xpdc503id328h8jl6z8alzjvg24dspaj209390hvldqv"; + name = "kde-l10n-mr-17.04.3.tar.xz"; }; }; kde-l10n-nb = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-nb-17.04.2.tar.xz"; - sha256 = "0bxq83qg39ivcr0qvxb0cd0q9mkjwp9j4h86s14wp5yq6jp0vcni"; - name = "kde-l10n-nb-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-nb-17.04.3.tar.xz"; + sha256 = "1d25ffix6pakdcpcr2qz1h6729550l9ba93z545n0psjgqpwvmmr"; + name = "kde-l10n-nb-17.04.3.tar.xz"; }; }; kde-l10n-nds = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-nds-17.04.2.tar.xz"; - sha256 = "0rpdbk83rmj24m3by7igvab5aaskizfqxwfyvcjj0zhxpals0px4"; - name = "kde-l10n-nds-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-nds-17.04.3.tar.xz"; + sha256 = "0pvx1rm6bx9xwyl4zfcw52mwif06350i9wmwz0kxxg3zs7lqb7h3"; + name = "kde-l10n-nds-17.04.3.tar.xz"; }; }; kde-l10n-nl = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-nl-17.04.2.tar.xz"; - sha256 = "180dsd92qap14pkqr4xv63zdaqz4s1jyx590d705yvbf3mkc1bwx"; - name = "kde-l10n-nl-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-nl-17.04.3.tar.xz"; + sha256 = "1ivm2qsl0dmkrgmddnp3cjmcjc6jag0wawhklacp1c9iscfcrppm"; + name = "kde-l10n-nl-17.04.3.tar.xz"; }; }; kde-l10n-nn = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-nn-17.04.2.tar.xz"; - sha256 = "1vbb3jvhhv8pksff8330i2b2qjksb4lksw3pb52ph2h77gb36bh3"; - name = "kde-l10n-nn-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-nn-17.04.3.tar.xz"; + sha256 = "0jsx980g7zn8m9xd7ljiqz1w9cvlgy84bl6hjhi0a89mfwkd27lg"; + name = "kde-l10n-nn-17.04.3.tar.xz"; }; }; kde-l10n-pa = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-pa-17.04.2.tar.xz"; - sha256 = "0v0a6bcrnrpy2ayj7d4v6lfgaxly3nk3d6dgmy26nydgmyg0xfsa"; - name = "kde-l10n-pa-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-pa-17.04.3.tar.xz"; + sha256 = "149d7pdxb0543c36gyxidd7z4j2jw5nbilv7c561j3zazbbcg4nm"; + name = "kde-l10n-pa-17.04.3.tar.xz"; }; }; kde-l10n-pl = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-pl-17.04.2.tar.xz"; - sha256 = "0chzlzyxjhh1rv4gl7pbph7fs09p932mkl7az8yihj3zl5cvw82n"; - name = "kde-l10n-pl-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-pl-17.04.3.tar.xz"; + sha256 = "04zxzx8586328v9dw6w5igxa95i7raqzpvdxshphv3wfnjgbzad5"; + name = "kde-l10n-pl-17.04.3.tar.xz"; }; }; kde-l10n-pt = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-pt-17.04.2.tar.xz"; - sha256 = "14yp29l7fb2jlpx2dd12zn64q39yf7p9p79iynjsg3spwfdm5zpi"; - name = "kde-l10n-pt-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-pt-17.04.3.tar.xz"; + sha256 = "009dnijcznzaf6p85mg3j7s4zhjfmk4smk8bkns6pjn1r2wdpfbi"; + name = "kde-l10n-pt-17.04.3.tar.xz"; }; }; kde-l10n-pt_BR = { - version = "pt_BR-17.04.2"; + version = "pt_BR-17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-pt_BR-17.04.2.tar.xz"; - sha256 = "12g1mbdhw18pga063gczsxvmigdwgncc0qk8vy1rj6h5q3w6kkfm"; - name = "kde-l10n-pt_BR-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-pt_BR-17.04.3.tar.xz"; + sha256 = "07ird1j382m8c9459nvhmw0jy8i8ri5wmh6h7m36b8m4i7cbfdcx"; + name = "kde-l10n-pt_BR-17.04.3.tar.xz"; }; }; kde-l10n-ro = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-ro-17.04.2.tar.xz"; - sha256 = "0sqym2mx927pfvdq5lny64scg80xyrz3q1vlg3sk8gyil0n942gv"; - name = "kde-l10n-ro-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-ro-17.04.3.tar.xz"; + sha256 = "1zs9yxv7566yi7rz9z9zk7mzq2rkh50y6s92sp52wyzsr3q4pl9j"; + name = "kde-l10n-ro-17.04.3.tar.xz"; }; }; kde-l10n-ru = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-ru-17.04.2.tar.xz"; - sha256 = "1gcy1ssir2fgg1djv7jbh9jv3y1pxs3yrxaqdd0m4zdkva1knx5p"; - name = "kde-l10n-ru-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-ru-17.04.3.tar.xz"; + sha256 = "12a5s73rwnx25vvwdgqis24q26x8kg6zrin3gili4kdmfxr0x27i"; + name = "kde-l10n-ru-17.04.3.tar.xz"; }; }; kde-l10n-sk = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-sk-17.04.2.tar.xz"; - sha256 = "0yq5b9z77bijfa3y1dx2d6avpirwzbdsz9zng93r8a3lzyv3syfi"; - name = "kde-l10n-sk-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-sk-17.04.3.tar.xz"; + sha256 = "0s3s94nb7dl7pdfm5pa7cw66q4vvjqqmv6rrzriia3z1dgg0n9y4"; + name = "kde-l10n-sk-17.04.3.tar.xz"; }; }; kde-l10n-sl = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-sl-17.04.2.tar.xz"; - sha256 = "1k117r37waxlxhdhlh7s2fii2iyv8himfkxnbm4lcxfbmhqj82cn"; - name = "kde-l10n-sl-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-sl-17.04.3.tar.xz"; + sha256 = "1n0bj63inj5j9zxqfimza7frqikzyxjr7cyfaqa46ck2wcawhmwm"; + name = "kde-l10n-sl-17.04.3.tar.xz"; }; }; kde-l10n-sr = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-sr-17.04.2.tar.xz"; - sha256 = "17xpb1q7qamz70qbg2k9i4jfbz1qsv4n0j5hw4ix9bm2dncaaqa9"; - name = "kde-l10n-sr-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-sr-17.04.3.tar.xz"; + sha256 = "0cs5rab87yydwpg6pql67x05802yzdj28y6rfzc0z0kr4diay34h"; + name = "kde-l10n-sr-17.04.3.tar.xz"; }; }; kde-l10n-sv = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-sv-17.04.2.tar.xz"; - sha256 = "1xlzc96pcwlbja3m0m15ii8n4lxf8h8ganyyh43zgxikcibcny70"; - name = "kde-l10n-sv-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-sv-17.04.3.tar.xz"; + sha256 = "01f8zr3rf8zvsd0v69vyy45nn7bq9zlxf6f5lgr0i1yd4xjz6fvn"; + name = "kde-l10n-sv-17.04.3.tar.xz"; }; }; kde-l10n-tr = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-tr-17.04.2.tar.xz"; - sha256 = "1fmmwv85cgazk655hdaykljjrh4cgghh0wkjf57n8lkkc7503278"; - name = "kde-l10n-tr-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-tr-17.04.3.tar.xz"; + sha256 = "082xrk31hajdq9hhnxh7z6ngn56q2adn8xjwkfizjyl3frf8ksya"; + name = "kde-l10n-tr-17.04.3.tar.xz"; }; }; kde-l10n-ug = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-ug-17.04.2.tar.xz"; - sha256 = "0l350qq3bfbvs7621lrl9azlx4mw5vdlrndp606v878abxaw16bh"; - name = "kde-l10n-ug-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-ug-17.04.3.tar.xz"; + sha256 = "01k9mchkkwyka0sgwg1mx0j1sax227s4mnm74vmpshj651nxqm3r"; + name = "kde-l10n-ug-17.04.3.tar.xz"; }; }; kde-l10n-uk = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-uk-17.04.2.tar.xz"; - sha256 = "1xnkknd2k8zdiq322nbiim9hg7gvww5zv3x7gqjrrqy7nha75mh4"; - name = "kde-l10n-uk-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-uk-17.04.3.tar.xz"; + sha256 = "1nwlqbr8cxcs2ny85bmzn549j66b1d7fiswlwgrvjlqj4mav3cwz"; + name = "kde-l10n-uk-17.04.3.tar.xz"; }; }; kde-l10n-wa = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-wa-17.04.2.tar.xz"; - sha256 = "1f9sphx3rlc5m1ji0ihxs3p6wb7b53acfjyd5vps3b3cbf3j4aa3"; - name = "kde-l10n-wa-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-wa-17.04.3.tar.xz"; + sha256 = "13flih2ca2r8l3favp0xw1hcvwd07dsj64rmg6s2ysk3pcizy3i8"; + name = "kde-l10n-wa-17.04.3.tar.xz"; }; }; kde-l10n-zh_CN = { - version = "zh_CN-17.04.2"; + version = "zh_CN-17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-zh_CN-17.04.2.tar.xz"; - sha256 = "1258f5s3pg6a9mfniwdf44w3y6pnf14m8nmqpfy534z68ypw6ymw"; - name = "kde-l10n-zh_CN-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-zh_CN-17.04.3.tar.xz"; + sha256 = "02gzlwbq1zqaa1kqk7pd55yv7agg7igbb2147yvdj9462igpzjyi"; + name = "kde-l10n-zh_CN-17.04.3.tar.xz"; }; }; kde-l10n-zh_TW = { - version = "zh_TW-17.04.2"; + version = "zh_TW-17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-zh_TW-17.04.2.tar.xz"; - sha256 = "0qz66hz1yabdgx3yq7cc6i5w9m01yp8pjrh46blskq6apwfwdhmg"; - name = "kde-l10n-zh_TW-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-zh_TW-17.04.3.tar.xz"; + sha256 = "0x1nwahmh6142g21a949hibmx2slgbvrp5iwq137zmzmxffp7y9h"; + name = "kde-l10n-zh_TW-17.04.3.tar.xz"; }; }; kdelibs = { - version = "4.14.33"; + version = "4.14.34"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kdelibs-4.14.33.tar.xz"; - sha256 = "0594ak7d93sqk293p3jdi0mad2wwglk7m7x6sgj2jgaxjn3c5amq"; - name = "kdelibs-4.14.33.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kdelibs-4.14.34.tar.xz"; + sha256 = "1yxwz6dln7km22cwxsns2rxxmw5p1c126xqnczz5fcjvalrk8zbp"; + name = "kdelibs-4.14.34.tar.xz"; }; }; kdenetwork-filesharing = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kdenetwork-filesharing-17.04.2.tar.xz"; - sha256 = "1fac78wbh61vsk1ibkvhffgnlpds9a6ax6jyly2n9lrcqifann64"; - name = "kdenetwork-filesharing-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kdenetwork-filesharing-17.04.3.tar.xz"; + sha256 = "0r16jgsp45cf7gyjii04gq12wm68j86mrz4502szq0c02hfnmrsd"; + name = "kdenetwork-filesharing-17.04.3.tar.xz"; }; }; kdenlive = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kdenlive-17.04.2.tar.xz"; - sha256 = "1jzwar4bdjrbf97i9g6njzibv3ywcwha4cjkmj70pql67d5nmki9"; - name = "kdenlive-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kdenlive-17.04.3.tar.xz"; + sha256 = "1n4x12pri0kw0lk3376l2059rnabi4c54ax8bdmx39hhn7lqxv45"; + name = "kdenlive-17.04.3.tar.xz"; }; }; kdepim-addons = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kdepim-addons-17.04.2.tar.xz"; - sha256 = "08hcgkjk3mwlg07g5k2b02kc67xyp2kxgh80f0v342kg455lq3fw"; - name = "kdepim-addons-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kdepim-addons-17.04.3.tar.xz"; + sha256 = "118n8jdpjr50wgf45y2gzbqljbyichg4a6df014cdi0qcc55mcdl"; + name = "kdepim-addons-17.04.3.tar.xz"; }; }; kdepim-apps-libs = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kdepim-apps-libs-17.04.2.tar.xz"; - sha256 = "1ala5hqzhpny0sncm96kpalj7dxkh06p6j0sk3725lpjqhr1ng15"; - name = "kdepim-apps-libs-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kdepim-apps-libs-17.04.3.tar.xz"; + sha256 = "154057mxhkhm4lwlm49lx2m02qkddv0w96ikani7prb5p0kdw09i"; + name = "kdepim-apps-libs-17.04.3.tar.xz"; }; }; kdepim-runtime = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kdepim-runtime-17.04.2.tar.xz"; - sha256 = "16crq3yc7djsas9klg1vl9nmk27fqj9770lfpysgz0pglb6j6k92"; - name = "kdepim-runtime-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kdepim-runtime-17.04.3.tar.xz"; + sha256 = "07fcrvs9aqjxn7big60hh9hcd6mg211cmk69wdhhi455arjsfpzq"; + name = "kdepim-runtime-17.04.3.tar.xz"; }; }; kde-runtime = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kde-runtime-17.04.2.tar.xz"; - sha256 = "1885cyarf6g460mnfl1wij0xg5n4z7w406lmlrk1w4h90ql48j69"; - name = "kde-runtime-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kde-runtime-17.04.3.tar.xz"; + sha256 = "05dshxx8bx872c4vp42i9n0dv19zq79p5m1lpd9kvmfpk3cvpxin"; + name = "kde-runtime-17.04.3.tar.xz"; }; }; kdesdk-kioslaves = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kdesdk-kioslaves-17.04.2.tar.xz"; - sha256 = "10sigid2zwgjfw737gr4wmm2ajx31v1y8y28l7dqd6y4jlkzf34j"; - name = "kdesdk-kioslaves-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kdesdk-kioslaves-17.04.3.tar.xz"; + sha256 = "1j9m08r8jpdq5fqp9irvbqyb37maah1wz2xg4byinrn9qqp76dfl"; + name = "kdesdk-kioslaves-17.04.3.tar.xz"; }; }; kdesdk-thumbnailers = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kdesdk-thumbnailers-17.04.2.tar.xz"; - sha256 = "1bq36gqqkf2cklj6rh35r88d4vknn22p0x3p6mq9ixca0sw7yc4a"; - name = "kdesdk-thumbnailers-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kdesdk-thumbnailers-17.04.3.tar.xz"; + sha256 = "0jjaajz3yxghm7phzhw3cgc0y4kgsc1vs0yc1w4cn8kmipal0x1q"; + name = "kdesdk-thumbnailers-17.04.3.tar.xz"; }; }; kdf = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kdf-17.04.2.tar.xz"; - sha256 = "00g9jyl4bxmrbxri1q3893gw362v4rzp0gpc94d46v2vi6xqb501"; - name = "kdf-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kdf-17.04.3.tar.xz"; + sha256 = "1d5nrp3x7r5fvghj7acrjhbz6n2cvd2qr60s6i0za7703b5iflyr"; + name = "kdf-17.04.3.tar.xz"; }; }; kdialog = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kdialog-17.04.2.tar.xz"; - sha256 = "184fyajhv4isirlv4sp8w2zxr7zkijknhsh6a1qpvr1r48ivw5aw"; - name = "kdialog-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kdialog-17.04.3.tar.xz"; + sha256 = "15b5qhxy387wpv2hx6hw31r3lyh7j30vwzn9q474vsmp6jj2zq5m"; + name = "kdialog-17.04.3.tar.xz"; }; }; kdiamond = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kdiamond-17.04.2.tar.xz"; - sha256 = "0krnb2g63zww655xmx1yn1105zkqryid5ip2vkn3cva2l1x8zfwr"; - name = "kdiamond-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kdiamond-17.04.3.tar.xz"; + sha256 = "0ri611bmqa81qlsfqmza4n5m14hlcrljhi4xlq2h5pcmg3j8ihyj"; + name = "kdiamond-17.04.3.tar.xz"; }; }; keditbookmarks = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/keditbookmarks-17.04.2.tar.xz"; - sha256 = "12s9v5m681f9sz49h1xdnpriik8q2zswgr051kvvckbdrxj46rqc"; - name = "keditbookmarks-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/keditbookmarks-17.04.3.tar.xz"; + sha256 = "0pxrf18rml40lh2z3l8kk1nlzpdbwf3jdlzjy745fdc9x9q3phhm"; + name = "keditbookmarks-17.04.3.tar.xz"; }; }; kfilereplace = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kfilereplace-17.04.2.tar.xz"; - sha256 = "1das2szmhw3lcpl2r3cqcylx3dx3xnvqclnasr3h5ahg4z86aqhn"; - name = "kfilereplace-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kfilereplace-17.04.3.tar.xz"; + sha256 = "115p6kjax7rhz646pvfi1av7pbllh42fmykzk4ld4mblgs56nj1j"; + name = "kfilereplace-17.04.3.tar.xz"; }; }; kfind = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kfind-17.04.2.tar.xz"; - sha256 = "0d04p14fzwryf9kjx7ancqi9cfhsmy9xc9ylyi7frbafr6kac5va"; - name = "kfind-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kfind-17.04.3.tar.xz"; + sha256 = "12iaj6f1b1w3b8jnhdh0gg9k57qxmicsxw68bi0ha4i8lw6dmfc5"; + name = "kfind-17.04.3.tar.xz"; }; }; kfloppy = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kfloppy-17.04.2.tar.xz"; - sha256 = "1f2aah2kskvyxpwkglv38ql955x1870saycym20b058dirinxg42"; - name = "kfloppy-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kfloppy-17.04.3.tar.xz"; + sha256 = "0ayaslvnfhf3v082dfv62ml5ss185jkm1cx7jlqqvpn84l6vykmk"; + name = "kfloppy-17.04.3.tar.xz"; }; }; kfourinline = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kfourinline-17.04.2.tar.xz"; - sha256 = "1423hcikj2fyy26vm5nl5q5pg6xbsjppkvd6qhjwzj9csd9m2ysr"; - name = "kfourinline-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kfourinline-17.04.3.tar.xz"; + sha256 = "00ci1vbnqvr84ihdh6dcp7dw5pjqx3s40j5fafym0q2mji1q0cwj"; + name = "kfourinline-17.04.3.tar.xz"; }; }; kgeography = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kgeography-17.04.2.tar.xz"; - sha256 = "1f7g9i4a2phi5gi5h6phn4w8l1yw2hf862yl6wwsgp4lb3agwcjb"; - name = "kgeography-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kgeography-17.04.3.tar.xz"; + sha256 = "0l9923fzpq5dxjvhsbxb03fh717yrys1najqdfyw1f9vs3fmkws9"; + name = "kgeography-17.04.3.tar.xz"; }; }; kget = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kget-17.04.2.tar.xz"; - sha256 = "0hnizzplcmhvkyl270bbsi587f6adb1n6vpjji1scwnfjz42pjma"; - name = "kget-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kget-17.04.3.tar.xz"; + sha256 = "1fffkpnzhi9gl9xib398l8az16wyysjlphqga0a9a0bfkk6h884k"; + name = "kget-17.04.3.tar.xz"; }; }; kgoldrunner = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kgoldrunner-17.04.2.tar.xz"; - sha256 = "0ihh2qr7dn5ibax0ljh7ahzhr193a5ghmzgaxkfk4649qc34vnx5"; - name = "kgoldrunner-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kgoldrunner-17.04.3.tar.xz"; + sha256 = "15sjikgk1qr36r5z6fbx535i6dj1l08klihrzyymmnr1vl5s02pr"; + name = "kgoldrunner-17.04.3.tar.xz"; }; }; kgpg = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kgpg-17.04.2.tar.xz"; - sha256 = "0svr1qv9g6dm1m5ilbyws1mhrdjjq31iw0dwza3fri3vsmhhqpmx"; - name = "kgpg-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kgpg-17.04.3.tar.xz"; + sha256 = "1xdnpmrb6kd48ppvim2bs9c2abhr55f5ha25xr3r89blawmw16w0"; + name = "kgpg-17.04.3.tar.xz"; }; }; khangman = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/khangman-17.04.2.tar.xz"; - sha256 = "1g06sm5fwdhysj7hjsrdj19hdf0q1kzc5li4h6klp4gim8hzji7w"; - name = "khangman-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/khangman-17.04.3.tar.xz"; + sha256 = "0n49zhwcsb8mgn416kzvq0x97b3x8mnln480wf8nd58f63hd4hdn"; + name = "khangman-17.04.3.tar.xz"; }; }; khelpcenter = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/khelpcenter-17.04.2.tar.xz"; - sha256 = "0zggqlyfgmpxgvjy83lqah9y927xzj8dy13pih0slnk01z50386c"; - name = "khelpcenter-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/khelpcenter-17.04.3.tar.xz"; + sha256 = "1sri5vb730k5n03kiykds024kl2hyw4bhzclxy5v0x36sjdqyz1z"; + name = "khelpcenter-17.04.3.tar.xz"; }; }; kholidays = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kholidays-17.04.2.tar.xz"; - sha256 = "1cyncg08binky75n93r0l5qlx1zw73dqx3xp4i7xajc7qkmiy1x9"; - name = "kholidays-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kholidays-17.04.3.tar.xz"; + sha256 = "1hljhvlk6z3a4injfafwazai25qicmbdazj12pxb0wn5s538m9nw"; + name = "kholidays-17.04.3.tar.xz"; }; }; kidentitymanagement = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kidentitymanagement-17.04.2.tar.xz"; - sha256 = "00pxbbnl4l4cq5mlmgf89ndfy4wykbfvhslws4is6wm3qf9v99gm"; - name = "kidentitymanagement-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kidentitymanagement-17.04.3.tar.xz"; + sha256 = "17n7shm642jxnbzz11k9xrb7c3lmhzi3dabrl4qwxam1vf4zli6a"; + name = "kidentitymanagement-17.04.3.tar.xz"; }; }; kig = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kig-17.04.2.tar.xz"; - sha256 = "0w1gl28rqqprijlqsfc8x6qjjc6nylniqvlpm71rgiwyq0zpyl1p"; - name = "kig-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kig-17.04.3.tar.xz"; + sha256 = "1r8w0b99fi0jj8ah2sxgzpz93b1324d4vrrjvgz1wjcwskwqmbld"; + name = "kig-17.04.3.tar.xz"; }; }; kigo = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kigo-17.04.2.tar.xz"; - sha256 = "01yjdwcfwibw1c7dgk2alyp9mj9vy70fki0zf85gi91cwkrqklsi"; - name = "kigo-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kigo-17.04.3.tar.xz"; + sha256 = "0qx4bccniavbsy4icy98r4i3rgqcq3vw4fim9ad1ibmwsakzwrb9"; + name = "kigo-17.04.3.tar.xz"; }; }; killbots = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/killbots-17.04.2.tar.xz"; - sha256 = "09a6h7q0nwj4lk81mrh1cpi27pjyxpdrk9lr2kgmjxgksavsi1p6"; - name = "killbots-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/killbots-17.04.3.tar.xz"; + sha256 = "0hjpzkdc0rgqiawy8vqh54bb693lhps9h2x9gxjsdhmk225l44b1"; + name = "killbots-17.04.3.tar.xz"; }; }; kimagemapeditor = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kimagemapeditor-17.04.2.tar.xz"; - sha256 = "00ln9mkmsky4fjn931d6y94f34fp7p11cx2vg1rafxzygr4zv0wz"; - name = "kimagemapeditor-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kimagemapeditor-17.04.3.tar.xz"; + sha256 = "1c1gv3bac40a4ix45ydxbn5rys1z33c3ycxvii17cgv591yqrana"; + name = "kimagemapeditor-17.04.3.tar.xz"; }; }; kimap = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kimap-17.04.2.tar.xz"; - sha256 = "1g0j3n1ybx4vwyil7nic4rva2xn0dc86kbh1awcrk5q61pvkwmlr"; - name = "kimap-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kimap-17.04.3.tar.xz"; + sha256 = "0bdcxlwlr8k2ydmaimm4ja2kgg93qp0bjfl2cpsrzsfrp7fky5q2"; + name = "kimap-17.04.3.tar.xz"; }; }; kio-extras = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kio-extras-17.04.2.tar.xz"; - sha256 = "1k84yn9q5w0wsa0rfr5rkz9pnsnhpn0xmdxx2r3kriq866iy2wfh"; - name = "kio-extras-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kio-extras-17.04.3.tar.xz"; + sha256 = "10zr3gafwswnk9qzb2f0ysllzbxfzq3l482f75sfzn8i2ripd3z1"; + name = "kio-extras-17.04.3.tar.xz"; }; }; kiriki = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kiriki-17.04.2.tar.xz"; - sha256 = "116llc5p785h17wlqmy7hhjm3h8cbzsa8wh5hc13g3db58zyy3l4"; - name = "kiriki-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kiriki-17.04.3.tar.xz"; + sha256 = "1a4bnxv7y55fgkb0p0x7i09sqajsxg599zxqdfhsrm4ak6cqgkrg"; + name = "kiriki-17.04.3.tar.xz"; }; }; kiten = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kiten-17.04.2.tar.xz"; - sha256 = "0khyg5m13ax2i7ml7cf23jq5zr090vdqm03b6m1959lhk3warvjw"; - name = "kiten-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kiten-17.04.3.tar.xz"; + sha256 = "1bxj013cb9jbahjghrdiq544zm7z4l4m1yd0zm0g9in9kp7rimzz"; + name = "kiten-17.04.3.tar.xz"; }; }; kjumpingcube = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kjumpingcube-17.04.2.tar.xz"; - sha256 = "073hdjv6aa6lannn2avanjcxzgsz5pdfh5xi3r1hlmcwzwx4ydis"; - name = "kjumpingcube-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kjumpingcube-17.04.3.tar.xz"; + sha256 = "0n1lpp6mvhj65zdw19hqsi21fwmfrxng570w1sbc4nr2xq5axibn"; + name = "kjumpingcube-17.04.3.tar.xz"; }; }; kldap = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kldap-17.04.2.tar.xz"; - sha256 = "1d5fbw11hz071rk814pfqa8gy8plznnr5wx5y16vb75a4sll1iw4"; - name = "kldap-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kldap-17.04.3.tar.xz"; + sha256 = "03ynbrf5slmkdigp4wpwys1gn6iyd9n6b2ki3adcff9vb6k636kc"; + name = "kldap-17.04.3.tar.xz"; }; }; kleopatra = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kleopatra-17.04.2.tar.xz"; - sha256 = "0ph1rmxgq8n3yb61rhphw3b3kv8drdw13a418xwzc1kddpksa8r8"; - name = "kleopatra-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kleopatra-17.04.3.tar.xz"; + sha256 = "08v1gldjk0f6d3card84ml4654irxswmvcizg5zbd8cbqb3mxzpw"; + name = "kleopatra-17.04.3.tar.xz"; }; }; klettres = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/klettres-17.04.2.tar.xz"; - sha256 = "093fb3n6dza44v3dqjragwkirid86frdv2v4yf54smpj8i5ykz21"; - name = "klettres-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/klettres-17.04.3.tar.xz"; + sha256 = "1gc1haxgx380q5chzm6l7hwf9laimjff3j2dvlfcqjq6hjjdasfw"; + name = "klettres-17.04.3.tar.xz"; }; }; klickety = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/klickety-17.04.2.tar.xz"; - sha256 = "18xian4xwsj7wm5i6239cnabigzy05w02gwall884xk61mjwgqi7"; - name = "klickety-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/klickety-17.04.3.tar.xz"; + sha256 = "1622y0ijw9y28i7fqbxlxj7hi1g1p5ff8dgn9f7bz02a67pdpxxz"; + name = "klickety-17.04.3.tar.xz"; }; }; klines = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/klines-17.04.2.tar.xz"; - sha256 = "0va4ia1za6mynb0xxyn1z9xag0vs3pscgwkq1jfjyrd1k5inribr"; - name = "klines-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/klines-17.04.3.tar.xz"; + sha256 = "1rzp34309ay7hrrjh6ya0ghr167dkxpkizvhz7l7dzrqv9r216wg"; + name = "klines-17.04.3.tar.xz"; }; }; klinkstatus = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/klinkstatus-17.04.2.tar.xz"; - sha256 = "0mx16r98nr8ic5j9aqy32sz946v58cdzvhja4hxy56a2619pn7p8"; - name = "klinkstatus-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/klinkstatus-17.04.3.tar.xz"; + sha256 = "0lx9f382nsl008r796bpck5f6q8iw6kh46kzkbxn6ygcc6fxz4nk"; + name = "klinkstatus-17.04.3.tar.xz"; }; }; kmag = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kmag-17.04.2.tar.xz"; - sha256 = "1aswvc7zy8sd2jplyjmn05yvz4zjsjxy7arpzr5pb6q0za1fx1f0"; - name = "kmag-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kmag-17.04.3.tar.xz"; + sha256 = "0frj2nzmkc0k8vmhhan0qb5qq519msjyz8g16yxip2wgw98n7z8w"; + name = "kmag-17.04.3.tar.xz"; }; }; kmahjongg = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kmahjongg-17.04.2.tar.xz"; - sha256 = "116ahf9yaw23bxz0hvfd8bs8276vc2nr3b383vahsgywakvcq71q"; - name = "kmahjongg-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kmahjongg-17.04.3.tar.xz"; + sha256 = "14afsfnnkdwhwqlyxvi16aldwanvn6s5nip6dy6k6aprap03y600"; + name = "kmahjongg-17.04.3.tar.xz"; }; }; kmail = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kmail-17.04.2.tar.xz"; - sha256 = "0vqhfnr9jz2yfjbk5cghmdxhdxlhk3x6mw9b33xq2cn9iink0n4l"; - name = "kmail-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kmail-17.04.3.tar.xz"; + sha256 = "0ml3vkk8d8hhhl3ir09dfn17vnkc94m8vr7fln3246w8rajzcnxb"; + name = "kmail-17.04.3.tar.xz"; }; }; kmail-account-wizard = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kmail-account-wizard-17.04.2.tar.xz"; - sha256 = "1l7fq7yzhp9ad1ij8fj47j9pq7adl9p2jgwsyg7gkhrfa8s02ygv"; - name = "kmail-account-wizard-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kmail-account-wizard-17.04.3.tar.xz"; + sha256 = "1d03kvjx92bqqh7b57kpfcy5viwkxwv4f113hw57bm6myfbv430z"; + name = "kmail-account-wizard-17.04.3.tar.xz"; }; }; kmailtransport = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kmailtransport-17.04.2.tar.xz"; - sha256 = "0yjzvfwyz546486n9d1r8lr0q41ffjlg5c3klg8zc54d8290ghdw"; - name = "kmailtransport-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kmailtransport-17.04.3.tar.xz"; + sha256 = "0d8w2xq0zjmk3h0hawsbacfvwb3s5qkzqns5hsdrf1dv7mx4w76r"; + name = "kmailtransport-17.04.3.tar.xz"; }; }; kmbox = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kmbox-17.04.2.tar.xz"; - sha256 = "0p1pf1a96h5bqhs5lmid0z9nd613x9vlwpraqdym5kyrzndvccys"; - name = "kmbox-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kmbox-17.04.3.tar.xz"; + sha256 = "1r457xa9s30hpm92cd5lga89g1y256macfmi9kj4l0vjvjphligh"; + name = "kmbox-17.04.3.tar.xz"; }; }; kmime = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kmime-17.04.2.tar.xz"; - sha256 = "1jz4bj2rgcn4fmjybvrlq5i6fpx1jzqlzk0z5dv0yrqrln20lmw8"; - name = "kmime-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kmime-17.04.3.tar.xz"; + sha256 = "107ylqgnc63l4a554c4rxp4ckyq33bgy6rwmgihysyy8ff4gfa9a"; + name = "kmime-17.04.3.tar.xz"; }; }; kmines = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kmines-17.04.2.tar.xz"; - sha256 = "0py92mbjqni0zpds8lf5wmirjwf8cw84ybirba73x6w40ysl3ny8"; - name = "kmines-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kmines-17.04.3.tar.xz"; + sha256 = "0m42zmfy51qricg9k1rf3b0bcl4cg982iazrh85qcgvpjlgba70n"; + name = "kmines-17.04.3.tar.xz"; }; }; kmix = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kmix-17.04.2.tar.xz"; - sha256 = "1dgxz6c2mm5wnmap6pj3pbiajgpm5xx1q2kklhqxc2gkqxrz25a2"; - name = "kmix-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kmix-17.04.3.tar.xz"; + sha256 = "1q5pk99hn4shfrbcfab8d1bh79i77v16q3ss2cfa6y8xkrny05rd"; + name = "kmix-17.04.3.tar.xz"; }; }; kmousetool = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kmousetool-17.04.2.tar.xz"; - sha256 = "065s73yksb39yawdz2ai221jncphanmxpxirdfnhljbg8d551k30"; - name = "kmousetool-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kmousetool-17.04.3.tar.xz"; + sha256 = "08f7lvvqks75g0bcjd0cylixa93fr85rnc5jni0ygvi02b9fiy5a"; + name = "kmousetool-17.04.3.tar.xz"; }; }; kmouth = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kmouth-17.04.2.tar.xz"; - sha256 = "1iqa059169w4r94r99w338z5mbkxhcfz6xjycrw2nkvnp5spc4mw"; - name = "kmouth-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kmouth-17.04.3.tar.xz"; + sha256 = "1x1g29ipq8v6zshhybwsm9ib8f0ks8rxyc0wjn0ncyirvrwr1ka3"; + name = "kmouth-17.04.3.tar.xz"; }; }; kmplot = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kmplot-17.04.2.tar.xz"; - sha256 = "0rdg9ywmxd0bicb030kpyhcrgbhpvaac339gxwq1q2arrczds38x"; - name = "kmplot-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kmplot-17.04.3.tar.xz"; + sha256 = "0v8v2bqarn34xahnprpyi66szaq0kjp16cqz90kk8d4ch4xnvhjv"; + name = "kmplot-17.04.3.tar.xz"; }; }; knavalbattle = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/knavalbattle-17.04.2.tar.xz"; - sha256 = "091wvhnj98s1c0as90h6qy0sx47bb95gbczljq2rrnxz6sjw3x52"; - name = "knavalbattle-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/knavalbattle-17.04.3.tar.xz"; + sha256 = "1qkpzd0fdnz6cdd308xsrk2g6s5lfpq8v5nl6rd6h6ksv599017n"; + name = "knavalbattle-17.04.3.tar.xz"; }; }; knetwalk = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/knetwalk-17.04.2.tar.xz"; - sha256 = "0g0q9m63qc33gfklpqpncvd3qdjpbjb53701ypiby3dlyb1znf3d"; - name = "knetwalk-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/knetwalk-17.04.3.tar.xz"; + sha256 = "16p7lxc4qzs4r2yjgshc8pcgpdi714rll6x0mzgsb0fdpdk3wrjg"; + name = "knetwalk-17.04.3.tar.xz"; }; }; knotes = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/knotes-17.04.2.tar.xz"; - sha256 = "1ypl677rhgq8hmy9y5zryfs4zcyzj88ajlwvsxd3lv9ybkc7ymhy"; - name = "knotes-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/knotes-17.04.3.tar.xz"; + sha256 = "0x6ymg6x3yiaz3gz9kaj88clw7ra0bbmyh230hi0s9v0x085slp3"; + name = "knotes-17.04.3.tar.xz"; }; }; kolf = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kolf-17.04.2.tar.xz"; - sha256 = "157gppkzgv3394pcxr3mc9vi0bd8hy9bjmmjcq9g8p5gdpj148ag"; - name = "kolf-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kolf-17.04.3.tar.xz"; + sha256 = "15l4pgidr6r4hh6q6c7gslh7027j1f5xxzwh5w76vlx3j0spzm7l"; + name = "kolf-17.04.3.tar.xz"; }; }; kollision = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kollision-17.04.2.tar.xz"; - sha256 = "065h6lm71h4184jk8lh1gz5bq1kyxnpyf7jg0y50q9g8fm147s5j"; - name = "kollision-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kollision-17.04.3.tar.xz"; + sha256 = "0wlwyayrcjrlgzvci3ih2as6dw38jm0j4s15c13ssr545r7mdd4m"; + name = "kollision-17.04.3.tar.xz"; }; }; kolourpaint = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kolourpaint-17.04.2.tar.xz"; - sha256 = "09kgmkqzcr534vz24w9p27zzd0hwh43cz09pjfdcgcwq5bsnni3s"; - name = "kolourpaint-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kolourpaint-17.04.3.tar.xz"; + sha256 = "1xy95vmwajlzvmaqg02ywd8ar8j0ncv0qr5gm49qc57kxnylixhj"; + name = "kolourpaint-17.04.3.tar.xz"; }; }; kompare = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kompare-17.04.2.tar.xz"; - sha256 = "0q6mi2l3bvl15qrylngdrngsvzv2dc26550pkjm1db94byx1qfk2"; - name = "kompare-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kompare-17.04.3.tar.xz"; + sha256 = "16wvfb337prnd9ncq1076hg3fz83lykpmaxmhznrjbiw8plc11n2"; + name = "kompare-17.04.3.tar.xz"; }; }; konqueror = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/konqueror-17.04.2.tar.xz"; - sha256 = "0f36frk1wzw75w982clzlfxic7nj8nmslwy2wk855p3arcrg2dcq"; - name = "konqueror-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/konqueror-17.04.3.tar.xz"; + sha256 = "08dv4w507zm1qhzis543jamggpsl2rardcvkqanlrh24v83q9zl8"; + name = "konqueror-17.04.3.tar.xz"; }; }; konquest = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/konquest-17.04.2.tar.xz"; - sha256 = "10apw2dj9xxrv4rw200lxb1iiqd2kpikb7njkf1x0h7c6lp7isxc"; - name = "konquest-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/konquest-17.04.3.tar.xz"; + sha256 = "0slnjkzlp0sk3sc5mjg27n918g4l4dsmz4ikz0cwbp46dbfz5y4c"; + name = "konquest-17.04.3.tar.xz"; }; }; konsole = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/konsole-17.04.2.tar.xz"; - sha256 = "1v37v4shq0k3kv8vqnp9b1ghdirjj3vsjcvalkiagz94w1g61vyl"; - name = "konsole-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/konsole-17.04.3.tar.xz"; + sha256 = "1dhjadpcfh4d7h3ll2sr387c3hgskx8as9p6rksjwkp05mkbgh79"; + name = "konsole-17.04.3.tar.xz"; }; }; kontact = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kontact-17.04.2.tar.xz"; - sha256 = "12gd453gdxmwbnqrlnbbqnqxd8chpf57mnjv498nhjv6sfj6mshv"; - name = "kontact-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kontact-17.04.3.tar.xz"; + sha256 = "148b86fd192nfc8yp9x5h4wwv7cnlyci1y3fb0wfl85h96d8sa5n"; + name = "kontact-17.04.3.tar.xz"; }; }; kontactinterface = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kontactinterface-17.04.2.tar.xz"; - sha256 = "1q4fdf4lglq84n0pva7fdqq4fqbwkq9g0qyp5mfq3fhvzbba3as1"; - name = "kontactinterface-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kontactinterface-17.04.3.tar.xz"; + sha256 = "0qlm7mfbhzbhfab0l9rfn5krnxlgbj9yny9bbn4isiyj8csjxmjy"; + name = "kontactinterface-17.04.3.tar.xz"; }; }; kopete = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kopete-17.04.2.tar.xz"; - sha256 = "0bicwm8r4rl4awxkpi4hin95n37yj4ln29gp0z6j97fzc7kpiqlj"; - name = "kopete-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kopete-17.04.3.tar.xz"; + sha256 = "0gz47c9i9ziamh8295r407yamlwx3lqi6f2h9xrapsac8qm4cj7c"; + name = "kopete-17.04.3.tar.xz"; }; }; korganizer = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/korganizer-17.04.2.tar.xz"; - sha256 = "0lrxy232v2gn40sd63xspyszkmqn1v6l40zcxpv9r7x62wn4v55r"; - name = "korganizer-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/korganizer-17.04.3.tar.xz"; + sha256 = "1z3vqlj1jhzvn9kq08hfpnw760yy8j4y82r151rb04c3k3x33mr7"; + name = "korganizer-17.04.3.tar.xz"; }; }; kpat = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kpat-17.04.2.tar.xz"; - sha256 = "1r8i5aisllg9ykgy75gfnma2y8v6y67fa91z6r0q16bg66l2ij44"; - name = "kpat-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kpat-17.04.3.tar.xz"; + sha256 = "0j39nvb9nvgmg9lxw70q11vj1v08zy3dpbdrzx73v2grp7mvlc14"; + name = "kpat-17.04.3.tar.xz"; }; }; kpimtextedit = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kpimtextedit-17.04.2.tar.xz"; - sha256 = "0d739nadn8n2393hq9rm2v8qx8l9jk7n1wgpbdbsddfq2lxz8g39"; - name = "kpimtextedit-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kpimtextedit-17.04.3.tar.xz"; + sha256 = "011y7f5aarznqs9ngbvi75h1z10avz1sp0286zmsi00g9733ap7h"; + name = "kpimtextedit-17.04.3.tar.xz"; }; }; kppp = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kppp-17.04.2.tar.xz"; - sha256 = "1nm6kzjdwrl7206gwd47irhkj94vifxqhikc4g8jkvfh60rh87j8"; - name = "kppp-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kppp-17.04.3.tar.xz"; + sha256 = "158zgjjlmnk2lh048c271ac9a1h70x0ihm77xr5bgnjg1yyp8lwj"; + name = "kppp-17.04.3.tar.xz"; }; }; kqtquickcharts = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kqtquickcharts-17.04.2.tar.xz"; - sha256 = "0zjb7p3yxlpz8cyczsr9xwh44l7k1ddg1zwxqah91igdk7mc620x"; - name = "kqtquickcharts-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kqtquickcharts-17.04.3.tar.xz"; + sha256 = "1v7cllvz4bhkqnqfib723psvd053wvazvvniw1w6g69lv9a6kn88"; + name = "kqtquickcharts-17.04.3.tar.xz"; }; }; krdc = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/krdc-17.04.2.tar.xz"; - sha256 = "0y8s28rwxjbpgq6kfhmrq9qr4h19iplfrgab7rb25zl881g9wycg"; - name = "krdc-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/krdc-17.04.3.tar.xz"; + sha256 = "0xi4s5w9wyrgcyqs4xixs8mcprnn3dp4p22fbgi8z8i25znd20d0"; + name = "krdc-17.04.3.tar.xz"; }; }; kremotecontrol = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kremotecontrol-17.04.2.tar.xz"; - sha256 = "1lw45vnarqw975zz38z9nnmqvk91j2viijl0sf4h2ikx0myqiif7"; - name = "kremotecontrol-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kremotecontrol-17.04.3.tar.xz"; + sha256 = "1m1yh4knmj5llrgv043j50azq5s7clfmlg8b86nasz78svbdhxwg"; + name = "kremotecontrol-17.04.3.tar.xz"; }; }; kreversi = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kreversi-17.04.2.tar.xz"; - sha256 = "1xhw4i4s7g7k3v4siprg2d1h9g4smqjwhz4qjzz236wmgky7na1b"; - name = "kreversi-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kreversi-17.04.3.tar.xz"; + sha256 = "0splganr60x9nz59jj4ysl8dk867c54k68d3pc8ac2yxhgb7qg0i"; + name = "kreversi-17.04.3.tar.xz"; }; }; krfb = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/krfb-17.04.2.tar.xz"; - sha256 = "17lcv2kplawmvakashvrpk50g5ycw5fai4fiz0ijsj05ivqmrb6z"; - name = "krfb-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/krfb-17.04.3.tar.xz"; + sha256 = "0yx19gf8mh6l5k4apfim48jw61hcllwb2nbk9d7k08nl635lxd7i"; + name = "krfb-17.04.3.tar.xz"; }; }; kross-interpreters = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kross-interpreters-17.04.2.tar.xz"; - sha256 = "0m2adnwhdclhhql0v3g2ay31g7ly67m3782ryq0vp9r8rcd5ga1b"; - name = "kross-interpreters-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kross-interpreters-17.04.3.tar.xz"; + sha256 = "1z7xnd4l1ksi0m4281pg9p0l2qv46acr1yijhrkg82va67y13r81"; + name = "kross-interpreters-17.04.3.tar.xz"; }; }; kruler = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kruler-17.04.2.tar.xz"; - sha256 = "175c67m1wi9sl6is9f5pbsb3p6siyi9w7219p4ff6wbbjqjxpj2f"; - name = "kruler-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kruler-17.04.3.tar.xz"; + sha256 = "01pab2j5jpkqxmymhkkwlaw63idmbi9pdv0974ypg209lp51nw9i"; + name = "kruler-17.04.3.tar.xz"; }; }; ksaneplugin = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/ksaneplugin-17.04.2.tar.xz"; - sha256 = "16j4mpl9ick5d43rxnwmvfsb2wr5zgpmr3mlnmn99cvpr27v9mkg"; - name = "ksaneplugin-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/ksaneplugin-17.04.3.tar.xz"; + sha256 = "0iyxzgxfvw8wk18bbhif5is8nj421rnf6hrm6jz8s1gzlamnmfkm"; + name = "ksaneplugin-17.04.3.tar.xz"; }; }; kscd = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kscd-17.04.2.tar.xz"; - sha256 = "0cgxbhmmw8n7fwin3glzgfx0m1sdx2k4yhkrjislni3raiq4rv9x"; - name = "kscd-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kscd-17.04.3.tar.xz"; + sha256 = "1c2w5kjm020930460iyq3q9jb1m3lz8cld4zmd2q7vr68ga31756"; + name = "kscd-17.04.3.tar.xz"; }; }; kshisen = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kshisen-17.04.2.tar.xz"; - sha256 = "0644aadh6svdhxb64hzhnvm11w071gax6bj30r0ad3zbqljzhnfv"; - name = "kshisen-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kshisen-17.04.3.tar.xz"; + sha256 = "14dswml5cgjr0q27gv7wgkl3mn3z2dvwa847k59s3mzpy7q45zyy"; + name = "kshisen-17.04.3.tar.xz"; }; }; ksirk = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/ksirk-17.04.2.tar.xz"; - sha256 = "0zh304xwknka6336avzpc5dvv2v6sl474d5q9vqzj8h0ybhdr5pb"; - name = "ksirk-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/ksirk-17.04.3.tar.xz"; + sha256 = "16hibmv3697wzy62p51s5nkps942dav2wk7hllaykx3qzcr3dflf"; + name = "ksirk-17.04.3.tar.xz"; }; }; ksnakeduel = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/ksnakeduel-17.04.2.tar.xz"; - sha256 = "137am9qi5wfg90b7zf4hk0nsa8pm9f8cj7iraij492d6naif8an5"; - name = "ksnakeduel-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/ksnakeduel-17.04.3.tar.xz"; + sha256 = "08v2yr8n9px55c467wyji2lmiyl1d7m7qm5ll7vynxsdzz6g02wq"; + name = "ksnakeduel-17.04.3.tar.xz"; }; }; kspaceduel = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kspaceduel-17.04.2.tar.xz"; - sha256 = "0jkr7xbgrgnwa94fdr1w03xxy75nksr31wb1sr2b3kpwp5ax1380"; - name = "kspaceduel-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kspaceduel-17.04.3.tar.xz"; + sha256 = "0y5c4hbxyl7pi4fp2zkkjmzqy27mazyh4capjnyjckqy91n3cfwa"; + name = "kspaceduel-17.04.3.tar.xz"; }; }; ksquares = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/ksquares-17.04.2.tar.xz"; - sha256 = "07fn872d126wv0gcfd58jd72ypajlpkfcd4njzj0v05x6i0njir0"; - name = "ksquares-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/ksquares-17.04.3.tar.xz"; + sha256 = "04531lg5xz9rk81l0xqvy8wlh1jmpgfc74i0drv4s712v0bvjixb"; + name = "ksquares-17.04.3.tar.xz"; }; }; kstars = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kstars-17.04.2.tar.xz"; - sha256 = "1r47l3zifb0carmgn0rv6wddqn483q9jadrwbahqp7b1yy14rkcj"; - name = "kstars-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kstars-17.04.3.tar.xz"; + sha256 = "011ncpkly5x6js9vx5d8pnrd3z9iz3zqxivx7cibjbgmwrl80dn8"; + name = "kstars-17.04.3.tar.xz"; }; }; ksudoku = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/ksudoku-17.04.2.tar.xz"; - sha256 = "11cvix24p1lpiss472yflcrwvygn0cxw4b5p9qhra643sx6bw5h5"; - name = "ksudoku-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/ksudoku-17.04.3.tar.xz"; + sha256 = "0x54jmzjz01nlsxrn1hr6my54rb58v1qdibz03a8nl7pfndq6qhi"; + name = "ksudoku-17.04.3.tar.xz"; }; }; ksystemlog = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/ksystemlog-17.04.2.tar.xz"; - sha256 = "1sw5f89khflmcbwwd1z399bwlnnl2lqp2qrj7wfdxb7s91j4jk2m"; - name = "ksystemlog-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/ksystemlog-17.04.3.tar.xz"; + sha256 = "00g7cw2g2450x2m8wip62aajs2r6knw359s5lr5cl2llzasp297i"; + name = "ksystemlog-17.04.3.tar.xz"; }; }; kteatime = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kteatime-17.04.2.tar.xz"; - sha256 = "10yqww3hybjirncjsxpya08c49ca0ac6zn6anjc1mb9nvji203xb"; - name = "kteatime-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kteatime-17.04.3.tar.xz"; + sha256 = "1cm5bmb0n8b6pxq0zbdl01mhrzh50ccrywzn2zjscbsnasnbynxk"; + name = "kteatime-17.04.3.tar.xz"; }; }; ktimer = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/ktimer-17.04.2.tar.xz"; - sha256 = "19b27l308xb70wbx06fxykdwzcan3cjf7naj51fgma4qcm6xjdir"; - name = "ktimer-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/ktimer-17.04.3.tar.xz"; + sha256 = "0s5xvm2fk0i5lyj2420c561xbf536508l1basv3dn12l9xixmbm4"; + name = "ktimer-17.04.3.tar.xz"; }; }; ktnef = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/ktnef-17.04.2.tar.xz"; - sha256 = "0vpq81gyjr14xf94h654v8cmfvndhc9wn8zznp9a7jbpzp4wdfnj"; - name = "ktnef-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/ktnef-17.04.3.tar.xz"; + sha256 = "06gyfz2xil0p9y1442dcwj3ymi1py3wrdbgkccc9vy4zpmaqmk68"; + name = "ktnef-17.04.3.tar.xz"; }; }; ktouch = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/ktouch-17.04.2.tar.xz"; - sha256 = "17chk2vzvb8manyfcsnr73pfnvy128fi8g20r1gnidhgw6ix0s1r"; - name = "ktouch-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/ktouch-17.04.3.tar.xz"; + sha256 = "0ms1cbmf21w0ypwkxi3flazkkx790kciblk1izwn3p6ywqdig0ih"; + name = "ktouch-17.04.3.tar.xz"; }; }; ktp-accounts-kcm = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/ktp-accounts-kcm-17.04.2.tar.xz"; - sha256 = "0kbnhkhw787bbgkpnchxkmwnzr2s4nqwmknzf34h613mlv7wspvg"; - name = "ktp-accounts-kcm-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/ktp-accounts-kcm-17.04.3.tar.xz"; + sha256 = "065gx0k28qialw41iqx3m25l1qppp77qssmhywb158pryy1v2clz"; + name = "ktp-accounts-kcm-17.04.3.tar.xz"; }; }; ktp-approver = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/ktp-approver-17.04.2.tar.xz"; - sha256 = "0986j2yy57jzg5z4czmrjw625ihw1393mv8h8kqipw727vvchka9"; - name = "ktp-approver-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/ktp-approver-17.04.3.tar.xz"; + sha256 = "11694778gg47fjq76rwxjibrcga7fqmnv88pmqvrb6hhskbnriav"; + name = "ktp-approver-17.04.3.tar.xz"; }; }; ktp-auth-handler = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/ktp-auth-handler-17.04.2.tar.xz"; - sha256 = "0hlch8d2fj6xnnd39v5q9vri8svn1852am1kbvvyws770kgldj49"; - name = "ktp-auth-handler-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/ktp-auth-handler-17.04.3.tar.xz"; + sha256 = "0m3s8piyhi9r11pq202ky14drhm45gxvvvy30w2x57qz9k013c67"; + name = "ktp-auth-handler-17.04.3.tar.xz"; }; }; ktp-call-ui = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/ktp-call-ui-17.04.2.tar.xz"; - sha256 = "070ms5wyifqnc64x3r835vvbvn0l253qkn1li7bkqmsjg50q5sm7"; - name = "ktp-call-ui-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/ktp-call-ui-17.04.3.tar.xz"; + sha256 = "16zz91kiyz1mnipl6sqxqrak6cfhcp195in45cvlpcm5pn7gn0x6"; + name = "ktp-call-ui-17.04.3.tar.xz"; }; }; ktp-common-internals = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/ktp-common-internals-17.04.2.tar.xz"; - sha256 = "01xrdn1609ag2kha3wp756fh4kszvcp8biky3cgp52qasmp6k4k2"; - name = "ktp-common-internals-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/ktp-common-internals-17.04.3.tar.xz"; + sha256 = "12mwfd60f7iyb0f0y3yzscw38dygakhv9xlidwy4yxj6n7xylr0k"; + name = "ktp-common-internals-17.04.3.tar.xz"; }; }; ktp-contact-list = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/ktp-contact-list-17.04.2.tar.xz"; - sha256 = "03iwx1xsd1scgw20s7n8cj7ai6cnlna19dd93s2a7r3z4jhwxkx0"; - name = "ktp-contact-list-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/ktp-contact-list-17.04.3.tar.xz"; + sha256 = "068m2nd969qrzsip4ks1zgcdardl4gzsdxm6jic04gxfhygrkllk"; + name = "ktp-contact-list-17.04.3.tar.xz"; }; }; ktp-contact-runner = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/ktp-contact-runner-17.04.2.tar.xz"; - sha256 = "1fal6g5zrh0s4wcxsqgps3a20xfdjc3pyw4dhdpgnsr6ig1z7rwn"; - name = "ktp-contact-runner-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/ktp-contact-runner-17.04.3.tar.xz"; + sha256 = "0qq1x1ip7vrjapq6aq8a7lbfcd6gn9cmal8g8247hilcjbmzlab2"; + name = "ktp-contact-runner-17.04.3.tar.xz"; }; }; ktp-desktop-applets = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/ktp-desktop-applets-17.04.2.tar.xz"; - sha256 = "0306lar375vh2wr9g2iicjawd5rm5zh7vp81jl0hgmzx7kxcjxgz"; - name = "ktp-desktop-applets-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/ktp-desktop-applets-17.04.3.tar.xz"; + sha256 = "0jsza9vaz7vn108j9c49fyqwyy2v7yjrmn3kpxn9kd4jmz81z74s"; + name = "ktp-desktop-applets-17.04.3.tar.xz"; }; }; ktp-filetransfer-handler = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/ktp-filetransfer-handler-17.04.2.tar.xz"; - sha256 = "044sr00rlcvxfw59f5m4i33jg4f8i77a8yjf3sdwjrnh03nsbjxz"; - name = "ktp-filetransfer-handler-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/ktp-filetransfer-handler-17.04.3.tar.xz"; + sha256 = "15bp0lrdingxz0sm9cxrjb3zhc1a56van2jl809v7703r3q6fliv"; + name = "ktp-filetransfer-handler-17.04.3.tar.xz"; }; }; ktp-kded-module = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/ktp-kded-module-17.04.2.tar.xz"; - sha256 = "19f5kdd3g54791a7ilsaas5ibj3f8gb889n82gh88lq7q9zrs5f3"; - name = "ktp-kded-module-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/ktp-kded-module-17.04.3.tar.xz"; + sha256 = "14jksyvl41179fm53834finmmh7pg5lyhgalvaa88dch62f3s6r7"; + name = "ktp-kded-module-17.04.3.tar.xz"; }; }; ktp-send-file = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/ktp-send-file-17.04.2.tar.xz"; - sha256 = "1ydwnmyqwbf5qjhy9w2z2788p7maa591nlc946ar32wg2sc6ik57"; - name = "ktp-send-file-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/ktp-send-file-17.04.3.tar.xz"; + sha256 = "10h7y12z4l05yblh4drngqzb77yijik28iilj619491w865kia90"; + name = "ktp-send-file-17.04.3.tar.xz"; }; }; ktp-text-ui = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/ktp-text-ui-17.04.2.tar.xz"; - sha256 = "1s5dhhc1ihnlz08a2vwalzmk6zm2kb157smn07a9ilq0l64psdqa"; - name = "ktp-text-ui-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/ktp-text-ui-17.04.3.tar.xz"; + sha256 = "1ggac4v9wiqdqihnp9ddfh20p7kli2yhikdkiv8wb2ia3836j6y1"; + name = "ktp-text-ui-17.04.3.tar.xz"; }; }; ktuberling = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/ktuberling-17.04.2.tar.xz"; - sha256 = "18krcrj9xlajj3q6vspw79snwnliqc00djpq8ra6yg2l56xqbwym"; - name = "ktuberling-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/ktuberling-17.04.3.tar.xz"; + sha256 = "0h66d6jhp9p47pb177hrjjkp0agwa4vzgjl53rib8lgv3ifyxq1d"; + name = "ktuberling-17.04.3.tar.xz"; }; }; kturtle = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kturtle-17.04.2.tar.xz"; - sha256 = "140j7xws7kfw0cf4axf0jgfk9ywvrds79906iwzf1nig8rbxrfy1"; - name = "kturtle-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kturtle-17.04.3.tar.xz"; + sha256 = "04sykc7bsvc20i0nq8h1w89gafz6cli9x1iphf0l6v8whvb7avmn"; + name = "kturtle-17.04.3.tar.xz"; }; }; kubrick = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kubrick-17.04.2.tar.xz"; - sha256 = "0pli70hkmb973j935fnjsaaml4gnck4jmzh3kph78wrhlxwqanqh"; - name = "kubrick-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kubrick-17.04.3.tar.xz"; + sha256 = "1zkjwsl7bsb170qac59psjkvdbqypfkp0s4snqvqw07jicbq75ss"; + name = "kubrick-17.04.3.tar.xz"; }; }; kwalletmanager = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kwalletmanager-17.04.2.tar.xz"; - sha256 = "1y1h7j6jg0nm5kfw03k5b9m39v5vfyflcfrfcqz4q19c3zx7msrw"; - name = "kwalletmanager-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kwalletmanager-17.04.3.tar.xz"; + sha256 = "1wz27vg9h2g7q26ii1m358b3qdnra96zp3kwlz5yn5jkgv6500cr"; + name = "kwalletmanager-17.04.3.tar.xz"; }; }; kwave = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kwave-17.04.2.tar.xz"; - sha256 = "0zk3xq76asz1lq1bvn5xyrly9qwz1bvipwsj03psckzzm0j2wx2j"; - name = "kwave-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kwave-17.04.3.tar.xz"; + sha256 = "1mps4fq351fxqpsrv74hchn64qm5407jr9vlh169khvrcjbj72xn"; + name = "kwave-17.04.3.tar.xz"; }; }; kwordquiz = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kwordquiz-17.04.2.tar.xz"; - sha256 = "00x9l00d3aq8jcg4522faj9mp94k0526i41ls3wvmfd7q1i18viz"; - name = "kwordquiz-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/kwordquiz-17.04.3.tar.xz"; + sha256 = "0kacbsr56a063586vs4if4mcqp9fwics4344ha12zh2j2clr20h3"; + name = "kwordquiz-17.04.3.tar.xz"; }; }; libgravatar = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/libgravatar-17.04.2.tar.xz"; - sha256 = "1w36qj6n40k2yxva1qw9naag6zz05gcnia3sqmfamzxdji4l3nis"; - name = "libgravatar-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/libgravatar-17.04.3.tar.xz"; + sha256 = "0mdnvr7k67v2j9x5zwfsy2d3hw6j83npcv7546yqxfv6myb0ffvc"; + name = "libgravatar-17.04.3.tar.xz"; }; }; libkcddb = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/libkcddb-17.04.2.tar.xz"; - sha256 = "0cvy01krgvayc3hmsv55rrqjp72d27fz58clzw51p6zf2kvjn4q3"; - name = "libkcddb-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/libkcddb-17.04.3.tar.xz"; + sha256 = "01mmll75l2lv0djahfaikq5nc52z3k7zlc2hx3djw9xrhhvmd63k"; + name = "libkcddb-17.04.3.tar.xz"; }; }; libkcompactdisc = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/libkcompactdisc-17.04.2.tar.xz"; - sha256 = "1ywpghj4dy8ly15g55q8mhmx85xlxz3zasblhzsyxqh6rgwhnab6"; - name = "libkcompactdisc-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/libkcompactdisc-17.04.3.tar.xz"; + sha256 = "0zr581qyf81v9sfh3qvhkjh0krzs35y0gpi4wp07df071hiddmvj"; + name = "libkcompactdisc-17.04.3.tar.xz"; }; }; libkdcraw = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/libkdcraw-17.04.2.tar.xz"; - sha256 = "17dd68wlc7528prywps7slv6f9jfzbfhfmdlv20q0lzrjlxb2jxk"; - name = "libkdcraw-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/libkdcraw-17.04.3.tar.xz"; + sha256 = "1w0zhz20vf2i55wywzf7ar5sp2paflbxjg3r35p6wpfrlafzvnjw"; + name = "libkdcraw-17.04.3.tar.xz"; }; }; libkdegames = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/libkdegames-17.04.2.tar.xz"; - sha256 = "07vs2077w7g6hvzaa9m7p6w3qc9daly174x7sq5an3wxb78zaj4k"; - name = "libkdegames-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/libkdegames-17.04.3.tar.xz"; + sha256 = "02j5kmbnxnmgf0vnmz6hzmkz5jc4aw2vm8gnjvs4l2hzcf7f82p8"; + name = "libkdegames-17.04.3.tar.xz"; }; }; libkdepim = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/libkdepim-17.04.2.tar.xz"; - sha256 = "1s6vvbxjrhvgc147ila9ryy5z1c76dqc9nrxdblkdk36kgj193xs"; - name = "libkdepim-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/libkdepim-17.04.3.tar.xz"; + sha256 = "0a0kxx99swyw31bf9npbfa5smavpar2qg593dvg1basdy102lpcv"; + name = "libkdepim-17.04.3.tar.xz"; }; }; libkeduvocdocument = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/libkeduvocdocument-17.04.2.tar.xz"; - sha256 = "1lakkz3ffp3qkhp15l8g04f1izgigv96ravj13yqvlafcj0l4wwh"; - name = "libkeduvocdocument-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/libkeduvocdocument-17.04.3.tar.xz"; + sha256 = "1z138s14cd7cfgv442i848m4w71f6442rjm8cghbd8m4kbd3m8yg"; + name = "libkeduvocdocument-17.04.3.tar.xz"; }; }; libkexiv2 = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/libkexiv2-17.04.2.tar.xz"; - sha256 = "113gfmdvk85mlgq97hi5n4sn0ar55qy4lvrngzp70hr5gyk6jx87"; - name = "libkexiv2-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/libkexiv2-17.04.3.tar.xz"; + sha256 = "035akzr9f7f9k86j1ihx9ql574vjfm3ai792k8h46xh9d7xn385q"; + name = "libkexiv2-17.04.3.tar.xz"; }; }; libkface = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/libkface-17.04.2.tar.xz"; - sha256 = "04cp6fqji8s6zsv09nbdkv9ikff5df5gb2nqbfdhh5hdyl5k9a6y"; - name = "libkface-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/libkface-17.04.3.tar.xz"; + sha256 = "081ghj31f39xxq692ad5a32w8kaks7xyl3xmcmgl0sp7yac102ar"; + name = "libkface-17.04.3.tar.xz"; }; }; libkgapi = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/libkgapi-17.04.2.tar.xz"; - sha256 = "1awcfwf1haa38vnr5273y5xk9b64s7m139aqgyr7r72czm96ql8s"; - name = "libkgapi-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/libkgapi-17.04.3.tar.xz"; + sha256 = "1j6lg6mdd7bhapdkfpicksbd9y9b4qh0f9m3k3yddx318n49nl8r"; + name = "libkgapi-17.04.3.tar.xz"; }; }; libkgeomap = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/libkgeomap-17.04.2.tar.xz"; - sha256 = "0gbri3vfan9n3za0qd5bzbwvmkslbsylg5rw11zlcl9r8c5yz23p"; - name = "libkgeomap-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/libkgeomap-17.04.3.tar.xz"; + sha256 = "1zc4ja631f54xk1mycda1h4c3wdhq9ggn67xn68jrlv4wrsm3ly1"; + name = "libkgeomap-17.04.3.tar.xz"; }; }; libkipi = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/libkipi-17.04.2.tar.xz"; - sha256 = "0spy876l7mzpb1kgbwxpi8nfyysd1xijg2ilbvbiisxf92krvxny"; - name = "libkipi-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/libkipi-17.04.3.tar.xz"; + sha256 = "1qf1qpq1q65fk96c6rvq4avlbqnfa7cr58fkcv8c620j7fkhh3iv"; + name = "libkipi-17.04.3.tar.xz"; }; }; libkleo = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/libkleo-17.04.2.tar.xz"; - sha256 = "05pz45g11sxjcmijdklb4kp2n7ydi33vbdfl43fjl0s7rv7vmzr4"; - name = "libkleo-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/libkleo-17.04.3.tar.xz"; + sha256 = "1jk0qlsx6k77vg85xp1fjvz3b2h6f08zmwgjfh24gz9jacdps2bq"; + name = "libkleo-17.04.3.tar.xz"; }; }; libkmahjongg = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/libkmahjongg-17.04.2.tar.xz"; - sha256 = "1dd58zz8zlcrwwn1zkhp2lw8h83fwiajaxf2yibwbk0bza1ydp3r"; - name = "libkmahjongg-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/libkmahjongg-17.04.3.tar.xz"; + sha256 = "1bwgrvzzwqd1zp9qskss8l20ihxd8z7mn4ap7xr2snr7m6bzandx"; + name = "libkmahjongg-17.04.3.tar.xz"; }; }; libkomparediff2 = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/libkomparediff2-17.04.2.tar.xz"; - sha256 = "156s5lyna9wgj1cfqm36snyax9hybsr9xa72n246a94z81r6afsz"; - name = "libkomparediff2-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/libkomparediff2-17.04.3.tar.xz"; + sha256 = "0jfhvp1dxbrblaqizflbs2c2r5ar1nd41rzhnrm4iwgafnpsa9av"; + name = "libkomparediff2-17.04.3.tar.xz"; }; }; libksane = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/libksane-17.04.2.tar.xz"; - sha256 = "12h6l6wa8g2qfddl9ylm9q4f8f2w7bgmii1v6yrmfb4nyr4bflda"; - name = "libksane-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/libksane-17.04.3.tar.xz"; + sha256 = "0wvqdbi7a2ji2fhvxqn5iyab8qwq9ycb5lngj1wlyzp96c3lyz40"; + name = "libksane-17.04.3.tar.xz"; }; }; libksieve = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/libksieve-17.04.2.tar.xz"; - sha256 = "0kz8nzd3cgipc3s3zif57d681ddb6xmb7kid25j3aypcz0i7gck1"; - name = "libksieve-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/libksieve-17.04.3.tar.xz"; + sha256 = "107bcfb3nvlwxhcwqdy90yki69xz2r7ipisb0dasxc70yvlkax83"; + name = "libksieve-17.04.3.tar.xz"; }; }; lokalize = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/lokalize-17.04.2.tar.xz"; - sha256 = "0a85gjj40r5iw6mf190s4r4c4xsh1nfixj15g86acz02dn43zapn"; - name = "lokalize-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/lokalize-17.04.3.tar.xz"; + sha256 = "0v9q0xs6vgwxk6cpirpv41y49r7c74fwlqvrr23m70252781gx7a"; + name = "lokalize-17.04.3.tar.xz"; }; }; lskat = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/lskat-17.04.2.tar.xz"; - sha256 = "0blnnyb7q6vxblvi6f1xigln70m1vjfpwav05qhm7msblhh5qp2j"; - name = "lskat-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/lskat-17.04.3.tar.xz"; + sha256 = "1bzrfb51aq0ir0kjsmzfvdfvjsj81xrn3sv6vsp0wmq1510dz0qq"; + name = "lskat-17.04.3.tar.xz"; }; }; mailcommon = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/mailcommon-17.04.2.tar.xz"; - sha256 = "1f826r9m0xb418sqgx9lb23zf5am6cmgvcrx2d54c2va2vq97xgk"; - name = "mailcommon-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/mailcommon-17.04.3.tar.xz"; + sha256 = "1zyjcdn2x70304l2gyijwyv5p1p3wqvvlx9b6aj2xmhm0yvsfibk"; + name = "mailcommon-17.04.3.tar.xz"; }; }; mailimporter = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/mailimporter-17.04.2.tar.xz"; - sha256 = "06q8k3x2nvhbgk1kh542rmqnc5c0hj4yzwl1c1clvjwlw7vpxdwh"; - name = "mailimporter-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/mailimporter-17.04.3.tar.xz"; + sha256 = "0f5nipzfz505c3bibsw6v4qnqd7bkv4fy61dyapka0dy0sxlmgdk"; + name = "mailimporter-17.04.3.tar.xz"; }; }; marble = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/marble-17.04.2.tar.xz"; - sha256 = "1c6xmpkqilxd9zxz8kz7g47hwsa4hw27qcy96wxcg24hg8b5zr09"; - name = "marble-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/marble-17.04.3.tar.xz"; + sha256 = "0mlhngwscikcayi71kdsd6wbz2nj6gpzcib2gax32lnjdhx3zml3"; + name = "marble-17.04.3.tar.xz"; }; }; mbox-importer = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/mbox-importer-17.04.2.tar.xz"; - sha256 = "1mq3wbj9fcrcny4m9vs4gk0cw7xyxv1sbpby0wl6a63hb6r4nvca"; - name = "mbox-importer-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/mbox-importer-17.04.3.tar.xz"; + sha256 = "03mah1djrmks8zvqhzds9r6gx4z6z9ngqc0ki4524pf1yshg4bic"; + name = "mbox-importer-17.04.3.tar.xz"; }; }; messagelib = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/messagelib-17.04.2.tar.xz"; - sha256 = "1fxajqxigfknl7ll755blz1ypy99idgr3gmi3p37ca3ld10f7ffv"; - name = "messagelib-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/messagelib-17.04.3.tar.xz"; + sha256 = "15jvx0f4dmkl7sp8qpijisamqvvz70x3xfk3q7n0cr81pdbc5s2k"; + name = "messagelib-17.04.3.tar.xz"; }; }; minuet = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/minuet-17.04.2.tar.xz"; - sha256 = "0p2ii0wfqswliqf4fk04mx9z6nfhifa11l2w7bid4aj78b29138g"; - name = "minuet-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/minuet-17.04.3.tar.xz"; + sha256 = "16x4rbckwbiv77wvqyd60p34lds9pm5zhllzhzhlllz21m041z2p"; + name = "minuet-17.04.3.tar.xz"; }; }; okteta = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/okteta-17.04.2.tar.xz"; - sha256 = "0w1xi3kd083dss69gnq4ghmhfr3w2cz42jbfjsaidzf4qcqlfr40"; - name = "okteta-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/okteta-17.04.3.tar.xz"; + sha256 = "01x9rp2h5ca85rriw8hz5qcmv4xm9isxvm8yc8b806kd08kwmhrv"; + name = "okteta-17.04.3.tar.xz"; }; }; okular = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/okular-17.04.2.tar.xz"; - sha256 = "0rqc6h3zb48smrmp835zk4agvlwnmjwmzwv3rh3lgwfw9i3jq2zf"; - name = "okular-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/okular-17.04.3.tar.xz"; + sha256 = "0c05ma4yi6yhibxqfl26y32792cv21kvxdxs2yxbhm1xy3b397iv"; + name = "okular-17.04.3.tar.xz"; }; }; palapeli = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/palapeli-17.04.2.tar.xz"; - sha256 = "0lcdkpvqmlsj73z88pi8v2hxd57bbbxlvf5yqj3zw33xb4nxw9bd"; - name = "palapeli-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/palapeli-17.04.3.tar.xz"; + sha256 = "1ixp23cp5qsil4dhvkq9q0d6cl3qyh6jard1zrd6qv3cz3586jsc"; + name = "palapeli-17.04.3.tar.xz"; }; }; parley = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/parley-17.04.2.tar.xz"; - sha256 = "02pcyl8lnpxi936k6i7hah7vzlwzsag7lpsc0ly6q6q9rm4iwkqj"; - name = "parley-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/parley-17.04.3.tar.xz"; + sha256 = "1i4l18c5vndx6i3f4l6yyhgr4bmnvfwiqgjj01bicxzawnknv75m"; + name = "parley-17.04.3.tar.xz"; }; }; picmi = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/picmi-17.04.2.tar.xz"; - sha256 = "0dqqaqfrqxwcp9daxfs8qmbf4kj6gn68v6l7dhj5r9mjvva0r4p5"; - name = "picmi-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/picmi-17.04.3.tar.xz"; + sha256 = "0n1wrbscjdqs4cks9igxdhqh583ksdqsi339cnlqdnazcpjrb96n"; + name = "picmi-17.04.3.tar.xz"; }; }; pimcommon = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/pimcommon-17.04.2.tar.xz"; - sha256 = "1yvhf7hd2gm734i7k4smg57xq15wspbiq909crxs0ga82qx09hcg"; - name = "pimcommon-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/pimcommon-17.04.3.tar.xz"; + sha256 = "02wzindfacgj3f7a71h7wqa0jk0096xidw9bwdb5nvjnaigxxnx3"; + name = "pimcommon-17.04.3.tar.xz"; }; }; pim-data-exporter = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/pim-data-exporter-17.04.2.tar.xz"; - sha256 = "1q5qb4jbfdwp7h8d0drx0fyzmb7ffpcfrmirw22z8xk50r2r4v0i"; - name = "pim-data-exporter-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/pim-data-exporter-17.04.3.tar.xz"; + sha256 = "1q4vjynfbwrdn9j7ggxfsrilzb3g5s1yqr51siiw17jr11xca3cb"; + name = "pim-data-exporter-17.04.3.tar.xz"; }; }; pim-sieve-editor = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/pim-sieve-editor-17.04.2.tar.xz"; - sha256 = "17aymflaqwci21h70s3lb8cfmh1qkynaswfkjqipravk58a302ni"; - name = "pim-sieve-editor-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/pim-sieve-editor-17.04.3.tar.xz"; + sha256 = "1dfksp7ric5na75i6hyj4q2sgzz7zdc9a0izpzhwzqbx86m56zd8"; + name = "pim-sieve-editor-17.04.3.tar.xz"; }; }; poxml = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/poxml-17.04.2.tar.xz"; - sha256 = "1cv7k4xilpx75z07l6mpzwinxn1cdw6h1qglqhs5i35ii4cbbw40"; - name = "poxml-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/poxml-17.04.3.tar.xz"; + sha256 = "18rpy9l1blmgzjhl0pw3gjfngzjylwkqiwzilb2pdijs1121sjhv"; + name = "poxml-17.04.3.tar.xz"; }; }; print-manager = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/print-manager-17.04.2.tar.xz"; - sha256 = "19hs25cgf54c6igm0sp5by4fayaz1w793drwz1szcl5b631sdywj"; - name = "print-manager-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/print-manager-17.04.3.tar.xz"; + sha256 = "0w51wkh2rlbwsna4amfiav0pi89si5cx8g0krfr12hiji05w4van"; + name = "print-manager-17.04.3.tar.xz"; }; }; rocs = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/rocs-17.04.2.tar.xz"; - sha256 = "0ahrbxs675zvwb81fmlp55hz72xx8zlzwjgq01p03ih8jsq71s4j"; - name = "rocs-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/rocs-17.04.3.tar.xz"; + sha256 = "078451k2vx4pryxs93hry41jd6w6i8nd9lifwivgs8nrrbk4pf5b"; + name = "rocs-17.04.3.tar.xz"; }; }; signon-kwallet-extension = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/signon-kwallet-extension-17.04.2.tar.xz"; - sha256 = "1qcv8b5bmjd2dklbd4msp3cmh61qp6z6ml2ps6gzx4la1vp6qfmv"; - name = "signon-kwallet-extension-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/signon-kwallet-extension-17.04.3.tar.xz"; + sha256 = "0ahfzsr7xpnps14fwajc2fvgxd6jh18w9da40hc47pm5n8wwwbb0"; + name = "signon-kwallet-extension-17.04.3.tar.xz"; }; }; spectacle = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/spectacle-17.04.2.tar.xz"; - sha256 = "1hab13wky0i7688jrzqy2m4kc49mz7fxjjk8z1rw2f4dxxaiymhf"; - name = "spectacle-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/spectacle-17.04.3.tar.xz"; + sha256 = "0xjclcvi5fq3aq0dz34cf4w6yvi9bjr3mwc0ywqfliw0j35r4iqv"; + name = "spectacle-17.04.3.tar.xz"; }; }; step = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/step-17.04.2.tar.xz"; - sha256 = "16mhi1z5x403764k5csnr60zg2nwkjj7b3b39kqv1qb9540dmb2y"; - name = "step-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/step-17.04.3.tar.xz"; + sha256 = "111pqn908khirr66d9l4va2blcm2zcksb3w11lvwz7dfidag0bks"; + name = "step-17.04.3.tar.xz"; }; }; svgpart = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/svgpart-17.04.2.tar.xz"; - sha256 = "1cns31z5pr78ilc1mhls31dchddwwzzwvbfddhygy2513067pca4"; - name = "svgpart-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/svgpart-17.04.3.tar.xz"; + sha256 = "101kll7q53qwhgjll4vrqdapag9bc5nwqnq14gxbmmyknpjpgxqh"; + name = "svgpart-17.04.3.tar.xz"; }; }; sweeper = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/sweeper-17.04.2.tar.xz"; - sha256 = "0zarr01q1v3yq0ipb213i48q27qivrgcrhvynw7livs5s35mx844"; - name = "sweeper-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/sweeper-17.04.3.tar.xz"; + sha256 = "1ai6bhfq7g80y7w3jaqzhlq8z3krmpjjg9ap1p358485d6ja9i0k"; + name = "sweeper-17.04.3.tar.xz"; }; }; syndication = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/syndication-17.04.2.tar.xz"; - sha256 = "19flj4f552yvvaih3wvw3i2p2nl60f5pgnl1ylimz5ga0c074vqq"; - name = "syndication-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/syndication-17.04.3.tar.xz"; + sha256 = "1d3nfzz2f0n31ivzrhld5gi1bk486i5dpp0v0b1wlnacm8z0ddy5"; + name = "syndication-17.04.3.tar.xz"; }; }; umbrello = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/umbrello-17.04.2.tar.xz"; - sha256 = "0jhxifv8s9a0pg6g2vlla901fwral8gyzzhy1mxbah907mj912k1"; - name = "umbrello-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/umbrello-17.04.3.tar.xz"; + sha256 = "1v1694j5crffmy12qij1hrikrsn2irasjra11jcc4rx2klfhv2bs"; + name = "umbrello-17.04.3.tar.xz"; }; }; zeroconf-ioslave = { - version = "17.04.2"; + version = "17.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/zeroconf-ioslave-17.04.2.tar.xz"; - sha256 = "10fm62dik7a0pnram7mdraryrbk1sscsp9i46j6sp243ndd13015"; - name = "zeroconf-ioslave-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.3/src/zeroconf-ioslave-17.04.3.tar.xz"; + sha256 = "04k2mc2kl3raiirpfq150zdxb4w86cg5m70xcw711qddw1fv0g3y"; + name = "zeroconf-ioslave-17.04.3.tar.xz"; }; }; } diff --git a/pkgs/applications/misc/abook/default.nix b/pkgs/applications/misc/abook/default.nix index 2c4bc0f21284..4c03b197b4a0 100644 --- a/pkgs/applications/misc/abook/default.nix +++ b/pkgs/applications/misc/abook/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, ncurses, readline }: +{ stdenv, fetchurl, fetchpatch, pkgconfig, ncurses, readline, autoreconfHook }: stdenv.mkDerivation rec { - name = "abook-0.6.0pre2"; + name = "abook-0.6.1"; src = fetchurl { url = "http://abook.sourceforge.net/devel/${name}.tar.gz"; - sha256 = "11fkyq9bqw7s6jf38yglk8bsx0ar2wik0fq0ds0rdp8985849m2r"; + sha256 = "1yf0ifyjhq2r003pnpn92mn0924bn9yxjifxxj2ldcsgd7w0vagh"; }; patches = [ @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig autoreconfHook ]; buildInputs = [ ncurses readline ]; meta = { diff --git a/pkgs/applications/misc/alacritty/default.nix b/pkgs/applications/misc/alacritty/default.nix index e84ee7ee16ba..50af18ca1fca 100644 --- a/pkgs/applications/misc/alacritty/default.nix +++ b/pkgs/applications/misc/alacritty/default.nix @@ -43,10 +43,14 @@ buildRustPackage rec { buildInputs = [ cmake makeWrapper - xclip pkgconfig ] ++ rpathLibs; + patchPhase = '' + substituteInPlace copypasta/src/x11.rs \ + --replace Command::new\(\"xclip\"\) Command::new\(\"${xclip}/bin/xclip\"\) + ''; + installPhase = '' mkdir -p $out/bin for f in $(find target/release -maxdepth 1 -type f); do diff --git a/pkgs/applications/misc/albert/default.nix b/pkgs/applications/misc/albert/default.nix index 854408e6e3e6..dd4858cfe2ad 100644 --- a/pkgs/applications/misc/albert/default.nix +++ b/pkgs/applications/misc/albert/default.nix @@ -1,17 +1,17 @@ -{ mkDerivation, lib, fetchFromGitHub, qtbase, qtsvg, qtx11extras, muparser, cmake }: +{ mkDerivation, lib, fetchFromGitHub, makeWrapper, qtbase, qtsvg, qtx11extras, muparser, cmake }: mkDerivation rec { name = "albert-${version}"; - version = "0.11.3"; + version = "0.12.0"; src = fetchFromGitHub { owner = "albertlauncher"; repo = "albert"; rev = "v${version}"; - sha256 = "0ddz6h1334b9kqy1lfi7qa21znm3l0b9h0d4s62llxdasv103jh5"; + sha256 = "120l7hli2l4qj2s126nawc4dsy4qvwvb0svc42hijry4l8imdhkq"; }; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake makeWrapper ]; buildInputs = [ qtbase qtsvg qtx11extras muparser ]; @@ -31,6 +31,11 @@ mkDerivation rec { rm "$out/lib" ''; + postInstall = '' + wrapProgram $out/bin/albert \ + --prefix XDG_DATA_DIRS : $out/share + ''; + meta = with lib; { homepage = https://albertlauncher.github.io/; description = "Desktop agnostic launcher"; diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index 34f403fda892..4aaa5f1ff67d 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -2,11 +2,11 @@ python2Packages.buildPythonApplication rec { name = "electrum-${version}"; - version = "2.8.3"; + version = "2.9.0"; src = fetchurl { url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz"; - sha256 = "04jswalydzwm16iismbq1h2shj17iq9sqm0mz8p98sh3dwkacvn1"; + sha256 = "1lida5phq0c1lxnk75d9jsps0vw4zy7saaxhv0q4kv76rk2b3fhv"; }; propagatedBuildInputs = with python2Packages; [ diff --git a/pkgs/applications/misc/ephemeralpg/default.nix b/pkgs/applications/misc/ephemeralpg/default.nix index 104192f7e61d..65df422599ca 100644 --- a/pkgs/applications/misc/ephemeralpg/default.nix +++ b/pkgs/applications/misc/ephemeralpg/default.nix @@ -12,4 +12,9 @@ stdenv.mkDerivation rec { PREFIX=$out make install wrapProgram $out/bin/pg_tmp --prefix PATH : ${postgresql}/bin ''; + meta = { + description = ''Run tests on an isolated, temporary PostgreSQL database.''; + license = stdenv.lib.licenses.isc; + homepage = http://ephemeralpg.org/; + }; } diff --git a/pkgs/applications/misc/jbidwatcher/default.nix b/pkgs/applications/misc/jbidwatcher/default.nix index d26ad94648aa..a1b16e2a4d13 100644 --- a/pkgs/applications/misc/jbidwatcher/default.nix +++ b/pkgs/applications/misc/jbidwatcher/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "jbidwatcher"; - version = "2.5.2"; + version = "2.5.6"; name = "${pname}-${version}"; src = fetchurl { url = "http://www.jbidwatcher.com/download/JBidwatcher-${version}.jar"; - sha256 = "07w75ryn8inm5i1829gabr8lifbycz40ynzsyaw22yzqk5if1n9l"; + sha256 = "1cw59wh72w1zzibs8x64dma3jc4hry64wjksqs52nc3vpnf0fzfr"; }; buildInputs = [ java ]; diff --git a/pkgs/applications/misc/moonlight-embedded/default.nix b/pkgs/applications/misc/moonlight-embedded/default.nix index 391440f86229..894751571ecf 100644 --- a/pkgs/applications/misc/moonlight-embedded/default.nix +++ b/pkgs/applications/misc/moonlight-embedded/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { name = "moonlight-embedded-${version}"; - version = "2.2.3"; + version = "2.4.2"; # fetchgit used to ensure submodules are available src = fetchgit { url = "git://github.com/irtimmer/moonlight-embedded"; rev = "refs/tags/v${version}"; - sha256 = "0m1114dsz44rvq402b4v5ib2cwj2vbasir0l8vi0q5iymwmsvxj4"; + sha256 = "0khdbwfclvpjgyk5ar1fs4j66zsjikaj422wlvrvqhyzi1v5arpr"; }; outputs = [ "out" "doc" ]; diff --git a/pkgs/applications/misc/qdirstat/default.nix b/pkgs/applications/misc/qdirstat/default.nix index be252ed81efd..cbbac11424ec 100644 --- a/pkgs/applications/misc/qdirstat/default.nix +++ b/pkgs/applications/misc/qdirstat/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchFromGitHub, qmake -, coreutils, xdg_utils, bash, perl }: +, coreutils, xdg_utils, bash +, perl, makeWrapper, perlPackages }: let version = "1.4"; @@ -13,7 +14,7 @@ in stdenv.mkDerivation rec { sha256 = "1ppasbr0mq301q6n3rm0bsmprs7vgkcjmmc0gbgqpgw84nmp9fqh"; }; - nativeBuildInputs = [ qmake ]; + nativeBuildInputs = [ qmake makeWrapper ]; buildInputs = [ perl ]; @@ -45,6 +46,11 @@ in stdenv.mkDerivation rec { --replace /bin/bash ${bash}/bin/bash ''; + postInstall = '' + wrapProgram $out/bin/qdirstat-cache-writer \ + --set PERL5LIB "${stdenv.lib.makePerlPath [ perlPackages.URI ]}" + ''; + meta = with stdenv.lib; { description = "Graphical disk usage analyzer"; homepage = src.meta.homepage; diff --git a/pkgs/applications/misc/urh/default.nix b/pkgs/applications/misc/urh/default.nix index 9015bb9956b3..faf373092d57 100644 --- a/pkgs/applications/misc/urh/default.nix +++ b/pkgs/applications/misc/urh/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { name = "urh-${version}"; - version = "1.5.5"; + version = "1.7.1"; src = fetchFromGitHub { owner = "jopohl"; repo = "urh"; rev = "v${version}"; - sha256 = "1f7hz2zs2dx3v6hpdyz7wyyq1xf641jhpljyhvmjr4zg5m035isa"; + sha256 = "00l1zs3qw89z1hlylprzrpf6nf7h22h0nw43h97gv775vaqqgczv"; }; buildInputs = [ hackrf rtl-sdr ]; diff --git a/pkgs/applications/misc/xtermcontrol/default.nix b/pkgs/applications/misc/xtermcontrol/default.nix new file mode 100644 index 000000000000..eae5240129a5 --- /dev/null +++ b/pkgs/applications/misc/xtermcontrol/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + version = "3.3"; + name = "xtermcontrol-${version}"; + + src = fetchurl { + url = "http://thrysoee.dk/xtermcontrol/xtermcontrol-${version}.tar.gz"; + sha256 = "1v2c1cnx43apmspga7icssh5ndbhzy5h82y6vm8fda40flq9mxj5"; + }; + + meta = { + description = "Enables dynamic control of xterm properties"; + longDescription = '' + Enables dynamic control of xterm properties. + It makes it easy to change colors, title, font and geometry of a running xterm, as well as to report the current settings of these properties. + Window manipulations de-/iconify, raise/lower, maximize/restore and reset are also supported. + To complete the feature set; xtermcontrol lets advanced users issue any xterm control sequence of their choosing. + ''; + homepage = http://thrysoee.dk/xtermcontrol; + license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.unix; + maintainers = [ stdenv.lib.maintainers.derchris ]; + }; +} diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index 5bcf47a4905d..423be7c33e78 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -84,7 +84,7 @@ let fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ]; # Upstream source - version = "7.0.2"; + version = "7.0.3"; lang = "en-US"; @@ -94,7 +94,7 @@ let "https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux64-${version}_${lang}.tar.xz" "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz" ]; - sha256 = "0xdw8mvyxz9vaxikzsj4ygzp36m4jfhvhqfiyaiiywpf39rqpkqr"; + sha256 = "1p91szx60xx3295bpap9w2ydgaibj0yn9lbdyhajal35bbhjxqhc"; }; "i686-linux" = fetchurl { @@ -102,7 +102,7 @@ let "https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux32-${version}_${lang}.tar.xz" "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz" ]; - sha256 = "0m522i8zih5sj18dyzk9im7gmpmrbf96657v38m3pxn4ci38b83z"; + sha256 = "0p51dxiq3qxyc5n7xvh1hq039pvp7z730f6dks4h5p3sfqw6isfp"; }; }; in diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix index d7988267f2f5..71d595cef6f6 100644 --- a/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "terragrunt-${version}"; - version = "0.12.24"; + version = "0.12.25"; goPackagePath = "github.com/gruntwork-io/terragrunt"; @@ -10,7 +10,7 @@ buildGoPackage rec { rev = "v${version}"; owner = "gruntwork-io"; repo = "terragrunt"; - sha256 = "0rkbicvqjadb99qw65g3k7pqal5sn05png30qwy59cv4gjr9q9m4"; + sha256 = "0j85abmkspbwdijf9dzm37x3ibqd3bhn01qs165433k74f9m500q"; }; goDeps = ./deps.nix; diff --git a/pkgs/applications/networking/cluster/terragrunt/deps.nix b/pkgs/applications/networking/cluster/terragrunt/deps.nix index fc7da0a2a99a..ac6bae693952 100644 --- a/pkgs/applications/networking/cluster/terragrunt/deps.nix +++ b/pkgs/applications/networking/cluster/terragrunt/deps.nix @@ -5,8 +5,8 @@ fetch = { type = "git"; url = "https://github.com/aws/aws-sdk-go"; - rev = "ae53883b2478fd8e2bdca2748367d5b5fa27ca22"; - sha256 = "0sa5g69wpk6hbd6g52cc7l5c6zph9zyc5l9dy4288xn4hpb6c23q"; + rev = "df374c20d53ed082b8cf0d0da52b1a181abf387b"; + sha256 = "0my26kjx1inh0ajh85n34wrl18mizx627cl0xhxlhcyw01p24792"; }; } { @@ -32,8 +32,8 @@ fetch = { type = "git"; url = "https://github.com/hashicorp/go-getter"; - rev = "2814e6fb2ca5b3bd950c97eff22553ecb3c7f77b"; - sha256 = "1pkqa5vdyc79iiw25b9vpl9f32nwv2pzh6f98l30678ypha0miqn"; + rev = "6aae8e4e2dee8131187c6a54b52664796e5a02b0"; + sha256 = "0hxjwph0ghx0732xq62bszk18wb18hdq6vzb6b6bdn3rsdva1d68"; }; } { @@ -77,8 +77,8 @@ fetch = { type = "git"; url = "https://github.com/mitchellh/go-testing-interface"; - rev = "477c2d05a845d8b55912a5a7993b9b24abcc5ef8"; - sha256 = "0llpcyiqfjdri7pba1p13maafgcyzjbd29h99b1hgj848k5avd61"; + rev = "9a441910b16872f7b8283682619b3761a9aa2222"; + sha256 = "0gfi97m6sadrwbq56as3d368c3ipcn3wz8pxqkk7kkba0h5wjc7v"; }; } { @@ -95,8 +95,17 @@ fetch = { type = "git"; url = "https://github.com/stretchr/testify"; - rev = "f6abca593680b2315d2075e0f5e2a9751e3f431a"; - sha256 = "0n2vidr9zyf6k296grnc6d3rk9hd6qw7mwvnfixlxm8g5y46rzl9"; + rev = "05e8a0eda380579888eb53c394909df027f06991"; + sha256 = "03l83nrgpbyc2hxxfi928gayj16fsclbr88dja6r9kikq19a6yhv"; + }; + } + { + goPackagePath = "github.com/ulikunitz/xz"; + fetch = { + type = "git"; + url = "https://github.com/ulikunitz/xz"; + rev = "0c6b41e72360850ca4f98dc341fd999726ea007f"; + sha256 = "0a6l7sp67ipxim093qh6fvw8knbxj24l7bj5lykcddi5gwfi78n3"; }; } { diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix index 94ffda9fede1..e1a9640bc23b 100644 --- a/pkgs/applications/networking/irc/weechat/default.nix +++ b/pkgs/applications/networking/irc/weechat/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { sha256 = "0xfnhaxmvxdxs3ic0qs5lwq3yl4pi5ib99p0p5lv3v2vldqlm4lc"; }; - outputs = [ "out" "doc" ]; + outputs = [ "out" ]; # "doc" was here but was not produced enableParallelBuilding = true; cmakeFlags = with stdenv.lib; [ diff --git a/pkgs/applications/networking/mailreaders/alpine/default.nix b/pkgs/applications/networking/mailreaders/alpine/default.nix index 22859a4c25d5..df930b93173d 100644 --- a/pkgs/applications/networking/mailreaders/alpine/default.nix +++ b/pkgs/applications/networking/mailreaders/alpine/default.nix @@ -3,34 +3,26 @@ }: # NOTE: Please check if any changes here are applicable to ../realpine/ as well -let - version = "2.00"; - baseName = "alpine"; -in -stdenv.mkDerivation { - name = "${baseName}-${version}"; +stdenv.mkDerivation rec { + name = "alpine-${version}"; + version = "2.21"; src = fetchurl { - url = "ftp://ftp.cac.washington.edu/alpine/alpine-${version}.tar.bz2"; - sha256 = "19m2w21dqn55rhxbh5lr9qarc2fqa9wmpj204jx7a0zrb90bhpf8"; + url = "http://alpine.freeiz.com/alpine/release/src/${name}.tar.xz"; + sha256 = "0f3llxrmaxw7w9w6aixh752md3cdc91mwfmbarkm8s413f4bcc30"; }; buildInputs = [ ncurses tcl openssl pam kerberos openldap ]; - hardeningDisable = [ "format" "fortify" ]; + hardeningDisable = [ "format" ]; configureFlags = [ "--with-ssl-include-dir=${openssl.dev}/include/openssl" - "--with-tcl-lib=${tcl.libPrefix}" "--with-passfile=.pine-passfile" ]; - preConfigure = '' - export NIX_LDFLAGS="$NIX_LDFLAGS -lgcc_s" - ''; - meta = { description = "Console mail reader"; license = stdenv.lib.licenses.asl20; diff --git a/pkgs/applications/networking/remote/xrdp/default.nix b/pkgs/applications/networking/remote/xrdp/default.nix index eff81e998579..b6b1f6542af3 100644 --- a/pkgs/applications/networking/remote/xrdp/default.nix +++ b/pkgs/applications/networking/remote/xrdp/default.nix @@ -58,7 +58,7 @@ let ./bootstrap ''; dontDisableStatic = true; - configureFlags = [ "--with-systemdsystemunitdir=./do-not-install" "--enable-ipv6" "--enable-jpeg" "--enable-fuse" "--enable-rfxcodec" "--enable-opus" ]; + configureFlags = [ "--with-systemdsystemunitdir=/var/empty" "--enable-ipv6" "--enable-jpeg" "--enable-fuse" "--enable-rfxcodec" "--enable-opus" ]; installFlags = [ "DESTDIR=$(out)" "prefix=" ]; diff --git a/pkgs/applications/networking/vnstat/default.nix b/pkgs/applications/networking/vnstat/default.nix index 1c78f926fe7b..c3424e2fc779 100644 --- a/pkgs/applications/networking/vnstat/default.nix +++ b/pkgs/applications/networking/vnstat/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "vnstat-${version}"; - version = "1.15"; + version = "1.17"; src = fetchurl { - sha256 = "0fdw3nbrfm4acv48r0934ls6ld5lwkff3gyym2c72qlbm9dlp0f3"; + sha256 = "0wbrmb4zapblb3b61180ryqy6i0c7gcacqz0y3r1x7nafqswbr0q"; url = "http://humdi.net/vnstat/${name}.tar.gz"; }; diff --git a/pkgs/applications/science/biology/igv/default.nix b/pkgs/applications/science/biology/igv/default.nix index 3acf7d965279..917863d1ba1d 100644 --- a/pkgs/applications/science/biology/igv/default.nix +++ b/pkgs/applications/science/biology/igv/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "igv-${version}"; - version = "2.3.89"; + version = "2.3.98"; src = fetchurl { url = "http://data.broadinstitute.org/igv/projects/downloads/IGV_${version}.zip"; - sha256 = "06bmj9jsnk5010ipv0w4qlcvgw67dy8hsvgcx9l74v3s0zp5di3y"; + sha256 = "1bjdsvx8jsbcry6v7yfclh3vrlsvaw38f3s9587lklj63zj638l2"; }; buildInputs = [ unzip jre ]; diff --git a/pkgs/applications/science/electronics/verilator/default.nix b/pkgs/applications/science/electronics/verilator/default.nix index ed4a430198a1..31c2d4f6475e 100644 --- a/pkgs/applications/science/electronics/verilator/default.nix +++ b/pkgs/applications/science/electronics/verilator/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, flex_2_6_1, bison }: +{ stdenv, fetchurl, perl, flex, bison }: stdenv.mkDerivation rec { name = "verilator-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; enableParallelBuilding = true; - buildInputs = [ perl flex_2_6_1 bison ]; + buildInputs = [ perl flex bison ]; postInstall = '' sed -i -e '3a\#!/usr/bin/env perl' -e '1,3d' $out/bin/{verilator,verilator_coverage,verilator_profcfunc} diff --git a/pkgs/applications/science/logic/coq2html/default.nix b/pkgs/applications/science/logic/coq2html/default.nix new file mode 100644 index 000000000000..9687ac66ead1 --- /dev/null +++ b/pkgs/applications/science/logic/coq2html/default.nix @@ -0,0 +1,38 @@ +{ stdenv, lib, make, fetchgit, ocaml }: + +let + version = "20170720"; +in + +stdenv.mkDerivation { + name = "coq2html-${version}"; + + src = fetchgit { + url = "https://github.com/xavierleroy/coq2html"; + rev = "e2b94093c6b9a877717f181765e30577de22439e"; + sha256 = "1x466j0pyjggyz0870pdllv9f5vpnfrgkd0w7ajvm9rkwyp3f610"; + }; + + buildInputs = [ make ocaml ]; + + installPhase = '' + mkdir -p $out/bin + cp coq2html $out/bin + ''; + + meta = with stdenv.lib; { + description = "coq2html is an HTML documentation generator for Coq source files"; + longDescription = '' + coq2html is an HTML documentation generator for Coq source files. It is + an alternative to the standard coqdoc documentation generator + distributed along with Coq. The major feature of coq2html is its ability + to fold proof scripts: in the generated HTML, proof scripts are + initially hidden, but can be revealed one by one by clicking on the + "Proof" keyword. + ''; + homepage = https://github.com/xavierleroy/coq2html; + license = licenses.gpl2; + maintainers = with maintainers; [ jwiegley ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/science/math/calc/default.nix b/pkgs/applications/science/math/calc/default.nix index b8ed7ffac3cd..ff8a1ff95844 100644 --- a/pkgs/applications/science/math/calc/default.nix +++ b/pkgs/applications/science/math/calc/default.nix @@ -12,11 +12,11 @@ in stdenv.mkDerivation rec { name = "calc-${version}"; - version = "2.12.5.3"; + version = "2.12.6.1"; src = fetchurl { - url = "mirror://sourceforge/calc/${name}.tar.bz2"; - sha256 = "14mnz6smhi3a0rgmwvddk9w3vdisi8khq67i8nqsl47vgs8n1kqg"; + url = "https://github.com/lcn2/calc/releases/download/${version}/${name}.tar.bz2"; + sha256 = "1vy4jmhmpl3gzgpkpv0kqwjv8hn1cza8cn1g8c69gq3inqvr4fvd"; }; buildInputs = [ makeWrapper readline ncurses utillinux ]; diff --git a/pkgs/applications/science/math/qalculate-gtk/default.nix b/pkgs/applications/science/math/qalculate-gtk/default.nix index 5f49b240fc06..cd89fbbe1871 100644 --- a/pkgs/applications/science/math/qalculate-gtk/default.nix +++ b/pkgs/applications/science/math/qalculate-gtk/default.nix @@ -2,13 +2,19 @@ stdenv.mkDerivation rec { name = "qalculate-gtk-${version}"; - version = "0.9.9"; + version = "1.0.0"; src = fetchurl { url = "https://github.com/Qalculate/qalculate-gtk/archive/v${version}.tar.gz"; - sha256 = "0v9ibycilygmi9zzi7cxif7si56c85lfzdvbqnbf32whg8ydqqkg"; + sha256 = "08sg6kfcfdpxjsl538ba26ncm2cxzc63nlafj99ff4b46wxia57k"; }; + patchPhase = '' + for fn in src/interface.cc src/main.cc; do + substituteInPlace $fn --replace 'getPackageDataDir().c_str()' \"$out/share\" + done + ''; + hardeningDisable = [ "format" ]; nativeBuildInputs = [ intltool pkgconfig autoreconfHook wrapGAppsHook ]; diff --git a/pkgs/applications/science/programming/scyther/cli.nix b/pkgs/applications/science/programming/scyther/cli.nix new file mode 100644 index 000000000000..152b71217743 --- /dev/null +++ b/pkgs/applications/science/programming/scyther/cli.nix @@ -0,0 +1,32 @@ +{ stdenv, glibc, flex, bison, cmake +, version, src, meta }: +stdenv.mkDerivation { + name = "scyther-cli-${version}"; + + inherit src meta; + + buildInputs = [ + cmake + glibc.static + flex + bison + ]; + + patchPhase = '' + # Since we're not in a git dir, the normal command this project uses to create this file wouldn't work + printf "%s\n" "#define TAGVERSION \"${version}\"" > src/version.h + ''; + + configurePhase = '' + (cd src && cmakeConfigurePhase) + ''; + + dontUseCmakeBuildDir = true; + cmakeFlags = [ "-DCMAKE_C_FLAGS=-std=gnu89" ]; + + installPhase = '' + mkdir -p "$out/bin" + mv src/scyther-linux "$out/bin/scyther-cli" + ln -s "$out/bin/scyther-cli" "$out/bin/scyther-linux" + ''; +} diff --git a/pkgs/applications/science/programming/scyther/default.nix b/pkgs/applications/science/programming/scyther/default.nix new file mode 100644 index 000000000000..beef26c6032a --- /dev/null +++ b/pkgs/applications/science/programming/scyther/default.nix @@ -0,0 +1,79 @@ +{ stdenv, lib, buildEnv, callPackage_i686, fetchFromGitHub, python27Packages, graphviz +, includeGUI ? true +, includeProtocols ? true +}: +let + version = "1.1.3"; + + src = fetchFromGitHub { + rev = "v${version}"; + sha256 = "0rb4ha5bnjxnwj4f3hciq7kyj96fhw14hqbwl5kr9cdw8q62mx0h"; + owner = "cascremers"; + repo = "scyther"; + }; + + meta = with lib; { + description = "Scyther is a tool for the automatic verification of security protocols."; + homepage = https://www.cs.ox.ac.uk/people/cas.cremers/scyther/; + license = licenses.gpl2; + maintainers = with maintainers; [ infinisil ]; + platforms = platforms.linux; + }; + + cli = callPackage_i686 ./cli.nix { + inherit version src meta; + }; + + gui = stdenv.mkDerivation { + name = "scyther-gui-${version}"; + inherit src meta; + buildInputs = [ + python27Packages.wrapPython + ]; + + patchPhase = '' + file=gui/Scyther/Scyther.py + + # By default the scyther binary is looked for in the directory of the python script ($out/gui), but we want to have it look where our cli package is + substituteInPlace $file --replace "return getMyDir()" "return \"${cli}/bin\"" + + # Removes the Shebang from the file, as this would be wrapped wrongly + sed -i -e "1d" $file + ''; + + dontBuild = true; + + propagatedBuildInputs = [ + python27Packages.wxPython + graphviz + ]; + + installPhase = '' + mkdir -p "$out"/gui "$out"/bin + cp -r gui/* "$out"/gui + ln -s "$out"/gui/scyther-gui.py "$out/bin/scyther-gui" + ''; + + postFixup = '' + wrapPythonProgramsIn "$out/gui" "$out $pythonPath" + ''; + + doInstallCheck = true; + installCheckPhase = '' + "$out/gui/scyther.py" "$src/gui/Protocols/Demo/ns3.spdl" + ''; + }; +in + buildEnv { + name = "scyther-${version}"; + inherit meta; + paths = [ cli ] ++ lib.optional includeGUI gui; + pathsToLink = [ "/bin" ]; + + postBuild = '' + rm "$out/bin/scyther-linux" + '' + lib.optionalString includeProtocols '' + mkdir -p "$out/protocols" + cp -rv ${src}/protocols/* "$out/protocols" + ''; + } diff --git a/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix b/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix index b613898faaae..5878f3a8b74c 100644 --- a/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix +++ b/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "diff-so-fancy-${version}"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "so-fancy"; repo = "diff-so-fancy"; rev = "v${version}"; - sha256 = "0wd9npcfp41ggvddrbif8qr25pm7jlzxzd3xn5rlq0y0frwx5akj"; + sha256 = "1hgppp8ngjbjzbi96529p36hzi0ysdndrh6d6m71gs21am8v4m9r"; }; # Perl is needed here for patchShebangs 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 2a9ea0715e03..8e3c6b8d9d02 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 @@ -4,13 +4,13 @@ let inherit (pythonPackages) buildPythonApplication pyqt4 sip pyinotify python mock; in buildPythonApplication rec { name = "git-cola-${version}"; - version = "2.10"; + version = "2.11"; src = fetchFromGitHub { owner = "git-cola"; repo = "git-cola"; rev = "v${version}"; - sha256 = "067g0yya6718kxagf5qm59zizp0lizca4m3ih85y732i6rqpgwv8"; + sha256 = "1prv8ib9jdkj5rgixj3hvkivwmbz5xvh8bmllrb1sb301yzi1s0g"; }; buildInputs = [ git gettext ]; 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 82549fd9a57a..9ddcaea497de 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 @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "git-hub-${version}"; - version = "0.11.0"; + version = "0.11.1"; src = fetchFromGitHub { - sha256 = "1lpi373vzr6gda0gic7w37qhipfg7bjpn8nwjjgz44vf2vjlhf9k"; + sha256 = "15449bqk7nyvbpin5j2hg862cqa7hb4zxkmr8mkqm5hz2jxmxspa"; rev = "v${version}"; repo = "git-hub"; owner = "sociomantic-tsunami"; diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index d09926da7cdb..8277261a1500 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -59,6 +59,10 @@ stdenv.mkDerivation rec { hardeningDisable = [ "stackprotector" ]; + preConfigure = '' + unset CPP # intereferes with dependency calculation + ''; + configureFlags = [ "--smbd=smbd" # use `smbd' from $PATH "--audio-drv-list=${audio}" diff --git a/pkgs/build-support/buildenv/builder.pl b/pkgs/build-support/buildenv/builder.pl index 678f5a3fe9e6..7cc37d156735 100755 --- a/pkgs/build-support/buildenv/builder.pl +++ b/pkgs/build-support/buildenv/builder.pl @@ -141,12 +141,11 @@ sub addPkg { my $propagatedFN = "$pkgDir/nix-support/propagated-user-env-packages"; if (-e $propagatedFN) { open PROP, "<$propagatedFN" or die; - my $propagated = <PROP>; - close PROP; - my @propagated = split ' ', $propagated; - foreach my $p (@propagated) { + while (my $p = <PROP>) { + chomp $p; $postponed{$p} = 1 unless defined $done{$p}; } + close PROP; } } diff --git a/pkgs/build-support/cc-wrapper/cc-wrapper.sh b/pkgs/build-support/cc-wrapper/cc-wrapper.sh index 3ccdc34db5b2..99eb63f40edf 100644 --- a/pkgs/build-support/cc-wrapper/cc-wrapper.sh +++ b/pkgs/build-support/cc-wrapper/cc-wrapper.sh @@ -55,7 +55,7 @@ while [ $n -lt ${#params[*]} ]; do nonFlagArgs=1 elif [ "$p" = -m32 ]; then if [ -e @out@/nix-support/dynamic-linker-m32 ]; then - NIX_LDFLAGS="$NIX_LDFLAGS -dynamic-linker $(cat @out@/nix-support/dynamic-linker-m32)" + NIX_LDFLAGS+=" -dynamic-linker $(cat @out@/nix-support/dynamic-linker-m32)" fi fi n=$((n + 1)) @@ -111,9 +111,9 @@ fi if [[ "$isCpp" = 1 ]]; then if [[ "$cppInclude" = 1 ]]; then - NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE ${NIX_CXXSTDLIB_COMPILE-@default_cxx_stdlib_compile@}" + NIX_CFLAGS_COMPILE+=" ${NIX_CXXSTDLIB_COMPILE-@default_cxx_stdlib_compile@}" fi - NIX_CFLAGS_LINK="$NIX_CFLAGS_LINK $NIX_CXXSTDLIB_LINK" + NIX_CFLAGS_LINK+=" $NIX_CXXSTDLIB_LINK" fi LD=@ldPath@/ld diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 676fbd006881..09d1d4cd681a 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -71,22 +71,6 @@ let -e 's^addCVars^addCVars${_infixSalt}^g' \ -e 's^\[ -z "\$crossConfig" \]^\[\[ "${builtins.toString (targetPlatform != hostPlatform)}" || -z "$crossConfig" \]\]^g' - '' + stdenv.lib.optionalString (textFile == ./setup-hook.sh) '' - cat << 'EOF' >> $out - for CMD in ar as nm objcopy ranlib strip strings size ld windres - do - # which is not part of stdenv, but compgen will do for now - if - PATH=$_PATH type -p ${prefix}$CMD > /dev/null - then - export ''$(echo "$CMD" | tr "[:lower:]" "[:upper:]")=${prefix}''${CMD}; - fi - done - EOF - - sed -i $out -e 's_envHooks_crossEnvHooks_g' - '' + '' - # NIX_ things which we don't both use and define, we revert them #asymmetric=$( # for pre in "" "\\$" @@ -105,22 +89,20 @@ let done ''); - # The dynamic linker has different names on different platforms. + # The dynamic linker has different names on different platforms. This is a + # shell glob that ought to match it. dynamicLinker = - if !nativeLibc then - (if targetPlatform.system == "i686-linux" then "ld-linux.so.2" else - if targetPlatform.system == "x86_64-linux" then "ld-linux-x86-64.so.2" else - # ARM with a wildcard, which can be "" or "-armhf". - if targetPlatform.isArm32 then "ld-linux*.so.3" else - if targetPlatform.system == "aarch64-linux" then "ld-linux-aarch64.so.1" else - if targetPlatform.system == "powerpc-linux" then "ld.so.1" else - if targetPlatform.system == "mips64el-linux" then "ld.so.1" else - if targetPlatform.system == "x86_64-darwin" then "/usr/lib/dyld" else - if stdenv.lib.hasSuffix "pc-gnu" targetPlatform.config then "ld.so.1" else - builtins.trace - "Don't know the name of the dynamic linker for platform ${targetPlatform.config}, so guessing instead." - null) - else ""; + /**/ if libc == null then null + else if targetPlatform.system == "i686-linux" then "${libc_lib}/lib/ld-linux.so.2" + else if targetPlatform.system == "x86_64-linux" then "${libc_lib}/lib/ld-linux-x86-64.so.2" + # ARM with a wildcard, which can be "" or "-armhf". + else if targetPlatform.isArm32 then "${libc_lib}/lib/ld-linux*.so.3" + else if targetPlatform.system == "aarch64-linux" then "${libc_lib}/lib/ld-linux-aarch64.so.1" + else if targetPlatform.system == "powerpc-linux" then "${libc_lib}/lib/ld.so.1" + else if targetPlatform.system == "mips64el-linux" then "${libc_lib}/lib/ld.so.1" + else if targetPlatform.system == "x86_64-darwin" then "/usr/lib/dyld" + else if stdenv.lib.hasSuffix "pc-gnu" targetPlatform.config then "ld.so.1" + else null; expand-response-params = if buildPackages.stdenv.cc or null != null && buildPackages.stdenv.cc != "/dev/null" then buildPackages.stdenv.mkDerivation { @@ -145,6 +127,7 @@ stdenv.mkDerivation { inherit cc shell libc_bin libc_dev libc_lib binutils_bin coreutils_bin; gnugrep_bin = if nativeTools then "" else gnugrep; + binPrefix = prefix; passthru = { inherit libc nativeTools nativeLibc nativePrefix isGNU isClang default_cxx_stdlib_compile @@ -175,39 +158,39 @@ stdenv.mkDerivation { } '' - # TODO(@Ericson2314): Unify logic next hash break - + optionalString (libc != null) (if (targetPlatform.isDarwin) then '' - echo $dynamicLinker > $out/nix-support/dynamic-linker + + optionalString (libc != null) ('' + if [[ -z ''${dynamicLinker+x} ]]; then + echo "Don't know the name of the dynamic linker for platform '${targetPlatform.config}', so guessing instead." >&2 + dynamicLinker="${libc_lib}/lib/ld*.so.?" + fi - echo "export LD_DYLD_PATH=\"$dynamicLinker\"" >> $out/nix-support/setup-hook - '' else if dynamicLinker != null then '' - dynamicLinker="${libc_lib}/lib/$dynamicLinker" - echo $dynamicLinker > $out/nix-support/dynamic-linker + # Expand globs to fill array of options + dynamicLinker=($dynamicLinker) - if [ -e ${libc_lib}/lib/32/ld-linux.so.2 ]; then - echo ${libc_lib}/lib/32/ld-linux.so.2 > $out/nix-support/dynamic-linker-m32 - fi + case ''${#dynamicLinker[@]} in + 0) echo "No dynamic linker found for platform '${targetPlatform.config}'." >&2;; + 1) echo "Using dynamic linker: '$dynamicLinker'" >&2;; + *) echo "Multiple dynamic linkers found for platform '${targetPlatform.config}'." >&2;; + esac - # The dynamic linker is passed in `ldflagsBefore' to allow - # explicit overrides of the dynamic linker by callers to gcc/ld - # (the *last* value counts, so ours should come first). - echo "-dynamic-linker" $dynamicLinker > $out/nix-support/libc-ldflags-before - '' else '' - dynamicLinker=`eval 'echo $libc/lib/ld*.so.?'` if [ -n "$dynamicLinker" ]; then echo $dynamicLinker > $out/nix-support/dynamic-linker + '' + (if targetPlatform.isDarwin then '' + printf "export LD_DYLD_PATH+=%q\n" "$dynamicLinker" >> $out/nix-support/setup-hook + '' else '' if [ -e ${libc_lib}/lib/32/ld-linux.so.2 ]; then echo ${libc_lib}/lib/32/ld-linux.so.2 > $out/nix-support/dynamic-linker-m32 fi - ldflagsBefore="-dynamic-linker $dlinker" + ldflagsBefore=(-dynamic-linker "$dynamicLinker") + '') + '' fi # The dynamic linker is passed in `ldflagsBefore' to allow # explicit overrides of the dynamic linker by callers to gcc/ld # (the *last* value counts, so ours should come first). - echo "$ldflagsBefore" > $out/nix-support/libc-ldflags-before + printWords "''${ldflagsBefore[@]}" > $out/nix-support/libc-ldflags-before '') + optionalString (libc != null) '' @@ -275,9 +258,9 @@ stdenv.mkDerivation { # Propagate the wrapped cc so that if you install the wrapper, # you get tools like gcov, the manpages, etc. as well (including # for binutils and Glibc). - echo ${cc} ${cc.man or ""} ${binutils_bin} ${if libc == null then "" else libc_bin} > $out/nix-support/propagated-user-env-packages + printWords ${cc} ${cc.man or ""} ${binutils_bin} ${if libc == null then "" else libc_bin} > $out/nix-support/propagated-user-env-packages - echo ${toString extraPackages} > $out/nix-support/propagated-native-build-inputs + printWords ${toString extraPackages} > $out/nix-support/propagated-native-build-inputs '' + optionalString (targetPlatform.isSunOS && nativePrefix != "") '' @@ -305,20 +288,24 @@ stdenv.mkDerivation { wrap ${prefix}ld.bfd ${preWrap ./ld-wrapper.sh} ${binutils_bin}/bin/${prefix}ld.bfd fi - export real_cc=${prefix}cc - export real_cxx=${prefix}c++ + # We export environment variables pointing to the wrapped nonstandard + # cmds, lest some lousy configure script use those to guess compiler + # version. + export named_cc=${prefix}cc + export named_cxx=${prefix}c++ + export default_cxx_stdlib_compile="${default_cxx_stdlib_compile}" if [ -e $ccPath/${prefix}gcc ]; then wrap ${prefix}gcc ${preWrap ./cc-wrapper.sh} $ccPath/${prefix}gcc ln -s ${prefix}gcc $out/bin/${prefix}cc - export real_cc=${prefix}gcc - export real_cxx=${prefix}g++ + export named_cc=${prefix}gcc + export named_cxx=${prefix}g++ elif [ -e $ccPath/clang ]; then wrap ${prefix}clang ${preWrap ./cc-wrapper.sh} $ccPath/clang ln -s ${prefix}clang $out/bin/${prefix}cc - export real_cc=clang - export real_cxx=clang++ + export named_cc=${prefix}clang + export named_cxx=${prefix}clang++ fi if [ -e $ccPath/${prefix}g++ ]; then diff --git a/pkgs/build-support/cc-wrapper/ld-wrapper.sh b/pkgs/build-support/cc-wrapper/ld-wrapper.sh index 056cfa920535..240082b5dfdc 100644 --- a/pkgs/build-support/cc-wrapper/ld-wrapper.sh +++ b/pkgs/build-support/cc-wrapper/ld-wrapper.sh @@ -64,7 +64,9 @@ extra+=($NIX_LDFLAGS_AFTER $NIX_LDFLAGS_HARDEN) # Add all used dynamic libraries to the rpath. if [ "$NIX_DONT_SET_RPATH" != 1 ]; then - libPath="" + declare -A libDirsSeen + declare -a libDirs + addToLibPath() { local path="$1" if [ "${path:0:1}" != / ]; then return 0; fi @@ -76,29 +78,27 @@ if [ "$NIX_DONT_SET_RPATH" != 1 ]; then fi ;; esac - case $libPath in - *\ $path\ *) return 0 ;; - esac - libPath="$libPath $path " + if [[ -z ${libDirsSeen[$path]} ]]; then + libDirs+=("$path") + libDirsSeen[$path]=1 + fi } + declare -A rpathsSeen + declare -a rpaths + addToRPath() { # If the path is not in the store, don't add it to the rpath. # This typically happens for libraries in /tmp that are later # copied to $out/lib. If not, we're screwed. if [ "${1:0:${#NIX_STORE}}" != "$NIX_STORE" ]; then return 0; fi - case $rpath in - *\ $1\ *) return 0 ;; - esac - rpath="$rpath $1 " - } - - libs="" - addToLibs() { - libs="$libs $1" + if [[ -z ${rpathsSeen[$1]} ]]; then + rpaths+=("$1") + rpathsSeen[$1]=1 + fi } - rpath="" + declare -a libs # First, find all -L... switches. allParams=("${params[@]}" ${extra[@]}) @@ -112,10 +112,10 @@ if [ "$NIX_DONT_SET_RPATH" != 1 ]; then addToLibPath ${p2} n=$((n + 1)) elif [ "$p" = -l ]; then - addToLibs ${p2} + libs+=(${p2}) n=$((n + 1)) elif [ "${p:0:2}" = -l ]; then - addToLibs ${p:2} + libs+=(${p:2}) elif [ "$p" = -dynamic-linker ]; then # Ignore the dynamic linker argument, or it # will get into the next 'elif'. We don't want @@ -135,9 +135,8 @@ if [ "$NIX_DONT_SET_RPATH" != 1 ]; then # so, add the directory to the rpath. # It's important to add the rpath in the order of -L..., so # the link time chosen objects will be those of runtime linking. - - for i in $libPath; do - for j in $libs; do + for i in ${libDirs[@]}; do + for j in ${libs[@]}; do if [ -f "$i/lib$j.so" ]; then addToRPath $i break @@ -145,10 +144,9 @@ if [ "$NIX_DONT_SET_RPATH" != 1 ]; then done done - # Finally, add `-rpath' switches. - for i in $rpath; do - extra+=(-rpath $i) + for i in ${rpaths[@]}; do + extra+=(-rpath "$i") done fi diff --git a/pkgs/build-support/cc-wrapper/setup-hook.sh b/pkgs/build-support/cc-wrapper/setup-hook.sh index f4f7ab181d3e..104b82425f29 100644 --- a/pkgs/build-support/cc-wrapper/setup-hook.sh +++ b/pkgs/build-support/cc-wrapper/setup-hook.sh @@ -1,5 +1,3 @@ -export NIX_CC=@out@ - addCVars () { if [ -d $1/include ]; then export NIX_CFLAGS_COMPILE+=" ${ccIncludeFlag:--isystem} $1/include" @@ -39,9 +37,26 @@ if [ -n "@coreutils_bin@" ]; then fi if [ -z "$crossConfig" ]; then - export CC=@real_cc@ - export CXX=@real_cxx@ + ENV_PREFIX="" else - export BUILD_CC=@real_cc@ - export BUILD_CXX=@real_cxx@ + ENV_PREFIX="BUILD_" fi + +export NIX_${ENV_PREFIX}CC=@out@ + +export ${ENV_PREFIX}CC=@named_cc@ +export ${ENV_PREFIX}CXX=@named_cxx@ + +for CMD in \ + cpp \ + ar as nm objcopy ranlib strip strings size ld windres +do + if + PATH=$_PATH type -p "@binPrefix@$CMD" > /dev/null + then + export "${ENV_PREFIX}$(echo "$CMD" | tr "[:lower:]" "[:upper:]")=@binPrefix@${CMD}"; + fi +done + +# No local scope available for sourced files +unset ENV_PREFIX diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index b6e342cf9b5e..160c3f85977b 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -437,8 +437,8 @@ rec { echo "Unpacking base image..." tar -C image -xpf "$fromImage" # Do not import the base image configuration and manifest + chmod a+w image image/*.json rm -f image/*.json - rm -f image/manifest.json if [[ -z "$fromImageName" ]]; then fromImageName=$(jshon -k < image/repositories|head -n1) diff --git a/pkgs/build-support/fetchbower/default.nix b/pkgs/build-support/fetchbower/default.nix index 835fbec6bf0e..dd0bac49cb6d 100644 --- a/pkgs/build-support/fetchbower/default.nix +++ b/pkgs/build-support/fetchbower/default.nix @@ -7,8 +7,10 @@ let ver = if builtins.length components == 1 then version else hash; in ver; + bowerName = name: lib.replaceStrings ["/"] ["-"] name; + fetchbower = name: version: target: outputHash: stdenv.mkDerivation { - name = "${name}-${bowerVersion version}"; + name = "${bowerName name}-${bowerVersion version}"; SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; buildCommand = '' fetch-bower --quiet --out=$PWD/out "${name}" "${target}" "${version}" diff --git a/pkgs/build-support/fetchurl/builder.sh b/pkgs/build-support/fetchurl/builder.sh index c4fd18e46caf..7c2bdf260b4e 100644 --- a/pkgs/build-support/fetchurl/builder.sh +++ b/pkgs/build-support/fetchurl/builder.sh @@ -39,7 +39,6 @@ tryDownload() { curlexit=$?; fi done - stopNest } @@ -51,7 +50,6 @@ finish() { fi runHook postFetch - stopNest exit 0 } diff --git a/pkgs/build-support/gcc-wrapper-old/builder.sh b/pkgs/build-support/gcc-wrapper-old/builder.sh index a8e8a370ec0d..22e32814927e 100644 --- a/pkgs/build-support/gcc-wrapper-old/builder.sh +++ b/pkgs/build-support/gcc-wrapper-old/builder.sh @@ -211,5 +211,5 @@ cp -p $utils $out/nix-support/utils.sh # tools like gcov, the manpages, etc. as well (including for binutils # and Glibc). if test -z "$nativeTools"; then - echo $gcc $binutils $libc $libc_bin > $out/nix-support/propagated-user-env-packages + printWords $gcc $binutils $libc $libc_bin > $out/nix-support/propagated-user-env-packages fi diff --git a/pkgs/build-support/trivial-builders.nix b/pkgs/build-support/trivial-builders.nix index 4debd9636396..16bd4e8e4054 100644 --- a/pkgs/build-support/trivial-builders.nix +++ b/pkgs/build-support/trivial-builders.nix @@ -84,7 +84,7 @@ rec { mkdir -p $out/nix-support cp ${script} $out/nix-support/setup-hook '' + lib.optionalString (deps != []) '' - echo ${toString deps} > $out/nix-support/propagated-native-build-inputs + printWords ${toString deps} > $out/nix-support/propagated-native-build-inputs '' + lib.optionalString (substitutions != {}) '' substituteAll ${script} $out/nix-support/setup-hook ''); diff --git a/pkgs/data/misc/cacert/default.nix b/pkgs/data/misc/cacert/default.nix index 5095fce8958e..fbf9af36f27a 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, writeText, nss, python3 , blacklist ? [] , includeEmail ? false }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { src = nss.src; - nativeBuildInputs = [ python ]; + nativeBuildInputs = [ python3 ]; configurePhase = '' ln -s nss/lib/ckfw/builtins/certdata.txt diff --git a/pkgs/data/misc/dns-root-data/default.nix b/pkgs/data/misc/dns-root-data/default.nix new file mode 100644 index 000000000000..ec0d9c83ad51 --- /dev/null +++ b/pkgs/data/misc/dns-root-data/default.nix @@ -0,0 +1,29 @@ +{ stdenv, lib, fetchurl }: + +let + + rootHints = fetchurl { + url = "http://www.internic.net/domain/named.root"; + sha256 = "1zf3ydn44z70gq1kd95lvk9cp68xlbl8vqpswqlhd30qafx6v6d1"; + }; + + rootKey = ./root.key; + rootDs = ./root.ds; + +in + +stdenv.mkDerivation { + name = "dns-root-data-2017-07-11"; + + buildCommand = '' + mkdir $out + cp ${rootHints} $out/root.hints + cp ${rootKey} $out/root.key + cp ${rootDs} $out/root.ds + ''; + + meta = with lib; { + description = "DNS root data including root zone and DNSSEC key"; + maintainers = with maintainers; [ fpletz ]; + }; +} diff --git a/pkgs/data/misc/dns-root-data/root.ds b/pkgs/data/misc/dns-root-data/root.ds new file mode 100644 index 000000000000..7578e0405d9d --- /dev/null +++ b/pkgs/data/misc/dns-root-data/root.ds @@ -0,0 +1,2 @@ +. IN DS 19036 8 2 49AAC11D7B6F6446702E54A1607371607A1A41855200FD2CE1CDDE32F24E8FB5 +. IN DS 20326 8 2 E06D44B80B8F1D39A95C0B0D7C65D08458E880409BBC683457104237C7F8EC8D diff --git a/pkgs/data/misc/dns-root-data/root.key b/pkgs/data/misc/dns-root-data/root.key new file mode 100644 index 000000000000..c0da7b3f60fa --- /dev/null +++ b/pkgs/data/misc/dns-root-data/root.key @@ -0,0 +1,2 @@ +. 172800 IN DNSKEY 257 3 8 AwEAAagAIKlVZrpC6Ia7gEzahOR+9W29euxhJhVVLOyQbSEW0O8gcCjFFVQUTf6v58fLjwBd0YI0EzrAcQqBGCzh/RStIoO8g0NfnfL2MTJRkxoXbfDaUeVPQuYEhg37NZWAJQ9VnMVDxP/VHL496M/QZxkjf5/Efucp2gaDX6RS6CXpoY68LsvPVjR0ZSwzz1apAzvN9dlzEheX7ICJBBtuA6G3LQpzW5hOA2hzCTMjJPJ8LbqF6dsV6DoBQzgul0sGIcGOYl7OyQdXfZ57relSQageu+ipAdTTJ25AsRTAoub8ONGcLmqrAmRLKBP1dfwhYB4N7knNnulqQxA+Uk1ihz0= ;{id = 19036 (ksk), size = 2048b} +. 172800 IN DNSKEY 257 3 8 AwEAAaz/tAm8yTn4Mfeh5eyI96WSVexTBAvkMgJzkKTOiW1vkIbzxeF3+/4RgWOq7HrxRixHlFlExOLAJr5emLvN7SWXgnLh4+B5xQlNVz8Og8kvArMtNROxVQuCaSnIDdD5LKyWbRd2n9WGe2R8PzgCmr3EgVLrjyBxWezF0jLHwVN8efS3rCj/EWgvIWgb9tarpVUDK/b58Da+sqqls3eNbuv7pr+eoZG+SrDK6nWeL3c6H5Apxz7LjVc1uTIdsIXxuOLYA4/ilBmSVIzuDWfdRUfhHdY6+cn8HFRm+2hM8AnXGXws9555KrUB5qihylGa8subX2Nn6UwNR1AkUTV74bU= ;{id = 20326 (ksk), size = 2048b} diff --git a/pkgs/data/misc/dns-root-data/update-root-key.sh b/pkgs/data/misc/dns-root-data/update-root-key.sh new file mode 100755 index 000000000000..9a3141aef197 --- /dev/null +++ b/pkgs/data/misc/dns-root-data/update-root-key.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p busybox unbound + +TMP=`mktemp` +unbound-anchor -a "$TMP" +grep -Ev "^($$|;)" "$TMP" | sed -e 's/ ;;.*//' > root.key + +unbound-anchor -F -a "$TMP" +sed '/^;/d' < "$TMP" > root.ds +rm $TMP diff --git a/pkgs/data/misc/shared-mime-info/default.nix b/pkgs/data/misc/shared-mime-info/default.nix index 7e2eefd3f1c3..484aa4e5a232 100644 --- a/pkgs/data/misc/shared-mime-info/default.nix +++ b/pkgs/data/misc/shared-mime-info/default.nix @@ -1,13 +1,13 @@ {stdenv, fetchurl, pkgconfig, gettext, perl, perlXMLParser, intltool , libxml2, glib}: -let version = "1.7"; in +let version = "1.8"; in stdenv.mkDerivation rec { name = "shared-mime-info-${version}"; src = fetchurl { url = "http://freedesktop.org/~hadess/${name}.tar.xz"; - sha256 = "0bjd2j1rqrj150mr04j7ib71lfdlgbf235fg8d70g8mszqf7ik7a"; + sha256 = "1sc96lv9dp1lkvs8dh3ngm3hbjb274d363dl9avhb61il3qmxx9a"; }; nativeBuildInputs = [ diff --git a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix index a527765688d6..a955f5cf8a48 100644 --- a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix +++ b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, ruby }: +{ lib, stdenv, fetchurl }: let @@ -10,8 +10,6 @@ let inherit sha256; }; - buildInputs = [ ruby ]; - dontBuild = true; installPhase = '' @@ -23,9 +21,6 @@ let # Backwards compatibility. Will remove eventually. mkdir -p $out/xml/xsl ln -s $dst $out/xml/xsl/docbook - - ln -sv $dst/epub/bin $out - chmod +x $out/bin/dbtoepub ''; meta = { diff --git a/pkgs/desktops/kde-4.14/kde-package/default.nix b/pkgs/desktops/kde-4.14/kde-package/default.nix index d5de6f5f6bc1..94f878097ded 100644 --- a/pkgs/desktops/kde-4.14/kde-package/default.nix +++ b/pkgs/desktops/kde-4.14/kde-package/default.nix @@ -86,7 +86,7 @@ rec { };}) '' mkdir -pv $out/nix-support - echo "${toString list}" | tee $out/nix-support/propagated-user-env-packages + printWords ${toString list} | tee $out/nix-support/propagated-user-env-packages ''; # Given manifest module data, return the module diff --git a/pkgs/desktops/plasma-5/fetch.sh b/pkgs/desktops/plasma-5/fetch.sh index c1a6e8672740..1b82b4c38fc7 100644 --- a/pkgs/desktops/plasma-5/fetch.sh +++ b/pkgs/desktops/plasma-5/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/plasma/5.10.3/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/plasma/5.10.4/ -A '*.tar.xz' ) diff --git a/pkgs/desktops/plasma-5/srcs.nix b/pkgs/desktops/plasma-5/srcs.nix index d1824f305279..c7b83ebc51d9 100644 --- a/pkgs/desktops/plasma-5/srcs.nix +++ b/pkgs/desktops/plasma-5/srcs.nix @@ -3,339 +3,339 @@ { bluedevil = { - version = "5.10.3"; + version = "5.10.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.3/bluedevil-5.10.3.tar.xz"; - sha256 = "03qkd08nwqkc25wvj4964xgrj40m6vhzqg67fdqamav6d5np106g"; - name = "bluedevil-5.10.3.tar.xz"; + url = "${mirror}/stable/plasma/5.10.4/bluedevil-5.10.4.tar.xz"; + sha256 = "1q1mhblrcsz55fjjgw9xd49w2whxcbvwvr7w5rb99jbgixiijmxi"; + name = "bluedevil-5.10.4.tar.xz"; }; }; breeze = { - version = "5.10.3"; + version = "5.10.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.3/breeze-5.10.3.tar.xz"; - sha256 = "048z84dsrx9ln5whg7vbp0amhhsnggh1jm4z6nmraizms2ay0w8a"; - name = "breeze-5.10.3.tar.xz"; + url = "${mirror}/stable/plasma/5.10.4/breeze-5.10.4.tar.xz"; + sha256 = "075iq5nr112la2zfmpkz0x7v1720zkil5b074g5p6yl058nfbg1d"; + name = "breeze-5.10.4.tar.xz"; }; }; breeze-grub = { - version = "5.10.3"; + version = "5.10.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.3/breeze-grub-5.10.3.tar.xz"; - sha256 = "1ghg7vc9ad6bw0b0q88srjwm8h9khyl93ljr2riaw3wh23slkw5z"; - name = "breeze-grub-5.10.3.tar.xz"; + url = "${mirror}/stable/plasma/5.10.4/breeze-grub-5.10.4.tar.xz"; + sha256 = "110d8jkgn6b28w4piwgl0lvkz7kkhx10948i8sb7dahyxilz57l2"; + name = "breeze-grub-5.10.4.tar.xz"; }; }; breeze-gtk = { - version = "5.10.3"; + version = "5.10.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.3/breeze-gtk-5.10.3.tar.xz"; - sha256 = "0ai2hkd79g1y8clk0650qijq5w5fmaamhbapw6yddf4v4a40vspc"; - name = "breeze-gtk-5.10.3.tar.xz"; + url = "${mirror}/stable/plasma/5.10.4/breeze-gtk-5.10.4.tar.xz"; + sha256 = "0r0q5i24vqqaf9lyi7ac9i650ha6b3pv0js3r2vj0kivj1kh9wz5"; + name = "breeze-gtk-5.10.4.tar.xz"; }; }; breeze-plymouth = { - version = "5.10.3"; + version = "5.10.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.3/breeze-plymouth-5.10.3.tar.xz"; - sha256 = "1249ywi5s8ba5mzgi2773xz04g3shzc61bwsfcgpvzyc61q3dsl9"; - name = "breeze-plymouth-5.10.3.tar.xz"; + url = "${mirror}/stable/plasma/5.10.4/breeze-plymouth-5.10.4.tar.xz"; + sha256 = "16nvp2078py6gqwhi23rz0li6d1zv5i669q6whrpwd1xvb489xlg"; + name = "breeze-plymouth-5.10.4.tar.xz"; }; }; discover = { - version = "5.10.3"; + version = "5.10.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.3/discover-5.10.3.tar.xz"; - sha256 = "189pv0zbl7mzswk65nlj8yq5ymj3ska8a52ws852blnccj8x18qn"; - name = "discover-5.10.3.tar.xz"; + url = "${mirror}/stable/plasma/5.10.4/discover-5.10.4.tar.xz"; + sha256 = "08bxk03jknbdyk1lsw59ml4d6p66shn6kijcsw44pkfiwxv4k7a8"; + name = "discover-5.10.4.tar.xz"; }; }; kactivitymanagerd = { - version = "5.10.3"; + version = "5.10.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.3/kactivitymanagerd-5.10.3.tar.xz"; - sha256 = "1y4xyg5swr2abiiqp67b95jfj4xbmgw1y51vj6njcdrkkkksz7qh"; - name = "kactivitymanagerd-5.10.3.tar.xz"; + url = "${mirror}/stable/plasma/5.10.4/kactivitymanagerd-5.10.4.tar.xz"; + sha256 = "0z33r8iysd69a76fwid46rywpvqa63pc5p7bgi2vy6aw7py5x2r2"; + name = "kactivitymanagerd-5.10.4.tar.xz"; }; }; kde-cli-tools = { - version = "5.10.3"; + version = "5.10.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.3/kde-cli-tools-5.10.3.tar.xz"; - sha256 = "1xmk45hj96qmfcprccsnlzr0hms98yvnnz8wkylgbnj75rcfq7ws"; - name = "kde-cli-tools-5.10.3.tar.xz"; + url = "${mirror}/stable/plasma/5.10.4/kde-cli-tools-5.10.4.tar.xz"; + sha256 = "1d9bp2yi4i5g4lk4y51yhmixkhjfjz9g0nlg6l22p37rnwr416h6"; + name = "kde-cli-tools-5.10.4.tar.xz"; }; }; kdecoration = { - version = "5.10.3"; + version = "5.10.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.3/kdecoration-5.10.3.tar.xz"; - sha256 = "14ayrnv1q1rhjclh2pbjwnzssqk2m9zlpm64011y258r5q9mw8h3"; - name = "kdecoration-5.10.3.tar.xz"; + url = "${mirror}/stable/plasma/5.10.4/kdecoration-5.10.4.tar.xz"; + sha256 = "15m62a0wwvssrr2k065kqmxj00fc4pvfmnxx6aakvnf11jwzs0r5"; + name = "kdecoration-5.10.4.tar.xz"; }; }; kde-gtk-config = { - version = "5.10.3"; + version = "5.10.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.3/kde-gtk-config-5.10.3.tar.xz"; - sha256 = "049dk79wgqgk2jiicqyv32m6nhj6k7hw5qrhagg8js28b6sqkw0m"; - name = "kde-gtk-config-5.10.3.tar.xz"; + url = "${mirror}/stable/plasma/5.10.4/kde-gtk-config-5.10.4.tar.xz"; + sha256 = "0r5kkvxf29mi45h0snsvjw9xkc02k9b2gai687sci7n8iwkjdc9j"; + name = "kde-gtk-config-5.10.4.tar.xz"; }; }; kdeplasma-addons = { - version = "5.10.3"; + version = "5.10.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.3/kdeplasma-addons-5.10.3.tar.xz"; - sha256 = "1lzkwa51845f97qz43j1k284hwjbg05cry7lj16nlaq0rlwncgps"; - name = "kdeplasma-addons-5.10.3.tar.xz"; + url = "${mirror}/stable/plasma/5.10.4/kdeplasma-addons-5.10.4.tar.xz"; + sha256 = "19rd7lsxbjw9sr96jfis8hfdrpmm1djwi8cr2yw683zv5kjqzigf"; + name = "kdeplasma-addons-5.10.4.tar.xz"; }; }; kgamma5 = { - version = "5.10.3"; + version = "5.10.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.3/kgamma5-5.10.3.tar.xz"; - sha256 = "19mcdj1xcsf43k3n77ybqj9i99l6m8yryw3bhcbzfxk0c6ccx9cy"; - name = "kgamma5-5.10.3.tar.xz"; + url = "${mirror}/stable/plasma/5.10.4/kgamma5-5.10.4.tar.xz"; + sha256 = "04kfigplrhcc01dap9a7l43dh2ig3ihyc01vwsrik73l026vm2im"; + name = "kgamma5-5.10.4.tar.xz"; }; }; khotkeys = { - version = "5.10.3"; + version = "5.10.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.3/khotkeys-5.10.3.tar.xz"; - sha256 = "1xbxbqvpnci2fanwvdrr6rnwabh3yfamndfhmy4gjik26y0i8yz4"; - name = "khotkeys-5.10.3.tar.xz"; + url = "${mirror}/stable/plasma/5.10.4/khotkeys-5.10.4.tar.xz"; + sha256 = "16apzdf2g42sr349jdjjal0lv2bpginb72f1c5p8cs14nvg0cnys"; + name = "khotkeys-5.10.4.tar.xz"; }; }; kinfocenter = { - version = "5.10.3"; + version = "5.10.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.3/kinfocenter-5.10.3.tar.xz"; - sha256 = "0a94wz7fbck08aw3xrvn2hjbj3px5ivfzkh6hhqcxblnc5ahr0fk"; - name = "kinfocenter-5.10.3.tar.xz"; + url = "${mirror}/stable/plasma/5.10.4/kinfocenter-5.10.4.tar.xz"; + sha256 = "1r0a4z6wzzkb30y76xx4x1gfbka7h3qn1j0fxyf2h97vd362g8zr"; + name = "kinfocenter-5.10.4.tar.xz"; }; }; kmenuedit = { - version = "5.10.3"; + version = "5.10.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.3/kmenuedit-5.10.3.tar.xz"; - sha256 = "1y4riijwp1g3bji2wd21m7raf95prajd3sxcgr140sg0lq8zg8h2"; - name = "kmenuedit-5.10.3.tar.xz"; + url = "${mirror}/stable/plasma/5.10.4/kmenuedit-5.10.4.tar.xz"; + sha256 = "1kvspljbzrbglyq1l69r7gdlqww674hxdbvrhq1v95sh33i3l29w"; + name = "kmenuedit-5.10.4.tar.xz"; }; }; kscreen = { - version = "5.10.3"; + version = "5.10.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.3/kscreen-5.10.3.tar.xz"; - sha256 = "03l8ammyir82w8kdl4sm8lkp1nr0qghk04g838p34m05ah8hb7nl"; - name = "kscreen-5.10.3.tar.xz"; + url = "${mirror}/stable/plasma/5.10.4/kscreen-5.10.4.tar.xz"; + sha256 = "0rahpg14raqngk8a63qh2bnqgga43dyzqfzd9ys94iqkxkmlsasw"; + name = "kscreen-5.10.4.tar.xz"; }; }; kscreenlocker = { - version = "5.10.3"; + version = "5.10.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.3/kscreenlocker-5.10.3.tar.xz"; - sha256 = "07k0smksglzq44llpn80xs7p8salfryphihran7frb1mvyg09yzx"; - name = "kscreenlocker-5.10.3.tar.xz"; + url = "${mirror}/stable/plasma/5.10.4/kscreenlocker-5.10.4.tar.xz"; + sha256 = "17sykdkd43z2x9ccvninbhgypysqr1p052cp1aj2wbvl54hhiznp"; + name = "kscreenlocker-5.10.4.tar.xz"; }; }; ksshaskpass = { - version = "5.10.3"; + version = "5.10.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.3/ksshaskpass-5.10.3.tar.xz"; - sha256 = "10cy8d4dbg8dzkh428x3vl6n2hh73b3fxnal8a2wwx23flhmg04c"; - name = "ksshaskpass-5.10.3.tar.xz"; + url = "${mirror}/stable/plasma/5.10.4/ksshaskpass-5.10.4.tar.xz"; + sha256 = "1nz6pw10k9r7y4h9wl4b5jxbk10jkdj8fymkzx94dcvgasia52jf"; + name = "ksshaskpass-5.10.4.tar.xz"; }; }; ksysguard = { - version = "5.10.3"; + version = "5.10.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.3/ksysguard-5.10.3.tar.xz"; - sha256 = "0mgzqd3abhs03k815kij6n6jpiqhd13vzbyifcp4r0q8kh34b71s"; - name = "ksysguard-5.10.3.tar.xz"; + url = "${mirror}/stable/plasma/5.10.4/ksysguard-5.10.4.tar.xz"; + sha256 = "02p6c9lvgpcaszl5zigyjhcarjmp12hhhhfbkd448nmaklrw4qnl"; + name = "ksysguard-5.10.4.tar.xz"; }; }; kwallet-pam = { - version = "5.10.3"; + version = "5.10.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.3/kwallet-pam-5.10.3.tar.xz"; - sha256 = "0pysv9lfljar4krdkwns7fyyi0zz5629prfmdxs2aww6cq4d2x7m"; - name = "kwallet-pam-5.10.3.tar.xz"; + url = "${mirror}/stable/plasma/5.10.4/kwallet-pam-5.10.4.tar.xz"; + sha256 = "1si9fyg4n7kxn2kff15r8ph6m5hipyb3fwif9hc0x5v8iwf7a9q2"; + name = "kwallet-pam-5.10.4.tar.xz"; }; }; kwayland-integration = { - version = "5.10.3"; + version = "5.10.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.3/kwayland-integration-5.10.3.tar.xz"; - sha256 = "1gfx5mxy1zan5shhddi4b6k578l19rkld2zkfa4g97hhvc0h83s9"; - name = "kwayland-integration-5.10.3.tar.xz"; + url = "${mirror}/stable/plasma/5.10.4/kwayland-integration-5.10.4.tar.xz"; + sha256 = "02d4sy3fzh45r2j13m8fr3p3xkd98j40mnzwf54ljb9irvm3fplc"; + name = "kwayland-integration-5.10.4.tar.xz"; }; }; kwin = { - version = "5.10.3"; + version = "5.10.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.3/kwin-5.10.3.tar.xz"; - sha256 = "0vbrf7vm8s7hrzkgsjsqggswadvrr1k2g85y7w1pb781way7xwj3"; - name = "kwin-5.10.3.tar.xz"; + url = "${mirror}/stable/plasma/5.10.4/kwin-5.10.4.tar.xz"; + sha256 = "0p7yv3a1qsv87ymr7kz8ayp3zspak1qw8lp051qrnaabpz951r39"; + name = "kwin-5.10.4.tar.xz"; }; }; kwrited = { - version = "5.10.3"; + version = "5.10.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.3/kwrited-5.10.3.tar.xz"; - sha256 = "0cjyvz5wg37dbnacsf3hz05bkwzpbznmlsy5plhqxr6wmq6q6l9q"; - name = "kwrited-5.10.3.tar.xz"; + url = "${mirror}/stable/plasma/5.10.4/kwrited-5.10.4.tar.xz"; + sha256 = "1di7xlgszw8iy4w7722x9g9998q8y48j1s8qd6mryqryr9ryq9b3"; + name = "kwrited-5.10.4.tar.xz"; }; }; libkscreen = { - version = "5.10.3"; + version = "5.10.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.3/libkscreen-5.10.3.tar.xz"; - sha256 = "02hcsfmjzajbpki2pmpdycgccjqadd98vzam56sihsvivgxykw4h"; - name = "libkscreen-5.10.3.tar.xz"; + url = "${mirror}/stable/plasma/5.10.4/libkscreen-5.10.4.tar.xz"; + sha256 = "0zpybykj6s547j53a7x4flj45qhpk3z0d3sfp6wgi88gybnffj8g"; + name = "libkscreen-5.10.4.tar.xz"; }; }; libksysguard = { - version = "5.10.3"; + version = "5.10.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.3/libksysguard-5.10.3.tar.xz"; - sha256 = "13s7j53jjyhd5kryyd1sy6yrx69h5smi7xg49d8as8zbf3rki08h"; - name = "libksysguard-5.10.3.tar.xz"; + url = "${mirror}/stable/plasma/5.10.4/libksysguard-5.10.4.tar.xz"; + sha256 = "01w0laywva0p0ar2lvr1k5000bhjikjfxsb4f6p30qswrchrmrh3"; + name = "libksysguard-5.10.4.tar.xz"; }; }; milou = { - version = "5.10.3"; + version = "5.10.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.3/milou-5.10.3.tar.xz"; - sha256 = "18bgwpxfv5n4nxvs6xj6ihk22bpmb1b4cs9dxhfn931r8lnzzixb"; - name = "milou-5.10.3.tar.xz"; + url = "${mirror}/stable/plasma/5.10.4/milou-5.10.4.tar.xz"; + sha256 = "105fyrh5n90ih93b9lq21y6s2ckdgb7lf9624y13gii674yv9xhb"; + name = "milou-5.10.4.tar.xz"; }; }; oxygen = { - version = "5.10.3"; + version = "5.10.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.3/oxygen-5.10.3.tar.xz"; - sha256 = "07jqm9nl84b2s9i461mz4b8i1x22376k9n1g9prcjzxyy3494flv"; - name = "oxygen-5.10.3.tar.xz"; + url = "${mirror}/stable/plasma/5.10.4/oxygen-5.10.4.tar.xz"; + sha256 = "0hip9vkp33dg51xr1v46i0w7fs6cqwx3lssw82qyzf042zipyikd"; + name = "oxygen-5.10.4.tar.xz"; }; }; plasma-desktop = { - version = "5.10.3"; + version = "5.10.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.3/plasma-desktop-5.10.3.tar.xz"; - sha256 = "1vwls9gavcipv8k2fwx9kzzldfcxch3g61nsc77dw0lrhcaf301d"; - name = "plasma-desktop-5.10.3.tar.xz"; + url = "${mirror}/stable/plasma/5.10.4/plasma-desktop-5.10.4.tar.xz"; + sha256 = "0g1cynvm58fg99n9ir0lwbsg3c4jh1fr330n12bx6ccgw66i1mgf"; + name = "plasma-desktop-5.10.4.tar.xz"; }; }; plasma-integration = { - version = "5.10.3"; + version = "5.10.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.3/plasma-integration-5.10.3.tar.xz"; - sha256 = "1vpgwzvqjcr6hgrh57777i21fbmixl6vrlyscdyk0912mdzplf5n"; - name = "plasma-integration-5.10.3.tar.xz"; + url = "${mirror}/stable/plasma/5.10.4/plasma-integration-5.10.4.tar.xz"; + sha256 = "0rf50yr97if7i8ghjsladw9krkcjn45qnpq86siph2hnn784x2q6"; + name = "plasma-integration-5.10.4.tar.xz"; }; }; plasma-nm = { - version = "5.10.3"; + version = "5.10.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.3/plasma-nm-5.10.3.tar.xz"; - sha256 = "1d8kncwcxw601n73m7igr2h09mk54qa2zgshrbd0h3496dw4xzxq"; - name = "plasma-nm-5.10.3.tar.xz"; + url = "${mirror}/stable/plasma/5.10.4/plasma-nm-5.10.4.tar.xz"; + sha256 = "0lxg2x73n353p69l4qgxm759f6vxl2z2rff60864yj80ija6i58c"; + name = "plasma-nm-5.10.4.tar.xz"; }; }; plasma-pa = { - version = "5.10.3"; + version = "5.10.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.3/plasma-pa-5.10.3.tar.xz"; - sha256 = "1dhkkfl39x17bd0hv3w0lclzlsialg7a7zydcjm345izpdgd11vx"; - name = "plasma-pa-5.10.3.tar.xz"; + url = "${mirror}/stable/plasma/5.10.4/plasma-pa-5.10.4.tar.xz"; + sha256 = "0nxn1vhylpy91kz4xihhrxagjlwdm5xi10blgkfkq98npg7g1had"; + name = "plasma-pa-5.10.4.tar.xz"; }; }; plasma-sdk = { - version = "5.10.3"; + version = "5.10.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.3/plasma-sdk-5.10.3.tar.xz"; - sha256 = "0m426fj5d07bqj0n1gxcn7brjwf7xrsj50hy14hky246wchvqh43"; - name = "plasma-sdk-5.10.3.tar.xz"; + url = "${mirror}/stable/plasma/5.10.4/plasma-sdk-5.10.4.tar.xz"; + sha256 = "0m1q39gxrjk5fmz5dkwxz0wjngv9xib6xiw3k8rscjbby5q2x4g0"; + name = "plasma-sdk-5.10.4.tar.xz"; }; }; plasma-tests = { - version = "5.10.3"; + version = "5.10.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.3/plasma-tests-5.10.3.tar.xz"; - sha256 = "04pn5bzhs0y6msir2px985jghhswas9zn37jb4zdy0sxd9yhabqb"; - name = "plasma-tests-5.10.3.tar.xz"; + url = "${mirror}/stable/plasma/5.10.4/plasma-tests-5.10.4.tar.xz"; + sha256 = "0l8f0p3z1xfc5ki4696yr4ckdpcfswg53f9bbwfzgwg54h109zs9"; + name = "plasma-tests-5.10.4.tar.xz"; }; }; plasma-workspace = { - version = "5.10.3"; + version = "5.10.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.3/plasma-workspace-5.10.3.tar.xz"; - sha256 = "0wfzdjpgd9fwycy4ww2j7xryh82wg4jfipnh9hicq2mss0x53mv9"; - name = "plasma-workspace-5.10.3.tar.xz"; + url = "${mirror}/stable/plasma/5.10.4/plasma-workspace-5.10.4.tar.xz"; + sha256 = "08d18swivlysh535fkkfc256rkl1p6b93y934w21bdyihs0mf18w"; + name = "plasma-workspace-5.10.4.tar.xz"; }; }; plasma-workspace-wallpapers = { - version = "5.10.3"; + version = "5.10.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.3/plasma-workspace-wallpapers-5.10.3.tar.xz"; - sha256 = "0vhdypkkcranpb7zv2ghh0d5x5698d7vvyv1k7xcgsd1bwf3037f"; - name = "plasma-workspace-wallpapers-5.10.3.tar.xz"; + url = "${mirror}/stable/plasma/5.10.4/plasma-workspace-wallpapers-5.10.4.tar.xz"; + sha256 = "04jp14y8k5bchs80hj3r2h3qi17q3i4fbq6g09457qv7i195xgr2"; + name = "plasma-workspace-wallpapers-5.10.4.tar.xz"; }; }; plymouth-kcm = { - version = "5.10.3"; + version = "5.10.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.3/plymouth-kcm-5.10.3.tar.xz"; - sha256 = "0ss5wkqa729f2bs8s9ss4bslpj0946kylbg2g2vmfzzr5a68ri6d"; - name = "plymouth-kcm-5.10.3.tar.xz"; + url = "${mirror}/stable/plasma/5.10.4/plymouth-kcm-5.10.4.tar.xz"; + sha256 = "0l0b2jpgz22f50i7zwmq5mij3p9ym6d059qvy35j96cyn69947nx"; + name = "plymouth-kcm-5.10.4.tar.xz"; }; }; polkit-kde-agent = { - version = "1-5.10.3"; + version = "1-5.10.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.3/polkit-kde-agent-1-5.10.3.tar.xz"; - sha256 = "0csllzr47f173f8dymfhhplig7w55j3kfqr14i12lc3yhy5g5ns6"; - name = "polkit-kde-agent-1-5.10.3.tar.xz"; + url = "${mirror}/stable/plasma/5.10.4/polkit-kde-agent-1-5.10.4.tar.xz"; + sha256 = "1kk1g40pgzdwbpxymyf5f0m474g273nq7knkzz41jp7yqi7dh9jw"; + name = "polkit-kde-agent-1-5.10.4.tar.xz"; }; }; powerdevil = { - version = "5.10.3"; + version = "5.10.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.3/powerdevil-5.10.3.tar.xz"; - sha256 = "0xjk8andskvygmb8ll0hxk8spc9ac0v3kyzyrd444va3q617zbi7"; - name = "powerdevil-5.10.3.tar.xz"; + url = "${mirror}/stable/plasma/5.10.4/powerdevil-5.10.4.tar.xz"; + sha256 = "1qlxdn7w6grwpqlwfwwsh0ag5bshi8m9mz2s1zvrfgk09wvl6mr2"; + name = "powerdevil-5.10.4.tar.xz"; }; }; sddm-kcm = { - version = "5.10.3"; + version = "5.10.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.3/sddm-kcm-5.10.3.tar.xz"; - sha256 = "1gcla1lk8idxj4j4sr13wv3q2v6c4ylhgjqj1ik9qr9rk7r2ny8c"; - name = "sddm-kcm-5.10.3.tar.xz"; + url = "${mirror}/stable/plasma/5.10.4/sddm-kcm-5.10.4.tar.xz"; + sha256 = "1sljbd57nn1n26jdrbyj8dgrjdz3rfq8vacvx96a2nj3csnf0qlk"; + name = "sddm-kcm-5.10.4.tar.xz"; }; }; systemsettings = { - version = "5.10.3"; + version = "5.10.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.3/systemsettings-5.10.3.tar.xz"; - sha256 = "0mfcyvzl5z3yqq0bbpwzhphir0vjjhvpifp17ra4w80j3f2c14jh"; - name = "systemsettings-5.10.3.tar.xz"; + url = "${mirror}/stable/plasma/5.10.4/systemsettings-5.10.4.tar.xz"; + sha256 = "05rchi657px3qizqq82z4k0wsjc4cm2w5wb1mb9ayg287cdrsnjy"; + name = "systemsettings-5.10.4.tar.xz"; }; }; user-manager = { - version = "5.10.3"; + version = "5.10.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.3/user-manager-5.10.3.tar.xz"; - sha256 = "10iis34bpi0vic3x4r6gss8frfxg4zv9v8mg1rpbmrrs5q8799fn"; - name = "user-manager-5.10.3.tar.xz"; + url = "${mirror}/stable/plasma/5.10.4/user-manager-5.10.4.tar.xz"; + sha256 = "16swrdmf0b26zy5qipb89smh3cps1fvcxkz12sxd8i92m6cxa903"; + name = "user-manager-5.10.4.tar.xz"; }; }; xdg-desktop-portal-kde = { - version = "5.10.3"; + version = "5.10.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.3/xdg-desktop-portal-kde-5.10.3.tar.xz"; - sha256 = "1hnbw211fn6aayx46h92nmjvdc0ar1bsy1dn1lg2a5575kq2lzgd"; - name = "xdg-desktop-portal-kde-5.10.3.tar.xz"; + url = "${mirror}/stable/plasma/5.10.4/xdg-desktop-portal-kde-5.10.4.tar.xz"; + sha256 = "01snfdj73r0hby9h32k7258r65ip62wk4p78qxibvffxm4ixw04l"; + name = "xdg-desktop-portal-kde-5.10.4.tar.xz"; }; }; } diff --git a/pkgs/development/compilers/ispc/default.nix b/pkgs/development/compilers/ispc/default.nix index f8413075ac81..6bc7f66ca299 100644 --- a/pkgs/development/compilers/ispc/default.nix +++ b/pkgs/development/compilers/ispc/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, bash, which, m4, python, bison, flex_2_6_1, llvmPackages, clangWrapSelf, +{stdenv, fetchFromGitHub, bash, which, m4, python, bison, flex, llvmPackages, clangWrapSelf, testedTargets ? ["sse2" "host"] # the default test target is sse4, but that is not supported by all Hydra agents }: @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { m4 python bison - flex_2_6_1 + flex llvm llvmPackages.clang-unwrapped # we need to link against libclang, so we need the unwrapped ]; diff --git a/pkgs/development/compilers/openjdk-darwin/8.nix b/pkgs/development/compilers/openjdk-darwin/8.nix index 51effd2c7841..6234b63208cd 100644 --- a/pkgs/development/compilers/openjdk-darwin/8.nix +++ b/pkgs/development/compilers/openjdk-darwin/8.nix @@ -33,7 +33,7 @@ let # any package that depends on the JRE has $CLASSPATH set up # properly. mkdir -p $out/nix-support - echo -n "${setJavaClassPath}" > $out/nix-support/propagated-native-build-inputs + printWords ${setJavaClassPath} > $out/nix-support/propagated-native-build-inputs install_name_tool -change /usr/X11/lib/libfreetype.6.dylib ${freetype}/lib/libfreetype.6.dylib $out/jre/lib/libfontmanager.dylib diff --git a/pkgs/development/compilers/openjdk-darwin/default.nix b/pkgs/development/compilers/openjdk-darwin/default.nix index 10a9eb2b3666..1e8f88beea66 100644 --- a/pkgs/development/compilers/openjdk-darwin/default.nix +++ b/pkgs/development/compilers/openjdk-darwin/default.nix @@ -23,7 +23,7 @@ let # any package that depends on the JRE has $CLASSPATH set up # properly. mkdir -p $out/nix-support - echo -n "${setJavaClassPath}" > $out/nix-support/propagated-native-build-inputs + printWords ${setJavaClassPath} > $out/nix-support/propagated-native-build-inputs install_name_tool -change /usr/X11/lib/libfreetype.6.dylib ${freetype}/lib/libfreetype.6.dylib $out/jre/lib/libfontmanager.dylib diff --git a/pkgs/development/compilers/openjdk/7.nix b/pkgs/development/compilers/openjdk/7.nix index 6dcbb0a330f1..72f0ba293ba9 100644 --- a/pkgs/development/compilers/openjdk/7.nix +++ b/pkgs/development/compilers/openjdk/7.nix @@ -190,7 +190,7 @@ let # any package that depends on the JRE has $CLASSPATH set up # properly. mkdir -p $jre/nix-support - echo -n "${setJavaClassPath}" > $jre/nix-support/propagated-native-build-inputs + printWords ${setJavaClassPath} > $jre/nix-support/propagated-native-build-inputs # Set JAVA_HOME automatically. mkdir -p $out/nix-support diff --git a/pkgs/development/compilers/openjdk/8.nix b/pkgs/development/compilers/openjdk/8.nix index 9ca28375c6bb..d03443479699 100644 --- a/pkgs/development/compilers/openjdk/8.nix +++ b/pkgs/development/compilers/openjdk/8.nix @@ -203,7 +203,7 @@ let # any package that depends on the JRE has $CLASSPATH set up # properly. mkdir -p $jre/nix-support - echo -n "${setJavaClassPath}" > $jre/nix-support/propagated-native-build-inputs + printWords ${setJavaClassPath} > $jre/nix-support/propagated-native-build-inputs # Set JAVA_HOME automatically. mkdir -p $out/nix-support diff --git a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix index 6db0029730a0..fec038199adc 100644 --- a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix +++ b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix @@ -165,7 +165,7 @@ let result = stdenv.mkDerivation rec { ln -s $jrePath/lib/${architecture}/libnpjp2.so $jrePath/lib/${architecture}/plugins mkdir -p $out/nix-support - echo -n "${setJavaClassPath}" > $out/nix-support/propagated-native-build-inputs + printWords ${setJavaClassPath} > $out/nix-support/propagated-native-build-inputs # Set JAVA_HOME automatically. cat <<EOF >> $out/nix-support/setup-hook diff --git a/pkgs/development/compilers/ponyc/default.nix b/pkgs/development/compilers/ponyc/default.nix index 6e393426b7a8..c3d9d9882074 100644 --- a/pkgs/development/compilers/ponyc/default.nix +++ b/pkgs/development/compilers/ponyc/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation ( rec { name = "ponyc-${version}"; - version = "0.15.0"; + version = "0.16.1"; src = fetchFromGitHub { owner = "ponylang"; repo = "ponyc"; rev = version; - sha256 = "02hmn066jswaij2ib0faabm2i9cqz562z6s0vakgwnxyrk4qayif"; + sha256 = "175yivc5vjwfdcqcpkdqmdfy72pn4k62n4j3qagfbwya7frq2car"; }; buildInputs = [ llvm makeWrapper which ]; diff --git a/pkgs/development/compilers/ponyc/pony-stable.nix b/pkgs/development/compilers/ponyc/pony-stable.nix index c91d9d603d54..46d91fc36e09 100644 --- a/pkgs/development/compilers/ponyc/pony-stable.nix +++ b/pkgs/development/compilers/ponyc/pony-stable.nix @@ -1,13 +1,13 @@ {stdenv, fetchFromGitHub, ponyc }: stdenv.mkDerivation { - name = "pony-stable-unstable-2017-04-20"; + name = "pony-stable-unstable-2017-07-26"; src = fetchFromGitHub { owner = "ponylang"; repo = "pony-stable"; - rev = "b2ea566b02ec40480f888652b04eaa5f191a241e"; - sha256 = "1bixkxccsrnyip3yp42r14rbhk832pvzwbkh6ash4ip2isxa6b19"; + rev = "4016f9253a4e3114ee69100d3d02154ffd3fd7e4"; + sha256 = "0xz5syjn2f8k31vny49k3jm8zisa15ly4hbcb3rh4jvq8jjp1ldr"; }; buildInputs = [ ponyc ]; diff --git a/pkgs/development/compilers/swi-prolog/default.nix b/pkgs/development/compilers/swi-prolog/default.nix index 79f7e5256b21..0f84b8ba4cd8 100644 --- a/pkgs/development/compilers/swi-prolog/default.nix +++ b/pkgs/development/compilers/swi-prolog/default.nix @@ -4,14 +4,14 @@ }: let - version = "7.2.3"; + version = "7.4.2"; in stdenv.mkDerivation { name = "swi-prolog-${version}"; src = fetchurl { url = "http://www.swi-prolog.org/download/stable/src/swipl-${version}.tar.gz"; - sha256 = "1da6sr8pz1zffs79nfa1d25a11ibhalm1vdwsb17p265nx8psra3"; + sha256 = "12yzy3w2l1p9fv77lv20xbqq47d0zjw5rkz96mx1xg1lldyja5vz"; }; buildInputs = [ gmp readline openssl libjpeg unixODBC libXinerama diff --git a/pkgs/development/compilers/zulu/default.nix b/pkgs/development/compilers/zulu/default.nix index c4cdf70f14ac..f7638757ff7a 100644 --- a/pkgs/development/compilers/zulu/default.nix +++ b/pkgs/development/compilers/zulu/default.nix @@ -54,7 +54,7 @@ in stdenv.mkDerivation rec { find $out -name "*.so" -exec patchelf --set-rpath "$rpath" {} \; mkdir -p $out/nix-support - echo -n "${setJavaClassPath}" > $out/nix-support/propagated-native-build-inputs + printWords ${setJavaClassPath} > $out/nix-support/propagated-native-build-inputs # Set JAVA_HOME automatically. cat <<EOF >> $out/nix-support/setup-hook diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 43270465775e..2d0d0ec101db 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -603,6 +603,14 @@ self: super: { # Fine-tune the build. structured-haskell-mode = (overrideCabal super.structured-haskell-mode (drv: { + src = pkgs.fetchFromGitHub { + owner = "chrisdone"; + repo = "structured-haskell-mode"; + rev = "bd08a0b2297667e2ac7896e3b480033ae5721d4d"; + sha256 = "14rl739z19ns31h9fj48sx9ppca4g4mqkc7ccpacagwwf55m259c"; + }; + version = "20170523-git"; + editedCabalFile = null; # Statically linked Haskell libraries make the tool start-up much faster, # which is important for use in Emacs. enableSharedExecutables = false; @@ -610,22 +618,22 @@ self: super: { # cannot easily byte-compile these files, unfortunately, because they # depend on a new version of haskell-mode that we don't have yet. postInstall = '' - local lispdir=( "$out/share/"*"-${self.ghc.name}/${drv.pname}-"*"/elisp" ) - mkdir -p $out/share/emacs - ln -s $lispdir $out/share/emacs/site-lisp + local lispdir=( "$data/share/${self.ghc.name}/"*"/${drv.pname}-"*"/elisp" ) + mkdir -p $data/share/emacs + ln -s $lispdir $data/share/emacs/site-lisp ''; })).override { haskell-src-exts = self.haskell-src-exts_1_19_1; }; - # # Make elisp files available at a location where people expect it. + # Make elisp files available at a location where people expect it. hindent = (overrideCabal super.hindent (drv: { # We cannot easily byte-compile these files, unfortunately, because they # depend on a new version of haskell-mode that we don't have yet. postInstall = '' - local lispdir=( "$out/share/"*"-${self.ghc.name}/${drv.pname}-${drv.version}/elisp" ) - mkdir -p $out/share/emacs - ln -s $lispdir $out/share/emacs/site-lisp + local lispdir=( "$data/share/${self.ghc.name}/"*"/${drv.pname}-"*"/elisp" ) + mkdir -p $data/share/emacs + ln -s $lispdir $data/share/emacs/site-lisp ''; doCheck = false; # https://github.com/chrisdone/hindent/issues/299 })).override { @@ -865,9 +873,6 @@ self: super: { # https://github.com/diagrams/diagrams-solve/issues/4 diagrams-solve = dontCheck super.diagrams-solve; - # Needs a newer version of ghc-events. - threadscope = super.threadscope.override { ghc-events = self.ghc-events_0_6_0; }; - # version 1.3.1.2 does not compile: syb >=0.1.0.2 && <0.7 ChasingBottoms = doJailbreak super.ChasingBottoms; diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 36e391183fad..7e99300a41e1 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -218,7 +218,7 @@ stdenv.mkDerivation ({ configureFlags="${concatStringsSep " " defaultConfigureFlags} $configureFlags" # nativePkgs defined in stdenv/setup.hs - for p in $nativePkgs; do + for p in "''${nativePkgs[@]}"; do if [ -d "$p/lib/${ghc.name}/package.conf.d" ]; then cp -f "$p/lib/${ghc.name}/package.conf.d/"*.conf $packageConfDir/ continue @@ -318,7 +318,7 @@ stdenv.mkDerivation ({ ${optionalString isGhcjs '' for exeDir in "$out/bin/"*.jsexe; do exe="''${exeDir%.jsexe}" - printf '%s\n' '#!${nodejs}/bin/node' > "$exe" + printWords '#!${nodejs}/bin/node' > "$exe" cat "$exeDir/all.js" >> "$exe" chmod +x "$exe" done diff --git a/pkgs/development/interpreters/groovy/default.nix b/pkgs/development/interpreters/groovy/default.nix index 1928d51d3e58..e203a1d09f40 100644 --- a/pkgs/development/interpreters/groovy/default.nix +++ b/pkgs/development/interpreters/groovy/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "groovy-${version}"; - version = "2.4.10"; + version = "2.4.12"; src = fetchurl { url = "http://dl.bintray.com/groovy/maven/apache-groovy-binary-${version}.zip"; - sha256 = "1a8pqcrm014h4x54gqqyxp7r1vkwhphqwrfa7gnqr6nzdqxzyk8w"; + sha256 = "1dm7m221pqbgh3lp1q1nvv6qc0fpja3cgsd0mx3ghahcfsfa3fck"; }; buildInputs = [ unzip makeWrapper ]; diff --git a/pkgs/development/interpreters/python/cpython/3.5/default.nix b/pkgs/development/interpreters/python/cpython/3.5/default.nix index a4aec241a1aa..a47b10d1cbb3 100644 --- a/pkgs/development/interpreters/python/cpython/3.5/default.nix +++ b/pkgs/development/interpreters/python/cpython/3.5/default.nix @@ -70,6 +70,7 @@ in stdenv.mkDerivation { url = https://github.com/python/cpython/commit/035ba5da3e53e.patch; sha256 = "1y74ir1w5cq542w27rgzgp70chhq2x047db9911mihpab8p2nj71"; }) + ./no-ldconfig.patch ]; postPatch = '' diff --git a/pkgs/development/interpreters/python/cpython/3.5/no-ldconfig.patch b/pkgs/development/interpreters/python/cpython/3.5/no-ldconfig.patch new file mode 100644 index 000000000000..c96de5d0e914 --- /dev/null +++ b/pkgs/development/interpreters/python/cpython/3.5/no-ldconfig.patch @@ -0,0 +1,164 @@ +From f0ed87f4066296b7aa3c095d04672c138506fa45 Mon Sep 17 00:00:00 2001 +From: Frederik Rietdijk <fridh@fridh.nl> +Date: Sat, 29 Jul 2017 20:33:56 +0200 +Subject: [PATCH] Don't use ldconfig and speed up uuid load + +--- + Lib/ctypes/util.py | 70 ++---------------------------------------------------- + Lib/uuid.py | 52 ---------------------------------------- + 2 files changed, 2 insertions(+), 120 deletions(-) + +diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py +index 7684eab81d..e9957d7951 100644 +--- a/Lib/ctypes/util.py ++++ b/Lib/ctypes/util.py +@@ -95,46 +95,7 @@ elif os.name == "posix": + import re, tempfile + + def _findLib_gcc(name): +- # Run GCC's linker with the -t (aka --trace) option and examine the +- # library name it prints out. The GCC command will fail because we +- # haven't supplied a proper program with main(), but that does not +- # matter. +- expr = os.fsencode(r'[^\(\)\s]*lib%s\.[^\(\)\s]*' % re.escape(name)) +- +- c_compiler = shutil.which('gcc') +- if not c_compiler: +- c_compiler = shutil.which('cc') +- if not c_compiler: +- # No C compiler available, give up +- return None +- +- temp = tempfile.NamedTemporaryFile() +- try: +- args = [c_compiler, '-Wl,-t', '-o', temp.name, '-l' + name] +- +- env = dict(os.environ) +- env['LC_ALL'] = 'C' +- env['LANG'] = 'C' +- try: +- proc = subprocess.Popen(args, +- stdout=subprocess.PIPE, +- stderr=subprocess.STDOUT, +- env=env) +- except OSError: # E.g. bad executable +- return None +- with proc: +- trace = proc.stdout.read() +- finally: +- try: +- temp.close() +- except FileNotFoundError: +- # Raised if the file was already removed, which is the normal +- # behaviour of GCC if linking fails +- pass +- res = re.search(expr, trace) +- if not res: +- return None +- return os.fsdecode(res.group(0)) ++ return None + + + if sys.platform == "sunos5": +@@ -256,34 +217,7 @@ elif os.name == "posix": + else: + + def _findSoname_ldconfig(name): +- import struct +- if struct.calcsize('l') == 4: +- machine = os.uname().machine + '-32' +- else: +- machine = os.uname().machine + '-64' +- mach_map = { +- 'x86_64-64': 'libc6,x86-64', +- 'ppc64-64': 'libc6,64bit', +- 'sparc64-64': 'libc6,64bit', +- 's390x-64': 'libc6,64bit', +- 'ia64-64': 'libc6,IA-64', +- } +- abi_type = mach_map.get(machine, 'libc6') +- +- # XXX assuming GLIBC's ldconfig (with option -p) +- regex = os.fsencode( +- '\s+(lib%s\.[^\s]+)\s+\(%s' % (re.escape(name), abi_type)) +- try: +- with subprocess.Popen(['/sbin/ldconfig', '-p'], +- stdin=subprocess.DEVNULL, +- stderr=subprocess.DEVNULL, +- stdout=subprocess.PIPE, +- env={'LC_ALL': 'C', 'LANG': 'C'}) as p: +- res = re.search(regex, p.stdout.read()) +- if res: +- return os.fsdecode(res.group(1)) +- except OSError: +- pass ++ return None + + def find_library(name): + return _findSoname_ldconfig(name) or _get_soname(_findLib_gcc(name)) +diff --git a/Lib/uuid.py b/Lib/uuid.py +index e96e7e034c..a099ab4b4a 100644 +--- a/Lib/uuid.py ++++ b/Lib/uuid.py +@@ -455,58 +455,6 @@ def _netbios_getnode(): + continue + return int.from_bytes(bytes, 'big') + +-# Thanks to Thomas Heller for ctypes and for his help with its use here. +- +-# If ctypes is available, use it to find system routines for UUID generation. +-# XXX This makes the module non-thread-safe! +-_uuid_generate_time = _UuidCreate = None +-try: +- import ctypes, ctypes.util +- import sys +- +- # The uuid_generate_* routines are provided by libuuid on at least +- # Linux and FreeBSD, and provided by libc on Mac OS X. +- _libnames = ['uuid'] +- if not sys.platform.startswith('win'): +- _libnames.append('c') +- for libname in _libnames: +- try: +- lib = ctypes.CDLL(ctypes.util.find_library(libname)) +- except Exception: +- continue +- if hasattr(lib, 'uuid_generate_time'): +- _uuid_generate_time = lib.uuid_generate_time +- break +- del _libnames +- +- # The uuid_generate_* functions are broken on MacOS X 10.5, as noted +- # in issue #8621 the function generates the same sequence of values +- # in the parent process and all children created using fork (unless +- # those children use exec as well). +- # +- # Assume that the uuid_generate functions are broken from 10.5 onward, +- # the test can be adjusted when a later version is fixed. +- if sys.platform == 'darwin': +- import os +- if int(os.uname().release.split('.')[0]) >= 9: +- _uuid_generate_time = None +- +- # On Windows prior to 2000, UuidCreate gives a UUID containing the +- # hardware address. On Windows 2000 and later, UuidCreate makes a +- # random UUID and UuidCreateSequential gives a UUID containing the +- # hardware address. These routines are provided by the RPC runtime. +- # NOTE: at least on Tim's WinXP Pro SP2 desktop box, while the last +- # 6 bytes returned by UuidCreateSequential are fixed, they don't appear +- # to bear any relationship to the MAC address of any network device +- # on the box. +- try: +- lib = ctypes.windll.rpcrt4 +- except: +- lib = None +- _UuidCreate = getattr(lib, 'UuidCreateSequential', +- getattr(lib, 'UuidCreate', None)) +-except: +- pass + + def _unixdll_getnode(): + """Get the hardware address on Unix using ctypes.""" +-- +2.13.3 + diff --git a/pkgs/development/interpreters/python/cpython/3.6/default.nix b/pkgs/development/interpreters/python/cpython/3.6/default.nix index d2d922ce4955..7e05a0ce61c9 100644 --- a/pkgs/development/interpreters/python/cpython/3.6/default.nix +++ b/pkgs/development/interpreters/python/cpython/3.6/default.nix @@ -27,7 +27,7 @@ with stdenv.lib; let majorVersion = "3.6"; - minorVersion = "1"; + minorVersion = "2"; minorVersionSuffix = ""; pythonVersion = majorVersion; version = "${majorVersion}.${minorVersion}${minorVersionSuffix}"; @@ -48,7 +48,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "https://www.python.org/ftp/python/${majorVersion}.${minorVersion}/Python-${version}.tar.xz"; - sha256 = "0ha03sbakxblzyvlramx5fj0ranzmzx4pa2png6nn8gczkfi0650"; + sha256 = "1ab4vlpdax1ihpiyiwchlgsk36apl4kgdw271wvl9l8ywhxpfacj"; }; NIX_LDFLAGS = optionalString stdenv.isLinux "-lgcc_s"; @@ -64,6 +64,10 @@ in stdenv.mkDerivation { substituteInPlace configure --replace '-Wl,-stack_size,1000000' ' ' ''; + patches = [ + ./no-ldconfig.patch + ]; + postPatch = '' # Determinism substituteInPlace "Lib/py_compile.py" --replace "source_stats['mtime']" "(1 if 'DETERMINISTIC_BUILD' in os.environ else source_stats['mtime'])" diff --git a/pkgs/development/interpreters/python/cpython/3.6/no-ldconfig.patch b/pkgs/development/interpreters/python/cpython/3.6/no-ldconfig.patch new file mode 100644 index 000000000000..da6afe04d6e7 --- /dev/null +++ b/pkgs/development/interpreters/python/cpython/3.6/no-ldconfig.patch @@ -0,0 +1,163 @@ +From a831df344ec1c883a0ef04d8cc8f5c53a942f6de Mon Sep 17 00:00:00 2001 +From: Frederik Rietdijk <fridh@fridh.nl> +Date: Sat, 29 Jul 2017 20:17:40 +0200 +Subject: [PATCH] Don't use ldconfig and speed up uuid load + +--- + Lib/ctypes/util.py | 70 ++---------------------------------------------------- + Lib/uuid.py | 51 --------------------------------------- + 2 files changed, 2 insertions(+), 119 deletions(-) + +diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py +index 339ae8aa8a..2944985c30 100644 +--- a/Lib/ctypes/util.py ++++ b/Lib/ctypes/util.py +@@ -85,46 +85,7 @@ elif os.name == "posix": + import re, tempfile + + def _findLib_gcc(name): +- # Run GCC's linker with the -t (aka --trace) option and examine the +- # library name it prints out. The GCC command will fail because we +- # haven't supplied a proper program with main(), but that does not +- # matter. +- expr = os.fsencode(r'[^\(\)\s]*lib%s\.[^\(\)\s]*' % re.escape(name)) +- +- c_compiler = shutil.which('gcc') +- if not c_compiler: +- c_compiler = shutil.which('cc') +- if not c_compiler: +- # No C compiler available, give up +- return None +- +- temp = tempfile.NamedTemporaryFile() +- try: +- args = [c_compiler, '-Wl,-t', '-o', temp.name, '-l' + name] +- +- env = dict(os.environ) +- env['LC_ALL'] = 'C' +- env['LANG'] = 'C' +- try: +- proc = subprocess.Popen(args, +- stdout=subprocess.PIPE, +- stderr=subprocess.STDOUT, +- env=env) +- except OSError: # E.g. bad executable +- return None +- with proc: +- trace = proc.stdout.read() +- finally: +- try: +- temp.close() +- except FileNotFoundError: +- # Raised if the file was already removed, which is the normal +- # behaviour of GCC if linking fails +- pass +- res = re.search(expr, trace) +- if not res: +- return None +- return os.fsdecode(res.group(0)) ++ return None + + + if sys.platform == "sunos5": +@@ -246,34 +207,7 @@ elif os.name == "posix": + else: + + def _findSoname_ldconfig(name): +- import struct +- if struct.calcsize('l') == 4: +- machine = os.uname().machine + '-32' +- else: +- machine = os.uname().machine + '-64' +- mach_map = { +- 'x86_64-64': 'libc6,x86-64', +- 'ppc64-64': 'libc6,64bit', +- 'sparc64-64': 'libc6,64bit', +- 's390x-64': 'libc6,64bit', +- 'ia64-64': 'libc6,IA-64', +- } +- abi_type = mach_map.get(machine, 'libc6') +- +- # XXX assuming GLIBC's ldconfig (with option -p) +- regex = r'\s+(lib%s\.[^\s]+)\s+\(%s' +- regex = os.fsencode(regex % (re.escape(name), abi_type)) +- try: +- with subprocess.Popen(['/sbin/ldconfig', '-p'], +- stdin=subprocess.DEVNULL, +- stderr=subprocess.DEVNULL, +- stdout=subprocess.PIPE, +- env={'LC_ALL': 'C', 'LANG': 'C'}) as p: +- res = re.search(regex, p.stdout.read()) +- if res: +- return os.fsdecode(res.group(1)) +- except OSError: +- pass ++ return None + + def _findLib_ld(name): + # See issue #9998 for why this is needed +diff --git a/Lib/uuid.py b/Lib/uuid.py +index 200c800b34..a099ab4b4a 100644 +--- a/Lib/uuid.py ++++ b/Lib/uuid.py +@@ -455,57 +455,6 @@ def _netbios_getnode(): + continue + return int.from_bytes(bytes, 'big') + +-# Thanks to Thomas Heller for ctypes and for his help with its use here. +- +-# If ctypes is available, use it to find system routines for UUID generation. +-# XXX This makes the module non-thread-safe! +-_uuid_generate_time = _UuidCreate = None +-try: +- import ctypes, ctypes.util +- import sys +- +- # The uuid_generate_* routines are provided by libuuid on at least +- # Linux and FreeBSD, and provided by libc on Mac OS X. +- _libnames = ['uuid'] +- if not sys.platform.startswith('win'): +- _libnames.append('c') +- for libname in _libnames: +- try: +- lib = ctypes.CDLL(ctypes.util.find_library(libname)) +- except Exception: +- continue +- if hasattr(lib, 'uuid_generate_time'): +- _uuid_generate_time = lib.uuid_generate_time +- break +- del _libnames +- +- # The uuid_generate_* functions are broken on MacOS X 10.5, as noted +- # in issue #8621 the function generates the same sequence of values +- # in the parent process and all children created using fork (unless +- # those children use exec as well). +- # +- # Assume that the uuid_generate functions are broken from 10.5 onward, +- # the test can be adjusted when a later version is fixed. +- if sys.platform == 'darwin': +- if int(os.uname().release.split('.')[0]) >= 9: +- _uuid_generate_time = None +- +- # On Windows prior to 2000, UuidCreate gives a UUID containing the +- # hardware address. On Windows 2000 and later, UuidCreate makes a +- # random UUID and UuidCreateSequential gives a UUID containing the +- # hardware address. These routines are provided by the RPC runtime. +- # NOTE: at least on Tim's WinXP Pro SP2 desktop box, while the last +- # 6 bytes returned by UuidCreateSequential are fixed, they don't appear +- # to bear any relationship to the MAC address of any network device +- # on the box. +- try: +- lib = ctypes.windll.rpcrt4 +- except: +- lib = None +- _UuidCreate = getattr(lib, 'UuidCreateSequential', +- getattr(lib, 'UuidCreate', None)) +-except: +- pass + + def _unixdll_getnode(): + """Get the hardware address on Unix using ctypes.""" +-- +2.13.3 + diff --git a/pkgs/development/libraries/afflib/default.nix b/pkgs/development/libraries/afflib/default.nix index 8b7dddf0e151..7c697d3e60c9 100644 --- a/pkgs/development/libraries/afflib/default.nix +++ b/pkgs/development/libraries/afflib/default.nix @@ -3,19 +3,18 @@ }: stdenv.mkDerivation rec { - version = "3.7.15"; + version = "3.7.16"; name = "afflib-${version}"; src = fetchFromGitHub { owner = "sshock"; repo = "AFFLIBv3"; rev = "v${version}"; - sha256 = "0ckg49m15lz5cxg0k12z2ys6v4smjr6l8bbazrvsqlm649gwd2bw"; + sha256 = "0piwkmg7jn64h57cjf5cybyvyqxj2k752g9vrf4ycds7nhvvbnb6"; }; buildInputs = [ zlib curl expat fuse openssl autoreconfHook python ]; - meta = { homepage = http://afflib.sourceforge.net/; description = "Advanced forensic format library"; diff --git a/pkgs/development/libraries/allegro/5.nix b/pkgs/development/libraries/allegro/5.nix index 7efccfad2432..f1402e4ad9ed 100644 --- a/pkgs/development/libraries/allegro/5.nix +++ b/pkgs/development/libraries/allegro/5.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, texinfo, libXext, xextproto, libX11, xproto +{ stdenv, fetchFromGitHub, texinfo, libXext, xextproto, libX11, xproto , libXpm, libXt, libXcursor, alsaLib, cmake, zlib, libpng, libvorbis , libXxf86dga, libXxf86misc, xf86dgaproto, xf86miscproto , xf86vidmodeproto, libXxf86vm, openal, mesa, kbproto, libjpeg, flac @@ -9,11 +9,13 @@ stdenv.mkDerivation rec { name = "allegro-${version}"; - version = "5.2.1.1"; + version = "5.2.2.0"; - src = fetchurl { - url = "http://download.gna.org/allegro/allegro/${version}/${name}.tar.gz"; - sha256 = "0waalic7lyaf6i33nikmkc29bndci5c5090c4ra2vmy67cqdzndm"; + src = fetchFromGitHub { + owner = "liballeg"; + repo = "allegro5"; + rev = version; + sha256 = "1sf0dr0ahrzsy6gzzpvys9d7d9w0grayhak4cyymjv7w857hf51m"; }; buildInputs = [ diff --git a/pkgs/development/libraries/bullet/default.nix b/pkgs/development/libraries/bullet/default.nix index a8d350d9e37d..0c9f0903f148 100644 --- a/pkgs/development/libraries/bullet/default.nix +++ b/pkgs/development/libraries/bullet/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "bullet-${version}"; - version = "2.83.7"; + version = "2.86.1"; src = fetchFromGitHub { owner = "bulletphysics"; repo = "bullet3"; rev = version; - sha256 = "1zz3vs6i5975y9mgb1k1vxrjbf1028v0nc11p646dsvv2vplxx5r"; + sha256 = "1k81hr5y9rs2nsal6711fal21rxp6h573cpmjjk8x8ji2crqbqlz"; }; buildInputs = [ cmake ] ++ diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix index f569f53861dc..5fe13d86f2db 100644 --- a/pkgs/development/libraries/dbus/default.nix +++ b/pkgs/development/libraries/dbus/default.nix @@ -6,8 +6,8 @@ assert x11Support -> libX11 != null && libSM != null; let - version = "1.10.18"; - sha256 = "0jjirhw6xwz2ffmbg5kr79108l8i1bdaw7szc67n3qpkygaxsjb0"; + version = "1.10.20"; + sha256 = "0j0b8rn9fvh1m4nndp9fzq09xw50grp5kfvkv7jgs9al1dwbjx75"; self = stdenv.mkDerivation { name = "dbus-${version}"; diff --git a/pkgs/development/libraries/faac/default.nix b/pkgs/development/libraries/faac/default.nix index abbe07224b56..554337860028 100644 --- a/pkgs/development/libraries/faac/default.nix +++ b/pkgs/development/libraries/faac/default.nix @@ -8,27 +8,13 @@ assert mp4v2Support -> (mp4v2 != null); with stdenv.lib; stdenv.mkDerivation rec { name = "faac-${version}"; - version = "1.28"; + version = "1.29.3"; src = fetchurl { url = "mirror://sourceforge/faac/${name}.tar.gz"; - sha256 = "1pqr7nf6p2r283n0yby2czd3iy159gz8rfinkis7vcfgyjci2565"; + sha256 = "0gssrz2vq52mj8x2hvdqc9bwkp64s4f4g7yj7ac6dwxs8dw8kwnf"; }; - patches = [ - (fetchpatch { - name = "faac-mp4v2-1.9.patch"; - url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/mp4v2-1.9.patch?h=packages/faac"; - sha256 = "1pja822zw9q3cg8bjkw5z0bpxsk4q92qix26zpiqbvi7vg314hyc"; - }) - (fetchpatch { - name = "faac-mp4v2-2.0.0.patch"; - url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/mp4v2-2.0.0.patch?h=packages/faac"; - sha256 = "07kmkrl0600rs01xqpkkw9n8p1215n485xqf8hwimp60dw3vc0wn"; - addPrefixes = true; - }) - ]; - configureFlags = [ ] ++ optional mp4v2Support "--with-external-mp4v2" ++ optional drmSupport "--enable-drm"; diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix index 6246026e9ea7..4a02c034cf38 100644 --- a/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/pkgs/development/libraries/ffmpeg-full/default.nix @@ -241,6 +241,11 @@ stdenv.mkDerivation rec { patchPhase = ''patchShebangs . '' + stdenv.lib.optionalString stdenv.isDarwin '' sed -i 's/#ifndef __MAC_10_11/#if 1/' ./libavcodec/audiotoolboxdec.c + '' + stdenv.lib.optionalString (frei0r != null) '' + substituteInPlace libavfilter/vf_frei0r.c \ + --replace /usr/local/lib/frei0r-1 ${frei0r}/lib/frei0r-1 + substituteInPlace doc/filters.texi \ + --replace /usr/local/lib/frei0r-1 ${frei0r}/lib/frei0r-1 ''; configureFlags = [ diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index 07f370b42100..eb8f17980c2c 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -59,6 +59,8 @@ composableDerivation.composableDerivation {} (fixed: rec { wrapPythonPrograms ''; + enableParallelBuilding = true; + meta = { description = "Translator library for raster geospatial data formats"; homepage = http://www.gdal.org/; diff --git a/pkgs/development/libraries/gnutls/generic.nix b/pkgs/development/libraries/gnutls/generic.nix index 48aa3fb96737..2a73682a7461 100644 --- a/pkgs/development/libraries/gnutls/generic.nix +++ b/pkgs/development/libraries/gnutls/generic.nix @@ -1,6 +1,7 @@ { lib, fetchurl, 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 # Version dependent args , version, src, patches ? [], postPatch ? "", nativeBuildInputs ? [] @@ -32,12 +33,13 @@ stdenv.mkDerivation { ++ [ "--disable-dependency-tracking" "--enable-fast-install" + "--with-unbound-root-key-file=${dns-root-data}/root.key" ] ++ lib.optional guileBindings [ "--enable-guile" "--with-guile-site-dir=\${out}/share/guile/site" ]; enableParallelBuilding = true; - buildInputs = [ lzo lzip libtasn1 libidn p11_kit zlib gmp autogen libunistring ] + buildInputs = [ lzo lzip libtasn1 libidn p11_kit zlib gmp autogen libunistring unbound ] ++ lib.optional (stdenv.isFreeBSD || stdenv.isDarwin) libiconv ++ lib.optional (tpmSupport && stdenv.isLinux) trousers ++ lib.optional guileBindings guile diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix index 917371678e9d..cf888641b94b 100644 --- a/pkgs/development/libraries/gtk+/3.x.nix +++ b/pkgs/development/libraries/gtk+/3.x.nix @@ -13,7 +13,7 @@ with stdenv.lib; let ver_maj = "3.22"; - ver_min = "15"; + ver_min = "16"; version = "${ver_maj}.${ver_min}"; in stdenv.mkDerivation rec { @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/gtk+/${ver_maj}/gtk+-${version}.tar.xz"; - sha256 = "c8a012c2a99132629ab043f764a2b7cb6388483a015cd15c7a4288bec3590fdb"; + sha256 = "3e0c3ad01f3c8c5c9b1cc1ae00852bd55164c8e5a9c1f90ba5e07f14f175fe2c"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/kde-frameworks/fetch.sh b/pkgs/development/libraries/kde-frameworks/fetch.sh index 480b11622c05..37aaeb29e7ac 100644 --- a/pkgs/development/libraries/kde-frameworks/fetch.sh +++ b/pkgs/development/libraries/kde-frameworks/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/frameworks/5.34/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/frameworks/5.36/ -A '*.tar.xz' ) diff --git a/pkgs/development/libraries/kde-frameworks/kcodecs.nix b/pkgs/development/libraries/kde-frameworks/kcodecs.nix index 90c9a963a60e..6009b5ed73e7 100644 --- a/pkgs/development/libraries/kde-frameworks/kcodecs.nix +++ b/pkgs/development/libraries/kde-frameworks/kcodecs.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, extra-cmake-modules, qtbase, qttools }: +{ mkDerivation, lib, extra-cmake-modules, qtbase, qttools, gperf }: mkDerivation { name = "kcodecs"; @@ -7,7 +7,7 @@ mkDerivation { broken = builtins.compareVersions qtbase.version "5.6.0" < 0; }; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ qttools ]; + buildInputs = [ qttools gperf ]; propagatedBuildInputs = [ qtbase ]; outputs = [ "out" "dev" ]; } diff --git a/pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix b/pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix index 7f325c88049e..ac2092168285 100644 --- a/pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, copyPathsToStore, extra-cmake-modules, - attr, ebook_tools, exiv2, ffmpeg, karchive, ki18n, poppler, qtbase, taglib + attr, ebook_tools, exiv2, ffmpeg, karchive, ki18n, poppler, qtbase, qtmultimedia, taglib }: mkDerivation { @@ -9,8 +9,8 @@ mkDerivation { meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ - attr ebook_tools exiv2 ffmpeg karchive ki18n poppler taglib + attr ebook_tools exiv2 ffmpeg karchive ki18n poppler qtbase qtmultimedia + taglib ]; - propagatedBuildInputs = [ qtbase ]; patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); } diff --git a/pkgs/development/libraries/kde-frameworks/khtml.nix b/pkgs/development/libraries/kde-frameworks/khtml.nix index 3724d078afff..5bb3078ea867 100644 --- a/pkgs/development/libraries/kde-frameworks/khtml.nix +++ b/pkgs/development/libraries/kde-frameworks/khtml.nix @@ -3,7 +3,7 @@ extra-cmake-modules, perl, giflib, karchive, kcodecs, kglobalaccel, ki18n, kiconthemes, kio, kjs, knotifications, kparts, ktextwidgets, kwallet, kwidgetsaddons, kwindowsystem, - kxmlgui, phonon, qtx11extras, sonnet + kxmlgui, phonon, qtx11extras, sonnet, gperf }: mkDerivation { @@ -13,7 +13,7 @@ mkDerivation { buildInputs = [ giflib karchive kcodecs kglobalaccel ki18n kiconthemes kio knotifications kparts ktextwidgets kwallet kwidgetsaddons kwindowsystem kxmlgui phonon - qtx11extras sonnet + qtx11extras sonnet gperf ]; propagatedBuildInputs = [ kjs ]; } diff --git a/pkgs/development/libraries/kde-frameworks/solid.nix b/pkgs/development/libraries/kde-frameworks/solid.nix index 24705d6c114a..2a9b4fa1a5c9 100644 --- a/pkgs/development/libraries/kde-frameworks/solid.nix +++ b/pkgs/development/libraries/kde-frameworks/solid.nix @@ -10,7 +10,7 @@ mkDerivation { maintainers = [ lib.maintainers.ttuegel ]; broken = builtins.compareVersions qtbase.version "5.6.0" < 0; }; - nativeBuildInputs = [ bison extra-cmake-modules flex ]; + nativeBuildInputs = [ bison extra-cmake-modules flex media-player-info ]; buildInputs = [ qtdeclarative qttools ]; propagatedBuildInputs = [ qtbase ]; propagatedUserEnvPkgs = [ media-player-info ]; diff --git a/pkgs/development/libraries/kde-frameworks/srcs.nix b/pkgs/development/libraries/kde-frameworks/srcs.nix index 88a943c4fcda..ee6ece8fe271 100644 --- a/pkgs/development/libraries/kde-frameworks/srcs.nix +++ b/pkgs/development/libraries/kde-frameworks/srcs.nix @@ -3,595 +3,595 @@ { attica = { - version = "5.34.0"; + version = "5.36.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/attica-5.34.0.tar.xz"; - sha256 = "0l8gmsmpwzg6nzwwlnsdl6r6qkhnhirpmrkag9xpd2sbmy734x53"; - name = "attica-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.36/attica-5.36.0.tar.xz"; + sha256 = "12i5ky68aaxfxb0x6ixcjjqcdw87b435yf06qiz74pwvbj7rklld"; + name = "attica-5.36.0.tar.xz"; }; }; baloo = { - version = "5.34.0"; + version = "5.36.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/baloo-5.34.0.tar.xz"; - sha256 = "0z53lnniq9xdk09d73z0p1xs1qmaf71m4znm4hmq956yg4yqa1ya"; - name = "baloo-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.36/baloo-5.36.0.tar.xz"; + sha256 = "1zrikrzg4v8mh3w1wln6dqx4jazjqkx0k3482gxf71g7gi9xj8gi"; + name = "baloo-5.36.0.tar.xz"; }; }; bluez-qt = { - version = "5.34.0"; + version = "5.36.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/bluez-qt-5.34.0.tar.xz"; - sha256 = "040gs2a1fx996gqdx2pwxh00szb1vb85055z946nqvqfn01921df"; - name = "bluez-qt-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.36/bluez-qt-5.36.0.tar.xz"; + sha256 = "1r3g5f2ll4flav9vjrxzh35y0w38h5fkg89h3s88pldshvgg208w"; + name = "bluez-qt-5.36.0.tar.xz"; }; }; breeze-icons = { - version = "5.34.0"; + version = "5.36.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/breeze-icons-5.34.0.tar.xz"; - sha256 = "1znzlggb6yrkw5rr2n75g7cfv9x5p9d55hss09c4i79lxrh1bk4a"; - name = "breeze-icons-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.36/breeze-icons-5.36.0.tar.xz"; + sha256 = "19b6jpy3zaawll53fg4cm50p93128bw483y1bjn82ghs7yqmp7f3"; + name = "breeze-icons-5.36.0.tar.xz"; }; }; extra-cmake-modules = { - version = "5.34.0"; + version = "5.36.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/extra-cmake-modules-5.34.0.tar.xz"; - sha256 = "1r3dyvrv77xrpjlzpa6yazwkknirvx1ccvdyj9x0mlk4vfi05nh5"; - name = "extra-cmake-modules-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.36/extra-cmake-modules-5.36.0.tar.xz"; + sha256 = "1bsxdlk08zn98isbycm982xz67d40c63qsgghfambvqi0js0n4kf"; + name = "extra-cmake-modules-5.36.0.tar.xz"; }; }; frameworkintegration = { - version = "5.34.0"; + version = "5.36.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/frameworkintegration-5.34.0.tar.xz"; - sha256 = "0hq1r2znjzy0wzm3nsclqmih1aia5300bsf87a2l4919q0ildb20"; - name = "frameworkintegration-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.36/frameworkintegration-5.36.0.tar.xz"; + sha256 = "1qa325fsdqk30v310qmira6j9cr5ij4bbj7yxyp4m1jzbp16sprl"; + name = "frameworkintegration-5.36.0.tar.xz"; }; }; kactivities = { - version = "5.34.0"; + version = "5.36.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/kactivities-5.34.0.tar.xz"; - sha256 = "0dg6bkdxf4sicij4szmi55npn6chp0sfmw27qi1s582ymqzjgf5m"; - name = "kactivities-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.36/kactivities-5.36.0.tar.xz"; + sha256 = "0h13jl5f35g24flwx19sxpknc7f5mx25nnwy0xdrhkbd6dknkss7"; + name = "kactivities-5.36.0.tar.xz"; }; }; kactivities-stats = { - version = "5.34.0"; + version = "5.36.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/kactivities-stats-5.34.0.tar.xz"; - sha256 = "1dfaq4hsd9wm1ka45dkxbl9wwr7s5ixbnnghqwxhl7a60imc680r"; - name = "kactivities-stats-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.36/kactivities-stats-5.36.0.tar.xz"; + sha256 = "1hgpvga64244kh70ad0iwfl60bqpdly78db57hdh3b4as3mc7z8h"; + name = "kactivities-stats-5.36.0.tar.xz"; }; }; kapidox = { - version = "5.34.0"; + version = "5.36.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/kapidox-5.34.0.tar.xz"; - sha256 = "190d5z6i71jrvfna6vnlim2p9rgc33s1fxl0zarn276683i1rwvg"; - name = "kapidox-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.36/kapidox-5.36.0.tar.xz"; + sha256 = "181zgybsavvn2pdg9acyg7d2wspy8myf79qxbc8mb9zp5vnhb9br"; + name = "kapidox-5.36.0.tar.xz"; }; }; karchive = { - version = "5.34.0"; + version = "5.36.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/karchive-5.34.0.tar.xz"; - sha256 = "0g8jskdar2znviwh9bs3kia093wgfnhl04x4jcg2rvh78ylkpvxw"; - name = "karchive-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.36/karchive-5.36.0.tar.xz"; + sha256 = "0l93ws6c09hm2qrhbc2r71qjgf27mv36ahnisygamfwh754n4700"; + name = "karchive-5.36.0.tar.xz"; }; }; kauth = { - version = "5.34.0"; + version = "5.36.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/kauth-5.34.0.tar.xz"; - sha256 = "06cw1bsp7inh5wglajm8aahy17p35ixgnijb7d74gjqzbj4cv93d"; - name = "kauth-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.36/kauth-5.36.0.tar.xz"; + sha256 = "0a3xcl1wqb2ggw5lcll4i95jpi68zvmyyd7jb57qk1ags49l3yfk"; + name = "kauth-5.36.0.tar.xz"; }; }; kbookmarks = { - version = "5.34.0"; + version = "5.36.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/kbookmarks-5.34.0.tar.xz"; - sha256 = "0ggn4rz8ch82ph64q6yik9fb1mp6kmsd7n33p769zl1lw7fldn0v"; - name = "kbookmarks-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.36/kbookmarks-5.36.0.tar.xz"; + sha256 = "1176bily8w0q9l2k070rcgvki5mcjz8kh9nlvrgnch17bzqrwcsr"; + name = "kbookmarks-5.36.0.tar.xz"; }; }; kcmutils = { - version = "5.34.0"; + version = "5.36.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/kcmutils-5.34.0.tar.xz"; - sha256 = "1b52lwn7qjqrn06va7j1jswlzs6bx0drs90myf3607k52ffbf4hy"; - name = "kcmutils-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.36/kcmutils-5.36.0.tar.xz"; + sha256 = "0rifncrndad2fr4b2imrshlhmzapw7zq05z52dyp0i5fdmznc8fz"; + name = "kcmutils-5.36.0.tar.xz"; }; }; kcodecs = { - version = "5.34.0"; + version = "5.36.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/kcodecs-5.34.0.tar.xz"; - sha256 = "0k51s4qlf0kq6i8f3wrsz5lrkzjqb1j26hrmlmg57vn91r58iash"; - name = "kcodecs-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.36/kcodecs-5.36.0.tar.xz"; + sha256 = "0v5yv988ixdwbz0bbybia3f9y64k17ic935dr84kaqndz643xzvc"; + name = "kcodecs-5.36.0.tar.xz"; }; }; kcompletion = { - version = "5.34.0"; + version = "5.36.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/kcompletion-5.34.0.tar.xz"; - sha256 = "18hvdk5b1nkh6b3vx0jajri57rl266b0qjsiwirh5wmjc81xbpcw"; - name = "kcompletion-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.36/kcompletion-5.36.0.tar.xz"; + sha256 = "1wi0fcrzxk27a1r0arrylxqyx4jpz1scj8pwf6whnpl56vmh6w9p"; + name = "kcompletion-5.36.0.tar.xz"; }; }; kconfig = { - version = "5.34.0"; + version = "5.36.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/kconfig-5.34.0.tar.xz"; - sha256 = "0blbx6b3fk6p8cv2iywk2avn9w1411bb0g5wwv456a9ggi01988x"; - name = "kconfig-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.36/kconfig-5.36.0.tar.xz"; + sha256 = "0m6n6dw4sgc1mr84dlg3lsbm080jqwrqd0mil15c33gsjn2kl7mk"; + name = "kconfig-5.36.0.tar.xz"; }; }; kconfigwidgets = { - version = "5.34.0"; + version = "5.36.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/kconfigwidgets-5.34.0.tar.xz"; - sha256 = "0h4kappsffrp2qgg8wza1ybgah2dlcgpz591llfvaz31ldsml9hk"; - name = "kconfigwidgets-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.36/kconfigwidgets-5.36.0.tar.xz"; + sha256 = "0siw3rhl8pjm6hnxis22rfdji28svp8q27991wsdmm7d5m284hx5"; + name = "kconfigwidgets-5.36.0.tar.xz"; }; }; kcoreaddons = { - version = "5.34.0"; + version = "5.36.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/kcoreaddons-5.34.0.tar.xz"; - sha256 = "1ybr4bv8rhp4cxpf8mfsc4dk0klzrfh1z8g2cw6zasmksxmmwi90"; - name = "kcoreaddons-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.36/kcoreaddons-5.36.0.tar.xz"; + sha256 = "152mkf75bvn95viz3cz54cmssp1j89wp591sycvnqcni4azjcjwx"; + name = "kcoreaddons-5.36.0.tar.xz"; }; }; kcrash = { - version = "5.34.0"; + version = "5.36.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/kcrash-5.34.0.tar.xz"; - sha256 = "1cshay7dhbqgh62nq85vd9sm20gq9s9f70mdnzjjh1q7cajybkp3"; - name = "kcrash-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.36/kcrash-5.36.0.tar.xz"; + sha256 = "0f6sbs91qykh0c4fs1lvdz89jn8rhnfg0v6dd3pkqm5q2fcdv3id"; + name = "kcrash-5.36.0.tar.xz"; }; }; kdbusaddons = { - version = "5.34.0"; + version = "5.36.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/kdbusaddons-5.34.0.tar.xz"; - sha256 = "1skblxfnjhbyiwavsfhksc2ybc2sikw3xr0js6mlfbpmvqzghn6h"; - name = "kdbusaddons-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.36/kdbusaddons-5.36.0.tar.xz"; + sha256 = "012fbzdpzamc2nvbfhzv2270p4jsxiwa552mmmj16yxnrjrwycw4"; + name = "kdbusaddons-5.36.0.tar.xz"; }; }; kdeclarative = { - version = "5.34.0"; + version = "5.36.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/kdeclarative-5.34.0.tar.xz"; - sha256 = "1mfj32p631zvwz9ldk8536ifb4n825zxbhx69bfllhw2vn1am7z2"; - name = "kdeclarative-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.36/kdeclarative-5.36.0.tar.xz"; + sha256 = "0ljx1841490sl1qsi8304whczxgj4q4irm8z720bkjqh0c8i5pid"; + name = "kdeclarative-5.36.0.tar.xz"; }; }; kded = { - version = "5.34.0"; + version = "5.36.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/kded-5.34.0.tar.xz"; - sha256 = "0qy4w7bcg60gyf6y6c11kqcshnld55a8w4fzglpwgqfbliyi5yzq"; - name = "kded-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.36/kded-5.36.0.tar.xz"; + sha256 = "0y44rgrxh47bj4ljpxs6gdib4fhzyz6pvi5l2hnacwr2l1vnfcs4"; + name = "kded-5.36.0.tar.xz"; }; }; kdelibs4support = { - version = "5.34.0"; + version = "5.36.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/portingAids/kdelibs4support-5.34.0.tar.xz"; - sha256 = "0q9jjsjcvc43va4yvfay2xi40vb95lnqhgzavpqcndzjihixwmi0"; - name = "kdelibs4support-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.36/portingAids/kdelibs4support-5.36.0.tar.xz"; + sha256 = "041ygn0yd5r91j9ppv63xwj21c4ny56qlmkv2hmpanl05y94bpnq"; + name = "kdelibs4support-5.36.0.tar.xz"; }; }; kdesignerplugin = { - version = "5.34.0"; + version = "5.36.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/kdesignerplugin-5.34.0.tar.xz"; - sha256 = "1jnarg7wrhdjfq73q4wplazxsz927mpf0l6m0i4akq4dlp1b7aah"; - name = "kdesignerplugin-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.36/kdesignerplugin-5.36.0.tar.xz"; + sha256 = "1ksa8f6ivjlmm6rlm20vmrlqw58rf1k4ry3mk60b073fni2779hv"; + name = "kdesignerplugin-5.36.0.tar.xz"; }; }; kdesu = { - version = "5.34.0"; + version = "5.36.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/kdesu-5.34.0.tar.xz"; - sha256 = "04mx0d6kf8slgkkgbna3cyv4c491jvlwcwqxc7zikz0i03l341id"; - name = "kdesu-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.36/kdesu-5.36.0.tar.xz"; + sha256 = "01lg36m19qsa8ipwyx85jr38jh9ddcl6cvs4z3jmhg2nl467pwwa"; + name = "kdesu-5.36.0.tar.xz"; }; }; kdewebkit = { - version = "5.34.0"; + version = "5.36.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/kdewebkit-5.34.0.tar.xz"; - sha256 = "155rn5bib4jq1ml35l4hll9cv30bp83wva4kgrhfc4y8cp46p9wk"; - name = "kdewebkit-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.36/kdewebkit-5.36.0.tar.xz"; + sha256 = "1x53gzn1qyyvlx36qfjl6297v4862qqr8cmld32qaqxsgqc11b9s"; + name = "kdewebkit-5.36.0.tar.xz"; }; }; kdnssd = { - version = "5.34.0"; + version = "5.36.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/kdnssd-5.34.0.tar.xz"; - sha256 = "082mdim9wykdap4fmjfayk443rbarsk1p8cn3mspx2nw047yja80"; - name = "kdnssd-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.36/kdnssd-5.36.0.tar.xz"; + sha256 = "07lfwbw546qsx2rss0ajblaqi9db2dz07s0vki1w9q17nf4lnl2p"; + name = "kdnssd-5.36.0.tar.xz"; }; }; kdoctools = { - version = "5.34.0"; + version = "5.36.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/kdoctools-5.34.0.tar.xz"; - sha256 = "145jjhsd0whmcj91zbjz2b1jyj4wasw60hbwyd4xvqds8cp0l02h"; - name = "kdoctools-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.36/kdoctools-5.36.0.tar.xz"; + sha256 = "0sgvxp90141y11lz2vm8y78ymny8krq493w4xxaj9blzgfyr0yrj"; + name = "kdoctools-5.36.0.tar.xz"; }; }; kemoticons = { - version = "5.34.0"; + version = "5.36.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/kemoticons-5.34.0.tar.xz"; - sha256 = "02h12qy0w6mcgkczi3md1znnvp7r47l8h416nd080ljpsydalgx8"; - name = "kemoticons-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.36/kemoticons-5.36.0.tar.xz"; + sha256 = "0bwag8x27dfshhd42340zr591l4nxhj58qlzdz64q4h3rhvibk5f"; + name = "kemoticons-5.36.0.tar.xz"; }; }; kfilemetadata = { - version = "5.34.0"; + version = "5.36.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/kfilemetadata-5.34.0.tar.xz"; - sha256 = "1rvlg6by8daiq5ff3qlxcw9k2iq4qicsj0c8a00xfy3w4h9ip9h5"; - name = "kfilemetadata-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.36/kfilemetadata-5.36.0.tar.xz"; + sha256 = "17967dl9r2fipagdb3xknfv8p3cqi2mhxmpw1ghmw9mdid01y33m"; + name = "kfilemetadata-5.36.0.tar.xz"; }; }; kglobalaccel = { - version = "5.34.0"; + version = "5.36.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/kglobalaccel-5.34.0.tar.xz"; - sha256 = "1i32dq70qxjbfvlw0wqxvqvl6ysydmpg3zbiflff4z1qrmvmpw6a"; - name = "kglobalaccel-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.36/kglobalaccel-5.36.0.tar.xz"; + sha256 = "1nkm2w38n8f5wq446g9kng8xy7vd4y0acfbsnlc9zshzmbf655bj"; + name = "kglobalaccel-5.36.0.tar.xz"; }; }; kguiaddons = { - version = "5.34.0"; + version = "5.36.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/kguiaddons-5.34.0.tar.xz"; - sha256 = "1nmlwvy2jdmh0m6bmahvk68vl2rs9s28c10dkncpi6gvhsdkigqx"; - name = "kguiaddons-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.36/kguiaddons-5.36.0.tar.xz"; + sha256 = "1xliia9zfg9kcgi78pkrlvb1nqj3h1cms7pccrnqgfgszm3j2y4c"; + name = "kguiaddons-5.36.0.tar.xz"; }; }; khtml = { - version = "5.34.0"; + version = "5.36.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/portingAids/khtml-5.34.0.tar.xz"; - sha256 = "0j490jfnz8pbfl1i11wj514nw0skpnxr2fvi9pqpfql9lfhsanxv"; - name = "khtml-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.36/portingAids/khtml-5.36.0.tar.xz"; + sha256 = "15akih9pn3yzx4vskvq5vqrgq64vxfprvbfh00ir7bgl8rzrrngs"; + name = "khtml-5.36.0.tar.xz"; }; }; ki18n = { - version = "5.34.0"; + version = "5.36.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/ki18n-5.34.0.tar.xz"; - sha256 = "0glvmmy01mp6hnix79aichgwjq842kgf5q5zynkg6mch85y4ary7"; - name = "ki18n-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.36/ki18n-5.36.0.tar.xz"; + sha256 = "12sm340y2qvxlw7cac9mwq5ps4px4z607a9lx4q0ckaggix8gjf0"; + name = "ki18n-5.36.0.tar.xz"; }; }; kiconthemes = { - version = "5.34.0"; + version = "5.36.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/kiconthemes-5.34.0.tar.xz"; - sha256 = "0hbl82r6qc8dh9v9n9xjkx966czkq5yjxx2rx7sbilj2p9v3saii"; - name = "kiconthemes-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.36/kiconthemes-5.36.0.tar.xz"; + sha256 = "0a9dkn20siymgwy1fsnf98qbg14v0rfyrf96vrz1378vkyh37j2l"; + name = "kiconthemes-5.36.0.tar.xz"; }; }; kidletime = { - version = "5.34.0"; + version = "5.36.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/kidletime-5.34.0.tar.xz"; - sha256 = "0z8x6iz52y2m8llsp2q4qayxswkzay7ksimzy47crfag442bw24g"; - name = "kidletime-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.36/kidletime-5.36.0.tar.xz"; + sha256 = "1dhszas2fai5pv0lhk26w93ankp1x56nq8zlqdqs77z6fihmnc9l"; + name = "kidletime-5.36.0.tar.xz"; }; }; kimageformats = { - version = "5.34.0"; + version = "5.36.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/kimageformats-5.34.0.tar.xz"; - sha256 = "0q9ng4clqk2dqw43nk1pmq1d61rahc3qr4dmg4y3kjvz3ahnnijw"; - name = "kimageformats-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.36/kimageformats-5.36.0.tar.xz"; + sha256 = "1j106d9m2z3dgz7ibff4cfzndann1yaf57c449s5l7gsdg229p89"; + name = "kimageformats-5.36.0.tar.xz"; }; }; kinit = { - version = "5.34.0"; + version = "5.36.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/kinit-5.34.0.tar.xz"; - sha256 = "08429kjihpaip73wszr3rsii8sdlwgm3kxx7g0hpjhkj9d2jq3m1"; - name = "kinit-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.36/kinit-5.36.0.tar.xz"; + sha256 = "0499wjpjpba3kgprs2pvvrply1mbnvm7pppncv4jh7ynhqkjvm94"; + name = "kinit-5.36.0.tar.xz"; }; }; kio = { - version = "5.34.0"; + version = "5.36.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/kio-5.34.0.tar.xz"; - sha256 = "1i23ld5b9gafh2x3lv79jbggbd92xyhk7rg3n765w3bsfpg2ijva"; - name = "kio-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.36/kio-5.36.0.tar.xz"; + sha256 = "1j23nxmsdivia5hrfdq42p4bdz5r0r739rr1px9dwmjiv3am33zi"; + name = "kio-5.36.0.tar.xz"; }; }; kitemmodels = { - version = "5.34.0"; + version = "5.36.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/kitemmodels-5.34.0.tar.xz"; - sha256 = "1liq1ppa7xb1dcncv25c2a0xy3l9bvb2a56cff90c0b0vwr239q5"; - name = "kitemmodels-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.36/kitemmodels-5.36.0.tar.xz"; + sha256 = "08vbjardjnj7bz8ah089gpljc05h67q15g2xa7h5swkvh0pvq19a"; + name = "kitemmodels-5.36.0.tar.xz"; }; }; kitemviews = { - version = "5.34.0"; + version = "5.36.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/kitemviews-5.34.0.tar.xz"; - sha256 = "054accbis471zj1gbfxbc99062r2hvpb04i6w3r8fa4ml8s6brqk"; - name = "kitemviews-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.36/kitemviews-5.36.0.tar.xz"; + sha256 = "01iayb6r8w4cnq3qpcs6c8cxmnjzp7mznk7s9d0djijplrcdgskl"; + name = "kitemviews-5.36.0.tar.xz"; }; }; kjobwidgets = { - version = "5.34.0"; + version = "5.36.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/kjobwidgets-5.34.0.tar.xz"; - sha256 = "0lrx761vf947mb2q1l2jgi0wgwj8cz2nn1xg0j38bh99sgddmzpf"; - name = "kjobwidgets-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.36/kjobwidgets-5.36.0.tar.xz"; + sha256 = "1m4wsvpw4k7x7v32hxkk7dvs9gsnnwwzvgk81d86kvzdipkrbbcp"; + name = "kjobwidgets-5.36.0.tar.xz"; }; }; kjs = { - version = "5.34.0"; + version = "5.36.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/portingAids/kjs-5.34.0.tar.xz"; - sha256 = "18b7k1hi73iqn06c1ryy9lcmvscr9d08q7n1wwkrn0l2xmy05xsq"; - name = "kjs-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.36/portingAids/kjs-5.36.0.tar.xz"; + sha256 = "06pzx7jajhk3yd01hxkia4lh85mdc9a5m2jd0bl1sk1q42hrm4n6"; + name = "kjs-5.36.0.tar.xz"; }; }; kjsembed = { - version = "5.34.0"; + version = "5.36.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/portingAids/kjsembed-5.34.0.tar.xz"; - sha256 = "17w8i370pqks1fj3pcziz7j014chnc6yi7md7w2p4xprw54pbmbk"; - name = "kjsembed-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.36/portingAids/kjsembed-5.36.0.tar.xz"; + sha256 = "1045jfxky4hnld24lg3qy7j4v0aa0n9fgwa13fm7sz923ylh3gs9"; + name = "kjsembed-5.36.0.tar.xz"; }; }; kmediaplayer = { - version = "5.34.0"; + version = "5.36.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/portingAids/kmediaplayer-5.34.0.tar.xz"; - sha256 = "1mq87qf86sdvwhas4w7rspd221qp4x9kds4nd0lpldiay4483k86"; - name = "kmediaplayer-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.36/portingAids/kmediaplayer-5.36.0.tar.xz"; + sha256 = "1pqg8ycsasn3sxh1r1wmrrz9431whylr77z8bvikj9x0w28fwnkm"; + name = "kmediaplayer-5.36.0.tar.xz"; }; }; knewstuff = { - version = "5.34.0"; + version = "5.36.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/knewstuff-5.34.0.tar.xz"; - sha256 = "19d53ylwr92dzl9agk4j765zvb897rcm55z7pr6841aj58jk9b82"; - name = "knewstuff-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.36/knewstuff-5.36.0.tar.xz"; + sha256 = "0pfshizab7xkj71hjm69kqd63wvsmn4fpyhz7r1s9hsj136cjyzi"; + name = "knewstuff-5.36.0.tar.xz"; }; }; knotifications = { - version = "5.34.0"; + version = "5.36.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/knotifications-5.34.0.tar.xz"; - sha256 = "12z5hza0n5zr6mv3gkwhzb8zkrmk6dvgq8hrzwm8rzkgphjr6pi9"; - name = "knotifications-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.36/knotifications-5.36.0.tar.xz"; + sha256 = "1hlyllhfdd4pgj7q9k76wsf58h6m9vls1iz6ah20qivbkkwls074"; + name = "knotifications-5.36.0.tar.xz"; }; }; knotifyconfig = { - version = "5.34.0"; + version = "5.36.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/knotifyconfig-5.34.0.tar.xz"; - sha256 = "0lwl22vq770jyp45j32s0ss8yiqdwbink6cdhkbapg3pzbiwklyk"; - name = "knotifyconfig-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.36/knotifyconfig-5.36.0.tar.xz"; + sha256 = "04cqyhbz6vfcwgd82jniwcc23sw7hzhrcfh5a3nlbx4yl0bifb3w"; + name = "knotifyconfig-5.36.0.tar.xz"; }; }; kpackage = { - version = "5.34.0"; + version = "5.36.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/kpackage-5.34.0.tar.xz"; - sha256 = "0wdymhcrjggxb7andz36cfk9f240vvbq5yahlxyhfp9z69lriw5q"; - name = "kpackage-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.36/kpackage-5.36.0.tar.xz"; + sha256 = "0bwa588wj0nwvbnblzfqx0qz1cc7a43p4dk1pc95rvzf00h8i1q8"; + name = "kpackage-5.36.0.tar.xz"; }; }; kparts = { - version = "5.34.0"; + version = "5.36.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/kparts-5.34.0.tar.xz"; - sha256 = "1a5n0f7ljdc2bm6vggzwbvpblyxjqn9m9pam70iab964pqqalgp7"; - name = "kparts-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.36/kparts-5.36.0.tar.xz"; + sha256 = "0ph5g1chbzlwb1x4iwvdcq56ya8pp7j0n56r9h2n2g0ybg4mmrzk"; + name = "kparts-5.36.0.tar.xz"; }; }; kpeople = { - version = "5.34.0"; + version = "5.36.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/kpeople-5.34.0.tar.xz"; - sha256 = "0krm74dl80s48nhiygga4dvkvqqimxdx4nczbk4qvj7j1g9p2rsh"; - name = "kpeople-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.36/kpeople-5.36.0.tar.xz"; + sha256 = "0wifh4xp43h5q0iyb281pa50p6ww3ymnayq206675l07c84h021a"; + name = "kpeople-5.36.0.tar.xz"; }; }; kplotting = { - version = "5.34.0"; + version = "5.36.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/kplotting-5.34.0.tar.xz"; - sha256 = "1ffy9b08128ym024wlfgnzk52vpy0mbaa91dhndpr40qcz0i67sh"; - name = "kplotting-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.36/kplotting-5.36.0.tar.xz"; + sha256 = "0gabk9x7mqql2cdafigcrp5ciyd8839arrrnxjq9gb02087v1rx7"; + name = "kplotting-5.36.0.tar.xz"; }; }; kpty = { - version = "5.34.0"; + version = "5.36.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/kpty-5.34.0.tar.xz"; - sha256 = "00k5hhz7nf3nf47xb003ni1chi03imyrfajap6ay4zp90l8fr950"; - name = "kpty-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.36/kpty-5.36.0.tar.xz"; + sha256 = "1z5adph6i7wpwk1rlbrmmwczmfp41h8lj1ifzpnp082wj5a5khk4"; + name = "kpty-5.36.0.tar.xz"; }; }; kross = { - version = "5.34.0"; + version = "5.36.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/portingAids/kross-5.34.0.tar.xz"; - sha256 = "092qz8vyiialv9fvk4wvn8mrfhz5i5hnbq0xnz6nvi1pk3db6bxq"; - name = "kross-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.36/portingAids/kross-5.36.0.tar.xz"; + sha256 = "0yhjzzkpwd406h265fczvlrnwddn2b24mw21gy6x8kcjmdl0ssjq"; + name = "kross-5.36.0.tar.xz"; }; }; krunner = { - version = "5.34.0"; + version = "5.36.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/krunner-5.34.0.tar.xz"; - sha256 = "0n527p708k719zgmvvbmp20xmg72f85cll05q05p4h317g7wz6i5"; - name = "krunner-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.36/krunner-5.36.0.tar.xz"; + sha256 = "0r91wd8dc9798j2ghiyxa2b46xvk9ns2rzk3yjaavmnq5xxf2mhq"; + name = "krunner-5.36.0.tar.xz"; }; }; kservice = { - version = "5.34.0"; + version = "5.36.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/kservice-5.34.0.tar.xz"; - sha256 = "0sikwn49s2iq1nj518q55m2p0hvdvwm98cpf0dkjb1z1v6fgjc37"; - name = "kservice-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.36/kservice-5.36.0.tar.xz"; + sha256 = "19hhvbs0f7494xhmk7nx72lmff1hpnhin0y1my1xbw03l3f0l4wh"; + name = "kservice-5.36.0.tar.xz"; }; }; ktexteditor = { - version = "5.34.0"; + version = "5.36.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/ktexteditor-5.34.0.tar.xz"; - sha256 = "182a0swfgdqr0faq3ksk6hlfvdi1afd0hpys5vayjjf263m19xxw"; - name = "ktexteditor-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.36/ktexteditor-5.36.0.tar.xz"; + sha256 = "02c6l6sl9ps1aly46p23wzfpgfc112fhjvhq53smw5qqzyd1187r"; + name = "ktexteditor-5.36.0.tar.xz"; }; }; ktextwidgets = { - version = "5.34.0"; + version = "5.36.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/ktextwidgets-5.34.0.tar.xz"; - sha256 = "1hri34b373bww5gv14qli2nm77k05pk170nbb2vv2zvzv93g25gw"; - name = "ktextwidgets-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.36/ktextwidgets-5.36.0.tar.xz"; + sha256 = "0b8w0gym1mmbsy1xic6nc76yqa5rwk8nmcjln2z5ri7cg20nxywa"; + name = "ktextwidgets-5.36.0.tar.xz"; }; }; kunitconversion = { - version = "5.34.0"; + version = "5.36.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/kunitconversion-5.34.0.tar.xz"; - sha256 = "0v4x0flbfavrzfiqh71mdkqgp1fzk4f52msvq6w60i2s3sz7hcsm"; - name = "kunitconversion-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.36/kunitconversion-5.36.0.tar.xz"; + sha256 = "1xa2n3h13i6lrlxmhvvvgpmcdmr01gskim8wcy5gf0nl23v8bcmh"; + name = "kunitconversion-5.36.0.tar.xz"; }; }; kwallet = { - version = "5.34.0"; + version = "5.36.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/kwallet-5.34.0.tar.xz"; - sha256 = "08z3ddsam5n5qn2svscp4hgksf6qd1h8lqw1v382p01nnmhxadz5"; - name = "kwallet-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.36/kwallet-5.36.0.tar.xz"; + sha256 = "1fyaki8j43i4q0spmgqbzhgv17ziib9g3pcf9jl6gnkmipmwm0l7"; + name = "kwallet-5.36.0.tar.xz"; }; }; kwayland = { - version = "5.34.0"; + version = "5.36.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/kwayland-5.34.0.tar.xz"; - sha256 = "1zxb9ram47vbiik8h0czyvacrdiijhnslkpcm61l4r1rb0ybb0ib"; - name = "kwayland-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.36/kwayland-5.36.0.tar.xz"; + sha256 = "0h9k8m9vb1y1w5gvhgs2fj1iqg64fc9zl4rqnssqgz6fyp3p7i52"; + name = "kwayland-5.36.0.tar.xz"; }; }; kwidgetsaddons = { - version = "5.34.0"; + version = "5.36.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/kwidgetsaddons-5.34.0.tar.xz"; - sha256 = "0hw87iig75mfgl5p3ph6zkwap31h357bm7rlyv5d9nnp10bq0hfg"; - name = "kwidgetsaddons-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.36/kwidgetsaddons-5.36.0.tar.xz"; + sha256 = "02x232rfagd7xv5m9jwyr5h0cr6g8ibr27s86240xpbb9z9656mw"; + name = "kwidgetsaddons-5.36.0.tar.xz"; }; }; kwindowsystem = { - version = "5.34.0"; + version = "5.36.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/kwindowsystem-5.34.0.tar.xz"; - sha256 = "1sp2x7afhw19vmhdp2qyrmljz8h0875xjk95n8c5gzypk7sr0l83"; - name = "kwindowsystem-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.36/kwindowsystem-5.36.0.tar.xz"; + sha256 = "0whih8hhlrqsfadqmh6msw8xv7pmmlk6v4zahlhalkfpdvir26ca"; + name = "kwindowsystem-5.36.0.tar.xz"; }; }; kxmlgui = { - version = "5.34.0"; + version = "5.36.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/kxmlgui-5.34.0.tar.xz"; - sha256 = "1v8m6qzjqg3ic14a5ki37bf13kifzcbhly68zcxgs5b92hr953iy"; - name = "kxmlgui-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.36/kxmlgui-5.36.0.tar.xz"; + sha256 = "0c8fvawbcz4v2dcnb77vk7c49l9bd7v8jgg8r8763lwksdckyyz7"; + name = "kxmlgui-5.36.0.tar.xz"; }; }; kxmlrpcclient = { - version = "5.34.0"; + version = "5.36.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/kxmlrpcclient-5.34.0.tar.xz"; - sha256 = "0kp3ab50m5jl2jgw883ip67s6gs0l3saprzrqa9r3hydn2c4s3md"; - name = "kxmlrpcclient-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.36/kxmlrpcclient-5.36.0.tar.xz"; + sha256 = "14x7xi2h1208wzj5jnxawz7frjvvkqargiv0v44p699s157bb0d1"; + name = "kxmlrpcclient-5.36.0.tar.xz"; }; }; modemmanager-qt = { - version = "5.34.0"; + version = "5.36.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/modemmanager-qt-5.34.0.tar.xz"; - sha256 = "1cf5nsc8h7djvr19fm5dphzplh1wm3asvn0a7r71spg0i7lzi89h"; - name = "modemmanager-qt-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.36/modemmanager-qt-5.36.0.tar.xz"; + sha256 = "0l9g374xwfhfjdniyrjyy8f3xkzdiiqzzpzwx2929h6jml0nr00f"; + name = "modemmanager-qt-5.36.0.tar.xz"; }; }; networkmanager-qt = { - version = "5.34.0"; + version = "5.36.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/networkmanager-qt-5.34.0.tar.xz"; - sha256 = "05s0irvkg0g57acriablyha2wb9c7w3xhq223vdddjqpcdx0pnkl"; - name = "networkmanager-qt-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.36/networkmanager-qt-5.36.0.tar.xz"; + sha256 = "1mii9qai7vkwj7x6g3yiqiqk5kzc7im27fg2dhzwgq95dgm4aa2x"; + name = "networkmanager-qt-5.36.0.tar.xz"; }; }; oxygen-icons5 = { - version = "5.34.0"; + version = "5.36.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/oxygen-icons5-5.34.0.tar.xz"; - sha256 = "0cmxxssir5zbp5nlxq81h2xfd6wrxbbkydyw93dby7r56isl7ga5"; - name = "oxygen-icons5-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.36/oxygen-icons5-5.36.0.tar.xz"; + sha256 = "042ry8g1v71ifb4yhdi3k6x64sbc0lfyzinyjz78l2zf154l3d9g"; + name = "oxygen-icons5-5.36.0.tar.xz"; }; }; plasma-framework = { - version = "5.34.0"; + version = "5.36.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/plasma-framework-5.34.0.tar.xz"; - sha256 = "0waicqskfwc8xpmrym165hwlfv6nzbwc783sac5vrhbyk4bwk8x9"; - name = "plasma-framework-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.36/plasma-framework-5.36.0.tar.xz"; + sha256 = "05wzhnn78f5fi8wwpdrcvjfdv3p14868wlk714shmc5q3svfaq3h"; + name = "plasma-framework-5.36.0.tar.xz"; }; }; prison = { - version = "5.34.0"; + version = "5.36.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/prison-5.34.0.tar.xz"; - sha256 = "00wj4yyfhhcq9b54civ5hy1grz70mmi676x50y12crcbbgkxm1lx"; - name = "prison-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.36/prison-5.36.0.tar.xz"; + sha256 = "0f52gmmvga0rd7d7m357dgbwxlwk7sq5mxakhjhwdgjgj1vjx0z3"; + name = "prison-5.36.0.tar.xz"; }; }; solid = { - version = "5.34.0"; + version = "5.36.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/solid-5.34.0.tar.xz"; - sha256 = "02kz21p3p1s1rg7gf34fr6ynhji6x97yvsfdpvbfxbhijabbh4ib"; - name = "solid-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.36/solid-5.36.0.tar.xz"; + sha256 = "1b7g0gph6x353amnjskv40a037r7likanx9m52gdsc0z3dg3s3di"; + name = "solid-5.36.0.tar.xz"; }; }; sonnet = { - version = "5.34.0"; + version = "5.36.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/sonnet-5.34.0.tar.xz"; - sha256 = "06gxrh8rb75ydkqxk5dhlmwndnczp264jx588ryfwlf3vlnk99vs"; - name = "sonnet-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.36/sonnet-5.36.0.tar.xz"; + sha256 = "1vb6jccfh5pxjb3r43qrqig3h0z8cr0pw27sb116igssc4j0gkxc"; + name = "sonnet-5.36.0.tar.xz"; }; }; syntax-highlighting = { - version = "5.34.0"; + version = "5.36.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/syntax-highlighting-5.34.0.tar.xz"; - sha256 = "0ryfwblvzj9rd5jj7l8scmbb49ygzk77ng05hrznsipczin2cjw8"; - name = "syntax-highlighting-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.36/syntax-highlighting-5.36.0.tar.xz"; + sha256 = "1igxjkx8sphxaf4y07d78lnn2nad6q7siarsflh1f79srm2qhnlj"; + name = "syntax-highlighting-5.36.0.tar.xz"; }; }; threadweaver = { - version = "5.34.0"; + version = "5.36.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/threadweaver-5.34.0.tar.xz"; - sha256 = "1gylpl283qf1jcfyib4q5xwnpdq13hnd2cp2i7xjazdw2jp40zhr"; - name = "threadweaver-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.36/threadweaver-5.36.0.tar.xz"; + sha256 = "19z97ddba9pkv4j5p2iyr02khqmlgizky306irhhlwdw3y0m4pm1"; + name = "threadweaver-5.36.0.tar.xz"; }; }; } diff --git a/pkgs/development/libraries/kerberos/heimdal.nix b/pkgs/development/libraries/kerberos/heimdal.nix index f791f3a8d6e0..81f878daaaaa 100644 --- a/pkgs/development/libraries/kerberos/heimdal.nix +++ b/pkgs/development/libraries/kerberos/heimdal.nix @@ -11,13 +11,14 @@ let in with stdenv.lib; stdenv.mkDerivation rec { - name = "${type}heimdal-2015-09-13"; + name = "${type}heimdal-${version}"; + version = "7.4.0"; src = fetchFromGitHub { owner = "heimdal"; repo = "heimdal"; - rev = "c81572ab5dcee3062e715b9e25ca7a20f6ec456b"; - sha256 = "1r60i4v6y5lpll0l2qpn0ycp6q6f1xjg7k1csi547zls8k96yk9s"; + rev = "heimdal-${version}"; + sha256 = "01ch6kqjrxi9fki54yjj2fhxhdkxijz161w2inh5k8mcixlf67vp"; }; nativeBuildInputs = [ autoreconfHook pkgconfig python2 perl yacc flex ] diff --git a/pkgs/development/libraries/ldns/default.nix b/pkgs/development/libraries/ldns/default.nix index 91eb7aecea90..816b850f1003 100644 --- a/pkgs/development/libraries/ldns/default.nix +++ b/pkgs/development/libraries/ldns/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, openssl, perl}: +{stdenv, fetchurl, openssl, perl, dns-root-data}: stdenv.mkDerivation rec { pname = "ldns"; @@ -15,15 +15,27 @@ stdenv.mkDerivation rec { patchShebangs doc/doxyparse.pl ''; - outputs = [ "out" "dev" "man" ]; + outputs = [ "out" "dev" "man" "examples" ]; nativeBuildInputs = [ perl ]; buildInputs = [ openssl ]; - configureFlags = [ "--with-ssl=${openssl.dev}" "--with-drill"]; + configureFlags = [ + "--with-ssl=${openssl.dev}" + "--with-trust-anchor=${dns-root-data}/root.key" + "--with-drill" + "--disable-gost" + ]; postInstall = '' moveToOutput "bin/ldns-config" "$dev" + + pushd examples + configureFlagsArray+=( "--bindir=$examples/bin" ) + configurePhase + make + make install + popd ''; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix index ac54858b1de3..ed742bee8741 100644 --- a/pkgs/development/libraries/libgcrypt/default.nix +++ b/pkgs/development/libraries/libgcrypt/default.nix @@ -4,11 +4,11 @@ assert enableCapabilities -> stdenv.isLinux; stdenv.mkDerivation rec { name = "libgcrypt-${version}"; - version = "1.7.8"; + version = "1.8.0"; src = fetchurl { url = "mirror://gnupg/libgcrypt/${name}.tar.bz2"; - sha256 = "16f1rsv4y4w2pk1il2jbcqggsb6mrlfva5vayd205fp68zm7d0ll"; + sha256 = "06w97l88y2c29zf8p8cg0m4k2kiiyj6pqxdl0cxigi3wp2brdr13"; }; outputs = [ "out" "dev" "info" ]; diff --git a/pkgs/development/libraries/libite/default.nix b/pkgs/development/libraries/libite/default.nix index 72b4469058c0..479deb7593d6 100644 --- a/pkgs/development/libraries/libite/default.nix +++ b/pkgs/development/libraries/libite/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "libite-${version}"; - version = "1.8.3"; + version = "1.9.2"; src = fetchFromGitHub { owner = "troglobit"; repo = "libite"; rev = "v${version}"; - sha256 = "040idgbjqr239rkd68rqzwhylryiaa0z3qkwj2l2mlscv0aq8v0j"; + sha256 = "1y2iylsgs8am5br7an0xkrgshq6k2zkk8jfsaa7vdw2dh3qvc9pr"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/development/libraries/libjpeg-turbo/default.nix b/pkgs/development/libraries/libjpeg-turbo/default.nix index cd8484170bdb..d1181966815e 100644 --- a/pkgs/development/libraries/libjpeg-turbo/default.nix +++ b/pkgs/development/libraries/libjpeg-turbo/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "libjpeg-turbo-${version}"; - version = "1.5.1"; + version = "1.5.2"; src = fetchurl { url = "mirror://sourceforge/libjpeg-turbo/${name}.tar.gz"; - sha256 = "0v365hm6z6lddcqagjj15wflk66rqyw75m73cqzl65rh4lyrshj1"; + sha256 = "0a5m0psfp5952y5vrcs0nbdz1y9wqzg2ms0xwrx752034wxr964h"; }; # github releases still need autotools, surprisingly patches = diff --git a/pkgs/development/libraries/libpng/default.nix b/pkgs/development/libraries/libpng/default.nix index c2f50af84ca8..94a9aa37ad9c 100644 --- a/pkgs/development/libraries/libpng/default.nix +++ b/pkgs/development/libraries/libpng/default.nix @@ -5,13 +5,12 @@ assert zlib != null; let - version = "1.6.29"; - patchVersion = "1.6.26"; - # patchVersion = version; - sha256 = "0fgjqp7x6jynacmqh6dj72cn6nnf6yxjfqqqfsxrx0pyx22bcia2"; + version = "1.6.31"; + patchVersion = "1.6.31"; + sha256 = "0hcbxv9qf4f9q7brrk0ndag526glr8lii43grssv45j9w0nn0ai3"; patch_src = fetchurl { url = "mirror://sourceforge/libpng-apng/libpng-${patchVersion}-apng.patch.gz"; - sha256 = "0b6p2k4afvhk1svargpllcvhxb4g3p857wkqk85cks0yv42ckph1"; + sha256 = "0f10ih658j514vpvsli0pk378vcmjn78g52cssyg92r4k1r19rla"; }; whenPatched = stdenv.lib.optionalString apngSupport; diff --git a/pkgs/development/libraries/libqalculate/default.nix b/pkgs/development/libraries/libqalculate/default.nix index abc0eb4a2287..2e748d266897 100644 --- a/pkgs/development/libraries/libqalculate/default.nix +++ b/pkgs/development/libraries/libqalculate/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libqalculate-${version}"; - version = "0.9.10"; + version = "1.0.0a"; src = fetchurl { url = "https://github.com/Qalculate/libqalculate/archive/v${version}.tar.gz"; - sha256 = "0whzc15nwsrib6bpw4lqsm59yr0pfk44hny9sivfbwhidk0177zi"; + sha256 = "12igmd1rn6zwrsg0mmn5pwy2bqj2gmc08iry0vcdxgzi7jc9x7ix"; }; outputs = [ "out" "dev" "doc" ]; diff --git a/pkgs/development/libraries/libunistring/default.nix b/pkgs/development/libraries/libunistring/default.nix index 662767b6678f..c4acc0627af8 100644 --- a/pkgs/development/libraries/libunistring/default.nix +++ b/pkgs/development/libraries/libunistring/default.nix @@ -8,12 +8,14 @@ stdenv.mkDerivation rec { sha256 = "1ra1baz2187kbw9im47g6kqb5mx9plq703mkjxaval8rxv5q3q4w"; }; - patches = stdenv.lib.optional stdenv.isDarwin [ ./clang.patch ]; + patches = stdenv.lib.optionals stdenv.isDarwin [ ./clang.patch stdenv.secure-format-patch ]; outputs = [ "out" "dev" "info" "doc" ]; propagatedBuildInputs = stdenv.lib.optional (!stdenv.isLinux) libiconv; + enableParallelBuilding = false; + configureFlags = [ "--with-libiconv-prefix=${libiconv}" ]; diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix index fdf5191bf720..1bc58260afe4 100644 --- a/pkgs/development/libraries/libuv/default.nix +++ b/pkgs/development/libraries/libuv/default.nix @@ -2,14 +2,14 @@ , ApplicationServices, CoreServices }: stdenv.mkDerivation rec { - version = "1.12.0"; + version = "1.13.1"; name = "libuv-${version}"; src = fetchFromGitHub { owner = "libuv"; repo = "libuv"; rev = "v${version}"; - sha256 = "0m025i0sfm4iv3aiic88x4y4bbhhdb204pmd9r383fsl458fck2p"; + sha256 = "0k348kgdphha1w4cw78zngq3gqcrhcn0az7k0k4w2bgmdf4ip8z8"; }; postPatch = let @@ -17,6 +17,7 @@ stdenv.mkDerivation rec { "getnameinfo_basic" "udp_send_hang_loop" # probably network-dependent "spawn_setuid_fails" "spawn_setgid_fails" "fs_chown" # user namespaces "getaddrinfo_fail" "getaddrinfo_fail_sync" + "threadpool_multiple_event_loops" # times out on slow machines ] # sometimes: timeout (no output), failed uv_listen ++ stdenv.lib.optionals stdenv.isDarwin [ "process_title" "emfile" ]; diff --git a/pkgs/development/libraries/mbedtls/1.3.nix b/pkgs/development/libraries/mbedtls/1.3.nix index e89fabb9fb33..764d50190b9e 100644 --- a/pkgs/development/libraries/mbedtls/1.3.nix +++ b/pkgs/development/libraries/mbedtls/1.3.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, perl }: stdenv.mkDerivation rec { - name = "mbedtls-1.3.19"; + name = "mbedtls-1.3.20"; src = fetchurl { url = "https://tls.mbed.org/download/${name}-gpl.tgz"; - sha256 = "03mhlh8s2378ph23m1173i7wkhrs5i6d03mk5wa7a1d3qn24jrar"; + sha256 = "0vv69c1c5rr7jcwwivx06fbfixgig90pjznh2c6cn841hgwm9z00"; }; nativeBuildInputs = [ perl ]; diff --git a/pkgs/development/libraries/mbedtls/default.nix b/pkgs/development/libraries/mbedtls/default.nix index c5eab3f74b50..b4500c8f6d6d 100644 --- a/pkgs/development/libraries/mbedtls/default.nix +++ b/pkgs/development/libraries/mbedtls/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, perl }: stdenv.mkDerivation rec { - name = "mbedtls-2.4.2"; + name = "mbedtls-2.5.1"; src = fetchurl { url = "https://tls.mbed.org/download/${name}-gpl.tgz"; - sha256 = "17r9qs585gqghcf5yavb1cnvsigl0f8r0k8rklr5a855hrajs7yh"; + sha256 = "1qny1amp54vn84wp0aaj8zvblad60zcp73pdwgnykn7h0q004bri"; }; nativeBuildInputs = [ perl ]; diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index e1bd4255636a..45819a8f3a6d 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -67,7 +67,7 @@ let in let - version = "17.1.4"; + version = "17.1.5"; branch = head (splitString "." version); driverLink = "/run/opengl-driver" + optionalString stdenv.isi686 "-32"; in @@ -82,7 +82,7 @@ stdenv.mkDerivation { "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz" "https://launchpad.net/mesa/trunk/${version}/+download/mesa-${version}.tar.xz" ]; - sha256 = "06f3b0e6a28f0d20b7f3391cf67fe89ae98ecd0a686cd545da76557b6cec9cad"; + sha256 = "378516b171712687aace4c7ea8b37c85895231d7a6d61e1e27362cf6034fded9"; }; prePatch = "patchShebangs ."; diff --git a/pkgs/development/libraries/newt/default.nix b/pkgs/development/libraries/newt/default.nix index 9002d06693e5..e00decca2ffd 100644 --- a/pkgs/development/libraries/newt/default.nix +++ b/pkgs/development/libraries/newt/default.nix @@ -16,6 +16,12 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = "-lncurses"; + preConfigure = '' + # If CPP is set explicitly, configure and make will not agree about which + # programs to use at different stages. + unset CPP + ''; + crossAttrs = { makeFlags = "CROSS_COMPILE=${stdenv.cc.prefix}"; }; diff --git a/pkgs/development/libraries/openh264/default.nix b/pkgs/development/libraries/openh264/default.nix index 8232af3e789e..0a0b4c8d5498 100644 --- a/pkgs/development/libraries/openh264/default.nix +++ b/pkgs/development/libraries/openh264/default.nix @@ -1,11 +1,14 @@ -{ stdenv, fetchurl, nasm }: +{ stdenv, fetchFromGitHub, nasm }: stdenv.mkDerivation rec { - name = "openh264-1.5.0"; + name = "openh264-${version}"; + version = "1.7.0"; - src = fetchurl { - url = "https://github.com/cisco/openh264/archive/v1.5.0.tar.gz"; - sha256 = "1d97dh5hzmy46jamfw03flvcz8md1hxp6y5n0b787h8ks7apn1wq"; + src = fetchFromGitHub { + owner = "cisco"; + repo = "openh264"; + rev = "v${version}"; + sha256 = "0ywrqni05bh925ws5fmd24bm6h9n6z2wp1q19v545v06biiwr46a"; }; buildInputs = [ nasm ]; 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 d3eaeed2f1e0..1b87b1b0a27b 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -114,6 +114,7 @@ stdenv.mkDerivation rec { -datadir $out/share/${name} -translationdir $out/share/${name}/translations " + unset LD # Makefile uses gcc for linking; setting LD interferes '' + optionalString stdenv.cc.isClang '' sed -i 's/QMAKE_CC = gcc/QMAKE_CC = clang/' mkspecs/common/g++-base.conf sed -i 's/QMAKE_CXX = g++/QMAKE_CXX = clang++/' mkspecs/common/g++-base.conf diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix index 6f3f78e55018..4d51d1ed02d6 100644 --- a/pkgs/development/libraries/science/math/openblas/default.nix +++ b/pkgs/development/libraries/science/math/openblas/default.nix @@ -61,13 +61,13 @@ let then blas64_ else hasPrefix "x86_64" stdenv.system; - version = "0.2.19"; + version = "0.2.20"; in stdenv.mkDerivation { name = "openblas-${version}"; src = fetchurl { url = "https://github.com/xianyi/OpenBLAS/archive/v${version}.tar.gz"; - sha256 = "0mw5ra1vjsqiba79zdhqfkqq6v3bla5a5c0wj7vca9qgjzjbah4w"; + sha256 = "157kpkbpwlr57dkmqiwr3qp9fglfidagv7l6fibrhln6v4aqpwsy"; name = "openblas-${version}.tar.gz"; }; diff --git a/pkgs/development/libraries/x264/default.nix b/pkgs/development/libraries/x264/default.nix index 6e4dc00b0387..06ed123c7356 100644 --- a/pkgs/development/libraries/x264/default.nix +++ b/pkgs/development/libraries/x264/default.nix @@ -1,12 +1,12 @@ {stdenv, fetchurl, yasm, enable10bit ? false}: stdenv.mkDerivation rec { - version = "20160615-2245"; + version = "20170731-2245"; name = "x264-${version}"; src = fetchurl { url = "http://download.videolan.org/x264/snapshots/x264-snapshot-${version}-stable.tar.bz2"; - sha256 = "0w5l77gm8bsmafzimzyc5s27kcw79r6nai3bpccqy0spyxhjsdc2"; + sha256 = "01sgk1ps4qfifdnblwa3fxnd8ah6n6zbmfc1sy09cgqcdgzxgj0z"; }; patchPhase = '' @@ -15,6 +15,11 @@ stdenv.mkDerivation rec { outputs = [ "out" "lib" ]; # leaving 52 kB of headers + preConfigure = '' + # `AS' is set to the binutils assembler, but we need yasm + unset AS + ''; + configureFlags = [ "--enable-shared" ] ++ stdenv.lib.optional (!stdenv.isi686) "--enable-pic" ++ stdenv.lib.optional (enable10bit) "--bit-depth=10"; diff --git a/pkgs/development/libraries/x265/default.nix b/pkgs/development/libraries/x265/default.nix index c485cb6a05aa..29d7ddf1fdc9 100644 --- a/pkgs/development/libraries/x265/default.nix +++ b/pkgs/development/libraries/x265/default.nix @@ -16,14 +16,14 @@ in stdenv.mkDerivation rec { name = "x265-${version}"; - version = "1.9"; + version = "2.5"; src = fetchurl { urls = [ "http://get.videolan.org/x265/x265_${version}.tar.gz" "https://github.com/videolan/x265/archive/${version}.tar.gz" ]; - sha256 = "1j0mbcf10aj6zi1nxql45f9817jd2ndcpd7x123sjmyr7q9m8iiy"; + sha256 = "05rxbnfcc8yl05q3xqkl1kk90k7zn5ih305r46dxnzjaa2djalrf"; }; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/zziplib/default.nix b/pkgs/development/libraries/zziplib/default.nix index 20070d8f717e..98215aa0c744 100644 --- a/pkgs/development/libraries/zziplib/default.nix +++ b/pkgs/development/libraries/zziplib/default.nix @@ -1,11 +1,12 @@ { fetchurl, stdenv, perl, python2, zip, xmlto, zlib }: stdenv.mkDerivation rec { - name = "zziplib-0.13.58"; + name = "zziplib-${version}"; + version = "0.13.66"; src = fetchurl { - url = "mirror://sourceforge/zziplib/${name}.tar.bz2"; - sha256 = "13j9f6i8rx0qd5m96iwrcha78h34qpfk5qzi7cv098pms6gq022m"; + url = "mirror://sourceforge/zziplib/zziplib13/${version}/${name}.tar.gz"; + sha256 = "0zdx0s19slzv79xplnr6jx0xjb01dd71jzpscf6vlj6k9ry8rcar"; }; patchPhase = '' diff --git a/pkgs/development/node-packages/README.md b/pkgs/development/node-packages/README.md index 8f14aadec147..b44394c696bb 100644 --- a/pkgs/development/node-packages/README.md +++ b/pkgs/development/node-packages/README.md @@ -1,13 +1,13 @@ Node.js packages -=============== +================ To add a package from [NPM](https://www.npmjs.com/) to nixpkgs: - 1. Modify `pkgs/development/node-packages/node-packages.json`, to add, update, - or remove package entries. (or `pkgs/development/node-packages/node-packages-v4.json` - for packagages depending on node.js 4.x) - 2. Run the script: `cd pkgs/development/node-packages && sh generate.sh`. + 1. Modify `pkgs/development/node-packages/node-packages-v6.json` to add, update + or remove package entries. (Or `pkgs/development/node-packages/node-packages-v4.json` + for packagages depending on Node.js 4.x) + 2. Run the script: `cd pkgs/development/node-packages && ./generate.sh`. 3. Build your new package to test your changes: `cd /path/to/nixpkgs && nix-build -A nodePackages.<new-or-updated-package>`. - To build against a specific node.js version (e.g. 4.x): + To build against a specific Node.js version (e.g. 4.x): `nix-build -A nodePackages_4_x.<new-or-updated-package>` 4. Add and commit all modified and generated files. diff --git a/pkgs/development/ocaml-modules/containers/default.nix b/pkgs/development/ocaml-modules/containers/default.nix index f44db6151751..84ac3ae61339 100644 --- a/pkgs/development/ocaml-modules/containers/default.nix +++ b/pkgs/development/ocaml-modules/containers/default.nix @@ -6,18 +6,18 @@ let mkpath = p: "${p}/lib/ocaml/${ocaml.version}/site-lib"; - version = "1.2"; + version = "1.3"; in stdenv.mkDerivation { - name = "ocaml-containers-${version}"; + name = "ocaml${ocaml.version}-containers-${version}"; src = fetchFromGitHub { owner = "c-cube"; repo = "ocaml-containers"; rev = "${version}"; - sha256 = "0k1676bn12hhayjlpy8bxfc3sgq6wd7zkh0ca700zh8jxjrshjqk"; + sha256 = "1gjs9d6759zpgp68djv296zwmvhdc6dqfb27aip7dhj6ic2bwgil"; }; buildInputs = [ ocaml findlib ocamlbuild cppo gen sequence qtest ounit ocaml_oasis qcheck ]; diff --git a/pkgs/development/ocaml-modules/gen/default.nix b/pkgs/development/ocaml-modules/gen/default.nix index 6cbbd4adc1b5..d9a1fb4770f8 100644 --- a/pkgs/development/ocaml-modules/gen/default.nix +++ b/pkgs/development/ocaml-modules/gen/default.nix @@ -1,15 +1,15 @@ { stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, qtest, ounit }: -let version = "0.4"; in +let version = "0.4.0.1"; in stdenv.mkDerivation { - name = "ocaml-gen-${version}"; + name = "ocaml${ocaml.version}-gen-${version}"; src = fetchFromGitHub { owner = "c-cube"; repo = "gen"; rev = "${version}"; - sha256 = "041dga300fh1y6fi8y0fkri2qda406lf2dmbrgllazw3rp07zkzj"; + sha256 = "0gg94f5l899rni3r7s7wq8plgazmbsaw498xckp25kkgpmkk61ml"; }; buildInputs = [ ocaml findlib ocamlbuild qtest ounit ]; diff --git a/pkgs/development/python-modules/FormEncode/default.nix b/pkgs/development/python-modules/FormEncode/default.nix new file mode 100644 index 000000000000..ff744fc1b8a8 --- /dev/null +++ b/pkgs/development/python-modules/FormEncode/default.nix @@ -0,0 +1,31 @@ +{ stdenv, buildPythonPackage, fetchPypi, dns, pycountry, nose }: + +buildPythonPackage rec { + pname = "FormEncode"; + version = "1.3.1"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "1xm77h2mds2prlaz0z4nzkx13g61rx5c2v3vpgjq9d5ij8bzb8md"; + }; + + buildInputs = [ dns pycountry nose ]; + + patchPhase = '' + # dnspython3 has been superseded, see its PyPI page + substituteInPlace setup.py --replace dnspython3 dnspython + ''; + + preCheck = '' + # two tests require dns resolving + sed -i 's/test_cyrillic_email/noop/' formencode/tests/test_email.py + sed -i 's/test_unicode_ascii_subgroup/noop/' formencode/tests/test_email.py + ''; + + meta = with stdenv.lib; { + description = "FormEncode validates and converts nested structures"; + homepage = "http://formencode.org"; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/actdiag/default.nix b/pkgs/development/python-modules/actdiag/default.nix index 064e5e6c11a3..36d49ad29af9 100644 --- a/pkgs/development/python-modules/actdiag/default.nix +++ b/pkgs/development/python-modules/actdiag/default.nix @@ -3,12 +3,12 @@ buildPythonPackage rec { pname = "actdiag"; - version = "0.5.3"; + version = "0.5.4"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "1vr4hnkr0gcvvpaycd8q3vcx029b2f5yv8swhdr8kwspaqb0dvfa"; + sha256 = "983071777d9941093aaef3be1f67c198a8ac8d2bba264cdd1f337ca415ab46af"; }; buildInputs = [ pep8 nose unittest2 docutils ]; diff --git a/pkgs/development/python-modules/alabaster/default.nix b/pkgs/development/python-modules/alabaster/default.nix index 69bcaa1fc06e..fcd9a0978005 100644 --- a/pkgs/development/python-modules/alabaster/default.nix +++ b/pkgs/development/python-modules/alabaster/default.nix @@ -3,12 +3,12 @@ buildPythonPackage rec { pname = "alabaster"; - version = "0.7.7"; + version = "0.7.10"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "f416a84e0d0ddbc288f6b8f2c276d10b40ca1238562cd9ed5a751292ec647b71"; + sha256 = "37cdcb9e9954ed60912ebc1ca12a9d12178c26637abdf124e3cde2341c257fe0"; }; propagatedBuildInputs = [ pygments ]; diff --git a/pkgs/development/python-modules/alembic/default.nix b/pkgs/development/python-modules/alembic/default.nix index 0538e7cf416d..d1262d8fab45 100644 --- a/pkgs/development/python-modules/alembic/default.nix +++ b/pkgs/development/python-modules/alembic/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "alembic"; - version = "0.9.2"; + version = "0.9.3"; src = fetchPypi { inherit pname version; - sha256 = "0iw6wysm83hycvrycymf9b4mkji47536kl3x7grynfcbyjcvbdm2"; + sha256 = "57f2ede554c0b18f1cf811cfbb3b02c586a5422df94922e3821883ba0b8c616c"; }; buildInputs = [ pytest pytestcov mock coverage ]; diff --git a/pkgs/development/python-modules/aniso8601/default.nix b/pkgs/development/python-modules/aniso8601/default.nix index bc49e991b4fa..95eda37d3f28 100644 --- a/pkgs/development/python-modules/aniso8601/default.nix +++ b/pkgs/development/python-modules/aniso8601/default.nix @@ -3,7 +3,7 @@ buildPythonPackage rec { pname = "aniso8601"; - version = "1.2.0"; + version = "1.2.1"; name = "${pname}-${version}"; meta = with stdenv.lib; { @@ -16,6 +16,6 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "502400f82574afa804cc915d83f15c67533d364dcd594f8a6b9d2053f3404dd4"; + sha256 = "e7ba4f42d3aea75909c79b1f4c4614768b4f13fbb98fc658a7b6061ddb0be47c"; }; } diff --git a/pkgs/development/python-modules/btrees/default.nix b/pkgs/development/python-modules/btrees/default.nix index 7cb10d96f905..7bfad0d4f5e2 100644 --- a/pkgs/development/python-modules/btrees/default.nix +++ b/pkgs/development/python-modules/btrees/default.nix @@ -5,7 +5,8 @@ buildPythonPackage rec { version = "4.4.1"; name = "${pname}-${version}"; - propagatedBuildInputs = [ persistent zope_interface transaction ]; + buildInputs = [ transaction ]; + propagatedBuildInputs = [ persistent zope_interface ]; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/celery/fix_endless_python3.6_loop_logger_isa.patch b/pkgs/development/python-modules/celery/fix_endless_python3.6_loop_logger_isa.patch new file mode 100644 index 000000000000..27caa80dd4ca --- /dev/null +++ b/pkgs/development/python-modules/celery/fix_endless_python3.6_loop_logger_isa.patch @@ -0,0 +1,18 @@ +Description: Fix endless loop in logger_isa (Python 3.6) +Author: George Psarakis <giwrgos.psarakis@gmail.com> +Origin: upstream, https://github.com/celery/celery/commit/9c950b47eca2b4e93fd2fe52cf80f158e6cf97ad +Forwarded: not-needed +Reviewed-By: Nishanth Aravamudan <nish.aravamudan@canonical.com> +Last-Update: 2017-06-12 + +--- celery-4.0.2.orig/celery/utils/log.py ++++ celery-4.0.2/celery/utils/log.py +@@ -82,7 +82,7 @@ def logger_isa(l, p, max=1000): + else: + if this in seen: + raise RuntimeError( +- 'Logger {0!r} parents recursive'.format(l), ++ 'Logger {0!r} parents recursive'.format(l.name), + ) + seen.add(this) + this = this.parent diff --git a/pkgs/development/python-modules/daphne/default.nix b/pkgs/development/python-modules/daphne/default.nix index 562b29cf0625..c90fb61ce03a 100644 --- a/pkgs/development/python-modules/daphne/default.nix +++ b/pkgs/development/python-modules/daphne/default.nix @@ -1,14 +1,14 @@ -{ stdenv, buildPythonPackage, fetchurl, +{ stdenv, buildPythonPackage, fetchPypi, asgiref, autobahn, twisted, hypothesis }: buildPythonPackage rec { pname = "daphne"; name = "${pname}-${version}"; - version = "1.2.0"; + version = "1.3.0"; - src = fetchurl { - url = "mirror://pypi/d/daphne/${name}.tar.gz"; - sha256 = "084216isw7rwy693i62rbd8kvpqx418jvf1q72cplv833wz3in7l"; + src = fetchPypi { + inherit pname version; + sha256 = "1xmmjp21m1w88ljsgnkf6cbzw5nxamh9cfmfgzxffpn4cdmvn96i"; }; buildInputs = [ hypothesis ]; diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix index 6d5388a443ca..740b0644381c 100644 --- a/pkgs/development/python-modules/dask/default.nix +++ b/pkgs/development/python-modules/dask/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "dask"; - version = "0.14.3"; + version = "0.15.1"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "9bf007f9cedc08f73089f0621ff65ec0882fc0a834acef56830dfd2872908211"; + sha256 = "f62f19ab5958b13d0ee733db18218c28a9d452a3554446a3dfb5ac3d4a5f7e34"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/discid/default.nix b/pkgs/development/python-modules/discid/default.nix index 167efe914256..d237f366fdf5 100644 --- a/pkgs/development/python-modules/discid/default.nix +++ b/pkgs/development/python-modules/discid/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "discid"; - version = "1.1.0"; + version = "1.1.1"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "b39d443051b26d0230be7a6c616243daae93337a8711dd5d4119bb6a0e516fa8"; + sha256 = "78a3bf6c8377fdbe3d85e914a209ff97aa43e35605779639847b510ced31f7b9"; }; patchPhase = '' diff --git a/pkgs/development/python-modules/django-raster/default.nix b/pkgs/development/python-modules/django-raster/default.nix index 2332229100c5..fbdc7282c1b6 100644 --- a/pkgs/development/python-modules/django-raster/default.nix +++ b/pkgs/development/python-modules/django-raster/default.nix @@ -3,13 +3,13 @@ pyparsing, django, celery }: buildPythonPackage rec { - version = "0.4"; + version = "0.5"; pname = "django-raster"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/d/django-raster/${name}.tar.gz"; - sha256 = "7fd6afa42b07ac51a3873e3d4840325dd3a8a631fdb5b853c76fbbfe59a2b17f"; + sha256 = "0v1jldb13s4dqq1vaq8ghfv3743jpi9a9n05bqgjm8szlkq8s7ah"; }; # Tests require a postgresql + postgis server diff --git a/pkgs/development/python-modules/dkimpy/default.nix b/pkgs/development/python-modules/dkimpy/default.nix index df768f5d1222..e32a9262f535 100644 --- a/pkgs/development/python-modules/dkimpy/default.nix +++ b/pkgs/development/python-modules/dkimpy/default.nix @@ -5,19 +5,24 @@ buildPythonApplication rec { name = "${pname}-${majorversion}.${minorversion}"; pname = "dkimpy"; majorversion = "0.6"; - minorversion = "1"; + minorversion = "2"; src = fetchurl { url = "https://launchpad.net/${pname}/${majorversion}/${majorversion}.${minorversion}/+download/${name}.tar.gz"; - sha256 = "0zmvyw18ww1jqrbqws636w3xki59fyqva553r6s74q5c4jvy36v2"; + sha256 = "1hagz8qk0v4ijfbcdq4z28bpgr2mkpr498z76i1vam2d50chmakl"; }; buildInputs = [ pytest ]; propagatedBuildInputs = [ openssl dns ]; - patchPhase = ''substituteInPlace dknewkey.py --replace \ - /usr/bin/openssl ${openssl}/bin/openssl - ''; + patchPhase = '' + substituteInPlace dknewkey.py --replace \ + /usr/bin/openssl ${openssl}/bin/openssl + ''; + + checkPhase = '' + python ./test.py + ''; postInstall = '' mkdir -p $out/bin $out/libexec @@ -27,15 +32,16 @@ buildPythonApplication rec { makeWrapper "$out/libexec/arcverify.py" $out/bin/arcverify makeWrapper "$out/libexec/arcsign.py" $out/bin/arcsign makeWrapper "$out/libexec/dknewkey.py" $out/bin/dknewkey - ''; + ''; meta = with stdenv.lib; { description = "DKIM + ARC email signing/verification tools + Python module"; - longDescription = ''Python module that implements DKIM (DomainKeys Identified Mail) - email signing and verification. It also provides a number of convєnient tools - for command line signing and verification, as well as generating new DKIM records. - This version also supports the experimental Authenticated Received Chain (ARC) - protocol. + longDescription = '' + Python module that implements DKIM (DomainKeys Identified Mail) email + signing and verification. It also provides a number of convєnient tools + for command line signing and verification, as well as generating new DKIM + records. This version also supports the experimental Authenticated + Received Chain (ARC) protocol. ''; homepage = "https://launchpad.net/dkimpy"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/dns/default.nix b/pkgs/development/python-modules/dns/default.nix new file mode 100644 index 000000000000..0548c5a1098e --- /dev/null +++ b/pkgs/development/python-modules/dns/default.nix @@ -0,0 +1,23 @@ +{ buildPythonPackage, fetchPypi, lib }: + +buildPythonPackage rec { + pname = "dnspython"; + version = "1.15.0"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "0z5d9vwf211v54bybrhm3qpxclys4dfdfsp7lk2hvf57yzhn7xa0"; + }; + + # needs networking for some tests + doCheck = false; + + meta = { + description = "A DNS toolkit for Python 3.x"; + homepage = http://www.dnspython.org; + # BSD-like, check http://www.dnspython.org/LICENSE for details + license = lib.licenses.free; + }; +} diff --git a/pkgs/development/python-modules/email-validator/default.nix b/pkgs/development/python-modules/email-validator/default.nix new file mode 100644 index 000000000000..4fc78d8bd1e1 --- /dev/null +++ b/pkgs/development/python-modules/email-validator/default.nix @@ -0,0 +1,27 @@ +{ stdenv, lib, buildPythonPackage, fetchPypi, isPy3k, dns, idna, ipaddress }: + +buildPythonPackage rec { + pname = "email_validator"; + version = "1.0.2"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "1ja9149l9ck5n45a72h3is7v476hjny5ybxbcamx1nw6iplsm7k6"; + }; + + doCheck = false; + + propagatedBuildInputs = [ + dns + idna + ] ++ (if isPy3k then [ ] else [ ipaddress ]); + + meta = with lib; { + description = "A robust email syntax and deliverability validation library for Python 2.x/3.x."; + homepage = https://github.com/JoshData/python-email-validator; + license = licenses.cc0; + maintainers = with maintainers; [ siddharthist ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/python-modules/faker/default.nix b/pkgs/development/python-modules/faker/default.nix new file mode 100644 index 000000000000..ce6887f3e062 --- /dev/null +++ b/pkgs/development/python-modules/faker/default.nix @@ -0,0 +1,36 @@ +{ stdenv, lib, buildPythonPackage, fetchPypi, + # Build inputs + dateutil, six, + # Test inputs + email_validator, nose, mock, ukpostcodeparser }: + +buildPythonPackage rec { + pname = "Faker"; + version = "0.7.18"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "310b20f3c497a777622920dca314d90f774028d49c7ee7ccfa96ca4b9d9bf429"; + }; + + checkInputs = [ + email_validator + nose + mock + ukpostcodeparser + ]; + + propagatedBuildInputs = [ + dateutil + six + ]; + + meta = with lib; { + description = "A Python library for generating fake user data"; + homepage = http://faker.rtfd.org; + license = licenses.mit; + maintainers = with maintainers; [ lovek323 ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/python-modules/keras/default.nix b/pkgs/development/python-modules/keras/default.nix index 43e576b1b312..011954ae8273 100644 --- a/pkgs/development/python-modules/keras/default.nix +++ b/pkgs/development/python-modules/keras/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "Keras"; - version = "2.0.5"; + version = "2.0.6"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "cbce24758530e070fe1b403d6d21391cbea78c037b70bf6afc1ca9f1f8269eff"; + sha256 = "0519480abe4ad18b2c2d1bc580eab75edd82c95083d341a1157952f4b00019bb"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/ldap.nix b/pkgs/development/python-modules/ldap.nix index b583a2ae2d82..34a179f501b9 100644 --- a/pkgs/development/python-modules/ldap.nix +++ b/pkgs/development/python-modules/ldap.nix @@ -3,13 +3,13 @@ buildPythonPackage rec { pname = "python-ldap"; - version = "2.4.39"; + version = "2.4.41"; name = "${pname}-${version}"; disabled = isPy3k; src = fetchPypi { inherit pname version; - sha256 = "3fb75108d27e8091de80dffa2ba3bf45c7a3bdc357e2959006aed52fa58bb2f3"; + sha256 = "6d430ecf040f2fc704ee316d3390cb1f5419c191371e1e131baef54a0e42cef0"; }; # Needed by tests to setup a mockup ldap server. diff --git a/pkgs/development/python-modules/libagent/default.nix b/pkgs/development/python-modules/libagent/default.nix index 5192abf8200f..4a3839537e3a 100644 --- a/pkgs/development/python-modules/libagent/default.nix +++ b/pkgs/development/python-modules/libagent/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "libagent"; - version = "0.9.1"; + version = "0.9.2"; src = fetchPypi{ inherit pname version; - sha256 = "1g19lsid7lqw567w31fif89w088lzbgh27xpb1pshjk1gvags3bc"; + sha256 = "d6c6dccc0a7693fc966f5962604a69a800e044ac5add3dd030c34cfd4d64311f"; }; buildInputs = [ diff --git a/pkgs/development/python-modules/libnacl/default.nix b/pkgs/development/python-modules/libnacl/default.nix index 7a96530912b6..324740f17de8 100644 --- a/pkgs/development/python-modules/libnacl/default.nix +++ b/pkgs/development/python-modules/libnacl/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "libnacl"; - version = "1.5.1"; + version = "1.5.2"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "e44e9436e7245b0d8b7322bef67750cb7757834d7ccdb7eb7b723b4813df84fb"; + sha256 = "c58390b0d191db948fc9ab681f07fdfce2a573cd012356bada47d56795d00ee2"; }; buildInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/m2r/default.nix b/pkgs/development/python-modules/m2r/default.nix index 74cc87d5d897..b79307a8084e 100644 --- a/pkgs/development/python-modules/m2r/default.nix +++ b/pkgs/development/python-modules/m2r/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "m2r"; name = "${pname}-${version}"; - version = "0.1.6"; + version = "0.1.7"; src = fetchPypi { inherit pname version; - sha256 = "a26bc2e25e0ad3f8650385aea25cf734ac4fcd30e54faec92fd39675da75e527"; + sha256 = "771631d051a52764fe5b660f97ad028df3aff90c9859d345ccfd17a4c7c2ab39"; }; propagatedBuildInputs = [ mistune docutils ]; diff --git a/pkgs/development/python-modules/numpy/default.nix b/pkgs/development/python-modules/numpy/default.nix index d427a33f80f4..75b946b40510 100644 --- a/pkgs/development/python-modules/numpy/default.nix +++ b/pkgs/development/python-modules/numpy/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "numpy"; - version = "1.12.1"; + version = "1.13.1"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/n/numpy/numpy-${version}.zip"; - sha256 = "a65266a4ad6ec8936a1bc85ce51f8600634a31a258b722c9274a80ff189d9542"; + sha256 = "c9b0283776085cb2804efff73e9955ca279ba4edafd58d3ead70b61d209c4fbb"; }; disabled = isPyPy; @@ -21,6 +21,7 @@ buildPythonPackage rec { preConfigure = '' sed -i 's/-faltivec//' numpy/distutils/system_info.py + export NPY_NUM_BUILD_JOBS=$NIX_BUILD_CORES ''; preBuild = '' @@ -32,6 +33,8 @@ buildPythonPackage rec { EOF ''; + enableParallelBuilding = true; + checkPhase = '' runHook preCheck pushd dist diff --git a/pkgs/development/python-modules/olefile/default.nix b/pkgs/development/python-modules/olefile/default.nix new file mode 100644 index 000000000000..5cf51b841329 --- /dev/null +++ b/pkgs/development/python-modules/olefile/default.nix @@ -0,0 +1,19 @@ +{ stdenv, buildPythonPackage, fetchPypi }: +buildPythonPackage rec { + pname = "olefile"; + version = "0.44"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "1bbk1xplmrhymqpk6rkb15sg7v9qfih7zh23p6g2fxxas06cmwk1"; + }; + + meta = with stdenv.lib; { + description = "Python package to parse, read and write Microsoft OLE2 files"; + homepage = https://www.decalage.info/python/olefileio; + # BSD like + reference to Pillow + license = "http://olefile.readthedocs.io/en/latest/License.html"; + }; +} diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix index ee75d211ad80..e9297676eafe 100644 --- a/pkgs/development/python-modules/pandas/default.nix +++ b/pkgs/development/python-modules/pandas/default.nix @@ -27,12 +27,12 @@ let inherit (stdenv) isDarwin; in buildPythonPackage rec { pname = "pandas"; - version = "0.20.2"; + version = "0.20.3"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "92173c976fcca70cb19a958eccdacf98af62ef7301bf786d0321cb8857cdfae6"; + sha256 = "a777e07633d83d546c55706420179551c8e01075b53c497dcf8ae4036766bc66"; }; LC_ALL = "en_US.UTF-8"; diff --git a/pkgs/development/python-modules/persistent/default.nix b/pkgs/development/python-modules/persistent/default.nix new file mode 100644 index 000000000000..4940a8b2e046 --- /dev/null +++ b/pkgs/development/python-modules/persistent/default.nix @@ -0,0 +1,23 @@ +{ buildPythonPackage +, fetchPypi +, zope_interface +, pkgs +}: + +buildPythonPackage rec { + pname = "persistent"; + version = "4.2.4.2"; + name = "${pname}-${version}"; + + propagatedBuildInputs = [ zope_interface ]; + + src = fetchPypi { + inherit pname version; + sha256 = "cf264cd55866c7ffbcbe1328f8d8b28fd042a5dd0c03a03f68c0887df3aa1964"; + }; + + meta = { + description = "Automatic persistence for Python objects"; + homepage = http://www.zope.org/Products/ZODB; + }; +} diff --git a/pkgs/development/python-modules/pillow/default.nix b/pkgs/development/python-modules/pillow/default.nix new file mode 100644 index 000000000000..0fbb36b3c196 --- /dev/null +++ b/pkgs/development/python-modules/pillow/default.nix @@ -0,0 +1,62 @@ +{ stdenv, buildPythonPackage, fetchPypi, isPyPy, + nose, olefile, + freetype, libjpeg, zlib, libtiff, libwebp, tcl, lcms2, tk, libX11}: +buildPythonPackage rec { + pname = "Pillow"; + version = "4.2.1"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "0wq0fiw964bj5rdmw66mhbfsjnmb13bcdr42krpk2ig5f1cgc967"; + }; + + doCheck = !stdenv.isDarwin && !isPyPy; + + # Disable imagefont tests, because they don't work well with infinality: + # https://github.com/python-pillow/Pillow/issues/1259 + postPatch = '' + rm Tests/test_imagefont.py + ''; + + propagatedBuildInputs = [ olefile ]; + + buildInputs = [ + freetype libjpeg zlib libtiff libwebp tcl nose lcms2 ] + ++ stdenv.lib.optionals (isPyPy) [ tk libX11 ]; + + # NOTE: we use LCMS_ROOT as WEBP root since there is not other setting for webp. + preConfigure = let + libinclude' = pkg: ''"${pkg.out}/lib", "${pkg.out}/include"''; + libinclude = pkg: ''"${pkg.out}/lib", "${pkg.dev}/include"''; + in '' + sed -i "setup.py" \ + -e 's|^FREETYPE_ROOT =.*$|FREETYPE_ROOT = ${libinclude freetype}|g ; + s|^JPEG_ROOT =.*$|JPEG_ROOT = ${libinclude libjpeg}|g ; + s|^ZLIB_ROOT =.*$|ZLIB_ROOT = ${libinclude zlib}|g ; + s|^LCMS_ROOT =.*$|LCMS_ROOT = ${libinclude lcms2}|g ; + s|^TIFF_ROOT =.*$|TIFF_ROOT = ${libinclude libtiff}|g ; + s|^TCL_ROOT=.*$|TCL_ROOT = ${libinclude' tcl}|g ;' + export LDFLAGS="-L${libwebp}/lib" + export CFLAGS="-I${libwebp}/include" + '' + # Remove impurities + + stdenv.lib.optionalString stdenv.isDarwin '' + substituteInPlace setup.py \ + --replace '"/Library/Frameworks",' "" \ + --replace '"/System/Library/Frameworks"' "" + ''; + + meta = with stdenv.lib; { + homepage = "https://python-pillow.github.io/"; + description = "Fork of The Python Imaging Library (PIL)"; + longDescription = '' + The Python Imaging Library (PIL) adds image processing + capabilities to your Python interpreter. This library + supports many file formats, and provides powerful image + processing and graphics capabilities. + ''; + license = "http://www.pythonware.com/products/pil/license.htm"; + maintainers = with maintainers; [ goibhniu prikhi ]; + }; +} diff --git a/pkgs/development/python-modules/plotly/default.nix b/pkgs/development/python-modules/plotly/default.nix index 383dbd1e08f7..ed62a0912818 100644 --- a/pkgs/development/python-modules/plotly/default.nix +++ b/pkgs/development/python-modules/plotly/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "plotly"; - version = "2.0.10"; + version = "2.0.12"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "8c013a01bb11c4c269c38a7086ffb92d6a2827922c49706131842498a49b3b81"; + sha256 = "0050da900e4420c15766f8dfb8d252510896511361bf485b9308bc0287f7add0"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pylint/default.nix b/pkgs/development/python-modules/pylint/default.nix index 12871bd8f6c2..8c82cb52910a 100644 --- a/pkgs/development/python-modules/pylint/default.nix +++ b/pkgs/development/python-modules/pylint/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "pylint"; - version = "1.7.1"; + version = "1.7.2"; src = fetchurl { url = "mirror://pypi/p/${pname}/${name}.tar.gz"; - sha256 = "8b4a7ab6cf5062e40e2763c0b4a596020abada1d7304e369578b522e46a6264a"; + sha256 = "ea6afb93a9ed810cf52ff3838eb3a15e2bf6a81b80de0eaede1ce442caa5ca69"; }; buildInputs = [ pytest pytestrunner mccabe configparser backports_functools_lru_cache ]; diff --git a/pkgs/development/python-modules/pyparsing/default.nix b/pkgs/development/python-modules/pyparsing/default.nix new file mode 100644 index 000000000000..f751a8bfbb2d --- /dev/null +++ b/pkgs/development/python-modules/pyparsing/default.nix @@ -0,0 +1,20 @@ +{ stdenv, buildPythonPackage, fetchPypi }: +buildPythonPackage rec { + pname = "pyparsing"; + name = "${pname}-${version}"; + version = "2.2.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "016b9gh606aa44sq92jslm89bg874ia0yyiyb643fa6dgbsbqch8"; + }; + + # Not everything necessary to run the tests is included in the distribution + doCheck = false; + + meta = with stdenv.lib; { + homepage = http://pyparsing.wikispaces.com/; + description = "An alternative approach to creating and executing simple grammars, vs. the traditional lex/yacc approach, or the use of regular expressions"; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/pyroute2/default.nix b/pkgs/development/python-modules/pyroute2/default.nix index de1651ec2b0b..2e60f6812e95 100644 --- a/pkgs/development/python-modules/pyroute2/default.nix +++ b/pkgs/development/python-modules/pyroute2/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "pyroute2"; - version = "0.4.16"; + version = "0.4.18"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/p/pyroute2/${name}.tar.gz"; - sha256 = "5c692efd83369cb44086572b3e1e95ab11f1bc516a89c8ca2429795a789f32a9"; + sha256 = "bdcff9f598ff4dda7420675ee387426cd9cc79d795ea73eb684a4314d4b00b9e"; }; # requires root priviledges diff --git a/pkgs/development/python-modules/pyside/shiboken.nix b/pkgs/development/python-modules/pyside/shiboken.nix index cef78c215500..0864b641cdba 100644 --- a/pkgs/development/python-modules/pyside/shiboken.nix +++ b/pkgs/development/python-modules/pyside/shiboken.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, cmake, buildPythonPackage, libxml2, libxslt, pysideApiextractor, pysideGeneratorrunner, python, sphinx, qt4, isPy3k, isPy35 }: +{ lib, fetchurl, cmake, buildPythonPackage, libxml2, libxslt, pysideApiextractor, pysideGeneratorrunner, python, sphinx, qt4, isPy3k, isPy35, isPy36 }: # This derivation provides a Python module and should therefore be called via `python-packages.nix`. # Python 3.5 is not supported: https://github.com/PySide/Shiboken/issues/77 @@ -23,7 +23,7 @@ buildPythonPackage rec { substituteInPlace generator/CMakeLists.txt --replace \ \"$\{GENERATORRUNNER_PLUGIN_DIR}\" lib/generatorrunner/ ''; - patches = if isPy35 then [ ./shiboken_py35.patch ] else null; + patches = if (isPy35 || isPy36) then [ ./shiboken_py35.patch ] else null; cmakeFlags = if isPy3k then "-DUSE_PYTHON3=TRUE" else null; diff --git a/pkgs/development/python-modules/pyside/shiboken_py35.patch b/pkgs/development/python-modules/pyside/shiboken_py35.patch index 5642ddc594d1..32088144ed78 100644 --- a/pkgs/development/python-modules/pyside/shiboken_py35.patch +++ b/pkgs/development/python-modules/pyside/shiboken_py35.patch @@ -6,7 +6,7 @@ diff --git a/cmake/Modules/FindPython3Libs.cmake b/cmake/Modules/FindPython3Libs # CMAKE_FIND_FRAMEWORKS(Python) -FOREACH(_CURRENT_VERSION 3.4 3.3 3.2 3.1 3.0) -+FOREACH(_CURRENT_VERSION 3.5 3.4 3.3 3.2 3.1 3.0) ++FOREACH(_CURRENT_VERSION 3.6 3.5 3.4 3.3 3.2 3.1 3.0) IF(_CURRENT_VERSION GREATER 3.1) SET(_32FLAGS "m" "u" "mu" "dm" "du" "dmu" "") ELSE() diff --git a/pkgs/development/python-modules/pytest-xdist/default.nix b/pkgs/development/python-modules/pytest-xdist/default.nix index b3577908cf9c..600c98925af4 100644 --- a/pkgs/development/python-modules/pytest-xdist/default.nix +++ b/pkgs/development/python-modules/pytest-xdist/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "pytest-xdist"; - version = "1.16.0"; + version = "1.18.2"; src = fetchPypi { inherit pname version; - sha256 = "42e5a1e5da9d7cff3e74b07f8692598382f95624f234ff7e00a3b1237e0feba2"; + sha256 = "10468377901b80255cf192c4603a94ffe8b1f071f5c912868da5f5cb91170dae"; }; buildInputs = [ pytest setuptools_scm ]; diff --git a/pkgs/development/python-modules/scipy/default.nix b/pkgs/development/python-modules/scipy/default.nix index a7428f134a7a..f4e4518ef168 100644 --- a/pkgs/development/python-modules/scipy/default.nix +++ b/pkgs/development/python-modules/scipy/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "scipy"; - version = "0.19.0"; + version = "0.19.1"; name = "${pname}-${version}"; src = fetchurl { - url = "mirror://pypi/s/scipy/scipy-${version}.zip"; - sha256 = "4190d34bf9a09626cd42100bbb12e3d96b2daf1a8a3244e991263eb693732122"; + url = "mirror://pypi/s/scipy/scipy-${version}.tar.gz"; + sha256 = "a19a2ca7a7336495ec180adeaa0dfdcf41e96dbbee90d51c3ed828ba570884e6"; }; buildInputs = [ gfortran nose numpy.blas ]; @@ -20,6 +20,7 @@ buildPythonPackage rec { preConfigure = '' sed -i '0,/from numpy.distutils.core/s//import setuptools;from numpy.distutils.core/' setup.py + export NPY_NUM_BUILD_JOBS=$NIX_BUILD_CORES ''; preBuild = '' @@ -31,6 +32,8 @@ buildPythonPackage rec { EOF ''; + enableParallelBuilding = true; + checkPhase = '' runHook preCheck pushd dist diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix index 4cd522fe1953..36b04692a9e5 100644 --- a/pkgs/development/python-modules/sqlalchemy/default.nix +++ b/pkgs/development/python-modules/sqlalchemy/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "SQLAlchemy"; name = "${pname}-${version}"; - version = "1.1.11"; + version = "1.1.12"; src = fetchPypi { inherit pname version; - sha256 = "76f76965e9a968ba3aecd2a8bc0d991cea04fd9a182e6c95c81f1551487b0211"; + sha256 = "d501527319f51a3d9eb639b654222c6f67287228a98ba102b1d0b598eb3266c9"; }; checkInputs = [ pytest mock pytest_xdist ] diff --git a/pkgs/development/python-modules/tornado/default.nix b/pkgs/development/python-modules/tornado/default.nix new file mode 100644 index 000000000000..11078eb85623 --- /dev/null +++ b/pkgs/development/python-modules/tornado/default.nix @@ -0,0 +1,28 @@ +{ lib +, python +, buildPythonPackage +, fetchPypi +, backports_abc +, backports_ssl_match_hostname +, certifi +, singledispatch +}: + +buildPythonPackage rec { + pname = "tornado"; + version = "4.5.1"; + name = "${pname}-${version}"; + + propagatedBuildInputs = [ backports_abc backports_ssl_match_hostname certifi singledispatch ]; + + # We specify the name of the test files to prevent + # https://github.com/NixOS/nixpkgs/issues/14634 + checkPhase = '' + ${python.interpreter} -m unittest discover *_test.py + ''; + + src = fetchPypi { + inherit pname version; + sha256 = "db0904a28253cfe53e7dedc765c71596f3c53bb8a866ae50123320ec1a7b73fd"; + }; +} diff --git a/pkgs/development/python-modules/trezor/default.nix b/pkgs/development/python-modules/trezor/default.nix index 6a3f9c638908..72d73022cabb 100644 --- a/pkgs/development/python-modules/trezor/default.nix +++ b/pkgs/development/python-modules/trezor/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "trezor"; - version = "0.7.15"; + version = "0.7.16"; src = fetchPypi { inherit pname version; - sha256 = "f7e4f509263ca172532b4c0a440d164add7cdc021b4370a253d51eba5806b618"; + sha256 = "6bdb69fc125ba705854e21163be6c7da3aa17c2a3a84f40b6d8a3f6e4a8cb314"; }; propagatedBuildInputs = [ protobuf3_2 hidapi requests ]; diff --git a/pkgs/development/python-modules/ukpostcodeparser/default.nix b/pkgs/development/python-modules/ukpostcodeparser/default.nix new file mode 100644 index 000000000000..d7d56bed8819 --- /dev/null +++ b/pkgs/development/python-modules/ukpostcodeparser/default.nix @@ -0,0 +1,22 @@ +{ stdenv, lib, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "UkPostcodeParser"; + version = "1.1.1"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "b7a7ac19d48897637c7aaa2f2970288f1c260e4a99140bf04c6086cf65576c6b"; + }; + + doCheck = false; + + meta = with lib; { + description = "UK Postcode parser"; + homepage = https://github.com/hamstah/ukpostcodeparser; + license = licenses.publicDomain; + maintainers = with maintainers; [ siddharthist ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/python-modules/vine/default.nix b/pkgs/development/python-modules/vine/default.nix index 85b17f5119ca..bf5a09a24187 100644 --- a/pkgs/development/python-modules/vine/default.nix +++ b/pkgs/development/python-modules/vine/default.nix @@ -3,14 +3,14 @@ buildPythonPackage rec { pname = "vine"; - version = "1.1.3"; + version = "1.1.4"; name = "${pname}-${version}"; disable = pythonOlder "2.7"; src = fetchPypi { inherit pname version; - sha256 = "0h94x9mc9bspg23lb1f73h7smdzc39ps7z7sm0q38ds9jahmvfc7"; + sha256 = "52116d59bc45392af9fdd3b75ed98ae48a93e822cee21e5fda249105c59a7a72"; }; buildInputs = [ case pytest ]; diff --git a/pkgs/development/python-modules/zc_lockfile/default.nix b/pkgs/development/python-modules/zc_lockfile/default.nix new file mode 100644 index 000000000000..8a438fadcd72 --- /dev/null +++ b/pkgs/development/python-modules/zc_lockfile/default.nix @@ -0,0 +1,27 @@ +{ buildPythonPackage +, fetchPypi +, mock +, zope_testing +, stdenv +}: + +buildPythonPackage rec { + pname = "zc.lockfile"; + version = "1.2.1"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "11db91ada7f22fe8aae268d4bfdeae012c4fe655f66bbb315b00822ec00d043e"; + }; + + buildInputs = [ mock ]; + propagatedBuildInputs = [ zope_testing ]; + + meta = with stdenv.lib; { + description = "Inter-process locks"; + homepage = http://www.python.org/pypi/zc.lockfile; + license = licenses.zpt20; + maintainers = with maintainers; [ goibhniu ]; + }; +} diff --git a/pkgs/development/python-modules/zconfig/default.nix b/pkgs/development/python-modules/zconfig/default.nix index aa90bf0ce1a6..5e7c762d03af 100644 --- a/pkgs/development/python-modules/zconfig/default.nix +++ b/pkgs/development/python-modules/zconfig/default.nix @@ -2,6 +2,8 @@ , fetchPypi , buildPythonPackage , zope_testrunner +, manuel +, docutils }: buildPythonPackage rec { @@ -16,6 +18,7 @@ buildPythonPackage rec { patches = [ ./skip-broken-test.patch ]; + buildInputs = [ manuel docutils ]; propagatedBuildInputs = [ zope_testrunner ]; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/zodbpickle/default.nix b/pkgs/development/python-modules/zodbpickle/default.nix new file mode 100644 index 000000000000..f51b30ab51e3 --- /dev/null +++ b/pkgs/development/python-modules/zodbpickle/default.nix @@ -0,0 +1,23 @@ +{ buildPythonPackage +, isPyPy +, fetchPypi +}: + +buildPythonPackage rec { + pname = "zodbpickle"; + version = "0.6.0"; + name = "${pname}-${version}"; + disabled = isPyPy; # https://github.com/zopefoundation/zodbpickle/issues/10 + + src = fetchPypi { + inherit pname version; + sha256 = "ea3248be966159e7791e3db0e35ea992b9235d52e7d39835438686741d196665"; + }; + + # fails.. + doCheck = false; + + meta = { + homepage = http://pypi.python.org/pypi/zodbpickle; + }; +} diff --git a/pkgs/development/tools/apktool/default.nix b/pkgs/development/tools/apktool/default.nix index 4f87bcd1589e..555cb313a629 100644 --- a/pkgs/development/tools/apktool/default.nix +++ b/pkgs/development/tools/apktool/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "apktool-${version}"; - version = "2.2.2"; + version = "2.2.4"; src = fetchurl { url = "https://bitbucket.org/iBotPeaches/apktool/downloads/apktool_${version}.jar"; - sha256 = "1a94jw0ml08xdwls1q9v5p1zak5qrbw2zyychnm5vch8znyws411"; + sha256 = "0l9jxa393a52iiawh93v31vr1y6z2bwg6dqhpivqd6y0vip1h7qz"; }; phases = [ "installPhase" ]; diff --git a/pkgs/development/tools/build-managers/gnumake/3.80/default.nix b/pkgs/development/tools/build-managers/gnumake/3.80/default.nix deleted file mode 100644 index ad855df73534..000000000000 --- a/pkgs/development/tools/build-managers/gnumake/3.80/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{stdenv, fetchurl}: - -stdenv.mkDerivation { - name = "gnumake-3.80"; - - src = fetchurl { - url = http://tarballs.nixos.org/make-3.80.tar.bz2; - sha256 = "06rgz6npynr8whmf7rxgkyvcz0clf3ggwf4cyhj3fcscn3kkk6x9"; - }; - - patches = [./log.patch]; - - hardeningDisable = [ "format" ]; - - meta = { - platforms = stdenv.lib.platforms.unix; - }; -} diff --git a/pkgs/development/tools/build-managers/gnumake/3.80/log.patch b/pkgs/development/tools/build-managers/gnumake/3.80/log.patch deleted file mode 100644 index fa90acfe8de5..000000000000 --- a/pkgs/development/tools/build-managers/gnumake/3.80/log.patch +++ /dev/null @@ -1,125 +0,0 @@ -diff -rc make-3.80-orig/job.c make-3.80/job.c -*** make-3.80-orig/job.c 2002-08-10 03:27:17.000000000 +0200 ---- make-3.80/job.c 2004-04-02 17:38:04.000000000 +0200 -*************** -*** 987,993 **** - appear. */ - - message (0, (just_print_flag || (!(flags & COMMANDS_SILENT) && !silent_flag)) -! ? "%s" : (char *) 0, p); - - /* Tell update_goal_chain that a command has been started on behalf of - this target. It is important that this happens here and not in ---- 987,993 ---- - appear. */ - - message (0, (just_print_flag || (!(flags & COMMANDS_SILENT) && !silent_flag)) -! ? "\e[3s\e[a%s\e[b" : (char *) 0, p); - - /* Tell update_goal_chain that a command has been started on behalf of - this target. It is important that this happens here and not in -diff -rc make-3.80-orig/main.c make-3.80/main.c -*** make-3.80-orig/main.c 2002-08-10 03:27:17.000000000 +0200 ---- make-3.80/main.c 2004-04-02 17:42:50.000000000 +0200 -*************** -*** 254,259 **** ---- 254,263 ---- - they appear out of date or not. */ - - int always_make_flag = 0; -+ -+ int logNestingStdout = 0; -+ int logNestingStderr = 0; -+ - - /* The usage output. We write it this way to make life easier for the - translators, especially those trying to translate to right-to-left -*************** -*** 827,832 **** ---- 831,845 ---- - } - - -+ static void closeNesting() -+ { -+ while (logNestingStdout--) -+ printf("\e[q"); -+ while (logNestingStderr--) -+ fprintf(stderr, "\e[q"); -+ } -+ -+ - #ifndef _AMIGA - int - main (argc, argv, envp) -*************** -*** 854,859 **** ---- 867,874 ---- - no_default_sh_exe = 1; - #endif - -+ atexit(closeNesting); -+ - default_goal_file = 0; - reading_file = 0; - -*************** -*** 2782,2787 **** ---- 2797,2808 ---- - - /* Use entire sentences to give the translators a fighting chance. */ - -+ if (entering) -+ { -+ printf("\e[p"); -+ logNestingStdout++; -+ } -+ - if (makelevel == 0) - if (starting_directory == 0) - if (entering) -*************** -*** 2810,2813 **** ---- 2831,2840 ---- - else - printf (_("%s[%u]: Leaving directory `%s'\n"), - program, makelevel, starting_directory); -+ -+ if (!entering) -+ { -+ printf("\e[q"); -+ logNestingStdout--; -+ } - } -diff -rc make-3.80-orig/make.h make-3.80/make.h -*** make-3.80-orig/make.h 2002-09-11 18:55:44.000000000 +0200 ---- make-3.80/make.h 2004-04-02 17:42:15.000000000 +0200 -*************** -*** 559,562 **** ---- 559,567 ---- - extern int atomic_stat PARAMS ((const char *file, struct stat *buf)); - extern struct dirent *atomic_readdir PARAMS ((DIR *dir)); - -+ - #endif -+ -+ -+ extern int logNestingStdout; -+ extern int logNestingStderr; -diff -rc make-3.80-orig/remake.c make-3.80/remake.c -*** make-3.80-orig/remake.c 2002-08-08 02:11:19.000000000 +0200 ---- make-3.80/remake.c 2004-04-04 23:10:19.000000000 +0200 -*************** -*** 1049,1055 **** ---- 1049,1059 ---- - /* The normal case: start some commands. */ - if (!touch_flag || file->cmds->any_recurse) - { -+ fprintf(stderr, "\e[pbuilding %s\n", file->name); -+ logNestingStderr++; - execute_file_commands (file); -+ fprintf(stderr, "\e[q"); -+ logNestingStderr--; - return; - } - diff --git a/pkgs/development/tools/build-managers/gnumake/3.82/default.nix b/pkgs/development/tools/build-managers/gnumake/3.82/default.nix index ce5eff878ead..87897017f86a 100644 --- a/pkgs/development/tools/build-managers/gnumake/3.82/default.nix +++ b/pkgs/development/tools/build-managers/gnumake/3.82/default.nix @@ -15,10 +15,6 @@ stdenv.mkDerivation { patches = [ - # Provide nested log output for subsequent pretty-printing by - # nix-log2xml. - ./log.patch - # Purity: don't look for library dependencies (of the form # `-lfoo') in /lib and /usr/lib. It's a stupid feature anyway. # Likewise, when searching for included Makefiles, don't look in diff --git a/pkgs/development/tools/build-managers/gnumake/3.82/log.patch b/pkgs/development/tools/build-managers/gnumake/3.82/log.patch deleted file mode 100644 index e6197fd8e78f..000000000000 --- a/pkgs/development/tools/build-managers/gnumake/3.82/log.patch +++ /dev/null @@ -1,125 +0,0 @@ -diff -rc job.c job.c -*** job.c 2006-03-20 04:03:04.000000000 +0100 ---- job.c 2009-01-19 19:37:28.000000000 +0100 -*************** -*** 1083,1089 **** - appear. */ - - message (0, (just_print_flag || (!(flags & COMMANDS_SILENT) && !silent_flag)) -! ? "%s" : (char *) 0, p); - - /* Tell update_goal_chain that a command has been started on behalf of - this target. It is important that this happens here and not in ---- 1083,1089 ---- - appear. */ - - message (0, (just_print_flag || (!(flags & COMMANDS_SILENT) && !silent_flag)) -! ? (enable_nested_output ? "\e[3s\e[a%s\e[b" : "%s") : (char *) 0, p); - - /* Tell update_goal_chain that a command has been started on behalf of - this target. It is important that this happens here and not in -diff -rc main.c main.c -*** main.c 2006-03-20 03:36:37.000000000 +0100 ---- main.c 2009-01-19 19:41:41.000000000 +0100 -*************** -*** 886,891 **** ---- 886,900 ---- - } - - -+ static void close_nesting() -+ { -+ while (stdout_nesting_level--) -+ printf("\e[q"); -+ while (stderr_nesting_level--) -+ fprintf(stderr, "\e[q"); -+ } -+ -+ - #ifdef _AMIGA - int - main (int argc, char **argv) -*************** -*** 931,936 **** ---- 940,950 ---- - atexit (close_stdout); - #endif - -+ atexit(close_nesting); -+ -+ if (getenv("NIX_INDENT_MAKE")) -+ enable_nested_output = 1; -+ - /* Needed for OS/2 */ - initialize_main(&argc, &argv); - -*************** -*** 3095,3100 **** ---- 3109,3120 ---- - - /* Use entire sentences to give the translators a fighting chance. */ - -+ if (entering && enable_nested_output) -+ { -+ printf("\e[p"); -+ stdout_nesting_level++; -+ } -+ - if (makelevel == 0) - if (starting_directory == 0) - if (entering) -*************** -*** 3124,3129 **** ---- 3144,3159 ---- - printf (_("%s[%u]: Leaving directory `%s'\n"), - program, makelevel, starting_directory); - -+ if (!entering && enable_nested_output) -+ { -+ printf("\e[q"); -+ stdout_nesting_level--; -+ } -+ - /* Flush stdout to be sure this comes before any stderr output. */ - fflush (stdout); - } -+ -+ int enable_nested_output = 0; -+ int stdout_nesting_level = 0; -+ int stderr_nesting_level = 0; -diff -rc make.h -*** make.h 2006-02-16 00:54:43.000000000 +0100 ---- make.h 2009-01-19 19:32:03.000000000 +0100 -*************** -*** 609,611 **** ---- 609,614 ---- - - #define ENULLLOOP(_v,_c) do { errno = 0; (_v) = _c; } \ - while((_v)==0 && errno==EINTR) -+ extern int enable_nested_output; -+ extern int stdout_nesting_level; -+ extern int stderr_nesting_level; -diff -rc reremake.c -*** remake.c 2006-03-20 03:36:37.000000000 +0100 ---- remake.c 2009-01-19 19:39:40.000000000 +0100 -*************** -*** 1120,1126 **** ---- 1120,1137 ---- - /* The normal case: start some commands. */ - if (!touch_flag || file->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/build-managers/gnumake/4.0/darwin-library_search-dylib.patch b/pkgs/development/tools/build-managers/gnumake/4.0/darwin-library_search-dylib.patch deleted file mode 100644 index de7e4f615212..000000000000 --- a/pkgs/development/tools/build-managers/gnumake/4.0/darwin-library_search-dylib.patch +++ /dev/null @@ -1,17 +0,0 @@ -Fixed default libpatttern on Darwin, imported from prefix overlay. -Got merged upstream: -https://savannah.gnu.org/bugs/?37197 ---- default.c.orig 2009-05-02 12:25:24 +0200 -+++ default.c 2009-05-02 12:25:58 +0200 -@@ -509,7 +509,11 @@ - #ifdef __MSDOS__ - ".LIBPATTERNS", "lib%.a $(DJDIR)/lib/lib%.a", - #else -+#ifdef __APPLE__ -+ ".LIBPATTERNS", "lib%.dylib lib%.a", -+#else - ".LIBPATTERNS", "lib%.so lib%.a", -+#endif - #endif - #endif - diff --git a/pkgs/development/tools/build-managers/gnumake/4.0/default.nix b/pkgs/development/tools/build-managers/gnumake/4.0/default.nix deleted file mode 100644 index a4128ac854c7..000000000000 --- a/pkgs/development/tools/build-managers/gnumake/4.0/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{stdenv, fetchurl}: - -let version = "4.0"; in -stdenv.mkDerivation { - name = "gnumake-${version}"; - - src = fetchurl { - url = "mirror://gnu/make/make-${version}.tar.bz2"; - sha256 = "1nyvn8mknw0mf7727lprva3lisl1y0n03lvar342rrpdmz3qc1p6"; - }; - - /* On Darwin, there are 3 test failures that haven't been investigated - yet. */ - doCheck = !stdenv.isDarwin && !stdenv.isFreeBSD; - - patches = - [ - # Purity: don't look for library dependencies (of the form - # `-lfoo') in /lib and /usr/lib. It's a stupid feature anyway. - # Likewise, when searching for included Makefiles, don't look in - # /usr/include and friends. - ./impure-dirs.patch - - # a bunch of patches from Gentoo, mostly should be from upstream (unreleased) - ./darwin-library_search-dylib.patch - ]; - patchFlags = "-p0"; - - meta = { - description = "GNU Make, a program controlling the generation of non-source files from sources"; - - longDescription = - '' Make is a tool which controls the generation of executables and - other non-source files of a program from the program's source files. - - Make gets its knowledge of how to build your program from a file - called the makefile, which lists each of the non-source files and - how to compute it from other files. When you write a program, you - should write a makefile for it, so that it is possible to use Make - to build and install the program. - ''; - - homepage = http://www.gnu.org/software/make/; - - license = stdenv.lib.licenses.gpl3Plus; - maintainers = [ ]; - platforms = stdenv.lib.platforms.all; - }; -} diff --git a/pkgs/development/tools/build-managers/gnumake/4.0/impure-dirs.patch b/pkgs/development/tools/build-managers/gnumake/4.0/impure-dirs.patch deleted file mode 100644 index f6646f1d0126..000000000000 --- a/pkgs/development/tools/build-managers/gnumake/4.0/impure-dirs.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff -rc read.c read.c -*** read.c 2006-03-17 15:24:20.000000000 +0100 ---- read.c 2007-05-24 17:16:31.000000000 +0200 -*************** -*** 99,107 **** ---- 99,109 ---- - #endif - INCLUDEDIR, - #ifndef _AMIGA -+ #if 0 - "/usr/gnu/include", - "/usr/local/include", - "/usr/include", -+ #endif - #endif - 0 - }; -diff -rc reremake.c -*** remake.c 2006-03-20 03:36:37.000000000 +0100 ---- remake.c 2007-05-24 17:06:54.000000000 +0200 -*************** -*** 1452,1460 **** ---- 1452,1462 ---- - static char *dirs[] = - { - #ifndef _AMIGA -+ #if 0 - "/lib", - "/usr/lib", - #endif -+ #endif - #if defined(WINDOWS32) && !defined(LIBDIR) - /* - * This is completely up to the user at product install time. Just define diff --git a/pkgs/development/tools/build-managers/gnumake/4.1/default.nix b/pkgs/development/tools/build-managers/gnumake/4.1/default.nix deleted file mode 100644 index 7c45a6c8e674..000000000000 --- a/pkgs/development/tools/build-managers/gnumake/4.1/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ stdenv, fetchurl }: - -let - version = "4.1"; -in -stdenv.mkDerivation { - name = "gnumake-${version}"; - - src = fetchurl { - url = "mirror://gnu/make/make-${version}.tar.bz2"; - sha256 = "19gwwhik3wdwn0r42b7xcihkbxvjl9r2bdal8nifc3k5i4rn3iqb"; - }; - - patchFlags = "-p0"; - patches = [ - # Purity: don't look for library dependencies (of the form `-lfoo') in /lib - # and /usr/lib. It's a stupid feature anyway. Likewise, when searching for - # included Makefiles, don't look in /usr/include and friends. - ./impure-dirs.patch - - # Don't segfault if we can't get a tty name. - ./no-tty-name.patch - ]; - - outputs = [ "out" "doc" ]; - - meta = { - homepage = http://www.gnu.org/software/make/; - description = "A tool to control the generation of non-source files from sources"; - license = stdenv.lib.licenses.gpl3Plus; - - longDescription = '' - Make is a tool which controls the generation of executables and - other non-source files of a program from the program's source files. - - Make gets its knowledge of how to build your program from a file - called the makefile, which lists each of the non-source files and - how to compute it from other files. When you write a program, you - should write a makefile for it, so that it is possible to use Make - to build and install the program. - ''; - - platforms = stdenv.lib.platforms.all; - }; -} diff --git a/pkgs/development/tools/build-managers/gnumake/4.1/impure-dirs.patch b/pkgs/development/tools/build-managers/gnumake/4.1/impure-dirs.patch deleted file mode 100644 index f6646f1d0126..000000000000 --- a/pkgs/development/tools/build-managers/gnumake/4.1/impure-dirs.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff -rc read.c read.c -*** read.c 2006-03-17 15:24:20.000000000 +0100 ---- read.c 2007-05-24 17:16:31.000000000 +0200 -*************** -*** 99,107 **** ---- 99,109 ---- - #endif - INCLUDEDIR, - #ifndef _AMIGA -+ #if 0 - "/usr/gnu/include", - "/usr/local/include", - "/usr/include", -+ #endif - #endif - 0 - }; -diff -rc reremake.c -*** remake.c 2006-03-20 03:36:37.000000000 +0100 ---- remake.c 2007-05-24 17:06:54.000000000 +0200 -*************** -*** 1452,1460 **** ---- 1452,1462 ---- - static char *dirs[] = - { - #ifndef _AMIGA -+ #if 0 - "/lib", - "/usr/lib", - #endif -+ #endif - #if defined(WINDOWS32) && !defined(LIBDIR) - /* - * This is completely up to the user at product install time. Just define diff --git a/pkgs/development/tools/build-managers/gnumake/4.1/no-tty-name.patch b/pkgs/development/tools/build-managers/gnumake/4.1/no-tty-name.patch deleted file mode 100644 index a84d7ab49d04..000000000000 --- a/pkgs/development/tools/build-managers/gnumake/4.1/no-tty-name.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 292da6f6867b75a5af7ddbb639a1feae022f438f Mon Sep 17 00:00:00 2001 -From: Paul Smith <psmith@gnu.org> -Date: Mon, 20 Oct 2014 05:54:56 +0000 -Subject: * main.c (main): [SV 43434] Handle NULL returns from ttyname(). - ---- -diff --git main.c main.c -index b2d169c..0cdb8a8 100644 ---- main.c -+++ main.c -@@ -1429,13 +1429,18 @@ main (int argc, char **argv, char **envp) - #ifdef HAVE_ISATTY - if (isatty (fileno (stdout))) - if (! lookup_variable (STRING_SIZE_TUPLE ("MAKE_TERMOUT"))) -- define_variable_cname ("MAKE_TERMOUT", TTYNAME (fileno (stdout)), -- o_default, 0)->export = v_export; -- -+ { -+ const char *tty = TTYNAME (fileno (stdout)); -+ define_variable_cname ("MAKE_TERMOUT", tty ? tty : DEFAULT_TTYNAME, -+ o_default, 0)->export = v_export; -+ } - if (isatty (fileno (stderr))) - if (! lookup_variable (STRING_SIZE_TUPLE ("MAKE_TERMERR"))) -- define_variable_cname ("MAKE_TERMERR", TTYNAME (fileno (stderr)), -- o_default, 0)->export = v_export; -+ { -+ const char *tty = TTYNAME (fileno (stderr)); -+ define_variable_cname ("MAKE_TERMERR", tty ? tty : DEFAULT_TTYNAME, -+ o_default, 0)->export = v_export; -+ } - #endif - - /* Reset in case the switches changed our minds. */ -diff --git makeint.h makeint.h -index 6223936..2009f41 100644 ---- makeint.h -+++ makeint.h -@@ -436,10 +436,11 @@ extern struct rlimit stack_limit; - /* The number of bytes needed to represent the largest integer as a string. */ - #define INTSTR_LENGTH CSTRLEN ("18446744073709551616") - -+#define DEFAULT_TTYNAME "true" - #ifdef HAVE_TTYNAME - # define TTYNAME(_f) ttyname (_f) - #else --# define TTYNAME(_f) "true" -+# define TTYNAME(_f) DEFAULT_TTYNAME - #endif - - --- -cgit v0.9.0.2 diff --git a/pkgs/development/tools/build-managers/jam/default.nix b/pkgs/development/tools/build-managers/jam/default.nix index c0d152ee7a2f..7314643530e8 100644 --- a/pkgs/development/tools/build-managers/jam/default.nix +++ b/pkgs/development/tools/build-managers/jam/default.nix @@ -10,6 +10,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ yacc ]; + preConfigure = '' + unset AR + ''; + buildPhase = '' make jam0 ./jam0 -j$NIX_BUILD_CORES -sBINDIR=$out/bin install diff --git a/pkgs/development/tools/misc/gnum4/default.nix b/pkgs/development/tools/misc/gnum4/default.nix index fbbd6cc4d6f8..33ea78907468 100644 --- a/pkgs/development/tools/misc/gnum4/default.nix +++ b/pkgs/development/tools/misc/gnum4/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ stdenv, hostPlatform, fetchurl }: stdenv.mkDerivation rec { name = "gnum4-1.4.18"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { configureFlags = "--with-syscmd-shell=${stdenv.shell}"; # Upstream is aware of it; it may be in the next release. - patches = [ ./s_isdir.patch ]; + patches = [ ./s_isdir.patch ] ++ stdenv.lib.optional hostPlatform.isDarwin stdenv.secure-format-patch; # FIXME needs gcc 4.9 in bootstrap tools hardeningDisable = [ "stackprotector" ]; diff --git a/pkgs/development/tools/misc/srecord/default.nix b/pkgs/development/tools/misc/srecord/default.nix index 9d0e2d7430e8..94a452ce0836 100644 --- a/pkgs/development/tools/misc/srecord/default.nix +++ b/pkgs/development/tools/misc/srecord/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation rec { homepage = http://srecord.sourceforge.net/; license = licenses.gpl3Plus; maintainers = [ maintainers.bjornfor ]; - platforms = platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/tools/packer/default.nix b/pkgs/development/tools/packer/default.nix index bcf08712ccb1..40501a78b1eb 100644 --- a/pkgs/development/tools/packer/default.nix +++ b/pkgs/development/tools/packer/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "packer-${version}"; - version = "1.0.0"; + version = "1.0.3"; goPackagePath = "github.com/mitchellh/packer"; @@ -11,7 +11,7 @@ buildGoPackage rec { owner = "mitchellh"; repo = "packer"; rev = "v${version}"; - sha256 = "16hdh3iwvdg1jk3pswa9r9lq4qkhds1lrqwl19vd1v2yz2r76kzi"; + sha256 = "1bd0rv93pxlv58c0x1d4dsjq4pg5qwrm2p7qw83pca7izlncgvfr"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/parsing/bison/3.x.nix b/pkgs/development/tools/parsing/bison/3.x.nix index ebbee4e693dc..0369d7dabde5 100644 --- a/pkgs/development/tools/parsing/bison/3.x.nix +++ b/pkgs/development/tools/parsing/bison/3.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, m4, perl, help2man }: +{ stdenv, hostPlatform, fetchurl, m4, perl, help2man }: stdenv.mkDerivation rec { name = "bison-3.0.4"; @@ -8,6 +8,8 @@ stdenv.mkDerivation rec { sha256 = "b67fd2daae7a64b5ba862c66c07c1addb9e6b1b05c5f2049392cfd8a2172952e"; }; + patches = stdenv.lib.optional hostPlatform.isDarwin stdenv.secure-format-patch; + nativeBuildInputs = [ m4 perl ] ++ stdenv.lib.optional stdenv.isSunOS help2man; propagatedBuildInputs = [ m4 ]; diff --git a/pkgs/development/tools/parsing/flex/2.5.35.nix b/pkgs/development/tools/parsing/flex/2.5.35.nix index 19bc9cf1b854..f3357de867ea 100644 --- a/pkgs/development/tools/parsing/flex/2.5.35.nix +++ b/pkgs/development/tools/parsing/flex/2.5.35.nix @@ -1,16 +1,14 @@ -{ stdenv, fetchurl, bison, m4 }: +{ stdenv, fetchurl, autoreconfHook, flex, bison, texinfo, help2man, m4 }: stdenv.mkDerivation rec { name = "flex-2.5.35"; src = fetchurl { - # Deleted from original SourceForge and GitHub only provides generated file. - # Note: binary cache still seems to serve it, too. - url = "http://downloads.openwrt.org/sources/${name}.tar.bz2"; - sha256 = "0ysff249mwhq0053bw3hxh58djc0gy7vjan2z1krrf9n5d5vvv0b"; + url = https://github.com/westes/flex/archive/flex-2-5-35.tar.gz; + sha256 = "0wh06nix8bd4w1aq4k2fbbkdq5i30a9lxz3xczf3ff28yy0kfwzm"; }; - buildInputs = [ bison ]; + nativeBuildInputs = [ flex bison texinfo help2man autoreconfHook ]; propagatedNativeBuildInputs = [ m4 ]; diff --git a/pkgs/development/tools/parsing/flex/default.nix b/pkgs/development/tools/parsing/flex/default.nix index 3bb34f5bc907..addf3b6197a3 100644 --- a/pkgs/development/tools/parsing/flex/default.nix +++ b/pkgs/development/tools/parsing/flex/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "flex-${version}"; - version = "2.6.3"; + version = "2.6.4"; src = fetchurl { url = "https://github.com/westes/flex/releases/download/v${version}/flex-${version}.tar.gz"; - sha256 = "1an2cn2z85mkpgqcinh1fhhcd7993qm2lil1yxic8iz76ci79ck8"; + sha256 = "15g9bv236nzi665p9ggqjlfn4dwck5835vf0bbw2cz7h5c1swyp8"; }; buildInputs = [ bison ]; diff --git a/pkgs/development/tools/rtags/default.nix b/pkgs/development/tools/rtags/default.nix index 23ee6dec86ab..85d14835a251 100644 --- a/pkgs/development/tools/rtags/default.nix +++ b/pkgs/development/tools/rtags/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "rtags-${version}"; - version = "2.10"; + version = "2.11"; buildInputs = [ cmake llvmPackages.llvm openssl llvmPackages.clang emacs ] ++ lib.optionals stdenv.isDarwin [ apple_sdk.libs.xpc apple_sdk.frameworks.CoreServices ]; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { rev = "refs/tags/v${version}"; fetchSubmodules = true; url = "https://github.com/andersbakken/rtags.git"; - sha256 = "0rv5hz4cfc1adpxvp4j4227nfc0p0yrjdc6l9i32jj11p69a5401"; + sha256 = "0965jn8zk3mh07yzw6jmwwp56xly1sihkn0vhv07izkh41mdkrvv"; # unicode file names lead to different checksums on HFS+ vs. other # filesystems because of unicode normalisation postFetch = '' diff --git a/pkgs/games/0ad/data.nix b/pkgs/games/0ad/data.nix index 68ef1fd53926..20dd30238fb8 100644 --- a/pkgs/games/0ad/data.nix +++ b/pkgs/games/0ad/data.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "0ad-data-${version}"; - version = "0.0.21"; + version = "0.0.22"; src = fetchurl { url = "http://releases.wildfiregames.com/0ad-${version}-alpha-unix-data.tar.xz"; - sha256 = "15xadyrpvq27lm9p1ny7bcmmv56m16h3xadbkdx69gfkzxc3razk"; + sha256 = "0vknk9ay9h2p34r7mym2g066f3s3c5d5vmap0ckcs5b86h5cscjc"; }; installPhase = '' diff --git a/pkgs/games/0ad/game.nix b/pkgs/games/0ad/game.nix index 3a50196456c0..cd0647cdee1d 100644 --- a/pkgs/games/0ad/game.nix +++ b/pkgs/games/0ad/game.nix @@ -10,11 +10,11 @@ assert withEditor -> wxGTK != null; stdenv.mkDerivation rec { name = "0ad-${version}"; - version = "0.0.21"; + version = "0.0.22"; src = fetchurl { url = "http://releases.wildfiregames.com/0ad-${version}-alpha-unix-build.tar.xz"; - sha256 = "1kw3hqnr737ipx4f03khz3hvsh3ha7r8iy9njppk2faa53j27gln"; + sha256 = "1cgmr4g5g9wv36v7ylbrvqhsjwgcsdgbqwc8zlqmnayk9zgkdpgx"; }; nativeBuildInputs = [ python2 perl pkgconfig ]; diff --git a/pkgs/games/klavaro/default.nix b/pkgs/games/klavaro/default.nix index ea56c1f1ac20..83f8f1a8be7b 100644 --- a/pkgs/games/klavaro/default.nix +++ b/pkgs/games/klavaro/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "klavaro-${version}"; - version = "3.02"; + version = "3.03"; src = fetchurl { url = "mirror://sourceforge/klavaro/${name}.tar.bz2"; - sha256 = "5f77730a8c1c8dfd4443ec8390c7226e3f82537df0882cd1222b140f0d0fcd6c"; + sha256 = "1dc75jd5bx5w3rr4zaqyf2cci3vzgac18fia0h04fzsfwlhrz5g0"; }; buildInputs = [ makeWrapper pkgconfig intltool curl gtk3 ]; diff --git a/pkgs/games/openmw/tes3mp.nix b/pkgs/games/openmw/tes3mp.nix new file mode 100644 index 000000000000..cb9e296cdd4f --- /dev/null +++ b/pkgs/games/openmw/tes3mp.nix @@ -0,0 +1,114 @@ +{ stdenv, fetchFromGitHub, qtbase, openscenegraph, mygui, bullet, ffmpeg, boost, cmake, SDL2, unshield, openal +, libXt, writeScriptBin, makeWrapper, symlinkJoin, ncurses, mesa_noglu, terra }: + +let + mygui_ = mygui.override { + inherit stdenv; + }; + terra_ = symlinkJoin { + name = "terra"; + paths = [ terra.static terra.dev ]; + }; + TES3MP = fetchFromGitHub { + owner = "TES3MP"; + repo = "openmw-tes3mp"; + rev = "f61664ff6d521e10db761a550c97c6edce8f0046"; + sha256 = "12h01kafyzq0h1cgf1c8d4mlvlplg5lvcnsc5m5h602r763pzgbb"; + }; + CallFF = fetchFromGitHub { + owner = "Koncord"; + repo = "CallFF"; + rev = "4aa5a31b7543a8f784852a5a109202b2783e93d9"; + sha256 = "0cf7r8hfh79bsg4p4k1iwhxapyakkvi0hcwwvzg1ln0fqm2yqp57"; + }; + RakNet = fetchFromGitHub { + owner = "TES3MP"; + repo = "RakNet"; + rev = "9ace90a385f60e0b919bd84964a53fb1d42438ba"; + sha256 = "0mkf5wx23w20fw9cmbiyfs86gmf0r11pdpd8y7qd4k4wl9c7n45q"; + }; + PluginExamples = fetchFromGitHub { + owner = "TES3MP"; + repo = "PluginExamples"; + rev = "213e72f315a8029eec71437e56de0eaeba5b3670"; + sha256 = "1q0cvz1s0zyq982066wgplnylqbiszz0bmcv2prqv78vq9is1l6b"; + }; + + fakegit = writeScriptBin "git" '' + #! ${stdenv.shell} + if [ "$*" = "rev-list --tags --max-count=1" ] || + [ "$*" = "rev-parse HEAD" ]; then + echo "${TES3MP.rev}" + else + exit 1 + fi + ''; +in stdenv.mkDerivation rec { + version = "0.6.0"; + name = "tes3mp-${version}"; + + src = fetchFromGitHub { + owner = "GrimKriegor"; + repo = "TES3MP-deploy"; + rev = "ac2e862c3b96206d8e0678d422ece30f9f2d0f45"; + sha256 = "0nysr6h7sa1j5ijyd52k6sw052vcdqdx4wjjmmy7p8wh1i0jkvv6"; + }; + + dontUseCmakeConfigure = true; + + nativeBuildInputs = [ cmake makeWrapper fakegit ]; + buildInputs = [ boost ffmpeg qtbase bullet mygui_ openscenegraph SDL2 unshield openal libXt + ncurses mesa_noglu ]; + + buildPhase = '' + mkdir dependencies keepers + cp --no-preserve=mode -r ${TES3MP} code + mkdir code/.git + cp --no-preserve=mode -r ${CallFF} dependencies/callff + cp --no-preserve=mode -r ${RakNet} dependencies/raknet + cp --no-preserve=mode -r ${PluginExamples} keepers/PluginExamples + ln -s ${terra_} dependencies/terra + + substituteInPlace tes3mp-deploy.sh \ + --replace "-DBUILD_OPENCS=OFF" "-DBUILD_OPENCS=OFF -DCMAKE_INSTALL_PREFIX=$out" + patchShebangs tes3mp-deploy.sh + echo y | ./tes3mp-deploy.sh -i -c $NIX_BUILD_CORES + ''; + + installPhase = '' + prefix=$out/opt/tes3mp + mkdir -p $prefix/build $out/etc/openmw $out/bin + for i in build/*; do + if [ -f "$i" ] && [ -x "$i" ]; then + mv "$i" $prefix/build + fi + done + mv build/resources $prefix/build + mv build/{settings-default.cfg,openmw.cfg,gamecontrollerdb.txt} $out/etc/openmw + mv keepers $prefix + + for i in tes3mp.sh tes3mp-browser.sh tes3mp-server.sh + do + bin="$out/bin/''${i%.sh}" + mv $i $bin + substituteInPlace $bin \ + --replace build/ $prefix/build/ + chmod +x $bin + done + ln -s $prefix/keepers/*.cfg $out/etc/openmw/ + + wrapProgram $out/bin/tes3mp-server \ + --run "mkdir -p ~/.config/openmw" \ + --run "cd ~/.config/openmw" \ + --run "[ -d PluginExamples ] || cp --no-preserve=mode -r $prefix/keepers/PluginExamples ." \ + --run "[ -f tes3mp-server.cfg ] || echo \"[Plugins] home = \$HOME/.config/openmw/PluginExamples\" > tes3mp-server.cfg" + ''; + + meta = with stdenv.lib; { + description = "Multiplayer for TES3:Morrowind based on OpenMW"; + homepage = "https://tes3mp.com/"; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ gnidorah ]; + }; +} diff --git a/pkgs/misc/emulators/dolphin-emu/master.nix b/pkgs/misc/emulators/dolphin-emu/master.nix index ed44ea593119..31e22240c3b4 100644 --- a/pkgs/misc/emulators/dolphin-emu/master.nix +++ b/pkgs/misc/emulators/dolphin-emu/master.nix @@ -4,12 +4,12 @@ , libpulseaudio ? null }: stdenv.mkDerivation rec { - name = "dolphin-emu-20170705"; + name = "dolphin-emu-20170730"; src = fetchFromGitHub { owner = "dolphin-emu"; repo = "dolphin"; - rev = "29cc009706f133aac39ebaa7003d37555b926109"; - sha256 = "0axd2z14lyqlaxrjssc0dkqnjdk3ccxh2fqrhya0jc2rsm8ighlz"; + rev = "141fb0f03ca4e0d05f7ccbf3e020997097f60dbe"; + sha256 = "1b4ygrfj1dpmyv7qqfnqrrvm96a3b68cwcnvv2pknrcpc17g52im"; }; cmakeFlags = '' diff --git a/pkgs/misc/misc.nix b/pkgs/misc/misc.nix index 6357c4e6f905..a3c293beab33 100644 --- a/pkgs/misc/misc.nix +++ b/pkgs/misc/misc.nix @@ -23,7 +23,7 @@ in */ collection = {list, name} : runCommand "collection-${name}" {} '' mkdir -p $out/nix-support - echo ${builtins.toString list} > $out/nix-support/propagated-user-env-packages + printWords ${builtins.toString list} > $out/nix-support/propagated-user-env-packages ''; /* creates a derivation symlinking references C/C++ libs into one include and lib directory called $out/cdt-envs/${name} diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/reexported_libraries b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/reexported_libraries index 00aaba1d4982..494426eba6dc 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/reexported_libraries +++ b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/reexported_libraries @@ -19,7 +19,7 @@ /usr/lib/system/libsystem_configuration.dylib /usr/lib/system/libsystem_coreservices.dylib -/usr/lib/system/libsystem_coretls.dylib +# /usr/lib/system/libsystem_coretls.dylib # Removed in 10.13 /usr/lib/system/libsystem_dnssd.dylib /usr/lib/system/libsystem_info.dylib diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/system_kernel_symbols b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/system_kernel_symbols index ff9073157a58..ed76787a9008 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/system_kernel_symbols +++ b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/system_kernel_symbols @@ -376,7 +376,6 @@ _fsync _fsync$NOCANCEL _ftruncate _futimes -_get_dp_control_port _getattrlist _getattrlistat _getattrlistbulk @@ -838,7 +837,6 @@ _sendmsg$NOCANCEL _sendmsg_x _sendto _sendto$NOCANCEL -_set_dp_control_port _setattrlist _setaudit _setaudit_addr diff --git a/pkgs/os-specific/linux/batman-adv/alfred.nix b/pkgs/os-specific/linux/batman-adv/alfred.nix index 7b800fe6f4f5..3a1407aae1ff 100644 --- a/pkgs/os-specific/linux/batman-adv/alfred.nix +++ b/pkgs/os-specific/linux/batman-adv/alfred.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, pkgconfig, gpsd, libcap, libnl }: let - ver = "2017.1"; + ver = "2017.2"; in stdenv.mkDerivation rec { name = "alfred-${ver}"; src = fetchurl { url = "http://downloads.open-mesh.org/batman/releases/batman-adv-${ver}/${name}.tar.gz"; - sha256 = "1c6zq8j0nb1wm9zzlzc2bn8a500pvqbn2vv9hrv6nvq7il2silzq"; + sha256 = "00sagxzkx0gqdkvc84w4bjy833l7n10hqalxdwkfxxwqwammclix"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/os-specific/linux/batman-adv/batctl.nix b/pkgs/os-specific/linux/batman-adv/batctl.nix index c34c7746b909..5f659eb9884c 100644 --- a/pkgs/os-specific/linux/batman-adv/batctl.nix +++ b/pkgs/os-specific/linux/batman-adv/batctl.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, pkgconfig, libnl }: let - ver = "2017.1"; + ver = "2017.2"; in stdenv.mkDerivation rec { name = "batctl-${ver}"; src = fetchurl { url = "http://downloads.open-mesh.org/batman/releases/batman-adv-${ver}/${name}.tar.gz"; - sha256 = "1imb59iaaw50y76595z6zvqnbpjgqkkp79gq4s7w7nj8wikiqcgq"; + sha256 = "0v2k9ylmk8i85p69dh6gh134f081gm1clq1vnhn6x4831n8x0q64"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/os-specific/linux/batman-adv/default.nix b/pkgs/os-specific/linux/batman-adv/default.nix index 8a96279c66be..4270f37594e3 100644 --- a/pkgs/os-specific/linux/batman-adv/default.nix +++ b/pkgs/os-specific/linux/batman-adv/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, kernel }: -let base = "batman-adv-2017.1"; in +let base = "batman-adv-2017.2"; in stdenv.mkDerivation rec { name = "${base}-${kernel.version}"; src = fetchurl { url = "http://downloads.open-mesh.org/batman/releases/${base}/${base}.tar.gz"; - sha256 = "05cck0mlg8xsvbra69x6i25xclsq1xc49dggxq81gi086c14h67c"; + sha256 = "0krr6waxkmms23cacfzngddxy1vq577s54wy2fgx6lyb4579g1yl"; }; hardeningDisable = [ "pic" ]; diff --git a/pkgs/os-specific/linux/firmware/raspberrypi/default.nix b/pkgs/os-specific/linux/firmware/raspberrypi/default.nix index 8a6dfff34704..123a7d9395da 100644 --- a/pkgs/os-specific/linux/firmware/raspberrypi/default.nix +++ b/pkgs/os-specific/linux/firmware/raspberrypi/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "raspberrypi-firmware-${version}"; - version = "1.20170427"; + version = "1.20170515"; src = fetchFromGitHub { owner = "raspberrypi"; repo = "firmware"; rev = version; - sha256 = "0n79nij0rlwjx3zqs4p3wcyrgrgg9gmsf1a526r91c689r5lpwvl"; + sha256 = "0liy0p69p9yr5cqgrfc23d3n243xkrx889gc8yqd9m2jpns4s361"; }; dontStrip = true; # Stripping breaks some of the binaries diff --git a/pkgs/os-specific/linux/ipsec-tools/default.nix b/pkgs/os-specific/linux/ipsec-tools/default.nix index 466ecb1efee1..30bd51473b5a 100644 --- a/pkgs/os-specific/linux/ipsec-tools/default.nix +++ b/pkgs/os-specific/linux/ipsec-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, linuxHeaders, readline, openssl, flex, kerberos, pam }: +{ stdenv, fetchurl, fetchpatch, linuxHeaders, readline, openssl, flex, kerberos, pam }: # TODO: These tools are supposed to work under NetBSD and FreeBSD as # well, so I guess it's not appropriate to place this expression in @@ -16,8 +16,14 @@ stdenv.mkDerivation rec { buildInputs = [ readline openssl flex kerberos pam ]; - patches = [ ./dont-create-localstatedir-during-install.patch - ./CVE-2015-4047.patch ]; + patches = [ + ./dont-create-localstatedir-during-install.patch + ./CVE-2015-4047.patch + (fetchpatch { + url = "https://anonscm.debian.org/cgit/pkg-ipsec-tools/pkg-ipsec-tools.git/plain/debian/patches/CVE-2016-10396.patch?id=62ac12648a4eb7c5ba5dba0f81998d1acf310d8b"; + sha256 = "1kf7j2pf1blni52z7q41n0yisqb7gvk01lvldr319zaxxg7rm84a"; + }) + ]; # fix build with newer gcc versions preConfigure = ''substituteInPlace configure --replace "-Werror" "" ''; diff --git a/pkgs/os-specific/linux/irqbalance/default.nix b/pkgs/os-specific/linux/irqbalance/default.nix index 7c3947539029..26cedf41a5a9 100644 --- a/pkgs/os-specific/linux/irqbalance/default.nix +++ b/pkgs/os-specific/linux/irqbalance/default.nix @@ -1,20 +1,20 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig}: +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, glib, ncurses, libcap_ng }: stdenv.mkDerivation rec { - name = "irqbalance-1.1.0"; + name = "irqbalance-${version}"; + version = "1.2.0"; src = fetchFromGitHub { owner = "irqbalance"; repo = "irqbalance"; - rev = "a23de3c455b88060620d102f6946b1d8be9e2680"; - sha256 = "06yq5k5v9wiwajqcjkbkk46g212qx78x323bygnyqshc5s25mp2x"; + rev = "v${version}"; + sha256 = "1xznxjbjzg6sds3fymdq9rk3g4cgq7xj7rz3dwbqqjqvd3k2nxw6"; }; - nativeBuildInputs = [ autoconf automake libtool pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ glib ncurses libcap_ng ]; - preConfigure = '' - ./autogen.sh - ''; + LDFLAGS = "-lncurses"; meta = { homepage = https://github.com/Irqbalance/irqbalance; diff --git a/pkgs/os-specific/linux/jool/cli.nix b/pkgs/os-specific/linux/jool/cli.nix index c8775eee48c6..6b79045ac67d 100644 --- a/pkgs/os-specific/linux/jool/cli.nix +++ b/pkgs/os-specific/linux/jool/cli.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchzip, autoreconfHook, pkgconfig, libnl }: +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libnl }: let - sourceAttrs = (import ./source.nix) { inherit fetchzip; }; + sourceAttrs = (import ./source.nix) { inherit fetchFromGitHub; }; in stdenv.mkDerivation { @@ -9,7 +9,7 @@ stdenv.mkDerivation { src = sourceAttrs.src; - sourceRoot = "Jool-${sourceAttrs.version}.zip/usr"; + sourceRoot = "Jool-v${sourceAttrs.version}-src/usr"; buildInputs = [ autoreconfHook pkgconfig libnl ]; diff --git a/pkgs/os-specific/linux/jool/default.nix b/pkgs/os-specific/linux/jool/default.nix index 824bc3f9a186..37dd4d727ec2 100644 --- a/pkgs/os-specific/linux/jool/default.nix +++ b/pkgs/os-specific/linux/jool/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchzip, kernel }: +{ stdenv, fetchFromGitHub, kernel }: -assert stdenv.lib.versionOlder kernel.version "4.11"; +assert stdenv.lib.versionOlder kernel.version "4.13"; let - sourceAttrs = (import ./source.nix) { inherit fetchzip; }; + sourceAttrs = (import ./source.nix) { inherit fetchFromGitHub; }; in stdenv.mkDerivation { diff --git a/pkgs/os-specific/linux/jool/source.nix b/pkgs/os-specific/linux/jool/source.nix index 2de2aeeff8fa..ace103a92f91 100644 --- a/pkgs/os-specific/linux/jool/source.nix +++ b/pkgs/os-specific/linux/jool/source.nix @@ -1,9 +1,11 @@ -{ fetchzip }: +{ fetchFromGitHub }: rec { - version = "3.5.3"; - src = fetchzip { - url = "https://github.com/NICMx/releases/raw/master/Jool/Jool-${version}.zip"; - sha256 = "1dh8qcb3grjpsk7j5d8p5dncrh4fljkrfd9b8sxd2c3kirczckmp"; + version = "3.5.4"; + src = fetchFromGitHub { + owner = "NICMx"; + repo = "Jool"; + rev = "v${version}"; + sha256 = "09b9zcxgmy59jb778lkdyslx777bpsl216kkivw0zwfwsgd4pyz5"; }; } diff --git a/pkgs/os-specific/linux/kbd/console-fix.patch b/pkgs/os-specific/linux/kbd/console-fix.patch deleted file mode 100644 index aefc20ff9140..000000000000 --- a/pkgs/os-specific/linux/kbd/console-fix.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/src/loadkeys.c b/src/loadkeys.c -index 6b23f68..adf65a0 100644 ---- a/src/loadkeys.c -+++ b/src/loadkeys.c -@@ -166,10 +166,10 @@ main(int argc, char *argv[]) - exit(EXIT_FAILURE); - } - -- /* get console */ -- fd = getfd(console); -- - if (!(options & OPT_M) && !(options & OPT_B)) { -+ /* get console */ -+ fd = getfd(console); -+ - /* check whether the keyboard is in Unicode mode */ - if (ioctl(fd, KDGKBMODE, &kbd_mode) || - ioctl(fd, KDGETMODE, &kd_mode)) { diff --git a/pkgs/os-specific/linux/kbd/default.nix b/pkgs/os-specific/linux/kbd/default.nix index 6e8893cc37d6..b97f48af414a 100644 --- a/pkgs/os-specific/linux/kbd/default.nix +++ b/pkgs/os-specific/linux/kbd/default.nix @@ -1,12 +1,15 @@ -{ stdenv, fetchurl, autoreconfHook, gzip, bzip2, pkgconfig, flex, check, pam }: +{ stdenv, fetchurl, autoreconfHook, + gzip, bzip2, pkgconfig, flex, check, + pam, coreutils +}: stdenv.mkDerivation rec { name = "kbd-${version}"; - version = "2.0.3"; + version = "2.0.4"; src = fetchurl { url = "mirror://kernel/linux/utils/kbd/${name}.tar.xz"; - sha256 = "0ppv953gn2zylcagr4z6zg5y2x93dxrml29plypg6xgbq3hrv2bs"; + sha256 = "124swm93dm4ca0pifgkrand3r9gvj3019d4zkfxsj9djpvv0mnaz"; }; configureFlags = [ @@ -15,7 +18,7 @@ stdenv.mkDerivation rec { "--disable-nls" ]; - patches = [ ./console-fix.patch ./search-paths.patch ]; + patches = [ ./search-paths.patch ]; postPatch = '' @@ -34,6 +37,14 @@ stdenv.mkDerivation rec { ''} ''; + postInstall = '' + for i in $out/bin/unicode_{start,stop}; do + substituteInPlace "$i" \ + --replace /usr/bin/tty ${coreutils}/bin/tty + done + ''; + + buildInputs = [ check pam ]; nativeBuildInputs = [ autoreconfHook pkgconfig flex ]; diff --git a/pkgs/os-specific/linux/kbd/search-paths.patch b/pkgs/os-specific/linux/kbd/search-paths.patch index 66a56041481c..c9405a56721d 100644 --- a/pkgs/os-specific/linux/kbd/search-paths.patch +++ b/pkgs/os-specific/linux/kbd/search-paths.patch @@ -1,77 +1,71 @@ -diff -ru3 kbd-2.0.3-old/src/libkeymap/analyze.l kbd-2.0.3/src/libkeymap/analyze.l ---- kbd-2.0.3-old/src/libkeymap/analyze.l 2016-07-03 02:31:28.258958092 +0300 -+++ kbd-2.0.3/src/libkeymap/analyze.l 2016-07-03 02:44:53.042592223 +0300 -@@ -99,6 +99,9 @@ +--- a/src/libkeymap/analyze.l ++++ b/src/libkeymap/analyze.l +@@ -101,6 +101,9 @@ stack_pop(struct lk_ctx *ctx, void *scan static const char *const include_dirpath0[] = { "", 0 }; static const char *const include_dirpath1[] = { "", "../include/", "../../include/", 0 }; static const char *const include_dirpath3[] = { -+ "/etc/kbd/" KEYMAPDIR "/include/", -+ "/etc/kbd/" KEYMAPDIR "/i386/include/", -+ "/etc/kbd/" KEYMAPDIR "/mac/include/", ++ "/etc/kbd/" KEYMAPDIR "/include/", ++ "/etc/kbd/" KEYMAPDIR "/i386/include/", ++ "/etc/kbd/" KEYMAPDIR "/mac/include/", DATADIR "/" KEYMAPDIR "/include/", DATADIR "/" KEYMAPDIR "/i386/include/", DATADIR "/" KEYMAPDIR "/mac/include/", 0 -diff -ru3 kbd-2.0.3-old/src/loadkeys.c kbd-2.0.3/src/loadkeys.c ---- kbd-2.0.3-old/src/loadkeys.c 2016-07-03 02:31:28.260958091 +0300 -+++ kbd-2.0.3/src/loadkeys.c 2016-07-03 02:34:34.123871103 +0300 -@@ -26,7 +26,7 @@ +--- a/src/loadkeys.c ++++ b/src/loadkeys.c +@@ -27,7 +27,7 @@ #include "keymap.h" - static const char *progname = NULL; + static const char *progname = NULL; -static const char *const dirpath1[] = { "", DATADIR "/" KEYMAPDIR "/**", KERNDIR "/", 0 }; +static const char *const dirpath1[] = { "", "/etc/kbd/" KEYMAPDIR "/**", DATADIR "/" KEYMAPDIR "/**", 0 }; static const char *const suffixes[] = { "", ".kmap", ".map", 0 }; - static void __attribute__ ((noreturn)) -diff -ru3 kbd-2.0.3-old/src/loadunimap.c kbd-2.0.3/src/loadunimap.c ---- kbd-2.0.3-old/src/loadunimap.c 2016-07-03 02:31:28.259958091 +0300 -+++ kbd-2.0.3/src/loadunimap.c 2016-07-03 02:33:06.803911971 +0300 -@@ -28,7 +28,7 @@ + static void __attribute__((noreturn)) +--- a/src/loadunimap.c ++++ b/src/loadunimap.c +@@ -30,7 +30,7 @@ extern char *progname; extern int force; --static const char *const unidirpath[] = { "", DATADIR "/" UNIMAPDIR "/", 0 }; -+static const char *const unidirpath[] = { "", "/etc/kbd/" UNIMAPDIR "/", DATADIR "/" UNIMAPDIR "/", 0 }; +-static const char *const unidirpath[] = { "", DATADIR "/" UNIMAPDIR "/", 0 }; ++static const char *const unidirpath[] = { "", "/etc/kbd/" UNIMAPDIR "/", DATADIR "/" UNIMAPDIR "/", 0 }; static const char *const unisuffixes[] = { "", ".uni", ".sfm", 0 }; #ifdef MAIN -diff -ru3 kbd-2.0.3-old/src/mapscrn.c kbd-2.0.3/src/mapscrn.c ---- kbd-2.0.3-old/src/mapscrn.c 2016-07-03 02:31:28.260958091 +0300 -+++ kbd-2.0.3/src/mapscrn.c 2016-07-03 02:33:21.119905270 +0300 -@@ -25,7 +25,7 @@ - static int ctoi (char *); +--- a/src/mapscrn.c ++++ b/src/mapscrn.c +@@ -27,7 +27,7 @@ void loadnewmap(int fd, char *mfil); + static int ctoi(char *); /* search for the map file in these directories (with trailing /) */ --static const char *const mapdirpath[] = { "", DATADIR "/" TRANSDIR "/", 0 }; -+static const char *const mapdirpath[] = { "", "/etc/kbd/" TRANSDIR "/", DATADIR "/" TRANSDIR "/", 0 }; +-static const char *const mapdirpath[] = { "", DATADIR "/" TRANSDIR "/", 0 }; ++static const char *const mapdirpath[] = { "", "/etc/kbd/" TRANSDIR "/", DATADIR "/" TRANSDIR "/", 0 }; static const char *const mapsuffixes[] = { "", ".trans", "_to_uni.trans", ".acm", 0 }; #ifdef MAIN -diff -ru3 kbd-2.0.3-old/src/resizecons.c kbd-2.0.3/src/resizecons.c ---- kbd-2.0.3-old/src/resizecons.c 2016-07-03 02:31:28.260958091 +0300 -+++ kbd-2.0.3/src/resizecons.c 2016-07-03 02:33:32.253900060 +0300 -@@ -100,7 +100,7 @@ +--- a/src/resizecons.c ++++ b/src/resizecons.c +@@ -101,7 +101,7 @@ static int vga_get_fontheight(void); static void vga_set_cursor(int, int); static void vga_set_verticaldisplayend_lowbyte(int); --const char *const dirpath[] = { "", DATADIR "/" VIDEOMODEDIR "/", 0}; -+const char *const dirpath[] = { "", "/etc/kbd/" VIDEOMODEDIR "/", DATADIR "/" VIDEOMODEDIR "/", 0}; +-const char *const dirpath[] = { "", DATADIR "/" VIDEOMODEDIR "/", 0 }; ++const char *const dirpath[] = { "", "/etc/kbd/" VIDEOMODEDIR "/", DATADIR "/" VIDEOMODEDIR "/", 0}; const char *const suffixes[] = { "", 0 }; - int -diff -ru3 kbd-2.0.3-old/src/setfont.c kbd-2.0.3/src/setfont.c ---- kbd-2.0.3-old/src/setfont.c 2016-07-03 02:31:28.260958091 +0300 -+++ kbd-2.0.3/src/setfont.c 2016-07-03 02:33:54.315889734 +0300 -@@ -51,10 +51,10 @@ - int debug = 0; + int main(int argc, char **argv) +--- a/src/setfont.c ++++ b/src/setfont.c +@@ -53,10 +53,10 @@ int force = 0; + int debug = 0; /* search for the font in these directories (with trailing /) */ --const char *const fontdirpath[] = { "", DATADIR "/" FONTDIR "/", 0 }; -+const char *const fontdirpath[] = { "", "/etc/kbd/" FONTDIR "/", DATADIR "/" FONTDIR "/", 0 }; +-const char *const fontdirpath[] = { "", DATADIR "/" FONTDIR "/", 0 }; ++const char *const fontdirpath[] = { "", "/etc/kbd/" FONTDIR "/", DATADIR "/" FONTDIR "/", 0 }; const char *const fontsuffixes[] = { "", ".psfu", ".psf", ".cp", ".fnt", 0 }; /* hide partial fonts a bit - loading a single one is a bad idea */ --const char *const partfontdirpath[] = { "", DATADIR "/" FONTDIR "/" PARTIALDIR "/", 0 }; -+const char *const partfontdirpath[] = { "", "/etc/kbd/" FONTDIR "/" PARTIALDIR "/", DATADIR "/" FONTDIR "/" PARTIALDIR "/", 0 }; +-const char *const partfontdirpath[] = { "", DATADIR "/" FONTDIR "/" PARTIALDIR "/", 0 }; ++const char *const partfontdirpath[] = { "", "/etc/kbd/" FONTDIR "/" PARTIALDIR "/", DATADIR "/" FONTDIR "/" PARTIALDIR "/", 0 }; const char *const partfontsuffixes[] = { "", 0 }; static inline int diff --git a/pkgs/os-specific/linux/kernel/linux-rpi.nix b/pkgs/os-specific/linux/kernel/linux-rpi.nix index 0e7f332e6177..f1fabad24fb0 100644 --- a/pkgs/os-specific/linux/kernel/linux-rpi.nix +++ b/pkgs/os-specific/linux/kernel/linux-rpi.nix @@ -1,8 +1,8 @@ { stdenv, hostPlatform, fetchFromGitHub, perl, buildLinux, ... } @ args: let - modDirVersion = "4.9.24"; - tag = "1.20170427"; + modDirVersion = "4.9.28"; + tag = "1.20170515"; in stdenv.lib.overrideDerivation (import ./generic.nix (args // rec { version = "${modDirVersion}-${tag}"; @@ -12,7 +12,7 @@ stdenv.lib.overrideDerivation (import ./generic.nix (args // rec { owner = "raspberrypi"; repo = "linux"; rev = "raspberrypi-kernel_${tag}-1"; - sha256 = "0f7p2jc3a9yvz7k1fig6fardgz2lvp5kawbb3rfsx2p53yjlhmf9"; + sha256 = "19cjvns6zs53l319k3a2angffr93dh2j9g0022ww6rmi6niq4fkf"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 64b91cc677db..5106aacbe612 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -1,13 +1,13 @@ { stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.13-rc2"; - modDirVersion = "4.13.0-rc2"; + version = "4.13-rc3"; + modDirVersion = "4.13.0-rc3"; extraMeta.branch = "4.13"; src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - sha256 = "1ni0z3v8zkqlmxn4czbw71yaipp6hbyh39vxdzpqy1dqn7zalmif"; + sha256 = "07cxqf57hgs3wnbvkqixiwhjrwdf433pjwmh0hv1id0bk8wdrjjl"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/mdadm/default.nix b/pkgs/os-specific/linux/mdadm/default.nix index 589099c911cf..0929bae991dd 100644 --- a/pkgs/os-specific/linux/mdadm/default.nix +++ b/pkgs/os-specific/linux/mdadm/default.nix @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { makeFlags = [ "NIXOS=1" "INSTALL=install" "INSTALL_BINDIR=$(out)/sbin" "MANDIR=$(out)/share/man" "RUN_DIR=/dev/.mdadm" + "STRIP=" ] ++ stdenv.lib.optionals (hostPlatform != buildPlatform) [ "CROSS_COMPILE=${stdenv.cc.prefix}" ]; diff --git a/pkgs/os-specific/linux/pam_ldap/default.nix b/pkgs/os-specific/linux/pam_ldap/default.nix index 1eee7dbdac2b..e7f2c8278e1a 100644 --- a/pkgs/os-specific/linux/pam_ldap/default.nix +++ b/pkgs/os-specific/linux/pam_ldap/default.nix @@ -1,18 +1,23 @@ -{stdenv, fetchurl, pam, openldap}: - +{ stdenv, fetchurl, pam, openldap, perl }: + stdenv.mkDerivation rec { - name = "pam_ldap-183"; - + name = "pam_ldap-186"; + src = fetchurl { url = "http://www.padl.com/download/${name}.tar.gz"; - sha256 = "1l0mlwvas9dnsfcgbszbzq3bzhdkibn1c3x15fczq3i82faf5g5a"; + sha256 = "0lv4f7hc02jrd2l3gqxd247qq62z11sp3fafn8lgb8ymb7aj5zn8"; }; + postPatch = '' + patchShebangs ./vers_string + ''; + preInstall = " substituteInPlace Makefile --replace '-o root -g root' '' "; - buildInputs = [pam openldap]; + nativeBuildInputs = [ perl ]; + buildInputs = [ pam openldap ]; meta = { homepage = http://www.padl.com/OSS/pam_ldap.html; diff --git a/pkgs/os-specific/linux/syslinux/default.nix b/pkgs/os-specific/linux/syslinux/default.nix index ce63d383c8e8..37a237f57ac9 100644 --- a/pkgs/os-specific/linux/syslinux/default.nix +++ b/pkgs/os-specific/linux/syslinux/default.nix @@ -30,7 +30,8 @@ stdenv.mkDerivation rec { preBuild = '' substituteInPlace Makefile --replace /bin/pwd $(type -P pwd) substituteInPlace gpxe/src/Makefile.housekeeping --replace /bin/echo $(type -P echo) - substituteInPlace utils/ppmtolss16 gpxe/src/Makefile --replace /usr/bin/perl $(type -P perl) + substituteInPlace utils/ppmtolss16 --replace /usr/bin/perl $(type -P perl) + substituteInPlace gpxe/src/Makefile --replace /usr/bin/perl $(type -P perl) ''; stripDebugList = "bin sbin share/syslinux/com32"; diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 41f9c1e3e996..8e303bee8214 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -9,14 +9,14 @@ assert stdenv.isLinux; stdenv.mkDerivation rec { - version = "233"; + version = "234"; name = "systemd-${version}"; src = fetchFromGitHub { owner = "nixos"; repo = "systemd"; - rev = "72782e7ad96f9da9b0e5873f87a64007068cee06"; - sha256 = "1cj20zrfr8g0vkxiv3h9bbd89xbj3mrsij3rjr1lbh4nkl5mcwpa"; + rev = "ba777535a890c2a2b7677dfacc63e12c578b9b3f"; + sha256 = "1vb45fbqkrgczfwkb0y07ldnwhjqk2sh446hzfkdn8hrwl1lifg5"; }; outputs = [ "out" "lib" "man" "dev" ]; @@ -32,7 +32,6 @@ stdenv.mkDerivation rec { autoreconfHook gettext docbook_xsl docbook_xml_dtd_42 docbook_xml_dtd_45 ]; - configureFlags = [ "--localstatedir=/var" "--sysconfdir=/etc" @@ -76,6 +75,8 @@ stdenv.mkDerivation rec { preConfigure = '' + unset RANLIB + ./autogen.sh # FIXME: patch this in systemd properly (and send upstream). @@ -99,8 +100,6 @@ stdenv.mkDerivation rec { --replace /usr/lib/systemd/catalog/ $out/lib/systemd/catalog/ configureFlagsArray+=("--with-ntp-servers=0.nixos.pool.ntp.org 1.nixos.pool.ntp.org 2.nixos.pool.ntp.org 3.nixos.pool.ntp.org") - - #export NIX_CFLAGS_LINK+=" -Wl,-rpath,$libudev/lib" ''; PYTHON_BINARY = "${coreutils}/bin/env python"; # don't want a build time dependency on Python @@ -166,16 +165,6 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - /* - # some libs fail to link to liblzma and/or libffi - postFixup = let extraLibs = stdenv.lib.makeLibraryPath [ xz.out libffi.out zlib.out ]; - in '' - for f in "$out"/lib/*.so.0.*; do - patchelf --set-rpath `patchelf --print-rpath "$f"`':${extraLibs}' "$f" - done - ''; - */ - # The interface version prevents NixOS from switching to an # incompatible systemd at runtime. (Switching across reboots is # fine, of course.) It should be increased whenever systemd changes diff --git a/pkgs/os-specific/linux/tcp-wrappers/default.nix b/pkgs/os-specific/linux/tcp-wrappers/default.nix index 526b1a86db1e..6a400f1de226 100644 --- a/pkgs/os-specific/linux/tcp-wrappers/default.nix +++ b/pkgs/os-specific/linux/tcp-wrappers/default.nix @@ -22,7 +22,7 @@ in stdenv.mkDerivation rec { patches="$(cat debian/patches/series | sed 's,^,debian/patches/,') $patches" ''; - makeFlags = [ "REAL_DAEMON_DIR=$(out)/bin" "linux" ]; + makeFlags = [ "STRINGS=" "REAL_DAEMON_DIR=$(out)/bin" "linux" ]; installPhase = '' mkdir -p "$out/bin" diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 45f1788bf63b..a47b43a1f0f3 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -12,6 +12,7 @@ with stdenv.lib; let buildKernel = any (n: n == configFile) [ "kernel" "all" ]; buildUser = any (n: n == configFile) [ "user" "all" ]; + in stdenv.mkDerivation rec { name = "zfs-${configFile}-${version}${optionalString buildKernel "-${kernel.version}"}"; version = "0.7.0"; @@ -44,7 +45,6 @@ in stdenv.mkDerivation rec { substituteInPlace ./module/zfs/zfs_ctldir.c --replace "mount -t zfs" "${utillinux}/bin/mount -t zfs" substituteInPlace ./lib/libzfs/libzfs_mount.c --replace "/bin/umount" "${utillinux}/bin/umount" substituteInPlace ./lib/libzfs/libzfs_mount.c --replace "/bin/mount" "${utillinux}/bin/mount" - substituteInPlace ./udev/rules.d/* --replace "/lib/udev/vdev_id" "$out/lib/udev/vdev_id" substituteInPlace ./cmd/ztest/ztest.c --replace "/usr/sbin/ztest" "$out/sbin/ztest" substituteInPlace ./cmd/ztest/ztest.c --replace "/usr/sbin/zdb" "$out/sbin/zdb" substituteInPlace ./config/user-systemd.m4 --replace "/usr/lib/modules-load.d" "$out/etc/modules-load.d" @@ -54,6 +54,12 @@ in stdenv.mkDerivation rec { substituteInPlace ./module/Makefile.in --replace "/bin/cp" "cp" substituteInPlace ./etc/systemd/system/zfs-share.service.in \ --replace "@bindir@/rm " "${coreutils}/bin/rm " + + for f in ./udev/rules.d/* + do + substituteInPlace "$f" --replace "/lib/udev/vdev_id" "$out/lib/udev/vdev_id" + done + ./autogen.sh ''; diff --git a/pkgs/servers/asterisk/default.nix b/pkgs/servers/asterisk/default.nix index e6102c84f134..8a25188d595f 100644 --- a/pkgs/servers/asterisk/default.nix +++ b/pkgs/servers/asterisk/default.nix @@ -97,8 +97,8 @@ in }; asterisk-stable = common { - version = "14.4.0"; - sha256 = "095slnhl74hs1c36rgg378azan9zwgryp8him7py4am60lbk3n3w"; + version = "14.6.0"; + sha256 = "1d3jjdapfv169d8yhfi92j75iwk9726brv1rjjy288d47jn3sm26"; externals = { "externals_cache/pjproject-2.6.tar.bz2" = pjproject-26; "addons/mp3" = mp3-202; diff --git a/pkgs/servers/caddy/default.nix b/pkgs/servers/caddy/default.nix index 77c836305147..e221c67a2c02 100644 --- a/pkgs/servers/caddy/default.nix +++ b/pkgs/servers/caddy/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "caddy-${version}"; - version = "0.10.4"; + version = "0.10.6"; goPackagePath = "github.com/mholt/caddy"; @@ -12,7 +12,7 @@ buildGoPackage rec { owner = "mholt"; repo = "caddy"; rev = "v${version}"; - sha256 = "0zch19a38487dflx84dlkwz67by9g4v2v8d7wrslqhs14a0sifhk"; + sha256 = "17k8518mx1l0q5bjlx0c6f249ibr9qdrcgwn3wpwhd244cbg44gn"; }; buildFlagsArray = '' diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix index 45abcff27767..4534ccbe099d 100644 --- a/pkgs/servers/dns/bind/default.nix +++ b/pkgs/servers/dns/bind/default.nix @@ -3,14 +3,14 @@ assert enableSeccomp -> libseccomp != null; -let version = "9.11.1-P2"; in +let version = "9.11.2"; in stdenv.mkDerivation rec { name = "bind-${version}"; src = fetchurl { url = "http://ftp.isc.org/isc/bind9/${version}/${name}.tar.gz"; - sha256 = "19gyh7yij6cpvk5b199ghhns5wmsz67d2rpgvl91dbkm2m1wclxz"; + sha256 = "0yn7wgi2y8mpmvbjbkl4va7p0xsnn48m4yjx6ynb1hzp423asikz"; }; outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ]; diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix index 568b0ee6c045..30f8fbef119d 100644 --- a/pkgs/servers/http/apache-httpd/2.4.nix +++ b/pkgs/servers/http/apache-httpd/2.4.nix @@ -16,12 +16,12 @@ assert ldapSupport -> aprutil.ldapSupport && openldap != null; assert http2Support -> nghttp2 != null; stdenv.mkDerivation rec { - version = "2.4.26"; + version = "2.4.27"; name = "apache-httpd-${version}"; src = fetchurl { url = "mirror://apache/httpd/httpd-${version}.tar.bz2"; - sha1 = "b10b0f569a0e5adfef61d8c7f0813d42046e399a"; + sha1 = "699e4e917e8fb5fd7d0ce7e009f8256ed02ec6fc"; }; # FIXME: -dev depends on -doc diff --git a/pkgs/servers/memcached/default.nix b/pkgs/servers/memcached/default.nix index 166c5cdbf522..fabd5b83724b 100644 --- a/pkgs/servers/memcached/default.nix +++ b/pkgs/servers/memcached/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, cyrus_sasl, libevent}: stdenv.mkDerivation rec { - name = "memcached-1.4.33"; + name = "memcached-1.4.39"; src = fetchurl { url = "http://memcached.org/files/${name}.tar.gz"; - sha256 = "07bpd6xdhzw6q2ga6xc075bw4jd44nxjl1vk4dqmd315d26nqwl3"; + sha256 = "0dfpmx0fqgp55j4vl06cz63fwx5kzhzipdm7n2kxjkvyg1ybzi13"; }; buildInputs = [cyrus_sasl libevent]; diff --git a/pkgs/servers/monitoring/sensu/Gemfile b/pkgs/servers/monitoring/sensu/Gemfile index ebee9f257219..3f570024febb 100644 --- a/pkgs/servers/monitoring/sensu/Gemfile +++ b/pkgs/servers/monitoring/sensu/Gemfile @@ -1,2 +1,13 @@ source 'https://rubygems.org' + gem 'sensu' + +# integration +gem 'sensu-plugins-influxdb' + +# checks +gem 'sensu-plugins-http' +gem 'sensu-plugins-disk-checks' +gem 'sensu-plugins-logs' +gem 'sensu-plugins-systemd' +# gem 'sensu-plugins-process-checks' diff --git a/pkgs/servers/monitoring/sensu/Gemfile.lock b/pkgs/servers/monitoring/sensu/Gemfile.lock index 0d01c2271458..9e47e697c3b6 100644 --- a/pkgs/servers/monitoring/sensu/Gemfile.lock +++ b/pkgs/servers/monitoring/sensu/Gemfile.lock @@ -5,17 +5,46 @@ GEM amqp (1.6.0) amq-protocol (>= 2.0.1) eventmachine + aws-sdk (2.10.19) + aws-sdk-resources (= 2.10.19) + aws-sdk-core (2.10.19) + aws-sigv4 (~> 1.0) + jmespath (~> 1.0) + aws-sdk-resources (2.10.19) + aws-sdk-core (= 2.10.19) + aws-sigv4 (1.0.1) + cause (0.1) childprocess (0.5.8) ffi (~> 1.0, >= 1.0.11) + dentaku (2.0.9) + domain_name (0.5.20170404) + unf (>= 0.0.5, < 1.0.0) em-http-server (0.1.8) eventmachine em-worker (0.0.2) eventmachine eventmachine (1.2.2) ffi (1.9.18) + http-cookie (1.0.3) + domain_name (~> 0.5) + influxdb (0.3.13) + cause + json + jmespath (1.3.1) + json (1.8.6) + jsonpath (0.5.8) + multi_json + mime-types (2.99.3) + mixlib-cli (1.7.0) + multi_json (1.12.1) + netrc (0.11.0) oj (2.18.1) parse-cron (0.1.4) - sensu (0.29.0) + rest-client (1.8.0) + http-cookie (>= 1.0.2, < 2.0) + mime-types (>= 1.16, < 3.0) + netrc (~> 0.7) + sensu (1.0.2) em-http-server (= 0.1.8) eventmachine (= 1.2.2) parse-cron (= 0.1.4) @@ -23,8 +52,8 @@ GEM sensu-extensions (= 1.9.0) sensu-json (= 2.1.0) sensu-logger (= 1.2.1) - sensu-redis (= 2.1.1) - sensu-settings (= 10.0.0) + sensu-redis (= 2.2.0) + sensu-settings (= 10.3.0) sensu-spawn (= 2.2.1) sensu-transport (= 7.0.2) sensu-extension (1.5.1) @@ -57,9 +86,28 @@ GEM sensu-logger (1.2.1) eventmachine sensu-json - sensu-redis (2.1.1) + sensu-plugin (1.4.5) + json (< 2.0.0) + mixlib-cli (>= 1.5.0) + sensu-plugins-disk-checks (2.4.0) + sensu-plugin (~> 1.2) + sys-filesystem (= 1.1.7) + sensu-plugins-http (2.5.0) + aws-sdk (~> 2.3) + rest-client (= 1.8.0) + sensu-plugin (~> 1.2) + sensu-plugins-influxdb (1.2.0) + dentaku (= 2.0.9) + influxdb (= 0.3.13) + jsonpath (= 0.5.8) + sensu-plugin (~> 1.3) + sensu-plugins-logs (1.2.0) + sensu-plugin (~> 1.2) + sensu-plugins-systemd (0.0.5) + sensu-plugin (~> 1.2) + sensu-redis (2.2.0) eventmachine - sensu-settings (10.0.0) + sensu-settings (10.3.0) parse-cron sensu-json (>= 1.1.0) sensu-spawn (2.2.1) @@ -71,12 +119,22 @@ GEM amqp (= 1.6.0) eventmachine sensu-redis (>= 1.0.0) + sys-filesystem (1.1.7) + ffi + unf (0.1.4) + unf_ext + unf_ext (0.0.7.4) PLATFORMS ruby DEPENDENCIES sensu + sensu-plugins-disk-checks + sensu-plugins-http + sensu-plugins-influxdb + sensu-plugins-logs + sensu-plugins-systemd BUNDLED WITH - 1.14.6 + 1.15.3 diff --git a/pkgs/servers/monitoring/sensu/gemset.nix b/pkgs/servers/monitoring/sensu/gemset.nix index 1df8d419cb63..36bef969c2ac 100644 --- a/pkgs/servers/monitoring/sensu/gemset.nix +++ b/pkgs/servers/monitoring/sensu/gemset.nix @@ -8,6 +8,7 @@ version = "2.0.1"; }; amqp = { + dependencies = ["amq-protocol" "eventmachine"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0kbrqnpjgj9v0722p3n5rw589l4g26ry8mcghwc5yr20ggkpdaz9"; @@ -15,7 +16,51 @@ }; version = "1.6.0"; }; + aws-sdk = { + dependencies = ["aws-sdk-resources"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "04fgpkhjjmwxppb7b0jbsc6zykkw7hpkncld8mm1zamajf653sf6"; + type = "gem"; + }; + version = "2.10.19"; + }; + aws-sdk-core = { + dependencies = ["aws-sigv4" "jmespath"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0f0qq7h4bpmlvcsl1bncxdyw63zanz6jdxch9i457irc5l6z8sm0"; + type = "gem"; + }; + version = "2.10.19"; + }; + aws-sdk-resources = { + dependencies = ["aws-sdk-core"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0c107vlh475jph5i2szchmcwlsimpvdbd2cc0m5p39jmw8prkysa"; + type = "gem"; + }; + version = "2.10.19"; + }; + aws-sigv4 = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0cxl0yvmyl8d0yj4cx3p75iki4fqk8ckb6ajfj7mr3g4ihp5mryp"; + type = "gem"; + }; + version = "1.0.1"; + }; + cause = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0digirxqlwdg79mkbn70yc7i9i1qnclm2wjbrc47kqv6236bpj00"; + type = "gem"; + }; + version = "0.1"; + }; childprocess = { + dependencies = ["ffi"]; source = { remotes = ["https://rubygems.org"]; sha256 = "1lv7axi1fhascm9njxh3lx1rbrnsm8wgvib0g7j26v4h1fcphqg0"; @@ -23,7 +68,25 @@ }; version = "0.5.8"; }; + dentaku = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "11z4cw4lspx3rgmmd2hd4l1iikk6p17icxwn7xym92v1j825zpnr"; + type = "gem"; + }; + version = "2.0.9"; + }; + domain_name = { + dependencies = ["unf"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "12hs8yijhak7p2hf1xkh98g0mnp5phq3mrrhywzaxpwz1gw5r3kf"; + type = "gem"; + }; + version = "0.5.20170404"; + }; em-http-server = { + dependencies = ["eventmachine"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0y8l4gymy9dzjjchjav90ck6has2i2zdjihlhcyrg3jgq6kjzyq5"; @@ -34,6 +97,7 @@ em-worker = { dependencies = ["eventmachine"]; source = { + remotes = ["https://rubygems.org"]; sha256 = "0z4jx9z2q5hxvdvik4yp0ahwfk69qsmdnyp72ln22p3qlkq2z5wk"; type = "gem"; }; @@ -55,6 +119,81 @@ }; version = "1.9.18"; }; + http-cookie = { + dependencies = ["domain_name"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "004cgs4xg5n6byjs7qld0xhsjq3n6ydfh897myr2mibvh6fjc49g"; + type = "gem"; + }; + version = "1.0.3"; + }; + influxdb = { + dependencies = ["cause" "json"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0jikl3iylbffsdmb4vr09ysqvpwxk133y6m9ylwcd0931ngsf0ks"; + type = "gem"; + }; + version = "0.3.13"; + }; + jmespath = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "07w8ipjg59qavijq59hl82zs74jf3jsp7vxl9q3a2d0wpv5akz3y"; + type = "gem"; + }; + version = "1.3.1"; + }; + json = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0qmj7fypgb9vag723w1a49qihxrcf5shzars106ynw2zk352gbv5"; + type = "gem"; + }; + version = "1.8.6"; + }; + jsonpath = { + dependencies = ["multi_json"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1gwhrd7xlysq537yy8ma69jc83lblwiccajl5zvyqpnwyjjc93df"; + type = "gem"; + }; + version = "0.5.8"; + }; + mime-types = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "03j98xr0qw2p2jkclpmk7pm29yvmmh0073d8d43ajmr0h3w7i5l9"; + type = "gem"; + }; + version = "2.99.3"; + }; + mixlib-cli = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0647msh7kp7lzyf6m72g6snpirvhimjm22qb8xgv9pdhbcrmcccp"; + type = "gem"; + }; + version = "1.7.0"; + }; + multi_json = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1wpc23ls6v2xbk3l1qncsbz16npvmw8p0b38l8czdzri18mp51xk"; + type = "gem"; + }; + version = "1.12.1"; + }; + netrc = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0gzfmcywp1da8nzfqsql2zqi648mfnx6qwkig3cv36n9m0yy676y"; + type = "gem"; + }; + version = "0.11.0"; + }; oj = { source = { remotes = ["https://rubygems.org"]; @@ -71,15 +210,26 @@ }; version = "0.1.4"; }; + rest-client = { + dependencies = ["http-cookie" "mime-types" "netrc"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1m8z0c4yf6w47iqz6j2p7x1ip4qnnzvhdph9d5fgx081cvjly3p7"; + type = "gem"; + }; + version = "1.8.0"; + }; sensu = { + dependencies = ["em-http-server" "eventmachine" "parse-cron" "sensu-extension" "sensu-extensions" "sensu-json" "sensu-logger" "sensu-redis" "sensu-settings" "sensu-spawn" "sensu-transport"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0931qccqhwmvqf4jj3jwip25xwkg7rf1yxxpkdhiyi2yndyfb8x7"; + sha256 = "1vk9bvxwh6ah8xkncf16f8r0bq84cnnx16ffc4k6sq73v8wpk116"; type = "gem"; }; - version = "0.29.0"; + version = "1.0.2"; }; sensu-extension = { + dependencies = ["eventmachine"]; source = { remotes = ["https://rubygems.org"]; sha256 = "1lgmjxfbq11v4yi3qanf1qxv0sgm1a8a7wj7qyn1nkva6zmimss3"; @@ -88,6 +238,7 @@ version = "1.5.1"; }; sensu-extensions = { + dependencies = ["sensu-extension" "sensu-extensions-check-dependencies" "sensu-extensions-debug" "sensu-extensions-json" "sensu-extensions-occurrences" "sensu-extensions-only-check-output" "sensu-extensions-ruby-hash" "sensu-json" "sensu-logger" "sensu-settings"]; source = { remotes = ["https://rubygems.org"]; sha256 = "1r09mdbbnh5cg9yvqw78sxbhlb8xqld1vwbr4hsjw6k3x1xpnnr9"; @@ -96,6 +247,7 @@ version = "1.9.0"; }; sensu-extensions-check-dependencies = { + dependencies = ["sensu-extension"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0clgvf2abvwz549f28ny3zd6q7z6y7m49i8pp91ll10jp1vsy4b2"; @@ -104,6 +256,7 @@ version = "1.0.1"; }; sensu-extensions-debug = { + dependencies = ["sensu-extension"]; source = { remotes = ["https://rubygems.org"]; sha256 = "11abdgn2kkkbvxq4692yg6a27qnxz4349gfiq7d35biy7vrw34lp"; @@ -112,6 +265,7 @@ version = "1.0.0"; }; sensu-extensions-json = { + dependencies = ["sensu-extension"]; source = { remotes = ["https://rubygems.org"]; sha256 = "1wnbn9sycdqdh9m0fhszaqkv0jijs3fkdbvcv8kdspx6irbv3m6g"; @@ -120,6 +274,7 @@ version = "1.0.0"; }; sensu-extensions-occurrences = { + dependencies = ["sensu-extension"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0lx5wsbblfs0rvkxfg09bsz0g2mwmckrhga7idnarsnm8m565v1v"; @@ -128,6 +283,7 @@ version = "1.2.0"; }; sensu-extensions-only-check-output = { + dependencies = ["sensu-extension"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0ds2i8wd4ji9ifig2zzr4jpxinvk5dm7j10pvaqy4snykxa3rqh3"; @@ -136,6 +292,7 @@ version = "1.0.0"; }; sensu-extensions-ruby-hash = { + dependencies = ["sensu-extension"]; source = { remotes = ["https://rubygems.org"]; sha256 = "1xyrj3gbmslbivcd5qcmyclgapn7qf7f5jwfvfpw53bxzib0h7s3"; @@ -144,6 +301,7 @@ version = "1.0.0"; }; sensu-json = { + dependencies = ["oj"]; source = { remotes = ["https://rubygems.org"]; sha256 = "02qkh86jddv7gha39vjx6g9hi7vkq7r433dr86bwmm9c7lqkgyl9"; @@ -152,6 +310,7 @@ version = "2.1.0"; }; sensu-logger = { + dependencies = ["eventmachine" "sensu-json"]; source = { remotes = ["https://rubygems.org"]; sha256 = "03kicjqz8a594bxnwyg6bcd4fipy2vxjl1gbaip4gpixxki32dx0"; @@ -159,23 +318,80 @@ }; version = "1.2.1"; }; + sensu-plugin = { + dependencies = ["json" "mixlib-cli"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0z18zk04l9klbjmqvjg6cpv3k4w5hi1by8wnpkiwdwa2jdv61jyb"; + type = "gem"; + }; + version = "1.4.5"; + }; + sensu-plugins-disk-checks = { + dependencies = ["sensu-plugin" "sys-filesystem"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1r7kzqp0kwhz7kk0s25r7lh2sw4yr99m5lr8cb99kq73fnsjqipq"; + type = "gem"; + }; + version = "2.4.0"; + }; + sensu-plugins-http = { + dependencies = ["aws-sdk" "rest-client" "sensu-plugin"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "13126hx2fgjsrfqnlh2hf2czn35pi8rkc5ql9yxf4y8x9a7dyksj"; + type = "gem"; + }; + version = "2.5.0"; + }; + sensu-plugins-influxdb = { + dependencies = ["dentaku" "influxdb" "jsonpath" "sensu-plugin"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "18nk7c451df46xcjk97r3h8yhaj8bz138ih5y0z26sdiha58brv7"; + type = "gem"; + }; + version = "1.2.0"; + }; + sensu-plugins-logs = { + dependencies = ["sensu-plugin"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0ycrf3967v5kavm58fj9db16l9wgyzac4h3r0f9hm32jy9qsxwq6"; + type = "gem"; + }; + version = "1.2.0"; + }; + sensu-plugins-systemd = { + dependencies = ["sensu-plugin"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1r7prvkf33j6qvvqq78186rn5g6wf0g3dqni34vnj8v1z287wkfh"; + type = "gem"; + }; + version = "0.0.5"; + }; sensu-redis = { + dependencies = ["eventmachine"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1nqk2046g6nldpiqy40f805gms8r856v2zxm53j0c8ni03sgz2a3"; + sha256 = "1drmychc04fg2gs7zsxx6aidfyxf7cn7k8k1jy7dnfbnlr5aln3n"; type = "gem"; }; - version = "2.1.1"; + version = "2.2.0"; }; sensu-settings = { + dependencies = ["parse-cron" "sensu-json"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0fb3wgqll5cq5akgmqhx6vgjvmcpcjyx68qqs8hb106b07gdpmli"; + sha256 = "0y55bqvps06gk94zllamqr0fa5bc27q0k1b5sp5gxh1bkf4w8gb3"; type = "gem"; }; - version = "10.0.0"; + version = "10.3.0"; }; sensu-spawn = { + dependencies = ["childprocess" "em-worker" "eventmachine"]; source = { remotes = ["https://rubygems.org"]; sha256 = "1vz5kbqk3ld0s16zjl8m38l1m1xwcvjlfc1g4nfm45qxdyfn7la7"; @@ -184,6 +400,7 @@ version = "2.2.1"; }; sensu-transport = { + dependencies = ["amq-protocol" "amqp" "eventmachine" "sensu-redis"]; source = { remotes = ["https://rubygems.org"]; sha256 = "15yib92hwyd8v04wcc0kaw0p8w2c2mwvi4ldya2jh3dqgs31mvhr"; @@ -191,4 +408,30 @@ }; version = "7.0.2"; }; + sys-filesystem = { + dependencies = ["ffi"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "10didky52nfapmybj6ipda18i8fcwf8bs9bbfbk5i7v1shzd36rf"; + type = "gem"; + }; + version = "1.1.7"; + }; + unf = { + dependencies = ["unf_ext"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0bh2cf73i2ffh4fcpdn9ir4mhq8zi50ik0zqa1braahzadx536a9"; + type = "gem"; + }; + version = "0.1.4"; + }; + unf_ext = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "14hr2dzqh33kqc0xchs8l05pf3kjcayvad4z1ip5rdjxrkfk8glb"; + type = "gem"; + }; + version = "0.0.7.4"; + }; } \ No newline at end of file diff --git a/pkgs/servers/monitoring/uchiwa/bower-packages.nix b/pkgs/servers/monitoring/uchiwa/bower-packages.nix index 80e73d632357..8a4e0e571b18 100644 --- a/pkgs/servers/monitoring/uchiwa/bower-packages.nix +++ b/pkgs/servers/monitoring/uchiwa/bower-packages.nix @@ -1,23 +1,25 @@ # Generated by bower2nix v3.1.1 (https://github.com/rvl/bower2nix) { fetchbower, buildEnv }: buildEnv { name = "bower-env"; ignoreCollisions = true; paths = [ - (fetchbower "uchiwa-web" "0.22.1" "0.22.1" "09rhssb5bpwdahdl2fxkjmax8cqg2m51bbf0m3lhkcrcjfc2w8kj") - (fetchbower "angular" "1.4.14" "~1.4" "1j5d80bxqh9lgcbmd661bsk8xrhnf43ym77jsk9n845gqr02bdkl") + (fetchbower "uchiwa-web" "0.25.3" "0.25.3" "065qyrm1vyi8fp5d5b0b8q5nk8gwh0kcrckl2q1d30c6zlqshg0v") + (fetchbower "angular" "1.6.5" "~1.6.3" "0iy7crwr2akh6pmfslbnsrw8m91rffqjibjmzza78xmpk1f4hs73") (fetchbower "angular-bootstrap" "2.2.0" "~2.2.0" "0zbimxmrmgbz60xg5rnkhv4gd0zvp5fdjdx5407r6a942irfy2x7") - (fetchbower "angular-cookies" "1.4.14" "~1.4" "10z9azpd228jwdn8p767a93xhb5nrypwa0j6491kbcvm2q1k0g6a") - (fetchbower "angular-gravatar" "0.3.2" "~0.3.1" "17d2sc828dsnlkjc4b9irandpimqwan8hlvk9wlmlv8yiyi685p6") - (fetchbower "angular-mass-autocomplete-uchiwa" "0.4.1" "0.4.1" "1h2ypg35f6nd6gy6yznpiadql13lk1gyccq6qd4mvksbyb5va6l5") - (fetchbower "angular-moment" "0.9.2" "~0.9.0" "143vivplxqd03vg23ynad2yrlgn6dmad7avjmzh0ina2qx7zslgf") - (fetchbower "angular-resource" "1.4.14" "~1.4" "1ll2qd0kn39fl5aa49894n1bfcl8dgrfk0w154rkhg7k732q18bk") - (fetchbower "angular-route" "1.4.14" "~1.4" "0wfdgvvldgzf7c4lba3x8mw38l9zwkm0i9fg8ad7pvjkqz133sqs") - (fetchbower "angular-sanitize" "1.4.14" "~1.4" "072b8dcxjp4cjvcjqxsd0bxa8xd2nqvjb1v878qgfkhf0wz44x32") + (fetchbower "angular-cookies" "1.6.5" "~1.6.3" "135yipc576gl9svsk30q62mbf70yp9hy0mbsmvx4jrl9kais495p") + (fetchbower "angular-gravatar" "0.4.2" "~0.4.2" "19q40hsjhwz8y3phmyrrg27f20qpaknvw44cfx4gliin2zqwwsfk") + (fetchbower "angular-moment" "1.0.1" "~1.0.1" "1ydnilyf6nysxxjir51lhn92k7mjqii5277xxdqnpcvc376la244") + (fetchbower "angular-resource" "1.6.5" "~1.6.3" "02jiqnkn14kn69ybb74ajhaxxwh71fh5b1g67fajhirkiimpnmxy") + (fetchbower "angular-route" "1.6.5" "~1.6.3" "1n1q9a9khvqjas0jb277pzk44zjziblrflvh6w0s6im3ljcb6a7g") + (fetchbower "angular-sanitize" "1.6.5" "~1.6.3" "0jj56xwrlyslr3pi94xnbz7xy5g7pwg47p2pnbwhr1a1piwfzh87") (fetchbower "angular-toastr" "1.6.0" "1.6.0" "1yksx3a4c3cva5liq087z4j196p0vxp1mzhbr27qr9wmyy6z84z1") + (fetchbower "angular-tools/ng-jsoneditor" "ea138469f157d8f2b54ec5b8dcf4b08a55b61459" "ea138469f157d8f2b54ec5b8dcf4b08a55b61459" "1rr7xf3a2l15g2nmd9svq8ijy1v0igc5jdpwp21kna1kzc65jg3m") (fetchbower "angular-ua-parser" "0.0.2" "0.0.2" "0z24747b0sywjyzl5chcwr96mpmyr595bry63c4d35mp186ail5z") (fetchbower "bootstrap" "3.1.1" "3.1.1" "036xbjpv4621p5r2l9vfm9zys6h1mhkvb0zhvk3irrmkzsl77hwh") (fetchbower "bootstrap-sass-official" "3.1.1" "3.1.1" "0rfmja15p8kxz6i3liwyqrmbm82azq61d3882w2vmp08vvv2c371") (fetchbower "fontawesome" "4.4.0" "~4.4.0" "1mbs0vhixvg11vj3n0l3jn3pb6s839rcs416zq2wzfqkbvsc3sf5") (fetchbower "highlightjs" "9.1.0" "~9.1.0" "1gz4q922sylbbqw1sawmjjq8nw0mk90wq0qq95ap0f31px7bfm3f") - (fetchbower "moment" "2.8.4" "~2.8.3" "1h30g5an2m9dja09m1s93hsfb25pzl0iah8mmab7nispl3mb585z") - (fetchbower "ua-parser-js" "0.7.12" "~0.7.12" "1hrhi7cdf5zd86jz7ipbb23qvkfplghfa92wa3aysca1rpg5zgpd") - (fetchbower "jquery" "3.1.1" ">= 1.9.0" "0rkp1hakimnjh3rvlzi30w7qx9x1j0gzjpaajgljn79kd082sgpd") + (fetchbower "moment" "2.16.0" "~2.16.0" "0g6zd465rnm3dhsank1iq9b5s4clc58lh3wrpg5sf8dd5zjlr2k2") + (fetchbower "moment-picker" "0.9.11" "~0.9.7" "0lw31180v0yjlcah17kpgklcllz78bnrdiyvwhw14151xcyds4jm") + (fetchbower "ua-parser-js" "0.7.14" "~0.7.12" "0z27b811xj09fh0gm72ah8425609gbj87jda3xap5l91alrwixz1") + (fetchbower "jsoneditor" "5.5.11" "~5.5.10" "05rcd98z6wc2x5kiaq9dfbvynbkwbrbrcgivcs8bv66d1k747ph8") + (fetchbower "jquery" "3.2.1" ">= 1.9.0" "1h14hjhi3ydnl66wmr8w72syyfcvbz47g7bprz7cqw5qxf2n7sah") ]; } diff --git a/pkgs/servers/monitoring/uchiwa/bower.json b/pkgs/servers/monitoring/uchiwa/bower.json deleted file mode 100644 index 1eb94f73e6b8..000000000000 --- a/pkgs/servers/monitoring/uchiwa/bower.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "name": "uchiwa", - "dependencies": { - "uchiwa-web": "0.21.0" - } -} diff --git a/pkgs/servers/monitoring/uchiwa/src.nix b/pkgs/servers/monitoring/uchiwa/src.nix index 68aaa4a5249b..c0ddf9cb7a4a 100644 --- a/pkgs/servers/monitoring/uchiwa/src.nix +++ b/pkgs/servers/monitoring/uchiwa/src.nix @@ -1,4 +1,4 @@ { - version = "0.22.1"; - sha256 = "15wa7zhchis2rh6jcqkindlidmbf3mryr3apnqnr27ydi2vlqn3g"; + version = "0.25.3-1"; + sha256 = "1sgr9fpjfx7qn7dbiaxhsw7iagcrqi39bjc0ba1lh1db5jh7ymks"; } diff --git a/pkgs/servers/monitoring/uchiwa/update.sh b/pkgs/servers/monitoring/uchiwa/update.sh index 2802037a4f52..33e3dacdda5d 100755 --- a/pkgs/servers/monitoring/uchiwa/update.sh +++ b/pkgs/servers/monitoring/uchiwa/update.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p nodePackages.bower2nix curl.bin git.out jq.out +#!nix-shell -i bash -p curl.bin git.out jq.out nodePackages.bower2nix set -euo pipefail IFS=$'\n\t' @@ -7,25 +7,36 @@ IFS=$'\n\t' # set -x REPO=sensu/uchiwa +SHA="1111111111111111111111111111111111111111111111111111" -VERSION=$(curl https://api.github.com/repos/${REPO}/tags -s | jq '.[0]' -r | jq .name -r) +write_src() { + cat <<_EOF > src.nix +{ + version = "${VERSION}"; + sha256 = "${SHA}"; +} +_EOF +} + +t=$(mktemp -d) -t=$(mktemp) +LATEST_VERSION=$(curl https://api.github.com/repos/${REPO}/tags -s | jq '.[0]' -r | jq .name -r) +echo "Latest version: ${LATEST_VERSION}" +VERSION=${1:-${LATEST_VERSION}} echo "Updating to: ${VERSION}" -curl https://raw.githubusercontent.com/${REPO}/${VERSION}/bower.json -s > $t -bower2nix $t bower-packages.nix +write_src + +curl https://raw.githubusercontent.com/${REPO}/${VERSION}/bower.json -s > $t/bower.json +bower2nix $t/bower.json $t/bower-packages.nix +mv $t/bower-packages.nix . +# sed -i 's@/@-@g' bower-packages.nix pushd $(git rev-parse --show-toplevel) -sha=$(nix-prefetch-url -A uchiwa.src) +SHA=$(nix-prefetch-url -A uchiwa.src) popd -cat <<_EOF > src.nix -{ - version = "${VERSION}"; - sha256 = "${sha}"; -} -_EOF +write_src -rm $t +rm -r $t diff --git a/pkgs/servers/radarr/default.nix b/pkgs/servers/radarr/default.nix index 23969dc2a23d..088eef0830b9 100644 --- a/pkgs/servers/radarr/default.nix +++ b/pkgs/servers/radarr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, mono, libmediainfo, sqlite, makeWrapper }: +{ stdenv, fetchurl, mono, libmediainfo, sqlite, curl, makeWrapper }: stdenv.mkDerivation rec { name = "radarr-${version}"; @@ -17,8 +17,8 @@ stdenv.mkDerivation rec { makeWrapper "${mono}/bin/mono" $out/bin/Radarr \ --add-flags "$out/share/${name}/Radarr.exe" \ - --prefix LD_LIBRARY_PATH ':' "${sqlite.out}/lib" \ - --prefix LD_LIBRARY_PATH ':' "${libmediainfo}/lib" + --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ + curl sqlite libmediainfo ]} ''; meta = with stdenv.lib; { diff --git a/pkgs/servers/shairport-sync/default.nix b/pkgs/servers/shairport-sync/default.nix index 2ee5683a2ca2..79f2012c7a9f 100644 --- a/pkgs/servers/shairport-sync/default.nix +++ b/pkgs/servers/shairport-sync/default.nix @@ -2,23 +2,23 @@ , libdaemon, popt, pkgconfig, libconfig, libpulseaudio, soxr }: stdenv.mkDerivation rec { - version = "2.3.6.5"; + version = "3.0.2"; name = "shairport-sync-${version}"; src = fetchFromGitHub { - sha256 = "1337y62pnch27s2gr47miip3na1am24xprlc5a27lbr764nr85s3"; + sha256 = "1lpfl591lhk66a5jfp86j669iswjzj503x02hg9h3211vxv3h9pa"; rev = version; repo = "shairport-sync"; owner = "mikebrady"; }; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ - autoreconfHook openssl avahi alsaLib libdaemon - pkgconfig popt libconfig libpulseaudio @@ -37,6 +37,7 @@ stdenv.mkDerivation rec { inherit (src.meta) homepage; description = "Airtunes server and emulator with multi-room capabilities"; license = licenses.mit; + maintainers = with maintainers; [ lnl7 ]; platforms = platforms.unix; }; } diff --git a/pkgs/servers/sonarr/default.nix b/pkgs/servers/sonarr/default.nix index bd921df6e528..3c096a0d52e8 100644 --- a/pkgs/servers/sonarr/default.nix +++ b/pkgs/servers/sonarr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, mono, libmediainfo, sqlite, makeWrapper, ... }: +{ stdenv, fetchurl, mono, libmediainfo, sqlite, curl, makeWrapper, ... }: stdenv.mkDerivation rec { name = "sonarr-${version}"; @@ -19,8 +19,8 @@ stdenv.mkDerivation rec { makeWrapper "${mono}/bin/mono" $out/bin/NzbDrone \ --add-flags "$out/bin/NzbDrone.exe" \ - --prefix LD_LIBRARY_PATH ':' "${sqlite.out}/lib" \ - --prefix LD_LIBRARY_PATH ':' "${libmediainfo}/lib" + --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ + curl sqlite libmediainfo ]} ''; meta = { diff --git a/pkgs/servers/sql/mysql/5.5.x.nix b/pkgs/servers/sql/mysql/5.5.x.nix index 820c3fc96050..6a85d956a0c2 100644 --- a/pkgs/servers/sql/mysql/5.5.x.nix +++ b/pkgs/servers/sql/mysql/5.5.x.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "mysql-${version}"; - version = "5.5.54"; + version = "5.5.57"; src = fetchurl { url = "mirror://mysql/MySQL-5.5/${name}.tar.gz"; - sha256 = "1f0sg72vbhavj1cbay0gyyrrw0mjcf2k0nf30zmn2h68ik7wnfr7"; + sha256 = "113kynpfj45fffr62xack2657pds8mkhsgg77zj94ksj3qrbvhn1"; }; patches = if stdenv.isCygwin then [ diff --git a/pkgs/servers/sql/mysql/5.7.x.nix b/pkgs/servers/sql/mysql/5.7.x.nix index be4ab80f7052..5598a7926338 100644 --- a/pkgs/servers/sql/mysql/5.7.x.nix +++ b/pkgs/servers/sql/mysql/5.7.x.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "mysql-${version}"; - version = "5.7.17"; + version = "5.7.19"; src = fetchurl { url = "mirror://mysql/MySQL-5.7/${name}.tar.gz"; - sha256 = "0lcn9cm36n14g22bcppq5vf4nxbrl3khvlsp9hsixqdfb3l27gyf"; + sha256 = "1c8y54yk756179nx4dgg79dijmjdq5n8l057cnqsg70pjdpyfl9y"; }; preConfigure = stdenv.lib.optional stdenv.isDarwin '' diff --git a/pkgs/servers/unifi/default.nix b/pkgs/servers/unifi/default.nix index 7237bbdcd968..ec3b255116b3 100644 --- a/pkgs/servers/unifi/default.nix +++ b/pkgs/servers/unifi/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { name = "unifi-controller-${version}"; - version = "5.5.19"; + version = "5.5.20"; src = fetchurl { url = "https://www.ubnt.com/downloads/unifi/${version}/unifi_sysvinit_all.deb"; - sha256 = "0bsfq48xjp230ir8pm9wpa5p4dh88zfy51lbi2xwpr454371ixcl"; + sha256 = "14v38x46vgwm3wg28lzv4sz6kjgp6r1xkwxnxn6pzq2r7v6xkaz0"; }; buildInputs = [ dpkg ]; diff --git a/pkgs/servers/web-apps/searx/default.nix b/pkgs/servers/web-apps/searx/default.nix new file mode 100644 index 000000000000..551f3a015a17 --- /dev/null +++ b/pkgs/servers/web-apps/searx/default.nix @@ -0,0 +1,34 @@ +{ stdenv, pythonPackages, fetchFromGitHub }: + +pythonPackages.buildPythonApplication rec { + name = "searx-${version}"; + version = "0.12.0"; + + src = fetchFromGitHub { + owner = "asciimoo"; + repo = "searx"; + rev = "v${version}"; + sha256 = "196lk8dpv8fsjgmwlqik6j6rabvfid41fir6lzqy03hv7ydcw1k0"; + }; + + postPatch = '' + substituteInPlace requirements.txt \ + --replace 'certifi==2017.1.23' 'certifi' \ + --replace 'lxml==3.7.3' 'lxml' \ + --replace 'pyopenssl==16.2.0' 'pyopenssl' \ + --replace 'pygments==2.1.3' 'pygments>=2.1,<3.0' + ''; + + propagatedBuildInputs = with pythonPackages; [ + pyyaml lxml grequests flaskbabel flask requests + gevent speaklater Babel pytz dateutil pygments + pyasn1 pyasn1-modules ndg-httpsclient certifi pysocks + ]; + + meta = with stdenv.lib; { + homepage = https://github.com/asciimoo/searx; + description = "A privacy-respecting, hackable metasearch engine"; + license = licenses.agpl3Plus; + maintainers = with maintainers; [ matejc fpletz profpatsch ]; + }; + } diff --git a/pkgs/servers/x11/xorg/builder.sh b/pkgs/servers/x11/xorg/builder.sh index 055886374df4..fae8bf5a8ce5 100644 --- a/pkgs/servers/x11/xorg/builder.sh +++ b/pkgs/servers/x11/xorg/builder.sh @@ -18,14 +18,14 @@ postInstall() { for r in $requires; do if test -n "$crossConfig"; then - for p in $crossPkgs; do + for p in "${crossPkgs[@]}"; do if test -e $p/lib/pkgconfig/$r.pc; then echo " found requisite $r in $p" propagatedBuildInputs="$propagatedBuildInputs $p" fi done else - for p in $nativePkgs; do + for p in "${nativePkgs[@]}"; do if test -e $p/lib/pkgconfig/$r.pc; then echo " found requisite $r in $p" propagatedNativeBuildInputs="$propagatedNativeBuildInputs $p" diff --git a/pkgs/shells/zsh-completions/default.nix b/pkgs/shells/zsh-completions/default.nix index a1f708227250..d2096ef811d7 100644 --- a/pkgs/shells/zsh-completions/default.nix +++ b/pkgs/shells/zsh-completions/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "zsh-completions-${version}"; - version = "0.25.0"; + version = "0.26.0"; src = fetchFromGitHub { owner = "zsh-users"; repo = "zsh-completions"; rev = "${version}"; - sha256 = "0hc56y0fvshzs05acbzxf4q37vqsk4q3zp4c7smh175v56wigy94"; + sha256 = "16yhwf42a11v8bhnfb7nda0svxmglzph3c0cknvf8p5m6mkqj9s2"; }; installPhase= '' diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix index 5848ee87b1b0..ac382927b1b9 100644 --- a/pkgs/stdenv/adapters.nix +++ b/pkgs/stdenv/adapters.nix @@ -73,15 +73,8 @@ rec { }; in stdenv // { mkDerivation = - { name ? "", buildInputs ? [], nativeBuildInputs ? [] + { buildInputs ? [], nativeBuildInputs ? [] , propagatedBuildInputs ? [], propagatedNativeBuildInputs ? [] - , # Disabling the tests by default when cross compiling, as usually the - # tests rely on being able to run produced binaries. - doCheck ? false - , configureFlags ? [] - , # Target is not included by default because most programs don't care. - # Including it then would cause needless massive rebuilds. - configurePlatforms ? args.crossAttrs.configurePlatforms or [ "build" "host" ] , selfNativeBuildInput ? args.crossAttrs.selfNativeBuildInput or false , ... } @ args: @@ -106,7 +99,6 @@ rec { nativeInputsFromBuildInputs = stdenv.lib.filter hostAsNativeDrv buildInputsNotNull; in stdenv.mkDerivation (args // { - name = name + "-" + hostPlatform.config; nativeBuildInputs = nativeBuildInputs ++ nativeInputsFromBuildInputs ++ stdenv.lib.optional selfNativeBuildInput nativeDrv @@ -116,15 +108,6 @@ rec { ++ stdenv.lib.optional (hostPlatform.config == "aarch64-linux-gnu") pkgs.updateAutotoolsGnuConfigScriptsHook ; - inherit doCheck; - - # This parameter is sometimes a string and sometimes a list, yuck - configureFlags = let inherit (stdenv.lib) optional elem; in - (if stdenv.lib.isString configureFlags then [configureFlags] else configureFlags) - ++ optional (elem "build" configurePlatforms) "--build=${buildPlatform.config}" - ++ optional (elem "host" configurePlatforms) "--host=${hostPlatform.config}" - ++ optional (elem "target" configurePlatforms) "--target=${targetPlatform.config}"; - # Cross-linking dynamic libraries, every buildInput should # be propagated because ld needs the -rpath-link to find # any library needed to link the program dynamically at diff --git a/pkgs/stdenv/darwin/darwin-secure-format.patch b/pkgs/stdenv/darwin/darwin-secure-format.patch new file mode 100644 index 000000000000..b14d8be6ef16 --- /dev/null +++ b/pkgs/stdenv/darwin/darwin-secure-format.patch @@ -0,0 +1,15 @@ +With format string strictness, High Sierra also enforces that %n isn't used +in dynamic format strings, but we should just disable its use on darwin in +general. + +--- a/lib/vasnprintf.c 2017-06-22 15:19:15.000000000 -0700 ++++ b/lib/vasnprintf.c 2017-06-22 15:20:20.000000000 -0700 +@@ -4869,7 +4869,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t * + #endif + *fbp = dp->conversion; + #if USE_SNPRINTF +-# if !(((__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)) && !defined __UCLIBC__) || ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__)) ++# if !defined(__APPLE__) && !(((__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)) && !defined __UCLIBC__) || ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__)) + fbp[1] = '%'; + fbp[2] = 'n'; + fbp[3] = '\0'; diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index f6d9bcac5104..cac33a1bebb2 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -4,15 +4,15 @@ # Allow passing in bootstrap files directly so we can test the stdenv bootstrap process when changing the bootstrap tools , bootstrapFiles ? let fetch = { file, sha256, executable ? true }: import <nix/fetchurl.nix> { - url = "http://tarballs.nixos.org/stdenv-darwin/x86_64/c4effbe806be9a0a3727fdbbc9a5e28149347532/${file}"; + url = "http://tarballs.nixos.org/stdenv-darwin/x86_64/10cbca5b30c6cb421ce15139f32ae3a4977292cf/${file}"; inherit (localSystem) system; inherit sha256 executable; }; in { - sh = fetch { file = "sh"; sha256 = "1b9r3dksj907bpxp589yhc4217cas73vni8sng4r57f04ydjcinr"; }; - bzip2 = fetch { file = "bzip2"; sha256 = "1wm28jgap4cbr8hf4ambg6h9flr2b4mcbh7fw20i0l51v6n8igky"; }; - mkdir = fetch { file = "mkdir"; sha256 = "0jc32mzx2whhx2xh70grvvgz4jj26118p9yxmhjqcysagc0k7y66"; }; - cpio = fetch { file = "cpio"; sha256 = "0x5dcczkzn0g8yb4pah449jmgy3nmpzrqy4s480grcx05b6v6hkp"; }; - tarball = fetch { file = "bootstrap-tools.cpio.bz2"; sha256 = "0ifdc8bwxdhmpbhx2vd3lwjg71gqm6pi5mfm0fkcsbqavl8hd8hz"; executable = false; }; + sh = fetch { file = "sh"; sha256 = "0s8a9vpzj6vadq4jmf4r8cargwnsf327hdjydxgqsfxb8y1q39w3"; }; + bzip2 = fetch { file = "bzip2"; sha256 = "1jqljpjr8mkiv7g5rl5impqx3all8vn1mxxdwa004pr3h48c1zgg"; }; + mkdir = fetch { file = "mkdir"; sha256 = "17zsjiwnq07i5r85q1hg7f6cnkcgllwy2amz9klaqwjy4vzz4vwh"; }; + cpio = fetch { file = "cpio"; sha256 = "04hrair58dgja6syh442pswiga5an9nl58ls57yknkn2pq51nx9m"; }; + tarball = fetch { file = "bootstrap-tools.cpio.bz2"; sha256 = "103833hrci0vwi1gi978hkp69rncicvpdszn87ffpf1cq0jzpa14"; executable = false; }; } }: @@ -50,6 +50,8 @@ in rec { args = [ ./unpack-bootstrap-tools.sh ]; inherit (bootstrapFiles) mkdir bzip2 cpio tarball; + reexportedLibrariesFile = + ../../os-specific/darwin/apple-source-releases/Libsystem/reexported_libraries; __sandboxProfile = binShClosure + libSystemProfile; }; @@ -109,7 +111,13 @@ in rec { stdenvSandboxProfile = binShClosure + libSystemProfile; extraSandboxProfile = binShClosure + libSystemProfile; - extraAttrs = { inherit platform; parent = last; }; + extraAttrs = { + inherit platform; + parent = last; + + # This is used all over the place so I figured I'd just leave it here for now + secure-format-patch = ./darwin-secure-format.patch; + }; overrides = self: super: (overrides self super) // { fetchurl = thisStdenv.fetchurlBoot; }; }; @@ -319,6 +327,9 @@ in rec { inherit platform bootstrapTools; libc = pkgs.darwin.Libsystem; shellPackage = pkgs.bash; + + # This is used all over the place so I figured I'd just leave it here for now + secure-format-patch = ./darwin-secure-format.patch; }; allowedRequisites = (with pkgs; [ diff --git a/pkgs/stdenv/darwin/unpack-bootstrap-tools.sh b/pkgs/stdenv/darwin/unpack-bootstrap-tools.sh index 66c4e9ebeda9..0da80ec5ce56 100644 --- a/pkgs/stdenv/darwin/unpack-bootstrap-tools.sh +++ b/pkgs/stdenv/darwin/unpack-bootstrap-tools.sh @@ -26,7 +26,7 @@ install_name_tool \ $out/lib/system/libsystem_kernel.dylib # TODO: this logic basically duplicates similar logic in the Libsystem expression. Deduplicate them! -libs=$(otool -arch x86_64 -L /usr/lib/libSystem.dylib | tail -n +3 | awk '{ print $1 }') +libs=$(cat $reexportedLibrariesFile | grep -v '^#') for i in $libs; do if [ "$i" != "/usr/lib/system/libsystem_kernel.dylib" ] && [ "$i" != "/usr/lib/system/libsystem_c.dylib" ]; then diff --git a/pkgs/stdenv/generic/builder.sh b/pkgs/stdenv/generic/builder.sh index a46c46c2db50..42e1a029e584 100644 --- a/pkgs/stdenv/generic/builder.sh +++ b/pkgs/stdenv/generic/builder.sh @@ -15,4 +15,6 @@ cat "$setup" >> $out/setup # Allow the user to install stdenv using nix-env and get the packages # in stdenv. mkdir $out/nix-support -echo $propagatedUserEnvPkgs > $out/nix-support/propagated-user-env-packages +if [ "$propagatedUserEnvPkgs" ]; then + printf '%s ' $propagatedUserEnvPkgs > $out/nix-support/propagated-user-env-packages +fi diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index 05221e2f3c10..be271daf8c8e 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -12,12 +12,22 @@ rec { # * https://nixos.org/nix/manual/#ssec-derivation # Explanation about derivations in general mkDerivation = - { nativeBuildInputs ? [] + { name ? "" + + , nativeBuildInputs ? [] , buildInputs ? [] , propagatedNativeBuildInputs ? [] , propagatedBuildInputs ? [] + , configureFlags ? [] + , # Target is not included by default because most programs don't care. + # Including it then would cause needless mass rebuilds. + # + # TODO(@Ericson2314): Make [ "build" "host" ] always the default. + configurePlatforms ? lib.optionals + (stdenv.hostPlatform != stdenv.buildPlatform) + [ "build" "host" ] , crossConfig ? null , meta ? {} , passthru ? {} @@ -72,6 +82,9 @@ rec { lib.unique (lib.concatMap (input: input.__propagatedImpureHostDeps or []) (lib.concatLists propagatedDependencies')); in { + name = name + lib.optionalString + (stdenv.hostPlatform != stdenv.buildPlatform) + stdenv.hostPlatform.config; builder = attrs.realBuilder or stdenv.shell; args = attrs.args or ["-e" (attrs.builder or ./default-builder.sh)]; inherit stdenv; @@ -84,6 +97,16 @@ rec { propagatedNativeBuildInputs = lib.elemAt propagatedDependencies' 0; propagatedBuildInputs = lib.elemAt propagatedDependencies' 1; + + # This parameter is sometimes a string, sometimes null, and sometimes a list, yuck + configureFlags = let inherit (lib) optional elem; in + (/**/ if lib.isString configureFlags then [configureFlags] + else if configureFlags == null then [] + else configureFlags) + ++ optional (elem "build" configurePlatforms) "--build=${stdenv.buildPlatform.config}" + ++ optional (elem "host" configurePlatforms) "--host=${stdenv.hostPlatform.config}" + ++ optional (elem "target" configurePlatforms) "--target=${stdenv.targetPlatform.config}"; + } // lib.optionalAttrs (stdenv.buildPlatform.isDarwin) { # TODO: remove lib.unique once nix has a list canonicalization primitive __sandboxProfile = diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index b48b49c0ad1b..dc3369f6611c 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -18,9 +18,9 @@ runHook() { local var="$hookName" if [[ "$hookName" =~ Hook$ ]]; then var+=s; else var+=Hooks; fi - eval "local -a dummy=(\"\${$var[@]}\")" + local varRef="$var[@]" local hook - for hook in "_callImplicitHook 0 $hookName" "${dummy[@]}"; do + for hook in "_callImplicitHook 0 $hookName" "${!varRef}"; do _eval "$hook" "$@" done return 0 @@ -34,9 +34,10 @@ runOneHook() { shift local var="$hookName" if [[ "$hookName" =~ Hook$ ]]; then var+=s; else var+=Hooks; fi - eval "local -a dummy=(\"\${$var[@]}\")" + + local varRef="$var[@]" local hook - for hook in "_callImplicitHook 1 $hookName" "${dummy[@]}"; do + for hook in "_callImplicitHook 1 $hookName" "${!varRef}"; do if _eval "$hook" "$@"; then return 0 fi @@ -53,9 +54,9 @@ runOneHook() { _callImplicitHook() { local def="$1" local hookName="$2" - case "$(type -t $hookName)" in - (function|alias|builtin) $hookName;; - (file) source $hookName;; + case "$(type -t "$hookName")" in + (function|alias|builtin) "$hookName";; + (file) source "$hookName";; (keyword) :;; (*) if [ -z "${!hookName}" ]; then return "$def"; else eval "${!hookName}"; fi;; esac @@ -67,7 +68,7 @@ _callImplicitHook() { _eval() { local code="$1" shift - if [ "$(type -t $code)" = function ]; then + if [ "$(type -t "$code")" = function ]; then eval "$code \"\$@\"" else eval "$code" @@ -78,29 +79,20 @@ _eval() { ###################################################################### # Logging. -nestingLevel=0 - -startNest() { - nestingLevel=$(($nestingLevel + 1)) - echo -en "\033[$1p" -} - -stopNest() { - nestingLevel=$(($nestingLevel - 1)) - echo -en "\033[q" -} - -header() { - startNest "$2" - echo "$1" -} - -# Make sure that even when we exit abnormally, the original nesting -# level is properly restored. -closeNest() { - while [ $nestingLevel -gt 0 ]; do - stopNest - done +# Obsolete. +stopNest() { true; } +header() { echo "$1"; } +closeNest() { true; } + +# Prints a command such that all word splits are unambiguous. We need +# to split the command in three parts because the middle format string +# will be, and must be, repeated for each argument. The first argument +# goes before the ':' and is just for convenience. +echoCmd() { + printf "%s:" "$1" + shift + printf ' %q' "$@" + echo } @@ -108,11 +100,9 @@ closeNest() { # Error handling. exitHandler() { - exitCode=$? + exitCode="$?" set +e - closeNest - if [ -n "$showBuildStats" ]; then times > "$NIX_BUILD_TOP/.times" local -a times=($(cat "$NIX_BUILD_TOP/.times")) @@ -121,10 +111,10 @@ exitHandler() { # - system time for the shell # - user time for all child processes # - system time for all child processes - echo "build time elapsed: " ${times[*]} + echo "build time elapsed: " "${times[@]}" fi - if [ $exitCode != 0 ]; then + if [ "$exitCode" != 0 ]; then runHook failureHook # If the builder had a non-zero exit code and @@ -134,7 +124,7 @@ exitHandler() { if [ -n "$succeedOnFailure" ]; then echo "build failed with exit code $exitCode (ignored)" mkdir -p "$out/nix-support" - printf "%s" $exitCode > "$out/nix-support/failed" + printf "%s" "$exitCode" > "$out/nix-support/failed" exit 0 fi @@ -142,7 +132,7 @@ exitHandler() { runHook exitHook fi - exit $exitCode + exit "$exitCode" } trap "exitHandler" EXIT @@ -153,11 +143,11 @@ trap "exitHandler" EXIT addToSearchPathWithCustomDelimiter() { - local delimiter=$1 - local varName=$2 - local dir=$3 + local delimiter="$1" + local varName="$2" + local dir="$3" if [ -d "$dir" ]; then - eval export ${varName}=${!varName}${!varName:+$delimiter}${dir} + export "${varName}=${!varName}${!varName:+$delimiter}${dir}" fi } @@ -198,7 +188,7 @@ isELF() { local fd local magic exec {fd}< "$fn" - read -n 4 -u $fd magic + read -r -n 4 -u "$fd" magic exec {fd}<&- if [[ "$magic" =~ ELF ]]; then return 0; else return 1; fi } @@ -211,11 +201,21 @@ isScript() { local magic if ! [ -x /bin/sh ]; then return 0; fi exec {fd}< "$fn" - read -n 2 -u $fd magic + read -r -n 2 -u "$fd" magic exec {fd}<&- if [[ "$magic" =~ \#! ]]; then return 0; else return 1; fi } +# printf unfortunately will print a trailing newline regardless +printLines() { + [[ "$#" -gt 0 ]] || return 0 + printf '%s\n' "$@" +} + +printWords() { + [[ "$#" -gt 0 ]] || return 0 + printf '%s ' "$@" +} ###################################################################### # Initialisation. @@ -239,7 +239,7 @@ shopt -s nullglob PATH= for i in $initialPath; do if [ "$i" = / ]; then i=; fi - addToSearchPath PATH $i/bin + addToSearchPath PATH "$i/bin" done if [ "$NIX_DEBUG" = 1 ]; then @@ -259,7 +259,7 @@ paxmark() { true; } # Execute the pre-hook. -if [ -z "$shell" ]; then export shell=$SHELL; fi +if [ -z "$shell" ]; then export shell="$SHELL"; fi runHook preHook @@ -272,16 +272,20 @@ runHook addInputsHook # Recursively find all build inputs. findInputs() { local pkg="$1" - local var=$2 - local propagatedBuildInputsFile=$3 + local var="$2" + local propagatedBuildInputsFile="$3" - case ${!var} in - *\ $pkg\ *) - return 0 - ;; + # TODO(@Ericson2314): Restore using associative array once Darwin + # nix-shell doesn't use impure bash. This should replace the O(n) + # case with an O(1) hash map lookup, assuming bash is implemented + # well :D. + local varRef="$var[*]" + + case "${!varRef}" in + *" $pkg "*) return 0 ;; esac - eval $var="'${!var} $pkg '" + eval "$var"'+=("$pkg")' if ! [ -e "$pkg" ]; then echo "build input $pkg does not exist" >&2 @@ -292,8 +296,8 @@ findInputs() { source "$pkg" fi - if [ -d $1/bin ]; then - addToSearchPath _PATH $1/bin + if [ -d "$pkg/bin" ]; then + addToSearchPath _PATH "$pkg/bin" fi if [ -f "$pkg/nix-support/setup-hook" ]; then @@ -301,8 +305,9 @@ findInputs() { fi if [ -f "$pkg/nix-support/$propagatedBuildInputsFile" ]; then - for i in $(cat "$pkg/nix-support/$propagatedBuildInputsFile"); do - findInputs "$i" $var $propagatedBuildInputsFile + local pkgNext + for pkgNext in $(< "$pkg/nix-support/$propagatedBuildInputsFile"); do + findInputs "$pkgNext" "$var" "$propagatedBuildInputsFile" done fi } @@ -310,21 +315,21 @@ findInputs() { if [ -z "$crossConfig" ]; then # Not cross-compiling - both buildInputs (and variants like propagatedBuildInputs) # are handled identically to nativeBuildInputs - nativePkgs="" + declare -a nativePkgs for i in $nativeBuildInputs $buildInputs \ $defaultNativeBuildInputs $defaultBuildInputs \ $propagatedNativeBuildInputs $propagatedBuildInputs; do - findInputs $i nativePkgs propagated-native-build-inputs + findInputs "$i" nativePkgs propagated-native-build-inputs done else - crossPkgs="" + declare -a crossPkgs for i in $buildInputs $defaultBuildInputs $propagatedBuildInputs; do - findInputs $i crossPkgs propagated-build-inputs + findInputs "$i" crossPkgs propagated-build-inputs done - nativePkgs="" + declare -a nativePkgs for i in $nativeBuildInputs $defaultNativeBuildInputs $propagatedNativeBuildInputs; do - findInputs $i nativePkgs propagated-native-build-inputs + findInputs "$i" nativePkgs propagated-native-build-inputs done fi @@ -332,25 +337,25 @@ fi # Set the relevant environment variables to point to the build inputs # found above. _addToNativeEnv() { - local pkg=$1 + local pkg="$1" # Run the package-specific hooks set by the setup-hook scripts. runHook envHook "$pkg" } -for i in $nativePkgs; do - _addToNativeEnv $i +for i in "${nativePkgs[@]}"; do + _addToNativeEnv "$i" done _addToCrossEnv() { - local pkg=$1 + local pkg="$1" # Run the package-specific hooks set by the setup-hook scripts. runHook crossEnvHook "$pkg" } -for i in $crossPkgs; do - _addToCrossEnv $i +for i in "${crossPkgs[@]}"; do + _addToCrossEnv "$i" done @@ -417,48 +422,53 @@ fi substitute() { local input="$1" local output="$2" + shift 2 if [ ! -f "$input" ]; then - echo "substitute(): file '$input' does not exist" + echo "${FUNCNAME[0]}(): ERROR: file '$input' does not exist" >&2 return 1 fi - local -a params=("$@") - - local n p pattern replacement varName content - - # a slightly hacky way to keep newline at the end - content="$(cat "$input"; printf "%s" X)" - content="${content%X}" + local content + # read returns non-0 on EOF, so we want read to fail + if IFS='' read -r -N 0 content < "$input"; then + echo "${FUNCNAME[0]}(): ERROR: File \"$input\" has null bytes, won't process" >&2 + return 1 + fi - for ((n = 2; n < ${#params[*]}; n += 1)); do - p="${params[$n]}" + while (( "$#" )); do + case "$1" in + --replace) + pattern="$2" + replacement="$3" + shift 3 + ;; - if [ "$p" = --replace ]; then - pattern="${params[$((n + 1))]}" - replacement="${params[$((n + 2))]}" - n=$((n + 2)) - fi + --subst-var) + local varName="$2" + shift 2 + # check if the used nix attribute name is a valid bash name + if ! [[ "$varName" =~ ^[a-zA-Z_][a-zA-Z0-9_]*$ ]]; then + echo "${FUNCNAME[0]}(): WARNING: substitution variables should be valid bash names," >&2 + echo " \"$varName\" isn't and therefore was skipped; it might be caused" >&2 + echo " by multi-line phases in variables - see #14907 for details." >&2 + continue + fi + pattern="@$varName@" + replacement="${!varName}" + ;; - if [ "$p" = --subst-var ]; then - varName="${params[$((n + 1))]}" - n=$((n + 1)) - # check if the used nix attribute name is a valid bash name - if ! [[ "$varName" =~ ^[a-zA-Z_][a-zA-Z0-9_]*$ ]]; then - echo "WARNING: substitution variables should be valid bash names," - echo " \"$varName\" isn't and therefore was skipped; it might be caused" - echo " by multi-line phases in variables - see #14907 for details." - continue - fi - pattern="@$varName@" - replacement="${!varName}" - fi + --subst-var-by) + pattern="@$2@" + replacement="$3" + shift 3 + ;; - if [ "$p" = --subst-var-by ]; then - pattern="@${params[$((n + 1))]}@" - replacement="${params[$((n + 2))]}" - n=$((n + 2)) - fi + *) + echo "${FUNCNAME[0]}(): ERROR: Invalid command line argument: $1" >&2 + return 1 + ;; + esac content="${content//"$pattern"/$replacement}" done @@ -521,7 +531,9 @@ dumpVars() { # Utility function: echo the base name of the given path, with the # prefix `HASH-' removed, if present. stripHash() { - local strippedName="$(basename "$1")"; + local strippedName + # On separate line for `set -e` + strippedName="$(basename "$1")" if echo "$strippedName" | grep -q '^[a-z0-9]\{32\}-'; then echo "$strippedName" | cut -c34- else @@ -569,7 +581,6 @@ unpackFile() { echo "do not know how to unpack source archive $curSrc" exit 1 fi - stopNest } @@ -578,6 +589,7 @@ unpackPhase() { if [ -z "$srcs" ]; then if [ -z "$src" ]; then + # shellcheck disable=SC2016 echo 'variable $src or $srcs should point to the source' exit 1 fi @@ -597,7 +609,7 @@ unpackPhase() { # Unpack all source archives. for i in $srcs; do - unpackFile $i + unpackFile "$i" done # Find the source directory. @@ -661,8 +673,8 @@ patchPhase() { ;; esac # "2>&1" is a hack to make patch fail if the decompressor fails (nonexistent patch, etc.) + # shellcheck disable=SC2086 $uncompress < "$i" 2>&1 | patch ${patchFlags:--p1} - stopNest done runHook postPatch @@ -677,18 +689,19 @@ fixLibtool() { configurePhase() { runHook preConfigure - if [ -z "$configureScript" -a -x ./configure ]; then + if [[ -z "$configureScript" && -x ./configure ]]; then configureScript=./configure fi if [ -z "$dontFixLibtool" ]; then - find . -iname "ltmain.sh" | while read i; do + local i + find . -iname "ltmain.sh" -print0 | while IFS='' read -r -d '' i; do echo "fixing libtool script $i" - fixLibtool $i + fixLibtool "$i" done fi - if [ -z "$dontAddPrefix" -a -n "$prefix" ]; then + if [[ -z "$dontAddPrefix" && -n "$prefix" ]]; then configureFlags="${prefixKey:---prefix=}$prefix $configureFlags" fi @@ -707,8 +720,12 @@ configurePhase() { fi if [ -n "$configureScript" ]; then - echo "configure flags: $configureFlags ${configureFlagsArray[@]}" - $configureScript $configureFlags "${configureFlagsArray[@]}" + # shellcheck disable=SC2086 + local flagsArray=($configureFlags "${configureFlagsArray[@]}") + echoCmd 'configure flags' "${flagsArray[@]}" + # shellcheck disable=SC2086 + $configureScript "${flagsArray[@]}" + unset flagsArray else echo "no configure script, doing nothing" fi @@ -720,17 +737,21 @@ configurePhase() { buildPhase() { runHook preBuild - if [ -z "$makeFlags" ] && ! [ -n "$makefile" -o -e "Makefile" -o -e "makefile" -o -e "GNUmakefile" ]; then + if [[ -z "$makeFlags" && ! ( -n "$makefile" || -e Makefile || -e makefile || -e GNUmakefile[[ ) ]]; then echo "no Makefile, doing nothing" else # See https://github.com/NixOS/nixpkgs/pull/1354#issuecomment-31260409 makeFlags="SHELL=$SHELL $makeFlags" - echo "make flags: $makeFlags ${makeFlagsArray[@]} $buildFlags ${buildFlagsArray[@]}" - make ${makefile:+-f $makefile} \ + # shellcheck disable=SC2086 + local flagsArray=( \ ${enableParallelBuilding:+-j${NIX_BUILD_CORES} -l${NIX_BUILD_CORES}} \ $makeFlags "${makeFlagsArray[@]}" \ - $buildFlags "${buildFlagsArray[@]}" + $buildFlags "${buildFlagsArray[@]}") + + echoCmd 'build flags' "${flagsArray[@]}" + make ${makefile:+-f $makefile} "${flagsArray[@]}" + unset flagsArray fi runHook postBuild @@ -740,11 +761,15 @@ buildPhase() { checkPhase() { runHook preCheck - echo "check flags: $makeFlags ${makeFlagsArray[@]} $checkFlags ${checkFlagsArray[@]}" - make ${makefile:+-f $makefile} \ + # shellcheck disable=SC2086 + local flagsArray=( \ ${enableParallelBuilding:+-j${NIX_BUILD_CORES} -l${NIX_BUILD_CORES}} \ $makeFlags "${makeFlagsArray[@]}" \ - ${checkFlags:-VERBOSE=y} "${checkFlagsArray[@]}" ${checkTarget:-check} + ${checkFlags:-VERBOSE=y} "${checkFlagsArray[@]}" ${checkTarget:-check}) + + echoCmd 'check flags' "${flagsArray[@]}" + make ${makefile:+-f $makefile} "${flagsArray[@]}" + unset flagsArray runHook postCheck } @@ -757,11 +782,16 @@ installPhase() { mkdir -p "$prefix" fi - installTargets=${installTargets:-install} - echo "install flags: $installTargets $makeFlags ${makeFlagsArray[@]} $installFlags ${installFlagsArray[@]}" - make ${makefile:+-f $makefile} $installTargets \ + installTargets="${installTargets:-install}" + + # shellcheck disable=SC2086 + local flagsArray=( $installTargets \ $makeFlags "${makeFlagsArray[@]}" \ - $installFlags "${installFlagsArray[@]}" + $installFlags "${installFlagsArray[@]}") + + echoCmd 'install flags' "${flagsArray[@]}" + make ${makefile:+-f $makefile} "${flagsArray[@]}" + unset flagsArray runHook postInstall } @@ -781,7 +811,7 @@ fixupPhase() { # Apply fixup to each output. local output for output in $outputs; do - prefix=${!output} runHook fixupOutput + prefix="${!output}" runHook fixupOutput done @@ -795,17 +825,20 @@ fixupPhase() { fi if [ -n "$propagated" ]; then mkdir -p "${!outputDev}/nix-support" - echo "$propagated" > "${!outputDev}/nix-support/propagated-native-build-inputs" + # shellcheck disable=SC2086 + printWords $propagated > "${!outputDev}/nix-support/propagated-native-build-inputs" fi else if [ -n "$propagatedBuildInputs" ]; then mkdir -p "${!outputDev}/nix-support" - echo "$propagatedBuildInputs" > "${!outputDev}/nix-support/propagated-build-inputs" + # shellcheck disable=SC2086 + printWords $propagatedBuildInputs > "${!outputDev}/nix-support/propagated-build-inputs" fi if [ -n "$propagatedNativeBuildInputs" ]; then mkdir -p "${!outputDev}/nix-support" - echo "$propagatedNativeBuildInputs" > "${!outputDev}/nix-support/propagated-native-build-inputs" + # shellcheck disable=SC2086 + printWords $propagatedNativeBuildInputs > "${!outputDev}/nix-support/propagated-native-build-inputs" fi fi @@ -818,7 +851,8 @@ fixupPhase() { if [ -n "$propagatedUserEnvPkgs" ]; then mkdir -p "${!outputBin}/nix-support" - echo "$propagatedUserEnvPkgs" > "${!outputBin}/nix-support/propagated-user-env-packages" + # shellcheck disable=SC2086 + printWords $propagatedUserEnvPkgs > "${!outputBin}/nix-support/propagated-user-env-packages" fi runHook postFixup @@ -828,11 +862,15 @@ fixupPhase() { installCheckPhase() { runHook preInstallCheck - echo "installcheck flags: $makeFlags ${makeFlagsArray[@]} $installCheckFlags ${installCheckFlagsArray[@]}" - make ${makefile:+-f $makefile} \ + # shellcheck disable=SC2086 + local flagsArray=( \ ${enableParallelBuilding:+-j${NIX_BUILD_CORES} -l${NIX_BUILD_CORES}} \ $makeFlags "${makeFlagsArray[@]}" \ - $installCheckFlags "${installCheckFlagsArray[@]}" ${installCheckTarget:-installcheck} + $installCheckFlags "${installCheckFlagsArray[@]}" ${installCheckTarget:-installcheck}) + + echoCmd 'installcheck flags' "${flagsArray[@]}" + make ${makefile:+-f $makefile} "${flagsArray[@]}" + unset flagsArray runHook postInstallCheck } @@ -841,15 +879,19 @@ installCheckPhase() { distPhase() { runHook preDist - echo "dist flags: $distFlags ${distFlagsArray[@]}" - make ${makefile:+-f $makefile} $distFlags "${distFlagsArray[@]}" ${distTarget:-dist} + # shellcheck disable=SC2086 + local flagsArray=($distFlags "${distFlagsArray[@]}" ${distTarget:-dist}) + + echo 'dist flags: %q' "${flagsArray[@]}" + make ${makefile:+-f $makefile} "${flagsArray[@]}" if [ "$dontCopyDist" != 1 ]; then mkdir -p "$out/tarballs" # Note: don't quote $tarballs, since we explicitly permit # wildcards in there. - cp -pvd ${tarballs:-*.tar.gz} $out/tarballs + # shellcheck disable=SC2086 + cp -pvd ${tarballs:-*.tar.gz} "$out/tarballs" fi runHook postDist @@ -858,7 +900,7 @@ distPhase() { showPhaseHeader() { local phase="$1" - case $phase in + case "$phase" in unpackPhase) header "unpacking sources";; patchPhase) header "patching sources";; configurePhase) header "configuring";; @@ -890,14 +932,14 @@ genericBuild() { fi for curPhase in $phases; do - if [ "$curPhase" = buildPhase -a -n "$dontBuild" ]; then continue; fi - if [ "$curPhase" = checkPhase -a -z "$doCheck" ]; then continue; fi - if [ "$curPhase" = installPhase -a -n "$dontInstall" ]; then continue; fi - if [ "$curPhase" = fixupPhase -a -n "$dontFixup" ]; then continue; fi - if [ "$curPhase" = installCheckPhase -a -z "$doInstallCheck" ]; then continue; fi - if [ "$curPhase" = distPhase -a -z "$doDist" ]; then continue; fi - - if [ -n "$tracePhases" ]; then + if [[ "$curPhase" = buildPhase && -n "$dontBuild" ]]; then continue; fi + if [[ "$curPhase" = checkPhase && -z "$doCheck" ]]; then continue; fi + if [[ "$curPhase" = installPhase && -n "$dontInstall" ]]; then continue; fi + if [[ "$curPhase" = fixupPhase && -n "$dontFixup" ]]; then continue; fi + if [[ "$curPhase" = installCheckPhase && -z "$doInstallCheck" ]]; then continue; fi + if [[ "$curPhase" = distPhase && -z "$doDist" ]]; then continue; fi + + if [[ -n "$tracePhases" ]]; then echo echo "@ phase-started $out $curPhase" fi @@ -917,8 +959,6 @@ genericBuild() { echo echo "@ phase-succeeded $out $curPhase" fi - - stopNest done } diff --git a/pkgs/tools/admin/lxd/default.nix b/pkgs/tools/admin/lxd/default.nix index 1aec4209b4d3..64ec5e9b418e 100644 --- a/pkgs/tools/admin/lxd/default.nix +++ b/pkgs/tools/admin/lxd/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "lxd-${version}"; - version = "2.14"; + version = "2.16"; rev = "lxd-${version}"; goPackagePath = "github.com/lxc/lxd"; @@ -11,7 +11,7 @@ buildGoPackage rec { inherit rev; owner = "lxc"; repo = "lxd"; - sha256 = "1jy60lb2m0497bnjj09qvflsj2rb0jjmlb8pm1xn5g4lpzibszjm"; + sha256 = "0i2mq9m8k9kznwz1i0xb48plp1ffpzvbdrvqvagis4sm17yab3fn"; }; goDeps = ./deps.nix; diff --git a/pkgs/tools/backup/tarsnap/default.nix b/pkgs/tools/backup/tarsnap/default.nix index 9fca48bde1bb..3767a377cfcf 100644 --- a/pkgs/tools/backup/tarsnap/default.nix +++ b/pkgs/tools/backup/tarsnap/default.nix @@ -8,11 +8,11 @@ let in stdenv.mkDerivation rec { name = "tarsnap-${version}"; - version = "1.0.38"; + version = "1.0.39"; src = fetchurl { url = "https://www.tarsnap.com/download/tarsnap-autoconf-${version}.tgz"; - sha256 = "0nyd722i7q8h81h5mvwxai0f3jmwd93r3ahjkmr12k55p8c0rvkn"; + sha256 = "10i0whbmb345l2ggnf4vs66qjcyf6hmlr8f4nqqcfq0h5a5j24sn"; }; preConfigure = '' diff --git a/pkgs/tools/cd-dvd/brasero/default.nix b/pkgs/tools/cd-dvd/brasero/default.nix index d033371cbcd6..d62f2c25623f 100644 --- a/pkgs/tools/cd-dvd/brasero/default.nix +++ b/pkgs/tools/cd-dvd/brasero/default.nix @@ -6,7 +6,7 @@ let major = "3.12"; - minor = "1"; + minor = "2"; binpath = lib.makeBinPath [ dvdauthor vcdimager ]; in stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "http://download.gnome.org/sources/brasero/${major}/${name}.tar.xz"; - sha256 = "09vi2hyhl0bz7imv3ky6h7x5m3d546n968wcghydwrkvwm9ylpls"; + sha256 = "0h90y674j26rvjahb8cc0w79zx477rb6zaqcj26wzvq8kmpic8k8"; }; nativeBuildInputs = [ pkgconfig itstool intltool wrapGAppsHook ]; diff --git a/pkgs/tools/compression/gzip/default.nix b/pkgs/tools/compression/gzip/default.nix index cb7dc65c710d..bb9555fa600c 100644 --- a/pkgs/tools/compression/gzip/default.nix +++ b/pkgs/tools/compression/gzip/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, xz }: +{ stdenv, hostPlatform, fetchurl, xz }: stdenv.mkDerivation rec { name = "gzip-${version}"; @@ -9,6 +9,8 @@ stdenv.mkDerivation rec { sha256 = "1lxv3p4iyx7833mlihkn5wfwmz4cys5nybwpz3dfawag8kn6f5zz"; }; + patches = stdenv.lib.optional hostPlatform.isDarwin stdenv.secure-format-patch; + outputs = [ "out" "man" "info" ]; enableParallelBuilding = true; diff --git a/pkgs/tools/filesystems/zerofree/default.nix b/pkgs/tools/filesystems/zerofree/default.nix index 994777680dbd..593715b2068d 100644 --- a/pkgs/tools/filesystems/zerofree/default.nix +++ b/pkgs/tools/filesystems/zerofree/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "zerofree-${version}"; - version = "1.0.4"; + version = "1.1.0"; src = fetchurl { url = "http://frippery.org/uml/${name}.tgz"; - sha256 = "0f38mvn3wfacapayl54q04qlz4in417pfm6gapgm7dhyjs9y5yd7"; + sha256 = "059g29x5r1xj6wcj4xj85l8w6qrxyl86yqbybjqqz6nxz4falxzf"; }; buildInputs = [ e2fsprogs ]; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://frippery.org/uml/index.html; + homepage = https://frippery.org/uml/; description = "Zero free blocks from ext2, ext3 and ext4 file-systems"; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.theuni ]; diff --git a/pkgs/tools/graphics/argyllcms/default.nix b/pkgs/tools/graphics/argyllcms/default.nix index 3c7af45f81dd..3cdb4497baf1 100644 --- a/pkgs/tools/graphics/argyllcms/default.nix +++ b/pkgs/tools/graphics/argyllcms/default.nix @@ -84,6 +84,8 @@ stdenv.mkDerivation rec { substituteInPlace Makefile --replace "-j 3" "-j $NIX_BUILD_CORES" # Remove tiff, jpg and png to be sure the nixpkgs-provided ones are used rm -rf tiff jpg png + + unset AR ''; buildInputs = [ diff --git a/pkgs/tools/graphics/gnuplot/default.nix b/pkgs/tools/graphics/gnuplot/default.nix index 3b537fad91db..6100573153ba 100644 --- a/pkgs/tools/graphics/gnuplot/default.nix +++ b/pkgs/tools/graphics/gnuplot/default.nix @@ -21,11 +21,11 @@ let withX = libX11 != null && !aquaterm && !stdenv.isDarwin; in stdenv.mkDerivation rec { - name = "gnuplot-5.0.3"; + name = "gnuplot-5.0.6"; src = fetchurl { url = "mirror://sourceforge/gnuplot/${name}.tar.gz"; - sha256 = "05f7p21d2b0r3h0af8i75bh2inx9pws1k4crx5c400927xgy6vjz"; + sha256 = "0q5lr6nala3ln6f3yp6g17ziymb9r9gx9zylnw1y3hjmwl9lggjv"; }; buildInputs = diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index 9a988a2b4311..099e9ee0849d 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -24,7 +24,8 @@ stdenv.mkDerivation rec { # FIXME needs gcc 4.9 in bootstrap tools hardeningDisable = [ "stackprotector" ]; - patches = optional hostPlatform.isCygwin ./coreutils-8.23-4.cygwin.patch; + patches = optional hostPlatform.isCygwin ./coreutils-8.23-4.cygwin.patch + ++ optional hostPlatform.isDarwin stdenv.secure-format-patch; # The test tends to fail on btrfs and maybe other unusual filesystems. postPatch = optionalString (!hostPlatform.isDarwin) '' diff --git a/pkgs/tools/misc/fd/default.nix b/pkgs/tools/misc/fd/default.nix new file mode 100644 index 000000000000..763ca668d181 --- /dev/null +++ b/pkgs/tools/misc/fd/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, rustPlatform }: + +rustPlatform.buildRustPackage rec { + name = "fd-${version}"; + version = "2.0.0"; + + src = fetchFromGitHub { + owner = "sharkdp"; + repo = "fd"; + rev = "v${version}"; + sha256 = "1xs4y9zf5m0ykl95787jv98xg0a60gkcyyh7kg7qg4xrcgf4qz4j"; + }; + + depsSha256 = "1hxf3j4584jgpwrwykx6yil6q6ka9l81qvx6zrbprdxk3pslp049"; + + meta = { + description = "A simple, fast and user-friendly alternative to find"; + longDescription = '' + `fd` is a simple, fast and user-friendly alternative to `find`. + + While it does not seek to mirror all of `find`'s powerful functionality, + it provides sensible (opinionated) defaults for 80% of the use cases. + ''; + homepage = "https://github.com/sharkdp/fd"; + license = stdenv.lib.licenses.mit; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix index 2bbeea8133e7..634022e88e02 100644 --- a/pkgs/tools/misc/grub/2.0x.nix +++ b/pkgs/tools/misc/grub/2.0x.nix @@ -85,6 +85,8 @@ stdenv.mkDerivation rec { # See <http://www.mail-archive.com/qemu-devel@nongnu.org/msg22775.html>. sed -i "tests/util/grub-shell.in" \ -e's/qemu-system-i386/qemu-system-x86_64 -nodefaults/g' + + unset CPP # setting CPP intereferes with dependency calculation ''; prePatch = diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix index 07326e7a8ed6..648d09b42654 100644 --- a/pkgs/tools/misc/parallel/default.nix +++ b/pkgs/tools/misc/parallel/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, perl, makeWrapper, procps }: stdenv.mkDerivation rec { - name = "parallel-20170522"; + name = "parallel-20170722"; src = fetchurl { url = "mirror://gnu/parallel/${name}.tar.bz2"; - sha256 = "1k5wlcc0dr2fxna0vi48s0l6pvbyl4pbclbih4103f1155im23ca"; + sha256 = "117g50bx1kcbrqix0f1539z5rzhvgsni2wddjv939wcxkrdb1idx"; }; nativeBuildInputs = [ makeWrapper perl ]; diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index b730d45c9e20..bf05cd9bf5cd 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -15,11 +15,11 @@ with stdenv.lib; buildPythonApplication rec { name = "youtube-dl-${version}"; - version = "2017.07.09"; + version = "2017.07.30.1"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${name}.tar.gz"; - sha256 = "0phrfby2nk5y5x5173bbg3jcr2ajk849al3zji5y39z39dj36ba2"; + sha256 = "1m1n5d06xh8hnild6kssiv9yaq2sm7vy0c8h506v3nff7i9wf0a7"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/networking/altermime/debian-patches.nix b/pkgs/tools/networking/altermime/debian-patches.nix deleted file mode 100644 index cd0ae77511b6..000000000000 --- a/pkgs/tools/networking/altermime/debian-patches.nix +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by debian-patches.sh from debian-patches.txt -let - prefix = "http://patch-tracker.debian.org/patch/series/dl/altermime/0.3.10-7"; -in -[ - { - url = "${prefix}/15_fix_snprintf.diff"; - sha256 = "0fbi99s7pc2jvg9s2zldvg18i6g5ca3pcyaxy47kyabnz956dris"; - } - { - url = "${prefix}/10_fix_printk_warnings.diff"; - sha256 = "1fqsym07r3gv8zllg7c956g5a04gsxnr1ibbgkjr3yx6nm5ci1j7"; - } - { - url = "${prefix}/20_fix-unused-but-set-variables.diff"; - sha256 = "0ski67k44amrgg2g3gwdjzrlix2gjg60r5rs5wbjingvq1n7255r"; - } -] diff --git a/pkgs/tools/networking/altermime/debian-patches.txt b/pkgs/tools/networking/altermime/debian-patches.txt deleted file mode 100644 index 77cb0ff10c15..000000000000 --- a/pkgs/tools/networking/altermime/debian-patches.txt +++ /dev/null @@ -1,4 +0,0 @@ -altermime/0.3.10-7 -15_fix_snprintf.diff -10_fix_printk_warnings.diff -20_fix-unused-but-set-variables.diff diff --git a/pkgs/tools/networking/altermime/default.nix b/pkgs/tools/networking/altermime/default.nix index e532739ecd4f..f05669a4e502 100644 --- a/pkgs/tools/networking/altermime/default.nix +++ b/pkgs/tools/networking/altermime/default.nix @@ -3,14 +3,14 @@ stdenv.mkDerivation rec { baseName = "altermime"; name = "${baseName}-${version}"; - version = "0.3.10"; + version = "0.3.11"; src = fetchurl { url = "http://www.pldaniels.com/${baseName}/${name}.tar.gz"; - sha256 = "0vn3vmbcimv0n14khxr1782m76983zz9sf4j2kz5v86lammxld43"; + sha256 = "15zxg6spcmd35r6xbidq2fgcg2nzyv1sbbqds08lzll70mqx4pj7"; }; - patches = map fetchurl (import ./debian-patches.nix); + NIX_CFLAGS_COMPILE = "-Wno-error=format"; postPatch = '' sed -i Makefile -e "s@/usr/local@$out@" diff --git a/pkgs/tools/networking/inadyn/default.nix b/pkgs/tools/networking/inadyn/default.nix index 4f9e8b045b0d..3495d2d56f0a 100644 --- a/pkgs/tools/networking/inadyn/default.nix +++ b/pkgs/tools/networking/inadyn/default.nix @@ -1,16 +1,25 @@ -{ stdenv, fetchurl, gnutls, autoreconfHook, pkgconfig, libite, libconfuse }: +{ stdenv, fetchurl, fetchpatch, autoreconfHook, pkgconfig +, gnutls, libite, libconfuse }: let - version = "2.0"; + version = "2.1"; in stdenv.mkDerivation { name = "inadyn-${version}"; src = fetchurl { url = "https://github.com/troglobit/inadyn/releases/download/v${version}/inadyn-${version}.tar.xz"; - sha256 = "16nmbxj337vkqkk6f7vx7fa8mczjv6dl3ybaxy16c23h486y0mzh"; + sha256 = "1b5khr2y5q1x2mn08zrnjf9hsals4y403mhsc1s7016w3my9lqw7"; }; + patches = [ + ./remove-unused-macro.patch + (fetchpatch { + url = "https://github.com/troglobit/inadyn/commit/ed3a7761015441b5d5cacd691b7aa114da048bef.patch"; + sha256 = "1passghmjd7gmrfcqkfqw9lvg8l22s91nm65ys3n3rylzsgaaq8i"; + }) + ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ gnutls libite libconfuse ]; diff --git a/pkgs/tools/networking/inadyn/remove-unused-macro.patch b/pkgs/tools/networking/inadyn/remove-unused-macro.patch new file mode 100644 index 000000000000..0ee6a5d7757c --- /dev/null +++ b/pkgs/tools/networking/inadyn/remove-unused-macro.patch @@ -0,0 +1,242 @@ +From b5c70461822003238784ff56f4c8eead10cfc2c1 Mon Sep 17 00:00:00 2001 +From: Joachim Nilsson <troglobit@gmail.com> +Date: Sun, 2 Jul 2017 21:01:33 +0200 +Subject: [PATCH] Remove UNUSED() macro and disable the compiler warning + instead + +Signed-off-by: Joachim Nilsson <troglobit@gmail.com> + +diff --git a/plugins/common.c b/plugins/common.c +index 55c1ac3..9e7ba7b 100644 +--- a/plugins/common.c ++++ b/plugins/common.c +@@ -64,7 +64,7 @@ int common_request(ddns_t *ctx, ddns_info_t *info, ddns_alias_t *alias) + * DynDNS response validator -- common to many other DDNS providers as well + * 'good' or 'nochg' are the good answers, + */ +-int common_response(http_trans_t *trans, ddns_info_t *UNUSED(info), ddns_alias_t *UNUSED(alias)) ++int common_response(http_trans_t *trans, ddns_info_t *info, ddns_alias_t *alias) + { + char *body = trans->rsp_body; + +diff --git a/plugins/ddnss.c b/plugins/ddnss.c +index fea41e9..5184db0 100644 +--- a/plugins/ddnss.c ++++ b/plugins/ddnss.c +@@ -60,7 +60,7 @@ static int request(ddns_t *ctx, ddns_info_t *info, ddns_alias_t *alias) + info->user_agent); + } + +-static int response(http_trans_t *trans, ddns_info_t *UNUSED(info), ddns_alias_t *UNUSED(alias)) ++static int response(http_trans_t *trans, ddns_info_t *info, ddns_alias_t *alias) + { + char *resp = trans->rsp_body; + +diff --git a/plugins/dhis.c b/plugins/dhis.c +index 11edd2c..b6e8e0b 100644 +--- a/plugins/dhis.c ++++ b/plugins/dhis.c +@@ -65,7 +65,7 @@ static int request(ddns_t *ctx, ddns_info_t *info, ddns_alias_t *alias) + info->user_agent); + } + +-static int response(http_trans_t *trans, ddns_info_t *UNUSED(info), ddns_alias_t *alias) ++static int response(http_trans_t *trans, ddns_info_t *info, ddns_alias_t *alias) + { + char *rsp = trans->rsp_body; + +diff --git a/plugins/dnsexit.c b/plugins/dnsexit.c +index c456f38..4bf0a08 100644 +--- a/plugins/dnsexit.c ++++ b/plugins/dnsexit.c +@@ -62,7 +62,7 @@ static int request(ddns_t *ctx, ddns_info_t *info, ddns_alias_t *alias) + info->user_agent); + } + +-static int response(http_trans_t *trans, ddns_info_t *UNUSED(info), ddns_alias_t *UNUSED(alias)) ++static int response(http_trans_t *trans, ddns_info_t *info, ddns_alias_t *alias) + { + int code = -1; + char *tmp; +diff --git a/plugins/dtdns.c b/plugins/dtdns.c +index e7996fe..38f0977 100644 +--- a/plugins/dtdns.c ++++ b/plugins/dtdns.c +@@ -58,7 +58,7 @@ static int request(ddns_t *ctx, ddns_info_t *info, ddns_alias_t *alias) + info->user_agent); + } + +-static int response(http_trans_t *trans, ddns_info_t *UNUSED(info), ddns_alias_t *UNUSED(alias)) ++static int response(http_trans_t *trans, ddns_info_t *info, ddns_alias_t *alias) + { + char *resp = trans->rsp_body; + +diff --git a/plugins/duckdns.c b/plugins/duckdns.c +index 9ca46ae..66d9c25 100755 +--- a/plugins/duckdns.c ++++ b/plugins/duckdns.c +@@ -78,7 +78,7 @@ static int request(ddns_t *ctx, ddns_info_t *info, ddns_alias_t *alias) + info->user_agent); + } + +-static int response(http_trans_t *trans, ddns_info_t *UNUSED(info), ddns_alias_t *UNUSED(alias)) ++static int response(http_trans_t *trans, ddns_info_t *info, ddns_alias_t *alias) + { + char *resp = trans->rsp_body; + +diff --git a/plugins/duiadns.c b/plugins/duiadns.c +index 7c4ced3..7dc09c9 100644 +--- a/plugins/duiadns.c ++++ b/plugins/duiadns.c +@@ -58,7 +58,7 @@ static int request(ddns_t *ctx, ddns_info_t *info, ddns_alias_t *alias) + info->user_agent); + } + +-static int response(http_trans_t *trans, ddns_info_t *UNUSED(info), ddns_alias_t *UNUSED(alias)) ++static int response(http_trans_t *trans, ddns_info_t *info, ddns_alias_t *alias) + { + char *resp = trans->rsp_body; + +diff --git a/plugins/dynv6-ipv4.c b/plugins/dynv6-ipv4.c +index 5dab9f1..f37215a 100644 +--- a/plugins/dynv6-ipv4.c ++++ b/plugins/dynv6-ipv4.c +@@ -59,7 +59,7 @@ static int request(ddns_t *ctx, ddns_info_t *info, ddns_alias_t *alias) + info->user_agent); + } + +-static int response(http_trans_t *trans, ddns_info_t *UNUSED(info), ddns_alias_t *UNUSED(alias)) ++static int response(http_trans_t *trans, ddns_info_t *info, ddns_alias_t *alias) + { + char *resp = trans->rsp_body; + +diff --git a/plugins/dynv6.c b/plugins/dynv6.c +index 84b7c40..03b1b4c 100644 +--- a/plugins/dynv6.c ++++ b/plugins/dynv6.c +@@ -59,7 +59,7 @@ static int request(ddns_t *ctx, ddns_info_t *info, ddns_alias_t *alias) + info->user_agent); + } + +-static int response(http_trans_t *trans, ddns_info_t *UNUSED(info), ddns_alias_t *UNUSED(alias)) ++static int response(http_trans_t *trans, ddns_info_t *info, ddns_alias_t *alias) + { + char *resp = trans->rsp_body; + +diff --git a/plugins/easydns.c b/plugins/easydns.c +index c9d8059..7718c56 100644 +--- a/plugins/easydns.c ++++ b/plugins/easydns.c +@@ -70,7 +70,7 @@ static int request(ddns_t *ctx, ddns_info_t *info, ddns_alias_t *alias) + /* + * NOERROR is the OK code here + */ +-static int response(http_trans_t *trans, ddns_info_t *UNUSED(info), ddns_alias_t *UNUSED(alias)) ++static int response(http_trans_t *trans, ddns_info_t *info, ddns_alias_t *alias) + { + char *resp = trans->rsp_body; + +diff --git a/plugins/freedns.c b/plugins/freedns.c +index 2c56ca4..2a2991f 100644 +--- a/plugins/freedns.c ++++ b/plugins/freedns.c +@@ -134,7 +134,7 @@ static int request(ddns_t *ctx, ddns_info_t *info, ddns_alias_t *alias) + fail blabla and n.n.n.n + are the good answers. We search our own IP address in response and that's enough. + */ +-static int response(http_trans_t *trans, ddns_info_t *UNUSED(info), ddns_alias_t *alias) ++static int response(http_trans_t *trans, ddns_info_t *info, ddns_alias_t *alias) + { + char *resp = trans->rsp_body; + +diff --git a/plugins/generic.c b/plugins/generic.c +index 8f23de4..3cee1f2 100644 +--- a/plugins/generic.c ++++ b/plugins/generic.c +@@ -238,7 +238,7 @@ static int request(ddns_t *ctx, ddns_info_t *info, ddns_alias_t *alias) + return ret; + } + +-static int response(http_trans_t *trans, ddns_info_t *info, ddns_alias_t *UNUSED(alias)) ++static int response(http_trans_t *trans, ddns_info_t *info, ddns_alias_t *alias) + { + char *resp = trans->rsp_body; + size_t i; +diff --git a/plugins/giradns.c b/plugins/giradns.c +index 2d6043e..ea19f77 100644 +--- a/plugins/giradns.c ++++ b/plugins/giradns.c +@@ -57,7 +57,7 @@ static int request(ddns_t *ctx, ddns_info_t *info, ddns_alias_t *alias) + info->server_name.name, info->user_agent); + } + +-static int response(http_trans_t *trans, ddns_info_t *UNUSED(info), ddns_alias_t *UNUSED(alias)) ++static int response(http_trans_t *trans, ddns_info_t *info, ddns_alias_t *alias) + { + char *resp = trans->rsp_body; + +diff --git a/plugins/sitelutions.c b/plugins/sitelutions.c +index c484a62..611c865 100644 +--- a/plugins/sitelutions.c ++++ b/plugins/sitelutions.c +@@ -64,7 +64,7 @@ static int request(ddns_t *ctx, ddns_info_t *info, ddns_alias_t *alias) + info->user_agent); + } + +-static int response(http_trans_t *trans, ddns_info_t *UNUSED(info), ddns_alias_t *UNUSED(alias)) ++static int response(http_trans_t *trans, ddns_info_t *info, ddns_alias_t *alias) + { + char *resp = trans->rsp_body; + +diff --git a/plugins/tunnelbroker.c b/plugins/tunnelbroker.c +index 1f58990..17eb2b9 100644 +--- a/plugins/tunnelbroker.c ++++ b/plugins/tunnelbroker.c +@@ -77,7 +77,7 @@ static int request(ddns_t *ctx, ddns_info_t *info, ddns_alias_t *alias) + * Hurricate Electric IPv6 tunnelbroker specific response validator + * Own IP address and 'already in use' are the good answers. + */ +-static int response(http_trans_t *trans, ddns_info_t *UNUSED(info), ddns_alias_t *alias) ++static int response(http_trans_t *trans, ddns_info_t *info, ddns_alias_t *alias) + { + char *resp = trans->rsp_body; + +diff --git a/plugins/tzo.c b/plugins/tzo.c +index 0a36e87..eba3da4 100644 +--- a/plugins/tzo.c ++++ b/plugins/tzo.c +@@ -66,7 +66,7 @@ static int request(ddns_t *ctx, ddns_info_t *info, ddns_alias_t *alias) + } + + /* TZO specific response validator. */ +-static int response(http_trans_t *trans, ddns_info_t *UNUSED(info), ddns_alias_t *UNUSED(alias)) ++static int response(http_trans_t *trans, ddns_info_t *info, ddns_alias_t *alias) + { + int code = -1; + +diff --git a/plugins/zerigo.c b/plugins/zerigo.c +index 4fb29ab..cc71348 100644 +--- a/plugins/zerigo.c ++++ b/plugins/zerigo.c +@@ -70,7 +70,7 @@ static int request(ddns_t *ctx, ddns_info_t *info, ddns_alias_t *alias) + * Server error + * Status: 5xx + */ +-static int response(http_trans_t *trans, ddns_info_t *UNUSED(info), ddns_alias_t *UNUSED(alias)) ++static int response(http_trans_t *trans, ddns_info_t *info, ddns_alias_t *alias) + { + char *ptr, *rsp = trans->rsp_body; + +diff --git a/plugins/zoneedit.c b/plugins/zoneedit.c +index 7178b9c..464ed66 100644 +--- a/plugins/zoneedit.c ++++ b/plugins/zoneedit.c +@@ -65,7 +65,7 @@ static int request(ddns_t *ctx, ddns_info_t *info, ddns_alias_t *alias) + * CODE=200, 201 + * CODE=707, for duplicated updates + */ +-static int response(http_trans_t *trans, ddns_info_t *UNUSED(info), ddns_alias_t *UNUSED(alias)) ++static int response(http_trans_t *trans, ddns_info_t *info, ddns_alias_t *alias) + { + int code = -1; + diff --git a/pkgs/tools/networking/mosh/default.nix b/pkgs/tools/networking/mosh/default.nix index 5f3975a1df86..1f465bc4f8a8 100644 --- a/pkgs/tools/networking/mosh/default.nix +++ b/pkgs/tools/networking/mosh/default.nix @@ -2,11 +2,11 @@ , makeWrapper, perl, openssl, autoreconfHook, openssh }: stdenv.mkDerivation rec { - name = "mosh-1.3.0"; + name = "mosh-1.3.2"; src = fetchurl { url = "https://mosh.org/${name}.tar.gz"; - sha256 = "0xikz40q873g9ihvz3x6bwkcb9hb8kcnp5wpcmb72pg5c7s143ij"; + sha256 = "05hjhlp6lk8yjcy59zywpf0r6s0h0b9zxq0lw66dh9x8vxrhaq6s"; }; buildInputs = [ autoreconfHook protobuf ncurses zlib pkgconfig IOTty makeWrapper perl openssl ]; diff --git a/pkgs/tools/networking/openntpd/default.nix b/pkgs/tools/networking/openntpd/default.nix index 6f3aab3082f0..3ead2ef0f214 100644 --- a/pkgs/tools/networking/openntpd/default.nix +++ b/pkgs/tools/networking/openntpd/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "openntpd-${version}"; - version = "6.0p1"; + version = "6.2p1"; src = fetchurl { url = "mirror://openbsd/OpenNTPD/${name}.tar.gz"; - sha256 = "1s3plmxmybwpfrimq6sc54wxnn6ca7rb2g5k2bdjm4c88w4q1axi"; + sha256 = "1g6hi03ylhv47sbar3xxgsrar8schqfwn4glckh6m6lni67ndq85"; }; configureFlags = [ diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index aaef2723da0c..c0440e78a389 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -60,6 +60,12 @@ stdenv.mkDerivation rec { ++ optional withKerberos kerberos ++ optional hpnSupport autoreconfHook; + preConfigure = '' + # Setting LD causes `configure' and `make' to disagree about which linker + # to use: `configure' wants `gcc', but `make' wants `ld'. + unset LD + ''; + # I set --disable-strip because later we strip anyway. And it fails to strip # properly when cross building. configureFlags = [ diff --git a/pkgs/tools/networking/ppp/default.nix b/pkgs/tools/networking/ppp/default.nix index 90a4b988c3f7..d07770260ff6 100644 --- a/pkgs/tools/networking/ppp/default.nix +++ b/pkgs/tools/networking/ppp/default.nix @@ -34,7 +34,9 @@ stdenv.mkDerivation rec { ''; postFixup = '' - substituteInPlace $out/bin/{pon,poff,plog} --replace "/usr/sbin" "$out/bin" + for tgt in pon poff plog; do + substituteInPlace "$out/bin/$tgt" --replace "/usr/sbin" "$out/bin" + done ''; meta = { diff --git a/pkgs/tools/networking/radvd/default.nix b/pkgs/tools/networking/radvd/default.nix index a5008e91423f..9ebce846e416 100644 --- a/pkgs/tools/networking/radvd/default.nix +++ b/pkgs/tools/networking/radvd/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "radvd-${version}"; - version = "2.16"; + version = "2.17"; src = fetchurl { url = "http://www.litech.org/radvd/dist/${name}.tar.xz"; - sha256 = "1s3aqgn3db0wb4920b0mrvwb5isgijlb6izb1wliqhhashwffz1i"; + sha256 = "1md6n63sg1n9x8yv0p7fwm1xxaiadj1q3mpadiqsvn14y1ddc2av"; }; nativeBuildInputs = [ pkgconfig bison flex check ]; diff --git a/pkgs/tools/networking/speedtest-cli/default.nix b/pkgs/tools/networking/speedtest-cli/default.nix index 8ccc924d9f6e..592a173df7e8 100644 --- a/pkgs/tools/networking/speedtest-cli/default.nix +++ b/pkgs/tools/networking/speedtest-cli/default.nix @@ -2,13 +2,13 @@ pythonPackages.buildPythonApplication rec { name = "speedtest-cli-${version}"; - version = "1.0.4"; - + version = "1.0.6"; + src = fetchFromGitHub { owner = "sivel"; repo = "speedtest-cli"; rev = "v${version}"; - sha256 = "13i7bvhvwv8h2lxnz9pfxq6jv915lb948d6xjiy5p7rqbki40ng2"; + sha256 = "008a0wymn06h93gdkxwlgxg8039ybdni96i4blhpayj52jkbflnv"; }; meta = with stdenv.lib; { diff --git a/pkgs/tools/networking/unbound/default.nix b/pkgs/tools/networking/unbound/default.nix index e700ea4fb286..5b6b2ee7ba70 100644 --- a/pkgs/tools/networking/unbound/default.nix +++ b/pkgs/tools/networking/unbound/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openssl, nettle, expat, libevent }: +{ stdenv, fetchurl, openssl, nettle, expat, libevent, dns-root-data }: stdenv.mkDerivation rec { name = "unbound-${version}"; @@ -20,6 +20,7 @@ stdenv.mkDerivation rec { "--localstatedir=/var" "--sysconfdir=/etc" "--sbindir=\${out}/bin" + "--with-rootkey-file=${dns-root-data}/root.key" "--enable-pie" "--enable-relro-now" ]; diff --git a/pkgs/tools/networking/wavemon/default.nix b/pkgs/tools/networking/wavemon/default.nix index ece252a9b6c7..0457c1ce6233 100644 --- a/pkgs/tools/networking/wavemon/default.nix +++ b/pkgs/tools/networking/wavemon/default.nix @@ -1,20 +1,26 @@ -{stdenv, fetchgit, ncurses, libnl, pkgconfig}: +{ stdenv, fetchFromGitHub, ncurses, libnl, pkgconfig }: + stdenv.mkDerivation rec { - version = "0.7.6.20151001"; - baseName="wavemon"; - name="${baseName}-${version}"; - buildInputs = [ncurses libnl pkgconfig]; - src = fetchgit { - url = https://github.com/uoaerg/wavemon.git ; - rev = "05753aed2ec5a786d602c7903c89fc6a230f8d42"; - sha256 = "13y4bi4qz4596f11ng6zaqir5j234wv64z4670q3pzh3fqmzmpm4"; + version = "0.8.1"; + baseName = "wavemon"; + name = "${baseName}-${version}"; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ncurses libnl ]; + + src = fetchFromGitHub { + owner = "uoaerg"; + repo = "wavemon"; + rev = "v${version}"; + sha256 = "0mx61rzl8a66pmigv2fh75zgdalxx75a5s1b7ydbviz18ihhjyls"; }; - meta = { + + meta = with stdenv.lib; { inherit version; - description = "WiFi state monitor"; - license = stdenv.lib.licenses.gpl3Plus ; - maintainers = [stdenv.lib.maintainers.raskin]; + description = "Ncurses-based monitoring application for wireless network devices"; + homepage = https://github.com/uoaerg/wavemon; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ raskin fpletz ]; platforms = stdenv.lib.platforms.linux; - downloadPage = https://github.com/uoaerg/wavemon.git ; }; } diff --git a/pkgs/tools/networking/whois/default.nix b/pkgs/tools/networking/whois/default.nix index fd1045d03d99..e6f251768645 100644 --- a/pkgs/tools/networking/whois/default.nix +++ b/pkgs/tools/networking/whois/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, perl, gettext }: stdenv.mkDerivation rec { - version = "5.2.16"; + version = "5.2.17"; name = "whois-${version}"; src = fetchFromGitHub { owner = "rfc1036"; repo = "whois"; rev = "v${version}"; - sha256 = "1axkj3xp8ryw94ml8lkqgpdqkv56aygbyv18kynf2bcglxildyvv"; + sha256 = "15jnzk0js8wxiapz1bw7jnck0fl3mcli56f9635z9x7vk63ss68z"; }; buildInputs = [ perl gettext ]; diff --git a/pkgs/tools/security/fail2ban/default.nix b/pkgs/tools/security/fail2ban/default.nix index e7a052c90f1c..31f2262cd9ff 100644 --- a/pkgs/tools/security/fail2ban/default.nix +++ b/pkgs/tools/security/fail2ban/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, python, pythonPackages, gamin }: -let version = "0.9.6"; in +let version = "0.9.7"; in pythonPackages.buildPythonApplication { name = "fail2ban-${version}"; @@ -9,7 +9,7 @@ pythonPackages.buildPythonApplication { owner = "fail2ban"; repo = "fail2ban"; rev = version; - sha256 = "1a75xjjqhn98zd9i51k15vjvcy0ql0gmcv9xf8pbd0bpvblgdah8"; + sha256 = "07l5pz93mz1r3g59xiyyznlpjfpv2zgvh3h9w0cbn79v7njim8kb"; }; propagatedBuildInputs = [ gamin ] diff --git a/pkgs/tools/security/gnupg/21.nix b/pkgs/tools/security/gnupg/21.nix index e74b0920f4a2..9590ee746b8b 100644 --- a/pkgs/tools/security/gnupg/21.nix +++ b/pkgs/tools/security/gnupg/21.nix @@ -15,11 +15,11 @@ assert guiSupport -> pinentry != null; stdenv.mkDerivation rec { name = "gnupg-${version}"; - version = "2.1.21"; + version = "2.1.22"; src = fetchurl { url = "mirror://gnupg/gnupg/${name}.tar.bz2"; - sha256 = "1p97limv29p01y79mgnzpwixa50lv53wgdl3ymk9idkmpaldisks"; + sha256 = "1msazgy1q1pp7y2xr46z0il4pfzmzgzkp7v0hv5cz4hvkspnywa6"; }; buildInputs = [ diff --git a/pkgs/tools/security/hashcat/hashcat3/default.nix b/pkgs/tools/security/hashcat/hashcat3/default.nix index c8a8acf907d3..1cb028a1a333 100644 --- a/pkgs/tools/security/hashcat/hashcat3/default.nix +++ b/pkgs/tools/security/hashcat/hashcat3/default.nix @@ -4,15 +4,15 @@ assert stdenv.isLinux; stdenv.mkDerivation rec { name = "hashcat-${version}"; - version = "3.10"; + version = "3.6.0"; src = fetchurl { - name = "${name}.tar.gz"; - url = "https://hashcat.net/files_legacy/hashcat-${version}.tar.gz"; - sha256 = "1sg30d9as6xsl7b0i7mz26igachbv0l0yimwb12nmarmgdgmwm9v"; + url = "https://hashcat.net/files/hashcat-${version}.tar.gz"; + sha256 = "127hdvq6ikah7r5vch63jnnkcsj7y61f9h8x79c3w25x9w55bxry"; }; - buildInputs = [ opencl-headers makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ opencl-headers ]; makeFlags = [ "OPENCL_HEADERS_KHRONOS=${opencl-headers}/include" ]; diff --git a/pkgs/tools/security/pcsclite/default.nix b/pkgs/tools/security/pcsclite/default.nix index e3aaca2e5b22..74bb5cc58197 100644 --- a/pkgs/tools/security/pcsclite/default.nix +++ b/pkgs/tools/security/pcsclite/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "pcsclite-${version}"; - version = "1.8.21"; + version = "1.8.22"; src = fetchurl { # This URL changes in unpredictable ways, so it is not sensible # to put a version variable in there. - url = "https://alioth.debian.org/frs/download.php/file/4216/pcsc-lite-1.8.21.tar.bz2"; - sha256 = "1b8kwl81f6s3y7qh68ahr8sp8a0w6m464v9b3s4zxq2cgpmnaczy"; + url = "https://alioth.debian.org/frs/download.php/file/4225/pcsc-lite-1.8.22.tar.bz2"; + sha256 = "01flkdyqs7kr6c63dv2qg8dwir3v9jlr9rzlw7vafrivxmhqydba"; }; patches = [ ./no-dropdir-literals.patch ]; diff --git a/pkgs/tools/security/vulnix/requirements.nix b/pkgs/tools/security/vulnix/requirements.nix index 11faca44ef93..d44d49f12a92 100644 --- a/pkgs/tools/security/vulnix/requirements.nix +++ b/pkgs/tools/security/vulnix/requirements.nix @@ -1,38 +1,6 @@ { pythonPackages, fetchurl, stdenv }: rec { - BTrees = pythonPackages.buildPythonPackage { - name = "BTrees-4.3.1"; - src = fetchurl { - url = "https://pypi.python.org/packages/24/76/cd6f225f2180c22af5cdb6656f51aec5fca45e45bdc4fa75c0a32f161a61/BTrees-4.3.1.tar.gz"; - sha256 = "2565b7d35260dfc6b1e2934470fd0a2f9326c58c535a2b4cb396289d1c195a95"; - }; - propagatedBuildInputs = [ - persistent - transaction - ] ++ (with pythonPackages; [ zope_interface coverage ]); - - meta = with stdenv.lib; { - homepage = ""; - license = licenses.zpt21; - description = "Scalable persistent object containers"; - }; - }; - - ZConfig = pythonPackages.buildPythonPackage { - name = "ZConfig-3.1.0"; - src = fetchurl { - url = "https://pypi.python.org/packages/52/b3/a96d62711a26d8cfbe546519975dc9ed54d2eb50b3238d2e6de045764796/ZConfig-3.1.0.tar.gz"; - sha256 = "c21fa3a073a56925a8098036d46717392994a92cffea1b3cda3176b70c0a842e"; - }; - propagatedBuildInputs = with pythonPackages; [ zope_testrunner ]; - meta = with stdenv.lib; { - homepage = ""; - license = licenses.zpt21; - description = "Structured Configuration Library"; - }; - }; - zodb = pythonPackages.buildPythonPackage { name = "ZODB-5.2.0"; src = fetchurl { @@ -41,31 +9,22 @@ rec { }; doCheck = false; propagatedBuildInputs = [ - BTrees - persistent transaction - ZConfig - zc.lockfile + ] ++ (with pythonPackages; [ + six + wheel + zope_interface zodbpickle - ] ++ (with pythonPackages; [ six wheel zope_interface ]); - meta = with stdenv.lib; { - homepage = ""; - license = licenses.zpt21; - description = "Zope Object Database: object database and persistence"; - }; - }; + zconfig + persistent + zc_lockfile + BTrees + ]); - persistent = pythonPackages.buildPythonPackage { - name = "persistent-4.2.2"; - src = fetchurl { - url = "https://pypi.python.org/packages/3d/71/3302512282b606ec4d054e09be24c065915518903b29380b6573bff79c24/persistent-4.2.2.tar.gz"; - sha256 = "52ececc6dbba5ef572d3435189318b4dff07675bafa9620e32f785e147c6563c"; - }; - propagatedBuildInputs = with pythonPackages; [ zope_interface six wheel ]; meta = with stdenv.lib; { homepage = ""; license = licenses.zpt21; - description = "Translucent persistent objects"; + description = "Zope Object Database: object database and persistence"; }; }; @@ -75,39 +34,16 @@ rec { url = "https://pypi.python.org/packages/8c/af/3ffafe85bcc93ecb09459f3f2bd8fbe142e9ab34048f9e2774543b470cbd/transaction-2.0.3.tar.gz"; sha256 = "67bfb81309ba9717edbb2ca2e5717c325b78beec0bf19f44e5b4b9410f82df7f"; }; - propagatedBuildInputs = with pythonPackages; [ zope_interface six wheel ]; + propagatedBuildInputs = with pythonPackages; [ + zope_interface + six + wheel + mock + ]; meta = with stdenv.lib; { homepage = ""; license = licenses.zpt21; description = "Transaction management for Python"; }; }; - - zc.lockfile = pythonPackages.buildPythonPackage { - name = "zc.lockfile-1.2.1"; - src = fetchurl { - url = "https://pypi.python.org/packages/bd/84/0299bbabbc9d3f84f718ba1039cc068030d3ad723c08f82a64337edf901e/zc.lockfile-1.2.1.tar.gz"; - sha256 = "11db91ada7f22fe8aae268d4bfdeae012c4fe655f66bbb315b00822ec00d043e"; - }; - meta = with stdenv.lib; { - homepage = ""; - license = licenses.zpt21; - description = "Basic inter-process locks"; - }; - }; - - zodbpickle = pythonPackages.buildPythonPackage { - name = "zodbpickle-0.6.0"; - src = fetchurl { - url = "https://pypi.python.org/packages/7a/fc/f6f437a5222b330735eaf8f1e67a6845bd1b600e9a9455e552d3c13c4902/zodbpickle-0.6.0.tar.gz"; - sha256 = "ea3248be966159e7791e3db0e35ea992b9235d52e7d39835438686741d196665"; - }; - doCheck = false; - - meta = with stdenv.lib; { - homepage = ""; - license = licenses.zpt21; - description = "Fork of Python 3 pickle module."; - }; - }; } diff --git a/pkgs/tools/system/ipmiutil/default.nix b/pkgs/tools/system/ipmiutil/default.nix index 174772107268..90feb381ae57 100644 --- a/pkgs/tools/system/ipmiutil/default.nix +++ b/pkgs/tools/system/ipmiutil/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { baseName = "ipmiutil"; - version = "3.0.2"; + version = "3.0.5"; name = "${baseName}-${version}"; src = fetchurl { url = "mirror://sourceforge/project/${baseName}/${name}.tar.gz"; - sha256 = "0nw12v7w9gx2px3b081i5mm5gl4l9n3vxhhk5n18vj1bs2jsxf4d"; + sha256 = "0ppfxh04c0aj9dxpkzj3xv1kylc17k1kvqabp8r7h70k6ljzgmxj"; }; buildInputs = [ openssl ]; diff --git a/pkgs/tools/system/pciutils/default.nix b/pkgs/tools/system/pciutils/default.nix index 998a3bdf6d1d..8a4fe6cb3cff 100644 --- a/pkgs/tools/system/pciutils/default.nix +++ b/pkgs/tools/system/pciutils/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, zlib, kmod, which }: stdenv.mkDerivation rec { - name = "pciutils-3.5.4"; # with database from 2017-02 + name = "pciutils-3.5.5"; # with database from 2017-07 src = fetchurl { url = "mirror://kernel/software/utils/pciutils/${name}.tar.xz"; - sha256 = "0rpy7kkb2y89wmbcbfjjjxsk2x89v5xxhxib4vpl131ip5m3qab4"; + sha256 = "1d62f8fa192f90e61c35a6fc15ff3cb9a7a792f782407acc42ef67817c5939f5"; }; buildInputs = [ pkgconfig zlib kmod which ]; diff --git a/pkgs/tools/system/smartmontools/default.nix b/pkgs/tools/system/smartmontools/default.nix index c3f05edd9adb..26d84ae0320e 100644 --- a/pkgs/tools/system/smartmontools/default.nix +++ b/pkgs/tools/system/smartmontools/default.nix @@ -1,20 +1,18 @@ -{ stdenv, fetchurl, IOKit ? null , ApplicationServices ? null }: +{ stdenv, fetchurl, autoreconfHook +, IOKit ? null , ApplicationServices ? null }: let - version = "6.5"; - dbrev = "4391"; + dbrev = "4394"; drivedbBranch = "RELEASE_${builtins.replaceStrings ["."] ["_"] version}_DRIVEDB"; driverdb = fetchurl { url = "http://sourceforge.net/p/smartmontools/code/${dbrev}/tree/branches/${drivedbBranch}/smartmontools/drivedb.h?format=raw"; - sha256 = "1da99m81wr0rjdhcz2xx0sbbrqxkxffja2kllg4srmhih7fps5p1"; + sha256 = "1kdpgbl1az0xhqn7j613cx366n7amra8xz3391jpzzrd3vlga393"; name = "smartmontools-drivedb.h"; }; -in - -stdenv.mkDerivation rec { +in stdenv.mkDerivation rec { name = "smartmontools-${version}"; src = fetchurl { @@ -22,16 +20,18 @@ stdenv.mkDerivation rec { sha256 = "1g25r6sx85b5lay5n6sbnqv05qxzj6xsafsp93hnrg1h044bps49"; }; - buildInputs = [] ++ stdenv.lib.optionals stdenv.isDarwin [IOKit ApplicationServices]; - patches = [ ./smartmontools.patch ]; postPatch = "cp -v ${driverdb} drivedb.h"; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [] ++ stdenv.lib.optionals stdenv.isDarwin [IOKit ApplicationServices]; + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "Tools for monitoring the health of hard drives"; - homepage = http://smartmontools.sourceforge.net/; - license = licenses.gpl2Plus; - platforms = with platforms; linux ++ darwin; - maintainers = [ maintainers.peti ]; + homepage = http://smartmontools.sourceforge.net/; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ peti ]; + platforms = with platforms; linux ++ darwin; }; } diff --git a/pkgs/tools/text/catdoc/default.nix b/pkgs/tools/text/catdoc/default.nix index fb0309e75325..2a06b25b11da 100644 --- a/pkgs/tools/text/catdoc/default.nix +++ b/pkgs/tools/text/catdoc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, fetchpatch }: stdenv.mkDerivation rec { name = "catdoc-${version}"; @@ -9,6 +9,13 @@ stdenv.mkDerivation rec { sha256 = "514a84180352b6bf367c1d2499819dfa82b60d8c45777432fa643a5ed7d80796"; }; + patches = [ + (fetchpatch { + url = "https://anonscm.debian.org/git/collab-maint/catdoc.git/diff/debian/patches/05-CVE-2017-11110.patch?id=21dd5b29b11be04149587657dd90253f52dfef0b"; + sha256 = "0mdqa9w1p6cmli6976v4wi0sw9r4p5prkj7lzfd1877wk11c9c73"; + }) + ]; + configureFlags = "--disable-wordview"; meta = with stdenv.lib; { diff --git a/pkgs/tools/text/gnugrep/default.nix b/pkgs/tools/text/gnugrep/default.nix index b33ea7169783..0db140c7891c 100644 --- a/pkgs/tools/text/gnugrep/default.nix +++ b/pkgs/tools/text/gnugrep/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, pcre, libiconv, perl }: -let version = "3.0"; in +let version = "3.1"; in stdenv.mkDerivation { name = "gnugrep-${version}"; src = fetchurl { url = "mirror://gnu/grep/grep-${version}.tar.xz"; - sha256 = "1dcasjp3a578nrvzrcn38mpizb8w1q6mvfzhjmcqqgkf0nsivj72"; + sha256 = "0zm0ywmyz9g8vn1plw14mn8kj74yipx5qsljndbyfgmvndx5qqnv"; }; # Perl is needed for testing diff --git a/pkgs/tools/text/mawk/default.nix b/pkgs/tools/text/mawk/default.nix index 6698334791c6..8840130dde50 100644 --- a/pkgs/tools/text/mawk/default.nix +++ b/pkgs/tools/text/mawk/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "mawk-1.3.4-20141206"; + name = "mawk-1.3.4-20161120"; src = fetchurl { url = "ftp://invisible-island.net/mawk/${name}.tgz"; - sha256 = "1j49ffl8gpfaq99hkylf3fjiygq74w1kpfp8f52xbpx57vn9587g"; + sha256 = "07hc33g2ip7463dravsiz0zwfc8vy4y4jxqvp7rz3hb896xw27in"; }; meta = with stdenv.lib; { diff --git a/pkgs/tools/typesetting/pdfgrep/default.nix b/pkgs/tools/typesetting/pdfgrep/default.nix index 6e5f98d4a717..0c288ca02ccf 100644 --- a/pkgs/tools/typesetting/pdfgrep/default.nix +++ b/pkgs/tools/typesetting/pdfgrep/default.nix @@ -1,26 +1,28 @@ -{ fetchurl, stdenv, pkgconfig, poppler, makeWrapper }: +{ stdenv, fetchurl, pkgconfig, poppler, libgcrypt, pcre, asciidoc }: stdenv.mkDerivation rec { name = "pdfgrep-${version}"; - version = "1.3.1"; + version = "2.0.1"; src = fetchurl { - url = "mirror://sourceforge/project/pdfgrep/${version}/${name}.tar.gz"; - sha256 = "6e8bcaf8b219e1ad733c97257a97286a94124694958c27506b2ea7fc8e532437"; + url = "https://pdfgrep.org/download/${name}.tar.gz"; + sha256 = "07llkrkcfjwd3ybai9ad10ybhr0biffcplmy7lw4fb87nd2dfw03"; }; - buildInputs = [ pkgconfig poppler makeWrapper ]; - - patchPhase = '' - sed -i -e "s%cpp/poppler-document.h%poppler/cpp/poppler-document.h%" pdfgrep.cc - sed -i -e "s%cpp/poppler-page.h%poppler/cpp/poppler-page.h%" pdfgrep.cc + postPatch = '' + for i in ./src/search.h ./src/pdfgrep.cc ./src/search.cc; do + substituteInPlace $i --replace '<cpp/' '<' + done ''; + nativeBuildInputs = [ pkgconfig asciidoc ]; + buildInputs = [ poppler libgcrypt pcre ]; + meta = { - description = "A tool to search text in PDF files"; - homepage = http://pdfgrep.sourceforge.net/; - license = stdenv.lib.licenses.free; - maintainers = with stdenv.lib.maintainers; [qknight]; + description = "Commandline utility to search text in PDF files"; + homepage = https://pdfgrep.org/; + license = stdenv.lib.licenses.gpl2Plus; + maintainers = with stdenv.lib.maintainers; [ qknight fpletz ]; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1f48e16ccdae..6dd9427c2ce0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1011,6 +1011,8 @@ with pkgs; buildInputs = old.buildInputs ++ [phantomjs2]; }); + fd = callPackage ../tools/misc/fd { }; + filebench = callPackage ../tools/misc/filebench { }; fsmon = callPackage ../tools/misc/fsmon { }; @@ -1697,7 +1699,7 @@ with pkgs; dtach = callPackage ../tools/misc/dtach { }; - dtc = callPackage ../development/compilers/dtc { flex = flex_2_6_1; }; + dtc = callPackage ../development/compilers/dtc { }; dub = callPackage ../development/tools/build-managers/dub { }; @@ -3648,7 +3650,7 @@ with pkgs; (attrs: { nativeBuildInputs = attrs.nativeBuildInputs ++ [ gtk3 ]; # Fix this build error in ./tests/examples/waylandsink: # main.c:28:2: error: #error "Wayland is not supported in GTK+" - configureFlags = attrs.configureFlags or "" + "--enable-wayland=no"; + configureFlags = attrs.configureFlags or [] ++ [ "--enable-wayland=no" ]; }); }; }; @@ -5627,9 +5629,7 @@ with pkgs; inherit (haskellPackages) idris; }; - intercal = callPackage ../development/compilers/intercal { - flex = flex_2_6_1; # Works with 2.5.35 too, but not 2.6.3 - }; + intercal = callPackage ../development/compilers/intercal { }; irony-server = callPackage ../development/tools/irony-server/default.nix { # The repository of irony to use -- must match the version of the employed emacs @@ -6002,7 +6002,9 @@ with pkgs; tbb = callPackage ../development/libraries/tbb { }; terra = callPackage ../development/compilers/terra { - llvmPackages = llvmPackages_38; + llvmPackages = llvmPackages_38 // { + llvm = llvmPackages_38.llvm.override { enableSharedLibraries = false; }; + }; lua = lua5_1; }; @@ -6923,11 +6925,8 @@ with pkgs; gnum4 = callPackage ../development/tools/misc/gnum4 { }; - gnumake380 = callPackage ../development/tools/build-managers/gnumake/3.80 { }; gnumake382 = callPackage ../development/tools/build-managers/gnumake/3.82 { }; gnumake3 = gnumake382; - gnumake40 = callPackage ../development/tools/build-managers/gnumake/4.0 { }; - gnumake41 = callPackage ../development/tools/build-managers/gnumake/4.1 { }; gnumake42 = callPackage ../development/tools/build-managers/gnumake/4.2 { }; gnumake = gnumake42; @@ -11535,9 +11534,7 @@ with pkgs; ruby-zoom = callPackage ../tools/text/ruby-zoom { }; - sensu = callPackage ../servers/monitoring/sensu { - ruby = ruby_2_1; - }; + sensu = callPackage ../servers/monitoring/sensu { }; uchiwa = callPackage ../servers/monitoring/uchiwa { }; @@ -11585,6 +11582,8 @@ with pkgs; tt-rss = callPackage ../servers/tt-rss { }; + searx = callPackages ../servers/web-apps/searx { }; + selfoss = callPackage ../servers/web-apps/selfoss { }; shaarli = callPackage ../servers/web-apps/shaarli { }; @@ -11941,9 +11940,7 @@ with pkgs; inherit (perlPackages) SGMLSpm; }; - iptables = callPackage ../os-specific/linux/iptables { - flex = flex_2_5_35; - }; + iptables = callPackage ../os-specific/linux/iptables { }; iptstate = callPackage ../os-specific/linux/iptstate { } ; @@ -12881,6 +12878,8 @@ with pkgs; dina-font-pcf = callPackage ../data/fonts/dina-pcf { }; + dns-root-data = callPackage ../data/misc/dns-root-data { }; + docbook5 = callPackage ../data/sgml+xml/schemas/docbook-5.0 { }; docbook_sgml_dtd_31 = callPackage ../data/sgml+xml/schemas/sgml-dtd/docbook/3.1.nix { }; @@ -13382,6 +13381,8 @@ with pkgs; bitcoin = altcoins.bitcoin; bitcoin-xt = altcoins.bitcoin-xt; + cryptop = callPackage ../applications/altcoins/cryptop { }; + libbitcoin = callPackage ../tools/misc/libbitcoin/libbitcoin.nix { secp256k1 = secp256k1.override { enableECDH = true; }; }; @@ -17379,6 +17380,10 @@ with pkgs; openmw = callPackage ../games/openmw { }; + openmw-tes3mp = libsForQt5.callPackage ../games/openmw/tes3mp.nix { + stdenv = overrideCC stdenv gcc7; + }; + openra = callPackage ../games/openra { lua = lua5_1; }; openrw = callPackage ../games/openrw { }; @@ -18038,6 +18043,8 @@ with pkgs; plm = callPackage ../applications/science/programming/plm { }; + scyther = callPackage ../applications/science/programming/scyther { }; + ### SCIENCE/LOGIC abc-verifier = callPackage ../applications/science/logic/abc {}; @@ -18151,6 +18158,10 @@ with pkgs; coq_HEAD = callPackage ../applications/science/logic/coq/HEAD.nix {}; coq = coqPackages.coq; + coq2html = callPackage ../applications/science/logic/coq2html { + make = pkgs.gnumake3; + }; + cryptoverif = callPackage ../applications/science/logic/cryptoverif { }; cubicle = callPackage ../applications/science/logic/cubicle { }; @@ -19229,4 +19240,6 @@ with pkgs; undaemonize = callPackage ../tools/system/undaemonize {}; houdini = callPackage ../applications/misc/houdini {}; + + xtermcontrol = callPackage ../applications/misc/xtermcontrol {}; } diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 0ce439376853..156be853cebb 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9751,15 +9751,17 @@ let self = _self // overrides; _self = with self; { }; Mouse = buildPerlModule rec { - name = "Mouse-v2.4.5"; + name = "Mouse-v2.4.10"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SY/SYOHEX/${name}.tar.gz"; - sha256 = "1f4dps68f2w1fwqjfpr4kllbcbwd744v3h1r9rkpwc2fhvq3q8hl"; + url = "mirror://cpan/authors/id/G/GF/GFUJI/${name}.tar.gz"; + sha256 = "053d28c4v8kj7llwfwj5hjkvc1kcs6mvcn24yg7vxklgj6hxv5dr"; }; buildInputs = [ ModuleBuildXSUtil TestException TestLeakTrace TestRequires TestOutput TestFatal ]; + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isi686 "-fno-stack-protector"; + hardeningDisable = stdenv.lib.optional stdenv.isi686 "stackprotector"; }; MouseXNativeTraits = buildPerlPackage rec { diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index c5e3ac0ac554..cec9674c8b51 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -235,11 +235,11 @@ let composer = pkgs.stdenv.mkDerivation rec { name = "composer-${version}"; - version = "1.4.1"; + version = "1.4.2"; src = pkgs.fetchurl { url = "https://getcomposer.org/download/${version}/composer.phar"; - sha256 = "1g2wsnjcx1ysbw1ps2xwyhgcl8kl3yfzxgwcnh5rigjk6k67glmb"; + sha256 = "1x467ngxb976ba2r9kqba7jpvm95a0db8nwaa2z14zs7xv1la6bb"; }; phases = [ "installPhase" ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1333c071b3e9..f0fd99d17743 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -136,6 +136,8 @@ in { emcee = callPackage ../development/python-modules/emcee { }; + email_validator = callPackage ../development/python-modules/email-validator { }; + dbus-python = callPackage ../development/python-modules/dbus { dbus = pkgs.dbus; }; @@ -2788,6 +2790,12 @@ in { sha256 = "0kgmbs3fl9879n48p4m79nxy9by2yhvxq1jdvlnqzzvkdb2sdmg3"; }; + # Fixes testsuite for python-3.6 + # From ubuntu packaging: https://launchpad.net/ubuntu/+archive/primary/+files/celery_4.0.2-0ubuntu1.debian.tar.xz + # (linked from https://launchpad.net/ubuntu/+source/celery) + # https://github.com/celery/celery/pull/3736#issuecomment-274155454 from upstream + patches = [ ../development/python-modules/celery/fix_endless_python3.6_loop_logger_isa.patch ]; + buildInputs = with self; [ pytest case ]; propagatedBuildInputs = with self; [ kombu billiard pytz anyjson amqp eventlet ]; @@ -5199,25 +5207,7 @@ in { }; }; - dns = buildPythonPackage rec { - name = "dnspython-${version}"; - version = "1.14.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/d/dnspython/${name}.zip"; - sha256 = "1p1i46fyhxfic8mfh3gfckpn2pn7282xqabhihiqymrp4sa8ni91"; - }; - - # needs networking for some tests - doCheck = false; - - meta = { - description = "A DNS toolkit for Python 3.x"; - homepage = http://www.dnspython.org; - # BSD-like, check http://www.dnspython.org/LICENSE for details - license = licenses.free; - }; - }; + dns = callPackage ../development/python-modules/dns { }; docker = callPackage ../development/python-modules/docker.nix {}; @@ -5854,22 +5844,7 @@ in { }; }; - faker = buildPythonPackage rec { - name = "faker-0.0.4"; - disabled = isPy3k; - src = pkgs.fetchurl { - url = mirror://pypi/F/Faker/Faker-0.0.4.tar.gz; - sha256 = "09q5jna3j8di0gw5yjx0dvlndkrk2x9vvqzwyfsvg3nlp8h38js1"; - }; - buildInputs = with self; [ nose ]; - meta = { - description = "A Python library for generating fake user data"; - homepage = http://pypi.python.org/pypi/Faker; - license = licenses.mit; - maintainers = with maintainers; [ lovek323 ]; - platforms = platforms.unix; - }; - }; + faker = callPackage ../development/python-modules/faker { }; fake_factory = buildPythonPackage rec { name = "fake-factory-${version}"; @@ -12018,6 +11993,14 @@ in { sha256 = "18hiricdnbnlz6hx3hbaa4dni6npv8rbid4dhf7k02k16qm6zz6h"; }; + # Backport fix for python-3.6 from master (see issue https://github.com/celery/kombu/issues/675) + # TODO remove at next update + patches = [ (pkgs.fetchpatch { + url = "https://github.com/celery/kombu/commit/dc3fceff59d79ceac3f8f11a5d697beabb4b7a7f.patch"; + sha256 = "0s6gsihzjvmpffc7xrrcijw00r56yb74jg0sbjgng2v1324z1da9"; + name = "don-t-modify-dict-size-while-iterating-over-it"; + }) ]; + buildInputs = with self; [ pytest case pytz ]; propagatedBuildInputs = with self; [ amqp ]; @@ -14944,13 +14927,13 @@ in { }); osc = buildPythonPackage { - name = "osc-0.156.0-94-gd8ba394"; + name = "osc-0.159.0-4-g2d44589"; disabled = isPy3k; src = pkgs.fetchFromGitHub { owner = "openSUSE"; repo = "osc"; - rev = "d8ba39416bb193a15489cb2ae57847434adbf1c8"; - sha256 = "0bxl1sjfpdrhyc0qljyqlkffyzn1iywjqgaz2z1y07zq59gc8wq0"; + rev = "2d44589886845af7da911aaec9403344e396cd91"; + sha256 = "0s8p7gkp64w6r5rnxpbvl2dgb5p85kq2skcqm6qxn5ddadhw2sfz"; }; buildInputs = with pkgs; [ bashInteractive ]; # needed for bash-completion helper propagatedBuildInputs = with self; [ urlgrabber m2crypto pyyaml ]; @@ -15845,30 +15828,7 @@ in { ''; }; - FormEncode = buildPythonPackage rec { - name = "FormEncode-${version}"; - version = "1.3.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/F/FormEncode/${name}.zip"; - sha256 = "0y5gywq0l79l85ylr55p4xy0h921zgmfw6zmrvlh83aa4j074xg6"; - }; - - buildInputs = with self; [ - dns pycountry nose - ]; - - preCheck = '' - # two tests require dns resolving - sed -i 's/test_cyrillic_email/noop/' formencode/tests/test_email.py - sed -i 's/test_unicode_ascii_subgroup/noop/' formencode/tests/test_email.py - ''; - - meta = with stdenv.lib; { - description = "FormEncode validates and converts nested structures"; - homepage = "http://formencode.org"; - }; - }; + FormEncode = callPackage ../development/python-modules/FormEncode { }; pycountry = buildPythonPackage rec { name = "pycountry-${version}"; @@ -16052,6 +16012,8 @@ in { }; }; + olefile = callPackage ../development/python-modules/olefile { }; + oslo-log = buildPythonPackage rec { name = "oslo.log-${version}"; version = "1.12.1"; @@ -17041,61 +17003,9 @@ in { pystringtemplate = callPackage ../development/python-modules/stringtemplate { }; - pillow = buildPythonPackage rec { - name = "Pillow-${version}"; - version = "3.4.2"; - - src = pkgs.fetchurl { - url = "mirror://pypi/P/Pillow/${name}.tar.gz"; - sha256 = "0ee9975c05602e755ff5000232e0335ba30d507f6261922a658ee11b1cec36d1"; - }; - - doCheck = !stdenv.isDarwin && !isPyPy; - - # Disable imagefont tests, because they don't work well with infinality: - # https://github.com/python-pillow/Pillow/issues/1259 - postPatch = '' - rm Tests/test_imagefont.py - ''; - - buildInputs = with self; [ - pkgs.freetype pkgs.libjpeg pkgs.zlib pkgs.libtiff pkgs.libwebp pkgs.tcl nose pkgs.lcms2 ] - ++ optionals (isPyPy) [ pkgs.tk pkgs.xorg.libX11 ]; - - # NOTE: we use LCMS_ROOT as WEBP root since there is not other setting for webp. - preConfigure = let - libinclude' = pkg: ''"${pkg.out}/lib", "${pkg.out}/include"''; - libinclude = pkg: ''"${pkg.out}/lib", "${pkg.dev}/include"''; - in '' - sed -i "setup.py" \ - -e 's|^FREETYPE_ROOT =.*$|FREETYPE_ROOT = ${libinclude pkgs.freetype}|g ; - s|^JPEG_ROOT =.*$|JPEG_ROOT = ${libinclude pkgs.libjpeg}|g ; - s|^ZLIB_ROOT =.*$|ZLIB_ROOT = ${libinclude pkgs.zlib}|g ; - s|^LCMS_ROOT =.*$|LCMS_ROOT = ${libinclude pkgs.lcms2}|g ; - s|^TIFF_ROOT =.*$|TIFF_ROOT = ${libinclude pkgs.libtiff}|g ; - s|^TCL_ROOT=.*$|TCL_ROOT = ${libinclude' pkgs.tcl}|g ;' - export LDFLAGS="-L${pkgs.libwebp}/lib" - export CFLAGS="-I${pkgs.libwebp}/include" - '' - # Remove impurities - + stdenv.lib.optionalString stdenv.isDarwin '' - substituteInPlace setup.py \ - --replace '"/Library/Frameworks",' "" \ - --replace '"/System/Library/Frameworks"' "" - ''; - - meta = { - homepage = "https://python-pillow.github.io/"; - description = "Fork of The Python Imaging Library (PIL)"; - longDescription = '' - The Python Imaging Library (PIL) adds image processing - capabilities to your Python interpreter. This library - supports many file formats, and provides powerful image - processing and graphics capabilities. - ''; - license = "http://www.pythonware.com/products/pil/license.htm"; - maintainers = with maintainers; [ goibhniu prikhi ]; - }; + pillow = callPackage ../development/python-modules/pillow { + inherit (pkgs) freetype libjpeg zlib libtiff libwebp tcl lcms2 tk; + inherit (pkgs.xorg) libX11; }; pkgconfig = buildPythonPackage rec { @@ -18770,23 +18680,7 @@ in { }; }; - pyparsing = buildPythonPackage rec { - name = "pyparsing-${version}"; - version = "2.1.10"; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/pyparsing/${name}.tar.gz"; - sha256 = "811c3e7b0031021137fc83e051795025fcb98674d07eb8fe922ba4de53d39188"; - }; - - # Not everything necessary to run the tests is included in the distribution - doCheck = false; - - meta = { - homepage = http://pyparsing.wikispaces.com/; - description = "An alternative approach to creating and executing simple grammars, vs. the traditional lex/yacc approach, or the use of regular expressions"; - }; - }; + pyparsing = callPackage ../development/python-modules/pyparsing { }; pyparted = buildPythonPackage rec { name = "pyparted-${version}"; @@ -21652,14 +21546,23 @@ in { }; sqlobject = buildPythonPackage rec { - version = "3.0.0"; - name = "sqlobject-${version}"; - src = pkgs.fetchurl { - url = "mirror://pypi/S/SQLObject/SQLObject-${version}.tar.gz"; - sha256 = "15g3g7f4yiyplqf54px1dsnmrw3jb7xwx97z8qzgp9ijmm5vpr8r"; + pname = "SQLObject"; + version = "3.3.0"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "0p2dxrxh7xrv5yys09v5z95d0z40w22aq3xc01ghdidd7hr79xy9"; }; - propagatedBuildInputs = with self; [ pydispatcher FormEncode ]; + checkInputs = with self; [ pytest ]; + + propagatedBuildInputs = with self; [ + FormEncode + PasteDeploy + paste + pydispatcher + ]; meta = { description = "Object Relational Manager for providing an object interface to your database"; @@ -22396,13 +22299,13 @@ in { }; supervisor = buildPythonPackage rec { - name = "supervisor-3.1.1"; + name = "supervisor-3.1.4"; disabled = isPy3k; src = pkgs.fetchurl { url = "mirror://pypi/s/supervisor/${name}.tar.gz"; - sha256 = "e3c3b35804c24b6325b5ba462553ebee80d5f4d1766274737b5c532cd4a11d59"; + sha256 = "0kk0sv7780m4dzmrcb2m284krz907jh8jp7khz5a79qryy4m1xw2"; }; buildInputs = with self; [ mock ]; @@ -23969,6 +23872,8 @@ in { u-msgpack-python = callPackage ../development/python-modules/u-msgpack-python { }; + ukpostcodeparser = callPackage ../development/python-modules/ukpostcodeparser { }; + umalqurra = buildPythonPackage rec { name = "umalqurra-${version}"; version = "0.2"; @@ -24042,7 +23947,7 @@ in { postPatch = '' # argparse is needed for python < 2.7, which we do not support anymore. - substituteInPlace setup.py --replace "argparse" + substituteInPlace setup.py --replace "argparse" "" # # fixes a transient error when collecting tests, see https://bugs.launchpad.net/python-neutronclient/+bug/1508547 sed -i '510i\ return None, False' unittest2/loader.py @@ -24855,23 +24760,7 @@ EOF zconfig = callPackage ../development/python-modules/zconfig { }; - zc_lockfile = buildPythonPackage rec { - name = "zc.lockfile-${version}"; - version = "1.0.2"; - - src = pkgs.fetchurl { - url = "mirror://pypi/z/zc.lockfile/${name}.tar.gz"; - sha256 = "96bb2aa0438f3e29a31e4702316f832ec1482837daef729a92e28c202d8fba5c"; - }; - - meta = { - description = "Inter-process locks"; - homepage = http://www.python.org/pypi/zc.lockfile; - license = licenses.zpt20; - maintainers = with maintainers; [ goibhniu ]; - }; - }; - + zc_lockfile = callPackage ../development/python-modules/zc_lockfile { }; zdaemon = buildPythonPackage rec { name = "zdaemon-${version}"; @@ -24973,40 +24862,11 @@ EOF }; }; - zodbpickle = self.buildPythonPackage rec { - name = "zodbpickle-0.5.2"; - disabled = isPyPy; # https://github.com/zopefoundation/zodbpickle/issues/10 - - src = pkgs.fetchurl { - url = "mirror://pypi/z/zodbpickle/${name}.tar.gz"; - sha256 = "f65c00fbc13523fced63de6cc11747aa1a6343aeb2895c89838ed55a5ab12cca"; - }; - - # fails.. - doCheck = false; - - meta = { - homepage = http://pypi.python.org/pypi/zodbpickle; - }; - }; + zodbpickle = callPackage ../development/python-modules/zodbpickle {}; BTrees = callPackage ../development/python-modules/btrees {}; - persistent = self.buildPythonPackage rec { - name = "persistent-4.0.8"; - - propagatedBuildInputs = with self; [ zope_interface ]; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/persistent/${name}.tar.gz"; - sha256 = "678902217c5370d33694c6dc95b89e1e6284b4dc41f04c056326194a3f6f3e22"; - }; - - meta = { - description = "Automatic persistence for Python objects"; - homepage = http://www.zope.org/Products/ZODB; - }; - }; + persistent = callPackage ../development/python-modules/persistent {}; xdot = buildPythonPackage rec { name = "xdot-0.7"; @@ -25537,23 +25397,7 @@ EOF }; }; - tornado = buildPythonPackage rec { - name = "tornado-${version}"; - version = "4.4.2"; - - propagatedBuildInputs = with self; [ backports_abc backports_ssl_match_hostname certifi singledispatch ]; - - # We specify the name of the test files to prevent - # https://github.com/NixOS/nixpkgs/issues/14634 - checkPhase = '' - ${python.interpreter} -m unittest discover *_test.py - ''; - - src = pkgs.fetchurl { - url = "mirror://pypi/t/tornado/${name}.tar.gz"; - sha256 = "1k7d90afm5pivam90a37nqiz9wlmakvnsfymp3p43kcqz29gk618"; - }; - }; + tornado = callPackage ../development/python-modules/tornado { }; tokenlib = buildPythonPackage rec { name = "tokenlib-${version}"; @@ -26535,42 +26379,6 @@ EOF }; }; - searx = buildPythonPackage rec { - name = "searx-${version}"; - version = "0.11.0"; - - src = pkgs.fetchFromGitHub { - owner = "asciimoo"; - repo = "searx"; - rev = "v${version}"; - sha256 = "1m6q7yd45lfk19yp30x1jmisff6npa1y348wqc9ixa3ywvb28ky8"; - }; - - postPatch = '' - substituteInPlace requirements.txt \ - --replace 'certifi==2016.9.26' 'certifi' \ - --replace 'pyyaml==3.11' 'pyyaml' \ - --replace 'lxml==3.7.1' 'lxml' \ - --replace 'pyopenssl==16.2.0' 'pyopenssl' \ - --replace 'requests[socks]==2.12.4' 'requests[socks]' \ - --replace 'pygments==2.1.3' 'pygments>=2.1,<3.0' \ - --replace 'python-dateutil==2.5.3' 'python-dateutil>=2.5,<3.0' - ''; - - propagatedBuildInputs = with self; [ - pyyaml lxml grequests flaskbabel flask requests - gevent speaklater Babel pytz dateutil pygments - pyasn1 pyasn1-modules ndg-httpsclient certifi pysocks - ]; - - meta = { - homepage = https://github.com/asciimoo/searx; - description = "A privacy-respecting, hackable metasearch engine"; - license = licenses.agpl3Plus; - maintainers = with maintainers; [ matejc fpletz profpatsch ]; - }; - }; - rpdb = buildPythonPackage rec { name = "rpdb-0.1.5"; |